diff --git a/lib/options.nix b/lib/options.nix
index d2eae3ae3a98..e5c0631a5437 100644
--- a/lib/options.nix
+++ b/lib/options.nix
@@ -36,7 +36,7 @@ rec {
example ? null,
# String describing the option.
description ? null,
- # Related packages used in the manual (see `genRelatedPackages` in ../nixos/doc/manual/default.nix).
+ # Related packages used in the manual (see `genRelatedPackages` in ../nixos/lib/make-options-doc/default.nix).
relatedPackages ? null,
# Option type, providing type-checking and value merging.
type ? null,
diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix
index 7ff22fb61fa9..f5c00ff62685 100644
--- a/maintainers/maintainer-list.nix
+++ b/maintainers/maintainer-list.nix
@@ -1724,6 +1724,16 @@
fingerprint = "389A 78CB CD88 5E0C 4701 DEB9 FD42 C7D0 D414 94C8";
}];
};
+ dump_stack = {
+ email = "root@dumpstack.io";
+ github = "jollheef";
+ githubId = 1749762;
+ name = "Mikhail Klementev";
+ keys = [{
+ longkeyid = "rsa4096/0x1525585D1B43C62A";
+ fingerprint = "5DD7 C6F6 0630 F08E DAE7 4711 1525 585D 1B43 C62A";
+ }];
+ };
dxf = {
email = "dingxiangfei2009@gmail.com";
github = "dingxiangfei2009";
@@ -2853,6 +2863,15 @@
githubId = 1383440;
name = "Jason Gilliland";
};
+ jdanek = {
+ email = "jdanek@redhat.com";
+ github = "jdanekrh";
+ keys = [{
+ longkeyid = "ed25519/0x69275CADF15D872E";
+ fingerprint = "D4A6 F051 AD58 2E7C BCED 5439 6927 5CAD F15D 872E";
+ }];
+ name = "Jiri Daněk";
+ };
jdehaas = {
email = "qqlq@nullptr.club";
github = "jeroendehaas";
@@ -6549,6 +6568,12 @@
githubId = 1525767;
name = "Vaibhav Sagar";
};
+ valebes = {
+ email = "valebes@gmail.com";
+ github = "valebes";
+ githubid = 10956211;
+ name = "Valerio Besozzi";
+ };
valeriangalliat = {
email = "val@codejam.info";
github = "valeriangalliat";
diff --git a/nixos/doc/manual/release-notes/rl-1909.xml b/nixos/doc/manual/release-notes/rl-1909.xml
index 37346948b289..6493bb995967 100644
--- a/nixos/doc/manual/release-notes/rl-1909.xml
+++ b/nixos/doc/manual/release-notes/rl-1909.xml
@@ -284,6 +284,13 @@
Squid 3 has been removed and the derivation now refers to Squid 4.
+
+
+ The option has been replaced by
+ . The new option allows setting extra
+ configuration while being better type-checked and mergeable.
+
+
@@ -506,6 +513,20 @@
been removed.
+
+
+ The rmilter package was removed with associated module and options due deprecation by upstream developer.
+ Use rspamd in proxy mode instead.
+
+
+
+
+ systemd cgroup accounting via the
+ systemd.enableCgroupAccounting
+ option is now enabled by default. It now also enables the more recent Block IO and IP accounting
+ features.
+
+
diff --git a/nixos/modules/config/update-users-groups.pl b/nixos/modules/config/update-users-groups.pl
index ef5e6346f02e..59cea51c611b 100644
--- a/nixos/modules/config/update-users-groups.pl
+++ b/nixos/modules/config/update-users-groups.pl
@@ -267,6 +267,7 @@ foreach my $line (-f "/etc/shadow" ? read_file("/etc/shadow") : ()) {
next if !defined $u;
$hashedPassword = "!" if !$spec->{mutableUsers};
$hashedPassword = $u->{hashedPassword} if defined $u->{hashedPassword} && !$spec->{mutableUsers}; # FIXME
+ chomp $hashedPassword;
push @shadowNew, join(":", $name, $hashedPassword, @rest) . "\n";
$shadowSeen{$name} = 1;
}
diff --git a/nixos/modules/misc/ids.nix b/nixos/modules/misc/ids.nix
index 1047df95cdf5..efd8544d6a21 100644
--- a/nixos/modules/misc/ids.nix
+++ b/nixos/modules/misc/ids.nix
@@ -251,7 +251,7 @@
gale = 223;
matrix-synapse = 224;
rspamd = 225;
- rmilter = 226;
+ # rmilter = 226; # unused, removed 2019-08-22
cfdyndns = 227;
gammu-smsd = 228;
pdnsd = 229;
@@ -340,6 +340,7 @@
cockroachdb = 313;
zoneminder = 314;
paperless = 315;
+ mailman = 316;
# When adding a uid, make sure it doesn't match an existing gid. And don't use uids above 399!
@@ -559,7 +560,7 @@
gale = 223;
matrix-synapse = 224;
rspamd = 225;
- rmilter = 226;
+ # rmilter = 226; # unused, removed 2019-08-22
cfdyndns = 227;
pdnsd = 229;
octoprint = 230;
@@ -640,6 +641,7 @@
cockroachdb = 313;
zoneminder = 314;
paperless = 315;
+ mailman = 316;
# When adding a gid, make sure it doesn't match an existing
# uid. Users and groups with the same name should have equal
diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix
index 388f4788b59e..6331e76c648f 100644
--- a/nixos/modules/module-list.nix
+++ b/nixos/modules/module-list.nix
@@ -387,7 +387,6 @@
./services/mail/spamassassin.nix
./services/mail/rspamd.nix
./services/mail/rss2email.nix
- ./services/mail/rmilter.nix
./services/mail/roundcube.nix
./services/mail/nullmailer.nix
./services/misc/airsonic.nix
@@ -790,6 +789,7 @@
./services/web-apps/mattermost.nix
./services/web-apps/mediawiki.nix
./services/web-apps/miniflux.nix
+ ./services/web-apps/moodle.nix
./services/web-apps/nextcloud.nix
./services/web-apps/nexus.nix
./services/web-apps/pgpkeyserver-lite.nix
@@ -803,6 +803,7 @@
./services/web-apps/zabbix.nix
./services/web-servers/apache-httpd/default.nix
./services/web-servers/caddy.nix
+ ./services/web-servers/darkhttpd.nix
./services/web-servers/fcgiwrap.nix
./services/web-servers/hitch/default.nix
./services/web-servers/hydron.nix
diff --git a/nixos/modules/rename.nix b/nixos/modules/rename.nix
index 65014b4beed4..348ad094e5ad 100644
--- a/nixos/modules/rename.nix
+++ b/nixos/modules/rename.nix
@@ -72,8 +72,8 @@ with lib;
# PAM
(mkRenamedOptionModule [ "security" "pam" "enableU2F" ] [ "security" "pam" "u2f" "enable" ])
- (mkRemovedOptionModule [ "services" "rmilter" "bindInetSockets" ] "Use services.rmilter.bindSocket.* instead")
- (mkRemovedOptionModule [ "services" "rmilter" "bindUnixSockets" ] "Use services.rmilter.bindSocket.* instead")
+ # rmilter/rspamd
+ (mkRemovedOptionModule [ "services" "rmilter" ] "Use services.rspamd.* instead to set up milter service")
# Xsession script
(mkRenamedOptionModule [ "services" "xserver" "displayManager" "job" "logsXsession" ] [ "services" "xserver" "displayManager" "job" "logToFile" ])
diff --git a/nixos/modules/services/databases/memcached.nix b/nixos/modules/services/databases/memcached.nix
index f9e403dfc0c2..84d2c8674f4e 100644
--- a/nixos/modules/services/databases/memcached.nix
+++ b/nixos/modules/services/databases/memcached.nix
@@ -103,7 +103,6 @@ in
LockPersonality = true;
RestrictRealtime = true;
PrivateMounts = true;
- PrivateUsers = true;
MemoryDenyWriteExecute = true;
};
};
diff --git a/nixos/modules/services/mail/rmilter.nix b/nixos/modules/services/mail/rmilter.nix
deleted file mode 100644
index 466365b6b305..000000000000
--- a/nixos/modules/services/mail/rmilter.nix
+++ /dev/null
@@ -1,252 +0,0 @@
-{ config, lib, pkgs, ... }:
-
-with lib;
-
-let
-
- rspamdCfg = config.services.rspamd;
- postfixCfg = config.services.postfix;
- cfg = config.services.rmilter;
-
- inetSocket = addr: port: "inet:${addr}:${toString port}";
- unixSocket = sock: "unix:${sock}";
-
- systemdSocket = if cfg.bindSocket.type == "unix" then cfg.bindSocket.path
- else "${cfg.bindSocket.address}:${toString cfg.bindSocket.port}";
- rmilterSocket = if cfg.bindSocket.type == "unix" then unixSocket cfg.bindSocket.path
- else inetSocket cfg.bindSocket.address cfg.bindSocket.port;
-
- rmilterConf = ''
- pidfile = /run/rmilter/rmilter.pid;
- bind_socket = ${if cfg.socketActivation then "fd:3" else rmilterSocket};
- tempdir = /tmp;
- '' + (with cfg.rspamd; if enable then ''
- spamd {
- servers = ${concatStringsSep ", " servers};
- connect_timeout = 1s;
- results_timeout = 20s;
- error_time = 10;
- dead_time = 300;
- maxerrors = 10;
- reject_message = "${rejectMessage}";
- ${optionalString (length whitelist != 0) "whitelist = ${concatStringsSep ", " whitelist};"}
-
- # rspamd_metric - metric for using with rspamd
- # Default: "default"
- rspamd_metric = "default";
- ${extraConfig}
- };
- '' else "") + cfg.extraConfig;
-
- rmilterConfigFile = pkgs.writeText "rmilter.conf" rmilterConf;
-
-in
-
-{
-
- ###### interface
-
- options = {
-
- services.rmilter = {
-
- enable = mkOption {
- type = types.bool;
- default = false;
- description = "Whether to run the rmilter daemon.";
- };
-
- debug = mkOption {
- type = types.bool;
- default = false;
- description = "Whether to run the rmilter daemon in debug mode.";
- };
-
- user = mkOption {
- type = types.string;
- default = "rmilter";
- description = ''
- User to use when no root privileges are required.
- '';
- };
-
- group = mkOption {
- type = types.string;
- default = "rmilter";
- description = ''
- Group to use when no root privileges are required.
- '';
- };
-
- bindSocket.type = mkOption {
- type = types.enum [ "unix" "inet" ];
- default = "unix";
- description = ''
- What kind of socket rmilter should listen on. Either "unix"
- for an Unix domain socket or "inet" for a TCP socket.
- '';
- };
-
- bindSocket.path = mkOption {
- type = types.str;
- default = "/run/rmilter.sock";
- description = ''
- Path to Unix domain socket to listen on.
- '';
- };
-
- bindSocket.address = mkOption {
- type = types.str;
- default = "[::1]";
- example = "0.0.0.0";
- description = ''
- Inet address to listen on.
- '';
- };
-
- bindSocket.port = mkOption {
- type = types.int;
- default = 11990;
- description = ''
- Inet port to listen on.
- '';
- };
-
- socketActivation = mkOption {
- type = types.bool;
- default = true;
- description = ''
- Enable systemd socket activation for rmilter.
-
- Disabling socket activation is not recommended when a Unix
- domain socket is used and could lead to incorrect
- permissions.
- '';
- };
-
- rspamd = {
- enable = mkOption {
- type = types.bool;
- default = rspamdCfg.enable;
- description = "Whether to use rspamd to filter mails";
- };
-
- servers = mkOption {
- type = types.listOf types.str;
- default = ["r:/run/rspamd/rspamd.sock"];
- description = ''
- Spamd socket definitions.
- Is server name is prefixed with r: it is rspamd server.
- '';
- };
-
- whitelist = mkOption {
- type = types.listOf types.str;
- default = [ ];
- description = "list of ips or nets that should be not checked with spamd";
- };
-
- rejectMessage = mkOption {
- type = types.str;
- default = "Spam message rejected; If this is not spam contact abuse";
- description = "reject message for spam";
- };
-
- extraConfig = mkOption {
- type = types.lines;
- default = "";
- description = "Custom snippet to append to end of `spamd' section";
- };
- };
-
- extraConfig = mkOption {
- type = types.lines;
- default = "";
- description = "Custom snippet to append to rmilter config";
- };
-
- postfix = {
- enable = mkOption {
- type = types.bool;
- default = false;
- description = "Add rmilter to postfix main.conf";
- };
-
- configFragment = mkOption {
- type = types.str;
- description = "Addon to postfix configuration";
- default = ''
- smtpd_milters = ${rmilterSocket}
- milter_protocol = 6
- milter_mail_macros = i {mail_addr} {client_addr} {client_name} {auth_authen}
- '';
- };
- };
-
- };
-
- };
-
-
- ###### implementation
-
- config = mkMerge [
-
- (mkIf cfg.enable {
- warnings = [
- ''`config.services.rmilter' is deprecated, `rmilter' deprecated and unsupported by upstream, and will be removed from next releases. Use built-in rspamd milter instead.''
- ];
-
- users.users = singleton {
- name = cfg.user;
- description = "rmilter daemon";
- uid = config.ids.uids.rmilter;
- group = cfg.group;
- };
-
- users.groups = singleton {
- name = cfg.group;
- gid = config.ids.gids.rmilter;
- };
-
- systemd.services.rmilter = {
- description = "Rmilter Service";
-
- wantedBy = [ "multi-user.target" ];
- after = [ "network.target" ];
-
- serviceConfig = {
- ExecStart = "${pkgs.rmilter}/bin/rmilter ${optionalString cfg.debug "-d"} -n -c ${rmilterConfigFile}";
- ExecReload = "${pkgs.coreutils}/bin/kill -USR1 $MAINPID";
- User = cfg.user;
- Group = cfg.group;
- PermissionsStartOnly = true;
- Restart = "always";
- RuntimeDirectory = "rmilter";
- RuntimeDirectoryMode = "0750";
- };
-
- };
-
- systemd.sockets.rmilter = mkIf cfg.socketActivation {
- description = "Rmilter service socket";
- wantedBy = [ "sockets.target" ];
- socketConfig = {
- ListenStream = systemdSocket;
- SocketUser = cfg.user;
- SocketGroup = cfg.group;
- SocketMode = "0660";
- };
- };
- })
-
- (mkIf (cfg.enable && cfg.rspamd.enable && rspamdCfg.enable) {
- users.users.${cfg.user}.extraGroups = [ rspamdCfg.group ];
- })
-
- (mkIf (cfg.enable && cfg.postfix.enable) {
- services.postfix.extraConfig = cfg.postfix.configFragment;
- users.users.${postfixCfg.user}.extraGroups = [ cfg.group ];
- })
- ];
-}
diff --git a/nixos/modules/services/misc/zoneminder.nix b/nixos/modules/services/misc/zoneminder.nix
index 6e83d47df1ca..bf38b9ad7a2d 100644
--- a/nixos/modules/services/misc/zoneminder.nix
+++ b/nixos/modules/services/misc/zoneminder.nix
@@ -200,7 +200,10 @@ in {
"zoneminder/80-nixos.conf".source = configFile;
};
- networking.firewall.allowedTCPPorts = lib.mkIf cfg.openFirewall [ cfg.port ];
+ networking.firewall.allowedTCPPorts = lib.mkIf cfg.openFirewall [
+ cfg.port
+ 6802 # zmtrigger
+ ];
services = {
fcgiwrap = lib.mkIf useNginx {
diff --git a/nixos/modules/services/networking/dnschain.nix b/nixos/modules/services/networking/dnschain.nix
index 0c2add424bac..5b58ea9b0c91 100644
--- a/nixos/modules/services/networking/dnschain.nix
+++ b/nixos/modules/services/networking/dnschain.nix
@@ -136,10 +136,16 @@ in
"/.dns/127.0.0.1#${toString cfg.dns.port}"
];
- services.pdns-recursor.forwardZones = mkIf cfgs.pdns-recursor.resolveDNSChainQueries
- { bit = "127.0.0.1:${toString cfg.dns.port}";
- dns = "127.0.0.1:${toString cfg.dns.port}";
- };
+ services.pdns-recursor = mkIf cfgs.pdns-recursor.resolveDNSChainQueries {
+ forwardZones =
+ { bit = "127.0.0.1:${toString cfg.dns.port}";
+ dns = "127.0.0.1:${toString cfg.dns.port}";
+ };
+ luaConfig =''
+ addNTA("bit", "namecoin doesn't support DNSSEC")
+ addNTA("dns", "namecoin doesn't support DNSSEC")
+ '';
+ };
users.users = singleton {
name = username;
diff --git a/nixos/modules/services/networking/jormungandr.nix b/nixos/modules/services/networking/jormungandr.nix
index c1a16a316b7a..0c66b85fe8a5 100644
--- a/nixos/modules/services/networking/jormungandr.nix
+++ b/nixos/modules/services/networking/jormungandr.nix
@@ -13,7 +13,7 @@ let
configSettings = {
storage = dataDir;
p2p = {
- public_address = "/ip4/127.0.0.1/tcp/8606";
+ public_address = "/ip4/127.0.0.1/tcp/8299";
messages = "high";
blocks = "high";
};
diff --git a/nixos/modules/services/networking/pdns-recursor.nix b/nixos/modules/services/networking/pdns-recursor.nix
index d07deb9dcc67..ec69cc838da9 100644
--- a/nixos/modules/services/networking/pdns-recursor.nix
+++ b/nixos/modules/services/networking/pdns-recursor.nix
@@ -6,25 +6,27 @@ let
dataDir = "/var/lib/pdns-recursor";
username = "pdns-recursor";
- cfg = config.services.pdns-recursor;
- zones = mapAttrsToList (zone: uri: "${zone}.=${uri}") cfg.forwardZones;
+ cfg = config.services.pdns-recursor;
- configFile = pkgs.writeText "recursor.conf" ''
- local-address=${cfg.dns.address}
- local-port=${toString cfg.dns.port}
- allow-from=${concatStringsSep "," cfg.dns.allowFrom}
+ oneOrMore = type: with types; either type (listOf type);
+ valueType = with types; oneOf [ int str bool path ];
+ configType = with types; attrsOf (nullOr (oneOrMore valueType));
- webserver-address=${cfg.api.address}
- webserver-port=${toString cfg.api.port}
- webserver-allow-from=${concatStringsSep "," cfg.api.allowFrom}
+ toBool = val: if val then "yes" else "no";
+ serialize = val: with types;
+ if str.check val then val
+ else if int.check val then toString val
+ else if path.check val then toString val
+ else if bool.check val then toBool val
+ else if builtins.isList val then (concatMapStringsSep "," serialize val)
+ else "";
- forward-zones=${concatStringsSep "," zones}
- export-etc-hosts=${if cfg.exportHosts then "yes" else "no"}
- dnssec=${cfg.dnssecValidation}
- serve-rfc1918=${if cfg.serveRFC1918 then "yes" else "no"}
+ configFile = pkgs.writeText "recursor.conf"
+ (concatStringsSep "\n"
+ (flip mapAttrsToList cfg.settings
+ (name: val: "${name}=${serialize val}")));
- ${cfg.extraConfig}
- '';
+ mkDefaultAttrs = mapAttrs (n: v: mkDefault v);
in {
options.services.pdns-recursor = {
@@ -117,17 +119,55 @@ in {
'';
};
- extraConfig = mkOption {
+ settings = mkOption {
+ type = configType;
+ default = { };
+ example = literalExample ''
+ {
+ loglevel = 8;
+ log-common-errors = true;
+ }
+ '';
+ description = ''
+ PowerDNS Recursor settings. Use this option to configure Recursor
+ settings not exposed in a NixOS option or to bypass one.
+ See the full documentation at
+
+ for the available options.
+ '';
+ };
+
+ luaConfig = mkOption {
type = types.lines;
default = "";
description = ''
- Extra options to be appended to the configuration file.
+ The content Lua configuration file for PowerDNS Recursor. See
+ .
'';
};
};
config = mkIf cfg.enable {
+ services.pdns-recursor.settings = mkDefaultAttrs {
+ local-address = cfg.dns.address;
+ local-port = cfg.dns.port;
+ allow-from = cfg.dns.allowFrom;
+
+ webserver-address = cfg.api.address;
+ webserver-port = cfg.api.port;
+ webserver-allow-from = cfg.api.allowFrom;
+
+ forward-zones = mapAttrsToList (zone: uri: "${zone}.=${uri}") cfg.forwardZones;
+ export-etc-hosts = cfg.exportHosts;
+ dnssec = cfg.dnssecValidation;
+ serve-rfc1918 = cfg.serveRFC1918;
+ lua-config-file = pkgs.writeText "recursor.lua" cfg.luaConfig;
+
+ log-timestamp = false;
+ disable-syslog = true;
+ };
+
users.users."${username}" = {
home = dataDir;
createHome = true;
@@ -150,8 +190,7 @@ in {
AmbientCapabilities = "cap_net_bind_service";
ExecStart = ''${pkgs.pdns-recursor}/bin/pdns_recursor \
--config-dir=${dataDir} \
- --socket-dir=${dataDir} \
- --disable-syslog
+ --socket-dir=${dataDir}
'';
};
@@ -165,4 +204,10 @@ in {
'';
};
};
+
+ imports = [
+ (mkRemovedOptionModule [ "services" "pdns-recursor" "extraConfig" ]
+ "To change extra Recursor settings use services.pdns-recursor.settings instead.")
+ ];
+
}
diff --git a/nixos/modules/services/networking/unifi.nix b/nixos/modules/services/networking/unifi.nix
index 6239c88b7e41..c922ba15960f 100644
--- a/nixos/modules/services/networking/unifi.nix
+++ b/nixos/modules/services/networking/unifi.nix
@@ -176,6 +176,7 @@ in
Type = "simple";
ExecStart = "${(removeSuffix "\n" cmd)} start";
ExecStop = "${(removeSuffix "\n" cmd)} stop";
+ Restart = "on-failure";
User = "unifi";
UMask = "0077";
WorkingDirectory = "${stateDir}";
diff --git a/nixos/modules/services/torrent/transmission.nix b/nixos/modules/services/torrent/transmission.nix
index f544928fb6b1..a94a471361ef 100644
--- a/nixos/modules/services/torrent/transmission.nix
+++ b/nixos/modules/services/torrent/transmission.nix
@@ -84,6 +84,18 @@ in
The directory where transmission will create files.
'';
};
+
+ user = mkOption {
+ type = types.str;
+ default = "transmission";
+ description = "User account under which Transmission runs.";
+ };
+
+ group = mkOption {
+ type = types.str;
+ default = "transmission";
+ description = "Group account under which Transmission runs.";
+ };
};
};
@@ -99,7 +111,8 @@ in
serviceConfig.ExecStartPre = preStart;
serviceConfig.ExecStart = "${pkgs.transmission}/bin/transmission-daemon -f --port ${toString config.services.transmission.port}";
serviceConfig.ExecReload = "${pkgs.coreutils}/bin/kill -HUP $MAINPID";
- serviceConfig.User = "transmission";
+ serviceConfig.User = cfg.user;
+ serviceConfig.Group = cfg.group;
# NOTE: transmission has an internal umask that also must be set (in settings.json)
serviceConfig.UMask = "0002";
};
@@ -107,14 +120,19 @@ in
# It's useful to have transmission in path, e.g. for remote control
environment.systemPackages = [ pkgs.transmission ];
- users.groups.transmission.gid = config.ids.gids.transmission;
- users.users.transmission = {
- group = "transmission";
- uid = config.ids.uids.transmission;
- description = "Transmission BitTorrent user";
- home = homeDir;
- createHome = true;
- };
+ users.users = optionalAttrs (cfg.user == "transmission") (singleton
+ { name = "transmission";
+ group = cfg.group;
+ uid = config.ids.uids.transmission;
+ description = "Transmission BitTorrent user";
+ home = homeDir;
+ createHome = true;
+ });
+
+ users.groups = optionalAttrs (cfg.group == "transmission") (singleton
+ { name = "transmission";
+ gid = config.ids.gids.transmission;
+ });
# AppArmor profile
security.apparmor.profiles = mkIf apparmor [
diff --git a/nixos/modules/services/web-apps/matomo.nix b/nixos/modules/services/web-apps/matomo.nix
index bf8b9dbcc216..d9f840408cc8 100644
--- a/nixos/modules/services/web-apps/matomo.nix
+++ b/nixos/modules/services/web-apps/matomo.nix
@@ -176,7 +176,7 @@ in {
# Use User-Private Group scheme to protect Matomo data, but allow administration / backup via 'matomo' group
# Copy config folder
chmod g+s "${dataDir}"
- cp -r "${cfg.package}/config" "${dataDir}/"
+ cp -r "${cfg.package}/share/config" "${dataDir}/"
chmod -R u+rwX,g+rwX,o-rwx "${dataDir}"
# check whether user setup has already been done
diff --git a/nixos/modules/services/web-apps/moodle.nix b/nixos/modules/services/web-apps/moodle.nix
new file mode 100644
index 000000000000..f2516c67c6b3
--- /dev/null
+++ b/nixos/modules/services/web-apps/moodle.nix
@@ -0,0 +1,300 @@
+{ config, lib, pkgs, ... }:
+
+let
+ inherit (lib) mkDefault mkEnableOption mkForce mkIf mkMerge mkOption types;
+ inherit (lib) concatStringsSep literalExample mapAttrsToList optional optionalString;
+
+ cfg = config.services.moodle;
+ fpm = config.services.phpfpm.pools.moodle;
+
+ user = "moodle";
+ group = config.services.httpd.group;
+ stateDir = "/var/lib/moodle";
+
+ moodleConfig = pkgs.writeText "config.php" ''
+ dbtype = '${ { "mysql" = "mariadb"; "pgsql" = "pgsql"; }.${cfg.database.type} }';
+ $CFG->dblibrary = 'native';
+ $CFG->dbhost = '${cfg.database.host}';
+ $CFG->dbname = '${cfg.database.name}';
+ $CFG->dbuser = '${cfg.database.user}';
+ ${optionalString (cfg.database.passwordFile != null) "$CFG->dbpass = file_get_contents('${cfg.database.passwordFile}');"}
+ $CFG->prefix = 'mdl_';
+ $CFG->dboptions = array (
+ 'dbpersist' => 0,
+ 'dbport' => '${toString cfg.database.port}',
+ ${optionalString (cfg.database.socket != null) "'dbsocket' => '${cfg.database.socket}',"}
+ 'dbcollation' => 'utf8mb4_unicode_ci',
+ );
+
+ $CFG->wwwroot = '${if cfg.virtualHost.enableSSL then "https" else "http"}://${cfg.virtualHost.hostName}';
+ $CFG->dataroot = '${stateDir}';
+ $CFG->admin = 'admin';
+
+ $CFG->directorypermissions = 02777;
+ $CFG->disableupdateautodeploy = true;
+
+ $CFG->pathtogs = '${pkgs.ghostscript}/bin/gs';
+ $CFG->pathtophp = '${pkgs.php}/bin/php';
+ $CFG->pathtodu = '${pkgs.coreutils}/bin/du';
+ $CFG->aspellpath = '${pkgs.aspell}/bin/aspell';
+ $CFG->pathtodot = '${pkgs.graphviz}/bin/dot';
+
+ require_once('${cfg.package}/share/moodle/lib/setup.php');
+
+ // There is no php closing tag in this file,
+ // it is intentional because it prevents trailing whitespace problems!
+ '';
+
+ mysqlLocal = cfg.database.createLocally && cfg.database.type == "mysql";
+ pgsqlLocal = cfg.database.createLocally && cfg.database.type == "pgsql";
+in
+{
+ # interface
+ options.services.moodle = {
+ enable = mkEnableOption "Moodle web application";
+
+ package = mkOption {
+ type = types.package;
+ default = pkgs.moodle;
+ defaultText = "pkgs.moodle";
+ description = "The Moodle package to use.";
+ };
+
+ initialPassword = mkOption {
+ type = types.str;
+ example = "correcthorsebatterystaple";
+ description = ''
+ Specifies the initial password for the admin, i.e. the password assigned if the user does not already exist.
+ The password specified here is world-readable in the Nix store, so it should be changed promptly.
+ '';
+ };
+
+ database = {
+ type = mkOption {
+ type = types.enum [ "mysql" "pgsql" ];
+ default = "mysql";
+ description = ''Database engine to use.'';
+ };
+
+ host = mkOption {
+ type = types.str;
+ default = "localhost";
+ description = "Database host address.";
+ };
+
+ port = mkOption {
+ type = types.int;
+ description = "Database host port.";
+ default = {
+ "mysql" = 3306;
+ "pgsql" = 5432;
+ }.${cfg.database.type};
+ defaultText = "3306";
+ };
+
+ name = mkOption {
+ type = types.str;
+ default = "moodle";
+ description = "Database name.";
+ };
+
+ user = mkOption {
+ type = types.str;
+ default = "moodle";
+ description = "Database user.";
+ };
+
+ passwordFile = mkOption {
+ type = types.nullOr types.path;
+ default = null;
+ example = "/run/keys/moodle-dbpassword";
+ description = ''
+ A file containing the password corresponding to
+ .
+ '';
+ };
+
+ socket = mkOption {
+ type = types.nullOr types.path;
+ default =
+ if mysqlLocal then "/run/mysqld/mysqld.sock"
+ else if pgsqlLocal then "/run/postgresql"
+ else null;
+ defaultText = "/run/mysqld/mysqld.sock";
+ description = "Path to the unix socket file to use for authentication.";
+ };
+
+ createLocally = mkOption {
+ type = types.bool;
+ default = true;
+ description = "Create the database and database user locally.";
+ };
+ };
+
+ virtualHost = mkOption {
+ type = types.submodule ({
+ options = import ../web-servers/apache-httpd/per-server-options.nix {
+ inherit lib;
+ forMainServer = false;
+ };
+ });
+ example = {
+ hostName = "moodle.example.org";
+ enableSSL = true;
+ adminAddr = "webmaster@example.org";
+ sslServerCert = "/var/lib/acme/moodle.example.org/full.pem";
+ sslServerKey = "/var/lib/acme/moodle.example.org/key.pem";
+ };
+ description = ''
+ Apache configuration can be done by adapting .
+ See for further information.
+ '';
+ };
+
+ poolConfig = mkOption {
+ type = with types; attrsOf (oneOf [ str int bool ]);
+ default = {
+ "pm" = "dynamic";
+ "pm.max_children" = 32;
+ "pm.start_servers" = 2;
+ "pm.min_spare_servers" = 2;
+ "pm.max_spare_servers" = 4;
+ "pm.max_requests" = 500;
+ };
+ description = ''
+ Options for the Moodle PHP pool. See the documentation on php-fpm.conf
+ for details on configuration directives.
+ '';
+ };
+ };
+
+ # implementation
+ config = mkIf cfg.enable {
+
+ assertions = [
+ { assertion = cfg.database.createLocally -> cfg.database.user == user;
+ message = "services.moodle.database.user must be set to ${user} if services.moodle.database.createLocally is set true";
+ }
+ { assertion = cfg.database.createLocally -> cfg.database.passwordFile == null;
+ message = "a password cannot be specified if services.moodle.database.createLocally is set to true";
+ }
+ ];
+
+ services.mysql = mkIf mysqlLocal {
+ enable = true;
+ package = mkDefault pkgs.mariadb;
+ ensureDatabases = [ cfg.database.name ];
+ ensureUsers = [
+ { name = cfg.database.user;
+ ensurePermissions = {
+ "${cfg.database.name}.*" = "SELECT, INSERT, UPDATE, DELETE, CREATE, CREATE TEMPORARY TABLES, DROP, INDEX, ALTER";
+ };
+ }
+ ];
+ };
+
+ services.postgresql = mkIf pgsqlLocal {
+ enable = true;
+ ensureDatabases = [ cfg.database.name ];
+ ensureUsers = [
+ { name = cfg.database.user;
+ ensurePermissions = { "DATABASE ${cfg.database.name}" = "ALL PRIVILEGES"; };
+ }
+ ];
+ };
+
+ services.phpfpm.pools.moodle = {
+ inherit user group;
+ phpEnv.MOODLE_CONFIG = "${moodleConfig}";
+ phpOptions = ''
+ zend_extension = opcache.so
+ opcache.enable = 1
+ '';
+ settings = {
+ "listen.owner" = config.services.httpd.user;
+ "listen.group" = config.services.httpd.group;
+ } // cfg.poolConfig;
+ };
+
+ services.httpd = {
+ enable = true;
+ adminAddr = mkDefault cfg.virtualHost.adminAddr;
+ extraModules = [ "proxy_fcgi" ];
+ virtualHosts = [ (mkMerge [
+ cfg.virtualHost {
+ documentRoot = mkForce "${cfg.package}/share/moodle";
+ extraConfig = ''
+
+
+
+ SetHandler "proxy:unix:${fpm.socket}|fcgi://localhost/"
+
+
+ Options -Indexes
+ DirectoryIndex index.php
+
+ '';
+ }
+ ]) ];
+ };
+
+ systemd.tmpfiles.rules = [
+ "d '${stateDir}' 0750 ${user} ${group} - -"
+ ];
+
+ systemd.services.moodle-init = {
+ wantedBy = [ "multi-user.target" ];
+ before = [ "phpfpm-moodle.service" ];
+ after = optional mysqlLocal "mysql.service" ++ optional pgsqlLocal "postgresql.service";
+ environment.MOODLE_CONFIG = moodleConfig;
+ script = ''
+ ${pkgs.php}/bin/php ${cfg.package}/share/moodle/admin/cli/check_database_schema.php && rc=$? || rc=$?
+
+ [ "$rc" == 1 ] && ${pkgs.php}/bin/php ${cfg.package}/share/moodle/admin/cli/upgrade.php \
+ --non-interactive \
+ --allow-unstable
+
+ [ "$rc" == 2 ] && ${pkgs.php}/bin/php ${cfg.package}/share/moodle/admin/cli/install_database.php \
+ --agree-license \
+ --adminpass=${cfg.initialPassword}
+
+ true
+ '';
+ serviceConfig = {
+ User = user;
+ Group = group;
+ Type = "oneshot";
+ };
+ };
+
+ systemd.services.moodle-cron = {
+ description = "Moodle cron service";
+ after = [ "moodle-init.service" ];
+ environment.MOODLE_CONFIG = moodleConfig;
+ serviceConfig = {
+ User = user;
+ Group = group;
+ ExecStart = "${pkgs.php}/bin/php ${cfg.package}/share/moodle/admin/cli/cron.php";
+ };
+ };
+
+ systemd.timers.moodle-cron = {
+ description = "Moodle cron timer";
+ wantedBy = [ "timers.target" ];
+ timerConfig = {
+ OnCalendar = "minutely";
+ };
+ };
+
+ systemd.services.httpd.after = optional mysqlLocal "mysql.service" ++ optional pgsqlLocal "postgresql.service";
+
+ users.users."${user}".group = group;
+
+ };
+}
diff --git a/nixos/modules/services/web-servers/darkhttpd.nix b/nixos/modules/services/web-servers/darkhttpd.nix
new file mode 100644
index 000000000000..80870118c334
--- /dev/null
+++ b/nixos/modules/services/web-servers/darkhttpd.nix
@@ -0,0 +1,77 @@
+{ config, lib, pkgs, ... }:
+
+with lib;
+
+let
+ cfg = config.services.darkhttpd;
+
+ args = concatStringsSep " " ([
+ cfg.rootDir
+ "--port ${toString cfg.port}"
+ "--addr ${cfg.address}"
+ ] ++ cfg.extraArgs
+ ++ optional cfg.hideServerId "--no-server-id"
+ ++ optional config.networking.enableIPv6 "--ipv6");
+
+in {
+ options.services.darkhttpd = with types; {
+ enable = mkEnableOption "DarkHTTPd web server";
+
+ port = mkOption {
+ default = 80;
+ type = ints.u16;
+ description = ''
+ Port to listen on.
+ Pass 0 to let the system choose any free port for you.
+ '';
+ };
+
+ address = mkOption {
+ default = "127.0.0.1";
+ type = str;
+ description = ''
+ Address to listen on.
+ Pass `all` to listen on all interfaces.
+ '';
+ };
+
+ rootDir = mkOption {
+ type = path;
+ description = ''
+ Path from which to serve files.
+ '';
+ };
+
+ hideServerId = mkOption {
+ type = bool;
+ default = true;
+ description = ''
+ Don't identify the server type in headers or directory listings.
+ '';
+ };
+
+ extraArgs = mkOption {
+ type = listOf str;
+ default = [];
+ description = ''
+ Additional configuration passed to the executable.
+ '';
+ };
+ };
+
+ config = mkIf cfg.enable {
+ systemd.services.darkhttpd = {
+ description = "Dark HTTPd";
+ wants = [ "network.target" ];
+ after = [ "network.target" ];
+ wantedBy = [ "multi-user.target" ];
+ serviceConfig = {
+ DynamicUser = true;
+ ExecStart = "${cfg.package}/bin/darkhttpd ${args}";
+ AmbientCapabilities = lib.mkIf (cfg.port < 1024) [ "CAP_NET_BIND_SERVICE" ];
+ Restart = "on-failure";
+ RestartSec = "2s";
+ };
+ };
+ };
+}
diff --git a/nixos/modules/services/x11/desktop-managers/gnome3.nix b/nixos/modules/services/x11/desktop-managers/gnome3.nix
index b18d06a095d1..0caa93ad217f 100644
--- a/nixos/modules/services/x11/desktop-managers/gnome3.nix
+++ b/nixos/modules/services/x11/desktop-managers/gnome3.nix
@@ -3,7 +3,9 @@
with lib;
let
+
cfg = config.services.xserver.desktopManager.gnome3;
+ serviceCfg = config.services.gnome3;
# Prioritize nautilus by default when opening directories
mimeAppsList = pkgs.writeTextFile {
@@ -45,10 +47,19 @@ let
flashbackEnabled = cfg.flashback.enableMetacity || length cfg.flashback.customSessions > 0;
-in {
+in
+
+{
options = {
+ services.gnome3 = {
+ core-os-services.enable = mkEnableOption "essential services for GNOME3";
+ core-shell.enable = mkEnableOption "GNOME Shell services";
+ core-utilities.enable = mkEnableOption "GNOME core utilities";
+ games.enable = mkEnableOption "GNOME games";
+ };
+
services.xserver.desktopManager.gnome3 = {
enable = mkOption {
default = false;
@@ -121,63 +132,40 @@ in {
};
- config = mkIf cfg.enable {
+ config = mkMerge [
+ (mkIf (cfg.enable || flashbackEnabled) {
+ services.gnome3.core-os-services.enable = true;
+ services.gnome3.core-shell.enable = true;
+ services.gnome3.core-utilities.enable = mkDefault true;
- # Enable helpful DBus services.
- security.polkit.enable = true;
- services.udisks2.enable = true;
- services.accounts-daemon.enable = true;
- services.dleyna-renderer.enable = mkDefault true;
- services.dleyna-server.enable = mkDefault true;
- services.gnome3.at-spi2-core.enable = true;
- services.gnome3.evolution-data-server.enable = true;
- services.gnome3.glib-networking.enable = true;
- services.gnome3.gnome-keyring.enable = true;
- services.gnome3.gnome-online-accounts.enable = mkDefault true;
- services.gnome3.gnome-remote-desktop.enable = mkDefault true;
- services.gnome3.gnome-settings-daemon.enable = true;
- services.gnome3.gnome-user-share.enable = mkDefault true;
- services.gvfs.enable = true;
- services.gnome3.rygel.enable = mkDefault true;
- services.gnome3.seahorse.enable = mkDefault true;
- services.gnome3.sushi.enable = mkDefault true;
- services.gnome3.tracker.enable = mkDefault true;
- services.gnome3.tracker-miners.enable = mkDefault true;
- hardware.pulseaudio.enable = mkDefault true;
- services.telepathy.enable = mkDefault true;
- networking.networkmanager.enable = mkDefault true;
- services.upower.enable = config.powerManagement.enable;
- services.dbus.packages =
- optional config.services.printing.enable pkgs.system-config-printer ++
- optional flashbackEnabled pkgs.gnome3.gnome-screensaver;
- services.colord.enable = mkDefault true;
- services.packagekit.enable = mkDefault true;
- hardware.bluetooth.enable = mkDefault true;
- services.hardware.bolt.enable = mkDefault true;
- services.xserver.libinput.enable = mkDefault true; # for controlling touchpad settings via gnome control center
- systemd.packages = [ pkgs.gnome3.vino ];
- xdg.portal.enable = true;
- xdg.portal.extraPortals = [ pkgs.xdg-desktop-portal-gtk ];
+ services.xserver.displayManager.extraSessionFilePackages = [ pkgs.gnome3.gnome-session ];
- # Enable default programs
- programs.dconf.enable = true;
- programs.evince.enable = mkDefault true;
- programs.file-roller.enable = mkDefault true;
- programs.gnome-disks.enable = mkDefault true;
- programs.gnome-documents.enable = mkDefault true;
- programs.gnome-terminal.enable = mkDefault true;
+ environment.extraInit = ''
+ ${concatMapStrings (p: ''
+ if [ -d "${p}/share/gsettings-schemas/${p.name}" ]; then
+ export XDG_DATA_DIRS=$XDG_DATA_DIRS''${XDG_DATA_DIRS:+:}${p}/share/gsettings-schemas/${p.name}
+ fi
- # If gnome3 is installed, build vim for gtk3 too.
- nixpkgs.config.vim.gui = "gtk3";
+ if [ -d "${p}/lib/girepository-1.0" ]; then
+ export GI_TYPELIB_PATH=$GI_TYPELIB_PATH''${GI_TYPELIB_PATH:+:}${p}/lib/girepository-1.0
+ export LD_LIBRARY_PATH=$LD_LIBRARY_PATH''${LD_LIBRARY_PATH:+:}${p}/lib
+ fi
+ '') cfg.sessionPath}
+ '';
- fonts.fonts = [
- pkgs.dejavu_fonts pkgs.cantarell-fonts
- pkgs.source-sans-pro
- pkgs.source-code-pro # Default monospace font in 3.32
- ];
+ environment.systemPackages = cfg.sessionPath;
- services.xserver.displayManager.extraSessionFilePackages = [ pkgs.gnome3.gnome-session ]
- ++ map
+ environment.variables.GNOME_SESSION_DEBUG = mkIf cfg.debug "1";
+
+ # Override GSettings schemas
+ environment.variables.NIX_GSETTINGS_OVERRIDES_DIR = "${nixos-gsettings-desktop-schemas}/share/gsettings-schemas/nixos-gsettings-overrides/glib-2.0/schemas";
+
+ # If gnome3 is installed, build vim for gtk3 too.
+ nixpkgs.config.vim.gui = "gtk3";
+ })
+
+ (mkIf flashbackEnabled {
+ services.xserver.displayManager.extraSessionFilePackages = map
(wm: pkgs.gnome3.gnome-flashback.mkSessionForWm {
inherit (wm) wmName wmLabel wmCommand;
}) (optional cfg.flashback.enableMetacity {
@@ -186,73 +174,152 @@ in {
wmCommand = "${pkgs.gnome3.metacity}/bin/metacity";
} ++ cfg.flashback.customSessions);
- environment.extraInit = ''
- ${concatMapStrings (p: ''
- if [ -d "${p}/share/gsettings-schemas/${p.name}" ]; then
- export XDG_DATA_DIRS=$XDG_DATA_DIRS''${XDG_DATA_DIRS:+:}${p}/share/gsettings-schemas/${p.name}
- fi
+ security.pam.services.gnome-screensaver = {
+ enableGnomeKeyring = true;
+ };
- if [ -d "${p}/lib/girepository-1.0" ]; then
- export GI_TYPELIB_PATH=$GI_TYPELIB_PATH''${GI_TYPELIB_PATH:+:}${p}/lib/girepository-1.0
- export LD_LIBRARY_PATH=$LD_LIBRARY_PATH''${LD_LIBRARY_PATH:+:}${p}/lib
- fi
- '') cfg.sessionPath}
- '';
+ services.dbus.packages = [
+ pkgs.gnome3.gnome-screensaver
+ ];
+ })
+ (mkIf serviceCfg.core-os-services.enable {
+ hardware.bluetooth.enable = mkDefault true;
+ hardware.pulseaudio.enable = mkDefault true;
+ programs.dconf.enable = true;
+ security.polkit.enable = true;
+ services.accounts-daemon.enable = true;
+ services.dleyna-renderer.enable = mkDefault true;
+ services.dleyna-server.enable = mkDefault true;
+ services.gnome3.at-spi2-core.enable = true;
+ services.gnome3.evolution-data-server.enable = true;
+ services.gnome3.gnome-keyring.enable = true;
+ services.gnome3.gnome-online-accounts.enable = mkDefault true;
+ services.gnome3.gnome-online-miners.enable = true;
+ services.gnome3.tracker-miners.enable = mkDefault true;
+ services.gnome3.tracker.enable = mkDefault true;
+ services.hardware.bolt.enable = mkDefault true;
+ services.packagekit.enable = mkDefault true;
+ services.udisks2.enable = true;
+ services.upower.enable = config.powerManagement.enable;
+ services.xserver.libinput.enable = mkDefault true; # for controlling touchpad settings via gnome control center
- services.geoclue2.enable = mkDefault true;
- # GNOME should have its own geoclue agent
- services.geoclue2.enableDemoAgent = false;
+ xdg.portal.enable = true;
+ xdg.portal.extraPortals = [ pkgs.xdg-desktop-portal-gtk ];
- services.geoclue2.appConfig."gnome-datetime-panel" = {
- isAllowed = true;
- isSystem = true;
- };
- services.geoclue2.appConfig."gnome-color-panel" = {
- isAllowed = true;
- isSystem = true;
- };
- services.geoclue2.appConfig."org.gnome.Shell" = {
- isAllowed = true;
- isSystem = true;
- };
+ networking.networkmanager.enable = mkDefault true;
- environment.variables.GNOME_SESSION_DEBUG = optionalString cfg.debug "1";
-
- # Override default mimeapps
- environment.variables.XDG_DATA_DIRS = [ "${mimeAppsList}/share" ];
-
- # Override GSettings schemas
- environment.variables.NIX_GSETTINGS_OVERRIDES_DIR = "${nixos-gsettings-desktop-schemas}/share/gsettings-schemas/nixos-gsettings-overrides/glib-2.0/schemas";
-
- # Let nautilus find extensions
- # TODO: Create nautilus-with-extensions package
- environment.variables.NAUTILUS_EXTENSION_DIR = "${config.system.path}/lib/nautilus/extensions-3.0";
-
- services.xserver.updateDbusEnvironment = true;
-
- environment.systemPackages = pkgs.gnome3.corePackages ++ cfg.sessionPath
- ++ (pkgs.gnome3.removePackagesByName pkgs.gnome3.optionalPackages config.environment.gnome3.excludePackages) ++ [
- pkgs.xdg-user-dirs # Update user dirs as described in http://freedesktop.org/wiki/Software/xdg-user-dirs/
- ];
-
- # Use the correct gnome3 packageSet
- networking.networkmanager.basePackages =
- { inherit (pkgs) networkmanager modemmanager wpa_supplicant crda;
+ # Use the correct gnome3 packageSet
+ networking.networkmanager.basePackages = {
+ inherit (pkgs) networkmanager modemmanager wpa_supplicant crda;
inherit (pkgs.gnome3) networkmanager-openvpn networkmanager-vpnc
- networkmanager-openconnect networkmanager-fortisslvpn
- networkmanager-iodine networkmanager-l2tp; };
+ networkmanager-openconnect networkmanager-fortisslvpn
+ networkmanager-iodine networkmanager-l2tp;
+ };
- # Needed for themes and backgrounds
- environment.pathsToLink = [
- "/share"
- "/share/nautilus-python/extensions"
- ];
+ services.xserver.updateDbusEnvironment = true;
- security.pam.services.gnome-screensaver = mkIf flashbackEnabled {
- enableGnomeKeyring = true;
- };
- };
+ # Needed for themes and backgrounds
+ environment.pathsToLink = [
+ "/share" # TODO: https://github.com/NixOS/nixpkgs/issues/47173
+ ];
+ })
+ (mkIf serviceCfg.core-shell.enable {
+ services.colord.enable = mkDefault true;
+ services.gnome3.glib-networking.enable = true;
+ services.gnome3.gnome-remote-desktop.enable = mkDefault true;
+ services.gnome3.gnome-settings-daemon.enable = true;
+ services.gnome3.gnome-user-share.enable = mkDefault true;
+ services.gnome3.rygel.enable = mkDefault true;
+ services.gvfs.enable = true;
+ services.telepathy.enable = mkDefault true;
+ systemd.packages = [ pkgs.gnome3.vino ];
+ services.dbus.packages =
+ optional config.services.printing.enable pkgs.system-config-printer;
+
+ services.geoclue2.enable = mkDefault true;
+ services.geoclue2.enableDemoAgent = false; # GNOME has its own geoclue agent
+
+ services.geoclue2.appConfig."gnome-datetime-panel" = {
+ isAllowed = true;
+ isSystem = true;
+ };
+ services.geoclue2.appConfig."gnome-color-panel" = {
+ isAllowed = true;
+ isSystem = true;
+ };
+ services.geoclue2.appConfig."org.gnome.Shell" = {
+ isAllowed = true;
+ isSystem = true;
+ };
+
+ fonts.fonts = with pkgs; [
+ cantarell-fonts
+ dejavu_fonts
+ source-code-pro # Default monospace font in 3.32
+ source-sans-pro
+ ];
+
+ environment.systemPackages = with pkgs.gnome3; [
+ adwaita-icon-theme
+ gnome-backgrounds
+ gnome-bluetooth
+ gnome-control-center
+ gnome-getting-started-docs
+ gnome-shell
+ gnome-shell-extensions
+ gnome-themes-extra
+ gnome-user-docs
+ pkgs.glib # for gsettings
+ pkgs.gnome-menus
+ pkgs.gtk3.out # for gtk-launch
+ pkgs.hicolor-icon-theme
+ pkgs.shared-mime-info # for update-mime-database
+ pkgs.xdg-user-dirs # Update user dirs as described in http://freedesktop.org/wiki/Software/xdg-user-dirs/
+ vino
+ ];
+ })
+
+ (mkIf serviceCfg.core-utilities.enable {
+ environment.systemPackages = (with pkgs.gnome3; removePackagesByName [
+ baobab eog epiphany evince gucharmap nautilus totem yelp gnome-calculator
+ gnome-contacts gnome-font-viewer gnome-screenshot gnome-system-monitor simple-scan
+ gnome-terminal evolution file-roller gedit gnome-clocks gnome-music gnome-tweaks
+ pkgs.gnome-photos nautilus-sendto dconf-editor vinagre gnome-weather gnome-logs
+ gnome-maps gnome-characters gnome-calendar accerciser gnome-nettool gnome-packagekit
+ gnome-software gnome-power-manager gnome-todo pkgs.gnome-usage
+ ] config.environment.gnome3.excludePackages);
+
+ # Enable default programs
+ programs.evince.enable = mkDefault true;
+ programs.file-roller.enable = mkDefault true;
+ programs.gnome-disks.enable = mkDefault true;
+ programs.gnome-documents.enable = mkDefault true;
+ programs.gnome-terminal.enable = mkDefault true;
+ services.gnome3.seahorse.enable = mkDefault true;
+ services.gnome3.sushi.enable = mkDefault true;
+
+ # Let nautilus find extensions
+ # TODO: Create nautilus-with-extensions package
+ environment.variables.NAUTILUS_EXTENSION_DIR = "${config.system.path}/lib/nautilus/extensions-3.0";
+
+ # Override default mimeapps for nautilus
+ environment.variables.XDG_DATA_DIRS = [ "${mimeAppsList}/share" ];
+
+ environment.pathsToLink = [
+ "/share/nautilus-python/extensions"
+ ];
+ })
+
+ (mkIf serviceCfg.games.enable {
+ environment.systemPackages = (with pkgs.gnome3; removePackagesByName [
+ aisleriot atomix five-or-more four-in-a-row gnome-chess gnome-klotski
+ gnome-mahjongg gnome-mines gnome-nibbles gnome-robots gnome-sudoku
+ gnome-taquin gnome-tetravex hitori iagno lightsoff quadrapassel
+ swell-foop tali
+ ] config.environment.gnome3.excludePackages);
+ })
+ ];
}
diff --git a/nixos/modules/system/boot/systemd.nix b/nixos/modules/system/boot/systemd.nix
index 23a2dd45d492..2a0360b12cbc 100644
--- a/nixos/modules/system/boot/systemd.nix
+++ b/nixos/modules/system/boot/systemd.nix
@@ -537,7 +537,7 @@ in
};
systemd.enableCgroupAccounting = mkOption {
- default = false;
+ default = true;
type = types.bool;
description = ''
Whether to enable cgroup accounting.
@@ -804,10 +804,10 @@ in
[Manager]
${optionalString config.systemd.enableCgroupAccounting ''
DefaultCPUAccounting=yes
+ DefaultBlockIOAccounting=yes
DefaultIOAccounting=yes
DefaultBlockIOAccounting=yes
- DefaultMemoryAccounting=yes
- DefaultTasksAccounting=yes
+ DefaultIPAccounting=yes
''}
DefaultLimitCORE=infinity
${config.systemd.extraConfig}
diff --git a/nixos/tests/all-tests.nix b/nixos/tests/all-tests.nix
index 36a053e8e6bd..e3e4ddab72c6 100644
--- a/nixos/tests/all-tests.nix
+++ b/nixos/tests/all-tests.nix
@@ -161,6 +161,7 @@ in
minio = handleTest ./minio.nix {};
misc = handleTest ./misc.nix {};
mongodb = handleTest ./mongodb.nix {};
+ moodle = handleTest ./moodle.nix {};
morty = handleTest ./morty.nix {};
mosquitto = handleTest ./mosquitto.nix {};
mpd = handleTest ./mpd.nix {};
diff --git a/nixos/tests/jormungandr.nix b/nixos/tests/jormungandr.nix
index ab4edf0506aa..2abafc53ce51 100644
--- a/nixos/tests/jormungandr.nix
+++ b/nixos/tests/jormungandr.nix
@@ -5,9 +5,17 @@ import ./make-test.nix ({ pkgs, ... }: {
};
nodes = {
+ # Testing the Byzantine Fault Tolerant protocol
bft = { ... }: {
environment.systemPackages = [ pkgs.jormungandr ];
+ services.jormungandr.enable = true;
+ services.jormungandr.genesisBlockFile = "/var/lib/jormungandr/block-0.bin";
+ services.jormungandr.secretFile = "/etc/secrets/jormungandr.yaml";
+ };
+ # Testing the Ouroboros Genesis Praos protocol
+ genesis = { ... }: {
+ environment.systemPackages = [ pkgs.jormungandr ];
services.jormungandr.enable = true;
services.jormungandr.genesisBlockFile = "/var/lib/jormungandr/block-0.bin";
services.jormungandr.secretFile = "/etc/secrets/jormungandr.yaml";
@@ -17,6 +25,7 @@ import ./make-test.nix ({ pkgs, ... }: {
testScript = ''
startAll;
+ ## Testing BFT
# Let's wait for the StateDirectory
$bft->waitForFile("/var/lib/jormungandr/");
@@ -45,5 +54,24 @@ import ./make-test.nix ({ pkgs, ... }: {
# Now we can test if we are able to reach the REST API
$bft->waitUntilSucceeds("curl -L http://localhost:8607/api/v0/node/stats | grep uptime");
+
+ ## Testing Genesis
+ # Let's wait for the StateDirectory
+ $genesis->waitForFile("/var/lib/jormungandr/");
+
+ # Bootstraping the configuration
+ $genesis->succeed("jormungandr-bootstrap -g -p 8607 -s 1");
+
+ # Moving generated files in place
+ $genesis->succeed("mkdir -p /etc/secrets");
+ $genesis->succeed("mv pool-secret1.yaml /etc/secrets/jormungandr.yaml");
+ $genesis->succeed("mv block-0.bin /var/lib/jormungandr/");
+
+ # We should have everything to start the service now
+ $genesis->succeed("systemctl restart jormungandr");
+ $genesis->waitForUnit("jormungandr.service");
+
+ # Now we can create and delegate an account
+ $genesis->succeed("./create-account-and-delegate.sh | tee -a /tmp/delegate.log");
'';
})
diff --git a/nixos/tests/moodle.nix b/nixos/tests/moodle.nix
new file mode 100644
index 000000000000..565a6b636949
--- /dev/null
+++ b/nixos/tests/moodle.nix
@@ -0,0 +1,22 @@
+import ./make-test.nix ({ pkgs, lib, ... }: {
+ name = "moodle";
+ meta.maintainers = [ lib.maintainers.aanderse ];
+
+ machine =
+ { ... }:
+ { services.moodle.enable = true;
+ services.moodle.virtualHost.hostName = "localhost";
+ services.moodle.virtualHost.adminAddr = "root@example.com";
+ services.moodle.initialPassword = "correcthorsebatterystaple";
+
+ # Ensure the virtual machine has enough memory to avoid errors like:
+ # Fatal error: Out of memory (allocated 152047616) (tried to allocate 33554440 bytes)
+ virtualisation.memorySize = 2000;
+ };
+
+ testScript = ''
+ startAll;
+ $machine->waitForUnit('phpfpm-moodle.service');
+ $machine->succeed('curl http://localhost/') =~ /You are not logged in/ or die;
+ '';
+})
diff --git a/nixos/tests/systemd.nix b/nixos/tests/systemd.nix
index 3168c026d514..1c201e3b5dcc 100644
--- a/nixos/tests/systemd.nix
+++ b/nixos/tests/systemd.nix
@@ -89,5 +89,12 @@ import ./make-test.nix ({ pkgs, ... }: {
$machine->waitForUnit('multi-user.target');
$machine->succeed('sysctl net.core.default_qdisc | grep -q "fq_codel"');
};
+
+ # Test cgroup accounting is enabled
+ subtest "systemd cgroup accounting is enabled", sub {
+ $machine->waitForUnit('multi-user.target');
+ $machine->succeed('systemctl show testservice1.service -p IOAccounting | grep -q "yes"');
+ $machine->succeed('systemctl status testservice1.service | grep -q "CPU:"');
+ };
'';
})
diff --git a/pkgs/applications/altcoins/bitcoin-classic.nix b/pkgs/applications/altcoins/bitcoin-classic.nix
index ad48ea2a6257..ddce5c3f7150 100644
--- a/pkgs/applications/altcoins/bitcoin-classic.nix
+++ b/pkgs/applications/altcoins/bitcoin-classic.nix
@@ -16,15 +16,15 @@ stdenv.mkDerivation rec {
sha256 = "06ij9v7zbdnhxq9429nnxiw655cp8idldj18l7fmj94gqx07n5vh";
};
- patches = [ ./fix-bitcoin-qt-build.patch ];
-
nativeBuildInputs = [ pkgconfig autoreconfHook ];
buildInputs = [ openssl db48 boost zlib
miniupnpc utillinux protobuf libevent ]
++ optionals withGui [ qtbase qttools qrencode ];
configureFlags = [ "--with-boost-libdir=${boost.out}/lib" ]
- ++ optionals withGui [ "--with-gui=qt5" ];
+ ++ optionals withGui [ "--with-gui=qt5"
+ "--with-qt-bindir=${qtbase.dev}/bin:${qttools.dev}/bin"
+ ];
enableParallelBuilding = true;
diff --git a/pkgs/applications/altcoins/jormungandr/default.nix b/pkgs/applications/altcoins/jormungandr/default.nix
index abfd3fa51718..8c276d6bb805 100644
--- a/pkgs/applications/altcoins/jormungandr/default.nix
+++ b/pkgs/applications/altcoins/jormungandr/default.nix
@@ -24,6 +24,22 @@ rustPlatform.buildRustPackage rec {
nativeBuildInputs = [ pkgconfig protobuf ];
buildInputs = [ openssl ] ++ lib.optionals stdenv.isDarwin [ darwin.apple_sdk.frameworks.Security ];
+ patchPhase = ''
+ sed -i "s~SCRIPTPATH=.*~SCRIPTPATH=$out/templates/~g" scripts/bootstrap
+ '';
+
+ installPhase = ''
+ install -d $out/bin $out/templates
+ install -m755 target/*/release/jormungandr $out/bin/
+ install -m755 target/*/release/jcli $out/bin/
+ install -m755 scripts/send-transaction $out/templates
+ install -m755 scripts/jcli-helpers $out/bin/
+ install -m755 scripts/bootstrap $out/bin/jormungandr-bootstrap
+ install -m644 scripts/faucet-send-money.shtempl $out/templates/
+ install -m644 scripts/create-account-and-delegate.shtempl $out/templates/
+ install -m644 scripts/faucet-send-certificate.shtempl $out/templates/
+ '';
+
PROTOC = "${protobuf}/bin/protoc";
# Disabling integration tests
diff --git a/pkgs/applications/audio/vcv-rack/default.nix b/pkgs/applications/audio/vcv-rack/default.nix
index 066767c293c1..234b98a893c8 100644
--- a/pkgs/applications/audio/vcv-rack/default.nix
+++ b/pkgs/applications/audio/vcv-rack/default.nix
@@ -28,13 +28,13 @@ let
in
with stdenv.lib; stdenv.mkDerivation rec {
pname = "VCV-Rack";
- version = "1.1.3";
+ version = "1.1.4";
src = fetchFromGitHub {
owner = "VCVRack";
repo = "Rack";
rev = "v${version}";
- sha256 = "16q3x0jpwkdwwvh7rn472w7nfjf81s10z9c7bx011kk7rgk88hh2";
+ sha256 = "04kg0nm7w19s2zfrsxjfl3bs4sy3bzf28kzl4hayzwv480667ybx";
fetchSubmodules = true;
};
@@ -78,7 +78,7 @@ with stdenv.lib; stdenv.mkDerivation rec {
# The source is BSD-3 licensed, some of the art is CC-BY-NC 4.0 or under a
# no-derivatives clause
license = with licenses; [ bsd3 cc-by-nc-40 unfreeRedistributable ];
- maintainers = with maintainers; [ moredread ];
+ maintainers = with maintainers; [ moredread nathyong ];
platforms = platforms.linux;
};
}
diff --git a/pkgs/applications/editors/emacs-modes/melpa-packages.nix b/pkgs/applications/editors/emacs-modes/melpa-packages.nix
index f57c1b71b13d..9574ec43a612 100644
--- a/pkgs/applications/editors/emacs-modes/melpa-packages.nix
+++ b/pkgs/applications/editors/emacs-modes/melpa-packages.nix
@@ -33,8 +33,6 @@ env NIXPKGS_ALLOW_BROKEN=1 nix-instantiate --show-trace ../../../../ -A emacsPac
inherit (import ./libgenerated.nix lib self) melpaDerivation;
super = lib.listToAttrs (map (melpaDerivation variant) (lib.importJSON archiveJson));
- generic = import ./melpa-generic.nix;
-
overrides = rec {
shared = {
# Expects bash to be at /bin/bash
@@ -131,20 +129,20 @@ env NIXPKGS_ALLOW_BROKEN=1 nix-instantiate --show-trace ../../../../ -A emacsPac
# upstream issue: missing file header
initsplit = markBroken super.initsplit;
- irony = super.irony.overrideAttrs(old: {
+ irony = super.irony.overrideAttrs (old: {
+ cmakeFlags = old.cmakeFlags or [] ++ [ "-DCMAKE_INSTALL_BINDIR=bin" ];
preConfigure = ''
cd server
'';
preBuild = ''
make
+ install -D bin/irony-server $out/bin/irony-server
+ cd ..
'';
- postInstall = ''
- mkdir -p $out
- mv $out/share/emacs/site-lisp/elpa/*/server/bin $out
- rm -rf $out/share/emacs/site-lisp/elpa/*/server
- '';
- preCheck = ''
+ checkPhase = ''
cd source/server
+ make check
+ cd ../..
'';
dontUseCmakeBuildDir = true;
doCheck = true;
@@ -396,13 +394,6 @@ env NIXPKGS_ALLOW_BROKEN=1 nix-instantiate --show-trace ../../../../ -A emacsPac
# Expects bash to be at /bin/bash
helm-rtags = markBroken super.helm-rtags;
- # Fails with "package does not untar cleanly into ..."
- irony = shared.irony.overrideAttrs(old: {
- meta = old.meta // {
- broken = true;
- };
- });
-
orgit =
(super.orgit.overrideAttrs (attrs: {
# searches for Git at build time
diff --git a/pkgs/applications/editors/nano/default.nix b/pkgs/applications/editors/nano/default.nix
index 0ce0e011ae6f..aea585ce8d66 100644
--- a/pkgs/applications/editors/nano/default.nix
+++ b/pkgs/applications/editors/nano/default.nix
@@ -20,11 +20,11 @@ let
in stdenv.mkDerivation rec {
pname = "nano";
- version = "4.3";
+ version = "4.4";
src = fetchurl {
url = "mirror://gnu/nano/${pname}-${version}.tar.xz";
- sha256 = "108dzj6azqmini9bvgl26r0q1y59s3nnrw75hfzv91bs50davlq0";
+ sha256 = "1iw2ypq34g1gfqyhgka2fz5yj5vrlz85q6zk7amgyj286ph25wia";
};
nativeBuildInputs = [ texinfo ] ++ optional enableNls gettext;
diff --git a/pkgs/applications/editors/tiled/default.nix b/pkgs/applications/editors/tiled/default.nix
index 4fa93d78235e..b0b80a4ec001 100644
--- a/pkgs/applications/editors/tiled/default.nix
+++ b/pkgs/applications/editors/tiled/default.nix
@@ -1,7 +1,7 @@
-{ stdenv, fetchFromGitHub, pkgconfig, qmake
+{ stdenv, mkDerivation, fetchFromGitHub, pkgconfig, qmake
, python, qtbase, qttools }:
-stdenv.mkDerivation rec {
+mkDerivation rec {
pname = "tiled";
version = "1.2.4";
diff --git a/pkgs/applications/misc/hugo/default.nix b/pkgs/applications/misc/hugo/default.nix
index 9e26e44a4f7e..034b9c79201a 100644
--- a/pkgs/applications/misc/hugo/default.nix
+++ b/pkgs/applications/misc/hugo/default.nix
@@ -2,7 +2,7 @@
buildGoModule rec {
pname = "hugo";
- version = "0.55.4";
+ version = "0.57.2";
goPackagePath = "github.com/gohugoio/hugo";
@@ -10,10 +10,10 @@ buildGoModule rec {
owner = "gohugoio";
repo = "hugo";
rev = "v${version}";
- sha256 = "0hbkl8dhhdic0admrkvlp1h1bmfrrwfnvipx27clyk0f88jcvb7y";
+ sha256 = "1cqvm2fj6hh2n9iv67vamhn23fbxmmwciks0r4h4y0hapzlzpyd8";
};
- modSha256 = "0yrwkaaasj9ihjjfbywnzkppix1y2znagg3dkyikk21sl5n0nz23";
+ modSha256 = "09r7r1s5b2fvnzpzjarpv2lnvp6bxdfschiq6352hw631n7kkyz1";
buildFlags = "-tags extended";
diff --git a/pkgs/applications/misc/megasync/default.nix b/pkgs/applications/misc/megasync/default.nix
index 8fcaf91ac98c..bc753c5a7a9a 100644
--- a/pkgs/applications/misc/megasync/default.nix
+++ b/pkgs/applications/misc/megasync/default.nix
@@ -17,9 +17,7 @@
, lsb-release
, mkDerivation
, pkgconfig
-, qmake
, qtbase
-, qtsvg
, qttools
, sqlite
, swig
@@ -29,13 +27,13 @@
mkDerivation rec {
pname = "megasync";
- version = "4.1.1.0";
+ version = "4.2.3.0";
src = fetchFromGitHub {
owner = "meganz";
repo = "MEGAsync";
rev = "v${version}_Linux";
- sha256 = "0lc228q3s9xp78dxjn22g6anqlsy1hi7a6yfs4q3l6gyfc3qcxl2";
+ sha256 = "0l4yfrxjb62vc9dnlzy8rjqi68ga1bys5x5rfzs40daw13yf1adv";
fetchSubmodules = true;
};
@@ -45,7 +43,6 @@ mkDerivation rec {
doxygen
lsb-release
pkgconfig
- qmake
qttools
swig
];
@@ -62,7 +59,6 @@ mkDerivation rec {
libuv
libzen
qtbase
- qtsvg
sqlite
unzip
wget
diff --git a/pkgs/applications/misc/orca/default.nix b/pkgs/applications/misc/orca/default.nix
index 98ebde981c0a..332c696d8da2 100644
--- a/pkgs/applications/misc/orca/default.nix
+++ b/pkgs/applications/misc/orca/default.nix
@@ -1,7 +1,7 @@
{ stdenv, pkgconfig, fetchurl, buildPythonApplication
, autoreconfHook, wrapGAppsHook, gobject-introspection
, intltool, yelp-tools, itstool, libxmlxx3
-, python, pygobject3, gtk3, gnome3, substituteAll
+, python, pygobject3, gtk3, gnome3, substituteAll, hicolor-icon-theme
, at-spi2-atk, at-spi2-core, pyatspi, dbus, dbus-python, pyxdg
, xkbcomp, procps, lsof, coreutils, gsettings-desktop-schemas
, speechd, brltty, liblouis, setproctitle, gst_all_1, gst-python
@@ -31,6 +31,7 @@ buildPythonApplication rec {
nativeBuildInputs = [
autoreconfHook wrapGAppsHook pkgconfig libxmlxx3
intltool yelp-tools itstool gobject-introspection
+ hicolor-icon-theme # setup-hook
];
propagatedBuildInputs = [
diff --git a/pkgs/applications/misc/rsclock/default.nix b/pkgs/applications/misc/rsclock/default.nix
new file mode 100644
index 000000000000..81c001509f34
--- /dev/null
+++ b/pkgs/applications/misc/rsclock/default.nix
@@ -0,0 +1,24 @@
+{ stdenv, rustPlatform, fetchFromGitHub }:
+
+rustPlatform.buildRustPackage rec {
+ pname = "rsClock";
+ version = "0.1.0";
+
+ src = fetchFromGitHub {
+ owner = "valebes";
+ repo = pname;
+ rev = "v${version}";
+ sha256 = "1fpidswkgpf9yr4vxqn38livz6r3z5i0lhg7ngj9f1ki4yqxn9zh";
+ };
+
+ cargoSha256 = "1m0lm8xh1qp0cbx870xy2m0bv047mb00vcwzq7r5gxqx8n61qm4n";
+
+ meta = with stdenv.lib; {
+ description = "A simple terminal clock written in Rust";
+ homepage = "https://github.com/valebes/rsClock";
+ license = licenses.mit;
+ maintainers = with maintainers; [valebes];
+ platforms = platforms.all;
+ };
+}
+
diff --git a/pkgs/applications/misc/yate/default.nix b/pkgs/applications/misc/yate/default.nix
index dc4f9429eea7..09a6cc4a3c0a 100644
--- a/pkgs/applications/misc/yate/default.nix
+++ b/pkgs/applications/misc/yate/default.nix
@@ -1,17 +1,17 @@
-{ stdenv, fetchurl, lib, qt4, openssl, autoconf, automake, pkgconfig }:
+{ stdenv, fetchurl, lib, qt4, openssl, pkgconfig }:
stdenv.mkDerivation rec {
pname = "yate";
- version = "6.0.0-1";
+ version = "6.1.0-1";
src = fetchurl {
url = "http://voip.null.ro/tarballs/yate${lib.versions.major version}/${pname}-${version}.tar.gz";
- sha256 = "05qqdhi3rp5660gq1484jkmxkm9vq81j0yr765h0gf0xclan1dqa";
+ sha256 = "0xx3i997nsf2wzbv6m5n6adsym0qhgc6xg4rsv0fwqrgisf5327d";
};
# TODO zaptel ? postgres ?
nativeBuildInputs = [ pkgconfig ];
- buildInputs = [ qt4 openssl autoconf automake ];
+ buildInputs = [ qt4 openssl ];
# /dev/null is used when linking which is a impure path for the wrapper
preConfigure =
diff --git a/pkgs/applications/networking/browsers/chromium/plugins.nix b/pkgs/applications/networking/browsers/chromium/plugins.nix
index aecebb08e0da..a0ea67133c6f 100644
--- a/pkgs/applications/networking/browsers/chromium/plugins.nix
+++ b/pkgs/applications/networking/browsers/chromium/plugins.nix
@@ -94,17 +94,17 @@ let
envVars.NIX_CHROMIUM_PLUGIN_PATH_WIDEVINE = "@out@/lib";
}}
'';
-
+
meta.platforms = platforms.x86_64;
};
flash = stdenv.mkDerivation rec {
pname = "flashplayer-ppapi";
- version = "32.0.0.223";
+ version = "32.0.0.238";
src = fetchzip {
url = "https://fpdownload.adobe.com/pub/flashplayer/pdc/${version}/flash_player_ppapi_linux.x86_64.tar.gz";
- sha256 = "0xm6jcdip4gki267ldw106l5j43im0ji2zjsarvi7n2nvvnwwgnl";
+ sha256 = "0jqx68lfqjpy6wbxdi0giclvh9mc9rha92hqdj1nx42v95k3gc65";
stripRoot = false;
};
@@ -135,7 +135,7 @@ let
'';
dontStrip = true;
-
+
meta.platforms = platforms.x86_64;
};
diff --git a/pkgs/applications/networking/browsers/vivaldi/default.nix b/pkgs/applications/networking/browsers/vivaldi/default.nix
index b06edaf9dcbe..246c5e7e60dc 100644
--- a/pkgs/applications/networking/browsers/vivaldi/default.nix
+++ b/pkgs/applications/networking/browsers/vivaldi/default.nix
@@ -17,11 +17,11 @@ let
vivaldiName = if isSnapshot then "vivaldi-snapshot" else "vivaldi";
in stdenv.mkDerivation rec {
pname = "vivaldi";
- version = "2.6.1566.51-1";
+ version = "2.7.1628.30-1";
src = fetchurl {
url = "https://downloads.vivaldi.com/${branch}/vivaldi-${branch}_${version}_amd64.deb";
- sha256 = "0582f16saldgn482806f9igb97is4p3ayvh99j0wx9plxnyq5xmm";
+ sha256 = "1lz8adwiwll8g246s5pa0ipfraph51s9f4lcfysdrp1s3s1qhw8x";
};
unpackPhase = ''
diff --git a/pkgs/applications/networking/cluster/tilt/default.nix b/pkgs/applications/networking/cluster/tilt/default.nix
index c40750752996..b4707327bc72 100644
--- a/pkgs/applications/networking/cluster/tilt/default.nix
+++ b/pkgs/applications/networking/cluster/tilt/default.nix
@@ -5,20 +5,20 @@ buildGoPackage rec {
/* Do not use "dev" as a version. If you do, Tilt will consider itself
running in development environment and try to serve assets from the
source tree, which is not there once build completes. */
- version = "0.9.7";
+ version = "0.10.4";
src = fetchFromGitHub {
owner = "windmilleng";
repo = pname;
rev = "v${version}";
- sha256 = "0b7jk7iwjzdsb2wp9qx4gs9g3gi2vcqw5ilkax3gfz7wsplm0n65";
+ sha256 = "0nxgmldbcaj91jq47qxpf6jqwvi9bhg243qchdkiliphybvilcrg";
};
goPackagePath = "github.com/windmilleng/tilt";
subPackages = [ "cmd/tilt" ];
- buildFlagsArray = ("-ldflags=-X main.version=${version} -X main.date=2019-07-30");
+ buildFlagsArray = ("-ldflags=-X main.version=${version} -X main.date=2019-08-14");
meta = with stdenv.lib; {
description = "Local development tool to manage your developer instance when your team deploys to Kubernetes in production";
diff --git a/pkgs/applications/networking/instant-messengers/riot/riot-desktop-yarndeps.nix b/pkgs/applications/networking/instant-messengers/riot/riot-desktop-yarndeps.nix
index b84807c69a04..b76848c2b810 100644
--- a/pkgs/applications/networking/instant-messengers/riot/riot-desktop-yarndeps.nix
+++ b/pkgs/applications/networking/instant-messengers/riot/riot-desktop-yarndeps.nix
@@ -1,7 +1,6 @@
-{fetchurl, linkFarm}: rec {
+{ fetchurl, fetchgit, linkFarm, runCommandNoCC, gnutar }: rec {
offline_cache = linkFarm "offline" packages;
packages = [
-
{
name = "_types_node___node_9.6.45.tgz";
path = fetchurl {
@@ -10,7 +9,6 @@
sha1 = "a9e5cfd026a3abaaf17e3c0318a470da9f2f178e";
};
}
-
{
name = "ajv___ajv_6.10.0.tgz";
path = fetchurl {
@@ -19,7 +17,6 @@
sha1 = "90d0d54439da587cd7e843bfb7045f50bd22bdf1";
};
}
-
{
name = "applescript___applescript_1.0.0.tgz";
path = fetchurl {
@@ -28,7 +25,6 @@
sha1 = "bb87af568cad034a4e48c4bdaf6067a3a2701317";
};
}
-
{
name = "asn1___asn1_0.2.4.tgz";
path = fetchurl {
@@ -37,7 +33,6 @@
sha1 = "8d2475dfab553bb33e77b54e59e880bb8ce23136";
};
}
-
{
name = "assert_plus___assert_plus_1.0.0.tgz";
path = fetchurl {
@@ -46,7 +41,6 @@
sha1 = "f12e0f3c5d77b0b1cdd9146942e4e96c1e4dd525";
};
}
-
{
name = "asynckit___asynckit_0.4.0.tgz";
path = fetchurl {
@@ -55,7 +49,6 @@
sha1 = "c79ed97f7f34cb8f2ba1bc9790bcc366474b4b79";
};
}
-
{
name = "auto_launch___auto_launch_5.0.5.tgz";
path = fetchurl {
@@ -64,7 +57,6 @@
sha1 = "d14bd002b1ef642f85e991a6195ff5300c8ad3c0";
};
}
-
{
name = "aws_sign2___aws_sign2_0.7.0.tgz";
path = fetchurl {
@@ -73,7 +65,6 @@
sha1 = "b46e890934a9591f2d2f6f86d7e6a9f1b3fe76a8";
};
}
-
{
name = "aws4___aws4_1.8.0.tgz";
path = fetchurl {
@@ -82,7 +73,6 @@
sha1 = "f0e003d9ca9e7f59c7a508945d7b2ef9a04a542f";
};
}
-
{
name = "bcrypt_pbkdf___bcrypt_pbkdf_1.0.2.tgz";
path = fetchurl {
@@ -91,7 +81,6 @@
sha1 = "a4301d389b6a43f9b67ff3ca11a3f6637e360e9e";
};
}
-
{
name = "bignumber.js___bignumber.js_2.4.0.tgz";
path = fetchurl {
@@ -100,7 +89,6 @@
sha1 = "838a992da9f9d737e0f4b2db0be62bb09dd0c5e8";
};
}
-
{
name = "bmp_js___bmp_js_0.0.3.tgz";
path = fetchurl {
@@ -109,7 +97,6 @@
sha1 = "64113e9c7cf1202b376ed607bf30626ebe57b18a";
};
}
-
{
name = "buffer_equal___buffer_equal_0.0.1.tgz";
path = fetchurl {
@@ -118,7 +105,6 @@
sha1 = "91bc74b11ea405bc916bc6aa908faafa5b4aac4b";
};
}
-
{
name = "caseless___caseless_0.12.0.tgz";
path = fetchurl {
@@ -127,7 +113,6 @@
sha1 = "1b681c21ff84033c826543090689420d187151dc";
};
}
-
{
name = "combined_stream___combined_stream_1.0.7.tgz";
path = fetchurl {
@@ -136,7 +121,6 @@
sha1 = "2d1d24317afb8abe95d6d2c0b07b57813539d828";
};
}
-
{
name = "conf___conf_2.2.0.tgz";
path = fetchurl {
@@ -145,7 +129,6 @@
sha1 = "ee282efafc1450b61e205372041ad7d866802d9a";
};
}
-
{
name = "core_util_is___core_util_is_1.0.2.tgz";
path = fetchurl {
@@ -154,7 +137,6 @@
sha1 = "b5fd54220aa2bc5ab57aab7140c940754503c1a7";
};
}
-
{
name = "dashdash___dashdash_1.14.1.tgz";
path = fetchurl {
@@ -163,7 +145,6 @@
sha1 = "853cfa0f7cbe2fed5de20326b8dd581035f6e2f0";
};
}
-
{
name = "deep_equal___deep_equal_1.0.1.tgz";
path = fetchurl {
@@ -172,7 +153,6 @@
sha1 = "f5d260292b660e084eff4cdbc9f08ad3247448b5";
};
}
-
{
name = "define_properties___define_properties_1.1.3.tgz";
path = fetchurl {
@@ -181,7 +161,6 @@
sha1 = "cf88da6cbee26fe6db7094f61d870cbd84cee9f1";
};
}
-
{
name = "delayed_stream___delayed_stream_1.0.0.tgz";
path = fetchurl {
@@ -190,7 +169,6 @@
sha1 = "df3ae199acadfb7d440aaae0b29e2272b24ec619";
};
}
-
{
name = "dom_walk___dom_walk_0.1.1.tgz";
path = fetchurl {
@@ -199,7 +177,6 @@
sha1 = "672226dc74c8f799ad35307df936aba11acd6018";
};
}
-
{
name = "dot_prop___dot_prop_4.2.0.tgz";
path = fetchurl {
@@ -208,7 +185,6 @@
sha1 = "1f19e0c2e1aa0e32797c49799f2837ac6af69c57";
};
}
-
{
name = "ecc_jsbn___ecc_jsbn_0.1.2.tgz";
path = fetchurl {
@@ -217,7 +193,6 @@
sha1 = "3a83a904e54353287874c564b7549386849a98c9";
};
}
-
{
name = "electron_store___electron_store_2.0.0.tgz";
path = fetchurl {
@@ -226,7 +201,6 @@
sha1 = "1035cca2a95409d1f54c7466606345852450d64a";
};
}
-
{
name = "electron_window_state___electron_window_state_4.1.1.tgz";
path = fetchurl {
@@ -235,7 +209,6 @@
sha1 = "6b34fdc31b38514dfec8b7c8f7b5d4addb67632d";
};
}
-
{
name = "env_paths___env_paths_1.0.0.tgz";
path = fetchurl {
@@ -244,7 +217,6 @@
sha1 = "4168133b42bb05c38a35b1ae4397c8298ab369e0";
};
}
-
{
name = "es_abstract___es_abstract_1.13.0.tgz";
path = fetchurl {
@@ -253,7 +225,6 @@
sha1 = "ac86145fdd5099d8dd49558ccba2eaf9b88e24e9";
};
}
-
{
name = "es_to_primitive___es_to_primitive_1.2.0.tgz";
path = fetchurl {
@@ -262,7 +233,6 @@
sha1 = "edf72478033456e8dda8ef09e00ad9650707f377";
};
}
-
{
name = "es6_promise___es6_promise_3.3.1.tgz";
path = fetchurl {
@@ -271,7 +241,6 @@
sha1 = "a08cdde84ccdbf34d027a1451bc91d4bcd28a613";
};
}
-
{
name = "exif_parser___exif_parser_0.1.12.tgz";
path = fetchurl {
@@ -280,7 +249,6 @@
sha1 = "58a9d2d72c02c1f6f02a0ef4a9166272b7760922";
};
}
-
{
name = "extend___extend_3.0.2.tgz";
path = fetchurl {
@@ -289,7 +257,6 @@
sha1 = "f8b1136b4071fbd8eb140aff858b1019ec2915fa";
};
}
-
{
name = "extsprintf___extsprintf_1.3.0.tgz";
path = fetchurl {
@@ -298,7 +265,6 @@
sha1 = "96918440e3041a7a414f8c52e3c574eb3c3e1e05";
};
}
-
{
name = "extsprintf___extsprintf_1.4.0.tgz";
path = fetchurl {
@@ -307,7 +273,6 @@
sha1 = "e2689f8f356fad62cca65a3a91c5df5f9551692f";
};
}
-
{
name = "fast_deep_equal___fast_deep_equal_2.0.1.tgz";
path = fetchurl {
@@ -316,7 +281,6 @@
sha1 = "7b05218ddf9667bf7f370bf7fdb2cb15fdd0aa49";
};
}
-
{
name = "fast_json_stable_stringify___fast_json_stable_stringify_2.0.0.tgz";
path = fetchurl {
@@ -325,7 +289,6 @@
sha1 = "d5142c0caee6b1189f87d3a76111064f86c8bbf2";
};
}
-
{
name = "file_type___file_type_3.9.0.tgz";
path = fetchurl {
@@ -334,7 +297,6 @@
sha1 = "257a078384d1db8087bc449d107d52a52672b9e9";
};
}
-
{
name = "find_up___find_up_2.1.0.tgz";
path = fetchurl {
@@ -343,7 +305,6 @@
sha1 = "45d1b7e506c717ddd482775a2b77920a3c0c57a7";
};
}
-
{
name = "for_each___for_each_0.3.3.tgz";
path = fetchurl {
@@ -352,7 +313,6 @@
sha1 = "69b447e88a0a5d32c3e7084f3f1710034b21376e";
};
}
-
{
name = "forever_agent___forever_agent_0.6.1.tgz";
path = fetchurl {
@@ -361,7 +321,6 @@
sha1 = "fbc71f0c41adeb37f96c577ad1ed42d8fdacca91";
};
}
-
{
name = "form_data___form_data_2.3.3.tgz";
path = fetchurl {
@@ -370,7 +329,6 @@
sha1 = "dcce52c05f644f298c6a7ab936bd724ceffbf3a6";
};
}
-
{
name = "function_bind___function_bind_1.1.1.tgz";
path = fetchurl {
@@ -379,7 +337,6 @@
sha1 = "a56899d3ea3c9bab874bb9773b7c5ede92f4895d";
};
}
-
{
name = "getpass___getpass_0.1.7.tgz";
path = fetchurl {
@@ -388,7 +345,6 @@
sha1 = "5eff8e3e684d569ae4cb2b1282604e8ba62149fa";
};
}
-
{
name = "global___global_4.3.2.tgz";
path = fetchurl {
@@ -397,7 +353,6 @@
sha1 = "e76989268a6c74c38908b1305b10fc0e394e9d0f";
};
}
-
{
name = "graceful_fs___graceful_fs_4.1.15.tgz";
path = fetchurl {
@@ -406,7 +361,6 @@
sha1 = "ffb703e1066e8a0eeaa4c8b80ba9253eeefbfb00";
};
}
-
{
name = "har_schema___har_schema_2.0.0.tgz";
path = fetchurl {
@@ -415,7 +369,6 @@
sha1 = "a94c2224ebcac04782a0d9035521f24735b7ec92";
};
}
-
{
name = "har_validator___har_validator_5.1.3.tgz";
path = fetchurl {
@@ -424,7 +377,6 @@
sha1 = "1ef89ebd3e4996557675eed9893110dc350fa080";
};
}
-
{
name = "has_symbols___has_symbols_1.0.0.tgz";
path = fetchurl {
@@ -433,7 +385,6 @@
sha1 = "ba1a8f1af2a0fc39650f5c850367704122063b44";
};
}
-
{
name = "has___has_1.0.3.tgz";
path = fetchurl {
@@ -442,7 +393,6 @@
sha1 = "722d7cbfc1f6aa8241f16dd814e011e1f41e8796";
};
}
-
{
name = "http_signature___http_signature_1.2.0.tgz";
path = fetchurl {
@@ -451,7 +401,6 @@
sha1 = "9aecd925114772f3d95b65a60abb8f7c18fbace1";
};
}
-
{
name = "imurmurhash___imurmurhash_0.1.4.tgz";
path = fetchurl {
@@ -460,7 +409,6 @@
sha1 = "9218b9b2b928a238b13dc4fb6b6d576f231453ea";
};
}
-
{
name = "ip_regex___ip_regex_1.0.3.tgz";
path = fetchurl {
@@ -469,7 +417,6 @@
sha1 = "dc589076f659f419c222039a33316f1c7387effd";
};
}
-
{
name = "is_callable___is_callable_1.1.4.tgz";
path = fetchurl {
@@ -478,7 +425,6 @@
sha1 = "1e1adf219e1eeb684d691f9d6a05ff0d30a24d75";
};
}
-
{
name = "is_date_object___is_date_object_1.0.1.tgz";
path = fetchurl {
@@ -487,7 +433,6 @@
sha1 = "9aa20eb6aeebbff77fbd33e74ca01b33581d3a16";
};
}
-
{
name = "is_function___is_function_1.0.1.tgz";
path = fetchurl {
@@ -496,7 +441,6 @@
sha1 = "12cfb98b65b57dd3d193a3121f5f6e2f437602b5";
};
}
-
{
name = "is_obj___is_obj_1.0.1.tgz";
path = fetchurl {
@@ -505,7 +449,6 @@
sha1 = "3e4729ac1f5fde025cd7d83a896dab9f4f67db0f";
};
}
-
{
name = "is_regex___is_regex_1.0.4.tgz";
path = fetchurl {
@@ -514,7 +457,6 @@
sha1 = "5517489b547091b0930e095654ced25ee97e9491";
};
}
-
{
name = "is_symbol___is_symbol_1.0.2.tgz";
path = fetchurl {
@@ -523,7 +465,6 @@
sha1 = "a055f6ae57192caee329e7a860118b497a950f38";
};
}
-
{
name = "is_typedarray___is_typedarray_1.0.0.tgz";
path = fetchurl {
@@ -532,7 +473,6 @@
sha1 = "e479c80858df0c1b11ddda6940f96011fcda4a9a";
};
}
-
{
name = "isstream___isstream_0.1.2.tgz";
path = fetchurl {
@@ -541,7 +481,6 @@
sha1 = "47e63f7af55afa6f92e1500e690eb8b8529c099a";
};
}
-
{
name = "jimp___jimp_0.2.28.tgz";
path = fetchurl {
@@ -550,7 +489,6 @@
sha1 = "dd529a937190f42957a7937d1acc3a7762996ea2";
};
}
-
{
name = "jpeg_js___jpeg_js_0.2.0.tgz";
path = fetchurl {
@@ -559,7 +497,6 @@
sha1 = "53e448ec9d263e683266467e9442d2c5a2ef5482";
};
}
-
{
name = "jsbn___jsbn_0.1.1.tgz";
path = fetchurl {
@@ -568,7 +505,6 @@
sha1 = "a5e654c2e5a2deb5f201d96cefbca80c0ef2f513";
};
}
-
{
name = "json_schema_traverse___json_schema_traverse_0.4.1.tgz";
path = fetchurl {
@@ -577,7 +513,6 @@
sha1 = "69f6a87d9513ab8bb8fe63bdb0979c448e684660";
};
}
-
{
name = "json_schema___json_schema_0.2.3.tgz";
path = fetchurl {
@@ -586,7 +521,6 @@
sha1 = "b480c892e59a2f05954ce727bd3f2a4e882f9e13";
};
}
-
{
name = "json_stringify_safe___json_stringify_safe_5.0.1.tgz";
path = fetchurl {
@@ -595,7 +529,6 @@
sha1 = "1296a2d58fd45f19a0f6ce01d65701e2c735b6eb";
};
}
-
{
name = "jsonfile___jsonfile_2.4.0.tgz";
path = fetchurl {
@@ -604,7 +537,6 @@
sha1 = "3736a2b428b87bbda0cc83b53fa3d633a35c2ae8";
};
}
-
{
name = "jsprim___jsprim_1.4.1.tgz";
path = fetchurl {
@@ -613,7 +545,6 @@
sha1 = "313e66bc1e5cc06e438bc1b7499c2e5c56acb6a2";
};
}
-
{
name = "load_bmfont___load_bmfont_1.4.0.tgz";
path = fetchurl {
@@ -622,7 +553,6 @@
sha1 = "75f17070b14a8c785fe7f5bee2e6fd4f98093b6b";
};
}
-
{
name = "locate_path___locate_path_2.0.0.tgz";
path = fetchurl {
@@ -631,7 +561,6 @@
sha1 = "2b568b265eec944c6d9c0de9c3dbbbca0354cd8e";
};
}
-
{
name = "make_dir___make_dir_1.3.0.tgz";
path = fetchurl {
@@ -640,7 +569,6 @@
sha1 = "79c1033b80515bd6d24ec9933e860ca75ee27f0c";
};
}
-
{
name = "mime_db___mime_db_1.38.0.tgz";
path = fetchurl {
@@ -649,7 +577,6 @@
sha1 = "1a2aab16da9eb167b49c6e4df2d9c68d63d8e2ad";
};
}
-
{
name = "mime_types___mime_types_2.1.22.tgz";
path = fetchurl {
@@ -658,7 +585,6 @@
sha1 = "fe6b355a190926ab7698c9a0556a11199b2199bd";
};
}
-
{
name = "mime___mime_1.6.0.tgz";
path = fetchurl {
@@ -667,7 +593,6 @@
sha1 = "32cd9e5c64553bd58d19a568af452acff04981b1";
};
}
-
{
name = "min_document___min_document_2.19.0.tgz";
path = fetchurl {
@@ -676,7 +601,6 @@
sha1 = "7bd282e3f5842ed295bb748cdd9f1ffa2c824685";
};
}
-
{
name = "minimist___minimist_0.0.8.tgz";
path = fetchurl {
@@ -685,7 +609,6 @@
sha1 = "857fcabfc3397d2625b8228262e86aa7a011b05d";
};
}
-
{
name = "minimist___minimist_1.2.0.tgz";
path = fetchurl {
@@ -694,7 +617,6 @@
sha1 = "a35008b20f41383eec1fb914f4cd5df79a264284";
};
}
-
{
name = "mkdirp___mkdirp_0.5.1.tgz";
path = fetchurl {
@@ -703,7 +625,6 @@
sha1 = "30057438eac6cf7f8c4767f38648d6697d75c903";
};
}
-
{
name = "oauth_sign___oauth_sign_0.9.0.tgz";
path = fetchurl {
@@ -712,7 +633,6 @@
sha1 = "47a7b016baa68b5fa0ecf3dee08a85c679ac6455";
};
}
-
{
name = "object_keys___object_keys_1.1.0.tgz";
path = fetchurl {
@@ -721,7 +641,6 @@
sha1 = "11bd22348dd2e096a045ab06f6c85bcc340fa032";
};
}
-
{
name = "p_limit___p_limit_1.3.0.tgz";
path = fetchurl {
@@ -730,7 +649,6 @@
sha1 = "b86bd5f0c25690911c7590fcbfc2010d54b3ccb8";
};
}
-
{
name = "p_locate___p_locate_2.0.0.tgz";
path = fetchurl {
@@ -739,7 +657,6 @@
sha1 = "20a0103b222a70c8fd39cc2e580680f3dde5ec43";
};
}
-
{
name = "p_try___p_try_1.0.0.tgz";
path = fetchurl {
@@ -748,7 +665,6 @@
sha1 = "cbc79cdbaf8fd4228e13f621f2b1a237c1b207b3";
};
}
-
{
name = "parse_bmfont_ascii___parse_bmfont_ascii_1.0.6.tgz";
path = fetchurl {
@@ -757,7 +673,6 @@
sha1 = "11ac3c3ff58f7c2020ab22769079108d4dfa0285";
};
}
-
{
name = "parse_bmfont_binary___parse_bmfont_binary_1.0.6.tgz";
path = fetchurl {
@@ -766,7 +681,6 @@
sha1 = "d038b476d3e9dd9db1e11a0b0e53a22792b69006";
};
}
-
{
name = "parse_bmfont_xml___parse_bmfont_xml_1.1.4.tgz";
path = fetchurl {
@@ -775,7 +689,6 @@
sha1 = "015319797e3e12f9e739c4d513872cd2fa35f389";
};
}
-
{
name = "parse_headers___parse_headers_2.0.2.tgz";
path = fetchurl {
@@ -784,7 +697,6 @@
sha1 = "9545e8a4c1ae5eaea7d24992bca890281ed26e34";
};
}
-
{
name = "path_exists___path_exists_3.0.0.tgz";
path = fetchurl {
@@ -793,7 +705,6 @@
sha1 = "ce0ebeaa5f78cb18925ea7d810d7b59b010fd515";
};
}
-
{
name = "path_is_absolute___path_is_absolute_1.0.1.tgz";
path = fetchurl {
@@ -802,7 +713,6 @@
sha1 = "174b9268735534ffbc7ace6bf53a5a9e1b5c5f5f";
};
}
-
{
name = "performance_now___performance_now_2.1.0.tgz";
path = fetchurl {
@@ -811,7 +721,6 @@
sha1 = "6309f4e0e5fa913ec1c69307ae364b4b377c9e7b";
};
}
-
{
name = "phin___phin_2.9.3.tgz";
path = fetchurl {
@@ -820,7 +729,6 @@
sha1 = "f9b6ac10a035636fb65dfc576aaaa17b8743125c";
};
}
-
{
name = "pify___pify_3.0.0.tgz";
path = fetchurl {
@@ -829,7 +737,6 @@
sha1 = "e5a4acd2c101fdf3d9a4d07f0dbc4db49dd28176";
};
}
-
{
name = "pixelmatch___pixelmatch_4.0.2.tgz";
path = fetchurl {
@@ -838,7 +745,6 @@
sha1 = "8f47dcec5011b477b67db03c243bc1f3085e8854";
};
}
-
{
name = "pkg_up___pkg_up_2.0.0.tgz";
path = fetchurl {
@@ -847,7 +753,6 @@
sha1 = "c819ac728059a461cab1c3889a2be3c49a004d7f";
};
}
-
{
name = "png_to_ico___png_to_ico_1.0.7.tgz";
path = fetchurl {
@@ -856,7 +761,6 @@
sha1 = "9346b5f4d6fd7e94cb08fd49eeb585f501c3e5f2";
};
}
-
{
name = "pngjs___pngjs_3.4.0.tgz";
path = fetchurl {
@@ -865,7 +769,6 @@
sha1 = "99ca7d725965fb655814eaf65f38f12bbdbf555f";
};
}
-
{
name = "process___process_0.5.2.tgz";
path = fetchurl {
@@ -874,7 +777,6 @@
sha1 = "1638d8a8e34c2f440a91db95ab9aeb677fc185cf";
};
}
-
{
name = "psl___psl_1.1.31.tgz";
path = fetchurl {
@@ -883,7 +785,6 @@
sha1 = "e9aa86d0101b5b105cbe93ac6b784cd547276184";
};
}
-
{
name = "punycode___punycode_1.4.1.tgz";
path = fetchurl {
@@ -892,7 +793,6 @@
sha1 = "c0d5a63b2718800ad8e1eb0fa5269c84dd41845e";
};
}
-
{
name = "punycode___punycode_2.1.1.tgz";
path = fetchurl {
@@ -901,7 +801,6 @@
sha1 = "b58b010ac40c22c5657616c8d2c2c02c7bf479ec";
};
}
-
{
name = "qs___qs_6.5.2.tgz";
path = fetchurl {
@@ -910,7 +809,6 @@
sha1 = "cb3ae806e8740444584ef154ce8ee98d403f3e36";
};
}
-
{
name = "read_chunk___read_chunk_1.0.1.tgz";
path = fetchurl {
@@ -919,7 +817,6 @@
sha1 = "5f68cab307e663f19993527d9b589cace4661194";
};
}
-
{
name = "request___request_2.88.0.tgz";
path = fetchurl {
@@ -928,7 +825,6 @@
sha1 = "9c2fca4f7d35b592efe57c7f0a55e81052124fef";
};
}
-
{
name = "safe_buffer___safe_buffer_5.1.2.tgz";
path = fetchurl {
@@ -937,7 +833,6 @@
sha1 = "991ec69d296e0313747d59bdfd2b745c35f8828d";
};
}
-
{
name = "safer_buffer___safer_buffer_2.1.2.tgz";
path = fetchurl {
@@ -946,7 +841,6 @@
sha1 = "44fa161b0187b9549dd84bb91802f9bd8385cd6a";
};
}
-
{
name = "sax___sax_1.2.4.tgz";
path = fetchurl {
@@ -955,7 +849,6 @@
sha1 = "2816234e2378bddc4e5354fab5caa895df7100d9";
};
}
-
{
name = "signal_exit___signal_exit_3.0.2.tgz";
path = fetchurl {
@@ -964,7 +857,6 @@
sha1 = "b5fdc08f1287ea1178628e415e25132b73646c6d";
};
}
-
{
name = "sshpk___sshpk_1.16.1.tgz";
path = fetchurl {
@@ -973,7 +865,6 @@
sha1 = "fb661c0bef29b39db40769ee39fa70093d6f6877";
};
}
-
{
name = "stream_to_buffer___stream_to_buffer_0.1.0.tgz";
path = fetchurl {
@@ -982,7 +873,6 @@
sha1 = "26799d903ab2025c9bd550ac47171b00f8dd80a9";
};
}
-
{
name = "stream_to___stream_to_0.2.2.tgz";
path = fetchurl {
@@ -991,7 +881,6 @@
sha1 = "84306098d85fdb990b9fa300b1b3ccf55e8ef01d";
};
}
-
{
name = "string.prototype.trim___string.prototype.trim_1.1.2.tgz";
path = fetchurl {
@@ -1000,7 +889,6 @@
sha1 = "d04de2c89e137f4d7d206f086b5ed2fae6be8cea";
};
}
-
{
name = "tinycolor2___tinycolor2_1.4.1.tgz";
path = fetchurl {
@@ -1009,7 +897,6 @@
sha1 = "f4fad333447bc0b07d4dc8e9209d8f39a8ac77e8";
};
}
-
{
name = "tough_cookie___tough_cookie_2.4.3.tgz";
path = fetchurl {
@@ -1018,7 +905,6 @@
sha1 = "53f36da3f47783b0925afa06ff9f3b165280f781";
};
}
-
{
name = "tunnel_agent___tunnel_agent_0.6.0.tgz";
path = fetchurl {
@@ -1027,7 +913,6 @@
sha1 = "27a5dea06b36b04a0a9966774b290868f0fc40fd";
};
}
-
{
name = "tweetnacl___tweetnacl_0.14.5.tgz";
path = fetchurl {
@@ -1036,7 +921,6 @@
sha1 = "5ae68177f192d4456269d108afa93ff8743f4f64";
};
}
-
{
name = "untildify___untildify_3.0.3.tgz";
path = fetchurl {
@@ -1045,7 +929,6 @@
sha1 = "1e7b42b140bcfd922b22e70ca1265bfe3634c7c9";
};
}
-
{
name = "uri_js___uri_js_4.2.2.tgz";
path = fetchurl {
@@ -1054,7 +937,6 @@
sha1 = "94c540e1ff772956e2299507c010aea6c8838eb0";
};
}
-
{
name = "url_regex___url_regex_3.2.0.tgz";
path = fetchurl {
@@ -1063,7 +945,6 @@
sha1 = "dbad1e0c9e29e105dd0b1f09f6862f7fdb482724";
};
}
-
{
name = "uuid___uuid_3.3.2.tgz";
path = fetchurl {
@@ -1072,7 +953,6 @@
sha1 = "1b4af4955eb3077c501c23872fc6513811587131";
};
}
-
{
name = "verror___verror_1.10.0.tgz";
path = fetchurl {
@@ -1081,7 +961,6 @@
sha1 = "3a105ca17053af55d6e270c1f8288682e18da400";
};
}
-
{
name = "winreg___winreg_1.2.4.tgz";
path = fetchurl {
@@ -1090,7 +969,6 @@
sha1 = "ba065629b7a925130e15779108cf540990e98d1b";
};
}
-
{
name = "write_file_atomic___write_file_atomic_2.4.2.tgz";
path = fetchurl {
@@ -1099,7 +977,6 @@
sha1 = "a7181706dfba17855d221140a9c06e15fcdd87b9";
};
}
-
{
name = "xhr___xhr_2.5.0.tgz";
path = fetchurl {
@@ -1108,7 +985,6 @@
sha1 = "bed8d1676d5ca36108667692b74b316c496e49dd";
};
}
-
{
name = "xml_parse_from_string___xml_parse_from_string_1.0.1.tgz";
path = fetchurl {
@@ -1117,7 +993,6 @@
sha1 = "a9029e929d3dbcded169f3c6e28238d95a5d5a28";
};
}
-
{
name = "xml2js___xml2js_0.4.19.tgz";
path = fetchurl {
@@ -1126,7 +1001,6 @@
sha1 = "686c20f213209e94abf0d1bcf1efaa291c7827a7";
};
}
-
{
name = "xmlbuilder___xmlbuilder_9.0.7.tgz";
path = fetchurl {
@@ -1135,7 +1009,6 @@
sha1 = "132ee63d2ec5565c557e20f4c22df9aca686b10d";
};
}
-
{
name = "xtend___xtend_4.0.1.tgz";
path = fetchurl {
diff --git a/pkgs/applications/networking/instant-messengers/riot/riot-desktop.nix b/pkgs/applications/networking/instant-messengers/riot/riot-desktop.nix
index d245fad7bca5..2c4557f2cc08 100644
--- a/pkgs/applications/networking/instant-messengers/riot/riot-desktop.nix
+++ b/pkgs/applications/networking/instant-messengers/riot/riot-desktop.nix
@@ -1,9 +1,8 @@
-{ pkgs, stdenv, fetchFromGitHub, makeWrapper, makeDesktopItem, electron_5, riot-web }:
+{ pkgs, stdenv, fetchFromGitHub, makeWrapper, makeDesktopItem, electron_5, riot-web, yarn2nix-moretea }:
-# Note for maintainers:
-# Versions of `riot-web` and `riot-desktop` should be kept in sync.
-
-with (import ./yarn2nix.nix { inherit pkgs; });
+# Notes for maintainers:
+# * versions of `riot-web` and `riot-desktop` should be kept in sync.
+# * the Yarn dependency expression must be updated with `./update-riot-desktop.sh `
let
executableName = "riot-desktop";
@@ -15,18 +14,13 @@ let
sha256 = "1nzzxcz4r9932cha80q1bzn1425m67fsl89pn7n7ybrv6y0jnxpc";
};
-in mkYarnPackage rec {
+in yarn2nix-moretea.mkYarnPackage rec {
name = "riot-desktop-${version}";
inherit version;
src = "${riot-web-src}/electron_app";
- # The package manifest should be copied on each update of this package.
- # > cp ${riot-web-src}/electron_app/package.json riot-desktop-package.json
packageJSON = ./riot-desktop-package.json;
-
- # The dependency expression can be regenerated using nixos.yarn2nix with the following command:
- # > yarn2nix --lockfile=${riot-web-src}/electron_app/yarn.lock > riot-desktop-yarndeps.nix
yarnNix = ./riot-desktop-yarndeps.nix;
nativeBuildInputs = [ makeWrapper ];
@@ -36,7 +30,9 @@ in mkYarnPackage rec {
mkdir -p "$out/share/riot"
ln -s '${riot-web}' "$out/share/riot/webapp"
cp -r '${riot-web-src}/origin_migrator' "$out/share/riot/origin_migrator"
- cp -r '.' "$out/share/riot/electron"
+ cp -r './deps/riot-web' "$out/share/riot/electron"
+ rm "$out/share/riot/electron/node_modules"
+ cp -r './node_modules' "$out/share/riot/electron"
# icons
for icon in $out/share/riot/electron/build/icons/*.png; do
diff --git a/pkgs/applications/networking/instant-messengers/riot/update-riot-desktop.sh b/pkgs/applications/networking/instant-messengers/riot/update-riot-desktop.sh
new file mode 100755
index 000000000000..b646a9e03adf
--- /dev/null
+++ b/pkgs/applications/networking/instant-messengers/riot/update-riot-desktop.sh
@@ -0,0 +1,17 @@
+#!/usr/bin/env nix-shell
+#!nix-shell -I nixpkgs=../../../../../ -i bash -p wget yarn2nix-moretea.yarn2nix
+
+set -euo pipefail
+
+if [ "$#" -ne 1 ] || [[ "$1" == -* ]]; then
+ echo "Regenerates the Yarn dependency lock files for the riot-desktop package."
+ echo "Usage: $0 "
+ exit 1
+fi
+
+RIOT_WEB_SRC="https://raw.githubusercontent.com/vector-im/riot-web/$1"
+
+wget "$RIOT_WEB_SRC/electron_app/package.json" -O riot-desktop-package.json
+wget "$RIOT_WEB_SRC/electron_app/yarn.lock" -O riot-desktop-yarndeps.lock
+yarn2nix --lockfile=riot-desktop-yarndeps.lock > riot-desktop-yarndeps.nix
+rm riot-desktop-yarndeps.lock
diff --git a/pkgs/applications/networking/instant-messengers/riot/yarn2nix.nix b/pkgs/applications/networking/instant-messengers/riot/yarn2nix.nix
deleted file mode 100644
index 5dd79fdf1d86..000000000000
--- a/pkgs/applications/networking/instant-messengers/riot/yarn2nix.nix
+++ /dev/null
@@ -1,320 +0,0 @@
-{ pkgs ? import {}
-, nodejs ? pkgs.nodejs
-, yarn ? pkgs.yarn
-}:
-
-let
- inherit (pkgs) stdenv lib fetchurl linkFarm;
-in rec {
- # Export yarn again to make it easier to find out which yarn was used.
- inherit yarn;
-
- # Re-export pkgs
- inherit pkgs;
-
- unlessNull = item: alt:
- if item == null then alt else item;
-
- reformatPackageName = pname:
- let
- # regex adapted from `validate-npm-package-name`
- # will produce 3 parts e.g.
- # "@someorg/somepackage" -> [ "@someorg/" "someorg" "somepackage" ]
- # "somepackage" -> [ null null "somepackage" ]
- parts = builtins.tail (builtins.match "^(@([^/]+)/)?([^/]+)$" pname);
- # if there is no organisation we need to filter out null values.
- non-null = builtins.filter (x: x != null) parts;
- in builtins.concatStringsSep "-" non-null;
-
- # https://docs.npmjs.com/files/package.json#license
- # TODO: support expression syntax (OR, AND, etc)
- spdxLicense = licstr:
- if licstr == "UNLICENSED" then
- lib.licenses.unfree
- else
- lib.findFirst
- (l: l ? spdxId && l.spdxId == licstr)
- { shortName = licstr; }
- (builtins.attrValues lib.licenses);
-
- # Generates the yarn.nix from the yarn.lock file
- mkYarnNix = yarnLock:
- pkgs.runCommand "yarn.nix" {}
- "${yarn2nix}/bin/yarn2nix --lockfile ${yarnLock} --no-patch > $out";
-
- # Loads the generated offline cache. This will be used by yarn as
- # the package source.
- importOfflineCache = yarnNix:
- let
- pkg = import yarnNix { inherit fetchurl linkFarm; };
- in
- pkg.offline_cache;
-
- defaultYarnFlags = [
- "--offline"
- "--frozen-lockfile"
- "--ignore-engines"
- "--ignore-scripts"
- ];
-
- mkYarnModules = {
- name,
- pname,
- packageJSON,
- yarnLock,
- yarnNix ? mkYarnNix yarnLock,
- yarnFlags ? defaultYarnFlags,
- pkgConfig ? {},
- preBuild ? "",
- workspaceDependencies ? [],
- }:
- let
- offlineCache = importOfflineCache yarnNix;
- extraBuildInputs = (lib.flatten (builtins.map (key:
- pkgConfig.${key} . buildInputs or []
- ) (builtins.attrNames pkgConfig)));
- postInstall = (builtins.map (key:
- if (pkgConfig.${key} ? postInstall) then
- ''
- for f in $(find -L -path '*/node_modules/${key}' -type d); do
- (cd "$f" && (${pkgConfig.${key}.postInstall}))
- done
- ''
- else
- ""
- ) (builtins.attrNames pkgConfig));
- workspaceJSON = pkgs.writeText
- "${name}-workspace-package.json"
- (builtins.toJSON { private = true; workspaces = ["deps/**"]; }); # scoped packages need second splat
- workspaceDependencyLinks = lib.concatMapStringsSep "\n"
- (dep: ''
- mkdir -p "deps/${dep.pname}"
- ln -sf ${dep.packageJSON} "deps/${dep.pname}/package.json"
- '')
- workspaceDependencies;
- in stdenv.mkDerivation {
- inherit preBuild name;
- phases = ["configurePhase" "buildPhase"];
- buildInputs = [ yarn nodejs ] ++ extraBuildInputs;
-
- configurePhase = ''
- # Yarn writes cache directories etc to $HOME.
- export HOME=$PWD/yarn_home
- '';
-
- buildPhase = ''
- runHook preBuild
-
- mkdir -p "deps/${pname}"
- cp ${packageJSON} "deps/${pname}/package.json"
- cp ${workspaceJSON} ./package.json
- cp ${yarnLock} ./yarn.lock
- chmod +w ./yarn.lock
-
- yarn config --offline set yarn-offline-mirror ${offlineCache}
-
- # Do not look up in the registry, but in the offline cache.
- # TODO: Ask upstream to fix this mess.
- sed -i -E '/resolved /{s|https://registry.yarnpkg.com/||;s|[@/:-]|_|g}' yarn.lock
-
- ${workspaceDependencyLinks}
- yarn install ${lib.escapeShellArgs yarnFlags}
-
- ${lib.concatStringsSep "\n" postInstall}
-
- mkdir $out
- mv node_modules $out/
- mv deps $out/
- patchShebangs $out
- '';
- };
-
- # This can be used as a shellHook in mkYarnPackage. It brings the built node_modules into
- # the shell-hook environment.
- linkNodeModulesHook = ''
- if [[ -d node_modules || -L node_modules ]]; then
- echo "./node_modules is present. Replacing."
- rm -rf node_modules
- fi
-
- ln -s "$node_modules" node_modules
- '';
-
- mkYarnWorkspace = {
- src,
- packageJSON ? src+"/package.json",
- yarnLock ? src+"/yarn.lock",
- packageOverrides ? {},
- ...
- }@attrs:
- let
- package = lib.importJSON packageJSON;
- packageGlobs = package.workspaces;
- globElemToRegex = lib.replaceStrings ["*"] [".*"];
- # PathGlob -> [PathGlobElem]
- splitGlob = lib.splitString "/";
- # Path -> [PathGlobElem] -> [Path]
- # Note: Only directories are included, everything else is filtered out
- expandGlobList = base: globElems:
- let
- elemRegex = globElemToRegex (lib.head globElems);
- rest = lib.tail globElems;
- children = lib.attrNames (lib.filterAttrs (name: type: type == "directory") (builtins.readDir base));
- matchingChildren = lib.filter (child: builtins.match elemRegex child != null) children;
- in if globElems == []
- then [ base ]
- else lib.concatMap (child: expandGlobList (base+("/"+child)) rest) matchingChildren;
- # Path -> PathGlob -> [Path]
- expandGlob = base: glob: expandGlobList base (splitGlob glob);
- packagePaths = lib.concatMap (expandGlob src) packageGlobs;
- packages = lib.listToAttrs (map (src:
- let
- packageJSON = src+"/package.json";
- package = lib.importJSON packageJSON;
- allDependencies = lib.foldl (a: b: a // b) {} (map (field: lib.attrByPath [field] {} package) ["dependencies" "devDependencies"]);
- in rec {
- name = reformatPackageName package.name;
- value = mkYarnPackage (builtins.removeAttrs attrs ["packageOverrides"] // {
- inherit src packageJSON yarnLock;
- workspaceDependencies = lib.mapAttrsToList (name: version: packages.${name})
- (lib.filterAttrs (name: version: packages ? ${name}) allDependencies);
- } // lib.attrByPath [name] {} packageOverrides);
- }) packagePaths);
- in packages;
-
- mkYarnPackage = {
- name ? null,
- src,
- packageJSON ? src + "/package.json",
- yarnLock ? src + "/yarn.lock",
- yarnNix ? mkYarnNix yarnLock,
- yarnFlags ? defaultYarnFlags,
- yarnPreBuild ? "",
- pkgConfig ? {},
- extraBuildInputs ? [],
- publishBinsFor ? null,
- workspaceDependencies ? [],
- ...
- }@attrs:
- let
- package = lib.importJSON packageJSON;
- pname = package.name;
- safeName = reformatPackageName pname;
- version = package.version;
- baseName = unlessNull name "${safeName}-${version}";
- deps = mkYarnModules {
- name = "${safeName}-modules-${version}";
- preBuild = yarnPreBuild;
- workspaceDependencies = workspaceDependenciesTransitive;
- inherit packageJSON pname yarnLock yarnNix yarnFlags pkgConfig;
- };
- publishBinsFor_ = unlessNull publishBinsFor [pname];
- linkDirFunction = ''
- linkDirToDirLinks() {
- target=$1
- if [ ! -f "$target" ]; then
- mkdir -p "$target"
- elif [ -L "$target" ]; then
- local new=$(mktemp -d)
- trueSource=$(realpath "$target")
- if [ "$(ls $trueSource | wc -l)" -gt 0 ]; then
- ln -s $trueSource/* $new/
- fi
- rm -r "$target"
- mv "$new" "$target"
- fi
- }
- '';
- workspaceDependenciesTransitive = lib.unique ((lib.flatten (builtins.map (dep: dep.workspaceDependencies) workspaceDependencies)) ++ workspaceDependencies);
- workspaceDependencyCopy = lib.concatMapStringsSep "\n"
- (dep: ''
- # ensure any existing scope directory is not a symlink
- linkDirToDirLinks "$(dirname node_modules/${dep.pname})"
- mkdir -p "deps/${dep.pname}"
- tar -xf "${dep}/tarballs/${dep.name}.tgz" --directory "deps/${dep.pname}" --strip-components=1
- if [ ! -e "deps/${dep.pname}/node_modules" ]; then
- ln -s "${deps}/deps/${dep.pname}/node_modules" "deps/${dep.pname}/node_modules"
- fi
- '')
- workspaceDependenciesTransitive;
- in stdenv.mkDerivation (builtins.removeAttrs attrs ["pkgConfig" "workspaceDependencies"] // {
- inherit src;
-
- name = baseName;
-
- buildInputs = [ yarn nodejs ] ++ extraBuildInputs;
-
- node_modules = deps + "/node_modules";
-
- configurePhase = attrs.configurePhase or ''
- runHook preConfigure
-
- for localDir in npm-packages-offline-cache node_modules; do
- if [[ -d $localDir || -L $localDir ]]; then
- echo "$localDir dir present. Removing."
- rm -rf $localDir
- fi
- done
-
- mkdir -p "deps/${pname}"
- shopt -s extglob
- cp -r !(deps) "deps/${pname}"
- shopt -u extglob
- ln -s ${deps}/deps/${pname}/node_modules "deps/${pname}/node_modules"
-
- cp -r $node_modules node_modules
- chmod -R +w node_modules
-
- ${linkDirFunction}
- linkDirToDirLinks "$(dirname node_modules/${pname})"
- ln -s "deps/${pname}" "node_modules/${pname}"
- ${workspaceDependencyCopy}
-
- # Help yarn commands run in other phases find the package
- echo "--cwd deps/${pname}" > .yarnrc
- runHook postConfigure
- '';
-
- # Replace this phase on frontend packages where only the generated
- # files are an interesting output.
- installPhase = attrs.installPhase or ''
- runHook preInstall
-
- mkdir -p $out/{bin,libexec/${pname}}
- mv node_modules $out/libexec/${pname}/node_modules
- mv deps $out/libexec/${pname}/deps
- node ${./nix/fixup_bin.js} $out/bin $out/libexec/${pname}/node_modules ${lib.concatStringsSep " " publishBinsFor_}
-
- runHook postInstall
- '';
-
- doDist = true;
- distPhase = attrs.distPhase or ''
- # pack command ignores cwd option
- rm -f .yarnrc
- cd $out/libexec/${pname}/deps/${pname}
- mkdir -p $out/tarballs/
- yarn pack --ignore-scripts --filename $out/tarballs/${baseName}.tgz
- '';
-
- passthru = {
- inherit pname package packageJSON deps;
- workspaceDependencies = workspaceDependenciesTransitive;
- } // (attrs.passthru or {});
-
- meta = {
- inherit (nodejs.meta) platforms;
- description = packageJSON.description or "";
- homepage = packageJSON.homepage or "";
- version = packageJSON.version or "";
- license = if packageJSON ? license then spdxLicense packageJSON.license else "";
- } // (attrs.meta or {});
- });
-
- yarn2nix = mkYarnPackage {
- src = ./.;
- # yarn2nix is the only package that requires the yarnNix option.
- # All the other projects can auto-generate that file.
- yarnNix = ./yarn.nix;
- };
-}
diff --git a/pkgs/applications/networking/instant-messengers/slack/default.nix b/pkgs/applications/networking/instant-messengers/slack/default.nix
index fab9c28ec973..d3aa302d601a 100644
--- a/pkgs/applications/networking/instant-messengers/slack/default.nix
+++ b/pkgs/applications/networking/instant-messengers/slack/default.nix
@@ -6,7 +6,7 @@ at-spi2-atk, libuuid, nodePackages
let
- version = "4.0.1";
+ version = "4.0.2";
rpath = stdenv.lib.makeLibraryPath [
alsaLib
@@ -51,7 +51,7 @@ let
if stdenv.hostPlatform.system == "x86_64-linux" then
fetchurl {
url = "https://downloads.slack-edge.com/linux_releases/slack-desktop-${version}-amd64.deb";
- sha256 = "1g7c8jka750pblsfzjvfyf7sp1m409kybqagml9miif1v71scxv2";
+ sha256 = "053j5py16ilpwy868rhh5l2g93xj1fq4fwxrsi2bkfsnmq261hkm";
}
else
throw "Slack is not supported on ${stdenv.hostPlatform.system}";
diff --git a/pkgs/applications/networking/mumble/overlay.nix b/pkgs/applications/networking/mumble/overlay.nix
index 185672a21f8c..babb3812bb92 100644
--- a/pkgs/applications/networking/mumble/overlay.nix
+++ b/pkgs/applications/networking/mumble/overlay.nix
@@ -12,10 +12,10 @@ in stdenv.mkDerivation {
installPhase = ''
mkdir -p $out/lib
- ln -s ${mumble}/lib/libmumble.so.1.* $out/lib/libmumble.so.1
+ ln -s ${mumble}/lib/libmumble.so.1.2.* $out/lib/libmumble.so.1
${lib.optionalString (mumble_i686 != null) ''
mkdir -p $out/lib32
- ln -s ${mumble_i686}/lib/libmumble.so.1.* $out/lib32/libmumble.so.1
+ ln -s ${mumble_i686}/lib/libmumble.so.1.2.* $out/lib32/libmumble.so.1
''}
install -Dm755 scripts/mumble-overlay $out/bin/mumble-overlay
sed -i "s,/usr/lib,$out/lib,g" $out/bin/mumble-overlay
diff --git a/pkgs/applications/networking/p2p/gnunet/default.nix b/pkgs/applications/networking/p2p/gnunet/default.nix
index 715d8e13ec30..eaa6b07c8fae 100644
--- a/pkgs/applications/networking/p2p/gnunet/default.nix
+++ b/pkgs/applications/networking/p2p/gnunet/default.nix
@@ -1,20 +1,24 @@
{ stdenv, fetchurl, adns, curl, gettext, gmp, gnutls, libextractor
, libgcrypt, libgnurl, libidn, libmicrohttpd, libtool, libunistring
, makeWrapper, ncurses, pkgconfig, libxml2, sqlite, zlib
-, libpulseaudio, libopus, libogg }:
+, libpulseaudio, libopus, libogg, jansson }:
stdenv.mkDerivation rec {
- name = "gnunet-0.11.0";
+ pname = "gnunet";
+ version = "0.11.6";
src = fetchurl {
- url = "mirror://gnu/gnunet/${name}.tar.gz";
- sha256 = "16kydkrjlf2vxflgls46bwaf9kjczf621p456q0qlphd7cy7lixp";
+ url = "mirror://gnu/gnunet/${pname}-${version}.tar.gz";
+ sha256 = "1gspr1lh885sb9r2anh7bi4zan3zjqx33lpyhq9hm2g0n5ip187q";
};
+ enableParallelBuilding = true;
+
+ nativeBuildInputs = [ pkgconfig libtool makeWrapper ];
buildInputs = [
- adns curl gettext gmp gnutls libextractor libgcrypt libgnurl libidn
- libmicrohttpd libtool libunistring libxml2 makeWrapper ncurses
- pkgconfig sqlite zlib libpulseaudio libopus libogg
+ adns curl gmp gnutls libextractor libgcrypt libgnurl libidn
+ libmicrohttpd libunistring libxml2 ncurses gettext
+ sqlite zlib libpulseaudio libopus libogg jansson
];
preConfigure = ''
@@ -29,26 +33,18 @@ stdenv.mkDerivation rec {
find . \( -iname \*test\*.c -or -name \*.conf \) | \
xargs sed -ie "s|/tmp|$TMPDIR|g"
- # Ensure NSS installation works fine
- configureFlags="$configureFlags --with-nssdir=$out/lib"
- patchShebangs src/gns/nss/install-nss-plugin.sh
-
sed -ie 's|@LDFLAGS@|@LDFLAGS@ $(Z_LIBS)|g' \
src/regex/Makefile.in \
src/fs/Makefile.in
'';
+ # unfortunately, there's still a few failures with impure tests
doCheck = false;
-
- /* FIXME: Tests must be run this way, but there are still a couple of
- failures.
-
- postInstall =
- '' export GNUNET_PREFIX="$out"
- export PATH="$out/bin:$PATH"
- make -k check
- '';
- */
+ checkPhase = ''
+ export GNUNET_PREFIX="$out"
+ export PATH="$out/bin:$PATH"
+ make -k check
+ '';
meta = with stdenv.lib; {
description = "GNU's decentralized anonymous and censorship-resistant P2P framework";
@@ -69,9 +65,7 @@ stdenv.mkDerivation rec {
'';
homepage = https://gnunet.org/;
-
license = licenses.gpl2Plus;
-
maintainers = with maintainers; [ vrthra ];
platforms = platforms.gnu ++ platforms.linux;
};
diff --git a/pkgs/applications/networking/p2p/stig/default.nix b/pkgs/applications/networking/p2p/stig/default.nix
new file mode 100644
index 000000000000..80b8251f2a3f
--- /dev/null
+++ b/pkgs/applications/networking/p2p/stig/default.nix
@@ -0,0 +1,56 @@
+{ lib
+, fetchFromGitHub
+, python3
+}:
+
+python3.pkgs.buildPythonApplication rec {
+ pname = "stig";
+ # This project has a different concept for pre release / alpha,
+ # Read the project's README for details: https://github.com/rndusr/stig#stig
+ version = "0.10.1a";
+
+ src = fetchFromGitHub {
+ owner = "rndusr";
+ repo = "stig";
+ rev = "v${version}";
+ sha256 = "076rlial6h1nhwdxf1mx5nf2zld5ci43cadj9wf8xms7zn8s6c8v";
+ };
+
+ # urwidtrees 1.0.3 is requested by the developer because 1.0.2 (which is packaged
+ # in nixpkgs) is not uploaded to pypi and 1.0.1 has a problematic `setup.py`.
+ # As long as we don't have any problems installing it, no special features / specific bugs
+ # were fixed in 1.0.3 that aren't available in 1.0.2 are used by stig.
+ # See https://github.com/rndusr/stig/issues/120
+ postPatch = ''
+ substituteInPlace setup.py \
+ --replace "urwidtrees>=1.0.3dev0" "urwidtrees"
+ '';
+
+ buildInputs = with python3.pkgs; [
+ urwid
+ urwidtrees
+ aiohttp
+ async-timeout
+ pyxdg
+ blinker
+ natsort
+ maxminddb
+ setproctitle
+ ];
+
+ checkInputs = with python3.pkgs; [
+ asynctest
+ pytest
+ ];
+
+ checkPhase = ''
+ pytest tests
+ '';
+
+ meta = with lib; {
+ description = "TUI and CLI for the BitTorrent client Transmission";
+ homepage = "https://github.com/rndusr/stig";
+ license = licenses.gpl3;
+ maintainers = with maintainers; [ doronbehar ];
+ };
+}
diff --git a/pkgs/applications/networking/sniffers/wireshark/default.nix b/pkgs/applications/networking/sniffers/wireshark/default.nix
index 643e421625f2..aa965a0c8683 100644
--- a/pkgs/applications/networking/sniffers/wireshark/default.nix
+++ b/pkgs/applications/networking/sniffers/wireshark/default.nix
@@ -1,6 +1,6 @@
{ stdenv, fetchurl, pkgconfig, pcre, perl, flex, bison, gettext, libpcap, libnl, c-ares
, gnutls, libgcrypt, libgpgerror, geoip, openssl, lua5, python3, libcap, glib
-, libssh, nghttp2, zlib, cmake, extra-cmake-modules, fetchpatch, makeWrapper
+, libssh, nghttp2, zlib, cmake, fetchpatch, makeWrapper
, withQt ? true, qt5 ? null
, ApplicationServices, SystemConfiguration, gmp
}:
@@ -29,7 +29,7 @@ in stdenv.mkDerivation {
];
nativeBuildInputs = [
- bison cmake extra-cmake-modules flex pkgconfig
+ bison cmake flex pkgconfig
] ++ optional withQt qt5.wrapQtAppsHook;
buildInputs = [
diff --git a/pkgs/applications/networking/ssb/patchwork/default.nix b/pkgs/applications/networking/ssb/patchwork/default.nix
index 40026275a1e3..8d6d5e2a4f94 100644
--- a/pkgs/applications/networking/ssb/patchwork/default.nix
+++ b/pkgs/applications/networking/ssb/patchwork/default.nix
@@ -1,13 +1,13 @@
{ appimageTools, symlinkJoin, lib, fetchurl, makeDesktopItem }:
let
- pname = "patchwork";
- version = "3.14.1";
+ pname = "ssb-patchwork";
+ version = "3.16.2";
name = "${pname}-${version}";
src = fetchurl {
- url = "https://github.com/ssbc/patchwork/releases/download/v${version}/ssb-${pname}-${version}-x86_64.AppImage";
- sha256 = "01vsldabv9nmbx8kzlgw275zykm72s1dxglnaq4jz5vbysbyn0qd";
+ url = "https://github.com/ssbc/patchwork/releases/download/v${version}/${pname}-${version}-x86_64.AppImage";
+ sha256 = "0hi9ysmwhiiww82a3mqdd2b1anj7qa41b46f6zb3q9d0b8nmvlz4";
};
binary = appimageTools.wrapType2 {
@@ -20,8 +20,8 @@ let
};
desktopItem = makeDesktopItem {
- name = "patchwork";
- exec = "${binary}/bin/patchwork";
+ name = "ssb-patchwork";
+ exec = "${binary}/bin/ssb-patchwork";
icon = "ssb-patchwork.png";
comment = "Decentralized messaging and sharing app";
desktopName = "Patchwork";
diff --git a/pkgs/applications/radio/sdrangel/default.nix b/pkgs/applications/radio/sdrangel/default.nix
new file mode 100644
index 000000000000..63e36fc9143c
--- /dev/null
+++ b/pkgs/applications/radio/sdrangel/default.nix
@@ -0,0 +1,74 @@
+{
+boost,
+cm256cc,
+cmake,
+codec2,
+fetchFromGitHub,
+fftwFloat,
+glew,
+lib,
+libav,
+libiio,
+libopus,
+libpulseaudio,
+libusb,
+limesuite,
+mkDerivation,
+ocl-icd,
+opencv3,
+pkgconfig,
+qtbase,
+qtmultimedia,
+qtwebsockets,
+serialdv
+}:
+
+let
+
+ codec2' = codec2.overrideAttrs (old: {
+ src = fetchFromGitHub {
+ owner = "drowe67";
+ repo = "codec2";
+ rev = "567346818c0d4d697773cf66d925fdb031e15668";
+ sha256 = "0ngqlh2cw5grx2lg7xj8baz6p55gfhq4caggxkb4pxlg817pwbpa";
+ };
+ });
+
+in mkDerivation rec {
+ pname = "sdrangel";
+ version = "4.11.7";
+
+ src = fetchFromGitHub {
+ owner = "f4exb";
+ repo = "sdrangel";
+ rev = "v${version}";
+ sha256 = "0zbx0gklylk8npb3wnnmqpam0pdxl40f20i3wzwwh4gqrppxywzx";
+ fetchSubmodules = false;
+ };
+
+ nativeBuildInputs = [ cmake pkgconfig ];
+ buildInputs = [
+ glew opencv3 libusb boost libopus limesuite libav libiio libpulseaudio
+ qtbase qtwebsockets qtmultimedia
+ fftwFloat
+ codec2' cm256cc serialdv
+ ];
+ cmakeFlags = [
+ "-DLIBSERIALDV_INCLUDE_DIR:PATH=${serialdv}/include/serialdv"
+ "-DLIMESUITE_INCLUDE_DIR:PATH=${limesuite}/include"
+ "-DLIMESUITE_LIBRARY:FILEPATH=${limesuite}/lib/libLimeSuite.so"
+ ];
+
+ LD_LIBRARY_PATH = "${ocl-icd}/lib";
+
+ meta = with lib; {
+ description = "Software defined radio (SDR) software";
+ longDescription = ''
+ SDRangel is an Open Source Qt5 / OpenGL 3.0+ SDR and signal analyzer frontend to various hardware.
+ '';
+ homepage = "https://github.com/f4exb/sdrangel";
+ license = licenses.gpl3Plus;
+ platforms = platforms.linux;
+ maintainers = with maintainers; [ alkeryn ];
+ };
+}
diff --git a/pkgs/applications/science/logic/stp/default.nix b/pkgs/applications/science/logic/stp/default.nix
index 5e186a395fc5..0ea659d1927f 100644
--- a/pkgs/applications/science/logic/stp/default.nix
+++ b/pkgs/applications/science/logic/stp/default.nix
@@ -1,14 +1,14 @@
{ stdenv, cmake, boost, bison, flex, fetchFromGitHub, perl, python3, python3Packages, zlib, minisatUnstable, cryptominisat }:
stdenv.mkDerivation rec {
- version = "2.2.0";
pname = "stp";
+ version = "2.3.3";
src = fetchFromGitHub {
owner = "stp";
repo = "stp";
- rev = "stp-${version}";
- sha256 = "1jh23wjm62nnqfx447g2y53bbangq04hjrvqc35v9xxpcjgj3i49";
+ rev = version;
+ sha256 = "1yg2v4wmswh1sigk47drwsxyayr472mf4i47lqmlcgn9hhbx1q87";
};
buildInputs = [ boost zlib minisatUnstable cryptominisat python3 ];
@@ -23,9 +23,8 @@ stdenv.mkDerivation rec {
)
'';
- # `make -f lib/Interface/CMakeFiles/cppinterface.dir/build.make lib/Interface/CMakeFiles/cppinterface.dir/cpp_interface.cpp.o`:
- # include/stp/AST/UsefulDefs.h:41:29: fatal error: stp/AST/ASTKind.h: No such file or directory
- enableParallelBuilding = false;
+ # seems to build fine now, may revert if concurrency does become an issue
+ enableParallelBuilding = true;
meta = with stdenv.lib; {
description = "Simple Theorem Prover";
diff --git a/pkgs/applications/science/logic/vampire/default.nix b/pkgs/applications/science/logic/vampire/default.nix
index 35be32f458c4..42963fe5f9c6 100644
--- a/pkgs/applications/science/logic/vampire/default.nix
+++ b/pkgs/applications/science/logic/vampire/default.nix
@@ -1,19 +1,16 @@
-{ stdenv, fetchFromGitHub, fetchpatch, z3, zlib, git }:
+{ stdenv, fetchFromGitHub, fetchpatch, z3, zlib }:
stdenv.mkDerivation rec {
- version = "4.2.2";
pname = "vampire";
+ version = "4.4";
src = fetchFromGitHub {
owner = "vprover";
repo = "vampire";
rev = version;
- sha256 = "03dqjxr3cwz4h6sn9074kc6b6wjz12kpsvsi0mq2w0j5l9f8d80y";
- #fetchSubmodules = true;
- #leaveDotGit = true;
+ sha256 = "0v2fdfnk7l5xr5c4y54r25g1nbp4vi85zv29nbklh3r7aws3w9q1";
};
- nativeBuildInputs = [ git ];
buildInputs = [ z3 zlib ];
makeFlags = [ "vampire_z3_rel" "CC:=$(CC)" "CXX:=$(CXX)" ];
diff --git a/pkgs/applications/version-management/blackbox/default.nix b/pkgs/applications/version-management/blackbox/default.nix
index 3f445e427a5c..8c28a6789624 100644
--- a/pkgs/applications/version-management/blackbox/default.nix
+++ b/pkgs/applications/version-management/blackbox/default.nix
@@ -1,14 +1,14 @@
{ stdenv, fetchFromGitHub }:
stdenv.mkDerivation rec {
- version = "1.20170611";
+ version = "1.20181219";
pname = "blackbox";
src = fetchFromGitHub {
owner = "stackexchange";
repo = pname;
rev = "v${version}";
- sha256 = "1jnzhlj54c0szw9l9wib07i2375pbm402bx9wagspcmwc0qw43p6";
+ sha256 = "1lpwwwc3rf992vdf3iy1ds07n1xkmad065im2bqzc6kdsbkn7rjx";
};
installPhase = ''
diff --git a/pkgs/applications/version-management/git-and-tools/qgit/default.nix b/pkgs/applications/version-management/git-and-tools/qgit/default.nix
index 06c8bb8cb2dd..74fad30b8a9a 100644
--- a/pkgs/applications/version-management/git-and-tools/qgit/default.nix
+++ b/pkgs/applications/version-management/git-and-tools/qgit/default.nix
@@ -1,22 +1,21 @@
-{ stdenv, fetchFromGitHub, cmake, qtbase }:
+{ mkDerivation, lib, fetchFromGitHub, cmake, qtbase }:
-stdenv.mkDerivation rec {
- name = "qgit-2.8";
+mkDerivation rec {
+ pname = "qgit";
+ version = "2.9";
src = fetchFromGitHub {
owner = "tibirna";
repo = "qgit";
- rev = name;
- sha256 = "01l6mz2f333x3zbfr68mizwpsh6sdsnadcavpasidiych1m5ry8f";
+ rev = "${pname}-${version}";
+ sha256 = "0n4dq9gffm9yd7n5p5qcdfgrmg2kwnfd51hfx10adgj9ibxlnc3z";
};
buildInputs = [ qtbase ];
nativeBuildInputs = [ cmake ];
- enableParallelBuilding = true;
-
- meta = with stdenv.lib; {
+ meta = with lib; {
license = licenses.gpl2;
homepage = https://github.com/tibirna/qgit;
description = "Graphical front-end to Git";
diff --git a/pkgs/applications/video/kodi/default.nix b/pkgs/applications/video/kodi/default.nix
index e5844eb827df..73bcdadbc594 100644
--- a/pkgs/applications/video/kodi/default.nix
+++ b/pkgs/applications/video/kodi/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, lib, fetchFromGitHub, autoconf, automake, libtool, makeWrapper
+{ stdenv, lib, fetchurl, fetchFromGitHub, autoconf, automake, libtool, makeWrapper, linuxHeaders
, pkgconfig, cmake, gnumake, yasm, python2Packages
, libgcrypt, libgpgerror, libunistring
, boost, avahi, lame, autoreconfHook
@@ -42,21 +42,36 @@ assert usbSupport -> libusb != null && ! udevSupport; # libusb won't be used i
assert vdpauSupport -> libvdpau != null;
assert useWayland -> wayland != null && wayland-protocols != null && waylandpp != null && libxkbcommon != null;
-# TODO for Kodi 18.0
-# - check if dbus support PR has been merged and add dbus as a buildInput
-
let
- kodiReleaseDate = "20190129";
- kodiVersion = "18.1";
+ kodiReleaseDate = "20190627";
+ kodiVersion = "18.3";
rel = "Leia";
kodi_src = fetchFromGitHub {
owner = "xbmc";
repo = "xbmc";
rev = "${kodiVersion}-${rel}";
- sha256 = "1w26aqvzxv4c70gcd1vw1pldapsc2xcacwq9b7dqx5m44j0zx1dc";
+ sha256 = "18fbl5hs3aqccrn0m3x7hp95wlafjav0yvrwmb5q3gj24mwf6jld";
};
+ cmakeProto = fetchurl {
+ url = "https://raw.githubusercontent.com/pramsey/libght/ca9b1121c352ea10170636e170040e1af015bad1/cmake/modules/CheckPrototypeExists.cmake";
+ sha256 = "1zai82gm5x55n3xvdv7mns3ja6a2k81x9zz0nk42j6s2yb0fkjxh";
+ };
+
+ cmakeProtoPatch = ''
+ # get rid of windows headers as they will otherwise be found first
+ rm -rf msvc
+
+ cp ${cmakeProto} cmake/${cmakeProto.name}
+ # we need to enable support for C++ for check_prototype_exists to do its thing
+ substituteInPlace CMakeLists.txt --replace 'LANGUAGES C' 'LANGUAGES C CXX'
+ if [ -f cmake/CheckHeadersSTDC.cmake ]; then
+ sed -i cmake/CheckHeadersSTDC.cmake \
+ -e '7iinclude(CheckPrototypeExists)'
+ fi
+ '';
+
kodiDependency = { name, version, rev, sha256, ... } @attrs:
let
attrs' = builtins.removeAttrs attrs ["name" "version" "rev" "sha256"];
@@ -83,16 +98,25 @@ let
nativeBuildInputs = [ cmake nasm pkgconfig ];
};
- # we should be able to build these externally and have kodi reference them as buildInputs.
- # Doesn't work ATM though so we just use them for the src
-
+ # We can build these externally but FindLibDvd.cmake forces us to build it
+ # them, so we currently just use them for the src.
libdvdcss = kodiDependency rec {
name = "libdvdcss";
version = "1.4.2";
rev = "${version}-${rel}-Beta-5";
sha256 = "0j41ydzx0imaix069s3z07xqw9q95k7llh06fc27dcn6f7b8ydyl";
- buildInputs = [ libdvdread ];
- nativeBuildInputs = [ autoreconfHook pkgconfig ];
+ buildInputs = [ linuxHeaders ];
+ nativeBuildInputs = [ cmake pkgconfig ];
+ postPatch = ''
+ rm -rf msvc
+
+ substituteInPlace config.h.cm \
+ --replace '#cmakedefine O_BINARY "''${O_BINARY}"' '#define O_BINARY 0'
+ '';
+ cmakeFlags = [
+ "-DBUILD_SHARED_LIBS=1"
+ "-DHAVE_LINUX_DVD_STRUCT=1"
+ ];
};
libdvdnav = kodiDependency rec {
@@ -100,8 +124,12 @@ let
version = "6.0.0";
rev = "${version}-${rel}-Alpha-3";
sha256 = "0qwlf4lgahxqxk1r2pzl866mi03pbp7l1fc0rk522sc0ak2s9jhb";
- buildInputs = [ libdvdread ];
- nativeBuildInputs = [ autoreconfHook pkgconfig ];
+ buildInputs = [ libdvdcss libdvdread ];
+ nativeBuildInputs = [ cmake pkgconfig ];
+ postPatch = cmakeProtoPatch;
+ postInstall = ''
+ mv $out/lib/liblibdvdnav.so $out/lib/libdvdnav.so
+ '';
};
libdvdread = kodiDependency rec {
@@ -109,7 +137,10 @@ let
version = "6.0.0";
rev = "${version}-${rel}-Alpha-3";
sha256 = "1xxn01mhkdnp10cqdr357wx77vyzfb5glqpqyg8m0skyi75aii59";
- nativeBuildInputs = [ autoreconfHook pkgconfig ];
+ buildInputs = [ libdvdcss ];
+ nativeBuildInputs = [ cmake pkgconfig ];
+ configureFlags = [ "--with-libdvdcss" ];
+ postPatch = cmakeProtoPatch;
};
in stdenv.mkDerivation rec {
@@ -160,7 +191,7 @@ in stdenv.mkDerivation rec {
makeWrapper
which
pkgconfig gnumake
- autoconf automake libtool # still needed for some components. Check if that is the case with 18.0
+ autoconf automake libtool # still needed for some components. Check if that is the case with 19.0
] ++ lib.optional useWayland [ wayland-protocols ];
cmakeFlags = [
diff --git a/pkgs/applications/virtualization/singularity/default.nix b/pkgs/applications/virtualization/singularity/default.nix
index beec7b92b790..60825063cabc 100644
--- a/pkgs/applications/virtualization/singularity/default.nix
+++ b/pkgs/applications/virtualization/singularity/default.nix
@@ -31,6 +31,11 @@ buildGoPackage rec {
nativeBuildInputs = [ removeReferencesTo utillinux which makeWrapper ];
propagatedBuildInputs = [ coreutils squashfsTools ];
+ prePatch = ''
+ substituteInPlace internal/pkg/build/copy/copy.go \
+ --replace /bin/cp ${coreutils}/bin/cp
+ '';
+
postConfigure = ''
cd go/src/github.com/sylabs/singularity
diff --git a/pkgs/applications/window-managers/sway/default.nix b/pkgs/applications/window-managers/sway/default.nix
index 12427b912654..215a576a578c 100644
--- a/pkgs/applications/window-managers/sway/default.nix
+++ b/pkgs/applications/window-managers/sway/default.nix
@@ -8,13 +8,13 @@
stdenv.mkDerivation rec {
pname = "sway";
- version = "1.1.1";
+ version = "1.2";
src = fetchFromGitHub {
owner = "swaywm";
repo = "sway";
rev = version;
- sha256 = "0yhn9zdg9mzfhn97c440lk3pw6122nrhx0is5sqmvgr6p814f776";
+ sha256 = "0vch2zm5afc76ia78p3vg71zr2fyda67l9hd2h0x1jq3mnvfbxnd";
};
patches = [
@@ -41,10 +41,6 @@ stdenv.mkDerivation rec {
wrapProgram $out/bin/sway --prefix PATH : "${swaybg}/bin"
'';
- postPatch = ''
- sed -i "s/version: '1.0'/version: '${version}'/" meson.build
- '';
-
meta = with stdenv.lib; {
description = "i3-compatible tiling Wayland compositor";
homepage = https://swaywm.org;
diff --git a/pkgs/misc/themes/obsidian2/default.nix b/pkgs/data/themes/obsidian2/default.nix
similarity index 77%
rename from pkgs/misc/themes/obsidian2/default.nix
rename to pkgs/data/themes/obsidian2/default.nix
index a7f640f9c56f..3a2dcea4b3a5 100644
--- a/pkgs/misc/themes/obsidian2/default.nix
+++ b/pkgs/data/themes/obsidian2/default.nix
@@ -2,24 +2,22 @@
stdenv.mkDerivation rec {
pname = "theme-obsidian2";
- version = "2.8";
+ version = "2.9";
src = fetchFromGitHub {
owner = "madmaxms";
repo = "theme-obsidian-2";
rev = "v${version}";
- sha256 = "0qryqpyxbhr0kyar2cshwhzv4da6rfz9gi4wjb6xvcb6szxhlcaq";
+ sha256 = "1m89ws2a4nms4m8187d5cxi281b66i59xa5shlp3g1r2jc4312cy";
};
propagatedUserEnvPkgs = [ gtk-engine-murrine ];
- postPatch = ''
- sed -i -e 's|Obsidian-2-Local|Obsidian-2|' Obsidian-2/index.theme
- '';
-
installPhase = ''
+ runHook preInstall
mkdir -p $out/share/themes
cp -a Obsidian-2 $out/share/themes
+ runHook postInstall
'';
meta = with stdenv.lib; {
diff --git a/pkgs/desktops/gnome-3/core/gnome-color-manager/default.nix b/pkgs/desktops/gnome-3/core/gnome-color-manager/default.nix
index b79651ea4bc7..bcc8871bcf14 100644
--- a/pkgs/desktops/gnome-3/core/gnome-color-manager/default.nix
+++ b/pkgs/desktops/gnome-3/core/gnome-color-manager/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, meson, ninja, pkgconfig, gettext, itstool, desktop-file-utils, gnome3, glib, gtk3, libexif, libtiff, colord, colord-gtk, libcanberra-gtk3, lcms2, vte, exiv2 }:
+{ stdenv, fetchurl, meson, ninja, pkgconfig, gettext, itstool, desktop-file-utils, gnome3, glib, gtk3, libexif, libtiff, colord, colord-gtk, libcanberra-gtk3, lcms2, vte, exiv2, hicolor-icon-theme }:
let
pname = "gnome-color-manager";
@@ -11,7 +11,12 @@ in stdenv.mkDerivation rec {
sha256 = "1vpxa2zjz3lkq9ldjg0fl65db9s6b4kcs8nyaqfz3jygma7ifg3w";
};
- nativeBuildInputs = [ meson ninja pkgconfig gettext itstool desktop-file-utils ];
+ nativeBuildInputs = [
+ meson ninja pkgconfig gettext itstool desktop-file-utils
+ # setup-hook
+ hicolor-icon-theme
+ ];
+
buildInputs = [ glib gtk3 libexif libtiff colord colord-gtk libcanberra-gtk3 lcms2 vte exiv2 ];
passthru = {
diff --git a/pkgs/desktops/gnome-3/core/vino/default.nix b/pkgs/desktops/gnome-3/core/vino/default.nix
index 4153a7ed9555..444c144cfab8 100644
--- a/pkgs/desktops/gnome-3/core/vino/default.nix
+++ b/pkgs/desktops/gnome-3/core/vino/default.nix
@@ -1,29 +1,85 @@
-{ stdenv, fetchurl, lib, wrapGAppsHook
-, pkgconfig, gnome3, gtk3, glib, intltool, libXtst, libnotify, libsoup
-, telepathySupport ? false, dbus-glib ? null, telepathy-glib ? null
-, libsecret, gnutls, libgcrypt, avahi, zlib, libjpeg, libXdamage, libXfixes, libXext
-, networkmanager }:
-
-with lib;
+{ stdenv
+, fetchFromGitLab
+, wrapGAppsHook
+, pkgconfig
+, gnome3
+, gtk3
+, glib
+, intltool
+, libXtst
+, libnotify
+, libsoup
+, libsecret
+, gnutls
+, libgcrypt
+, avahi
+, zlib
+, libjpeg
+, libXdamage
+, libXfixes
+, libXext
+, networkmanager
+, gnome-common
+, libtool
+, automake
+, autoconf
+, telepathySupport ? false
+, dbus-glib ? null
+, telepathy-glib ? null
+}:
stdenv.mkDerivation rec {
pname = "vino";
- version = "3.22.0";
+ version = "unstable-2019-07-08";
- src = fetchurl {
- url = "mirror://gnome/sources/vino/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
- sha256 = "2911c779b6a2c46e5bc8e5a0c94c2a4d5bd4a1ee7e35f2818702cb13d9d23bab";
+ src = fetchFromGitLab {
+ domain = "gitlab.gnome.org";
+ owner = "GNOME";
+ repo = "vino";
+ rev = "aed81a798558c8127b765cd4fb4dc726d10f1e21";
+ sha256 = "16r4cj5nsygmd9v97nq6d1yhynzak9hdnaprcdbmwfhh0c9w8jv3";
};
doCheck = true;
- nativeBuildInputs = [ intltool wrapGAppsHook pkgconfig ];
+ nativeBuildInputs = [
+ autoconf
+ automake
+ gnome-common
+ intltool
+ libtool
+ pkgconfig
+ wrapGAppsHook
+ ];
buildInputs = [
- gnome3.adwaita-icon-theme gtk3 glib libXtst libnotify libsoup
- libsecret gnutls libgcrypt avahi zlib libjpeg
- libXdamage libXfixes libXext networkmanager
- ] ++ optionals telepathySupport [ dbus-glib telepathy-glib ];
+ avahi
+ glib
+ gnome3.adwaita-icon-theme
+ gnutls
+ gtk3
+ libXdamage
+ libXext
+ libXfixes
+ libXtst
+ libgcrypt
+ libjpeg
+ libnotify
+ libsecret
+ libsoup
+ networkmanager
+ zlib
+ ]
+ ++ stdenv.lib.optionals telepathySupport [ dbus-glib telepathy-glib ]
+ ;
+
+ preConfigure = ''
+ NOCONFIGURE=1 ./autogen.sh
+ '';
+
+ postInstall = stdenv.lib.optionalString (!telepathySupport) ''
+ rm -f $out/share/dbus-1/services/org.freedesktop.Telepathy.Client.Vino.service
+ '';
passthru = {
updateScript = gnome3.updateScript {
@@ -35,7 +91,7 @@ stdenv.mkDerivation rec {
meta = with stdenv.lib; {
homepage = https://wiki.gnome.org/Projects/Vino;
description = "GNOME desktop sharing server";
- maintainers = with maintainers; [ lethalman domenkozar ];
+ maintainers = gnome3.maintainers;
license = licenses.gpl2;
platforms = platforms.linux;
};
diff --git a/pkgs/desktops/gnome-3/default.nix b/pkgs/desktops/gnome-3/default.nix
index 7820c32e2a69..1f16ff9d0b52 100644
--- a/pkgs/desktops/gnome-3/default.nix
+++ b/pkgs/desktops/gnome-3/default.nix
@@ -21,36 +21,6 @@ lib.makeScope pkgs.newScope (self: with self; {
maintainers = with pkgs.lib.maintainers; [ lethalman jtojnar hedning worldofpeace ];
- corePackages = with gnome3; [
- pkgs.desktop-file-utils
- pkgs.shared-mime-info # for update-mime-database
- pkgs.glib # for gsettings
- pkgs.gtk3.out # for gtk-update-icon-cache
- glib-networking gvfs dconf gnome-backgrounds gnome-control-center
- pkgs.gnome-menus gnome-settings-daemon gnome-shell
- gnome-themes-extra adwaita-icon-theme gnome-shell-extensions
- pkgs.hicolor-icon-theme
- ];
-
- optionalPackages = with gnome3; [ baobab eog epiphany evince
- gucharmap nautilus totem vino yelp gnome-bluetooth
- gnome-calculator gnome-contacts gnome-font-viewer gnome-screenshot
- gnome-system-monitor simple-scan
- gnome-terminal gnome-user-docs evolution file-roller gedit
- gnome-clocks gnome-music gnome-tweaks pkgs.gnome-photos
- nautilus-sendto dconf-editor vinagre gnome-weather gnome-logs
- gnome-maps gnome-characters gnome-calendar accerciser gnome-nettool
- gnome-getting-started-docs gnome-packagekit gnome-software
- gnome-power-manager gnome-todo pkgs.gnome-usage
- ];
-
- gamesPackages = with gnome3; [ swell-foop lightsoff iagno
- tali quadrapassel gnome-sudoku atomix aisleriot five-or-more
- four-in-a-row gnome-chess gnome-klotski gnome-mahjongg
- gnome-mines gnome-nibbles gnome-robots gnome-tetravex
- hitori gnome-taquin
- ];
-
libsoup = pkgs.libsoup.override { gnomeSupport = true; };
libchamplain = pkgs.libchamplain.override { libsoup = libsoup; };
gnome3 = self // { recurseForDerivations = false; };
@@ -385,4 +355,9 @@ lib.makeScope pkgs.newScope (self: with self; {
rest = librest;
pidgin-im-gnome-shell-extension = pkgs.gnomeExtensions.pidgin-im-integration; # added 2019-08-01
+
+ # added 2019-08-25
+ corePackages = throw "deprecated 2019-08-25: please use `services.gnome3.core-shell.enable`";
+ optionalPackages = throw "deprecated 2019-08-25: please use `services.gnome3.core-utilities.enable`";
+ gamesPackages = throw "deprecated 2019-08-25: please use `services.gnome3.games.enable`";
})
diff --git a/pkgs/desktops/lxqt/compton-conf/default.nix b/pkgs/desktops/lxqt/compton-conf/default.nix
index f5331751c709..e639996f7c6a 100644
--- a/pkgs/desktops/lxqt/compton-conf/default.nix
+++ b/pkgs/desktops/lxqt/compton-conf/default.nix
@@ -1,7 +1,7 @@
-{ stdenv, fetchFromGitHub, cmake, pkgconfig, qtbase, qttools, lxqt,
+{ lib, mkDerivation, fetchFromGitHub, cmake, pkgconfig, qtbase, qttools, lxqt,
libconfig }:
-stdenv.mkDerivation rec {
+mkDerivation rec {
pname = "compton-conf";
version = "0.14.1";
@@ -29,7 +29,7 @@ stdenv.mkDerivation rec {
--replace "DESTINATION \"\''${LXQT_ETC_XDG_DIR}" "DESTINATION \"etc/xdg" \
'';
- meta = with stdenv.lib; {
+ meta = with lib; {
description = "GUI configuration tool for compton X composite manager";
homepage = https://github.com/lxqt/compton-conf;
license = licenses.lgpl21;
diff --git a/pkgs/desktops/lxqt/libfm-qt/default.nix b/pkgs/desktops/lxqt/libfm-qt/default.nix
index 3ce1ea068a71..c214f0b3dcd4 100644
--- a/pkgs/desktops/lxqt/libfm-qt/default.nix
+++ b/pkgs/desktops/lxqt/libfm-qt/default.nix
@@ -1,10 +1,10 @@
{
- stdenv, fetchFromGitHub, cmake, pkgconfig, lxqt-build-tools,
+ lib, mkDerivation, fetchFromGitHub, cmake, pkgconfig, lxqt-build-tools,
pcre, libexif, xorg, libfm, menu-cache,
qtx11extras, qttools
}:
-stdenv.mkDerivation rec {
+mkDerivation rec {
pname = "libfm-qt";
version = "0.14.1";
@@ -33,7 +33,7 @@ stdenv.mkDerivation rec {
menu-cache
];
- meta = with stdenv.lib; {
+ meta = with lib; {
description = "Core library of PCManFM-Qt (Qt binding for libfm)";
homepage = https://github.com/lxqt/libfm-qt;
license = licenses.lgpl21;
diff --git a/pkgs/desktops/lxqt/liblxqt/default.nix b/pkgs/desktops/lxqt/liblxqt/default.nix
index 193358605995..d94b1ac0d030 100644
--- a/pkgs/desktops/lxqt/liblxqt/default.nix
+++ b/pkgs/desktops/lxqt/liblxqt/default.nix
@@ -1,7 +1,7 @@
-{ stdenv, fetchFromGitHub, cmake, lxqt-build-tools, qtx11extras,
+{ lib, mkDerivation, fetchFromGitHub, cmake, lxqt-build-tools, qtx11extras,
qttools, qtsvg, libqtxdg, polkit-qt, kwindowsystem, xorg }:
-stdenv.mkDerivation rec {
+mkDerivation rec {
pname = "liblxqt";
version = "0.14.1";
@@ -27,18 +27,11 @@ stdenv.mkDerivation rec {
xorg.libXScrnSaver
];
- cmakeFlags = [
- "-DLXQT_ETC_XDG_DIR=/run/current-system/sw/etc/xdg"
- ];
-
postPatch = ''
- sed -i 's|set(LXQT_SHARE_DIR .*)|set(LXQT_SHARE_DIR "/run/current-system/sw/share/lxqt")|' CMakeLists.txt
sed -i "s|\''${POLKITQT-1_POLICY_FILES_INSTALL_DIR}|''${out}/share/polkit-1/actions|" CMakeLists.txt
- substituteInPlace CMakeLists.txt \
- --replace "\''${LXQT_TRANSLATIONS_DIR}" "''${out}/share/lxqt/translations"
'';
- meta = with stdenv.lib; {
+ meta = with lib; {
description = "Core utility library for all LXQt components";
homepage = https://github.com/lxqt/liblxqt;
license = licenses.lgpl21Plus;
diff --git a/pkgs/desktops/lxqt/libqtxdg/default.nix b/pkgs/desktops/lxqt/libqtxdg/default.nix
index d351f3e0d6e1..799e4286803b 100644
--- a/pkgs/desktops/lxqt/libqtxdg/default.nix
+++ b/pkgs/desktops/lxqt/libqtxdg/default.nix
@@ -1,6 +1,6 @@
-{ stdenv, fetchFromGitHub, cmake, qtbase, qtsvg, lxqt-build-tools }:
+{ lib, mkDerivation, fetchFromGitHub, cmake, qtbase, qtsvg, lxqt-build-tools }:
-stdenv.mkDerivation rec {
+mkDerivation rec {
pname = "libqtxdg";
version = "3.3.1";
@@ -23,7 +23,7 @@ stdenv.mkDerivation rec {
)
'';
- meta = with stdenv.lib; {
+ meta = with lib; {
description = "Qt implementation of freedesktop.org xdg specs";
homepage = https://github.com/lxqt/libqtxdg;
license = licenses.lgpl21;
diff --git a/pkgs/desktops/lxqt/libsysstat/default.nix b/pkgs/desktops/lxqt/libsysstat/default.nix
index 74fa1b03fa6b..dc2ce54d6ae6 100644
--- a/pkgs/desktops/lxqt/libsysstat/default.nix
+++ b/pkgs/desktops/lxqt/libsysstat/default.nix
@@ -1,6 +1,6 @@
-{ stdenv, fetchFromGitHub, cmake, qtbase, lxqt-build-tools }:
+{ lib, mkDerivation, fetchFromGitHub, cmake, qtbase, lxqt-build-tools }:
-stdenv.mkDerivation rec {
+mkDerivation rec {
pname = "libsysstat";
version = "0.4.2";
@@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
buildInputs = [ qtbase ];
- meta = with stdenv.lib; {
+ meta = with lib; {
description = "Library used to query system info and statistics";
homepage = https://github.com/lxqt/libsysstat;
license = licenses.lgpl21Plus;
diff --git a/pkgs/desktops/lxqt/lximage-qt/default.nix b/pkgs/desktops/lxqt/lximage-qt/default.nix
index affa0cc8c9d6..33e6a1f99e5c 100644
--- a/pkgs/desktops/lxqt/lximage-qt/default.nix
+++ b/pkgs/desktops/lxqt/lximage-qt/default.nix
@@ -1,7 +1,7 @@
-{ stdenv, fetchFromGitHub, cmake, pkgconfig, qtbase, qttools,
+{ lib, mkDerivation, fetchFromGitHub, cmake, pkgconfig, qtbase, qttools,
qtx11extras, qtsvg, xorg, lxqt-build-tools, libfm-qt, libexif }:
-stdenv.mkDerivation rec {
+mkDerivation rec {
pname = "lximage-qt";
version = "0.14.1";
@@ -29,7 +29,7 @@ stdenv.mkDerivation rec {
libexif
];
- meta = with stdenv.lib; {
+ meta = with lib; {
description = "The image viewer and screenshot tool for lxqt";
homepage = https://github.com/lxqt/lximage-qt;
license = licenses.gpl2;
diff --git a/pkgs/desktops/lxqt/lxqt-about/default.nix b/pkgs/desktops/lxqt/lxqt-about/default.nix
index 7778eb92263c..595141daffc7 100644
--- a/pkgs/desktops/lxqt/lxqt-about/default.nix
+++ b/pkgs/desktops/lxqt/lxqt-about/default.nix
@@ -1,6 +1,6 @@
-{ stdenv, fetchFromGitHub, cmake, lxqt-build-tools, qtx11extras, qttools, qtsvg, kwindowsystem, liblxqt, libqtxdg }:
+{ lib, mkDerivation, fetchFromGitHub, cmake, lxqt-build-tools, qtx11extras, qttools, qtsvg, kwindowsystem, liblxqt, libqtxdg }:
-stdenv.mkDerivation rec {
+mkDerivation rec {
pname = "lxqt-about";
version = "0.14.1";
@@ -25,12 +25,7 @@ stdenv.mkDerivation rec {
libqtxdg
];
- postPatch = ''
- substituteInPlace CMakeLists.txt \
- --replace "\''${LXQT_TRANSLATIONS_DIR}" "''${out}/share/lxqt/translations"
- '';
-
- meta = with stdenv.lib; {
+ meta = with lib; {
description = "Dialogue window providing information about LXQt and the system it's running on";
homepage = https://github.com/lxqt/lxqt-about;
license = licenses.lgpl21;
diff --git a/pkgs/desktops/lxqt/lxqt-admin/default.nix b/pkgs/desktops/lxqt/lxqt-admin/default.nix
index 5ea6b0d08824..a49bb120791a 100644
--- a/pkgs/desktops/lxqt/lxqt-admin/default.nix
+++ b/pkgs/desktops/lxqt/lxqt-admin/default.nix
@@ -1,6 +1,6 @@
-{ stdenv, fetchFromGitHub, cmake, lxqt-build-tools, qtx11extras, qttools, qtsvg, kwindowsystem, liblxqt, libqtxdg, polkit-qt }:
+{ lib, mkDerivation, fetchFromGitHub, cmake, lxqt-build-tools, qtx11extras, qttools, qtsvg, kwindowsystem, liblxqt, libqtxdg, polkit-qt }:
-stdenv.mkDerivation rec {
+mkDerivation rec {
pname = "lxqt-admin";
version = "0.14.1";
@@ -29,14 +29,9 @@ stdenv.mkDerivation rec {
postPatch = ''
sed "s|\''${POLKITQT-1_POLICY_FILES_INSTALL_DIR}|''${out}/share/polkit-1/actions|" \
-i lxqt-admin-user/CMakeLists.txt
-
- for f in lxqt-admin-{user,time}/CMakeLists.txt; do
- substituteInPlace $f \
- --replace "\''${LXQT_TRANSLATIONS_DIR}" "''${out}/share/lxqt/translations"
- done
'';
- meta = with stdenv.lib; {
+ meta = with lib; {
description = "LXQt system administration tool";
homepage = https://github.com/lxqt/lxqt-admin;
license = licenses.lgpl21;
diff --git a/pkgs/desktops/lxqt/lxqt-archiver/default.nix b/pkgs/desktops/lxqt/lxqt-archiver/default.nix
index fee4e02dd302..da90826116f2 100644
--- a/pkgs/desktops/lxqt/lxqt-archiver/default.nix
+++ b/pkgs/desktops/lxqt/lxqt-archiver/default.nix
@@ -1,6 +1,6 @@
-{ stdenv, fetchFromGitHub, cmake, pkgconfig, lxqt-build-tools, json-glib, libfm-qt, qtbase, qttools, qtx11extras }:
+{ lib, mkDerivation, fetchFromGitHub, cmake, pkgconfig, lxqt-build-tools, json-glib, libfm-qt, qtbase, qttools, qtx11extras }:
-stdenv.mkDerivation rec {
+mkDerivation rec {
pname = "lxqt-archiver";
version = "0.0.96";
@@ -29,7 +29,7 @@ stdenv.mkDerivation rec {
hardeningDisable = [ "format" ];
- meta = with stdenv.lib; {
+ meta = with lib; {
description = "Archive tool for the LXQt desktop environment";
homepage = https://github.com/lxqt/lxqt-archiver/;
license = licenses.gpl2;
diff --git a/pkgs/desktops/lxqt/lxqt-build-tools/LXQtConfigVars.cmake b/pkgs/desktops/lxqt/lxqt-build-tools/LXQtConfigVars.cmake
new file mode 100644
index 000000000000..fd7ef927f8b3
--- /dev/null
+++ b/pkgs/desktops/lxqt/lxqt-build-tools/LXQtConfigVars.cmake
@@ -0,0 +1,7 @@
+add_definitions("-DLXQT_RELATIVE_SHARE_DIR=\"${LXQT_RELATIVE_SHARE_DIR}\"")
+add_definitions("-DLXQT_SHARE_DIR=\"${LXQT_SHARE_DIR}\"")
+add_definitions("-DLXQT_RELATIVE_SHARE_TRANSLATIONS_DIR=\"${LXQT_RELATIVE_TRANSLATIONS_DIR}\"")
+add_definitions("-DLXQT_SHARE_TRANSLATIONS_DIR=\"${LXQT_TRANSLATIONS_DIR}\"")
+add_definitions("-DLXQT_GRAPHICS_DIR=\"${LXQT_GRAPHICS_DIR}\"")
+add_definitions("-DLXQT_ETC_XDG_DIR=\"${LXQT_ETC_XDG_DIR}\"")
+add_definitions("-DLXQT_DATA_DIR=\"${LXQT_DATA_DIR}\"")
diff --git a/pkgs/desktops/lxqt/lxqt-build-tools/default.nix b/pkgs/desktops/lxqt/lxqt-build-tools/default.nix
index f55fa579ff45..626c99fcf9c9 100644
--- a/pkgs/desktops/lxqt/lxqt-build-tools/default.nix
+++ b/pkgs/desktops/lxqt/lxqt-build-tools/default.nix
@@ -1,6 +1,6 @@
-{ stdenv, fetchFromGitHub, cmake, pkgconfig, pcre, qtbase, glib }:
+{ lib, mkDerivation, fetchFromGitHub, cmake, pkgconfig, pcre, qtbase, glib }:
-stdenv.mkDerivation rec {
+mkDerivation rec {
pname = "lxqt-build-tools";
version = "0.6.0";
@@ -11,13 +11,20 @@ stdenv.mkDerivation rec {
sha256 = "0i7m9s4g5rsw28vclc9nh0zcapx85cqfwxkx7rrw7wa12svy7pm2";
};
- nativeBuildInputs = [ cmake pkgconfig ];
+ nativeBuildInputs = [ cmake pkgconfig setupHook ];
buildInputs = [ qtbase glib pcre ];
- preConfigure = ''cmakeFlags+=" -DLXQT_ETC_XDG_DIR=$out/etc/xdg"'';
+ setupHook = ./setup-hook.sh;
- meta = with stdenv.lib; {
+ # We're dependent on this macro doing add_definitions in most places
+ # But we have the setup-hook to set the values.
+ postInstall = ''
+ rm $out/share/cmake/lxqt-build-tools/modules/LXQtConfigVars.cmake
+ cp ${./LXQtConfigVars.cmake} $out/share/cmake/lxqt-build-tools/modules/LXQtConfigVars.cmake
+ '';
+
+ meta = with lib; {
description = "Various packaging tools and scripts for LXQt applications";
homepage = https://github.com/lxqt/lxqt-build-tools;
license = licenses.lgpl21;
diff --git a/pkgs/desktops/lxqt/lxqt-build-tools/setup-hook.sh b/pkgs/desktops/lxqt/lxqt-build-tools/setup-hook.sh
new file mode 100644
index 000000000000..e40765116e9c
--- /dev/null
+++ b/pkgs/desktops/lxqt/lxqt-build-tools/setup-hook.sh
@@ -0,0 +1,15 @@
+LXQtCMakePostHook() {
+ cmakeFlagsArray+=(
+ -DLXQT_LIBRARY_NAME=lxqt
+ -DLXQT_SHARE_DIR=$out/share/lxqt
+ -DLXQT_TRANSLATIONS_DIR=$out/share/lxqt/translations
+ -DLXQT_GRAPHICS_DIR=$out/share/lxqt/graphics
+ -DLXQT_ETC_XDG_DIR=$out/etc/xdg
+ -DLXQT_DATA_DIR=$out/share
+ -DLXQT_RELATIVE_SHARE_DIR=lxqt
+ -DLXQT_RELATIVE_SHARE_TRANSLATIONS_DIR=lxqt/translations
+ )
+
+}
+
+postHooks+=(LXQtCMakePostHook)
diff --git a/pkgs/desktops/lxqt/lxqt-config/default.nix b/pkgs/desktops/lxqt/lxqt-config/default.nix
index e7ba00bc8a89..d775a93fff4c 100644
--- a/pkgs/desktops/lxqt/lxqt-config/default.nix
+++ b/pkgs/desktops/lxqt/lxqt-config/default.nix
@@ -1,8 +1,8 @@
-{ stdenv, fetchFromGitHub, cmake, pkgconfig, lxqt-build-tools, qtbase,
+{ lib, mkDerivation, fetchFromGitHub, cmake, pkgconfig, lxqt-build-tools, qtbase,
qtx11extras, qttools, qtsvg, kwindowsystem, libkscreen, liblxqt,
libqtxdg, xorg }:
-stdenv.mkDerivation rec {
+mkDerivation rec {
pname = "lxqt-config";
version = "0.14.1";
@@ -38,27 +38,10 @@ stdenv.mkDerivation rec {
];
postPatch = ''
- substituteInPlace src/CMakeLists.txt \
- --replace "DESTINATION \"\''${LXQT_ETC_XDG_DIR}" "DESTINATION \"etc/xdg"
-
- for f in \
- lxqt-config-file-associations/CMakeLists.txt \
- lxqt-config-brightness/CMakeLists.txt \
- lxqt-config-appearance/CMakeLists.txt \
- lxqt-config-locale/CMakeLists.txt \
- lxqt-config-monitor/CMakeLists.txt \
- lxqt-config-input/CMakeLists.txt \
- liblxqt-config-cursor/CMakeLists.txt \
- src/CMakeLists.txt
- do
- substituteInPlace $f \
- --replace "\''${LXQT_TRANSLATIONS_DIR}" "''${out}/share/lxqt/translations"
- done
-
sed -i "/\''${XORG_LIBINPUT_INCLUDE_DIRS}/a ${xorg.xf86inputlibinput.dev}/include/xorg" lxqt-config-input/CMakeLists.txt
'';
- meta = with stdenv.lib; {
+ meta = with lib; {
description = "Tools to configure LXQt and the underlying operating system";
homepage = https://github.com/lxqt/lxqt-config;
license = licenses.lgpl21;
diff --git a/pkgs/desktops/lxqt/lxqt-globalkeys/default.nix b/pkgs/desktops/lxqt/lxqt-globalkeys/default.nix
index 0502426e82df..d836ddeea38f 100644
--- a/pkgs/desktops/lxqt/lxqt-globalkeys/default.nix
+++ b/pkgs/desktops/lxqt/lxqt-globalkeys/default.nix
@@ -1,6 +1,6 @@
-{ stdenv, fetchFromGitHub, cmake, lxqt-build-tools, qtbase, qttools, qtx11extras, qtsvg, kwindowsystem, liblxqt, libqtxdg }:
+{ lib, mkDerivation, fetchFromGitHub, cmake, lxqt-build-tools, qtbase, qttools, qtx11extras, qtsvg, kwindowsystem, liblxqt, libqtxdg }:
-stdenv.mkDerivation rec {
+mkDerivation rec {
pname = "lxqt-globalkeys";
version = "0.14.1";
@@ -26,17 +26,7 @@ stdenv.mkDerivation rec {
libqtxdg
];
- postPatch = ''
- for dir in autostart xdg; do
- substituteInPlace $dir/CMakeLists.txt \
- --replace "DESTINATION \"\''${LXQT_ETC_XDG_DIR}" "DESTINATION \"etc/xdg"
- done
-
- substituteInPlace config/CMakeLists.txt \
- --replace "\''${LXQT_TRANSLATIONS_DIR}" "''${out}/share/lxqt/translations"
- '';
-
- meta = with stdenv.lib; {
+ meta = with lib; {
description = "Daemon used to register global keyboard shortcuts";
homepage = https://github.com/lxqt/lxqt-globalkeys;
license = licenses.lgpl21;
diff --git a/pkgs/desktops/lxqt/lxqt-notificationd/default.nix b/pkgs/desktops/lxqt/lxqt-notificationd/default.nix
index 7eed84b33908..81a6a423a210 100644
--- a/pkgs/desktops/lxqt/lxqt-notificationd/default.nix
+++ b/pkgs/desktops/lxqt/lxqt-notificationd/default.nix
@@ -1,6 +1,6 @@
-{ stdenv, fetchFromGitHub, cmake, lxqt-build-tools, qtbase, qttools, qtsvg, kwindowsystem, liblxqt, libqtxdg, qtx11extras }:
+{ lib, mkDerivation, fetchFromGitHub, cmake, lxqt-build-tools, qtbase, qttools, qtsvg, kwindowsystem, liblxqt, libqtxdg, qtx11extras }:
-stdenv.mkDerivation rec {
+mkDerivation rec {
pname = "lxqt-notificationd";
version = "0.14.1";
@@ -16,16 +16,6 @@ stdenv.mkDerivation rec {
lxqt-build-tools
];
- postPatch = ''
- substituteInPlace autostart/CMakeLists.txt \
- --replace "DESTINATION \"\''${LXQT_ETC_XDG_DIR}" "DESTINATION \"etc/xdg"
-
- for f in {config,src}/CMakeLists.txt; do
- substituteInPlace $f \
- --replace "\''${LXQT_TRANSLATIONS_DIR}" "''${out}/share/lxqt/translations"
- done
- '';
-
buildInputs = [
qtbase
qttools
@@ -36,7 +26,7 @@ stdenv.mkDerivation rec {
qtx11extras
];
- meta = with stdenv.lib; {
+ meta = with lib; {
description = "The LXQt notification daemon";
homepage = https://github.com/lxqt/lxqt-notificationd;
license = licenses.lgpl21;
diff --git a/pkgs/desktops/lxqt/lxqt-openssh-askpass/default.nix b/pkgs/desktops/lxqt/lxqt-openssh-askpass/default.nix
index 7ba2f00b5c58..83048ed7d578 100644
--- a/pkgs/desktops/lxqt/lxqt-openssh-askpass/default.nix
+++ b/pkgs/desktops/lxqt/lxqt-openssh-askpass/default.nix
@@ -1,6 +1,6 @@
-{ stdenv, fetchFromGitHub, cmake, lxqt-build-tools, qtbase, qttools, qtsvg, qtx11extras, kwindowsystem, liblxqt, libqtxdg }:
+{ lib, mkDerivation, fetchFromGitHub, cmake, lxqt-build-tools, qtbase, qttools, qtsvg, qtx11extras, kwindowsystem, liblxqt, libqtxdg }:
-stdenv.mkDerivation rec {
+mkDerivation rec {
pname = "lxqt-openssh-askpass";
version = "0.14.1";
@@ -26,12 +26,7 @@ stdenv.mkDerivation rec {
libqtxdg
];
- postPatch = ''
- substituteInPlace CMakeLists.txt \
- --replace "\''${LXQT_TRANSLATIONS_DIR}" "''${out}/share/lxqt/translations"
- '';
-
- meta = with stdenv.lib; {
+ meta = with lib; {
description = "GUI to query passwords on behalf of SSH agents";
homepage = https://github.com/lxqt/lxqt-openssh-askpass;
license = licenses.lgpl21;
diff --git a/pkgs/desktops/lxqt/lxqt-panel/default.nix b/pkgs/desktops/lxqt/lxqt-panel/default.nix
index 4363c9f83920..4558d36e554e 100644
--- a/pkgs/desktops/lxqt/lxqt-panel/default.nix
+++ b/pkgs/desktops/lxqt/lxqt-panel/default.nix
@@ -1,5 +1,5 @@
{
- stdenv, fetchFromGitHub,
+ lib, mkDerivation, fetchFromGitHub,
cmake, pkgconfig, lxqt-build-tools,
qtbase, qttools, qtx11extras, qtsvg, libdbusmenu, kwindowsystem, solid,
kguiaddons, liblxqt, libqtxdg, lxqt-globalkeys, libsysstat,
@@ -7,7 +7,7 @@
lxmenu-data, pcre, libXdamage
}:
-stdenv.mkDerivation rec {
+mkDerivation rec {
pname = "lxqt-panel";
version = "0.14.1";
@@ -49,21 +49,7 @@ stdenv.mkDerivation rec {
libXdamage
];
- postPatch = ''
- for dir in autostart menu; do
- substituteInPlace $dir/CMakeLists.txt \
- --replace "DESTINATION \"\''${LXQT_ETC_XDG_DIR}" "DESTINATION \"etc/xdg"
- done
- substituteInPlace panel/CMakeLists.txt \
- --replace "DESTINATION \''${LXQT_ETC_XDG_DIR}" "DESTINATION etc/xdg"
-
- for f in cmake/BuildPlugin.cmake panel/CMakeLists.txt; do
- substituteInPlace $f \
- --replace "\''${LXQT_TRANSLATIONS_DIR}" "''${out}/share/lxqt/translations"
- done
- '';
-
- meta = with stdenv.lib; {
+ meta = with lib; {
description = "The LXQt desktop panel";
homepage = https://github.com/lxqt/lxqt-panel;
license = licenses.lgpl21;
diff --git a/pkgs/desktops/lxqt/lxqt-policykit/default.nix b/pkgs/desktops/lxqt/lxqt-policykit/default.nix
index 792a323e6820..d501d83947ec 100644
--- a/pkgs/desktops/lxqt/lxqt-policykit/default.nix
+++ b/pkgs/desktops/lxqt/lxqt-policykit/default.nix
@@ -1,10 +1,10 @@
{
- stdenv, fetchFromGitHub, cmake, pkgconfig, lxqt-build-tools,
+ lib, mkDerivation, fetchFromGitHub, cmake, pkgconfig, lxqt-build-tools,
qtbase, qttools, qtx11extras, qtsvg, polkit-qt, kwindowsystem, liblxqt,
libqtxdg, pcre
}:
-stdenv.mkDerivation rec {
+mkDerivation rec {
pname = "lxqt-policykit";
version = "0.14.1";
@@ -33,15 +33,7 @@ stdenv.mkDerivation rec {
pcre
];
- postPatch = ''
- substituteInPlace autostart/CMakeLists.txt \
- --replace "DESTINATION \"\''${LXQT_ETC_XDG_DIR}" "DESTINATION \"etc/xdg"
-
- substituteInPlace CMakeLists.txt \
- --replace "\''${LXQT_TRANSLATIONS_DIR}" "''${out}/share/lxqt/translations"
- '';
-
- meta = with stdenv.lib; {
+ meta = with lib; {
description = "The LXQt PolicyKit agent";
homepage = https://github.com/lxqt/lxqt-policykit;
license = licenses.lgpl21;
diff --git a/pkgs/desktops/lxqt/lxqt-powermanagement/default.nix b/pkgs/desktops/lxqt/lxqt-powermanagement/default.nix
index 6bdf5ce2c0c6..9f8c66d826c5 100644
--- a/pkgs/desktops/lxqt/lxqt-powermanagement/default.nix
+++ b/pkgs/desktops/lxqt/lxqt-powermanagement/default.nix
@@ -1,6 +1,6 @@
-{ stdenv, fetchFromGitHub, cmake, lxqt-build-tools, qtbase, qttools, qtx11extras, qtsvg, kwindowsystem, solid, kidletime, liblxqt, libqtxdg }:
+{ lib, mkDerivation, fetchFromGitHub, cmake, lxqt-build-tools, qtbase, qttools, qtx11extras, qtsvg, kwindowsystem, solid, kidletime, liblxqt, libqtxdg }:
-stdenv.mkDerivation rec {
+mkDerivation rec {
pname = "lxqt-powermanagement";
version = "0.14.1";
@@ -28,17 +28,7 @@ stdenv.mkDerivation rec {
libqtxdg
];
- postPatch = ''
- substituteInPlace autostart/CMakeLists.txt \
- --replace "DESTINATION \"\''${LXQT_ETC_XDG_DIR}" "DESTINATION \"etc/xdg"
-
- for f in {config,src}/CMakeLists.txt; do
- substituteInPlace $f \
- --replace "\''${LXQT_TRANSLATIONS_DIR}" "''${out}/share/lxqt/translations"
- done
- '';
-
- meta = with stdenv.lib; {
+ meta = with lib; {
description = "Power management module for LXQt";
homepage = https://github.com/lxqt/lxqt-powermanagement;
license = licenses.lgpl21;
diff --git a/pkgs/desktops/lxqt/lxqt-qtplugin/default.nix b/pkgs/desktops/lxqt/lxqt-qtplugin/default.nix
index 82f393cf8d52..604fc570e1fb 100644
--- a/pkgs/desktops/lxqt/lxqt-qtplugin/default.nix
+++ b/pkgs/desktops/lxqt/lxqt-qtplugin/default.nix
@@ -1,10 +1,10 @@
{
- stdenv, fetchFromGitHub,
+ lib, mkDerivation, fetchFromGitHub,
cmake, lxqt-build-tools,
qtbase, qtx11extras, qttools, qtsvg, libdbusmenu, libqtxdg, libfm-qt
}:
-stdenv.mkDerivation rec {
+mkDerivation rec {
pname = "lxqt-qtplugin";
version = "0.14.0";
@@ -35,7 +35,7 @@ stdenv.mkDerivation rec {
--replace "DESTINATION \"\''${QT_PLUGINS_DIR}" "DESTINATION \"$qtPluginPrefix"
'';
- meta = with stdenv.lib; {
+ meta = with lib; {
description = "LXQt Qt platform integration plugin";
homepage = https://github.com/lxqt/lxqt-qtplugin;
license = licenses.lgpl21;
diff --git a/pkgs/desktops/lxqt/lxqt-runner/default.nix b/pkgs/desktops/lxqt/lxqt-runner/default.nix
index 54236bfbb7ef..d737bd91c916 100644
--- a/pkgs/desktops/lxqt/lxqt-runner/default.nix
+++ b/pkgs/desktops/lxqt/lxqt-runner/default.nix
@@ -1,7 +1,7 @@
-{ stdenv, fetchFromGitHub, cmake, pkgconfig, lxqt-build-tools, qtbase, qttools, qtsvg, kwindowsystem, liblxqt, libqtxdg, lxqt-globalkeys, qtx11extras,
+{ lib, mkDerivation, fetchFromGitHub, cmake, pkgconfig, lxqt-build-tools, qtbase, qttools, qtsvg, kwindowsystem, liblxqt, libqtxdg, lxqt-globalkeys, qtx11extras,
menu-cache, muparser, pcre }:
-stdenv.mkDerivation rec {
+mkDerivation rec {
pname = "lxqt-runner";
version = "0.14.1";
@@ -32,15 +32,7 @@ stdenv.mkDerivation rec {
pcre
];
- postPatch = ''
- substituteInPlace autostart/CMakeLists.txt \
- --replace "DESTINATION \"\''${LXQT_ETC_XDG_DIR}" "DESTINATION \"etc/xdg"
-
- substituteInPlace CMakeLists.txt \
- --replace "\''${LXQT_TRANSLATIONS_DIR}" "''${out}/share/lxqt/translations"
- '';
-
- meta = with stdenv.lib; {
+ meta = with lib; {
description = "Tool used to launch programs quickly by typing their names";
homepage = https://github.com/lxqt/lxqt-runner;
license = licenses.lgpl21;
diff --git a/pkgs/desktops/lxqt/lxqt-session/default.nix b/pkgs/desktops/lxqt/lxqt-session/default.nix
index 40ef5697a547..fbf2c7ddde7c 100644
--- a/pkgs/desktops/lxqt/lxqt-session/default.nix
+++ b/pkgs/desktops/lxqt/lxqt-session/default.nix
@@ -1,6 +1,6 @@
-{ stdenv, fetchFromGitHub, cmake, pkgconfig, lxqt-build-tools, qtbase, qttools, qtsvg, qtx11extras, kwindowsystem, liblxqt, libqtxdg, xorg, xdg-user-dirs }:
+{ lib, mkDerivation, fetchFromGitHub, cmake, pkgconfig, lxqt-build-tools, qtbase, qttools, qtsvg, qtx11extras, kwindowsystem, liblxqt, libqtxdg, xorg, xdg-user-dirs }:
-stdenv.mkDerivation rec {
+mkDerivation rec {
pname = "lxqt-session";
version = "0.14.1";
@@ -30,19 +30,7 @@ stdenv.mkDerivation rec {
xdg-user-dirs
];
- postPatch = ''
- for dir in autostart config; do
- substituteInPlace $dir/CMakeLists.txt \
- --replace "DESTINATION \"\''${LXQT_ETC_XDG_DIR}" "DESTINATION \"etc/xdg"
- done
-
- for f in lxqt-{config-session,leave,session}/CMakeLists.txt; do
- substituteInPlace $f \
- --replace "\''${LXQT_TRANSLATIONS_DIR}" "''${out}/share/lxqt/translations"
- done
- '';
-
- meta = with stdenv.lib; {
+ meta = with lib; {
description = "An alternative session manager ported from the original razor-session";
homepage = https://github.com/lxqt/lxqt-session;
license = licenses.lgpl21;
diff --git a/pkgs/desktops/lxqt/lxqt-sudo/default.nix b/pkgs/desktops/lxqt/lxqt-sudo/default.nix
index 6deef1bf56ba..91159398b8fc 100644
--- a/pkgs/desktops/lxqt/lxqt-sudo/default.nix
+++ b/pkgs/desktops/lxqt/lxqt-sudo/default.nix
@@ -1,6 +1,6 @@
-{ stdenv, fetchFromGitHub, cmake, lxqt-build-tools, qtbase, qttools, qtx11extras, qtsvg, kwindowsystem, liblxqt, libqtxdg, sudo }:
+{ lib, mkDerivation, fetchFromGitHub, cmake, lxqt-build-tools, qtbase, qttools, qtx11extras, qtsvg, kwindowsystem, liblxqt, libqtxdg, sudo }:
-stdenv.mkDerivation rec {
+mkDerivation rec {
pname = "lxqt-sudo";
version = "0.14.1";
@@ -27,12 +27,7 @@ stdenv.mkDerivation rec {
sudo
];
- postPatch = ''
- substituteInPlace CMakeLists.txt \
- --replace "\''${LXQT_TRANSLATIONS_DIR}" "''${out}/share/lxqt/translations"
- '';
-
- meta = with stdenv.lib; {
+ meta = with lib; {
description = "GUI frontend for sudo/su";
homepage = https://github.com/lxqt/lxqt-sudo;
license = licenses.lgpl21;
diff --git a/pkgs/desktops/lxqt/lxqt-themes/default.nix b/pkgs/desktops/lxqt/lxqt-themes/default.nix
index 02591b9eb86e..9d8da87fd5d4 100644
--- a/pkgs/desktops/lxqt/lxqt-themes/default.nix
+++ b/pkgs/desktops/lxqt/lxqt-themes/default.nix
@@ -1,6 +1,6 @@
-{ stdenv, fetchFromGitHub, cmake, lxqt-build-tools }:
+{ lib, mkDerivation, fetchFromGitHub, cmake, lxqt-build-tools }:
-stdenv.mkDerivation rec {
+mkDerivation rec {
pname = "lxqt-themes";
version = "0.14.0";
@@ -16,14 +16,7 @@ stdenv.mkDerivation rec {
lxqt-build-tools
];
- postPatch = ''
- substituteInPlace CMakeLists.txt \
- --replace "DESTINATION \"\''${LXQT_GRAPHICS_DIR}" "DESTINATION \"share/lxqt/graphics"
- substituteInPlace themes/CMakeLists.txt \
- --replace "DESTINATION \"\''${LXQT_SHARE_DIR}" "DESTINATION \"share/lxqt"
- '';
-
- meta = with stdenv.lib; {
+ meta = with lib; {
description = "Themes, graphics and icons for LXQt";
homepage = https://github.com/lxqt/lxqt-themes;
license = licenses.lgpl21;
diff --git a/pkgs/desktops/lxqt/obconf-qt/default.nix b/pkgs/desktops/lxqt/obconf-qt/default.nix
index 2360d1970c99..a5be8f419677 100644
--- a/pkgs/desktops/lxqt/obconf-qt/default.nix
+++ b/pkgs/desktops/lxqt/obconf-qt/default.nix
@@ -1,7 +1,7 @@
-{ stdenv, fetchFromGitHub, cmake, pkgconfig, pcre, qtbase, qttools,
+{ lib, mkDerivation, fetchFromGitHub, cmake, pkgconfig, pcre, qtbase, qttools,
qtx11extras, xorg, lxqt-build-tools, openbox, hicolor-icon-theme }:
-stdenv.mkDerivation rec {
+mkDerivation rec {
pname = "obconf-qt";
version = "0.14.1";
@@ -30,7 +30,7 @@ stdenv.mkDerivation rec {
hicolor-icon-theme
];
- meta = with stdenv.lib; {
+ meta = with lib; {
description = "The Qt port of obconf, the Openbox configuration tool";
homepage = https://github.com/lxqt/obconf-qt;
license = licenses.gpl2;
diff --git a/pkgs/desktops/lxqt/pavucontrol-qt/default.nix b/pkgs/desktops/lxqt/pavucontrol-qt/default.nix
index 00359e2ffede..7b7d7290320b 100644
--- a/pkgs/desktops/lxqt/pavucontrol-qt/default.nix
+++ b/pkgs/desktops/lxqt/pavucontrol-qt/default.nix
@@ -1,7 +1,7 @@
-{ stdenv, fetchFromGitHub, cmake, pkgconfig, lxqt, libpulseaudio,
+{ lib, mkDerivation, fetchFromGitHub, cmake, pkgconfig, lxqt, libpulseaudio,
pcre, qtbase, qttools, qtx11extras }:
-stdenv.mkDerivation rec {
+mkDerivation rec {
pname = "pavucontrol-qt";
version = "0.14.1";
@@ -26,7 +26,7 @@ stdenv.mkDerivation rec {
pcre
];
- meta = with stdenv.lib; {
+ meta = with lib; {
description = "A Pulseaudio mixer in Qt (port of pavucontrol)";
homepage = https://github.com/lxqt/pavucontrol-qt;
license = licenses.gpl2;
diff --git a/pkgs/desktops/lxqt/pcmanfm-qt/default.nix b/pkgs/desktops/lxqt/pcmanfm-qt/default.nix
index 320d451f087e..168b7f35ad27 100644
--- a/pkgs/desktops/lxqt/pcmanfm-qt/default.nix
+++ b/pkgs/desktops/lxqt/pcmanfm-qt/default.nix
@@ -1,7 +1,7 @@
-{ stdenv, fetchFromGitHub, cmake, pkgconfig, lxqt, qtbase, qttools,
+{ lib, mkDerivation, fetchFromGitHub, cmake, pkgconfig, lxqt, qtbase, qttools,
qtx11extras, libfm-qt, menu-cache, lxmenu-data }:
-stdenv.mkDerivation rec {
+mkDerivation rec {
pname = "pcmanfm-qt";
version = "0.14.1";
@@ -28,14 +28,7 @@ stdenv.mkDerivation rec {
lxmenu-data
];
- postPatch = ''
- for dir in autostart config; do
- substituteInPlace $dir/CMakeLists.txt \
- --replace "DESTINATION \"\''${LXQT_ETC_XDG_DIR}" "DESTINATION \"etc/xdg"
- done
- '';
-
- meta = with stdenv.lib; {
+ meta = with lib; {
description = "File manager and desktop icon manager (Qt port of PCManFM and libfm)";
homepage = https://github.com/lxqt/pcmanfm-qt;
license = licenses.gpl2;
diff --git a/pkgs/desktops/lxqt/qlipper/default.nix b/pkgs/desktops/lxqt/qlipper/default.nix
index ae4fb28f06a5..df717debbae8 100644
--- a/pkgs/desktops/lxqt/qlipper/default.nix
+++ b/pkgs/desktops/lxqt/qlipper/default.nix
@@ -1,6 +1,6 @@
-{ stdenv, fetchFromGitHub, cmake, qtbase, qttools }:
+{ lib, mkDerivation, fetchFromGitHub, cmake, qtbase, qttools }:
-stdenv.mkDerivation rec {
+mkDerivation rec {
pname = "qlipper";
version = "5.1.1";
@@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
buildInputs = [ qtbase qttools ];
- meta = with stdenv.lib; {
+ meta = with lib; {
description = "Cross-platform clipboard history applet";
homepage = https://github.com/pvanek/qlipper;
license = licenses.gpl2Plus;
diff --git a/pkgs/desktops/lxqt/qps/default.nix b/pkgs/desktops/lxqt/qps/default.nix
index c17ef21c6768..942c9257c25d 100644
--- a/pkgs/desktops/lxqt/qps/default.nix
+++ b/pkgs/desktops/lxqt/qps/default.nix
@@ -1,7 +1,7 @@
-{ stdenv, fetchFromGitHub, cmake, qtbase, qtx11extras, qttools,
+{ lib, mkDerivation, fetchFromGitHub, cmake, qtbase, qtx11extras, qttools,
lxqt-build-tools }:
-stdenv.mkDerivation rec {
+mkDerivation rec {
pname = "qps";
version = "1.10.20";
@@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
buildInputs = [ qtbase qtx11extras qttools ];
- meta = with stdenv.lib; {
+ meta = with lib; {
description = "The Qt process manager";
homepage = https://github.com/lxqt/qps;
license = licenses.gpl2;
diff --git a/pkgs/desktops/lxqt/qterminal/default.nix b/pkgs/desktops/lxqt/qterminal/default.nix
index c1e4274ab7b2..10f525eb9e6c 100644
--- a/pkgs/desktops/lxqt/qterminal/default.nix
+++ b/pkgs/desktops/lxqt/qterminal/default.nix
@@ -1,7 +1,7 @@
-{ stdenv, fetchFromGitHub, cmake, lxqt-build-tools, qtermwidget,
+{ lib, mkDerivation, fetchFromGitHub, cmake, lxqt-build-tools, qtermwidget,
qtbase, qttools, qtx11extras }:
-stdenv.mkDerivation rec {
+mkDerivation rec {
pname = "qterminal";
version = "0.14.1";
@@ -24,7 +24,7 @@ stdenv.mkDerivation rec {
qtermwidget
];
- meta = with stdenv.lib; {
+ meta = with lib; {
description = "A lightweight Qt-based terminal emulator";
homepage = https://github.com/lxqt/qterminal;
license = licenses.gpl2;
diff --git a/pkgs/desktops/lxqt/qtermwidget/default.nix b/pkgs/desktops/lxqt/qtermwidget/default.nix
index e47d8e050828..e61360f6a3b4 100644
--- a/pkgs/desktops/lxqt/qtermwidget/default.nix
+++ b/pkgs/desktops/lxqt/qtermwidget/default.nix
@@ -1,6 +1,6 @@
-{ stdenv, fetchFromGitHub, cmake, qtbase, qttools, lxqt-build-tools }:
+{ lib, mkDerivation, fetchFromGitHub, cmake, qtbase, qttools, lxqt-build-tools }:
-stdenv.mkDerivation rec {
+mkDerivation rec {
pname = "qtermwidget";
version = "0.14.1";
@@ -13,9 +13,9 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ cmake lxqt-build-tools ];
- buildInputs = [ qtbase qttools];
+ buildInputs = [ qtbase qttools ];
- meta = with stdenv.lib; {
+ meta = with lib; {
description = "A terminal emulator widget for Qt 5";
homepage = https://github.com/lxqt/qtermwidget;
license = licenses.gpl2;
diff --git a/pkgs/desktops/lxqt/screengrab/default.nix b/pkgs/desktops/lxqt/screengrab/default.nix
index 14fa977e023d..bac68f7166c5 100644
--- a/pkgs/desktops/lxqt/screengrab/default.nix
+++ b/pkgs/desktops/lxqt/screengrab/default.nix
@@ -1,6 +1,6 @@
-{ stdenv, fetchFromGitHub, cmake, pkgconfig, qtbase, qttools, qtx11extras, qtsvg, kwindowsystem, libqtxdg, xorg, autoPatchelfHook }:
+{ lib, mkDerivation, fetchFromGitHub, cmake, pkgconfig, qtbase, qttools, qtx11extras, qtsvg, kwindowsystem, libqtxdg, xorg, autoPatchelfHook }:
-stdenv.mkDerivation rec {
+mkDerivation rec {
pname = "screengrab";
version = "1.101";
@@ -28,7 +28,7 @@ stdenv.mkDerivation rec {
xorg.libXdmcp
];
- meta = with stdenv.lib; {
+ meta = with lib; {
description = "Crossplatform tool for fast making screenshots";
homepage = https://github.com/lxqt/screengrab;
license = licenses.gpl2;
diff --git a/pkgs/development/compilers/crystal/default.nix b/pkgs/development/compilers/crystal/default.nix
index 90355896064c..ff1672973055 100644
--- a/pkgs/development/compilers/crystal/default.nix
+++ b/pkgs/development/compilers/crystal/default.nix
@@ -200,5 +200,12 @@ in rec {
binary = binaryCrystal_0_29;
};
- crystal = crystal_0_29;
+ crystal_0_30 = generic {
+ version = "0.30.1";
+ sha256 = "0fbk784zjflsl3hys5a1xmn8mda8kb2z7ql58wpyfavivswxanbs";
+ doCheck = false; # 6 checks are failing now
+ binary = binaryCrystal_0_29;
+ };
+
+ crystal = crystal_0_30;
}
diff --git a/pkgs/development/compilers/fsharp41/default.nix b/pkgs/development/compilers/fsharp41/default.nix
index b41c32be18f7..e497deb2e873 100644
--- a/pkgs/development/compilers/fsharp41/default.nix
+++ b/pkgs/development/compilers/fsharp41/default.nix
@@ -1,14 +1,14 @@
# Temporaririly avoid dependency on dotnetbuildhelpers to avoid rebuilding many times while working on it
-{ stdenv, fetchurl, pkgconfig, autoconf, automake, which, mono, dotnetbuildhelpers, dotnetPackages }:
+{ stdenv, fetchurl, pkgconfig, autoconf, automake, which, mono, msbuild, dotnetbuildhelpers, dotnetPackages }:
stdenv.mkDerivation rec {
pname = "fsharp";
- version = "4.1.7";
+ version = "4.1.34";
src = fetchurl {
url = "https://github.com/fsharp/fsharp/archive/${version}.tar.gz";
- sha256 = "0rfkrk4mzi4w54mfqilvng9ar5swhmnwhsyjc54rx3fd0np3jiyl";
+ sha256 = "0cv6p5pin962vhbpsji40nkckkag5c96kq5qihvg60pc1z821p0i";
};
nativeBuildInputs = [ pkgconfig ];
@@ -17,12 +17,16 @@ stdenv.mkDerivation rec {
automake
which
mono
+ msbuild
dotnetbuildhelpers
dotnetPackages.FsCheck262
dotnetPackages.FSharpCompilerTools
- dotnetPackages.FSharpCore
+ dotnetPackages.FSharpCore302
+ dotnetPackages.FSharpCore3125
+ dotnetPackages.FSharpCore4001
+ dotnetPackages.FSharpCore4117
dotnetPackages.FSharpData225
- dotnetPackages.FsLexYacc704
+ dotnetPackages.FsLexYacc706
dotnetPackages.MicrosoftDiaSymReader
dotnetPackages.MicrosoftDiaSymReaderPortablePdb
dotnetPackages.NUnit350
@@ -31,6 +35,14 @@ stdenv.mkDerivation rec {
dotnetPackages.SystemValueTuple
];
+ # https://github.com/mono/mono/tree/fe0f311a848068ab2d17a9b9dd15326e5712d520/packaging/MacSDK/patches
+ # https://github.com/mono/mono/issues/7805
+ patches = [
+ ./fsharp-IsPathRooted-type-inference.patch
+ ./fsharp-string-switchName.patch
+ ./fsharp-path-overloads.patch
+ ];
+
configurePhase = ''
substituteInPlace ./autogen.sh --replace "/usr/bin/env sh" "${stdenv.shell}"
./autogen.sh --prefix $out
@@ -47,24 +59,30 @@ stdenv.mkDerivation rec {
mkdir packages
ln -s ${dotnetPackages.FsCheck262}/lib/dotnet/FsCheck packages/FsCheck.2.6.2
- ln -s ${dotnetPackages.FSharpCompilerTools}/lib/dotnet/FSharp.Compiler.Tools packages/FSharp.Compiler.Tools.4.1.4
- ln -s ${dotnetPackages.FSharpCore}/lib/dotnet/FSharp.Core/ packages/FSharp.Core.4.0.0.1
+ ln -s ${dotnetPackages.FSharpCompilerTools}/lib/dotnet/FSharp.Compiler.Tools packages/FSharp.Compiler.Tools.4.1.27
+ ln -s ${dotnetPackages.FSharpCore302}/lib/dotnet/FSharp.Core/ packages/FSharp.Core.3.0.2
+ ln -s ${dotnetPackages.FSharpCore3125}/lib/dotnet/FSharp.Core/ packages/FSharp.Core.3.1.2.5
+ ln -s ${dotnetPackages.FSharpCore4001}/lib/dotnet/FSharp.Core/ packages/FSharp.Core.4.0.0.1
+ ln -s ${dotnetPackages.FSharpCore4117}/lib/dotnet/FSharp.Core/ packages/FSharp.Core.4.1.17
ln -s ${dotnetPackages.FSharpData225}/lib/dotnet/FSharp.Data/ packages/FSharp.Data.2.2.5
- ln -s ${dotnetPackages.FsLexYacc704}/lib/dotnet/FsLexYacc/ packages/FsLexYacc.7.0.4
+ ln -s ${dotnetPackages.FsLexYacc706}/lib/dotnet/FsLexYacc/ packages/FsLexYacc.7.0.6
ln -s ${dotnetPackages.MicrosoftDiaSymReader}/lib/dotnet/Microsoft.DiaSymReader/ packages/Microsoft.DiaSymReader.1.1.0
ln -s ${dotnetPackages.MicrosoftDiaSymReaderPortablePdb}/lib/dotnet/Microsoft.DiaSymReader.PortablePdb/ packages/Microsoft.DiaSymReader.PortablePdb.1.2.0
ln -s ${dotnetPackages.NUnit350}/lib/dotnet/NUnit/ packages/NUnit.3.5.0
ln -s ${dotnetPackages.SystemCollectionsImmutable131}/lib/dotnet/System.Collections.Immutable/ packages/System.Collections.Immutable.1.3.1
ln -s ${dotnetPackages.SystemReflectionMetadata}/lib/dotnet/System.Reflection.Metadata/ packages/System.Reflection.Metadata.1.4.2
- ln -s ${dotnetPackages.SystemValueTuple}/lib/dotnet/System.ValueTuple/ packages/System.ValueTuple.4.3.0
+ ln -s ${dotnetPackages.SystemValueTuple}/lib/dotnet/System.ValueTuple/ packages/System.ValueTuple.4.3.1
'';
- # Make sure the executables use the right mono binary,
- # and set up some symlinks for backwards compatibility.
+ # Signing /home/jdanek/nix/nixpkgs/build/fss/fsharp-4.1.34/again/fsharp-4.1.34/Release/fsharp30/net40/bin/FSharp.Core.dll with Mono key
+ # ERROR: Unknown error during processing: System.UnauthorizedAccessException: Access to the path
+ # "Release/fsharp30/net40/bin/FSharp.Core.dll" is denied.
+ preInstall = ''
+ find Release/ -name FSharp.Core.dll -exec chmod u+w {} \;
+ '';
+
+ # Set up some symlinks for backwards compatibility.
postInstall = ''
- substituteInPlace $out/bin/fsharpc --replace " mono " " ${mono}/bin/mono "
- substituteInPlace $out/bin/fsharpi --replace " mono " " ${mono}/bin/mono "
- substituteInPlace $out/bin/fsharpiAnyCpu --replace " mono " " ${mono}/bin/mono "
ln -s $out/bin/fsharpc $out/bin/fsc
ln -s $out/bin/fsharpi $out/bin/fsi
for dll in "$out/lib/mono/fsharp"/FSharp*.dll
@@ -73,6 +91,26 @@ stdenv.mkDerivation rec {
done
'';
+ doInstallCheck = true;
+ installCheckPhase = ''
+ echo 'printf "int = %i" (6 * 7);;' > script.fsx
+ $out/bin/fsi --exec script.fsx | grep "int = 42"
+ $out/bin/fsharpi --exec script.fsx | grep "int = 42"
+ $out/bin/fsharpiAnyCpu --exec script.fsx | grep "int = 42"
+
+ cat > answer.fs <]
+let main argv =
+ printfn "int = %i" (6 * 7)
+ 0
+EOF
+
+ $out/bin/fsc answer.fs
+ ${mono}/bin/mono answer.exe | grep "int = 42"
+ '';
+
# To fix this error when running:
# The file "/nix/store/path/whatever.exe" is an not a valid CIL image
dontStrip = true;
diff --git a/pkgs/development/compilers/fsharp41/fsharp-IsPathRooted-type-inference.patch b/pkgs/development/compilers/fsharp41/fsharp-IsPathRooted-type-inference.patch
new file mode 100644
index 000000000000..06dd3e82adc9
--- /dev/null
+++ b/pkgs/development/compilers/fsharp41/fsharp-IsPathRooted-type-inference.patch
@@ -0,0 +1,21 @@
+commit c37fce5b3019c7a150203fc3a484885591b194de
+Author: Alexis Christoforides
+Date: Sun Dec 2 00:10:24 2018 -0500
+
+ Help Path.IsPathRooted method overload selection.
+
+ .NET Core, and Mono after merging https://github.com/mono/mono/pull/11342, introduce ambiguity with a new overload.
+
+diff --git a/src/scripts/scriptlib.fsx b/src/scripts/scriptlib.fsx
+index cc797e305..699c7bb93 100644
+--- a/src/scripts/scriptlib.fsx
++++ b/src/scripts/scriptlib.fsx
+@@ -92,7 +92,7 @@ module Scripting =
+
+ module Process =
+
+- let processExePath baseDir exe =
++ let processExePath baseDir (exe:string) =
+ if Path.IsPathRooted(exe) then exe
+ else
+ match Path.GetDirectoryName(exe) with
diff --git a/pkgs/development/compilers/fsharp41/fsharp-path-overloads.patch b/pkgs/development/compilers/fsharp41/fsharp-path-overloads.patch
new file mode 100644
index 000000000000..f791317d0802
--- /dev/null
+++ b/pkgs/development/compilers/fsharp41/fsharp-path-overloads.patch
@@ -0,0 +1,22 @@
+diff --git a/src/scripts/scriptlib.fsx b/src/scripts/scriptlib.fsx
+index cc797e305..ae8a6d3cc 100644
+--- a/src/scripts/scriptlib.fsx
++++ b/src/scripts/scriptlib.fsx
+@@ -59,12 +59,12 @@ module Scripting =
+
+ let (++) a b = Path.Combine(a,b)
+
+- let getBasename a = Path.GetFileNameWithoutExtension a
+- let getFullPath a = Path.GetFullPath a
+- let getFilename a = Path.GetFileName a
+- let getDirectoryName a = Path.GetDirectoryName a
++ let getBasename (path: string) = Path.GetFileNameWithoutExtension path
++ let getFullPath (path: string) = Path.GetFullPath path
++ let getFilename (path: string) = Path.GetFileName path
++ let getDirectoryName (path: string) = Path.GetDirectoryName path
+
+- let copyFile source dir =
++ let copyFile (source: string) dir =
+ let dest =
+ if not (Directory.Exists dir) then Directory.CreateDirectory dir |>ignore
+ let result = Path.Combine(dir, Path.GetFileName source)
diff --git a/pkgs/development/compilers/fsharp41/fsharp-string-switchName.patch b/pkgs/development/compilers/fsharp41/fsharp-string-switchName.patch
new file mode 100644
index 000000000000..4b36eaabcafc
--- /dev/null
+++ b/pkgs/development/compilers/fsharp41/fsharp-string-switchName.patch
@@ -0,0 +1,13 @@
+diff --git a/src/scripts/scriptlib.fsx b/src/scripts/scriptlib.fsx
+index cc797e305..5a7be7d2b 100644
+--- a/src/scripts/scriptlib.fsx
++++ b/src/scripts/scriptlib.fsx
+@@ -36,7 +36,7 @@ module Scripting =
+ #if INTERACTIVE
+ let argv = Microsoft.FSharp.Compiler.Interactive.Settings.fsi.CommandLineArgs |> Seq.skip 1 |> Seq.toArray
+
+- let getCmdLineArgOptional switchName =
++ let getCmdLineArgOptional (switchName: string) =
+ argv |> Array.filter(fun t -> t.StartsWith(switchName)) |> Array.map(fun t -> t.Remove(0, switchName.Length).Trim()) |> Array.tryHead
+
+ let getCmdLineArg switchName defaultValue =
diff --git a/pkgs/development/compilers/ghc/8.8.1.nix b/pkgs/development/compilers/ghc/8.8.1.nix
index 423eaf02d8c4..95bbab3cb3e1 100644
--- a/pkgs/development/compilers/ghc/8.8.1.nix
+++ b/pkgs/development/compilers/ghc/8.8.1.nix
@@ -86,12 +86,12 @@ let
in
stdenv.mkDerivation (rec {
- version = "8.8.0.20190721";
+ version = "8.8.1";
name = "${targetPrefix}ghc-${version}";
src = fetchurl {
- url = "https://downloads.haskell.org/ghc/8.8.1-rc1/ghc-${version}-src.tar.xz";
- sha256 = "1ih76zpxk8ay84xjyaflqc754002y8pdaainqfvb4cnhy6lpb1br";
+ url = "https://downloads.haskell.org/ghc/${version}/ghc-${version}-src.tar.xz";
+ sha256 = "06kj4fhvijinjafiy4s873n60qly323rdlz9bmc79nhlp3cq72lh";
};
enableParallelBuilding = true;
diff --git a/pkgs/development/compilers/mono/6.nix b/pkgs/development/compilers/mono/6.nix
new file mode 100644
index 000000000000..ec91d7e979c1
--- /dev/null
+++ b/pkgs/development/compilers/mono/6.nix
@@ -0,0 +1,9 @@
+{ callPackage, Foundation, libobjc }:
+
+callPackage ./generic.nix (rec {
+ inherit Foundation libobjc;
+ version = "6.0.0.313";
+ srcArchiveSuffix = "tar.xz";
+ sha256 = "0l0cd6q5xh1vdm6zr78rkfqdsmrgzanjgpxvgig0pyd3glfyjim9";
+ enableParallelBuilding = true;
+})
diff --git a/pkgs/development/compilers/mono/generic.nix b/pkgs/development/compilers/mono/generic.nix
index ecb687e96e57..9a2f01b9f3d5 100644
--- a/pkgs/development/compilers/mono/generic.nix
+++ b/pkgs/development/compilers/mono/generic.nix
@@ -1,4 +1,7 @@
-{ stdenv, fetchurl, bison, pkgconfig, glib, gettext, perl, libgdiplus, libX11, callPackage, ncurses, zlib, withLLVM ? false, cacert, Foundation, libobjc, python, version, sha256, autoconf, libtool, automake, cmake, which, enableParallelBuilding ? true }:
+{ stdenv, fetchurl, bison, pkgconfig, glib, gettext, perl, libgdiplus, libX11, callPackage, ncurses, zlib, withLLVM ? false, cacert, Foundation, libobjc, python, version, sha256, autoconf, libtool, automake, cmake, which
+, enableParallelBuilding ? true
+, srcArchiveSuffix ? "tar.bz2"
+}:
let
llvm = callPackage ./llvm.nix { };
@@ -9,7 +12,7 @@ stdenv.mkDerivation rec {
src = fetchurl {
inherit sha256;
- url = "https://download.mono-project.com/sources/mono/${pname}-${version}.tar.bz2";
+ url = "https://download.mono-project.com/sources/mono/${pname}-${version}.${srcArchiveSuffix}";
};
buildInputs =
diff --git a/pkgs/development/compilers/owl-lisp/default.nix b/pkgs/development/compilers/owl-lisp/default.nix
index 0625e2d8bbc2..80ea9eb4c0b8 100644
--- a/pkgs/development/compilers/owl-lisp/default.nix
+++ b/pkgs/development/compilers/owl-lisp/default.nix
@@ -1,33 +1,31 @@
-{ stdenv, fetchFromGitHub, coreutils, which }:
+{ stdenv, fetchFromGitLab, coreutils, which }:
stdenv.mkDerivation rec {
pname = "owl-lisp";
- version = "0.1.16";
+ version = "0.1.19";
- src = fetchFromGitHub {
- owner = "aoh";
- repo = "owl-lisp";
+ src = fetchFromGitLab {
+ owner = "owl-lisp";
+ repo = "owl";
rev = "v${version}";
- sha256 = "1qp6p48bmlyn83rqi6k3d098dg4cribavg5rd4x17z37i181vxvj";
+ sha256 = "1bgjd2gkr5risfcc401rlr5fc82gwm4r2gpp9gzkg9h64acivkjx";
};
nativeBuildInputs = [ which ];
prePatch = ''
- substituteInPlace Makefile --replace /usr $out
-
- for f in tests/run tests/exec.sh ; do
- substituteInPlace $f --replace /bin/echo ${coreutils}/bin/echo
- done
+ substituteInPlace Makefile \
+ --replace /usr $out
'';
# tests are run as part of the compilation process
doCheck = false;
meta = with stdenv.lib; {
- description = "A functional lisp";
- homepage = https://github.com/aoh/owl-lisp;
+ description = "A functional Scheme for world domination";
+ homepage = "https://gitlab.com/owl-lisp/owl";
license = licenses.mit;
maintainers = with maintainers; [ peterhoeg ];
+ platforms = platforms.linux;
};
}
diff --git a/pkgs/development/interpreters/python/cpython/2.7/default.nix b/pkgs/development/interpreters/python/cpython/2.7/default.nix
index de980f1ca687..4e323898afbf 100644
--- a/pkgs/development/interpreters/python/cpython/2.7/default.nix
+++ b/pkgs/development/interpreters/python/cpython/2.7/default.nix
@@ -79,6 +79,12 @@ let
sha256 = "0l9rw6r5r90iybdkp3hhl2pf0h0s1izc68h5d3ywrm92pq32wz57";
})
+ (fetchpatch {
+ url = "https://github.com/python/cpython/commit/979daae300916adb399ab5b51410b6ebd0888f13.patch";
+ name = "CVE-2018-20852.patch";
+ sha256 = "0p838ycssd6abxzby69rhngjqqm59cmlp07910mpjx7lmsz049pb";
+ })
+
# Fix race-condition during pyc creation. Has a slight backwards
# incompatible effect: pyc symlinks will now be overridden
# (https://bugs.python.org/issue17222). Included in python >= 3.4,
diff --git a/pkgs/development/interpreters/python/cpython/default.nix b/pkgs/development/interpreters/python/cpython/default.nix
index 7561fdad7852..60d067c1bf2c 100644
--- a/pkgs/development/interpreters/python/cpython/default.nix
+++ b/pkgs/development/interpreters/python/cpython/default.nix
@@ -83,6 +83,8 @@ in with passthru; stdenv.mkDerivation {
prePatch = optionalString stdenv.isDarwin ''
substituteInPlace configure --replace '`/usr/bin/arch`' '"i386"'
substituteInPlace configure --replace '-Wl,-stack_size,1000000' ' '
+ '' + optionalString (stdenv.isDarwin && x11Support) ''
+ substituteInPlace setup.py --replace /Library/Frameworks /no-such-path
'';
patches = [
diff --git a/pkgs/development/libraries/allegro/5.nix b/pkgs/development/libraries/allegro/5.nix
index 46e3d02963d8..b267c62d6c70 100644
--- a/pkgs/development/libraries/allegro/5.nix
+++ b/pkgs/development/libraries/allegro/5.nix
@@ -9,13 +9,13 @@
stdenv.mkDerivation rec {
pname = "allegro";
- version = "5.2.4.0";
+ version = "5.2.5.0";
src = fetchFromGitHub {
owner = "liballeg";
repo = "allegro5";
rev = version;
- sha256 = "01y3hirn5b08f188nnhb2cbqj4vzysr7l2qpz2208srv8arzmj2d";
+ sha256 = "1jrnizpwznyxz2c7zb75lfy7l51ww5jlqfaahcrycfj1xay9mpqp";
};
buildInputs = [
@@ -28,14 +28,6 @@ stdenv.mkDerivation rec {
libpulseaudio libpthreadstubs
];
- patches = [
- # fix compilation with mesa 18.2.5
- (fetchpatch {
- url = "https://github.com/liballeg/allegro5/commit/a40d30e21802ecf5c9382cf34af9b01bd3781e47.patch";
- sha256 = "1f1xlj5y2vr6wzmcz04s8kxn8cfdwrg9kjlnvpz9dix1z3qjnd4m";
- })
- ];
-
postPatch = ''
sed -e 's@/XInput2.h@/XI2.h@g' -i CMakeLists.txt "src/"*.c
'';
diff --git a/pkgs/development/libraries/babl/default.nix b/pkgs/development/libraries/babl/default.nix
index eff6ff626325..d95797d5a5f6 100644
--- a/pkgs/development/libraries/babl/default.nix
+++ b/pkgs/development/libraries/babl/default.nix
@@ -1,15 +1,41 @@
-{ stdenv, fetchurl }:
+{ stdenv
+, fetchurl
+, meson
+, ninja
+, pkgconfig
+, gobject-introspection
+, lcms2
+}:
stdenv.mkDerivation rec {
pname = "babl";
- version = "0.1.66";
+ version = "0.1.72";
+
+ outputs = [ "out" "dev" ];
src = fetchurl {
- url = "https://ftp.gtk.org/pub/babl/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.bz2";
- sha256 = "0qx1dwbinxihwl2lmxi60qiqi402jlrdcnixx14kk6j88n9xi79n";
+ url = "https://download.gimp.org/pub/babl/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
+ sha256 = "0hkagjrnza77aasa1kss5hvy37ndm50y6i7hkdn2z8hzgc4i3qb4";
};
- doCheck = true;
+ patches = [
+ # Apple linker does not know --version-script flag
+ # https://gitlab.gnome.org/GNOME/babl/merge_requests/26
+ ./fix-darwin.patch
+ ];
+
+ nativeBuildInputs = [
+ meson
+ ninja
+ pkgconfig
+ gobject-introspection
+ ];
+
+ buildInputs = [
+ lcms2
+ ];
+
+ doCheck = !stdenv.isDarwin;
meta = with stdenv.lib; {
description = "Image pixel format conversion library";
diff --git a/pkgs/development/libraries/babl/fix-darwin.patch b/pkgs/development/libraries/babl/fix-darwin.patch
new file mode 100644
index 000000000000..eaeff63689fc
--- /dev/null
+++ b/pkgs/development/libraries/babl/fix-darwin.patch
@@ -0,0 +1,16 @@
+diff --git a/babl/meson.build b/babl/meson.build
+index b551c9a..f452435 100644
+--- a/babl/meson.build
++++ b/babl/meson.build
+@@ -24,9 +24,9 @@
+ ]
+
+ # Linker arguments
+-babl_link_args = [
++babl_link_args = cc.get_supported_link_arguments([
+ '-Wl,--version-script,' + version_script,
+-]
++])
+ if platform_win32
+ babl_link_args += '-Wl,--no-undefined'
+ endif
diff --git a/pkgs/development/libraries/cctz/default.nix b/pkgs/development/libraries/cctz/default.nix
index 457b51dea7a3..5897f84efff0 100644
--- a/pkgs/development/libraries/cctz/default.nix
+++ b/pkgs/development/libraries/cctz/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub }:
+{ stdenv, fetchFromGitHub, darwin }:
stdenv.mkDerivation rec {
pname = "cctz";
@@ -13,8 +13,14 @@ stdenv.mkDerivation rec {
makeFlags = [ "PREFIX=$(out)" ];
+ buildInputs = stdenv.lib.optional stdenv.isDarwin darwin.apple_sdk.frameworks.Foundation;
+
installTargets = [ "install_hdrs" "install_shared_lib" ];
+ postInstall = stdenv.lib.optionalString stdenv.isDarwin ''
+ install_name_tool -id $out/lib/libcctz.so $out/lib/libcctz.so
+ '';
+
enableParallelBuilding = true;
meta = with stdenv.lib; {
diff --git a/pkgs/development/libraries/dlib/default.nix b/pkgs/development/libraries/dlib/default.nix
index e28b1add7e28..dfa5509fb98e 100644
--- a/pkgs/development/libraries/dlib/default.nix
+++ b/pkgs/development/libraries/dlib/default.nix
@@ -6,14 +6,14 @@
}:
stdenv.mkDerivation rec {
- version = "19.16";
pname = "dlib";
+ version = "19.17";
src = fetchFromGitHub {
owner = "davisking";
repo = "dlib";
rev ="v${version}";
- sha256 = "0ix52npsxfm6324jli7y0zkyijl5yirv2yzfncyd4sq0r9fcwb4p";
+ sha256 = "0g11ilma6cll3bd2ahm66j1sjb9v4rxz3xjbfkcg5pjsvb49n029";
};
postPatch = ''
diff --git a/pkgs/development/libraries/exiv2/default.nix b/pkgs/development/libraries/exiv2/default.nix
index 9b05165e1b2b..ec6f07f0953a 100644
--- a/pkgs/development/libraries/exiv2/default.nix
+++ b/pkgs/development/libraries/exiv2/default.nix
@@ -14,20 +14,15 @@
stdenv.mkDerivation rec {
pname = "exiv2";
- version = "0.27.1";
+ version = "0.27.2";
src = fetchFromGitHub rec {
owner = "exiv2";
repo = "exiv2";
- rev = version;
- sha256 = "0b5m921070fkyif0zlyb49gly3p6xd0hv1jyym4j25hx12gzbx0c";
+ rev = "v${version}";
+ sha256 = "0n8il52yzbmvbkryrl8waz7hd9a2fdkw8zsrmhyh63jlvmmc31gf";
};
- patches = [
- # https://github.com/Exiv2/exiv2/commit/aae88060ca85a483cd7fe791ba116c04d96c0bf9#comments
- ./fix-cmake.patch
- ];
-
cmakeFlags = [
"-DEXIV2_BUILD_PO=ON"
"-DEXIV2_BUILD_DOC=ON"
@@ -58,7 +53,7 @@ stdenv.mkDerivation rec {
"doc"
];
- doCheck = stdenv.isLinux;
+ doCheck = true;
# Test setup found by inspecting ${src}/.travis/run.sh; problems without cmake.
checkTarget = "tests";
@@ -72,6 +67,14 @@ stdenv.mkDerivation rec {
${stdenv.lib.optionalString stdenv.isAarch64 ''
rm -f ../tests/bugfixes/github/test_CVE_2018_12265.py
''}
+
+ ${stdenv.lib.optionalString stdenv.isDarwin ''
+ export DYLD_LIBRARY_PATH=$DYLD_LIBRARY_PATH:`pwd`/lib
+ # Removing tests depending on charset conversion
+ substituteInPlace ../test/Makefile --replace "conversions.sh" ""
+ rm -f ../tests/bugfixes/redmine/test_issue_460.py
+ rm -f ../tests/bugfixes/redmine/test_issue_662.py
+ ''}
'';
postCheck = ''
diff --git a/pkgs/development/libraries/exiv2/fix-cmake.patch b/pkgs/development/libraries/exiv2/fix-cmake.patch
deleted file mode 100644
index 1e19aed8b904..000000000000
--- a/pkgs/development/libraries/exiv2/fix-cmake.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
-index 34087004..41b3a068 100644
---- a/src/CMakeLists.txt
-+++ b/src/CMakeLists.txt
-@@ -239,9 +239,9 @@ install(FILES
- ${CMAKE_BINARY_DIR}/exiv2lib_export.h
- DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/exiv2)
-
--install(EXPORT exiv2Config DESTINATION "${CMAKE_INSTALL_LIBDIR}/exiv2/cmake")
-+install(EXPORT exiv2Config DESTINATION "${CMAKE_INSTALL_LIBDIR}/cmake/exiv2")
-
--install(FILES ${CMAKE_CURRENT_BINARY_DIR}/exiv2ConfigVersion.cmake DESTINATION "${CMAKE_INSTALL_LIBDIR}/exiv2/cmake")
-+install(FILES ${CMAKE_CURRENT_BINARY_DIR}/exiv2ConfigVersion.cmake DESTINATION "${CMAKE_INSTALL_LIBDIR}/cmake/exiv2")
-
- # ******************************************************************************
- # exiv2 application
diff --git a/pkgs/development/libraries/gegl/3.0.nix b/pkgs/development/libraries/gegl/3.0.nix
deleted file mode 100644
index 54ee7662d06e..000000000000
--- a/pkgs/development/libraries/gegl/3.0.nix
+++ /dev/null
@@ -1,38 +0,0 @@
-{ stdenv, fetchurl, pkgconfig, glib, babl, libpng, cairo, libjpeg, which
-, librsvg, pango, gtk, bzip2, json-glib, intltool, autoreconfHook, libraw
-, libwebp, gnome3, libintl }:
-
-stdenv.mkDerivation rec {
- name = "gegl-0.3.34";
-
- src = fetchurl {
- url = "https://download.gimp.org/pub/gegl/0.3/${name}.tar.bz2";
- sha256 = "010k86wn8cmr07rqwa4lccrmiiqrwbnkxvic4lpapwgbamv258jw";
- };
-
- hardeningDisable = [ "format" ];
-
- # needs fonts otherwise don't know how to pass them
- configureFlags = [ "--disable-docs" ];
-
- enableParallelBuilding = true;
-
- doCheck = true;
-
- buildInputs = [
- libpng cairo libjpeg librsvg pango gtk bzip2
- libraw libwebp gnome3.gexiv2
- ];
-
- propagatedBuildInputs = [ glib json-glib babl ]; # for gegl-3.0.pc
-
- nativeBuildInputs = [ pkgconfig intltool which autoreconfHook libintl ];
-
- meta = with stdenv.lib; {
- description = "Graph-based image processing framework";
- homepage = http://www.gegl.org;
- license = licenses.gpl3;
- maintainers = with maintainers; [ jtojnar ];
- platforms = platforms.unix;
- };
-}
diff --git a/pkgs/development/libraries/graphene/default.nix b/pkgs/development/libraries/graphene/default.nix
index 7c61b222486f..c439e763e73d 100644
--- a/pkgs/development/libraries/graphene/default.nix
+++ b/pkgs/development/libraries/graphene/default.nix
@@ -5,6 +5,7 @@
, ninja
, python3
, mutest
+, nixosTests
, glib
, gtk-doc
, docbook_xsl
@@ -57,6 +58,12 @@ stdenv.mkDerivation rec {
doCheck = true;
+ passthru = {
+ tests = {
+ installedTests = nixosTests.graphene;
+ };
+ };
+
meta = with stdenv.lib; {
description = "A thin layer of graphic data types";
homepage = "https://ebassi.github.com/graphene";
diff --git a/pkgs/development/libraries/hunspell/dictionaries.nix b/pkgs/development/libraries/hunspell/dictionaries.nix
index b9a283d80d2e..4fa369e299d2 100644
--- a/pkgs/development/libraries/hunspell/dictionaries.nix
+++ b/pkgs/development/libraries/hunspell/dictionaries.nix
@@ -640,12 +640,12 @@ in rec {
uk_UA = uk-ua;
uk-ua = mkDict rec {
name = "hunspell-dict-uk-ua-${version}";
- version = "4.2.5";
- _version = "4-2.5";
+ version = "4.6.3";
+ _version = "4-6.3";
src = fetchurl {
url = "https://extensions.libreoffice.org/extensions/ukrainian-spelling-dictionary-and-thesaurus/${_version}/@@download/file/dict-uk_UA-${version}.oxt";
- sha256 = "1s2i9cd569g97kafrswczvwmvg7m9aks8qsbxd1mi73zy2y1r7n4";
+ sha256 = "14rd07yx4fx2qxjr5xqc8qy151idd8k2hr5yi18d9r8gccnm9w50";
};
dictFileName = "uk_UA";
diff --git a/pkgs/development/libraries/libgnurl/default.nix b/pkgs/development/libraries/libgnurl/default.nix
index 4c10a288474f..0bb3af37eee1 100644
--- a/pkgs/development/libraries/libgnurl/default.nix
+++ b/pkgs/development/libraries/libgnurl/default.nix
@@ -2,23 +2,38 @@
libidn2, libunistring, nghttp2 }:
stdenv.mkDerivation rec {
- version = "7.64.0";
-
pname = "libgnurl";
+ version = "7.65.3";
src = fetchurl {
url = "mirror://gnu/gnunet/gnurl-${version}.tar.gz";
- sha256 = "0pvmbi32lixcpk10prplmwrmi4wzp3bc1aiyhr552kx0wqdqmdk8";
+ sha256 = "19l7jw3x83qk7yay5968pc39vzvxl55mhn1nmjh51miyda405qa9";
};
nativeBuildInputs = [ libtool groff perl pkgconfig python2 ];
-
+
buildInputs = [ gnutls zlib libidn2 libunistring nghttp2 ];
configureFlags = [
"--disable-ntlm-wb"
"--without-ca-bundle"
"--with-ca-fallback"
+ # below options will cause errors if enabled
+ "--disable-ftp"
+ "--disable-tftp"
+ "--disable-file"
+ "--disable-ldap"
+ "--disable-dict"
+ "--disable-rtsp"
+ "--disable-telnet"
+ "--disable-pop3"
+ "--disable-imap"
+ "--disable-smb"
+ "--disable-smtp"
+ "--disable-gopher"
+ "--without-ssl" # disables only openssl, not ssl in general
+ "--without-libpsl"
+ "--without-librtmp"
];
meta = with stdenv.lib; {
diff --git a/pkgs/development/libraries/mutest/default.nix b/pkgs/development/libraries/mutest/default.nix
index b247706067e7..423a93b69a80 100644
--- a/pkgs/development/libraries/mutest/default.nix
+++ b/pkgs/development/libraries/mutest/default.nix
@@ -6,15 +6,15 @@
stdenv.mkDerivation rec {
pname = "mutest";
- version = "unstable-2019-10-12";
+ version = "unstable-2019-08-26";
outputs = [ "out" "dev" ];
src = fetchFromGitHub {
owner = "ebassi";
repo = "mutest";
- rev = "822b5ddf07f957135ba39889d81e513d525b9b8e";
- sha256 = "0a5fjdq9p0q5bibqngbbpd9lga0gzrv8yj5wgdfb8ylxzg0jph2p";
+ rev = "e6246c9ae4f36ffe8c021f0a80438f6c7a6efa3a";
+ sha256 = "0gdqwq6fvk06wld4rhnw5752hahrvhd69zrci045x25rwx90x26q";
};
nativeBuildInputs = [
diff --git a/pkgs/development/libraries/poco/default.nix b/pkgs/development/libraries/poco/default.nix
index 993e53f2133d..c19e343f19ae 100644
--- a/pkgs/development/libraries/poco/default.nix
+++ b/pkgs/development/libraries/poco/default.nix
@@ -28,6 +28,5 @@ stdenv.mkDerivation rec {
description = "Cross-platform C++ libraries with a network/internet focus";
license = licenses.boost;
maintainers = with maintainers; [ orivej ];
- platforms = platforms.linux;
};
}
diff --git a/pkgs/development/libraries/vapoursynth/default.nix b/pkgs/development/libraries/vapoursynth/default.nix
index 65132806d883..53d70f4d369d 100644
--- a/pkgs/development/libraries/vapoursynth/default.nix
+++ b/pkgs/development/libraries/vapoursynth/default.nix
@@ -12,13 +12,13 @@ with stdenv.lib;
stdenv.mkDerivation rec {
pname = "vapoursynth";
- version = "R46";
+ version = "R47.2";
src = fetchFromGitHub {
owner = "vapoursynth";
repo = "vapoursynth";
rev = version;
- sha256 = "1xbwva12l68awplardf47ydlx904wifw468npaxa9cx9dvd5mv13";
+ sha256 = "004h0vvih7dlhkcz6l2786pf7s04qhiv0bii4gjx23cxyklglh9i";
};
nativeBuildInputs = [ pkgconfig autoreconfHook nasm makeWrapper ];
diff --git a/pkgs/development/libraries/wlroots/default.nix b/pkgs/development/libraries/wlroots/default.nix
index b85616842ea6..4d820bd95198 100644
--- a/pkgs/development/libraries/wlroots/default.nix
+++ b/pkgs/development/libraries/wlroots/default.nix
@@ -6,18 +6,17 @@
stdenv.mkDerivation rec {
pname = "wlroots";
- version = "0.6.0";
+ version = "0.7.0";
src = fetchFromGitHub {
owner = "swaywm";
repo = "wlroots";
rev = version;
- sha256 = "1rdcmll5b8w242n6yfjpsaprq280ck2jmbz46dxndhignxgda7k4";
+ sha256 = "0jzxa6psbc7ddxli7rbfqxmv1svxnis51l1vch4hb9fdixqm284a";
};
- # $out for the library, $bin for rootston, and $examples for the example
- # programs (in examples) AND rootston
- outputs = [ "out" "bin" "examples" ];
+ # $out for the library and $examples for the example programs (in examples):
+ outputs = [ "out" "examples" ];
nativeBuildInputs = [ meson ninja pkgconfig ];
@@ -32,31 +31,13 @@ stdenv.mkDerivation rec {
"-Dxcb-icccm=enabled" "-Dxcb-errors=enabled"
];
- postPatch = ''
- # It happens from time to time that the version wasn't updated:
- sed -iE "s/version: '[0-9]\.[0-9]\.[0-9]'/version: '${version}.0'/" meson.build
- '';
-
postInstall = ''
- # Copy the library to $bin and $examples
- for output in "$bin" "$examples"; do
- mkdir -p $output/lib
- cp -P libwlroots* $output/lib/
- done
+ # Copy the library to $examples
+ mkdir -p $examples/lib
+ cp -P libwlroots* $examples/lib/
'';
postFixup = ''
- # Install rootston (the reference compositor) to $bin and $examples (this
- # has to be done after the fixup phase to prevent broken binaries):
- for output in "$bin" "$examples"; do
- mkdir -p $output/bin
- cp rootston/rootston $output/bin/
- patchelf \
- --set-rpath "$(patchelf --print-rpath $output/bin/rootston | sed s,$out,$output,g)" \
- $output/bin/rootston
- mkdir $output/etc
- cp ../rootston/rootston.ini.example $output/etc/rootston.ini
- done
# Install ALL example programs to $examples:
# screencopy dmabuf-capture input-inhibitor layer-shell idle-inhibit idle
# screenshot output-layout multi-pointer rotation tablet touch pointer
@@ -65,9 +46,6 @@ stdenv.mkDerivation rec {
cd ./examples
for binary in $(find . -executable -type f -printf '%P\n' | grep -vE '\.so'); do
cp "$binary" "$examples/bin/wlroots-$binary"
- patchelf \
- --set-rpath "$(patchelf --print-rpath $output/bin/rootston | sed s,$out,$examples,g)" \
- "$examples/bin/wlroots-$binary"
done
'';
diff --git a/pkgs/development/lisp-modules/lisp-packages.nix b/pkgs/development/lisp-modules/lisp-packages.nix
index e176fc319094..46d417fd2aac 100644
--- a/pkgs/development/lisp-modules/lisp-packages.nix
+++ b/pkgs/development/lisp-modules/lisp-packages.nix
@@ -24,8 +24,8 @@ let lispPackages = rec {
quicklispdist = pkgs.fetchurl {
# Will usually be replaced with a fresh version anyway, but needs to be
# a valid distinfo.txt
- url = "https://beta.quicklisp.org/dist/quicklisp/2019-01-07/distinfo.txt";
- sha256 = "1f0giy182p6qlmmqljir92566c8l1g2sv41cbzv86s3kv0j640fd";
+ url = "https://beta.quicklisp.org/dist/quicklisp/2019-07-11/distinfo.txt";
+ sha256 = "0r7ga5gkiy6va1v7a01fnj1yp97pifl9v8fnqpvbiv33dwdvbx2w";
};
buildPhase = '' true; '';
postInstall = ''
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cffi-grovel.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cffi-grovel.nix
index 1af0947627f5..a7d22ac129b9 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cffi-grovel.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cffi-grovel.nix
@@ -1,15 +1,15 @@
args @ { fetchurl, ... }:
rec {
baseName = ''cffi-grovel'';
- version = ''cffi_0.20.0'';
+ version = ''cffi_0.20.1'';
description = ''The CFFI Groveller'';
deps = [ args."alexandria" args."babel" args."cffi" args."cffi-toolchain" args."trivial-features" ];
src = fetchurl {
- url = ''http://beta.quicklisp.org/archive/cffi/2018-12-10/cffi_0.20.0.tgz'';
- sha256 = ''1jal7r0dqp0sc5wj8a97xjlvfvayymdp1w3172hdxfppddnhhm8z'';
+ url = ''http://beta.quicklisp.org/archive/cffi/2019-07-10/cffi_0.20.1.tgz'';
+ sha256 = ''0ppcwc61ww1igmkwpvzpr9hzsl8wpf8acxlamq5r0604iz07qhka'';
};
packageName = "cffi-grovel";
@@ -18,13 +18,13 @@ rec {
overrides = x: x;
}
/* (SYSTEM cffi-grovel DESCRIPTION The CFFI Groveller SHA256
- 1jal7r0dqp0sc5wj8a97xjlvfvayymdp1w3172hdxfppddnhhm8z URL
- http://beta.quicklisp.org/archive/cffi/2018-12-10/cffi_0.20.0.tgz MD5
- 94a8b377cf1ac7d8fc73dcc98f3420c6 NAME cffi-grovel FILENAME cffi-grovel DEPS
+ 0ppcwc61ww1igmkwpvzpr9hzsl8wpf8acxlamq5r0604iz07qhka URL
+ http://beta.quicklisp.org/archive/cffi/2019-07-10/cffi_0.20.1.tgz MD5
+ b8a8337465a7b4c1be05270b777ce14f NAME cffi-grovel FILENAME cffi-grovel DEPS
((NAME alexandria FILENAME alexandria) (NAME babel FILENAME babel)
(NAME cffi FILENAME cffi) (NAME cffi-toolchain FILENAME cffi-toolchain)
(NAME trivial-features FILENAME trivial-features))
DEPENDENCIES (alexandria babel cffi cffi-toolchain trivial-features)
- VERSION cffi_0.20.0 SIBLINGS
+ VERSION cffi_0.20.1 SIBLINGS
(cffi-examples cffi-libffi cffi-tests cffi-toolchain cffi-uffi-compat cffi)
PARASITES NIL) */
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cffi-toolchain.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cffi-toolchain.nix
index c440c72788fe..3d2463806073 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cffi-toolchain.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cffi-toolchain.nix
@@ -1,15 +1,15 @@
args @ { fetchurl, ... }:
rec {
baseName = ''cffi-toolchain'';
- version = ''cffi_0.20.0'';
+ version = ''cffi_0.20.1'';
description = ''The CFFI toolchain'';
deps = [ args."alexandria" args."babel" args."cffi" args."trivial-features" ];
src = fetchurl {
- url = ''http://beta.quicklisp.org/archive/cffi/2018-12-10/cffi_0.20.0.tgz'';
- sha256 = ''1jal7r0dqp0sc5wj8a97xjlvfvayymdp1w3172hdxfppddnhhm8z'';
+ url = ''http://beta.quicklisp.org/archive/cffi/2019-07-10/cffi_0.20.1.tgz'';
+ sha256 = ''0ppcwc61ww1igmkwpvzpr9hzsl8wpf8acxlamq5r0604iz07qhka'';
};
packageName = "cffi-toolchain";
@@ -18,14 +18,14 @@ rec {
overrides = x: x;
}
/* (SYSTEM cffi-toolchain DESCRIPTION The CFFI toolchain SHA256
- 1jal7r0dqp0sc5wj8a97xjlvfvayymdp1w3172hdxfppddnhhm8z URL
- http://beta.quicklisp.org/archive/cffi/2018-12-10/cffi_0.20.0.tgz MD5
- 94a8b377cf1ac7d8fc73dcc98f3420c6 NAME cffi-toolchain FILENAME
+ 0ppcwc61ww1igmkwpvzpr9hzsl8wpf8acxlamq5r0604iz07qhka URL
+ http://beta.quicklisp.org/archive/cffi/2019-07-10/cffi_0.20.1.tgz MD5
+ b8a8337465a7b4c1be05270b777ce14f NAME cffi-toolchain FILENAME
cffi-toolchain DEPS
((NAME alexandria FILENAME alexandria) (NAME babel FILENAME babel)
(NAME cffi FILENAME cffi)
(NAME trivial-features FILENAME trivial-features))
- DEPENDENCIES (alexandria babel cffi trivial-features) VERSION cffi_0.20.0
+ DEPENDENCIES (alexandria babel cffi trivial-features) VERSION cffi_0.20.1
SIBLINGS
(cffi-examples cffi-grovel cffi-libffi cffi-tests cffi-uffi-compat cffi)
PARASITES NIL) */
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cffi.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cffi.nix
index 001c7d9a5450..b83b14611978 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cffi.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cffi.nix
@@ -1,7 +1,7 @@
args @ { fetchurl, ... }:
rec {
baseName = ''cffi'';
- version = ''cffi_0.20.0'';
+ version = ''cffi_0.20.1'';
parasites = [ "cffi/c2ffi" "cffi/c2ffi-generator" ];
@@ -10,8 +10,8 @@ rec {
deps = [ args."alexandria" args."babel" args."cl-json" args."cl-ppcre" args."trivial-features" args."uiop" ];
src = fetchurl {
- url = ''http://beta.quicklisp.org/archive/cffi/2018-12-10/cffi_0.20.0.tgz'';
- sha256 = ''1jal7r0dqp0sc5wj8a97xjlvfvayymdp1w3172hdxfppddnhhm8z'';
+ url = ''http://beta.quicklisp.org/archive/cffi/2019-07-10/cffi_0.20.1.tgz'';
+ sha256 = ''0ppcwc61ww1igmkwpvzpr9hzsl8wpf8acxlamq5r0604iz07qhka'';
};
packageName = "cffi";
@@ -20,15 +20,15 @@ rec {
overrides = x: x;
}
/* (SYSTEM cffi DESCRIPTION The Common Foreign Function Interface SHA256
- 1jal7r0dqp0sc5wj8a97xjlvfvayymdp1w3172hdxfppddnhhm8z URL
- http://beta.quicklisp.org/archive/cffi/2018-12-10/cffi_0.20.0.tgz MD5
- 94a8b377cf1ac7d8fc73dcc98f3420c6 NAME cffi FILENAME cffi DEPS
+ 0ppcwc61ww1igmkwpvzpr9hzsl8wpf8acxlamq5r0604iz07qhka URL
+ http://beta.quicklisp.org/archive/cffi/2019-07-10/cffi_0.20.1.tgz MD5
+ b8a8337465a7b4c1be05270b777ce14f NAME cffi FILENAME cffi DEPS
((NAME alexandria FILENAME alexandria) (NAME babel FILENAME babel)
(NAME cl-json FILENAME cl-json) (NAME cl-ppcre FILENAME cl-ppcre)
(NAME trivial-features FILENAME trivial-features)
(NAME uiop FILENAME uiop))
DEPENDENCIES (alexandria babel cl-json cl-ppcre trivial-features uiop)
- VERSION cffi_0.20.0 SIBLINGS
+ VERSION cffi_0.20.1 SIBLINGS
(cffi-examples cffi-grovel cffi-libffi cffi-tests cffi-toolchain
cffi-uffi-compat)
PARASITES (cffi/c2ffi cffi/c2ffi-generator)) */
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/chipz.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/chipz.nix
index a9808173b626..c30c68e53c8d 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/chipz.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/chipz.nix
@@ -1,15 +1,15 @@
args @ { fetchurl, ... }:
rec {
baseName = ''chipz'';
- version = ''20180328-git'';
+ version = ''20190202-git'';
description = ''A library for decompressing deflate, zlib, and gzip data'';
deps = [ ];
src = fetchurl {
- url = ''http://beta.quicklisp.org/archive/chipz/2018-03-28/chipz-20180328-git.tgz'';
- sha256 = ''0ryjrfrlzyjkzb799indyzxivq8s9d7pgjzss7ha91xzr8sl6xf7'';
+ url = ''http://beta.quicklisp.org/archive/chipz/2019-02-02/chipz-20190202-git.tgz'';
+ sha256 = ''1vk8nml2kvkpwydcnm49gz2j9flvl8676kbvci5qa7qm286dhn5a'';
};
packageName = "chipz";
@@ -19,7 +19,7 @@ rec {
}
/* (SYSTEM chipz DESCRIPTION
A library for decompressing deflate, zlib, and gzip data SHA256
- 0ryjrfrlzyjkzb799indyzxivq8s9d7pgjzss7ha91xzr8sl6xf7 URL
- http://beta.quicklisp.org/archive/chipz/2018-03-28/chipz-20180328-git.tgz
- MD5 a548809d6ef705c69356a2057ecd8a52 NAME chipz FILENAME chipz DEPS NIL
- DEPENDENCIES NIL VERSION 20180328-git SIBLINGS NIL PARASITES NIL) */
+ 1vk8nml2kvkpwydcnm49gz2j9flvl8676kbvci5qa7qm286dhn5a URL
+ http://beta.quicklisp.org/archive/chipz/2019-02-02/chipz-20190202-git.tgz
+ MD5 e3533408ca6899fe996eede390e820c7 NAME chipz FILENAME chipz DEPS NIL
+ DEPENDENCIES NIL VERSION 20190202-git SIBLINGS NIL PARASITES NIL) */
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-async-repl.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-async-repl.nix
index d678fd8e9424..d84233c43424 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-async-repl.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-async-repl.nix
@@ -1,15 +1,15 @@
args @ { fetchurl, ... }:
rec {
baseName = ''cl-async-repl'';
- version = ''cl-async-20190107-git'';
+ version = ''cl-async-20190307-git'';
description = ''REPL integration for CL-ASYNC.'';
deps = [ args."alexandria" args."babel" args."bordeaux-threads" args."cffi" args."cffi-grovel" args."cffi-toolchain" args."cl-async" args."cl-async-base" args."cl-async-util" args."cl-libuv" args."cl-ppcre" args."fast-io" args."static-vectors" args."trivial-features" args."trivial-gray-streams" args."vom" ];
src = fetchurl {
- url = ''http://beta.quicklisp.org/archive/cl-async/2019-01-07/cl-async-20190107-git.tgz'';
- sha256 = ''11hgsnms6w2s1vsphsqdwyqql11aa6bzplzrp5w4lizl2nkva82b'';
+ url = ''http://beta.quicklisp.org/archive/cl-async/2019-03-07/cl-async-20190307-git.tgz'';
+ sha256 = ''1sgqdz1dqhknh92l39w67931kml6v9c5yj0brx7lb18l1z76ycw6'';
};
packageName = "cl-async-repl";
@@ -18,9 +18,9 @@ rec {
overrides = x: x;
}
/* (SYSTEM cl-async-repl DESCRIPTION REPL integration for CL-ASYNC. SHA256
- 11hgsnms6w2s1vsphsqdwyqql11aa6bzplzrp5w4lizl2nkva82b URL
- http://beta.quicklisp.org/archive/cl-async/2019-01-07/cl-async-20190107-git.tgz
- MD5 609aa604c6940ee81f382cb249f3ca72 NAME cl-async-repl FILENAME
+ 1sgqdz1dqhknh92l39w67931kml6v9c5yj0brx7lb18l1z76ycw6 URL
+ http://beta.quicklisp.org/archive/cl-async/2019-03-07/cl-async-20190307-git.tgz
+ MD5 ead46ad0e709ce26489eb8b239bdbd0e NAME cl-async-repl FILENAME
cl-async-repl DEPS
((NAME alexandria FILENAME alexandria) (NAME babel FILENAME babel)
(NAME bordeaux-threads FILENAME bordeaux-threads)
@@ -39,5 +39,5 @@ rec {
(alexandria babel bordeaux-threads cffi cffi-grovel cffi-toolchain cl-async
cl-async-base cl-async-util cl-libuv cl-ppcre fast-io static-vectors
trivial-features trivial-gray-streams vom)
- VERSION cl-async-20190107-git SIBLINGS
+ VERSION cl-async-20190307-git SIBLINGS
(cl-async-ssl cl-async-test cl-async) PARASITES NIL) */
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-async-ssl.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-async-ssl.nix
index 722e05ed09c2..c13b8b70647d 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-async-ssl.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-async-ssl.nix
@@ -1,15 +1,15 @@
args @ { fetchurl, ... }:
rec {
baseName = ''cl-async-ssl'';
- version = ''cl-async-20190107-git'';
+ version = ''cl-async-20190307-git'';
description = ''SSL Wrapper around cl-async socket implementation.'';
deps = [ args."alexandria" args."babel" args."bordeaux-threads" args."cffi" args."cffi-grovel" args."cffi-toolchain" args."cl-async" args."cl-async-base" args."cl-async-util" args."cl-libuv" args."cl-ppcre" args."fast-io" args."static-vectors" args."trivial-features" args."trivial-gray-streams" args."vom" ];
src = fetchurl {
- url = ''http://beta.quicklisp.org/archive/cl-async/2019-01-07/cl-async-20190107-git.tgz'';
- sha256 = ''11hgsnms6w2s1vsphsqdwyqql11aa6bzplzrp5w4lizl2nkva82b'';
+ url = ''http://beta.quicklisp.org/archive/cl-async/2019-03-07/cl-async-20190307-git.tgz'';
+ sha256 = ''1sgqdz1dqhknh92l39w67931kml6v9c5yj0brx7lb18l1z76ycw6'';
};
packageName = "cl-async-ssl";
@@ -19,9 +19,9 @@ rec {
}
/* (SYSTEM cl-async-ssl DESCRIPTION
SSL Wrapper around cl-async socket implementation. SHA256
- 11hgsnms6w2s1vsphsqdwyqql11aa6bzplzrp5w4lizl2nkva82b URL
- http://beta.quicklisp.org/archive/cl-async/2019-01-07/cl-async-20190107-git.tgz
- MD5 609aa604c6940ee81f382cb249f3ca72 NAME cl-async-ssl FILENAME
+ 1sgqdz1dqhknh92l39w67931kml6v9c5yj0brx7lb18l1z76ycw6 URL
+ http://beta.quicklisp.org/archive/cl-async/2019-03-07/cl-async-20190307-git.tgz
+ MD5 ead46ad0e709ce26489eb8b239bdbd0e NAME cl-async-ssl FILENAME
cl-async-ssl DEPS
((NAME alexandria FILENAME alexandria) (NAME babel FILENAME babel)
(NAME bordeaux-threads FILENAME bordeaux-threads)
@@ -40,5 +40,5 @@ rec {
(alexandria babel bordeaux-threads cffi cffi-grovel cffi-toolchain cl-async
cl-async-base cl-async-util cl-libuv cl-ppcre fast-io static-vectors
trivial-features trivial-gray-streams vom)
- VERSION cl-async-20190107-git SIBLINGS
+ VERSION cl-async-20190307-git SIBLINGS
(cl-async-repl cl-async-test cl-async) PARASITES NIL) */
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-async.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-async.nix
index edb4b01b0d1d..363227534a8b 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-async.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-async.nix
@@ -1,7 +1,7 @@
args @ { fetchurl, ... }:
rec {
baseName = ''cl-async'';
- version = ''20190107-git'';
+ version = ''20190307-git'';
parasites = [ "cl-async-base" "cl-async-util" ];
@@ -10,8 +10,8 @@ rec {
deps = [ args."alexandria" args."babel" args."bordeaux-threads" args."cffi" args."cffi-grovel" args."cffi-toolchain" args."cl-libuv" args."cl-ppcre" args."fast-io" args."static-vectors" args."trivial-features" args."trivial-gray-streams" args."uiop" args."vom" ];
src = fetchurl {
- url = ''http://beta.quicklisp.org/archive/cl-async/2019-01-07/cl-async-20190107-git.tgz'';
- sha256 = ''11hgsnms6w2s1vsphsqdwyqql11aa6bzplzrp5w4lizl2nkva82b'';
+ url = ''http://beta.quicklisp.org/archive/cl-async/2019-03-07/cl-async-20190307-git.tgz'';
+ sha256 = ''1sgqdz1dqhknh92l39w67931kml6v9c5yj0brx7lb18l1z76ycw6'';
};
packageName = "cl-async";
@@ -20,9 +20,9 @@ rec {
overrides = x: x;
}
/* (SYSTEM cl-async DESCRIPTION Asynchronous operations for Common Lisp. SHA256
- 11hgsnms6w2s1vsphsqdwyqql11aa6bzplzrp5w4lizl2nkva82b URL
- http://beta.quicklisp.org/archive/cl-async/2019-01-07/cl-async-20190107-git.tgz
- MD5 609aa604c6940ee81f382cb249f3ca72 NAME cl-async FILENAME cl-async DEPS
+ 1sgqdz1dqhknh92l39w67931kml6v9c5yj0brx7lb18l1z76ycw6 URL
+ http://beta.quicklisp.org/archive/cl-async/2019-03-07/cl-async-20190307-git.tgz
+ MD5 ead46ad0e709ce26489eb8b239bdbd0e NAME cl-async FILENAME cl-async DEPS
((NAME alexandria FILENAME alexandria) (NAME babel FILENAME babel)
(NAME bordeaux-threads FILENAME bordeaux-threads)
(NAME cffi FILENAME cffi) (NAME cffi-grovel FILENAME cffi-grovel)
@@ -37,5 +37,5 @@ rec {
(alexandria babel bordeaux-threads cffi cffi-grovel cffi-toolchain cl-libuv
cl-ppcre fast-io static-vectors trivial-features trivial-gray-streams uiop
vom)
- VERSION 20190107-git SIBLINGS (cl-async-repl cl-async-ssl cl-async-test)
+ VERSION 20190307-git SIBLINGS (cl-async-repl cl-async-ssl cl-async-test)
PARASITES (cl-async-base cl-async-util)) */
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 a1da44a6b896..bdc5fe920cf6 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
@@ -1,15 +1,15 @@
args @ { fetchurl, ... }:
rec {
baseName = ''cl-dbi'';
- version = ''20190107-git'';
+ version = ''20190521-git'';
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" ];
src = fetchurl {
- url = ''http://beta.quicklisp.org/archive/cl-dbi/2019-01-07/cl-dbi-20190107-git.tgz'';
- sha256 = ''02w729jfkbd8443ia07ixr53b4asxx2gcllr84hvlibafawkkdh2'';
+ url = ''http://beta.quicklisp.org/archive/cl-dbi/2019-05-21/cl-dbi-20190521-git.tgz'';
+ sha256 = ''1q0hhgxnd91v020zh9ivlmzhzz5ald6q1bm5i5cawzh0xfyfhhvg'';
};
packageName = "cl-dbi";
@@ -18,9 +18,9 @@ rec {
overrides = x: x;
}
/* (SYSTEM cl-dbi DESCRIPTION NIL SHA256
- 02w729jfkbd8443ia07ixr53b4asxx2gcllr84hvlibafawkkdh2 URL
- http://beta.quicklisp.org/archive/cl-dbi/2019-01-07/cl-dbi-20190107-git.tgz
- MD5 349829f5d0bf363b828827ad6728c54e NAME cl-dbi FILENAME cl-dbi DEPS
+ 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
((NAME alexandria FILENAME alexandria)
(NAME bordeaux-threads FILENAME bordeaux-threads)
(NAME cl-annot FILENAME cl-annot) (NAME cl-syntax FILENAME cl-syntax)
@@ -32,5 +32,5 @@ rec {
DEPENDENCIES
(alexandria bordeaux-threads cl-annot cl-syntax cl-syntax-annot closer-mop
dbi named-readtables split-sequence trivial-types)
- VERSION 20190107-git SIBLINGS
+ VERSION 20190521-git SIBLINGS
(dbd-mysql dbd-postgres dbd-sqlite3 dbi-test dbi) PARASITES NIL) */
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-emb.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-emb.nix
index 78f70be2f1fe..1510495a4cbc 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-emb.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-emb.nix
@@ -1,15 +1,15 @@
args @ { fetchurl, ... }:
rec {
baseName = ''cl-emb'';
- version = ''20180228-git'';
+ version = ''20190521-git'';
description = ''A templating system for Common Lisp'';
deps = [ args."cl-ppcre" ];
src = fetchurl {
- url = ''http://beta.quicklisp.org/archive/cl-emb/2018-02-28/cl-emb-20180228-git.tgz'';
- sha256 = ''0b7y3n65sjn3xk03jflw363m6jkx86zf9v540d4n5jv4vcn34sqw'';
+ url = ''http://beta.quicklisp.org/archive/cl-emb/2019-05-21/cl-emb-20190521-git.tgz'';
+ sha256 = ''1d6bi2mx1kw7an3maxjp4ldrhkwfdb58va9whxblz2xjlbykdv8d'';
};
packageName = "cl-emb";
@@ -18,8 +18,8 @@ rec {
overrides = x: x;
}
/* (SYSTEM cl-emb DESCRIPTION A templating system for Common Lisp SHA256
- 0b7y3n65sjn3xk03jflw363m6jkx86zf9v540d4n5jv4vcn34sqw URL
- http://beta.quicklisp.org/archive/cl-emb/2018-02-28/cl-emb-20180228-git.tgz
- MD5 94db80b2a91611e71ada33f500b49d22 NAME cl-emb FILENAME cl-emb DEPS
+ 1d6bi2mx1kw7an3maxjp4ldrhkwfdb58va9whxblz2xjlbykdv8d URL
+ http://beta.quicklisp.org/archive/cl-emb/2019-05-21/cl-emb-20190521-git.tgz
+ MD5 b27bbe8de2206ab7c461700b58d4d527 NAME cl-emb FILENAME cl-emb DEPS
((NAME cl-ppcre FILENAME cl-ppcre)) DEPENDENCIES (cl-ppcre) VERSION
- 20180228-git SIBLINGS NIL PARASITES NIL) */
+ 20190521-git SIBLINGS NIL PARASITES NIL) */
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-fuse-meta-fs.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-fuse-meta-fs.nix
index c33efa2eb08a..6a40d0fa8c92 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-fuse-meta-fs.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-fuse-meta-fs.nix
@@ -1,15 +1,15 @@
args @ { fetchurl, ... }:
rec {
baseName = ''cl-fuse-meta-fs'';
- version = ''20150608-git'';
+ version = ''20190710-git'';
description = ''CFFI bindings to FUSE (Filesystem in user space)'';
deps = [ args."alexandria" args."babel" args."bordeaux-threads" args."cffi" args."cffi-grovel" args."cffi-toolchain" args."cl-fuse" args."cl-utilities" args."iterate" args."pcall" args."pcall-queue" args."trivial-backtrace" args."trivial-features" args."trivial-utf-8" ];
src = fetchurl {
- url = ''http://beta.quicklisp.org/archive/cl-fuse-meta-fs/2015-06-08/cl-fuse-meta-fs-20150608-git.tgz'';
- sha256 = ''1i3yw237ygwlkhbcbm9q54ad9g4fi63fw4mg508hr7bz9gzg36q2'';
+ url = ''http://beta.quicklisp.org/archive/cl-fuse-meta-fs/2019-07-10/cl-fuse-meta-fs-20190710-git.tgz'';
+ sha256 = ''1c2nyxj7q8njxydn4xiagvnb21zhb1l07q7nhfw0qs2qk6dkasq7'';
};
packageName = "cl-fuse-meta-fs";
@@ -19,9 +19,9 @@ rec {
}
/* (SYSTEM cl-fuse-meta-fs DESCRIPTION
CFFI bindings to FUSE (Filesystem in user space) SHA256
- 1i3yw237ygwlkhbcbm9q54ad9g4fi63fw4mg508hr7bz9gzg36q2 URL
- http://beta.quicklisp.org/archive/cl-fuse-meta-fs/2015-06-08/cl-fuse-meta-fs-20150608-git.tgz
- MD5 eb80b959dd6494cd787cff4f8c2f214b NAME cl-fuse-meta-fs FILENAME
+ 1c2nyxj7q8njxydn4xiagvnb21zhb1l07q7nhfw0qs2qk6dkasq7 URL
+ http://beta.quicklisp.org/archive/cl-fuse-meta-fs/2019-07-10/cl-fuse-meta-fs-20190710-git.tgz
+ MD5 461f7023274fb273e6c759e881bdd636 NAME cl-fuse-meta-fs FILENAME
cl-fuse-meta-fs DEPS
((NAME alexandria FILENAME alexandria) (NAME babel FILENAME babel)
(NAME bordeaux-threads FILENAME bordeaux-threads)
@@ -37,4 +37,4 @@ rec {
(alexandria babel bordeaux-threads cffi cffi-grovel cffi-toolchain cl-fuse
cl-utilities iterate pcall pcall-queue trivial-backtrace trivial-features
trivial-utf-8)
- VERSION 20150608-git SIBLINGS NIL PARASITES NIL) */
+ VERSION 20190710-git SIBLINGS NIL PARASITES NIL) */
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-fuse.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-fuse.nix
index d41fe76ca232..de71e2e299ad 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-fuse.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-fuse.nix
@@ -1,15 +1,15 @@
args @ { fetchurl, ... }:
rec {
baseName = ''cl-fuse'';
- version = ''20160318-git'';
+ version = ''20190710-git'';
description = ''CFFI bindings to FUSE (Filesystem in user space)'';
deps = [ args."alexandria" args."babel" args."bordeaux-threads" args."cffi" args."cffi-grovel" args."cffi-toolchain" args."cl-utilities" args."iterate" args."trivial-backtrace" args."trivial-features" args."trivial-utf-8" ];
src = fetchurl {
- url = ''http://beta.quicklisp.org/archive/cl-fuse/2016-03-18/cl-fuse-20160318-git.tgz'';
- sha256 = ''1yllmnnhqp42s37a2y7h7vph854xgna62l1pidvlyskc90bl5jf6'';
+ url = ''http://beta.quicklisp.org/archive/cl-fuse/2019-07-10/cl-fuse-20190710-git.tgz'';
+ sha256 = ''1gxah8qwwb9xlvbdy5xxz07hh2hsw7xdrps1n4slhz4x6vyy80li'';
};
packageName = "cl-fuse";
@@ -18,9 +18,9 @@ rec {
overrides = x: x;
}
/* (SYSTEM cl-fuse DESCRIPTION CFFI bindings to FUSE (Filesystem in user space)
- SHA256 1yllmnnhqp42s37a2y7h7vph854xgna62l1pidvlyskc90bl5jf6 URL
- http://beta.quicklisp.org/archive/cl-fuse/2016-03-18/cl-fuse-20160318-git.tgz
- MD5 ce2e907e5ae2cece72fa314be1ced44c NAME cl-fuse FILENAME cl-fuse DEPS
+ SHA256 1gxah8qwwb9xlvbdy5xxz07hh2hsw7xdrps1n4slhz4x6vyy80li URL
+ http://beta.quicklisp.org/archive/cl-fuse/2019-07-10/cl-fuse-20190710-git.tgz
+ MD5 5f267e59eb2358b1b6e4e735fb408e6a NAME cl-fuse FILENAME cl-fuse DEPS
((NAME alexandria FILENAME alexandria) (NAME babel FILENAME babel)
(NAME bordeaux-threads FILENAME bordeaux-threads)
(NAME cffi FILENAME cffi) (NAME cffi-grovel FILENAME cffi-grovel)
@@ -32,4 +32,4 @@ rec {
DEPENDENCIES
(alexandria babel bordeaux-threads cffi cffi-grovel cffi-toolchain
cl-utilities iterate trivial-backtrace trivial-features trivial-utf-8)
- VERSION 20160318-git SIBLINGS NIL PARASITES NIL) */
+ VERSION 20190710-git SIBLINGS NIL PARASITES NIL) */
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-html5-parser.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-html5-parser.nix
index d1ce782e7f84..dde2cc31dd05 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-html5-parser.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-html5-parser.nix
@@ -1,15 +1,15 @@
args @ { fetchurl, ... }:
rec {
baseName = ''cl-html5-parser'';
- version = ''20171019-git'';
+ version = ''20190521-git'';
description = ''A HTML5 parser for Common Lisp'';
deps = [ args."cl-ppcre" args."flexi-streams" args."string-case" args."trivial-gray-streams" ];
src = fetchurl {
- url = ''http://beta.quicklisp.org/archive/cl-html5-parser/2017-10-19/cl-html5-parser-20171019-git.tgz'';
- sha256 = ''0ww4r8x27k060krnwq2nb9w93wl9cxqjqil4j1n0fgpbyp2mqn98'';
+ url = ''http://beta.quicklisp.org/archive/cl-html5-parser/2019-05-21/cl-html5-parser-20190521-git.tgz'';
+ sha256 = ''055jz0yqgjncvy2dxvnwg4iwdvmfsvkch46v58nymz5gi8gaaz7p'';
};
packageName = "cl-html5-parser";
@@ -18,14 +18,14 @@ rec {
overrides = x: x;
}
/* (SYSTEM cl-html5-parser DESCRIPTION A HTML5 parser for Common Lisp SHA256
- 0ww4r8x27k060krnwq2nb9w93wl9cxqjqil4j1n0fgpbyp2mqn98 URL
- http://beta.quicklisp.org/archive/cl-html5-parser/2017-10-19/cl-html5-parser-20171019-git.tgz
- MD5 c4a18ac20668c9aef723954fb901c16b NAME cl-html5-parser FILENAME
+ 055jz0yqgjncvy2dxvnwg4iwdvmfsvkch46v58nymz5gi8gaaz7p URL
+ http://beta.quicklisp.org/archive/cl-html5-parser/2019-05-21/cl-html5-parser-20190521-git.tgz
+ MD5 149e5609d0a96c867fac6c22693c5e30 NAME cl-html5-parser FILENAME
cl-html5-parser DEPS
((NAME cl-ppcre FILENAME cl-ppcre)
(NAME flexi-streams FILENAME flexi-streams)
(NAME string-case FILENAME string-case)
(NAME trivial-gray-streams FILENAME trivial-gray-streams))
DEPENDENCIES (cl-ppcre flexi-streams string-case trivial-gray-streams)
- VERSION 20171019-git SIBLINGS (cl-html5-parser-cxml cl-html5-parser-tests)
+ VERSION 20190521-git SIBLINGS (cl-html5-parser-cxml cl-html5-parser-tests)
PARASITES NIL) */
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-interpol.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-interpol.nix
index 1f58be6c09e9..b0be8c775a37 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-interpol.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-interpol.nix
@@ -5,7 +5,7 @@ rec {
parasites = [ "cl-interpol-test" ];
- description = '''';
+ description = ''System lacks description'';
deps = [ args."cl-ppcre" args."cl-unicode" args."flexi-streams" args."named-readtables" ];
@@ -19,7 +19,7 @@ rec {
asdFilesToKeep = ["cl-interpol.asd"];
overrides = x: x;
}
-/* (SYSTEM cl-interpol DESCRIPTION NIL SHA256
+/* (SYSTEM cl-interpol DESCRIPTION System lacks description SHA256
1s88m5kci9y9h3ycvqm0xjzbkbd8zhm9rxp2a674hmgrjfqras0r URL
http://beta.quicklisp.org/archive/cl-interpol/2018-07-11/cl-interpol-20180711-git.tgz
MD5 b2d6893ef703c5b6e5736fa33ba0794e NAME cl-interpol FILENAME cl-interpol
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-markup.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-markup.nix
index 8967b0970c56..b1916c27bfdd 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-markup.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-markup.nix
@@ -3,7 +3,7 @@ rec {
baseName = ''cl-markup'';
version = ''20131003-git'';
- description = '''';
+ description = ''System lacks description'';
deps = [ ];
@@ -17,7 +17,7 @@ rec {
asdFilesToKeep = ["cl-markup.asd"];
overrides = x: x;
}
-/* (SYSTEM cl-markup DESCRIPTION NIL SHA256
+/* (SYSTEM cl-markup DESCRIPTION System lacks description SHA256
1ik3a5k6axq941zbf6zyig553i5gnypbcxdq9l7bfxp8w18vbj0r URL
http://beta.quicklisp.org/archive/cl-markup/2013-10-03/cl-markup-20131003-git.tgz
MD5 3ec36b8e15435933f614959032987848 NAME cl-markup FILENAME cl-markup DEPS
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-postgres.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-postgres.nix
index 08b6a492e766..2fad295c7ee5 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-postgres.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-postgres.nix
@@ -1,7 +1,7 @@
args @ { fetchurl, ... }:
rec {
baseName = ''cl-postgres'';
- version = ''postmodern-20190107-git'';
+ version = ''postmodern-20190521-git'';
parasites = [ "cl-postgres/simple-date-tests" "cl-postgres/tests" ];
@@ -10,8 +10,8 @@ rec {
deps = [ args."fiveam" args."md5" args."simple-date_slash_postgres-glue" args."split-sequence" args."usocket" ];
src = fetchurl {
- url = ''http://beta.quicklisp.org/archive/postmodern/2019-01-07/postmodern-20190107-git.tgz'';
- sha256 = ''030p5kp593p4z7p3k0828dlayglw2si3q187z1fafgpvspp42sd5'';
+ url = ''http://beta.quicklisp.org/archive/postmodern/2019-05-21/postmodern-20190521-git.tgz'';
+ sha256 = ''1vphrizbhbs3r5rq4b8dh4149bz11h5xxilragwf4l2i619k3cp5'';
};
packageName = "cl-postgres";
@@ -20,14 +20,14 @@ rec {
overrides = x: x;
}
/* (SYSTEM cl-postgres DESCRIPTION Low-level client library for PostgreSQL
- SHA256 030p5kp593p4z7p3k0828dlayglw2si3q187z1fafgpvspp42sd5 URL
- http://beta.quicklisp.org/archive/postmodern/2019-01-07/postmodern-20190107-git.tgz
- MD5 3f6f78c4fb0f5a8bb9f13247f1f3d6eb NAME cl-postgres FILENAME cl-postgres
+ SHA256 1vphrizbhbs3r5rq4b8dh4149bz11h5xxilragwf4l2i619k3cp5 URL
+ http://beta.quicklisp.org/archive/postmodern/2019-05-21/postmodern-20190521-git.tgz
+ MD5 102567f386757cd52aca500c0c348d90 NAME cl-postgres FILENAME cl-postgres
DEPS
((NAME fiveam FILENAME fiveam) (NAME md5 FILENAME md5)
(NAME simple-date/postgres-glue FILENAME simple-date_slash_postgres-glue)
(NAME split-sequence FILENAME split-sequence)
(NAME usocket FILENAME usocket))
DEPENDENCIES (fiveam md5 simple-date/postgres-glue split-sequence usocket)
- VERSION postmodern-20190107-git SIBLINGS (postmodern s-sql simple-date)
+ VERSION postmodern-20190521-git SIBLINGS (postmodern s-sql simple-date)
PARASITES (cl-postgres/simple-date-tests cl-postgres/tests)) */
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-ppcre-unicode.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-ppcre-unicode.nix
index e65c0a03ddc5..27887f12497e 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-ppcre-unicode.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-ppcre-unicode.nix
@@ -1,7 +1,7 @@
args @ { fetchurl, ... }:
rec {
baseName = ''cl-ppcre-unicode'';
- version = ''cl-ppcre-20180831-git'';
+ version = ''cl-ppcre-20190521-git'';
parasites = [ "cl-ppcre-unicode-test" ];
@@ -10,8 +10,8 @@ rec {
deps = [ args."cl-ppcre" args."cl-ppcre-test" args."cl-unicode" args."flexi-streams" ];
src = fetchurl {
- url = ''http://beta.quicklisp.org/archive/cl-ppcre/2018-08-31/cl-ppcre-20180831-git.tgz'';
- sha256 = ''03x6hg2wzjwx9znqpzs9mmbrz81380ac6jkyblnsafbzr3d0rgyb'';
+ url = ''http://beta.quicklisp.org/archive/cl-ppcre/2019-05-21/cl-ppcre-20190521-git.tgz'';
+ sha256 = ''0p6jcvf9afnsg80a1zqsp7fyz0lf1fxzbin7rs9bl4i6jvm0hjqx'';
};
packageName = "cl-ppcre-unicode";
@@ -21,13 +21,13 @@ rec {
}
/* (SYSTEM cl-ppcre-unicode DESCRIPTION
Perl-compatible regular expression library (Unicode) SHA256
- 03x6hg2wzjwx9znqpzs9mmbrz81380ac6jkyblnsafbzr3d0rgyb URL
- http://beta.quicklisp.org/archive/cl-ppcre/2018-08-31/cl-ppcre-20180831-git.tgz
- MD5 021ef17563de8e5d5f5942629972785d NAME cl-ppcre-unicode FILENAME
+ 0p6jcvf9afnsg80a1zqsp7fyz0lf1fxzbin7rs9bl4i6jvm0hjqx URL
+ http://beta.quicklisp.org/archive/cl-ppcre/2019-05-21/cl-ppcre-20190521-git.tgz
+ MD5 a980b75c1b386b49bcb28107991eb4ec NAME cl-ppcre-unicode FILENAME
cl-ppcre-unicode DEPS
((NAME cl-ppcre FILENAME cl-ppcre)
(NAME cl-ppcre-test FILENAME cl-ppcre-test)
(NAME cl-unicode FILENAME cl-unicode)
(NAME flexi-streams FILENAME flexi-streams))
DEPENDENCIES (cl-ppcre cl-ppcre-test cl-unicode flexi-streams) VERSION
- cl-ppcre-20180831-git SIBLINGS (cl-ppcre) PARASITES (cl-ppcre-unicode-test)) */
+ cl-ppcre-20190521-git SIBLINGS (cl-ppcre) PARASITES (cl-ppcre-unicode-test)) */
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-ppcre.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-ppcre.nix
index 3f56cf3dfaee..8bb8fb2478d8 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-ppcre.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-ppcre.nix
@@ -1,7 +1,7 @@
args @ { fetchurl, ... }:
rec {
baseName = ''cl-ppcre'';
- version = ''20180831-git'';
+ version = ''20190521-git'';
parasites = [ "cl-ppcre-test" ];
@@ -10,8 +10,8 @@ rec {
deps = [ args."flexi-streams" ];
src = fetchurl {
- url = ''http://beta.quicklisp.org/archive/cl-ppcre/2018-08-31/cl-ppcre-20180831-git.tgz'';
- sha256 = ''03x6hg2wzjwx9znqpzs9mmbrz81380ac6jkyblnsafbzr3d0rgyb'';
+ url = ''http://beta.quicklisp.org/archive/cl-ppcre/2019-05-21/cl-ppcre-20190521-git.tgz'';
+ sha256 = ''0p6jcvf9afnsg80a1zqsp7fyz0lf1fxzbin7rs9bl4i6jvm0hjqx'';
};
packageName = "cl-ppcre";
@@ -20,8 +20,8 @@ rec {
overrides = x: x;
}
/* (SYSTEM cl-ppcre DESCRIPTION Perl-compatible regular expression library
- SHA256 03x6hg2wzjwx9znqpzs9mmbrz81380ac6jkyblnsafbzr3d0rgyb URL
- http://beta.quicklisp.org/archive/cl-ppcre/2018-08-31/cl-ppcre-20180831-git.tgz
- MD5 021ef17563de8e5d5f5942629972785d NAME cl-ppcre FILENAME cl-ppcre DEPS
+ SHA256 0p6jcvf9afnsg80a1zqsp7fyz0lf1fxzbin7rs9bl4i6jvm0hjqx URL
+ http://beta.quicklisp.org/archive/cl-ppcre/2019-05-21/cl-ppcre-20190521-git.tgz
+ MD5 a980b75c1b386b49bcb28107991eb4ec NAME cl-ppcre FILENAME cl-ppcre DEPS
((NAME flexi-streams FILENAME flexi-streams)) DEPENDENCIES (flexi-streams)
- VERSION 20180831-git SIBLINGS (cl-ppcre-unicode) PARASITES (cl-ppcre-test)) */
+ VERSION 20190521-git SIBLINGS (cl-ppcre-unicode) PARASITES (cl-ppcre-test)) */
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-project.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-project.nix
index 15fd56107c82..496a0bd4e567 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-project.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-project.nix
@@ -1,15 +1,15 @@
args @ { fetchurl, ... }:
rec {
baseName = ''cl-project'';
- version = ''20180831-git'';
+ version = ''20190521-git'';
description = ''Generate a skeleton for modern project'';
deps = [ args."alexandria" args."anaphora" args."bordeaux-threads" args."cl-ansi-text" args."cl-colors" args."cl-emb" args."cl-fad" args."cl-ppcre" args."let-plus" args."local-time" args."prove" args."uiop" ];
src = fetchurl {
- url = ''http://beta.quicklisp.org/archive/cl-project/2018-08-31/cl-project-20180831-git.tgz'';
- sha256 = ''0iifc03sj982bjakvy0k3m6zsidc3k1ds6xaq36wzgzgw7x6lm0s'';
+ url = ''http://beta.quicklisp.org/archive/cl-project/2019-05-21/cl-project-20190521-git.tgz'';
+ sha256 = ''1wm1php6bdyy1gy76vfxlmh1lm7snqg1mhpzhkcmqrrmz0jx0gnf'';
};
packageName = "cl-project";
@@ -18,9 +18,9 @@ rec {
overrides = x: x;
}
/* (SYSTEM cl-project DESCRIPTION Generate a skeleton for modern project SHA256
- 0iifc03sj982bjakvy0k3m6zsidc3k1ds6xaq36wzgzgw7x6lm0s URL
- http://beta.quicklisp.org/archive/cl-project/2018-08-31/cl-project-20180831-git.tgz
- MD5 11fbcc0f4f5c6d7b921eb83ab5f3ee1b NAME cl-project FILENAME cl-project
+ 1wm1php6bdyy1gy76vfxlmh1lm7snqg1mhpzhkcmqrrmz0jx0gnf URL
+ http://beta.quicklisp.org/archive/cl-project/2019-05-21/cl-project-20190521-git.tgz
+ MD5 1468189ff8880f43034c44adc317274f NAME cl-project FILENAME cl-project
DEPS
((NAME alexandria FILENAME alexandria) (NAME anaphora FILENAME anaphora)
(NAME bordeaux-threads FILENAME bordeaux-threads)
@@ -32,4 +32,4 @@ rec {
DEPENDENCIES
(alexandria anaphora bordeaux-threads cl-ansi-text cl-colors cl-emb cl-fad
cl-ppcre let-plus local-time prove uiop)
- VERSION 20180831-git SIBLINGS (cl-project-test) PARASITES NIL) */
+ VERSION 20190521-git SIBLINGS (cl-project-test) PARASITES NIL) */
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-smtp.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-smtp.nix
index 3ca67723925e..0d58e11b4d26 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-smtp.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-smtp.nix
@@ -1,15 +1,15 @@
args @ { fetchurl, ... }:
rec {
baseName = ''cl-smtp'';
- version = ''20180131-git'';
+ version = ''20190710-git'';
description = ''Common Lisp smtp client.'';
deps = [ args."alexandria" args."babel" args."bordeaux-threads" args."cffi" args."cl_plus_ssl" args."cl-base64" args."flexi-streams" args."split-sequence" args."trivial-features" args."trivial-garbage" args."trivial-gray-streams" args."usocket" ];
src = fetchurl {
- url = ''http://beta.quicklisp.org/archive/cl-smtp/2018-01-31/cl-smtp-20180131-git.tgz'';
- sha256 = ''0sjjynnynxmfxdfpvzl3jj1jz0dhj0bx4bv63q1icm2p9xzfzb61'';
+ url = ''http://beta.quicklisp.org/archive/cl-smtp/2019-07-10/cl-smtp-20190710-git.tgz'';
+ sha256 = ''1bx5jh5vl8slsgrl2w4yv7imiswl8nmknczzyj5bzm1bzk0hx52r'';
};
packageName = "cl-smtp";
@@ -18,9 +18,9 @@ rec {
overrides = x: x;
}
/* (SYSTEM cl-smtp DESCRIPTION Common Lisp smtp client. SHA256
- 0sjjynnynxmfxdfpvzl3jj1jz0dhj0bx4bv63q1icm2p9xzfzb61 URL
- http://beta.quicklisp.org/archive/cl-smtp/2018-01-31/cl-smtp-20180131-git.tgz
- MD5 0ce08f067f145ab4c7528f806f0b51ff NAME cl-smtp FILENAME cl-smtp DEPS
+ 1bx5jh5vl8slsgrl2w4yv7imiswl8nmknczzyj5bzm1bzk0hx52r URL
+ http://beta.quicklisp.org/archive/cl-smtp/2019-07-10/cl-smtp-20190710-git.tgz
+ MD5 f55956a4708d0b4fc2ba181063b73e92 NAME cl-smtp FILENAME cl-smtp DEPS
((NAME alexandria FILENAME alexandria) (NAME babel FILENAME babel)
(NAME bordeaux-threads FILENAME bordeaux-threads)
(NAME cffi FILENAME cffi) (NAME cl+ssl FILENAME cl_plus_ssl)
@@ -35,4 +35,4 @@ rec {
(alexandria babel bordeaux-threads cffi cl+ssl cl-base64 flexi-streams
split-sequence trivial-features trivial-garbage trivial-gray-streams
usocket)
- VERSION 20180131-git SIBLINGS NIL PARASITES NIL) */
+ VERSION 20190710-git SIBLINGS NIL PARASITES NIL) */
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-unicode.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-unicode.nix
index cec8cc2865c2..7849acb57c0a 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-unicode.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-unicode.nix
@@ -1,7 +1,7 @@
args @ { fetchurl, ... }:
rec {
baseName = ''cl-unicode'';
- version = ''20180328-git'';
+ version = ''20190521-git'';
parasites = [ "cl-unicode/base" "cl-unicode/build" "cl-unicode/test" ];
@@ -10,8 +10,8 @@ rec {
deps = [ args."cl-ppcre" args."flexi-streams" ];
src = fetchurl {
- url = ''http://beta.quicklisp.org/archive/cl-unicode/2018-03-28/cl-unicode-20180328-git.tgz'';
- sha256 = ''1ky8qhvisagyvd7qcqzvy40z2sl9dr16q94k21wpgpvlz3kwbpln'';
+ url = ''http://beta.quicklisp.org/archive/cl-unicode/2019-05-21/cl-unicode-20190521-git.tgz'';
+ sha256 = ''0p20yrqbn3fwsnrxvh2cv0m86mh3mz9vj15m7siw1kjkbzq0vngc'';
};
packageName = "cl-unicode";
@@ -20,11 +20,11 @@ rec {
overrides = x: x;
}
/* (SYSTEM cl-unicode DESCRIPTION Portable Unicode Library SHA256
- 1ky8qhvisagyvd7qcqzvy40z2sl9dr16q94k21wpgpvlz3kwbpln URL
- http://beta.quicklisp.org/archive/cl-unicode/2018-03-28/cl-unicode-20180328-git.tgz
- MD5 6030b7833f08f78946ddd44d6c6a9086 NAME cl-unicode FILENAME cl-unicode
+ 0p20yrqbn3fwsnrxvh2cv0m86mh3mz9vj15m7siw1kjkbzq0vngc URL
+ http://beta.quicklisp.org/archive/cl-unicode/2019-05-21/cl-unicode-20190521-git.tgz
+ MD5 04009a1266edbdda4d38902907caba25 NAME cl-unicode FILENAME cl-unicode
DEPS
((NAME cl-ppcre FILENAME cl-ppcre)
(NAME flexi-streams FILENAME flexi-streams))
- DEPENDENCIES (cl-ppcre flexi-streams) VERSION 20180328-git SIBLINGS NIL
+ DEPENDENCIES (cl-ppcre flexi-streams) VERSION 20190521-git SIBLINGS NIL
PARASITES (cl-unicode/base cl-unicode/build cl-unicode/test)) */
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-who.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-who.nix
index 575e05aa074d..3be45384d418 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-who.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-who.nix
@@ -1,7 +1,7 @@
args @ { fetchurl, ... }:
rec {
baseName = ''cl-who'';
- version = ''20171130-git'';
+ version = ''20190710-git'';
parasites = [ "cl-who-test" ];
@@ -10,8 +10,8 @@ rec {
deps = [ args."flexi-streams" ];
src = fetchurl {
- url = ''http://beta.quicklisp.org/archive/cl-who/2017-11-30/cl-who-20171130-git.tgz'';
- sha256 = ''1941kwnvqnqr81vjkv8fcpc16abz7hrrmz18xwxxprsi6wifzjzw'';
+ url = ''http://beta.quicklisp.org/archive/cl-who/2019-07-10/cl-who-20190710-git.tgz'';
+ sha256 = ''0pbigwn38xikdwvjy9696z9f00dwg565y3wh6ja51q681y8zh9ir'';
};
packageName = "cl-who";
@@ -20,8 +20,8 @@ rec {
overrides = x: x;
}
/* (SYSTEM cl-who DESCRIPTION (X)HTML generation macros SHA256
- 1941kwnvqnqr81vjkv8fcpc16abz7hrrmz18xwxxprsi6wifzjzw URL
- http://beta.quicklisp.org/archive/cl-who/2017-11-30/cl-who-20171130-git.tgz
- MD5 257a670166ff9d24d1570f44be0c7171 NAME cl-who FILENAME cl-who DEPS
+ 0pbigwn38xikdwvjy9696z9f00dwg565y3wh6ja51q681y8zh9ir URL
+ http://beta.quicklisp.org/archive/cl-who/2019-07-10/cl-who-20190710-git.tgz
+ MD5 e5bb2856ed62d76528e4cef7b5e701c0 NAME cl-who FILENAME cl-who DEPS
((NAME flexi-streams FILENAME flexi-streams)) DEPENDENCIES (flexi-streams)
- VERSION 20171130-git SIBLINGS NIL PARASITES (cl-who-test)) */
+ VERSION 20190710-git SIBLINGS NIL PARASITES (cl-who-test)) */
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl_plus_ssl.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl_plus_ssl.nix
index f329437a75af..f344dbfa2fe8 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl_plus_ssl.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl_plus_ssl.nix
@@ -1,17 +1,15 @@
args @ { fetchurl, ... }:
rec {
baseName = ''cl_plus_ssl'';
- version = ''cl+ssl-20181018-git'';
-
- parasites = [ "openssl-1.1.0" ];
+ version = ''cl+ssl-20190710-git'';
description = ''Common Lisp interface to OpenSSL.'';
deps = [ args."alexandria" args."babel" args."bordeaux-threads" args."cffi" args."flexi-streams" args."trivial-features" args."trivial-garbage" args."trivial-gray-streams" args."uiop" ];
src = fetchurl {
- url = ''http://beta.quicklisp.org/archive/cl+ssl/2018-10-18/cl+ssl-20181018-git.tgz'';
- sha256 = ''1rih343mrhhmma868bk9ip7s1gqqkwlmcq63vq8vpdr2wzv47srm'';
+ url = ''http://beta.quicklisp.org/archive/cl+ssl/2019-07-10/cl+ssl-20190710-git.tgz'';
+ sha256 = ''0lxyd8nryhk9f8gg0fksqf3y5lgbb7f61snsc3qzi5gplkdy0mzv'';
};
packageName = "cl+ssl";
@@ -20,9 +18,9 @@ rec {
overrides = x: x;
}
/* (SYSTEM cl+ssl DESCRIPTION Common Lisp interface to OpenSSL. SHA256
- 1rih343mrhhmma868bk9ip7s1gqqkwlmcq63vq8vpdr2wzv47srm URL
- http://beta.quicklisp.org/archive/cl+ssl/2018-10-18/cl+ssl-20181018-git.tgz
- MD5 45d92813cc134bf04725ee6a1f0c24a7 NAME cl+ssl FILENAME cl_plus_ssl DEPS
+ 0lxyd8nryhk9f8gg0fksqf3y5lgbb7f61snsc3qzi5gplkdy0mzv URL
+ http://beta.quicklisp.org/archive/cl+ssl/2019-07-10/cl+ssl-20190710-git.tgz
+ MD5 fae6e01902964d010ad2565a61a6af2a NAME cl+ssl FILENAME cl_plus_ssl DEPS
((NAME alexandria FILENAME alexandria) (NAME babel FILENAME babel)
(NAME bordeaux-threads FILENAME bordeaux-threads)
(NAME cffi FILENAME cffi) (NAME flexi-streams FILENAME flexi-streams)
@@ -33,5 +31,4 @@ rec {
DEPENDENCIES
(alexandria babel bordeaux-threads cffi flexi-streams trivial-features
trivial-garbage trivial-gray-streams uiop)
- VERSION cl+ssl-20181018-git SIBLINGS (cl+ssl.test) PARASITES
- (openssl-1.1.0)) */
+ VERSION cl+ssl-20190710-git SIBLINGS (cl+ssl.test) PARASITES NIL) */
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/clack-handler-hunchentoot.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/clack-handler-hunchentoot.nix
index 6de9d3f8fc9e..6cfd7842409c 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/clack-handler-hunchentoot.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/clack-handler-hunchentoot.nix
@@ -1,15 +1,15 @@
args @ { fetchurl, ... }:
rec {
baseName = ''clack-handler-hunchentoot'';
- version = ''clack-20181018-git'';
+ version = ''clack-20190710-git'';
description = ''Clack handler for Hunchentoot.'';
deps = [ args."alexandria" args."babel" args."bordeaux-threads" args."cffi" args."chunga" args."cl_plus_ssl" args."cl-base64" args."cl-fad" args."cl-ppcre" args."clack-socket" args."flexi-streams" args."hunchentoot" args."md5" args."rfc2388" args."split-sequence" args."trivial-backtrace" args."trivial-features" args."trivial-garbage" args."trivial-gray-streams" args."usocket" ];
src = fetchurl {
- url = ''http://beta.quicklisp.org/archive/clack/2018-10-18/clack-20181018-git.tgz'';
- sha256 = ''1f16i1pdqkh56ahnhxni3182q089d7ya8gxv4vyczsjzw93yakcf'';
+ url = ''http://beta.quicklisp.org/archive/clack/2019-07-10/clack-20190710-git.tgz'';
+ sha256 = ''1642myknfaajcyqllnhn9s17yb6dbj1yh9wmg1kbplwq9c3yjs7k'';
};
packageName = "clack-handler-hunchentoot";
@@ -18,9 +18,9 @@ rec {
overrides = x: x;
}
/* (SYSTEM clack-handler-hunchentoot DESCRIPTION Clack handler for Hunchentoot.
- SHA256 1f16i1pdqkh56ahnhxni3182q089d7ya8gxv4vyczsjzw93yakcf URL
- http://beta.quicklisp.org/archive/clack/2018-10-18/clack-20181018-git.tgz
- MD5 16121d921667ee8d0d70324da7281849 NAME clack-handler-hunchentoot
+ SHA256 1642myknfaajcyqllnhn9s17yb6dbj1yh9wmg1kbplwq9c3yjs7k URL
+ http://beta.quicklisp.org/archive/clack/2019-07-10/clack-20190710-git.tgz
+ MD5 9d8869ca599652d68dd759c8a6adcd3d NAME clack-handler-hunchentoot
FILENAME clack-handler-hunchentoot DEPS
((NAME alexandria FILENAME alexandria) (NAME babel FILENAME babel)
(NAME bordeaux-threads FILENAME bordeaux-threads)
@@ -42,7 +42,7 @@ rec {
cl-ppcre clack-socket flexi-streams hunchentoot md5 rfc2388 split-sequence
trivial-backtrace trivial-features trivial-garbage trivial-gray-streams
usocket)
- VERSION clack-20181018-git SIBLINGS
+ VERSION clack-20190710-git SIBLINGS
(clack-handler-fcgi clack-handler-toot clack-handler-wookie clack-socket
clack-test clack-v1-compat clack t-clack-handler-fcgi
t-clack-handler-hunchentoot t-clack-handler-toot t-clack-handler-wookie
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 745b87a65764..1ac6ccc329c2 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
@@ -1,15 +1,15 @@
args @ { fetchurl, ... }:
rec {
baseName = ''clack-socket'';
- version = ''clack-20181018-git'';
+ version = ''clack-20190710-git'';
description = '''';
deps = [ ];
src = fetchurl {
- url = ''http://beta.quicklisp.org/archive/clack/2018-10-18/clack-20181018-git.tgz'';
- sha256 = ''1f16i1pdqkh56ahnhxni3182q089d7ya8gxv4vyczsjzw93yakcf'';
+ url = ''http://beta.quicklisp.org/archive/clack/2019-07-10/clack-20190710-git.tgz'';
+ sha256 = ''1642myknfaajcyqllnhn9s17yb6dbj1yh9wmg1kbplwq9c3yjs7k'';
};
packageName = "clack-socket";
@@ -18,10 +18,10 @@ rec {
overrides = x: x;
}
/* (SYSTEM clack-socket DESCRIPTION NIL SHA256
- 1f16i1pdqkh56ahnhxni3182q089d7ya8gxv4vyczsjzw93yakcf URL
- http://beta.quicklisp.org/archive/clack/2018-10-18/clack-20181018-git.tgz
- MD5 16121d921667ee8d0d70324da7281849 NAME clack-socket FILENAME
- clack-socket DEPS NIL DEPENDENCIES NIL VERSION clack-20181018-git SIBLINGS
+ 1642myknfaajcyqllnhn9s17yb6dbj1yh9wmg1kbplwq9c3yjs7k URL
+ http://beta.quicklisp.org/archive/clack/2019-07-10/clack-20190710-git.tgz
+ MD5 9d8869ca599652d68dd759c8a6adcd3d NAME clack-socket FILENAME
+ clack-socket DEPS NIL DEPENDENCIES NIL VERSION clack-20190710-git SIBLINGS
(clack-handler-fcgi clack-handler-hunchentoot clack-handler-toot
clack-handler-wookie clack-test clack-v1-compat clack t-clack-handler-fcgi
t-clack-handler-hunchentoot t-clack-handler-toot t-clack-handler-wookie
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/clack-test.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/clack-test.nix
index c1c80e48cbdb..1792d79f1d89 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/clack-test.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/clack-test.nix
@@ -1,15 +1,15 @@
args @ { fetchurl, ... }:
rec {
baseName = ''clack-test'';
- version = ''clack-20181018-git'';
+ version = ''clack-20190710-git'';
description = ''Testing Clack Applications.'';
deps = [ args."alexandria" args."anaphora" args."babel" args."bordeaux-threads" args."cffi" args."cffi-grovel" args."cffi-toolchain" args."chipz" args."chunga" 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."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."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."usocket" args."xsubseq" ];
src = fetchurl {
- url = ''http://beta.quicklisp.org/archive/clack/2018-10-18/clack-20181018-git.tgz'';
- sha256 = ''1f16i1pdqkh56ahnhxni3182q089d7ya8gxv4vyczsjzw93yakcf'';
+ url = ''http://beta.quicklisp.org/archive/clack/2019-07-10/clack-20190710-git.tgz'';
+ sha256 = ''1642myknfaajcyqllnhn9s17yb6dbj1yh9wmg1kbplwq9c3yjs7k'';
};
packageName = "clack-test";
@@ -18,9 +18,9 @@ rec {
overrides = x: x;
}
/* (SYSTEM clack-test DESCRIPTION Testing Clack Applications. SHA256
- 1f16i1pdqkh56ahnhxni3182q089d7ya8gxv4vyczsjzw93yakcf URL
- http://beta.quicklisp.org/archive/clack/2018-10-18/clack-20181018-git.tgz
- MD5 16121d921667ee8d0d70324da7281849 NAME clack-test FILENAME clack-test
+ 1642myknfaajcyqllnhn9s17yb6dbj1yh9wmg1kbplwq9c3yjs7k URL
+ http://beta.quicklisp.org/archive/clack/2019-07-10/clack-20190710-git.tgz
+ MD5 9d8869ca599652d68dd759c8a6adcd3d NAME clack-test FILENAME clack-test
DEPS
((NAME alexandria FILENAME alexandria) (NAME anaphora FILENAME anaphora)
(NAME babel FILENAME babel)
@@ -71,7 +71,7 @@ rec {
split-sequence static-vectors trivial-backtrace trivial-features
trivial-garbage trivial-gray-streams trivial-mimes trivial-types usocket
xsubseq)
- VERSION clack-20181018-git SIBLINGS
+ VERSION clack-20190710-git SIBLINGS
(clack-handler-fcgi clack-handler-hunchentoot clack-handler-toot
clack-handler-wookie clack-socket clack-v1-compat clack
t-clack-handler-fcgi t-clack-handler-hunchentoot t-clack-handler-toot
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 5477fc5cd027..749fce006e4e 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
@@ -1,15 +1,15 @@
args @ { fetchurl, ... }:
rec {
baseName = ''clack-v1-compat'';
- version = ''clack-20181018-git'';
+ version = ''clack-20190710-git'';
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" ];
src = fetchurl {
- url = ''http://beta.quicklisp.org/archive/clack/2018-10-18/clack-20181018-git.tgz'';
- sha256 = ''1f16i1pdqkh56ahnhxni3182q089d7ya8gxv4vyczsjzw93yakcf'';
+ url = ''http://beta.quicklisp.org/archive/clack/2019-07-10/clack-20190710-git.tgz'';
+ sha256 = ''1642myknfaajcyqllnhn9s17yb6dbj1yh9wmg1kbplwq9c3yjs7k'';
};
packageName = "clack-v1-compat";
@@ -18,9 +18,9 @@ rec {
overrides = x: x;
}
/* (SYSTEM clack-v1-compat DESCRIPTION NIL SHA256
- 1f16i1pdqkh56ahnhxni3182q089d7ya8gxv4vyczsjzw93yakcf URL
- http://beta.quicklisp.org/archive/clack/2018-10-18/clack-20181018-git.tgz
- MD5 16121d921667ee8d0d70324da7281849 NAME clack-v1-compat FILENAME
+ 1642myknfaajcyqllnhn9s17yb6dbj1yh9wmg1kbplwq9c3yjs7k URL
+ http://beta.quicklisp.org/archive/clack/2019-07-10/clack-20190710-git.tgz
+ MD5 9d8869ca599652d68dd759c8a6adcd3d NAME clack-v1-compat FILENAME
clack-v1-compat DEPS
((NAME alexandria FILENAME alexandria) (NAME anaphora FILENAME anaphora)
(NAME babel FILENAME babel)
@@ -73,7 +73,7 @@ rec {
rfc2388 smart-buffer split-sequence static-vectors trivial-backtrace
trivial-features trivial-garbage trivial-gray-streams trivial-mimes
trivial-types uiop usocket xsubseq)
- VERSION clack-20181018-git SIBLINGS
+ VERSION clack-20190710-git SIBLINGS
(clack-handler-fcgi clack-handler-hunchentoot clack-handler-toot
clack-handler-wookie clack-socket clack-test clack t-clack-handler-fcgi
t-clack-handler-hunchentoot t-clack-handler-toot t-clack-handler-wookie
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/clack.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/clack.nix
index 612e6b5c066e..1813844e85fd 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/clack.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/clack.nix
@@ -1,15 +1,15 @@
args @ { fetchurl, ... }:
rec {
baseName = ''clack'';
- version = ''20181018-git'';
+ version = ''20190710-git'';
description = ''Web application environment for Common Lisp'';
deps = [ args."alexandria" args."bordeaux-threads" args."ironclad" args."lack" args."lack-component" args."lack-middleware-backtrace" args."lack-util" args."nibbles" args."uiop" ];
src = fetchurl {
- url = ''http://beta.quicklisp.org/archive/clack/2018-10-18/clack-20181018-git.tgz'';
- sha256 = ''1f16i1pdqkh56ahnhxni3182q089d7ya8gxv4vyczsjzw93yakcf'';
+ url = ''http://beta.quicklisp.org/archive/clack/2019-07-10/clack-20190710-git.tgz'';
+ sha256 = ''1642myknfaajcyqllnhn9s17yb6dbj1yh9wmg1kbplwq9c3yjs7k'';
};
packageName = "clack";
@@ -18,9 +18,9 @@ rec {
overrides = x: x;
}
/* (SYSTEM clack DESCRIPTION Web application environment for Common Lisp SHA256
- 1f16i1pdqkh56ahnhxni3182q089d7ya8gxv4vyczsjzw93yakcf URL
- http://beta.quicklisp.org/archive/clack/2018-10-18/clack-20181018-git.tgz
- MD5 16121d921667ee8d0d70324da7281849 NAME clack FILENAME clack DEPS
+ 1642myknfaajcyqllnhn9s17yb6dbj1yh9wmg1kbplwq9c3yjs7k URL
+ http://beta.quicklisp.org/archive/clack/2019-07-10/clack-20190710-git.tgz
+ MD5 9d8869ca599652d68dd759c8a6adcd3d NAME clack FILENAME clack DEPS
((NAME alexandria FILENAME alexandria)
(NAME bordeaux-threads FILENAME bordeaux-threads)
(NAME ironclad FILENAME ironclad) (NAME lack FILENAME lack)
@@ -31,7 +31,7 @@ rec {
DEPENDENCIES
(alexandria bordeaux-threads ironclad lack lack-component
lack-middleware-backtrace lack-util nibbles uiop)
- VERSION 20181018-git SIBLINGS
+ VERSION 20190710-git SIBLINGS
(clack-handler-fcgi clack-handler-hunchentoot clack-handler-toot
clack-handler-wookie clack-socket clack-test clack-v1-compat
t-clack-handler-fcgi t-clack-handler-hunchentoot t-clack-handler-toot
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/closer-mop.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/closer-mop.nix
index ce078c3196af..ca03207fabd8 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/closer-mop.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/closer-mop.nix
@@ -1,15 +1,15 @@
args @ { fetchurl, ... }:
rec {
baseName = ''closer-mop'';
- version = ''20190107-git'';
+ version = ''20190710-git'';
description = ''Closer to MOP is a compatibility layer that rectifies many of the absent or incorrect CLOS MOP features across a broad range of Common Lisp implementations.'';
deps = [ ];
src = fetchurl {
- url = ''http://beta.quicklisp.org/archive/closer-mop/2019-01-07/closer-mop-20190107-git.tgz'';
- sha256 = ''0h6fd0kr3g8dd782sxd7zrqljqfnw6pz1dsiadl0x853ki680gcw'';
+ url = ''http://beta.quicklisp.org/archive/closer-mop/2019-07-10/closer-mop-20190710-git.tgz'';
+ sha256 = ''0zh53f4jffzjl8ix9dks0shqcxnsj830a34iqgmz3prq8rwba0gx'';
};
packageName = "closer-mop";
@@ -19,7 +19,7 @@ rec {
}
/* (SYSTEM closer-mop DESCRIPTION
Closer to MOP is a compatibility layer that rectifies many of the absent or incorrect CLOS MOP features across a broad range of Common Lisp implementations.
- SHA256 0h6fd0kr3g8dd782sxd7zrqljqfnw6pz1dsiadl0x853ki680gcw URL
- http://beta.quicklisp.org/archive/closer-mop/2019-01-07/closer-mop-20190107-git.tgz
- MD5 6aa5a1e9901b579eb50e2fb46035bc50 NAME closer-mop FILENAME closer-mop
- DEPS NIL DEPENDENCIES NIL VERSION 20190107-git SIBLINGS NIL PARASITES NIL) */
+ SHA256 0zh53f4jffzjl8ix9dks0shqcxnsj830a34iqgmz3prq8rwba0gx URL
+ http://beta.quicklisp.org/archive/closer-mop/2019-07-10/closer-mop-20190710-git.tgz
+ MD5 5ebb554f9f7ba7f0d9dc6584806c8a0e NAME closer-mop FILENAME closer-mop
+ DEPS NIL DEPENDENCIES NIL VERSION 20190710-git SIBLINGS NIL PARASITES NIL) */
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/closure-common.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/closure-common.nix
index 3866dd6f4594..c1b36b6b653c 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/closure-common.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/closure-common.nix
@@ -3,7 +3,7 @@ rec {
baseName = ''closure-common'';
version = ''20181018-git'';
- description = '''';
+ description = ''System lacks description'';
deps = [ args."alexandria" args."babel" args."trivial-features" args."trivial-gray-streams" ];
@@ -17,7 +17,7 @@ rec {
asdFilesToKeep = ["closure-common.asd"];
overrides = x: x;
}
-/* (SYSTEM closure-common DESCRIPTION NIL SHA256
+/* (SYSTEM closure-common DESCRIPTION System lacks description SHA256
18bp7jnxma9hscp09fa723ws9nnynjil935rp8dy9hp6ypghpxpn URL
http://beta.quicklisp.org/archive/closure-common/2018-10-18/closure-common-20181018-git.tgz
MD5 b09ee60c258a29f0c107960ec4c04ada NAME closure-common FILENAME
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/clss.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/clss.nix
index 3f6d6ae32ac6..2f07706a9129 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/clss.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/clss.nix
@@ -1,15 +1,15 @@
args @ { fetchurl, ... }:
rec {
baseName = ''clss'';
- version = ''20180831-git'';
+ version = ''20190710-git'';
description = ''A DOM tree searching engine based on CSS selectors.'';
deps = [ args."array-utils" args."documentation-utils" args."plump" args."trivial-indent" ];
src = fetchurl {
- url = ''http://beta.quicklisp.org/archive/clss/2018-08-31/clss-20180831-git.tgz'';
- sha256 = ''18jm89i9353khrp9q92bnqllkypcsmyd43jvdr6gl0n50fmzs5jd'';
+ url = ''http://beta.quicklisp.org/archive/clss/2019-07-10/clss-20190710-git.tgz'';
+ sha256 = ''1gvnvwjrvinp8545gzav108pzrh00wx3vx2v7l6z18a80kn0h9vs'';
};
packageName = "clss";
@@ -18,11 +18,11 @@ rec {
overrides = x: x;
}
/* (SYSTEM clss DESCRIPTION A DOM tree searching engine based on CSS selectors.
- SHA256 18jm89i9353khrp9q92bnqllkypcsmyd43jvdr6gl0n50fmzs5jd URL
- http://beta.quicklisp.org/archive/clss/2018-08-31/clss-20180831-git.tgz MD5
- 39b69790115d6c4fe4709f5a45b5d4a4 NAME clss FILENAME clss DEPS
+ SHA256 1gvnvwjrvinp8545gzav108pzrh00wx3vx2v7l6z18a80kn0h9vs URL
+ http://beta.quicklisp.org/archive/clss/2019-07-10/clss-20190710-git.tgz MD5
+ c5a918fe272b71af7c4b6e71a7faad46 NAME clss FILENAME clss DEPS
((NAME array-utils FILENAME array-utils)
(NAME documentation-utils FILENAME documentation-utils)
(NAME plump FILENAME plump) (NAME trivial-indent FILENAME trivial-indent))
DEPENDENCIES (array-utils documentation-utils plump trivial-indent) VERSION
- 20180831-git SIBLINGS NIL PARASITES NIL) */
+ 20190710-git SIBLINGS NIL PARASITES NIL) */
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/clx.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/clx.nix
index 6f570ce5c8f0..6b99f99b7ab8 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/clx.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/clx.nix
@@ -1,7 +1,7 @@
args @ { fetchurl, ... }:
rec {
baseName = ''clx'';
- version = ''20181210-git'';
+ version = ''20190521-git'';
parasites = [ "clx/test" ];
@@ -10,8 +10,8 @@ rec {
deps = [ args."fiasco" ];
src = fetchurl {
- url = ''http://beta.quicklisp.org/archive/clx/2018-12-10/clx-20181210-git.tgz'';
- sha256 = ''1xaylf5j1xdyqmvpw7c3hdcc44bz8ax4rz02n8hvznwvg3xcman6'';
+ url = ''http://beta.quicklisp.org/archive/clx/2019-05-21/clx-20190521-git.tgz'';
+ sha256 = ''0rsais9nsz4naf50wp2iirxfj84rdmbdxivfh3496rsi2ji7j8qs'';
};
packageName = "clx";
@@ -21,8 +21,8 @@ rec {
}
/* (SYSTEM clx DESCRIPTION
An implementation of the X Window System protocol in Lisp. SHA256
- 1xaylf5j1xdyqmvpw7c3hdcc44bz8ax4rz02n8hvznwvg3xcman6 URL
- http://beta.quicklisp.org/archive/clx/2018-12-10/clx-20181210-git.tgz MD5
- d6d0edd1594e6bc420b1e2ba0c453636 NAME clx FILENAME clx DEPS
- ((NAME fiasco FILENAME fiasco)) DEPENDENCIES (fiasco) VERSION 20181210-git
+ 0rsais9nsz4naf50wp2iirxfj84rdmbdxivfh3496rsi2ji7j8qs URL
+ http://beta.quicklisp.org/archive/clx/2019-05-21/clx-20190521-git.tgz MD5
+ afcd581193237d3202a4fbcc1f0622c3 NAME clx FILENAME clx DEPS
+ ((NAME fiasco FILENAME fiasco)) DEPENDENCIES (fiasco) VERSION 20190521-git
SIBLINGS NIL PARASITES (clx/test)) */
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/command-line-arguments.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/command-line-arguments.nix
index e1fb59658528..1d81acba2dc6 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/command-line-arguments.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/command-line-arguments.nix
@@ -1,15 +1,15 @@
args @ { fetchurl, ... }:
rec {
baseName = ''command-line-arguments'';
- version = ''20151218-git'';
+ version = ''20190710-git'';
description = ''small library to deal with command-line arguments'';
deps = [ ];
src = fetchurl {
- url = ''http://beta.quicklisp.org/archive/command-line-arguments/2015-12-18/command-line-arguments-20151218-git.tgz'';
- sha256 = ''07yv3vj9kjd84q09d6kvgryqxb71bsa7jl22fd1an6inmk0a3yyh'';
+ url = ''http://beta.quicklisp.org/archive/command-line-arguments/2019-07-10/command-line-arguments-20190710-git.tgz'';
+ sha256 = ''1221nraxk55mwgf6pilhzg5lh98jd0nxrdn2mj1zczj88im01733'';
};
packageName = "command-line-arguments";
@@ -19,8 +19,8 @@ rec {
}
/* (SYSTEM command-line-arguments DESCRIPTION
small library to deal with command-line arguments SHA256
- 07yv3vj9kjd84q09d6kvgryqxb71bsa7jl22fd1an6inmk0a3yyh URL
- http://beta.quicklisp.org/archive/command-line-arguments/2015-12-18/command-line-arguments-20151218-git.tgz
- MD5 8cdb99db40143e34cf6b0b25ca95f826 NAME command-line-arguments FILENAME
- command-line-arguments DEPS NIL DEPENDENCIES NIL VERSION 20151218-git
+ 1221nraxk55mwgf6pilhzg5lh98jd0nxrdn2mj1zczj88im01733 URL
+ http://beta.quicklisp.org/archive/command-line-arguments/2019-07-10/command-line-arguments-20190710-git.tgz
+ MD5 77b361a7f4b3b73a88c3a95c7bbffa98 NAME command-line-arguments FILENAME
+ command-line-arguments DEPS NIL DEPENDENCIES NIL VERSION 20190710-git
SIBLINGS NIL PARASITES NIL) */
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cxml-stp.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cxml-stp.nix
index 74648ba66a8c..ebae32962f10 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cxml-stp.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cxml-stp.nix
@@ -1,17 +1,17 @@
args @ { fetchurl, ... }:
rec {
baseName = ''cxml-stp'';
- version = ''20181018-git'';
+ version = ''20190521-git'';
- parasites = [ "cxml-stp-test" ];
+ parasites = [ "cxml-stp/test" ];
- description = '''';
+ description = ''System lacks description'';
deps = [ args."alexandria" args."babel" args."cl-ppcre" args."closure-common" args."cxml" args."parse-number" args."puri" args."rt" args."trivial-features" args."trivial-gray-streams" args."xpath" args."xpath_slash_test" args."yacc" ];
src = fetchurl {
- url = ''http://beta.quicklisp.org/archive/cxml-stp/2018-10-18/cxml-stp-20181018-git.tgz'';
- sha256 = ''0xv6drasndp802mgww53n6hpf0qjh2r7d48rld1qibf20y80bz77'';
+ url = ''http://beta.quicklisp.org/archive/cxml-stp/2019-05-21/cxml-stp-20190521-git.tgz'';
+ sha256 = ''1lgqw1w65yra0lyy41finj19y1z6yqkvkyzgvagb7s54cnzafz21'';
};
packageName = "cxml-stp";
@@ -19,10 +19,10 @@ rec {
asdFilesToKeep = ["cxml-stp.asd"];
overrides = x: x;
}
-/* (SYSTEM cxml-stp DESCRIPTION NIL SHA256
- 0xv6drasndp802mgww53n6hpf0qjh2r7d48rld1qibf20y80bz77 URL
- http://beta.quicklisp.org/archive/cxml-stp/2018-10-18/cxml-stp-20181018-git.tgz
- MD5 38d39fce85b270145d5a5bd4668d953f NAME cxml-stp FILENAME cxml-stp DEPS
+/* (SYSTEM cxml-stp DESCRIPTION System lacks description SHA256
+ 1lgqw1w65yra0lyy41finj19y1z6yqkvkyzgvagb7s54cnzafz21 URL
+ http://beta.quicklisp.org/archive/cxml-stp/2019-05-21/cxml-stp-20190521-git.tgz
+ MD5 9e0c99bd2b547e07b23305a5ff72aff6 NAME cxml-stp FILENAME cxml-stp 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)
@@ -34,4 +34,4 @@ rec {
DEPENDENCIES
(alexandria babel cl-ppcre closure-common cxml parse-number puri rt
trivial-features trivial-gray-streams xpath xpath/test yacc)
- VERSION 20181018-git SIBLINGS NIL PARASITES (cxml-stp-test)) */
+ VERSION 20190521-git SIBLINGS NIL PARASITES (cxml-stp/test)) */
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/dbd-mysql.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/dbd-mysql.nix
index 2f863a627bbc..173a31e9f31d 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/dbd-mysql.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/dbd-mysql.nix
@@ -1,15 +1,15 @@
args @ { fetchurl, ... }:
rec {
baseName = ''dbd-mysql'';
- version = ''cl-dbi-20190107-git'';
+ version = ''cl-dbi-20190521-git'';
description = ''Database driver for MySQL.'';
deps = [ args."alexandria" args."babel" args."bordeaux-threads" args."cffi" args."cl-annot" args."cl-mysql" args."cl-syntax" args."cl-syntax-annot" args."closer-mop" args."dbi" args."named-readtables" args."split-sequence" args."trivial-features" args."trivial-types" ];
src = fetchurl {
- url = ''http://beta.quicklisp.org/archive/cl-dbi/2019-01-07/cl-dbi-20190107-git.tgz'';
- sha256 = ''02w729jfkbd8443ia07ixr53b4asxx2gcllr84hvlibafawkkdh2'';
+ url = ''http://beta.quicklisp.org/archive/cl-dbi/2019-05-21/cl-dbi-20190521-git.tgz'';
+ sha256 = ''1q0hhgxnd91v020zh9ivlmzhzz5ald6q1bm5i5cawzh0xfyfhhvg'';
};
packageName = "dbd-mysql";
@@ -18,9 +18,9 @@ rec {
overrides = x: x;
}
/* (SYSTEM dbd-mysql DESCRIPTION Database driver for MySQL. SHA256
- 02w729jfkbd8443ia07ixr53b4asxx2gcllr84hvlibafawkkdh2 URL
- http://beta.quicklisp.org/archive/cl-dbi/2019-01-07/cl-dbi-20190107-git.tgz
- MD5 349829f5d0bf363b828827ad6728c54e NAME dbd-mysql FILENAME dbd-mysql DEPS
+ 1q0hhgxnd91v020zh9ivlmzhzz5ald6q1bm5i5cawzh0xfyfhhvg URL
+ http://beta.quicklisp.org/archive/cl-dbi/2019-05-21/cl-dbi-20190521-git.tgz
+ MD5 ba77d3a955991b406f56cc1a09e71dc2 NAME dbd-mysql FILENAME dbd-mysql DEPS
((NAME alexandria FILENAME alexandria) (NAME babel FILENAME babel)
(NAME bordeaux-threads FILENAME bordeaux-threads)
(NAME cffi FILENAME cffi) (NAME cl-annot FILENAME cl-annot)
@@ -35,5 +35,5 @@ rec {
(alexandria babel bordeaux-threads cffi cl-annot cl-mysql cl-syntax
cl-syntax-annot closer-mop dbi named-readtables split-sequence
trivial-features trivial-types)
- VERSION cl-dbi-20190107-git SIBLINGS
+ VERSION cl-dbi-20190521-git SIBLINGS
(cl-dbi dbd-postgres dbd-sqlite3 dbi-test dbi) PARASITES NIL) */
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/dbd-postgres.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/dbd-postgres.nix
index f76f5e7e561d..6668cd4f762b 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/dbd-postgres.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/dbd-postgres.nix
@@ -1,15 +1,15 @@
args @ { fetchurl, ... }:
rec {
baseName = ''dbd-postgres'';
- version = ''cl-dbi-20190107-git'';
+ version = ''cl-dbi-20190521-git'';
description = ''Database driver for PostgreSQL.'';
deps = [ args."alexandria" args."bordeaux-threads" args."cl-annot" args."cl-postgres" args."cl-syntax" args."cl-syntax-annot" args."closer-mop" args."dbi" args."md5" args."named-readtables" args."split-sequence" args."trivial-garbage" args."trivial-types" args."usocket" ];
src = fetchurl {
- url = ''http://beta.quicklisp.org/archive/cl-dbi/2019-01-07/cl-dbi-20190107-git.tgz'';
- sha256 = ''02w729jfkbd8443ia07ixr53b4asxx2gcllr84hvlibafawkkdh2'';
+ url = ''http://beta.quicklisp.org/archive/cl-dbi/2019-05-21/cl-dbi-20190521-git.tgz'';
+ sha256 = ''1q0hhgxnd91v020zh9ivlmzhzz5ald6q1bm5i5cawzh0xfyfhhvg'';
};
packageName = "dbd-postgres";
@@ -18,9 +18,9 @@ rec {
overrides = x: x;
}
/* (SYSTEM dbd-postgres DESCRIPTION Database driver for PostgreSQL. SHA256
- 02w729jfkbd8443ia07ixr53b4asxx2gcllr84hvlibafawkkdh2 URL
- http://beta.quicklisp.org/archive/cl-dbi/2019-01-07/cl-dbi-20190107-git.tgz
- MD5 349829f5d0bf363b828827ad6728c54e NAME dbd-postgres FILENAME
+ 1q0hhgxnd91v020zh9ivlmzhzz5ald6q1bm5i5cawzh0xfyfhhvg URL
+ http://beta.quicklisp.org/archive/cl-dbi/2019-05-21/cl-dbi-20190521-git.tgz
+ MD5 ba77d3a955991b406f56cc1a09e71dc2 NAME dbd-postgres FILENAME
dbd-postgres DEPS
((NAME alexandria FILENAME alexandria)
(NAME bordeaux-threads FILENAME bordeaux-threads)
@@ -37,5 +37,5 @@ rec {
(alexandria bordeaux-threads cl-annot cl-postgres cl-syntax cl-syntax-annot
closer-mop dbi md5 named-readtables split-sequence trivial-garbage
trivial-types usocket)
- VERSION cl-dbi-20190107-git SIBLINGS
+ VERSION cl-dbi-20190521-git SIBLINGS
(cl-dbi dbd-mysql dbd-sqlite3 dbi-test dbi) PARASITES NIL) */
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/dbd-sqlite3.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/dbd-sqlite3.nix
index 01acb76767ea..9b6fde0ea94b 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/dbd-sqlite3.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/dbd-sqlite3.nix
@@ -1,15 +1,15 @@
args @ { fetchurl, ... }:
rec {
baseName = ''dbd-sqlite3'';
- version = ''cl-dbi-20190107-git'';
+ version = ''cl-dbi-20190521-git'';
description = ''Database driver for SQLite3.'';
- deps = [ args."alexandria" args."babel" args."bordeaux-threads" args."cffi" args."cl-annot" args."cl-syntax" args."cl-syntax-annot" args."closer-mop" args."dbi" args."iterate" args."named-readtables" args."split-sequence" args."sqlite" args."trivial-features" args."trivial-types" args."uiop" ];
+ deps = [ args."alexandria" args."babel" args."bordeaux-threads" args."cffi" args."cl-annot" args."cl-syntax" args."cl-syntax-annot" args."closer-mop" args."dbi" args."iterate" args."named-readtables" args."split-sequence" args."sqlite" args."trivial-features" args."trivial-garbage" args."trivial-types" args."uiop" ];
src = fetchurl {
- url = ''http://beta.quicklisp.org/archive/cl-dbi/2019-01-07/cl-dbi-20190107-git.tgz'';
- sha256 = ''02w729jfkbd8443ia07ixr53b4asxx2gcllr84hvlibafawkkdh2'';
+ url = ''http://beta.quicklisp.org/archive/cl-dbi/2019-05-21/cl-dbi-20190521-git.tgz'';
+ sha256 = ''1q0hhgxnd91v020zh9ivlmzhzz5ald6q1bm5i5cawzh0xfyfhhvg'';
};
packageName = "dbd-sqlite3";
@@ -18,9 +18,9 @@ rec {
overrides = x: x;
}
/* (SYSTEM dbd-sqlite3 DESCRIPTION Database driver for SQLite3. SHA256
- 02w729jfkbd8443ia07ixr53b4asxx2gcllr84hvlibafawkkdh2 URL
- http://beta.quicklisp.org/archive/cl-dbi/2019-01-07/cl-dbi-20190107-git.tgz
- MD5 349829f5d0bf363b828827ad6728c54e NAME dbd-sqlite3 FILENAME dbd-sqlite3
+ 1q0hhgxnd91v020zh9ivlmzhzz5ald6q1bm5i5cawzh0xfyfhhvg URL
+ http://beta.quicklisp.org/archive/cl-dbi/2019-05-21/cl-dbi-20190521-git.tgz
+ MD5 ba77d3a955991b406f56cc1a09e71dc2 NAME dbd-sqlite3 FILENAME dbd-sqlite3
DEPS
((NAME alexandria FILENAME alexandria) (NAME babel FILENAME babel)
(NAME bordeaux-threads FILENAME bordeaux-threads)
@@ -33,10 +33,11 @@ rec {
(NAME split-sequence FILENAME split-sequence)
(NAME sqlite FILENAME sqlite)
(NAME trivial-features FILENAME trivial-features)
+ (NAME trivial-garbage FILENAME trivial-garbage)
(NAME trivial-types FILENAME trivial-types) (NAME uiop FILENAME uiop))
DEPENDENCIES
(alexandria babel bordeaux-threads cffi cl-annot cl-syntax cl-syntax-annot
closer-mop dbi iterate named-readtables split-sequence sqlite
- trivial-features trivial-types uiop)
- VERSION cl-dbi-20190107-git SIBLINGS
+ trivial-features trivial-garbage trivial-types uiop)
+ VERSION cl-dbi-20190521-git SIBLINGS
(cl-dbi dbd-mysql dbd-postgres dbi-test dbi) PARASITES NIL) */
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/dbi.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/dbi.nix
index 382143eb8fb3..26c5306c06a3 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/dbi.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/dbi.nix
@@ -1,15 +1,15 @@
args @ { fetchurl, ... }:
rec {
baseName = ''dbi'';
- version = ''cl-20190107-git'';
+ version = ''cl-20190521-git'';
description = ''Database independent interface for Common Lisp'';
deps = [ args."alexandria" args."bordeaux-threads" args."cl-annot" args."cl-syntax" args."cl-syntax-annot" args."closer-mop" args."named-readtables" args."split-sequence" args."trivial-types" ];
src = fetchurl {
- url = ''http://beta.quicklisp.org/archive/cl-dbi/2019-01-07/cl-dbi-20190107-git.tgz'';
- sha256 = ''02w729jfkbd8443ia07ixr53b4asxx2gcllr84hvlibafawkkdh2'';
+ url = ''http://beta.quicklisp.org/archive/cl-dbi/2019-05-21/cl-dbi-20190521-git.tgz'';
+ sha256 = ''1q0hhgxnd91v020zh9ivlmzhzz5ald6q1bm5i5cawzh0xfyfhhvg'';
};
packageName = "dbi";
@@ -18,9 +18,9 @@ rec {
overrides = x: x;
}
/* (SYSTEM dbi DESCRIPTION Database independent interface for Common Lisp
- SHA256 02w729jfkbd8443ia07ixr53b4asxx2gcllr84hvlibafawkkdh2 URL
- http://beta.quicklisp.org/archive/cl-dbi/2019-01-07/cl-dbi-20190107-git.tgz
- MD5 349829f5d0bf363b828827ad6728c54e NAME dbi FILENAME dbi DEPS
+ SHA256 1q0hhgxnd91v020zh9ivlmzhzz5ald6q1bm5i5cawzh0xfyfhhvg URL
+ http://beta.quicklisp.org/archive/cl-dbi/2019-05-21/cl-dbi-20190521-git.tgz
+ MD5 ba77d3a955991b406f56cc1a09e71dc2 NAME dbi FILENAME dbi DEPS
((NAME alexandria FILENAME alexandria)
(NAME bordeaux-threads FILENAME bordeaux-threads)
(NAME cl-annot FILENAME cl-annot) (NAME cl-syntax FILENAME cl-syntax)
@@ -32,5 +32,5 @@ rec {
DEPENDENCIES
(alexandria bordeaux-threads cl-annot cl-syntax cl-syntax-annot closer-mop
named-readtables split-sequence trivial-types)
- VERSION cl-20190107-git SIBLINGS
+ VERSION cl-20190521-git SIBLINGS
(cl-dbi dbd-mysql dbd-postgres dbd-sqlite3 dbi-test) PARASITES NIL) */
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/dexador.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/dexador.nix
index c47d9f1a1aad..4d5bc0a22175 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/dexador.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/dexador.nix
@@ -1,15 +1,15 @@
args @ { fetchurl, ... }:
rec {
baseName = ''dexador'';
- version = ''20181018-git'';
+ version = ''20190521-git'';
description = ''Yet another HTTP client for Common Lisp'';
deps = [ args."alexandria" args."babel" args."bordeaux-threads" args."cffi" args."cffi-grovel" args."cffi-toolchain" args."chipz" args."chunga" args."cl_plus_ssl" args."cl-base64" args."cl-cookie" args."cl-fad" args."cl-ppcre" args."cl-reexport" args."cl-utilities" args."fast-http" args."fast-io" args."flexi-streams" args."local-time" args."proc-parse" args."quri" args."smart-buffer" args."split-sequence" args."static-vectors" args."trivial-features" args."trivial-garbage" args."trivial-gray-streams" args."trivial-mimes" args."usocket" args."xsubseq" ];
src = fetchurl {
- url = ''http://beta.quicklisp.org/archive/dexador/2018-10-18/dexador-20181018-git.tgz'';
- sha256 = ''1pwzydf9paiqxsfawbf7j55h5fqkk0561p3rzflsfnmr1dabi9kc'';
+ url = ''http://beta.quicklisp.org/archive/dexador/2019-05-21/dexador-20190521-git.tgz'';
+ sha256 = ''15v475xvawp3vhbw3kkvxq8z98j6i7h9fi4mkicn5mylx2j3z1mk'';
};
packageName = "dexador";
@@ -18,9 +18,9 @@ rec {
overrides = x: x;
}
/* (SYSTEM dexador DESCRIPTION Yet another HTTP client for Common Lisp SHA256
- 1pwzydf9paiqxsfawbf7j55h5fqkk0561p3rzflsfnmr1dabi9kc URL
- http://beta.quicklisp.org/archive/dexador/2018-10-18/dexador-20181018-git.tgz
- MD5 268ea459fac563834490247de52a6ce1 NAME dexador FILENAME dexador DEPS
+ 15v475xvawp3vhbw3kkvxq8z98j6i7h9fi4mkicn5mylx2j3z1mk URL
+ http://beta.quicklisp.org/archive/dexador/2019-05-21/dexador-20190521-git.tgz
+ MD5 4e405ba1b7721c2d62bc315ec31af0fe NAME dexador FILENAME dexador DEPS
((NAME alexandria FILENAME alexandria) (NAME babel FILENAME babel)
(NAME bordeaux-threads FILENAME bordeaux-threads)
(NAME cffi FILENAME cffi) (NAME cffi-grovel FILENAME cffi-grovel)
@@ -48,4 +48,4 @@ rec {
fast-http fast-io flexi-streams local-time proc-parse quri smart-buffer
split-sequence static-vectors trivial-features trivial-garbage
trivial-gray-streams trivial-mimes usocket xsubseq)
- VERSION 20181018-git SIBLINGS (dexador-test) PARASITES NIL) */
+ VERSION 20190521-git SIBLINGS (dexador-test) PARASITES NIL) */
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/documentation-utils.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/documentation-utils.nix
index 541f1c6a169d..7c25ed9a0377 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/documentation-utils.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/documentation-utils.nix
@@ -1,15 +1,15 @@
args @ { fetchurl, ... }:
rec {
baseName = ''documentation-utils'';
- version = ''20180831-git'';
+ version = ''20190710-git'';
description = ''A few simple tools to help you with documenting your library.'';
deps = [ args."trivial-indent" ];
src = fetchurl {
- url = ''http://beta.quicklisp.org/archive/documentation-utils/2018-08-31/documentation-utils-20180831-git.tgz'';
- sha256 = ''0g26hgppynrfdkpaplb77xzrsmsdzmlnqgl8336l08zmg80x90n5'';
+ url = ''http://beta.quicklisp.org/archive/documentation-utils/2019-07-10/documentation-utils-20190710-git.tgz'';
+ sha256 = ''1n3z8sw75k2jjpsg6ch5g9s4v56y96dbs4338ajrfdsk3pk4wgj3'';
};
packageName = "documentation-utils";
@@ -19,9 +19,9 @@ rec {
}
/* (SYSTEM documentation-utils DESCRIPTION
A few simple tools to help you with documenting your library. SHA256
- 0g26hgppynrfdkpaplb77xzrsmsdzmlnqgl8336l08zmg80x90n5 URL
- http://beta.quicklisp.org/archive/documentation-utils/2018-08-31/documentation-utils-20180831-git.tgz
- MD5 e0f58ffe20602cada3413b4eeec909ef NAME documentation-utils FILENAME
+ 1n3z8sw75k2jjpsg6ch5g9s4v56y96dbs4338ajrfdsk3pk4wgj3 URL
+ http://beta.quicklisp.org/archive/documentation-utils/2019-07-10/documentation-utils-20190710-git.tgz
+ MD5 4f45f511ac55008b8b8aa04f7feaa2d4 NAME documentation-utils FILENAME
documentation-utils DEPS ((NAME trivial-indent FILENAME trivial-indent))
- DEPENDENCIES (trivial-indent) VERSION 20180831-git SIBLINGS
+ DEPENDENCIES (trivial-indent) VERSION 20190710-git SIBLINGS
(multilang-documentation-utils) PARASITES NIL) */
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/drakma.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/drakma.nix
index 95162ffc99a3..aa97f8f7cbe3 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/drakma.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/drakma.nix
@@ -1,15 +1,15 @@
args @ { fetchurl, ... }:
rec {
baseName = ''drakma'';
- version = ''v2.0.4'';
+ version = ''v2.0.5'';
description = ''Full-featured http/https client based on usocket'';
deps = [ args."alexandria" args."babel" args."bordeaux-threads" args."cffi" args."chipz" args."chunga" args."cl_plus_ssl" args."cl-base64" args."cl-ppcre" args."flexi-streams" args."puri" args."split-sequence" args."trivial-features" args."trivial-garbage" args."trivial-gray-streams" args."usocket" ];
src = fetchurl {
- url = ''http://beta.quicklisp.org/archive/drakma/2017-08-30/drakma-v2.0.4.tgz'';
- sha256 = ''0i0dmw1b245yc0f8f8ww8cnhsji7vsnr7868p62c953ccwlcj5ga'';
+ url = ''http://beta.quicklisp.org/archive/drakma/2019-05-21/drakma-v2.0.5.tgz'';
+ sha256 = ''14bqvdr1f5ms6kxdgran57qk43g9c37ia7ni1z3afdkbv8wp2lyj'';
};
packageName = "drakma";
@@ -18,9 +18,9 @@ rec {
overrides = x: x;
}
/* (SYSTEM drakma DESCRIPTION Full-featured http/https client based on usocket
- SHA256 0i0dmw1b245yc0f8f8ww8cnhsji7vsnr7868p62c953ccwlcj5ga URL
- http://beta.quicklisp.org/archive/drakma/2017-08-30/drakma-v2.0.4.tgz MD5
- 1c668721156beadeca4f6536677e143e NAME drakma FILENAME drakma DEPS
+ SHA256 14bqvdr1f5ms6kxdgran57qk43g9c37ia7ni1z3afdkbv8wp2lyj URL
+ http://beta.quicklisp.org/archive/drakma/2019-05-21/drakma-v2.0.5.tgz MD5
+ 85316671dd8ada170b85af82ed97ce8e NAME drakma FILENAME drakma DEPS
((NAME alexandria FILENAME alexandria) (NAME babel FILENAME babel)
(NAME bordeaux-threads FILENAME bordeaux-threads)
(NAME cffi FILENAME cffi) (NAME chipz FILENAME chipz)
@@ -36,4 +36,4 @@ rec {
(alexandria babel bordeaux-threads cffi chipz chunga cl+ssl cl-base64
cl-ppcre flexi-streams puri split-sequence trivial-features
trivial-garbage trivial-gray-streams usocket)
- VERSION v2.0.4 SIBLINGS (drakma-test) PARASITES NIL) */
+ VERSION v2.0.5 SIBLINGS (drakma-test) PARASITES NIL) */
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/esrap.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/esrap.nix
index 3b2d0225ff92..a024ad3907a3 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/esrap.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/esrap.nix
@@ -1,7 +1,7 @@
args @ { fetchurl, ... }:
rec {
baseName = ''esrap'';
- version = ''20190107-git'';
+ version = ''20190521-git'';
parasites = [ "esrap/tests" ];
@@ -10,8 +10,8 @@ rec {
deps = [ args."alexandria" args."fiveam" ];
src = fetchurl {
- url = ''http://beta.quicklisp.org/archive/esrap/2019-01-07/esrap-20190107-git.tgz'';
- sha256 = ''0kb4szcd7v4qj56p0yg1abvk79is6p5myri3gakzm87l2nmg15xs'';
+ url = ''http://beta.quicklisp.org/archive/esrap/2019-05-21/esrap-20190521-git.tgz'';
+ sha256 = ''0kbb05735yhkh2vply6hdk2jn43s8pym8j6jqip13qyaaiax6w5q'';
};
packageName = "esrap";
@@ -21,9 +21,9 @@ rec {
}
/* (SYSTEM esrap DESCRIPTION
A Packrat / Parsing Grammar / TDPL parser for Common Lisp. SHA256
- 0kb4szcd7v4qj56p0yg1abvk79is6p5myri3gakzm87l2nmg15xs URL
- http://beta.quicklisp.org/archive/esrap/2019-01-07/esrap-20190107-git.tgz
- MD5 b8c98e84e3c63e4e3ce2f6c8b4d4bab7 NAME esrap FILENAME esrap DEPS
+ 0kbb05735yhkh2vply6hdk2jn43s8pym8j6jqip13qyaaiax6w5q URL
+ http://beta.quicklisp.org/archive/esrap/2019-05-21/esrap-20190521-git.tgz
+ MD5 401362d64d644f02824de03697435883 NAME esrap FILENAME esrap DEPS
((NAME alexandria FILENAME alexandria) (NAME fiveam FILENAME fiveam))
- DEPENDENCIES (alexandria fiveam) VERSION 20190107-git SIBLINGS NIL
+ DEPENDENCIES (alexandria fiveam) VERSION 20190521-git SIBLINGS NIL
PARASITES (esrap/tests)) */
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 cec236dc5565..0e7f5b79160b 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
@@ -1,7 +1,7 @@
args @ { fetchurl, ... }:
rec {
baseName = ''external-program'';
- version = ''20160825-git'';
+ version = ''20190307-git'';
parasites = [ "external-program-test" ];
@@ -10,8 +10,8 @@ rec {
deps = [ args."fiveam" args."trivial-features" ];
src = fetchurl {
- url = ''http://beta.quicklisp.org/archive/external-program/2016-08-25/external-program-20160825-git.tgz'';
- sha256 = ''0avnnhxxa1wfri9i3m1339nszyp1w2cilycc948nf5awz4mckq13'';
+ url = ''http://beta.quicklisp.org/archive/external-program/2019-03-07/external-program-20190307-git.tgz'';
+ sha256 = ''1nl3mngh7vp2l9mfbdhni4nc164zznafnl74p1kv9j07n5fcpnyz'';
};
packageName = "external-program";
@@ -20,11 +20,11 @@ rec {
overrides = x: x;
}
/* (SYSTEM external-program DESCRIPTION NIL SHA256
- 0avnnhxxa1wfri9i3m1339nszyp1w2cilycc948nf5awz4mckq13 URL
- http://beta.quicklisp.org/archive/external-program/2016-08-25/external-program-20160825-git.tgz
- MD5 6902724c4f762a17645c46b0a1d8efde NAME external-program FILENAME
+ 1nl3mngh7vp2l9mfbdhni4nc164zznafnl74p1kv9j07n5fcpnyz URL
+ http://beta.quicklisp.org/archive/external-program/2019-03-07/external-program-20190307-git.tgz
+ MD5 b30fe104c34059506fd4c493fa79fe1a NAME external-program FILENAME
external-program DEPS
((NAME fiveam FILENAME fiveam)
(NAME trivial-features FILENAME trivial-features))
- DEPENDENCIES (fiveam trivial-features) VERSION 20160825-git SIBLINGS NIL
+ DEPENDENCIES (fiveam trivial-features) VERSION 20190307-git SIBLINGS NIL
PARASITES (external-program-test)) */
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/fiasco.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/fiasco.nix
index 87d9fe983ec3..39f2af5430fc 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/fiasco.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/fiasco.nix
@@ -1,7 +1,7 @@
args @ { fetchurl, ... }:
rec {
baseName = ''fiasco'';
- version = ''20181210-git'';
+ version = ''20190307-git'';
parasites = [ "fiasco-self-tests" ];
@@ -10,8 +10,8 @@ rec {
deps = [ args."alexandria" args."trivial-gray-streams" ];
src = fetchurl {
- url = ''http://beta.quicklisp.org/archive/fiasco/2018-12-10/fiasco-20181210-git.tgz'';
- sha256 = ''0l4wjik8iwipy67lbdrjhcvz7zldv85nykbxasis4zmmh001777y'';
+ url = ''http://beta.quicklisp.org/archive/fiasco/2019-03-07/fiasco-20190307-git.tgz'';
+ sha256 = ''0ffnkfnj4ayvzsxb2h04xaypgxg3fbar07f6rvlbncdckm9q5jk3'';
};
packageName = "fiasco";
@@ -21,10 +21,10 @@ rec {
}
/* (SYSTEM fiasco DESCRIPTION
A Common Lisp test framework that treasures your failures, logical continuation of Stefil.
- SHA256 0l4wjik8iwipy67lbdrjhcvz7zldv85nykbxasis4zmmh001777y URL
- http://beta.quicklisp.org/archive/fiasco/2018-12-10/fiasco-20181210-git.tgz
- MD5 9d3c0ec30c7f73490188f27eaec00fd8 NAME fiasco FILENAME fiasco DEPS
+ SHA256 0ffnkfnj4ayvzsxb2h04xaypgxg3fbar07f6rvlbncdckm9q5jk3 URL
+ http://beta.quicklisp.org/archive/fiasco/2019-03-07/fiasco-20190307-git.tgz
+ MD5 7cc0c66f865d44974c8d682346b5f6d5 NAME fiasco FILENAME fiasco DEPS
((NAME alexandria FILENAME alexandria)
(NAME trivial-gray-streams FILENAME trivial-gray-streams))
- DEPENDENCIES (alexandria trivial-gray-streams) VERSION 20181210-git
+ DEPENDENCIES (alexandria trivial-gray-streams) VERSION 20190307-git
SIBLINGS NIL PARASITES (fiasco-self-tests)) */
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/form-fiddle.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/form-fiddle.nix
index 4a23cbf51ee7..90ce8b83dde6 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/form-fiddle.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/form-fiddle.nix
@@ -1,15 +1,15 @@
args @ { fetchurl, ... }:
rec {
baseName = ''form-fiddle'';
- version = ''20180831-git'';
+ version = ''20190710-git'';
description = ''A collection of utilities to destructure lambda forms.'';
deps = [ args."documentation-utils" args."trivial-indent" ];
src = fetchurl {
- url = ''http://beta.quicklisp.org/archive/form-fiddle/2018-08-31/form-fiddle-20180831-git.tgz'';
- sha256 = ''013n10rzqbfvdlz37pdmj4y7qv3fzv7q2hxv8aw7kcirg5gl7mkj'';
+ url = ''http://beta.quicklisp.org/archive/form-fiddle/2019-07-10/form-fiddle-20190710-git.tgz'';
+ sha256 = ''12zmqm2vls043kaka7jp6pnsvkxlyv6x183yjyrs8jk461qfydwl'';
};
packageName = "form-fiddle";
@@ -19,11 +19,11 @@ rec {
}
/* (SYSTEM form-fiddle DESCRIPTION
A collection of utilities to destructure lambda forms. SHA256
- 013n10rzqbfvdlz37pdmj4y7qv3fzv7q2hxv8aw7kcirg5gl7mkj URL
- http://beta.quicklisp.org/archive/form-fiddle/2018-08-31/form-fiddle-20180831-git.tgz
- MD5 1e9ae81423ed3c5f2e07c26f93b45956 NAME form-fiddle FILENAME form-fiddle
+ 12zmqm2vls043kaka7jp6pnsvkxlyv6x183yjyrs8jk461qfydwl URL
+ http://beta.quicklisp.org/archive/form-fiddle/2019-07-10/form-fiddle-20190710-git.tgz
+ MD5 2576065de1e3c95751285fb155f5bcf6 NAME form-fiddle FILENAME form-fiddle
DEPS
((NAME documentation-utils FILENAME documentation-utils)
(NAME trivial-indent FILENAME trivial-indent))
- DEPENDENCIES (documentation-utils trivial-indent) VERSION 20180831-git
+ DEPENDENCIES (documentation-utils trivial-indent) VERSION 20190710-git
SIBLINGS NIL PARASITES NIL) */
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/hu_dot_dwim_dot_asdf.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/hu_dot_dwim_dot_asdf.nix
index a74f24f8642f..1f2700608e37 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/hu_dot_dwim_dot_asdf.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/hu_dot_dwim_dot_asdf.nix
@@ -1,15 +1,15 @@
args @ { fetchurl, ... }:
rec {
baseName = ''hu_dot_dwim_dot_asdf'';
- version = ''20180228-darcs'';
+ version = ''20190521-darcs'';
description = ''Various ASDF extensions such as attached test and documentation system, explicit development support, etc.'';
deps = [ args."uiop" ];
src = fetchurl {
- url = ''http://beta.quicklisp.org/archive/hu.dwim.asdf/2018-02-28/hu.dwim.asdf-20180228-darcs.tgz'';
- sha256 = ''19ak3krzlzbdh8chbimwjca8q4jksaf9v88k86jsdgxchfr0dkld'';
+ url = ''http://beta.quicklisp.org/archive/hu.dwim.asdf/2019-05-21/hu.dwim.asdf-20190521-darcs.tgz'';
+ sha256 = ''0rsbv71vyszy8w35yjwb5h6zcmknjq223hkzir79y72qdsc6sabn'';
};
packageName = "hu.dwim.asdf";
@@ -19,8 +19,8 @@ rec {
}
/* (SYSTEM hu.dwim.asdf DESCRIPTION
Various ASDF extensions such as attached test and documentation system, explicit development support, etc.
- SHA256 19ak3krzlzbdh8chbimwjca8q4jksaf9v88k86jsdgxchfr0dkld URL
- http://beta.quicklisp.org/archive/hu.dwim.asdf/2018-02-28/hu.dwim.asdf-20180228-darcs.tgz
- MD5 a1f3085cbd7ea77f9212112cc8914e86 NAME hu.dwim.asdf FILENAME
+ SHA256 0rsbv71vyszy8w35yjwb5h6zcmknjq223hkzir79y72qdsc6sabn URL
+ http://beta.quicklisp.org/archive/hu.dwim.asdf/2019-05-21/hu.dwim.asdf-20190521-darcs.tgz
+ MD5 b359bf05f587196eba172803b5594318 NAME hu.dwim.asdf FILENAME
hu_dot_dwim_dot_asdf DEPS ((NAME uiop FILENAME uiop)) DEPENDENCIES (uiop)
- VERSION 20180228-darcs SIBLINGS (hu.dwim.asdf.documentation) PARASITES NIL) */
+ VERSION 20190521-darcs SIBLINGS (hu.dwim.asdf.documentation) PARASITES NIL) */
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/ironclad.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/ironclad.nix
index 4c3bcbb42b06..2c56b5964f97 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/ironclad.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/ironclad.nix
@@ -1,17 +1,17 @@
args @ { fetchurl, ... }:
rec {
baseName = ''ironclad'';
- version = ''v0.44'';
+ version = ''v0.46'';
parasites = [ "ironclad/tests" ];
description = ''A cryptographic toolkit written in pure Common Lisp'';
- deps = [ args."nibbles" args."rt" ];
+ deps = [ args."alexandria" args."bordeaux-threads" args."nibbles" args."rt" ];
src = fetchurl {
- url = ''http://beta.quicklisp.org/archive/ironclad/2018-12-10/ironclad-v0.44.tgz'';
- sha256 = ''0qxvvv9hp6843s3n4fnj2fl26xzdpnk91j1h0sgi8v0fbfakwl2y'';
+ url = ''http://beta.quicklisp.org/archive/ironclad/2019-07-10/ironclad-v0.46.tgz'';
+ sha256 = ''1bcqz7z30dpr9rz5wg94bbq93swn6lxqj60rn9f5q0fryn9na3l2'';
};
packageName = "ironclad";
@@ -21,9 +21,11 @@ rec {
}
/* (SYSTEM ironclad DESCRIPTION
A cryptographic toolkit written in pure Common Lisp SHA256
- 0qxvvv9hp6843s3n4fnj2fl26xzdpnk91j1h0sgi8v0fbfakwl2y URL
- http://beta.quicklisp.org/archive/ironclad/2018-12-10/ironclad-v0.44.tgz
- MD5 ebce1cbac421a5d7ad461cdaed4ac863 NAME ironclad FILENAME ironclad DEPS
- ((NAME nibbles FILENAME nibbles) (NAME rt FILENAME rt)) DEPENDENCIES
- (nibbles rt) VERSION v0.44 SIBLINGS (ironclad-text) PARASITES
- (ironclad/tests)) */
+ 1bcqz7z30dpr9rz5wg94bbq93swn6lxqj60rn9f5q0fryn9na3l2 URL
+ http://beta.quicklisp.org/archive/ironclad/2019-07-10/ironclad-v0.46.tgz
+ MD5 23f67c2312723bdaf1ff78898d2354c7 NAME ironclad FILENAME ironclad DEPS
+ ((NAME alexandria FILENAME alexandria)
+ (NAME bordeaux-threads FILENAME bordeaux-threads)
+ (NAME nibbles FILENAME nibbles) (NAME rt FILENAME rt))
+ DEPENDENCIES (alexandria bordeaux-threads nibbles rt) VERSION v0.46
+ SIBLINGS (ironclad-text) PARASITES (ironclad/tests)) */
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/jonathan.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/jonathan.nix
index 81493865b864..702eb2d05b55 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/jonathan.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/jonathan.nix
@@ -1,15 +1,15 @@
args @ { fetchurl, ... }:
rec {
baseName = ''jonathan'';
- version = ''20181210-git'';
+ version = ''20190202-git'';
description = ''High performance JSON encoder and decoder. Currently support: SBCL, CCL.'';
deps = [ args."alexandria" args."babel" args."cffi" args."cffi-grovel" args."cffi-toolchain" args."cl-annot" args."cl-ppcre" args."cl-syntax" args."cl-syntax-annot" args."fast-io" args."named-readtables" args."proc-parse" args."static-vectors" args."trivial-features" args."trivial-gray-streams" args."trivial-types" ];
src = fetchurl {
- url = ''http://beta.quicklisp.org/archive/jonathan/2018-12-10/jonathan-20181210-git.tgz'';
- sha256 = ''1m0cz8r48zvwbsywrgj9zdlfy48iycxb4h9l8wg04gmb5xv82rxh'';
+ url = ''http://beta.quicklisp.org/archive/jonathan/2019-02-02/jonathan-20190202-git.tgz'';
+ sha256 = ''1p70ji0mwx11q5iy792lxpcbx7mzh4az88vgkq39yx1ffwvpxvwl'';
};
packageName = "jonathan";
@@ -19,9 +19,9 @@ rec {
}
/* (SYSTEM jonathan DESCRIPTION
High performance JSON encoder and decoder. Currently support: SBCL, CCL.
- SHA256 1m0cz8r48zvwbsywrgj9zdlfy48iycxb4h9l8wg04gmb5xv82rxh URL
- http://beta.quicklisp.org/archive/jonathan/2018-12-10/jonathan-20181210-git.tgz
- MD5 eb76f293df02d1b85faf92b92cb24d53 NAME jonathan FILENAME jonathan DEPS
+ SHA256 1p70ji0mwx11q5iy792lxpcbx7mzh4az88vgkq39yx1ffwvpxvwl URL
+ http://beta.quicklisp.org/archive/jonathan/2019-02-02/jonathan-20190202-git.tgz
+ MD5 bf340574fc901706ba2dcdc57e1e78ad NAME jonathan FILENAME jonathan DEPS
((NAME alexandria FILENAME alexandria) (NAME babel FILENAME babel)
(NAME cffi FILENAME cffi) (NAME cffi-grovel FILENAME cffi-grovel)
(NAME cffi-toolchain FILENAME cffi-toolchain)
@@ -39,4 +39,4 @@ rec {
(alexandria babel cffi cffi-grovel cffi-toolchain cl-annot cl-ppcre
cl-syntax cl-syntax-annot fast-io named-readtables proc-parse
static-vectors trivial-features trivial-gray-streams trivial-types)
- VERSION 20181210-git SIBLINGS (jonathan-test) PARASITES NIL) */
+ VERSION 20190202-git SIBLINGS (jonathan-test) PARASITES NIL) */
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/kmrcl.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/kmrcl.nix
index e5cbad3e9e83..e44004a9cf7e 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/kmrcl.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/kmrcl.nix
@@ -3,7 +3,7 @@ rec {
baseName = ''kmrcl'';
version = ''20150923-git'';
- description = '''';
+ description = ''System lacks description'';
deps = [ ];
@@ -17,7 +17,7 @@ rec {
asdFilesToKeep = ["kmrcl.asd"];
overrides = x: x;
}
-/* (SYSTEM kmrcl DESCRIPTION NIL SHA256
+/* (SYSTEM kmrcl DESCRIPTION System lacks description SHA256
0sx7p16pp5i4qr569p2265ky6rd65gyjp21k348a6c3fs2yn0r2g URL
http://beta.quicklisp.org/archive/kmrcl/2015-09-23/kmrcl-20150923-git.tgz
MD5 0cd15d3ed3e7d56528dd3243d1a5c9b1 NAME kmrcl FILENAME kmrcl DEPS 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 b99f7867a7ac..96a831147bba 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
@@ -1,15 +1,15 @@
args @ { fetchurl, ... }:
rec {
baseName = ''lack-component'';
- version = ''lack-20181210-git'';
+ version = ''lack-20190521-git'';
description = '''';
deps = [ ];
src = fetchurl {
- url = ''http://beta.quicklisp.org/archive/lack/2018-12-10/lack-20181210-git.tgz'';
- sha256 = ''00i36c5r5nk8abqqxhclr9nj6wawpybf5raswpm18h0kpxyf6qz8'';
+ url = ''http://beta.quicklisp.org/archive/lack/2019-05-21/lack-20190521-git.tgz'';
+ sha256 = ''0ng1k5jq7icfi8c8r3wqj3qrqkh2lyav5ab6mf3l5y4bfwbil593'';
};
packageName = "lack-component";
@@ -18,10 +18,10 @@ rec {
overrides = x: x;
}
/* (SYSTEM lack-component DESCRIPTION NIL SHA256
- 00i36c5r5nk8abqqxhclr9nj6wawpybf5raswpm18h0kpxyf6qz8 URL
- http://beta.quicklisp.org/archive/lack/2018-12-10/lack-20181210-git.tgz MD5
- b75ab822b0b1d7fa5ff4d47db3ec80dd NAME lack-component FILENAME
- lack-component DEPS NIL DEPENDENCIES NIL VERSION lack-20181210-git SIBLINGS
+ 0ng1k5jq7icfi8c8r3wqj3qrqkh2lyav5ab6mf3l5y4bfwbil593 URL
+ http://beta.quicklisp.org/archive/lack/2019-05-21/lack-20190521-git.tgz MD5
+ 7d7321550f0795e998c7afe4498e7a40 NAME lack-component FILENAME
+ lack-component DEPS NIL DEPENDENCIES NIL VERSION lack-20190521-git SIBLINGS
(lack-middleware-accesslog lack-middleware-auth-basic
lack-middleware-backtrace lack-middleware-csrf lack-middleware-mount
lack-middleware-session lack-middleware-static lack-request lack-response
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 7cce4b212941..610633e9af25 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
@@ -1,15 +1,15 @@
args @ { fetchurl, ... }:
rec {
baseName = ''lack-middleware-backtrace'';
- version = ''lack-20181210-git'';
+ version = ''lack-20190521-git'';
description = '''';
deps = [ args."uiop" ];
src = fetchurl {
- url = ''http://beta.quicklisp.org/archive/lack/2018-12-10/lack-20181210-git.tgz'';
- sha256 = ''00i36c5r5nk8abqqxhclr9nj6wawpybf5raswpm18h0kpxyf6qz8'';
+ url = ''http://beta.quicklisp.org/archive/lack/2019-05-21/lack-20190521-git.tgz'';
+ sha256 = ''0ng1k5jq7icfi8c8r3wqj3qrqkh2lyav5ab6mf3l5y4bfwbil593'';
};
packageName = "lack-middleware-backtrace";
@@ -18,11 +18,11 @@ rec {
overrides = x: x;
}
/* (SYSTEM lack-middleware-backtrace DESCRIPTION NIL SHA256
- 00i36c5r5nk8abqqxhclr9nj6wawpybf5raswpm18h0kpxyf6qz8 URL
- http://beta.quicklisp.org/archive/lack/2018-12-10/lack-20181210-git.tgz MD5
- b75ab822b0b1d7fa5ff4d47db3ec80dd NAME lack-middleware-backtrace FILENAME
+ 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
- (uiop) VERSION lack-20181210-git SIBLINGS
+ (uiop) VERSION lack-20190521-git SIBLINGS
(lack-component lack-middleware-accesslog lack-middleware-auth-basic
lack-middleware-csrf lack-middleware-mount lack-middleware-session
lack-middleware-static lack-request lack-response lack-session-store-dbi
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 6da62f22f65f..3607cbedf44f 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
@@ -1,15 +1,15 @@
args @ { fetchurl, ... }:
rec {
baseName = ''lack-util'';
- version = ''lack-20181210-git'';
+ version = ''lack-20190521-git'';
description = '''';
- deps = [ args."ironclad" args."nibbles" ];
+ deps = [ args."alexandria" args."bordeaux-threads" args."ironclad" args."nibbles" ];
src = fetchurl {
- url = ''http://beta.quicklisp.org/archive/lack/2018-12-10/lack-20181210-git.tgz'';
- sha256 = ''00i36c5r5nk8abqqxhclr9nj6wawpybf5raswpm18h0kpxyf6qz8'';
+ url = ''http://beta.quicklisp.org/archive/lack/2019-05-21/lack-20190521-git.tgz'';
+ sha256 = ''0ng1k5jq7icfi8c8r3wqj3qrqkh2lyav5ab6mf3l5y4bfwbil593'';
};
packageName = "lack-util";
@@ -18,11 +18,14 @@ rec {
overrides = x: x;
}
/* (SYSTEM lack-util DESCRIPTION NIL SHA256
- 00i36c5r5nk8abqqxhclr9nj6wawpybf5raswpm18h0kpxyf6qz8 URL
- http://beta.quicklisp.org/archive/lack/2018-12-10/lack-20181210-git.tgz MD5
- b75ab822b0b1d7fa5ff4d47db3ec80dd NAME lack-util FILENAME lack-util DEPS
- ((NAME ironclad FILENAME ironclad) (NAME nibbles FILENAME nibbles))
- DEPENDENCIES (ironclad nibbles) VERSION lack-20181210-git SIBLINGS
+ 0ng1k5jq7icfi8c8r3wqj3qrqkh2lyav5ab6mf3l5y4bfwbil593 URL
+ http://beta.quicklisp.org/archive/lack/2019-05-21/lack-20190521-git.tgz MD5
+ 7d7321550f0795e998c7afe4498e7a40 NAME lack-util FILENAME lack-util DEPS
+ ((NAME alexandria FILENAME alexandria)
+ (NAME bordeaux-threads FILENAME bordeaux-threads)
+ (NAME ironclad FILENAME ironclad) (NAME nibbles FILENAME nibbles))
+ DEPENDENCIES (alexandria bordeaux-threads ironclad nibbles) VERSION
+ lack-20190521-git SIBLINGS
(lack-component lack-middleware-accesslog lack-middleware-auth-basic
lack-middleware-backtrace lack-middleware-csrf lack-middleware-mount
lack-middleware-session lack-middleware-static lack-request lack-response
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/lack.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/lack.nix
index c8ef9a7f6708..08095979989b 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/lack.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/lack.nix
@@ -1,15 +1,15 @@
args @ { fetchurl, ... }:
rec {
baseName = ''lack'';
- version = ''20181210-git'';
+ version = ''20190521-git'';
description = ''A minimal Clack'';
- deps = [ args."ironclad" args."lack-component" args."lack-util" args."nibbles" ];
+ deps = [ args."alexandria" args."bordeaux-threads" args."ironclad" args."lack-component" args."lack-util" args."nibbles" ];
src = fetchurl {
- url = ''http://beta.quicklisp.org/archive/lack/2018-12-10/lack-20181210-git.tgz'';
- sha256 = ''00i36c5r5nk8abqqxhclr9nj6wawpybf5raswpm18h0kpxyf6qz8'';
+ url = ''http://beta.quicklisp.org/archive/lack/2019-05-21/lack-20190521-git.tgz'';
+ sha256 = ''0ng1k5jq7icfi8c8r3wqj3qrqkh2lyav5ab6mf3l5y4bfwbil593'';
};
packageName = "lack";
@@ -18,14 +18,17 @@ rec {
overrides = x: x;
}
/* (SYSTEM lack DESCRIPTION A minimal Clack SHA256
- 00i36c5r5nk8abqqxhclr9nj6wawpybf5raswpm18h0kpxyf6qz8 URL
- http://beta.quicklisp.org/archive/lack/2018-12-10/lack-20181210-git.tgz MD5
- b75ab822b0b1d7fa5ff4d47db3ec80dd NAME lack FILENAME lack DEPS
- ((NAME ironclad FILENAME ironclad)
+ 0ng1k5jq7icfi8c8r3wqj3qrqkh2lyav5ab6mf3l5y4bfwbil593 URL
+ http://beta.quicklisp.org/archive/lack/2019-05-21/lack-20190521-git.tgz MD5
+ 7d7321550f0795e998c7afe4498e7a40 NAME lack FILENAME lack DEPS
+ ((NAME alexandria FILENAME alexandria)
+ (NAME bordeaux-threads FILENAME bordeaux-threads)
+ (NAME ironclad FILENAME ironclad)
(NAME lack-component FILENAME lack-component)
(NAME lack-util FILENAME lack-util) (NAME nibbles FILENAME nibbles))
- DEPENDENCIES (ironclad lack-component lack-util nibbles) VERSION
- 20181210-git SIBLINGS
+ DEPENDENCIES
+ (alexandria bordeaux-threads ironclad lack-component lack-util nibbles)
+ VERSION 20190521-git SIBLINGS
(lack-component lack-middleware-accesslog lack-middleware-auth-basic
lack-middleware-backtrace lack-middleware-csrf lack-middleware-mount
lack-middleware-session lack-middleware-static lack-request lack-response
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/lift.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/lift.nix
index a3ddc2fd953e..1edb65596a6c 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/lift.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/lift.nix
@@ -1,15 +1,15 @@
args @ { fetchurl, ... }:
rec {
baseName = ''lift'';
- version = ''20151031-git'';
+ version = ''20190521-git'';
description = ''LIsp Framework for Testing'';
deps = [ ];
src = fetchurl {
- url = ''http://beta.quicklisp.org/archive/lift/2015-10-31/lift-20151031-git.tgz'';
- sha256 = ''1h8fkpm377brbrc06zdynd2qilc85vr9i8r9f8pjqqmk3p1qyl46'';
+ url = ''http://beta.quicklisp.org/archive/lift/2019-05-21/lift-20190521-git.tgz'';
+ sha256 = ''0cinilin9bxzsj3mzd4488zx2irvyl5qpbykv0xbyfz2mjh94ac9'';
};
packageName = "lift";
@@ -18,8 +18,8 @@ rec {
overrides = x: x;
}
/* (SYSTEM lift DESCRIPTION LIsp Framework for Testing SHA256
- 1h8fkpm377brbrc06zdynd2qilc85vr9i8r9f8pjqqmk3p1qyl46 URL
- http://beta.quicklisp.org/archive/lift/2015-10-31/lift-20151031-git.tgz MD5
- b92e97b3d337607743f47bde0889f3ee NAME lift FILENAME lift DEPS NIL
- DEPENDENCIES NIL VERSION 20151031-git SIBLINGS
+ 0cinilin9bxzsj3mzd4488zx2irvyl5qpbykv0xbyfz2mjh94ac9 URL
+ http://beta.quicklisp.org/archive/lift/2019-05-21/lift-20190521-git.tgz MD5
+ c03d3fa715792440c7b51a852ad581e3 NAME lift FILENAME lift DEPS NIL
+ DEPENDENCIES NIL VERSION 20190521-git SIBLINGS
(lift-documentation lift-test) PARASITES NIL) */
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/local-time.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/local-time.nix
index 1a94c643d8af..5ffa27fcca53 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/local-time.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/local-time.nix
@@ -1,7 +1,7 @@
args @ { fetchurl, ... }:
rec {
baseName = ''local-time'';
- version = ''20181210-git'';
+ version = ''20190710-git'';
parasites = [ "local-time/test" ];
@@ -10,8 +10,8 @@ rec {
deps = [ args."alexandria" args."bordeaux-threads" args."cl-fad" args."stefil" ];
src = fetchurl {
- url = ''http://beta.quicklisp.org/archive/local-time/2018-12-10/local-time-20181210-git.tgz'';
- sha256 = ''0m17mjql9f2glr9f2cg5d2dk5gi2xjjqxih18dx71jpbd71m6q4s'';
+ url = ''http://beta.quicklisp.org/archive/local-time/2019-07-10/local-time-20190710-git.tgz'';
+ sha256 = ''1f6l5g4frb2cyqdyyr64wdhp3fralshm43q7rigsrcz2vx5y75jk'';
};
packageName = "local-time";
@@ -21,12 +21,12 @@ rec {
}
/* (SYSTEM local-time DESCRIPTION
A library for manipulating dates and times, based on a paper by Erik Naggum
- SHA256 0m17mjql9f2glr9f2cg5d2dk5gi2xjjqxih18dx71jpbd71m6q4s URL
- http://beta.quicklisp.org/archive/local-time/2018-12-10/local-time-20181210-git.tgz
- MD5 161762ecff2ffbe4dc68c8dc28472515 NAME local-time FILENAME local-time
+ SHA256 1f6l5g4frb2cyqdyyr64wdhp3fralshm43q7rigsrcz2vx5y75jk URL
+ http://beta.quicklisp.org/archive/local-time/2019-07-10/local-time-20190710-git.tgz
+ MD5 ff315f40d1f955210c78aa0804a117f2 NAME local-time FILENAME local-time
DEPS
((NAME alexandria FILENAME alexandria)
(NAME bordeaux-threads FILENAME bordeaux-threads)
(NAME cl-fad FILENAME cl-fad) (NAME stefil FILENAME stefil))
DEPENDENCIES (alexandria bordeaux-threads cl-fad stefil) VERSION
- 20181210-git SIBLINGS (cl-postgres+local-time) PARASITES (local-time/test)) */
+ 20190710-git SIBLINGS (cl-postgres+local-time) PARASITES (local-time/test)) */
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/lquery.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/lquery.nix
index 19382889315a..f64e9ee6a330 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/lquery.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/lquery.nix
@@ -1,15 +1,15 @@
args @ { fetchurl, ... }:
rec {
baseName = ''lquery'';
- version = ''20190107-git'';
+ version = ''20190710-git'';
description = ''A library to allow jQuery-like HTML/DOM manipulation.'';
deps = [ args."array-utils" args."clss" args."documentation-utils" args."form-fiddle" args."plump" args."trivial-indent" ];
src = fetchurl {
- url = ''http://beta.quicklisp.org/archive/lquery/2019-01-07/lquery-20190107-git.tgz'';
- sha256 = ''023w4hsclqhw9bg1rfva0sapqmnmgsvf9gngbfhqcfgsdf7wff9r'';
+ url = ''http://beta.quicklisp.org/archive/lquery/2019-07-10/lquery-20190710-git.tgz'';
+ sha256 = ''17kgp8xrygg2d7pfzqram3iv3rry91yfgjs1ym37ac8r5gqrmfsw'';
};
packageName = "lquery";
@@ -19,13 +19,13 @@ rec {
}
/* (SYSTEM lquery DESCRIPTION
A library to allow jQuery-like HTML/DOM manipulation. SHA256
- 023w4hsclqhw9bg1rfva0sapqmnmgsvf9gngbfhqcfgsdf7wff9r URL
- http://beta.quicklisp.org/archive/lquery/2019-01-07/lquery-20190107-git.tgz
- MD5 295245984aa471d2709dcf926abd82e2 NAME lquery FILENAME lquery DEPS
+ 17kgp8xrygg2d7pfzqram3iv3rry91yfgjs1ym37ac8r5gqrmfsw URL
+ http://beta.quicklisp.org/archive/lquery/2019-07-10/lquery-20190710-git.tgz
+ MD5 987e9e505ff230c7bfc425bdf58fb717 NAME lquery FILENAME lquery DEPS
((NAME array-utils FILENAME array-utils) (NAME clss FILENAME clss)
(NAME documentation-utils FILENAME documentation-utils)
(NAME form-fiddle FILENAME form-fiddle) (NAME plump FILENAME plump)
(NAME trivial-indent FILENAME trivial-indent))
DEPENDENCIES
(array-utils clss documentation-utils form-fiddle plump trivial-indent)
- VERSION 20190107-git SIBLINGS (lquery-test) PARASITES NIL) */
+ VERSION 20190710-git SIBLINGS (lquery-test) PARASITES NIL) */
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/map-set.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/map-set.nix
index db25e6ae5347..8187c99f94a4 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/map-set.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/map-set.nix
@@ -1,15 +1,15 @@
args @ { fetchurl, ... }:
rec {
baseName = ''map-set'';
- version = ''20160628-hg'';
+ version = ''20190307-hg'';
description = ''Set-like data structure.'';
deps = [ ];
src = fetchurl {
- url = ''http://beta.quicklisp.org/archive/map-set/2016-06-28/map-set-20160628-hg.tgz'';
- sha256 = ''15fbha43a5153ah836djp9dbg41728adjrzwryv68gcqs31rjk9v'';
+ url = ''http://beta.quicklisp.org/archive/map-set/2019-03-07/map-set-20190307-hg.tgz'';
+ sha256 = ''1x7yh4gzdvypr1q45qgmjln5pjlh82bfpk6sqyrihrldmwwnbzg9'';
};
packageName = "map-set";
@@ -18,7 +18,7 @@ rec {
overrides = x: x;
}
/* (SYSTEM map-set DESCRIPTION Set-like data structure. SHA256
- 15fbha43a5153ah836djp9dbg41728adjrzwryv68gcqs31rjk9v URL
- http://beta.quicklisp.org/archive/map-set/2016-06-28/map-set-20160628-hg.tgz
- MD5 49cf6b527841b717b8696efaa7bb6389 NAME map-set FILENAME map-set DEPS NIL
- DEPENDENCIES NIL VERSION 20160628-hg SIBLINGS NIL PARASITES NIL) */
+ 1x7yh4gzdvypr1q45qgmjln5pjlh82bfpk6sqyrihrldmwwnbzg9 URL
+ http://beta.quicklisp.org/archive/map-set/2019-03-07/map-set-20190307-hg.tgz
+ MD5 866dba36cdf060c943267cb79ccc0532 NAME map-set FILENAME map-set DEPS NIL
+ DEPENDENCIES NIL VERSION 20190307-hg SIBLINGS NIL PARASITES NIL) */
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/pcall-queue.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/pcall-queue.nix
index 93890afd3004..fe9ccae2886a 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/pcall-queue.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/pcall-queue.nix
@@ -3,7 +3,7 @@ rec {
baseName = ''pcall-queue'';
version = ''pcall-0.3'';
- description = '''';
+ description = ''System lacks description'';
deps = [ args."alexandria" args."bordeaux-threads" ];
@@ -17,7 +17,7 @@ rec {
asdFilesToKeep = ["pcall-queue.asd"];
overrides = x: x;
}
-/* (SYSTEM pcall-queue DESCRIPTION NIL SHA256
+/* (SYSTEM pcall-queue DESCRIPTION System lacks description SHA256
02idx1wnv9770fl2nh179sb8njw801g70b5mf8jqhqm2gwsb731y URL
http://beta.quicklisp.org/archive/pcall/2010-10-06/pcall-0.3.tgz MD5
019d85dfd1d5d0ee8d4ee475411caf6b NAME pcall-queue FILENAME pcall-queue DEPS
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/plump.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/plump.nix
index 9f36a6717659..8757c704c8f4 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/plump.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/plump.nix
@@ -1,15 +1,15 @@
args @ { fetchurl, ... }:
rec {
baseName = ''plump'';
- version = ''20190107-git'';
+ version = ''20190710-git'';
description = ''An XML / XHTML / HTML parser that aims to be as lenient as possible.'';
deps = [ args."array-utils" args."documentation-utils" args."trivial-indent" ];
src = fetchurl {
- url = ''http://beta.quicklisp.org/archive/plump/2019-01-07/plump-20190107-git.tgz'';
- sha256 = ''0kc93374dvr9mz6k4c0xx47jjx5sjrxs151vnnpx8jxr4cc620l3'';
+ url = ''http://beta.quicklisp.org/archive/plump/2019-07-10/plump-20190710-git.tgz'';
+ sha256 = ''1in8c86a1ss8h02bsr3yb0clqgbvqh0bh5gy4y01yfckixbxh5fi'';
};
packageName = "plump";
@@ -19,11 +19,11 @@ rec {
}
/* (SYSTEM plump DESCRIPTION
An XML / XHTML / HTML parser that aims to be as lenient as possible. SHA256
- 0kc93374dvr9mz6k4c0xx47jjx5sjrxs151vnnpx8jxr4cc620l3 URL
- http://beta.quicklisp.org/archive/plump/2019-01-07/plump-20190107-git.tgz
- MD5 5b1a46b83536d5bf1a082a1ef191d3aa NAME plump FILENAME plump DEPS
+ 1in8c86a1ss8h02bsr3yb0clqgbvqh0bh5gy4y01yfckixbxh5fi URL
+ http://beta.quicklisp.org/archive/plump/2019-07-10/plump-20190710-git.tgz
+ MD5 e3276779e368758274156c9477f0b22a NAME plump FILENAME plump DEPS
((NAME array-utils FILENAME array-utils)
(NAME documentation-utils FILENAME documentation-utils)
(NAME trivial-indent FILENAME trivial-indent))
DEPENDENCIES (array-utils documentation-utils trivial-indent) VERSION
- 20190107-git SIBLINGS (plump-dom plump-lexer plump-parser) PARASITES NIL) */
+ 20190710-git SIBLINGS (plump-dom plump-lexer plump-parser) PARASITES NIL) */
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/query-fs.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/query-fs.nix
index 589f69178991..3666dda9bf87 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/query-fs.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/query-fs.nix
@@ -1,15 +1,15 @@
args @ { fetchurl, ... }:
rec {
baseName = ''query-fs'';
- version = ''20190107-git'';
+ version = ''20190521-git'';
description = ''High-level virtual FS using CL-Fuse-Meta-FS to represent results of queries'';
deps = [ args."alexandria" args."babel" args."bordeaux-threads" args."cffi" args."cffi-grovel" args."cffi-toolchain" args."cl-fuse" args."cl-fuse-meta-fs" args."cl-ppcre" args."cl-utilities" args."command-line-arguments" args."iterate" args."pcall" args."pcall-queue" args."trivial-backtrace" args."trivial-features" args."trivial-utf-8" ];
src = fetchurl {
- url = ''http://beta.quicklisp.org/archive/query-fs/2019-01-07/query-fs-20190107-git.tgz'';
- sha256 = ''1980k3l970ma1571myr66nxaxkg2vzf81a2wn28qcx40niy6pbq4'';
+ url = ''http://beta.quicklisp.org/archive/query-fs/2019-05-21/query-fs-20190521-git.tgz'';
+ sha256 = ''1zz917yjjnjx09cl27793056262nz1jhikdaj1mxhgzm3w6ywf39'';
};
packageName = "query-fs";
@@ -19,9 +19,9 @@ rec {
}
/* (SYSTEM query-fs DESCRIPTION
High-level virtual FS using CL-Fuse-Meta-FS to represent results of queries
- SHA256 1980k3l970ma1571myr66nxaxkg2vzf81a2wn28qcx40niy6pbq4 URL
- http://beta.quicklisp.org/archive/query-fs/2019-01-07/query-fs-20190107-git.tgz
- MD5 3abd1f0a2f82d10d919bb5b4aa5485be NAME query-fs FILENAME query-fs DEPS
+ SHA256 1zz917yjjnjx09cl27793056262nz1jhikdaj1mxhgzm3w6ywf39 URL
+ http://beta.quicklisp.org/archive/query-fs/2019-05-21/query-fs-20190521-git.tgz
+ MD5 1108c91b69007c6ab35b42d70d4dd7a2 NAME query-fs FILENAME query-fs DEPS
((NAME alexandria FILENAME alexandria) (NAME babel FILENAME babel)
(NAME bordeaux-threads FILENAME bordeaux-threads)
(NAME cffi FILENAME cffi) (NAME cffi-grovel FILENAME cffi-grovel)
@@ -40,4 +40,4 @@ rec {
(alexandria babel bordeaux-threads cffi cffi-grovel cffi-toolchain cl-fuse
cl-fuse-meta-fs cl-ppcre cl-utilities command-line-arguments iterate pcall
pcall-queue trivial-backtrace trivial-features trivial-utf-8)
- VERSION 20190107-git SIBLINGS NIL PARASITES NIL) */
+ VERSION 20190521-git SIBLINGS NIL PARASITES NIL) */
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/quri.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/quri.nix
index 2f30db52448c..f6022cb2a1f2 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/quri.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/quri.nix
@@ -1,15 +1,15 @@
args @ { fetchurl, ... }:
rec {
baseName = ''quri'';
- version = ''20181210-git'';
+ version = ''20190521-git'';
description = ''Yet another URI library for Common Lisp'';
deps = [ args."alexandria" args."babel" args."cl-utilities" args."split-sequence" args."trivial-features" ];
src = fetchurl {
- url = ''http://beta.quicklisp.org/archive/quri/2018-12-10/quri-20181210-git.tgz'';
- sha256 = ''0iy2q1jg1j07sw5al6c325zkwcbs218z3dszd785vl89ms6kjyn4'';
+ url = ''http://beta.quicklisp.org/archive/quri/2019-05-21/quri-20190521-git.tgz'';
+ sha256 = ''1khhdhn1isszii52xaibn6m4hv4sm5j2v0vgc2rp1x05xds9rzs2'';
};
packageName = "quri";
@@ -18,13 +18,13 @@ rec {
overrides = x: x;
}
/* (SYSTEM quri DESCRIPTION Yet another URI library for Common Lisp SHA256
- 0iy2q1jg1j07sw5al6c325zkwcbs218z3dszd785vl89ms6kjyn4 URL
- http://beta.quicklisp.org/archive/quri/2018-12-10/quri-20181210-git.tgz MD5
- 94f607540ccc8a15a4439527e41bf7ac NAME quri FILENAME quri DEPS
+ 1khhdhn1isszii52xaibn6m4hv4sm5j2v0vgc2rp1x05xds9rzs2 URL
+ http://beta.quicklisp.org/archive/quri/2019-05-21/quri-20190521-git.tgz MD5
+ c2e37013c3b8e109aeb009719e9492ac NAME quri FILENAME quri DEPS
((NAME alexandria FILENAME alexandria) (NAME babel FILENAME babel)
(NAME cl-utilities FILENAME cl-utilities)
(NAME split-sequence FILENAME split-sequence)
(NAME trivial-features FILENAME trivial-features))
DEPENDENCIES
(alexandria babel cl-utilities split-sequence trivial-features) VERSION
- 20181210-git SIBLINGS (quri-test) PARASITES NIL) */
+ 20190521-git SIBLINGS (quri-test) PARASITES NIL) */
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 86890d60dc5e..33847198bdd9 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
@@ -1,7 +1,7 @@
args @ { fetchurl, ... }:
rec {
baseName = ''simple-date'';
- version = ''postmodern-20190107-git'';
+ version = ''postmodern-20190521-git'';
parasites = [ "simple-date/postgres-glue" "simple-date/tests" ];
@@ -10,8 +10,8 @@ rec {
deps = [ args."cl-postgres" args."fiveam" args."md5" args."usocket" ];
src = fetchurl {
- url = ''http://beta.quicklisp.org/archive/postmodern/2019-01-07/postmodern-20190107-git.tgz'';
- sha256 = ''030p5kp593p4z7p3k0828dlayglw2si3q187z1fafgpvspp42sd5'';
+ url = ''http://beta.quicklisp.org/archive/postmodern/2019-05-21/postmodern-20190521-git.tgz'';
+ sha256 = ''1vphrizbhbs3r5rq4b8dh4149bz11h5xxilragwf4l2i619k3cp5'';
};
packageName = "simple-date";
@@ -20,12 +20,12 @@ rec {
overrides = x: x;
}
/* (SYSTEM simple-date DESCRIPTION NIL SHA256
- 030p5kp593p4z7p3k0828dlayglw2si3q187z1fafgpvspp42sd5 URL
- http://beta.quicklisp.org/archive/postmodern/2019-01-07/postmodern-20190107-git.tgz
- MD5 3f6f78c4fb0f5a8bb9f13247f1f3d6eb NAME simple-date FILENAME simple-date
+ 1vphrizbhbs3r5rq4b8dh4149bz11h5xxilragwf4l2i619k3cp5 URL
+ http://beta.quicklisp.org/archive/postmodern/2019-05-21/postmodern-20190521-git.tgz
+ MD5 102567f386757cd52aca500c0c348d90 NAME simple-date FILENAME simple-date
DEPS
((NAME cl-postgres FILENAME cl-postgres) (NAME fiveam FILENAME fiveam)
(NAME md5 FILENAME md5) (NAME usocket FILENAME usocket))
DEPENDENCIES (cl-postgres fiveam md5 usocket) VERSION
- postmodern-20190107-git SIBLINGS (cl-postgres postmodern s-sql) PARASITES
+ postmodern-20190521-git SIBLINGS (cl-postgres postmodern s-sql) PARASITES
(simple-date/postgres-glue simple-date/tests)) */
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/split-sequence.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/split-sequence.nix
index f0a21983f16f..a22076facd39 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/split-sequence.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/split-sequence.nix
@@ -1,7 +1,7 @@
args @ { fetchurl, ... }:
rec {
baseName = ''split-sequence'';
- version = ''v1.5.0'';
+ version = ''v2.0.0'';
parasites = [ "split-sequence/tests" ];
@@ -11,8 +11,8 @@ rec {
deps = [ args."fiveam" ];
src = fetchurl {
- url = ''http://beta.quicklisp.org/archive/split-sequence/2018-10-18/split-sequence-v1.5.0.tgz'';
- sha256 = ''0cxdgprb8c15fydm09aqvc8sdp5n87m6khv70kzkms1n2vm6sb0g'';
+ url = ''http://beta.quicklisp.org/archive/split-sequence/2019-05-21/split-sequence-v2.0.0.tgz'';
+ sha256 = ''09cmmswzl1kahvlzgqv8lqm9qcnz5iqg8f26fw3mm9rb3dcp7aba'';
};
packageName = "split-sequence";
@@ -23,8 +23,8 @@ rec {
/* (SYSTEM split-sequence DESCRIPTION
Splits a sequence into a list of subsequences
delimited by objects satisfying a test.
- SHA256 0cxdgprb8c15fydm09aqvc8sdp5n87m6khv70kzkms1n2vm6sb0g URL
- http://beta.quicklisp.org/archive/split-sequence/2018-10-18/split-sequence-v1.5.0.tgz
- MD5 67844853787187d993e6d530306eb2b4 NAME split-sequence FILENAME
+ SHA256 09cmmswzl1kahvlzgqv8lqm9qcnz5iqg8f26fw3mm9rb3dcp7aba URL
+ http://beta.quicklisp.org/archive/split-sequence/2019-05-21/split-sequence-v2.0.0.tgz
+ MD5 88aadc6c9da23663ebbb39d546991df4 NAME split-sequence FILENAME
split-sequence DEPS ((NAME fiveam FILENAME fiveam)) DEPENDENCIES (fiveam)
- VERSION v1.5.0 SIBLINGS NIL PARASITES (split-sequence/tests)) */
+ VERSION v2.0.0 SIBLINGS NIL PARASITES (split-sequence/tests)) */
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/sqlite.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/sqlite.nix
index 991791b57d02..57dec7c93cac 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/sqlite.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/sqlite.nix
@@ -3,7 +3,7 @@ rec {
baseName = ''sqlite'';
version = ''cl-20130615-git'';
- description = '''';
+ description = ''System lacks description'';
deps = [ args."alexandria" args."babel" args."cffi" args."iterate" args."trivial-features" ];
@@ -17,7 +17,7 @@ rec {
asdFilesToKeep = ["sqlite.asd"];
overrides = x: x;
}
-/* (SYSTEM sqlite DESCRIPTION NIL SHA256
+/* (SYSTEM sqlite DESCRIPTION System lacks description SHA256
0db1fvvnsrnxmp272ycnl2kwhymjwrimr8z4djvjlg6cvjxk6lqh URL
http://beta.quicklisp.org/archive/cl-sqlite/2013-06-15/cl-sqlite-20130615-git.tgz
MD5 93be7c68f587d830941be55f2c2f1c8b NAME sqlite FILENAME sqlite DEPS
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/stumpwm.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/stumpwm.nix
index e75cb087f38d..e89eb1971d60 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/stumpwm.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/stumpwm.nix
@@ -1,15 +1,15 @@
args @ { fetchurl, ... }:
rec {
baseName = ''stumpwm'';
- version = ''20190107-git'';
+ version = ''20190710-git'';
description = ''A tiling, keyboard driven window manager'';
deps = [ args."alexandria" args."cl-ppcre" args."clx" ];
src = fetchurl {
- url = ''http://beta.quicklisp.org/archive/stumpwm/2019-01-07/stumpwm-20190107-git.tgz'';
- sha256 = ''1i9l1jaxa38fp6s3wmbg5cnn27j4ry8z1mh3w5bhyq0b54zxbcar'';
+ url = ''http://beta.quicklisp.org/archive/stumpwm/2019-07-10/stumpwm-20190710-git.tgz'';
+ sha256 = ''10msx6a7s28aqkdz6x847n5jhg9sykvx96p3gh2pq1ab71wq1l3w'';
};
packageName = "stumpwm";
@@ -18,10 +18,10 @@ rec {
overrides = x: x;
}
/* (SYSTEM stumpwm DESCRIPTION A tiling, keyboard driven window manager SHA256
- 1i9l1jaxa38fp6s3wmbg5cnn27j4ry8z1mh3w5bhyq0b54zxbcar URL
- http://beta.quicklisp.org/archive/stumpwm/2019-01-07/stumpwm-20190107-git.tgz
- MD5 5634a308f5b40d9bab1f7c066aa6b9df NAME stumpwm FILENAME stumpwm DEPS
+ 10msx6a7s28aqkdz6x847n5jhg9sykvx96p3gh2pq1ab71wq1l3w URL
+ http://beta.quicklisp.org/archive/stumpwm/2019-07-10/stumpwm-20190710-git.tgz
+ MD5 7956cf3486c586f137b75f8b8c0e677c NAME stumpwm FILENAME stumpwm DEPS
((NAME alexandria FILENAME alexandria) (NAME cl-ppcre FILENAME cl-ppcre)
(NAME clx FILENAME clx))
- DEPENDENCIES (alexandria cl-ppcre clx) VERSION 20190107-git SIBLINGS
+ DEPENDENCIES (alexandria cl-ppcre clx) VERSION 20190710-git SIBLINGS
(stumpwm-tests) PARASITES NIL) */
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/swank.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/swank.nix
index 301b12a8998e..50b815425dc6 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/swank.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/swank.nix
@@ -1,15 +1,15 @@
args @ { fetchurl, ... }:
rec {
baseName = ''swank'';
- version = ''slime-v2.23'';
+ version = ''slime-v2.24'';
- description = '''';
+ description = ''System lacks description'';
deps = [ ];
src = fetchurl {
- url = ''http://beta.quicklisp.org/archive/slime/2019-01-07/slime-v2.23.tgz'';
- sha256 = ''1ml602yq5s38x0syg0grik8i4h01jw06yja87vpkjl3mkxqvxvky'';
+ url = ''http://beta.quicklisp.org/archive/slime/2019-07-10/slime-v2.24.tgz'';
+ sha256 = ''0gsq3i5818iwfbh710lf96kb66q3ap3qvvkcj06zyfh30n50x1g6'';
};
packageName = "swank";
@@ -17,8 +17,8 @@ rec {
asdFilesToKeep = ["swank.asd"];
overrides = x: x;
}
-/* (SYSTEM swank DESCRIPTION NIL SHA256
- 1ml602yq5s38x0syg0grik8i4h01jw06yja87vpkjl3mkxqvxvky URL
- http://beta.quicklisp.org/archive/slime/2019-01-07/slime-v2.23.tgz MD5
- 726724480d861d97e8b58bc8f9f27697 NAME swank FILENAME swank DEPS NIL
- DEPENDENCIES NIL VERSION slime-v2.23 SIBLINGS NIL PARASITES NIL) */
+/* (SYSTEM swank DESCRIPTION System lacks description SHA256
+ 0gsq3i5818iwfbh710lf96kb66q3ap3qvvkcj06zyfh30n50x1g6 URL
+ http://beta.quicklisp.org/archive/slime/2019-07-10/slime-v2.24.tgz MD5
+ 05f421f7a9dffa4ba206c548524ef1c0 NAME swank FILENAME swank DEPS NIL
+ DEPENDENCIES NIL VERSION slime-v2.24 SIBLINGS NIL PARASITES NIL) */
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivial-backtrace.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivial-backtrace.nix
index 9a4afce3280f..683f87357f56 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivial-backtrace.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivial-backtrace.nix
@@ -1,15 +1,15 @@
args @ { fetchurl, ... }:
rec {
baseName = ''trivial-backtrace'';
- version = ''20160531-git'';
+ version = ''20190710-git'';
description = ''trivial-backtrace'';
deps = [ ];
src = fetchurl {
- url = ''http://beta.quicklisp.org/archive/trivial-backtrace/2016-05-31/trivial-backtrace-20160531-git.tgz'';
- sha256 = ''1vcvalcv2ljiv2gyh8xjcg62cjsripjwmnhc8zji35ja1xyqvxhx'';
+ url = ''http://beta.quicklisp.org/archive/trivial-backtrace/2019-07-10/trivial-backtrace-20190710-git.tgz'';
+ sha256 = ''01pzn5ki3w5sgp270rqg6y982zw4p72x5zqcdjgn8hp7lk2a9g9x'';
};
packageName = "trivial-backtrace";
@@ -18,8 +18,8 @@ rec {
overrides = x: x;
}
/* (SYSTEM trivial-backtrace DESCRIPTION trivial-backtrace SHA256
- 1vcvalcv2ljiv2gyh8xjcg62cjsripjwmnhc8zji35ja1xyqvxhx URL
- http://beta.quicklisp.org/archive/trivial-backtrace/2016-05-31/trivial-backtrace-20160531-git.tgz
- MD5 a3b41b4ae24e3fde303a2623201aac4d NAME trivial-backtrace FILENAME
- trivial-backtrace DEPS NIL DEPENDENCIES NIL VERSION 20160531-git SIBLINGS
+ 01pzn5ki3w5sgp270rqg6y982zw4p72x5zqcdjgn8hp7lk2a9g9x URL
+ http://beta.quicklisp.org/archive/trivial-backtrace/2019-07-10/trivial-backtrace-20190710-git.tgz
+ MD5 e9035ed00321b24278cbf5449a1aebed NAME trivial-backtrace FILENAME
+ trivial-backtrace DEPS NIL DEPENDENCIES NIL VERSION 20190710-git SIBLINGS
(trivial-backtrace-test) PARASITES NIL) */
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivial-features.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivial-features.nix
index 1a562c2288bb..82d0e4513ab1 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivial-features.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivial-features.nix
@@ -1,15 +1,15 @@
args @ { fetchurl, ... }:
rec {
baseName = ''trivial-features'';
- version = ''20161204-git'';
+ version = ''20190710-git'';
description = ''Ensures consistent *FEATURES* across multiple CLs.'';
deps = [ ];
src = fetchurl {
- url = ''http://beta.quicklisp.org/archive/trivial-features/2016-12-04/trivial-features-20161204-git.tgz'';
- sha256 = ''0i2zyc9c7jigljxll29sh9gv1fawdsf0kq7s86pwba5zi99q2ij2'';
+ url = ''http://beta.quicklisp.org/archive/trivial-features/2019-07-10/trivial-features-20190710-git.tgz'';
+ sha256 = ''04i2vhhij8pwy46zih1dkm8ldy8qqgrncxxqd4y1sgiq3airg3dy'';
};
packageName = "trivial-features";
@@ -19,8 +19,8 @@ rec {
}
/* (SYSTEM trivial-features DESCRIPTION
Ensures consistent *FEATURES* across multiple CLs. SHA256
- 0i2zyc9c7jigljxll29sh9gv1fawdsf0kq7s86pwba5zi99q2ij2 URL
- http://beta.quicklisp.org/archive/trivial-features/2016-12-04/trivial-features-20161204-git.tgz
- MD5 07497e3fd92e68027a96f877cfe62bd4 NAME trivial-features FILENAME
- trivial-features DEPS NIL DEPENDENCIES NIL VERSION 20161204-git SIBLINGS
+ 04i2vhhij8pwy46zih1dkm8ldy8qqgrncxxqd4y1sgiq3airg3dy URL
+ http://beta.quicklisp.org/archive/trivial-features/2019-07-10/trivial-features-20190710-git.tgz
+ MD5 3907b044e00a812ebae989134fe57c55 NAME trivial-features FILENAME
+ trivial-features DEPS NIL DEPENDENCIES NIL VERSION 20190710-git SIBLINGS
(trivial-features-tests) PARASITES NIL) */
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivial-garbage.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivial-garbage.nix
index 5c3c486fb0ff..c629bb3548d4 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivial-garbage.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivial-garbage.nix
@@ -1,17 +1,17 @@
args @ { fetchurl, ... }:
rec {
baseName = ''trivial-garbage'';
- version = ''20181018-git'';
+ version = ''20190521-git'';
- parasites = [ "trivial-garbage-tests" ];
+ parasites = [ "trivial-garbage/tests" ];
description = ''Portable finalizers, weak hash-tables and weak pointers.'';
deps = [ args."rt" ];
src = fetchurl {
- url = ''http://beta.quicklisp.org/archive/trivial-garbage/2018-10-18/trivial-garbage-20181018-git.tgz'';
- sha256 = ''0hiflg8iak99bbgv0lqj6zwqyklx85ixp7yp4r8xzzm61ya613pl'';
+ url = ''http://beta.quicklisp.org/archive/trivial-garbage/2019-05-21/trivial-garbage-20190521-git.tgz'';
+ sha256 = ''0yhb7rkrbcfgghwvbw13nvmr86v19ka6qb53j8n89c7r270d8fdl'';
};
packageName = "trivial-garbage";
@@ -21,8 +21,8 @@ rec {
}
/* (SYSTEM trivial-garbage DESCRIPTION
Portable finalizers, weak hash-tables and weak pointers. SHA256
- 0hiflg8iak99bbgv0lqj6zwqyklx85ixp7yp4r8xzzm61ya613pl URL
- http://beta.quicklisp.org/archive/trivial-garbage/2018-10-18/trivial-garbage-20181018-git.tgz
- MD5 4d1d1ab0518b375da21b9a6eeaa498e3 NAME trivial-garbage FILENAME
+ 0yhb7rkrbcfgghwvbw13nvmr86v19ka6qb53j8n89c7r270d8fdl URL
+ http://beta.quicklisp.org/archive/trivial-garbage/2019-05-21/trivial-garbage-20190521-git.tgz
+ MD5 38fb70797069d4402c6b0fe91f4ca5a8 NAME trivial-garbage FILENAME
trivial-garbage DEPS ((NAME rt FILENAME rt)) DEPENDENCIES (rt) VERSION
- 20181018-git SIBLINGS NIL PARASITES (trivial-garbage-tests)) */
+ 20190521-git SIBLINGS NIL PARASITES (trivial-garbage/tests)) */
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivial-indent.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivial-indent.nix
index d34913b1656c..33eedbaa8184 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivial-indent.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivial-indent.nix
@@ -1,15 +1,15 @@
args @ { fetchurl, ... }:
rec {
baseName = ''trivial-indent'';
- version = ''20181018-git'';
+ version = ''20190710-git'';
description = ''A very simple library to allow indentation hints for SWANK.'';
deps = [ ];
src = fetchurl {
- url = ''http://beta.quicklisp.org/archive/trivial-indent/2018-10-18/trivial-indent-20181018-git.tgz'';
- sha256 = ''0lrbzm1dsf28q7vh9g8n8i5gzd5lxzfaphsa5dd9k2ahdr912c2g'';
+ url = ''http://beta.quicklisp.org/archive/trivial-indent/2019-07-10/trivial-indent-20190710-git.tgz'';
+ sha256 = ''00s35j8cf1ivwc1l55wprx1a78mvnxaz6innwwb3jan1sl3caycx'';
};
packageName = "trivial-indent";
@@ -19,8 +19,8 @@ rec {
}
/* (SYSTEM trivial-indent DESCRIPTION
A very simple library to allow indentation hints for SWANK. SHA256
- 0lrbzm1dsf28q7vh9g8n8i5gzd5lxzfaphsa5dd9k2ahdr912c2g URL
- http://beta.quicklisp.org/archive/trivial-indent/2018-10-18/trivial-indent-20181018-git.tgz
- MD5 87679f984544027ac939c22e288b09c5 NAME trivial-indent FILENAME
- trivial-indent DEPS NIL DEPENDENCIES NIL VERSION 20181018-git SIBLINGS NIL
+ 00s35j8cf1ivwc1l55wprx1a78mvnxaz6innwwb3jan1sl3caycx URL
+ http://beta.quicklisp.org/archive/trivial-indent/2019-07-10/trivial-indent-20190710-git.tgz
+ MD5 a5026ac3d68e02fce100761e546a0d77 NAME trivial-indent FILENAME
+ trivial-indent DEPS NIL DEPENDENCIES NIL VERSION 20190710-git SIBLINGS NIL
PARASITES NIL) */
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivial-mimes.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivial-mimes.nix
index f06c0d7ebf57..f02d9e0dc2c7 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivial-mimes.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivial-mimes.nix
@@ -1,15 +1,15 @@
args @ { fetchurl, ... }:
rec {
baseName = ''trivial-mimes'';
- version = ''20180831-git'';
+ version = ''20190710-git'';
description = ''Tiny library to detect mime types in files.'';
deps = [ ];
src = fetchurl {
- url = ''http://beta.quicklisp.org/archive/trivial-mimes/2018-08-31/trivial-mimes-20180831-git.tgz'';
- sha256 = ''0nkf6ifjvh4fvmf7spmqmz64yh2l1f25gxq1r8s0z0vnrmpsggqr'';
+ url = ''http://beta.quicklisp.org/archive/trivial-mimes/2019-07-10/trivial-mimes-20190710-git.tgz'';
+ sha256 = ''0z6m26gs0ilqs183xb4a5acpka9md10szbbdpm5xzjrhl15nb4jn'';
};
packageName = "trivial-mimes";
@@ -19,8 +19,8 @@ rec {
}
/* (SYSTEM trivial-mimes DESCRIPTION
Tiny library to detect mime types in files. SHA256
- 0nkf6ifjvh4fvmf7spmqmz64yh2l1f25gxq1r8s0z0vnrmpsggqr URL
- http://beta.quicklisp.org/archive/trivial-mimes/2018-08-31/trivial-mimes-20180831-git.tgz
- MD5 503680e90278947d888bcbe3338c74e3 NAME trivial-mimes FILENAME
- trivial-mimes DEPS NIL DEPENDENCIES NIL VERSION 20180831-git SIBLINGS NIL
+ 0z6m26gs0ilqs183xb4a5acpka9md10szbbdpm5xzjrhl15nb4jn URL
+ http://beta.quicklisp.org/archive/trivial-mimes/2019-07-10/trivial-mimes-20190710-git.tgz
+ MD5 b7fa1cb9382a2a562343c6ca87b1b4ac NAME trivial-mimes FILENAME
+ trivial-mimes DEPS NIL DEPENDENCIES NIL VERSION 20190710-git SIBLINGS NIL
PARASITES NIL) */
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/uiop.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/uiop.nix
index fdaa07109b49..18f1b74edbd3 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/uiop.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/uiop.nix
@@ -1,15 +1,15 @@
args @ { fetchurl, ... }:
rec {
baseName = ''uiop'';
- version = ''3.3.2'';
+ version = ''3.3.3'';
- description = '''';
+ description = ''System lacks description'';
deps = [ ];
src = fetchurl {
- url = ''http://beta.quicklisp.org/archive/uiop/2018-07-11/uiop-3.3.2.tgz'';
- sha256 = ''1q13a7dzc9vpd0w7c4xw03ijmlnyhjw2p76h0v8m7dyb23s7p9y5'';
+ url = ''http://beta.quicklisp.org/archive/uiop/2019-05-21/uiop-3.3.3.tgz'';
+ sha256 = ''1r89bqjmz1919l3wlmd32p416jzpacy3glkhiwnf1crkja27iagm'';
};
packageName = "uiop";
@@ -17,8 +17,8 @@ rec {
asdFilesToKeep = ["uiop.asd"];
overrides = x: x;
}
-/* (SYSTEM uiop DESCRIPTION NIL SHA256
- 1q13a7dzc9vpd0w7c4xw03ijmlnyhjw2p76h0v8m7dyb23s7p9y5 URL
- http://beta.quicklisp.org/archive/uiop/2018-07-11/uiop-3.3.2.tgz MD5
- 8d7b7b4065873107147678c6ef72e5ee NAME uiop FILENAME uiop DEPS NIL
- DEPENDENCIES NIL VERSION 3.3.2 SIBLINGS (asdf-driver) PARASITES NIL) */
+/* (SYSTEM uiop DESCRIPTION System lacks description SHA256
+ 1r89bqjmz1919l3wlmd32p416jzpacy3glkhiwnf1crkja27iagm URL
+ http://beta.quicklisp.org/archive/uiop/2019-05-21/uiop-3.3.3.tgz MD5
+ 64d561117f048ad8621eff7a6173d65e NAME uiop FILENAME uiop DEPS NIL
+ DEPENDENCIES NIL VERSION 3.3.3 SIBLINGS (asdf-driver) PARASITES NIL) */
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/usocket.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/usocket.nix
index 6d02b9764701..c3928cf0e4cc 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/usocket.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/usocket.nix
@@ -1,15 +1,15 @@
args @ { fetchurl, ... }:
rec {
baseName = ''usocket'';
- version = ''0.7.1'';
+ version = ''0.8.2'';
description = ''Universal socket library for Common Lisp'';
deps = [ args."split-sequence" ];
src = fetchurl {
- url = ''http://beta.quicklisp.org/archive/usocket/2018-08-31/usocket-0.7.1.tgz'';
- sha256 = ''18w2f835lgiznv6rm1v7yq94dg5qjcmbj91kpvfjw81pk4i7i7lw'';
+ url = ''http://beta.quicklisp.org/archive/usocket/2019-07-10/usocket-0.8.2.tgz'';
+ sha256 = ''0g5niqwzh4y6f25lnjx1qyzl0yg906zq2sy7ck67f7bcmc79w8zm'';
};
packageName = "usocket";
@@ -18,9 +18,9 @@ rec {
overrides = x: x;
}
/* (SYSTEM usocket DESCRIPTION Universal socket library for Common Lisp SHA256
- 18w2f835lgiznv6rm1v7yq94dg5qjcmbj91kpvfjw81pk4i7i7lw URL
- http://beta.quicklisp.org/archive/usocket/2018-08-31/usocket-0.7.1.tgz MD5
- fb48ff59f0d71bfc9c2939aacdb123a0 NAME usocket FILENAME usocket DEPS
+ 0g5niqwzh4y6f25lnjx1qyzl0yg906zq2sy7ck67f7bcmc79w8zm URL
+ http://beta.quicklisp.org/archive/usocket/2019-07-10/usocket-0.8.2.tgz MD5
+ 0218443cd70b675d9b09c1bf09cd9da4 NAME usocket FILENAME usocket DEPS
((NAME split-sequence FILENAME split-sequence)) DEPENDENCIES
- (split-sequence) VERSION 0.7.1 SIBLINGS (usocket-server usocket-test)
+ (split-sequence) VERSION 0.8.2 SIBLINGS (usocket-server usocket-test)
PARASITES NIL) */
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/woo.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/woo.nix
index 0d8822c2f4fe..59a41a7cf9ae 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/woo.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/woo.nix
@@ -1,15 +1,15 @@
args @ { fetchurl, ... }:
rec {
baseName = ''woo'';
- version = ''20181210-git'';
+ version = ''20190710-git'';
description = ''An asynchronous HTTP server written in Common Lisp'';
deps = [ args."alexandria" args."babel" args."bordeaux-threads" args."cffi" args."cffi-grovel" args."cffi-toolchain" args."cl-utilities" args."clack-socket" args."fast-http" args."fast-io" args."flexi-streams" args."lev" args."proc-parse" args."quri" args."smart-buffer" args."split-sequence" args."static-vectors" args."swap-bytes" args."trivial-features" args."trivial-gray-streams" args."trivial-utf-8" args."vom" args."xsubseq" ];
src = fetchurl {
- url = ''http://beta.quicklisp.org/archive/woo/2018-12-10/woo-20181210-git.tgz'';
- sha256 = ''1j00hvlhc24r3zyxh3bjb3xj74lyrvmbdgsdabidjxlzihmcb4ms'';
+ url = ''http://beta.quicklisp.org/archive/woo/2019-07-10/woo-20190710-git.tgz'';
+ sha256 = ''16fxk75bfb6g3998wqra93a7w4n0yqqi1i8w8dx8yiyy9yb7jij5'';
};
packageName = "woo";
@@ -18,9 +18,9 @@ rec {
overrides = x: x;
}
/* (SYSTEM woo DESCRIPTION An asynchronous HTTP server written in Common Lisp
- SHA256 1j00hvlhc24r3zyxh3bjb3xj74lyrvmbdgsdabidjxlzihmcb4ms URL
- http://beta.quicklisp.org/archive/woo/2018-12-10/woo-20181210-git.tgz MD5
- ecc4d7c194b3a941e381d9e6392d51c9 NAME woo FILENAME woo DEPS
+ SHA256 16fxk75bfb6g3998wqra93a7w4n0yqqi1i8w8dx8yiyy9yb7jij5 URL
+ http://beta.quicklisp.org/archive/woo/2019-07-10/woo-20190710-git.tgz MD5
+ f35b65dec09276f08c4ca532d077a7a9 NAME woo FILENAME woo DEPS
((NAME alexandria FILENAME alexandria) (NAME babel FILENAME babel)
(NAME bordeaux-threads FILENAME bordeaux-threads)
(NAME cffi FILENAME cffi) (NAME cffi-grovel FILENAME cffi-grovel)
@@ -43,4 +43,4 @@ rec {
cl-utilities clack-socket fast-http fast-io flexi-streams lev proc-parse
quri smart-buffer split-sequence static-vectors swap-bytes
trivial-features trivial-gray-streams trivial-utf-8 vom xsubseq)
- VERSION 20181210-git SIBLINGS (clack-handler-woo woo-test) PARASITES NIL) */
+ VERSION 20190710-git SIBLINGS (clack-handler-woo woo-test) PARASITES NIL) */
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/xembed.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/xembed.nix
index 4c88e839bdab..9854567fd5bf 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/xembed.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/xembed.nix
@@ -1,15 +1,15 @@
args @ { fetchurl, ... }:
rec {
baseName = ''xembed'';
- version = ''clx-20120909-git'';
+ version = ''clx-20190307-git'';
- description = '''';
+ description = ''An implementation of the XEMBED protocol that integrates with CLX.'';
deps = [ args."clx" ];
src = fetchurl {
- url = ''http://beta.quicklisp.org/archive/clx-xembed/2012-09-09/clx-xembed-20120909-git.tgz'';
- sha256 = ''06h2md0lb0sribpkg5k7z7fnc02k0ssaswcimg2ya8wqypj4rlbb'';
+ url = ''http://beta.quicklisp.org/archive/clx-xembed/2019-03-07/clx-xembed-20190307-git.tgz'';
+ sha256 = ''1a0yy707qdb7sw20lavmhlass3n3ds2pn52jxdkrvpgg358waf3j'';
};
packageName = "xembed";
@@ -17,9 +17,10 @@ rec {
asdFilesToKeep = ["xembed.asd"];
overrides = x: x;
}
-/* (SYSTEM xembed DESCRIPTION NIL SHA256
- 06h2md0lb0sribpkg5k7z7fnc02k0ssaswcimg2ya8wqypj4rlbb URL
- http://beta.quicklisp.org/archive/clx-xembed/2012-09-09/clx-xembed-20120909-git.tgz
- MD5 4270362697093017ac0243b71e3576f9 NAME xembed FILENAME xembed DEPS
- ((NAME clx FILENAME clx)) DEPENDENCIES (clx) VERSION clx-20120909-git
+/* (SYSTEM xembed DESCRIPTION
+ An implementation of the XEMBED protocol that integrates with CLX. SHA256
+ 1a0yy707qdb7sw20lavmhlass3n3ds2pn52jxdkrvpgg358waf3j URL
+ http://beta.quicklisp.org/archive/clx-xembed/2019-03-07/clx-xembed-20190307-git.tgz
+ MD5 04304f828ea8970b6f5301fe78ed8e10 NAME xembed FILENAME xembed DEPS
+ ((NAME clx FILENAME clx)) DEPENDENCIES (clx) VERSION clx-20190307-git
SIBLINGS NIL PARASITES NIL) */
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/xpath.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/xpath.nix
index ad90b8552181..3e14a5ba9f06 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/xpath.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/xpath.nix
@@ -1,7 +1,7 @@
args @ { fetchurl, ... }:
rec {
baseName = ''xpath'';
- version = ''plexippus-20181210-git'';
+ version = ''plexippus-20190521-git'';
parasites = [ "xpath/test" ];
@@ -10,8 +10,8 @@ rec {
deps = [ args."alexandria" args."babel" args."cl-ppcre" args."closure-common" args."cxml" args."parse-number" args."puri" args."trivial-features" args."trivial-gray-streams" args."yacc" ];
src = fetchurl {
- url = ''http://beta.quicklisp.org/archive/plexippus-xpath/2018-12-10/plexippus-xpath-20181210-git.tgz'';
- sha256 = ''1acg17ckl65h0xr1vv2ljkmli7jgln7qhl4zs8lwl9jcayi6fynn'';
+ url = ''http://beta.quicklisp.org/archive/plexippus-xpath/2019-05-21/plexippus-xpath-20190521-git.tgz'';
+ sha256 = ''15357w1rlmahld4rh8avix7m40mwiiv7n2vlyc57ldw2k1m0n7xa'';
};
packageName = "xpath";
@@ -21,9 +21,9 @@ rec {
}
/* (SYSTEM xpath DESCRIPTION
An implementation of the XML Path Language (XPath) Version 1.0 SHA256
- 1acg17ckl65h0xr1vv2ljkmli7jgln7qhl4zs8lwl9jcayi6fynn URL
- http://beta.quicklisp.org/archive/plexippus-xpath/2018-12-10/plexippus-xpath-20181210-git.tgz
- MD5 106060a6e90dd35c80385ad5a1e8554d NAME xpath FILENAME xpath DEPS
+ 15357w1rlmahld4rh8avix7m40mwiiv7n2vlyc57ldw2k1m0n7xa URL
+ http://beta.quicklisp.org/archive/plexippus-xpath/2019-05-21/plexippus-xpath-20190521-git.tgz
+ MD5 eb9a4c39a7c37aa0338c401713b3f944 NAME xpath FILENAME xpath 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)
@@ -34,4 +34,4 @@ rec {
DEPENDENCIES
(alexandria babel cl-ppcre closure-common cxml parse-number puri
trivial-features trivial-gray-streams yacc)
- VERSION plexippus-20181210-git SIBLINGS NIL PARASITES (xpath/test)) */
+ VERSION plexippus-20190521-git SIBLINGS NIL PARASITES (xpath/test)) */
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-overrides.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-overrides.nix
index 3343f22b7b0b..2e4ceda31c81 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-overrides.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-overrides.nix
@@ -165,4 +165,11 @@ $out/lib/common-lisp/query-fs"
meta.broken = true; # 2018-04-10
};
};
+ split-sequence = x: {
+ overrides = y: (x.overrides y) // {
+ preConfigure = ''
+ sed -i -e '/:components/i:serial t' split-sequence.asd
+ '';
+ };
+ };
}
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix.nix b/pkgs/development/lisp-modules/quicklisp-to-nix.nix
index 0de50a17ad66..2e71e0174f62 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix.nix
@@ -590,6 +590,8 @@ let quicklisp-to-nix-packages = rec {
(qlOverrides."lack-util" or (x: {}))
(import ./quicklisp-to-nix-output/lack-util.nix {
inherit fetchurl;
+ "alexandria" = quicklisp-to-nix-packages."alexandria";
+ "bordeaux-threads" = quicklisp-to-nix-packages."bordeaux-threads";
"ironclad" = quicklisp-to-nix-packages."ironclad";
"nibbles" = quicklisp-to-nix-packages."nibbles";
}));
@@ -1352,6 +1354,8 @@ let quicklisp-to-nix-packages = rec {
(qlOverrides."lack" or (x: {}))
(import ./quicklisp-to-nix-output/lack.nix {
inherit fetchurl;
+ "alexandria" = quicklisp-to-nix-packages."alexandria";
+ "bordeaux-threads" = quicklisp-to-nix-packages."bordeaux-threads";
"ironclad" = quicklisp-to-nix-packages."ironclad";
"lack-component" = quicklisp-to-nix-packages."lack-component";
"lack-util" = quicklisp-to-nix-packages."lack-util";
@@ -1372,6 +1376,8 @@ let quicklisp-to-nix-packages = rec {
(qlOverrides."ironclad" or (x: {}))
(import ./quicklisp-to-nix-output/ironclad.nix {
inherit fetchurl;
+ "alexandria" = quicklisp-to-nix-packages."alexandria";
+ "bordeaux-threads" = quicklisp-to-nix-packages."bordeaux-threads";
"nibbles" = quicklisp-to-nix-packages."nibbles";
"rt" = quicklisp-to-nix-packages."rt";
}));
@@ -1683,6 +1689,7 @@ let quicklisp-to-nix-packages = rec {
"split-sequence" = quicklisp-to-nix-packages."split-sequence";
"sqlite" = quicklisp-to-nix-packages."sqlite";
"trivial-features" = quicklisp-to-nix-packages."trivial-features";
+ "trivial-garbage" = quicklisp-to-nix-packages."trivial-garbage";
"trivial-types" = quicklisp-to-nix-packages."trivial-types";
"uiop" = quicklisp-to-nix-packages."uiop";
}));
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix/system-info.lisp b/pkgs/development/lisp-modules/quicklisp-to-nix/system-info.lisp
index 9dd82ce2b2d6..6a4c2b4ad1a2 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix/system-info.lisp
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix/system-info.lisp
@@ -352,7 +352,10 @@ quicklisp-to-nix."
(remove name (mapcar 'name ql-sibling-systems)
:test 'equal))
(dependencies raw-dependencies)
- (description (asdf:system-description (asdf:find-system system)))
+ (description
+ (or
+ (ignore-errors (asdf:system-description (asdf:find-system system)))
+ "System lacks description"))
(release-name (short-description ql-release)))
(list
:system system
diff --git a/pkgs/development/node-packages/node-packages-v10.json b/pkgs/development/node-packages/node-packages-v10.json
index 667b4233ff8f..e53f64d8ecaf 100644
--- a/pkgs/development/node-packages/node-packages-v10.json
+++ b/pkgs/development/node-packages/node-packages-v10.json
@@ -45,6 +45,7 @@
, "git-standup"
, "graphql-cli"
, "grunt-cli"
+, "gtop"
, "gulp"
, "gulp-cli"
, "html-minifier"
diff --git a/pkgs/development/node-packages/node-packages-v10.nix b/pkgs/development/node-packages/node-packages-v10.nix
index 8b5678755e5d..ce8a63cfdd37 100644
--- a/pkgs/development/node-packages/node-packages-v10.nix
+++ b/pkgs/development/node-packages/node-packages-v10.nix
@@ -2281,13 +2281,13 @@ let
sha512 = "hb+6E7kMzWlcwfe//ILDoktBPKL2a3+RnJT/CXnzRXaiLQpsdkf5li4q2v0fmvd+4v7L3tTN8KM+//lJyviEkg==";
};
};
- "@snyk/dep-graph-1.10.0" = {
+ "@snyk/dep-graph-1.12.0" = {
name = "_at_snyk_slash_dep-graph";
packageName = "@snyk/dep-graph";
- version = "1.10.0";
+ version = "1.12.0";
src = fetchurl {
- url = "https://registry.npmjs.org/@snyk/dep-graph/-/dep-graph-1.10.0.tgz";
- sha512 = "QwQTmmnVb1mjAffGsjKKrwit8ahLWyhlKWQcTVZo9UXFgWAwiuCjTXKAXhijZjGvrXQzNf5KbIBu+SZ1Dq2toQ==";
+ url = "https://registry.npmjs.org/@snyk/dep-graph/-/dep-graph-1.12.0.tgz";
+ sha512 = "n7+PlHn3SqznHgsCpeBRfEvU1oiQydoGkXQlnSB2+tfImiKXvY7YZbrg4wlbvYgylYiTbpCi5CpPNkJG14S+UQ==";
};
};
"@snyk/gemfile-1.2.0" = {
@@ -2839,13 +2839,13 @@ let
sha512 = "mlGER3Aqmq7bqR1tTTIVHq8KSAFFRyGbrxuM8C/H82g6k7r2fS+IMEkIu3D7JHzG10NvPdR8DNx0jr0pwpp4dA==";
};
};
- "@types/ws-6.0.1" = {
+ "@types/ws-6.0.2" = {
name = "_at_types_slash_ws";
packageName = "@types/ws";
- version = "6.0.1";
+ version = "6.0.2";
src = fetchurl {
- url = "https://registry.npmjs.org/@types/ws/-/ws-6.0.1.tgz";
- sha512 = "EzH8k1gyZ4xih/MaZTXwT2xOkPiIMSrhQ9b8wrlX88L0T02eYsddatQlwVFlEPyEqV0ChpdpNnE51QPH6NVT4Q==";
+ url = "https://registry.npmjs.org/@types/ws/-/ws-6.0.2.tgz";
+ sha512 = "22XiR1ox9LftTaAtn/c5JCninwc7moaqbkJfaDUb7PkaUitcf5vbTZHdq9dxSMviCm9C3W85rzB8e6yNR70apQ==";
};
};
"@types/zen-observable-0.8.0" = {
@@ -2857,40 +2857,40 @@ let
sha512 = "te5lMAWii1uEJ4FwLjzdlbw3+n0FZNOvFXHxQDKeT0dilh7HOzdMzV2TrJVUzq8ep7J4Na8OUYPRLSQkJHAlrg==";
};
};
- "@vue/cli-shared-utils-3.9.0" = {
+ "@vue/cli-shared-utils-3.10.0" = {
name = "_at_vue_slash_cli-shared-utils";
packageName = "@vue/cli-shared-utils";
- version = "3.9.0";
+ version = "3.10.0";
src = fetchurl {
- url = "https://registry.npmjs.org/@vue/cli-shared-utils/-/cli-shared-utils-3.9.0.tgz";
- sha512 = "wumeMZTz5aQ+1Y6uxTKegIsgOXEWT3hT8f9sW2mj5SwNDVyQ+AHZTgSynYExTUJg3dH81uKgFDUpPdAvGxzh8g==";
+ url = "https://registry.npmjs.org/@vue/cli-shared-utils/-/cli-shared-utils-3.10.0.tgz";
+ sha512 = "i96XBUtLdWeKFCC/ot12ngqnVikN/dXpelGdyxvNZczCkX7Je0FUdrZkiw0+uTYTu1RmuYWpLs+vb/YQerjiWg==";
};
};
- "@vue/cli-ui-3.9.3" = {
+ "@vue/cli-ui-3.10.0" = {
name = "_at_vue_slash_cli-ui";
packageName = "@vue/cli-ui";
- version = "3.9.3";
+ version = "3.10.0";
src = fetchurl {
- url = "https://registry.npmjs.org/@vue/cli-ui/-/cli-ui-3.9.3.tgz";
- sha512 = "CDMQn1An4OlaLoB0paZfXBSvuUUkR3BPU/EWTLszP1lHqTecAkj7ESIdelXfpPwRhxchE/7c9s9XXEhpHublrQ==";
+ url = "https://registry.npmjs.org/@vue/cli-ui/-/cli-ui-3.10.0.tgz";
+ sha512 = "Tekgh54ClA+x3ey3H1td/RVhGt9MG02/z/OtG+q2Dcy9j47bscDDiTv3OJgw64WrH5tqz1aKEA/SibxL9ehS+Q==";
};
};
- "@vue/cli-ui-addon-webpack-3.9.3" = {
+ "@vue/cli-ui-addon-webpack-3.10.0" = {
name = "_at_vue_slash_cli-ui-addon-webpack";
packageName = "@vue/cli-ui-addon-webpack";
- version = "3.9.3";
+ version = "3.10.0";
src = fetchurl {
- url = "https://registry.npmjs.org/@vue/cli-ui-addon-webpack/-/cli-ui-addon-webpack-3.9.3.tgz";
- sha512 = "BQro2UwHx7w1DcM2MJoF7qfa/Pp48mZWLwqJjCJVqg1utFkAqwjlIM9VweYWEWO7/jJ5B4JfuKCzRrGTtGDbdw==";
+ url = "https://registry.npmjs.org/@vue/cli-ui-addon-webpack/-/cli-ui-addon-webpack-3.10.0.tgz";
+ sha512 = "c930BWpeFu1H+mbUZT4VSLngD95yaOAg9qr21Kq1KMZ3CW7gakbttwpgXjn8edwdkvUl65IpSkdh/n/XyYyXxg==";
};
};
- "@vue/cli-ui-addon-widgets-3.9.3" = {
+ "@vue/cli-ui-addon-widgets-3.10.0" = {
name = "_at_vue_slash_cli-ui-addon-widgets";
packageName = "@vue/cli-ui-addon-widgets";
- version = "3.9.3";
+ version = "3.10.0";
src = fetchurl {
- url = "https://registry.npmjs.org/@vue/cli-ui-addon-widgets/-/cli-ui-addon-widgets-3.9.3.tgz";
- sha512 = "DnIvWNbhilouNyaevH2aBKSzdUK1zhveQvGp3z9ddVNgD6MadY9qf0YIrGrtzK4gn2Jc42BpOh64Slzwq9KhcQ==";
+ url = "https://registry.npmjs.org/@vue/cli-ui-addon-widgets/-/cli-ui-addon-widgets-3.10.0.tgz";
+ sha512 = "FvPB05n8Gp0TbvWPXnlwcQPSLZIwEY+Mzwh0pMDTN9yoxnf+/xhIt2PwRmFtecIBqyBZAIyYI50wmCxs9c2Hbw==";
};
};
"@webassemblyjs/ast-1.8.1" = {
@@ -3550,13 +3550,13 @@ let
sha1 = "fd8270f71fbb4996b004fa880ee5d46573a731bf";
};
};
- "acorn-globals-4.3.2" = {
+ "acorn-globals-4.3.3" = {
name = "acorn-globals";
packageName = "acorn-globals";
- version = "4.3.2";
+ version = "4.3.3";
src = fetchurl {
- url = "https://registry.npmjs.org/acorn-globals/-/acorn-globals-4.3.2.tgz";
- sha512 = "BbzvZhVtZP+Bs1J1HcwrQe8ycfO0wStkSGxuul3He3GkHOIZ6eTqOkPuw9IP1X3+IkOo4wiJmwkobzXYz4wewQ==";
+ url = "https://registry.npmjs.org/acorn-globals/-/acorn-globals-4.3.3.tgz";
+ sha512 = "vkR40VwS2SYO98AIeFvzWWh+xyc2qi9s7OoXSFEGIP/rOJKzjnhykaZJNnHdoq4BL2gGxI5EZOU16z896EYnOQ==";
};
};
"acorn-jsx-3.0.1" = {
@@ -4189,6 +4189,15 @@ let
sha512 = "8zjUtFJ3db/QoPXuuEMloS2AUf79/yeyttJ7Abr3hteopJu9HK8vsgGviGUMq+zyA6cZZO6gAyZoMTF6TgaEjA==";
};
};
+ "ansi-term-0.0.2" = {
+ name = "ansi-term";
+ packageName = "ansi-term";
+ version = "0.0.2";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/ansi-term/-/ansi-term-0.0.2.tgz";
+ sha1 = "fd753efa4beada0eac99981bc52a3f6ff019deb7";
+ };
+ };
"ansi-to-html-0.6.11" = {
name = "ansi-to-html";
packageName = "ansi-to-html";
@@ -4207,6 +4216,15 @@ let
sha1 = "a82250ddb0015e9a27ca82e82ea603bbfa45efaf";
};
};
+ "ansicolors-0.2.1" = {
+ name = "ansicolors";
+ packageName = "ansicolors";
+ version = "0.2.1";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/ansicolors/-/ansicolors-0.2.1.tgz";
+ sha1 = "be089599097b74a5c9c4a84a0cdbcdb62bd87aef";
+ };
+ };
"ansicolors-0.3.2" = {
name = "ansicolors";
packageName = "ansicolors";
@@ -4702,13 +4720,13 @@ let
sha1 = "ff662b4a78201494a3ee544d3a33fe7496509ebc";
};
};
- "archiver-3.0.3" = {
+ "archiver-3.1.1" = {
name = "archiver";
packageName = "archiver";
- version = "3.0.3";
+ version = "3.1.1";
src = fetchurl {
- url = "https://registry.npmjs.org/archiver/-/archiver-3.0.3.tgz";
- sha512 = "d0W7NUyXoLklozHHfvWnHoHS3dvQk8eB22pv5tBwcu1jEO5eZY8W+gHytkAaJ0R8fU2TnNThrWYxjvFlKvRxpw==";
+ url = "https://registry.npmjs.org/archiver/-/archiver-3.1.1.tgz";
+ sha512 = "5Hxxcig7gw5Jod/8Gq0OneVgLYET+oNHcxgWItq4TbhOzRLKNAFUb9edAftiMKXvXfCB0vbGrJdZDNq0dWMsxg==";
};
};
"archiver-utils-1.3.0" = {
@@ -5539,13 +5557,13 @@ let
sha512 = "z/WhQ5FPySLdvREByI2vZiTWwCnF0moMJ1hK9YQwDTHKh6I7/uSckMetoRGb5UBZPC1z0jlw+n/XCgjeH7y1AQ==";
};
};
- "async-limiter-1.0.0" = {
+ "async-limiter-1.0.1" = {
name = "async-limiter";
packageName = "async-limiter";
- version = "1.0.0";
+ version = "1.0.1";
src = fetchurl {
- url = "https://registry.npmjs.org/async-limiter/-/async-limiter-1.0.0.tgz";
- sha512 = "jp/uFnooOiO+L211eZOoSyzpOITMXx1rBITauYykG3BRYPu8h0UcxsPNB04RR5vo4Tyz3+ay17tR6JVf9qzYWg==";
+ url = "https://registry.npmjs.org/async-limiter/-/async-limiter-1.0.1.tgz";
+ sha512 = "csOlWGAcRFJaI6m+F2WKdnMKr4HhdhFVBk0H/QbJFMCr+uO2kwohwXQPxw/9OCxp05r5ghVBFSyioixx3gfkNQ==";
};
};
"async-lock-1.2.2" = {
@@ -5701,13 +5719,13 @@ let
sha1 = "00f35b2d27ac91b1f0d3ef2084c98cf1d1f0adc3";
};
};
- "aws-sdk-2.503.0" = {
+ "aws-sdk-2.504.0" = {
name = "aws-sdk";
packageName = "aws-sdk";
- version = "2.503.0";
+ version = "2.504.0";
src = fetchurl {
- url = "https://registry.npmjs.org/aws-sdk/-/aws-sdk-2.503.0.tgz";
- sha512 = "DPwRxhPYCGNvKL9rUhpAoOVpMRyISbVMlXykLQknYo7wyOI+jYcyA7t8H7IFPAqj4ZG+R+Au9tO/KT4im+2gbg==";
+ url = "https://registry.npmjs.org/aws-sdk/-/aws-sdk-2.504.0.tgz";
+ sha512 = "azOX54oovJv0zWzO23fBgIprwsvx8KUuMR+cAUAOx23D8LJ5S+sl3UYS9Q1X4qF/blBTa4+ZNawZDV0N1HiQmw==";
};
};
"aws-sign2-0.6.0" = {
@@ -6763,13 +6781,13 @@ let
sha1 = "1101e9544f4a76b1bc3b26d452ca96d7a35e7978";
};
};
- "base64-js-1.3.0" = {
+ "base64-js-1.3.1" = {
name = "base64-js";
packageName = "base64-js";
- version = "1.3.0";
+ version = "1.3.1";
src = fetchurl {
- url = "https://registry.npmjs.org/base64-js/-/base64-js-1.3.0.tgz";
- sha512 = "ccav/yGvoa80BQDljCxsmmQ3Xvx60/UpBIij5QN21W3wBi/hhIC9OoO+KLpu9IJTS9j4DRVJ3aDDF9cMSoa2lw==";
+ url = "https://registry.npmjs.org/base64-js/-/base64-js-1.3.1.tgz";
+ sha512 = "mLQ4i2QO1ytvGWFWmcngKO//JXAQueZvwEKtjgQFM4jIK0kU+ytMfplL8j+n5mspOfjHwoAg+9yhb7BwAHm36g==";
};
};
"base64-url-1.2.1" = {
@@ -7078,13 +7096,13 @@ let
sha512 = "Phlt0plgpIIBOGTT/ehfFnbNlfsDEiqmzE2KRXoX1bLIlir4X/MR+zSyBEkL05ffWgnRSf/DXv+WrUAVr93/ow==";
};
};
- "binary-search-1.3.5" = {
+ "binary-search-1.3.6" = {
name = "binary-search";
packageName = "binary-search";
- version = "1.3.5";
+ version = "1.3.6";
src = fetchurl {
- url = "https://registry.npmjs.org/binary-search/-/binary-search-1.3.5.tgz";
- sha512 = "RHFP0AdU6KAB0CCZsRMU2CJTk2EpL8GLURT+4gilpjr1f/7M91FgUMnXuQLmf3OKLet34gjuNFwO7e4agdX5pw==";
+ url = "https://registry.npmjs.org/binary-search/-/binary-search-1.3.6.tgz";
+ sha512 = "nbE1WxOTTrUWIfsfZ4aHGYu5DOuNkbxGokjV6Z2kxfJK3uaAb8zNK1muzOeipoLHZjInT4Br88BHpzevc681xA==";
};
};
"binaryheap-0.0.3" = {
@@ -7123,15 +7141,6 @@ let
sha1 = "b05d8b5f0d09f2df35a9db3b3a62d3808c46c457";
};
};
- "bitfield-2.0.0" = {
- name = "bitfield";
- packageName = "bitfield";
- version = "2.0.0";
- src = fetchurl {
- url = "https://registry.npmjs.org/bitfield/-/bitfield-2.0.0.tgz";
- sha512 = "4xM4DYejOHQ/qWBfeqBXNA4mJ12PwcOibFYnH1kYh5U9BHciCqEJBqGNVnMJXUhm8mflujNRLSv7IiVQxovgjw==";
- };
- };
"bitfield-3.0.0" = {
name = "bitfield";
packageName = "bitfield";
@@ -7204,13 +7213,13 @@ let
sha1 = "ffd2eabc141d36ed5c1817df7e992f91fd7fc65c";
};
};
- "bittorrent-tracker-9.11.0" = {
+ "bittorrent-tracker-9.12.1" = {
name = "bittorrent-tracker";
packageName = "bittorrent-tracker";
- version = "9.11.0";
+ version = "9.12.1";
src = fetchurl {
- url = "https://registry.npmjs.org/bittorrent-tracker/-/bittorrent-tracker-9.11.0.tgz";
- sha512 = "T1zvW/kSeEnWT4I3JE+6c7aZbO5jtleZyQe911SyzIxFF9DvtUNWXud3p5ZUkXaoI2xXwfpvlks5VFj5SKEB+A==";
+ url = "https://registry.npmjs.org/bittorrent-tracker/-/bittorrent-tracker-9.12.1.tgz";
+ sha512 = "5gjqHG3xV3eEy3UOOn4kkB09sl66t+fYzBGFMI83lRC/+33xmgpDYnu2lOnjYdRPAKWv0nBJT5XR/l9JkQ341A==";
};
};
"bl-0.8.2" = {
@@ -7285,6 +7294,24 @@ let
sha1 = "825a8fc536a5dc43193467f3124f7e9b78b21cef";
};
};
+ "blessed-0.1.81" = {
+ name = "blessed";
+ packageName = "blessed";
+ version = "0.1.81";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/blessed/-/blessed-0.1.81.tgz";
+ sha1 = "f962d687ec2c369570ae71af843256e6d0ca1129";
+ };
+ };
+ "blessed-contrib-4.8.16" = {
+ name = "blessed-contrib";
+ packageName = "blessed-contrib";
+ version = "4.8.16";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/blessed-contrib/-/blessed-contrib-4.8.16.tgz";
+ sha512 = "B1fEJTR+8IsimEvYQbvXCvnV0L674rFxy9yMwqibiRO2nxa5fzwnoKhJjRJFCBYH27ztW+b6jKvnOvetnj30WA==";
+ };
+ };
"blob-0.0.2" = {
name = "blob";
packageName = "blob";
@@ -7330,13 +7357,13 @@ let
sha1 = "13ebfe778a03205cfe03751481ebb4b3300c126a";
};
};
- "block-stream2-1.1.0" = {
+ "block-stream2-2.0.0" = {
name = "block-stream2";
packageName = "block-stream2";
- version = "1.1.0";
+ version = "2.0.0";
src = fetchurl {
- url = "https://registry.npmjs.org/block-stream2/-/block-stream2-1.1.0.tgz";
- sha1 = "c738e3a91ba977ebb5e1fef431e13ca11d8639e2";
+ url = "https://registry.npmjs.org/block-stream2/-/block-stream2-2.0.0.tgz";
+ sha512 = "1oI+RHHUEo64xomy1ozLgVJetFlHkIfQfJzTBQrj6xWnEMEPooeo2fZoqFjp0yzfHMBrgxwgh70tKp6T17+i3g==";
};
};
"bluebird-1.1.1" = {
@@ -7411,6 +7438,15 @@ let
sha512 = "ItfYfPLkWHUjckQCk8xC+LwxgK8NYcXywGigJgSwOP8Y2iyWT4f2vsZnoOXTTbo+o5yXmIUJ4gn5538SO5S3gA==";
};
};
+ "bn.js-5.0.0" = {
+ name = "bn.js";
+ packageName = "bn.js";
+ version = "5.0.0";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/bn.js/-/bn.js-5.0.0.tgz";
+ sha512 = "bVwDX8AF+72fIUNuARelKAlQUNtPOfG2fRxorbVvFk4zpHbqLrPdOGfVg5vrKwVzLLePqPBiATaOZNELQzmS0A==";
+ };
+ };
"bncode-0.2.3" = {
name = "bncode";
packageName = "bncode";
@@ -7654,6 +7690,15 @@ let
sha512 = "b8um+L1RzM3WDSzvhm6gIz1yfTbBt6YTlcEKAvsmqCZZFw46z626lVj9j1yEPW33H5H+lBQpZMP1k8l+78Ha0A==";
};
};
+ "bresenham-0.0.3" = {
+ name = "bresenham";
+ packageName = "bresenham";
+ version = "0.0.3";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/bresenham/-/bresenham-0.0.3.tgz";
+ sha1 = "abdab9e5b194e27c757cd314d8444314f299877a";
+ };
+ };
"brfs-1.6.1" = {
name = "brfs";
packageName = "brfs";
@@ -8509,13 +8554,13 @@ let
sha512 = "bsTwuIg/BZZK/vreVTYYbSWoe2F+71P7K5QGEX+pT250DZbfU1MQ5prOKpPR+LL6uWKK3KMwMCAS74QB3Um1uw==";
};
};
- "caniuse-lite-1.0.30000988" = {
+ "caniuse-lite-1.0.30000989" = {
name = "caniuse-lite";
packageName = "caniuse-lite";
- version = "1.0.30000988";
+ version = "1.0.30000989";
src = fetchurl {
- url = "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30000988.tgz";
- sha512 = "lPj3T8poYrRc/bniW5SQPND3GRtSrQdUM/R4mCYTbZxyi3jQiggLvZH4+BYUuX0t4TXjU+vMM7KFDQg+rSzZUQ==";
+ url = "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30000989.tgz";
+ sha512 = "vrMcvSuMz16YY6GSVZ0dWDTJP8jqk3iFQ/Aq5iqblPwxSVVZI+zxDyTX0VPqtQsDnfdrBDcsmhgTEOh5R8Lbpw==";
};
};
"capture-stack-trace-1.0.1" = {
@@ -8527,6 +8572,15 @@ let
sha512 = "mYQLZnx5Qt1JgB1WEiMCf2647plpGeQ2NMR/5L0HNZzGQo4fuSPnK+wjfPnKZV0aiJDgzmWqqkV/g7JD+DW0qw==";
};
};
+ "cardinal-1.0.0" = {
+ name = "cardinal";
+ packageName = "cardinal";
+ version = "1.0.0";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/cardinal/-/cardinal-1.0.0.tgz";
+ sha1 = "50e21c1b0aa37729f9377def196b5a9cec932ee9";
+ };
+ };
"caseless-0.11.0" = {
name = "caseless";
packageName = "caseless";
@@ -8779,6 +8833,15 @@ let
sha1 = "c0a1d2f3a7092e03774bfa83f14c0fc5790a8667";
};
};
+ "charm-0.1.2" = {
+ name = "charm";
+ packageName = "charm";
+ version = "0.1.2";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/charm/-/charm-0.1.2.tgz";
+ sha1 = "06c21eed1a1b06aeb67553cdc53e23274bac2296";
+ };
+ };
"charset-1.0.1" = {
name = "charset";
packageName = "charset";
@@ -9013,13 +9076,13 @@ let
sha1 = "04a106672c18b085ab774d983dfa3ea138f22205";
};
};
- "chunk-store-stream-4.0.0" = {
+ "chunk-store-stream-4.1.0" = {
name = "chunk-store-stream";
packageName = "chunk-store-stream";
- version = "4.0.0";
+ version = "4.1.0";
src = fetchurl {
- url = "https://registry.npmjs.org/chunk-store-stream/-/chunk-store-stream-4.0.0.tgz";
- sha512 = "hmtlqMozj1LbZlEpTBXL3YrBsLz4nJEXVihrSbe6ugfxH/Yae5JvUCXQwpWI7VELjXX0GyZK3ajQDBX/r30zBw==";
+ url = "https://registry.npmjs.org/chunk-store-stream/-/chunk-store-stream-4.1.0.tgz";
+ sha512 = "GjkZ16bFKMFnb8LrGZXAPeRoLXZTLu9ges6LCErJe28bMp6zKLxjWuJ7TYzR0jWq9nwo58hXG3BXZYy66Vze0Q==";
};
};
"ci-info-1.6.0" = {
@@ -10165,13 +10228,13 @@ let
sha1 = "524a9f10903f3a813389b0225d27c48bb751890f";
};
};
- "compress-commons-2.0.0" = {
+ "compress-commons-2.1.1" = {
name = "compress-commons";
packageName = "compress-commons";
- version = "2.0.0";
+ version = "2.1.1";
src = fetchurl {
- url = "https://registry.npmjs.org/compress-commons/-/compress-commons-2.0.0.tgz";
- sha512 = "gnETNngrfsAoLBENM8M0DoiCDJkHwz3OfIg4mBtqKDcRgE4oXNwHxHxgHvwKKlrcD7eZ7BVTy4l8t9xVF7q3FQ==";
+ url = "https://registry.npmjs.org/compress-commons/-/compress-commons-2.1.1.tgz";
+ sha512 = "eVw6n7CnEMFzc3duyFVrQEuY1BlHR3rYsSztyG32ibGMW722i3C6IizEGMFmfMU+A+fALvBIwxN3czffTcdA+Q==";
};
};
"compressible-2.0.17" = {
@@ -11065,6 +11128,15 @@ let
sha1 = "e3cdd3b4df3168dd74e3de3fbbcb7b297fe908f4";
};
};
+ "crc32-stream-3.0.1" = {
+ name = "crc32-stream";
+ packageName = "crc32-stream";
+ version = "3.0.1";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/crc32-stream/-/crc32-stream-3.0.1.tgz";
+ sha512 = "mctvpXlbzsvK+6z8kJwSJ5crm7yBwrQMTybJzMw1O4lLGJqjlDCXY2Zw7KheiA6XBEcBmfLx1D88mjRGVJtY9w==";
+ };
+ };
"create-ecdh-4.0.3" = {
name = "create-ecdh";
packageName = "create-ecdh";
@@ -11101,13 +11173,13 @@ let
sha512 = "MJG9liiZ+ogc4TzUwuvbER1JRdgvUFSB5+VR/g5h82fGaIRWMWddtKBHi7/sVhfjQZ6SehlyhvQYrcYkaUIpLg==";
};
};
- "create-torrent-4.0.0" = {
+ "create-torrent-4.2.1" = {
name = "create-torrent";
packageName = "create-torrent";
- version = "4.0.0";
+ version = "4.2.1";
src = fetchurl {
- url = "https://registry.npmjs.org/create-torrent/-/create-torrent-4.0.0.tgz";
- sha512 = "16JQRuPJWAntC4p+k6EFMxKatqzQOKv037aAun6Comomizlg9fOoBiIhxC/QCQfJFmGIfnT6HMOEa6da5xUmsg==";
+ url = "https://registry.npmjs.org/create-torrent/-/create-torrent-4.2.1.tgz";
+ sha512 = "IlKF2B3vrAGVzcgYVVgfsekp4p2N9BqkGeVqckTljajs+qIQ5oAwAzELJtb6sZ14UQBT7ZQNOOyvxgIL98VpZg==";
};
};
"creato-1.0.5" = {
@@ -13162,6 +13234,15 @@ let
sha512 = "l0IU0pPzLWSHBcieZbpOKgkIn3ts3vAh7ZuFyXNwJxJXk/c4Gwj9xaTJwIDVQCXawWD0qb3IzMGH5rglQaO0XA==";
};
};
+ "dom-serializer-0.2.1" = {
+ name = "dom-serializer";
+ packageName = "dom-serializer";
+ version = "0.2.1";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/dom-serializer/-/dom-serializer-0.2.1.tgz";
+ sha512 = "sK3ujri04WyjwQXVoK4PU3y8ula1stq10GJZpqHIUgoGZdsGzAGu65BnU3d08aTVSvO7mGPZUc0wTEDL+qGE0Q==";
+ };
+ };
"dom-walk-0.1.1" = {
name = "dom-walk";
packageName = "dom-walk";
@@ -13207,6 +13288,15 @@ let
sha512 = "BSKB+TSpMpFI/HOxCNr1O8aMOTZ8hT3pM3GQ0w/mWRmkhEDSFJkkyzz4XQsBV44BChwGkrDfMyjVD0eA2aFV3w==";
};
};
+ "domelementtype-2.0.1" = {
+ name = "domelementtype";
+ packageName = "domelementtype";
+ version = "2.0.1";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/domelementtype/-/domelementtype-2.0.1.tgz";
+ sha512 = "5HOHUDsYZWV8FGWN0Njbr/Rn7f/eWSQi1v7+HsUVwXgn8nWWlL64zKDkS0n8ZmQ3mlWOMuXOnR+7Nx/5tMO5AQ==";
+ };
+ };
"domexception-1.0.1" = {
name = "domexception";
packageName = "domexception";
@@ -13387,6 +13477,24 @@ let
sha512 = "pYxfDYpued//QpnLIm4Avk7rsNtAtQkUES2cwAYSvD/wd2pKD71gN2Ebj3e7klzXwjocvE8c5vx/1fxwpqmSxA==";
};
};
+ "drawille-blessed-contrib-1.0.0" = {
+ name = "drawille-blessed-contrib";
+ packageName = "drawille-blessed-contrib";
+ version = "1.0.0";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/drawille-blessed-contrib/-/drawille-blessed-contrib-1.0.0.tgz";
+ sha1 = "15c27934f57a0056ad13596e1561637bc941f0b7";
+ };
+ };
+ "drawille-canvas-blessed-contrib-0.1.3" = {
+ name = "drawille-canvas-blessed-contrib";
+ packageName = "drawille-canvas-blessed-contrib";
+ version = "0.1.3";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/drawille-canvas-blessed-contrib/-/drawille-canvas-blessed-contrib-0.1.3.tgz";
+ sha1 = "212f078a722bfd2ecc267ea86ab6dddc1081fd48";
+ };
+ };
"dreamopt-0.6.0" = {
name = "dreamopt";
packageName = "dreamopt";
@@ -13648,13 +13756,13 @@ let
sha512 = "PcW2a0tyTuPHz3tWyYqtK6r1fZ3gp+3Sop8Ph+ZYN81Ob5rwmbHEzaqs10N3BEsaGTkh/ooniXK+WwszGlc2+Q==";
};
};
- "electron-to-chromium-1.3.210" = {
+ "electron-to-chromium-1.3.215" = {
name = "electron-to-chromium";
packageName = "electron-to-chromium";
- version = "1.3.210";
+ version = "1.3.215";
src = fetchurl {
- url = "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.3.210.tgz";
- sha512 = "m1i/F+gw9jkauxDx0mOr7Sj6vp6se1mfkQNYqZb1yL5VGTp0AC1NZH5CGI6YMSO7WaScILmkKDZFG9/hlR9axQ==";
+ url = "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.3.215.tgz";
+ sha512 = "ZV3OnwF0FlIygwxAG2H92yt7WGjWBpawyFAFu8e9k7xJatY+BPowID0D0Bs3PMACYAJATEejw/I9cawO27ZvTg==";
};
};
"elegant-spinner-1.0.1" = {
@@ -14054,6 +14162,15 @@ let
sha512 = "f2LZMYl1Fzu7YSBKg+RoROelpOaNrcGmE9AZubeDfrCEia483oW4MI4VyFd5VNHIgQ/7qm1I0wUHK1eJnn2y2w==";
};
};
+ "entities-2.0.0" = {
+ name = "entities";
+ packageName = "entities";
+ version = "2.0.0";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/entities/-/entities-2.0.0.tgz";
+ sha512 = "D9f7V0JSRwIxlRI2mjMqufDrRDnx8p+eEOz7aUM9SuvF8gsBzra0/6tbjl1m8eQHrZlYj6PxqE00hZ1SAIKPLw==";
+ };
+ };
"env-paths-1.0.0" = {
name = "env-paths";
packageName = "env-paths";
@@ -14594,6 +14711,15 @@ let
sha1 = "609ac5c2667eae5433b41eb9ecece2331b41498f";
};
};
+ "esprima-3.0.0" = {
+ name = "esprima";
+ packageName = "esprima";
+ version = "3.0.0";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/esprima/-/esprima-3.0.0.tgz";
+ sha1 = "53cf247acda77313e551c3aa2e73342d3fb4f7d9";
+ };
+ };
"esprima-3.1.3" = {
name = "esprima";
packageName = "esprima";
@@ -14747,6 +14873,15 @@ let
sha1 = "b77b9309f7107addfeab63f0c0eafd8db0bd8c1c";
};
};
+ "event-stream-0.9.8" = {
+ name = "event-stream";
+ packageName = "event-stream";
+ version = "0.9.8";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/event-stream/-/event-stream-0.9.8.tgz";
+ sha1 = "5da9cf3c7900975989db5a68c28e5b3c98ebe03a";
+ };
+ };
"event-stream-3.1.5" = {
name = "event-stream";
packageName = "event-stream";
@@ -15845,13 +15980,13 @@ let
sha512 = "7KjR1vv6qnicaPMi1iiTcI85CyYwRO/PSFCu6SvqL8jN2Wjt/NIYQTFtFs7fSDCYOstUkEWIQGFUg5YZQfjlcg==";
};
};
- "filestream-4.1.3" = {
+ "filestream-5.0.0" = {
name = "filestream";
packageName = "filestream";
- version = "4.1.3";
+ version = "5.0.0";
src = fetchurl {
- url = "https://registry.npmjs.org/filestream/-/filestream-4.1.3.tgz";
- sha1 = "948fcaade8221f715f5ecaddc54862faaacc9325";
+ url = "https://registry.npmjs.org/filestream/-/filestream-5.0.0.tgz";
+ sha512 = "5H3RqSaJp12THfZiNWodYM7TiKfQvrpX+EIOrB1XvCceTys4yvfEIl8wDp+/yI8qj6Bxym8m0NYWwVXDAet/+A==";
};
};
"fill-range-2.2.4" = {
@@ -16187,15 +16322,6 @@ let
sha1 = "554440766da0a0d603999f433453f6c2fc6a75c1";
};
};
- "flatten-1.0.2" = {
- name = "flatten";
- packageName = "flatten";
- version = "1.0.2";
- src = fetchurl {
- url = "https://registry.npmjs.org/flatten/-/flatten-1.0.2.tgz";
- sha1 = "dae46a9d78fbe25292258cc1e780a41d95c03782";
- };
- };
"flow-bin-0.85.0" = {
name = "flow-bin";
packageName = "flow-bin";
@@ -17375,6 +17501,15 @@ let
sha512 = "SsZUjg/P03KPzQBt7OxJPasGw6NRO5uOgiZ5RGXVud5iSIZ0eNZeNp5rTwCxtavrRUa/A77j8mePVc5lEvk0KQ==";
};
};
+ "gl-matrix-2.8.1" = {
+ name = "gl-matrix";
+ packageName = "gl-matrix";
+ version = "2.8.1";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/gl-matrix/-/gl-matrix-2.8.1.tgz";
+ sha512 = "0YCjVpE3pS5XWlN3J4X7AiAx65+nqAI54LndtVFnQZB6G/FVLkZH8y8V6R3cIoOQR4pUdfwQGd1iwyoXHJ4Qfw==";
+ };
+ };
"glob-3.1.21" = {
name = "glob";
packageName = "glob";
@@ -17871,13 +18006,13 @@ let
sha1 = "0e8bdfe4d1ddb8854d64e04ea7c00e2a026e5658";
};
};
- "graceful-fs-4.2.0" = {
+ "graceful-fs-4.2.1" = {
name = "graceful-fs";
packageName = "graceful-fs";
- version = "4.2.0";
+ version = "4.2.1";
src = fetchurl {
- url = "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.0.tgz";
- sha512 = "jpSvDPV4Cq/bgtpndIWbI5hmYxhQGHPC4d4cqBPb4DLniCfhJokdXhwhaDuLBGLQdvvRum/UiX6ECVIPvDXqdg==";
+ url = "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.1.tgz";
+ sha512 = "b9usnbDGnD928gJB3LrCmxoibr3VE4U2SMo5PBuBnokWyDADTqDPXg4YpwKF1trpH+UbGp7QLicO3+aWEy0+mw==";
};
};
"graceful-readlink-1.0.1" = {
@@ -18762,6 +18897,15 @@ let
sha1 = "8f2d508d0600b4a456da2f086556e7e5c056a3c6";
};
};
+ "here-0.0.2" = {
+ name = "here";
+ packageName = "here";
+ version = "0.0.2";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/here/-/here-0.0.2.tgz";
+ sha1 = "69c1af3f02121f3d8788e02e84dc8b3905d71195";
+ };
+ };
"hex-color-regex-1.1.0" = {
name = "hex-color-regex";
packageName = "hex-color-regex";
@@ -18870,13 +19014,13 @@ let
sha1 = "08a74d9272a9cc83ae8e6bbe0303f0ee76432094";
};
};
- "hosted-git-info-2.7.1" = {
+ "hosted-git-info-2.8.2" = {
name = "hosted-git-info";
packageName = "hosted-git-info";
- version = "2.7.1";
+ version = "2.8.2";
src = fetchurl {
- url = "https://registry.npmjs.org/hosted-git-info/-/hosted-git-info-2.7.1.tgz";
- sha512 = "7T/BxH19zbcCTa8XkMlbK5lTo1WtgkFi3GvdWEyNuc4Vex7/9Dqbnpsf4JMydcfj9HCg4zUWFTL3Za6lapg5/w==";
+ url = "https://registry.npmjs.org/hosted-git-info/-/hosted-git-info-2.8.2.tgz";
+ sha512 = "CyjlXII6LMsPMyUzxpTt8fzh5QwzGqPmQXgY/Jyf4Zfp27t/FvfhwoE/8laaMUcMy816CkWF20I7NeQhwwY88w==";
};
};
"hsl-regex-1.0.0" = {
@@ -21228,6 +21372,15 @@ let
sha1 = "1f16e4aa22b04d1336b66188a66af3c600c3a66d";
};
};
+ "is-wsl-2.1.0" = {
+ name = "is-wsl";
+ packageName = "is-wsl";
+ version = "2.1.0";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/is-wsl/-/is-wsl-2.1.0.tgz";
+ sha512 = "pFTjpv/x5HRj8kbZ/Msxi9VrvtOMRBqaDi3OIcbwPI3OuH+r3lLxVWukLITBaOGJIbA/w2+M1eVmVa4XNQlAmQ==";
+ };
+ };
"is-yarn-global-0.3.0" = {
name = "is-yarn-global";
packageName = "is-yarn-global";
@@ -24820,6 +24973,15 @@ let
sha1 = "c32abd0bd6525d9b051645bb4f26ac5dc98a0dbf";
};
};
+ "map-canvas-0.1.5" = {
+ name = "map-canvas";
+ packageName = "map-canvas";
+ version = "0.1.5";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/map-canvas/-/map-canvas-0.1.5.tgz";
+ sha1 = "8be6bade0bf3e9f9a8b56e8836a1d1d133cab186";
+ };
+ };
"map-filter-reduce-2.2.1" = {
name = "map-filter-reduce";
packageName = "map-filter-reduce";
@@ -25018,6 +25180,15 @@ let
sha512 = "c+yYdCZJQrsRjTPhUx7VKkApw9bwDkNbHUKo1ovgcfDjb2kc8rLuRbIFyXL5WOEUwzSSKo3IXpph2K6DqB/KZg==";
};
};
+ "marked-terminal-1.7.0" = {
+ name = "marked-terminal";
+ packageName = "marked-terminal";
+ version = "1.7.0";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/marked-terminal/-/marked-terminal-1.7.0.tgz";
+ sha1 = "c8c460881c772c7604b64367007ee5f77f125904";
+ };
+ };
"marky-1.2.1" = {
name = "marky";
packageName = "marky";
@@ -25324,6 +25495,15 @@ let
sha512 = "ZS4Bp4r/Zoeq6+NLJpP+0Zzm0pR8whtGPf1XExKLJBAczGMnSi3It14OiNCStjQjM6NU1okjQGSxgEZN8eBYKg==";
};
};
+ "memory-streams-0.1.3" = {
+ name = "memory-streams";
+ packageName = "memory-streams";
+ version = "0.1.3";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/memory-streams/-/memory-streams-0.1.3.tgz";
+ sha512 = "qVQ/CjkMyMInPaaRMrwWNDvf6boRZXaT/DbQeMYcCWuXPEBf1v8qChOc9OlEVQp2uOvRXa1Qu30fLmKhY6NipA==";
+ };
+ };
"memorystore-1.6.1" = {
name = "memorystore";
packageName = "memorystore";
@@ -25333,6 +25513,15 @@ let
sha512 = "rYRjVukgBR9sptGI3IfpAjZc4SkupddhAenUhPTGprnqM8Qh863PxfXxXWlfvHpMIAkJCok28Bm7ZlOKB4U+MA==";
};
};
+ "memorystream-0.3.1" = {
+ name = "memorystream";
+ packageName = "memorystream";
+ version = "0.3.1";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/memorystream/-/memorystream-0.3.1.tgz";
+ sha1 = "86d7090b30ce455d63fbae12dda51a47ddcaf9b2";
+ };
+ };
"menu-string-1.3.0" = {
name = "menu-string";
packageName = "menu-string";
@@ -26458,13 +26647,13 @@ let
sha512 = "xasv76hl6nr1dEy3lPvy7Ej7K/Lx3O/FCvwge8PeVJpciPPoNCbaANcNiBug3IpdvTveZUcAV0DJzdnUDMesNQ==";
};
};
- "multistream-3.0.0" = {
+ "multistream-3.1.0" = {
name = "multistream";
packageName = "multistream";
- version = "3.0.0";
+ version = "3.1.0";
src = fetchurl {
- url = "https://registry.npmjs.org/multistream/-/multistream-3.0.0.tgz";
- sha512 = "v1Fx9uhHEpTB725/Kj8YpRCvrLhb20LeABFLw+0dkBkKUUAbDCY6CUUNzGQsJ94ji/p50wBPsRjIQXN1iOwZYA==";
+ url = "https://registry.npmjs.org/multistream/-/multistream-3.1.0.tgz";
+ sha512 = "zBgD3kn8izQAN/TaL1PCMv15vYpf+Vcrsfub06njuYVYlzUldzpopTlrEZ53pZVEbfn3Shtv7vRFoOv6LOV87Q==";
};
};
"mustache-2.3.2" = {
@@ -26584,13 +26773,13 @@ let
sha512 = "iWo/23xFnl+IGeX+LlfwoVKtyY4volPSodf3nwPScPgxjws4k2ZUozPG98OouMA0yn0JamqApjRw7eqLrzyV2A==";
};
};
- "muxrpcli-3.1.1" = {
+ "muxrpcli-3.1.2" = {
name = "muxrpcli";
packageName = "muxrpcli";
- version = "3.1.1";
+ version = "3.1.2";
src = fetchurl {
- url = "https://registry.npmjs.org/muxrpcli/-/muxrpcli-3.1.1.tgz";
- sha512 = "DSBXkmbfZgUrM9Y54Saeb2RySmuDMo5jAnMnBo0JHempIlHIXmnrIASdC0co0TQATq8kECF6SYcTFbJLKZUfJw==";
+ url = "https://registry.npmjs.org/muxrpcli/-/muxrpcli-3.1.2.tgz";
+ sha512 = "3nDL3dYXKxAN+spKSQBolxFoOl4HJCcm5UKlxjdjQxcjvLGLFLvwuNf1vCRpSveCHiFCxPLltWq2hT+vlDLPtQ==";
};
};
"mv-2.1.1" = {
@@ -27480,6 +27669,15 @@ let
sha512 = "SUDEb+o71XR5lXSTyivXd9J7fCloE3SyP4lSgt3lU2oSANiox+SxlNRGPjDKrwU1YN3ix2KN/VGGCg0t01rttQ==";
};
};
+ "node-notifier-5.4.2" = {
+ name = "node-notifier";
+ packageName = "node-notifier";
+ version = "5.4.2";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/node-notifier/-/node-notifier-5.4.2.tgz";
+ sha512 = "85nkTziazE2dR4pyoLxMwz0b9MmxFQPVXYs/WlWI7CPtBkARJOV+89khdNjpbclXIJDECQYnTvh1xuZV3WHkCA==";
+ };
+ };
"node-persist-2.1.0" = {
name = "node-persist";
packageName = "node-persist";
@@ -27759,6 +27957,15 @@ let
sha1 = "ca7416f20a5e3f9c3b86180f96295fa3d0b52e0d";
};
};
+ "nopt-2.1.2" = {
+ name = "nopt";
+ packageName = "nopt";
+ version = "2.1.2";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/nopt/-/nopt-2.1.2.tgz";
+ sha1 = "6cccd977b80132a07731d6e8ce58c2c8303cf9af";
+ };
+ };
"nopt-2.2.1" = {
name = "nopt";
packageName = "nopt";
@@ -28768,6 +28975,15 @@ let
sha1 = "e981ab7e268b457948593b55674c099a815cac31";
};
};
+ "optimist-0.3.7" = {
+ name = "optimist";
+ packageName = "optimist";
+ version = "0.3.7";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/optimist/-/optimist-0.3.7.tgz";
+ sha1 = "c90941ad59e4273328923074d2cf2e7cbc6ec0d9";
+ };
+ };
"optimist-0.6.0" = {
name = "optimist";
packageName = "optimist";
@@ -30163,6 +30379,15 @@ let
sha512 = "oLHIdio3tZ0qH76NybpeneBhYVj0QFTfXEFTc/B3zKQspYfYYkWYgFsmzo+4kvId/bQRcNkVeguI3y+CD22BtA==";
};
};
+ "picture-tuber-1.0.2" = {
+ name = "picture-tuber";
+ packageName = "picture-tuber";
+ version = "1.0.2";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/picture-tuber/-/picture-tuber-1.0.2.tgz";
+ sha512 = "49/xq+wzbwDeI32aPvwQJldM8pr7dKDRuR76IjztrkmiCkAQDaWFJzkmfVqCHmt/iFoPFhHmI9L0oKhthrTOQw==";
+ };
+ };
"pid-from-port-1.1.3" = {
name = "pid-from-port";
packageName = "pid-from-port";
@@ -30460,6 +30685,15 @@ let
sha512 = "2qHaIQr2VLRFoxe2nASzsV6ef4yOOH+Fi9FBOVH6cqeSgUnoyySPZkxzLuzd+RYOQTRpROA0ztTMqxROKSb/nA==";
};
};
+ "png-js-0.1.1" = {
+ name = "png-js";
+ packageName = "png-js";
+ version = "0.1.1";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/png-js/-/png-js-0.1.1.tgz";
+ sha1 = "1cc7c212303acabe74263ec3ac78009580242d93";
+ };
+ };
"pngjs-2.3.1" = {
name = "pngjs";
packageName = "pngjs";
@@ -31253,13 +31487,13 @@ let
sha1 = "8e57123c396ab988897fb327fd3aedc3e735e4fe";
};
};
- "prompts-2.1.0" = {
+ "prompts-2.2.1" = {
name = "prompts";
packageName = "prompts";
- version = "2.1.0";
+ version = "2.2.1";
src = fetchurl {
- url = "https://registry.npmjs.org/prompts/-/prompts-2.1.0.tgz";
- sha512 = "+x5TozgqYdOwWsQFZizE/Tra3fKvAoy037kOyU6cgz84n8f6zxngLOV4O32kTwt9FcLCxAqw0P/c8rOr9y+Gfg==";
+ url = "https://registry.npmjs.org/prompts/-/prompts-2.2.1.tgz";
+ sha512 = "VObPvJiWPhpZI6C5m60XOzTfnYg/xc/an+r9VYymj9WJW3B/DIH+REzjpAACPf8brwPeP+7vz3bIim3S+AaMjw==";
};
};
"promzard-0.3.0" = {
@@ -33071,6 +33305,15 @@ let
sha1 = "c1b2007b42d57eb1389079b3c8333639d5e1ccaa";
};
};
+ "redeyed-1.0.1" = {
+ name = "redeyed";
+ packageName = "redeyed";
+ version = "1.0.1";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/redeyed/-/redeyed-1.0.1.tgz";
+ sha1 = "e96c193b40c0816b00aec842698e61185e55498a";
+ };
+ };
"redis-0.12.1" = {
name = "redis";
packageName = "redis";
@@ -34727,13 +34970,13 @@ let
sha512 = "sDtmZDpibGH2ixj3FOmsC3Z/b08eaB2/KAvy2oSp4qvcGdhatBSfb1RdVpwjQl5c3J83WbBo1HSZ7DBtMu43lA==";
};
};
- "secret-stack-6.2.1" = {
+ "secret-stack-6.3.0" = {
name = "secret-stack";
packageName = "secret-stack";
- version = "6.2.1";
+ version = "6.3.0";
src = fetchurl {
- url = "https://registry.npmjs.org/secret-stack/-/secret-stack-6.2.1.tgz";
- sha512 = "7hw13S77Et4yC23uVXOFDRyullxAvFuoN3XW6PvHlAVkYMirLkyeglPOwPTk5JhYwIKPdpIz6vQ7DM0zSlOUHA==";
+ url = "https://registry.npmjs.org/secret-stack/-/secret-stack-6.3.0.tgz";
+ sha512 = "abIfcP1tlJ3gbfgAkp6mgqEc7M70GvXVTyE//iHDXMQz21zQxOD5WcWAiMg1Lgw5FgLfHM1WF+c8PqFNNE3WOg==";
};
};
"secure-keys-1.0.0" = {
@@ -35591,13 +35834,13 @@ let
sha1 = "5d3d5751bb39aeba2f710d8eec78768df821f38d";
};
};
- "simple-websocket-7.2.0" = {
+ "simple-websocket-8.0.0" = {
name = "simple-websocket";
packageName = "simple-websocket";
- version = "7.2.0";
+ version = "8.0.0";
src = fetchurl {
- url = "https://registry.npmjs.org/simple-websocket/-/simple-websocket-7.2.0.tgz";
- sha512 = "wdxFg1fHw1yqFKWDcw+yNb4VIYqtl+vknZMlpLhvZSlR6l7/iVuwozqo+Qtl73mB1IH5QnXzonD1S+hAaLNTvQ==";
+ url = "https://registry.npmjs.org/simple-websocket/-/simple-websocket-8.0.0.tgz";
+ sha512 = "DwBEoqOq8gvnblarMPkhZD6AWituWbVfTil/UflowYm/Bu5SK23BDKGxrVwgQXGKydzxlSiYva7LC3/hXSRLIw==";
};
};
"single-line-log-0.4.1" = {
@@ -35627,13 +35870,13 @@ let
sha512 = "dKKwjIoTOa587TARYLlBRXq2lkbu5Iz35XrEVWpelhBP1m8r2BGOy1QlaZe84GTFHG/BTucEUd2btnNc8QzIVA==";
};
};
- "sisteransi-1.0.2" = {
+ "sisteransi-1.0.3" = {
name = "sisteransi";
packageName = "sisteransi";
- version = "1.0.2";
+ version = "1.0.3";
src = fetchurl {
- url = "https://registry.npmjs.org/sisteransi/-/sisteransi-1.0.2.tgz";
- sha512 = "ZcYcZcT69nSLAR2oLN2JwNmLkJEKGooFMCdvOkFrToUt/WfcRWqhIg4P4KwY4dmLbuyXIx4o4YmPsvMRJYJd/w==";
+ url = "https://registry.npmjs.org/sisteransi/-/sisteransi-1.0.3.tgz";
+ sha512 = "SbEG75TzH8G7eVXFSN5f9EExILKfly7SUvVY5DhhYLvfhKqhDFY0OzevWa/zwak0RLRfWS5AvfMWpd9gJvr5Yg==";
};
};
"skin-tone-1.0.0" = {
@@ -35843,22 +36086,22 @@ let
sha1 = "6541184cc90aeea6c6e7b35e2659082443c66198";
};
};
- "snyk-1.208.0" = {
+ "snyk-1.210.0" = {
name = "snyk";
packageName = "snyk";
- version = "1.208.0";
+ version = "1.210.0";
src = fetchurl {
- url = "https://registry.npmjs.org/snyk/-/snyk-1.208.0.tgz";
- sha512 = "MMOQazfz+5fvoCDEBBJiuYNdcrtE3anemGvL7VJFlWu4uc8YgVZ8gvetEO7OmLmn4FfTmJ/hAthEQgcXYjDjFw==";
+ url = "https://registry.npmjs.org/snyk/-/snyk-1.210.0.tgz";
+ sha512 = "k6/EIX1Dc4Qk8omcKQDm13RRywkKqXoQ0IMz5Nyk1y8sdmg1S78QSWnfTaEPe+OQE1olrtjInrDX3Yu20CnMzg==";
};
};
- "snyk-config-2.2.2" = {
+ "snyk-config-2.2.3" = {
name = "snyk-config";
packageName = "snyk-config";
- version = "2.2.2";
+ version = "2.2.3";
src = fetchurl {
- url = "https://registry.npmjs.org/snyk-config/-/snyk-config-2.2.2.tgz";
- sha512 = "ud1UJhU5b3z2achCVbXin6m3eeESvJTn9hBDYjp5BafI+1ajOJt0LnUB9+SAZ3CnQIK90PUb/3nSx0xjtda7sA==";
+ url = "https://registry.npmjs.org/snyk-config/-/snyk-config-2.2.3.tgz";
+ sha512 = "9NjxHVMd1U1LFw66Lya4LXgrsFUiuRiL4opxfTFo0LmMNzUoU5Bk/p0zDdg3FE5Wg61r4fP2D8w+QTl6M8CGiw==";
};
};
"snyk-docker-plugin-1.25.1" = {
@@ -35906,13 +36149,13 @@ let
sha512 = "A+CCyBSa4IKok5uEhqT+hV/35RO6APFNLqk9DRRHg7xW2/j//nPX8wTSZUPF8QeRNEk/sX+6df7M1y6PBHGSHA==";
};
};
- "snyk-mvn-plugin-2.3.1" = {
+ "snyk-mvn-plugin-2.3.3" = {
name = "snyk-mvn-plugin";
packageName = "snyk-mvn-plugin";
- version = "2.3.1";
+ version = "2.3.3";
src = fetchurl {
- url = "https://registry.npmjs.org/snyk-mvn-plugin/-/snyk-mvn-plugin-2.3.1.tgz";
- sha512 = "2RgBnYe3Upc7SL+sL7MmnoCoJV/TZZ7q2L0J1BAbjoD/4cca4q0TCR6QVLzytHf4fSqc6QjSMjTUfmAo0kgsBg==";
+ url = "https://registry.npmjs.org/snyk-mvn-plugin/-/snyk-mvn-plugin-2.3.3.tgz";
+ sha512 = "NYFL+jtHfAJk+Jdyme4I8pTvg/wfoHgkOs1g1nFUEPTcpBb5mfqy7Q9hDJWvnfXY8M6P9aEqvO+bmCVgTQvySg==";
};
};
"snyk-nodejs-lockfile-parser-1.16.0" = {
@@ -35924,13 +36167,13 @@ let
sha512 = "cf3uozRXEG88nsjOQlo+SfOJPpcLs45qpnuk2vhBBZ577IMnV+fTOJQsP2YRiikLUbdgkVlduviwUO6OVn1PhA==";
};
};
- "snyk-nuget-plugin-1.11.2" = {
+ "snyk-nuget-plugin-1.11.3" = {
name = "snyk-nuget-plugin";
packageName = "snyk-nuget-plugin";
- version = "1.11.2";
+ version = "1.11.3";
src = fetchurl {
- url = "https://registry.npmjs.org/snyk-nuget-plugin/-/snyk-nuget-plugin-1.11.2.tgz";
- sha512 = "dNAwwFzrxI0gJh+3Eta7EFlz+jzXeTqXUwThaEASxCNNugV8gKsK/v+k0pQBsRPKvTLFlswB2D2Bt1E7YSOixA==";
+ url = "https://registry.npmjs.org/snyk-nuget-plugin/-/snyk-nuget-plugin-1.11.3.tgz";
+ sha512 = "UgLTMr7Vz0qZoL15SkFAUfMb4Vw/qFxf6lBoL2v8xA+Mqdvn2Yu9x/yW659ElFVSUjniqKTFyloKq9/XSv+c+A==";
};
};
"snyk-paket-parser-1.5.0" = {
@@ -36248,13 +36491,13 @@ let
sha512 = "UMmCHovws/sxIBZsIRhIl8uRPou/RFDD0vVop81T1hG106NLLgqajKKuHAOtAP6hflnZ0UrVA2VFwddTd/NQyA==";
};
};
- "sodium-native-2.4.3" = {
+ "sodium-native-2.4.5" = {
name = "sodium-native";
packageName = "sodium-native";
- version = "2.4.3";
+ version = "2.4.5";
src = fetchurl {
- url = "https://registry.npmjs.org/sodium-native/-/sodium-native-2.4.3.tgz";
- sha512 = "UCj3G++buo7HFADLMXyG+K7trEl6h17lde/2Sd3Al9ozcfPIQyKohmVqDncHY7ZggWkhzdwHKyDnlFWFQHZ5pg==";
+ url = "https://registry.npmjs.org/sodium-native/-/sodium-native-2.4.5.tgz";
+ sha512 = "G1uhd4l1OexzUC/6eHIbAvoivCs9T7ncDlEWodZglPZVUOXi6jtSe7tCi25aYB06zRoOjVfE4SL+hZ4EfkyZgw==";
};
};
"sodium-universal-2.0.0" = {
@@ -36509,6 +36752,15 @@ let
sha512 = "dSO0DDYUahUt/0/pD/Is3VIm5TGJjludZ0HVymmhYF6eNA53PVLhnUk0znSYbH8IYBuJdCE+1luR22jNLMaQdw==";
};
};
+ "sparkline-0.1.2" = {
+ name = "sparkline";
+ packageName = "sparkline";
+ version = "0.1.2";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/sparkline/-/sparkline-0.1.2.tgz";
+ sha1 = "c3bde46252b1354e710c4b200d54816bd9f07a32";
+ };
+ };
"sparse-bitfield-3.0.3" = {
name = "sparse-bitfield";
packageName = "sparse-bitfield";
@@ -37499,6 +37751,15 @@ let
sha512 = "ryeEu3DGMt/095uTShIYGzLbbhZ+tHQtgp5HWEhXALSoc4U1iLSvpReZUdysahnJ3tki80wBBgryqqBzFZ0KaA==";
};
};
+ "stream-to-blob-2.0.0" = {
+ name = "stream-to-blob";
+ packageName = "stream-to-blob";
+ version = "2.0.0";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/stream-to-blob/-/stream-to-blob-2.0.0.tgz";
+ sha512 = "E+YitTtIHo7RQ4Cmgl+EzlMpqvLroTynRgt4t0pI4y5oz/piqlBQB8NFXLIWcjGOsKw+THnImrdpWcOCVxK25Q==";
+ };
+ };
"stream-to-blob-url-2.1.2" = {
name = "stream-to-blob-url";
packageName = "stream-to-blob-url";
@@ -38480,6 +38741,15 @@ let
sha512 = "YPPlu67mdnHGTup2A8ff7BC2Pjq0e0Yp/IyTFN03zWO0RcK07uLcbi7C2KpGR2FvWbaB0+bfE27a+sBKebSo7w==";
};
};
+ "systeminformation-4.14.4" = {
+ name = "systeminformation";
+ packageName = "systeminformation";
+ version = "4.14.4";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/systeminformation/-/systeminformation-4.14.4.tgz";
+ sha512 = "ib2dodksiiaGOW4rcKvFr5naHkODI9GwQPugLb6FLKppkIsE7rj2dfY2UdMBr7oX0/iZP981hoxmbk2e6zl99Q==";
+ };
+ };
"syswide-cas-5.3.0" = {
name = "syswide-cas";
packageName = "syswide-cas";
@@ -38796,6 +39066,15 @@ let
sha512 = "LB83o9bfZGrntdqPuRdanIVCPReam9SOZKW0fOy5I9X3A854GGWi0tjCqoXEk84XIEYBc/x9Hq3EFop/H5wJaw==";
};
};
+ "term-canvas-0.0.5" = {
+ name = "term-canvas";
+ packageName = "term-canvas";
+ version = "0.0.5";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/term-canvas/-/term-canvas-0.0.5.tgz";
+ sha1 = "597afac2fa6369a6f17860bce9c5f66d6ea0ca96";
+ };
+ };
"term-size-1.2.0" = {
name = "term-size";
packageName = "term-size";
@@ -38805,13 +39084,13 @@ let
sha1 = "458b83887f288fc56d6fffbfad262e26638efa69";
};
};
- "terminal-kit-1.29.2" = {
+ "terminal-kit-1.29.3" = {
name = "terminal-kit";
packageName = "terminal-kit";
- version = "1.29.2";
+ version = "1.29.3";
src = fetchurl {
- url = "https://registry.npmjs.org/terminal-kit/-/terminal-kit-1.29.2.tgz";
- sha512 = "Ky4kxKivTqdH7OXZEOh1oaUx9OZSf707nW3OHN97UpLAfU/U75lzUlQhDxoKsG0T9qejC7b8qCbX3Ps+kX14SQ==";
+ url = "https://registry.npmjs.org/terminal-kit/-/terminal-kit-1.29.3.tgz";
+ sha512 = "RngmihiCinQ0CT3Q7l2R4aiV50czaB0gmGZ2rOZXhX5vWAkUAsnRVcv4JG068KQP1FbQNhm88CU/nBCZQmMPUQ==";
};
};
"terser-3.17.0" = {
@@ -38823,13 +39102,13 @@ let
sha512 = "/FQzzPJmCpjAH9Xvk2paiWrFq+5M6aVOf+2KRbwhByISDX/EujxsK+BAvrhb6H+2rtrLCHK9N01wO014vrIwVQ==";
};
};
- "terser-4.1.2" = {
+ "terser-4.1.3" = {
name = "terser";
packageName = "terser";
- version = "4.1.2";
+ version = "4.1.3";
src = fetchurl {
- url = "https://registry.npmjs.org/terser/-/terser-4.1.2.tgz";
- sha512 = "jvNoEQSPXJdssFwqPSgWjsOrb+ELoE+ILpHPKXC83tIxOlh2U75F1KuB2luLD/3a6/7K3Vw5pDn+hvu0C4AzSw==";
+ url = "https://registry.npmjs.org/terser/-/terser-4.1.3.tgz";
+ sha512 = "on13d+cnpn5bMouZu+J8tPYQecsdRJCJuxFJ+FVoPBoLJgk5bCBkp+Uen2hWyi0KIUm6eDarnlAlH+KgIx/PuQ==";
};
};
"terser-webpack-plugin-1.4.1" = {
@@ -40092,13 +40371,13 @@ let
sha512 = "/XrQjW0e5Z915m1A0qeXD9tSLDmz8zGjR6imhGDme6rMtXYudFpXXhaToKnM52nPPCNdCh6YQsLLkwbbkFvzVA==";
};
};
- "type-1.0.1" = {
+ "type-1.0.3" = {
name = "type";
packageName = "type";
- version = "1.0.1";
+ version = "1.0.3";
src = fetchurl {
- url = "https://registry.npmjs.org/type/-/type-1.0.1.tgz";
- sha512 = "MAM5dBMJCJNKs9E7JXo4CXRAansRfG0nlJxW7Wf6GZzSOvH31zClSaHdIMWLehe/EGMBkqeC55rrkaOr5Oo7Nw==";
+ url = "https://registry.npmjs.org/type/-/type-1.0.3.tgz";
+ sha512 = "51IMtNfVcee8+9GJvj0spSuFcZHe9vSib6Xtgsny1Km9ugyz2mbS08I3rsUIRYgJohFRFU1160sgRodYz378Hg==";
};
};
"type-check-0.3.2" = {
@@ -41586,6 +41865,15 @@ let
sha512 = "CNmdbwQMBjwr9Gsmohvm0pbL954tJrNzf6gWL3K+QMQf00PF7ERGrEiLgjuU3mKreLC2MeGhUsNV9ybTbLgd3w==";
};
};
+ "v8-compile-cache-2.1.0" = {
+ name = "v8-compile-cache";
+ packageName = "v8-compile-cache";
+ version = "2.1.0";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/v8-compile-cache/-/v8-compile-cache-2.1.0.tgz";
+ sha512 = "usZBT3PW+LOjM25wbqIlZwPeJV+3OSz3M1k1Ws8snlW39dZyYL9lOGC5FgPVHfk0jKmjiDV8Z0mIbVQPiwFs7g==";
+ };
+ };
"v8-debug-1.0.1" = {
name = "v8-debug";
packageName = "v8-debug";
@@ -42018,13 +42306,13 @@ let
sha1 = "2fb1decd4c466aa88b0f9341af33dc1aff2478d5";
};
};
- "videostream-3.2.0" = {
+ "videostream-3.2.1" = {
name = "videostream";
packageName = "videostream";
- version = "3.2.0";
+ version = "3.2.1";
src = fetchurl {
- url = "https://registry.npmjs.org/videostream/-/videostream-3.2.0.tgz";
- sha512 = "8+EY2dBxpJti9OBWUHtTn8wZEzyUwX7ldm/rwz8LKsgK+ccGVbTug9F6nyBOehLhifXALCs6Ca+CeYPVGBwobg==";
+ url = "https://registry.npmjs.org/videostream/-/videostream-3.2.1.tgz";
+ sha512 = "Z4EcsX9aYNJZD1M+0jCeQ0t+5ETlHE88B2SF1fCuVxfn+XxHGJVec6tbHGqpULk4esOOLJEipAScOCDGHk+teQ==";
};
};
"vinyl-0.4.6" = {
@@ -42567,13 +42855,13 @@ let
sha512 = "YQ+BmxuTgd6UXZW3+ICGfyqRyHXVlD5GtQr5+qjiNW7bF0cqrzX500HVXPBOvgXb5YnzDd+h0zqyv61KUD7+Sg==";
};
};
- "webpack-4.39.0" = {
+ "webpack-4.39.1" = {
name = "webpack";
packageName = "webpack";
- version = "4.39.0";
+ version = "4.39.1";
src = fetchurl {
- url = "https://registry.npmjs.org/webpack/-/webpack-4.39.0.tgz";
- sha512 = "nrxFNSEKm4T1C/EsgOgN50skt//Pl4X7kgJC1MrlE47M292LSCVmMOC47iTGL0CGxbdwhKGgeThrJcw0bstEfA==";
+ url = "https://registry.npmjs.org/webpack/-/webpack-4.39.1.tgz";
+ sha512 = "/LAb2TJ2z+eVwisldp3dqTEoNhzp/TLCZlmZm3GGGAlnfIWDgOEE758j/9atklNLfRyhKbZTCOIoPqLJXeBLbQ==";
};
};
"webpack-cli-3.3.6" = {
@@ -42594,13 +42882,13 @@ let
sha1 = "fc571588c8558da77be9efb6debdc5a3b172bdc2";
};
};
- "webpack-sources-1.4.1" = {
+ "webpack-sources-1.4.3" = {
name = "webpack-sources";
packageName = "webpack-sources";
- version = "1.4.1";
+ version = "1.4.3";
src = fetchurl {
- url = "https://registry.npmjs.org/webpack-sources/-/webpack-sources-1.4.1.tgz";
- sha512 = "XSz38193PTo/1csJabKaV4b53uRVotlMgqJXm3s3eje0Bu6gQTxYDqpD38CmQfDBA+gN+QqaGjasuC8I/7eW3Q==";
+ url = "https://registry.npmjs.org/webpack-sources/-/webpack-sources-1.4.3.tgz";
+ sha512 = "lgTS3Xhv1lCOKo7SA5TjKXMjpSM4sBjNV5+q2bqesbSPs5FjGmU6jjtBSkX9b4qW87vDIsCIlUPOEhbZrMdjeQ==";
};
};
"websocket-driver-0.7.3" = {
@@ -42630,13 +42918,13 @@ let
sha512 = "EXy/zXb9kNHI07TIMz1oIUIrPZxQRA8aeJ5XYg5ihV8K4kD1DuA+FY6R96HfdIHzlSzS8HiISAfrm+vVQkZBug==";
};
};
- "webtorrent-0.105.3" = {
+ "webtorrent-0.106.0" = {
name = "webtorrent";
packageName = "webtorrent";
- version = "0.105.3";
+ version = "0.106.0";
src = fetchurl {
- url = "https://registry.npmjs.org/webtorrent/-/webtorrent-0.105.3.tgz";
- sha512 = "Jm2Y4NIwRdAOTnFCueE9t1bcFjFK9W75pEfvx9WNidLo20eUvdLuERLu75Gnl7eI44mue1nAtk7MgaYk2CaeRw==";
+ url = "https://registry.npmjs.org/webtorrent/-/webtorrent-0.106.0.tgz";
+ sha512 = "CTj4J6yj6TuNTfrjRL84tunlCwIM+4hBu/6BfZslgi+iHdiJklUmFra/1WXBsx1madUB6/Ujx1eh4w+FO0on7g==";
};
};
"whatwg-encoding-1.0.5" = {
@@ -43278,6 +43566,15 @@ let
sha1 = "474b50865af3a49a9c4657f05acd145458f77d82";
};
};
+ "x256-0.0.2" = {
+ name = "x256";
+ packageName = "x256";
+ version = "0.0.2";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/x256/-/x256-0.0.2.tgz";
+ sha1 = "c9af18876f7a175801d564fe70ad9e8317784934";
+ };
+ };
"xdg-basedir-3.0.0" = {
name = "xdg-basedir";
packageName = "xdg-basedir";
@@ -44062,13 +44359,13 @@ let
sha1 = "a8bc45f4c1b49699c6b90198baacaacdbcd4ba04";
};
};
- "zip-stream-2.1.0" = {
+ "zip-stream-2.1.2" = {
name = "zip-stream";
packageName = "zip-stream";
- version = "2.1.0";
+ version = "2.1.2";
src = fetchurl {
- url = "https://registry.npmjs.org/zip-stream/-/zip-stream-2.1.0.tgz";
- sha512 = "F/xoLqlQShgvn1BzHQCNiYIoo2R93GQIMH+tA6JC3ckMDkme4bnhEEXSferZcG5ea/6bZNx3GqSUHqT8TUO6uQ==";
+ url = "https://registry.npmjs.org/zip-stream/-/zip-stream-2.1.2.tgz";
+ sha512 = "ykebHGa2+uzth/R4HZLkZh3XFJzivhVsjJt8bN3GvBzLaqqrUdRacu+c4QtnUgjkkQfsOuNE1JgLKMCPNmkKgg==";
};
};
"zmq-2.15.3" = {
@@ -44169,13 +44466,13 @@ in
sources."get-stream-4.1.0"
sources."getpass-0.1.7"
sources."glob-7.1.4"
- sources."graceful-fs-4.2.0"
+ sources."graceful-fs-4.2.1"
sources."har-schema-2.0.0"
sources."har-validator-5.1.3"
sources."has-1.0.3"
sources."has-flag-3.0.0"
sources."has-symbols-1.0.0"
- sources."hosted-git-info-2.7.1"
+ sources."hosted-git-info-2.8.2"
sources."http-cache-semantics-3.8.1"
(sources."http-proxy-agent-2.1.0" // {
dependencies = [
@@ -44561,7 +44858,7 @@ in
sources."globalyzer-0.1.4"
sources."globrex-0.1.2"
sources."got-9.6.0"
- sources."graceful-fs-4.2.0"
+ sources."graceful-fs-4.2.1"
(sources."gulp-vinyl-zip-2.1.2" // {
dependencies = [
sources."readable-stream-2.3.6"
@@ -44736,10 +45033,10 @@ in
"@vue/cli" = nodeEnv.buildNodePackage {
name = "_at_vue_slash_cli";
packageName = "@vue/cli";
- version = "3.9.3";
+ version = "3.10.0";
src = fetchurl {
- url = "https://registry.npmjs.org/@vue/cli/-/cli-3.9.3.tgz";
- sha512 = "+l/N5sNSwvDe6UsVrqcz8GIWp8QO5Q72OUW7P0X3xdcVo0XPnzwJ/jzKaYGnp7/syOFTIfL6KyW4gVezPE2oPA==";
+ url = "https://registry.npmjs.org/@vue/cli/-/cli-3.10.0.tgz";
+ sha512 = "0A2wsUPAoiiqr4B/EAlz1SPUNbq0pbyt4I8V6fiwie5oJXaxfJ8Vl8rpSUsZ2PzwpowgdiutjFkOxvFmhHAkQQ==";
};
dependencies = [
sources."@akryum/winattr-3.0.0"
@@ -44875,16 +45172,16 @@ in
sources."@types/node-12.6.9"
sources."@types/range-parser-1.2.3"
sources."@types/serve-static-1.13.2"
- sources."@types/ws-6.0.1"
+ sources."@types/ws-6.0.2"
sources."@types/zen-observable-0.8.0"
- sources."@vue/cli-shared-utils-3.9.0"
- (sources."@vue/cli-ui-3.9.3" // {
+ sources."@vue/cli-shared-utils-3.10.0"
+ (sources."@vue/cli-ui-3.10.0" // {
dependencies = [
sources."clone-2.1.2"
];
})
- sources."@vue/cli-ui-addon-webpack-3.9.3"
- sources."@vue/cli-ui-addon-widgets-3.9.3"
+ sources."@vue/cli-ui-addon-webpack-3.10.0"
+ sources."@vue/cli-ui-addon-widgets-3.10.0"
sources."@wry/context-0.4.4"
sources."@wry/equality-0.1.9"
sources."abbrev-1.1.1"
@@ -44952,7 +45249,7 @@ in
sources."ast-types-0.11.7"
sources."async-1.5.2"
sources."async-each-1.0.3"
- sources."async-limiter-1.0.0"
+ sources."async-limiter-1.0.1"
sources."async-retry-1.2.3"
sources."asynckit-0.4.0"
sources."atob-2.1.2"
@@ -44967,7 +45264,7 @@ in
sources."define-property-1.0.0"
];
})
- sources."base64-js-1.3.0"
+ sources."base64-js-1.3.1"
sources."bcrypt-pbkdf-1.0.2"
sources."binary-extensions-1.13.1"
sources."bl-1.2.2"
@@ -44995,7 +45292,7 @@ in
sources."cache-base-1.0.1"
sources."call-me-maybe-1.0.1"
sources."camelcase-4.1.0"
- sources."caniuse-lite-1.0.30000988"
+ sources."caniuse-lite-1.0.30000989"
sources."capture-stack-trace-1.0.1"
sources."caseless-0.12.0"
sources."caw-2.0.1"
@@ -45120,7 +45417,7 @@ in
sources."ecc-jsbn-0.1.2"
sources."ee-first-1.1.1"
sources."ejs-2.6.2"
- sources."electron-to-chromium-1.3.210"
+ sources."electron-to-chromium-1.3.215"
sources."encodeurl-1.0.2"
sources."end-of-stream-1.4.1"
sources."entities-1.1.2"
@@ -45241,7 +45538,7 @@ in
})
sources."good-listener-1.2.2"
sources."got-6.7.1"
- sources."graceful-fs-4.2.0"
+ sources."graceful-fs-4.2.1"
sources."graceful-readlink-1.0.1"
sources."graphql-14.4.2"
(sources."graphql-anywhere-4.2.4" // {
@@ -45425,9 +45722,9 @@ in
sources."node-fetch-2.6.0"
sources."node-ipc-9.1.1"
sources."node-modules-regexp-1.0.0"
- (sources."node-notifier-5.4.0" // {
+ (sources."node-notifier-5.4.2" // {
dependencies = [
- sources."semver-5.7.0"
+ sources."is-wsl-2.1.0"
];
})
(sources."node-releases-1.1.26" // {
@@ -46099,7 +46396,7 @@ in
];
})
sources."globals-11.12.0"
- sources."graceful-fs-4.2.0"
+ sources."graceful-fs-4.2.1"
sources."has-color-0.1.7"
sources."has-flag-3.0.0"
sources."homedir-polyfill-1.0.3"
@@ -46605,10 +46902,10 @@ in
azure-functions-core-tools = nodeEnv.buildNodePackage {
name = "azure-functions-core-tools";
packageName = "azure-functions-core-tools";
- version = "2.7.1480";
+ version = "2.7.1505";
src = fetchurl {
- url = "https://registry.npmjs.org/azure-functions-core-tools/-/azure-functions-core-tools-2.7.1480.tgz";
- sha512 = "Yr0YtXQ6JHB8ep68X9E5FQvbNb0Hs05t8o8exl+LJ8c/0VpIg2Ff7slzRHseTuQF4RysYk2VbRNPaN6ZPS1kWw==";
+ url = "https://registry.npmjs.org/azure-functions-core-tools/-/azure-functions-core-tools-2.7.1505.tgz";
+ sha512 = "3v1lDv6zwhGi2Qb8rNFA3tR+8h/vlufuanRgbw2ofPCPBCC29yiyQs2+IiCTBHVAxcBPN0h5rsELstoZ3S2Odw==";
};
dependencies = [
sources."agent-base-4.3.0"
@@ -46635,7 +46932,7 @@ in
sources."fs.realpath-1.0.0"
sources."fstream-1.0.12"
sources."glob-7.1.3"
- sources."graceful-fs-4.2.0"
+ sources."graceful-fs-4.2.1"
sources."has-flag-3.0.0"
sources."https-proxy-agent-2.2.1"
sources."inflight-1.0.6"
@@ -46683,7 +46980,7 @@ in
dependencies = [
sources."abab-2.0.0"
sources."acorn-5.7.3"
- (sources."acorn-globals-4.3.2" // {
+ (sources."acorn-globals-4.3.3" // {
dependencies = [
sources."acorn-6.2.1"
];
@@ -46696,7 +46993,7 @@ in
sources."array-equal-1.0.0"
sources."asn1-0.2.4"
sources."assert-plus-1.0.0"
- sources."async-limiter-1.0.0"
+ sources."async-limiter-1.0.1"
sources."asynckit-0.4.0"
sources."aws-sign2-0.7.0"
sources."aws4-1.8.0"
@@ -46934,14 +47231,14 @@ in
sources."find-up-1.1.2"
(sources."fs-extra-0.26.7" // {
dependencies = [
- sources."graceful-fs-4.2.0"
+ sources."graceful-fs-4.2.1"
];
})
sources."fs.realpath-1.0.0"
sources."get-stdin-4.0.1"
sources."glob-6.0.4"
sources."graceful-fs-3.0.11"
- sources."hosted-git-info-2.7.1"
+ sources."hosted-git-info-2.8.2"
sources."indent-string-2.1.0"
sources."inflight-1.0.6"
sources."inherits-2.0.4"
@@ -46952,21 +47249,22 @@ in
sources."is-utf8-0.2.1"
(sources."jsonfile-2.4.0" // {
dependencies = [
- sources."graceful-fs-4.2.0"
+ sources."graceful-fs-4.2.1"
];
})
(sources."klaw-1.3.1" // {
dependencies = [
- sources."graceful-fs-4.2.0"
+ sources."graceful-fs-4.2.1"
];
})
(sources."load-json-file-1.1.0" // {
dependencies = [
- sources."graceful-fs-4.2.0"
+ sources."graceful-fs-4.2.1"
];
})
sources."lodash-4.2.1"
sources."loud-rejection-1.6.0"
+ sources."lru-cache-5.1.1"
sources."map-obj-1.0.1"
sources."meow-3.7.0"
sources."mime-db-1.40.0"
@@ -46990,7 +47288,7 @@ in
sources."path-parse-1.0.6"
(sources."path-type-1.1.0" // {
dependencies = [
- sources."graceful-fs-4.2.0"
+ sources."graceful-fs-4.2.1"
];
})
sources."pify-2.3.0"
@@ -47027,6 +47325,7 @@ in
sources."trim-newlines-1.0.0"
sources."validate-npm-package-license-3.0.4"
sources."wrappy-1.0.2"
+ sources."yallist-3.0.3"
];
buildInputs = globalBuildInputs;
meta = {
@@ -47062,7 +47361,7 @@ in
];
})
sources."balanced-match-1.0.0"
- sources."base64-js-1.3.0"
+ sources."base64-js-1.3.1"
sources."bn.js-4.11.8"
sources."brace-expansion-1.1.11"
sources."brorand-1.1.0"
@@ -47248,7 +47547,7 @@ in
sources."aws-sign2-0.7.0"
sources."aws4-1.8.0"
sources."balanced-match-1.0.0"
- sources."base64-js-1.3.0"
+ sources."base64-js-1.3.1"
sources."bcrypt-pbkdf-1.0.2"
sources."bencode-2.0.1"
sources."bitfield-0.1.0"
@@ -47346,12 +47645,12 @@ in
sources."getpass-0.1.7"
sources."glob-7.1.4"
sources."got-1.2.2"
- sources."graceful-fs-4.2.0"
+ sources."graceful-fs-4.2.1"
sources."har-schema-2.0.0"
sources."har-validator-5.1.3"
sources."has-ansi-1.0.3"
sources."hat-0.0.3"
- sources."hosted-git-info-2.7.1"
+ sources."hosted-git-info-2.8.2"
sources."http-signature-1.2.0"
sources."immediate-chunk-store-1.0.8"
sources."indent-string-2.1.0"
@@ -47387,6 +47686,7 @@ in
sources."long-2.4.0"
sources."loud-rejection-1.6.0"
sources."lru-2.0.1"
+ sources."lru-cache-5.1.1"
sources."magnet-uri-5.2.4"
sources."map-obj-1.0.1"
(sources."mdns-js-1.0.3" // {
@@ -47613,6 +47913,7 @@ in
sources."xmldom-0.1.27"
sources."xspfr-0.3.1"
sources."xtend-4.0.2"
+ sources."yallist-3.0.3"
];
buildInputs = globalBuildInputs;
meta = {
@@ -47823,7 +48124,7 @@ in
sources."define-property-1.0.0"
];
})
- sources."base64-js-1.3.0"
+ sources."base64-js-1.3.1"
sources."bcrypt-pbkdf-1.0.2"
sources."big-integer-1.6.44"
(sources."body-parser-1.19.0" // {
@@ -48020,7 +48321,7 @@ in
sources."get-stream-3.0.0"
];
})
- sources."graceful-fs-4.2.0"
+ sources."graceful-fs-4.2.1"
sources."har-schema-2.0.0"
sources."har-validator-5.1.3"
sources."has-1.0.3"
@@ -48032,7 +48333,7 @@ in
sources."kind-of-4.0.0"
];
})
- sources."hosted-git-info-2.7.1"
+ sources."hosted-git-info-2.8.2"
(sources."http-errors-1.7.2" // {
dependencies = [
sources."inherits-2.0.3"
@@ -48106,7 +48407,7 @@ in
sources."lodash.debounce-4.0.8"
sources."loud-rejection-2.1.0"
sources."lowercase-keys-1.0.1"
- sources."lru-cache-4.1.5"
+ sources."lru-cache-5.1.1"
sources."macos-release-2.3.0"
sources."make-dir-1.3.0"
sources."map-cache-0.2.2"
@@ -48335,6 +48636,8 @@ in
sources."cross-spawn-5.1.0"
sources."execa-0.7.0"
sources."get-stream-3.0.0"
+ sources."lru-cache-4.1.5"
+ sources."yallist-2.1.2"
];
})
sources."through-2.3.8"
@@ -48398,7 +48701,7 @@ in
sources."xdg-basedir-3.0.0"
sources."xmlbuilder-9.0.7"
sources."xmldom-0.1.27"
- sources."yallist-2.1.2"
+ sources."yallist-3.0.3"
];
buildInputs = globalBuildInputs;
meta = {
@@ -48533,14 +48836,14 @@ in
})
sources."glob-to-regexp-0.3.0"
sources."globby-9.2.0"
- sources."graceful-fs-4.2.0"
+ sources."graceful-fs-4.2.1"
sources."has-value-1.0.0"
(sources."has-values-1.0.0" // {
dependencies = [
sources."kind-of-4.0.0"
];
})
- sources."hosted-git-info-2.7.1"
+ sources."hosted-git-info-2.8.2"
sources."ignore-4.0.6"
sources."indent-string-3.2.0"
sources."inflight-1.0.6"
@@ -48572,6 +48875,7 @@ in
})
sources."locate-path-2.0.0"
sources."loud-rejection-1.6.0"
+ sources."lru-cache-5.1.1"
sources."make-dir-2.1.0"
sources."map-cache-0.2.2"
sources."map-obj-2.0.0"
@@ -48720,6 +49024,7 @@ in
sources."use-3.1.1"
sources."validate-npm-package-license-3.0.4"
sources."wrappy-1.0.2"
+ sources."yallist-3.0.3"
sources."yargs-parser-10.1.0"
];
buildInputs = globalBuildInputs;
@@ -48859,7 +49164,7 @@ in
sources."symbol-observable-1.2.0"
sources."through-2.3.8"
sources."tmp-0.0.33"
- sources."type-1.0.1"
+ sources."type-1.0.3"
sources."util-deprecate-1.0.2"
(sources."variable-diff-1.1.0" // {
dependencies = [
@@ -48921,7 +49226,7 @@ in
sources."fstream-1.0.12"
sources."fstream-ignore-1.0.5"
sources."glob-7.1.4"
- sources."graceful-fs-4.2.0"
+ sources."graceful-fs-4.2.1"
sources."has-flag-3.0.0"
sources."hyperquest-2.1.3"
sources."iconv-lite-0.4.24"
@@ -49021,7 +49326,7 @@ in
sources."cross-spawn-5.1.0"
sources."escape-string-regexp-1.0.5"
sources."fs-extra-4.0.3"
- sources."graceful-fs-4.2.0"
+ sources."graceful-fs-4.2.1"
sources."has-flag-3.0.0"
sources."isexe-2.0.0"
sources."jsonfile-4.0.0"
@@ -49311,7 +49616,7 @@ in
sources."global-4.3.2"
sources."global-dirs-0.1.1"
sources."got-6.7.1"
- sources."graceful-fs-4.2.0"
+ sources."graceful-fs-4.2.1"
sources."har-schema-2.0.0"
sources."har-validator-5.1.3"
sources."has-1.0.3"
@@ -49586,7 +49891,11 @@ in
];
})
sources."sodium-javascript-0.5.5"
- sources."sodium-native-2.4.3"
+ (sources."sodium-native-2.4.5" // {
+ dependencies = [
+ sources."node-gyp-build-4.1.0"
+ ];
+ })
sources."sodium-universal-2.0.0"
sources."sorted-array-functions-1.2.0"
sources."sorted-indexof-1.0.0"
@@ -49909,10 +50218,10 @@ in
sources."assert-plus-1.0.0"
sources."async-2.6.3"
sources."asynckit-0.4.0"
- sources."aws-sdk-2.503.0"
+ sources."aws-sdk-2.504.0"
sources."aws-sign2-0.7.0"
sources."aws4-1.8.0"
- sources."base64-js-1.3.0"
+ sources."base64-js-1.3.1"
sources."bcrypt-pbkdf-1.0.2"
sources."buffer-4.9.1"
sources."buffer-queue-1.0.0"
@@ -50037,7 +50346,7 @@ in
sources."ansi-styles-2.2.1"
sources."anymatch-3.0.3"
sources."async-each-1.0.3"
- sources."async-limiter-1.0.0"
+ sources."async-limiter-1.0.1"
sources."binary-extensions-2.0.0"
sources."braces-3.0.2"
sources."chalk-1.1.3"
@@ -50142,7 +50451,7 @@ in
sources."supports-color-2.0.0"
sources."timers-ext-0.1.7"
sources."to-regex-range-5.0.1"
- sources."type-1.0.1"
+ sources."type-1.0.3"
sources."unpipe-1.0.0"
sources."url-parse-1.4.3"
sources."which-1.3.1"
@@ -50251,13 +50560,18 @@ in
sources."get-stream-3.0.0"
sources."globals-9.18.0"
sources."got-7.1.0"
- sources."graceful-fs-4.2.0"
+ sources."graceful-fs-4.2.1"
sources."has-ansi-3.0.0"
sources."has-flag-3.0.0"
sources."has-symbol-support-x-1.4.2"
sources."has-to-string-tag-x-1.4.1"
sources."home-or-tmp-2.0.0"
- sources."hosted-git-info-2.7.1"
+ (sources."hosted-git-info-2.8.2" // {
+ dependencies = [
+ sources."lru-cache-5.1.1"
+ sources."yallist-3.0.3"
+ ];
+ })
sources."import-jsx-1.3.2"
sources."imurmurhash-0.1.4"
sources."indent-string-3.2.0"
@@ -50566,7 +50880,7 @@ in
sources."tslib-1.10.0"
sources."type-check-0.3.2"
sources."uri-js-4.2.2"
- sources."v8-compile-cache-2.0.3"
+ sources."v8-compile-cache-2.1.0"
sources."which-1.3.1"
sources."wordwrap-1.0.0"
sources."wrappy-1.0.2"
@@ -50720,7 +51034,7 @@ in
sources."tslib-1.10.0"
sources."type-check-0.3.2"
sources."uri-js-4.2.2"
- sources."v8-compile-cache-2.0.3"
+ sources."v8-compile-cache-2.1.0"
sources."which-1.3.1"
sources."wordwrap-1.0.0"
sources."wrappy-1.0.2"
@@ -50790,13 +51104,13 @@ in
sources."fs-extra-1.0.0"
sources."get-stdin-4.0.1"
sources."getpass-0.1.7"
- sources."graceful-fs-4.2.0"
+ sources."graceful-fs-4.2.1"
sources."har-schema-2.0.0"
sources."har-validator-5.1.3"
sources."has-ansi-2.0.0"
sources."has-flag-3.0.0"
sources."hasha-2.2.0"
- sources."hosted-git-info-2.7.1"
+ sources."hosted-git-info-2.8.2"
sources."http-signature-1.2.0"
sources."indent-string-2.1.0"
sources."inherits-2.0.4"
@@ -50826,6 +51140,7 @@ in
})
sources."log-update-1.0.2"
sources."loud-rejection-1.6.0"
+ sources."lru-cache-5.1.1"
sources."map-obj-1.0.1"
sources."meow-3.7.0"
sources."mime-db-1.40.0"
@@ -50912,6 +51227,7 @@ in
sources."validate-npm-package-license-3.0.4"
sources."verror-1.10.0"
sources."which-1.3.1"
+ sources."yallist-3.0.3"
sources."yauzl-2.4.1"
sources."zen-observable-0.5.2"
];
@@ -50976,9 +51292,14 @@ in
sources."generate-function-1.1.0"
sources."generate-object-property-1.2.0"
sources."get-stream-3.0.0"
- sources."graceful-fs-4.2.0"
+ sources."graceful-fs-4.2.1"
sources."has-flag-3.0.0"
- sources."hosted-git-info-2.7.1"
+ (sources."hosted-git-info-2.8.2" // {
+ dependencies = [
+ sources."lru-cache-5.1.1"
+ sources."yallist-3.0.3"
+ ];
+ })
sources."iconv-lite-0.4.24"
sources."indent-string-3.2.0"
sources."inherits-2.0.4"
@@ -51230,7 +51551,7 @@ in
sources."glob-7.1.4"
sources."glob-base-0.3.0"
sources."glob-parent-2.0.0"
- sources."graceful-fs-4.2.0"
+ sources."graceful-fs-4.2.1"
(sources."has-value-1.0.0" // {
dependencies = [
sources."isobject-3.0.1"
@@ -51633,7 +51954,7 @@ in
sources."muxrpc-6.4.2"
sources."nan-2.14.0"
sources."nearley-2.18.0"
- sources."node-gyp-build-3.9.0"
+ sources."node-gyp-build-4.1.0"
sources."node-polyglot-1.0.0"
sources."non-private-ip-1.4.4"
sources."options-0.0.6"
@@ -51708,7 +52029,7 @@ in
];
})
sources."sodium-chloride-1.1.2"
- sources."sodium-native-2.4.3"
+ sources."sodium-native-2.4.5"
sources."split-buffer-1.0.0"
sources."ssb-avatar-0.2.0"
sources."ssb-caps-1.1.0"
@@ -51982,7 +52303,7 @@ in
sources."global-modules-1.0.0"
sources."global-prefix-1.0.2"
sources."got-6.7.1"
- sources."graceful-fs-4.2.0"
+ sources."graceful-fs-4.2.1"
sources."graphcool-json-schema-1.2.1"
(sources."graphcool-yml-0.4.15" // {
dependencies = [
@@ -52020,7 +52341,12 @@ in
sources."has-flag-3.0.0"
sources."header-case-1.0.1"
sources."homedir-polyfill-1.0.3"
- sources."hosted-git-info-2.7.1"
+ (sources."hosted-git-info-2.8.2" // {
+ dependencies = [
+ sources."lru-cache-5.1.1"
+ sources."yallist-3.0.3"
+ ];
+ })
(sources."http-errors-1.7.2" // {
dependencies = [
sources."inherits-2.0.3"
@@ -52670,6 +52996,80 @@ in
production = true;
bypassCache = true;
};
+ gtop = nodeEnv.buildNodePackage {
+ name = "gtop";
+ packageName = "gtop";
+ version = "1.0.1";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/gtop/-/gtop-1.0.1.tgz";
+ sha512 = "rDONVL6bOSKi9H2PuZ+nItRvFML39EeLgV65JRkGPdLri5saUAMVISZV/4jW8LylZBRHysVmaI1nCu5S/0Iilg==";
+ };
+ dependencies = [
+ sources."abbrev-1.1.1"
+ sources."ansi-regex-2.1.1"
+ sources."ansi-styles-2.2.1"
+ sources."ansi-term-0.0.2"
+ sources."ansicolors-0.2.1"
+ sources."blessed-0.1.81"
+ sources."blessed-contrib-4.8.16"
+ sources."bresenham-0.0.3"
+ sources."buffers-0.1.1"
+ sources."cardinal-1.0.0"
+ sources."chalk-1.1.3"
+ sources."charm-0.1.2"
+ sources."cli-table-0.3.1"
+ sources."colors-1.0.3"
+ sources."core-util-is-1.0.2"
+ sources."drawille-blessed-contrib-1.0.0"
+ sources."drawille-canvas-blessed-contrib-0.1.3"
+ sources."escape-string-regexp-1.0.5"
+ sources."esprima-3.0.0"
+ (sources."event-stream-0.9.8" // {
+ dependencies = [
+ sources."optimist-0.2.8"
+ ];
+ })
+ sources."gl-matrix-2.8.1"
+ sources."has-ansi-2.0.0"
+ sources."here-0.0.2"
+ sources."inherits-2.0.4"
+ sources."isarray-0.0.1"
+ sources."lodash-4.17.15"
+ 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-terminal-1.7.0"
+ sources."memory-streams-0.1.3"
+ sources."memorystream-0.3.1"
+ sources."node-emoji-1.10.0"
+ sources."nopt-2.1.2"
+ sources."optimist-0.3.7"
+ sources."picture-tuber-1.0.2"
+ sources."png-js-0.1.1"
+ sources."readable-stream-1.0.34"
+ sources."redeyed-1.0.1"
+ sources."sax-1.2.4"
+ sources."sparkline-0.1.2"
+ sources."string_decoder-0.10.31"
+ sources."strip-ansi-3.0.1"
+ sources."supports-color-2.0.0"
+ sources."systeminformation-4.14.4"
+ sources."term-canvas-0.0.5"
+ sources."wordwrap-0.0.3"
+ sources."x256-0.0.2"
+ sources."xml2js-0.4.19"
+ sources."xmlbuilder-9.0.7"
+ ];
+ buildInputs = globalBuildInputs;
+ meta = {
+ description = "graphic top";
+ homepage = "https://github.com/aksakalli/gtop#readme";
+ license = "MIT";
+ };
+ production = true;
+ bypassCache = true;
+ };
gulp = nodeEnv.buildNodePackage {
name = "gulp";
packageName = "gulp";
@@ -52853,7 +53253,7 @@ in
sources."global-modules-1.0.0"
sources."global-prefix-1.0.2"
sources."glogg-1.0.2"
- sources."graceful-fs-4.2.0"
+ sources."graceful-fs-4.2.1"
sources."gulp-cli-2.2.0"
sources."gulplog-1.0.0"
sources."has-symbols-1.0.0"
@@ -52864,7 +53264,7 @@ in
];
})
sources."homedir-polyfill-1.0.3"
- sources."hosted-git-info-2.7.1"
+ sources."hosted-git-info-2.8.2"
sources."inflight-1.0.6"
sources."inherits-2.0.4"
sources."ini-1.3.5"
@@ -52905,6 +53305,7 @@ in
sources."lead-1.0.0"
sources."liftoff-3.1.0"
sources."load-json-file-1.1.0"
+ sources."lru-cache-5.1.1"
sources."make-iterator-1.0.1"
sources."map-cache-0.2.2"
sources."map-visit-1.0.0"
@@ -53077,7 +53478,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.1"
+ sources."type-1.0.3"
sources."typedarray-0.0.6"
sources."unc-path-regex-0.1.2"
sources."undertaker-1.2.1"
@@ -53110,6 +53511,7 @@ in
sources."wrappy-1.0.2"
sources."xtend-4.0.2"
sources."y18n-3.2.1"
+ sources."yallist-3.0.3"
sources."yargs-7.1.0"
sources."yargs-parser-5.0.0"
];
@@ -53229,7 +53631,7 @@ in
sources."global-modules-1.0.0"
sources."global-prefix-1.0.2"
sources."glogg-1.0.2"
- sources."graceful-fs-4.2.0"
+ sources."graceful-fs-4.2.1"
sources."gulplog-1.0.0"
sources."has-value-1.0.0"
(sources."has-values-1.0.0" // {
@@ -53238,7 +53640,7 @@ in
];
})
sources."homedir-polyfill-1.0.3"
- sources."hosted-git-info-2.7.1"
+ sources."hosted-git-info-2.8.2"
sources."inherits-2.0.4"
sources."ini-1.3.5"
sources."interpret-1.2.0"
@@ -53282,6 +53684,7 @@ in
sources."lcid-1.0.0"
sources."liftoff-3.1.0"
sources."load-json-file-1.1.0"
+ sources."lru-cache-5.1.1"
(sources."make-iterator-1.0.1" // {
dependencies = [
sources."kind-of-6.0.2"
@@ -53426,7 +53829,7 @@ in
})
sources."to-regex-3.0.2"
sources."to-regex-range-2.1.1"
- sources."type-1.0.1"
+ sources."type-1.0.3"
sources."typedarray-0.0.6"
sources."unc-path-regex-0.1.2"
sources."union-value-1.0.1"
@@ -53449,6 +53852,7 @@ in
sources."which-module-1.0.0"
sources."wrap-ansi-2.1.0"
sources."y18n-3.2.1"
+ sources."yallist-3.0.3"
sources."yargs-7.1.0"
sources."yargs-parser-5.0.0"
];
@@ -53523,9 +53927,10 @@ in
sources."dashdash-1.14.1"
sources."date-now-0.1.4"
sources."delayed-stream-1.0.0"
- (sources."dom-serializer-0.1.1" // {
+ (sources."dom-serializer-0.2.1" // {
dependencies = [
- sources."entities-1.1.2"
+ sources."domelementtype-2.0.1"
+ sources."entities-2.0.0"
];
})
sources."domelementtype-1.3.1"
@@ -53790,7 +54195,7 @@ in
sha512 = "RJ8nHsE4diosqkSpKot3unMn05ExCisUDy/URw/3M9t8MetvthBBQpcfaRPGftXRGebaMF1HnH6dLG994TpNVQ==";
};
dependencies = [
- sources."async-limiter-1.0.0"
+ sources."async-limiter-1.0.1"
sources."chrome-remote-interface-0.26.1"
sources."commander-2.11.0"
sources."node-fetch-2.6.0"
@@ -53835,7 +54240,7 @@ in
sources."ansi-styles-3.2.1"
sources."ast-types-0.13.2"
sources."astral-regex-1.0.0"
- sources."async-limiter-1.0.0"
+ sources."async-limiter-1.0.1"
sources."asynckit-0.4.0"
sources."balanced-match-1.0.0"
sources."brace-expansion-1.1.11"
@@ -53902,7 +54307,7 @@ in
sources."get-stream-4.1.0"
sources."get-uri-2.0.3"
sources."glob-7.1.4"
- sources."graceful-fs-4.2.0"
+ sources."graceful-fs-4.2.1"
sources."has-flag-3.0.0"
sources."http-errors-1.7.3"
(sources."http-proxy-agent-2.1.0" // {
@@ -54257,7 +54662,7 @@ in
sources."abab-2.0.0"
sources."abbrev-1.1.1"
sources."acorn-5.7.3"
- (sources."acorn-globals-4.3.2" // {
+ (sources."acorn-globals-4.3.3" // {
dependencies = [
sources."acorn-6.2.1"
];
@@ -54284,7 +54689,7 @@ in
sources."asap-2.0.6"
sources."asn1-0.2.4"
sources."assert-plus-1.0.0"
- sources."async-limiter-1.0.0"
+ sources."async-limiter-1.0.1"
sources."async-mutex-0.1.3"
sources."asynckit-0.4.0"
sources."atob-2.1.2"
@@ -54392,7 +54797,7 @@ in
sources."getpass-0.1.7"
sources."github-from-package-0.0.0"
sources."glob-7.1.4"
- sources."graceful-fs-4.2.0"
+ sources."graceful-fs-4.2.1"
sources."har-schema-2.0.0"
sources."har-validator-5.1.3"
sources."has-ansi-2.0.0"
@@ -54666,7 +55071,7 @@ in
sources."q-0.9.7"
];
})
- sources."terminal-kit-1.29.2"
+ sources."terminal-kit-1.29.3"
(sources."tkwidgets-0.5.26" // {
dependencies = [
sources."is-fullwidth-code-point-2.0.0"
@@ -54822,7 +55227,7 @@ in
sources."catharsis-0.8.11"
sources."entities-1.1.2"
sources."escape-string-regexp-2.0.0"
- sources."graceful-fs-4.2.0"
+ sources."graceful-fs-4.2.1"
sources."js2xmlparser-4.0.0"
sources."klaw-3.0.0"
sources."linkify-it-2.2.0"
@@ -54866,9 +55271,10 @@ in
sources."console-browserify-1.1.0"
sources."core-util-is-1.0.2"
sources."date-now-0.1.4"
- (sources."dom-serializer-0.1.1" // {
+ (sources."dom-serializer-0.2.1" // {
dependencies = [
- sources."entities-1.1.2"
+ sources."domelementtype-2.0.1"
+ sources."entities-2.0.0"
];
})
sources."domelementtype-1.3.1"
@@ -55101,7 +55507,7 @@ in
sources."get-stream-4.1.0"
];
})
- sources."graceful-fs-4.2.0"
+ sources."graceful-fs-4.2.1"
sources."har-schema-2.0.0"
sources."har-validator-5.1.3"
sources."has-flag-3.0.0"
@@ -55320,7 +55726,7 @@ in
sources."anymatch-3.0.3"
sources."arraybuffer.slice-0.0.7"
sources."async-2.6.3"
- sources."async-limiter-1.0.0"
+ sources."async-limiter-1.0.1"
sources."backo2-1.0.2"
sources."balanced-match-1.0.0"
sources."base64-arraybuffer-0.1.5"
@@ -55384,7 +55790,7 @@ in
sources."fsevents-2.0.7"
sources."glob-7.1.4"
sources."glob-parent-5.0.0"
- sources."graceful-fs-4.2.0"
+ sources."graceful-fs-4.2.1"
sources."has-binary2-1.0.3"
sources."has-cors-1.1.0"
sources."http-errors-1.7.2"
@@ -55525,7 +55931,7 @@ in
sources."glob-7.1.4"
sources."glob-parent-3.1.0"
sources."glob-stream-6.1.0"
- sources."graceful-fs-4.2.0"
+ sources."graceful-fs-4.2.1"
sources."has-symbols-1.0.0"
sources."inflight-1.0.6"
sources."inherits-2.0.4"
@@ -56272,7 +56678,7 @@ in
sources."pify-4.0.1"
];
})
- sources."graceful-fs-4.2.0"
+ sources."graceful-fs-4.2.1"
(sources."handlebars-4.1.2" // {
dependencies = [
sources."source-map-0.6.1"
@@ -56290,7 +56696,7 @@ in
sources."kind-of-4.0.0"
];
})
- sources."hosted-git-info-2.7.1"
+ sources."hosted-git-info-2.8.2"
sources."http-cache-semantics-3.8.1"
sources."http-proxy-agent-2.1.0"
sources."http-signature-1.2.0"
@@ -56832,7 +57238,7 @@ in
sources."forever-agent-0.6.1"
sources."form-data-2.3.3"
sources."getpass-0.1.7"
- sources."graceful-fs-4.2.0"
+ sources."graceful-fs-4.2.1"
sources."har-schema-2.0.0"
sources."har-validator-5.1.3"
sources."http-signature-1.2.0"
@@ -57026,7 +57432,7 @@ in
sources."is-glob-3.1.0"
];
})
- sources."graceful-fs-4.2.0"
+ sources."graceful-fs-4.2.1"
sources."has-value-1.0.0"
(sources."has-values-1.0.0" // {
dependencies = [
@@ -57250,7 +57656,7 @@ in
sources."assert-plus-1.0.0"
sources."assign-symbols-1.0.0"
sources."async-each-1.0.3"
- sources."async-limiter-1.0.0"
+ sources."async-limiter-1.0.1"
sources."asynckit-0.4.0"
sources."atob-2.1.2"
sources."aws-sign2-0.7.0"
@@ -57368,7 +57774,7 @@ in
sources."github-slugger-1.2.1"
sources."glob-base-0.3.0"
sources."glob-parent-2.0.0"
- sources."graceful-fs-4.2.0"
+ sources."graceful-fs-4.2.1"
sources."har-schema-2.0.0"
sources."har-validator-5.1.3"
(sources."has-binary2-1.0.3" // {
@@ -57997,7 +58403,7 @@ in
sources."isobject-3.0.1"
];
})
- sources."base64-js-1.3.0"
+ sources."base64-js-1.3.1"
sources."big.js-5.2.2"
sources."binary-extensions-1.13.1"
sources."bl-1.2.2"
@@ -58035,7 +58441,7 @@ in
})
sources."call-me-maybe-1.0.1"
sources."camelcase-5.3.1"
- sources."caniuse-lite-1.0.30000988"
+ sources."caniuse-lite-1.0.30000989"
sources."caw-2.0.1"
(sources."chalk-2.4.2" // {
dependencies = [
@@ -58194,7 +58600,7 @@ in
})
sources."duplexer3-0.1.4"
sources."duplexify-3.7.1"
- sources."electron-to-chromium-1.3.210"
+ sources."electron-to-chromium-1.3.215"
sources."elliptic-6.5.0"
sources."emoji-regex-7.0.3"
sources."emojis-list-2.1.0"
@@ -58389,7 +58795,7 @@ in
sources."p-cancelable-1.1.0"
];
})
- sources."graceful-fs-4.2.0"
+ sources."graceful-fs-4.2.1"
sources."graceful-readlink-1.0.1"
sources."has-ansi-2.0.0"
sources."has-flag-3.0.0"
@@ -58415,7 +58821,7 @@ in
sources."hash.js-1.1.7"
sources."hmac-drbg-1.0.1"
sources."homedir-polyfill-1.0.3"
- sources."hosted-git-info-2.7.1"
+ sources."hosted-git-info-2.8.2"
sources."http-cache-semantics-3.8.1"
sources."https-browserify-1.0.0"
sources."ieee754-1.1.13"
@@ -58907,7 +59313,7 @@ in
sources."supports-color-2.0.0"
sources."tapable-1.1.3"
sources."tar-stream-1.6.2"
- (sources."terser-4.1.2" // {
+ (sources."terser-4.1.3" // {
dependencies = [
sources."commander-2.20.0"
sources."source-map-0.6.1"
@@ -58982,7 +59388,7 @@ in
sources."vm-browserify-1.1.0"
sources."watchpack-1.6.0"
sources."wcwidth-1.0.1"
- (sources."webpack-4.39.0" // {
+ (sources."webpack-4.39.1" // {
dependencies = [
sources."arr-diff-4.0.0"
sources."array-unique-0.3.2"
@@ -59034,7 +59440,7 @@ in
sources."source-map-0.4.4"
];
})
- (sources."webpack-sources-1.4.1" // {
+ (sources."webpack-sources-1.4.3" // {
dependencies = [
sources."source-list-map-2.0.1"
sources."source-map-0.6.1"
@@ -59480,7 +59886,7 @@ in
sources."fragment-cache-0.2.1"
(sources."fs-mkdirp-stream-1.0.0" // {
dependencies = [
- sources."graceful-fs-4.2.0"
+ sources."graceful-fs-4.2.1"
sources."readable-stream-2.3.6"
sources."string_decoder-1.1.1"
sources."through2-2.0.5"
@@ -59535,7 +59941,7 @@ in
})
(sources."gulp-sourcemaps-2.6.4" // {
dependencies = [
- sources."graceful-fs-4.2.0"
+ sources."graceful-fs-4.2.1"
sources."readable-stream-2.3.6"
sources."source-map-0.6.1"
sources."string_decoder-1.1.1"
@@ -59552,7 +59958,7 @@ in
sources."extend-shallow-1.1.4"
sources."glob-7.1.4"
sources."glob-stream-6.1.0"
- sources."graceful-fs-4.2.0"
+ sources."graceful-fs-4.2.1"
sources."kind-of-1.1.0"
sources."minimatch-3.0.4"
sources."ordered-read-streams-1.0.1"
@@ -59654,7 +60060,7 @@ in
sources."lead-1.0.0"
(sources."less-2.7.3" // {
dependencies = [
- sources."graceful-fs-4.2.0"
+ sources."graceful-fs-4.2.1"
];
})
sources."liftoff-2.5.0"
@@ -59897,7 +60303,7 @@ in
sources."tough-cookie-2.3.4"
sources."tunnel-agent-0.6.0"
sources."tweetnacl-0.14.5"
- sources."type-1.0.1"
+ sources."type-1.0.3"
sources."typescript-3.5.3"
(sources."uglify-js-3.4.9" // {
dependencies = [
@@ -59940,7 +60346,7 @@ in
dependencies = [
sources."clone-2.1.2"
sources."clone-stats-1.0.0"
- sources."graceful-fs-4.2.0"
+ sources."graceful-fs-4.2.1"
sources."vinyl-2.2.0"
];
})
@@ -60268,7 +60674,7 @@ in
sources."gauge-2.7.4"
sources."getpass-0.1.7"
sources."glob-7.1.4"
- sources."graceful-fs-4.2.0"
+ sources."graceful-fs-4.2.1"
sources."har-schema-2.0.0"
sources."har-validator-5.1.3"
sources."has-unicode-2.0.1"
@@ -60451,14 +60857,14 @@ in
];
})
sources."glob-5.0.15"
- sources."graceful-fs-4.2.0"
+ sources."graceful-fs-4.2.1"
sources."har-schema-1.0.5"
sources."har-validator-4.2.1"
sources."has-unicode-2.0.1"
sources."hawk-3.1.3"
sources."headless-0.1.7"
sources."hoek-2.16.3"
- sources."hosted-git-info-2.7.1"
+ sources."hosted-git-info-2.8.2"
sources."http-errors-1.7.2"
sources."http-signature-1.1.1"
sources."iconv-lite-0.4.24"
@@ -60490,6 +60896,7 @@ in
sources."load-json-file-1.1.0"
sources."lodash-2.4.2"
sources."loud-rejection-1.6.0"
+ sources."lru-cache-5.1.1"
sources."map-obj-1.0.1"
sources."media-typer-0.3.0"
sources."meow-3.7.0"
@@ -60647,6 +61054,7 @@ in
sources."xmldom-0.1.27"
sources."xtend-4.0.2"
sources."y18n-3.2.1"
+ sources."yallist-3.0.3"
sources."yargs-3.32.0"
];
buildInputs = globalBuildInputs;
@@ -60793,7 +61201,7 @@ in
sources."asn1-0.2.4"
sources."assert-plus-1.0.0"
sources."async-0.1.22"
- sources."async-limiter-1.0.0"
+ sources."async-limiter-1.0.1"
sources."asynckit-0.4.0"
sources."aws-sign2-0.7.0"
sources."aws4-1.8.0"
@@ -60934,7 +61342,7 @@ in
sources."string_decoder-1.1.1"
];
})
- sources."graceful-fs-4.2.0"
+ sources."graceful-fs-4.2.1"
sources."har-schema-2.0.0"
sources."har-validator-5.1.3"
sources."has-unicode-2.0.1"
@@ -61188,7 +61596,7 @@ in
sources."tunnel-agent-0.6.0"
sources."tweetnacl-0.14.5"
sources."twitter-ng-0.6.2"
- sources."type-1.0.1"
+ sources."type-1.0.3"
sources."type-is-1.6.18"
sources."typedarray-0.0.6"
sources."uc.micro-1.0.6"
@@ -61257,7 +61665,7 @@ in
sources."aws-sign2-0.7.0"
sources."aws4-1.8.0"
sources."balanced-match-1.0.0"
- sources."base64-js-1.3.0"
+ sources."base64-js-1.3.1"
sources."bcrypt-pbkdf-1.0.2"
sources."brace-expansion-1.1.11"
sources."buffer-from-1.1.1"
@@ -61299,11 +61707,11 @@ in
sources."gauge-2.7.4"
sources."getpass-0.1.7"
sources."glob-7.1.4"
- sources."graceful-fs-4.2.0"
+ sources."graceful-fs-4.2.1"
sources."har-schema-2.0.0"
sources."har-validator-5.1.3"
sources."has-unicode-2.0.1"
- sources."hosted-git-info-2.7.1"
+ sources."hosted-git-info-2.8.2"
sources."http-signature-1.2.0"
sources."inflight-1.0.6"
sources."inherits-2.0.4"
@@ -61318,6 +61726,7 @@ in
sources."json-stringify-safe-5.0.1"
sources."jsonfile-1.0.1"
sources."jsprim-1.4.1"
+ sources."lru-cache-5.1.1"
sources."mime-db-1.40.0"
sources."mime-types-2.1.24"
sources."minimatch-3.0.4"
@@ -61559,7 +61968,7 @@ in
})
sources."global-dirs-0.1.1"
sources."got-6.7.1"
- sources."graceful-fs-4.2.0"
+ sources."graceful-fs-4.2.1"
sources."has-flag-3.0.0"
sources."has-value-1.0.0"
(sources."has-values-1.0.0" // {
@@ -61891,11 +62300,11 @@ in
sources."glob-7.1.4"
sources."global-dirs-0.1.1"
sources."got-9.6.0"
- sources."graceful-fs-4.2.0"
+ sources."graceful-fs-4.2.1"
sources."has-ansi-2.0.0"
sources."has-flag-3.0.0"
sources."has-yarn-2.1.0"
- sources."hosted-git-info-2.7.1"
+ sources."hosted-git-info-2.8.2"
sources."http-cache-semantics-3.8.1"
sources."http-proxy-agent-2.1.0"
sources."https-proxy-agent-2.2.2"
@@ -62015,7 +62424,7 @@ in
sources."progress-2.0.3"
sources."promise-inflight-1.0.1"
sources."promise-retry-1.1.1"
- sources."prompts-2.1.0"
+ sources."prompts-2.2.1"
sources."protoduck-5.0.1"
sources."pseudomap-1.0.2"
sources."pump-3.0.0"
@@ -62065,7 +62474,7 @@ in
sources."shebang-command-1.2.0"
sources."shebang-regex-1.0.0"
sources."signal-exit-3.0.2"
- sources."sisteransi-1.0.2"
+ sources."sisteransi-1.0.3"
sources."smart-buffer-4.0.2"
sources."socks-2.3.2"
(sources."socks-proxy-agent-4.0.2" // {
@@ -62505,7 +62914,7 @@ in
sources."abab-2.0.0"
sources."abbrev-1.1.1"
sources."acorn-5.7.3"
- (sources."acorn-globals-4.3.2" // {
+ (sources."acorn-globals-4.3.3" // {
dependencies = [
sources."acorn-6.2.1"
];
@@ -62538,7 +62947,7 @@ in
sources."assert-plus-1.0.0"
sources."assign-symbols-1.0.0"
sources."async-each-1.0.3"
- sources."async-limiter-1.0.0"
+ sources."async-limiter-1.0.1"
sources."asynckit-0.4.0"
sources."atob-2.1.2"
sources."aws-sign2-0.7.0"
@@ -62561,7 +62970,7 @@ in
sources."define-property-1.0.0"
];
})
- sources."base64-js-1.3.0"
+ sources."base64-js-1.3.1"
sources."bcrypt-pbkdf-1.0.2"
sources."binary-extensions-1.13.1"
sources."bindings-1.2.1"
@@ -62598,7 +63007,7 @@ in
sources."caller-path-2.0.0"
sources."callsites-2.0.0"
sources."caniuse-api-3.0.0"
- sources."caniuse-lite-1.0.30000988"
+ sources."caniuse-lite-1.0.30000989"
sources."caseless-0.12.0"
sources."chalk-2.4.2"
sources."chokidar-2.1.6"
@@ -62718,7 +63127,12 @@ in
sources."des.js-1.0.0"
sources."destroy-1.0.4"
sources."diffie-hellman-5.0.3"
- sources."dom-serializer-0.1.1"
+ (sources."dom-serializer-0.2.1" // {
+ dependencies = [
+ sources."domelementtype-2.0.1"
+ sources."entities-2.0.0"
+ ];
+ })
sources."domain-browser-1.2.0"
sources."domelementtype-1.3.1"
sources."domexception-1.0.1"
@@ -62731,7 +63145,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.210"
+ sources."electron-to-chromium-1.3.215"
sources."elliptic-6.5.0"
sources."encodeurl-1.0.2"
sources."entities-1.1.2"
@@ -62789,7 +63203,7 @@ in
})
sources."glob-to-regexp-0.3.0"
sources."globals-11.12.0"
- sources."graceful-fs-4.2.0"
+ sources."graceful-fs-4.2.1"
sources."grapheme-breaker-0.3.2"
sources."har-schema-2.0.0"
sources."har-validator-5.1.3"
@@ -62818,7 +63232,7 @@ in
sources."html-tags-1.2.0"
(sources."htmlnano-0.2.4" // {
dependencies = [
- sources."terser-4.1.2"
+ sources."terser-4.1.3"
];
})
(sources."htmlparser2-3.10.1" // {
@@ -63292,7 +63706,7 @@ in
sources."util-deprecate-1.0.2"
sources."util.promisify-1.0.0"
sources."uuid-3.3.2"
- sources."v8-compile-cache-2.0.3"
+ sources."v8-compile-cache-2.1.0"
sources."vendors-1.0.3"
sources."verror-1.10.0"
sources."vlq-0.2.3"
@@ -63417,11 +63831,11 @@ in
sources."get-browser-rtc-1.0.2"
sources."get-stdin-4.0.1"
sources."glob-7.1.4"
- sources."graceful-fs-4.2.0"
+ sources."graceful-fs-4.2.1"
sources."has-ansi-2.0.0"
sources."has-flag-3.0.0"
sources."hat-0.0.3"
- sources."hosted-git-info-2.7.1"
+ sources."hosted-git-info-2.8.2"
sources."http-headers-3.0.2"
sources."iconv-lite-0.4.24"
sources."immediate-chunk-store-1.0.8"
@@ -63463,6 +63877,7 @@ in
sources."lodash-3.10.1"
sources."loud-rejection-1.6.0"
sources."lru-2.0.1"
+ sources."lru-cache-5.1.1"
sources."magnet-uri-5.2.4"
sources."map-obj-1.0.1"
sources."meow-3.7.0"
@@ -63612,6 +64027,7 @@ in
sources."xmlbuilder-4.0.0"
sources."xmldom-0.1.27"
sources."xtend-4.0.2"
+ sources."yallist-3.0.3"
];
buildInputs = globalBuildInputs;
meta = {
@@ -63635,7 +64051,7 @@ in
sources."addr-to-ip-port-1.5.1"
sources."after-0.8.2"
sources."ajv-6.10.2"
- sources."archiver-3.0.3"
+ sources."archiver-3.1.1"
(sources."archiver-utils-2.1.0" // {
dependencies = [
sources."readable-stream-2.3.6"
@@ -63651,7 +64067,7 @@ in
sources."backo2-1.0.2"
sources."balanced-match-1.0.0"
sources."base64-arraybuffer-0.1.5"
- sources."base64-js-1.3.0"
+ sources."base64-js-1.3.1"
sources."base64-url-1.2.1"
sources."base64id-1.0.0"
sources."basic-auth-1.0.4"
@@ -63697,7 +64113,7 @@ in
sources."component-bind-1.0.0"
sources."component-emitter-1.2.1"
sources."component-inherit-0.0.3"
- (sources."compress-commons-2.0.0" // {
+ (sources."compress-commons-2.1.1" // {
dependencies = [
sources."readable-stream-2.3.6"
];
@@ -63729,11 +64145,7 @@ in
sources."cookie-signature-1.0.6"
sources."core-util-is-1.0.2"
sources."crc-3.8.0"
- (sources."crc32-stream-2.0.0" // {
- dependencies = [
- sources."readable-stream-2.3.6"
- ];
- })
+ sources."crc32-stream-3.0.1"
(sources."csrf-3.0.6" // {
dependencies = [
sources."uid-safe-2.1.4"
@@ -63811,7 +64223,7 @@ in
sources."get-browser-rtc-1.0.2"
sources."getpass-0.1.7"
sources."glob-7.1.4"
- sources."graceful-fs-4.2.0"
+ sources."graceful-fs-4.2.1"
sources."har-schema-2.0.0"
sources."har-validator-5.1.3"
(sources."has-binary-0.1.7" // {
@@ -64076,7 +64488,7 @@ in
sources."xmlhttprequest-ssl-1.5.3"
sources."xtend-4.0.2"
sources."yeast-0.1.2"
- sources."zip-stream-2.1.0"
+ sources."zip-stream-2.1.2"
];
buildInputs = globalBuildInputs;
meta = {
@@ -64090,10 +64502,10 @@ in
pnpm = nodeEnv.buildNodePackage {
name = "pnpm";
packageName = "pnpm";
- version = "3.6.2";
+ version = "3.6.3";
src = fetchurl {
- url = "https://registry.npmjs.org/pnpm/-/pnpm-3.6.2.tgz";
- sha512 = "/UW87zxOU3p60deTeo94GX/ZR6ph1tGDDZmCnIFvo2gMsAaWAM/nePuAdT/RZ3cbSJfG3+/HXxsYOxetAjC/Sg==";
+ url = "https://registry.npmjs.org/pnpm/-/pnpm-3.6.3.tgz";
+ sha512 = "Hxk8VouMZRh870u0hJHCcumylGO8VV6Id+Fm7S+MyZVGGgtaZlEFFV2HIndVd9nXTksS+RuhINX6jGIVmqTmDg==";
};
buildInputs = globalBuildInputs;
meta = {
@@ -64147,7 +64559,7 @@ in
})
sources."async-1.5.2"
sources."balanced-match-1.0.0"
- sources."base64-js-1.3.0"
+ sources."base64-js-1.3.1"
sources."bn.js-4.11.8"
sources."brace-expansion-1.1.11"
sources."brorand-1.1.0"
@@ -64221,7 +64633,7 @@ in
sources."get-assigned-identifiers-1.2.0"
sources."glob-7.1.4"
sources."globule-1.2.1"
- sources."graceful-fs-4.2.0"
+ sources."graceful-fs-4.2.1"
sources."has-1.0.3"
sources."hash-base-3.0.4"
sources."hash.js-1.1.7"
@@ -64453,7 +64865,7 @@ in
sources."esprima-3.1.3"
sources."esprima-fb-13001.1001.0-dev-harmony-fb"
sources."glob-5.0.15"
- sources."graceful-fs-4.2.0"
+ sources."graceful-fs-4.2.1"
sources."iconv-lite-0.4.24"
sources."inflight-1.0.6"
sources."inherits-2.0.4"
@@ -65083,7 +65495,7 @@ in
sources."for-in-1.0.2"
sources."fragment-cache-0.2.1"
sources."get-value-2.0.6"
- sources."graceful-fs-4.2.0"
+ sources."graceful-fs-4.2.1"
sources."graceful-readlink-1.0.1"
sources."has-value-1.0.0"
(sources."has-values-1.0.0" // {
@@ -65376,14 +65788,14 @@ in
snyk = nodeEnv.buildNodePackage {
name = "snyk";
packageName = "snyk";
- version = "1.208.0";
+ version = "1.210.0";
src = fetchurl {
- url = "https://registry.npmjs.org/snyk/-/snyk-1.208.0.tgz";
- sha512 = "MMOQazfz+5fvoCDEBBJiuYNdcrtE3anemGvL7VJFlWu4uc8YgVZ8gvetEO7OmLmn4FfTmJ/hAthEQgcXYjDjFw==";
+ url = "https://registry.npmjs.org/snyk/-/snyk-1.210.0.tgz";
+ sha512 = "k6/EIX1Dc4Qk8omcKQDm13RRywkKqXoQ0IMz5Nyk1y8sdmg1S78QSWnfTaEPe+OQE1olrtjInrDX3Yu20CnMzg==";
};
dependencies = [
sources."@snyk/composer-lockfile-parser-1.0.3"
- sources."@snyk/dep-graph-1.10.0"
+ sources."@snyk/dep-graph-1.12.0"
sources."@snyk/gemfile-1.2.0"
sources."@types/agent-base-4.2.0"
sources."@types/debug-4.1.4"
@@ -65495,10 +65907,15 @@ in
sources."get-stream-3.0.0"
];
})
- sources."graceful-fs-4.2.0"
+ sources."graceful-fs-4.2.1"
sources."graphlib-2.1.7"
sources."has-flag-3.0.0"
- sources."hosted-git-info-2.7.1"
+ (sources."hosted-git-info-2.8.2" // {
+ dependencies = [
+ sources."lru-cache-5.1.1"
+ sources."yallist-3.0.3"
+ ];
+ })
sources."http-errors-1.7.3"
(sources."http-proxy-agent-2.1.0" // {
dependencies = [
@@ -65652,7 +66069,7 @@ in
sources."shebang-regex-1.0.0"
sources."signal-exit-3.0.2"
sources."smart-buffer-4.0.2"
- sources."snyk-config-2.2.2"
+ sources."snyk-config-2.2.3"
(sources."snyk-docker-plugin-1.25.1" // {
dependencies = [
sources."debug-4.1.1"
@@ -65670,13 +66087,13 @@ in
];
})
sources."snyk-module-1.9.1"
- (sources."snyk-mvn-plugin-2.3.1" // {
+ (sources."snyk-mvn-plugin-2.3.3" // {
dependencies = [
sources."tslib-1.9.3"
];
})
sources."snyk-nodejs-lockfile-parser-1.16.0"
- sources."snyk-nuget-plugin-1.11.2"
+ sources."snyk-nuget-plugin-1.11.3"
sources."snyk-paket-parser-1.5.0"
(sources."snyk-php-plugin-1.6.4" // {
dependencies = [
@@ -65801,7 +66218,7 @@ in
sources."accepts-1.3.7"
sources."after-0.8.2"
sources."arraybuffer.slice-0.0.7"
- sources."async-limiter-1.0.0"
+ sources."async-limiter-1.0.1"
sources."backo2-1.0.2"
sources."base64-arraybuffer-0.1.5"
sources."base64id-1.0.0"
@@ -65894,7 +66311,12 @@ in
sources."color-name-1.1.3"
sources."configstore-3.1.2"
sources."create-error-class-3.0.2"
- sources."cross-spawn-5.1.0"
+ (sources."cross-spawn-5.1.0" // {
+ dependencies = [
+ sources."lru-cache-4.1.5"
+ sources."yallist-2.1.2"
+ ];
+ })
sources."crypto-random-string-1.0.0"
sources."currently-unhandled-0.4.1"
sources."debug-3.1.0"
@@ -65918,9 +66340,9 @@ in
sources."get-stream-3.0.0"
sources."global-dirs-0.1.1"
sources."got-6.7.1"
- sources."graceful-fs-4.2.0"
+ sources."graceful-fs-4.2.1"
sources."has-flag-3.0.0"
- sources."hosted-git-info-2.7.1"
+ sources."hosted-git-info-2.8.2"
sources."http-proxy-agent-2.1.0"
sources."https-proxy-agent-2.2.2"
sources."import-lazy-2.1.0"
@@ -65947,7 +66369,7 @@ in
sources."log-update-2.3.0"
sources."loud-rejection-1.6.0"
sources."lowercase-keys-1.0.1"
- sources."lru-cache-4.1.5"
+ sources."lru-cache-5.1.1"
sources."make-dir-1.3.0"
sources."map-obj-2.0.0"
sources."meow-5.0.0"
@@ -66023,7 +66445,7 @@ in
sources."xdg-basedir-3.0.0"
sources."xml2js-0.4.19"
sources."xmlbuilder-9.0.7"
- sources."yallist-2.1.2"
+ sources."yallist-3.0.3"
sources."yargs-parser-10.1.0"
];
buildInputs = globalBuildInputs;
@@ -66076,7 +66498,7 @@ in
sources."base64-url-2.3.2"
sources."bash-color-0.0.4"
sources."binary-extensions-1.13.1"
- sources."binary-search-1.3.5"
+ sources."binary-search-1.3.6"
(sources."bl-0.8.2" // {
dependencies = [
sources."isarray-0.0.1"
@@ -66228,7 +66650,7 @@ in
sources."glob-parent-2.0.0"
sources."globby-4.1.0"
sources."gossip-query-2.0.2"
- sources."graceful-fs-4.2.0"
+ sources."graceful-fs-4.2.1"
sources."has-1.0.3"
sources."has-ansi-2.0.0"
sources."has-network-0.0.1"
@@ -66344,11 +66766,7 @@ in
sources."string_decoder-0.10.31"
];
})
- (sources."leveldown-5.1.1" // {
- dependencies = [
- sources."node-gyp-build-4.1.0"
- ];
- })
+ sources."leveldown-5.1.1"
sources."levelup-4.1.0"
sources."libnested-1.4.1"
sources."libsodium-0.7.5"
@@ -66392,7 +66810,7 @@ in
sources."muxrpc-6.4.2"
sources."muxrpc-usage-2.1.0"
sources."muxrpc-validation-3.0.2"
- sources."muxrpcli-3.1.1"
+ sources."muxrpcli-3.1.2"
(sources."mv-2.1.1" // {
dependencies = [
sources."rimraf-2.4.5"
@@ -66410,7 +66828,7 @@ in
sources."ncp-2.0.0"
sources."nearley-2.18.0"
sources."nice-try-1.0.5"
- sources."node-gyp-build-3.9.0"
+ sources."node-gyp-build-4.1.0"
sources."non-private-ip-1.4.4"
sources."normalize-path-2.1.1"
sources."normalize-uri-1.1.2"
@@ -66620,7 +67038,7 @@ in
sources."safe-buffer-5.1.2"
sources."safe-regex-1.1.0"
sources."secret-handshake-1.1.20"
- sources."secret-stack-6.2.1"
+ sources."secret-stack-6.3.0"
sources."semver-5.7.0"
sources."separator-escape-0.0.0"
(sources."set-value-2.0.1" // {
@@ -66669,7 +67087,7 @@ in
];
})
sources."sodium-chloride-1.1.2"
- sources."sodium-native-2.4.3"
+ sources."sodium-native-2.4.5"
sources."source-map-0.5.7"
sources."source-map-resolve-0.5.2"
sources."source-map-url-0.4.0"
@@ -66899,9 +67317,9 @@ in
sources."asn1-0.2.4"
sources."assert-plus-0.2.0"
sources."async-1.5.2"
- sources."async-limiter-1.0.0"
+ sources."async-limiter-1.0.1"
sources."asynckit-0.4.0"
- sources."aws-sdk-2.503.0"
+ sources."aws-sdk-2.504.0"
sources."aws-sign2-0.6.0"
sources."aws4-1.8.0"
sources."babel-runtime-6.26.0"
@@ -66916,7 +67334,7 @@ in
})
sources."balanced-match-1.0.0"
sources."base64-arraybuffer-0.1.5"
- sources."base64-js-1.3.0"
+ sources."base64-js-1.3.1"
sources."base64id-1.0.0"
sources."base64url-3.0.1"
sources."basic-auth-1.1.0"
@@ -67097,7 +67515,7 @@ in
sources."ms-2.1.2"
];
})
- sources."graceful-fs-4.2.0"
+ sources."graceful-fs-4.2.1"
sources."graphlib-2.1.7"
sources."har-schema-2.0.0"
sources."har-validator-2.0.6"
@@ -67117,7 +67535,12 @@ in
];
})
sources."hoek-2.16.3"
- sources."hosted-git-info-2.7.1"
+ (sources."hosted-git-info-2.8.2" // {
+ dependencies = [
+ sources."lru-cache-5.1.1"
+ sources."yallist-3.0.3"
+ ];
+ })
(sources."http-errors-1.7.2" // {
dependencies = [
sources."inherits-2.0.3"
@@ -67681,10 +68104,14 @@ in
];
})
sources."define-properties-1.1.3"
- sources."dom-serializer-0.1.1"
+ (sources."dom-serializer-0.2.1" // {
+ dependencies = [
+ sources."domelementtype-2.0.1"
+ ];
+ })
sources."domelementtype-1.3.1"
sources."domutils-1.7.0"
- sources."entities-1.1.2"
+ sources."entities-2.0.0"
sources."es-abstract-1.13.0"
sources."es-to-primitive-1.2.0"
sources."escape-string-regexp-1.0.5"
@@ -67926,7 +68353,7 @@ in
})
sources."global-dirs-0.1.1"
sources."got-6.7.1"
- sources."graceful-fs-4.2.0"
+ sources."graceful-fs-4.2.1"
(sources."graphlib-2.1.7" // {
dependencies = [
sources."lodash-4.17.15"
@@ -68366,7 +68793,7 @@ in
sources."argparse-1.0.10"
sources."asn1-0.2.4"
sources."assert-plus-1.0.0"
- sources."async-limiter-1.0.0"
+ sources."async-limiter-1.0.1"
sources."asynckit-0.4.0"
sources."aws-sign2-0.7.0"
sources."aws4-1.8.0"
@@ -68494,7 +68921,7 @@ in
sources."errno-0.1.7"
sources."fs.realpath-1.0.0"
sources."glob-7.1.4"
- sources."graceful-fs-4.2.0"
+ sources."graceful-fs-4.2.1"
sources."inflight-1.0.6"
sources."inherits-2.0.4"
sources."isarray-1.0.0"
@@ -68592,11 +69019,11 @@ in
sources."function-bind-1.1.1"
sources."get-stdin-5.0.1"
sources."glob-7.1.4"
- sources."graceful-fs-4.2.0"
+ sources."graceful-fs-4.2.1"
sources."has-1.0.3"
sources."has-ansi-2.0.0"
sources."has-symbols-1.0.0"
- sources."hosted-git-info-2.7.1"
+ sources."hosted-git-info-2.8.2"
sources."inflight-1.0.6"
sources."inherits-2.0.4"
sources."is-alphabetical-1.0.3"
@@ -68630,6 +69057,7 @@ in
sources."locate-path-2.0.0"
sources."lodash-4.17.15"
sources."log-symbols-1.0.2"
+ sources."lru-cache-5.1.1"
sources."map-like-2.0.0"
sources."markdown-escapes-1.0.3"
sources."md5-2.2.1"
@@ -68730,6 +69158,7 @@ in
sources."x-is-string-0.1.0"
sources."xml-escape-1.1.0"
sources."xtend-4.0.2"
+ sources."yallist-3.0.3"
];
buildInputs = globalBuildInputs;
meta = {
@@ -68837,7 +69266,12 @@ in
sources."configstore-3.1.2"
sources."core-util-is-1.0.2"
sources."create-error-class-3.0.2"
- sources."cross-spawn-5.1.0"
+ (sources."cross-spawn-5.1.0" // {
+ dependencies = [
+ sources."lru-cache-4.1.5"
+ sources."yallist-2.1.2"
+ ];
+ })
sources."crypto-random-string-1.0.0"
sources."currently-unhandled-0.4.1"
sources."cuss-1.16.0"
@@ -68867,9 +69301,9 @@ in
sources."glob-7.1.4"
sources."global-dirs-0.1.1"
sources."got-6.7.1"
- sources."graceful-fs-4.2.0"
+ sources."graceful-fs-4.2.1"
sources."has-flag-3.0.0"
- sources."hosted-git-info-2.7.1"
+ sources."hosted-git-info-2.8.2"
sources."ignore-3.3.10"
sources."import-lazy-2.1.0"
sources."imurmurhash-0.1.4"
@@ -68911,7 +69345,7 @@ in
sources."lodash.intersection-4.4.0"
sources."loud-rejection-1.6.0"
sources."lowercase-keys-1.0.1"
- sources."lru-cache-4.1.5"
+ sources."lru-cache-5.1.1"
(sources."make-dir-1.3.0" // {
dependencies = [
sources."pify-3.0.0"
@@ -69085,7 +69519,7 @@ in
sources."x-is-string-0.1.0"
sources."xdg-basedir-3.0.0"
sources."xtend-4.0.2"
- sources."yallist-2.1.2"
+ sources."yallist-3.0.3"
];
buildInputs = globalBuildInputs;
meta = {
@@ -69460,7 +69894,7 @@ in
sources."asn1-0.2.3"
sources."asn1.js-5.2.0"
sources."assert-plus-1.0.0"
- sources."async-limiter-1.0.0"
+ sources."async-limiter-1.0.1"
sources."asynckit-0.4.0"
sources."aws-sign2-0.7.0"
sources."aws4-1.8.0"
@@ -69572,7 +70006,7 @@ in
sources."getpass-0.1.7"
sources."glob-7.1.4"
sources."got-9.6.0"
- sources."graceful-fs-4.2.0"
+ sources."graceful-fs-4.2.1"
sources."grapheme-splitter-1.0.4"
sources."har-schema-2.0.0"
sources."har-validator-5.1.3"
@@ -69904,7 +70338,7 @@ in
sources."fs.realpath-1.0.0"
sources."getpass-0.1.7"
sources."glob-7.1.4"
- sources."graceful-fs-4.2.0"
+ sources."graceful-fs-4.2.1"
sources."har-schema-2.0.0"
sources."har-validator-5.1.3"
sources."http-signature-1.2.0"
@@ -70270,7 +70704,7 @@ in
sources."commander-2.20.0"
sources."crypto-random-string-1.0.0"
sources."fs-extra-7.0.1"
- sources."graceful-fs-4.2.0"
+ sources."graceful-fs-4.2.1"
sources."jsonfile-4.0.0"
sources."p-debounce-1.0.0"
sources."temp-dir-1.0.0"
@@ -70334,7 +70768,7 @@ in
sources."asn1-0.2.4"
sources."assert-plus-1.0.0"
sources."async-1.0.0"
- sources."async-limiter-1.0.0"
+ sources."async-limiter-1.0.1"
sources."asynckit-0.4.0"
sources."aws-sign2-0.7.0"
sources."aws4-1.8.0"
@@ -70480,7 +70914,7 @@ in
sources."getmac-1.4.6"
sources."getpass-0.1.7"
sources."glob-7.1.4"
- sources."graceful-fs-4.2.0"
+ sources."graceful-fs-4.2.1"
sources."har-schema-2.0.0"
sources."har-validator-5.1.3"
(sources."has-binary2-1.0.3" // {
@@ -70496,7 +70930,12 @@ in
sources."mkdirp-0.3.0"
];
})
- sources."hosted-git-info-2.7.1"
+ (sources."hosted-git-info-2.8.2" // {
+ dependencies = [
+ sources."lru-cache-5.1.1"
+ sources."yallist-3.0.3"
+ ];
+ })
sources."http-errors-1.7.2"
sources."http-signature-1.2.0"
sources."iconv-lite-0.4.24"
@@ -70845,7 +71284,7 @@ in
sources."aws-sign2-0.7.0"
sources."aws4-1.8.0"
sources."balanced-match-1.0.0"
- sources."base64-js-1.3.0"
+ sources."base64-js-1.3.1"
sources."bcrypt-pbkdf-1.0.2"
sources."bl-1.2.2"
sources."bluebird-3.5.5"
@@ -70925,7 +71364,7 @@ in
sources."git-clone-0.1.0"
sources."glob-7.1.4"
sources."got-6.7.1"
- sources."graceful-fs-4.2.0"
+ sources."graceful-fs-4.2.1"
sources."graceful-readlink-1.0.1"
sources."gray-matter-2.1.1"
sources."handlebars-4.1.2"
@@ -71267,7 +71706,12 @@ in
sources."core-js-2.6.9"
sources."core-util-is-1.0.2"
sources."create-error-class-3.0.2"
- sources."cross-spawn-5.1.0"
+ (sources."cross-spawn-5.1.0" // {
+ dependencies = [
+ sources."lru-cache-4.1.5"
+ sources."yallist-2.1.2"
+ ];
+ })
sources."crypto-random-string-1.0.0"
sources."css-parse-1.7.0"
sources."currently-unhandled-0.4.1"
@@ -71291,7 +71735,12 @@ in
sources."doctrine-3.0.0"
sources."dot-prop-4.2.0"
sources."duplexer3-0.1.4"
- sources."editorconfig-0.15.3"
+ (sources."editorconfig-0.15.3" // {
+ dependencies = [
+ sources."lru-cache-4.1.5"
+ sources."yallist-2.1.2"
+ ];
+ })
sources."element-helper-json-2.0.5"
sources."emoji-regex-7.0.3"
sources."error-ex-1.3.2"
@@ -71358,7 +71807,7 @@ in
sources."global-dirs-0.1.1"
sources."globals-11.12.0"
sources."got-6.7.1"
- sources."graceful-fs-4.2.0"
+ sources."graceful-fs-4.2.1"
sources."gridsome-helper-json-1.0.3"
sources."has-1.0.3"
(sources."has-ansi-2.0.0" // {
@@ -71390,7 +71839,7 @@ in
sources."hast-util-parse-selector-2.2.2"
sources."hast-util-to-string-1.0.2"
sources."hast-util-whitespace-1.0.3"
- sources."hosted-git-info-2.7.1"
+ sources."hosted-git-info-2.8.2"
sources."html-void-elements-1.0.4"
sources."html-whitespace-sensitive-tag-names-1.0.1"
sources."iconv-lite-0.4.24"
@@ -71508,7 +71957,7 @@ in
sources."longest-streak-1.0.0"
sources."loud-rejection-1.6.0"
sources."lowercase-keys-1.0.1"
- sources."lru-cache-4.1.5"
+ sources."lru-cache-5.1.1"
sources."make-dir-1.3.0"
sources."map-cache-0.2.2"
sources."map-obj-2.0.0"
@@ -72014,7 +72463,7 @@ in
sources."xdg-basedir-3.0.0"
sources."xtend-4.0.2"
sources."y18n-3.2.1"
- sources."yallist-2.1.2"
+ sources."yallist-3.0.3"
(sources."yargs-4.7.1" // {
dependencies = [
sources."ansi-regex-2.1.1"
@@ -72063,7 +72512,7 @@ in
sources."@cliqz-oss/node-firefox-connect-1.2.1"
sources."@sindresorhus/is-0.14.0"
sources."@snyk/composer-lockfile-parser-1.0.3"
- sources."@snyk/dep-graph-1.10.0"
+ sources."@snyk/dep-graph-1.12.0"
sources."@snyk/gemfile-1.2.0"
sources."@szmarczak/http-timer-1.1.2"
sources."@types/agent-base-4.2.0"
@@ -72169,7 +72618,7 @@ in
sources."define-property-1.0.0"
];
})
- sources."base64-js-1.3.0"
+ sources."base64-js-1.3.1"
sources."bcrypt-pbkdf-1.0.2"
sources."binary-extensions-1.13.1"
(sources."bl-1.2.2" // {
@@ -72561,7 +73010,7 @@ in
sources."get-stream-3.0.0"
];
})
- sources."graceful-fs-4.2.0"
+ sources."graceful-fs-4.2.1"
sources."graceful-readlink-1.0.1"
sources."graphlib-2.1.7"
sources."growly-1.3.0"
@@ -72577,7 +73026,12 @@ in
];
})
sources."has-yarn-2.1.0"
- sources."hosted-git-info-2.7.1"
+ (sources."hosted-git-info-2.8.2" // {
+ dependencies = [
+ sources."lru-cache-5.1.1"
+ sources."yallist-3.0.3"
+ ];
+ })
sources."htmlparser2-3.10.1"
sources."http-cache-semantics-4.0.3"
sources."http-errors-1.7.3"
@@ -73049,7 +73503,7 @@ in
];
})
sources."snapdragon-util-3.0.1"
- (sources."snyk-1.208.0" // {
+ (sources."snyk-1.210.0" // {
dependencies = [
sources."ansi-regex-4.1.0"
sources."debug-3.2.6"
@@ -73058,7 +73512,7 @@ in
sources."update-notifier-2.5.0"
];
})
- (sources."snyk-config-2.2.2" // {
+ (sources."snyk-config-2.2.3" // {
dependencies = [
sources."debug-3.2.6"
sources."ms-2.1.2"
@@ -73091,13 +73545,13 @@ in
sources."ms-2.1.2"
];
})
- (sources."snyk-mvn-plugin-2.3.1" // {
+ (sources."snyk-mvn-plugin-2.3.3" // {
dependencies = [
sources."tslib-1.9.3"
];
})
sources."snyk-nodejs-lockfile-parser-1.16.0"
- (sources."snyk-nuget-plugin-1.11.2" // {
+ (sources."snyk-nuget-plugin-1.11.3" // {
dependencies = [
sources."debug-3.2.6"
sources."ms-2.1.2"
@@ -73254,7 +73708,7 @@ in
sources."tslib-1.10.0"
sources."tunnel-agent-0.6.0"
sources."tweetnacl-0.14.5"
- sources."type-1.0.1"
+ sources."type-1.0.3"
sources."type-check-0.3.2"
sources."type-fest-0.5.2"
sources."typedarray-0.0.6"
@@ -73378,10 +73832,10 @@ in
webpack = nodeEnv.buildNodePackage {
name = "webpack";
packageName = "webpack";
- version = "4.39.0";
+ version = "4.39.1";
src = fetchurl {
- url = "https://registry.npmjs.org/webpack/-/webpack-4.39.0.tgz";
- sha512 = "nrxFNSEKm4T1C/EsgOgN50skt//Pl4X7kgJC1MrlE47M292LSCVmMOC47iTGL0CGxbdwhKGgeThrJcw0bstEfA==";
+ url = "https://registry.npmjs.org/webpack/-/webpack-4.39.1.tgz";
+ sha512 = "/LAb2TJ2z+eVwisldp3dqTEoNhzp/TLCZlmZm3GGGAlnfIWDgOEE758j/9atklNLfRyhKbZTCOIoPqLJXeBLbQ==";
};
dependencies = [
sources."@webassemblyjs/ast-1.8.5"
@@ -73434,7 +73888,7 @@ in
sources."define-property-1.0.0"
];
})
- sources."base64-js-1.3.0"
+ sources."base64-js-1.3.1"
sources."big.js-5.2.2"
sources."binary-extensions-1.13.1"
sources."bluebird-3.5.5"
@@ -73566,7 +74020,7 @@ in
sources."is-glob-3.1.0"
];
})
- sources."graceful-fs-4.2.0"
+ sources."graceful-fs-4.2.1"
sources."has-value-1.0.0"
(sources."has-values-1.0.0" // {
dependencies = [
@@ -73777,7 +74231,7 @@ in
sources."stream-shift-1.0.0"
sources."string_decoder-1.1.1"
sources."tapable-1.1.3"
- (sources."terser-4.1.2" // {
+ (sources."terser-4.1.3" // {
dependencies = [
sources."source-map-0.6.1"
];
@@ -73830,7 +74284,7 @@ in
sources."util-deprecate-1.0.2"
sources."vm-browserify-1.1.0"
sources."watchpack-1.6.0"
- (sources."webpack-sources-1.4.1" // {
+ (sources."webpack-sources-1.4.3" // {
dependencies = [
sources."source-map-0.6.1"
];
@@ -73970,7 +74424,7 @@ in
];
})
sources."global-prefix-1.0.2"
- sources."graceful-fs-4.2.0"
+ sources."graceful-fs-4.2.1"
sources."has-flag-3.0.0"
sources."has-value-1.0.0"
(sources."has-values-1.0.0" // {
@@ -74181,20 +74635,20 @@ in
webtorrent-cli = nodeEnv.buildNodePackage {
name = "webtorrent-cli";
packageName = "webtorrent-cli";
- version = "2.0.2";
+ version = "3.0.0";
src = fetchurl {
- url = "https://registry.npmjs.org/webtorrent-cli/-/webtorrent-cli-2.0.2.tgz";
- sha512 = "thdHJQpoOLDXZMJQ708JhAQvqceds3R79LIDmzAALLRV5h1O/Ezmj7en3L3b/s1ek0TLkYW9TJxs1ohDcjaU9Q==";
+ url = "https://registry.npmjs.org/webtorrent-cli/-/webtorrent-cli-3.0.0.tgz";
+ sha512 = "ktehmMXkJbM1gnlPxiiVbTYq0rQHLs+U/A/3pXNt0vIYjHgzsydooejwHZlmL7vxdfZAaSHilbkBDRgWW071rA==";
};
dependencies = [
sources."addr-to-ip-port-1.5.1"
sources."airplay-js-0.3.0"
sources."ascli-0.3.0"
- sources."async-limiter-1.0.0"
+ sources."async-limiter-1.0.1"
sources."balanced-match-1.0.0"
sources."bencode-2.0.1"
- sources."binary-search-1.3.5"
- sources."bitfield-2.0.0"
+ sources."binary-search-1.3.6"
+ sources."bitfield-3.0.0"
(sources."bittorrent-dht-9.0.1" // {
dependencies = [
sources."debug-4.1.1"
@@ -74204,12 +74658,11 @@ in
sources."bittorrent-peerid-1.3.0"
(sources."bittorrent-protocol-3.1.0" // {
dependencies = [
- sources."bitfield-3.0.0"
sources."debug-4.1.1"
sources."ms-2.1.2"
];
})
- (sources."bittorrent-tracker-9.11.0" // {
+ (sources."bittorrent-tracker-9.12.1" // {
dependencies = [
sources."debug-4.1.1"
sources."ms-2.1.2"
@@ -74217,13 +74670,8 @@ in
];
})
sources."blob-to-buffer-1.2.8"
- (sources."block-stream2-1.1.0" // {
- dependencies = [
- sources."readable-stream-2.3.6"
- sources."safe-buffer-5.1.2"
- ];
- })
- sources."bn.js-4.11.8"
+ sources."block-stream2-2.0.0"
+ sources."bn.js-5.0.0"
sources."brace-expansion-1.1.11"
sources."browserify-package-json-1.0.1"
sources."buffer-alloc-1.2.0"
@@ -74243,7 +74691,7 @@ in
sources."mime-1.6.0"
];
})
- sources."chunk-store-stream-4.0.0"
+ sources."chunk-store-stream-4.1.0"
sources."clivas-0.2.0"
sources."closest-to-2.0.0"
sources."colour-0.7.1"
@@ -74254,13 +74702,13 @@ in
dependencies = [
sources."readable-stream-2.3.6"
sources."safe-buffer-5.1.2"
+ sources."string_decoder-1.1.1"
];
})
sources."core-util-is-1.0.2"
- sources."create-torrent-4.0.0"
+ sources."create-torrent-4.2.1"
sources."debug-2.6.9"
sources."decompress-response-3.3.0"
- sources."defined-1.0.0"
(sources."dlnacasts-0.1.0" // {
dependencies = [
sources."mime-1.6.0"
@@ -74273,13 +74721,7 @@ in
sources."elementtree-0.1.7"
sources."end-of-stream-1.4.1"
sources."executable-4.1.1"
- (sources."filestream-4.1.3" // {
- dependencies = [
- sources."readable-stream-2.3.6"
- sources."safe-buffer-5.1.2"
- ];
- })
- sources."flatten-1.0.2"
+ sources."filestream-5.0.0"
(sources."fs-chunk-store-1.7.0" // {
dependencies = [
sources."thunky-1.0.3"
@@ -74340,7 +74782,7 @@ in
sources."thunky-1.0.3"
];
})
- sources."multistream-3.0.0"
+ sources."multistream-3.1.0"
sources."netmask-1.0.6"
sources."network-address-1.1.2"
sources."next-event-1.0.0"
@@ -74349,7 +74791,7 @@ in
sources."nodebmc-0.0.7"
sources."on-finished-2.3.0"
sources."once-1.4.0"
- sources."opn-6.0.0"
+ sources."open-6.4.0"
sources."optjs-3.2.2"
sources."package-json-versionify-1.0.4"
sources."parse-numeric-range-0.0.2"
@@ -74402,21 +74844,23 @@ in
];
})
sources."simple-sha1-2.1.2"
- (sources."simple-websocket-7.2.0" // {
+ (sources."simple-websocket-8.0.0" // {
dependencies = [
- sources."debug-3.2.6"
+ sources."debug-4.1.1"
sources."ms-2.1.2"
- sources."readable-stream-2.3.6"
- sources."safe-buffer-5.1.2"
];
})
sources."speedometer-1.1.0"
sources."split-1.0.1"
- sources."stream-to-blob-1.0.2"
- sources."stream-to-blob-url-2.1.2"
+ sources."stream-to-blob-2.0.0"
+ (sources."stream-to-blob-url-2.1.2" // {
+ dependencies = [
+ sources."stream-to-blob-1.0.2"
+ ];
+ })
sources."stream-with-known-length-to-buffer-1.0.3"
sources."string2compact-1.3.0"
- (sources."string_decoder-1.1.1" // {
+ (sources."string_decoder-1.2.0" // {
dependencies = [
sources."safe-buffer-5.1.2"
];
@@ -74442,7 +74886,6 @@ in
sources."url-join-4.0.1"
(sources."ut_metadata-3.4.0" // {
dependencies = [
- sources."bitfield-3.0.0"
sources."debug-4.1.1"
sources."ms-2.1.2"
];
@@ -74450,9 +74893,9 @@ in
sources."ut_pex-1.2.1"
sources."utf-8-validate-5.0.2"
sources."util-deprecate-1.0.2"
- sources."videostream-3.2.0"
+ sources."videostream-3.2.1"
sources."vlc-command-1.1.2"
- (sources."webtorrent-0.105.3" // {
+ (sources."webtorrent-0.106.0" // {
dependencies = [
sources."debug-4.1.1"
sources."ms-2.1.2"
@@ -74461,11 +74904,10 @@ in
})
sources."winreg-1.2.4"
sources."wrappy-1.0.2"
- sources."ws-6.2.1"
+ sources."ws-7.1.1"
sources."xml2js-0.4.19"
sources."xmlbuilder-9.0.7"
sources."xmldom-0.1.27"
- sources."xtend-4.0.2"
];
buildInputs = globalBuildInputs;
meta = {
@@ -74766,7 +75208,7 @@ in
sources."global-tunnel-ng-2.7.1"
sources."globby-8.0.2"
sources."got-8.3.2"
- sources."graceful-fs-4.2.0"
+ sources."graceful-fs-4.2.1"
sources."grouped-queue-0.3.3"
sources."har-schema-2.0.0"
sources."har-validator-5.1.3"
@@ -74785,7 +75227,12 @@ in
sources."kind-of-4.0.0"
];
})
- sources."hosted-git-info-2.7.1"
+ (sources."hosted-git-info-2.8.2" // {
+ dependencies = [
+ sources."lru-cache-5.1.1"
+ sources."yallist-3.0.3"
+ ];
+ })
sources."http-cache-semantics-3.8.1"
sources."http-signature-1.2.0"
sources."humanize-string-1.0.2"
diff --git a/pkgs/development/node-packages/node-packages-v12.nix b/pkgs/development/node-packages/node-packages-v12.nix
index e9062f33a407..a4a765d70ed0 100644
--- a/pkgs/development/node-packages/node-packages-v12.nix
+++ b/pkgs/development/node-packages/node-packages-v12.nix
@@ -184,13 +184,13 @@ let
sha512 = "5T6P4xPgpp0YDFvSWwEZ4NoE3aM4QBQXDzmVbraCkFj8zHM+mba8SyqB5DbZWyR7mYHo6Y7BdQo3MoA4m0TeQg==";
};
};
- "base64-js-1.3.0" = {
+ "base64-js-1.3.1" = {
name = "base64-js";
packageName = "base64-js";
- version = "1.3.0";
+ version = "1.3.1";
src = fetchurl {
- url = "https://registry.npmjs.org/base64-js/-/base64-js-1.3.0.tgz";
- sha512 = "ccav/yGvoa80BQDljCxsmmQ3Xvx60/UpBIij5QN21W3wBi/hhIC9OoO+KLpu9IJTS9j4DRVJ3aDDF9cMSoa2lw==";
+ url = "https://registry.npmjs.org/base64-js/-/base64-js-1.3.1.tgz";
+ sha512 = "mLQ4i2QO1ytvGWFWmcngKO//JXAQueZvwEKtjgQFM4jIK0kU+ytMfplL8j+n5mspOfjHwoAg+9yhb7BwAHm36g==";
};
};
"bcrypt-pbkdf-1.0.2" = {
@@ -724,13 +724,13 @@ let
sha1 = "dbf743c6c14992593c655568cb66ed32c0122ebe";
};
};
- "graceful-fs-4.2.0" = {
+ "graceful-fs-4.2.1" = {
name = "graceful-fs";
packageName = "graceful-fs";
- version = "4.2.0";
+ version = "4.2.1";
src = fetchurl {
- url = "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.0.tgz";
- sha512 = "jpSvDPV4Cq/bgtpndIWbI5hmYxhQGHPC4d4cqBPb4DLniCfhJokdXhwhaDuLBGLQdvvRum/UiX6ECVIPvDXqdg==";
+ url = "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.1.tgz";
+ sha512 = "b9usnbDGnD928gJB3LrCmxoibr3VE4U2SMo5PBuBnokWyDADTqDPXg4YpwKF1trpH+UbGp7QLicO3+aWEy0+mw==";
};
};
"grunt-known-options-1.1.1" = {
@@ -814,13 +814,13 @@ let
sha512 = "eSmmWE5bZTK2Nou4g0AI3zZ9rswp7GRKoKXS1BLUkvPviOqs4YTN1djQIqrXy9k5gEtdLPy86JjRwsNM9tnDcA==";
};
};
- "hosted-git-info-2.7.1" = {
+ "hosted-git-info-2.8.2" = {
name = "hosted-git-info";
packageName = "hosted-git-info";
- version = "2.7.1";
+ version = "2.8.2";
src = fetchurl {
- url = "https://registry.npmjs.org/hosted-git-info/-/hosted-git-info-2.7.1.tgz";
- sha512 = "7T/BxH19zbcCTa8XkMlbK5lTo1WtgkFi3GvdWEyNuc4Vex7/9Dqbnpsf4JMydcfj9HCg4zUWFTL3Za6lapg5/w==";
+ url = "https://registry.npmjs.org/hosted-git-info/-/hosted-git-info-2.8.2.tgz";
+ sha512 = "CyjlXII6LMsPMyUzxpTt8fzh5QwzGqPmQXgY/Jyf4Zfp27t/FvfhwoE/8laaMUcMy816CkWF20I7NeQhwwY88w==";
};
};
"http-signature-1.2.0" = {
@@ -1183,6 +1183,15 @@ let
sha1 = "2009291bb31cea861bbf10a7c15a28caf75c31ec";
};
};
+ "lru-cache-5.1.1" = {
+ name = "lru-cache";
+ packageName = "lru-cache";
+ version = "5.1.1";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/lru-cache/-/lru-cache-5.1.1.tgz";
+ sha512 = "KpNARQA3Iwv+jTA0utUVVbrh+Jlrr1Fv0e56GGzAFOXN7dk/FviaDW8LHmK52DlcH4WP2n6gI8vN1aesBFgo9w==";
+ };
+ };
"make-iterator-1.0.1" = {
name = "make-iterator";
packageName = "make-iterator";
@@ -2607,7 +2616,7 @@ in
sources."aws-sign2-0.7.0"
sources."aws4-1.8.0"
sources."balanced-match-1.0.0"
- sources."base64-js-1.3.0"
+ sources."base64-js-1.3.1"
sources."bcrypt-pbkdf-1.0.2"
sources."brace-expansion-1.1.11"
sources."buffer-from-1.1.1"
@@ -2649,11 +2658,11 @@ in
sources."gauge-2.7.4"
sources."getpass-0.1.7"
sources."glob-7.1.4"
- sources."graceful-fs-4.2.0"
+ sources."graceful-fs-4.2.1"
sources."har-schema-2.0.0"
sources."har-validator-5.1.3"
sources."has-unicode-2.0.1"
- sources."hosted-git-info-2.7.1"
+ sources."hosted-git-info-2.8.2"
sources."http-signature-1.2.0"
sources."inflight-1.0.6"
sources."inherits-2.0.4"
@@ -2668,6 +2677,7 @@ in
sources."json-stringify-safe-5.0.1"
sources."jsonfile-1.0.1"
sources."jsprim-1.4.1"
+ sources."lru-cache-5.1.1"
sources."mime-db-1.40.0"
sources."mime-types-2.1.24"
sources."minimatch-3.0.4"
diff --git a/pkgs/development/ocaml-modules/mtime/default.nix b/pkgs/development/ocaml-modules/mtime/default.nix
index 73f84886cc57..f4e3586b43c1 100644
--- a/pkgs/development/ocaml-modules/mtime/default.nix
+++ b/pkgs/development/ocaml-modules/mtime/default.nix
@@ -7,8 +7,8 @@ with lib;
let param =
if versionAtLeast ocaml.version "4.03"
then {
- version = "1.1.0";
- sha256 = "1qb4ljwirrc3g8brh97s76rjky2cpmy7zm87y7iqd6pxix52ydk3";
+ version = "1.2.0";
+ sha256 = "0zm1jvqkz3ghznfsm3bbv9q2zinp9grggdf7k9phjazjvny68xb8";
} else {
version = "0.8.4";
sha256 = "1adm8sc3lkjly99hyi5gqnxas748k7h62ljgn8x423nkn8gyp8dh";
diff --git a/pkgs/development/ocaml-modules/ocurl/default.nix b/pkgs/development/ocaml-modules/ocurl/default.nix
index 0b90cd4b6aad..8c8d45192494 100644
--- a/pkgs/development/ocaml-modules/ocurl/default.nix
+++ b/pkgs/development/ocaml-modules/ocurl/default.nix
@@ -1,5 +1,9 @@
{ stdenv, pkgconfig, ocaml, findlib, fetchurl, curl, ncurses }:
+if stdenv.lib.versionOlder ocaml.version "4.02"
+then throw "ocurl is not available for OCaml ${ocaml.version}"
+else
+
stdenv.mkDerivation rec {
name = "ocurl-0.8.2";
src = fetchurl {
diff --git a/pkgs/development/python-modules/aiosmtpd/default.nix b/pkgs/development/python-modules/aiosmtpd/default.nix
index 9e053c718c86..77d7cf653d19 100644
--- a/pkgs/development/python-modules/aiosmtpd/default.nix
+++ b/pkgs/development/python-modules/aiosmtpd/default.nix
@@ -1,14 +1,17 @@
-{ lib, isPy3k, fetchPypi, buildPythonPackage
+{ lib, isPy3k, fetchFromGitHub, buildPythonPackage
, atpublic }:
buildPythonPackage rec {
pname = "aiosmtpd";
- version = "1.2";
+ version = "1.2.1";
disabled = !isPy3k;
- src = fetchPypi {
- inherit pname version;
- sha256 = "1xdfk741pjmz1cm8dsi4n5vq4517i175rm94696m3f7kcgk7xsmp";
+ # Release not published to Pypi
+ src = fetchFromGitHub {
+ owner = "aio-libs";
+ repo = pname;
+ rev = version;
+ sha256 = "14c30dm6jzxiblnsah53fdv68vqhxwvb9x0aq9bc4vcdas747vr7";
};
propagatedBuildInputs = [
diff --git a/pkgs/development/python-modules/ansible/default.nix b/pkgs/development/python-modules/ansible/default.nix
index e21445ab3ec2..fab3c0df58c5 100644
--- a/pkgs/development/python-modules/ansible/default.nix
+++ b/pkgs/development/python-modules/ansible/default.nix
@@ -1,5 +1,5 @@
{ lib
-, fetchurl
+, fetchFromGitHub
, buildPythonPackage
, pycrypto
, paramiko
@@ -18,11 +18,13 @@
buildPythonPackage rec {
pname = "ansible";
- version = "2.8.2";
+ version = "2.8.4";
- src = fetchurl {
- url = "https://releases.ansible.com/ansible/${pname}-${version}.tar.gz";
- sha256 = "1e5ba829ca0602c55b33da399b06f99b135a34014b661d1c36d8892a1e2d3730";
+ src = fetchFromGitHub {
+ owner = "ansible";
+ repo = "ansible";
+ rev = "v${version}";
+ sha256 = "1fp7zz8awfv70nn8i6x0ggx4472377hm7787x16qv2kz4nb069ki";
};
prePatch = ''
diff --git a/pkgs/development/python-modules/browser-cookie3/default.nix b/pkgs/development/python-modules/browser-cookie3/default.nix
index 64510ee5b640..807dafab4369 100644
--- a/pkgs/development/python-modules/browser-cookie3/default.nix
+++ b/pkgs/development/python-modules/browser-cookie3/default.nix
@@ -1,11 +1,11 @@
{ lib, fetchPypi, buildPythonPackage, isPy3k, keyring, pbkdf2, pyaes}:
buildPythonPackage rec {
pname = "browser-cookie3";
- version = "0.6.4";
+ version = "0.7.6";
src = fetchPypi {
inherit pname version;
- sha256 = "16nghwsrv08gz4iiyxsy5lgg5ljgrwkp471m7xnsvhhpb3axmnsc";
+ sha256 = "1f24hsclg1wz2i8aiam91l06qqy0plxhwl615l4qkg35mbw4ry7h";
};
disabled = !isPy3k;
diff --git a/pkgs/development/python-modules/caldav/default.nix b/pkgs/development/python-modules/caldav/default.nix
index aa3aa8b9c02b..653296a927e8 100644
--- a/pkgs/development/python-modules/caldav/default.nix
+++ b/pkgs/development/python-modules/caldav/default.nix
@@ -1,11 +1,11 @@
{ lib, buildPythonPackage, fetchPypi
-, tzlocal, requests, vobject, lxml }:
+, tzlocal, requests, vobject, lxml, nose }:
buildPythonPackage rec {
pname = "caldav";
version = "0.6.1";
- propagatedBuildInputs = [ tzlocal requests vobject lxml ];
+ propagatedBuildInputs = [ tzlocal requests vobject lxml nose ];
src = fetchPypi {
inherit pname version;
diff --git a/pkgs/development/python-modules/django-mailman3/default.nix b/pkgs/development/python-modules/django-mailman3/default.nix
new file mode 100644
index 000000000000..91cea9b00598
--- /dev/null
+++ b/pkgs/development/python-modules/django-mailman3/default.nix
@@ -0,0 +1,30 @@
+{ stdenv, buildPythonPackage, fetchPypi, django-gravatar2, django_compressor
+, django-allauth, mailmanclient, django, mock
+}:
+
+buildPythonPackage rec {
+ pname = "django-mailman3";
+ version = "1.2.0";
+
+ src = fetchPypi {
+ inherit pname version;
+ sha256 = "0v6c1jhcc212wc2xa314irfcchl05r7nysrcy63dcaan958kmnnx";
+ };
+
+ propagatedBuildInputs = [
+ django-gravatar2 django_compressor django-allauth mailmanclient
+ ];
+ checkInputs = [ django mock ];
+
+ checkPhase = ''
+ cd $NIX_BUILD_TOP/$sourceRoot
+ PYTHONPATH=.:$PYTHONPATH django-admin.py test --settings=django_mailman3.tests.settings_test
+ '';
+
+ meta = with stdenv.lib; {
+ description = "Django library for Mailman UIs";
+ homepage = https://gitlab.com/mailman/django-mailman3;
+ license = licenses.gpl3;
+ maintainers = with maintainers; [ globin peti ];
+ };
+}
diff --git a/pkgs/development/python-modules/django_modelcluster/default.nix b/pkgs/development/python-modules/django_modelcluster/default.nix
index 479e66289e64..4efd2002b1fd 100644
--- a/pkgs/development/python-modules/django_modelcluster/default.nix
+++ b/pkgs/development/python-modules/django_modelcluster/default.nix
@@ -2,18 +2,21 @@
, buildPythonPackage
, fetchPypi
, pytz
+, pythonOlder
, six
}:
buildPythonPackage rec {
pname = "django-modelcluster";
- version = "4.4";
+ version = "5.0";
src = fetchPypi {
inherit pname version;
- sha256 = "02mrs7aapabapfh7h7n71s8r7zxkmad3yk4rdyfwcf0x36326rsr";
+ sha256 = "0zcn1b0lp9dg6xvz8p8v1hrrgqj71izqalqz2dp1nz5rbj3s34x2";
};
+ disabled = pythonOlder "3.5";
+
doCheck = false;
propagatedBuildInputs = [ pytz six ];
diff --git a/pkgs/development/python-modules/django_silk/default.nix b/pkgs/development/python-modules/django_silk/default.nix
index 6bb2b1d43f15..13ba5ef7964e 100644
--- a/pkgs/development/python-modules/django_silk/default.nix
+++ b/pkgs/development/python-modules/django_silk/default.nix
@@ -23,14 +23,14 @@
buildPythonPackage rec {
pname = "django-silk";
- version = "3.0.2";
+ version = "3.0.3";
# pypi tarball doesn't include test project
src = fetchFromGitHub {
owner = "jazzband";
repo = "django-silk";
rev = version;
- sha256 = "1fbaafc2gx01gscdalp6hj6bz4b0cmq59lgmvsydw7jkds4mps7c";
+ sha256 = "0j1r88zv7fvmlnrzr2h65czzdcpvl7n847ra1pfc52bfa4lf8b9j";
};
# "test_time_taken" tests aren't suitable for reproducible execution, but django's
# test runner doesn't have an easy way to ignore tests - so instead prevent it from picking
diff --git a/pkgs/development/python-modules/dlib/default.nix b/pkgs/development/python-modules/dlib/default.nix
index c200b6959b64..d9b3bb93264e 100644
--- a/pkgs/development/python-modules/dlib/default.nix
+++ b/pkgs/development/python-modules/dlib/default.nix
@@ -1,4 +1,4 @@
-{ buildPythonPackage, dlib, python, pytest, avxSupport ? true }:
+{ buildPythonPackage, dlib, python, pytest, more-itertools, avxSupport ? true, lib }:
buildPythonPackage {
inherit (dlib) name src nativeBuildInputs buildInputs meta;
@@ -10,9 +10,15 @@ buildPythonPackage {
${python.interpreter} nix_run_setup test --no USE_AVX_INSTRUCTIONS
'';
- setupPyBuildFlags = [ "--${if avxSupport then "yes" else "no"} USE_AVX_INSTRUCTIONS" ];
+ setupPyBuildFlags = lib.optional avxSupport "--no USE_AVX_INSTRUCTIONS";
patches = [ ./build-cores.patch ];
- checkInputs = [ pytest ];
+ postPatch = ''
+ substituteInPlace setup.py \
+ --replace "more-itertools<6.0.0" "more-itertools" \
+ --replace "pytest==3.8" "pytest"
+ '';
+
+ checkInputs = [ pytest more-itertools ];
}
diff --git a/pkgs/development/python-modules/dogtail/default.nix b/pkgs/development/python-modules/dogtail/default.nix
index 804267268d78..deeb8ce06420 100644
--- a/pkgs/development/python-modules/dogtail/default.nix
+++ b/pkgs/development/python-modules/dogtail/default.nix
@@ -11,6 +11,7 @@
, fetchurl
, dbus
, xvfb_run
+, wrapGAppsHook
# , fetchPypi
}:
@@ -32,8 +33,9 @@ buildPythonPackage rec {
./nix-support.patch
];
- nativeBuildInputs = [ gobject-introspection dbus xvfb_run ]; # for setup hooks
+ nativeBuildInputs = [ gobject-introspection dbus xvfb_run wrapGAppsHook ]; # for setup hooks
propagatedBuildInputs = [ at-spi2-core gtk3 pygobject3 pyatspi pycairo ];
+ strictDeps = false; # issue 56943
checkPhase = ''
runHook preCheck
diff --git a/pkgs/development/python-modules/flufl/bounce.nix b/pkgs/development/python-modules/flufl/bounce.nix
new file mode 100644
index 000000000000..0a2e8dff1b73
--- /dev/null
+++ b/pkgs/development/python-modules/flufl/bounce.nix
@@ -0,0 +1,14 @@
+{ buildPythonPackage, fetchPypi, atpublic, zope_interface, nose2 }:
+
+buildPythonPackage rec {
+ pname = "flufl.bounce";
+ version = "3.0";
+
+ buildInputs = [ nose2 ];
+ propagatedBuildInputs = [ atpublic zope_interface ];
+
+ src = fetchPypi {
+ inherit pname version;
+ sha256 = "0k5kjqa3x6gvwwxyzb2vwi1g1i6asm1zw5fivylxz3d583y4kid2";
+ };
+}
diff --git a/pkgs/development/python-modules/flufl/i18n.nix b/pkgs/development/python-modules/flufl/i18n.nix
new file mode 100644
index 000000000000..6e8d77bf4f81
--- /dev/null
+++ b/pkgs/development/python-modules/flufl/i18n.nix
@@ -0,0 +1,13 @@
+{ buildPythonPackage, fetchPypi, atpublic }:
+
+buildPythonPackage rec {
+ pname = "flufl.i18n";
+ version = "2.0.2";
+
+ propagatedBuildInputs = [ atpublic ];
+
+ src = fetchPypi {
+ inherit pname version;
+ sha256 = "1csgds59nx0ann9v2alqr69lakp1cnc1ikmbgn96l6n23js7c2ah";
+ };
+}
diff --git a/pkgs/development/python-modules/flufl/lock.nix b/pkgs/development/python-modules/flufl/lock.nix
new file mode 100644
index 000000000000..1be5d9a7c4c2
--- /dev/null
+++ b/pkgs/development/python-modules/flufl/lock.nix
@@ -0,0 +1,13 @@
+{ buildPythonPackage, fetchPypi, atpublic }:
+
+buildPythonPackage rec {
+ pname = "flufl.lock";
+ version = "3.2";
+
+ propagatedBuildInputs = [ atpublic ];
+
+ src = fetchPypi {
+ inherit pname version;
+ sha256 = "0nzzd6l30ff6cwsrlrb94xzfja4wkyrqv3ydc6cz0hdbr766mmm8";
+ };
+}
diff --git a/pkgs/development/python-modules/lazr/config.nix b/pkgs/development/python-modules/lazr/config.nix
new file mode 100644
index 000000000000..759c9689bc93
--- /dev/null
+++ b/pkgs/development/python-modules/lazr/config.nix
@@ -0,0 +1,13 @@
+{ buildPythonPackage, fetchPypi, lazr_delegates }:
+
+buildPythonPackage rec {
+ pname = "lazr.config";
+ version = "2.2.1";
+
+ propagatedBuildInputs = [ lazr_delegates ];
+
+ src = fetchPypi {
+ inherit pname version;
+ sha256 = "1s7pyvlq06qjrkaw9r6nc290lb095n25ybzgavvy51ygpxkgqxwn";
+ };
+}
diff --git a/pkgs/development/python-modules/lazr/delegates.nix b/pkgs/development/python-modules/lazr/delegates.nix
new file mode 100644
index 000000000000..40e2e47d517d
--- /dev/null
+++ b/pkgs/development/python-modules/lazr/delegates.nix
@@ -0,0 +1,15 @@
+{ buildPythonPackage, fetchPypi, nose, zope_interface }:
+
+buildPythonPackage rec {
+ pname = "lazr.delegates";
+ version = "2.0.4";
+
+ propagatedBuildInputs = [ nose zope_interface ];
+
+ doCheck = false; # cannot import name 'ClassType' from 'types'
+
+ src = fetchPypi {
+ inherit pname version;
+ sha256 = "1rdnl85j9ayp8n85l0ciip621j9dcziz5qnmv2m7krgwgcn31vfx";
+ };
+}
diff --git a/pkgs/development/python-modules/mailmanclient/default.nix b/pkgs/development/python-modules/mailmanclient/default.nix
new file mode 100644
index 000000000000..95e9e4fdd3e0
--- /dev/null
+++ b/pkgs/development/python-modules/mailmanclient/default.nix
@@ -0,0 +1,21 @@
+{ stdenv, buildPythonPackage, fetchPypi, six, httplib2 }:
+
+buildPythonPackage rec {
+ pname = "mailmanclient";
+ version = "3.2.2";
+
+ src = fetchPypi {
+ inherit pname version;
+ sha256 = "0xsrzdrsmfhnxv68zwm1g6awk7in08k6yhkyd27ipn0mq1wjm5jd";
+ };
+
+ propagatedBuildInputs = [ six httplib2 ];
+
+ meta = with stdenv.lib; {
+ homepage = "http://www.gnu.org/software/mailman/";
+ description = "REST client for driving Mailman 3";
+ license = licenses.lgpl3;
+ platforms = platforms.linux;
+ maintainers = with maintainers; [ peti globin ];
+ };
+}
diff --git a/pkgs/development/python-modules/moderngl/default.nix b/pkgs/development/python-modules/moderngl/default.nix
index 8040b80f88b8..a45a24b7a2a9 100644
--- a/pkgs/development/python-modules/moderngl/default.nix
+++ b/pkgs/development/python-modules/moderngl/default.nix
@@ -8,11 +8,11 @@
buildPythonPackage rec {
pname = "moderngl";
- version = "5.5.0";
+ version = "5.5.3";
src = fetchPypi {
inherit pname version;
- sha256 = "0x8xblc3zybp7jw9cscpm4r5pmmilj9l4yi1rkxyf0y80kchlxq4";
+ sha256 = "1k2yf2yglzx65gcv2bqql6w6lmgyp3f1jz4ddq9vylf09a8j7fga";
};
disabled = !isPy3k;
@@ -23,7 +23,7 @@ buildPythonPackage rec {
doCheck = false;
meta = with lib; {
- homepage = https://github.com/cprogrammer1994/ModernGL;
+ homepage = https://github.com/moderngl/moderngl;
description = "High performance rendering for Python 3";
license = licenses.mit;
platforms = platforms.linux; # should be mesaPlatforms, darwin build breaks.
diff --git a/pkgs/development/python-modules/pyqtwebengine/default.nix b/pkgs/development/python-modules/pyqtwebengine/default.nix
index 7d745aa9e105..b48f21b9e78d 100644
--- a/pkgs/development/python-modules/pyqtwebengine/default.nix
+++ b/pkgs/development/python-modules/pyqtwebengine/default.nix
@@ -1,5 +1,6 @@
{ lib, fetchurl, pythonPackages, pkgconfig
, qmake, qtbase, qtsvg, qtwebengine
+, wrapQtAppsHook
}:
let
@@ -77,9 +78,12 @@ in buildPythonPackage rec {
doCheck = true;
-
enableParallelBuilding = true;
+ passthru = {
+ inherit wrapQtAppsHook;
+ };
+
meta = with lib; {
description = "Python bindings for Qt5";
homepage = http://www.riverbankcomputing.co.uk;
diff --git a/pkgs/development/python-modules/pytest-ansible/default.nix b/pkgs/development/python-modules/pytest-ansible/default.nix
index 3085ee06e870..0ef79cd09894 100644
--- a/pkgs/development/python-modules/pytest-ansible/default.nix
+++ b/pkgs/development/python-modules/pytest-ansible/default.nix
@@ -1,6 +1,6 @@
{ stdenv
, buildPythonPackage
-, fetchPypi
+, fetchFromGitHub
, ansible
, pytest
, mock
@@ -8,11 +8,13 @@
buildPythonPackage rec {
pname = "pytest-ansible";
- version = "2.0.2";
+ version = "2.1.1";
- src = fetchPypi {
- inherit pname version;
- sha256 = "d69d89cbcf29e587cbe6ec4b229346edbf027d3c04944dd7bcbf3d7bba46348f";
+ src = fetchFromGitHub {
+ owner = "ansible";
+ repo = "pytest-ansible";
+ rev = "v${version}";
+ sha256 = "0v97sqk3q2vkmwnjlnncz8ss8086x9jg3cz0g2nzlngs4ql1gdb0";
};
patchPhase = ''
@@ -24,11 +26,11 @@ buildPythonPackage rec {
checkInputs = [ mock ];
propagatedBuildInputs = [ ansible pytest ];
- # tests not included with release
+ # tests not included with release, even on github
doCheck = false;
checkPhase = ''
- pytest
+ HOME=$TMPDIR pytest tests/
'';
meta = with stdenv.lib; {
diff --git a/pkgs/development/python-modules/sqlalchemy-utils/default.nix b/pkgs/development/python-modules/sqlalchemy-utils/default.nix
index 1212b6c94b0c..ef30b6917a3b 100644
--- a/pkgs/development/python-modules/sqlalchemy-utils/default.nix
+++ b/pkgs/development/python-modules/sqlalchemy-utils/default.nix
@@ -5,12 +5,12 @@
buildPythonPackage rec {
pname = "sqlalchemy-utils";
- version = "0.34.0";
+ version = "0.34.2";
src = fetchPypi {
inherit version;
pname = "SQLAlchemy-Utils";
- sha256 = "0rlixs084isgxsvvpz96njqzikvg8x021sgjp4yj71jpd8blvg8f";
+ sha256 = "126c9p8rnnb043w57ah7idqfryczbz4vi9lzsz2cgiaig6fv52b6";
};
propagatedBuildInputs = [
diff --git a/pkgs/development/python-modules/tensorflow/default.nix b/pkgs/development/python-modules/tensorflow/default.nix
index 70488a0d9dcb..899e89368436 100644
--- a/pkgs/development/python-modules/tensorflow/default.nix
+++ b/pkgs/development/python-modules/tensorflow/default.nix
@@ -118,7 +118,7 @@ let
keras-applications
# libs taken from system through the TF_SYS_LIBS mechanism
- grpc
+ # grpc
sqlite
openssl
jsoncpp
@@ -169,7 +169,8 @@ let
"flatbuffers"
"gast_archive"
"gif_archive"
- "grpc"
+ # Lots of errors, requires an older version
+ # "grpc"
"hwloc"
"icu"
"jpeg"
@@ -245,8 +246,7 @@ let
'';
# FIXME: Tensorflow uses dlopen() for CUDA libraries.
- # No idea why gpr isn't linked properly; perhaps Tensorflow expects a static library?
- NIX_LDFLAGS = [ "-lgpr" ] ++ lib.optionals cudaSupport [ "-lcudart" "-lcublas" "-lcufft" "-lcurand" "-lcusolver" "-lcusparse" "-lcudnn" ];
+ NIX_LDFLAGS = lib.optionals cudaSupport [ "-lcudart" "-lcublas" "-lcufft" "-lcurand" "-lcusolver" "-lcusparse" "-lcudnn" ];
hardeningDisable = [ "format" ];
@@ -261,15 +261,14 @@ let
bazelTarget = "//tensorflow/tools/pip_package:build_pip_package //tensorflow/tools/lib_package:libtensorflow";
fetchAttrs = {
- preInstall = ''
- rm -rf $bazelOut/external/{bazel_tools,\@bazel_tools.marker,local_*,\@local_*}
- '';
+ # So that checksums don't depend on these.
+ TF_SYSTEM_LIBS = null;
# cudaSupport causes fetch of ncclArchive, resulting in different hashes
sha256 = if cudaSupport then
- "19ll3f1i5qzd7ngz3m2jbxzgcrdjx5sv6kv2j5mcb8g3xsws8j5x"
+ "196pm3ynfafqlcxah07hkvphf536hpix1ydgsynr1yg08aynlvvx"
else
- "0y9kw3k4yvrxwdy7zry7nip9mdiwyv35r6mx65g4w7qajiypfc7i";
+ "138r85n27ijzwxfwb5pcfyb79v14368jpckw0vmciz6pwf11bd9g";
};
buildAttrs = {
diff --git a/pkgs/development/ruby-modules/bundler-app/default.nix b/pkgs/development/ruby-modules/bundler-app/default.nix
index 58e72e4a9f42..f0727b3c1704 100644
--- a/pkgs/development/ruby-modules/bundler-app/default.nix
+++ b/pkgs/development/ruby-modules/bundler-app/default.nix
@@ -36,7 +36,7 @@
let
basicEnv = (callPackage ../bundled-common {}) args;
- cmdArgs = removeAttrs args [ "pname" "postBuild" "gemConfig" "passthru" ] // {
+ cmdArgs = removeAttrs args [ "pname" "postBuild" "gemConfig" "passthru" "gemset" ] // {
inherit preferLocalBuild allowSubstitutes; # pass the defaults
buildInputs = buildInputs ++ lib.optional (scripts != []) makeWrapper;
diff --git a/pkgs/development/tools/analysis/tflint/default.nix b/pkgs/development/tools/analysis/tflint/default.nix
index 24ad463439ab..5099505cc5b0 100644
--- a/pkgs/development/tools/analysis/tflint/default.nix
+++ b/pkgs/development/tools/analysis/tflint/default.nix
@@ -2,16 +2,16 @@
buildGoModule rec {
pname = "tflint";
- version = "0.10.1";
+ version = "0.10.3";
src = fetchFromGitHub {
owner = "wata727";
repo = pname;
rev = "v${version}";
- sha256 = "0x9kh0bvbil6z09v41gzk5sdiprqg288jfcjw1n2x809sj7c6vhf";
+ sha256 = "1p4w1ddgb4nqibbrvix0p0gdlj6ann5lkyvlcsbkn25z8ha3qa39";
};
- modSha256 = "0wig41m81kmy7l6sj6kk4ryc3m1b18n2vlf80x0bbhn46kyfnbgr";
+ modSha256 = "1snanz4cpqkfgxp8k52w3x4i49k6d5jffcffrcx8xya8yvx2wxy3";
subPackages = [ "." ];
diff --git a/pkgs/development/tools/build-managers/msbuild/default.nix b/pkgs/development/tools/build-managers/msbuild/default.nix
new file mode 100644
index 000000000000..e9bb3c27df9f
--- /dev/null
+++ b/pkgs/development/tools/build-managers/msbuild/default.nix
@@ -0,0 +1,133 @@
+{ stdenv, fetchurl, makeWrapper, glibcLocales, mono, dotnetPackages, unzip, dotnet-sdk }:
+
+let
+
+ xplat = fetchurl {
+ url = "https://github.com/mono/msbuild/releases/download/0.07/mono_msbuild_xplat-master-8f608e49.zip";
+ sha256 = "1jxq3fk9a6q2a8i9zacxaz3fkvc22i9qvzlpa7wbb95h42g0ffhq";
+ };
+
+ deps = import ./nuget.nix { inherit fetchurl; };
+
+in
+
+stdenv.mkDerivation rec {
+ pname = "msbuild";
+ version = "16.3+xamarinxplat.2019.07.26.14.57";
+
+ src = fetchurl {
+ url = "https://download.mono-project.com/sources/msbuild/msbuild-${version}.tar.xz";
+ sha256 = "1zcdfx4xsh62wj3g1jc2an0lppsfs691lz4dv05xbgi01aq1hk6a";
+ };
+
+ nativeBuildInputs = [
+ dotnet-sdk
+ mono
+ ];
+
+ buildInputs = [
+ dotnetPackages.Nuget
+ glibcLocales
+ makeWrapper
+ unzip
+ ];
+
+ # https://aur.archlinux.org/cgit/aur.git/tree/PKGBUILD?h=msbuild
+ phases = ["unpackPhase" "buildPhase" "installPhase" "installCheckPhase"];
+
+ # https://github.com/NixOS/nixpkgs/issues/38991
+ # bash: warning: setlocale: LC_ALL: cannot change locale (en_US.UTF-8)
+ LOCALE_ARCHIVE = stdenv.lib.optionalString stdenv.isLinux
+ "${glibcLocales}/lib/locale/locale-archive";
+
+ buildPhase = ''
+ # nuget would otherwise try to base itself in /homeless-shelter
+ export HOME=$(pwd)/fake-home
+
+ for package in ${toString deps}; do
+ nuget add $package -Source nixos
+ done
+
+ nuget sources Disable -Name "nuget.org"
+ nuget sources Add -Name nixos -Source $(pwd)/nixos
+
+ # license check is case sensitive
+ mv LICENSE license
+
+ mkdir -p artifacts
+ unzip ${xplat} -d artifacts
+ mv artifacts/msbuild artifacts/mono-msbuild
+ chmod +x artifacts/mono-msbuild/MSBuild.dll
+
+ ln -s $(find ${dotnet-sdk} -name libhostfxr.so) artifacts/mono-msbuild/SdkResolvers/Microsoft.DotNet.MSBuildSdkResolver/
+
+ # overwrite the file
+ echo "#!${stdenv.shell}" > eng/common/dotnet-install.sh
+
+ # msbuild response files to use only the nixos source
+ echo "/p:RestoreSources=nixos" > artifacts/mono-msbuild/MSBuild.rsp
+ echo "/p:RestoreSources=nixos" > src/MSBuild/MSBuild.rsp
+
+ # not patchShebangs, there is /bin/bash in the body of the script as well
+ substituteInPlace ./eng/cibuild_bootstrapped_msbuild.sh --replace /bin/bash ${stdenv.shell}
+
+ # DisableNerdbankVersioning https://gitter.im/Microsoft/msbuild/archives/2018/06/27?at=5b33dbc4ce3b0f268d489bfa
+ # TODO there are some (many?) failing tests
+ ./eng/cibuild_bootstrapped_msbuild.sh --host_type mono --configuration Release --skip_tests /p:DisableNerdbankVersioning=true
+ '';
+
+ installPhase = ''
+ mono artifacts/mono-msbuild/MSBuild.dll mono/build/install.proj /p:MonoInstallPrefix="$out" /p:Configuration=Release-MONO
+
+ ln -s ${mono}/lib/mono/msbuild/Current/bin/Roslyn $out/lib/mono/msbuild/Current/bin/Roslyn
+
+ makeWrapper ${mono}/bin/mono $out/bin/msbuild \
+ --set MSBuildExtensionsPath $out/lib/mono/xbuild \
+ --set-default MONO_GC_PARAMS "nursery-size=64m" \
+ --add-flags "$out/lib/mono/msbuild/15.0/bin/MSBuild.dll"
+ '';
+
+ doInstallCheck = true;
+
+ # https://docs.microsoft.com/cs-cz/visualstudio/msbuild/walkthrough-creating-an-msbuild-project-file-from-scratch?view=vs-2019
+ installCheckPhase = ''
+ cat > Helloworld.cs < Helloworld.csproj <
+
+
+
+
+
+
+
+EOF
+
+ $out/bin/msbuild Helloworld.csproj -t:Build
+ ${mono}/bin/mono Helloworld.exe | grep "Hello, world!"
+ '';
+
+ meta = with stdenv.lib; {
+ description = "Mono version of Microsoft Build Engine, the build platform for .NET, and Visual Studio";
+ homepage = https://github.com/mono/msbuild;
+ license = licenses.mit;
+ maintainers = with maintainers; [ jdanek ];
+ platforms = platforms.unix;
+ };
+}
+
diff --git a/pkgs/development/tools/build-managers/msbuild/nuget.nix b/pkgs/development/tools/build-managers/msbuild/nuget.nix
new file mode 100644
index 000000000000..0aae3840752d
--- /dev/null
+++ b/pkgs/development/tools/build-managers/msbuild/nuget.nix
@@ -0,0 +1,1130 @@
+{ fetchurl }: let
+
+ fetchNuGet = { url, name, version, sha256 }: fetchurl {
+ inherit name url sha256;
+ };
+
+in [
+(fetchNuGet {
+ name = "microsoft.build";
+ version = "14.3.0";
+ url = "https://www.nuget.org/api/v2/package/microsoft.build/14.3.0";
+ sha256 = "1zamn3p8xxi0wsjlpln0y71ncb977f3fp08mvaz4wmbmi76nr0rz";
+ })
+(fetchNuGet {
+ name = "system.io";
+ version = "4.1.0";
+ url = "https://www.nuget.org/api/v2/package/system.io/4.1.0";
+ sha256 = "1g0yb8p11vfd0kbkyzlfsbsp5z44lwsvyc0h3dpw6vqnbi035ajp";
+ })
+(fetchNuGet {
+ name = "system.io";
+ version = "4.3.0";
+ url = "https://www.nuget.org/api/v2/package/system.io/4.3.0";
+ sha256 = "05l9qdrzhm4s5dixmx68kxwif4l99ll5gqmh7rqgw554fx0agv5f";
+ })
+(fetchNuGet {
+ name = "system.xml.xpath";
+ version = "4.3.0";
+ url = "https://www.nuget.org/api/v2/package/system.xml.xpath/4.3.0";
+ sha256 = "1cv2m0p70774a0sd1zxc8fm8jk3i5zk2bla3riqvi8gsm0r4kpci";
+ })
+(fetchNuGet {
+ name = "microsoft.net.compilers.toolset";
+ version = "3.3.0-beta2-19367-02";
+ url = "https://dotnetfeed.blob.core.windows.net/dotnet-core/flatcontainer/microsoft.net.compilers.toolset/3.3.0-beta2-19367-02/microsoft.net.compilers.toolset.3.3.0-beta2-19367-02.nupkg";
+ sha256 = "1v9lz2fmfprhql0klqa8iipiiz3wcflvlgr3a86pcjjk7x0y84sl";
+ })
+(fetchNuGet {
+ name = "system.io.filesystem";
+ version = "4.0.1";
+ url = "https://www.nuget.org/api/v2/package/system.io.filesystem/4.0.1";
+ sha256 = "0kgfpw6w4djqra3w5crrg8xivbanh1w9dh3qapb28q060wb9flp1";
+ })
+(fetchNuGet {
+ name = "system.io.filesystem";
+ version = "4.3.0";
+ url = "https://www.nuget.org/api/v2/package/system.io.filesystem/4.3.0";
+ sha256 = "0z2dfrbra9i6y16mm9v1v6k47f0fm617vlb7s5iybjjsz6g1ilmw";
+ })
+(fetchNuGet {
+ name = "largeaddressaware";
+ version = "1.0.3";
+ url = "https://www.nuget.org/api/v2/package/largeaddressaware/1.0.3";
+ sha256 = "1ppss9bgj0hf5s8307bnm2a4qm10mrymp0v12m28a5q81zjz0fr5";
+ })
+(fetchNuGet {
+ name = "nuget.protocol";
+ version = "5.2.0-rtm.6067";
+ url = "https://dotnet.myget.org/F/nuget-build/api/v2/package/nuget.protocol/5.2.0-rtm.6067";
+ sha256 = "0fm3qgcdsy6dy6fih0n9a4w39mzdha4cz51gr9pp9g4nag34za2a";
+ })
+(fetchNuGet {
+ name = "runtime.native.system.security.cryptography.openssl";
+ version = "4.3.0";
+ url = "https://www.nuget.org/api/v2/package/runtime.native.system.security.cryptography.openssl/4.3.0";
+ sha256 = "18pzfdlwsg2nb1jjjjzyb5qlgy6xjxzmhnfaijq5s2jw3cm3ab97";
+ })
+(fetchNuGet {
+ name = "runtime.ubuntu.14.04-x64.runtime.native.system.security.cryptography.openssl";
+ version = "4.3.0";
+ url = "https://www.nuget.org/api/v2/package/runtime.ubuntu.14.04-x64.runtime.native.system.security.cryptography.openssl/4.3.0";
+ sha256 = "160p68l2c7cqmyqjwxydcvgw7lvl1cr0znkw8fp24d1by9mqc8p3";
+ })
+(fetchNuGet {
+ name = "system.buffers";
+ version = "4.3.0";
+ url = "https://www.nuget.org/api/v2/package/system.buffers/4.3.0";
+ sha256 = "0fgns20ispwrfqll4q1zc1waqcmylb3zc50ys9x8zlwxh9pmd9jy";
+ })
+(fetchNuGet {
+ name = "system.buffers";
+ version = "4.4.0";
+ url = "https://www.nuget.org/api/v2/package/system.buffers/4.4.0";
+ sha256 = "183f8063w8zqn99pv0ni0nnwh7fgx46qzxamwnans55hhs2l0g19";
+ })
+(fetchNuGet {
+ name = "xunit.core";
+ version = "2.4.1";
+ url = "https://www.nuget.org/api/v2/package/xunit.core/2.4.1";
+ sha256 = "1nnb3j4kzmycaw1g76ii4rfqkvg6l8gqh18falwp8g28h802019a";
+ })
+(fetchNuGet {
+ name = "system.io.filesystem.primitives";
+ version = "4.3.0";
+ url = "https://www.nuget.org/api/v2/package/system.io.filesystem.primitives/4.3.0";
+ sha256 = "0j6ndgglcf4brg2lz4wzsh1av1gh8xrzdsn9f0yznskhqn1xzj9c";
+ })
+(fetchNuGet {
+ name = "system.io.filesystem.primitives";
+ version = "4.0.1";
+ url = "https://www.nuget.org/api/v2/package/system.io.filesystem.primitives/4.0.1";
+ sha256 = "1s0mniajj3lvbyf7vfb5shp4ink5yibsx945k6lvxa96r8la1612";
+ })
+(fetchNuGet {
+ name = "system.xml.xmldocument";
+ version = "4.0.1";
+ url = "https://www.nuget.org/api/v2/package/system.xml.xmldocument/4.0.1";
+ sha256 = "0ihsnkvyc76r4dcky7v3ansnbyqjzkbyyia0ir5zvqirzan0bnl1";
+ })
+(fetchNuGet {
+ name = "system.xml.xmldocument";
+ version = "4.3.0";
+ url = "https://www.nuget.org/api/v2/package/system.xml.xmldocument/4.3.0";
+ sha256 = "0bmz1l06dihx52jxjr22dyv5mxv6pj4852lx68grjm7bivhrbfwi";
+ })
+(fetchNuGet {
+ name = "microsoft.build.framework";
+ version = "15.5.180";
+ url = "https://www.nuget.org/api/v2/package/microsoft.build.framework/15.5.180";
+ sha256 = "064y3a711ikx9pm9d2wyms4i3k4f9hfvn3vymhwygg7yv7gcj92z";
+ })
+(fetchNuGet {
+ name = "microsoft.build.framework";
+ version = "14.3.0";
+ url = "https://www.nuget.org/api/v2/package/microsoft.build.framework/14.3.0";
+ sha256 = "0r7y1i7dbr3pb53fdrh268hyi627w85nzv2iblwyg8dzkfxraafd";
+ })
+(fetchNuGet {
+ name = "system.globalization";
+ version = "4.3.0";
+ url = "https://www.nuget.org/api/v2/package/system.globalization/4.3.0";
+ sha256 = "1cp68vv683n6ic2zqh2s1fn4c2sd87g5hpp6l4d4nj4536jz98ki";
+ })
+(fetchNuGet {
+ name = "system.globalization";
+ version = "4.0.11";
+ url = "https://www.nuget.org/api/v2/package/system.globalization/4.0.11";
+ sha256 = "070c5jbas2v7smm660zaf1gh0489xanjqymkvafcs4f8cdrs1d5d";
+ })
+(fetchNuGet {
+ name = "microsoft.dotnet.signtool";
+ version = "1.0.0-beta.19372.10";
+ url = "https://dotnetfeed.blob.core.windows.net/dotnet-core/flatcontainer/microsoft.dotnet.signtool/1.0.0-beta.19372.10/microsoft.dotnet.signtool.1.0.0-beta.19372.10.nupkg";
+ sha256 = "1f2im2lilw10zslfclxh49knr542jy7q09p009flxsgn68riy0j6";
+ })
+(fetchNuGet {
+ name = "system.runtime.handles";
+ version = "4.3.0";
+ url = "https://www.nuget.org/api/v2/package/system.runtime.handles/4.3.0";
+ sha256 = "0sw2gfj2xr7sw9qjn0j3l9yw07x73lcs97p8xfc9w1x9h5g5m7i8";
+ })
+(fetchNuGet {
+ name = "system.runtime.handles";
+ version = "4.0.1";
+ url = "https://www.nuget.org/api/v2/package/system.runtime.handles/4.0.1";
+ sha256 = "1g0zrdi5508v49pfm3iii2hn6nm00bgvfpjq1zxknfjrxxa20r4g";
+ })
+(fetchNuGet {
+ name = "microsoft.codeanalysis.common";
+ version = "3.0.0-beta1-61516-01";
+ url = "https://dotnet.myget.org/F/roslyn/api/v2/package/microsoft.codeanalysis.common/3.0.0-beta1-61516-01";
+ sha256 = "1qfm61yrsmihhir7n3hb5ccn1r50i39rv1g74880ma7ihjl1hz54";
+ })
+(fetchNuGet {
+ name = "microsoft.netcore.platforms";
+ version = "1.0.1";
+ url = "https://www.nuget.org/api/v2/package/microsoft.netcore.platforms/1.0.1";
+ sha256 = "01al6cfxp68dscl15z7rxfw9zvhm64dncsw09a1vmdkacsa2v6lr";
+ })
+(fetchNuGet {
+ name = "microsoft.netcore.platforms";
+ version = "1.1.0";
+ url = "https://www.nuget.org/api/v2/package/microsoft.netcore.platforms/1.1.0";
+ sha256 = "08vh1r12g6ykjygq5d3vq09zylgb84l63k49jc4v8faw9g93iqqm";
+ })
+(fetchNuGet {
+ name = "system.reflection.primitives";
+ version = "4.3.0";
+ url = "https://www.nuget.org/api/v2/package/system.reflection.primitives/4.3.0";
+ sha256 = "04xqa33bld78yv5r93a8n76shvc8wwcdgr1qvvjh959g3rc31276";
+ })
+(fetchNuGet {
+ name = "system.reflection.primitives";
+ version = "4.0.1";
+ url = "https://www.nuget.org/api/v2/package/system.reflection.primitives/4.0.1";
+ sha256 = "1bangaabhsl4k9fg8khn83wm6yial8ik1sza7401621jc6jrym28";
+ })
+(fetchNuGet {
+ name = "microbuild.core";
+ version = "0.2.0";
+ url = "https://www.nuget.org/api/v2/package/microbuild.core/0.2.0";
+ sha256 = "0q4s45jskbyxfx4ay6znnvv94zma2wd85b8rwmwszd2nb0xl3194";
+ })
+(fetchNuGet {
+ name = "system.diagnostics.tracesource";
+ version = "4.0.0";
+ url = "https://www.nuget.org/api/v2/package/system.diagnostics.tracesource/4.0.0";
+ sha256 = "1mc7r72xznczzf6mz62dm8xhdi14if1h8qgx353xvhz89qyxsa3h";
+ })
+(fetchNuGet {
+ name = "system.runtime.numerics";
+ version = "4.3.0";
+ url = "https://www.nuget.org/api/v2/package/system.runtime.numerics/4.3.0";
+ sha256 = "19rav39sr5dky7afygh309qamqqmi9kcwvz3i0c5700v0c5cg61z";
+ })
+(fetchNuGet {
+ name = "system.threading.tasks.parallel";
+ version = "4.3.0";
+ url = "https://www.nuget.org/api/v2/package/system.threading.tasks.parallel/4.3.0";
+ sha256 = "1rr3qa4hxwyj531s4nb3bwrxnxxwz617i0n9gh6x7nr7dd3ayzgh";
+ })
+(fetchNuGet {
+ name = "system.threading.tasks.parallel";
+ version = "4.0.1";
+ url = "https://www.nuget.org/api/v2/package/system.threading.tasks.parallel/4.0.1";
+ sha256 = "114wdg32hr46dfsnns3pgs67kcha5jn47p5gg0mhxfn5vrkr2p75";
+ })
+(fetchNuGet {
+ name = "nuget.credentials";
+ version = "5.2.0-rtm.6067";
+ url = "https://dotnet.myget.org/F/nuget-build/api/v2/package/nuget.credentials/5.2.0-rtm.6067";
+ sha256 = "07g2na590sph9li5igww74i3gqyrj5cb6gsgjh54f1f4bs4x1c4k";
+ })
+(fetchNuGet {
+ name = "system.objectmodel";
+ version = "4.0.12";
+ url = "https://www.nuget.org/api/v2/package/system.objectmodel/4.0.12";
+ sha256 = "1sybkfi60a4588xn34nd9a58png36i0xr4y4v4kqpg8wlvy5krrj";
+ })
+(fetchNuGet {
+ name = "system.objectmodel";
+ version = "4.3.0";
+ url = "https://www.nuget.org/api/v2/package/system.objectmodel/4.3.0";
+ sha256 = "191p63zy5rpqx7dnrb3h7prvgixmk168fhvvkkvhlazncf8r3nc2";
+ })
+(fetchNuGet {
+ name = "system.xml.xmlserializer";
+ version = "4.0.11";
+ url = "https://www.nuget.org/api/v2/package/system.xml.xmlserializer/4.0.11";
+ sha256 = "01nzc3gdslw90qfykq4qzr2mdnqxjl4sj0wp3fixiwdmlmvpib5z";
+ })
+(fetchNuGet {
+ name = "microsoft.codeanalysis.build.tasks";
+ version = "3.0.0-beta1-61516-01";
+ url = "https://dotnet.myget.org/F/roslyn/api/v2/package/microsoft.codeanalysis.build.tasks/3.0.0-beta1-61516-01";
+ sha256 = "1cjpqbd4i0gxhh86nvamlpkisd1krcrya6riwjhghvpjph6115vp";
+ })
+(fetchNuGet {
+ name = "system.private.datacontractserialization";
+ version = "4.1.1";
+ url = "https://www.nuget.org/api/v2/package/system.private.datacontractserialization/4.1.1";
+ sha256 = "1xk9wvgzipssp1393nsg4n16zbr5481k03nkdlj954hzq5jkx89r";
+ })
+(fetchNuGet {
+ name = "system.numerics.vectors";
+ version = "4.4.0";
+ url = "https://www.nuget.org/api/v2/package/system.numerics.vectors/4.4.0";
+ sha256 = "0rdvma399070b0i46c4qq1h2yvjj3k013sqzkilz4bz5cwmx1rba";
+ })
+(fetchNuGet {
+ name = "microsoft.build.centralpackageversions";
+ version = "2.0.1";
+ url = "https://www.nuget.org/api/v2/package/microsoft.build.centralpackageversions/2.0.1";
+ sha256 = "17cjiaj2b98q8s89168g42jb8rhwm6062jcbv57rbkdiiwdsn55k";
+ })
+(fetchNuGet {
+ name = "system.text.encoding.extensions";
+ version = "4.0.11";
+ url = "https://www.nuget.org/api/v2/package/system.text.encoding.extensions/4.0.11";
+ sha256 = "08nsfrpiwsg9x5ml4xyl3zyvjfdi4mvbqf93kjdh11j4fwkznizs";
+ })
+(fetchNuGet {
+ name = "system.text.encoding.extensions";
+ version = "4.3.0";
+ url = "https://www.nuget.org/api/v2/package/system.text.encoding.extensions/4.3.0";
+ sha256 = "11q1y8hh5hrp5a3kw25cb6l00v5l5dvirkz8jr3sq00h1xgcgrxy";
+ })
+(fetchNuGet {
+ name = "microsoft.visualstudio.sdk.embedinteroptypes";
+ version = "15.0.15";
+ url = "https://www.nuget.org/api/v2/package/microsoft.visualstudio.sdk.embedinteroptypes/15.0.15";
+ sha256 = "0chr3slzzcanwcyd9isx4gichqzmfh4zd3h83piw0r4xsww1wmpd";
+ })
+(fetchNuGet {
+ name = "runtime.ubuntu.16.04-x64.runtime.native.system.security.cryptography.openssl";
+ version = "4.3.0";
+ url = "https://www.nuget.org/api/v2/package/runtime.ubuntu.16.04-x64.runtime.native.system.security.cryptography.openssl/4.3.0";
+ sha256 = "15zrc8fgd8zx28hdghcj5f5i34wf3l6bq5177075m2bc2j34jrqy";
+ })
+(fetchNuGet {
+ name = "system.runtime.extensions";
+ version = "4.1.0";
+ url = "https://www.nuget.org/api/v2/package/system.runtime.extensions/4.1.0";
+ sha256 = "0rw4rm4vsm3h3szxp9iijc3ksyviwsv6f63dng3vhqyg4vjdkc2z";
+ })
+(fetchNuGet {
+ name = "system.runtime.extensions";
+ version = "4.3.0";
+ url = "https://www.nuget.org/api/v2/package/system.runtime.extensions/4.3.0";
+ sha256 = "1ykp3dnhwvm48nap8q23893hagf665k0kn3cbgsqpwzbijdcgc60";
+ })
+(fetchNuGet {
+ name = "system.resources.extensions";
+ version = "4.6.0-preview8.19364.1";
+ url = "https://dotnetfeed.blob.core.windows.net/dotnet-core/flatcontainer/system.resources.extensions/4.6.0-preview8.19364.1/system.resources.extensions.4.6.0-preview8.19364.1.nupkg";
+ sha256 = "0jh9ilbicmsngv77a4ayzs0n7s440ycdf726nbljw029gq4rzvqf";
+ })
+(fetchNuGet {
+ name = "nuget.frameworks";
+ version = "5.2.0-rtm.6067";
+ url = "https://dotnet.myget.org/F/nuget-build/api/v2/package/nuget.frameworks/5.2.0-rtm.6067";
+ sha256 = "1g1kcfqhxr1bhl3ksbdmz3rb9nq1qmkac1sijf9ng4gmr9fmprdm";
+ })
+(fetchNuGet {
+ name = "system.diagnostics.diagnosticsource";
+ version = "4.3.0";
+ url = "https://www.nuget.org/api/v2/package/system.diagnostics.diagnosticsource/4.3.0";
+ sha256 = "0z6m3pbiy0qw6rn3n209rrzf9x1k4002zh90vwcrsym09ipm2liq";
+ })
+(fetchNuGet {
+ name = "system.security.claims";
+ version = "4.3.0";
+ url = "https://www.nuget.org/api/v2/package/system.security.claims/4.3.0";
+ sha256 = "0jvfn7j22l3mm28qjy3rcw287y9h65ha4m940waaxah07jnbzrhn";
+ })
+(fetchNuGet {
+ name = "system.linq.expressions";
+ version = "4.3.0";
+ url = "https://www.nuget.org/api/v2/package/system.linq.expressions/4.3.0";
+ sha256 = "0ky2nrcvh70rqq88m9a5yqabsl4fyd17bpr63iy2mbivjs2nyypv";
+ })
+(fetchNuGet {
+ name = "system.diagnostics.stacktrace";
+ version = "4.3.0";
+ url = "https://www.nuget.org/api/v2/package/system.diagnostics.stacktrace/4.3.0";
+ sha256 = "0ash4h9k0m7xsm0yl79r0ixrdz369h7y922wipp5gladmlbvpyjd";
+ })
+(fetchNuGet {
+ name = "runtime.osx.10.10-x64.runtime.native.system.security.cryptography.openssl";
+ version = "4.3.0";
+ url = "https://www.nuget.org/api/v2/package/runtime.osx.10.10-x64.runtime.native.system.security.cryptography.openssl/4.3.0";
+ sha256 = "0zcxjv5pckplvkg0r6mw3asggm7aqzbdjimhvsasb0cgm59x09l3";
+ })
+(fetchNuGet {
+ name = "system.diagnostics.tracing";
+ version = "4.3.0";
+ url = "https://www.nuget.org/api/v2/package/system.diagnostics.tracing/4.3.0";
+ sha256 = "1m3bx6c2s958qligl67q7grkwfz3w53hpy7nc97mh6f7j5k168c4";
+ })
+(fetchNuGet {
+ name = "system.diagnostics.tracing";
+ version = "4.1.0";
+ url = "https://www.nuget.org/api/v2/package/system.diagnostics.tracing/4.1.0";
+ sha256 = "1d2r76v1x610x61ahfpigda89gd13qydz6vbwzhpqlyvq8jj6394";
+ })
+(fetchNuGet {
+ name = "xunit.analyzers";
+ version = "0.10.0";
+ url = "https://www.nuget.org/api/v2/package/xunit.analyzers/0.10.0";
+ sha256 = "15n02q3akyqbvkp8nq75a8rd66d4ax0rx8fhdcn8j78pi235jm7j";
+ })
+(fetchNuGet {
+ name = "xunit.assert";
+ version = "2.4.1";
+ url = "https://www.nuget.org/api/v2/package/xunit.assert/2.4.1";
+ sha256 = "1imynzh80wxq2rp9sc4gxs4x1nriil88f72ilhj5q0m44qqmqpc6";
+ })
+(fetchNuGet {
+ name = "system.appcontext";
+ version = "4.1.0";
+ url = "https://www.nuget.org/api/v2/package/system.appcontext/4.1.0";
+ sha256 = "0fv3cma1jp4vgj7a8hqc9n7hr1f1kjp541s6z0q1r6nazb4iz9mz";
+ })
+(fetchNuGet {
+ name = "system.appcontext";
+ version = "4.3.0";
+ url = "https://www.nuget.org/api/v2/package/system.appcontext/4.3.0";
+ sha256 = "1649qvy3dar900z3g817h17nl8jp4ka5vcfmsr05kh0fshn7j3ya";
+ })
+(fetchNuGet {
+ name = "system.text.encoding.codepages";
+ version = "4.3.0";
+ url = "https://www.nuget.org/api/v2/package/system.text.encoding.codepages/4.3.0";
+ sha256 = "0lgxg1gn7pg7j0f942pfdc9q7wamzxsgq3ng248ikdasxz0iadkv";
+ })
+(fetchNuGet {
+ name = "system.text.encoding.codepages";
+ version = "4.0.1";
+ url = "https://www.nuget.org/api/v2/package/system.text.encoding.codepages/4.0.1";
+ sha256 = "00wpm3b9y0k996rm9whxprngm8l500ajmzgy2ip9pgwk0icp06y3";
+ })
+(fetchNuGet {
+ name = "runtime.fedora.24-x64.runtime.native.system.security.cryptography.openssl";
+ version = "4.3.0";
+ url = "https://www.nuget.org/api/v2/package/runtime.fedora.24-x64.runtime.native.system.security.cryptography.openssl/4.3.0";
+ sha256 = "0c2p354hjx58xhhz7wv6div8xpi90sc6ibdm40qin21bvi7ymcaa";
+ })
+(fetchNuGet {
+ name = "microsoft.codeanalysis.csharp";
+ version = "3.0.0-beta1-61516-01";
+ url = "https://dotnet.myget.org/F/roslyn/api/v2/package/microsoft.codeanalysis.csharp/3.0.0-beta1-61516-01";
+ sha256 = "0a7npkdw6s5jczw1lkm63x2bpz1z3ccid20h5nm6k78cv7sihm4h";
+ })
+(fetchNuGet {
+ name = "system.console";
+ version = "4.0.0";
+ url = "https://www.nuget.org/api/v2/package/system.console/4.0.0";
+ sha256 = "0ynxqbc3z1nwbrc11hkkpw9skw116z4y9wjzn7id49p9yi7mzmlf";
+ })
+(fetchNuGet {
+ name = "system.console";
+ version = "4.3.0";
+ url = "https://www.nuget.org/api/v2/package/system.console/4.3.0";
+ sha256 = "1flr7a9x920mr5cjsqmsy9wgnv3lvd0h1g521pdr1lkb2qycy7ay";
+ })
+(fetchNuGet {
+ name = "system.reflection.typeextensions";
+ version = "4.1.0";
+ url = "https://www.nuget.org/api/v2/package/system.reflection.typeextensions/4.1.0";
+ sha256 = "1bjli8a7sc7jlxqgcagl9nh8axzfl11f4ld3rjqsyxc516iijij7";
+ })
+(fetchNuGet {
+ name = "system.runtime.compilerservices.unsafe";
+ version = "4.5.2";
+ url = "https://www.nuget.org/api/v2/package/system.runtime.compilerservices.unsafe/4.5.2";
+ sha256 = "1vz4275fjij8inf31np78hw50al8nqkngk04p3xv5n4fcmf1grgi";
+ })
+(fetchNuGet {
+ name = "system.threading.tasks";
+ version = "4.3.0";
+ url = "https://www.nuget.org/api/v2/package/system.threading.tasks/4.3.0";
+ sha256 = "134z3v9abw3a6jsw17xl3f6hqjpak5l682k2vz39spj4kmydg6k7";
+ })
+(fetchNuGet {
+ name = "system.threading.tasks";
+ version = "4.0.11";
+ url = "https://www.nuget.org/api/v2/package/system.threading.tasks/4.0.11";
+ sha256 = "0nr1r41rak82qfa5m0lhk9mp0k93bvfd7bbd9sdzwx9mb36g28p5";
+ })
+(fetchNuGet {
+ name = "xunit.abstractions";
+ version = "2.0.3";
+ url = "https://www.nuget.org/api/v2/package/xunit.abstractions/2.0.3";
+ sha256 = "00wl8qksgkxld76fgir3ycc5rjqv1sqds6x8yx40927q5py74gfh";
+ })
+(fetchNuGet {
+ name = "microsoft.build.utilities.core";
+ version = "15.5.180";
+ url = "https://www.nuget.org/api/v2/package/microsoft.build.utilities.core/15.5.180";
+ sha256 = "0c4bjhaqgc98bchln8p5d2p1vyn8qrha2b8gpn2l7bnznbcrd630";
+ })
+(fetchNuGet {
+ name = "microsoft.build.utilities.core";
+ version = "14.3.0";
+ url = "https://www.nuget.org/api/v2/package/microsoft.build.utilities.core/14.3.0";
+ sha256 = "0351nsnx12nzkss6vaqwwh7d7car7hrgyh0vyd4bl83c4x3ls1kb";
+ })
+(fetchNuGet {
+ name = "system.reflection.emit";
+ version = "4.0.1";
+ url = "https://www.nuget.org/api/v2/package/system.reflection.emit/4.0.1";
+ sha256 = "0ydqcsvh6smi41gyaakglnv252625hf29f7kywy2c70nhii2ylqp";
+ })
+(fetchNuGet {
+ name = "microsoft.visualstudio.setup.configuration.interop";
+ version = "1.16.30";
+ url = "https://www.nuget.org/api/v2/package/microsoft.visualstudio.setup.configuration.interop/1.16.30";
+ sha256 = "14022lx03vdcqlvbbdmbsxg5pqfx1rfq2jywxlyaz9v68cvsb0g4";
+ })
+(fetchNuGet {
+ name = "system.net.sockets";
+ version = "4.3.0";
+ url = "https://www.nuget.org/api/v2/package/system.net.sockets/4.3.0";
+ sha256 = "1ssa65k6chcgi6mfmzrznvqaxk8jp0gvl77xhf1hbzakjnpxspla";
+ })
+(fetchNuGet {
+ name = "microsoft.dotnet.arcade.sdk";
+ version = "1.0.0-beta.19372.10";
+ url = "https://dotnetfeed.blob.core.windows.net/dotnet-core/flatcontainer/microsoft.dotnet.arcade.sdk/1.0.0-beta.19372.10/microsoft.dotnet.arcade.sdk.1.0.0-beta.19372.10.nupkg";
+ sha256 = "1lii0yg4fbsma80mmvw2zwplc26abb46q6gkxwbsbkyszkw128hv";
+ })
+(fetchNuGet {
+ name = "runtime.fedora.23-x64.runtime.native.system.security.cryptography.openssl";
+ version = "4.3.0";
+ url = "https://www.nuget.org/api/v2/package/runtime.fedora.23-x64.runtime.native.system.security.cryptography.openssl/4.3.0";
+ sha256 = "0hkg03sgm2wyq8nqk6dbm9jh5vcq57ry42lkqdmfklrw89lsmr59";
+ })
+(fetchNuGet {
+ name = "runtime.native.system.io.compression";
+ version = "4.3.0";
+ url = "https://www.nuget.org/api/v2/package/runtime.native.system.io.compression/4.3.0";
+ sha256 = "1vvivbqsk6y4hzcid27pqpm5bsi6sc50hvqwbcx8aap5ifrxfs8d";
+ })
+(fetchNuGet {
+ name = "system.diagnostics.debug";
+ version = "4.3.0";
+ url = "https://www.nuget.org/api/v2/package/system.diagnostics.debug/4.3.0";
+ sha256 = "00yjlf19wjydyr6cfviaph3vsjzg3d5nvnya26i2fvfg53sknh3y";
+ })
+(fetchNuGet {
+ name = "system.diagnostics.debug";
+ version = "4.0.11";
+ url = "https://www.nuget.org/api/v2/package/system.diagnostics.debug/4.0.11";
+ sha256 = "0gmjghrqmlgzxivd2xl50ncbglb7ljzb66rlx8ws6dv8jm0d5siz";
+ })
+(fetchNuGet {
+ name = "system.xml.readerwriter";
+ version = "4.3.0";
+ url = "https://www.nuget.org/api/v2/package/system.xml.readerwriter/4.3.0";
+ sha256 = "0c47yllxifzmh8gq6rq6l36zzvw4kjvlszkqa9wq3fr59n0hl3s1";
+ })
+(fetchNuGet {
+ name = "system.xml.readerwriter";
+ version = "4.0.11";
+ url = "https://www.nuget.org/api/v2/package/system.xml.readerwriter/4.0.11";
+ sha256 = "0c6ky1jk5ada9m94wcadih98l6k1fvf6vi7vhn1msjixaha419l5";
+ })
+(fetchNuGet {
+ name = "system.threading.timer";
+ version = "4.3.0";
+ url = "https://www.nuget.org/api/v2/package/system.threading.timer/4.3.0";
+ sha256 = "1nx773nsx6z5whv8kaa1wjh037id2f1cxhb69pvgv12hd2b6qs56";
+ })
+(fetchNuGet {
+ name = "system.threading.timer";
+ version = "4.0.1";
+ url = "https://www.nuget.org/api/v2/package/system.threading.timer/4.0.1";
+ sha256 = "15n54f1f8nn3mjcjrlzdg6q3520571y012mx7v991x2fvp73lmg6";
+ })
+(fetchNuGet {
+ name = "system.reflection.metadata";
+ version = "1.4.2";
+ url = "https://www.nuget.org/api/v2/package/system.reflection.metadata/1.4.2";
+ sha256 = "08b7b43vczlliv8k7q43jinjfrxwpljsglw7sxmc6sd7d54pd1vi";
+ })
+(fetchNuGet {
+ name = "system.reflection.metadata";
+ version = "1.6.0";
+ url = "https://www.nuget.org/api/v2/package/system.reflection.metadata/1.6.0";
+ sha256 = "1wdbavrrkajy7qbdblpbpbalbdl48q3h34cchz24gvdgyrlf15r4";
+ })
+(fetchNuGet {
+ name = "system.xml.xdocument";
+ version = "4.3.0";
+ url = "https://www.nuget.org/api/v2/package/system.xml.xdocument/4.3.0";
+ sha256 = "08h8fm4l77n0nd4i4fk2386y809bfbwqb7ih9d7564ifcxr5ssxd";
+ })
+(fetchNuGet {
+ name = "system.linq";
+ version = "4.3.0";
+ url = "https://www.nuget.org/api/v2/package/system.linq/4.3.0";
+ sha256 = "1w0gmba695rbr80l1k2h4mrwzbzsyfl2z4klmpbsvsg5pm4a56s7";
+ })
+(fetchNuGet {
+ name = "system.linq";
+ version = "4.1.0";
+ url = "https://www.nuget.org/api/v2/package/system.linq/4.1.0";
+ sha256 = "1ppg83svb39hj4hpp5k7kcryzrf3sfnm08vxd5sm2drrijsla2k5";
+ })
+(fetchNuGet {
+ name = "nuget.librarymodel";
+ version = "5.2.0-rtm.6067";
+ url = "https://dotnet.myget.org/F/nuget-build/api/v2/package/nuget.librarymodel/5.2.0-rtm.6067";
+ sha256 = "0dxvnspgkc1lcmilb67kkipg39ih34cmifs6jwk9kbrwf96z51q9";
+ })
+(fetchNuGet {
+ name = "xlifftasks";
+ version = "1.0.0-beta.19252.1";
+ url = "https://dotnetfeed.blob.core.windows.net/dotnet-core/flatcontainer/xlifftasks/1.0.0-beta.19252.1/xlifftasks.1.0.0-beta.19252.1.nupkg";
+ sha256 = "0249sfb30y9dgsfryaj8644qw3yc1xp2xzc08lsrwvmm8vjcvkri";
+ })
+(fetchNuGet {
+ name = "system.text.regularexpressions";
+ version = "4.3.0";
+ url = "https://www.nuget.org/api/v2/package/system.text.regularexpressions/4.3.0";
+ sha256 = "1bgq51k7fwld0njylfn7qc5fmwrk2137gdq7djqdsw347paa9c2l";
+ })
+(fetchNuGet {
+ name = "system.text.regularexpressions";
+ version = "4.1.0";
+ url = "https://www.nuget.org/api/v2/package/system.text.regularexpressions/4.1.0";
+ sha256 = "1mw7vfkkyd04yn2fbhm38msk7dz2xwvib14ygjsb8dq2lcvr18y7";
+ })
+(fetchNuGet {
+ name = "system.security.accesscontrol";
+ version = "4.3.0";
+ url = "https://www.nuget.org/api/v2/package/system.security.accesscontrol/4.3.0";
+ sha256 = "1gakrskmlmwhzmjc1c2mrwk0fml615rsk31dw0kbjnn9yqnnrjbi";
+ })
+(fetchNuGet {
+ name = "xunit.runner.visualstudio";
+ version = "2.4.1";
+ url = "https://www.nuget.org/api/v2/package/xunit.runner.visualstudio/2.4.1";
+ sha256 = "0fln5pk18z98gp0zfshy1p9h6r9wc55nyqhap34k89yran646vhn";
+ })
+(fetchNuGet {
+ name = "system.resources.resourcemanager";
+ version = "4.0.1";
+ url = "https://www.nuget.org/api/v2/package/system.resources.resourcemanager/4.0.1";
+ sha256 = "0b4i7mncaf8cnai85jv3wnw6hps140cxz8vylv2bik6wyzgvz7bi";
+ })
+(fetchNuGet {
+ name = "system.resources.resourcemanager";
+ version = "4.3.0";
+ url = "https://www.nuget.org/api/v2/package/system.resources.resourcemanager/4.3.0";
+ sha256 = "0sjqlzsryb0mg4y4xzf35xi523s4is4hz9q4qgdvlvgivl7qxn49";
+ })
+(fetchNuGet {
+ name = "nuget.projectmodel";
+ version = "5.2.0-rtm.6067";
+ url = "https://dotnet.myget.org/F/nuget-build/api/v2/package/nuget.projectmodel/5.2.0-rtm.6067";
+ sha256 = "1s5950nbcsnfrpbaxdnl6cv1xbsa57fln04lhyrki536476a6wcn";
+ })
+(fetchNuGet {
+ name = "nuget.versioning";
+ version = "5.2.0-rtm.6067";
+ url = "https://dotnet.myget.org/F/nuget-build/api/v2/package/nuget.versioning/5.2.0-rtm.6067";
+ sha256 = "04rr31ms95h7ymqxlalpv3xs48j8ng4ljfz5lmrfw7547rhcrj2h";
+ })
+(fetchNuGet {
+ name = "system.memory";
+ version = "4.5.3";
+ url = "https://www.nuget.org/api/v2/package/system.memory/4.5.3";
+ sha256 = "0naqahm3wljxb5a911d37mwjqjdxv9l0b49p5dmfyijvni2ppy8a";
+ })
+(fetchNuGet {
+ name = "system.resources.reader";
+ version = "4.0.0";
+ url = "https://www.nuget.org/api/v2/package/system.resources.reader/4.0.0";
+ sha256 = "1jafi73dcf1lalrir46manq3iy6xnxk2z7gpdpwg4wqql7dv3ril";
+ })
+(fetchNuGet {
+ name = "nuget.common";
+ version = "5.2.0-rtm.6067";
+ url = "https://dotnet.myget.org/F/nuget-build/api/v2/package/nuget.common/5.2.0-rtm.6067";
+ sha256 = "1ff5dhkv8v04n2kr5gyjjvki4mqsp1w4dwsgj7cvdcfcm8alba0m";
+ })
+(fetchNuGet {
+ name = "runtime.native.system";
+ version = "4.0.0";
+ url = "https://www.nuget.org/api/v2/package/runtime.native.system/4.0.0";
+ sha256 = "1ppk69xk59ggacj9n7g6fyxvzmk1g5p4fkijm0d7xqfkig98qrkf";
+ })
+(fetchNuGet {
+ name = "runtime.native.system";
+ version = "4.3.0";
+ url = "https://www.nuget.org/api/v2/package/runtime.native.system/4.3.0";
+ sha256 = "15hgf6zaq9b8br2wi1i3x0zvmk410nlmsmva9p0bbg73v6hml5k4";
+ })
+(fetchNuGet {
+ name = "system.runtime.interopservices";
+ version = "4.1.0";
+ url = "https://www.nuget.org/api/v2/package/system.runtime.interopservices/4.1.0";
+ sha256 = "01kxqppx3dr3b6b286xafqilv4s2n0gqvfgzfd4z943ga9i81is1";
+ })
+(fetchNuGet {
+ name = "system.runtime.interopservices";
+ version = "4.3.0";
+ url = "https://www.nuget.org/api/v2/package/system.runtime.interopservices/4.3.0";
+ sha256 = "00hywrn4g7hva1b2qri2s6rabzwgxnbpw9zfxmz28z09cpwwgh7j";
+ })
+(fetchNuGet {
+ name = "microbuild.core.sentinel";
+ version = "1.0.0";
+ url = "https://dotnetfeed.blob.core.windows.net/dotnet-core/flatcontainer/microbuild.core.sentinel/1.0.0/microbuild.core.sentinel.1.0.0.nupkg";
+ sha256 = "035kqx5fkapql108n222lz8psvxk04mv3dy1qg3h08i4b8j3dy8i";
+ })
+(fetchNuGet {
+ name = "sn";
+ version = "1.0.0";
+ url = "https://dotnetfeed.blob.core.windows.net/dotnet-core/flatcontainer/sn/1.0.0/sn.1.0.0.nupkg";
+ sha256 = "1012fcdc6vq2355v86h434s6p2nnqgpdapb7p25l4h39g5q8p1qs";
+ })
+(fetchNuGet {
+ name = "system.text.encoding";
+ version = "4.0.11";
+ url = "https://www.nuget.org/api/v2/package/system.text.encoding/4.0.11";
+ sha256 = "1dyqv0hijg265dwxg6l7aiv74102d6xjiwplh2ar1ly6xfaa4iiw";
+ })
+(fetchNuGet {
+ name = "system.text.encoding";
+ version = "4.3.0";
+ url = "https://www.nuget.org/api/v2/package/system.text.encoding/4.3.0";
+ sha256 = "1f04lkir4iladpp51sdgmis9dj4y8v08cka0mbmsy0frc9a4gjqr";
+ })
+(fetchNuGet {
+ name = "runtime.ubuntu.16.10-x64.runtime.native.system.security.cryptography.openssl";
+ version = "4.3.0";
+ url = "https://www.nuget.org/api/v2/package/runtime.ubuntu.16.10-x64.runtime.native.system.security.cryptography.openssl/4.3.0";
+ sha256 = "1p4dgxax6p7rlgj4q73k73rslcnz4wdcv8q2flg1s8ygwcm58ld5";
+ })
+(fetchNuGet {
+ name = "system.reflection.emit.lightweight";
+ version = "4.0.1";
+ url = "https://www.nuget.org/api/v2/package/system.reflection.emit.lightweight/4.0.1";
+ sha256 = "1s4b043zdbx9k39lfhvsk68msv1nxbidhkq6nbm27q7sf8xcsnxr";
+ })
+(fetchNuGet {
+ name = "microsoft.net.test.sdk";
+ version = "15.9.0";
+ url = "https://www.nuget.org/api/v2/package/microsoft.net.test.sdk/15.9.0";
+ sha256 = "0g7wjgiigs4v8qa32g9ysqgx8bx55dzmbxfkc4ic95mpd1vkjqxw";
+ })
+(fetchNuGet {
+ name = "system.io.compression";
+ version = "4.3.0";
+ url = "https://www.nuget.org/api/v2/package/system.io.compression/4.3.0";
+ sha256 = "084zc82yi6yllgda0zkgl2ys48sypiswbiwrv7irb3r0ai1fp4vz";
+ })
+(fetchNuGet {
+ name = "system.runtime.serialization.primitives";
+ version = "4.1.1";
+ url = "https://www.nuget.org/api/v2/package/system.runtime.serialization.primitives/4.1.1";
+ sha256 = "042rfjixknlr6r10vx2pgf56yming8lkjikamg3g4v29ikk78h7k";
+ })
+(fetchNuGet {
+ name = "system.diagnostics.fileversioninfo";
+ version = "4.3.0";
+ url = "https://www.nuget.org/api/v2/package/system.diagnostics.fileversioninfo/4.3.0";
+ sha256 = "094hx249lb3vb336q7dg3v257hbxvz2jnalj695l7cg5kxzqwai7";
+ })
+(fetchNuGet {
+ name = "system.xml.xpath.xdocument";
+ version = "4.3.0";
+ url = "https://www.nuget.org/api/v2/package/system.xml.xpath.xdocument/4.3.0";
+ sha256 = "1wxckyb7n1pi433xzz0qcwcbl1swpra64065mbwwi8dhdc4kiabn";
+ })
+(fetchNuGet {
+ name = "system.security.principal.windows";
+ version = "4.3.0";
+ url = "https://www.nuget.org/api/v2/package/system.security.principal.windows/4.3.0";
+ sha256 = "00a0a7c40i3v4cb20s2cmh9csb5jv2l0frvnlzyfxh848xalpdwr";
+ })
+(fetchNuGet {
+ name = "vswhere";
+ version = "2.6.7";
+ url = "https://www.nuget.org/api/v2/package/vswhere/2.6.7";
+ sha256 = "0h4k5i96p7633zzf4xsv7615f9x72rr5qr7b9934ri2y6gshfcwk";
+ })
+(fetchNuGet {
+ name = "runtime.opensuse.13.2-x64.runtime.native.system.security.cryptography.openssl";
+ version = "4.3.0";
+ url = "https://www.nuget.org/api/v2/package/runtime.opensuse.13.2-x64.runtime.native.system.security.cryptography.openssl/4.3.0";
+ sha256 = "0qyynf9nz5i7pc26cwhgi8j62ps27sqmf78ijcfgzab50z9g8ay3";
+ })
+(fetchNuGet {
+ name = "xunit.runner.console";
+ version = "2.4.1";
+ url = "https://www.nuget.org/api/v2/package/xunit.runner.console/2.4.1";
+ sha256 = "13ykz9anhz72xc4q6byvdfwrp54hlcbl6zsfapwfhnzyvfgb9w13";
+ })
+(fetchNuGet {
+ name = "system.threading";
+ version = "4.0.11";
+ url = "https://www.nuget.org/api/v2/package/system.threading/4.0.11";
+ sha256 = "19x946h926bzvbsgj28csn46gak2crv2skpwsx80hbgazmkgb1ls";
+ })
+(fetchNuGet {
+ name = "system.threading";
+ version = "4.3.0";
+ url = "https://www.nuget.org/api/v2/package/system.threading/4.3.0";
+ sha256 = "0rw9wfamvhayp5zh3j7p1yfmx9b5khbf4q50d8k5rk993rskfd34";
+ })
+(fetchNuGet {
+ name = "system.threading.tasks.dataflow";
+ version = "4.5.24";
+ url = "https://www.nuget.org/api/v2/package/system.threading.tasks.dataflow/4.5.24";
+ sha256 = "0wahbfdb0jxx3hi04xggfms8wgf68wmvv68m2vfp8v2kiqr5mr2r";
+ })
+(fetchNuGet {
+ name = "microsoft.codeanalysis.analyzers";
+ version = "1.1.0";
+ url = "https://www.nuget.org/api/v2/package/microsoft.codeanalysis.analyzers/1.1.0";
+ sha256 = "08r667hj2259wbim1p3al5qxkshydykmb7nd9ygbjlg4mmydkapc";
+ })
+(fetchNuGet {
+ name = "system.dynamic.runtime";
+ version = "4.3.0";
+ url = "https://www.nuget.org/api/v2/package/system.dynamic.runtime/4.3.0";
+ sha256 = "1d951hrvrpndk7insiag80qxjbf2y0y39y8h5hnq9612ws661glk";
+ })
+(fetchNuGet {
+ name = "system.io.pipes";
+ version = "4.3.0";
+ url = "https://www.nuget.org/api/v2/package/system.io.pipes/4.3.0";
+ sha256 = "1ygv16gzpi9cnlzcqwijpv7055qc50ynwg3vw29vj1q3iha3h06r";
+ })
+(fetchNuGet {
+ name = "system.net.primitives";
+ version = "4.3.0";
+ url = "https://www.nuget.org/api/v2/package/system.net.primitives/4.3.0";
+ sha256 = "0c87k50rmdgmxx7df2khd9qj7q35j9rzdmm2572cc55dygmdk3ii";
+ })
+(fetchNuGet {
+ name = "system.runtime.serialization.xml";
+ version = "4.1.1";
+ url = "https://www.nuget.org/api/v2/package/system.runtime.serialization.xml/4.1.1";
+ sha256 = "11747an5gbz821pwahaim3v82gghshnj9b5c4cw539xg5a3gq7rk";
+ })
+(fetchNuGet {
+ name = "system.security.cryptography.encoding";
+ version = "4.3.0";
+ url = "https://www.nuget.org/api/v2/package/system.security.cryptography.encoding/4.3.0";
+ sha256 = "1jr6w70igqn07k5zs1ph6xja97hxnb3mqbspdrff6cvssgrixs32";
+ })
+(fetchNuGet {
+ name = "system.collections.nongeneric";
+ version = "4.0.1";
+ url = "https://www.nuget.org/api/v2/package/system.collections.nongeneric/4.0.1";
+ sha256 = "19994r5y5bpdhj7di6w047apvil8lh06lh2c2yv9zc4fc5g9bl4d";
+ })
+(fetchNuGet {
+ name = "system.diagnostics.tools";
+ version = "4.3.0";
+ url = "https://www.nuget.org/api/v2/package/system.diagnostics.tools/4.3.0";
+ sha256 = "0in3pic3s2ddyibi8cvgl102zmvp9r9mchh82ns9f0ms4basylw1";
+ })
+(fetchNuGet {
+ name = "microsoft.netframework.referenceassemblies";
+ version = "1.0.0-alpha-004";
+ url = "https://dotnet.myget.org/F/roslyn-tools/api/v2/package/microsoft.netframework.referenceassemblies/1.0.0-alpha-004";
+ sha256 = "1qrpxhcx11v92lqwvrih88mlyfw2rkrsjqh7gl8c1h71vyppr3bp";
+ })
+(fetchNuGet {
+ name = "system.reflection.emit.ilgeneration";
+ version = "4.0.1";
+ url = "https://www.nuget.org/api/v2/package/system.reflection.emit.ilgeneration/4.0.1";
+ sha256 = "1pcd2ig6bg144y10w7yxgc9d22r7c7ww7qn1frdfwgxr24j9wvv0";
+ })
+(fetchNuGet {
+ name = "xunit.extensibility.execution";
+ version = "2.4.1";
+ url = "https://www.nuget.org/api/v2/package/xunit.extensibility.execution/2.4.1";
+ sha256 = "1pbilxh1gp2ywm5idfl0klhl4gb16j86ib4x83p8raql1dv88qia";
+ })
+(fetchNuGet {
+ name = "microsoft.codecoverage";
+ version = "15.9.0";
+ url = "https://www.nuget.org/api/v2/package/microsoft.codecoverage/15.9.0";
+ sha256 = "10v5xrdilnm362g9545qxvlrbwc9vn65jhpb1i0jlhyqsj6bfwzg";
+ })
+(fetchNuGet {
+ name = "xunit.extensibility.core";
+ version = "2.4.1";
+ url = "https://www.nuget.org/api/v2/package/xunit.extensibility.core/2.4.1";
+ sha256 = "103qsijmnip2pnbhciqyk2jyhdm6snindg5z2s57kqf5pcx9a050";
+ })
+(fetchNuGet {
+ name = "system.collections.concurrent";
+ version = "4.0.12";
+ url = "https://www.nuget.org/api/v2/package/system.collections.concurrent/4.0.12";
+ sha256 = "07y08kvrzpak873pmyxs129g1ch8l27zmg51pcyj2jvq03n0r0fc";
+ })
+(fetchNuGet {
+ name = "system.collections.concurrent";
+ version = "4.3.0";
+ url = "https://www.nuget.org/api/v2/package/system.collections.concurrent/4.3.0";
+ sha256 = "0wi10md9aq33jrkh2c24wr2n9hrpyamsdhsxdcnf43b7y86kkii8";
+ })
+(fetchNuGet {
+ name = "system.collections";
+ version = "4.0.11";
+ url = "https://www.nuget.org/api/v2/package/system.collections/4.0.11";
+ sha256 = "1ga40f5lrwldiyw6vy67d0sg7jd7ww6kgwbksm19wrvq9hr0bsm6";
+ })
+(fetchNuGet {
+ name = "system.collections";
+ version = "4.3.0";
+ url = "https://www.nuget.org/api/v2/package/system.collections/4.3.0";
+ sha256 = "19r4y64dqyrq6k4706dnyhhw7fs24kpp3awak7whzss39dakpxk9";
+ })
+(fetchNuGet {
+ name = "runtime.opensuse.42.1-x64.runtime.native.system.security.cryptography.openssl";
+ version = "4.3.0";
+ url = "https://www.nuget.org/api/v2/package/runtime.opensuse.42.1-x64.runtime.native.system.security.cryptography.openssl/4.3.0";
+ sha256 = "1klrs545awhayryma6l7g2pvnp9xy4z0r1i40r80zb45q3i9nbyf";
+ })
+(fetchNuGet {
+ name = "microsoft.build.nugetsdkresolver";
+ version = "5.2.0-rtm.6067";
+ url = "https://dotnet.myget.org/F/nuget-build/api/v2/package/microsoft.build.nugetsdkresolver/5.2.0-rtm.6067";
+ sha256 = "1rz2i4md7b8rlybb9s7416l0pr357f3ar149s6ipfq0xijn3xgmh";
+ })
+(fetchNuGet {
+ name = "system.reflection";
+ version = "4.1.0";
+ url = "https://www.nuget.org/api/v2/package/system.reflection/4.1.0";
+ sha256 = "1js89429pfw79mxvbzp8p3q93il6rdff332hddhzi5wqglc4gml9";
+ })
+(fetchNuGet {
+ name = "system.reflection";
+ version = "4.3.0";
+ url = "https://www.nuget.org/api/v2/package/system.reflection/4.3.0";
+ sha256 = "0xl55k0mw8cd8ra6dxzh974nxif58s3k1rjv1vbd7gjbjr39j11m";
+ })
+(fetchNuGet {
+ name = "nuget.configuration";
+ version = "5.2.0-rtm.6067";
+ url = "https://dotnet.myget.org/F/nuget-build/api/v2/package/nuget.configuration/5.2.0-rtm.6067";
+ sha256 = "075mypb32i0d0x73rcr0di6pb0bhlp0izv3633ky64kddriajma1";
+ })
+(fetchNuGet {
+ name = "system.net.http";
+ version = "4.3.0";
+ url = "https://www.nuget.org/api/v2/package/system.net.http/4.3.0";
+ sha256 = "1i4gc757xqrzflbk7kc5ksn20kwwfjhw9w7pgdkn19y3cgnl302j";
+ })
+(fetchNuGet {
+ name = "runtime.debian.8-x64.runtime.native.system.security.cryptography.openssl";
+ version = "4.3.0";
+ url = "https://www.nuget.org/api/v2/package/runtime.debian.8-x64.runtime.native.system.security.cryptography.openssl/4.3.0";
+ sha256 = "16rnxzpk5dpbbl1x354yrlsbvwylrq456xzpsha1n9y3glnhyx9d";
+ })
+(fetchNuGet {
+ name = "system.security.cryptography.x509certificates";
+ version = "4.3.0";
+ url = "https://www.nuget.org/api/v2/package/system.security.cryptography.x509certificates/4.3.0";
+ sha256 = "0valjcz5wksbvijylxijjxb1mp38mdhv03r533vnx1q3ikzdav9h";
+ })
+(fetchNuGet {
+ name = "nuget.packaging";
+ version = "5.2.0-rtm.6067";
+ url = "https://dotnet.myget.org/F/nuget-build/api/v2/package/nuget.packaging/5.2.0-rtm.6067";
+ sha256 = "16p5glvvpp5rw10ycbpyg39k4prir450l12r5frpm8qz0rdp3xig";
+ })
+(fetchNuGet {
+ name = "nuget.commands";
+ version = "5.2.0-rtm.6067";
+ url = "https://dotnet.myget.org/F/nuget-build/api/v2/package/nuget.commands/5.2.0-rtm.6067";
+ sha256 = "06vnphsmwnvcigwj37hy5abipjzwhnq61zw66cclwd6jjibb1kh9";
+ })
+(fetchNuGet {
+ name = "system.runtime";
+ version = "4.1.0";
+ url = "https://www.nuget.org/api/v2/package/system.runtime/4.1.0";
+ sha256 = "02hdkgk13rvsd6r9yafbwzss8kr55wnj8d5c7xjnp8gqrwc8sn0m";
+ })
+(fetchNuGet {
+ name = "system.runtime";
+ version = "4.3.0";
+ url = "https://www.nuget.org/api/v2/package/system.runtime/4.3.0";
+ sha256 = "066ixvgbf2c929kgknshcxqj6539ax7b9m570cp8n179cpfkapz7";
+ })
+(fetchNuGet {
+ name = "microsoft.win32.primitives";
+ version = "4.3.0";
+ url = "https://www.nuget.org/api/v2/package/microsoft.win32.primitives/4.3.0";
+ sha256 = "0j0c1wj4ndj21zsgivsc24whiya605603kxrbiw6wkfdync464wq";
+ })
+(fetchNuGet {
+ name = "microsoft.win32.primitives";
+ version = "4.0.1";
+ url = "https://www.nuget.org/api/v2/package/microsoft.win32.primitives/4.0.1";
+ sha256 = "1n8ap0cmljbqskxpf8fjzn7kh1vvlndsa75k01qig26mbw97k2q7";
+ })
+(fetchNuGet {
+ name = "system.collections.immutable";
+ version = "1.2.0";
+ url = "https://www.nuget.org/api/v2/package/system.collections.immutable/1.2.0";
+ sha256 = "1jm4pc666yiy7af1mcf7766v710gp0h40p228ghj6bavx7xfa38m";
+ })
+(fetchNuGet {
+ name = "system.collections.immutable";
+ version = "1.3.1";
+ url = "https://www.nuget.org/api/v2/package/system.collections.immutable/1.3.1";
+ sha256 = "17615br2x5riyx8ivf1dcqwj6q3ipq1bi5hqhw54yfyxmx38ddva";
+ })
+(fetchNuGet {
+ name = "system.collections.immutable";
+ version = "1.5.0";
+ url = "https://www.nuget.org/api/v2/package/system.collections.immutable/1.5.0";
+ sha256 = "1d5gjn5afnrf461jlxzawcvihz195gayqpcfbv6dd7pxa9ialn06";
+ })
+(fetchNuGet {
+ name = "nuget.dependencyresolver.core";
+ version = "5.2.0-rtm.6067";
+ url = "https://dotnet.myget.org/F/nuget-build/api/v2/package/nuget.dependencyresolver.core/5.2.0-rtm.6067";
+ sha256 = "0iw1z2lascjjmdkk9nf2wqm5sj5nqjv4611xx29vlmp6cyhnpq4i";
+ })
+(fetchNuGet {
+ name = "netstandard.library";
+ version = "1.6.1";
+ url = "https://www.nuget.org/api/v2/package/netstandard.library/1.6.1";
+ sha256 = "1z70wvsx2d847a2cjfii7b83pjfs34q05gb037fdjikv5kbagml8";
+ })
+(fetchNuGet {
+ name = "shouldly";
+ version = "3.0.0";
+ url = "https://www.nuget.org/api/v2/package/shouldly/3.0.0";
+ sha256 = "1hg28w898kl84rx57sclb2z9b76v5hxlwxig1xnb6fr81aahzlw3";
+ })
+(fetchNuGet {
+ name = "microsoft.diasymreader.pdb2pdb";
+ version = "1.1.0-beta1-62506-02";
+ url = "https://dotnetfeed.blob.core.windows.net/dotnet-core/flatcontainer/microsoft.diasymreader.pdb2pdb/1.1.0-beta1-62506-02/microsoft.diasymreader.pdb2pdb.1.1.0-beta1-62506-02.nupkg";
+ sha256 = "1dkhpmq5aw34nndvb4xc370866vf33x70zrjhgvnpwwspb6vb0zh";
+ })
+(fetchNuGet {
+ name = "system.globalization.calendars";
+ version = "4.3.0";
+ url = "https://www.nuget.org/api/v2/package/system.globalization.calendars/4.3.0";
+ sha256 = "1xwl230bkakzzkrggy1l1lxmm3xlhk4bq2pkv790j5lm8g887lxq";
+ })
+(fetchNuGet {
+ name = "system.io.compression.zipfile";
+ version = "4.3.0";
+ url = "https://www.nuget.org/api/v2/package/system.io.compression.zipfile/4.3.0";
+ sha256 = "1yxy5pq4dnsm9hlkg9ysh5f6bf3fahqqb6p8668ndy5c0lk7w2ar";
+ })
+(fetchNuGet {
+ name = "system.runtime.interopservices.runtimeinformation";
+ version = "4.0.0";
+ url = "https://www.nuget.org/api/v2/package/system.runtime.interopservices.runtimeinformation/4.0.0";
+ sha256 = "0glmvarf3jz5xh22iy3w9v3wyragcm4hfdr17v90vs7vcrm7fgp6";
+ })
+(fetchNuGet {
+ name = "system.runtime.interopservices.runtimeinformation";
+ version = "4.3.0";
+ url = "https://www.nuget.org/api/v2/package/system.runtime.interopservices.runtimeinformation/4.3.0";
+ sha256 = "0q18r1sh4vn7bvqgd6dmqlw5v28flbpj349mkdish2vjyvmnb2ii";
+ })
+(fetchNuGet {
+ name = "system.io.filesystem.driveinfo";
+ version = "4.3.0";
+ url = "https://www.nuget.org/api/v2/package/system.io.filesystem.driveinfo/4.3.0";
+ sha256 = "0j67khc75lwdf7d5i3z41cks7zhac4zdccgvk2xmq6wm1l08xnlh";
+ })
+(fetchNuGet {
+ name = "system.threading.tasks.extensions";
+ version = "4.3.0";
+ url = "https://www.nuget.org/api/v2/package/system.threading.tasks.extensions/4.3.0";
+ sha256 = "1xxcx2xh8jin360yjwm4x4cf5y3a2bwpn2ygkfkwkicz7zk50s2z";
+ })
+(fetchNuGet {
+ name = "system.threading.tasks.extensions";
+ version = "4.0.0";
+ url = "https://www.nuget.org/api/v2/package/system.threading.tasks.extensions/4.0.0";
+ sha256 = "1cb51z062mvc2i8blpzmpn9d9mm4y307xrwi65di8ri18cz5r1zr";
+ })
+(fetchNuGet {
+ name = "microsoft.netcore.targets";
+ version = "1.0.1";
+ url = "https://www.nuget.org/api/v2/package/microsoft.netcore.targets/1.0.1";
+ sha256 = "0ppdkwy6s9p7x9jix3v4402wb171cdiibq7js7i13nxpdky7074p";
+ })
+(fetchNuGet {
+ name = "microsoft.netcore.targets";
+ version = "1.1.0";
+ url = "https://www.nuget.org/api/v2/package/microsoft.netcore.targets/1.1.0";
+ sha256 = "193xwf33fbm0ni3idxzbr5fdq3i2dlfgihsac9jj7whj0gd902nh";
+ })
+(fetchNuGet {
+ name = "system.reflection.extensions";
+ version = "4.0.1";
+ url = "https://www.nuget.org/api/v2/package/system.reflection.extensions/4.0.1";
+ sha256 = "0m7wqwq0zqq9gbpiqvgk3sr92cbrw7cp3xn53xvw7zj6rz6fdirn";
+ })
+(fetchNuGet {
+ name = "system.reflection.extensions";
+ version = "4.3.0";
+ url = "https://www.nuget.org/api/v2/package/system.reflection.extensions/4.3.0";
+ sha256 = "02bly8bdc98gs22lqsfx9xicblszr2yan7v2mmw3g7hy6miq5hwq";
+ })
+(fetchNuGet {
+ name = "system.diagnostics.process";
+ version = "4.1.0";
+ url = "https://www.nuget.org/api/v2/package/system.diagnostics.process/4.1.0";
+ sha256 = "061lrcs7xribrmq7kab908lww6kn2xn1w3rdc41q189y0jibl19s";
+ })
+(fetchNuGet {
+ name = "system.diagnostics.process";
+ version = "4.3.0";
+ url = "https://www.nuget.org/api/v2/package/system.diagnostics.process/4.3.0";
+ sha256 = "0g4prsbkygq8m21naqmcp70f24a1ksyix3dihb1r1f71lpi3cfj7";
+ })
+(fetchNuGet {
+ name = "system.security.cryptography.primitives";
+ version = "4.3.0";
+ url = "https://www.nuget.org/api/v2/package/system.security.cryptography.primitives/4.3.0";
+ sha256 = "0pyzncsv48zwly3lw4f2dayqswcfvdwq2nz0dgwmi7fj3pn64wby";
+ })
+(fetchNuGet {
+ name = "system.threading.thread";
+ version = "4.0.0";
+ url = "https://www.nuget.org/api/v2/package/system.threading.thread/4.0.0";
+ sha256 = "1gxxm5fl36pjjpnx1k688dcw8m9l7nmf802nxis6swdaw8k54jzc";
+ })
+(fetchNuGet {
+ name = "system.threading.thread";
+ version = "4.3.0";
+ url = "https://www.nuget.org/api/v2/package/system.threading.thread/4.3.0";
+ sha256 = "0y2xiwdfcph7znm2ysxanrhbqqss6a3shi1z3c779pj2s523mjx4";
+ })
+(fetchNuGet {
+ name = "newtonsoft.json";
+ version = "9.0.1";
+ url = "https://www.nuget.org/api/v2/package/newtonsoft.json/9.0.1";
+ sha256 = "0mcy0i7pnfpqm4pcaiyzzji4g0c8i3a5gjz28rrr28110np8304r";
+ })
+(fetchNuGet {
+ name = "runtime.rhel.7-x64.runtime.native.system.security.cryptography.openssl";
+ version = "4.3.0";
+ url = "https://www.nuget.org/api/v2/package/runtime.rhel.7-x64.runtime.native.system.security.cryptography.openssl/4.3.0";
+ sha256 = "0vhynn79ih7hw7cwjazn87rm9z9fj0rvxgzlab36jybgcpcgphsn";
+ })
+(fetchNuGet {
+ name = "xunit";
+ version = "2.4.1";
+ url = "https://www.nuget.org/api/v2/package/xunit/2.4.1";
+ sha256 = "0xf3kaywpg15flqaqfgywqyychzk15kz0kz34j21rcv78q9ywq20";
+ })
+(fetchNuGet {
+ name = "system.valuetuple";
+ version = "4.3.0";
+ url = "https://www.nuget.org/api/v2/package/system.valuetuple/4.3.0";
+ sha256 = "1227k7fxbxapq7dms4lvwwjdf3pr1jcsmhy2nzzhj6g6hs530hxn";
+ })
+(fetchNuGet {
+ name = "microsoft.netframework.referenceassemblies.net472";
+ version = "1.0.0-alpha-004";
+ url = "https://dotnet.myget.org/F/roslyn-tools/api/v2/package/microsoft.netframework.referenceassemblies.net472/1.0.0-alpha-004";
+ sha256 = "08wa54dm7yskayzxivnwbm8sg1pf6ai8ccr64ixf9lyz3yw6y0nc";
+ })
+(fetchNuGet {
+ name = "system.security.cryptography.algorithms";
+ version = "4.3.0";
+ url = "https://www.nuget.org/api/v2/package/system.security.cryptography.algorithms/4.3.0";
+ sha256 = "03sq183pfl5kp7gkvq77myv7kbpdnq3y0xj7vi4q1kaw54sny0ml";
+ })
+]
diff --git a/pkgs/development/tools/gofumpt/default.nix b/pkgs/development/tools/gofumpt/default.nix
new file mode 100644
index 000000000000..221058a461ef
--- /dev/null
+++ b/pkgs/development/tools/gofumpt/default.nix
@@ -0,0 +1,22 @@
+{ lib, buildGoModule, fetchFromGitHub }:
+
+buildGoModule rec {
+ pname = "gofumpt";
+ version = "2019-07-29";
+
+ src = fetchFromGitHub {
+ owner = "mvdan";
+ repo = pname;
+ rev = "96300e3d49fbb3b7bc9c6dc74f8a5cc0ef46f84b";
+ sha256 = "169hwggbhlr6ga045d6sa7xsan3mnj19qbh63i3h4rynqlppzvpf";
+ };
+
+ modSha256 = "1g7dkl60zwlk4q2gwx2780xys8rf2c4kqyy8gr99s5y342wsbx2g";
+
+ meta = with lib; {
+ description = "A stricter gofmt";
+ homepage = https://github.com/mvdan/gofumpt;
+ license = licenses.bsd3;
+ maintainers = with maintainers; [ rvolosatovs ];
+ };
+}
diff --git a/pkgs/development/tools/misc/astyle/default.nix b/pkgs/development/tools/misc/astyle/default.nix
index e66d92e34d65..66e972826cb9 100644
--- a/pkgs/development/tools/misc/astyle/default.nix
+++ b/pkgs/development/tools/misc/astyle/default.nix
@@ -1,32 +1,26 @@
-{ stdenv, fetchurl }:
+{ stdenv, lib, fetchurl, cmake }:
-let
- name = "astyle";
+stdenv.mkDerivation rec {
+ pname = "astyle";
version = "3.1";
-in
-stdenv.mkDerivation {
- name = "${name}-${version}";
src = fetchurl {
- url = "mirror://sourceforge/${name}/${name}_${version}_linux.tar.gz";
+ url = "mirror://sourceforge/${pname}/${pname}_${version}_linux.tar.gz";
sha256 = "1ms54wcs7hg1bsywqwf2lhdfizgbk7qxc9ghasxk8i99jvwlrk6b";
};
- sourceRoot = if stdenv.cc.isClang
- then "astyle/build/clang"
- else "astyle/build/gcc";
+ # lots of hardcoded references to /usr
+ postPatch = ''
+ substituteInPlace CMakeLists.txt \
+ --replace ' /usr/' " $out/"
+ '';
- # -s option is obsolete on Darwin and breaks build
- postPatch = if stdenv.isDarwin then ''
- substituteInPlace Makefile --replace "LDFLAGSr = -s" "LDFLAGSr ="
- '' else null;
+ nativeBuildInputs = [ cmake ];
- installFlags = "INSTALL=install prefix=$$out";
-
- meta = {
- homepage = http://astyle.sourceforge.net/;
+ meta = with lib; {
description = "Source code indenter, formatter, and beautifier for C, C++, C# and Java";
- license = stdenv.lib.licenses.lgpl3;
- platforms = stdenv.lib.platforms.unix;
+ homepage = "https://astyle.sourceforge.net/";
+ license = licenses.lgpl3;
+ platforms = platforms.unix;
};
}
diff --git a/pkgs/development/tools/misc/texi2html/default.nix b/pkgs/development/tools/misc/texi2html/default.nix
index b094f05e9516..247733b81baf 100644
--- a/pkgs/development/tools/misc/texi2html/default.nix
+++ b/pkgs/development/tools/misc/texi2html/default.nix
@@ -1,20 +1,27 @@
-{ stdenv, fetchurl, perl }:
+{ stdenv, fetchurl, perl, gettext }:
stdenv.mkDerivation rec {
- name = "texi2html-1.82";
+ pname = "texi2html";
+ version = "5.0";
src = fetchurl {
- url = "mirror://savannah/texi2html/${name}.tar.bz2";
- sha256 = "1wdli2szkgm3l0vx8rf6lylw0b0m47dlz9iy004n928nqkzix76n";
+ url = "mirror://savannah/texi2html/${pname}-${version}.tar.bz2";
+ sha256 = "1yprv64vrlcbksqv25asplnjg07mbq38lfclp1m5lj8cw878pag8";
};
- buildInputs = [perl];
+ nativeBuildInputs = [ gettext ];
+ buildInputs = [ perl ];
- meta = {
+ preBuild = ''
+ substituteInPlace separated_to_hash.pl \
+ --replace "/usr/bin/perl" "${perl}/bin/perl"
+ '';
+
+ meta = with stdenv.lib; {
description = "Perl script which converts Texinfo source files to HTML output";
homepage = https://www.nongnu.org/texi2html/;
- license = stdenv.lib.licenses.gpl2;
- maintainers = [stdenv.lib.maintainers.marcweber];
- platforms = stdenv.lib.platforms.unix;
+ license = licenses.gpl2;
+ maintainers = [ maintainers.marcweber ];
+ platforms = platforms.unix;
};
}
diff --git a/pkgs/development/tools/out-of-tree/default.nix b/pkgs/development/tools/out-of-tree/default.nix
new file mode 100644
index 000000000000..7064cb8285ee
--- /dev/null
+++ b/pkgs/development/tools/out-of-tree/default.nix
@@ -0,0 +1,30 @@
+{ stdenv, buildGoPackage, fetchgit, qemu, docker, which, makeWrapper }:
+
+buildGoPackage rec {
+ pname = "out-of-tree";
+ version = "1.0.1";
+
+ buildInputs = [ makeWrapper ];
+
+ goPackagePath = "code.dumpstack.io/tools/${pname}";
+
+ src = fetchgit {
+ rev = "refs/tags/v${version}";
+ url = "https://code.dumpstack.io/tools/${pname}.git";
+ sha256 = "0p0ps73w6lmsdyf7irqgbhfxjg5smgbn081d06pnr1zmxvw8dryx";
+ };
+
+ goDeps = ./deps.nix;
+
+ postFixup = ''
+ wrapProgram $bin/bin/out-of-tree \
+ --prefix PATH : "${stdenv.lib.makeBinPath [ qemu docker which ]}"
+ '';
+
+ meta = with stdenv.lib; {
+ description = "kernel {module, exploit} development tool";
+ homepage = https://out-of-tree.io;
+ maintainers = [ maintainers.dump_stack ];
+ license = licenses.agpl3Plus;
+ };
+}
diff --git a/pkgs/development/tools/out-of-tree/deps.nix b/pkgs/development/tools/out-of-tree/deps.nix
new file mode 100644
index 000000000000..28c6af4586ce
--- /dev/null
+++ b/pkgs/development/tools/out-of-tree/deps.nix
@@ -0,0 +1,120 @@
+# This file was generated by https://github.com/kamilchm/go2nix v1.3.0
+[
+ {
+ goPackagePath = "github.com/alecthomas/template";
+ fetch = {
+ type = "git";
+ url = "https://github.com/alecthomas/template";
+ rev = "a0175ee3bccc567396460bf5acd36800cb10c49c";
+ sha256 = "0qjgvvh26vk1cyfq9fadyhfgdj36f1iapbmr5xp6zqipldz8ffxj";
+ };
+ }
+ {
+ goPackagePath = "github.com/alecthomas/units";
+ fetch = {
+ type = "git";
+ url = "https://github.com/alecthomas/units";
+ rev = "2efee857e7cfd4f3d0138cc3cbb1b4966962b93a";
+ sha256 = "1j65b91qb9sbrml9cpabfrcf07wmgzzghrl7809hjjhrmbzri5bl";
+ };
+ }
+ {
+ goPackagePath = "github.com/mattn/go-runewidth";
+ fetch = {
+ type = "git";
+ url = "https://github.com/mattn/go-runewidth";
+ rev = "703b5e6b11ae25aeb2af9ebb5d5fdf8fa2575211";
+ sha256 = "0znpyz71gajx3g0j2zp63nhjj2c07g16885vxv4ykwnrfmzbgk4w";
+ };
+ }
+ {
+ goPackagePath = "github.com/mattn/go-sqlite3";
+ fetch = {
+ type = "git";
+ url = "https://github.com/mattn/go-sqlite3";
+ rev = "5dd71670cca4bc0ee90371eabd0f1bdba1ac6f35";
+ sha256 = "1zq7gq5bhf5w9g43680v2z6j0px366a3gmmk5dyxqv0gyrgcpm17";
+ };
+ }
+ {
+ goPackagePath = "github.com/naoina/go-stringutil";
+ fetch = {
+ type = "git";
+ url = "https://github.com/naoina/go-stringutil";
+ rev = "6b638e95a32d0c1131db0e7fe83775cbea4a0d0b";
+ sha256 = "00831p1wn3rimybk1z8l30787kn1akv5jax5wx743nn76qcmkmc6";
+ };
+ }
+ {
+ goPackagePath = "github.com/naoina/toml";
+ fetch = {
+ type = "git";
+ url = "https://github.com/naoina/toml";
+ rev = "9fafd69674167c06933b1787ae235618431ce87f";
+ sha256 = "0mpvdnidgab48k7dfq1vaiz1wny8n29y7zxpipnp1zm8ibxpism0";
+ };
+ }
+ {
+ goPackagePath = "github.com/olekukonko/tablewriter";
+ fetch = {
+ type = "git";
+ url = "https://github.com/olekukonko/tablewriter";
+ rev = "e6d60cf7ba1f42d86d54cdf5508611c4aafb3970";
+ sha256 = "0hh95glg7d2md185r03wn52j2r33jc4zil0qvcrs66ka7bdxi7vj";
+ };
+ }
+ {
+ goPackagePath = "github.com/otiai10/copy";
+ fetch = {
+ type = "git";
+ url = "https://github.com/otiai10/copy";
+ rev = "7e9a647135a142c2669943d4a4d29be015ce9392";
+ sha256 = "1fpjyk6zrcdwgw3w93v3sb4xf0gq8w5py6vvlljxgf4gi7k96klj";
+ };
+ }
+ {
+ goPackagePath = "github.com/remeh/sizedwaitgroup";
+ fetch = {
+ type = "git";
+ url = "https://github.com/remeh/sizedwaitgroup";
+ rev = "5e7302b12ccef91dce9fde2f5bda6d5c7ea5d2eb";
+ sha256 = "1xwdzby27xzcghsqhli3il165iz3vkx3g4abgvkl99wysyhcvn0a";
+ };
+ }
+ {
+ goPackagePath = "github.com/zcalusic/sysinfo";
+ fetch = {
+ type = "git";
+ url = "https://github.com/zcalusic/sysinfo";
+ rev = "fbadb57345c2ba8d05d75e81206f665d322c0bb2";
+ sha256 = "0556jj50aw2an6a4s4v2n0kk42hbkpgcvd4gbahkdlh4qrqg2r0j";
+ };
+ }
+ {
+ goPackagePath = "golang.org/x/crypto";
+ fetch = {
+ type = "git";
+ url = "https://go.googlesource.com/crypto";
+ rev = "4def268fd1a49955bfb3dda92fe3db4f924f2285";
+ sha256 = "1bfsnari529gw34cz0zqk3d9mrkcj1ay35kangri8kbgll0ss5a6";
+ };
+ }
+ {
+ goPackagePath = "gopkg.in/alecthomas/kingpin.v2";
+ fetch = {
+ type = "git";
+ url = "https://gopkg.in/alecthomas/kingpin.v2";
+ rev = "947dcec5ba9c011838740e680966fd7087a71d0d";
+ sha256 = "0mndnv3hdngr3bxp7yxfd47cas4prv98sqw534mx7vp38gd88n5r";
+ };
+ }
+ {
+ goPackagePath = "gopkg.in/logrusorgru/aurora.v1";
+ fetch = {
+ type = "git";
+ url = "https://gopkg.in/logrusorgru/aurora.v1";
+ rev = "a7b3b318ed4e1ae5b80602b08627267303c68572";
+ sha256 = "1dldc270z42zm2d377ks7sa5059janjcjhv3inza3rjvapknsrcb";
+ };
+ }
+]
diff --git a/pkgs/development/tools/skaffold/default.nix b/pkgs/development/tools/skaffold/default.nix
index b8482ee58b80..58dde8386921 100644
--- a/pkgs/development/tools/skaffold/default.nix
+++ b/pkgs/development/tools/skaffold/default.nix
@@ -2,9 +2,9 @@
buildGoPackage rec {
pname = "skaffold";
- version = "0.35.0";
- # rev is the 0.35.0 commit, mainly for skaffold version command output
- rev = "1da7608f9eb21ebe722bc054584e591e4223a3dc";
+ version = "0.36.0";
+ # rev is the 0.36.0 commit, mainly for skaffold version command output
+ rev = "1c054d4ffc7e14b4d81efcbea8b2022403ee4b89";
goPackagePath = "github.com/GoogleContainerTools/skaffold";
subPackages = ["cmd/skaffold"];
@@ -20,7 +20,7 @@ buildGoPackage rec {
owner = "GoogleContainerTools";
repo = "skaffold";
rev = "v${version}";
- sha256 = "1vh7vlz14gfjpxf2wy1pybw5x55mw34j6isyy5zl0rsbs9mf6ci1";
+ sha256 = "1d7z36r33lmxm5cv1kby6g9zbsr88prgsp32x4jcs9l1ifwblhng";
};
meta = {
diff --git a/pkgs/games/anki/default.nix b/pkgs/games/anki/default.nix
index 1e2a60566d4e..2b39a2ee2cfd 100644
--- a/pkgs/games/anki/default.nix
+++ b/pkgs/games/anki/default.nix
@@ -94,12 +94,9 @@ buildPythonApplication rec {
checkInputs = [ pytest glibcLocales nose ];
+ nativeBuildInputs = [ pyqtwebengine.wrapQtAppsHook ];
buildInputs = [ lame mplayer libpulseaudio ];
- makeWrapperArgs = [
- ''--prefix PATH ':' "${lame}/bin:${mplayer}/bin"''
- ];
-
patches = [
# Disable updated version check.
./no-version-check.patch
@@ -159,17 +156,23 @@ buildPythonApplication rec {
cp -rv locale $out/share/
cp -rv anki aqt web $pp/
- wrapPythonPrograms
-
# copy the manual into $doc
cp -r ${manual}/share/doc/anki/html $doc/share/doc/anki
'';
+ dontWrapQtApps = true;
+ makeWrapperArgs = [
+ ''--prefix PATH ':' "${lame}/bin:${mplayer}/bin"''
+ "\${qtWrapperArgs[@]}"
+ ];
+
+ # now wrapPythonPrograms from postFixup will add both python and qt env variables
+
passthru = {
inherit manual;
};
- meta = with stdenv.lib; {
+ meta = with lib; {
homepage = "https://apps.ankiweb.net/";
description = "Spaced repetition flashcard program";
longDescription = ''
@@ -187,6 +190,6 @@ buildPythonApplication rec {
license = licenses.agpl3Plus;
broken = stdenv.hostPlatform.isAarch64;
platforms = platforms.mesaPlatforms;
- maintainers = with maintainers; [ the-kenny Profpatsch enzime ];
+ maintainers = with maintainers; [ oxij the-kenny Profpatsch enzime ];
};
}
diff --git a/pkgs/games/steam/steam.nix b/pkgs/games/steam/steam.nix
index 63c7e4675b7a..1d1912d97a15 100644
--- a/pkgs/games/steam/steam.nix
+++ b/pkgs/games/steam/steam.nix
@@ -2,7 +2,7 @@
let
traceLog = "/tmp/steam-trace-dependencies.log";
- version = "1.0.0.59";
+ version = "1.0.0.61";
in stdenv.mkDerivation rec {
pname = "steam-original";
@@ -10,7 +10,7 @@ in stdenv.mkDerivation rec {
src = fetchurl {
url = "http://repo.steampowered.com/steam/pool/steam/s/steam/steam_${version}.tar.gz";
- sha256 = "17yrziy2bmzcppp5v3ycdjll250k4idak4rjakmw8gvr96whs255";
+ sha256 = "0c5xy57gwr14vp3wy3jpqi5dl6y7n01p2dy4jlgl9bf9x7616r6n";
};
makeFlags = [ "DESTDIR=$(out)" "PREFIX=" ];
diff --git a/pkgs/misc/vscode-extensions/cpptools/default.nix b/pkgs/misc/vscode-extensions/cpptools/default.nix
index a5dad88b924e..73b533f368ef 100644
--- a/pkgs/misc/vscode-extensions/cpptools/default.nix
+++ b/pkgs/misc/vscode-extensions/cpptools/default.nix
@@ -83,8 +83,8 @@ vscode-utils.buildVscodeMarketplaceExtension {
mktplcRef = {
name = "cpptools";
publisher = "ms-vscode";
- version = "0.24.1";
- sha256 = "0gqplcppfg2lr6k198q9pw08n0cpc0wvc9w350m9ivv35hw0x5ra";
+ version = "0.25.0";
+ sha256 = "0vqqc0j9ahhb9a8wrhjjb34rfdj7msqsza3443bi4206gkiwpp3n";
};
buildInputs = [
diff --git a/pkgs/os-specific/darwin/apple-source-releases/network_cmds/default.nix b/pkgs/os-specific/darwin/apple-source-releases/network_cmds/default.nix
index feee054c2ac8..9ca0f3b4e56d 100644
--- a/pkgs/os-specific/darwin/apple-source-releases/network_cmds/default.nix
+++ b/pkgs/os-specific/darwin/apple-source-releases/network_cmds/default.nix
@@ -1,9 +1,9 @@
{ stdenv, appleDerivation, xcbuildHook
-, openssl, Librpcsvc, xnu, libpcap, developer_cmds }:
+, openssl_1_0_2, Librpcsvc, xnu, libpcap, developer_cmds }:
appleDerivation rec {
nativeBuildInputs = [ xcbuildHook ];
- buildInputs = [ openssl xnu Librpcsvc libpcap developer_cmds ];
+ buildInputs = [ openssl_1_0_2 xnu Librpcsvc libpcap developer_cmds ];
NIX_CFLAGS_COMPILE = " -I./unbound -I${xnu}/Library/Frameworks/System.framework/Headers/";
diff --git a/pkgs/os-specific/linux/kernel/linux-4.14.nix b/pkgs/os-specific/linux/kernel/linux-4.14.nix
index 03b293055da0..38078ea67282 100644
--- a/pkgs/os-specific/linux/kernel/linux-4.14.nix
+++ b/pkgs/os-specific/linux/kernel/linux-4.14.nix
@@ -3,7 +3,7 @@
with stdenv.lib;
buildLinux (args // rec {
- version = "4.14.139";
+ version = "4.14.140";
# modDirVersion needs to be x.y.z, will automatically add .0 if needed
modDirVersion = if (modDirVersionArg == null) then concatStrings (intersperse "." (take 3 (splitString "." "${version}.0"))) else modDirVersionArg;
@@ -13,6 +13,6 @@ buildLinux (args // rec {
src = fetchurl {
url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz";
- sha256 = "0hkhwcbxg6bry13w9kspx48b10274w6pgv200wh91fjd8jax8qlc";
+ sha256 = "1wmx7xgm21dk1hvrq14sxh3c4304284sgxr4vngg4pki2ljyspkr";
};
} // (args.argsOverride or {}))
diff --git a/pkgs/os-specific/linux/kernel/linux-4.19.nix b/pkgs/os-specific/linux/kernel/linux-4.19.nix
index 7939ec3bfbfe..1e3d14c140d1 100644
--- a/pkgs/os-specific/linux/kernel/linux-4.19.nix
+++ b/pkgs/os-specific/linux/kernel/linux-4.19.nix
@@ -3,7 +3,7 @@
with stdenv.lib;
buildLinux (args // rec {
- version = "4.19.67";
+ version = "4.19.68";
# modDirVersion needs to be x.y.z, will automatically add .0 if needed
modDirVersion = if (modDirVersionArg == null) then concatStrings (intersperse "." (take 3 (splitString "." "${version}.0"))) else modDirVersionArg;
@@ -13,6 +13,6 @@ buildLinux (args // rec {
src = fetchurl {
url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz";
- sha256 = "00m5k0nfcvgff70686rbhn3w8c9wc3jxqvyddw40lylaqdh3s72s";
+ sha256 = "0ax04sivi1lsx01m3abi16w6d0jd3qvwzzq2zbn8q2lca505k1wi";
};
} // (args.argsOverride or {}))
diff --git a/pkgs/os-specific/linux/kernel/linux-4.4.nix b/pkgs/os-specific/linux/kernel/linux-4.4.nix
index 8084599f8675..0d3ce63325f6 100644
--- a/pkgs/os-specific/linux/kernel/linux-4.4.nix
+++ b/pkgs/os-specific/linux/kernel/linux-4.4.nix
@@ -1,11 +1,11 @@
{ stdenv, buildPackages, fetchurl, perl, buildLinux, ... } @ args:
buildLinux (args // rec {
- version = "4.4.189";
+ version = "4.4.190";
extraMeta.branch = "4.4";
src = fetchurl {
url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz";
- sha256 = "0nc8v62gw89m3ykqg6nqf749fzm8y1n481ns8vny4gbinyikjhlp";
+ sha256 = "1rf28cjrrmj7mm8xqlfld6k20ddk15j4mmyarqibjx9pk9acij7y";
};
} // (args.argsOverride or {}))
diff --git a/pkgs/os-specific/linux/kernel/linux-4.9.nix b/pkgs/os-specific/linux/kernel/linux-4.9.nix
index 61f93435a063..0008219efb9a 100644
--- a/pkgs/os-specific/linux/kernel/linux-4.9.nix
+++ b/pkgs/os-specific/linux/kernel/linux-4.9.nix
@@ -1,11 +1,11 @@
{ stdenv, buildPackages, fetchurl, perl, buildLinux, ... } @ args:
buildLinux (args // rec {
- version = "4.9.189";
+ version = "4.9.190";
extraMeta.branch = "4.9";
src = fetchurl {
url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz";
- sha256 = "1cyhwnxkjd0qa5d48657yppjnzbi830q0p25jjv2dxs629k4bnck";
+ sha256 = "05ha3snfk0vdqk9i27icwpq2if0h2jvshavn69ldwqm4h2h1r2py";
};
} // (args.argsOverride or {}))
diff --git a/pkgs/os-specific/linux/kernel/linux-5.2.nix b/pkgs/os-specific/linux/kernel/linux-5.2.nix
index c87d6505940c..6f6de115ad0b 100644
--- a/pkgs/os-specific/linux/kernel/linux-5.2.nix
+++ b/pkgs/os-specific/linux/kernel/linux-5.2.nix
@@ -3,7 +3,7 @@
with stdenv.lib;
buildLinux (args // rec {
- version = "5.2.9";
+ version = "5.2.10";
# modDirVersion needs to be x.y.z, will automatically add .0 if needed
modDirVersion = if (modDirVersionArg == null) then concatStrings (intersperse "." (take 3 (splitString "." "${version}.0"))) else modDirVersionArg;
@@ -13,6 +13,6 @@ buildLinux (args // rec {
src = fetchurl {
url = "mirror://kernel/linux/kernel/v5.x/linux-${version}.tar.xz";
- sha256 = "1rnlnphw9rih4qhdld9ic5lnj5jh4vy5nqbj9lqwv9bc615jmw5n";
+ sha256 = "0jgw7gj71i9kf4prbdi9h791ngxf24nr90302glnsa9aghwc95k0";
};
} // (args.argsOverride or {}))
diff --git a/pkgs/os-specific/linux/mcelog/default.nix b/pkgs/os-specific/linux/mcelog/default.nix
index 659f875bc2be..a58bfc321d3c 100644
--- a/pkgs/os-specific/linux/mcelog/default.nix
+++ b/pkgs/os-specific/linux/mcelog/default.nix
@@ -2,13 +2,13 @@
stdenv.mkDerivation rec {
pname = "mcelog";
- version = "162";
+ version = "164";
src = fetchFromGitHub {
owner = "andikleen";
repo = "mcelog";
rev = "v${version}";
- sha256 = "1zxj545wslp92npll0411grc49l53cgp8dqqn3zb4vcxrvfc4vh9";
+ sha256 = "1i0f0zvxlzkfp0bvghm1z8z8bb8a5x97h56bwd7fdkrm00ivfw2k";
};
postPatch = ''
diff --git a/pkgs/servers/http/apache-modules/mod_wsgi/default.nix b/pkgs/servers/http/apache-modules/mod_wsgi/default.nix
index 568b6ecd174d..0e17cc40efe3 100644
--- a/pkgs/servers/http/apache-modules/mod_wsgi/default.nix
+++ b/pkgs/servers/http/apache-modules/mod_wsgi/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, apacheHttpd, python2 }:
+{ stdenv, fetchurl, apacheHttpd, python, ncurses }:
stdenv.mkDerivation rec {
pname = "mod_wsgi";
@@ -9,7 +9,7 @@ stdenv.mkDerivation rec {
sha256 = "1j8pqn0xhd502ardlmkqx8y85s1npmk9nifqps60wjh29nny03f2";
};
- buildInputs = [ apacheHttpd python2 ];
+ buildInputs = [ apacheHttpd python ncurses ];
patchPhase = ''
sed -r -i -e "s|^LIBEXECDIR=.*$|LIBEXECDIR=$out/modules|" \
diff --git a/pkgs/servers/mail/mailman/0001-Find-external-tools-via-PATH-rather-than-hard-coding.patch b/pkgs/servers/mail/mailman/0001-Find-external-tools-via-PATH-rather-than-hard-coding.patch
new file mode 100644
index 000000000000..b8a5476c0559
--- /dev/null
+++ b/pkgs/servers/mail/mailman/0001-Find-external-tools-via-PATH-rather-than-hard-coding.patch
@@ -0,0 +1,51 @@
+From 47469af384a6d4a0877c76d3c52013b40ab61f04 Mon Sep 17 00:00:00 2001
+From: Peter Simons
+Date: Mon, 26 Aug 2019 16:10:04 +0200
+Subject: [PATCH] Find external tools via $PATH rather than hard-coding
+ /usr/bin.
+
+---
+ src/mailman/config/mhonarc.cfg | 2 +-
+ src/mailman/config/postfix.cfg | 2 +-
+ src/mailman/config/schema.cfg | 2 +-
+ 3 files changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/src/mailman/config/mhonarc.cfg b/src/mailman/config/mhonarc.cfg
+index b00f93aea..096e9521b 100644
+--- a/src/mailman/config/mhonarc.cfg
++++ b/src/mailman/config/mhonarc.cfg
+@@ -24,4 +24,4 @@ base_url: http://$hostname/archives/$fqdn_listname
+
+ # If the archiver works by calling a command on the local machine, this is the
+ # command to call.
+-command: /usr/bin/mhonarc -outdir /path/to/archive/$listname -add
++command: mhonarc -outdir /path/to/archive/$listname -add
+diff --git a/src/mailman/config/postfix.cfg b/src/mailman/config/postfix.cfg
+index cddda220a..934c9a977 100644
+--- a/src/mailman/config/postfix.cfg
++++ b/src/mailman/config/postfix.cfg
+@@ -5,7 +5,7 @@
+ # db file, from the associated plain text files. The file being updated will
+ # be appended to this string (with a separating space), so it must be
+ # appropriate for os.system().
+-postmap_command: /usr/sbin/postmap
++postmap_command: postmap
+
+ # This variable describes the type of transport maps that will be generated by
+ # mailman to be used with postfix for LMTP transport. By default, it is set to
+diff --git a/src/mailman/config/schema.cfg b/src/mailman/config/schema.cfg
+index fa06ccced..406999e13 100644
+--- a/src/mailman/config/schema.cfg
++++ b/src/mailman/config/schema.cfg
+@@ -65,7 +65,7 @@ filtered_messages_are_preservable: no
+ # where the substitution variable $filename is filled in by Mailman, and
+ # contains the path to the temporary file that the command should read from.
+ # The command should print the converted text to stdout.
+-html_to_plain_text_command: /usr/bin/lynx -dump $filename
++html_to_plain_text_command: lynx -dump $filename
+
+ # Specify what characters are allowed in list names. Characters outside of
+ # the class [-_.+=!$*{}~0-9a-z] matched case insensitively are never allowed,
+--
+2.22.0
+
diff --git a/pkgs/servers/mail/mailman/core.nix b/pkgs/servers/mail/mailman/core.nix
new file mode 100644
index 000000000000..fcd594270db4
--- /dev/null
+++ b/pkgs/servers/mail/mailman/core.nix
@@ -0,0 +1,42 @@
+{ stdenv, buildPythonPackage, fetchPypi, alembic, aiosmtpd, dnspython
+, flufl_bounce, flufl_i18n, flufl_lock, lazr_config, lazr_delegates, passlib
+, requests, zope_configuration, click, falcon, importlib-resources
+, zope_component
+}:
+
+buildPythonPackage rec {
+ pname = "mailman";
+ version = "3.2.2";
+
+ patches = [ ./0001-Find-external-tools-via-PATH-rather-than-hard-coding.patch ];
+
+ src = fetchPypi {
+ inherit pname version;
+ sha256 = "09s9p5pb8gff6zblwidyq830yfgcvv50p5drdaxj1qpy8w46lvc6";
+ };
+
+ propagatedBuildInputs = [
+ alembic aiosmtpd click dnspython falcon flufl_bounce flufl_i18n flufl_lock
+ importlib-resources lazr_config passlib requests zope_configuration
+ zope_component
+ ];
+
+ # Mailman assumes that those scripts in $out/bin are Python scripts. Wrapping
+ # them in shell code breaks this assumption. The proper way to use mailman is
+ # to create a specialized python interpreter:
+ #
+ # python37.withPackages (ps: [ps.mailman])
+ #
+ # This gives a properly wrapped 'mailman' command plus an interpreter that
+ # has all the necessary search paths to execute unwrapped 'master' and
+ # 'runner' scripts. The setup is a little tricky, but fortunately NixOS is
+ # about to get a OS module that takes care of those details.
+ dontWrapPythonPrograms = true;
+
+ meta = {
+ homepage = https://www.gnu.org/software/mailman/;
+ description = "Free software for managing electronic mail discussion and newsletter lists";
+ license = stdenv.lib.licenses.gpl3Plus;
+ maintainers = with stdenv.lib.maintainers; [ peti ];
+ };
+}
diff --git a/pkgs/servers/mail/mailman/fix-var-prefix.patch b/pkgs/servers/mail/mailman/fix-var-prefix.patch
deleted file mode 100644
index 9bb735ecbed7..000000000000
--- a/pkgs/servers/mail/mailman/fix-var-prefix.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-diff -ubr mailman-2.1.16-orig/contrib/redhat_fhs.patch mailman-2.1.16/contrib/redhat_fhs.patch
---- mailman-2.1.16-orig/contrib/redhat_fhs.patch 2013-10-21 14:55:48.797631434 +0200
-+++ mailman-2.1.16/contrib/redhat_fhs.patch 2013-10-21 14:56:42.534310378 +0200
-@@ -197,7 +197,7 @@
- + else true; \
- + fi; \
- + done
-- chmod o-r $(DESTDIR)$(var_prefix)/archives/private
-+ chmod o-r $(prefix)$(var_prefix)/archives/private
- @for d in $(ARCH_INDEP_DIRS); \
- do \
- Only in mailman-2.1.5.FHS: Makefile.in~
-diff -ubr mailman-2.1.16-orig/Makefile.in mailman-2.1.16/Makefile.in
---- mailman-2.1.16-orig/Makefile.in 2013-10-21 14:55:48.798631519 +0200
-+++ mailman-2.1.16/Makefile.in 2013-10-21 14:56:42.562313220 +0200
-@@ -87,7 +87,7 @@
- @echo "Creating architecture independent directories..."
- @for d in $(VAR_DIRS); \
- do \
-- dir=$(DESTDIR)$(var_prefix)/$$d; \
-+ dir=$(prefix)$(var_prefix)/$$d; \
- if test ! -d $$dir; then \
- echo "Creating directory hierarchy $$dir"; \
- $(srcdir)/mkinstalldirs $$dir; \
-@@ -96,7 +96,7 @@
- else true; \
- fi; \
- done
-- chmod o-r $(DESTDIR)$(var_prefix)/archives/private
-+ chmod o-r $(prefix)$(var_prefix)/archives/private
- @for d in $(ARCH_INDEP_DIRS); \
- do \
- dir=$(DESTDIR)$(prefix)/$$d; \
diff --git a/pkgs/servers/mail/mailman/postorius.nix b/pkgs/servers/mail/mailman/postorius.nix
new file mode 100644
index 000000000000..871f2ea244dd
--- /dev/null
+++ b/pkgs/servers/mail/mailman/postorius.nix
@@ -0,0 +1,28 @@
+{ stdenv, buildPythonPackage, fetchPypi, beautifulsoup4, vcrpy, mock
+, django-mailman3, mailmanclient
+}:
+
+buildPythonPackage rec {
+ pname = "postorius";
+ version = "1.2.4";
+
+ src = fetchPypi {
+ inherit pname version;
+ sha256 = "1722lnscxfl8wdigf5d80d1qmd5gblr439wa989jxlww0wkjg9fl";
+ };
+
+ buildInputs = [ beautifulsoup4 vcrpy mock ];
+ propagatedBuildInputs = [ django-mailman3 ];
+
+ checkPhase = ''
+ cd $NIX_BUILD_TOP/$sourceRoot
+ PYTHONPATH=.:$PYTHONPATH python example_project/manage.py test --settings=test_settings postorius
+ '';
+
+ meta = {
+ homepage = https://www.gnu.org/software/mailman/;
+ description = "Web-based user interface for managing GNU Mailman";
+ license = stdenv.lib.licenses.gpl3;
+ maintainers = with stdenv.lib.maintainers; [ globin peti ];
+ };
+}
diff --git a/pkgs/servers/mail/rmilter/fd-passing-libmilter.patch b/pkgs/servers/mail/rmilter/fd-passing-libmilter.patch
deleted file mode 100644
index 3ab61a6fab00..000000000000
--- a/pkgs/servers/mail/rmilter/fd-passing-libmilter.patch
+++ /dev/null
@@ -1,80 +0,0 @@
-Description: systemd-like socket activation support for libmilter
-Author: Mikhail Gusarov {unix|local}:/path/to/file -- A named pipe.
- inet:port@{hostname|ip-address} -- An IPV4 socket.
- inet6:port@{hostname|ip-address} -- An IPV6 socket.
-+ fd:number -- Pre-opened file descriptor.
-
-
-
-diff --git a/libmilter/listener.c b/libmilter/listener.c
-index 48c552f..2249a1f 100644
---- a/libmilter/listener.c
-+++ b/libmilter/listener.c
-@@ -197,6 +197,11 @@ mi_milteropen(conn, backlog, rmsocket, name)
- L_socksize = sizeof addr.sin6;
- }
- #endif /* NETINET6 */
-+ else if (strcasecmp(p, "fd") == 0)
-+ {
-+ addr.sa.sa_family = AF_UNSPEC;
-+ L_socksize = sizeof (_SOCK_ADDR);
-+ }
- else
- {
- smi_log(SMI_LOG_ERR, "%s: unknown socket type %s",
-@@ -443,7 +448,21 @@ mi_milteropen(conn, backlog, rmsocket, name)
- }
- #endif /* NETINET || NETINET6 */
-
-- sock = socket(addr.sa.sa_family, SOCK_STREAM, 0);
-+ if (addr.sa.sa_family == AF_UNSPEC)
-+ {
-+ char *end;
-+ sock = strtol(colon, &end, 10);
-+ if (*end != '\0' || sock < 0)
-+ {
-+ smi_log(SMI_LOG_ERR, "%s: expected positive integer as fd, got %s", name, colon);
-+ return INVALID_SOCKET;
-+ }
-+ }
-+ else
-+ {
-+ sock = socket(addr.sa.sa_family, SOCK_STREAM, 0);
-+ }
-+
- if (!ValidSocket(sock))
- {
- smi_log(SMI_LOG_ERR,
-@@ -466,6 +485,7 @@ mi_milteropen(conn, backlog, rmsocket, name)
- #if NETUNIX
- addr.sa.sa_family != AF_UNIX &&
- #endif /* NETUNIX */
-+ addr.sa.sa_family != AF_UNSPEC &&
- setsockopt(sock, SOL_SOCKET, SO_REUSEADDR, (void *) &sockopt,
- sizeof(sockopt)) == -1)
- {
-@@ -511,7 +531,8 @@ mi_milteropen(conn, backlog, rmsocket, name)
- }
- #endif /* NETUNIX */
-
-- if (bind(sock, &addr.sa, L_socksize) < 0)
-+ if (addr.sa.sa_family != AF_UNSPEC &&
-+ bind(sock, &addr.sa, L_socksize) < 0)
- {
- smi_log(SMI_LOG_ERR,
- "%s: Unable to bind to port %s: %s",
-@@ -817,7 +838,7 @@ mi_listener(conn, dbg, smfi, timeout, backlog)
- # ifdef BSD4_4_SOCKADDR
- cliaddr.sa.sa_len == 0 ||
- # endif /* BSD4_4_SOCKADDR */
-- cliaddr.sa.sa_family != L_family))
-+ (L_family != AF_UNSPEC && cliaddr.sa.sa_family != L_family)))
- {
- (void) closesocket(connfd);
- connfd = INVALID_SOCKET;
diff --git a/pkgs/servers/rainloop/default.nix b/pkgs/servers/rainloop/default.nix
index 807147342143..b037524f67f2 100644
--- a/pkgs/servers/rainloop/default.nix
+++ b/pkgs/servers/rainloop/default.nix
@@ -39,6 +39,6 @@
};
rainloop-standard = common {
edition = "";
- sha256 = "1fbnpk7l2fbmzn31vx36caqg9xm40g4hh4mv3s8d70slxwhlscw0";
+ sha256 = "e3ec8209cb3b9f092938a89094e645ef27659763432bedbe7fad4fa650554222";
};
}
diff --git a/pkgs/servers/web-apps/moodle/default.nix b/pkgs/servers/web-apps/moodle/default.nix
new file mode 100644
index 000000000000..4f47890cc87a
--- /dev/null
+++ b/pkgs/servers/web-apps/moodle/default.nix
@@ -0,0 +1,40 @@
+{ stdenv, fetchurl, writeText }:
+
+let
+ version = "3.7.1";
+ stableVersion = builtins.substring 0 2 (builtins.replaceStrings ["."] [""] version);
+in
+
+stdenv.mkDerivation rec {
+ pname = "moodle";
+ inherit version;
+
+ src = fetchurl {
+ url = "https://download.moodle.org/stable${stableVersion}/${pname}-${version}.tgz";
+ sha256 = "0xfriw0nfaf9hlcjviwg2acwpd192jf2ahw8sw3s6bj3pr1isxmd";
+ };
+
+ phpConfig = writeText "config.php" ''
+
+ '';
+
+ installPhase = ''
+ runHook preInstall
+
+ mkdir -p $out/share/moodle
+ cp -r . $out/share/moodle
+ cp ${phpConfig} $out/share/moodle/config.php
+
+ runHook postInstall
+ '';
+
+ meta = with stdenv.lib; {
+ description = "Free and open-source learning management system (LMS) written in PHP";
+ license = licenses.gpl3Plus;
+ homepage = "https://moodle.org/";
+ maintainers = with maintainers; [ aanderse ];
+ platforms = platforms.all;
+ };
+}
diff --git a/pkgs/servers/x11/xorg/default.nix b/pkgs/servers/x11/xorg/default.nix
index 3be672c29f17..66d4643de39f 100644
--- a/pkgs/servers/x11/xorg/default.nix
+++ b/pkgs/servers/x11/xorg/default.nix
@@ -2159,11 +2159,11 @@ lib.makeScope newScope (self: with self; {
}) {};
xf86videosis = callPackage ({ stdenv, pkgconfig, fetchurl, xorgproto, libdrm, libpciaccess, xorgserver }: stdenv.mkDerivation {
- name = "xf86-video-sis-0.10.9";
+ name = "xf86-video-sis-0.11.0";
builder = ./builder.sh;
src = fetchurl {
- url = mirror://xorg/individual/driver/xf86-video-sis-0.10.9.tar.bz2;
- sha256 = "03f1abjjf68y8y1iz768rn95va9d33wmbwfbsqrgl6k0gi0bf9jj";
+ url = mirror://xorg/individual/driver/xf86-video-sis-0.11.0.tar.bz2;
+ sha256 = "0srvrhydjnynfb7b1s145rgmsk4f71iz0ag4icpmb05944d90xr1";
};
hardeningDisable = [ "bindnow" "relro" ];
nativeBuildInputs = [ pkgconfig ];
diff --git a/pkgs/servers/x11/xorg/tarballs.list b/pkgs/servers/x11/xorg/tarballs.list
index 426b848a138d..beeffc21e562 100644
--- a/pkgs/servers/x11/xorg/tarballs.list
+++ b/pkgs/servers/x11/xorg/tarballs.list
@@ -117,7 +117,7 @@ mirror://xorg/individual/driver/xf86-video-rendition-4.2.7.tar.bz2
mirror://xorg/individual/driver/xf86-video-s3virge-1.11.0.tar.bz2
mirror://xorg/individual/driver/xf86-video-savage-2.3.9.tar.bz2
mirror://xorg/individual/driver/xf86-video-siliconmotion-1.7.9.tar.bz2
-mirror://xorg/individual/driver/xf86-video-sis-0.10.9.tar.bz2
+mirror://xorg/individual/driver/xf86-video-sis-0.11.0.tar.bz2
mirror://xorg/individual/driver/xf86-video-sisusb-0.9.7.tar.bz2
mirror://xorg/individual/driver/xf86-video-suncg6-1.1.2.tar.bz2
mirror://xorg/individual/driver/xf86-video-sunffb-1.2.2.tar.bz2
diff --git a/pkgs/servers/zoneminder/default.nix b/pkgs/servers/zoneminder/default.nix
index c10721ee78b7..6e6875c3550c 100644
--- a/pkgs/servers/zoneminder/default.nix
+++ b/pkgs/servers/zoneminder/default.nix
@@ -146,7 +146,7 @@ in stdenv.mkDerivation rec {
# build-time dependencies
DateManip DBI DBDmysql LWP SysMmap
# run-time dependencies not checked at build-time
- ClassStdFast DataDump JSONMaybeXS LWPProtocolHttps NumberBytesHuman SysCPU SysMemInfo TimeDate
+ ClassStdFast DataDump DeviceSerialPort JSONMaybeXS LWPProtocolHttps NumberBytesHuman SysCPU SysMemInfo TimeDate
]);
nativeBuildInputs = [ cmake makeWrapper pkgconfig ];
diff --git a/pkgs/tools/misc/3llo/Gemfile b/pkgs/tools/misc/3llo/Gemfile
new file mode 100644
index 000000000000..17a1086d78f0
--- /dev/null
+++ b/pkgs/tools/misc/3llo/Gemfile
@@ -0,0 +1,2 @@
+source 'https://rubygems.org'
+gem '3llo', '0.3.0'
diff --git a/pkgs/tools/misc/3llo/Gemfile.lock b/pkgs/tools/misc/3llo/Gemfile.lock
new file mode 100644
index 000000000000..0696ba341651
--- /dev/null
+++ b/pkgs/tools/misc/3llo/Gemfile.lock
@@ -0,0 +1,27 @@
+GEM
+ remote: https://rubygems.org/
+ specs:
+ 3llo (0.3.0)
+ tty-prompt (~> 0.12.0)
+ equatable (0.6.1)
+ necromancer (0.4.0)
+ pastel (0.7.3)
+ equatable (~> 0.6)
+ tty-color (~> 0.5)
+ tty-color (0.5.0)
+ tty-cursor (0.4.0)
+ tty-prompt (0.12.0)
+ necromancer (~> 0.4.0)
+ pastel (~> 0.7.0)
+ tty-cursor (~> 0.4.0)
+ wisper (~> 1.6.1)
+ wisper (1.6.1)
+
+PLATFORMS
+ ruby
+
+DEPENDENCIES
+ 3llo (= 0.3.0)
+
+BUNDLED WITH
+ 1.17.2
diff --git a/pkgs/tools/misc/3llo/default.nix b/pkgs/tools/misc/3llo/default.nix
new file mode 100644
index 000000000000..1f59d1f16a78
--- /dev/null
+++ b/pkgs/tools/misc/3llo/default.nix
@@ -0,0 +1,31 @@
+{ lib, ruby, bundlerApp, fetchpatch }:
+
+bundlerApp {
+ pname = "3llo";
+
+ gemfile = ./Gemfile;
+ lockfile = ./Gemfile.lock;
+
+ gemset = lib.recursiveUpdate (import ./gemset.nix) ({
+ "3llo" = {
+ dontBuild = false;
+ patches = [
+ (fetchpatch {
+ url = https://github.com/qcam/3llo/commit/7667c67fdc975bac315da027a3c69f49e7c06a2e.patch;
+ sha256 = "0ahp19igj77x23b2j9zk3znlmm7q7nija7mjgsmgqkgfbz2r1y7v";
+ })
+ ];
+ };
+ });
+
+ inherit ruby;
+
+ exes = [ "3llo" ];
+
+ meta = with lib; {
+ description = "Trello interactive CLI on terminal";
+ license = licenses.mit;
+ homepage = https://github.com/qcam/3llo;
+ maintainers = with maintainers; [ ma27 ];
+ };
+}
diff --git a/pkgs/tools/misc/3llo/gemset.nix b/pkgs/tools/misc/3llo/gemset.nix
new file mode 100644
index 000000000000..5c50ea9b2122
--- /dev/null
+++ b/pkgs/tools/misc/3llo/gemset.nix
@@ -0,0 +1,85 @@
+{
+ "3llo" = {
+ dependencies = ["tty-prompt"];
+ groups = ["default"];
+ platforms = [];
+ source = {
+ remotes = ["https://rubygems.org"];
+ sha256 = "082g42lkkynnb2piz37ih696zm2ms63mz2q9rnfzjsd149ig39yy";
+ type = "gem";
+ };
+ version = "0.3.0";
+ };
+ equatable = {
+ groups = ["default"];
+ platforms = [];
+ source = {
+ remotes = ["https://rubygems.org"];
+ sha256 = "0fzx2ishipnp6c124ka6fiw5wk42s7c7gxid2c4c1mb55b30dglf";
+ type = "gem";
+ };
+ version = "0.6.1";
+ };
+ necromancer = {
+ groups = ["default"];
+ platforms = [];
+ source = {
+ remotes = ["https://rubygems.org"];
+ sha256 = "0v9nhdkv6zrp7cn48xv7n2vjhsbslpvs0ha36mfkcd56cp27pavz";
+ type = "gem";
+ };
+ version = "0.4.0";
+ };
+ pastel = {
+ dependencies = ["equatable" "tty-color"];
+ groups = ["default"];
+ platforms = [];
+ source = {
+ remotes = ["https://rubygems.org"];
+ sha256 = "0m43wk7gswwkl6lfxwlliqc9v1qp8arfygihyz91jc9icf270xzm";
+ type = "gem";
+ };
+ version = "0.7.3";
+ };
+ tty-color = {
+ groups = ["default"];
+ platforms = [];
+ source = {
+ remotes = ["https://rubygems.org"];
+ sha256 = "1zpp6zixkkchrc2lqnabrsy24pxikz2px87ggz5ph6355fs803da";
+ type = "gem";
+ };
+ version = "0.5.0";
+ };
+ tty-cursor = {
+ groups = ["default"];
+ platforms = [];
+ source = {
+ remotes = ["https://rubygems.org"];
+ sha256 = "07whfm8mnp7l49s2cm2qy1snhsqq3a90sqwb71gvym4hm2kx822a";
+ type = "gem";
+ };
+ version = "0.4.0";
+ };
+ tty-prompt = {
+ dependencies = ["necromancer" "pastel" "tty-cursor" "wisper"];
+ groups = ["default"];
+ platforms = [];
+ source = {
+ remotes = ["https://rubygems.org"];
+ sha256 = "1026nyqhgmgxi2nmk8xk3hca07gy5rpisjs8y6w00wnw4f01kpv0";
+ type = "gem";
+ };
+ version = "0.12.0";
+ };
+ wisper = {
+ groups = ["default"];
+ platforms = [];
+ source = {
+ remotes = ["https://rubygems.org"];
+ sha256 = "19bw0z1qw1dhv7gn9lad25hgbgpb1bkw8d599744xdfam158ms2s";
+ type = "gem";
+ };
+ version = "1.6.1";
+ };
+}
\ No newline at end of file
diff --git a/pkgs/tools/misc/ckb-next/default.nix b/pkgs/tools/misc/ckb-next/default.nix
index 5a647541171a..575cb686f9d4 100644
--- a/pkgs/tools/misc/ckb-next/default.nix
+++ b/pkgs/tools/misc/ckb-next/default.nix
@@ -23,6 +23,10 @@ mkDerivation rec {
cmake
];
+ cmakeFlags = [
+ "-DINSTALL_DIR_ANIMATIONS=libexec"
+ ];
+
patches = [
./install-dirs.patch
./systemd-service.patch
diff --git a/pkgs/tools/misc/dynamic-colors/default.nix b/pkgs/tools/misc/dynamic-colors/default.nix
index 799236a58046..6cb01f14a2c0 100644
--- a/pkgs/tools/misc/dynamic-colors/default.nix
+++ b/pkgs/tools/misc/dynamic-colors/default.nix
@@ -2,37 +2,25 @@
stdenv.mkDerivation rec {
pname = "dynamic-colors";
- version = "0.2.2.1";
+ version = "0.2.2.2";
src = fetchFromGitHub {
owner = "peterhoeg";
repo = "dynamic-colors";
rev = "v${version}";
- sha256 = "0qz76n5sspgpz6bz66jfkyr42da3skbpw9wbvxgm3ha343azfaiw";
+ sha256 = "0i63570z9aqbxa8ixh4ayb3akgjdnlqyl2sbf9d7x8f1pxhk5kd5";
};
- dontBuild = true;
- dontStrip = true;
+ PREFIX = placeholder "out";
- installPhase = ''
- mkdir -p \
- $out/bin \
- $out/share/dynamic-colors/colorschemes \
- $out/share/bash-completion/completions \
- $out/share/zsh/site-packages
-
- install -m755 bin/dynamic-colors $out/bin/
- install -m644 completions/dynamic-colors.bash $out/share/bash-completion/completions/dynamic-colors
- install -m644 completions/dynamic-colors.zsh $out/share/zsh/site-packages/_dynamic-colors
- install -m644 colorschemes/* -t $out/share/dynamic-colors/colorschemes
-
- substituteInPlace $out/bin/dynamic-colors \
+ postPatch = ''
+ substituteInPlace bin/dynamic-colors \
--replace /usr/share/dynamic-colors $out/share/dynamic-colors
'';
meta = with stdenv.lib; {
description = "Change terminal colors on the fly";
- homepage = https://github.com/peterhoeg/dynamic-colors;
+ homepage = "https://github.com/peterhoeg/dynamic-colors";
license = licenses.mit;
maintainers = with maintainers; [ peterhoeg ];
platforms = platforms.unix;
diff --git a/pkgs/tools/misc/ffsend/default.nix b/pkgs/tools/misc/ffsend/default.nix
index 22697cfb24d3..73734ee5ea0f 100644
--- a/pkgs/tools/misc/ffsend/default.nix
+++ b/pkgs/tools/misc/ffsend/default.nix
@@ -16,16 +16,16 @@ with rustPlatform;
buildRustPackage rec {
pname = "ffsend";
- version = "0.2.49";
+ version = "0.2.50";
src = fetchFromGitLab {
owner = "timvisee";
repo = "ffsend";
rev = "v${version}";
- sha256 = "08x0kakhn75yzajxpvpdp1ml9z77i2x2k02kqcx3ssr6mbc7xnpf";
+ sha256 = "06virzmg3prvwk5gilr19qrpi93wvv7jq096kgsbn3rmnv3ys1zh";
};
- cargoSha256 = "1dmkij25gj0ya1i6h5l7pkjnqvj02zvsx15hddbjn1q06pihcsjm";
+ cargoSha256 = "1g72nz3nha41cvsb514z4k78yw7xcsh3nm0bl2wqy9dvdzgp1lm1";
nativeBuildInputs = [ cmake pkgconfig ];
buildInputs = [ openssl ]
diff --git a/pkgs/tools/misc/grc/default.nix b/pkgs/tools/misc/grc/default.nix
index fde08702f675..828d4e4dab78 100644
--- a/pkgs/tools/misc/grc/default.nix
+++ b/pkgs/tools/misc/grc/default.nix
@@ -1,8 +1,9 @@
-{ stdenv, fetchFromGitHub, python3Packages, makeWrapper }:
+{ stdenv, fetchFromGitHub, python3Packages }:
-stdenv.mkDerivation rec {
+python3Packages.buildPythonApplication rec {
pname = "grc";
version = "1.11.3";
+ format = "other";
src = fetchFromGitHub {
owner = "garabik";
@@ -11,22 +12,18 @@ stdenv.mkDerivation rec {
sha256 = "0b3wx9zr7l642hizk93ysbdss7rfymn22b2ykj4kpkf1agjkbv35";
};
- buildInputs = with python3Packages; [ wrapPython makeWrapper ];
+ postPatch = ''
+ for f in grc grcat; do
+ substituteInPlace $f \
+ --replace /usr/local/ $out/
+ done
+ '';
installPhase = ''
runHook preInstall
./install.sh "$out" "$out"
-
- for f in $out/bin/* ; do
- patchPythonScript $f
- substituteInPlace $f \
- --replace ' /usr/bin/env python3' '${python3Packages.python.interpreter}' \
- --replace "'/etc/grc.conf'" "'$out/etc/grc.conf'" \
- --replace "'/usr/share/grc/'" "'$out/share/grc/'"
- wrapProgram $f \
- --prefix PATH : $out/bin
- done
+ install -Dm444 -t $out/share/zsh/vendor-completions _grc
runHook postInstall
'';
diff --git a/pkgs/tools/misc/ix/default.nix b/pkgs/tools/misc/ix/default.nix
new file mode 100644
index 000000000000..fdbd7611dce5
--- /dev/null
+++ b/pkgs/tools/misc/ix/default.nix
@@ -0,0 +1,30 @@
+{ stdenv, fetchurl, makeWrapper, curl }:
+
+stdenv.mkDerivation rec {
+ pname = "ix";
+ version = "20190815";
+
+ src = fetchurl {
+ url = "http://ix.io/client";
+ sha256 = "0xc2s4s1aq143zz8lgkq5k25dpf049dw253qxiav5k7d7qvzzy57";
+ };
+
+ buildInputs = [ makeWrapper ];
+
+ phases = [ "installPhase" "fixupPhase" ];
+
+ installPhase = ''
+ install -Dm +x $src $out/bin/ix
+ '';
+
+ postFixup = ''
+ wrapProgram $out/bin/ix --prefix PATH : "${stdenv.lib.makeBinPath [ curl ]}"
+ '';
+
+ meta = with stdenv.lib; {
+ homepage = "http://ix.io";
+ description = "Command line pastebin";
+ maintainers = with maintainers; [ asymmetric ];
+ platforms = platforms.all;
+ };
+}
diff --git a/pkgs/tools/misc/vdirsyncer/default.nix b/pkgs/tools/misc/vdirsyncer/default.nix
index b3b1b4b310a7..8f79f5463e30 100644
--- a/pkgs/tools/misc/vdirsyncer/default.nix
+++ b/pkgs/tools/misc/vdirsyncer/default.nix
@@ -8,17 +8,18 @@ python3Packages.buildPythonApplication rec {
name = "${pname}-${version}";
src = fetchFromGitHub {
- owner = "pimutils";
+ owner = "spk";
repo = pname;
- rev = "ac45cf144b0ceb72cc2a9f454808688f3ac9ba4f";
- sha256 = "0hqsjdpgvm7d34q5b2hzmrzfxk43ald1bx22mvgg559kw1ck54s9";
+ # fix-build-style branch, see https://github.com/pimutils/vdirsyncer/pull/798
+ rev = "2c62d03bd73f8b44a47c2e769ade046697896ae9";
+ sha256 = "1q6xvzz5rf5sqdaj3mdvhpgwy5b16isavgg7vardgjwqwv1yal28";
};
native = rustPlatform.buildRustPackage {
name = "${name}-native";
inherit src;
sourceRoot = "source/rust";
- cargoSha256 = "1qziwlf6nlkpxb1hamb7qsipqg9ibp871rimgpwil38vqmyd570s";
+ cargoSha256 = "1n1dxq3klsry5mmbfff2jv7ih8mr5zvpncrdgba6qs93wi77qi0y";
buildInputs = [ pkgconfig openssl ] ++ stdenv.lib.optional stdenv.isDarwin Security;
};
@@ -36,18 +37,6 @@ python3Packages.buildPythonApplication rec {
checkInputs = with python3Packages; [ hypothesis pytest pytest-localserver pytest-subtesthack ];
- patches = [
- # Fixes for hypothesis: https://github.com/pimutils/vdirsyncer/pull/779
- (fetchpatch {
- url = https://github.com/pimutils/vdirsyncer/commit/22ad88a6b18b0979c5d1f1d610c1d2f8f87f4b89.patch;
- sha256 = "0dbzj6jlxhdidnm3i21a758z83sdiwzhpd45pbkhycfhgmqmhjpl";
- })
- (fetchpatch {
- url = https://github.com/pimutils/vdirsyncer/commit/29417235321c249c65904bc7948b066ef5683aee.patch;
- sha256 = "0zvr0y88gm3vprjcdzs4m151laa9qhkyi61rvrfdjmf42fwhbm80";
- })
- ];
-
postPatch = ''
# Invalid argument: 'perform_health_check' is not a valid setting
substituteInPlace tests/conftest.py \
@@ -74,7 +63,7 @@ python3Packages.buildPythonApplication rec {
meta = with stdenv.lib; {
homepage = https://github.com/pimutils/vdirsyncer;
description = "Synchronize calendars and contacts";
- maintainers = with maintainers; [ matthiasbeyer ];
+ maintainers = with maintainers; [ matthiasbeyer gebner ];
license = licenses.mit;
};
}
diff --git a/pkgs/tools/misc/wev/default.nix b/pkgs/tools/misc/wev/default.nix
new file mode 100644
index 000000000000..fa69cc4445ee
--- /dev/null
+++ b/pkgs/tools/misc/wev/default.nix
@@ -0,0 +1,34 @@
+{ stdenv, fetchurl
+, pkg-config, scdoc
+, wayland, wayland-protocols, libxkbcommon
+}:
+
+let
+ version = "2019-08-11";
+ commit = "47d17393473be152cf601272faf5704fff1c3f92";
+in stdenv.mkDerivation {
+ pname = "wev-unstable";
+ inherit version;
+
+ src = fetchurl {
+ url = "https://git.sr.ht/~sircmpwn/wev/archive/${commit}.tar.gz";
+ sha256 = "0a5kvrviz77bf7357gqs2iy7a1bvb3izgkmiv1rdxzzmihd563ga";
+ };
+
+ nativeBuildInputs = [ pkg-config scdoc ];
+ buildInputs = [ wayland wayland-protocols libxkbcommon ];
+
+ installFlags = [ "PREFIX=$(out)" ];
+
+ meta = with stdenv.lib; {
+ description = "Wayland event viewer";
+ longDescription = ''
+ This is a tool for debugging events on a Wayland window, analagous to the
+ X11 tool xev.
+ '';
+ homepage = https://git.sr.ht/~sircmpwn/wev;
+ license = licenses.mit;
+ platforms = platforms.unix;
+ maintainers = with maintainers; [ primeos ];
+ };
+}
diff --git a/pkgs/tools/networking/tcpflow/default.nix b/pkgs/tools/networking/tcpflow/default.nix
index 1df0f2c37fc2..8f502c5ef3f6 100644
--- a/pkgs/tools/networking/tcpflow/default.nix
+++ b/pkgs/tools/networking/tcpflow/default.nix
@@ -1,61 +1,44 @@
-{ stdenv, lib, fetchFromGitHub, openssl, zlib, libpcap, boost, cairo, automake, autoconf, useCairo ? false }:
+{ stdenv, lib, fetchFromGitHub, automake, autoconf
+, openssl, zlib, libpcap, boost
+, useCairo ? false, cairo
+}:
stdenv.mkDerivation rec {
- baseName = "tcpflow";
- version = "1.4.6";
- name = "${baseName}-${version}";
+ pname = "tcpflow";
+ version = "1.5.2";
src = fetchFromGitHub {
owner = "simsong";
- repo = "tcpflow";
- rev = "017687365b8233d16260f4afd7572c8ad8873cf6";
- sha256 = "002cqmn786sjysf59xnbb7lgr23nqqslb2gvy29q2xpnq6my9w38";
+ repo = pname;
+ rev = "${pname}-${version}";
+ sha256 = "063n3pfqa0lgzcwk4c0h01g2y5c3sli615j6a17dxpg95aw1zryy";
+ fetchSubmodules = true;
};
- be13_api = fetchFromGitHub {
- owner = "simsong";
- repo = "be13_api";
- rev = "8f4f4b3fe0b4815babb3a6fb595eb9a6d07e8a2e";
- sha256 = "1dlys702x3m8cr9kf4b9j8n28yh6knhwgqkm6a5yhh1grd8r3ksm";
- };
-
- dfxml = fetchFromGitHub {
- owner = "simsong";
- repo = "dfxml";
- rev = "13a8cc22189a8336d16777f2897ada6ae2ee59de";
- sha256 = "0wzhbkp4c8sp6wrk4ilz3skxp14scdnm3mw2xmxxrsifymzs2f5n";
- };
-
- httpparser = fetchFromGitHub {
- owner = "nodejs";
- repo = "http-parser";
- rev = "8d9e5db981b623fffc93657abacdc80270cbee58";
- sha256 = "0x17wwhrc7b2ngiqy0clnzn1zz2gbcz5n9m29pcyrcplly782k52";
- };
-
- buildInputs = [ openssl zlib libpcap boost automake autoconf ] ++ lib.optional useCairo cairo;
-
- postUnpack = ''
- pushd "$sourceRoot/src"
- cp -rv ${be13_api}/* be13_api/
- cp -rv ${dfxml}/* dfxml/
- cp -rv ${httpparser}/* http-parser/
- chmod -R u+w dfxml
- popd
- '';
+ nativeBuildInputs = [ automake autoconf ];
+ buildInputs = [ openssl zlib libpcap boost ]
+ ++ lib.optional useCairo cairo;
prePatch = ''
- substituteInPlace ./bootstrap.sh \
- --replace \ git 'echo git' \
- --replace /bin/rm rm
+ substituteInPlace bootstrap.sh \
+ --replace ".git" "" \
+ --replace "/bin/rm" "rm"
+ substituteInPlace configure.ac \
+ --replace "1.5.1" "1.5.2"
'';
preConfigure = "bash ./bootstrap.sh";
meta = with stdenv.lib; {
- description = ''TCP stream extractor'';
- license = licenses.gpl3 ;
- maintainers = with maintainers; [ raskin obadz ];
+ description = "TCP stream extractor";
+ longDescription = ''
+ tcpflow is a program that captures data transmitted as part of TCP
+ connections (flows), and stores the data in a way that is convenient for
+ protocol analysis and debugging.
+ '';
+ inherit (src.meta) homepage;
+ license = licenses.gpl3;
+ maintainers = with maintainers; [ primeos raskin obadz ];
platforms = platforms.linux;
};
}
diff --git a/pkgs/tools/networking/tcpflow/default.upstream b/pkgs/tools/networking/tcpflow/default.upstream
deleted file mode 100644
index 72802e4d0469..000000000000
--- a/pkgs/tools/networking/tcpflow/default.upstream
+++ /dev/null
@@ -1 +0,0 @@
-url http://www.digitalcorpora.org/downloads/tcpflow/
diff --git a/pkgs/tools/networking/uwimap/default.nix b/pkgs/tools/networking/uwimap/default.nix
index ad9eea0ecedd..125c83da4c4f 100644
--- a/pkgs/tools/networking/uwimap/default.nix
+++ b/pkgs/tools/networking/uwimap/default.nix
@@ -1,6 +1,6 @@
{ stdenv, fetchurl, fetchpatch, pam, openssl }:
-stdenv.mkDerivation {
+stdenv.mkDerivation ({
name = "uw-imap-2007f";
src = fetchurl {
@@ -12,7 +12,8 @@ stdenv.mkDerivation {
then "osx"
else "lnp" # Linux with PAM modules;
# -fPIC is required to compile php with imap on x86_64 systems
- + stdenv.lib.optionalString stdenv.isx86_64 " EXTRACFLAGS=-fPIC";
+ + stdenv.lib.optionalString stdenv.isx86_64 " EXTRACFLAGS=-fPIC"
+ + stdenv.lib.optionalString (stdenv.buildPlatform != stdenv.hostPlatform) " CC=${stdenv.hostPlatform.config}-gcc RANLIB=${stdenv.hostPlatform.config}-ranlib";
hardeningDisable = [ "format" ];
@@ -51,4 +52,11 @@ stdenv.mkDerivation {
passthru = {
withSSL = true;
};
-}
+} // stdenv.lib.optionalAttrs (stdenv.buildPlatform != stdenv.hostPlatform) {
+ # This is set here to prevent rebuilds on native compilation.
+ # Configure phase is a no-op there, because this package doesn't use ./configure scripts.
+ configurePhase = ''
+ echo "Cross-compilation, injecting make flags"
+ makeFlagsArray+=("ARRC=${stdenv.hostPlatform.config}-ar rc")
+ '';
+})
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index ca4b421e6f2d..5057dfd15cd1 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -454,6 +454,8 @@ in
_0x0 = callPackage ../tools/misc/0x0 { };
+ _3llo = callPackage ../tools/misc/3llo { };
+
_1password = callPackage ../applications/misc/1password { };
_9pfs = callPackage ../tools/filesystems/9pfs { };
@@ -2804,6 +2806,8 @@ in
wallutils = callPackage ../tools/graphics/wallutils { };
+ wev = callPackage ../tools/misc/wev { };
+
wl-clipboard = callPackage ../tools/misc/wl-clipboard { };
z-lua = callPackage ../tools/misc/z-lua { };
@@ -4030,6 +4034,8 @@ in
isync = callPackage ../tools/networking/isync { };
+ ix = callPackage ../tools/misc/ix { };
+
jaaa = callPackage ../applications/audio/jaaa { };
jackett = callPackage ../servers/jackett { };
@@ -5243,6 +5249,8 @@ in
stdenv = clangStdenv;
};
+ out-of-tree = callPackage ../development/tools/out-of-tree { };
+
oppai-ng = callPackage ../tools/misc/oppai-ng { };
update-dotdee = with python3Packages; toPythonApplication update-dotdee;
@@ -6272,6 +6280,8 @@ in
svgcleaner = callPackage ../tools/graphics/svgcleaner { };
+ ssb-patchwork = callPackage ../applications/networking/ssb/patchwork { };
+
ssdeep = callPackage ../tools/security/ssdeep { };
ssh-ident = callPackage ../tools/networking/ssh-ident { };
@@ -6387,9 +6397,7 @@ in
tcpdump = callPackage ../tools/networking/tcpdump { };
- tcpflow = callPackage ../tools/networking/tcpflow {
- openssl = openssl_1_0_2;
- };
+ tcpflow = callPackage ../tools/networking/tcpflow { };
tcpkali = callPackage ../applications/networking/tcpkali { };
@@ -7442,6 +7450,7 @@ in
crystal_0_26
crystal_0_27
crystal_0_29
+ crystal_0_30
crystal;
icr = callPackage ../development/tools/icr {};
@@ -7824,7 +7833,7 @@ in
fsharp = callPackage ../development/compilers/fsharp { };
- fsharp41 = callPackage ../development/compilers/fsharp41 { mono = mono4; };
+ fsharp41 = callPackage ../development/compilers/fsharp41 { mono = mono6; };
fstar = callPackage ../development/compilers/fstar { };
@@ -8211,8 +8220,15 @@ in
inherit (darwin.apple_sdk.frameworks) Foundation;
};
+ mono6 = callPackage ../development/compilers/mono/6.nix {
+ inherit (darwin) libobjc;
+ inherit (darwin.apple_sdk.frameworks) Foundation;
+ };
+
monoDLLFixer = callPackage ../build-support/mono-dll-fixer { };
+ msbuild = callPackage ../development/tools/build-managers/msbuild { mono = mono6; };
+
mosml = callPackage ../development/compilers/mosml { };
mozart-binary = callPackage ../development/compilers/mozart/binary.nix { };
@@ -8951,6 +8967,8 @@ in
tcl-8_5 = callPackage ../development/interpreters/tcl/8.5.nix { };
tcl-8_6 = callPackage ../development/interpreters/tcl/8.6.nix { };
+ wasm = ocamlPackages.wasm;
+
proglodyte-wasm = callPackage ../development/interpreters/proglodyte-wasm { };
wasm-gc = callPackage ../development/interpreters/wasm-gc { };
@@ -10808,10 +10826,6 @@ in
inherit (darwin.apple_sdk.frameworks) OpenGL;
};
- gegl_0_3 = callPackage ../development/libraries/gegl/3.0.nix {
- gtk = res.gtk2;
- };
-
gegl_0_4 = callPackage ../development/libraries/gegl/4.0.nix {
gtk = res.gtk2;
};
@@ -13370,8 +13384,6 @@ in
lvtk = callPackage ../development/libraries/audio/lvtk { };
- patchwork = callPackage ../applications/networking/ssb/patchwork { };
-
qradiolink = callPackage ../applications/radio/qradiolink { };
qrupdate = callPackage ../development/libraries/qrupdate { };
@@ -14454,7 +14466,9 @@ in
mod_python = callPackage ../servers/http/apache-modules/mod_python { };
- mod_wsgi = callPackage ../servers/http/apache-modules/mod_wsgi { };
+ mod_wsgi = self.mod_wsgi2;
+ mod_wsgi2 = callPackage ../servers/http/apache-modules/mod_wsgi { python = python2; ncurses = null; };
+ mod_wsgi3 = callPackage ../servers/http/apache-modules/mod_wsgi { python = python3; };
php = pkgs.php.override { inherit apacheHttpd; };
@@ -14673,8 +14687,6 @@ in
labelImg = callPackage ../applications/science/machine-learning/labelimg { };
- mailman = callPackage ../servers/mail/mailman { };
-
mailman-rss = callPackage ../development/python-modules/mailman-rss { };
mattermost = callPackage ../servers/mattermost { };
@@ -14715,6 +14727,8 @@ in
mlmmj = callPackage ../servers/mail/mlmmj { };
+ moodle = callPackage ../servers/web-apps/moodle { };
+
morty = callPackage ../servers/web-apps/morty { };
mullvad-vpn = callPackage ../applications/networking/mullvad-vpn { };
@@ -14793,8 +14807,6 @@ in
postsrsd = callPackage ../servers/mail/postsrsd { };
- rmilter = callPackage ../servers/mail/rmilter { };
-
rspamd = callPackage ../servers/mail/rspamd { };
pfixtools = callPackage ../servers/mail/postfix/pfixtools.nix {
@@ -15528,6 +15540,8 @@ in
gradm = callPackage ../os-specific/linux/gradm { };
+ inherit (nodePackages) gtop;
+
hd-idle = callPackage ../os-specific/linux/hd-idle { };
hdparm = callPackage ../os-specific/linux/hdparm { };
@@ -16143,6 +16157,8 @@ in
goconvey = callPackage ../development/tools/goconvey { };
+ gofumpt = callPackage ../development/tools/gofumpt { };
+
gotags = callPackage ../development/tools/gotags { };
golint = callPackage ../development/tools/golint { };
@@ -16328,6 +16344,8 @@ in
sdparm = callPackage ../os-specific/linux/sdparm { };
+ sdrangel = libsForQt5.callPackage ../applications/radio/sdrangel { };
+
sepolgen = callPackage ../os-specific/linux/sepolgen { };
setools = callPackage ../os-specific/linux/setools { };
@@ -17014,6 +17032,8 @@ in
starship = callPackage ../tools/misc/starship { };
+ stig = callPackage ../applications/networking/p2p/stig { };
+
stix-otf = callPackage ../data/fonts/stix-otf { };
stix-two = callPackage ../data/fonts/stix-two { };
@@ -17095,6 +17115,8 @@ in
gtk = res.gtk2;
};
+ theme-obsidian2 = callPackage ../data/themes/obsidian2 { };
+
themes = name: callPackage (../data/misc/themes + ("/" + name + ".nix")) {};
theano = callPackage ../data/fonts/theano { };
@@ -20428,6 +20450,8 @@ in
rpcs3 = libsForQt5.callPackage ../misc/emulators/rpcs3 { };
+ rsclock = callPackage ../applications/misc/rsclock { };
+
rstudio = libsForQt5.callPackage ../applications/editors/rstudio {
boost = boost166;
llvmPackages = llvmPackages_7;
@@ -22726,8 +22750,6 @@ in
theme-jade1 = callPackage ../misc/themes/jade1 { };
- theme-obsidian2 = callPackage ../misc/themes/obsidian2 { };
-
theme-vertex = callPackage ../misc/themes/vertex { };
rox-filer = callPackage ../desktops/rox/rox-filer {
diff --git a/pkgs/top-level/dotnet-packages.nix b/pkgs/top-level/dotnet-packages.nix
index 1740b3278097..e89a7d9df2aa 100644
--- a/pkgs/top-level/dotnet-packages.nix
+++ b/pkgs/top-level/dotnet-packages.nix
@@ -45,10 +45,31 @@ let self = dotnetPackages // overrides; dotnetPackages = with self; {
outputFiles = [ "lib/net40/*" ];
};
- FSharpCore = fetchNuGet {
+ FSharpCore302 = fetchNuGet {
+ baseName = "FSharp.Core";
+ version = "3.0.2";
+ sha256 = "1s4pqwbmhrsg5sw8i6dixdri3x0yjyilmkhsf4apfkp80si7d73q";
+ outputFiles = [ "*" ];
+ };
+
+ FSharpCore3125 = fetchNuGet {
+ baseName = "FSharp.Core";
+ version = "3.1.2.5";
+ sha256 = "0pfvjimrgrffb5rj612gsid044lfpk8g2cxyh9792dc1n8ck5hih";
+ outputFiles = [ "*" ];
+ };
+
+ FSharpCore4001 = fetchNuGet {
baseName = "FSharp.Core";
version = "4.0.0.1";
- sha256 = "01nhjcxdz8l1r5vvdzhmgy5x7z5fqppab3ki34qg14axgf8jjygn";
+ sha256 = "0v53iq12ji2d1bkdyg9dn8sz5l93sprrh835amh39dghh8v8vm8k";
+ outputFiles = [ "*" ];
+ };
+
+ FSharpCore4117 = fetchNuGet {
+ baseName = "FSharp.Core";
+ version = "4.1.17";
+ sha256 = "1yk23ir66fgqm5r6qyf66zf64l0s223l3yd7p9yvbyimyg0hgzb1";
outputFiles = [ "*" ];
};
@@ -89,8 +110,8 @@ let self = dotnetPackages // overrides; dotnetPackages = with self; {
FSharpCompilerTools = fetchNuGet {
baseName = "FSharp.Compiler.Tools";
- version = "4.1.4";
- sha256 = "0vsp0khlnwh15ibg8s161rw6a6i8rlriclpq53paga447jllf0m8";
+ version = "4.1.27";
+ sha256 = "1m3hl8ja9gp5ajxmjf7bnq24bbkd6kx7yhxf4zb8si27h1n9l6dl";
outputFiles = [ "*" ];
};
@@ -101,10 +122,10 @@ let self = dotnetPackages // overrides; dotnetPackages = with self; {
outputFiles = [ "build/*" ];
};
- FsLexYacc704 = fetchNuGet {
+ FsLexYacc706 = fetchNuGet {
baseName = "FsLexYacc";
- version = "7.0.4";
- sha256 = "01zpdb0pybdf0by02rwd7pb1g0cmnn8jxm2pibzxjxw6f4l43ywi";
+ version = "7.0.6";
+ sha256 = "0xwiq8q5q6ga6zj24w83ch5csbv405xcg6jg2hmnjic0npz0drk2";
outputFiles = [ "*" ];
};
@@ -203,8 +224,8 @@ let self = dotnetPackages // overrides; dotnetPackages = with self; {
SystemValueTuple = fetchNuGet {
baseName = "System.ValueTuple";
- version = "4.3.0";
- sha256 = "00p5s753xh5417arw3k6npf1pc1k3m1s9mrlkw5vmc7pg8lm6n88";
+ version = "4.3.1";
+ sha256 = "0qzq878s66yfkf4n2b9af8lw2bx45s3cg6mi0w8w0bi358fa7q70";
outputFiles = [ "*" ];
};
@@ -848,13 +869,13 @@ let self = dotnetPackages // overrides; dotnetPackages = with self; {
Nuget = buildDotnetPackage {
baseName = "Nuget";
- version = "3.4.3";
+ version = "4.9.1";
src = fetchFromGitHub {
owner = "mono";
repo = "nuget-binary";
- rev = "1f3025c2eb13bfcb56b47ddd77329ac3d9911d1c";
- sha256 = "01snk05hcrp5i2ys3p1y34r05q1b460q6wb8p3vwpba2q2czdax5";
+ rev = "7871fa26914593fdb2f2500df1196df7b8aecb1c";
+ sha256 = "07r63xam6icm17pf6amh1qkmna13nxa3ncdan7a3ql307i5isriz";
};
buildInputs = [ unzip ];
diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix
index 8f6f474a532f..10fcbb2a1a48 100644
--- a/pkgs/top-level/perl-packages.nix
+++ b/pkgs/top-level/perl-packages.nix
@@ -4532,17 +4532,6 @@ let
};
};
- DeviceSerialPort = buildPerlPackage {
- pname = "Device-SerialPort";
- version = "1.04";
- src = fetchurl {
- url = mirror://cpan/authors/id/C/CO/COOK/Device-SerialPort-1.04.tar.gz;
- sha256 = "1mz9a2qzkz6fbz76wcwmp48h6ckjxpcazb70q03acklvndy5d4nk";
- };
- meta = {
- };
- };
-
DBDMock = buildPerlModule {
pname = "DBD-Mock";
version = "1.45";
@@ -15007,6 +14996,19 @@ let
};
};
+ DeviceSerialPort = buildPerlPackage rec {
+ pname = "Device-SerialPort";
+ version = "1.04";
+ src = fetchurl {
+ url = "mirror://cpan/authors/id/C/CO/COOK/${pname}-${version}.tar.gz";
+ sha256 = "1mz9a2qzkz6fbz76wcwmp48h6ckjxpcazb70q03acklvndy5d4nk";
+ };
+ meta = with stdenv.lib; {
+ description = "Linux/POSIX emulation of Win32::SerialPort functions.";
+ license = with licenses; [ artistic1 gpl1Plus ];
+ };
+ };
+
ServerStarter = buildPerlModule {
pname = "Server-Starter";
version = "0.34";
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index a591b93bd7cb..7f6186433cb0 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -583,6 +583,12 @@ in {
firetv = callPackage ../development/python-modules/firetv { };
+ flufl_bounce = callPackage ../development/python-modules/flufl/bounce.nix { };
+
+ flufl_i18n = callPackage ../development/python-modules/flufl/i18n.nix { };
+
+ flufl_lock = callPackage ../development/python-modules/flufl/lock.nix { };
+
foxdot = callPackage ../development/python-modules/foxdot { };
fsspec = callPackage ../development/python-modules/fsspec { };
@@ -685,6 +691,10 @@ in {
langdetect = callPackage ../development/python-modules/langdetect { };
+ lazr_config = callPackage ../development/python-modules/lazr/config.nix { };
+
+ lazr_delegates = callPackage ../development/python-modules/lazr/delegates.nix { };
+
libmr = callPackage ../development/python-modules/libmr { };
limitlessled = callPackage ../development/python-modules/limitlessled { };
@@ -701,6 +711,10 @@ in {
mail-parser = callPackage ../development/python-modules/mail-parser { };
+ mailman = disabledIf (!isPy3k) (callPackage ../servers/mail/mailman/core.nix { });
+
+ mailmanclient = callPackage ../development/python-modules/mailmanclient { };
+
manhole = callPackage ../development/python-modules/manhole { };
markerlib = callPackage ../development/python-modules/markerlib { };
@@ -809,6 +823,8 @@ in {
poetry = callPackage ../development/python-modules/poetry { };
+ postorius = disabledIf (!isPy3k) (callPackage ../servers/mail/mailman/postorius.nix { });
+
pplpy = callPackage ../development/python-modules/pplpy { };
pprintpp = callPackage ../development/python-modules/pprintpp { };
@@ -2865,6 +2881,8 @@ in {
django-logentry-admin = callPackage ../development/python-modules/django-logentry-admin { };
+ django-mailman3 = callPackage ../development/python-modules/django-mailman3 { };
+
django-pglocks = callPackage ../development/python-modules/django-pglocks { };
django-picklefield = callPackage ../development/python-modules/django-picklefield { };
@@ -5839,6 +5857,7 @@ in {
cudatoolkit = pkgs.cudatoolkit_10;
cudnn = pkgs.cudnn_cudatoolkit_10;
nccl = pkgs.nccl_cudatoolkit_10;
+ openssl = pkgs.openssl_1_0_2;
};
tensorflow = if stdenv.isDarwin then self.tensorflow-bin else self.tensorflow-build;