diff --git a/lib/default.nix b/lib/default.nix
index 4971e68ebd3..a909cefd60f 100644
--- a/lib/default.nix
+++ b/lib/default.nix
@@ -56,6 +56,9 @@ let
# back-compat aliases
platforms = systems.doubles;
+ # linux kernel configuration
+ kernel = callLibs ./kernel.nix;
+
inherit (builtins) add addErrorContext attrNames concatLists
deepSeq elem elemAt filter genericClosure genList getAttr
hasAttr head isAttrs isBool isInt isList isString length
diff --git a/lib/kernel.nix b/lib/kernel.nix
index 36ea3083828..2ce19f8cb68 100644
--- a/lib/kernel.nix
+++ b/lib/kernel.nix
@@ -1,12 +1,7 @@
-{ lib, version }:
+{ lib }:
with lib;
{
- # Common patterns/legacy
- whenAtLeast = ver: mkIf (versionAtLeast version ver);
- whenOlder = ver: mkIf (versionOlder version ver);
- # range is (inclusive, exclusive)
- whenBetween = verLow: verHigh: mkIf (versionAtLeast version verLow && versionOlder version verHigh);
# Keeping these around in case we decide to change this horrible implementation :)
@@ -18,4 +13,14 @@ with lib;
module = { tristate = "m"; };
freeform = x: { freeform = x; };
+ /*
+ Common patterns/legacy used in common-config/hardened-config.nix
+ */
+ whenHelpers = version: {
+ whenAtLeast = ver: mkIf (versionAtLeast version ver);
+ whenOlder = ver: mkIf (versionOlder version ver);
+ # range is (inclusive, exclusive)
+ whenBetween = verLow: verHigh: mkIf (versionAtLeast version verLow && versionOlder version verHigh);
+ };
+
}
diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix
index 574619b2b31..1d2881b2801 100644
--- a/maintainers/maintainer-list.nix
+++ b/maintainers/maintainer-list.nix
@@ -1958,7 +1958,7 @@
drewrisinger = {
email = "drisinger+nixpkgs@gmail.com";
github = "drewrisinger";
- gitHubId = 10198051;
+ githubId = 10198051;
name = "Drew Risinger";
};
dsferruzza = {
@@ -3099,7 +3099,7 @@
illiusdope = {
email = "mat@marini.ca";
github = "illiusdope";
- gitHubId = 61913481;
+ githubId = 61913481;
name = "Mat Marini";
};
ilya-fedin = {
@@ -4544,6 +4544,12 @@
githubId = 1711539;
name = "matklad";
};
+ matt-snider = {
+ email = "matt.snider@protonmail.com";
+ github = "matt-snider";
+ githubId = 11810057;
+ name = "Matt Snider";
+ };
matthewbauer = {
email = "mjbauer95@gmail.com";
github = "matthewbauer";
@@ -4884,7 +4890,7 @@
mmilata = {
email = "martin@martinmilata.cz";
github = "mmilata";
- gitHubId = 85857;
+ githubId = 85857;
name = "Martin Milata";
};
mmlb = {
@@ -7253,6 +7259,12 @@
githubId = 844343;
name = "Thiago K. Okada";
};
+ thmzlt = {
+ email = "git@thomazleite.com";
+ github = "thmzlt";
+ githubId = 7709;
+ name = "Thomaz Leite";
+ };
ThomasMader = {
email = "thomas.mader@gmail.com";
github = "ThomasMader";
diff --git a/nixos/lib/eval-config.nix b/nixos/lib/eval-config.nix
index 77490ca3762..9892d6f160f 100644
--- a/nixos/lib/eval-config.nix
+++ b/nixos/lib/eval-config.nix
@@ -41,6 +41,12 @@ let
# default to the argument. That way this new default could propagate all
# they way through, but has the last priority behind everything else.
nixpkgs.system = lib.mkDefault system;
+
+ # Stash the value of the `system` argument. When using `nesting.children`
+ # we want to have the same default value behavior (immediately above)
+ # without any interference from the user's configuration.
+ nixpkgs.initialSystem = system;
+
_module.args.pkgs = lib.mkIf (pkgs_ != null) (lib.mkForce pkgs_);
};
};
diff --git a/nixos/lib/testing-python.nix b/nixos/lib/testing-python.nix
index 6663864f1e5..3891adc1043 100644
--- a/nixos/lib/testing-python.nix
+++ b/nixos/lib/testing-python.nix
@@ -175,13 +175,13 @@ in rec {
nodeNames = builtins.attrNames nodes;
invalidNodeNames = lib.filter
- (node: builtins.match "^[A-z_][A-z0-9_]+$" node == null) nodeNames;
+ (node: builtins.match "^[A-z_]([A-z0-9_]+)?$" node == null) nodeNames;
in
if lib.length invalidNodeNames > 0 then
throw ''
Cannot create machines out of (${lib.concatStringsSep ", " invalidNodeNames})!
- All machines are referenced as perl variables in the testing framework which will break the
+ All machines are referenced as python variables in the testing framework which will break the
script when special characters are used.
Please stick to alphanumeric chars and underscores as separation.
diff --git a/nixos/modules/config/networking.nix b/nixos/modules/config/networking.nix
index 81427bb8ee6..dd36696b94d 100644
--- a/nixos/modules/config/networking.nix
+++ b/nixos/modules/config/networking.nix
@@ -35,12 +35,22 @@ in
'';
};
+ networking.hostFiles = lib.mkOption {
+ type = types.listOf types.path;
+ defaultText = lib.literalExample "Hosts from `networking.hosts` and `networking.extraHosts`";
+ example = lib.literalExample ''[ "''${pkgs.my-blocklist-package}/share/my-blocklist/hosts" ]'';
+ description = ''
+ Files that should be concatenated together to form /etc/hosts.
+ '';
+ };
+
networking.extraHosts = lib.mkOption {
type = types.lines;
default = "";
example = "192.168.0.1 lanlocalhost";
description = ''
Additional verbatim entries to be appended to /etc/hosts.
+ For adding hosts from derivation results, use instead.
'';
};
@@ -159,6 +169,15 @@ in
"::1" = [ "localhost" ];
};
+ networking.hostFiles = let
+ stringHosts =
+ let
+ oneToString = set: ip: ip + " " + concatStringsSep " " set.${ip} + "\n";
+ allToString = set: concatMapStrings (oneToString set) (attrNames set);
+ in pkgs.writeText "string-hosts" (allToString (filterAttrs (_: v: v != []) cfg.hosts));
+ extraHosts = pkgs.writeText "extra-hosts" cfg.extraHosts;
+ in mkBefore [ stringHosts extraHosts ];
+
environment.etc =
{ # /etc/services: TCP/UDP port assignments.
services.source = pkgs.iana-etc + "/etc/services";
@@ -167,12 +186,8 @@ in
protocols.source = pkgs.iana-etc + "/etc/protocols";
# /etc/hosts: Hostname-to-IP mappings.
- hosts.text = let
- oneToString = set: ip: ip + " " + concatStringsSep " " set.${ip};
- allToString = set: concatMapStringsSep "\n" (oneToString set) (attrNames set);
- in ''
- ${allToString (filterAttrs (_: v: v != []) cfg.hosts)}
- ${cfg.extraHosts}
+ hosts.source = pkgs.runCommandNoCC "hosts" {} ''
+ cat ${escapeShellArgs cfg.hostFiles} > $out
'';
# /etc/host.conf: resolver configuration file
diff --git a/nixos/modules/misc/nixpkgs.nix b/nixos/modules/misc/nixpkgs.nix
index afb74581e23..011d493c153 100644
--- a/nixos/modules/misc/nixpkgs.nix
+++ b/nixos/modules/misc/nixpkgs.nix
@@ -216,6 +216,14 @@ in
Ignored when nixpkgs.pkgs is set.
'';
};
+
+ initialSystem = mkOption {
+ type = types.str;
+ internal = true;
+ description = ''
+ Preserved value of system passed to eval-config.nix.
+ '';
+ };
};
config = {
diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix
index 917840fb919..dba2593bbef 100644
--- a/nixos/modules/module-list.nix
+++ b/nixos/modules/module-list.nix
@@ -406,6 +406,7 @@
./services/mail/sympa.nix
./services/mail/nullmailer.nix
./services/misc/airsonic.nix
+ ./services/misc/ankisyncd.nix
./services/misc/apache-kafka.nix
./services/misc/autofs.nix
./services/misc/autorandr.nix
diff --git a/nixos/modules/programs/firejail.nix b/nixos/modules/programs/firejail.nix
index 0abdde5ddeb..5e53f733794 100644
--- a/nixos/modules/programs/firejail.nix
+++ b/nixos/modules/programs/firejail.nix
@@ -47,7 +47,7 @@ in {
config = mkIf cfg.enable {
security.wrappers.firejail.source = "${lib.getBin pkgs.firejail}/bin/firejail";
- environment.systemPackages = [ wrappedBins ];
+ environment.systemPackages = [ pkgs.firejail ] ++ [ wrappedBins ];
};
meta.maintainers = with maintainers; [ peterhoeg ];
diff --git a/nixos/modules/services/mail/dovecot.nix b/nixos/modules/services/mail/dovecot.nix
index b5ed2c594f7..230a2ae3f82 100644
--- a/nixos/modules/services/mail/dovecot.nix
+++ b/nixos/modules/services/mail/dovecot.nix
@@ -14,18 +14,34 @@ let
base_dir = ${baseDir}
protocols = ${concatStringsSep " " cfg.protocols}
sendmail_path = /run/wrappers/bin/sendmail
+ # defining mail_plugins must be done before the first protocol {} filter because of https://doc.dovecot.org/configuration_manual/config_file/config_file_syntax/#variable-expansion
+ mail_plugins = $mail_plugins ${concatStringsSep " " cfg.mailPlugins.globally.enable}
''
- (if cfg.sslServerCert == null then ''
- ssl = no
- disable_plaintext_auth = no
- '' else ''
- ssl_cert = <${cfg.sslServerCert}
- ssl_key = <${cfg.sslServerKey}
- ${optionalString (cfg.sslCACert != null) ("ssl_ca = <" + cfg.sslCACert)}
- ssl_dh = <${config.security.dhparams.params.dovecot2.path}
- disable_plaintext_auth = yes
- '')
+ (
+ concatStringsSep "\n" (
+ mapAttrsToList (
+ protocol: plugins: ''
+ protocol ${protocol} {
+ mail_plugins = $mail_plugins ${concatStringsSep " " plugins.enable}
+ }
+ ''
+ ) cfg.mailPlugins.perProtocol
+ )
+ )
+
+ (
+ if cfg.sslServerCert == null then ''
+ ssl = no
+ disable_plaintext_auth = no
+ '' else ''
+ ssl_cert = <${cfg.sslServerCert}
+ ssl_key = <${cfg.sslServerKey}
+ ${optionalString (cfg.sslCACert != null) ("ssl_ca = <" + cfg.sslCACert)}
+ ssl_dh = <${config.security.dhparams.params.dovecot2.path}
+ disable_plaintext_auth = yes
+ ''
+ )
''
default_internal_user = ${cfg.user}
@@ -45,55 +61,58 @@ let
}
''
- (optionalString cfg.enablePAM ''
- userdb {
- driver = passwd
- }
-
- passdb {
- driver = pam
- args = ${optionalString cfg.showPAMFailure "failure_show_msg=yes"} dovecot2
- }
- '')
-
- (optionalString (cfg.sieveScripts != {}) ''
- plugin {
- ${concatStringsSep "\n" (mapAttrsToList (to: from: "sieve_${to} = ${stateDir}/sieve/${to}") cfg.sieveScripts)}
- }
- '')
-
- (optionalString (cfg.mailboxes != []) ''
- protocol imap {
- namespace inbox {
- inbox=yes
- ${concatStringsSep "\n" (map mailboxConfig cfg.mailboxes)}
+ (
+ optionalString cfg.enablePAM ''
+ userdb {
+ driver = passwd
}
- }
- '')
- (optionalString cfg.enableQuota ''
- mail_plugins = $mail_plugins quota
- service quota-status {
- executable = ${dovecotPkg}/libexec/dovecot/quota-status -p postfix
- inet_listener {
- port = ${cfg.quotaPort}
+ passdb {
+ driver = pam
+ args = ${optionalString cfg.showPAMFailure "failure_show_msg=yes"} dovecot2
}
- client_limit = 1
- }
+ ''
+ )
- protocol imap {
- mail_plugins = $mail_plugins imap_quota
- }
+ (
+ optionalString (cfg.sieveScripts != {}) ''
+ plugin {
+ ${concatStringsSep "\n" (mapAttrsToList (to: from: "sieve_${to} = ${stateDir}/sieve/${to}") cfg.sieveScripts)}
+ }
+ ''
+ )
- plugin {
- quota_rule = *:storage=${cfg.quotaGlobalPerUser}
- quota = maildir:User quota # per virtual mail user quota # BUG/FIXME broken, we couldn't get this working
- quota_status_success = DUNNO
- quota_status_nouser = DUNNO
- quota_status_overquota = "552 5.2.2 Mailbox is full"
- quota_grace = 10%%
- }
- '')
+ (
+ optionalString (cfg.mailboxes != []) ''
+ protocol imap {
+ namespace inbox {
+ inbox=yes
+ ${concatStringsSep "\n" (map mailboxConfig cfg.mailboxes)}
+ }
+ }
+ ''
+ )
+
+ (
+ optionalString cfg.enableQuota ''
+ service quota-status {
+ executable = ${dovecotPkg}/libexec/dovecot/quota-status -p postfix
+ inet_listener {
+ port = ${cfg.quotaPort}
+ }
+ client_limit = 1
+ }
+
+ plugin {
+ quota_rule = *:storage=${cfg.quotaGlobalPerUser}
+ quota = maildir:User quota # per virtual mail user quota # BUG/FIXME broken, we couldn't get this working
+ quota_status_success = DUNNO
+ quota_status_nouser = DUNNO
+ quota_status_overquota = "552 5.2.2 Mailbox is full"
+ quota_grace = 10%%
+ }
+ ''
+ )
cfg.extraConfig
];
@@ -107,7 +126,7 @@ let
mailbox "${mailbox.name}" {
auto = ${toString mailbox.auto}
'' + optionalString (mailbox.specialUse != null) ''
- special_use = \${toString mailbox.specialUse}
+ special_use = \${toString mailbox.specialUse}
'' + "}";
mailboxes = { ... }: {
@@ -160,7 +179,7 @@ in
protocols = mkOption {
type = types.listOf types.str;
- default = [ ];
+ default = [];
description = "Additional listeners to start when Dovecot is enabled.";
};
@@ -183,6 +202,43 @@ in
description = "Additional entries to put verbatim into Dovecot's config file.";
};
+ mailPlugins =
+ let
+ plugins = hint: types.submodule {
+ options = {
+ enable = mkOption {
+ type = types.listOf types.str;
+ default = [];
+ description = "mail plugins to enable as a list of strings to append to the ${hint} $mail_plugins configuration variable";
+ };
+ };
+ };
+ in
+ mkOption {
+ type = with types; submodule {
+ options = {
+ globally = mkOption {
+ description = "Additional entries to add to the mail_plugins variable for all protocols";
+ type = plugins "top-level";
+ example = { enable = [ "virtual" ]; };
+ default = { enable = []; };
+ };
+ perProtocol = mkOption {
+ description = "Additional entries to add to the mail_plugins variable, per protocol";
+ type = attrsOf (plugins "corresponding per-protocol");
+ default = {};
+ example = { imap = [ "imap_acl" ]; };
+ };
+ };
+ };
+ description = "Additional entries to add to the mail_plugins variable, globally and per protocol";
+ example = {
+ globally.enable = [ "acl" ];
+ perProtocol.imap.enable = [ "imap_acl" ];
+ };
+ default = { globally.enable = []; perProtocol = {}; };
+ };
+
configFile = mkOption {
type = types.nullOr types.path;
default = null;
@@ -305,27 +361,33 @@ in
enable = true;
params.dovecot2 = {};
};
- services.dovecot2.protocols =
- optional cfg.enableImap "imap"
- ++ optional cfg.enablePop3 "pop3"
- ++ optional cfg.enableLmtp "lmtp";
+ services.dovecot2.protocols =
+ optional cfg.enableImap "imap"
+ ++ optional cfg.enablePop3 "pop3"
+ ++ optional cfg.enableLmtp "lmtp";
+
+ services.dovecot2.mailPlugins = mkIf cfg.enableQuota {
+ globally.enable = [ "quota" ];
+ perProtocol.imap.enable = [ "imap_quota" ];
+ };
users.users = {
dovenull =
- { uid = config.ids.uids.dovenull2;
+ {
+ uid = config.ids.uids.dovenull2;
description = "Dovecot user for untrusted logins";
group = "dovenull";
};
} // optionalAttrs (cfg.user == "dovecot2") {
dovecot2 =
- { uid = config.ids.uids.dovecot2;
- description = "Dovecot user";
- group = cfg.group;
- };
+ {
+ uid = config.ids.uids.dovecot2;
+ description = "Dovecot user";
+ group = cfg.group;
+ };
} // optionalAttrs (cfg.createMailUser && cfg.mailUser != null) {
${cfg.mailUser} =
- { description = "Virtual Mail User"; } //
- optionalAttrs (cfg.mailGroup != null)
+ { description = "Virtual Mail User"; } // optionalAttrs (cfg.mailGroup != null)
{ group = cfg.mailGroup; };
};
@@ -334,7 +396,7 @@ in
} // optionalAttrs (cfg.group == "dovecot2") {
dovecot2.gid = config.ids.gids.dovecot2;
} // optionalAttrs (cfg.createMailUser && cfg.mailGroup != null) {
- ${cfg.mailGroup} = { };
+ ${cfg.mailGroup} = {};
};
environment.etc."dovecot/modules".source = modulesDir;
@@ -363,15 +425,19 @@ in
rm -rf ${stateDir}/sieve
'' + optionalString (cfg.sieveScripts != {}) ''
mkdir -p ${stateDir}/sieve
- ${concatStringsSep "\n" (mapAttrsToList (to: from: ''
- if [ -d '${from}' ]; then
- mkdir '${stateDir}/sieve/${to}'
- cp -p "${from}/"*.sieve '${stateDir}/sieve/${to}'
- else
- cp -p '${from}' '${stateDir}/sieve/${to}'
- fi
- ${pkgs.dovecot_pigeonhole}/bin/sievec '${stateDir}/sieve/${to}'
- '') cfg.sieveScripts)}
+ ${concatStringsSep "\n" (
+ mapAttrsToList (
+ to: from: ''
+ if [ -d '${from}' ]; then
+ mkdir '${stateDir}/sieve/${to}'
+ cp -p "${from}/"*.sieve '${stateDir}/sieve/${to}'
+ else
+ cp -p '${from}' '${stateDir}/sieve/${to}'
+ fi
+ ${pkgs.dovecot_pigeonhole}/bin/sievec '${stateDir}/sieve/${to}'
+ ''
+ ) cfg.sieveScripts
+ )}
chown -R '${cfg.mailUser}:${cfg.mailGroup}' '${stateDir}/sieve'
'';
};
@@ -379,17 +445,21 @@ in
environment.systemPackages = [ dovecotPkg ];
assertions = [
- { assertion = intersectLists cfg.protocols [ "pop3" "imap" ] != [];
+ {
+ assertion = intersectLists cfg.protocols [ "pop3" "imap" ] != [];
message = "dovecot needs at least one of the IMAP or POP3 listeners enabled";
}
- { assertion = (cfg.sslServerCert == null) == (cfg.sslServerKey == null)
- && (cfg.sslCACert != null -> !(cfg.sslServerCert == null || cfg.sslServerKey == null));
+ {
+ assertion = (cfg.sslServerCert == null) == (cfg.sslServerKey == null)
+ && (cfg.sslCACert != null -> !(cfg.sslServerCert == null || cfg.sslServerKey == null));
message = "dovecot needs both sslServerCert and sslServerKey defined for working crypto";
}
- { assertion = cfg.showPAMFailure -> cfg.enablePAM;
+ {
+ assertion = cfg.showPAMFailure -> cfg.enablePAM;
message = "dovecot is configured with showPAMFailure while enablePAM is disabled";
}
- { assertion = cfg.sieveScripts != {} -> (cfg.mailUser != null && cfg.mailGroup != null);
+ {
+ assertion = cfg.sieveScripts != {} -> (cfg.mailUser != null && cfg.mailGroup != null);
message = "dovecot requires mailUser and mailGroup to be set when sieveScripts is set";
}
];
diff --git a/nixos/modules/services/misc/ankisyncd.nix b/nixos/modules/services/misc/ankisyncd.nix
new file mode 100644
index 00000000000..5fc19649d3d
--- /dev/null
+++ b/nixos/modules/services/misc/ankisyncd.nix
@@ -0,0 +1,79 @@
+{ config, lib, pkgs, ... }:
+
+with lib;
+
+let
+ cfg = config.services.ankisyncd;
+
+ name = "ankisyncd";
+
+ stateDir = "/var/lib/${name}";
+
+ authDbPath = "${stateDir}/auth.db";
+
+ sessionDbPath = "${stateDir}/session.db";
+
+ configFile = pkgs.writeText "ankisyncd.conf" (lib.generators.toINI {} {
+ sync_app = {
+ host = cfg.host;
+ port = cfg.port;
+ data_root = stateDir;
+ auth_db_path = authDbPath;
+ session_db_path = sessionDbPath;
+
+ base_url = "/sync/";
+ base_media_url = "/msync/";
+ };
+ });
+in
+ {
+ options.services.ankisyncd = {
+ enable = mkEnableOption "ankisyncd";
+
+ package = mkOption {
+ type = types.package;
+ default = pkgs.ankisyncd;
+ defaultText = literalExample "pkgs.ankisyncd";
+ description = "The package to use for the ankisyncd command.";
+ };
+
+ host = mkOption {
+ type = types.str;
+ default = "localhost";
+ description = "ankisyncd host";
+ };
+
+ port = mkOption {
+ type = types.int;
+ default = 27701;
+ description = "ankisyncd port";
+ };
+
+ openFirewall = mkOption {
+ default = false;
+ type = types.bool;
+ description = "Whether to open the firewall for the specified port.";
+ };
+ };
+
+ config = mkIf cfg.enable {
+ networking.firewall.allowedTCPPorts = mkIf cfg.openFirewall [ cfg.port ];
+
+ environment.etc."ankisyncd/ankisyncd.conf".source = configFile;
+
+ systemd.services.ankisyncd = {
+ description = "ankisyncd - Anki sync server";
+ after = [ "network.target" ];
+ wantedBy = [ "multi-user.target" ];
+ path = [ cfg.package ];
+
+ serviceConfig = {
+ Type = "simple";
+ DynamicUser = true;
+ StateDirectory = name;
+ ExecStart = "${cfg.package}/bin/ankisyncd";
+ Restart = "always";
+ };
+ };
+ };
+ }
diff --git a/nixos/modules/services/networking/cjdns.nix b/nixos/modules/services/networking/cjdns.nix
index 3fb85b16cbe..5f8ac96b229 100644
--- a/nixos/modules/services/networking/cjdns.nix
+++ b/nixos/modules/services/networking/cjdns.nix
@@ -29,17 +29,13 @@ let
};
# Additional /etc/hosts entries for peers with an associated hostname
- cjdnsExtraHosts = import (pkgs.runCommand "cjdns-hosts" {}
- # Generate a builder that produces an output usable as a Nix string value
- ''
- exec >$out
- echo \'\'
- ${concatStringsSep "\n" (mapAttrsToList (k: v:
- optionalString (v.hostname != "")
- "echo $(${pkgs.cjdns}/bin/publictoip6 ${v.publicKey}) ${v.hostname}")
- (cfg.ETHInterface.connectTo // cfg.UDPInterface.connectTo))}
- echo \'\'
- '');
+ cjdnsExtraHosts = pkgs.runCommandNoCC "cjdns-hosts" {} ''
+ exec >$out
+ ${concatStringsSep "\n" (mapAttrsToList (k: v:
+ optionalString (v.hostname != "")
+ "echo $(${pkgs.cjdns}/bin/publictoip6 ${v.publicKey}) ${v.hostname}")
+ (cfg.ETHInterface.connectTo // cfg.UDPInterface.connectTo))}
+ '';
parseModules = x:
x // { connectTo = mapAttrs (name: value: { inherit (value) password publicKey; }) x.connectTo; };
@@ -144,13 +140,15 @@ in
connectTo = mkOption {
type = types.attrsOf ( types.submodule ( connectToSubmodule ) );
default = { };
- example = {
- "192.168.1.1:27313" = {
- hostname = "homer.hype";
- password = "5kG15EfpdcKNX3f2GSQ0H1HC7yIfxoCoImnO5FHM";
- publicKey = "371zpkgs8ss387tmr81q04mp0hg1skb51hw34vk1cq644mjqhup0.k";
- };
- };
+ example = literalExample ''
+ {
+ "192.168.1.1:27313" = {
+ hostname = "homer.hype";
+ password = "5kG15EfpdcKNX3f2GSQ0H1HC7yIfxoCoImnO5FHM";
+ publicKey = "371zpkgs8ss387tmr81q04mp0hg1skb51hw34vk1cq644mjqhup0.k";
+ };
+ }
+ '';
description = ''
Credentials for making UDP tunnels.
'';
@@ -189,13 +187,15 @@ in
connectTo = mkOption {
type = types.attrsOf ( types.submodule ( connectToSubmodule ) );
default = { };
- example = {
- "01:02:03:04:05:06" = {
- hostname = "homer.hype";
- password = "5kG15EfpdcKNX3f2GSQ0H1HC7yIfxoCoImnO5FHM";
- publicKey = "371zpkgs8ss387tmr81q04mp0hg1skb51hw34vk1cq644mjqhup0.k";
- };
- };
+ example = literalExample ''
+ {
+ "01:02:03:04:05:06" = {
+ hostname = "homer.hype";
+ password = "5kG15EfpdcKNX3f2GSQ0H1HC7yIfxoCoImnO5FHM";
+ publicKey = "371zpkgs8ss387tmr81q04mp0hg1skb51hw34vk1cq644mjqhup0.k";
+ };
+ }
+ '';
description = ''
Credentials for connecting look similar to UDP credientials
except they begin with the mac address.
@@ -278,7 +278,7 @@ in
};
};
- networking.extraHosts = mkIf cfg.addExtraHosts cjdnsExtraHosts;
+ networking.hostFiles = mkIf cfg.addExtraHosts [ cjdnsExtraHosts ];
assertions = [
{ assertion = ( cfg.ETHInterface.bind != "" || cfg.UDPInterface.bind != "" || cfg.confFile != null );
diff --git a/nixos/modules/services/networking/ntp/ntpd.nix b/nixos/modules/services/networking/ntp/ntpd.nix
index b5403cb747d..54ff054d84c 100644
--- a/nixos/modules/services/networking/ntp/ntpd.nix
+++ b/nixos/modules/services/networking/ntp/ntpd.nix
@@ -23,6 +23,8 @@ let
restrict -6 ::1
${toString (map (server: "server " + server + " iburst\n") cfg.servers)}
+
+ ${cfg.extraConfig}
'';
ntpFlags = "-c ${configFile} -u ${ntpUser}:nogroup ${toString cfg.extraFlags}";
@@ -81,6 +83,17 @@ in
'';
};
+ extraConfig = mkOption {
+ type = types.lines;
+ default = "";
+ example = ''
+ fudge 127.127.1.0 stratum 10
+ '';
+ description = ''
+ Additional text appended to ntp.conf.
+ '';
+ };
+
extraFlags = mkOption {
type = types.listOf types.str;
description = "Extra flags passed to the ntpd command.";
diff --git a/nixos/modules/system/activation/top-level.nix b/nixos/modules/system/activation/top-level.nix
index f67d2900561..14bd751ce32 100644
--- a/nixos/modules/system/activation/top-level.nix
+++ b/nixos/modules/system/activation/top-level.nix
@@ -15,6 +15,7 @@ let
map (childConfig:
(import ../../../lib/eval-config.nix {
inherit baseModules;
+ system = config.nixpkgs.initialSystem;
modules =
(optionals inheritParent modules)
++ [ ./no-clone.nix ]
diff --git a/nixos/modules/tasks/filesystems/btrfs.nix b/nixos/modules/tasks/filesystems/btrfs.nix
index 48be18c7102..f64493e1a3c 100644
--- a/nixos/modules/tasks/filesystems/btrfs.nix
+++ b/nixos/modules/tasks/filesystems/btrfs.nix
@@ -118,12 +118,17 @@ in
fs' = utils.escapeSystemdPath fs;
in nameValuePair "btrfs-scrub-${fs'}" {
description = "btrfs scrub on ${fs}";
+ # scrub prevents suspend2ram or proper shutdown
+ conflicts = [ "shutdown.target" "sleep.target" ];
+ before = [ "shutdown.target" "sleep.target" ];
serviceConfig = {
- Type = "oneshot";
+ # simple and not oneshot, otherwise ExecStop is not used
+ Type = "simple";
Nice = 19;
IOSchedulingClass = "idle";
ExecStart = "${pkgs.btrfs-progs}/bin/btrfs scrub start -B ${fs}";
+ ExecStop = "${pkgs.btrfs-progs}/bin/btrfs scrub cancel ${fs}";
};
};
in listToAttrs (map scrubService cfgScrub.fileSystems);
diff --git a/nixos/tests/nesting.nix b/nixos/tests/nesting.nix
index 6388b67a6e4..a75806b24ff 100644
--- a/nixos/tests/nesting.nix
+++ b/nixos/tests/nesting.nix
@@ -29,10 +29,10 @@ import ./make-test-python.nix {
)
clone.succeed("cowsay hey")
clone.succeed("hello")
-
- children.wait_for_unit("default.target")
- children.succeed("cowsay hey")
- children.fail("hello")
+
+ children.wait_for_unit("default.target")
+ children.succeed("cowsay hey")
+ children.fail("hello")
with subtest("Nested children do not inherit from parent"):
children.succeed(
diff --git a/pkgs/applications/audio/spotify-tui/default.nix b/pkgs/applications/audio/spotify-tui/default.nix
index 9613df6df0b..94f08a5f7a8 100644
--- a/pkgs/applications/audio/spotify-tui/default.nix
+++ b/pkgs/applications/audio/spotify-tui/default.nix
@@ -2,16 +2,16 @@
rustPlatform.buildRustPackage rec {
pname = "spotify-tui";
- version = "0.15.0";
+ version = "0.16.0";
src = fetchFromGitHub {
owner = "Rigellute";
repo = "spotify-tui";
rev = "v${version}";
- sha256 = "19mnnpsidwr5y6igs478gfp7rq76378f66nzfhj4mraqd2jc4nzj";
+ sha256 = "0fmj25zjg12v0kyanic343lrdhxkh290v88qiz6ac47g8bdy3c83";
};
- cargoSha256 = "1zhv3sla92z7pjdnf0r4x85n7z9spi70vgy4kw72rdc5v9bmj7q8";
+ cargoSha256 = "1n8aacy0hapjm10hmgqm07rb5c0ngmzr1s116pspsl7cdszza6xi";
nativeBuildInputs = [ pkgconfig ] ++ stdenv.lib.optionals stdenv.isLinux [ python3 ];
buildInputs = [ openssl ]
diff --git a/pkgs/applications/editors/jetbrains/default.nix b/pkgs/applications/editors/jetbrains/default.nix
index 1db952cf1a5..466d52236d0 100644
--- a/pkgs/applications/editors/jetbrains/default.nix
+++ b/pkgs/applications/editors/jetbrains/default.nix
@@ -250,12 +250,12 @@ in
clion = buildClion rec {
name = "clion-${version}";
- version = "2019.3.3"; /* updated by script */
+ version = "2019.3.4"; /* updated by script */
description = "C/C++ IDE. New. Intelligent. Cross-platform";
license = stdenv.lib.licenses.unfree;
src = fetchurl {
url = "https://download.jetbrains.com/cpp/CLion-${version}.tar.gz";
- sha256 = "1dvnb6mb8xgrgqzqxm2zirwm77w4pci6ibwsdh6wqpnzpqksh4iw"; /* updated by script */
+ sha256 = "0whd379ck79vhz14yh5g6vpl4cvgw4z9ag4mwgizmd8kbcfnvdxd"; /* updated by script */
};
wmClass = "jetbrains-clion";
update-channel = "CLion RELEASE"; # channel's id as in http://www.jetbrains.com/updates/updates.xml
@@ -263,12 +263,12 @@ in
datagrip = buildDataGrip rec {
name = "datagrip-${version}";
- version = "2019.3.2"; /* updated by script */
+ version = "2019.3.3"; /* updated by script */
description = "Your Swiss Army Knife for Databases and SQL";
license = stdenv.lib.licenses.unfree;
src = fetchurl {
url = "https://download.jetbrains.com/datagrip/${name}.tar.gz";
- sha256 = "1aypzs5q9zgggxbpaxfd8r5ds0ck31lb00csn62npndqxa3bj7z5"; /* updated by script */
+ sha256 = "0zbyiw60gqcqi5bbazmsbs4qzmmxx1q034hs36k1dryf2y02jyih"; /* updated by script */
};
wmClass = "jetbrains-datagrip";
update-channel = "DataGrip RELEASE";
@@ -276,12 +276,12 @@ in
goland = buildGoland rec {
name = "goland-${version}";
- version = "2019.3.2"; /* updated by script */
+ version = "2019.3.3"; /* updated by script */
description = "Up and Coming Go IDE";
license = stdenv.lib.licenses.unfree;
src = fetchurl {
url = "https://download.jetbrains.com/go/${name}.tar.gz";
- sha256 = "0namvc8dfm562dgvs4mrv1c6lyi4j8yxw402fkw55l0xqv3ff0a9"; /* updated by script */
+ sha256 = "091ym7vyb0hxzz6a1jfb88x0lj499vjd04bq8swmw14m1akmk3lf"; /* updated by script */
};
wmClass = "jetbrains-goland";
update-channel = "GoLand RELEASE";
@@ -315,12 +315,12 @@ in
phpstorm = buildPhpStorm rec {
name = "phpstorm-${version}";
- version = "2019.3.2"; /* updated by script */
+ version = "2019.3.3"; /* updated by script */
description = "Professional IDE for Web and PHP developers";
license = stdenv.lib.licenses.unfree;
src = fetchurl {
url = "https://download.jetbrains.com/webide/PhpStorm-${version}.tar.gz";
- sha256 = "02qnkcri49chbbpx2f338cfs5w2kg1l7zfn6fa7qrla82zpjsqlm"; /* updated by script */
+ sha256 = "03ag1a40l1k8sqlywcs7kjn02c65xm3l9riyimg4hx23yi17w18h"; /* updated by script */
};
wmClass = "jetbrains-phpstorm";
update-channel = "PhpStorm RELEASE";
@@ -354,12 +354,12 @@ in
rider = buildRider rec {
name = "rider-${version}";
- version = "2019.3.1"; /* updated by script */
+ version = "2019.3.4"; /* updated by script */
description = "A cross-platform .NET IDE based on the IntelliJ platform and ReSharper";
license = stdenv.lib.licenses.unfree;
src = fetchurl {
url = "https://download.jetbrains.com/rider/JetBrains.Rider-${version}.tar.gz";
- sha256 = "0cs8fc3h6d2m84ppiqjy0f3xklpc5gf0i6c4bzv04y8ngh0cwgl2"; /* updated by script */
+ sha256 = "17axv0v31dpmjcaij5qpqqm071mwhmf1ahy0y0h96limq8cw9872"; /* updated by script */
};
wmClass = "jetbrains-rider";
update-channel = "Rider RELEASE";
@@ -367,12 +367,12 @@ in
ruby-mine = buildRubyMine rec {
name = "ruby-mine-${version}";
- version = "2019.3.2"; /* updated by script */
+ version = "2019.3.3"; /* updated by script */
description = "The Most Intelligent Ruby and Rails IDE";
license = stdenv.lib.licenses.unfree;
src = fetchurl {
url = "https://download.jetbrains.com/ruby/RubyMine-${version}.tar.gz";
- sha256 = "0mwzhvrhvsyb8r7sjcigv9jazim1zyipb3ym4xsd2gyl3ans2vm9"; /* updated by script */
+ sha256 = "0lkzb3rifr7r23vijcz7rqcxjpykx7dkghiq5prk1zz83hzi4b2j"; /* updated by script */
};
wmClass = "jetbrains-rubymine";
update-channel = "RubyMine RELEASE";
@@ -380,12 +380,12 @@ in
webstorm = buildWebStorm rec {
name = "webstorm-${version}";
- version = "2019.3.2"; /* updated by script */
+ version = "2019.3.3"; /* updated by script */
description = "Professional IDE for Web and JavaScript development";
license = stdenv.lib.licenses.unfree;
src = fetchurl {
url = "https://download.jetbrains.com/webstorm/WebStorm-${version}.tar.gz";
- sha256 = "0mbfkwjqg2d1mkka0vajx41nv4f07y1w7chk6ii7sylaj7ypzi13"; /* updated by script */
+ sha256 = "1b7hwqpk96g4il5rbxb8cpqsizgc9k5kb8vkvkcc9xh7qqz02i85"; /* updated by script */
};
wmClass = "jetbrains-webstorm";
update-channel = "WebStorm RELEASE";
diff --git a/pkgs/applications/editors/texstudio/default.nix b/pkgs/applications/editors/texstudio/default.nix
index 372d9508174..d6db89e5c5e 100644
--- a/pkgs/applications/editors/texstudio/default.nix
+++ b/pkgs/applications/editors/texstudio/default.nix
@@ -3,13 +3,13 @@
mkDerivation rec {
pname = "texstudio";
- version = "2.12.20";
+ version = "2.12.22";
src = fetchFromGitHub {
owner = "${pname}-org";
repo = pname;
rev = version;
- sha256 = "0hywx2knqdrslzmm4if476ryf4ma0aw5j8kdp6lyrz2jx7az2gqa";
+ sha256 = "037jvsfln8wav17qj9anxz2a7p51v7ky85wmhdj2hgwp40al651g";
};
nativeBuildInputs = [ qmake wrapQtAppsHook pkgconfig ];
@@ -27,6 +27,6 @@ mkDerivation rec {
homepage = http://texstudio.sourceforge.net;
license = licenses.gpl2Plus;
platforms = [ "x86_64-linux" ];
- maintainers = with maintainers; [ cfouche ];
+ maintainers = with maintainers; [ ajs124 cfouche ];
};
}
diff --git a/pkgs/applications/editors/vscode/generic.nix b/pkgs/applications/editors/vscode/generic.nix
index ace4bbe9cdc..a573c518b5d 100644
--- a/pkgs/applications/editors/vscode/generic.nix
+++ b/pkgs/applications/editors/vscode/generic.nix
@@ -62,7 +62,7 @@ in
else [ gtk2 at-spi2-atk wrapGAppsHook ] ++ atomEnv.packages)
++ [ libsecret libXScrnSaver ];
- runtimeDependencies = [ systemd.lib fontconfig.lib ];
+ runtimeDependencies = lib.optional (stdenv.isLinux) [ systemd.lib fontconfig.lib ];
nativeBuildInputs = lib.optional (!stdenv.isDarwin) autoPatchelfHook;
diff --git a/pkgs/applications/misc/blender/default.nix b/pkgs/applications/misc/blender/default.nix
index 75f5b8302e6..f55e46a6dc7 100644
--- a/pkgs/applications/misc/blender/default.nix
+++ b/pkgs/applications/misc/blender/default.nix
@@ -122,7 +122,8 @@ stdenv.mkDerivation rec {
# --python-expr is used to workaround https://developer.blender.org/T74304
postInstall = ''
wrapProgram $blenderExecutable \
- --add-flags '--python-expr "import sys; sys.path.append(\"${python3Packages.numpy}/${python.sitePackages}\")"'
+ --prefix PYTHONPATH : ${python3Packages.numpy}/${python.sitePackages} \
+ --add-flags '--python-use-system-env'
'';
# Set RUNPATH so that libcuda and libnvrtc in /run/opengl-driver(-32)/lib can be
diff --git a/pkgs/applications/misc/cheat/default.nix b/pkgs/applications/misc/cheat/default.nix
index a86c1e8bc05..d4d0643bfdc 100644
--- a/pkgs/applications/misc/cheat/default.nix
+++ b/pkgs/applications/misc/cheat/default.nix
@@ -2,18 +2,18 @@
buildGoModule rec {
pname = "cheat";
- version = "3.0.3";
+ version = "3.0.7";
src = fetchFromGitHub {
owner = "chrisallenlane";
repo = "cheat";
rev = version;
- sha256 = "19w1admdcgld9vlc4fsyc5d9bi6rmwhr2x2ji43za2vjlk34hnnx";
+ sha256 = "0i5j85ciimk14kndb81qxny1ksr57sr9xdvjn7x1ibc7h6pikjn5";
};
subPackages = [ "cmd/cheat" ];
- modSha256 = "189cqnfl403f4lk7g9v68mwk93ciglqli639dk4x9091lvn5gq5q";
+ modSha256 = "1v9hvxygwvqma2j5yz7r95g34xpwb0n29hm39i89vgmvl3hy67s0";
meta = with stdenv.lib; {
description = "Create and view interactive cheatsheets on the command-line";
diff --git a/pkgs/applications/misc/polybar/default.nix b/pkgs/applications/misc/polybar/default.nix
index e1045663a3b..1fc0162f8d0 100644
--- a/pkgs/applications/misc/polybar/default.nix
+++ b/pkgs/applications/misc/polybar/default.nix
@@ -68,11 +68,6 @@ stdenv.mkDerivation rec {
(if i3Support || i3GapsSupport then makeWrapper else null)
];
- postConfigure = ''
- substituteInPlace generated-sources/settings.hpp \
- --replace "${stdenv.cc}" "${stdenv.cc.name}"
- '';
-
postInstall = if (i3Support || i3GapsSupport) then ''
wrapProgram $out/bin/polybar \
--prefix PATH : "${if i3Support then i3 else i3-gaps}/bin"
diff --git a/pkgs/applications/misc/simplenote/default.nix b/pkgs/applications/misc/simplenote/default.nix
index b98b0eee2aa..7ec72eae6fa 100644
--- a/pkgs/applications/misc/simplenote/default.nix
+++ b/pkgs/applications/misc/simplenote/default.nix
@@ -16,10 +16,10 @@ let
pname = "simplenote";
- version = "1.14.0";
+ version = "1.15.0";
sha256 = {
- x86_64-linux = "1l61xf1i80fd8ymmnrb3plqn70jsxd8wyg0n6f69bz3k8s5g8cxi";
+ x86_64-linux = "08h3g2rw75k63ssd62c6jrb2dy9sz85y5jpfj5np64dvw70a1811";
}.${system} or throwSystem;
meta = with stdenv.lib; {
diff --git a/pkgs/applications/misc/wikicurses/default.nix b/pkgs/applications/misc/wikicurses/default.nix
index d38383c30ec..9b1e9f091e2 100644
--- a/pkgs/applications/misc/wikicurses/default.nix
+++ b/pkgs/applications/misc/wikicurses/default.nix
@@ -11,8 +11,18 @@ pythonPackages.buildPythonApplication rec {
sha256 = "0f14s4qx3q5pr5vn460c34b5mbz2xs62d8ljs3kic8gmdn8x2knm";
};
+ outputs = [ "out" "man" ];
+
propagatedBuildInputs = with pythonPackages; [ urwid beautifulsoup4 lxml ];
+ postInstall = ''
+ mkdir -p $man/share/man/man{1,5}
+ cp wikicurses.1 $man/share/man/man1/
+ cp wikicurses.conf.5 $man/share/man/man5/
+ '';
+
+ doCheck = false;
+
meta = {
description = "A simple curses interface for MediaWiki sites such as Wikipedia";
homepage = https://github.com/ids1024/wikicurses/;
diff --git a/pkgs/applications/misc/zola/default.nix b/pkgs/applications/misc/zola/default.nix
index 201a3eda3cc..6616f7e4294 100644
--- a/pkgs/applications/misc/zola/default.nix
+++ b/pkgs/applications/misc/zola/default.nix
@@ -2,16 +2,16 @@
rustPlatform.buildRustPackage rec {
pname = "zola";
- version = "0.10.0";
+ version = "0.10.1";
src = fetchFromGitHub {
owner = "getzola";
repo = pname;
rev = "v${version}";
- sha256 = "112aqv21gy1fbly5v2x3ph32pr82d1mwh0q57yfaaqygz2madypb";
+ sha256 = "07zg4ia983rgvgvmw4xbi347lr4rxlf1xv8rw72cflc74kyia67n";
};
- cargoSha256 = "0hqa60bx8pxhgad7x6r4zbwddrkcspnnp53bl94zbf3j47p10ggz";
+ cargoSha256 = "13lnl01h8k8xv2ls1kjskfnyjmmk8iyk2mvbk01p2wmhp5m876md";
nativeBuildInputs = [ cmake pkg-config ];
buildInputs = [ openssl ]
diff --git a/pkgs/applications/networking/browsers/chromium/plugins.nix b/pkgs/applications/networking/browsers/chromium/plugins.nix
index e600d134e9c..434bd77b6d1 100644
--- a/pkgs/applications/networking/browsers/chromium/plugins.nix
+++ b/pkgs/applications/networking/browsers/chromium/plugins.nix
@@ -45,11 +45,11 @@ let
flash = stdenv.mkDerivation rec {
pname = "flashplayer-ppapi";
- version = "32.0.0.330";
+ version = "32.0.0.344";
src = fetchzip {
url = "https://fpdownload.adobe.com/pub/flashplayer/pdc/${version}/flash_player_ppapi_linux.x86_64.tar.gz";
- sha256 = "08gpx0fq0r1sz5smfdgv4fkfwq1hdijv4dw432d6jdz8lq09y1nk";
+ sha256 = "05ijlgsby9zxx0qs6f3vav1z0p6xr1cg6idl4akxvfmsl6hn6hkq";
stripRoot = false;
};
diff --git a/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer/default.nix b/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer/default.nix
index 3d711f92d1c..46a759cf27a 100644
--- a/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer/default.nix
+++ b/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer/default.nix
@@ -74,7 +74,7 @@ let
in
stdenv.mkDerivation rec {
pname = "flashplayer";
- version = "32.0.0.330";
+ version = "32.0.0.344";
src = fetchurl {
url =
@@ -85,14 +85,14 @@ stdenv.mkDerivation rec {
sha256 =
if debug then
if arch == "x86_64" then
- "1k7h1p6g1vf96v31j1n8638jdxacap0729n0dnmh6l0h5q518k1b"
+ "1kkwijxlcs1rlqxr1vj51h95fwwrp5m0c9lngqpncgmmhh8v9dyr"
else
- "0gabgllx79s6rhv0zivfj6z79rcsdrzrdm94xdr19c11dsbqxd6b"
+ "0r47s19fw7gsph73rd5jb2zfsjwz7mjawm6c49rir9rsa0zxrsks"
else
if arch == "x86_64" then
- "1pf3k1x8c2kbkc9pf9y5n4jilp3g41v8v0q5ng77sbnl92s35zsj"
+ "1ki3i7zw0q48xf01xjfm1mpizc5flk768p9hqxpg881r4h65dh6b"
else
- "1xibm6ffm09c553g100cgb6grnk21dfq8m81yy0jskph157vg962";
+ "1v527i60sljwyvv4l1kg9ml05skjgm3naynlswd35hsz258jnxl4";
};
nativeBuildInputs = [ unzip ];
diff --git a/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer/standalone.nix b/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer/standalone.nix
index b003a1b3f5c..5274d30e68a 100644
--- a/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer/standalone.nix
+++ b/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer/standalone.nix
@@ -50,7 +50,7 @@
stdenv.mkDerivation {
pname = "flashplayer-standalone";
- version = "32.0.0.330";
+ version = "32.0.0.344";
src = fetchurl {
url =
@@ -60,9 +60,9 @@ stdenv.mkDerivation {
"https://fpdownload.macromedia.com/pub/flashplayer/updaters/32/flash_player_sa_linux.x86_64.tar.gz";
sha256 =
if debug then
- "0wrkg2in4c0bnbifm06m4rdggzs8zbaxwrh6z3mpbf4p3bl6xg84"
+ "1ymsk07xmnanyv86r58ar1l4wgjarlq0fc111ajc76pp8dsxnfx8"
else
- "08qxa3zanlgmn8sn7crz242adx10jqymd4gzf1m0zlczw20ar09c";
+ "0wiwpn4a0jxslw4ahalq74rksn82y0aqa3lrjr9qs7kdcak74vky";
};
nativeBuildInputs = [ unzip ];
diff --git a/pkgs/applications/networking/cluster/atlantis/default.nix b/pkgs/applications/networking/cluster/atlantis/default.nix
index 67e91870f1a..cb846060a3d 100644
--- a/pkgs/applications/networking/cluster/atlantis/default.nix
+++ b/pkgs/applications/networking/cluster/atlantis/default.nix
@@ -2,21 +2,21 @@
buildGoModule rec {
pname = "atlantis";
- version = "0.10.1";
+ version = "0.11.1";
src = fetchFromGitHub {
owner = "runatlantis";
repo = "atlantis";
rev = "v${version}";
- sha256 = "08k2dgz6rph68647ah1rdp7hqa5h1ar4gdy7vdjy5kn7gz21gmri";
+ sha256 = "1ylk6n13ln6yaq4nc4n7fm00wfiyqi2x33sca5avzsvd1b387kk6";
};
- modSha256 = "1i4s3xcq2qc3zy00wk2l77935ilm6n5k1msilmdnj0061ia4860y";
+ modSha256 = "1bhplk3p780llpj9l0fwcyli74879968d6j582mvjwvf2winbqzq";
subPackages = [ "." ];
meta = with stdenv.lib; {
- homepage = https://github.com/runatlantis/atlantis;
+ homepage = "https://github.com/runatlantis/atlantis";
description = "Terraform Pull Request Automation";
platforms = platforms.all;
license = licenses.asl20;
diff --git a/pkgs/applications/networking/cluster/helm/default.nix b/pkgs/applications/networking/cluster/helm/default.nix
index 12e20e9c13b..88ca9b3da94 100644
--- a/pkgs/applications/networking/cluster/helm/default.nix
+++ b/pkgs/applications/networking/cluster/helm/default.nix
@@ -2,13 +2,13 @@
buildGoModule rec {
pname = "helm";
- version = "3.1.1";
+ version = "3.1.2";
src = fetchFromGitHub {
owner = "helm";
repo = "helm";
rev = "v${version}";
- sha256 = "16hbwmgq14g28r9s0ipnpiqlppyh57yrcqcspmj05vrf9jsg5vwj";
+ sha256 = "0pg5cwgyfb4isy2fn233kj3bdn0i8qqp90yzix0khs5maalpnrk1";
};
modSha256 = "0618zzi4x37ahsrazsr82anghhfva8yaryzb3p5d737p3ixbiyv8";
diff --git a/pkgs/applications/networking/cluster/marathon/default.nix b/pkgs/applications/networking/cluster/marathon/default.nix
index 72bd82be6c1..b7decc0c141 100644
--- a/pkgs/applications/networking/cluster/marathon/default.nix
+++ b/pkgs/applications/networking/cluster/marathon/default.nix
@@ -24,7 +24,7 @@ stdenv.mkDerivation rec {
homepage = https://mesosphere.github.io/marathon;
description = "Cluster-wide init and control system for services in cgroups or Docker containers";
license = licenses.asl20;
- maintainers = with maintainers; [ kamilchm kevincox pradeepchhetri ];
+ maintainers = with maintainers; [ kamilchm pradeepchhetri ];
platforms = platforms.linux;
};
}
diff --git a/pkgs/applications/networking/cluster/mesos/default.nix b/pkgs/applications/networking/cluster/mesos/default.nix
index 1ad30335b94..ec152fdc464 100644
--- a/pkgs/applications/networking/cluster/mesos/default.nix
+++ b/pkgs/applications/networking/cluster/mesos/default.nix
@@ -256,7 +256,7 @@ in stdenv.mkDerivation rec {
homepage = "http://mesos.apache.org";
license = licenses.asl20;
description = "A cluster manager that provides efficient resource isolation and sharing across distributed applications, or frameworks";
- maintainers = with maintainers; [ cstrahan kevincox offline ];
+ maintainers = with maintainers; [ cstrahan offline ];
platforms = platforms.unix;
};
}
diff --git a/pkgs/applications/networking/ids/zeek/default.nix b/pkgs/applications/networking/ids/zeek/default.nix
index 947abc39c21..9d1df501369 100644
--- a/pkgs/applications/networking/ids/zeek/default.nix
+++ b/pkgs/applications/networking/ids/zeek/default.nix
@@ -1,18 +1,23 @@
{stdenv, fetchurl, cmake, flex, bison, openssl, libpcap, zlib, file, curl
, libmaxminddb, gperftools, python, swig, rocksdb }:
-
+let
+ preConfigure = (import ./script.nix);
+in
stdenv.mkDerivation rec {
pname = "zeek";
- version = "3.0.1";
+ version = "3.0.3";
src = fetchurl {
- url = "https://www.zeek.org/downloads/zeek-${version}.tar.gz";
- sha256 = "1lhik212wrbi092qizc08f3i0b9pj318sxwm0abc5jc3v3pz7x3r";
+ url = "https://old.zeek.org/downloads/zeek-${version}.tar.gz";
+ sha256 = "0xlw5v83qbgy23wdcddmvan2pid28mw745g4fc1z5r18kp67i8a2";
};
nativeBuildInputs = [ cmake flex bison file ];
buildInputs = [ openssl libpcap zlib curl libmaxminddb gperftools python swig rocksdb ];
+ #see issue https://github.com/zeek/zeek/issues/804 to modify hardlinking duplicate files.
+ inherit preConfigure;
+
enableParallelBuilding = true;
cmakeFlags = [
diff --git a/pkgs/applications/networking/ids/zeek/script.nix b/pkgs/applications/networking/ids/zeek/script.nix
new file mode 100644
index 00000000000..10a2d11a148
--- /dev/null
+++ b/pkgs/applications/networking/ids/zeek/script.nix
@@ -0,0 +1,62 @@
+''
+ sed -i "1i##! test dpd" $PWD/scripts/base/frameworks/dpd/__load__.zeek
+ sed -i "1i##! test x509" $PWD/scripts/base/files/x509/__load__.zeek
+ sed -i "1i##! test files-extract" $PWD/scripts/base/files/extract/__load__.zeek
+ sed -i "1i##! test files-hash" $PWD/scripts/base/files/hash/__load__.zeek
+ sed -i "1i##! test files-pe" $PWD/scripts/base/files/pe/__load__.zeek
+ sed -i "1i##! test analyzer" $PWD/scripts/base/frameworks/analyzer/__load__.zeek
+ sed -i "1i##! test cluster" $PWD/scripts/base/frameworks/cluster/__load__.zeek
+ sed -i "1i##! test config" $PWD/scripts/base/frameworks/config/__load__.zeek
+ sed -i "1i##! test contro" $PWD/scripts/base/frameworks/control/__load__.zeek
+ sed -i "1i##! test files" $PWD/scripts/base/frameworks/files/__load__.zeek
+ sed -i "1i##! test files-magic" $PWD/scripts/base/frameworks/files/magic/__load__.zeek
+ sed -i "1i##! test input" $PWD/scripts/base/frameworks/input/__load__.zeek
+ sed -i "1i##! test intel" $PWD/scripts/base/frameworks/intel/__load__.zeek
+ sed -i "1i##! test logging" $PWD/scripts/base/frameworks/logging/__load__.zeek
+ sed -i "1i##! test logging-postprocessors" $PWD/scripts/base/frameworks/logging/postprocessors/__load__.zeek
+ sed -i "1i##! test netcontrol" $PWD/scripts/base/frameworks/netcontrol/__load__.zeek
+ sed -i "1i##! test netcontrol-plugins" $PWD/scripts/base/frameworks/netcontrol/plugins/__load__.zeek
+ sed -i "1i##! test notice" $PWD/scripts/base/frameworks/notice/__load__.zeek
+ sed -i "1i##! test openflow" $PWD/scripts/base/frameworks/openflow/__load__.zeek
+ sed -i "1i##! test openflow-plugins" $PWD/scripts/base/frameworks/openflow/plugins/__load__.zeek
+ sed -i "1i##! test packet-filter" $PWD/scripts/base/frameworks/packet-filter/__load__.zeek
+ sed -i "1i##! test reporter" $PWD/scripts/base/frameworks/reporter/__load__.zeek
+ sed -i "1i##! test signatures" $PWD/scripts/base/frameworks/signatures/__load__.zeek
+ sed -i "1i##! test software" $PWD/scripts/base/frameworks/software/__load__.zeek
+ sed -i "1i##! test sumstats" $PWD/scripts/base/frameworks/sumstats/__load__.zeek
+ sed -i "1i##! test sumstats-plugins" $PWD/scripts/base/frameworks/sumstats/plugins/__load__.zeek
+ sed -i "1i##! test conn" $PWD/scripts/base/protocols/conn/__load__.zeek
+ sed -i "1i##! test dce-rpc" $PWD/scripts/base/protocols/dce-rpc/__load__.zeek
+ sed -i "1i##! test dhcp" $PWD/scripts/base/protocols/dhcp/__load__.zeek
+ sed -i "1i##! test dnp3" $PWD/scripts/base/protocols/dnp3/__load__.zeek
+ sed -i "1i##! test dns" $PWD/scripts/base/protocols/dns/__load__.zeek
+ sed -i "1i##! test ftp" $PWD/scripts/base/protocols/ftp/__load__.zeek
+ sed -i "1i##! test http" $PWD/scripts/base/protocols/http/__load__.zeek
+ sed -i "1i##! test imap" $PWD/scripts/base/protocols/imap/__load__.zeek
+ sed -i "1i##! test irc" $PWD/scripts/base/protocols/irc/__load__.zeek
+ sed -i "1i##! test krb" $PWD/scripts/base/protocols/krb/__load__.zeek
+ sed -i "1i##! test modbus" $PWD/scripts/base/protocols/modbus/__load__.zeek
+ sed -i "1i##! test mqtt" $PWD/scripts/base/protocols/mqtt/__load__.zeek
+ sed -i "1i##! test mysql" $PWD/scripts/base/protocols/mysql/__load__.zeek
+ sed -i "1i##! test ntlm" $PWD/scripts/base/protocols/ntlm/__load__.zeek
+ sed -i "1i##! test ntp" $PWD/scripts/base/protocols/ntp/__load__.zeek
+ sed -i "1i##! test pop3" $PWD/scripts/base/protocols/pop3/__load__.zeek
+ sed -i "1i##! test radius" $PWD/scripts/base/protocols/radius/__load__.zeek
+ sed -i "1i##! test rdp" $PWD/scripts/base/protocols/rdp/__load__.zeek
+ sed -i "1i##! test rfb" $PWD/scripts/base/protocols/rfb/__load__.zeek
+ sed -i "1i##! test sip" $PWD/scripts/base/protocols/sip/__load__.zeek
+ sed -i "1i##! test smb" $PWD/scripts/base/protocols/smb/__load__.zeek
+ sed -i "1i##! test smtp" $PWD/scripts/base/protocols/smtp/__load__.zeek
+ sed -i "1i##! test snmp" $PWD/scripts/base/protocols/snmp/__load__.zeek
+ sed -i "1i##! test socks" $PWD/scripts/base/protocols/socks/__load__.zeek
+ sed -i "1i##! test ssh" $PWD/scripts/base/protocols/ssh/__load__.zeek
+ sed -i "1i##! test ssl" $PWD/scripts/base/protocols/ssl/__load__.zeek
+ sed -i "1i##! test syslog" $PWD/scripts/base/protocols/syslog/__load__.zeek
+ sed -i "1i##! test xmpp" $PWD/scripts/base/protocols/xmpp/__load__.zeek
+ sed -i "1i##! test unified2" $PWD/scripts/policy/files/unified2/__load__.zeek
+ sed -i "1i##! test intel-seen" $PWD/scripts/policy/frameworks/intel/seen/__load__.zeek
+ sed -i "1i##! test notice" $PWD/scripts/policy/frameworks/notice/__load__.zeek
+ sed -i "1i##! test barnyard2" $PWD/scripts/policy/integration/barnyard2/__load__.zeek
+ sed -i "1i##! test collective-intel" $PWD/scripts/policy/integration/collective-intel/__load__.zeek
+ sed -i "1i##! test detect-traceroute" $PWD/scripts/policy/misc/detect-traceroute/__load__.zeek
+''
diff --git a/pkgs/applications/networking/instant-messengers/pantalaimon/default.nix b/pkgs/applications/networking/instant-messengers/pantalaimon/default.nix
index 2fcf65dfc1c..c7d8ce4b56d 100644
--- a/pkgs/applications/networking/instant-messengers/pantalaimon/default.nix
+++ b/pkgs/applications/networking/instant-messengers/pantalaimon/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, buildPythonApplication, fetchPypi, pythonOlder,
+{ lib, stdenv, buildPythonApplication, fetchFromGitHub, pythonOlder,
attrs, aiohttp, appdirs, click, keyring, Logbook, peewee, janus,
prompt_toolkit, matrix-nio, dbus-python, pydbus, notify2, pygobject3,
@@ -9,13 +9,16 @@
buildPythonApplication rec {
pname = "pantalaimon";
- version = "0.4";
+ version = "0.5.1";
disabled = pythonOlder "3.6";
- src = fetchPypi {
- inherit pname version;
- sha256 = "1canj9w72wh1rcw6fivrvaahpxy13gb6gh1k8nss6bgixalvnq9m";
+ # pypi tarball miss tests
+ src = fetchFromGitHub {
+ owner = "matrix-org";
+ repo = pname;
+ rev = version;
+ sha256 = "18jihvqlfk8lx97hxcr36zdkp2sffg2l8mkg5lflylwcgwy1dx0y";
};
propagatedBuildInputs = [
diff --git a/pkgs/applications/networking/ipfs/default.nix b/pkgs/applications/networking/ipfs/default.nix
index db325cf1387..4f71fcf3b74 100644
--- a/pkgs/applications/networking/ipfs/default.nix
+++ b/pkgs/applications/networking/ipfs/default.nix
@@ -2,17 +2,21 @@
buildGoModule rec {
pname = "ipfs";
- version = "0.4.22";
+ version = "0.4.23";
rev = "v${version}";
src = fetchFromGitHub {
owner = "ipfs";
repo = "go-ipfs";
inherit rev;
- sha256 = "1drwkam2m1qdny51l7ja9vd33jffy8w0z0wbp28ajx4glp0kyra2";
+ sha256 = "19m1bhqf1jghdv2ngdnjdk1kvjcxbkgm1ccdkmkabv4ii43h8jwm";
};
- modSha256 = "0jbzkifn88myk2vpd390clyl835978vpcfz912y8cnl26s6q677n";
+ postPatch = ''
+ rm -rf test/dependencies
+ '';
+
+ modSha256 = "12m4ind1s8zaa6kssblc28z2cafy20w2jp80kzif39hg5ar9bijm";
meta = with stdenv.lib; {
description = "A global, versioned, peer-to-peer filesystem";
diff --git a/pkgs/applications/networking/mailreaders/claws-mail/default.nix b/pkgs/applications/networking/mailreaders/claws-mail/default.nix
index ffe75eaac7c..5f5e66597ac 100644
--- a/pkgs/applications/networking/mailreaders/claws-mail/default.nix
+++ b/pkgs/applications/networking/mailreaders/claws-mail/default.nix
@@ -107,6 +107,6 @@ stdenv.mkDerivation rec {
homepage = "https://www.claws-mail.org/";
license = licenses.gpl3;
platforms = platforms.linux;
- maintainers = with maintainers; [ fpletz globin ];
+ maintainers = with maintainers; [ fpletz globin orivej ];
};
}
diff --git a/pkgs/applications/networking/mailreaders/claws-mail/gtk3.nix b/pkgs/applications/networking/mailreaders/claws-mail/gtk3.nix
new file mode 100644
index 00000000000..1e1909e7109
--- /dev/null
+++ b/pkgs/applications/networking/mailreaders/claws-mail/gtk3.nix
@@ -0,0 +1,121 @@
+{ config, fetchgit, stdenv, wrapGAppsHook, autoreconfHook, bison, flex
+, curl, dbus, dbus-glib, enchant, gtk3, gnutls, gnupg, gpgme
+, libarchive, libcanberra-gtk3, libetpan, libnotify, libsoup, libxml2, networkmanager
+, openldap, perl, pkgconfig, poppler, python, shared-mime-info, webkitgtk
+, glib-networking, gsettings-desktop-schemas, libSM, libytnef, libical
+# Build options
+# TODO: A flag to build the manual.
+# TODO: Plugins that complain about their missing dependencies, even when
+# provided:
+# gdata requires libgdata
+# geolocation requires libchamplain
+, enableLdap ? false
+, enableNetworkManager ? config.networking.networkmanager.enable or false
+, enablePgp ? true
+, enablePluginArchive ? false
+, enablePluginFancy ? true
+, enablePluginNotificationDialogs ? true
+, enablePluginNotificationSounds ? true
+, enablePluginPdf ? false
+, enablePluginPython ? false
+, enablePluginRavatar ? false
+, enablePluginRssyl ? false
+, enablePluginSmime ? false
+, enablePluginSpamassassin ? false
+, enablePluginSpamReport ? false
+, enablePluginVcalendar ? false
+, enableSpellcheck ? false
+}:
+
+with stdenv.lib;
+
+stdenv.mkDerivation rec {
+ pname = "claws-mail-gtk3";
+ version = "3.17.5";
+
+ src = fetchgit {
+ url = "git://git.claws-mail.org/claws.git";
+ rev = "c1e1902323c2b5dfe82144328b7933dc857ef343"; # this commit is "for release 3.17.5"
+ sha256 = "0cqzlzcms6alvsdsbcc06bsdi1h349b16qngn2z1p8fz16x6s6cy";
+ };
+
+ outputs = [ "out" "dev" ];
+
+ patches = [ ./mime.patch ];
+
+ preConfigure = ''
+ # autotools check tries to dlopen libpython as a requirement for the python plugin
+ export LD_LIBRARY_PATH=$LD_LIBRARY_PATH''${LD_LIBRARY_PATH:+:}${python}/lib
+ # generate version without .git
+ [ -e version ] || echo "echo ${version}" > version
+ '';
+
+ postPatch = ''
+ substituteInPlace src/procmime.c \
+ --subst-var-by MIMEROOTDIR ${shared-mime-info}/share
+ '';
+
+ nativeBuildInputs = [ autoreconfHook bison flex pkgconfig wrapGAppsHook python.pkgs.wrapPython ];
+ propagatedBuildInputs = with python.pkgs; [ python ] ++ optionals enablePluginPython [ pygtk pygobject2 ];
+
+ buildInputs =
+ [ curl dbus dbus-glib gtk3 gnutls gsettings-desktop-schemas
+ libetpan perl glib-networking libSM libytnef
+ ]
+ ++ optional enableSpellcheck enchant
+ ++ optionals (enablePgp || enablePluginSmime) [ gnupg gpgme ]
+ ++ optional enablePluginArchive libarchive
+ ++ optional enablePluginNotificationSounds libcanberra-gtk3
+ ++ optional enablePluginNotificationDialogs libnotify
+ ++ optional enablePluginFancy libsoup
+ ++ optional enablePluginRssyl libxml2
+ ++ optional enableNetworkManager networkmanager
+ ++ optional enableLdap openldap
+ ++ optional enablePluginPdf poppler
+ ++ optional enablePluginFancy webkitgtk
+ ++ optional enablePluginVcalendar libical;
+
+ configureFlags =
+ optional (!enableLdap) "--disable-ldap"
+ ++ optional (!enableNetworkManager) "--disable-networkmanager"
+ ++ optionals (!enablePgp) [
+ "--disable-pgpcore-plugin"
+ "--disable-pgpinline-plugin"
+ "--disable-pgpmime-plugin"
+ ]
+ ++ optional (!enablePluginArchive) "--disable-archive-plugin"
+ ++ optional (!enablePluginFancy) "--disable-fancy-plugin"
+ ++ optional (!enablePluginPdf) "--disable-pdf_viewer-plugin"
+ ++ optional (!enablePluginPython) "--disable-python-plugin"
+ ++ optional (!enablePluginRavatar) "--disable-libravatar-plugin"
+ ++ optional (!enablePluginRssyl) "--disable-rssyl-plugin"
+ ++ optional (!enablePluginSmime) "--disable-smime-plugin"
+ ++ optional (!enablePluginSpamassassin) "--disable-spamassassin-plugin"
+ ++ optional (!enablePluginSpamReport) "--disable-spam_report-plugin"
+ ++ optional (!enablePluginVcalendar) "--disable-vcalendar-plugin"
+ ++ optional (!enableSpellcheck) "--disable-enchant";
+
+ enableParallelBuilding = true;
+
+ pythonPath = with python.pkgs; [ pygobject2 pygtk ];
+
+ preFixup = ''
+ buildPythonPath "$out $pythonPath"
+ gappsWrapperArgs+=(--prefix XDG_DATA_DIRS : "${shared-mime-info}/share" --prefix PYTHONPATH : "$program_PYTHONPATH")
+ '';
+
+ postInstall = ''
+ mkdir -p $out/share/applications
+ cp claws-mail.desktop $out/share/applications
+ '';
+
+ NIX_CFLAGS_COMPILE = [ "-Wno-deprecated-declarations" ];
+
+ meta = {
+ description = "The user-friendly, lightweight, and fast email client";
+ homepage = "https://www.claws-mail.org/";
+ license = licenses.gpl3;
+ platforms = platforms.linux;
+ maintainers = with maintainers; [ fpletz globin orivej ];
+ };
+}
diff --git a/pkgs/applications/networking/mailreaders/neomutt/default.nix b/pkgs/applications/networking/mailreaders/neomutt/default.nix
index 274d9d4718e..dc473eaaadd 100644
--- a/pkgs/applications/networking/mailreaders/neomutt/default.nix
+++ b/pkgs/applications/networking/mailreaders/neomutt/default.nix
@@ -4,14 +4,14 @@
}:
stdenv.mkDerivation rec {
- version = "20191207";
+ version = "20200313";
pname = "neomutt";
src = fetchFromGitHub {
owner = "neomutt";
repo = "neomutt";
rev = version;
- sha256 = "147yjpqnsbfy01fhsflxlixk0985r91a6bjmqq3cwmf7gka3sihm";
+ sha256 = "1k4k07l6h5krc3fx928qvdq3ssw9fxn95aj7k885xlckd2i1lnb5";
};
buildInputs = [
@@ -80,7 +80,7 @@ stdenv.mkDerivation rec {
description = "A small but very powerful text-based mail client";
homepage = http://www.neomutt.org;
license = licenses.gpl2Plus;
- maintainers = with maintainers; [ cstrahan erikryb jfrankenau vrthra ];
+ maintainers = with maintainers; [ cstrahan erikryb jfrankenau vrthra ma27 ];
platforms = platforms.unix;
};
}
diff --git a/pkgs/applications/networking/mumble/default.nix b/pkgs/applications/networking/mumble/default.nix
index da7c5d4af74..4408994ba8f 100644
--- a/pkgs/applications/networking/mumble/default.nix
+++ b/pkgs/applications/networking/mumble/default.nix
@@ -20,7 +20,6 @@ let
version = source.version;
patches = (source.patches or [])
- ++ optional jackSupport ./mumble-jack-support.patch
++ [ ./fix-rnnoise-argument.patch ];
nativeBuildInputs = [ pkgconfig python qt5.qmake ]
diff --git a/pkgs/applications/networking/mumble/mumble-jack-support.patch b/pkgs/applications/networking/mumble/mumble-jack-support.patch
deleted file mode 100644
index 7c18a33193d..00000000000
--- a/pkgs/applications/networking/mumble/mumble-jack-support.patch
+++ /dev/null
@@ -1,457 +0,0 @@
-The patch was created by Filipe Coelho (falkTX) of the KXStudio
-project. http://kxstudio.sourceforge.net
-
-diff -U 3 -H -d -r -N -- mumble-1.2.2.orig/src/mumble/JackAudio.cpp mumble-1.2.2/src/mumble/JackAudio.cpp
---- mumble-1.2.2.orig/src/mumble/JackAudio.cpp 1970-01-01 01:00:00.000000000 +0100
-+++ mumble-1.2.2/src/mumble/JackAudio.cpp 2011-01-26 06:02:00.000000000 +0000
-@@ -0,0 +1,314 @@
-+/* Copyright (C) 2011, Benjamin Jemlich
-+ Copyright (C) 2011, Filipe Coelho
-+
-+ All rights reserved.
-+
-+ Redistribution and use in source and binary forms, with or without
-+ modification, are permitted provided that the following conditions
-+ are met:
-+
-+ - Redistributions of source code must retain the above copyright notice,
-+ this list of conditions and the following disclaimer.
-+ - Redistributions in binary form must reproduce the above copyright notice,
-+ this list of conditions and the following disclaimer in the documentation
-+ and/or other materials provided with the distribution.
-+ - Neither the name of the Mumble Developers nor the names of its
-+ contributors may be used to endorse or promote products derived from this
-+ software without specific prior written permission.
-+
-+ THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-+ ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-+ LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-+ A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE FOUNDATION OR
-+ CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
-+ EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
-+ PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
-+ PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
-+ LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
-+ NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
-+ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-+*/
-+
-+#include "JackAudio.h"
-+#include "User.h"
-+#include "Global.h"
-+#include "MainWindow.h"
-+#include "Timer.h"
-+
-+#include
-+
-+static JackAudioSystem *jasys = NULL;
-+
-+class JackAudioInputRegistrar : public AudioInputRegistrar {
-+ public:
-+ JackAudioInputRegistrar();
-+ virtual AudioInput *create();
-+ virtual const QList getDeviceChoices();
-+ virtual void setDeviceChoice(const QVariant &, Settings &);
-+ virtual bool canEcho(const QString &) const;
-+};
-+
-+class JackAudioOutputRegistrar : public AudioOutputRegistrar {
-+ public:
-+ JackAudioOutputRegistrar();
-+ virtual AudioOutput *create();
-+ virtual const QList getDeviceChoices();
-+ virtual void setDeviceChoice(const QVariant &, Settings &);
-+};
-+
-+class JackAudioInit : public DeferInit {
-+ public:
-+ JackAudioInputRegistrar *airJackAudio;
-+ JackAudioOutputRegistrar *aorJackAudio;
-+ void initialize() {
-+ jasys = new JackAudioSystem();
-+ jasys->init_jack();
-+ jasys->qmWait.lock();
-+ jasys->qwcWait.wait(&jasys->qmWait, 1000);
-+ jasys->qmWait.unlock();
-+ if (jasys->bJackIsGood) {
-+ airJackAudio = new JackAudioInputRegistrar();
-+ aorJackAudio = new JackAudioOutputRegistrar();
-+ } else {
-+ airJackAudio = NULL;
-+ aorJackAudio = NULL;
-+ delete jasys;
-+ jasys = NULL;
-+ }
-+ };
-+ void destroy() {
-+ if (airJackAudio)
-+ delete airJackAudio;
-+ if (aorJackAudio)
-+ delete aorJackAudio;
-+ if (jasys) {
-+ jasys->close_jack();
-+ delete jasys;
-+ jasys = NULL;
-+ }
-+ };
-+};
-+
-+static JackAudioInit jackinit; //unused
-+
-+JackAudioSystem::JackAudioSystem() {
-+ bJackIsGood = false;
-+ iSampleRate = 0;
-+}
-+
-+JackAudioSystem::~JackAudioSystem() {
-+}
-+
-+void JackAudioSystem::init_jack()
-+{
-+ client = jack_client_open("mumble", JackNullOption, 0);
-+
-+ if (client) {
-+ in_port = jack_port_register(client, "input", JACK_DEFAULT_AUDIO_TYPE, JackPortIsInput, 0);
-+ out_port = jack_port_register(client, "output", JACK_DEFAULT_AUDIO_TYPE, JackPortIsOutput, 0);
-+ jack_set_process_callback(client, process_callback, this);
-+ jack_set_sample_rate_callback(client, srate_callback, this);
-+ jack_on_shutdown(client, shutdown_callback, this);
-+
-+ iSampleRate = jack_get_sample_rate(client);
-+
-+ if (jack_activate(client) || in_port == NULL || out_port == NULL) {
-+ client = NULL;
-+ return;
-+ }
-+
-+ int port_flags;
-+ unsigned i = -1;
-+ const char** ports = jack_get_ports(client, 0, 0, JackPortIsPhysical);
-+
-+ if (ports) {
-+ while (ports[++i])
-+ {
-+ jack_port_t* port = jack_port_by_name(client, ports[i]);
-+ port_flags = jack_port_flags(port);
-+
-+ if (port_flags & (JackPortIsPhysical|JackPortIsOutput) && strstr(jack_port_type(port), "audio")) {
-+ jack_connect(client, ports[i], jack_port_name(in_port));
-+ }
-+ if (port_flags & (JackPortIsPhysical|JackPortIsInput) && strstr(jack_port_type(port), "audio")) {
-+ jack_connect(client, jack_port_name(out_port), ports[i]);
-+ }
-+ }
-+ }
-+
-+ jack_free(ports);
-+
-+ // If we made it this far, then everything is okay
-+ qhInput.insert(QString(), tr("Hardware Ports"));
-+ qhOutput.insert(QString(), tr("Hardware Ports"));
-+ bJackIsGood = true;
-+
-+ } else {
-+ bJackIsGood = false;
-+ client = NULL;
-+ }
-+}
-+
-+void JackAudioSystem::close_jack()
-+{
-+ if (client) {
-+ jack_deactivate(client);
-+ jack_client_close(client);
-+ client = NULL;
-+ }
-+}
-+
-+int JackAudioSystem::process_callback(jack_nframes_t nframes, void *arg)
-+{
-+ JackAudioSystem *jas = (JackAudioSystem*)arg;
-+
-+ if (jas && jas->bJackIsGood) {
-+ AudioInputPtr ai = g.ai;
-+ AudioOutputPtr ao = g.ao;
-+ JackAudioInput *jai = (JackAudioInput*)(ai.get());
-+ JackAudioOutput *jao = (JackAudioOutput*)(ao.get());
-+
-+ if (jai && jai->bRunning && jai->iMicChannels > 0 && !jai->isFinished()) {
-+ void* input = jack_port_get_buffer(jas->in_port, nframes);
-+ if ((float*)input != 0)
-+ jai->addMic(input, nframes);
-+ }
-+
-+ if (jao && jao->bRunning && jao->iChannels > 0 && !jao->isFinished()) {
-+ jack_default_audio_sample_t* output = (jack_default_audio_sample_t*)jack_port_get_buffer(jas->out_port, nframes);
-+ memset(output, 0, sizeof(jack_default_audio_sample_t)*nframes); //TEST
-+ jao->mix(output, nframes);
-+ }
-+ }
-+
-+ return 0;
-+}
-+
-+int JackAudioSystem::srate_callback(jack_nframes_t frames, void *arg)
-+{
-+ JackAudioSystem *jas = (JackAudioSystem*)arg;
-+ jas->iSampleRate = frames;
-+ return 0;
-+}
-+
-+void JackAudioSystem::shutdown_callback(void *arg)
-+{
-+ JackAudioSystem *jas = (JackAudioSystem*)arg;
-+ jas->bJackIsGood = false;
-+}
-+
-+JackAudioInputRegistrar::JackAudioInputRegistrar() : AudioInputRegistrar(QLatin1String("JACK"), 10) {
-+}
-+
-+AudioInput *JackAudioInputRegistrar::create() {
-+ return new JackAudioInput();
-+}
-+
-+const QList JackAudioInputRegistrar::getDeviceChoices() {
-+ QList qlReturn;
-+
-+ QStringList qlInputDevs = jasys->qhInput.keys();
-+ qSort(qlInputDevs);
-+
-+ foreach(const QString &dev, qlInputDevs) {
-+ qlReturn << audioDevice(jasys->qhInput.value(dev), dev);
-+ }
-+
-+ return qlReturn;
-+}
-+
-+void JackAudioInputRegistrar::setDeviceChoice(const QVariant &choice, Settings &s) {
-+ Q_UNUSED(choice);
-+ Q_UNUSED(s);
-+}
-+
-+bool JackAudioInputRegistrar::canEcho(const QString &osys) const {
-+ Q_UNUSED(osys);
-+ return false;
-+}
-+
-+JackAudioOutputRegistrar::JackAudioOutputRegistrar() : AudioOutputRegistrar(QLatin1String("JACK"), 10) {
-+}
-+
-+AudioOutput *JackAudioOutputRegistrar::create() {
-+ return new JackAudioOutput();
-+}
-+
-+const QList JackAudioOutputRegistrar::getDeviceChoices() {
-+ QList qlReturn;
-+
-+ QStringList qlOutputDevs = jasys->qhOutput.keys();
-+ qSort(qlOutputDevs);
-+
-+ foreach(const QString &dev, qlOutputDevs) {
-+ qlReturn << audioDevice(jasys->qhOutput.value(dev), dev);
-+ }
-+
-+ return qlReturn;
-+}
-+
-+void JackAudioOutputRegistrar::setDeviceChoice(const QVariant &choice, Settings &s) {
-+ Q_UNUSED(choice);
-+ Q_UNUSED(s);
-+}
-+
-+JackAudioInput::JackAudioInput() {
-+ bRunning = true;
-+ iMicChannels = 0;
-+};
-+
-+JackAudioInput::~JackAudioInput() {
-+ bRunning = false;
-+ iMicChannels = 0;
-+ qmMutex.lock();
-+ qwcWait.wakeAll();
-+ qmMutex.unlock();
-+ wait();
-+}
-+
-+void JackAudioInput::run() {
-+ if (jasys && jasys->bJackIsGood) {
-+ iMicFreq = jasys->iSampleRate;
-+ iMicChannels = 1;
-+ eMicFormat = SampleFloat;
-+ initializeMixer();
-+ }
-+
-+ qmMutex.lock();
-+ while (bRunning)
-+ qwcWait.wait(&qmMutex);
-+ qmMutex.unlock();
-+}
-+
-+JackAudioOutput::JackAudioOutput() {
-+ bRunning = true;
-+ iChannels = 0;
-+}
-+
-+JackAudioOutput::~JackAudioOutput() {
-+ bRunning = false;
-+ iChannels = 0;
-+ qmMutex.lock();
-+ qwcWait.wakeAll();
-+ qmMutex.unlock();
-+ wait();
-+}
-+
-+void JackAudioOutput::run() {
-+ if (jasys && jasys->bJackIsGood) {
-+ unsigned int chanmasks[32];
-+
-+ chanmasks[0] = SPEAKER_FRONT_LEFT;
-+ chanmasks[1] = SPEAKER_FRONT_RIGHT;
-+
-+ eSampleFormat = SampleFloat;
-+ iMixerFreq = jasys->iSampleRate;
-+ iChannels = 1;
-+ initializeMixer(chanmasks);
-+ }
-+
-+ qmMutex.lock();
-+ while (bRunning)
-+ qwcWait.wait(&qmMutex);
-+ qmMutex.unlock();
-+}
-diff -U 3 -H -d -r -N -- mumble-1.2.2.orig/src/mumble/JackAudio.h mumble-1.2.2/src/mumble/JackAudio.h
---- mumble-1.2.2.orig/src/mumble/JackAudio.h 1970-01-01 01:00:00.000000000 +0100
-+++ mumble-1.2.2/src/mumble/JackAudio.h 2011-01-26 06:03:58.000000000 +0000
-@@ -0,0 +1,97 @@
-+/* Copyright (C) 2011, Benjamin Jemlich
-+ Copyright (C) 2011, Filipe Coelho
-+
-+ All rights reserved.
-+
-+ Redistribution and use in source and binary forms, with or without
-+ modification, are permitted provided that the following conditions
-+ are met:
-+
-+ - Redistributions of source code must retain the above copyright notice,
-+ this list of conditions and the following disclaimer.
-+ - Redistributions in binary form must reproduce the above copyright notice,
-+ this list of conditions and the following disclaimer in the documentation
-+ and/or other materials provided with the distribution.
-+ - Neither the name of the Mumble Developers nor the names of its
-+ contributors may be used to endorse or promote products derived from this
-+ software without specific prior written permission.
-+
-+ THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-+ ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-+ LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-+ A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE FOUNDATION OR
-+ CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
-+ EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
-+ PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
-+ PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
-+ LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
-+ NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
-+ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-+*/
-+
-+#ifndef _JACKAUDIO_H
-+#define _JACKAUDIO_H
-+
-+#include "AudioInput.h"
-+#include "AudioOutput.h"
-+#include
-+
-+class JackAudioOutput;
-+class JackAudioInput;
-+
-+class JackAudioSystem : public QObject {
-+ private:
-+ Q_OBJECT
-+ Q_DISABLE_COPY(JackAudioSystem)
-+ protected:
-+ jack_client_t* client;
-+ jack_port_t* in_port;
-+ jack_port_t* out_port;
-+
-+ static int process_callback(jack_nframes_t nframes, void *arg);
-+ static int srate_callback(jack_nframes_t frames, void *arg);
-+ static void shutdown_callback(void *arg);
-+ public:
-+ QHash qhInput;
-+ QHash qhOutput;
-+ bool bJackIsGood;
-+ int iSampleRate;
-+ QMutex qmWait;
-+ QWaitCondition qwcWait;
-+
-+ void init_jack();
-+ void close_jack();
-+
-+ JackAudioSystem();
-+ ~JackAudioSystem();
-+};
-+
-+class JackAudioInput : public AudioInput {
-+ friend class JackAudioSystem;
-+ private:
-+ Q_OBJECT
-+ Q_DISABLE_COPY(JackAudioInput)
-+ protected:
-+ QMutex qmMutex;
-+ QWaitCondition qwcWait;
-+ public:
-+ JackAudioInput();
-+ ~JackAudioInput();
-+ void run();
-+};
-+
-+class JackAudioOutput : public AudioOutput {
-+ friend class JackAudioSystem;
-+ private:
-+ Q_OBJECT
-+ Q_DISABLE_COPY(JackAudioOutput)
-+ protected:
-+ QMutex qmMutex;
-+ QWaitCondition qwcWait;
-+ public:
-+ JackAudioOutput();
-+ ~JackAudioOutput();
-+ void run();
-+};
-+
-+#endif
-diff -U 3 -H -d -r -N -- mumble-1.2.2.orig/src/mumble/mumble.pro mumble-1.2.2/src/mumble/mumble.pro
---- mumble-1.2.2.orig/src/mumble/mumble.pro 2010-02-09 16:34:51.000000000 +0000
-+++ mumble-1.2.2/src/mumble/mumble.pro 2011-01-26 01:45:55.000000000 +0000
-@@ -93,11 +93,17 @@
- unix {
- HAVE_PULSEAUDIO=$$system(pkg-config --modversion --silence-errors libpulse)
- HAVE_PORTAUDIO=$$system(pkg-config --modversion --silence-errors portaudio-2.0)
-+ HAVE_JACKAUDIO=$$system(pkg-config --modversion --silence-errors jack)
-
- !isEmpty(HAVE_PORTAUDIO):!CONFIG(no-portaudio) {
- CONFIG *= portaudio
- }
-
-+ !isEmpty(HAVE_JACKAUDIO):!CONFIG(no-jackaudio) {
-+ CONFIG -= portaudio
-+ CONFIG *= jackaudio
-+ }
-+
- !isEmpty(HAVE_PULSEAUDIO):!CONFIG(no-pulseaudio) {
- CONFIG -= portaudio
- CONFIG *= pulseaudio
-@@ -110,6 +116,13 @@
- QMAKE_CXXFLAGS_DEBUG *= -I../../speex/include -I../../speexbuild
- }
-
-+ jackaudio {
-+ DEFINES *= USE_JACKAUDIO
-+ PKGCONFIG *= jack
-+ HEADERS *= JackAudio.h
-+ SOURCES *= JackAudio.cpp
-+ }
-+
- CONFIG *= link_pkgconfig
-
- PKGCONFIG *= openssl sndfile
diff --git a/pkgs/applications/networking/sync/unison/default.nix b/pkgs/applications/networking/sync/unison/default.nix
index cada3f93f55..c29bd3a486c 100644
--- a/pkgs/applications/networking/sync/unison/default.nix
+++ b/pkgs/applications/networking/sync/unison/default.nix
@@ -1,6 +1,8 @@
-{stdenv, fetchFromGitHub, ocaml, lablgtk, fontschumachermisc, xset, makeWrapper, ncurses
+{stdenv, fetchFromGitHub, ocamlPackages, fontschumachermisc, xset, makeWrapper, ncurses
, enableX11 ? true}:
+let inherit (ocamlPackages) ocaml lablgtk; in
+
stdenv.mkDerivation (rec {
pname = "unison";
diff --git a/pkgs/applications/office/paperwork/backend.nix b/pkgs/applications/office/paperwork/backend.nix
index 7f82780fbe9..c28a4bc916d 100644
--- a/pkgs/applications/office/paperwork/backend.nix
+++ b/pkgs/applications/office/paperwork/backend.nix
@@ -3,14 +3,15 @@
, isPy3k, isPyPy
, pyenchant, simplebayes, pillow, pycountry, whoosh, termcolor
-, python-Levenshtein, pyinsane2, pygobject3, pyocr, natsort
+, python-Levenshtein, pygobject3, pyocr, natsort, libinsane
+, distro
, pkgs
}:
buildPythonPackage rec {
pname = "paperwork-backend";
- version = "1.2.4";
+ version = "1.3.1";
src = fetchFromGitLab {
domain = "gitlab.gnome.org";
@@ -18,7 +19,7 @@ buildPythonPackage rec {
group = "World";
owner = "OpenPaperwork";
rev = version;
- sha256 = "0wjjiw99aswmppnhzq3jir0p5p78r3m8hjinhdirkgm6h7skq5p4";
+ sha256 = "1219yz8z4r1yn6miq8zc2z1m1lnhf3dmkhwfw23n05bg842nvg65";
};
sourceRoot = "source/paperwork-backend";
@@ -34,14 +35,14 @@ buildPythonPackage rec {
propagatedBuildInputs = [
pyenchant simplebayes pillow pycountry whoosh termcolor
- python-Levenshtein pyinsane2 pygobject3 pyocr natsort
- pkgs.poppler_gi pkgs.gtk3
+ python-Levenshtein libinsane pygobject3 pyocr natsort
+ pkgs.poppler_gi pkgs.gtk3 distro
];
meta = {
description = "Backend part of Paperwork (Python API, no UI)";
homepage = https://openpaper.work/;
license = lib.licenses.gpl3Plus;
- maintainers = [ lib.maintainers.aszlig ];
+ maintainers = with lib.maintainers; [ aszlig symphorien ];
};
}
diff --git a/pkgs/applications/office/paperwork/default.nix b/pkgs/applications/office/paperwork/default.nix
index 3506ea8b551..c3930115365 100644
--- a/pkgs/applications/office/paperwork/default.nix
+++ b/pkgs/applications/office/paperwork/default.nix
@@ -1,7 +1,15 @@
-{ lib, python3Packages, gtk3, cairo
-, aspellDicts, buildEnv
-, gnome3, librsvg
-, xvfb_run, dbus, libnotify
+{ lib
+, python3Packages
+, gtk3
+, cairo
+, aspellDicts
+, buildEnv
+, gnome3
+, librsvg
+, xvfb_run
+, dbus
+, libnotify
+, wrapGAppsHook
}:
python3Packages.buildPythonApplication rec {
@@ -46,9 +54,23 @@ python3Packages.buildPythonApplication rec {
paths = lib.collect lib.isDerivation aspellDicts;
}}/lib/aspell";
+ postInstall = ''
+ # paperwork-shell needs to be re-wrapped with access to paperwork
+ cp ${python3Packages.paperwork-backend}/bin/.paperwork-shell-wrapped $out/bin/paperwork-shell
+ # install desktop files and icons
+ XDG_DATA_HOME=$out/share $out/bin/paperwork-shell install
+ '';
+
checkInputs = [ xvfb_run dbus.daemon ] ++ (with python3Packages; [ paperwork-backend ]);
+
+ nativeBuildInputs = [
+ wrapGAppsHook
+ ];
+
buildInputs = [
- gnome3.adwaita-icon-theme libnotify librsvg
+ gnome3.adwaita-icon-theme
+ libnotify
+ librsvg
];
# A few parts of chkdeps need to have a display and a dbus session, so we not
@@ -61,21 +83,20 @@ python3Packages.buildPythonApplication rec {
'';
propagatedBuildInputs = with python3Packages; [
- paperwork-backend pypillowfight gtk3 cairo pyxdg dateutil setuptools pandas
- ];
-
- makeWrapperArgs = [
- "--set GI_TYPELIB_PATH \"$GI_TYPELIB_PATH\""
- "--set GDK_PIXBUF_MODULE_FILE \"$GDK_PIXBUF_MODULE_FILE\""
- "--prefix XDG_DATA_DIRS : \"$out/share\""
- "--suffix XDG_DATA_DIRS : \"$XDG_ICON_DIRS:$GSETTINGS_SCHEMAS_PATH\""
+ paperwork-backend
+ pypillowfight
+ gtk3
+ cairo
+ pyxdg
+ dateutil
+ setuptools
];
meta = {
description = "A personal document manager for scanned documents";
homepage = https://openpaper.work/;
license = lib.licenses.gpl3Plus;
- maintainers = [ lib.maintainers.aszlig ];
+ maintainers = with lib.maintainers; [ aszlig symphorien ];
platforms = lib.platforms.linux;
};
}
diff --git a/pkgs/applications/office/trilium/default.nix b/pkgs/applications/office/trilium/default.nix
index ee494092884..3794a676d4c 100644
--- a/pkgs/applications/office/trilium/default.nix
+++ b/pkgs/applications/office/trilium/default.nix
@@ -19,7 +19,7 @@ let
maintainers = with maintainers; [ emmanuelrosa dtzWill kampka ];
};
- version = "0.39.4";
+ version = "0.40.5";
in {
@@ -30,14 +30,14 @@ in {
src = fetchurl {
url = "https://github.com/zadam/trilium/releases/download/v${version}/trilium-linux-x64-${version}.tar.xz";
- sha256 = "18wrnm13k0gg6aljpf6k7c5zia81zzkqc0sa1pgz0yzczydsfaa9";
+ sha256 = "02hmfgv8viy1hn2ix4b0gdzbcj7piddsmjdnb0b5hpwahqrikiyi";
};
# Fetch from source repo, no longer included in release.
# (they did special-case icon.png but we want the scalable svg)
# Use the version here to ensure we get any changes.
trilium_svg = fetchurl {
- url = "https://raw.githubusercontent.com/zadam/trilium/v${version}/src/public/images/trilium.svg";
+ url = "https://raw.githubusercontent.com/zadam/trilium/v${version}/images/trilium.svg";
sha256 = "1rgj7pza20yndfp8n12k93jyprym02hqah36fkk2b3if3kcmwnfg";
};
@@ -78,7 +78,7 @@ in {
src = fetchurl {
url = "https://github.com/zadam/trilium/releases/download/v${version}/trilium-linux-x64-server-${version}.tar.xz";
- sha256 = "06svdp25031p665pvlxdz10malvhxpczzrg90hpr1zymm6v8van3";
+ sha256 = "00b7qx2h26qrdhw2a7y0irhbr442yynnzpm1pz55hi33zpckbrc7";
};
nativeBuildInputs = [
diff --git a/pkgs/applications/radio/rtl-sdr/default.nix b/pkgs/applications/radio/rtl-sdr/default.nix
index 4e9badaa6c5..69c568c3a1b 100644
--- a/pkgs/applications/radio/rtl-sdr/default.nix
+++ b/pkgs/applications/radio/rtl-sdr/default.nix
@@ -10,8 +10,8 @@ stdenv.mkDerivation rec {
sha256 = "0lmvsnb4xw4hmz6zs0z5ilsah5hjz29g1s0050n59fllskqr3b8k";
};
- nativeBuildInputs = [ pkgconfig ];
- buildInputs = [ cmake libusb1 ];
+ nativeBuildInputs = [ pkgconfig cmake ];
+ buildInputs = [ libusb1 ];
# TODO: get these fixes upstream:
# * Building with -DINSTALL_UDEV_RULES=ON tries to install udev rules to
diff --git a/pkgs/applications/science/electronics/verilator/default.nix b/pkgs/applications/science/electronics/verilator/default.nix
index 7163c201dbf..85f6ac42126 100644
--- a/pkgs/applications/science/electronics/verilator/default.nix
+++ b/pkgs/applications/science/electronics/verilator/default.nix
@@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
pname = "verilator";
- version = "4.028";
+ version = "4.030";
src = fetchurl {
url = "https://www.veripool.org/ftp/${pname}-${version}.tgz";
- sha256 = "1rl92jnayhc1j47gjxdz2zf1by9vzlawbyw9mf1d7d2y22dqak1l";
+ sha256 = "07ldkf7xkr31n1dmx82bmzam8bvc1vsp32k76vd7yzn7r853qyky";
};
enableParallelBuilding = true;
diff --git a/pkgs/applications/science/math/geogebra/default.nix b/pkgs/applications/science/math/geogebra/default.nix
index de84d35c2e8..bba26610a07 100644
--- a/pkgs/applications/science/math/geogebra/default.nix
+++ b/pkgs/applications/science/math/geogebra/default.nix
@@ -2,7 +2,7 @@
stdenv.mkDerivation rec {
pname = "geogebra";
- version = "5-0-573-0";
+ version = "5-0-574-0";
preferLocalBuild = true;
@@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
"https://download.geogebra.org/installers/5.0/GeoGebra-Linux-Portable-${version}.tar.bz2"
"http://web.archive.org/https://download.geogebra.org/installers/5.0/GeoGebra-Linux-Portable-${version}.tar.bz2"
];
- sha256 = "0lj0k49sjsjqs716n74xbq6a4gids5903f5s6fhqyahrwyldhzrj";
+ sha256 = "0jbci4spqkf33yb079lsnsc684y4mdf1p8lm9r0037av8jlsrgrc";
};
srcIcon = fetchurl {
diff --git a/pkgs/applications/science/math/getdp/default.nix b/pkgs/applications/science/math/getdp/default.nix
index 3ccd89cf2c1..0ac2ea7d1b3 100644
--- a/pkgs/applications/science/math/getdp/default.nix
+++ b/pkgs/applications/science/math/getdp/default.nix
@@ -1,24 +1,27 @@
-{ stdenv, fetchurl, cmake, gfortran, openblas, openmpi, python3 }:
+{ stdenv, fetchurl, cmake, gfortran, openblas, openmpi, petsc, python3 }:
stdenv.mkDerivation rec {
- pname = "getdp";
- version = "3.0.4";
+ name = "getdp-${version}";
+ version = "3.3.0";
src = fetchurl {
url = "http://getdp.info/src/getdp-${version}-source.tgz";
- sha256 = "0v3hg03lzw4hz28hm45hpv0gyydqz0wav7xvb5n0v0jrm47mrspv";
+ sha256 = "1pfviy2bw8z5y6c15czvlvyjjg9pvpgrj9fr54xfi2gmvs7zkgpf";
};
- nativeBuildInputs = [ cmake ];
- buildInputs = [ gfortran openblas openmpi python3 ];
+ nativeBuildInputs = [ cmake gfortran ];
+ buildInputs = [ openblas openmpi petsc python3 ];
meta = with stdenv.lib; {
description = "A General Environment for the Treatment of Discrete Problems";
longDescription = ''
- GetDP is a free finite element solver using mixed elements to discretize de Rham-type complexes in one, two and three dimensions.
- The main feature of GetDP is the closeness between the input data defining discrete problems (written by the user in ASCII data files) and the symbolic mathematical expressions of these problems.
+ GetDP is a free finite element solver using mixed elements to discretize
+ de Rham-type complexes in one, two and three dimensions. The main
+ feature of GetDP is the closeness between the input data defining
+ discrete problems (written by the user in ASCII data files) and the
+ symbolic mathematical expressions of these problems.
'';
- homepage = http://getdp.info/;
- license = stdenv.lib.licenses.gpl2Plus;
+ homepage = "http://getdp.info/";
+ license = licenses.gpl2Plus;
maintainers = with maintainers; [ wucke13 ];
platforms = platforms.linux;
};
diff --git a/pkgs/applications/science/math/pari/default.nix b/pkgs/applications/science/math/pari/default.nix
index 8886a0c8a69..8f2f740f248 100644
--- a/pkgs/applications/science/math/pari/default.nix
+++ b/pkgs/applications/science/math/pari/default.nix
@@ -1,5 +1,6 @@
{ stdenv
, fetchurl
+, fetchpatch
, gmp
, readline
, libX11
@@ -19,6 +20,15 @@ stdenv.mkDerivation rec {
sha256 = "1jd65h2psrmba2dx7rkf5qidf9ka0cwbsg20pd18k45ggr30l467";
};
+ patches = [
+ # https://trac.sagemath.org/ticket/29313#comment:1
+ (fetchpatch {
+ name = "backport-bug-fix.patch";
+ url = "https://git.archlinux.org/svntogit/community.git/plain/repos/community-x86_64/c7a1d35f.patch?h=packages/pari&id=27893d227290dc3821d68aa25877d9765c204dad";
+ sha256 = "0vm0fwyzj66cr32imip6srksd47s2s2sjl1rb26ph8gpfi3nalii";
+ })
+ ];
+
buildInputs = [
gmp
readline
diff --git a/pkgs/applications/science/math/sage/sage-src.nix b/pkgs/applications/science/math/sage/sage-src.nix
index 1cbea74edae..cd465a8c413 100644
--- a/pkgs/applications/science/math/sage/sage-src.nix
+++ b/pkgs/applications/science/math/sage/sage-src.nix
@@ -130,6 +130,13 @@ stdenv.mkDerivation rec {
url = "https://git.sagemath.org/sage.git/patch/?h=c6d0308db15efd611211d26cfcbefbd180fc0831";
sha256 = "0nwai2jr22h49km4hx3kwafs3mzsc5kwsv7mqwjf6ibwfx2bbgyq";
})
+
+ # https://trac.sagemath.org/ticket/29313 (patch from ArchLinux)
+ (fetchpatch {
+ name = "pari-2.11.3.patch";
+ url = "https://aur.archlinux.org/cgit/aur.git/plain/sagemath-pari-2.11.3.patch?h=sagemath-git&id=02e1d58bd1cd70935d69a4990469d18be6bd2c43";
+ sha256 = "0z07444zvijyw96d11q7j81pvg7ysd6ycf1bbbjr6za9y74hv7d2";
+ })
];
patches = nixPatches ++ bugfixPatches ++ packageUpgradePatches;
diff --git a/pkgs/applications/version-management/git-and-tools/git-standup/default.nix b/pkgs/applications/version-management/git-and-tools/git-standup/default.nix
index c7488e84d5d..ceb734f0f67 100644
--- a/pkgs/applications/version-management/git-and-tools/git-standup/default.nix
+++ b/pkgs/applications/version-management/git-and-tools/git-standup/default.nix
@@ -2,13 +2,13 @@
stdenv.mkDerivation rec {
pname = "git-standup";
- version = "2.3.1";
+ version = "2.3.2";
src = fetchFromGitHub {
owner = "kamranahmedse";
repo = pname;
rev = version;
- sha256 = "0wx9ypyxhpjbrasl6264jmj9fjrpg3gn93dg00cakabz3r7yxxq3";
+ sha256 = "1xnn0jjha56v7l2vj45zzxncl6m5x2hq6nkffgc1bcikhp1pidn7";
};
nativeBuildInputs = [ makeWrapper ];
diff --git a/pkgs/applications/version-management/git-and-tools/gitstatus/romkatv_libgit2.nix b/pkgs/applications/version-management/git-and-tools/gitstatus/romkatv_libgit2.nix
index 1279e5dd6c9..e4cd58bf0f0 100644
--- a/pkgs/applications/version-management/git-and-tools/gitstatus/romkatv_libgit2.nix
+++ b/pkgs/applications/version-management/git-and-tools/gitstatus/romkatv_libgit2.nix
@@ -2,13 +2,15 @@
libgit2.overrideAttrs (oldAttrs: {
cmakeFlags = oldAttrs.cmakeFlags ++ [
- "-DUSE_BUNDLED_ZLIB=ON"
- "-DUSE_ICONV=OFF"
"-DBUILD_CLAR=OFF"
- "-DUSE_SSH=OFF"
- "-DUSE_HTTPS=OFF"
"-DBUILD_SHARED_LIBS=OFF"
- "-DUSE_EXT_HTTP_PARSER=OFF"
+ "-DREGEX_BACKEND=builtin"
+ "-DUSE_BUNDLED_ZLIB=ON"
+ "-DUSE_HTTPS=OFF"
+ "-DUSE_HTTP_PARSER=builtin" # overwritten from libgit2
+ "-DUSE_ICONV=OFF"
+ "-DUSE_SSH=OFF"
+ "-DZERO_NSEC=ON"
];
src = fetchFromGitHub {
owner = "romkatv";
diff --git a/pkgs/applications/version-management/git-and-tools/hub/default.nix b/pkgs/applications/version-management/git-and-tools/hub/default.nix
index 1b67b933cb1..f868c6b3c8f 100644
--- a/pkgs/applications/version-management/git-and-tools/hub/default.nix
+++ b/pkgs/applications/version-management/git-and-tools/hub/default.nix
@@ -2,7 +2,7 @@
buildGoPackage rec {
pname = "hub";
- version = "2.14.1";
+ version = "2.14.2";
goPackagePath = "github.com/github/hub";
@@ -13,7 +13,7 @@ buildGoPackage rec {
owner = "github";
repo = pname;
rev = "v${version}";
- sha256 = "0b179sp8z2blzh4a0c2pjbbiya68x2i4cnmcci58r8k0mwrx6mw1";
+ sha256 = "1qjab3dpia1jdlszz3xxix76lqrm4zbmqzd9ymld7h06awzsg2vh";
};
nativeBuildInputs = [ groff utillinux ];
diff --git a/pkgs/applications/version-management/gitlab/data.json b/pkgs/applications/version-management/gitlab/data.json
index 07ec3a29144..ddad51dfb63 100644
--- a/pkgs/applications/version-management/gitlab/data.json
+++ b/pkgs/applications/version-management/gitlab/data.json
@@ -1,11 +1,11 @@
{
- "version": "12.8.5",
- "repo_hash": "1y5606p793w1js39420jcd2bj42cripczgrdxgg2cq0r2kq8axk8",
+ "version": "12.8.6",
+ "repo_hash": "0plcigppmg6ckmq8myj3m9adshdvqj7czx8fms71bsa9zx060wib",
"owner": "gitlab-org",
"repo": "gitlab",
- "rev": "v12.8.5-ee",
+ "rev": "v12.8.6-ee",
"passthru": {
- "GITALY_SERVER_VERSION": "12.8.5",
+ "GITALY_SERVER_VERSION": "12.8.6",
"GITLAB_PAGES_VERSION": "1.16.0",
"GITLAB_SHELL_VERSION": "11.0.0",
"GITLAB_WORKHORSE_VERSION": "8.21.0"
diff --git a/pkgs/applications/version-management/gitlab/gitaly/default.nix b/pkgs/applications/version-management/gitlab/gitaly/default.nix
index 0dd60a6df20..9b3e4da2024 100644
--- a/pkgs/applications/version-management/gitlab/gitaly/default.nix
+++ b/pkgs/applications/version-management/gitlab/gitaly/default.nix
@@ -28,14 +28,14 @@ let
};
});
in buildGoPackage rec {
- version = "12.8.5";
+ version = "12.8.6";
pname = "gitaly";
src = fetchFromGitLab {
owner = "gitlab-org";
repo = "gitaly";
rev = "v${version}";
- sha256 = "19pwffncihhywfac7ybry38vyj3pmdz66g5nqrvwn4xxw7ypvd24";
+ sha256 = "1rf9qmyjllkwkyi7la1dzyjh0z9sw21zdzihd7v9ngwqssfk5zfk";
};
# Fix a check which assumes that hook files are writeable by their
diff --git a/pkgs/applications/version-management/gitlab/update.py b/pkgs/applications/version-management/gitlab/update.py
index dc2d1e29719..a2a3a6d05b7 100755
--- a/pkgs/applications/version-management/gitlab/update.py
+++ b/pkgs/applications/version-management/gitlab/update.py
@@ -175,6 +175,8 @@ def update_gitaly():
f.write(repo.get_file(fn, f"v{gitaly_server_version}"))
subprocess.check_output(['bundix'], cwd=gitaly_dir)
+
+ os.environ['GOROOT'] = ""
subprocess.check_output(['vgo2nix'], cwd=gitaly_dir)
for fn in ['go.mod', 'go.sum']:
@@ -197,6 +199,7 @@ def update_gitlab_shell():
with open(gitlab_shell_dir / fn, 'w') as f:
f.write(repo.get_file(fn, f"v{gitlab_shell_version}"))
+ os.environ['GOROOT'] = ""
subprocess.check_output(['vgo2nix'], cwd=gitlab_shell_dir)
for fn in ['go.mod', 'go.sum']:
@@ -217,6 +220,7 @@ def update_gitlab_workhorse():
with open(gitlab_workhorse_dir / fn, 'w') as f:
f.write(repo.get_file(fn, f"v{gitlab_workhorse_version}"))
+ os.environ['GOROOT'] = ""
subprocess.check_output(['vgo2nix'], cwd=gitlab_workhorse_dir)
for fn in ['go.mod', 'go.sum']:
diff --git a/pkgs/applications/virtualization/docker/default.nix b/pkgs/applications/virtualization/docker/default.nix
index e4093ea87e7..7f7b3a227e8 100644
--- a/pkgs/applications/virtualization/docker/default.nix
+++ b/pkgs/applications/virtualization/docker/default.nix
@@ -206,9 +206,9 @@ rec {
};
docker_19_03 = makeOverridable dockerGen {
- version = "19.03.7";
- rev = "7141c199a2edb2a90b778175f836f9dd2a22c95a";
- sha256 = "1h1hrp6cw3ah2gaq2vfdd1d9vh7gyf7rs6bdxwpxk9ixc19fxsm4";
+ version = "19.03.8";
+ rev = "afacb8b7f0d8d4f9d2a8e8736e9c993e672b41f3";
+ sha256 = "15iq16rlnkw78lvapcfpbnsnxhdjbvfvgzg3xzxhpdg1dmq40b6j";
runcRev = "dc9208a3303feef5b3839f4323d9beb36df0a9dd"; # v1.0.0-rc10
runcSha256 = "0pi3rvj585997m4z9ljkxz2z9yxf9p2jr0pmqbqrc7bc95f5hagk";
containerdRev = "7ad184331fa3e55e52b890ea95e65ba581ae3429"; # v1.2.13
diff --git a/pkgs/applications/window-managers/i3/lock-color.nix b/pkgs/applications/window-managers/i3/lock-color.nix
index 7895d8c124a..062a8c4b8d8 100644
--- a/pkgs/applications/window-managers/i3/lock-color.nix
+++ b/pkgs/applications/window-managers/i3/lock-color.nix
@@ -4,14 +4,14 @@
}:
stdenv.mkDerivation rec {
- version = "2.12.c";
+ version = "2.12.c.1";
pname = "i3lock-color";
src = fetchFromGitHub {
owner = "PandorasFox";
repo = "i3lock-color";
rev = version;
- sha256 = "08fhnchf187b73h52xgzb86g6byzxz085zs9galsvl687g5zxk34";
+ sha256 = "1q09cfgkikqbrkk1kljg8dsgbs5nacixhdqaww18h94hmlnbbssc";
};
nativeBuildInputs = [ autoreconfHook pkgconfig ];
@@ -51,7 +51,7 @@ stdenv.mkDerivation rec {
- clock: time/date with configurable format
- keyboard-layout
'';
- homepage = https://github.com/PandorasFox/i3lock-color;
+ homepage = "https://github.com/PandorasFox/i3lock-color";
maintainers = with maintainers; [ malyn ];
license = licenses.bsd3;
diff --git a/pkgs/data/fonts/jost/default.nix b/pkgs/data/fonts/jost/default.nix
index ecada2eda7b..3c1403da263 100644
--- a/pkgs/data/fonts/jost/default.nix
+++ b/pkgs/data/fonts/jost/default.nix
@@ -1,7 +1,7 @@
{stdenv, fetchzip}:
let
- version = "3.3";
+ version = "3.5";
in fetchzip {
name = "jost-${version}";
url = "https://github.com/indestructible-type/Jost/releases/download/${version}/Jost.zip";
@@ -11,7 +11,7 @@ in fetchzip {
unzip -j $downloadedFile \*.otf -d $out/share/fonts/opentype
'';
- sha256="00nrhs3aif2hc4yhjhbn9ywmydl2w0g0hv5m5is8gv7wx8yi2j9z";
+ sha256="0l78vhmbsyfmrva5wc76pskhxqryyg8q5xddpj9g5wqsddy525dq";
meta = with stdenv.lib; {
homepage = https://github.com/indestructible-type/Jost;
diff --git a/pkgs/development/compilers/gcc/9/default.nix b/pkgs/development/compilers/gcc/9/default.nix
index 7ff8d7529ca..f660a59a790 100644
--- a/pkgs/development/compilers/gcc/9/default.nix
+++ b/pkgs/development/compilers/gcc/9/default.nix
@@ -245,6 +245,12 @@ stdenv.mkDerivation ({
inherit (stdenv) is64bit;
+ # In this particular combination it stopped creating lib output at all.
+ # TODO: perhaps find a better fix? (ideally understand what's going on)
+ postFixup = if crossStageStatic && targetPlatform.isMusl && targetPlatform.is32bit
+ then ''mkdir "$lib"''
+ else null;
+
meta = {
homepage = https://gcc.gnu.org/;
license = stdenv.lib.licenses.gpl3Plus; # runtime support libraries are typically LGPLv3+
diff --git a/pkgs/development/compilers/sbcl/default.nix b/pkgs/development/compilers/sbcl/default.nix
index 79173871095..4517db4c384 100644
--- a/pkgs/development/compilers/sbcl/default.nix
+++ b/pkgs/development/compilers/sbcl/default.nix
@@ -10,11 +10,11 @@
stdenv.mkDerivation rec {
pname = "sbcl";
- version = "2.0.1";
+ version = "2.0.2";
src = fetchurl {
url = "mirror://sourceforge/project/sbcl/sbcl/${version}/${pname}-${version}-source.tar.bz2";
- sha256 = "1s2nrq26czl7f8jpa9qjpmdqbzvldvf4c7c1z1c438v4f85xcl44";
+ sha256 = "07pyzdjnhcpqwvr3rrk4i18maqdywbq1qj93fnpx1h4b7dp08r28";
};
buildInputs = [texinfo];
diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix
index 3f28ebebd22..90819d64c33 100644
--- a/pkgs/development/haskell-modules/configuration-common.nix
+++ b/pkgs/development/haskell-modules/configuration-common.nix
@@ -81,12 +81,12 @@ self: super: {
# The Hackage tarball is purposefully broken, because it's not intended to be, like, useful.
# https://git-annex.branchable.com/bugs/bash_completion_file_is_missing_in_the_6.20160527_tarball_on_hackage/
- git-annex = (overrideSrc (appendPatch super.git-annex ./patches/git-annex-fix-build-with-ghc-8.8.x.patch) {
+ git-annex = (overrideSrc super.git-annex {
src = pkgs.fetchgit {
name = "git-annex-${super.git-annex.version}-src";
url = "git://git-annex.branchable.com/";
rev = "refs/tags/" + super.git-annex.version;
- sha256 = "0pl0yip7zp4i78cj9jqkmm33wqaaaxjq3ggnfmv95y79yijd6yh4";
+ sha256 = "0y2qcjahi705c6nnypqpa5w3bzyzk4kqvbwfnpiaxzk5vna589gg";
};
}).override {
dbus = if pkgs.stdenv.isLinux then self.dbus else null;
@@ -376,6 +376,7 @@ self: super: {
Rlang-QQ = dontCheck super.Rlang-QQ;
safecopy = dontCheck super.safecopy;
sai-shape-syb = dontCheck super.sai-shape-syb;
+ saltine = dontCheck super.saltine; # https://github.com/tel/saltine/pull/56
scp-streams = dontCheck super.scp-streams;
sdl2 = dontCheck super.sdl2; # the test suite needs an x server
sdl2-ttf = dontCheck super.sdl2-ttf; # as of version 0.2.1, the test suite requires user intervention
@@ -1219,7 +1220,13 @@ self: super: {
temporary-resourcet = doJailbreak super.temporary-resourcet;
# Requires dhall >= 1.23.0
- ats-pkg = super.ats-pkg.override { dhall = self.dhall_1_29_0; };
+ ats-pkg = dontCheck (super.ats-pkg.override { dhall = self.dhall_1_29_0; });
+
+ # fake a home dir and capture generated man page
+ ats-format = overrideCabal super.ats-format (old : {
+ preConfigure = "export HOME=$PWD";
+ postBuild = "mv .local/share $out";
+ });
# Test suite doesn't work with current QuickCheck
# https://github.com/pruvisto/heap/issues/11
@@ -1467,4 +1474,26 @@ self: super: {
# haskell-ci-0.8 needs cabal-install-parsers ==0.1, but we have 0.2.
haskell-ci = doJailbreak super.haskell-ci;
+ persistent-mysql = dontCheck super.persistent-mysql;
+
+ # Fix EdisonAPI and EdisonCore for GHC 8.8:
+ # https://github.com/robdockins/edison/pull/16
+ EdisonAPI = appendPatch super.EdisonAPI (pkgs.fetchpatch {
+ url = "https://github.com/robdockins/edison/pull/16/commits/8da6c0f7d8666766e2f0693425c347c0adb492dc.patch";
+ postFetch = ''
+ ${pkgs.patchutils}/bin/filterdiff --include='a/edison-api/*' --strip=1 "$out" > "$tmpfile"
+ mv "$tmpfile" "$out"
+ '';
+ sha256 = "0yi5pz039lcm4pl9xnl6krqxyqq5rgb5b6m09w0sfy06x0n4x213";
+ });
+
+ EdisonCore = appendPatch super.EdisonCore (pkgs.fetchpatch {
+ url = "https://github.com/robdockins/edison/pull/16/commits/8da6c0f7d8666766e2f0693425c347c0adb492dc.patch";
+ postFetch = ''
+ ${pkgs.patchutils}/bin/filterdiff --include='a/edison-core/*' --strip=1 "$out" > "$tmpfile"
+ mv "$tmpfile" "$out"
+ '';
+ sha256 = "097wqn8hxsr50b9mhndg5pjim5jma2ym4ylpibakmmb5m98n17zp";
+ });
+
} // import ./configuration-tensorflow.nix {inherit pkgs haskellLib;} self super
diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml
index 5c66ad9a390..3c684570533 100644
--- a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml
+++ b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml
@@ -1,6 +1,6 @@
# pkgs/development/haskell-modules/configuration-hackage2nix.yaml
-compiler: ghc-8.8.2
+compiler: ghc-8.8.3
core-packages:
- array-0.5.4.0
@@ -10,23 +10,23 @@ core-packages:
- Cabal-3.0.1.0
- containers-0.6.2.1
- deepseq-1.4.4.0
- - directory-1.3.4.0
+ - directory-1.3.6.0
- filepath-1.4.2.1
- - ghc-8.8.2
- - ghc-boot-8.8.2
- - ghc-boot-th-8.8.2
+ - ghc-8.8.3
+ - ghc-boot-8.8.3
+ - ghc-boot-th-8.8.3
- ghc-compact-0.1.0.0
- - ghc-heap-8.8.2
+ - ghc-heap-8.8.3
- ghc-prim-0.5.3
- - ghci-8.8.2
+ - ghci-8.8.3
- haskeline-0.7.5.0
- hpc-0.6.0.3
- integer-gmp-1.0.2.0
- - libiserv-8.8.2
+ - libiserv-8.8.3
- mtl-2.2.2
- parsec-3.1.14.0
- pretty-1.1.3.6
- - process-1.6.7.0
+ - process-1.6.8.0
- rts-1.0
- stm-2.5.0.0
- template-haskell-2.15.0.0
@@ -76,7 +76,7 @@ default-package-overrides:
# gi-gdkx11-4.x requires gtk-4.x, which is still under development and
# not yet available in Nixpkgs
- gi-gdkx11 < 4
- # LTS Haskell 15.2
+ # LTS Haskell 15.3
- abstract-deque ==0.3
- abstract-par ==0.3.3
- AC-Angle ==1.0
@@ -361,7 +361,7 @@ default-package-overrides:
- bytes ==0.17
- byteset ==0.1.1.0
- byteslice ==0.2.2.0
- - bytesmith ==0.3.5.0
+ - bytesmith ==0.3.6.0
- bytestring-builder ==0.10.8.2.0
- bytestring-conversion ==0.3.1
- bytestring-lexing ==0.5.0.2
@@ -407,7 +407,7 @@ default-package-overrides:
- Chart-diagrams ==1.9.3
- chaselev-deque ==0.5.0.5
- ChasingBottoms ==1.3.1.7
- - checkers ==0.5.2
+ - checkers ==0.5.4
- checksum ==0.0
- chimera ==0.3.0.0
- choice ==0.2.2
@@ -444,7 +444,7 @@ default-package-overrides:
- co-log ==0.4.0.0
- co-log-core ==0.2.1.0
- co-log-polysemy ==0.0.1.1
- - Color ==0.1.3.1
+ - Color ==0.1.4
- colorful-monoids ==0.2.1.2
- colorize-haskell ==1.0.1
- colour ==2.3.5
@@ -577,7 +577,7 @@ default-package-overrides:
- data-tree-print ==0.1.0.2
- dataurl ==0.1.0.0
- DAV ==1.3.4
- - dbus ==1.2.11
+ - dbus ==1.2.12
- debian-build ==0.10.2.0
- debug-trace-var ==0.2.0
- dec ==0.0.3
@@ -707,7 +707,7 @@ default-package-overrides:
- extended-reals ==0.2.3.0
- extensible-effects ==5.0.0.1
- extensible-exceptions ==0.1.1.4
- - extra ==1.6.20
+ - extra ==1.6.21
- extractable-singleton ==0.0.1
- extrapolate ==0.4.1
- fail ==4.9.0.0
@@ -785,12 +785,12 @@ default-package-overrides:
- funcmp ==1.9
- function-builder ==0.3.0.1
- functor-classes-compat ==1
- - fused-effects ==1.0.0.1
+ - fused-effects ==1.0.2.0
- fusion-plugin ==0.1.1
- fusion-plugin-types ==0.1.0
- fuzzcheck ==0.1.1
- fuzzy ==0.1.0.0
- - fuzzy-dates ==0.1.1.1
+ - fuzzy-dates ==0.1.1.2
- fuzzyset ==0.2.0
- fuzzy-time ==0.1.0.0
- gauge ==0.2.5
@@ -868,9 +868,9 @@ default-package-overrides:
- gi-pango ==1.0.22
- giphy-api ==0.7.0.0
- githash ==0.1.3.3
- - github-rest ==1.0.1
+ - github-rest ==1.0.2
- github-types ==0.2.1
- - gitlab-haskell ==0.1.5
+ - gitlab-haskell ==0.1.7
- gitrev ==1.3.1
- gi-xlib ==2.0.8
- gl ==0.9
@@ -1059,8 +1059,8 @@ default-package-overrides:
- hunit-dejafu ==2.0.0.1
- hvect ==0.4.0.0
- hvega ==0.5.0.0
- - hw-balancedparens ==0.3.0.4
- - hw-bits ==0.7.1.0
+ - hw-balancedparens ==0.3.0.5
+ - hw-bits ==0.7.1.2
- hw-conduit ==0.2.0.6
- hw-conduit-merges ==0.2.0.0
- hw-diagnostics ==0.0.0.7
@@ -1287,7 +1287,7 @@ default-package-overrides:
- markdown-unlit ==0.5.0
- markov-chain ==0.0.3.4
- massiv ==0.4.5.0
- - massiv-io ==0.2.0.0
+ - massiv-io ==0.2.1.0
- massiv-test ==0.1.2
- mathexpr ==0.3.0.0
- math-functions ==0.3.3.0
@@ -1331,9 +1331,9 @@ default-package-overrides:
- mime-types ==0.1.0.9
- mini-egison ==0.1.6
- minimal-configuration ==0.1.4
- - minimorph ==0.2.1.0
+ - minimorph ==0.2.2.0
- minio-hs ==1.5.2
- - miniutter ==0.5.0.0
+ - miniutter ==0.5.1.0
- mintty ==0.1.2
- miso ==1.4.0.0
- missing-foreign ==0.1.1
@@ -1356,7 +1356,7 @@ default-package-overrides:
- monad-extras ==0.6.0
- monadic-arrays ==0.2.2
- monad-journal ==0.8.1
- - monad-logger ==0.3.31
+ - monad-logger ==0.3.32
- monad-logger-json ==0.1.0.0
- monad-logger-prefix ==0.1.11
- monad-loops ==0.4.3
@@ -1551,7 +1551,7 @@ default-package-overrides:
- persistent-sqlite ==2.10.6.2
- persistent-template ==2.8.2.3
- persistent-test ==2.0.3.1
- - persistent-typed-db ==0.1.0.0
+ - persistent-typed-db ==0.1.0.1
- pg-harness-client ==0.6.0
- pgp-wordlist ==0.1.0.3
- pg-transact ==0.3.1.1
@@ -1739,7 +1739,7 @@ default-package-overrides:
- rerebase ==1.4.1
- resolv ==0.1.1.3
- resource-pool ==0.2.3.2
- - resourcet ==1.2.2
+ - resourcet ==1.2.3
- result ==0.2.6.0
- rethinkdb-client-driver ==0.0.25
- retry ==0.8.1.0
@@ -1747,7 +1747,7 @@ default-package-overrides:
- rfc1751 ==0.1.2
- rfc5051 ==0.1.0.4
- rigel-viz ==0.2.0.0
- - rio ==0.1.14.0
+ - rio ==0.1.14.1
- rio-orphans ==0.1.1.0
- rio-prettyprint ==0.1.0.0
- roc-id ==0.1.0.0
@@ -1792,7 +1792,7 @@ default-package-overrides:
- sdl2-gfx ==0.2
- sdl2-image ==2.0.0
- sdl2-mixer ==1.1.0
- - sdl2-ttf ==2.1.0
+ - sdl2-ttf ==2.1.1
- search-algorithms ==0.3.1
- secp256k1-haskell ==0.1.8
- securemem ==0.1.10
@@ -2178,7 +2178,7 @@ default-package-overrides:
- unix-bytestring ==0.3.7.3
- unix-compat ==0.5.2
- unix-time ==0.4.7
- - unliftio ==0.2.12
+ - unliftio ==0.2.12.1
- unliftio-core ==0.1.2.0
- unliftio-pool ==0.2.1.0
- unlit ==0.4.0.0
@@ -2239,7 +2239,7 @@ default-package-overrides:
- wai-app-static ==3.1.7.1
- wai-conduit ==3.0.0.4
- wai-cors ==0.2.7
- - wai-enforce-https ==0.0.1
+ - wai-enforce-https ==0.0.2
- wai-eventsource ==3.0.0
- wai-extra ==3.0.29.1
- wai-handler-launch ==3.0.3.1
@@ -2324,7 +2324,7 @@ default-package-overrides:
- yesod-auth ==1.6.9
- yesod-auth-hashdb ==1.7.1.2
- yesod-bin ==1.6.0.4
- - yesod-core ==1.6.17.2
+ - yesod-core ==1.6.17.3
- yesod-form ==1.6.7
- yesod-gitrev ==0.2.1
- yesod-newsfeed ==1.7.0.0
@@ -2344,7 +2344,7 @@ default-package-overrides:
- zeromq4-haskell ==0.8.0
- zeromq4-patterns ==0.3.1.0
- zim-parser ==0.2.1.0
- - zip ==1.3.1
+ - zip ==1.3.2
- zip-archive ==0.4.1
- zippers ==0.3
- zip-stream ==0.2.0.1
@@ -2847,6 +2847,7 @@ broken-packages:
- arbor-monad-metric
- arbor-monad-metric-datadog
- arbtt
+ - archive-tar-bytestring
- archiver
- archlinux
- archlinux-web
@@ -2920,8 +2921,6 @@ broken-packages:
- atomic-primops-vector
- atomo
- atp-haskell
- - ats-format
- - ats-pkg
- ats-setup
- ats-storable
- attempt
@@ -3179,6 +3178,8 @@ broken-packages:
- bitcoin-rpc
- bitcoin-script
- bitcoin-tx
+ - bitcoind-regtest
+ - bitcoind-rpc
- Bitly
- bitly-cli
- bitmaps
@@ -3427,6 +3428,7 @@ broken-packages:
- carte
- cartel
- Cartesian
+ - cas-store
- casa-abbreviations-and-acronyms
- casadi-bindings
- casadi-bindings-control
@@ -4383,8 +4385,6 @@ broken-packages:
- edentv
- edge
- edges
- - EdisonAPI
- - EdisonCore
- edit
- edit-lenses
- editable
@@ -8156,7 +8156,6 @@ broken-packages:
- persistent-map
- persistent-migration
- persistent-mongoDB
- - persistent-mysql
- persistent-mysql-haskell
- persistent-protobuf
- persistent-ratelimit
@@ -8979,7 +8978,6 @@ broken-packages:
- sajson
- salak-toml
- Salsa
- - saltine
- saltine-quickcheck
- salvia
- salvia-demo
@@ -9377,7 +9375,6 @@ broken-packages:
- smuggler
- snake
- snake-game
- - snap
- snap-accept
- snap-auth-cli
- snap-blaze-clay
@@ -10962,5 +10959,3 @@ broken-packages:
- ztar
- zuramaru
- Zwaluw
- - zxcvbn-dvorak
- - zxcvbn-hs
diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix
index d2d3c343682..2caf04f479a 100644
--- a/pkgs/development/haskell-modules/hackage-packages.nix
+++ b/pkgs/development/haskell-modules/hackage-packages.nix
@@ -3291,26 +3291,6 @@ self: {
}) {inherit (pkgs) libdevil;};
"Color" = callPackage
- ({ mkDerivation, base, Cabal, cabal-doctest, colour, criterion
- , data-default-class, deepseq, doctest, hspec, HUnit, JuicyPixels
- , massiv, massiv-test, QuickCheck, random, template-haskell, vector
- }:
- mkDerivation {
- pname = "Color";
- version = "0.1.3.1";
- sha256 = "0a4ljaqb1a8v622v99n37abas7xhzlmykbz5lm1q9xjs596qx357";
- setupHaskellDepends = [ base Cabal cabal-doctest ];
- libraryHaskellDepends = [ base data-default-class deepseq vector ];
- testHaskellDepends = [
- base colour doctest hspec HUnit JuicyPixels massiv massiv-test
- QuickCheck random template-haskell vector
- ];
- benchmarkHaskellDepends = [ base colour criterion deepseq random ];
- description = "Color spaces and conversions between them";
- license = stdenv.lib.licenses.bsd3;
- }) {};
-
- "Color_0_1_4" = callPackage
({ mkDerivation, base, Cabal, cabal-doctest, colour, criterion
, data-default-class, deepseq, doctest, hspec, HUnit, JuicyPixels
, massiv, massiv-test, QuickCheck, random, template-haskell, vector
@@ -3328,7 +3308,6 @@ self: {
benchmarkHaskellDepends = [ base colour criterion deepseq random ];
description = "Color spaces and conversions between them";
license = stdenv.lib.licenses.bsd3;
- hydraPlatforms = stdenv.lib.platforms.none;
}) {};
"Combinatorrent" = callPackage
@@ -5118,8 +5097,6 @@ self: {
libraryHaskellDepends = [ base mtl ];
description = "A library of efficient, purely-functional data structures (API)";
license = stdenv.lib.licenses.mit;
- hydraPlatforms = stdenv.lib.platforms.none;
- broken = true;
}) {};
"EdisonCore" = callPackage
@@ -5135,8 +5112,6 @@ self: {
];
description = "A library of efficient, purely-functional data structures (Core Implementations)";
license = stdenv.lib.licenses.mit;
- hydraPlatforms = stdenv.lib.platforms.none;
- broken = true;
}) {};
"EditTimeReport" = callPackage
@@ -8891,8 +8866,8 @@ self: {
({ mkDerivation, base, bcm2835, bytestring }:
mkDerivation {
pname = "HPi";
- version = "0.6.0";
- sha256 = "1b0m6srghxbd3cjwffkajf1dnsw8nsgqyi4wiy7wsdsadqnv25z9";
+ version = "0.7.0";
+ sha256 = "094wdlnby4iqp5zvd3iimp3whn386w5h6x04izz5xxf43bzzbl2a";
libraryHaskellDepends = [ base bytestring ];
librarySystemDepends = [ bcm2835 ];
description = "GPIO, I2C and SPI functions for the Raspberry Pi";
@@ -18442,6 +18417,20 @@ self: {
license = stdenv.lib.licenses.bsd3;
}) {};
+ "Spintax_0_3_4" = callPackage
+ ({ mkDerivation, attoparsec, base, extra, mtl, mwc-random, text }:
+ mkDerivation {
+ pname = "Spintax";
+ version = "0.3.4";
+ sha256 = "008b83nnjgpzjr4c2dk1vambzb78dwx59c5cq4p0s8ghp6xl9sk3";
+ libraryHaskellDepends = [
+ attoparsec base extra mtl mwc-random text
+ ];
+ description = "Random text generation based on spintax";
+ license = stdenv.lib.licenses.bsd3;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ }) {};
+
"Spock" = callPackage
({ mkDerivation, base, base64-bytestring, bytestring, containers
, cryptonite, focus, hashable, hspec, hspec-wai, http-types, hvect
@@ -23553,8 +23542,8 @@ self: {
}:
mkDerivation {
pname = "aeson-combinators";
- version = "0.0.1.1";
- sha256 = "0dcdmmpsjs7lkyznyvazxy977niysb58pwjidc2pkv26xdrkm2nk";
+ version = "0.0.2.1";
+ sha256 = "1a087940jpbnc2rc7cs4xj6kq1wv7b5ibhaimj7f6jglrn9xjgf0";
libraryHaskellDepends = [
aeson base bytestring containers fail scientific text time
time-compat unordered-containers uuid-types vector void
@@ -24120,8 +24109,8 @@ self: {
pname = "aeson-schemas";
version = "1.0.3";
sha256 = "0fmhqibw6mw9shxh94riqq465njbgjsv539xb6sx7qpkhcck2csi";
- revision = "2";
- editedCabalFile = "0dydrwj8d7337c0qdxc7cxg8y2hb89ksli9692rvx7zfan41cpq7";
+ revision = "3";
+ editedCabalFile = "01vp89mjl7jl80mdl9hqmiz3vs7fjl5mf1p64d3g352xqak3mr7d";
libraryHaskellDepends = [
aeson base bytestring first-class-families megaparsec
template-haskell text unordered-containers
@@ -24283,8 +24272,8 @@ self: {
}:
mkDerivation {
pname = "aeson-value-parser";
- version = "0.17";
- sha256 = "0xsvlwsql73g9lmd6izmgqfv8fvbbssmizkryaaphazym443hiw5";
+ version = "0.18";
+ sha256 = "1n288jb8ksjb6psgal4q6p7ad13sdak3llk54nc0gg5w2r20x634";
libraryHaskellDepends = [
aeson attoparsec base bytestring hashable mtl scientific text
transformers unordered-containers vector
@@ -31122,6 +31111,24 @@ self: {
license = stdenv.lib.licenses.bsd3;
}) {};
+ "archive-tar-bytestring" = callPackage
+ ({ mkDerivation, base, bytestring, composition-prelude, cpphs
+ , tar-bytestring, text, unix
+ }:
+ mkDerivation {
+ pname = "archive-tar-bytestring";
+ version = "0.1.0.0";
+ sha256 = "0s1x4krnjdf1gq0f1krqdhxjkz4yanl5ayr0mdg6bcprlpzf3ib9";
+ libraryHaskellDepends = [
+ base bytestring composition-prelude tar-bytestring text unix
+ ];
+ libraryToolDepends = [ cpphs ];
+ description = "Common interface using the tar-bytestring package";
+ license = stdenv.lib.licenses.bsd3;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ broken = true;
+ }) {};
+
"archiver" = callPackage
({ mkDerivation, base, bytestring, containers, curl, HTTP, network
, process, random
@@ -31484,8 +31491,8 @@ self: {
}:
mkDerivation {
pname = "arithmetic";
- version = "1.5";
- sha256 = "0angjp341sfij8lqns74k6pwazdc679bd19fxphqab91cj9p9s56";
+ version = "1.6";
+ sha256 = "1k448bgs99i5lg87jvbfy63p4h1n2g6ldb4a0vig5ym7q5yhjkdc";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [
@@ -33374,8 +33381,6 @@ self: {
];
description = "A source-code formatter for ATS";
license = stdenv.lib.licenses.bsd3;
- hydraPlatforms = stdenv.lib.platforms.none;
- broken = true;
}) {};
"ats-pkg" = callPackage
@@ -33410,8 +33415,6 @@ self: {
doHaddock = false;
description = "A build tool for ATS";
license = stdenv.lib.licenses.bsd3;
- hydraPlatforms = stdenv.lib.platforms.none;
- broken = true;
}) {};
"ats-setup" = callPackage
@@ -40700,6 +40703,49 @@ self: {
license = stdenv.lib.licenses.mit;
}) {};
+ "bitcoind-regtest" = callPackage
+ ({ mkDerivation, base, bitcoind-rpc, cereal, containers
+ , haskoin-core, http-client, process, servant, servant-client
+ , tasty, tasty-hunit, temporary, text
+ }:
+ mkDerivation {
+ pname = "bitcoind-regtest";
+ version = "0.1.0.0";
+ sha256 = "078834ndl253d1s6f68a8cq1dc0hq3r3ic4a90wbr4msw9zn626q";
+ libraryHaskellDepends = [
+ base bitcoind-rpc cereal containers haskoin-core http-client
+ process servant servant-client temporary text
+ ];
+ testHaskellDepends = [
+ base bitcoind-rpc cereal haskoin-core http-client process servant
+ servant-client tasty tasty-hunit temporary text
+ ];
+ description = "A library for working with bitcoin-core regtest networks";
+ license = stdenv.lib.licenses.isc;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ broken = true;
+ }) {};
+
+ "bitcoind-rpc" = callPackage
+ ({ mkDerivation, aeson, base, bytestring, cereal, haskoin-core
+ , http-client, scientific, servant, servant-client
+ , servant-jsonrpc-client, text, time, transformers
+ }:
+ mkDerivation {
+ pname = "bitcoind-rpc";
+ version = "0.1.0.0";
+ sha256 = "1a3p49lzzsqd9m7ivisxksb6c7yc0dg5rps6ym85s4aasr1ln1j8";
+ libraryHaskellDepends = [
+ aeson base bytestring cereal haskoin-core http-client scientific
+ servant servant-client servant-jsonrpc-client text time
+ transformers
+ ];
+ description = "A streamlined interface to bitcoin core using Haskoin types and Servant";
+ license = stdenv.lib.licenses.isc;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ broken = true;
+ }) {};
+
"bitly-cli" = callPackage
({ mkDerivation, base, Bitly, directory, filepath, regexpr }:
mkDerivation {
@@ -44980,6 +45026,21 @@ self: {
license = stdenv.lib.licenses.bsd3;
}) {};
+ "bytelog" = callPackage
+ ({ mkDerivation, base, bytebuild, byteslice, natural-arithmetic
+ , posix-api, primitive
+ }:
+ mkDerivation {
+ pname = "bytelog";
+ version = "0.1.0.0";
+ sha256 = "03acvb13q3bs77qyxsf91b9l2wv6f23lrghqnh2dacsdrg75dpfa";
+ libraryHaskellDepends = [
+ base bytebuild byteslice natural-arithmetic posix-api primitive
+ ];
+ description = "Fast logging";
+ license = stdenv.lib.licenses.bsd3;
+ }) {};
+
"byteorder" = callPackage
({ mkDerivation, base }:
mkDerivation {
@@ -45047,30 +45108,6 @@ self: {
}) {};
"bytesmith" = callPackage
- ({ mkDerivation, base, byte-order, byteslice, bytestring
- , contiguous, gauge, primitive, run-st, tasty, tasty-hunit
- , tasty-quickcheck, text-short, wide-word
- }:
- mkDerivation {
- pname = "bytesmith";
- version = "0.3.5.0";
- sha256 = "1axjb1p819cfpwrmilc8qakw7acipx47hdrilwj6ib0nn5agya8f";
- libraryHaskellDepends = [
- base byteslice bytestring contiguous primitive run-st text-short
- wide-word
- ];
- testHaskellDepends = [
- base byte-order byteslice primitive tasty tasty-hunit
- tasty-quickcheck text-short wide-word
- ];
- benchmarkHaskellDepends = [
- base byteslice bytestring gauge primitive
- ];
- description = "Nonresumable byte parser";
- license = stdenv.lib.licenses.bsd3;
- }) {};
-
- "bytesmith_0_3_6_0" = callPackage
({ mkDerivation, base, byte-order, byteslice, bytestring
, contiguous, gauge, primitive, run-st, tasty, tasty-hunit
, tasty-quickcheck, text-short, wide-word
@@ -45092,7 +45129,6 @@ self: {
];
description = "Nonresumable byte parser";
license = stdenv.lib.licenses.bsd3;
- hydraPlatforms = stdenv.lib.platforms.none;
}) {};
"bytestring_0_10_10_0" = callPackage
@@ -47280,8 +47316,8 @@ self: {
}:
mkDerivation {
pname = "cachix";
- version = "0.3.6";
- sha256 = "14iz8ihzrcq075zk6cz8dmp2c9ygsfvi0ksa0969k8746hgwwxf9";
+ version = "0.3.7";
+ sha256 = "14rz8rncvnv8x9idfg69acck38bygnbnccdn7ghhz4ailiamf50b";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [
@@ -48407,6 +48443,68 @@ self: {
broken = true;
}) {};
+ "cas-hashable" = callPackage
+ ({ mkDerivation, aeson, base, bytestring, clock, containers
+ , cryptonite, ghc-prim, hashable, integer-gmp, memory, path
+ , path-io, safe-exceptions, scientific, text, time, unix
+ , unordered-containers, vector
+ }:
+ mkDerivation {
+ pname = "cas-hashable";
+ version = "1.0.1";
+ sha256 = "13r3iiv882mq692yy24gy3kdfgg3lrk51909na5yx2hjlj47nyxd";
+ libraryHaskellDepends = [
+ aeson base bytestring clock containers cryptonite ghc-prim hashable
+ integer-gmp memory path path-io safe-exceptions scientific text
+ time unix unordered-containers vector
+ ];
+ description = "A hashing class for content-addressed storage";
+ license = stdenv.lib.licenses.mit;
+ }) {};
+
+ "cas-hashable-s3" = callPackage
+ ({ mkDerivation, aeson, aws, base, cas-hashable, constraints
+ , http-conduit, reflection, resourcet
+ }:
+ mkDerivation {
+ pname = "cas-hashable-s3";
+ version = "1.0.0";
+ sha256 = "07sap2kx6vqhyszdnmnvamaqkfpqn3711phj0ig961n7h8p433dz";
+ libraryHaskellDepends = [
+ aeson aws base cas-hashable constraints http-conduit reflection
+ resourcet
+ ];
+ description = "ContentHashable instances for S3 objects";
+ license = stdenv.lib.licenses.mit;
+ }) {};
+
+ "cas-store" = callPackage
+ ({ mkDerivation, aeson, async, base, bytestring, cas-hashable
+ , containers, cryptonite, directory, filepath, hashable, hinotify
+ , hostname, lens, monad-control, path, path-io, random
+ , safe-exceptions, sqlite-simple, store, tar, tasty, tasty-hunit
+ , text, unix
+ }:
+ mkDerivation {
+ pname = "cas-store";
+ version = "1.0.1";
+ sha256 = "1ls0zsaf472ikpxddzr94cj7hbszlxm4jhdhl7syykypp867v2vi";
+ libraryHaskellDepends = [
+ aeson async base bytestring cas-hashable containers cryptonite
+ directory filepath hashable hinotify hostname lens monad-control
+ path path-io random safe-exceptions sqlite-simple store tar text
+ unix
+ ];
+ testHaskellDepends = [
+ async base cas-hashable containers path path-io safe-exceptions
+ tasty tasty-hunit unix
+ ];
+ description = "A content-addressed storage";
+ license = stdenv.lib.licenses.mit;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ broken = true;
+ }) {};
+
"casa-abbreviations-and-acronyms" = callPackage
({ mkDerivation, base, bytestring, containers, fuzzy, lens
, monoid-subclasses, optparse-applicative, these, wreq
@@ -50194,8 +50292,8 @@ self: {
}:
mkDerivation {
pname = "cgrep";
- version = "6.6.30";
- sha256 = "1ald0461mnd65g5czp3d8dzdvy8pmdxhzj35sghcnxi6qs18xp69";
+ version = "6.6.32";
+ sha256 = "0d1d81bkqd2wvcls5l1msli42cvcdrp0xy7i3s0yb10kfgd1y0qw";
isLibrary = false;
isExecutable = true;
executableHaskellDepends = [
@@ -50755,19 +50853,6 @@ self: {
}) {};
"checkers" = callPackage
- ({ mkDerivation, array, base, QuickCheck, random, semigroupoids }:
- mkDerivation {
- pname = "checkers";
- version = "0.5.2";
- sha256 = "1mqfy6lrivc36kxbfr9zyp70pyq3k2xrmavkadznh999d54x11kq";
- libraryHaskellDepends = [
- array base QuickCheck random semigroupoids
- ];
- description = "Check properties on standard classes and data structures";
- license = stdenv.lib.licenses.bsd3;
- }) {};
-
- "checkers_0_5_4" = callPackage
({ mkDerivation, array, base, QuickCheck, random, semigroupoids }:
mkDerivation {
pname = "checkers";
@@ -50778,7 +50863,6 @@ self: {
];
description = "Check properties on standard classes and data structures";
license = stdenv.lib.licenses.bsd3;
- hydraPlatforms = stdenv.lib.platforms.none;
}) {};
"checkmate" = callPackage
@@ -57222,6 +57306,18 @@ self: {
license = stdenv.lib.licenses.bsd2;
}) {};
+ "concurrent-resource-map" = callPackage
+ ({ mkDerivation, base, containers, random, stm }:
+ mkDerivation {
+ pname = "concurrent-resource-map";
+ version = "0.1.0.0";
+ sha256 = "05zgjb2plrk35fiyskk07jfiydi4mlk6awbfjvhnsa3qi11pxdly";
+ libraryHaskellDepends = [ base containers ];
+ testHaskellDepends = [ base random stm ];
+ description = "Concurrent resource map";
+ license = stdenv.lib.licenses.bsd3;
+ }) {};
+
"concurrent-rpc" = callPackage
({ mkDerivation, base }:
mkDerivation {
@@ -58042,12 +58138,31 @@ self: {
license = stdenv.lib.licenses.bsd3;
}) {};
+ "conferer_0_3_0_0" = callPackage
+ ({ mkDerivation, base, bytestring, containers, deepseq, directory
+ , hspec, text
+ }:
+ mkDerivation {
+ pname = "conferer";
+ version = "0.3.0.0";
+ sha256 = "0irbi1b5fwxcm68a8dbh6qhl2sin998qv8pazw574a3s4z38slv5";
+ libraryHaskellDepends = [
+ base bytestring containers directory text
+ ];
+ testHaskellDepends = [
+ base bytestring containers deepseq directory hspec text
+ ];
+ description = "Configuration management library";
+ license = stdenv.lib.licenses.bsd3;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ }) {};
+
"conferer-hedis" = callPackage
({ mkDerivation, base, conferer, hedis, hspec, text }:
mkDerivation {
pname = "conferer-hedis";
- version = "0.2.0.0";
- sha256 = "0h09lzjg8lhhql6zmr0c7mz8rlaskvkadmcl1xwj76cm1kg3hlwx";
+ version = "0.3.0.0";
+ sha256 = "1d5y15xlsmvj5vbfyp5hmx3zjrwyz58q08aq3w90ia4pi206sq1l";
libraryHaskellDepends = [ base conferer hedis text ];
testHaskellDepends = [ base conferer hedis hspec text ];
description = "conferer's FromConfig instances for hedis settings";
@@ -58066,14 +58181,27 @@ self: {
license = stdenv.lib.licenses.bsd3;
}) {};
+ "conferer-hspec_0_3_0_0" = callPackage
+ ({ mkDerivation, base, conferer, hspec, hspec-core, text }:
+ mkDerivation {
+ pname = "conferer-hspec";
+ version = "0.3.0.0";
+ sha256 = "0vgg0fadcd3xkjrjrvvwl6ybxp6sccr82rjdxswrr0x38c5q42xz";
+ libraryHaskellDepends = [ base conferer hspec-core text ];
+ testHaskellDepends = [ base conferer hspec hspec-core text ];
+ description = "conferer's FromConfig instances for hspec Config";
+ license = stdenv.lib.licenses.bsd3;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ }) {};
+
"conferer-provider-dhall" = callPackage
({ mkDerivation, base, bytestring, conferer, conferer-provider-json
, dhall, dhall-json, directory, hspec, text
}:
mkDerivation {
pname = "conferer-provider-dhall";
- version = "0.2.0.0";
- sha256 = "0d0zwx4cqihvv09i45b6c7vhbxp9iiagqx417ikmhan9pki6ykq5";
+ version = "0.3.0.0";
+ sha256 = "0gdfc1np6p80sb2ddz2jzhqqzzw7jz0rkbhrvyd9k5bp7ivzhfk3";
libraryHaskellDepends = [
base bytestring conferer conferer-provider-json dhall dhall-json
directory text
@@ -58106,14 +58234,35 @@ self: {
license = stdenv.lib.licenses.bsd3;
}) {};
+ "conferer-provider-json_0_3_0_0" = callPackage
+ ({ mkDerivation, aeson, aeson-qq, base, bytestring, conferer
+ , directory, hspec, text, unordered-containers, vector
+ }:
+ mkDerivation {
+ pname = "conferer-provider-json";
+ version = "0.3.0.0";
+ sha256 = "0jrq1cpfhlyq9dvnf4kmx3wqjwz7x18g0hwbg4gkv12spjffpnc9";
+ libraryHaskellDepends = [
+ aeson base bytestring conferer directory text unordered-containers
+ vector
+ ];
+ testHaskellDepends = [
+ aeson aeson-qq base bytestring conferer directory hspec text
+ unordered-containers vector
+ ];
+ description = "conferer's provider for reading json files";
+ license = stdenv.lib.licenses.bsd3;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ }) {};
+
"conferer-provider-yaml" = callPackage
({ mkDerivation, base, conferer, conferer-provider-json, hspec
, yaml
}:
mkDerivation {
pname = "conferer-provider-yaml";
- version = "0.2.0.0";
- sha256 = "19h18374jkcbhj90f0sbz5fq9h35b4pi6wx0hf4h2n46k0gffq12";
+ version = "0.3.0.0";
+ sha256 = "0w1niybl4qa3yv5yzyvybs3v1h0a0ay051cvcpzimwx7kg6vqjv6";
libraryHaskellDepends = [
base conferer conferer-provider-json yaml
];
@@ -58130,8 +58279,8 @@ self: {
}:
mkDerivation {
pname = "conferer-snap";
- version = "0.2.0.0";
- sha256 = "0kvg31i2ffs9ppky8kqszqpq5xaf01zy7k09ifsywmnm96cri9g4";
+ version = "0.3.0.0";
+ sha256 = "19kw9g0f7znc7as6nhjvnx5kypd71ygr5ialhk4pfjva3bp121ij";
libraryHaskellDepends = [
base conferer snap-core snap-server text
];
@@ -58157,6 +58306,22 @@ self: {
license = stdenv.lib.licenses.bsd3;
}) {};
+ "conferer-warp_0_3_0_0" = callPackage
+ ({ mkDerivation, base, conferer, hspec, http-types, text, wai, warp
+ }:
+ mkDerivation {
+ pname = "conferer-warp";
+ version = "0.3.0.0";
+ sha256 = "19rld3xl4mfzl08wyciwh9amfcadnbn0rgjxvdy2s0vgk3nj7677";
+ libraryHaskellDepends = [ base conferer http-types text wai warp ];
+ testHaskellDepends = [
+ base conferer hspec http-types text wai warp
+ ];
+ description = "conferer's FromConfig instances for warp settings";
+ license = stdenv.lib.licenses.bsd3;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ }) {};
+
"confetti" = callPackage
({ mkDerivation, base, cmdargs, directory, filepath, MissingH
, tasty, tasty-hunit, tasty-smallcheck, text, time, unix, yaml
@@ -58477,16 +58642,16 @@ self: {
}) {};
"configurator-pg" = callPackage
- ({ mkDerivation, attoparsec, base, bytestring, containers, filepath
- , HUnit, protolude, scientific, test-framework
+ ({ mkDerivation, base, bytestring, containers, filepath, HUnit
+ , megaparsec, protolude, scientific, test-framework
, test-framework-hunit, text
}:
mkDerivation {
pname = "configurator-pg";
- version = "0.1.0.3";
- sha256 = "0fc77ihnablff8v0kgr88pcc3rn41ca14bvfxr21jx807fn8g63p";
+ version = "0.2.1";
+ sha256 = "0hlzh1608gcz86sh0wg1qgfz2v805hdjwga9sib1hb5cpmfc9c4j";
libraryHaskellDepends = [
- attoparsec base containers protolude scientific text
+ base containers megaparsec protolude scientific text
];
testHaskellDepends = [
base bytestring filepath HUnit protolude test-framework
@@ -59053,8 +59218,8 @@ self: {
}:
mkDerivation {
pname = "construct";
- version = "0.2";
- sha256 = "18ww9yij81js122gkp03kajkakqvkn370lcz03kfcmmc5inw0vzj";
+ version = "0.2.0.1";
+ sha256 = "1j2xc1j9f71shins5nnj0xg41k4vx2r1jgimnnlcdln2g24v71l2";
enableSeparateDataOutput = true;
setupHaskellDepends = [ base Cabal cabal-doctest ];
libraryHaskellDepends = [
@@ -66981,8 +67146,8 @@ self: {
}:
mkDerivation {
pname = "dbus";
- version = "1.2.11";
- sha256 = "150agli4ialryxcv6nd3y90pi5ikls8bn9my3fp2j5fwir27abns";
+ version = "1.2.12";
+ sha256 = "19gc1cmz8g5fmqks5rj5fwg9ihd5ras180jdv2wfgilrlrjxvx84";
libraryHaskellDepends = [
base bytestring cereal conduit containers deepseq exceptions
filepath lens network parsec random split template-haskell text
@@ -69619,6 +69784,8 @@ self: {
pname = "dhall-json";
version = "1.6.2";
sha256 = "044hq25h872rjlcp24fzf0nslxg4a6hmq8ylcljzk003lmq0c2xz";
+ revision = "1";
+ editedCabalFile = "0zljipb4nq0xmdfhqq7vr9c3966mpkd812g4z6xz7ngzrqn41s40";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [
@@ -73303,20 +73470,22 @@ self: {
}) {};
"dobutokO2" = callPackage
- ({ mkDerivation, base, directory, mmsyn3, mmsyn7s, mmsyn7ukr
- , process, vector
+ ({ mkDerivation, base, directory, mmsyn2, mmsyn3, mmsyn6ukr
+ , mmsyn7s, mmsyn7ukr, process, vector
}:
mkDerivation {
pname = "dobutokO2";
- version = "0.3.1.1";
- sha256 = "1fkyk57ckif0yk2fc1gjvla44bj2y9r5k1zms03ld001vpmkwbir";
+ version = "0.8.2.0";
+ sha256 = "1czji489jj0f18shcx4likz8l46zwvq9vabrn1wv1lyh19nnk1k8";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [
- base directory mmsyn3 mmsyn7s mmsyn7ukr process vector
+ base directory mmsyn2 mmsyn3 mmsyn6ukr mmsyn7s mmsyn7ukr process
+ vector
];
executableHaskellDepends = [
- base directory mmsyn3 mmsyn7s mmsyn7ukr process vector
+ base directory mmsyn2 mmsyn3 mmsyn6ukr mmsyn7s mmsyn7ukr process
+ vector
];
description = "A program and a library to create experimental music from a mono audio and a Ukrainian text";
license = stdenv.lib.licenses.mit;
@@ -76998,6 +77167,8 @@ self: {
pname = "egison-pattern-src-th-mode";
version = "0.2.1.0";
sha256 = "0libfs39irdnqfvynmpji21p6nyk2s3zsxhlmsz763aya51ymxpy";
+ revision = "1";
+ editedCabalFile = "13k65z8jai64087ns3b99wznv0ain3z3bailk8fdpnsjf4s2a4qg";
libraryHaskellDepends = [
base egison-pattern-src haskell-src-exts haskell-src-meta mtl
pretty template-haskell text
@@ -82537,28 +82708,30 @@ self: {
"extra" = callPackage
({ mkDerivation, base, clock, directory, filepath, process
- , QuickCheck, semigroups, time, unix
+ , QuickCheck, quickcheck-instances, semigroups, time, unix
}:
mkDerivation {
pname = "extra";
- version = "1.6.20";
- sha256 = "0bx0km3sc3irgpvz1ky334pr1fr88y2mkkniadzpn2pcrb9lxshr";
+ version = "1.6.21";
+ sha256 = "1gjx98w4w61g043k6rzc8i34cbxpcigi8lb6i7pp1vwp8w8jm5vl";
libraryHaskellDepends = [
base clock directory filepath process semigroups time unix
];
- testHaskellDepends = [ base directory filepath QuickCheck unix ];
+ testHaskellDepends = [
+ base directory filepath QuickCheck quickcheck-instances unix
+ ];
description = "Extra functions I use";
license = stdenv.lib.licenses.bsd3;
}) {};
- "extra_1_7" = callPackage
+ "extra_1_7_1" = callPackage
({ mkDerivation, base, clock, directory, filepath, process
, QuickCheck, quickcheck-instances, semigroups, time, unix
}:
mkDerivation {
pname = "extra";
- version = "1.7";
- sha256 = "1mfhgbvyvrj0z9vpbcgm5dlrys51gd8fh2qwwihxixbw12vmqd86";
+ version = "1.7.1";
+ sha256 = "0zshxv9dnd8vksncmb8dj4wvq2wdybzwxyhmy2zp6a81icm4azx4";
libraryHaskellDepends = [
base clock directory filepath process semigroups time unix
];
@@ -82739,6 +82912,21 @@ self: {
broken = true;
}) {};
+ "factor" = callPackage
+ ({ mkDerivation, arithmetic, base, opentheory-primitive, random }:
+ mkDerivation {
+ pname = "factor";
+ version = "1.0";
+ sha256 = "02fy4lnajdj0dqkz3bfpj6qzk34kjmjz6c0vidwc7kqqivhxldvh";
+ isLibrary = false;
+ isExecutable = true;
+ executableHaskellDepends = [
+ arithmetic base opentheory-primitive random
+ ];
+ description = "Factoring integers";
+ license = stdenv.lib.licenses.mit;
+ }) {};
+
"factory" = callPackage
({ mkDerivation, array, base, Cabal, containers, data-default
, deepseq, parallel, primes, QuickCheck, random, toolshed
@@ -83594,8 +83782,8 @@ self: {
}:
mkDerivation {
pname = "fay";
- version = "0.24.0.4";
- sha256 = "1jpqc48a7h9x64wv77g7bdnhvfjgbabp4n3qcbqsfz9v92j46j0a";
+ version = "0.24.0.5";
+ sha256 = "05wm3zp41xgx0s9p0wmy9rqk9ii6wcxsr3jrcqqrnlpbp90dwfxx";
isLibrary = true;
isExecutable = true;
enableSeparateDataOutput = true;
@@ -83804,6 +83992,33 @@ self: {
license = stdenv.lib.licenses.bsd3;
}) {};
+ "fb_2_1_0" = callPackage
+ ({ mkDerivation, aeson, attoparsec, base, bytestring, conduit
+ , conduit-extra, containers, cryptonite, data-default, hspec
+ , http-client, http-conduit, http-types, HUnit, memory
+ , monad-logger, QuickCheck, resourcet, text, time, transformers
+ , transformers-base, unliftio, unliftio-core, unordered-containers
+ }:
+ mkDerivation {
+ pname = "fb";
+ version = "2.1.0";
+ sha256 = "18h16dkyh35q0wyjvri7z2q2j8rx4bb6ma2bf6h2cdm7jh6zdakq";
+ libraryHaskellDepends = [
+ aeson attoparsec base bytestring conduit conduit-extra cryptonite
+ data-default http-client http-conduit http-types memory
+ monad-logger resourcet text time transformers transformers-base
+ unliftio unliftio-core unordered-containers
+ ];
+ testHaskellDepends = [
+ aeson base bytestring conduit containers data-default hspec
+ http-conduit HUnit QuickCheck resourcet text time transformers
+ unliftio
+ ];
+ description = "Bindings to Facebook's API";
+ license = stdenv.lib.licenses.bsd3;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ }) {};
+
"fb-persistent" = callPackage
({ mkDerivation, base, cereal, fb, persistent, text, time }:
mkDerivation {
@@ -85910,6 +86125,19 @@ self: {
license = stdenv.lib.licenses.mit;
}) {};
+ "first-class-families_0_8_0_0" = callPackage
+ ({ mkDerivation, base, doctest, Glob }:
+ mkDerivation {
+ pname = "first-class-families";
+ version = "0.8.0.0";
+ sha256 = "190jl3vs7glkbm8ap90x9yzlj01yzxd818s3i0w4pz21b6d6sxav";
+ libraryHaskellDepends = [ base ];
+ testHaskellDepends = [ base doctest Glob ];
+ description = "First class type families";
+ license = stdenv.lib.licenses.mit;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ }) {};
+
"first-class-instances" = callPackage
({ mkDerivation, base, Cabal, containers, hspec, hspec-discover
, template-haskell
@@ -90895,37 +91123,37 @@ self: {
}) {};
"funflow" = callPackage
- ({ mkDerivation, aeson, async, base, bytestring, clock, constraints
- , containers, contravariant, cryptonite, data-default, directory
- , exceptions, filepath, ghc-prim, Glob, hashable, hedis, hinotify
- , hostname, integer-gmp, katip, lens, lifted-async, memory
- , monad-control, mtl, network, optparse-applicative, path, path-io
- , pretty, process, random, safe-exceptions, scientific
- , sqlite-simple, stm, store, tar, tasty, tasty-hunit
- , template-haskell, temporary, text, time, transformers, unix
- , unordered-containers, vector, yaml
+ ({ mkDerivation, aeson, async, base, bytestring, cas-hashable
+ , cas-store, clock, constraints, containers, contravariant
+ , cryptonite, data-default, directory, exceptions, filepath
+ , ghc-prim, Glob, hashable, hedis, hostname, integer-gmp, katip
+ , lens, lifted-async, memory, monad-control, mtl, network
+ , optparse-applicative, path, path-io, pretty, process, profunctors
+ , random, safe-exceptions, scientific, sqlite-simple, stm, store
+ , tar, tasty, tasty-hunit, template-haskell, temporary, text, time
+ , transformers, unix, unordered-containers, vector, yaml
}:
mkDerivation {
pname = "funflow";
- version = "1.5.0";
- sha256 = "0mvv78jjiq3bglqpynl90155mwm7k8m7qv127cxi31n0xmzpw4ky";
+ version = "1.6.0";
+ sha256 = "0cwy4wiy5vr6wix5fjiw6dmy4nxyv9bbnj5w2wkhs8rdb0c34zim";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [
- aeson async base bytestring clock constraints containers
- contravariant cryptonite data-default directory exceptions filepath
- ghc-prim Glob hashable hedis hinotify hostname integer-gmp katip
- lens lifted-async memory monad-control mtl path path-io pretty
- process random safe-exceptions scientific sqlite-simple stm store
- tar template-haskell text time transformers unix
- unordered-containers vector yaml
+ aeson async base bytestring cas-hashable cas-store clock
+ constraints containers contravariant cryptonite data-default
+ directory exceptions filepath ghc-prim Glob hashable hedis hostname
+ integer-gmp katip lens lifted-async memory monad-control mtl path
+ path-io pretty process profunctors random safe-exceptions
+ scientific sqlite-simple stm store tar template-haskell text time
+ transformers unix unordered-containers vector yaml
];
executableHaskellDepends = [
- base bytestring clock hedis network optparse-applicative path
- safe-exceptions text unix
+ base bytestring cas-store clock hedis network optparse-applicative
+ path safe-exceptions text unix
];
testHaskellDepends = [
- async base containers data-default directory filepath hedis path
+ async base cas-store data-default directory filepath hedis path
path-io process random safe-exceptions tasty tasty-hunit temporary
text unix
];
@@ -91060,26 +91288,6 @@ self: {
}) {};
"fused-effects" = callPackage
- ({ mkDerivation, base, containers, gauge, hedgehog, hedgehog-fn
- , inspection-testing, markdown-unlit, mtl, tasty, tasty-hedgehog
- , tasty-hunit, transformers
- }:
- mkDerivation {
- pname = "fused-effects";
- version = "1.0.0.1";
- sha256 = "1v11m8i4ffadfiy3bxwgjcrx5z5gzxv4ciniqzv01b0jxajfkg9g";
- libraryHaskellDepends = [ base transformers ];
- testHaskellDepends = [
- base containers hedgehog hedgehog-fn inspection-testing mtl tasty
- tasty-hedgehog tasty-hunit transformers
- ];
- testToolDepends = [ markdown-unlit ];
- benchmarkHaskellDepends = [ base gauge ];
- description = "A fast, flexible, fused effect system";
- license = stdenv.lib.licenses.bsd3;
- }) {};
-
- "fused-effects_1_0_2_0" = callPackage
({ mkDerivation, base, containers, gauge, hedgehog, hedgehog-fn
, inspection-testing, markdown-unlit, mtl, tasty, tasty-hedgehog
, tasty-hunit, transformers
@@ -91097,7 +91305,6 @@ self: {
benchmarkHaskellDepends = [ base gauge ];
description = "A fast, flexible, fused effect system";
license = stdenv.lib.licenses.bsd3;
- hydraPlatforms = stdenv.lib.platforms.none;
}) {};
"fused-effects-exceptions" = callPackage
@@ -91351,8 +91558,8 @@ self: {
({ mkDerivation, base, hourglass, hspec, lens, parsec }:
mkDerivation {
pname = "fuzzy-dates";
- version = "0.1.1.1";
- sha256 = "1hanmwzr1g11am4z3r9wrkzfycvk76a03cg9bqpifidv7y9hcd73";
+ version = "0.1.1.2";
+ sha256 = "12ga6d4kp6mk6cg781ibaxxmpq7kfh8i4yg8r4awiwp1ic8lrcd9";
libraryHaskellDepends = [ base hourglass hspec lens parsec ];
testHaskellDepends = [ base hourglass hspec lens parsec ];
description = "Libary for parsing dates in strings in varied formats";
@@ -94771,6 +94978,26 @@ self: {
license = stdenv.lib.licenses.bsd3;
}) {};
+ "ghc-lib-parser-ex_8_8_5_5" = callPackage
+ ({ mkDerivation, base, bytestring, containers, directory, extra
+ , filepath, ghc, ghc-boot, ghc-boot-th, tasty, tasty-hunit
+ , uniplate
+ }:
+ mkDerivation {
+ pname = "ghc-lib-parser-ex";
+ version = "8.8.5.5";
+ sha256 = "15rp1829zzppz3y014cac1ssmklssn5hsfvadqrzkzmnky2yr215";
+ libraryHaskellDepends = [
+ base bytestring containers extra ghc ghc-boot ghc-boot-th uniplate
+ ];
+ testHaskellDepends = [
+ base directory extra filepath ghc ghc-boot-th tasty tasty-hunit
+ ];
+ description = "Algorithms on GHC parse trees";
+ license = stdenv.lib.licenses.bsd3;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ }) {};
+
"ghc-make" = callPackage
({ mkDerivation, base, process, shake, unordered-containers }:
mkDerivation {
@@ -95191,14 +95418,19 @@ self: {
"ghc-tags-plugin" = callPackage
({ mkDerivation, attoparsec, base, bytestring, containers
- , directory, ghc, gitrev
+ , directory, filepath, ghc, lattices, QuickCheck
+ , quickcheck-instances, tasty, tasty-golden, tasty-quickcheck, text
}:
mkDerivation {
pname = "ghc-tags-plugin";
- version = "0.1.1.0";
- sha256 = "1bwv5sda0lihc0f0blxgs4j730kd31p9djk8wxyf8qiqdlsp2afa";
+ version = "0.1.4.0";
+ sha256 = "0ci82krwqiprh23p316n1k09z6ja962xscnx9ycqpsyywbgkcqk4";
libraryHaskellDepends = [
- attoparsec base bytestring containers directory ghc gitrev
+ attoparsec base bytestring containers directory filepath ghc text
+ ];
+ testHaskellDepends = [
+ attoparsec base bytestring lattices QuickCheck quickcheck-instances
+ tasty tasty-golden tasty-quickcheck text
];
doHaddock = false;
description = "A compiler plugin which generates tags file from GHC syntax tree";
@@ -95283,6 +95515,30 @@ self: {
license = stdenv.lib.licenses.bsd2;
}) {};
+ "ghc-typelits-extra_0_4" = callPackage
+ ({ mkDerivation, base, containers, ghc, ghc-prim
+ , ghc-tcplugins-extra, ghc-typelits-knownnat
+ , ghc-typelits-natnormalise, integer-gmp, tasty, tasty-hunit
+ , transformers
+ }:
+ mkDerivation {
+ pname = "ghc-typelits-extra";
+ version = "0.4";
+ sha256 = "0511vpwn8hz1hvn58g49l95iqcgqr8l8bqy5qwijy2bzad2nhcbg";
+ libraryHaskellDepends = [
+ base containers ghc ghc-prim ghc-tcplugins-extra
+ ghc-typelits-knownnat ghc-typelits-natnormalise integer-gmp
+ transformers
+ ];
+ testHaskellDepends = [
+ base ghc-typelits-knownnat ghc-typelits-natnormalise tasty
+ tasty-hunit
+ ];
+ description = "Additional type-level operations on GHC.TypeLits.Nat";
+ license = stdenv.lib.licenses.bsd2;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ }) {};
+
"ghc-typelits-knownnat" = callPackage
({ mkDerivation, base, ghc, ghc-prim, ghc-tcplugins-extra
, ghc-typelits-natnormalise, tasty, tasty-hunit, tasty-quickcheck
@@ -95321,6 +95577,25 @@ self: {
license = stdenv.lib.licenses.bsd2;
}) {};
+ "ghc-typelits-natnormalise_0_7_2" = callPackage
+ ({ mkDerivation, base, containers, ghc, ghc-tcplugins-extra
+ , integer-gmp, syb, tasty, tasty-hunit, template-haskell
+ , transformers
+ }:
+ mkDerivation {
+ pname = "ghc-typelits-natnormalise";
+ version = "0.7.2";
+ sha256 = "1hk2f2vqkpia7kv7pqwf942y1w9m7mvmikzabkrjp8f8gijcsk52";
+ libraryHaskellDepends = [
+ base containers ghc ghc-tcplugins-extra integer-gmp syb
+ transformers
+ ];
+ testHaskellDepends = [ base tasty tasty-hunit template-haskell ];
+ description = "GHC typechecker plugin for types of kind GHC.TypeLits.Nat";
+ license = stdenv.lib.licenses.bsd2;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ }) {};
+
"ghc-typelits-presburger" = callPackage
({ mkDerivation, base, containers, ghc, ghc-tcplugins-extra, mtl
, pretty, reflection, syb, transformers
@@ -95581,6 +95856,33 @@ self: {
license = stdenv.lib.licenses.bsd3;
}) {};
+ "ghcid_0_8_3" = callPackage
+ ({ mkDerivation, ansi-terminal, base, cmdargs, containers
+ , directory, extra, filepath, fsnotify, process, tasty, tasty-hunit
+ , terminal-size, time, unix
+ }:
+ mkDerivation {
+ pname = "ghcid";
+ version = "0.8.3";
+ sha256 = "1b8a8mx6z2ridw79gijjv90b2jgk0qrncvg0sjbmvyyyajx1h5f7";
+ isLibrary = true;
+ isExecutable = true;
+ libraryHaskellDepends = [
+ ansi-terminal base cmdargs directory extra filepath process time
+ ];
+ executableHaskellDepends = [
+ ansi-terminal base cmdargs containers directory extra filepath
+ fsnotify process terminal-size time unix
+ ];
+ testHaskellDepends = [
+ ansi-terminal base cmdargs containers directory extra filepath
+ fsnotify process tasty tasty-hunit terminal-size time unix
+ ];
+ description = "GHCi based bare bones IDE";
+ license = stdenv.lib.licenses.bsd3;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ }) {};
+
"ghcide" = callPackage
({ mkDerivation, aeson, async, base, binary, bytestring, containers
, data-default, deepseq, directory, extra, filepath, fuzzy, ghc
@@ -97277,8 +97579,8 @@ self: {
}:
mkDerivation {
pname = "git-annex";
- version = "8.20200226";
- sha256 = "09v80ni1w9z1im79lzrnpz7xlivwna44zqpwq4axwyd17cffqi9m";
+ version = "8.20200309";
+ sha256 = "1yjb01jh5rccqg44nqh4iyxmbpkcpm6m82lnw7s0s2vizj8891p5";
configureFlags = [
"-fassistant" "-f-benchmark" "-fdbus" "-f-debuglocks" "-fmagicmime"
"-fnetworkbsd" "-fpairing" "-fproduction" "-fs3" "-ftorrentparser"
@@ -97905,29 +98207,6 @@ self: {
}) {};
"github-rest" = callPackage
- ({ mkDerivation, aeson, aeson-qq, base, bytestring, http-client
- , http-client-tls, http-types, jwt, mtl, scientific, tasty
- , tasty-golden, tasty-hunit, tasty-quickcheck, text, time
- , transformers, unliftio, unliftio-core
- }:
- mkDerivation {
- pname = "github-rest";
- version = "1.0.1";
- sha256 = "0dv959xmfpwbkjnjkisgxldkb89ln0wypz4cb65biijqfw0i4399";
- libraryHaskellDepends = [
- aeson base bytestring http-client http-client-tls http-types jwt
- mtl scientific text time transformers unliftio unliftio-core
- ];
- testHaskellDepends = [
- aeson aeson-qq base bytestring http-client http-client-tls
- http-types jwt mtl scientific tasty tasty-golden tasty-hunit
- tasty-quickcheck text time transformers unliftio unliftio-core
- ];
- description = "Query the GitHub REST API programmatically";
- license = stdenv.lib.licenses.bsd3;
- }) {};
-
- "github-rest_1_0_2" = callPackage
({ mkDerivation, aeson, aeson-qq, base, bytestring, http-client
, http-client-tls, http-types, jwt, mtl, scientific, tasty
, tasty-golden, tasty-hunit, tasty-quickcheck, text, time
@@ -97948,7 +98227,6 @@ self: {
];
description = "Query the GitHub REST API programmatically";
license = stdenv.lib.licenses.bsd3;
- hydraPlatforms = stdenv.lib.platforms.none;
}) {};
"github-tools" = callPackage
@@ -98167,22 +98445,6 @@ self: {
}) {};
"gitlab-haskell" = callPackage
- ({ mkDerivation, aeson, base, bytestring, connection, http-conduit
- , http-types, text, time, transformers, unliftio, unliftio-core
- }:
- mkDerivation {
- pname = "gitlab-haskell";
- version = "0.1.5";
- sha256 = "01wll1aik3x9bj5z29h12srj7skyqk6v1g4rvrd86zd9zvxqr6cw";
- libraryHaskellDepends = [
- aeson base bytestring connection http-conduit http-types text time
- transformers unliftio unliftio-core
- ];
- description = "A Haskell library for the GitLab web API";
- license = stdenv.lib.licenses.bsd3;
- }) {};
-
- "gitlab-haskell_0_1_7" = callPackage
({ mkDerivation, aeson, base, bytestring, connection, http-conduit
, http-types, text, time, transformers, unliftio, unliftio-core
}:
@@ -98196,7 +98458,6 @@ self: {
];
description = "A Haskell library for the GitLab web API";
license = stdenv.lib.licenses.bsd3;
- hydraPlatforms = stdenv.lib.platforms.none;
}) {};
"gitlib" = callPackage
@@ -98848,6 +99109,8 @@ self: {
pname = "glirc";
version = "2.35";
sha256 = "093cqbvqijjy6xd0fzas13ldrsf9kg59jak88qzl5kks7z9djl0f";
+ revision = "1";
+ editedCabalFile = "14kgfgqyfw5vcm77n5iljxw5n28iclc1hpvi44x4vhrnmfpmq62v";
isLibrary = true;
isExecutable = true;
setupHaskellDepends = [ base Cabal filepath ];
@@ -107743,10 +108006,8 @@ self: {
}:
mkDerivation {
pname = "hakyll";
- version = "4.13.1.0";
- sha256 = "14l85n69zsczyw2fs8kjnnmkl4gk85xj3f4alfa7604nnmic9mvn";
- revision = "1";
- editedCabalFile = "0vbs0y4niirmwcc2r59pbzl33s4qzpdlslvigyb6adf6r79di1r9";
+ version = "4.13.2.0";
+ sha256 = "0g52lip9i6zanjja0v86v5sypjvnfpfwzzddrpj04pml733nsnfj";
isLibrary = true;
isExecutable = true;
enableSeparateDataOutput = true;
@@ -117398,6 +117659,8 @@ self: {
pname = "hedn";
version = "0.3.0.0";
sha256 = "1gx8bw2l1qpb4jgh5d1zzgfm2rnwavg5shmp4wq2mqrih11r3f3y";
+ revision = "1";
+ editedCabalFile = "1bpd4dd8afccj2bakqqbimmd3ja9i21q9k98vmzw37ishbd3xync";
libraryHaskellDepends = [
base containers deepseq deriving-compat megaparsec
parser-combinators prettyprinter scientific template-haskell text
@@ -119697,6 +119960,8 @@ self: {
pname = "hie-bios";
version = "0.4.0";
sha256 = "1pa8wjj6sml39371f355z46304jzzwpcr62q0qzrpqq8w9017241";
+ revision = "1";
+ editedCabalFile = "12m0hy4lirnr02h0nh2a85cfm8jv7jgqh24fdn29jkc28gpspm72";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [
@@ -121484,8 +121749,8 @@ self: {
}:
mkDerivation {
pname = "hledger-flow";
- version = "0.13.1.0";
- sha256 = "1ixfsndl2has2pmq5vrf59z96j0pqaa8y8wk61rzjdh9cn62i3jj";
+ version = "0.13.2.0";
+ sha256 = "1zajlqbayr6vm45y3901xwgg6acjn8fwx73mm9bnbsbxfzxn4g7d";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [
@@ -121922,8 +122187,8 @@ self: {
}:
mkDerivation {
pname = "hlrdb-core";
- version = "0.1.5.0";
- sha256 = "0aznzrwv021nppb5cxbpnr7hiajny4s40diz6kcmddsbml56xmk9";
+ version = "0.1.6.0";
+ sha256 = "13hb0657y5cqhbl2m27v28b6zl9mgcq17r983rds3l3bccn67ayv";
libraryHaskellDepends = [
base bytestring hashable hedis lens mtl profunctors random time
unordered-containers
@@ -122750,18 +123015,19 @@ self: {
({ mkDerivation, base, base16-bytestring, base64-bytestring, binary
, bytestring, containers, cryptohash-md5, cryptohash-sha1
, cryptohash-sha256, directory, filepath, hashable, mtl, process
- , regex-base, regex-tdfa-text, tasty, tasty-discover, tasty-hspec
- , tasty-hunit, tasty-quickcheck, temporary, text, unix
- , unordered-containers, vector
+ , regex-base, regex-tdfa, saltine, tasty, tasty-discover
+ , tasty-hspec, tasty-hunit, tasty-quickcheck, temporary, text, time
+ , unix, unordered-containers, vector
}:
mkDerivation {
pname = "hnix-store-core";
- version = "0.1.0.0";
- sha256 = "1xrx3ly6qsh3j6naqxdv9v759fbmksd2yfdgnzppcnskrcfrm347";
+ version = "0.2.0.0";
+ sha256 = "1gy808dzaq2jjy1xdhf3vjxzprlzn9mmbxc554sa03v8f9hc0r7h";
libraryHaskellDepends = [
base base16-bytestring binary bytestring containers cryptohash-md5
cryptohash-sha1 cryptohash-sha256 directory filepath hashable mtl
- regex-base regex-tdfa-text text unix unordered-containers vector
+ regex-base regex-tdfa saltine text time unix unordered-containers
+ vector
];
testHaskellDepends = [
base base64-bytestring binary bytestring containers directory
@@ -123328,6 +123594,30 @@ self: {
license = stdenv.lib.licenses.bsd3;
}) {};
+ "holmes" = callPackage
+ ({ mkDerivation, base, containers, hashable, hedgehog, hspec
+ , logict, markdown-unlit, mtl, primitive, relude, split, tasty
+ , tasty-discover, tasty-hedgehog, tasty-hspec, transformers
+ , unordered-containers
+ }:
+ mkDerivation {
+ pname = "holmes";
+ version = "0.2.0.0";
+ sha256 = "13x48fvjfvh65c9cz3b81hk7ka43i0zz7gih7v3jpjwq0s7hqic8";
+ libraryHaskellDepends = [
+ base containers hashable hedgehog logict mtl primitive transformers
+ unordered-containers
+ ];
+ testHaskellDepends = [
+ base containers hashable hedgehog hspec primitive relude split
+ tasty tasty-discover tasty-hedgehog tasty-hspec transformers
+ unordered-containers
+ ];
+ testToolDepends = [ markdown-unlit tasty-discover ];
+ description = "Tools and combinators for solving constraint problems";
+ license = stdenv.lib.licenses.mit;
+ }) {};
+
"holy-project" = callPackage
({ mkDerivation, aeson, ansi-terminal, base, bytestring, Cabal
, directory, filepath, hastache, http-conduit, HUnit, lens
@@ -129223,8 +129513,8 @@ self: {
}:
mkDerivation {
pname = "hspec-snap";
- version = "1.0.1.0";
- sha256 = "0r7isf3vi8mc6h50s6n8cbmvbdmklk3v8d7wwb1ikzjl4izhimkn";
+ version = "1.0.2.0";
+ sha256 = "1rqqyrnny5wk4xql1ddavq72qcvdhblm7ga8728i42v14n6z80i4";
libraryHaskellDepends = [
aeson base bytestring containers digestive-functors HandsomeSoup
hspec hspec-core HUnit hxt lens mtl snap snap-core text
@@ -130257,15 +130547,15 @@ self: {
}) {};
"hsyslog-udp" = callPackage
- ({ mkDerivation, base, bytestring, hspec, hsyslog, network, text
- , time, unix
+ ({ mkDerivation, base, bytestring, hspec, hsyslog, network
+ , network-bsd, text, time, unix
}:
mkDerivation {
pname = "hsyslog-udp";
- version = "0.2.4";
- sha256 = "1xahxchr1il9naf8kdwdbh1sy5vv4afqkcxfy4993nsk5j7zs586";
+ version = "0.2.5";
+ sha256 = "02n2l9fl926di21w01qhqn3f39hnm6nqc7kn0af1f89qncpbxl5d";
libraryHaskellDepends = [
- base bytestring hsyslog network text time unix
+ base bytestring hsyslog network network-bsd text time unix
];
testHaskellDepends = [ base hspec time ];
description = "Log to syslog over a network via UDP";
@@ -131010,6 +131300,34 @@ self: {
license = stdenv.lib.licenses.mit;
}) {};
+ "http-client_0_6_4_1" = callPackage
+ ({ mkDerivation, array, async, base, blaze-builder, bytestring
+ , case-insensitive, containers, cookie, deepseq, directory
+ , exceptions, filepath, ghc-prim, hspec, http-types, memory
+ , mime-types, monad-control, network, network-uri, random, stm
+ , streaming-commons, text, time, transformers, zlib
+ }:
+ mkDerivation {
+ pname = "http-client";
+ version = "0.6.4.1";
+ sha256 = "1y12xfh6xvsfvyapbssmgrpjz025rmyccprbnmzhs0y1cmlz6hjp";
+ libraryHaskellDepends = [
+ array base blaze-builder bytestring case-insensitive containers
+ cookie deepseq exceptions filepath ghc-prim http-types memory
+ mime-types network network-uri random stm streaming-commons text
+ time transformers
+ ];
+ testHaskellDepends = [
+ async base blaze-builder bytestring case-insensitive containers
+ deepseq directory hspec http-types monad-control network
+ network-uri streaming-commons text time transformers zlib
+ ];
+ doCheck = false;
+ description = "An HTTP client engine";
+ license = stdenv.lib.licenses.mit;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ }) {};
+
"http-client-auth" = callPackage
({ mkDerivation, base, base64-string, blaze-builder, bytestring
, case-insensitive, conduit, crypto-conduit, http-client
@@ -131387,6 +131705,26 @@ self: {
broken = true;
}) {};
+ "http-directory_0_1_8" = callPackage
+ ({ mkDerivation, base, bytestring, hspec, html-conduit, http-client
+ , http-client-tls, http-date, http-types, network-uri, text, time
+ , xml-conduit
+ }:
+ mkDerivation {
+ pname = "http-directory";
+ version = "0.1.8";
+ sha256 = "0sav7z5vdda6zq1xyhvrqwh3kdn1bnpmwlhiaxr3sb1npz3hjgcn";
+ libraryHaskellDepends = [
+ base bytestring html-conduit http-client http-client-tls http-date
+ http-types network-uri text time xml-conduit
+ ];
+ testHaskellDepends = [ base hspec text ];
+ description = "http directory listing library";
+ license = stdenv.lib.licenses.mit;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ broken = true;
+ }) {};
+
"http-dispatch" = callPackage
({ mkDerivation, aeson, base, base64-bytestring, bytestring
, case-insensitive, hspec, http-client, http-client-tls, http-types
@@ -133012,8 +133350,8 @@ self: {
}:
mkDerivation {
pname = "hw-balancedparens";
- version = "0.3.0.4";
- sha256 = "1f25czr55c8fsb1l2ljfr93x2fp888g78ngf45xampnr6m3468j3";
+ version = "0.3.0.5";
+ sha256 = "0mc1qxng09891rpdw8g6cbx61b7pvvd7v4jm3ngzi5byamm0sbxp";
libraryHaskellDepends = [
base deepseq hedgehog hspec hw-bits hw-excess hw-fingertree hw-prim
hw-rankselect-base vector
@@ -133032,29 +133370,6 @@ self: {
}) {};
"hw-bits" = callPackage
- ({ mkDerivation, base, bitvec, bytestring, criterion, deepseq
- , hedgehog, hspec, hspec-discover, hw-hspec-hedgehog, hw-int
- , hw-prim, hw-string-parse, vector
- }:
- mkDerivation {
- pname = "hw-bits";
- version = "0.7.1.0";
- sha256 = "0r4jinz2h5zkjap6f6qrjgfq6xhaz3j34fjwawv8qvgc4qgq7bil";
- libraryHaskellDepends = [
- base bitvec bytestring deepseq hw-int hw-prim hw-string-parse
- vector
- ];
- testHaskellDepends = [
- base bitvec bytestring hedgehog hspec hw-hspec-hedgehog hw-prim
- vector
- ];
- testToolDepends = [ hspec-discover ];
- benchmarkHaskellDepends = [ base criterion vector ];
- description = "Bit manipulation";
- license = stdenv.lib.licenses.bsd3;
- }) {};
-
- "hw-bits_0_7_1_2" = callPackage
({ mkDerivation, base, bitvec, bytestring, criterion, deepseq
, doctest, doctest-discover, hedgehog, hspec, hspec-discover
, hw-hspec-hedgehog, hw-int, hw-prim, hw-string-parse, vector
@@ -133075,6 +133390,29 @@ self: {
benchmarkHaskellDepends = [ base criterion vector ];
description = "Bit manipulation";
license = stdenv.lib.licenses.bsd3;
+ }) {};
+
+ "hw-bits_0_7_1_5" = callPackage
+ ({ mkDerivation, base, bitvec, bytestring, criterion, deepseq
+ , doctest, doctest-discover, hedgehog, hspec, hspec-discover
+ , hw-hspec-hedgehog, hw-int, hw-prim, hw-string-parse, vector
+ }:
+ mkDerivation {
+ pname = "hw-bits";
+ version = "0.7.1.5";
+ sha256 = "0gvbsnirlgsj58363zqg960j0ydx2bhgw4lwql71jf9kg7hd4kqb";
+ libraryHaskellDepends = [
+ base bitvec bytestring deepseq hw-int hw-prim hw-string-parse
+ vector
+ ];
+ testHaskellDepends = [
+ base bitvec bytestring doctest doctest-discover hedgehog hspec
+ hw-hspec-hedgehog hw-prim vector
+ ];
+ testToolDepends = [ doctest-discover hspec-discover ];
+ benchmarkHaskellDepends = [ base criterion vector ];
+ description = "Bit manipulation";
+ license = stdenv.lib.licenses.bsd3;
hydraPlatforms = stdenv.lib.platforms.none;
}) {};
@@ -133903,8 +134241,8 @@ self: {
}:
mkDerivation {
pname = "hw-uri";
- version = "0.2.0.1";
- sha256 = "1i42l5jg06xlfbplibxx8104w1x61yixbv7w3l1fs0q06zzxaiqp";
+ version = "0.2.1.0";
+ sha256 = "1bwdzvms0n86k7gbkhk0jj3m1pcc9vbjk13kgpchqxpxm971srbs";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [
@@ -135492,8 +135830,8 @@ self: {
}:
mkDerivation {
pname = "icepeak";
- version = "0.7.1.0";
- sha256 = "1mw6ydcmp7q3qqqv0s86h3vahvsh9nzfi8d0yfwf8ywp6lzwhxfv";
+ version = "0.7.2.0";
+ sha256 = "0vs2lfwqxss2f4ajzj4pqzr5mxk69hs0jl4kz7y2qn7161x4vcd2";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [
@@ -137349,6 +137687,29 @@ self: {
license = stdenv.lib.licenses.gpl3;
}) {};
+ "incremental-parser_0_4_0_1" = callPackage
+ ({ mkDerivation, base, bytestring, checkers, criterion, deepseq
+ , monoid-subclasses, parsers, QuickCheck, rank2classes, tasty
+ , tasty-quickcheck, text, transformers
+ }:
+ mkDerivation {
+ pname = "incremental-parser";
+ version = "0.4.0.1";
+ sha256 = "1cghkzdsh8vjv1ggk5qjr5ny88wna5kbifbfsy1ld5n5k66536lf";
+ libraryHaskellDepends = [
+ base monoid-subclasses parsers rank2classes transformers
+ ];
+ testHaskellDepends = [
+ base checkers monoid-subclasses QuickCheck tasty tasty-quickcheck
+ ];
+ benchmarkHaskellDepends = [
+ base bytestring criterion deepseq monoid-subclasses text
+ ];
+ description = "Generic parser library capable of providing partial results from partial input";
+ license = stdenv.lib.licenses.gpl3;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ }) {};
+
"incremental-sat-solver" = callPackage
({ mkDerivation, base, containers, mtl }:
mkDerivation {
@@ -139199,6 +139560,8 @@ self: {
pname = "intro";
version = "0.6.0.1";
sha256 = "1kka6dnlyqppjx9ykk3zixfyslr8cf4ja6sa2hgq6h69mmsicp67";
+ revision = "1";
+ editedCabalFile = "1jxd4agavzccgszniqzakgpb6b49qx5c20asr068rpvaf03msncx";
libraryHaskellDepends = [
base bytestring containers deepseq dlist extra hashable mtl safe
text transformers unordered-containers writer-cps-mtl
@@ -151327,8 +151690,8 @@ self: {
}:
mkDerivation {
pname = "libarchive";
- version = "2.2.3.0";
- sha256 = "0vnby3clfx3rqs6gw8l55nhdns47my0ihc9l4k5zmy1bvdhywy6y";
+ version = "2.2.4.0";
+ sha256 = "05d16ckk6iaj75zarqq6hjjmmb2xdd62hcyidfya3jfkw74zh1rp";
setupHaskellDepends = [ base Cabal chs-cabal ];
libraryHaskellDepends = [
base bytestring composition-prelude deepseq dlist filepath mtl
@@ -153203,8 +153566,8 @@ self: {
}:
mkDerivation {
pname = "lingo";
- version = "0.3.1.0";
- sha256 = "0bx3hf0lpi05w2ky0pkak39lhbpqyy8nahyk5j6z8ivi7fpm3p4s";
+ version = "0.3.2.0";
+ sha256 = "0qym6svpvxsxbhbppk0lkpp2zbqa13f0njkxnpyz5id581c3v8hx";
setupHaskellDepends = [
base bytestring Cabal containers directory filepath text yaml
];
@@ -157291,8 +157654,8 @@ self: {
}:
mkDerivation {
pname = "lz4-bytes";
- version = "0.1.0.0";
- sha256 = "02lc1ka16vfwljsh1ybp4cn39rpgiwp38qj1ayr77ha3nhjzr9z0";
+ version = "0.1.0.2";
+ sha256 = "1h0rfc273jszv3c83izkr7v8x7zqikbayf20yhahj2fl129ar362";
libraryHaskellDepends = [ base byteslice primitive run-st ];
testHaskellDepends = [
base byteslice primitive tasty tasty-quickcheck
@@ -157329,17 +157692,19 @@ self: {
}) {};
"lz4-hs" = callPackage
- ({ mkDerivation, base, bytestring, c2hs, filepath, tasty
+ ({ mkDerivation, base, bytestring, c2hs, criterion, filepath, tasty
, tasty-hunit, temporary
}:
mkDerivation {
pname = "lz4-hs";
- version = "0.1.1.0";
- sha256 = "12wcjfqbzh4myyxbnwlf3kddis8h0cgar62gjw7srrfa2025vmc7";
+ version = "0.1.3.0";
+ sha256 = "0yx1njh0zwk2qk99ip1f2wlcy3ql35piqbvd6dppr2hwnm5bh1mk";
libraryHaskellDepends = [ base bytestring ];
libraryToolDepends = [ c2hs ];
testHaskellDepends = [ base bytestring tasty tasty-hunit ];
- benchmarkHaskellDepends = [ base bytestring filepath temporary ];
+ benchmarkHaskellDepends = [
+ base bytestring criterion filepath temporary
+ ];
description = "lz4 bindings for Haskell";
license = stdenv.lib.licenses.bsd3;
}) {};
@@ -157520,6 +157885,26 @@ self: {
broken = true;
}) {};
+ "macaroon-shop" = callPackage
+ ({ mkDerivation, base, bytes, bytestring, cereal, containers
+ , cryptonite, hedgehog, memory, saltine, transformers
+ }:
+ mkDerivation {
+ pname = "macaroon-shop";
+ version = "0.1.0.0";
+ sha256 = "087b83l3bdx1mk79bxqcwckbjdz7idi0m73dcrjiv5b4q5rjr8rs";
+ libraryHaskellDepends = [
+ base bytes bytestring cereal containers cryptonite memory saltine
+ transformers
+ ];
+ testHaskellDepends = [
+ base bytes bytestring cereal containers cryptonite hedgehog memory
+ saltine transformers
+ ];
+ description = "A toolkit for working with macaroons";
+ license = stdenv.lib.licenses.isc;
+ }) {};
+
"macbeth-lib" = callPackage
({ mkDerivation, attoparsec, base, bytestring, conduit
, conduit-extra, containers, directory, either-unwrap, filepath
@@ -159640,31 +160025,6 @@ self: {
}) {};
"massiv-io" = callPackage
- ({ mkDerivation, base, bytestring, Cabal, cabal-doctest, Color
- , data-default-class, deepseq, doctest, exceptions, filepath, hspec
- , JuicyPixels, massiv, massiv-test, netpbm, QuickCheck, random
- , template-haskell, unliftio, vector
- }:
- mkDerivation {
- pname = "massiv-io";
- version = "0.2.0.0";
- sha256 = "1gypn2srqsnzmx1jd28632w34n7z4x5wadi4m7srxdhwk14vqg2m";
- revision = "1";
- editedCabalFile = "0kg2k84r5sxbg5pjjva639l0h1c4nhahmy1iakwmczkxjnzh6f8a";
- setupHaskellDepends = [ base Cabal cabal-doctest ];
- libraryHaskellDepends = [
- base bytestring Color data-default-class deepseq exceptions
- filepath JuicyPixels massiv netpbm unliftio vector
- ];
- testHaskellDepends = [
- base bytestring doctest hspec JuicyPixels massiv massiv-test
- QuickCheck random template-haskell
- ];
- description = "Import/export of Image files into massiv Arrays";
- license = stdenv.lib.licenses.bsd3;
- }) {};
-
- "massiv-io_0_2_1_0" = callPackage
({ mkDerivation, base, bytestring, Cabal, cabal-doctest, Color
, data-default-class, deepseq, doctest, exceptions, filepath, hspec
, JuicyPixels, massiv, massiv-test, netpbm, QuickCheck, random
@@ -159685,7 +160045,6 @@ self: {
];
description = "Import/export of Image files into massiv Arrays";
license = stdenv.lib.licenses.bsd3;
- hydraPlatforms = stdenv.lib.platforms.none;
}) {};
"massiv-scheduler" = callPackage
@@ -160263,8 +160622,8 @@ self: {
}:
mkDerivation {
pname = "matterhorn";
- version = "50200.6.0";
- sha256 = "0b8qsd2w324sxmp3cgnz7fzlbhk5nz6slw8qxxm5dpy0bs5v7xnb";
+ version = "50200.7.0";
+ sha256 = "08ynlxqdb2mr7si0q7747pd1x9v9s7jmq2q75bqhzl44rpjhh4dv";
isLibrary = false;
isExecutable = true;
enableSeparateDataOutput = true;
@@ -160300,8 +160659,8 @@ self: {
}:
mkDerivation {
pname = "mattermost-api";
- version = "50200.3.0";
- sha256 = "1d5nxaf382lzsr05rcby9w8y726bsda29w46b96p89whfbq8s9h3";
+ version = "50200.4.0";
+ sha256 = "0nl3xsw90rg08hmipr0d80h7ss68mlyaawagkiv2gj4qjlb2lqcn";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [
@@ -160324,8 +160683,8 @@ self: {
}:
mkDerivation {
pname = "mattermost-api-qc";
- version = "50200.3.0";
- sha256 = "14111sq1k7iw8yy050805x0m80i9mixgxaqkl15gm0pvm4ap5ycd";
+ version = "50200.4.0";
+ sha256 = "1lxr3xfvc4qg1n1wxqz1bv4ac12xiwnk79i53w2gx2xks6rdpibj";
libraryHaskellDepends = [
base containers mattermost-api QuickCheck text time
];
@@ -163178,8 +163537,8 @@ self: {
}:
mkDerivation {
pname = "minilight";
- version = "0.4.2";
- sha256 = "0bs4ix1yazq660jn9yz3yyfxx6scj2dgy37n13461l7ax1y9xp7s";
+ version = "0.4.3";
+ sha256 = "1qsmrb6bfwrv302pmm26nkkfky10h0mdkflvj3lfjmnz0bv7aw4g";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [
@@ -163214,22 +163573,6 @@ self: {
}) {};
"minimorph" = callPackage
- ({ mkDerivation, base, HUnit, test-framework, test-framework-hunit
- , text
- }:
- mkDerivation {
- pname = "minimorph";
- version = "0.2.1.0";
- sha256 = "1phpsd0j8c987sw99p4hyywr4ydcxf5aq4h6xqdl3acwi0dv4zhj";
- libraryHaskellDepends = [ base text ];
- testHaskellDepends = [
- base HUnit test-framework test-framework-hunit text
- ];
- description = "English spelling functions with an emphasis on simplicity";
- license = stdenv.lib.licenses.bsd3;
- }) {};
-
- "minimorph_0_2_2_0" = callPackage
({ mkDerivation, base, HUnit, test-framework, test-framework-hunit
, text
}:
@@ -163243,7 +163586,6 @@ self: {
];
description = "English spelling functions with an emphasis on simplicity";
license = stdenv.lib.licenses.bsd3;
- hydraPlatforms = stdenv.lib.platforms.none;
}) {};
"minimung" = callPackage
@@ -163430,23 +163772,6 @@ self: {
}) {};
"miniutter" = callPackage
- ({ mkDerivation, base, binary, containers, HUnit, minimorph
- , test-framework, test-framework-hunit, text
- }:
- mkDerivation {
- pname = "miniutter";
- version = "0.5.0.0";
- sha256 = "0hgsk54s07497rsgsck8lhpfbrxavx1chq90hsw14w3ggr1xnc7f";
- enableSeparateDataOutput = true;
- libraryHaskellDepends = [ base binary containers minimorph text ];
- testHaskellDepends = [
- base containers HUnit test-framework test-framework-hunit text
- ];
- description = "Simple English clause creation from arbitrary words";
- license = stdenv.lib.licenses.bsd3;
- }) {};
-
- "miniutter_0_5_1_0" = callPackage
({ mkDerivation, base, binary, containers, HUnit, minimorph
, test-framework, test-framework-hunit, text
}:
@@ -163461,7 +163786,6 @@ self: {
];
description = "Simple English clause creation from arbitrary words";
license = stdenv.lib.licenses.bsd3;
- hydraPlatforms = stdenv.lib.platforms.none;
}) {};
"minlen" = callPackage
@@ -164192,8 +164516,8 @@ self: {
}:
mkDerivation {
pname = "mmsyn7h";
- version = "0.7.2.0";
- sha256 = "10mmc9gaq4wg9ixs1fwi7ga41lpiih5xx2w278fv6nli0p7flx3j";
+ version = "0.7.5.0";
+ sha256 = "17haan991lzs5qs4gzywhk4vpn9dvgasdm9ff8hzs5h6a0604sfn";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [
@@ -164226,8 +164550,8 @@ self: {
({ mkDerivation, base, mmsyn2, mmsyn5, mmsyn6ukr, vector }:
mkDerivation {
pname = "mmsyn7s";
- version = "0.6.5.1";
- sha256 = "0n5d3a3sscvasssi38nlbflqibjca2s95b6xyfmdwqn1n95bs6cy";
+ version = "0.6.6.0";
+ sha256 = "0hmsf7l3p2b2zj5ydjzxzkgqsj53yjwn71vgw8qzhbxjihk5x6l2";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [ base mmsyn2 mmsyn5 mmsyn6ukr vector ];
@@ -165281,27 +165605,6 @@ self: {
}) {};
"monad-logger" = callPackage
- ({ mkDerivation, base, bytestring, conduit, conduit-extra
- , exceptions, fast-logger, lifted-base, monad-control, monad-loops
- , mtl, resourcet, stm, stm-chans, template-haskell, text
- , transformers, transformers-base, transformers-compat
- , unliftio-core
- }:
- mkDerivation {
- pname = "monad-logger";
- version = "0.3.31";
- sha256 = "0awr06bh5d51kci2w2xsj34qvh98sb6dm48a4k05k8awv8hrrpmd";
- libraryHaskellDepends = [
- base bytestring conduit conduit-extra exceptions fast-logger
- lifted-base monad-control monad-loops mtl resourcet stm stm-chans
- template-haskell text transformers transformers-base
- transformers-compat unliftio-core
- ];
- description = "A class of monads which can log messages";
- license = stdenv.lib.licenses.mit;
- }) {};
-
- "monad-logger_0_3_32" = callPackage
({ mkDerivation, base, bytestring, conduit, conduit-extra
, exceptions, fast-logger, lifted-base, monad-control, monad-loops
, mtl, resourcet, stm, stm-chans, template-haskell, text
@@ -165320,7 +165623,6 @@ self: {
];
description = "A class of monads which can log messages";
license = stdenv.lib.licenses.mit;
- hydraPlatforms = stdenv.lib.platforms.none;
}) {};
"monad-logger-json" = callPackage
@@ -173055,18 +173357,18 @@ self: {
({ mkDerivation, async, base, binary, binary-conduit, bytestring
, conduit, conduit-extra, data-default-class
, data-default-instances-base, data-msgpack, data-msgpack-types
- , exceptions, hspec, MissingH, monad-control, mtl, network, tagged
- , text
+ , exceptions, hspec, monad-control, mtl, network, tagged, text
+ , unliftio-core
}:
mkDerivation {
pname = "network-msgpack-rpc";
- version = "0.0.5";
- sha256 = "0lrlq5amcgg84ja2wjxkqm9llsbpsj6n0zrk7vvfjcra144b39rq";
+ version = "0.0.6";
+ sha256 = "1rris7vsls5cxagx3gx8aa3np7fld4dqyhcqczc7dwxcnkzj3c78";
libraryHaskellDepends = [
base binary binary-conduit bytestring conduit conduit-extra
data-default-class data-default-instances-base data-msgpack
- data-msgpack-types exceptions MissingH monad-control mtl network
- tagged text
+ data-msgpack-types exceptions monad-control mtl network tagged text
+ unliftio-core
];
testHaskellDepends = [ async base bytestring hspec mtl network ];
description = "A MessagePack-RPC Implementation";
@@ -176766,18 +177068,16 @@ self: {
}) {};
"objective" = callPackage
- ({ mkDerivation, base, containers, exceptions, free, hashable
+ ({ mkDerivation, base, bifunctors, containers, exceptions, hashable
, monad-skeleton, mtl, profunctors, template-haskell, transformers
, transformers-compat, unordered-containers, void, witherable
}:
mkDerivation {
pname = "objective";
- version = "1.1.2";
- sha256 = "0i36r3ygwpzb57ga0jjkp9rzikpsp15l777dclp7yi1zvqz2ikrg";
- revision = "1";
- editedCabalFile = "039j3xac9ish0yk4w04bmip6g9p6ndfd9ngh46ya125ms4nhmyj4";
+ version = "1.2";
+ sha256 = "0qbms1n31zafakhn6y0hdy1a3bv7l3z4gzfqc1iczbwnxamiiq0q";
libraryHaskellDepends = [
- base containers exceptions free hashable monad-skeleton mtl
+ base bifunctors containers exceptions hashable monad-skeleton mtl
profunctors template-haskell transformers transformers-compat
unordered-containers void witherable
];
@@ -177295,6 +177595,20 @@ self: {
broken = true;
}) {};
+ "om-fail" = callPackage
+ ({ mkDerivation, base, monad-logger, safe-exceptions, transformers
+ }:
+ mkDerivation {
+ pname = "om-fail";
+ version = "0.1.0.2";
+ sha256 = "0wv102jpyi69xij2rwzrz5pdlc7pxad0wqsf0zfj15sfl1cnwya6";
+ libraryHaskellDepends = [
+ base monad-logger safe-exceptions transformers
+ ];
+ description = "Monad transformer providing MonadFail";
+ license = stdenv.lib.licenses.mit;
+ }) {};
+
"omaketex" = callPackage
({ mkDerivation, base, optparse-applicative, shakespeare-text
, shelly, text
@@ -178386,15 +178700,15 @@ self: {
license = stdenv.lib.licenses.asl20;
}) {};
- "opentelemetry_0_1_0" = callPackage
+ "opentelemetry_0_2_0" = callPackage
({ mkDerivation, async, base, bytestring, clock, directory
, exceptions, hashable, random, stm, tasty, tasty-discover
, tasty-hunit, tasty-quickcheck, text, unordered-containers
}:
mkDerivation {
pname = "opentelemetry";
- version = "0.1.0";
- sha256 = "032dx71zdgsi1qpj948s55j3da0vdqms292166yvdg9h8vl5ji53";
+ version = "0.2.0";
+ sha256 = "1nxkghxwjkgvdk6xhpssa7aifryn6rr0agbhyc0ybf2c76r1pr8b";
libraryHaskellDepends = [
base bytestring clock directory exceptions hashable random stm text
unordered-containers
@@ -178408,6 +178722,19 @@ self: {
hydraPlatforms = stdenv.lib.platforms.none;
}) {};
+ "opentelemetry-http-client" = callPackage
+ ({ mkDerivation, base, http-client, http-types, opentelemetry, text
+ }:
+ mkDerivation {
+ pname = "opentelemetry-http-client";
+ version = "0.2.0";
+ sha256 = "1z2fdlfc1hqzd9aypvrvyrc5547fvmfigh1wnsnbb9gswbckf6iy";
+ libraryHaskellDepends = [
+ base http-client http-types opentelemetry text
+ ];
+ license = stdenv.lib.licenses.asl20;
+ }) {};
+
"opentelemetry-lightstep" = callPackage
({ mkDerivation, aeson, async, base, bytestring, exceptions
, http-client, http-client-tls, http-types, network, opentelemetry
@@ -178415,8 +178742,8 @@ self: {
}:
mkDerivation {
pname = "opentelemetry-lightstep";
- version = "0.1.0";
- sha256 = "01l463xfwn40j3jd54hvmbx0csgjg853j39r38clzwknxsfq60cb";
+ version = "0.2.0";
+ sha256 = "03fv2lgwkqngp26rdrk2fzvnccdgjc7xsv3sl3adb3xwzppkn0xh";
libraryHaskellDepends = [
aeson async base bytestring exceptions http-client http-client-tls
http-types network opentelemetry scientific stm text
@@ -178428,6 +178755,16 @@ self: {
broken = true;
}) {};
+ "opentelemetry-wai" = callPackage
+ ({ mkDerivation, base, http-types, opentelemetry, text, wai }:
+ mkDerivation {
+ pname = "opentelemetry-wai";
+ version = "0.2.0";
+ sha256 = "1n27g8xjij05g7xxx8z50k39nmclhm707xs2pfqy830zdq1ldfl4";
+ libraryHaskellDepends = [ base http-types opentelemetry text wai ];
+ license = stdenv.lib.licenses.asl20;
+ }) {};
+
"opentheory" = callPackage
({ mkDerivation, base, opentheory-primitive, QuickCheck }:
mkDerivation {
@@ -179462,8 +179799,8 @@ self: {
({ mkDerivation, base, hashable, lucid, org-mode, text }:
mkDerivation {
pname = "org-mode-lucid";
- version = "1.0.1";
- sha256 = "102hn0r18nm6l9m976bl6qfqwrdj3vmn0f2j32vrxkkybwfjwdkh";
+ version = "1.1.0";
+ sha256 = "066mdm9a7dkz6yy9g2yhqalvxrxhak1mw0awag3ivswv6djf528q";
libraryHaskellDepends = [ base hashable lucid org-mode text ];
license = stdenv.lib.licenses.bsd3;
}) {};
@@ -181208,8 +181545,8 @@ self: {
({ mkDerivation }:
mkDerivation {
pname = "pandora";
- version = "0.2.2";
- sha256 = "16aisw2cafa25hm3si7g0xzai9j602gggd8yz8ixrrhly9jhw0cd";
+ version = "0.2.3";
+ sha256 = "1sk8hhw3ad0jb2ik787pqjgaprd78k7qc0m0chcji3z5bprxp1cw";
description = "A box of patterns and paradigms";
license = stdenv.lib.licenses.mit;
}) {};
@@ -181427,8 +181764,8 @@ self: {
}:
mkDerivation {
pname = "pantry";
- version = "0.3.0.0";
- sha256 = "0j4ryr3wz2wlfsn9qf0cjbk91iwas89rci3x55cnf8s8ppx159am";
+ version = "0.4.0.0";
+ sha256 = "11n0xrk5258inzzikbapsv7752396qsrgaaf5kimpzgb67cs9k5j";
libraryHaskellDepends = [
aeson ansi-terminal base bytestring Cabal casa-client casa-types
conduit conduit-extra containers cryptonite cryptonite-conduit
@@ -182900,8 +183237,8 @@ self: {
}:
mkDerivation {
pname = "partial-order";
- version = "0.1.2.1";
- sha256 = "15y3593fl5gabcf0qzyfql30v80sninv1f79dz4v2ll89dzwfzg3";
+ version = "0.2.0.0";
+ sha256 = "1j65vhgas602fzmrjzxg7fvkmqclzxdni8yn0699l7ni6miv8pxj";
libraryHaskellDepends = [ base containers ];
testHaskellDepends = [
base containers HUnit test-framework test-framework-hunit
@@ -185286,8 +185623,6 @@ self: {
];
description = "Backend for the persistent library using MySQL database server";
license = stdenv.lib.licenses.mit;
- hydraPlatforms = stdenv.lib.platforms.none;
- broken = true;
}) {};
"persistent-mysql-haskell" = callPackage
@@ -185679,32 +186014,6 @@ self: {
}) {};
"persistent-typed-db" = callPackage
- ({ mkDerivation, aeson, base, bytestring, conduit, esqueleto, hspec
- , http-api-data, monad-logger, path-pieces, persistent
- , persistent-template, resource-pool, resourcet, template-haskell
- , text, transformers
- }:
- mkDerivation {
- pname = "persistent-typed-db";
- version = "0.1.0.0";
- sha256 = "0wlz2d6v4ks376amp26fxw5wj381kqaghp25mry073krc7yqz6yv";
- libraryHaskellDepends = [
- aeson base bytestring conduit http-api-data monad-logger
- path-pieces persistent persistent-template resource-pool resourcet
- template-haskell text transformers
- ];
- testHaskellDepends = [
- aeson base bytestring conduit esqueleto hspec http-api-data
- monad-logger path-pieces persistent persistent-template
- resource-pool resourcet template-haskell text transformers
- ];
- description = "Type safe access to multiple database schemata";
- license = stdenv.lib.licenses.bsd3;
- hydraPlatforms = stdenv.lib.platforms.none;
- broken = true;
- }) {};
-
- "persistent-typed-db_0_1_0_1" = callPackage
({ mkDerivation, aeson, base, bytestring, conduit, esqueleto, hspec
, http-api-data, monad-logger, path-pieces, persistent
, persistent-template, resource-pool, resourcet, template-haskell
@@ -188468,6 +188777,39 @@ self: {
license = stdenv.lib.licenses.bsd3;
}) {};
+ "plaid" = callPackage
+ ({ mkDerivation, aeson, base, bytestring, casing, conduit
+ , conduit-extra, containers, either, errors, hspec, hspec-wai
+ , hspec-wai-json, http-client, http-client-tls, http-conduit
+ , http-types, microlens, microlens-th, mtl, network, pretty-simple
+ , QuickCheck, raw-strings-qq, safe-exceptions, text, time
+ , transformers, wai
+ }:
+ mkDerivation {
+ pname = "plaid";
+ version = "0.1.0.0";
+ sha256 = "125427rhy5xlaw3qinrazyyj39z4g0rbnhm2k4jrgp1jgba91lc3";
+ isLibrary = true;
+ isExecutable = true;
+ libraryHaskellDepends = [
+ aeson base bytestring casing containers http-client-tls
+ http-conduit microlens microlens-th mtl network pretty-simple
+ raw-strings-qq safe-exceptions text time
+ ];
+ executableHaskellDepends = [
+ aeson base bytestring conduit conduit-extra either http-client
+ http-client-tls microlens microlens-th mtl network pretty-simple
+ safe-exceptions text time transformers
+ ];
+ testHaskellDepends = [
+ aeson base bytestring containers errors hspec hspec-wai
+ hspec-wai-json http-types microlens microlens-th pretty-simple
+ QuickCheck text time wai
+ ];
+ description = "Plaid.com api integration library";
+ license = stdenv.lib.licenses.bsd3;
+ }) {};
+
"plailude" = callPackage
({ mkDerivation, base, bytestring, mtl, time, unix }:
mkDerivation {
@@ -189083,8 +189425,8 @@ self: {
}:
mkDerivation {
pname = "plugins-multistage";
- version = "0.6.2";
- sha256 = "1cjy71s9whjkc8lrb29v5hbkak1jf36ng3xhqszdag887f2mk22b";
+ version = "0.6.3";
+ sha256 = "08m73a30alspw1dk33qvp5i0yqq7xlzkj2dsvs77myk9f1sp1ywx";
libraryHaskellDepends = [
base directory ghc ghci process template-haskell th-desugar
];
@@ -189843,6 +190185,8 @@ self: {
pname = "polysemy";
version = "1.3.0.0";
sha256 = "0p5g1n5b0dfkadqpqf2ka25dblimwqhxwx5ax0mxwixb0jwd0pvb";
+ revision = "1";
+ editedCabalFile = "02fkrfdn7pwslc9yffgx3fis8ag36m3dhigw67ns1s16gsf5a7dz";
setupHaskellDepends = [ base Cabal cabal-doctest ];
libraryHaskellDepends = [
async base containers first-class-families mtl QuickCheck stm syb
@@ -189967,8 +190311,8 @@ self: {
({ mkDerivation, base, containers, deepseq, polyparse, tagsoup }:
mkDerivation {
pname = "polysoup";
- version = "0.6.3";
- sha256 = "0j2gk5x3njgv7x86p80f0zrsvzxcsn7x9l78swmgwcfkfy4j5xls";
+ version = "0.6.4";
+ sha256 = "0kgagizdn47xdnvmkwn5h3c78mdsh95siq2cyp9bga22pqhj4sid";
libraryHaskellDepends = [
base containers deepseq polyparse tagsoup
];
@@ -190648,8 +190992,8 @@ self: {
}:
mkDerivation {
pname = "posix-api";
- version = "0.3.3.0";
- sha256 = "0a4npmhgnpq7ya21zijsxhyndr9swlknh6v7rn6y9qbva4q3gjx7";
+ version = "0.3.4.0";
+ sha256 = "163bblw200jr2vghc7i9g9xls6vhihayxvb4am4lr3j047ifqbmb";
libraryHaskellDepends = [
base byteslice primitive primitive-addr primitive-offset
primitive-unlifted
@@ -194275,8 +194619,8 @@ self: {
({ mkDerivation, base, comonad, lawz, profunctors }:
mkDerivation {
pname = "profunctor-arrows";
- version = "0.0.0.3";
- sha256 = "09hn8llfbwgj56mvwyiyk4n3myy0s4lixrzgi3sm4q1ypg4w0dz2";
+ version = "0.0.1";
+ sha256 = "136d594l4magjibq44fs64bqafvcdy8jm2gijs6x1whpab0vl44k";
libraryHaskellDepends = [ base comonad lawz profunctors ];
description = "Profunctor arrows";
license = stdenv.lib.licenses.bsd3;
@@ -194324,31 +194668,27 @@ self: {
}) {};
"profunctor-optics" = callPackage
- ({ mkDerivation, adjunctions, base, connections, containers
- , distributive, doctest, hedgehog, ilist, keys, magmas, mtl
- , newtype-generics, profunctor-arrows, profunctors, rings
- , semigroupoids, tagged, transformers, unliftio-core
+ ({ mkDerivation, adjunctions, base, coapplicative, distributive
+ , doctest, lawz, mtl, newtype-generics, profunctors, rings
+ , semigroupoids, tagged, transformers
}:
mkDerivation {
pname = "profunctor-optics";
- version = "0.0.1";
- sha256 = "12f8v0bv6ra8smpjbcj8qlzm1fq4hzn1f2807f2jkcjz5s9a6wf5";
+ version = "0.0.2";
+ sha256 = "0x9cq3z1ixxgc85xf0387f5rsdwrm53qwzmcfm0b0z8gj38qaa5r";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [
- adjunctions base connections distributive keys magmas mtl
- newtype-generics profunctor-arrows profunctors rings semigroupoids
- tagged transformers unliftio-core
+ adjunctions base coapplicative distributive lawz mtl
+ newtype-generics profunctors rings semigroupoids tagged
+ transformers
];
- executableHaskellDepends = [
- adjunctions base connections containers doctest ilist mtl
- ];
- testHaskellDepends = [ base connections hedgehog ];
- description = "An optics library compatible with the typeclasses in 'profunctors'";
+ executableHaskellDepends = [ base doctest mtl ];
+ description = "A compact optics library compatible with the typeclasses in profunctors";
license = stdenv.lib.licenses.bsd3;
hydraPlatforms = stdenv.lib.platforms.none;
broken = true;
- }) {};
+ }) {coapplicative = null;};
"profunctors" = callPackage
({ mkDerivation, base, base-orphans, bifunctors, comonad
@@ -196583,6 +196923,27 @@ self: {
license = stdenv.lib.licenses.bsd3;
}) {};
+ "purescript-bridge_0_14_0_0" = callPackage
+ ({ mkDerivation, base, containers, directory, filepath
+ , generic-deriving, hspec, hspec-expectations-pretty-diff, lens
+ , mtl, text, transformers
+ }:
+ mkDerivation {
+ pname = "purescript-bridge";
+ version = "0.14.0.0";
+ sha256 = "1gplvmkx2c8ksk25wdinhwwbmqa5czbd4nwdgn4sa9ci10f2i4a3";
+ libraryHaskellDepends = [
+ base containers directory filepath generic-deriving lens mtl text
+ transformers
+ ];
+ testHaskellDepends = [
+ base containers hspec hspec-expectations-pretty-diff text
+ ];
+ description = "Generate PureScript data types from Haskell data types";
+ license = stdenv.lib.licenses.bsd3;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ }) {};
+
"purescript-bundle-fast" = callPackage
({ mkDerivation, base, containers, directory, filepath
, optparse-applicative, text, vector
@@ -200112,6 +200473,28 @@ self: {
license = stdenv.lib.licenses.bsd3;
}) {};
+ "rank2classes_1_4" = callPackage
+ ({ mkDerivation, base, Cabal, cabal-doctest, distributive, doctest
+ , markdown-unlit, tasty, tasty-hunit, template-haskell
+ , transformers
+ }:
+ mkDerivation {
+ pname = "rank2classes";
+ version = "1.4";
+ sha256 = "0h8ysf32nw28aqhnnq2cckagwfrri4k44p3pzhhlp6lvhckvqnq1";
+ setupHaskellDepends = [ base Cabal cabal-doctest ];
+ libraryHaskellDepends = [
+ base distributive template-haskell transformers
+ ];
+ testHaskellDepends = [
+ base distributive doctest tasty tasty-hunit
+ ];
+ testToolDepends = [ markdown-unlit ];
+ description = "standard type constructor class hierarchy, only with methods of rank 2 types";
+ license = stdenv.lib.licenses.bsd3;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ }) {};
+
"rapid" = callPackage
({ mkDerivation, async, base, containers, foreign-store, stm }:
mkDerivation {
@@ -200557,8 +200940,8 @@ self: {
}:
mkDerivation {
pname = "rattletrap";
- version = "9.0.7";
- sha256 = "0kgg1qfhgjajzrw22yvcxmiim14pxr2gim1aak3ivnmhn4yff4fg";
+ version = "9.0.8";
+ sha256 = "1a98zy1n6dlxxyfdganqfcx8hw04i4hjwdj8ggdd4g0jky62jaz2";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [
@@ -205611,8 +205994,8 @@ self: {
}:
mkDerivation {
pname = "require";
- version = "0.4.3";
- sha256 = "0j6dsyqx637b5p8jmk5h4b0qham0m8m74c8b8y1dywm0c5daayca";
+ version = "0.4.4";
+ sha256 = "1y7n1dyccwfy5fplinw72fsq1vjzp5nrngvr5g08yfqykaidpc8r";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [
@@ -205637,6 +206020,30 @@ self: {
broken = true;
}) {};
+ "rere" = callPackage
+ ({ mkDerivation, aeson, attoparsec, base, bytestring, clock
+ , containers, criterion, derp, fin, parsec, QuickCheck
+ , quickcheck-instances, tasty, tasty-quickcheck, transformers, vec
+ }:
+ mkDerivation {
+ pname = "rere";
+ version = "0.1";
+ sha256 = "0hskndalxqmlwscvacqmp7gbp8m75a8hnvbifw0hw7hhszlf0yac";
+ libraryHaskellDepends = [
+ base containers fin parsec QuickCheck transformers vec
+ ];
+ testHaskellDepends = [
+ base containers QuickCheck quickcheck-instances tasty
+ tasty-quickcheck
+ ];
+ benchmarkHaskellDepends = [
+ aeson attoparsec base bytestring clock containers criterion derp
+ fin parsec vec
+ ];
+ description = "Regular-expressions extended with fixpoints for context-free powers";
+ license = stdenv.lib.licenses.bsd3;
+ }) {};
+
"rerebase" = callPackage
({ mkDerivation, rebase }:
mkDerivation {
@@ -205952,24 +206359,6 @@ self: {
}) {};
"resourcet" = callPackage
- ({ mkDerivation, base, containers, exceptions, hspec, mtl
- , primitive, transformers, unliftio-core
- }:
- mkDerivation {
- pname = "resourcet";
- version = "1.2.2";
- sha256 = "1rfbfcv3r1h29y0yqr3x6a1s04lbc3vzm3jqnfg4f9rqp9d448qk";
- revision = "1";
- editedCabalFile = "18v6frks5zr64hpq8dprbk6dxpq4ykijp1xg00ghp7qz060f1r0i";
- libraryHaskellDepends = [
- base containers exceptions mtl primitive transformers unliftio-core
- ];
- testHaskellDepends = [ base exceptions hspec transformers ];
- description = "Deterministic allocation and freeing of scarce resources";
- license = stdenv.lib.licenses.bsd3;
- }) {};
-
- "resourcet_1_2_3" = callPackage
({ mkDerivation, base, containers, exceptions, hspec, mtl
, primitive, transformers, unliftio-core
}:
@@ -205983,7 +206372,6 @@ self: {
testHaskellDepends = [ base exceptions hspec transformers ];
description = "Deterministic allocation and freeing of scarce resources";
license = stdenv.lib.licenses.bsd3;
- hydraPlatforms = stdenv.lib.platforms.none;
}) {};
"respond" = callPackage
@@ -207268,45 +207656,21 @@ self: {
"rings" = callPackage
({ mkDerivation, adjunctions, base, containers, distributive, lawz
- , magmas, semigroupoids
+ , magmas, profunctors, semigroupoids
}:
mkDerivation {
pname = "rings";
- version = "0.1.2";
- sha256 = "0rci487ycp44h3qqpnwz9z429xwhsj4andsvcdpisbns56mw6rqd";
+ version = "0.1.3";
+ sha256 = "0w0jvmj7x62fs0k5vah47mbdasiqjs9kphvrfbdma4i59899w5y1";
libraryHaskellDepends = [
- adjunctions base containers distributive lawz magmas semigroupoids
+ adjunctions base containers distributive lawz magmas profunctors
+ semigroupoids
];
description = "Ring-like objects";
license = stdenv.lib.licenses.bsd3;
}) {};
"rio" = callPackage
- ({ mkDerivation, base, bytestring, containers, deepseq, directory
- , exceptions, filepath, hashable, hspec, microlens, mtl, primitive
- , process, QuickCheck, text, time, typed-process, unix, unliftio
- , unliftio-core, unordered-containers, vector
- }:
- mkDerivation {
- pname = "rio";
- version = "0.1.14.0";
- sha256 = "1ss0lbdrmiblxza8lv51kpdw51s7m5qaihxlvf1jp4qg4amdayxw";
- libraryHaskellDepends = [
- base bytestring containers deepseq directory exceptions filepath
- hashable microlens mtl primitive process text time typed-process
- unix unliftio unliftio-core unordered-containers vector
- ];
- testHaskellDepends = [
- base bytestring containers deepseq directory exceptions filepath
- hashable hspec microlens mtl primitive process QuickCheck text time
- typed-process unix unliftio unliftio-core unordered-containers
- vector
- ];
- description = "A standard library for Haskell";
- license = stdenv.lib.licenses.mit;
- }) {};
-
- "rio_0_1_14_1" = callPackage
({ mkDerivation, base, bytestring, containers, deepseq, directory
, exceptions, filepath, hashable, hspec, microlens, mtl, primitive
, process, QuickCheck, text, time, typed-process, unix, unliftio
@@ -207329,7 +207693,6 @@ self: {
];
description = "A standard library for Haskell";
license = stdenv.lib.licenses.mit;
- hydraPlatforms = stdenv.lib.platforms.none;
}) {};
"rio-orphans" = callPackage
@@ -208285,24 +208648,24 @@ self: {
}:
mkDerivation {
pname = "rose-trees";
- version = "0.0.4.4";
- sha256 = "1kbjkfknl2pyp30n5c6m6xavqlm8zg06w78b3x7iwvi854yi64r3";
+ version = "0.0.4.5";
+ sha256 = "0ql6wdsq1dpx0bbgs6798c6h4wyw9xcbr64shr7pvl9fwivdl6j7";
libraryHaskellDepends = [
base containers deepseq hashable mtl QuickCheck
quickcheck-instances semigroupoids semigroups sets
unordered-containers witherable
];
testHaskellDepends = [
- base containers deepseq hashable QuickCheck quickcheck-instances
- semigroupoids semigroups sets tasty tasty-quickcheck
- unordered-containers witherable
+ base containers deepseq hashable mtl QuickCheck
+ quickcheck-instances semigroupoids semigroups sets tasty
+ tasty-quickcheck unordered-containers witherable
];
benchmarkHaskellDepends = [
base containers criterion deepseq hashable mtl QuickCheck
quickcheck-instances semigroupoids semigroups sets
unordered-containers witherable
];
- description = "A collection of rose tree structures";
+ description = "Various trie implementations in Haskell";
license = stdenv.lib.licenses.bsd3;
hydraPlatforms = stdenv.lib.platforms.none;
broken = true;
@@ -210177,8 +210540,6 @@ self: {
];
description = "Cryptography that's easy to digest (NaCl/libsodium bindings)";
license = stdenv.lib.licenses.mit;
- hydraPlatforms = stdenv.lib.platforms.none;
- broken = true;
}) {inherit (pkgs) libsodium;};
"saltine-quickcheck" = callPackage
@@ -212593,25 +212954,6 @@ self: {
}) {};
"sdl2-ttf" = callPackage
- ({ mkDerivation, base, bytestring, SDL2, sdl2, SDL2_ttf
- , template-haskell, text, transformers
- }:
- mkDerivation {
- pname = "sdl2-ttf";
- version = "2.1.0";
- sha256 = "1xw05jgv6x9xplahwf3jjdq6v3mha4s7bb27kn8x66764glnyrf7";
- isLibrary = true;
- isExecutable = true;
- libraryHaskellDepends = [
- base bytestring sdl2 template-haskell text transformers
- ];
- libraryPkgconfigDepends = [ SDL2 SDL2_ttf ];
- description = "Bindings to SDL2_ttf";
- license = stdenv.lib.licenses.bsd3;
- platforms = [ "i686-linux" "x86_64-linux" ];
- }) {inherit (pkgs) SDL2; inherit (pkgs) SDL2_ttf;};
-
- "sdl2-ttf_2_1_1" = callPackage
({ mkDerivation, base, bytestring, SDL2, sdl2, SDL2_ttf
, template-haskell, text, transformers
}:
@@ -212628,7 +212970,6 @@ self: {
description = "Bindings to SDL2_ttf";
license = stdenv.lib.licenses.bsd3;
platforms = [ "i686-linux" "x86_64-linux" ];
- hydraPlatforms = stdenv.lib.platforms.none;
}) {inherit (pkgs) SDL2; inherit (pkgs) SDL2_ttf;};
"sdnv" = callPackage
@@ -216482,8 +216823,8 @@ self: {
}:
mkDerivation {
pname = "servant-snap";
- version = "0.8.4.1";
- sha256 = "1649s1n313rd8h409bfz2jkq2ch7ffw06y120j95rjcp6r8xgfv2";
+ version = "0.8.5";
+ sha256 = "12ihxmi6c6zypzx6ijj0yhl0mppk40zkyhkv3g3kx3mgx50qs5yq";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [
@@ -217121,6 +217462,34 @@ self: {
license = stdenv.lib.licenses.mit;
}) {};
+ "serverless-haskell_0_10_2" = callPackage
+ ({ mkDerivation, aeson, aeson-casing, amazonka-core
+ , amazonka-kinesis, amazonka-s3, base, bytestring, case-insensitive
+ , hspec, hspec-discover, http-types, iproute, lens, network
+ , network-simple, raw-strings-qq, text, time, unix
+ , unordered-containers
+ }:
+ mkDerivation {
+ pname = "serverless-haskell";
+ version = "0.10.2";
+ sha256 = "1iy69394dqv38dlh71m8sarcfps9gaaq90zpc4f169vnhpr59wak";
+ libraryHaskellDepends = [
+ aeson aeson-casing amazonka-core amazonka-kinesis amazonka-s3 base
+ bytestring case-insensitive http-types iproute lens network
+ network-simple text time unix unordered-containers
+ ];
+ testHaskellDepends = [
+ aeson aeson-casing amazonka-core amazonka-kinesis amazonka-s3 base
+ bytestring case-insensitive hspec hspec-discover http-types iproute
+ lens network network-simple raw-strings-qq text time unix
+ unordered-containers
+ ];
+ testToolDepends = [ hspec-discover ];
+ description = "Deploying Haskell code onto AWS Lambda using Serverless";
+ license = stdenv.lib.licenses.mit;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ }) {};
+
"serversession" = callPackage
({ mkDerivation, aeson, base, base64-bytestring, bytestring
, containers, data-default, hashable, hspec, nonce, path-pieces
@@ -217970,6 +218339,22 @@ self: {
broken = true;
}) {};
+ "sha1" = callPackage
+ ({ mkDerivation, base, bytebuild, byteslice, natural-arithmetic
+ , primitive, small-bytearray-builder
+ }:
+ mkDerivation {
+ pname = "sha1";
+ version = "0.1.0.2";
+ sha256 = "14jy1g6pm4vnq7rhg4z1yazazk9vfav7nn8saxkddxaflaax4llf";
+ libraryHaskellDepends = [ base bytebuild byteslice primitive ];
+ testHaskellDepends = [
+ base byteslice natural-arithmetic primitive small-bytearray-builder
+ ];
+ description = "SHA-1 Hash";
+ license = stdenv.lib.licenses.bsd3;
+ }) {};
+
"shade" = callPackage
({ mkDerivation, base, mtl, transformers }:
mkDerivation {
@@ -218126,6 +218511,23 @@ self: {
license = stdenv.lib.licenses.bsd3;
}) {};
+ "shake-bindist" = callPackage
+ ({ mkDerivation, archive-sig, archive-tar, base, bytestring, bz2
+ , lzlib, shake, zlib, zstd
+ }:
+ mkDerivation {
+ pname = "shake-bindist";
+ version = "0.1.0.0";
+ sha256 = "0f2w7bbnnigfjpfywljl6k2gcz1rq99lfz7cig0076rbjg7aifii";
+ revision = "2";
+ editedCabalFile = "0bk1r9qn41xhhjisvahs0fdsfiv79rb1yk545ry0vw83d0af6kl8";
+ libraryHaskellDepends = [
+ archive-sig archive-tar base bytestring bz2 lzlib shake zlib zstd
+ ];
+ description = "Rules for binary distributions";
+ license = stdenv.lib.licenses.bsd3;
+ }) {};
+
"shake-c" = callPackage
({ mkDerivation, base, cdeps, composition-prelude, shake }:
mkDerivation {
@@ -221627,6 +222029,19 @@ self: {
license = stdenv.lib.licenses.mit;
}) {};
+ "skylighting-lucid" = callPackage
+ ({ mkDerivation, base, containers, lucid, skylighting-core, text }:
+ mkDerivation {
+ pname = "skylighting-lucid";
+ version = "1.0.0";
+ sha256 = "09wh0dh8glnb051hdbcf4q4v3nflikgc585acqin8kq7zny7ps72";
+ libraryHaskellDepends = [
+ base containers lucid skylighting-core text
+ ];
+ description = "Lucid support for Skylighting";
+ license = stdenv.lib.licenses.bsd3;
+ }) {};
+
"skylighting-modding" = callPackage
({ mkDerivation, base, containers, skylighting-core, text }:
mkDerivation {
@@ -222798,10 +223213,8 @@ self: {
}:
mkDerivation {
pname = "snap";
- version = "1.1.2.0";
- sha256 = "05da0dg0p6djcsinycih50hjnircibmicarwg2vr14a7zbrhynps";
- revision = "2";
- editedCabalFile = "13hx2wghxrranxxv5qp8a5maqd203q15k3qg4fafjzhyh3wf6a67";
+ version = "1.1.3.0";
+ sha256 = "09iwyam3k9a90xm99pm54h74f8llfz2jm0i8rrdqwayjy5xq2w3i";
libraryHaskellDepends = [
aeson attoparsec base bytestring cereal clientsession configurator
containers directory directory-tree dlist fail filepath hashable
@@ -222821,8 +223234,6 @@ self: {
];
description = "Top-level package for the Snap Web Framework";
license = stdenv.lib.licenses.bsd3;
- hydraPlatforms = stdenv.lib.platforms.none;
- broken = true;
}) {};
"snap-accept" = callPackage
@@ -224445,8 +224856,8 @@ self: {
pname = "soap-openssl";
version = "0.1.0.2";
sha256 = "03w389yhybzvc06gpxigibqga9mr7m41rkg1ki3n686j9xzm8210";
- revision = "1";
- editedCabalFile = "1b3aivn9jfaax00id7x4cqvpmd6lgynslchlry0qsmq1lj466cdf";
+ revision = "2";
+ editedCabalFile = "0zhl8x57y35ymhpznrsn2yrgc3bigjn5mabwl4nvprpznb2x44vn";
libraryHaskellDepends = [
base configurator data-default HsOpenSSL http-client
http-client-openssl soap text
@@ -226716,8 +227127,8 @@ self: {
}:
mkDerivation {
pname = "sqlite-simple";
- version = "0.4.17.0";
- sha256 = "1bd1883kn2bvzglqg3l2yjcd94liv36181ib8g40k34zdm67wvbz";
+ version = "0.4.18.0";
+ sha256 = "00icsf8pgrcqcn5562lmn12yz1f16a2v2q6bl90iknvjyrk1hgzp";
libraryHaskellDepends = [
attoparsec base blaze-builder blaze-textual bytestring containers
direct-sqlite Only semigroups template-haskell text time
@@ -227289,6 +227700,34 @@ self: {
license = stdenv.lib.licenses.bsd3;
}) {};
+ "stache_2_1_1" = callPackage
+ ({ mkDerivation, aeson, base, bytestring, containers, criterion
+ , deepseq, directory, file-embed, filepath, hspec, hspec-discover
+ , hspec-megaparsec, megaparsec, mtl, template-haskell, text
+ , unordered-containers, vector, yaml
+ }:
+ mkDerivation {
+ pname = "stache";
+ version = "2.1.1";
+ sha256 = "06pn7pm5vgk9f4bsh3m29cik514nv5w655ip04k7p5jv9xgmn4ld";
+ enableSeparateDataOutput = true;
+ libraryHaskellDepends = [
+ aeson base bytestring containers deepseq directory filepath
+ megaparsec mtl template-haskell text unordered-containers vector
+ ];
+ testHaskellDepends = [
+ aeson base bytestring containers file-embed hspec hspec-megaparsec
+ megaparsec template-haskell text yaml
+ ];
+ testToolDepends = [ hspec-discover ];
+ benchmarkHaskellDepends = [
+ aeson base criterion deepseq megaparsec text
+ ];
+ description = "Mustache templates for Haskell";
+ license = stdenv.lib.licenses.bsd3;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ }) {};
+
"stack" = callPackage
({ mkDerivation, aeson, annotated-wl-pprint, ansi-terminal, array
, async, attoparsec, base, base64-bytestring, bytestring, Cabal
@@ -229894,6 +230333,31 @@ self: {
license = stdenv.lib.licenses.mit;
}) {};
+ "stratosphere_0_50_0" = callPackage
+ ({ mkDerivation, aeson, aeson-pretty, base, bytestring, containers
+ , hashable, hspec, hspec-discover, lens, template-haskell, text
+ , unordered-containers
+ }:
+ mkDerivation {
+ pname = "stratosphere";
+ version = "0.50.0";
+ sha256 = "0nxvrfi3jp0p874gkj25rdlfsb2rskp82bz58c0rply0s5rivlfl";
+ isLibrary = true;
+ isExecutable = true;
+ libraryHaskellDepends = [
+ aeson aeson-pretty base bytestring containers hashable lens
+ template-haskell text unordered-containers
+ ];
+ testHaskellDepends = [
+ aeson aeson-pretty base bytestring containers hashable hspec
+ hspec-discover lens template-haskell text unordered-containers
+ ];
+ testToolDepends = [ hspec-discover ];
+ description = "EDSL for AWS CloudFormation";
+ license = stdenv.lib.licenses.mit;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ }) {};
+
"stratum-tool" = callPackage
({ mkDerivation, aeson, async, base, bytestring, bytestring-builder
, cmdargs, connection, containers, curl, curl-aeson, network, stm
@@ -235467,8 +235931,8 @@ self: {
}:
mkDerivation {
pname = "tagsoup-navigate";
- version = "0.1.0.4";
- sha256 = "1mds95a0xz3iklidmvczjpmm9vjhzdrdvcj3dg0n3ivwwli672m9";
+ version = "0.1.0.7";
+ sha256 = "02qq2qc5xrsw6nf4hc02g9xkgdkx3ka7pack02dkhnbxj3jv03vw";
libraryHaskellDepends = [
base deriving-compat lens mmorph mtl semigroupoids semigroups
tagsoup tagsoup-selection transformers
@@ -238940,6 +239404,26 @@ self: {
license = stdenv.lib.licenses.bsd3;
}) {};
+ "tex-join-bib" = callPackage
+ ({ mkDerivation, async, base, containers, foldl, optparse-generic
+ , system-filepath, text, turtle
+ }:
+ mkDerivation {
+ pname = "tex-join-bib";
+ version = "0.1.0.0";
+ sha256 = "1dlks58g9jfkcsdlcjyqw8rh27j1c66crb39s53ar7w6p08invk1";
+ isLibrary = true;
+ isExecutable = true;
+ libraryHaskellDepends = [
+ async base containers foldl system-filepath text turtle
+ ];
+ executableHaskellDepends = [
+ base optparse-generic system-filepath text
+ ];
+ description = "Compile separate tex files with the same bibliography";
+ license = stdenv.lib.licenses.gpl3;
+ }) {};
+
"tex2txt" = callPackage
({ mkDerivation, base, containers, deepseq, parsec }:
mkDerivation {
@@ -245785,8 +246269,8 @@ self: {
}:
mkDerivation {
pname = "tries";
- version = "0.0.6";
- sha256 = "0765my34c8fcd8ri9acrcymgpjfqqq7a98zr94z8czrnh5zsmzjv";
+ version = "0.0.6.1";
+ sha256 = "0sb4bj2dd88890hg8k3z0kpl1zk1d1r70sspviylzp6b26q3gyvm";
libraryHaskellDepends = [
base bytestring composition containers deepseq hashable keys
QuickCheck quickcheck-instances rose-trees semigroups sets
@@ -246787,6 +247271,34 @@ self: {
license = stdenv.lib.licenses.bsd3;
}) {};
+ "turtle_1_5_17" = callPackage
+ ({ mkDerivation, ansi-wl-pprint, async, base, bytestring, clock
+ , containers, criterion, directory, doctest, exceptions, fail
+ , foldl, hostname, managed, optional-args, optparse-applicative
+ , process, semigroups, stm, streaming-commons, system-fileio
+ , system-filepath, temporary, text, time, transformers, unix
+ , unix-compat
+ }:
+ mkDerivation {
+ pname = "turtle";
+ version = "1.5.17";
+ sha256 = "0chj4issjbkdkj1jbcpi8v104784qnzvkq81a4wcdijk09biphq7";
+ libraryHaskellDepends = [
+ ansi-wl-pprint async base bytestring clock containers directory
+ exceptions foldl hostname managed optional-args
+ optparse-applicative process semigroups stm streaming-commons
+ system-fileio system-filepath temporary text time transformers unix
+ unix-compat
+ ];
+ testHaskellDepends = [
+ base doctest fail system-filepath temporary
+ ];
+ benchmarkHaskellDepends = [ base criterion text ];
+ description = "Shell programming, Haskell-style";
+ license = stdenv.lib.licenses.bsd3;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ }) {};
+
"turtle-options" = callPackage
({ mkDerivation, base, HUnit, optional-args, parsec, text, turtle
}:
@@ -248665,8 +249177,8 @@ self: {
}:
mkDerivation {
pname = "typesafe-precure";
- version = "0.7.6.2";
- sha256 = "0nhb8v17ycjjldcvhyjc1qk7r4hqhqdw6gw9fp0mbvn5cbpi0xrm";
+ version = "0.7.7.1";
+ sha256 = "0yjw4fm7n7qdb9rib7q5nirnw0cdvqy2g05lidxw5pkgdbi9np3m";
libraryHaskellDepends = [
aeson aeson-pretty autoexporter base bytestring dlist
monad-skeleton template-haskell text th-data-compat
@@ -250320,13 +250832,13 @@ self: {
"unity-testresult-parser" = callPackage
({ mkDerivation, ansi-terminal, ansi-wl-pprint, base, containers
- , mtl, optparse-applicative, split, text, unordered-containers
- , xml-conduit
+ , mtl, optparse-applicative, semigroups, split, text
+ , unordered-containers, xml-conduit
}:
mkDerivation {
pname = "unity-testresult-parser";
- version = "0.1.0.3";
- sha256 = "1521dv3d7ssqzy8vf4y55dzg0w192667kqia0f0w76magnwhk8ic";
+ version = "0.1.0.10";
+ sha256 = "0mb7q5lqkn11s11s8w6a4anmbsf3z4c66bg78j1dnwkqivx02k0b";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [
@@ -250334,8 +250846,8 @@ self: {
xml-conduit
];
executableHaskellDepends = [
- ansi-terminal ansi-wl-pprint base mtl optparse-applicative split
- text
+ ansi-terminal ansi-wl-pprint base mtl optparse-applicative
+ semigroups split text
];
license = stdenv.lib.licenses.bsd3;
hydraPlatforms = stdenv.lib.platforms.none;
@@ -250779,31 +251291,6 @@ self: {
}) {};
"unliftio" = callPackage
- ({ mkDerivation, async, base, bytestring, containers, deepseq
- , directory, filepath, gauge, hspec, process, QuickCheck, stm, time
- , transformers, unix, unliftio-core
- }:
- mkDerivation {
- pname = "unliftio";
- version = "0.2.12";
- sha256 = "02gy1zrxgzg4xmzm8lafsf1nyr3as1q20r8ld73xg3q7rkag9acg";
- libraryHaskellDepends = [
- async base bytestring deepseq directory filepath process stm time
- transformers unix unliftio-core
- ];
- testHaskellDepends = [
- async base bytestring containers deepseq directory filepath hspec
- process QuickCheck stm time transformers unix unliftio-core
- ];
- benchmarkHaskellDepends = [
- async base bytestring deepseq directory filepath gauge process stm
- time transformers unix unliftio-core
- ];
- description = "The MonadUnliftIO typeclass for unlifting monads to IO (batteries included)";
- license = stdenv.lib.licenses.mit;
- }) {};
-
- "unliftio_0_2_12_1" = callPackage
({ mkDerivation, async, base, bytestring, containers, deepseq
, directory, filepath, gauge, hspec, process, QuickCheck, stm, time
, transformers, unix, unliftio-core
@@ -250826,7 +251313,6 @@ self: {
];
description = "The MonadUnliftIO typeclass for unlifting monads to IO (batteries included)";
license = stdenv.lib.licenses.mit;
- hydraPlatforms = stdenv.lib.platforms.none;
}) {};
"unliftio-core" = callPackage
@@ -255512,28 +255998,29 @@ self: {
license = stdenv.lib.licenses.bsd3;
}) {};
- "vty_5_27" = callPackage
- ({ mkDerivation, base, blaze-builder, bytestring, Cabal, containers
- , deepseq, directory, filepath, hashable, HUnit, microlens
- , microlens-mtl, microlens-th, mtl, parallel, parsec, QuickCheck
- , quickcheck-assertions, random, smallcheck, stm, string-qq
- , terminfo, test-framework, test-framework-hunit
- , test-framework-smallcheck, text, transformers, unix, utf8-string
- , vector
+ "vty_5_28_1" = callPackage
+ ({ mkDerivation, ansi-terminal, base, binary, blaze-builder
+ , bytestring, Cabal, containers, deepseq, directory, filepath
+ , hashable, HUnit, microlens, microlens-mtl, microlens-th, mtl
+ , parallel, parsec, QuickCheck, quickcheck-assertions, random
+ , smallcheck, stm, string-qq, terminfo, test-framework
+ , test-framework-hunit, test-framework-smallcheck, text
+ , transformers, unix, utf8-string, vector
}:
mkDerivation {
pname = "vty";
- version = "5.27";
- sha256 = "1iif1lcf59bypxlamla085bzrp3bl23jq2rcfzrjy6a3grywdgdl";
+ version = "5.28.1";
+ sha256 = "0hshmpa3n6936527wimxf3vi5v6gddp09kxjjmcxjwq39h9a640y";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [
- base blaze-builder bytestring containers deepseq directory filepath
- hashable microlens microlens-mtl microlens-th mtl parallel parsec
- stm terminfo text transformers unix utf8-string vector
+ ansi-terminal base binary blaze-builder bytestring containers
+ deepseq directory filepath hashable microlens microlens-mtl
+ microlens-th mtl parallel parsec stm terminfo text transformers
+ unix utf8-string vector
];
executableHaskellDepends = [
- base containers microlens microlens-mtl mtl
+ base containers directory filepath microlens microlens-mtl mtl
];
testHaskellDepends = [
base blaze-builder bytestring Cabal containers deepseq HUnit
@@ -255977,18 +256464,18 @@ self: {
"wai-enforce-https" = callPackage
({ mkDerivation, base, bytestring, case-insensitive, hspec
- , http-types, network, text, wai, wai-extra, warp, warp-tls
+ , http-types, network, text, wai, wai-extra
}:
mkDerivation {
pname = "wai-enforce-https";
- version = "0.0.1";
- sha256 = "0gm4n57abmbawpij3hsn6ia283b75sn40387dimpp573q5nnnwmv";
+ version = "0.0.2";
+ sha256 = "0p3j438knirr32j6dhqscws93h3ygk6lvw97r489h8i1dip9rqll";
isLibrary = true;
isExecutable = true;
+ enableSeparateDataOutput = true;
libraryHaskellDepends = [
base bytestring case-insensitive http-types network text wai
];
- executableHaskellDepends = [ base http-types wai warp warp-tls ];
testHaskellDepends = [
base bytestring case-insensitive hspec http-types wai wai-extra
];
@@ -255996,14 +256483,14 @@ self: {
license = stdenv.lib.licenses.bsd3;
}) {};
- "wai-enforce-https_0_0_2" = callPackage
+ "wai-enforce-https_0_0_2_1" = callPackage
({ mkDerivation, base, bytestring, case-insensitive, hspec
, http-types, network, text, wai, wai-extra
}:
mkDerivation {
pname = "wai-enforce-https";
- version = "0.0.2";
- sha256 = "0p3j438knirr32j6dhqscws93h3ygk6lvw97r489h8i1dip9rqll";
+ version = "0.0.2.1";
+ sha256 = "1mbhk50j1a47ydg5kd6bj3nbzqfq1abm1d1vcxc3smw4fgf39g5x";
isLibrary = true;
isExecutable = true;
enableSeparateDataOutput = true;
@@ -262081,6 +262568,34 @@ self: {
license = stdenv.lib.licenses.bsd3;
}) {};
+ "xeno_0_4_1" = callPackage
+ ({ mkDerivation, array, base, bytestring, bytestring-mmap, bzlib
+ , criterion, deepseq, filepath, ghc-prim, hexml, hexpat, hspec, mtl
+ , mutable-containers, time, vector, weigh, xml
+ }:
+ mkDerivation {
+ pname = "xeno";
+ version = "0.4.1";
+ sha256 = "0pnmbi6w4l1i8m5vjxgxpcx98b5rphm32ykzcvgdnvahv8mrqycy";
+ isLibrary = true;
+ isExecutable = true;
+ enableSeparateDataOutput = true;
+ libraryHaskellDepends = [
+ array base bytestring deepseq mtl mutable-containers vector
+ ];
+ executableHaskellDepends = [
+ base bytestring bytestring-mmap deepseq hexml time weigh
+ ];
+ testHaskellDepends = [ base bytestring hexml hspec ];
+ benchmarkHaskellDepends = [
+ base bytestring bzlib criterion deepseq filepath ghc-prim hexml
+ hexpat weigh xml
+ ];
+ description = "A fast event-based XML parser in pure Haskell";
+ license = stdenv.lib.licenses.bsd3;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ }) {};
+
"xenstore" = callPackage
({ mkDerivation, base, bytestring, cereal, mtl, network }:
mkDerivation {
@@ -264519,6 +265034,36 @@ self: {
license = stdenv.lib.licenses.bsd3;
}) {};
+ "yaml_0_11_3_0" = callPackage
+ ({ mkDerivation, aeson, attoparsec, base, base-compat, bytestring
+ , conduit, containers, directory, filepath, hspec, HUnit, libyaml
+ , mockery, mtl, raw-strings-qq, resourcet, scientific
+ , template-haskell, temporary, text, transformers
+ , unordered-containers, vector
+ }:
+ mkDerivation {
+ pname = "yaml";
+ version = "0.11.3.0";
+ sha256 = "01lafh83rp0v49f052vyv4gcbdgzcf42cmg0iqlykk6c586ksvh4";
+ configureFlags = [ "-fsystem-libyaml" ];
+ isLibrary = true;
+ isExecutable = true;
+ libraryHaskellDepends = [
+ aeson attoparsec base bytestring conduit containers directory
+ filepath libyaml mtl resourcet scientific template-haskell text
+ transformers unordered-containers vector
+ ];
+ testHaskellDepends = [
+ aeson attoparsec base base-compat bytestring conduit containers
+ directory filepath hspec HUnit libyaml mockery mtl raw-strings-qq
+ resourcet scientific template-haskell temporary text transformers
+ unordered-containers vector
+ ];
+ description = "Support for parsing and rendering YAML documents";
+ license = stdenv.lib.licenses.bsd3;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ }) {};
+
"yaml-combinators" = callPackage
({ mkDerivation, aeson, base, bytestring, doctest, generics-sop
, scientific, tasty, tasty-hunit, text, transformers
@@ -265962,43 +266507,6 @@ self: {
}) {};
"yesod-core" = callPackage
- ({ mkDerivation, aeson, async, auto-update, base, blaze-html
- , blaze-markup, bytestring, case-insensitive, cereal, clientsession
- , conduit, conduit-extra, containers, cookie, deepseq, fast-logger
- , gauge, hspec, hspec-expectations, http-types, HUnit, memory
- , monad-logger, mtl, network, parsec, path-pieces, primitive
- , random, resourcet, shakespeare, streaming-commons
- , template-haskell, text, time, transformers, unix-compat, unliftio
- , unordered-containers, vector, wai, wai-extra, wai-logger, warp
- , word8
- }:
- mkDerivation {
- pname = "yesod-core";
- version = "1.6.17.2";
- sha256 = "0rcfksbxnwcpg5qh9vjkddv39q95mx4nxzgix51bbwa128hhzcwf";
- libraryHaskellDepends = [
- aeson auto-update base blaze-html blaze-markup bytestring
- case-insensitive cereal clientsession conduit conduit-extra
- containers cookie deepseq fast-logger http-types memory
- monad-logger mtl parsec path-pieces primitive random resourcet
- shakespeare template-haskell text time transformers unix-compat
- unliftio unordered-containers vector wai wai-extra wai-logger warp
- word8
- ];
- testHaskellDepends = [
- async base bytestring clientsession conduit conduit-extra
- containers cookie hspec hspec-expectations http-types HUnit network
- path-pieces random resourcet shakespeare streaming-commons
- template-haskell text transformers unliftio wai wai-extra warp
- ];
- benchmarkHaskellDepends = [
- base blaze-html bytestring gauge shakespeare text
- ];
- description = "Creation of type-safe, RESTful web applications";
- license = stdenv.lib.licenses.mit;
- }) {};
-
- "yesod-core_1_6_17_3" = callPackage
({ mkDerivation, aeson, async, auto-update, base, blaze-html
, blaze-markup, bytestring, case-insensitive, cereal, clientsession
, conduit, conduit-extra, containers, cookie, deepseq, fast-logger
@@ -266033,7 +266541,6 @@ self: {
];
description = "Creation of type-safe, RESTful web applications";
license = stdenv.lib.licenses.mit;
- hydraPlatforms = stdenv.lib.platforms.none;
}) {};
"yesod-crud" = callPackage
@@ -266267,8 +266774,8 @@ self: {
}:
mkDerivation {
pname = "yesod-fb";
- version = "0.5.2";
- sha256 = "0srvdipwrmqi3wh8z51432dgr3kpgi5iw9ikbahv6swvhs5k8w41";
+ version = "0.6.0";
+ sha256 = "0anhnbwc9j11lm2sh8wi15p160vb9g0ng8lqc6g8am61jsxxw40x";
libraryHaskellDepends = [
aeson base bytestring conduit fb http-client-tls http-conduit
memory text wai yesod-core
@@ -268631,6 +269138,8 @@ self: {
pname = "zenhack-prelude";
version = "0.1.1.0";
sha256 = "07njs4zb976zxyiwg03ijvn1wvmx188ys49gckwybg1kl824x11f";
+ revision = "1";
+ editedCabalFile = "0sj45k2v33x3312yz1bdbck2bcv5q64mh7v7xy35ghp72ynw1z8z";
libraryHaskellDepends = [ base ];
description = "@zenhack's personal custom prelude";
license = stdenv.lib.licenses.mit;
@@ -269120,8 +269629,8 @@ self: {
}:
mkDerivation {
pname = "zip";
- version = "1.3.1";
- sha256 = "11dbbmwn81j6zmjnlxqz748jd9ywd18nhzr5pqkgk5kd3n27rd0j";
+ version = "1.3.2";
+ sha256 = "0nmqp34w82wzlkip9zk05dy4yjnwy8dc2k7n1kq0rrdsb9zsc360";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [
@@ -269139,7 +269648,7 @@ self: {
license = stdenv.lib.licenses.bsd3;
}) {};
- "zip_1_3_2" = callPackage
+ "zip_1_4_0" = callPackage
({ mkDerivation, base, bytestring, bzlib-conduit, case-insensitive
, cereal, conduit, conduit-extra, containers, digest, directory
, dlist, exceptions, filepath, hspec, monad-control, mtl
@@ -269148,8 +269657,8 @@ self: {
}:
mkDerivation {
pname = "zip";
- version = "1.3.2";
- sha256 = "0nmqp34w82wzlkip9zk05dy4yjnwy8dc2k7n1kq0rrdsb9zsc360";
+ version = "1.4.0";
+ sha256 = "07g17n6fr86c6c5yhs8ml53mk0g032060vja620bp32irfm00m2r";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [
@@ -269856,8 +270365,6 @@ self: {
];
description = "Password strength estimation based on zxcvbn";
license = stdenv.lib.licenses.mit;
- hydraPlatforms = stdenv.lib.platforms.none;
- broken = true;
}) {};
"zxcvbn-hs" = callPackage
@@ -269896,8 +270403,6 @@ self: {
];
description = "Password strength estimation based on zxcvbn";
license = stdenv.lib.licenses.mit;
- hydraPlatforms = stdenv.lib.platforms.none;
- broken = true;
}) {};
}
diff --git a/pkgs/development/haskell-modules/make-package-set.nix b/pkgs/development/haskell-modules/make-package-set.nix
index 17fb1ab8ae8..1418cfef057 100644
--- a/pkgs/development/haskell-modules/make-package-set.nix
+++ b/pkgs/development/haskell-modules/make-package-set.nix
@@ -124,7 +124,7 @@ let
sha256Arg = if sha256 == null then "--sha256=" else ''--sha256="${sha256}"'';
in buildPackages.stdenv.mkDerivation {
name = "cabal2nix-${name}";
- nativeBuildInputs = [ buildPackages.cabal2nix ];
+ nativeBuildInputs = [ buildPackages.cabal2nix-unwrapped ];
preferLocalBuild = true;
allowSubstitutes = false;
phases = ["installPhase"];
diff --git a/pkgs/development/haskell-modules/patches/git-annex-fix-build-with-ghc-8.8.x.patch b/pkgs/development/haskell-modules/patches/git-annex-fix-build-with-ghc-8.8.x.patch
deleted file mode 100644
index e28a1f5949e..00000000000
--- a/pkgs/development/haskell-modules/patches/git-annex-fix-build-with-ghc-8.8.x.patch
+++ /dev/null
@@ -1,125 +0,0 @@
-From f8d8959e43abd88c5e977079f0948e45cf4c0b0c Mon Sep 17 00:00:00 2001
-From: Peter Simons
-Date: Fri, 28 Feb 2020 11:56:48 +0100
-Subject: [PATCH] Fix build with ghc-8.8.x.
-
-The 'fail' method has been moved to the 'MonadFail' class. I made the changes
-so that the code still compiles with previous versions of 'base' that don't
-have the new MonadFail class exported by Prelude yet.
----
- CmdLine/GitAnnex/Options.hs | 5 +++--
- Command/Expire.hs | 5 +++--
- Command/Init.hs | 7 ++++---
- Utility/HumanTime.hs | 5 +++--
- 4 files changed, 13 insertions(+), 9 deletions(-)
-
-diff --git a/CmdLine/GitAnnex/Options.hs b/CmdLine/GitAnnex/Options.hs
-index 030c83dd5..a9a36d76f 100644
---- a/CmdLine/GitAnnex/Options.hs
-+++ b/CmdLine/GitAnnex/Options.hs
-@@ -9,6 +9,7 @@
-
- module CmdLine.GitAnnex.Options where
-
-+import Control.Monad.Fail as Fail ( MonadFail(..) )
- import Options.Applicative
- import qualified Data.Map as M
-
-@@ -215,8 +216,8 @@ parseAllOption = flag' WantAllKeys
- <> help "operate on all versions of all files"
- )
-
--parseKey :: Monad m => String -> m Key
--parseKey = maybe (fail "invalid key") return . deserializeKey
-+parseKey :: MonadFail m => String -> m Key
-+parseKey = maybe (Fail.fail "invalid key") return . deserializeKey
-
- -- Options to match properties of annexed files.
- annexedMatchingOptions :: [GlobalOption]
-diff --git a/Command/Expire.hs b/Command/Expire.hs
-index 83c38e569..37dc33883 100644
---- a/Command/Expire.hs
-+++ b/Command/Expire.hs
-@@ -17,6 +17,7 @@ import Annex.VectorClock
- import qualified Remote
- import Utility.HumanTime
-
-+import Control.Monad.Fail as Fail ( MonadFail(..) )
- import Data.Time.Clock.POSIX
- import qualified Data.Map as M
-
-@@ -105,9 +106,9 @@ parseExpire ps = do
- Nothing -> giveup $ "bad expire time: " ++ s
- Just d -> Just (now - durationToPOSIXTime d)
-
--parseActivity :: Monad m => String -> m Activity
-+parseActivity :: MonadFail m => String -> m Activity
- parseActivity s = case readish s of
-- Nothing -> fail $ "Unknown activity. Choose from: " ++
-+ Nothing -> Fail.fail $ "Unknown activity. Choose from: " ++
- unwords (map show [minBound..maxBound :: Activity])
- Just v -> return v
-
-diff --git a/Command/Init.hs b/Command/Init.hs
-index db6cb14fb..879a1110f 100644
---- a/Command/Init.hs
-+++ b/Command/Init.hs
-@@ -13,6 +13,7 @@ import Annex.Version
- import Types.RepoVersion
- import qualified Annex.SpecialRemote
-
-+import Control.Monad.Fail as Fail ( MonadFail(..) )
- import qualified Data.Map as M
-
- cmd :: Command
-@@ -33,14 +34,14 @@ optParser desc = InitOptions
- <> help "Override default annex.version"
- ))
-
--parseRepoVersion :: Monad m => String -> m RepoVersion
-+parseRepoVersion :: MonadFail m => String -> m RepoVersion
- parseRepoVersion s = case RepoVersion <$> readish s of
-- Nothing -> fail $ "version parse error"
-+ Nothing -> Fail.fail $ "version parse error"
- Just v
- | v `elem` supportedVersions -> return v
- | otherwise -> case M.lookup v autoUpgradeableVersions of
- Just v' -> return v'
-- Nothing -> fail $ s ++ " is not a currently supported repository version"
-+ Nothing -> Fail.fail $ s ++ " is not a currently supported repository version"
-
- seek :: InitOptions -> CommandSeek
- seek = commandAction . start
-diff --git a/Utility/HumanTime.hs b/Utility/HumanTime.hs
-index 01fbeacfb..d2e70f332 100644
---- a/Utility/HumanTime.hs
-+++ b/Utility/HumanTime.hs
-@@ -19,6 +19,7 @@ module Utility.HumanTime (
- import Utility.PartialPrelude
- import Utility.QuickCheck
-
-+import Control.Monad.Fail as Fail ( MonadFail(..) )
- import qualified Data.Map as M
- import Data.Time.Clock
- import Data.Time.Clock.POSIX (POSIXTime)
-@@ -44,7 +45,7 @@ daysToDuration :: Integer -> Duration
- daysToDuration i = Duration $ i * dsecs
-
- {- Parses a human-input time duration, of the form "5h", "1m", "5h1m", etc -}
--parseDuration :: Monad m => String -> m Duration
-+parseDuration :: MonadFail m => String -> m Duration
- parseDuration = maybe parsefail (return . Duration) . go 0
- where
- go n [] = return n
-@@ -55,7 +56,7 @@ parseDuration = maybe parsefail (return . Duration) . go 0
- u <- M.lookup c unitmap
- go (n + num * u) rest
- _ -> return $ n + num
-- parsefail = fail "duration parse error; expected eg \"5m\" or \"1h5m\""
-+ parsefail = Fail.fail "duration parse error; expected eg \"5m\" or \"1h5m\""
-
- fromDuration :: Duration -> String
- fromDuration Duration { durationSeconds = d }
---
-2.25.1
-
diff --git a/pkgs/development/interpreters/wasmer/default.nix b/pkgs/development/interpreters/wasmer/default.nix
index 37baf241db6..d3d9cf87207 100644
--- a/pkgs/development/interpreters/wasmer/default.nix
+++ b/pkgs/development/interpreters/wasmer/default.nix
@@ -8,17 +8,17 @@
rustPlatform.buildRustPackage rec {
pname = "wasmer";
- version = "0.13.0";
+ version = "0.16.2";
src = fetchFromGitHub {
owner = "wasmerio";
repo = pname;
rev = version;
- sha256 = "1k9zd2vhrbvxlpkh21m39alk5lfhd3xa25k0awis27plfpv8fqcq";
+ sha256 = "124zq772kz9a7n3qpxgmp4awqj41l8mhhwc0y3r77i1q02i1sy7z";
fetchSubmodules = true;
};
- cargoSha256 = "101y3zcnbl0w0zv2k0bhqk5d0xj8m2h6ww9r366j9b1y54cqj4b7";
+ cargoSha256 = "1qqysvcviimpm2zhzsbn8vhy91rxzaknh9hv75y38xd5ggnnh9m6";
nativeBuildInputs = [ cmake pkg-config ];
diff --git a/pkgs/development/libraries/boost/1.62.nix b/pkgs/development/libraries/boost/1.62.nix
deleted file mode 100644
index a1b3c51d0e6..00000000000
--- a/pkgs/development/libraries/boost/1.62.nix
+++ /dev/null
@@ -1,12 +0,0 @@
-{ stdenv, callPackage, fetchurl, ... } @ args:
-
-callPackage ./generic.nix (args // {
- version = "1.62.0";
-
- src = fetchurl {
- url = "mirror://sourceforge/boost/boost_1_62_0.tar.bz2";
- # long-form SHA256 from www.boost.org
- sha256 = "36c96b0f6155c98404091d8ceb48319a28279ca0333fba1ad8611eb90afb2ca0";
- };
-
-})
diff --git a/pkgs/development/libraries/boost/1.63.nix b/pkgs/development/libraries/boost/1.63.nix
deleted file mode 100644
index a8b459f4b12..00000000000
--- a/pkgs/development/libraries/boost/1.63.nix
+++ /dev/null
@@ -1,12 +0,0 @@
-{ stdenv, callPackage, fetchurl, ... } @ args:
-
-callPackage ./generic.nix (args // {
- version = "1.63.0";
-
- src = fetchurl {
- url = "mirror://sourceforge/boost/boost_1_63_0.tar.bz2";
- # SHA256 from http://www.boost.org/users/history/version_1_63_0.html
- sha256 = "beae2529f759f6b3bf3f4969a19c2e9d6f0c503edcb2de4a61d1428519fcb3b0";
- };
-
-})
diff --git a/pkgs/development/libraries/boost/1.64.nix b/pkgs/development/libraries/boost/1.64.nix
deleted file mode 100644
index 32632f79d22..00000000000
--- a/pkgs/development/libraries/boost/1.64.nix
+++ /dev/null
@@ -1,12 +0,0 @@
-{ stdenv, callPackage, fetchurl, ... } @ args:
-
-callPackage ./generic.nix (args // {
- version = "1.64.0";
-
- src = fetchurl {
- url = "mirror://sourceforge/boost/boost_1_64_0.tar.bz2";
- # SHA256 from http://www.boost.org/users/history/version_1_64_0.html
- sha256 = "7bcc5caace97baa948931d712ea5f37038dbb1c5d89b43ad4def4ed7cb683332";
- };
-
-})
diff --git a/pkgs/development/libraries/dqlite/default.nix b/pkgs/development/libraries/dqlite/default.nix
index 84b4b1bab77..5f84440df45 100644
--- a/pkgs/development/libraries/dqlite/default.nix
+++ b/pkgs/development/libraries/dqlite/default.nix
@@ -5,13 +5,13 @@ with stdenv.lib;
stdenv.mkDerivation rec {
pname = "dqlite";
- version = "1.0.0";
+ version = "1.4.0";
src = fetchFromGitHub {
owner = "canonical";
repo = pname;
rev = "v${version}";
- sha256 = "0670c1c84lcf5vl3h6mlff00fz2fnm766bzlk526sjjzysx3zjya";
+ sha256 = "19snm6cicxagcw9ys2jmjf6fchzs6pwm7h4jmyr0pn6zks2yjf1i";
};
nativeBuildInputs = [ autoreconfHook file pkgconfig ];
@@ -33,7 +33,7 @@ stdenv.mkDerivation rec {
'';
homepage = https://github.com/CanonicalLtd/dqlite/;
license = licenses.asl20;
- maintainers = with maintainers; [ joko ];
+ maintainers = with maintainers; [ joko wucke13 ];
platforms = platforms.unix;
};
}
diff --git a/pkgs/development/libraries/howard-hinnant-date/default.nix b/pkgs/development/libraries/howard-hinnant-date/default.nix
index 185af3dff31..df6e4329388 100644
--- a/pkgs/development/libraries/howard-hinnant-date/default.nix
+++ b/pkgs/development/libraries/howard-hinnant-date/default.nix
@@ -2,13 +2,13 @@
stdenv.mkDerivation rec {
pname = "howard-hinnant-date-unstable";
- version = "2020-01-24";
+ version = "2020-03-09";
src = fetchFromGitHub {
owner = "HowardHinnant";
repo = "date";
- rev = "9a0ee2542848ab8625984fc8cdbfb9b5414c0082";
- sha256 = "0yxsn0hj22n61bjywysxqgfv7hj5xvsl6isma95fl8xrimpny083";
+ rev = "4c1968b8f038483037cadfdbad3215ce21d934bb";
+ sha256 = "0dywrf18v1znfnz0gdxgi2ydax466zq34gc1vvg2k7vq17a30wq3";
};
patches = [
diff --git a/pkgs/development/libraries/libinsane/default.nix b/pkgs/development/libraries/libinsane/default.nix
new file mode 100644
index 00000000000..d37ae942656
--- /dev/null
+++ b/pkgs/development/libraries/libinsane/default.nix
@@ -0,0 +1,47 @@
+{ stdenv
+, lib
+, meson
+, ninja
+, fetchFromGitLab
+, pkg-config
+, glib
+, docbook_xsl
+, sane-backends
+, gobject-introspection
+, vala
+, gtk-doc
+, valgrind
+, doxygen
+, cunit
+}:
+
+stdenv.mkDerivation rec {
+ pname = "libinsane";
+ version = "1.0.3";
+
+ outputs = [ "out" "dev" "devdoc" ];
+
+ src = fetchFromGitLab {
+ domain = "gitlab.gnome.org";
+ repo = "libinsane";
+ group = "World";
+ owner = "OpenPaperwork";
+ rev = version;
+ sha256 = "1x2pl4ahqjc6ql97v7fnyna0qrnw3bxmqg3lyi5biyajfhg9nvql";
+ };
+
+ nativeBuildInputs = [ meson pkg-config ninja doxygen gtk-doc docbook_xsl gobject-introspection vala ];
+
+ buildInputs = [ sane-backends glib ];
+
+ checkInputs = [ cunit valgrind ];
+
+ doCheck = true;
+
+ meta = {
+ description = "Crossplatform access to image scanners (paper eaters only)";
+ homepage = "https://openpaper.work/en/projects/";
+ license = lib.licenses.lgpl3Plus;
+ maintainers = [ lib.maintainers.symphorien ];
+ };
+}
diff --git a/pkgs/development/libraries/ndi/default.nix b/pkgs/development/libraries/ndi/default.nix
index fcf9457c691..7a4407a17f0 100644
--- a/pkgs/development/libraries/ndi/default.nix
+++ b/pkgs/development/libraries/ndi/default.nix
@@ -2,21 +2,22 @@
stdenv.mkDerivation rec {
pname = "ndi";
- version = "4";
+ fullVersion = "4.1.6";
+ version = builtins.head (builtins.splitVersion fullVersion);
src = requireFile rec {
name = "InstallNDISDK_v${version}_Linux.tar.gz";
- sha256 = "1hac5npyg8nifs9ipj34pkn0zjyx8774x3i3h8znhmijx2j2982p";
+ sha256 = "0hki805j3hlci6w5ca2cajm5q0y9yihgvpsykkn8dzx8chw4pmsk";
message = ''
- In order to use the NDI SDK, you need to comply with NewTek's license and
- download the Linux version ${version} tarball from:
+ In order to use NDI SDK version ${fullVersion}, you need to comply with
+ NewTek's license and download the appropriate Linux tarball from:
- ${meta.homepage}
+ ${meta.homepage}
Once you have downloaded the file, please use the following command and
re-run the installation:
- nix-prefetch-url file://\$PWD/${name}
+ \$ nix-prefetch-url file://\$PWD/${name}
'';
};
diff --git a/pkgs/development/libraries/openjpeg/2.x.nix b/pkgs/development/libraries/openjpeg/2.x.nix
index 24f3752ef43..fe0e5aeb691 100644
--- a/pkgs/development/libraries/openjpeg/2.x.nix
+++ b/pkgs/development/libraries/openjpeg/2.x.nix
@@ -23,5 +23,15 @@ callPackage ./generic.nix (args // rec {
name = "CVE-2019-12973-2.patch";
sha256 = "1jkkfw13l7nx4hxdhc7z17f4vfgqcaf09zpl235kypbxx1ygc7vq";
})
+ (fetchpatch {
+ url = "https://github.com/uclouvain/openjpeg/commit/024b8407392cb0b82b04b58ed256094ed5799e04.patch";
+ name = "CVE-2020-6851.patch";
+ sha256 = "1lfwlzqxb69cwzjp8v9lijz4c2qhf3b8m6sq1khipqlgrb3l58xw";
+ })
+ (fetchpatch {
+ url = "https://github.com/uclouvain/openjpeg/commit/05f9b91e60debda0e83977e5e63b2e66486f7074.patch";
+ name = "CVE-2020-8112.patch";
+ sha256 = "16kykc8wbq9kx9w9kkf3i7snak82m184qrl9bpxvkjl7h0n9aw49";
+ })
];
})
diff --git a/pkgs/development/libraries/raft-canonical/default.nix b/pkgs/development/libraries/raft-canonical/default.nix
index 515fbc602d9..201c332dfdd 100644
--- a/pkgs/development/libraries/raft-canonical/default.nix
+++ b/pkgs/development/libraries/raft-canonical/default.nix
@@ -2,13 +2,13 @@
stdenv.mkDerivation rec {
pname = "raft-canonical";
- version = "0.9.6";
+ version = "0.9.17";
src = fetchFromGitHub {
owner = "canonical";
repo = "raft";
rev = "v${version}";
- sha256 = "083il7b5kw3pc7m5p9xjpb9dlvfarc51sni92mkgm9ckc32x9vpp";
+ sha256 = "0q444wd6wz85g4zjkdsrf8z7chkjq9rxzq8l6fh37mgf7c23hv09";
};
nativeBuildInputs = [ autoreconfHook file pkgconfig ];
@@ -18,12 +18,14 @@ stdenv.mkDerivation rec {
substituteInPlace configure --replace /usr/bin/ " "
'';
- doCheck = false;
- # Due to
- #io_uv_recv/success/first [ ERROR ]
- #Error: test/lib/dir.c:97: No such file or directory
+ # test fails
+ #
+ #append/finalizeSegment [ ERROR ]
+ #Error: test/integration/test_uv_append.c:264: assertion failed: test_dir_has_file(f->dir, "0000000000000001-0000000000000004") is not true
#Error: child killed by signal 6 (Aborted)
+ doCheck = false;
+
outputs = [ "dev" "out" ];
meta = with stdenv.lib; {
@@ -39,6 +41,6 @@ stdenv.mkDerivation rec {
'';
homepage = "https://github.com/canonical/raft";
license = licenses.asl20;
- maintainers = [ maintainers.wucke13 ];
+ maintainers = with maintainers; [ wucke13 ];
};
}
diff --git a/pkgs/development/libraries/science/math/petsc/default.nix b/pkgs/development/libraries/science/math/petsc/default.nix
index c2eda9dac48..492ad63f27b 100644
--- a/pkgs/development/libraries/science/math/petsc/default.nix
+++ b/pkgs/development/libraries/science/math/petsc/default.nix
@@ -1,17 +1,12 @@
-{ stdenv
-, fetchurl
-, blas
-, gfortran
-, liblapack
-, python }:
+{ stdenv , fetchurl , blas , gfortran , liblapack , python }:
stdenv.mkDerivation rec {
pname = "petsc";
- version = "3.8.4";
+ version = "3.12.4";
src = fetchurl {
url = "http://ftp.mcs.anl.gov/pub/petsc/release-snapshots/petsc-${version}.tar.gz";
- sha256 = "1iy49gagxncx09d88kxnwkj876p35683mpfk33x37165si6xqy4z";
+ sha256 = "1hw4f12v2xwrs37gjh83dbixhg0yxandqx7s7k5vlfx91l9l3aan";
};
nativeBuildInputs = [ blas gfortran.cc.lib liblapack python ];
@@ -26,7 +21,7 @@ stdenv.mkDerivation rec {
configureFlagsArray=(
$configureFlagsArray
"--CC=$CC"
- "--with-cxx=0"
+ "--with-cxx=g++"
"--with-fc=0"
"--with-mpi=0"
"--with-blas-lib=[${blas}/lib/libblas.a,${gfortran.cc.lib}/lib/libgfortran.a]"
@@ -34,17 +29,14 @@ stdenv.mkDerivation rec {
)
'';
- postInstall = ''
- rm $out/bin/petscmpiexec
- rm $out/bin/popup
- rm $out/bin/uncrustify.cfg
- rm -rf $out/bin/win32fe
- '';
-
- meta = {
- description = "Library of linear algebra algorithms for solving partial differential equations";
- homepage = https://www.mcs.anl.gov/petsc/index.html;
- platforms = stdenv.lib.platforms.all;
- license = stdenv.lib.licenses.bsd2;
+ meta = with stdenv.lib; {
+ description = ''
+ Library of linear algebra algorithms for solving partial differential
+ equations
+ '';
+ homepage = "https://www.mcs.anl.gov/petsc/index.html";
+ license = licenses.bsd2;
+ maintainers = with maintainers; [ wucke13 ];
+ platforms = platforms.all;
};
}
diff --git a/pkgs/development/libraries/wcslib/default.nix b/pkgs/development/libraries/wcslib/default.nix
index 8363f774c24..0b57d099319 100644
--- a/pkgs/development/libraries/wcslib/default.nix
+++ b/pkgs/development/libraries/wcslib/default.nix
@@ -1,14 +1,14 @@
{ fetchurl, stdenv, flex }:
stdenv.mkDerivation rec {
- version = "7.1";
+ version = "7.2";
pname = "wcslib";
buildInputs = [ flex ];
src = fetchurl {
url = "ftp://ftp.atnf.csiro.au/pub/software/wcslib/${pname}-${version}.tar.bz2";
- sha256 ="05ji2v4la8h6azprb8x2zh6wrswxsq8cqw9zml0layc4nfg79fzh";
+ sha256 ="0fbf6ypq7ag9dmjn65ja5vbfxswb6511bja8rbna25wmhns9x5b3";
};
prePatch = ''
@@ -20,7 +20,7 @@ stdenv.mkDerivation rec {
meta = {
description = "World Coordinate System Library for Astronomy";
- homepage = https://www.atnf.csiro.au/people/mcalabre/WCS/;
+ homepage = "https://www.atnf.csiro.au/people/mcalabre/WCS/";
longDescription = ''Library for world coordinate systems for
spherical geometries and their conversion to image coordinate
diff --git a/pkgs/development/ocaml-modules/earley/default.nix b/pkgs/development/ocaml-modules/earley/default.nix
index ab3011361e1..f47231a242e 100644
--- a/pkgs/development/ocaml-modules/earley/default.nix
+++ b/pkgs/development/ocaml-modules/earley/default.nix
@@ -1,4 +1,8 @@
-{ lib, fetchurl, buildDunePackage }:
+{ lib, fetchurl, ocaml, buildDunePackage }:
+
+if lib.versionAtLeast ocaml.version "4.08"
+then throw "earley is not available for OCaml ${ocaml.version}"
+else
buildDunePackage rec {
version = "2.0.0";
diff --git a/pkgs/development/ocaml-modules/earlybird/default.nix b/pkgs/development/ocaml-modules/earlybird/default.nix
index 1a98c748e45..decbb411767 100644
--- a/pkgs/development/ocaml-modules/earlybird/default.nix
+++ b/pkgs/development/ocaml-modules/earlybird/default.nix
@@ -1,7 +1,11 @@
-{ lib, fetchurl, buildDunePackage, angstrom, angstrom-lwt-unix,
+{ lib, fetchurl, ocaml, buildDunePackage, angstrom, angstrom-lwt-unix,
batteries, cmdliner, lwt_ppx, ocaml_lwt, ppx_deriving_yojson,
ppx_tools_versioned, yojson }:
+if lib.versionAtLeast ocaml.version "4.08"
+then throw "earlybird is not available for OCaml ${ocaml.version}"
+else
+
buildDunePackage rec {
pname = "earlybird";
version = "0.1.5";
diff --git a/pkgs/development/ocaml-modules/ocf/default.nix b/pkgs/development/ocaml-modules/ocf/default.nix
index 0452b1b7dfe..e90d13de3b3 100644
--- a/pkgs/development/ocaml-modules/ocf/default.nix
+++ b/pkgs/development/ocaml-modules/ocf/default.nix
@@ -1,6 +1,7 @@
{ stdenv, fetchFromGitHub, fetchpatch, ocaml, findlib, ppx_tools, yojson }:
if stdenv.lib.versionOlder ocaml.version "4.03"
+|| stdenv.lib.versionAtLeast ocaml.version "4.08"
then throw "ocf not supported for ocaml ${ocaml.version}"
else
stdenv.mkDerivation rec {
diff --git a/pkgs/development/ocaml-modules/ppx_tools_versioned/default.nix b/pkgs/development/ocaml-modules/ppx_tools_versioned/default.nix
index 03cadad7ff4..7fd939e58ec 100644
--- a/pkgs/development/ocaml-modules/ppx_tools_versioned/default.nix
+++ b/pkgs/development/ocaml-modules/ppx_tools_versioned/default.nix
@@ -2,19 +2,19 @@
buildDunePackage rec {
pname = "ppx_tools_versioned";
- version = "5.2.3";
+ version = "5.3.0";
src = fetchFromGitHub {
owner = "ocaml-ppx";
repo = pname;
rev = version;
- sha256 = "1hcmpnw26zf70a71r3d2c2c0mn8q084gdn1r36ynng6fv9hq6j0y";
+ sha256 = "0c735w9mq49dmvkdw9ahfwh0icsk2sbhnfwmdhpibj86phfm17yj";
};
propagatedBuildInputs = [ ocaml-migrate-parsetree ];
meta = with lib; {
- homepage = https://github.com/let-def/ppx_tools_versioned;
+ homepage = "https://github.com/let-def/ppx_tools_versioned";
description = "Tools for authors of syntactic tools (such as ppx rewriters)";
license = licenses.gpl2;
maintainers = [ maintainers.volth ];
diff --git a/pkgs/development/ocaml-modules/sedlex/2.nix b/pkgs/development/ocaml-modules/sedlex/2.nix
index 09390a27343..26c35b98339 100644
--- a/pkgs/development/ocaml-modules/sedlex/2.nix
+++ b/pkgs/development/ocaml-modules/sedlex/2.nix
@@ -1,16 +1,15 @@
-{ stdenv
+{ lib
, fetchFromGitHub
, fetchurl
+, buildDunePackage
, ocaml
-, dune
-, findlib
, gen
, ppx_tools_versioned
, ocaml-migrate-parsetree
, uchar
}:
-if stdenv.lib.versionOlder ocaml.version "4.02.3"
+if lib.versionOlder ocaml.version "4.02.3"
then throw "sedlex is not available for OCaml ${ocaml.version}"
else
@@ -28,8 +27,8 @@ let
sha256 = "0gsb1jpj3mnqbjgbavi4l95gl6g4agq58j82km22fdfg63j3w3fk";
};
in
-stdenv.mkDerivation rec {
- name = "ocaml${ocaml.version}-sedlex-${version}";
+buildDunePackage rec {
+ pname = "sedlex";
version = "2.1";
src = fetchFromGitHub {
@@ -39,7 +38,7 @@ stdenv.mkDerivation rec {
sha256 = "05f6qa8x3vhpdz1fcnpqk37fpnyyq13icqsk2gww5idjnh6kng26";
};
- buildInputs = [ ocaml findlib dune ppx_tools_versioned ocaml-migrate-parsetree ];
+ buildInputs = [ ppx_tools_versioned ocaml-migrate-parsetree ];
propagatedBuildInputs = [ gen uchar ];
@@ -49,21 +48,14 @@ stdenv.mkDerivation rec {
ln -s ${PropList} src/generator/data/PropList.txt
'';
- buildFlags = [ "build" ];
-
- installPhase = ''
- make INSTALL_ARGS="--prefix=$out --libdir=$OCAMLFIND_DESTDIR" install
- '';
-
- createFindlibDestdir = true;
+ doCheck = true;
dontStrip = true;
meta = {
homepage = https://github.com/ocaml-community/sedlex;
description = "An OCaml lexer generator for Unicode";
- license = stdenv.lib.licenses.mit;
- inherit (ocaml.meta) platforms;
- maintainers = [ stdenv.lib.maintainers.marsam ];
+ license = lib.licenses.mit;
+ maintainers = [ lib.maintainers.marsam ];
};
}
diff --git a/pkgs/development/ocaml-modules/wasm/default.nix b/pkgs/development/ocaml-modules/wasm/default.nix
index e10a67a50a0..fe3d4ea0e86 100644
--- a/pkgs/development/ocaml-modules/wasm/default.nix
+++ b/pkgs/development/ocaml-modules/wasm/default.nix
@@ -1,6 +1,7 @@
{ stdenv, fetchFromGitHub, ocaml, findlib, ocamlbuild }:
if !stdenv.lib.versionAtLeast ocaml.version "4.02"
+ || stdenv.lib.versionAtLeast ocaml.version "4.08"
then throw "wasm is not available for OCaml ${ocaml.version}"
else
diff --git a/pkgs/development/python-modules/bravado-core/default.nix b/pkgs/development/python-modules/bravado-core/default.nix
new file mode 100644
index 00000000000..55a12009a15
--- /dev/null
+++ b/pkgs/development/python-modules/bravado-core/default.nix
@@ -0,0 +1,52 @@
+{ lib, buildPythonPackage, fetchFromGitHub, python-dateutil, jsonref, jsonschema,
+ pyyaml, simplejson, six, pytz, msgpack, swagger-spec-validator, rfc3987,
+ strict-rfc3339, webcolors, mypy-extensions, jsonpointer, idna, pytest, mock,
+ pytest-benchmark, isPy27, enum34 }:
+
+buildPythonPackage rec {
+ pname = "bravado-core";
+ version = "5.16.1";
+
+ src = fetchFromGitHub {
+ owner = "Yelp";
+ repo = pname;
+ rev = "v${version}";
+ sha256 = "0r9gk5vkjbc407fjydms3ik3hnzajq54znyz58d8rm6pvqcvjjpl";
+ };
+
+ checkInputs = [
+ mypy-extensions
+ pytest
+ mock
+ pytest-benchmark
+ ];
+
+ checkPhase = ''pytest --benchmark-skip'';
+
+ propagatedBuildInputs = [
+ python-dateutil
+ jsonref
+ jsonschema
+ pyyaml
+ simplejson
+ six
+ pytz
+ msgpack
+ swagger-spec-validator
+
+ # the following 3 packages are included when jsonschema (3.2) is installed
+ # as jsonschema[format], which reflects what happens in setup.py
+ rfc3987
+ strict-rfc3339
+ webcolors
+ jsonpointer
+ idna
+ ] ++ lib.optionals isPy27 [ enum34 ];
+
+ meta = with lib; {
+ description = "Library for adding Swagger support to clients and servers";
+ homepage = "https://github.com/Yelp/bravado-core";
+ license = licenses.bsd3;
+ maintainers = with maintainers; [ vanschelven ];
+ };
+}
diff --git a/pkgs/development/python-modules/convertdate/default.nix b/pkgs/development/python-modules/convertdate/default.nix
new file mode 100644
index 00000000000..5a8608c5037
--- /dev/null
+++ b/pkgs/development/python-modules/convertdate/default.nix
@@ -0,0 +1,23 @@
+{ stdenv, buildPythonPackage, fetchFromGitHub, pymeeus, pytz }:
+
+buildPythonPackage rec {
+ pname = "convertdate";
+ version = "2.2.0";
+
+ # Tests are not available in the PyPI tarball so use GitHub instead.
+ src = fetchFromGitHub {
+ owner = "fitnr";
+ repo = pname;
+ rev = "v${version}";
+ sha256 = "04j8k7a9qndmawy3m345py74y18hw7lb6gc0qp0mr8d68x99xjq0";
+ };
+
+ propagatedBuildInputs = [ pymeeus pytz ];
+
+ meta = with stdenv.lib; {
+ homepage = "https://github.com/fitnr/convertdate";
+ description = "Utils for converting between date formats and calculating holidays";
+ license = licenses.mit;
+ maintainers = with maintainers; [ jluttine ];
+ };
+}
diff --git a/pkgs/development/python-modules/fastapi/default.nix b/pkgs/development/python-modules/fastapi/default.nix
index 75edf5dc424..daec9218a1d 100644
--- a/pkgs/development/python-modules/fastapi/default.nix
+++ b/pkgs/development/python-modules/fastapi/default.nix
@@ -1,6 +1,7 @@
{ lib
, buildPythonPackage
, fetchFromGitHub
+, fetchurl
, uvicorn
, starlette
, pydantic
@@ -10,11 +11,12 @@
, pyjwt
, passlib
, aiosqlite
+, peewee
}:
buildPythonPackage rec {
pname = "fastapi";
- version = "0.45.0";
+ version = "0.49.0";
format = "flit";
disabled = !isPy3k;
@@ -22,7 +24,7 @@ buildPythonPackage rec {
owner = "tiangolo";
repo = "fastapi";
rev = version;
- sha256 = "1qwh382ny6qa3zi64micdq4j7dc64zv4rfd8g91j0digd4rhs6i1";
+ sha256 = "1dw5f2xvn0fqqsy29ypba8v3444cy7dvc7gkpmnhshky0rmfni3n";
};
propagatedBuildInputs = [
@@ -37,16 +39,9 @@ buildPythonPackage rec {
pyjwt
passlib
aiosqlite
+ peewee
];
- # starlette pinning kept in place due to 0.12.9 being a hard
- # dependency luckily fastapi is currently the only dependent on
- # starlette. Please remove pinning when possible
- postPatch = ''
- substituteInPlace pyproject.toml \
- --replace "pydantic >=0.32.2,<=0.32.2" "pydantic"
- '';
-
checkPhase = ''
pytest --ignore=tests/test_default_response_class.py
'';
diff --git a/pkgs/development/python-modules/hickle/default.nix b/pkgs/development/python-modules/hickle/default.nix
index 8d45970294c..bc8c741ec2b 100644
--- a/pkgs/development/python-modules/hickle/default.nix
+++ b/pkgs/development/python-modules/hickle/default.nix
@@ -6,20 +6,23 @@
, astropy
, scipy
, pandas
+, codecov
, pytest
, pytestcov
, pytestrunner
, coveralls
+, twine
+, check-manifest
, lib
}:
buildPythonPackage rec {
pname = "hickle";
- version = "3.4.5";
+ version = "3.4.6";
src = fetchPypi {
inherit pname version;
- sha256 = "1d1qj3yl7635lgkqacz9r8fyhv71396l748ww4wy05ibpignjm2x";
+ sha256 = "026r6yg3amsi8k8plzsbw5rnifym6sc17y011daqyvcpb7mfs94b";
};
postPatch = ''
@@ -28,7 +31,9 @@ buildPythonPackage rec {
'';
propagatedBuildInputs = [ h5py numpy dill ];
- checkInputs = [ pytest pytestcov pytestrunner coveralls scipy pandas astropy ];
+ checkInputs = [
+ pytest pytestcov pytestrunner coveralls scipy pandas astropy twine check-manifest codecov
+ ];
meta = {
description = "Serialize Python data to HDF5";
diff --git a/pkgs/development/python-modules/holidays/default.nix b/pkgs/development/python-modules/holidays/default.nix
index ebde21a4821..eeaf449971b 100644
--- a/pkgs/development/python-modules/holidays/default.nix
+++ b/pkgs/development/python-modules/holidays/default.nix
@@ -1,18 +1,18 @@
-{ stdenv, buildPythonPackage, fetchPypi , six, dateutil }:
+{ stdenv, buildPythonPackage, fetchPypi, six, dateutil, convertdate }:
buildPythonPackage rec {
pname = "holidays";
- version = "0.9.12";
+ version = "0.10.1";
src = fetchPypi {
inherit pname version;
- sha256 = "3182c4a6fef8d01a829468362ace9c3bba7645873610535fef53454dbb4ea092";
+ sha256 = "1dx39krafb6cdnd7h5vgwmw4y075s6k3d31a6vhwvqhmdig3294h";
};
- propagatedBuildInputs = [ six dateutil ];
+ propagatedBuildInputs = [ six dateutil convertdate ];
meta = with stdenv.lib; {
- homepage = https://github.com/dr-prodigy/python-holidays;
+ homepage = "https://github.com/dr-prodigy/python-holidays";
description = "Generate and work with holidays in Python";
license = licenses.mit;
maintainers = with maintainers; [ jluttine ];
diff --git a/pkgs/development/python-modules/i3ipc/default.nix b/pkgs/development/python-modules/i3ipc/default.nix
index 482a51a099e..707a58ff85e 100644
--- a/pkgs/development/python-modules/i3ipc/default.nix
+++ b/pkgs/development/python-modules/i3ipc/default.nix
@@ -1,24 +1,37 @@
{ stdenv, buildPythonPackage, fetchFromGitHub
, enum-compat
-, xorgserver, pytest, i3, python
+, xorgserver, pytest, pytest-xvfb, pytest-asyncio, i3, python, xlib, xdpyinfo
+, makeFontsConf, coreutils
}:
buildPythonPackage rec {
pname = "i3ipc";
- version = "1.6.0";
+ version = "2.1.1";
src = fetchFromGitHub {
owner = "acrisci";
repo = "i3ipc-python";
rev = "v${version}";
- sha256 = "0sb525wvwcnikjaqzha94xr97r1gjys30csmaj17swlxgyczxvq5";
+ sha256 = "10zpbiw1gcndn439g1vxcdkxllwp02qcmaal4w7hi2rzgaw1xkdk";
};
+ propagatedBuildInputs = [ enum-compat xlib ];
- propagatedBuildInputs = [ enum-compat ];
+ fontsConf = makeFontsConf {
+ fontDirectories = [ ];
+ };
+ FONTCONFIG_FILE = fontsConf; # Fontconfig error: Cannot load default config file
+ checkInputs = [ pytest xdpyinfo pytest-asyncio pytest-xvfb xorgserver i3 ];
- checkInputs = [ xorgserver pytest i3 ];
+ postPatch = ''
+ substituteInPlace test/i3.config \
+ --replace /bin/true ${coreutils}/bin/true
+ '';
+
+ checkPhase = ''
+ py.test --ignore=test/aio/test_shutdown_event.py \
+ --ignore=test/test_shutdown_event.py
+ '';
- checkPhase = ''${python.interpreter} run-tests.py'';
meta = with stdenv.lib; {
description = "An improved Python library to control i3wm and sway";
diff --git a/pkgs/development/python-modules/jupyterlab/default.nix b/pkgs/development/python-modules/jupyterlab/default.nix
index 55ade7db9ca..3faa0a2edc3 100644
--- a/pkgs/development/python-modules/jupyterlab/default.nix
+++ b/pkgs/development/python-modules/jupyterlab/default.nix
@@ -8,12 +8,12 @@
buildPythonPackage rec {
pname = "jupyterlab";
- version = "1.2.6";
+ version = "2.0.0";
disabled = pythonOlder "3.5";
src = fetchPypi {
inherit pname version;
- sha256 = "0mc3nrj7fc5q2ajr09m261j386jsp8qjljg8anghlh8czc9ln4s2";
+ sha256 = "17p8rpihid0103fyjndk2yvg18n3ypn3hxay92ckcv10vsbiys5b";
};
propagatedBuildInputs = [ jupyterlab_server notebook ];
diff --git a/pkgs/development/python-modules/klaus/default.nix b/pkgs/development/python-modules/klaus/default.nix
index d1218ab49b7..a2d171fbb9a 100644
--- a/pkgs/development/python-modules/klaus/default.nix
+++ b/pkgs/development/python-modules/klaus/default.nix
@@ -2,13 +2,13 @@
buildPythonPackage rec {
pname = "klaus";
- version = "1.5.1";
+ version = "1.5.2";
src = fetchFromGitHub {
owner = "jonashaag";
repo = pname;
rev = version;
- sha256 = "1432m3ki2g4ma10pfv310q1w4da46b0y2jklb8ajbz8a09ms6mfx";
+ sha256 = "12b96jgiv9y7zmkqqj3dh0fbbm3ps8gbqk925qrhh56zqjl66kx2";
};
prePatch = ''
diff --git a/pkgs/development/python-modules/matrix-nio/default.nix b/pkgs/development/python-modules/matrix-nio/default.nix
index c7631f0c5b2..f8c1222fb3f 100644
--- a/pkgs/development/python-modules/matrix-nio/default.nix
+++ b/pkgs/development/python-modules/matrix-nio/default.nix
@@ -20,13 +20,13 @@
buildPythonPackage rec {
pname = "nio";
- version = "0.7.1";
+ version = "0.8.0";
src = fetchFromGitHub {
owner = "poljar";
repo = "matrix-nio";
rev = version;
- sha256 = "05cggfhsfa0irvzc7x3fndv6n0zszxxhmlv89r5rkrl5wvrhbb2h";
+ sha256 = "151c59a913y6kx99g7g3mhpgbgavwic1mh21nfrr9x0rm98ilay9";
};
nativeBuildInputs = [
diff --git a/pkgs/development/python-modules/pyicloud/default.nix b/pkgs/development/python-modules/pyicloud/default.nix
index 1c6fe286db5..7bc52f74701 100644
--- a/pkgs/development/python-modules/pyicloud/default.nix
+++ b/pkgs/development/python-modules/pyicloud/default.nix
@@ -15,11 +15,11 @@
buildPythonPackage rec {
pname = "pyicloud";
- version = "0.9.2";
+ version = "0.9.4";
src = fetchPypi {
inherit pname version;
- sha256 = "1jjkzf7vwms6pymnmdr893830vrymxnq455xnqp21wqhjjiy2amd";
+ sha256 = "0r171wnq2g5bw7gd59vh6flm0104ix1a6s2vhdrf8s74hipw57si";
};
propagatedBuildInputs = [
diff --git a/pkgs/development/python-modules/pyinsane2/default.nix b/pkgs/development/python-modules/pyinsane2/default.nix
deleted file mode 100644
index 8f96ebe915a..00000000000
--- a/pkgs/development/python-modules/pyinsane2/default.nix
+++ /dev/null
@@ -1,45 +0,0 @@
-{ stdenv
-, buildPythonPackage
-, fetchPypi
-, nose
-, pillow
-, pkgs
-}:
-
-buildPythonPackage rec {
- pname = "pyinsane2";
- version = "2.0.13";
-
- src = fetchPypi {
- inherit pname version;
- sha256 = "0d519531d552e4512776225eb400a6a4a9bfc83a08918ec7fea19cb2fa7ec4ee";
- };
-
- # This is needed by setup.py regardless of whether tests are enabled.
- buildInputs = [ nose ];
- propagatedBuildInputs = [ pillow ];
-
- postPatch = ''
- # pyinsane2 forks itself, so we need to re-inject the PYTHONPATH.
- sed -i -e '/os.putenv.*PYINSANE_DAEMON/ {
- a \ os.putenv("PYTHONPATH", ":".join(sys.path))
- }' pyinsane2/sane/abstract_proc.py
-
- sed -i -e 's,"libsane.so.1","${pkgs.sane-backends}/lib/libsane.so",' \
- pyinsane2/sane/rawapi.py
- '';
-
- # Tests require a scanner to be physically connected, so let's just do a
- # quick check whether initialization works.
- checkPhase = ''
- python -c 'import pyinsane2; pyinsane2.init()'
- '';
-
- meta = with stdenv.lib; {
- homepage = "https://github.com/jflesch/pyinsane";
- description = "Access and use image scanners";
- license = licenses.gpl3Plus;
- platforms = platforms.linux;
- };
-
-}
diff --git a/pkgs/development/python-modules/pymeeus/default.nix b/pkgs/development/python-modules/pymeeus/default.nix
new file mode 100644
index 00000000000..4c8097325bc
--- /dev/null
+++ b/pkgs/development/python-modules/pymeeus/default.nix
@@ -0,0 +1,24 @@
+{ stdenv, buildPythonPackage, fetchPypi, pytest }:
+
+buildPythonPackage rec {
+ pname = "PyMeeus";
+ version = "0.3.7";
+
+ src = fetchPypi {
+ inherit pname version;
+ sha256 = "0qjnk9sc65i4by2x4zm6w941a4i31fmhgwbkpbqkk87rwq4h4hsn";
+ };
+
+ checkInputs = [ pytest ];
+
+ checkPhase = ''
+ pytest .
+ '';
+
+ meta = with stdenv.lib; {
+ homepage = "https://github.com/architest/pymeeus";
+ description = "Library of astronomical algorithms";
+ license = licenses.lgpl3;
+ maintainers = with maintainers; [ jluttine ];
+ };
+}
diff --git a/pkgs/development/python-modules/pyocr/default.nix b/pkgs/development/python-modules/pyocr/default.nix
index ca606767f4d..8cfce9ba43f 100644
--- a/pkgs/development/python-modules/pyocr/default.nix
+++ b/pkgs/development/python-modules/pyocr/default.nix
@@ -1,10 +1,10 @@
-{ lib, fetchFromGitLab, buildPythonPackage, pillow, six
-, tesseract, cuneiform, isPy3k, substituteAll, pytest, tox
-}:
+{ lib, fetchFromGitLab, buildPythonPackage, pillow, setuptools_scm,
+setuptools-scm-git-archive , tesseract, cuneiform, isPy3k, substituteAll,
+pytest, tox }:
buildPythonPackage rec {
pname = "pyocr";
- version = "0.5.3";
+ version = "0.7.2";
disabled = !isPy3k;
# Don't fetch from PYPI because it doesn't contain tests.
@@ -14,7 +14,7 @@ buildPythonPackage rec {
owner = "OpenPaperwork";
repo = "pyocr";
rev = version;
- sha256 = "1nihf0qmbpg3yj3yp11jp6hp5z5dqf39nz6j9lqbvgi1nqbs7x15";
+ sha256 = "09ab86bmizpv94w3mdvdqkjyyvk1vafw3jqhkiw5xx7p180xn3il";
};
patches = [ (substituteAll {
@@ -23,38 +23,8 @@ buildPythonPackage rec {
})
];
- postPatch = ''
- echo 'version = "${version}"' > src/pyocr/_version.py
-
- # Disable specific tests that are probably failing because of this issue:
- # https://github.com/jflesch/pyocr/issues/52
- for test in $disabledTests; do
- file="''${test%%:*}"
- fun="''${test#*:}"
- echo "import pytest" >> "tests/tests_$file.py"
- echo "$fun = pytest.mark.skip($fun)" >> "tests/tests_$file.py"
- done
- '';
-
- disabledTests = [
- "cuneiform:TestTxt.test_basic"
- "cuneiform:TestTxt.test_european"
- "cuneiform:TestTxt.test_french"
- "cuneiform:TestWordBox.test_basic"
- "cuneiform:TestWordBox.test_european"
- "cuneiform:TestWordBox.test_french"
- "libtesseract:TestBasicDoc.test_basic"
- "libtesseract:TestDigitLineBox.test_digits"
- "libtesseract:TestLineBox.test_japanese"
- "libtesseract:TestTxt.test_japanese"
- "libtesseract:TestWordBox.test_japanese"
- "libtesseract:TestTxt.test_multi"
- "tesseract:TestTxt.test_multi"
- "tesseract:TestDigitLineBox.test_digits"
- "tesseract:TestTxt.test_japanese"
- ];
-
- propagatedBuildInputs = [ pillow six ];
+ buildInputs = [ setuptools_scm setuptools-scm-git-archive ];
+ propagatedBuildInputs = [ pillow ];
checkInputs = [ pytest tox ];
checkPhase = "pytest";
diff --git a/pkgs/development/python-modules/pyocr/paths.patch b/pkgs/development/python-modules/pyocr/paths.patch
index 9350d4050da..55cbf7d48da 100644
--- a/pkgs/development/python-modules/pyocr/paths.patch
+++ b/pkgs/development/python-modules/pyocr/paths.patch
@@ -1,9 +1,9 @@
-Index: current/src/pyocr/cuneiform.py
-===================================================================
---- current.orig/src/pyocr/cuneiform.py
-+++ current/src/pyocr/cuneiform.py
-@@ -27,13 +27,9 @@ from . import error
- from . import util
+diff --git a/src/pyocr/cuneiform.py b/src/pyocr/cuneiform.py
+index 2e5b717..35647e2 100644
+--- a/src/pyocr/cuneiform.py
++++ b/src/pyocr/cuneiform.py
+@@ -25,13 +25,9 @@ from . import builders
+ from .error import CuneiformError
-# CHANGE THIS IF CUNEIFORM IS NOT IN YOUR PATH, OR IS NAMED DIFFERENTLY
@@ -18,25 +18,34 @@ Index: current/src/pyocr/cuneiform.py
LANGUAGES_LINE_PREFIX = "Supported languages: "
LANGUAGES_SPLIT_RE = re.compile("[^a-z]")
-Index: current/src/pyocr/libtesseract/tesseract_raw.py
-===================================================================
---- current.orig/src/pyocr/libtesseract/tesseract_raw.py
-+++ current/src/pyocr/libtesseract/tesseract_raw.py
-@@ -1,52 +1,13 @@
- import ctypes
+diff --git a/src/pyocr/libtesseract/tesseract_raw.py b/src/pyocr/libtesseract/tesseract_raw.py
+index a068e73..9ebea5c 100644
+--- a/src/pyocr/libtesseract/tesseract_raw.py
++++ b/src/pyocr/libtesseract/tesseract_raw.py
+@@ -2,7 +2,6 @@ import ctypes
+ import locale
import logging
import os
-import sys
from ..error import TesseractError
-
+@@ -10,48 +9,16 @@ from ..error import TesseractError
logger = logging.getLogger(__name__)
--TESSDATA_PREFIX = os.getenv('TESSDATA_PREFIX', None)
+ TESSDATA_PREFIX = os.getenv('TESSDATA_PREFIX', None)
-libnames = []
++if TESSDATA_PREFIX is None:
++ TESSDATA_PREFIX = '@tesseract@/share/tessdata'
++ os.environ['TESSDATA_PREFIX'] = TESSDATA_PREFIX
++
++
+ # 70 is the minimum credible dpi for tesseract and force it to compute an
+ # estimate of the image dpi
+ DPI_DEFAULT = 70
+
-
--if getattr(sys, 'frozen', False):
+-if getattr(sys, 'frozen', False): # pragma: no cover
- # Pyinstaller integration
- libnames += [os.path.join(sys._MEIPASS, "libtesseract-4.dll")]
- libnames += [os.path.join(sys._MEIPASS, "libtesseract-3.dll")]
@@ -51,7 +60,7 @@ Index: current/src/pyocr/libtesseract/tesseract_raw.py
- TESSDATA_PREFIX = tessdata
-
-
--if sys.platform[:3] == "win":
+-if sys.platform[:3] == "win": # pragma: no cover
- libnames += [
- # Jflesch> Don't they have the equivalent of LD_LIBRARY_PATH on
- # Windows ?
@@ -76,15 +85,16 @@ Index: current/src/pyocr/libtesseract/tesseract_raw.py
g_libtesseract = None
-@@ -346,12 +307,11 @@ def init(lang=None):
+@@ -364,12 +331,12 @@ def init(lang=None):
try:
if lang:
lang = lang.encode("utf-8")
- prefix = None
-- if TESSDATA_PREFIX:
+- if TESSDATA_PREFIX: # pragma: no cover
- prefix = TESSDATA_PREFIX.encode("utf-8")
-+ prefix = os.getenv('TESSDATA_PREFIX', '@tesseract@/share/tessdata')
-+ os.environ['TESSDATA_PREFIX'] = prefix
++
++ prefix = TESSDATA_PREFIX
++
g_libtesseract.TessBaseAPIInit3(
ctypes.c_void_p(handle),
- ctypes.c_char_p(prefix),
@@ -92,11 +102,11 @@ Index: current/src/pyocr/libtesseract/tesseract_raw.py
ctypes.c_char_p(lang)
)
g_libtesseract.TessBaseAPISetVariable(
-Index: current/src/pyocr/tesseract.py
-===================================================================
---- current.orig/src/pyocr/tesseract.py
-+++ current/src/pyocr/tesseract.py
-@@ -31,8 +31,7 @@ from .builders import DigitBuilder # ba
+diff --git a/src/pyocr/tesseract.py b/src/pyocr/tesseract.py
+index 7c30852..44e8446 100644
+--- a/src/pyocr/tesseract.py
++++ b/src/pyocr/tesseract.py
+@@ -28,8 +28,7 @@ from .builders import DigitBuilder # backward compatibility
from .error import TesseractError # backward compatibility
from .util import digits_only
@@ -106,3 +116,233 @@ Index: current/src/pyocr/tesseract.py
TESSDATA_EXTENSION = ".traineddata"
+diff --git a/tests/tests_cuneiform.py b/tests/tests_cuneiform.py
+index 45b7f6a..95f55c6 100644
+--- a/tests/tests_cuneiform.py
++++ b/tests/tests_cuneiform.py
+@@ -21,7 +21,7 @@ class TestCuneiform(BaseTest):
+ # XXX is it useful?
+ which.return_value = True
+ self.assertTrue(cuneiform.is_available())
+- which.assert_called_once_with("cuneiform")
++ which.assert_called_once_with("@cuneiform@/bin/cuneiform")
+
+ @patch("subprocess.Popen")
+ def test_version(self, popen):
+@@ -54,7 +54,7 @@ class TestCuneiform(BaseTest):
+ self.assertIn("eng", langs)
+ self.assertIn("fra", langs)
+ popen.assert_called_once_with(
+- ["cuneiform", "-l"],
++ ["@cuneiform@/bin/cuneiform", "-l"],
+ stdout=subprocess.PIPE, stderr=subprocess.STDOUT
+ )
+
+@@ -109,7 +109,7 @@ class TestCuneiformTxt(BaseTest):
+ output = cuneiform.image_to_string(self.image)
+ self.assertEqual(output, self._get_file_content("text").strip())
+ popen.assert_called_once_with(
+- ["cuneiform", "-f", "text", "-o", self.tmp_filename, "-"],
++ ["@cuneiform@/bin/cuneiform", "-f", "text", "-o", self.tmp_filename, "-"],
+ stdin=subprocess.PIPE, stdout=subprocess.PIPE,
+ stderr=subprocess.STDOUT
+ )
+@@ -125,7 +125,7 @@ class TestCuneiformTxt(BaseTest):
+ builder=self.builder)
+ self.assertEqual(output, self._get_file_content("text").strip())
+ popen.assert_called_once_with(
+- ["cuneiform", "-l", "fra", "-f", "text", "-o", self.tmp_filename,
++ ["@cuneiform@/bin/cuneiform", "-l", "fra", "-f", "text", "-o", self.tmp_filename,
+ "-"],
+ stdin=subprocess.PIPE, stdout=subprocess.PIPE,
+ stderr=subprocess.STDOUT
+@@ -142,7 +142,7 @@ class TestCuneiformTxt(BaseTest):
+ builder=self.builder)
+ self.assertEqual(output, self._get_file_content("text").strip())
+ popen.assert_called_once_with(
+- ["cuneiform", "-f", "text", "-o", self.tmp_filename, "-"],
++ ["@cuneiform@/bin/cuneiform", "-f", "text", "-o", self.tmp_filename, "-"],
+ stdin=subprocess.PIPE, stdout=subprocess.PIPE,
+ stderr=subprocess.STDOUT
+ )
+@@ -173,7 +173,7 @@ class TestCuneiformTxt(BaseTest):
+ output = cuneiform.image_to_string(image, builder=self.builder)
+ self.assertEqual(output, self._get_file_content("text").strip())
+ popen.assert_called_once_with(
+- ["cuneiform", "-f", "text", "-o", self.tmp_filename, "-"],
++ ["@cuneiform@/bin/cuneiform", "-f", "text", "-o", self.tmp_filename, "-"],
+ stdin=subprocess.PIPE, stdout=subprocess.PIPE,
+ stderr=subprocess.STDOUT
+ )
+@@ -227,7 +227,7 @@ class TestCuneiformWordBox(BaseTest):
+ output = cuneiform.image_to_string(self.image,
+ builder=self.builder)
+ popen.assert_called_once_with(
+- ["cuneiform", "-f", "hocr", "-o", self.tmp_filename, "-"],
++ ["@cuneiform@/bin/cuneiform", "-f", "hocr", "-o", self.tmp_filename, "-"],
+ stdin=subprocess.PIPE, stdout=subprocess.PIPE,
+ stderr=subprocess.STDOUT
+ )
+@@ -280,7 +280,7 @@ class TestCuneiformLineBox(BaseTest):
+ output = cuneiform.image_to_string(self.image,
+ builder=self.builder)
+ popen.assert_called_once_with(
+- ["cuneiform", "-f", "hocr", "-o", self.tmp_filename, "-"],
++ ["@cuneiform@/bin/cuneiform", "-f", "hocr", "-o", self.tmp_filename, "-"],
+ stdin=subprocess.PIPE, stdout=subprocess.PIPE,
+ stderr=subprocess.STDOUT
+ )
+diff --git a/tests/tests_libtesseract.py b/tests/tests_libtesseract.py
+index ad7fdc9..57e7a60 100644
+--- a/tests/tests_libtesseract.py
++++ b/tests/tests_libtesseract.py
+@@ -165,7 +165,8 @@ class TestLibTesseractRaw(BaseTest):
+ args = libtess.TessBaseAPIInit3.call_args[0]
+ self.assertEqual(len(args), 3)
+ self.assertEqual(args[0].value, self.handle)
+- self.assertEqual(args[1].value, None)
++ # we hardcode tesseract data, so we don't get None
++ #self.assertEqual(args[1].value, None)
+ self.assertEqual(args[2].value, lang.encode() if lang else None)
+
+ self.assertEqual(
+@@ -201,7 +202,8 @@ class TestLibTesseractRaw(BaseTest):
+ args = libtess.TessBaseAPIInit3.call_args[0]
+ self.assertEqual(len(args), 3)
+ self.assertEqual(args[0].value, self.handle)
+- self.assertEqual(args[1].value, None)
++ # we hardcode tesseract data, so we don't get None
++ #self.assertEqual(args[1].value, None)
+ self.assertEqual(args[2].value, lang.encode() if lang else None)
+
+ self.assertEqual(
+diff --git a/tests/tests_tesseract.py b/tests/tests_tesseract.py
+index 1a55567..a24d96f 100644
+--- a/tests/tests_tesseract.py
++++ b/tests/tests_tesseract.py
+@@ -36,7 +36,7 @@ class TestTesseract(BaseTest):
+ def test_available(self, which):
+ which.return_value = True
+ self.assertTrue(tesseract.is_available())
+- which.assert_called_once_with("tesseract")
++ which.assert_called_once_with("@tesseract@/bin/tesseract")
+
+ @patch("subprocess.Popen")
+ def test_version_error(self, popen):
+@@ -156,7 +156,7 @@ class TestTesseract(BaseTest):
+ for lang in ("eng", "fra", "jpn", "osd"):
+ self.assertIn(lang, langs)
+ popen.assert_called_once_with(
+- ["tesseract", "--list-langs"],
++ ["@tesseract@/bin/tesseract", "--list-langs"],
+ startupinfo=None, creationflags=0,
+ stdout=subprocess.PIPE, stderr=subprocess.STDOUT
+ )
+@@ -171,7 +171,7 @@ class TestTesseract(BaseTest):
+ self.assertEqual(te.exception.status, 1)
+ self.assertEqual("unable to get languages", te.exception.message)
+ popen.assert_called_once_with(
+- ["tesseract", "--list-langs"],
++ ["@tesseract@/bin/tesseract", "--list-langs"],
+ startupinfo=None, creationflags=0,
+ stdout=subprocess.PIPE, stderr=subprocess.STDOUT
+ )
+@@ -248,7 +248,7 @@ class TestTesseract(BaseTest):
+ self.assertEqual(status, 0)
+ self.assertEqual(error, message)
+ popen.assert_called_once_with(
+- ["tesseract", "input.bmp", "output"],
++ ["@tesseract@/bin/tesseract", "input.bmp", "output"],
+ cwd=tmpdir,
+ startupinfo=None,
+ creationflags=0,
+@@ -271,7 +271,7 @@ class TestTesseract(BaseTest):
+ self.assertEqual(status, 0)
+ self.assertEqual(error, message)
+ popen.assert_called_with(
+- ["tesseract", "input2.bmp", "output2", "-l", "fra", "--psm", "3"],
++ ["@tesseract@/bin/tesseract", "input2.bmp", "output2", "-l", "fra", "--psm", "3"],
+ cwd=tmpdir,
+ startupinfo=None,
+ creationflags=0,
+@@ -302,7 +302,7 @@ class TestTesseract(BaseTest):
+ self.assertEqual(result["angle"], 90)
+ self.assertEqual(result["confidence"], 9.30)
+ popen.assert_called_once_with(
+- ["tesseract", "input.bmp", "stdout", "--psm", "0"],
++ ["@tesseract@/bin/tesseract", "input.bmp", "stdout", "--psm", "0"],
+ stdin=subprocess.PIPE,
+ shell=False,
+ startupinfo=None,
+@@ -338,7 +338,7 @@ class TestTesseract(BaseTest):
+ self.assertEqual(result["angle"], 90)
+ self.assertEqual(result["confidence"], 9.30)
+ popen.assert_called_once_with(
+- ["tesseract", "input.bmp", "stdout", "--psm", "0"],
++ ["@tesseract@/bin/tesseract", "input.bmp", "stdout", "--psm", "0"],
+ stdin=subprocess.PIPE,
+ shell=False,
+ startupinfo=None,
+@@ -371,7 +371,7 @@ class TestTesseract(BaseTest):
+ self.assertEqual(result["angle"], 90)
+ self.assertEqual(result["confidence"], 9.30)
+ popen.assert_called_once_with(
+- ["tesseract", "input.bmp", "stdout",
++ ["@tesseract@/bin/tesseract", "input.bmp", "stdout",
+ "--psm", "0", "-l", "osd"],
+ stdin=subprocess.PIPE,
+ shell=False,
+@@ -399,7 +399,7 @@ class TestTesseract(BaseTest):
+ with self.assertRaises(tesseract.TesseractError) as te:
+ tesseract.detect_orientation(self.image)
+ popen.assert_called_once_with(
+- ["tesseract", "input.bmp", "stdout", "--psm", "0"],
++ ["@tesseract@/bin/tesseract", "input.bmp", "stdout", "--psm", "0"],
+ stdin=subprocess.PIPE,
+ shell=False,
+ startupinfo=None,
+@@ -433,7 +433,7 @@ class TestTesseract(BaseTest):
+ with self.assertRaises(tesseract.TesseractError) as te:
+ tesseract.detect_orientation(self.image)
+ popen.assert_called_once_with(
+- ["tesseract", "input.bmp", "stdout", "--psm", "0"],
++ ["@tesseract@/bin/tesseract", "input.bmp", "stdout", "--psm", "0"],
+ stdin=subprocess.PIPE,
+ shell=False,
+ startupinfo=None,
+@@ -467,7 +467,7 @@ class TestTesseract(BaseTest):
+ self.assertEqual(result["angle"], 90)
+ self.assertEqual(result["confidence"], 9.30)
+ popen.assert_called_once_with(
+- ["tesseract", "input.bmp", "stdout", "-psm", "0"],
++ ["@tesseract@/bin/tesseract", "input.bmp", "stdout", "-psm", "0"],
+ stdin=subprocess.PIPE,
+ shell=False,
+ startupinfo=None,
+@@ -500,7 +500,7 @@ class TestTesseract(BaseTest):
+ self.assertEqual(result["angle"], 90)
+ self.assertEqual(result["confidence"], 9.30)
+ popen.assert_called_once_with(
+- ["tesseract", "input.bmp", "stdout", "-psm", "0", "-l", "fra"],
++ ["@tesseract@/bin/tesseract", "input.bmp", "stdout", "-psm", "0", "-l", "fra"],
+ stdin=subprocess.PIPE,
+ shell=False,
+ startupinfo=None,
+@@ -527,7 +527,7 @@ class TestTesseract(BaseTest):
+ with self.assertRaises(tesseract.TesseractError) as te:
+ tesseract.detect_orientation(self.image)
+ popen.assert_called_once_with(
+- ["tesseract", "input.bmp", "stdout", "-psm", "0"],
++ ["@tesseract@/bin/tesseract", "input.bmp", "stdout", "-psm", "0"],
+ stdin=subprocess.PIPE,
+ shell=False,
+ startupinfo=None,
+@@ -561,7 +561,7 @@ class TestTesseract(BaseTest):
+ with self.assertRaises(tesseract.TesseractError) as te:
+ tesseract.detect_orientation(self.image)
+ popen.assert_called_once_with(
+- ["tesseract", "input.bmp", "stdout", "-psm", "0"],
++ ["@tesseract@/bin/tesseract", "input.bmp", "stdout", "-psm", "0"],
+ stdin=subprocess.PIPE,
+ shell=False,
+ startupinfo=None,
diff --git a/pkgs/development/python-modules/starlette/default.nix b/pkgs/development/python-modules/starlette/default.nix
index a2170db1bd4..a6d93465ffc 100644
--- a/pkgs/development/python-modules/starlette/default.nix
+++ b/pkgs/development/python-modules/starlette/default.nix
@@ -1,7 +1,7 @@
{ lib
, stdenv
, buildPythonPackage
-, fetchPypi
+, fetchFromGitHub
, aiofiles
, graphene
, itsdangerous
@@ -20,12 +20,20 @@
buildPythonPackage rec {
pname = "starlette";
- version = "0.13.0";
+
+ # This is not the latest version of Starlette, however, later
+ # versions of Starlette break FastAPI due to
+ # https://github.com/tiangolo/fastapi/issues/683. Please update when
+ # possible. FastAPI is currently Starlette's only dependent.
+
+ version = "0.12.9";
disabled = isPy27;
- src = fetchPypi {
- inherit pname version;
- sha256 = "6bd414152d40d000ccbf6aa40ed89718b40868366a0f69fb83034f416303acef";
+ src = fetchFromGitHub {
+ owner = "encode";
+ repo = pname;
+ rev = version;
+ sha256 = "0w44s8ynzy8w8dgm755c8jina9i4dd87vqkcv7jc1kwkg384w9i5";
};
propagatedBuildInputs = [
diff --git a/pkgs/development/tools/analysis/tflint/default.nix b/pkgs/development/tools/analysis/tflint/default.nix
index c98eba0abe6..1b22cb2dc03 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.15.0";
+ version = "0.15.1";
src = fetchFromGitHub {
owner = "terraform-linters";
repo = pname;
rev = "v${version}";
- sha256 = "0j1bx2180z6znfrg8k4sjwvm3cbvnklqjxdssbr2yd47h8kfwk3g";
+ sha256 = "12a1jg4vcp6w72j8nsxf162i616g303cs783wlsa9iwm4w0cpb2h";
};
- modSha256 = "1qa7qfxpc43n9xyyfcd24d17g4fdcffkd57ny078ja219x13kay3";
+ modSha256 = "1k26i01sdgx9yik5fnd8kv300d8llqpvj9qpvga7hsbk58s2g8mv";
subPackages = [ "." ];
diff --git a/pkgs/development/tools/haskell/vaultenv/default.nix b/pkgs/development/tools/haskell/vaultenv/default.nix
index 419f4530dca..1d901cb723c 100644
--- a/pkgs/development/tools/haskell/vaultenv/default.nix
+++ b/pkgs/development/tools/haskell/vaultenv/default.nix
@@ -6,11 +6,11 @@
}:
mkDerivation rec {
pname = "vaultenv";
- version = "0.13.0";
+ version = "0.13.1";
src = fetchzip {
url = "https://github.com/channable/vaultenv/archive/v${version}.tar.gz";
- sha256 = "0kz5p57fq855mhbqrpb737sqrax9cdcyh2g57460hc8fyvs97lq0";
+ sha256 = "0ycf5skxjns77sgbm8faq9ps9rs2hqznsbzrd51hdkpak56k42cp";
};
buildTools = [ hpack ];
diff --git a/pkgs/development/tools/heroku/default.nix b/pkgs/development/tools/heroku/default.nix
index 1e2359f1003..1867f33bfa8 100644
--- a/pkgs/development/tools/heroku/default.nix
+++ b/pkgs/development/tools/heroku/default.nix
@@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
pname = "heroku";
- version = "7.38.1";
+ version = "7.39.0";
src = fetchurl {
url = "https://cli-assets.heroku.com/heroku-v${version}/heroku-v${version}.tar.xz";
- sha256 = "1sa4ph4d5y48yz2n06aivqgl07ljlgwgf5ik431vnrz5smxl6ngr";
+ sha256 = "0jj5n1jw61scpli1a0115zyp8zsa3mmljzd72bm1n5c86ppdh8pa";
};
nativeBuildInputs = [ makeWrapper ];
diff --git a/pkgs/development/tools/hobbes/default.nix b/pkgs/development/tools/hobbes/default.nix
new file mode 100644
index 00000000000..b56afc0a435
--- /dev/null
+++ b/pkgs/development/tools/hobbes/default.nix
@@ -0,0 +1,40 @@
+{ stdenv, fetchFromGitHub, cmake, llvm_6, ncurses, readline, zlib }:
+
+stdenv.mkDerivation {
+ name = "hobbes";
+ version = "unstable-2020-03-10";
+
+ src = fetchFromGitHub {
+ owner = "morgan-stanley";
+ repo = "hobbes";
+ rev = "ae956df9da3f3b24630bc1757dfaa2a8952db07a";
+ sha256 = "1a0lb87vb0qcp5wy6swk4jcc88l7vhy6iflsk7zplw547mbjhjsy";
+ };
+
+ nativeBuildInputs = [
+ cmake
+ ];
+
+ buildInputs = [
+ llvm_6 # LLVM 6 is latest currently supported. See https://git.io/JvK6w.
+ ncurses
+ readline
+ zlib
+ ];
+
+ doCheck = false; # Running tests in NixOS hangs. See https://git.io/JvK7R.
+ checkTarget = "test";
+
+ meta = with stdenv.lib; {
+ description = "A language and an embedded JIT compiler";
+ longDescription = ''
+ Hobbes is a a language, embedded compiler, and runtime for efficient
+ dynamic expression evaluation, data storage and analysis.
+ '';
+ homepage = "https://github.com/Morgan-Stanley/hobbes";
+ license = licenses.asl20;
+ maintainers = [ maintainers.thmzlt ];
+ platforms = [ "x86_64-linux" "x86_64-darwin" ];
+ broken = stdenv.isDarwin;
+ };
+}
diff --git a/pkgs/development/tools/metals/default.nix b/pkgs/development/tools/metals/default.nix
index 415479edc84..6ac2d4404eb 100644
--- a/pkgs/development/tools/metals/default.nix
+++ b/pkgs/development/tools/metals/default.nix
@@ -2,7 +2,7 @@
let
baseName = "metals";
- version = "0.7.6";
+ version = "0.8.1";
deps = stdenv.mkDerivation {
name = "${baseName}-deps-${version}";
buildCommand = ''
@@ -15,7 +15,7 @@ let
'';
outputHashMode = "recursive";
outputHashAlgo = "sha256";
- outputHash = "03vx8n77mndpqbvq14cy3k9r4jwgjacrv56v5n87da8rqiclx37j";
+ outputHash = "0m1vly213cazylg1rmfh5qk3bq65aafa0rf1anfdb3ggymylwza0";
};
in
stdenv.mkDerivation rec {
diff --git a/pkgs/development/tools/misc/act/default.nix b/pkgs/development/tools/misc/act/default.nix
index 03bd2696cce..de1cf939e6a 100644
--- a/pkgs/development/tools/misc/act/default.nix
+++ b/pkgs/development/tools/misc/act/default.nix
@@ -2,16 +2,16 @@
buildGoModule rec {
pname = "act";
- version = "0.2.5";
+ version = "0.2.6";
src = fetchFromGitHub {
owner = "nektos";
repo = pname;
rev = "v${version}";
- sha256 = "00clafq3izvfwxkb85hf6s40yfw2hpsfz3xg4da28pgh1wlqb9ps";
+ sha256 = "0l7id483006mnii4rlcff4p0ricd8a2n24sf74a9b387x0akpbsn";
};
- modSha256 = "0ghp61m8fxg1iwq2ypmp99cqv3n16c06v2xzg9v34299vmd89gi2";
+ modSha256 = "04s4p9j6j7gw1s4v271zwzvdny7dvjaazd2pihmyjfik95xmwx9r";
buildFlagsArray = [ "-ldflags=-s -w -X main.version=${version}" ];
diff --git a/pkgs/development/tools/misc/inotify-tools/default.nix b/pkgs/development/tools/misc/inotify-tools/default.nix
index b04de1832ab..ead13e340d5 100644
--- a/pkgs/development/tools/misc/inotify-tools/default.nix
+++ b/pkgs/development/tools/misc/inotify-tools/default.nix
@@ -1,16 +1,23 @@
-{ stdenv, autoreconfHook, fetchFromGitHub }:
+{ stdenv, autoreconfHook, fetchFromGitHub, fetchpatch }:
stdenv.mkDerivation rec {
pname = "inotify-tools";
- version = "3.20.1";
+ version = "3.20.2.2";
src = fetchFromGitHub {
repo = "inotify-tools";
owner = "rvoicilas";
rev = version;
- sha256 = "14dci1i4mhsd5sa33k8h3ayphk19kizynh5ql9ryibdpmcanfiyq";
+ sha256 = "1r12bglkb0bkqff6kgxjm81hk6z20nrxq3m7iv15d4nrqf9pm7s0";
};
+ patches = [
+ (fetchpatch {
+ url = "https://github.com/inotify-tools/inotify-tools/commit/7ddf45158af0c1e93b02181a45c5b65a0e5bed25.patch";
+ sha256 = "08imqancx8l0bg9q7xaiql1xlalmbfnpjfjshp495sjais0r6gy7";
+ })
+ ];
+
nativeBuildInputs = [ autoreconfHook ];
meta = with stdenv.lib; {
diff --git a/pkgs/development/tools/packer/default.nix b/pkgs/development/tools/packer/default.nix
index bfc330276b0..1430f0fc2a3 100644
--- a/pkgs/development/tools/packer/default.nix
+++ b/pkgs/development/tools/packer/default.nix
@@ -1,7 +1,7 @@
{ stdenv, buildGoPackage, fetchFromGitHub }:
buildGoPackage rec {
pname = "packer";
- version = "1.5.1";
+ version = "1.5.4";
goPackagePath = "github.com/hashicorp/packer";
@@ -11,7 +11,7 @@ buildGoPackage rec {
owner = "hashicorp";
repo = "packer";
rev = "v${version}";
- sha256 = "0cj5nr2wjpw676wwx97pk4vfal4n13hm95bjl6600fj6m3491sh0";
+ sha256 = "06320crk5dldh7w3yi4pkx7hn3s0l8q1h9fqyzf56iw8sx7983g5";
};
meta = with stdenv.lib; {
diff --git a/pkgs/development/tools/rust/bindgen/default.nix b/pkgs/development/tools/rust/bindgen/default.nix
index c064ebc4e7e..2ca4b8070aa 100644
--- a/pkgs/development/tools/rust/bindgen/default.nix
+++ b/pkgs/development/tools/rust/bindgen/default.nix
@@ -3,7 +3,7 @@
rustPlatform.buildRustPackage rec {
pname = "rust-bindgen";
- version = "0.53.1";
+ version = "0.53.2";
RUSTFLAGS = "--cap-lints warn"; # probably OK to remove after update
@@ -11,10 +11,10 @@ rustPlatform.buildRustPackage rec {
owner = "rust-lang";
repo = pname;
rev = "v${version}";
- sha256 = "0zxqryqks9in9q7az0lrw8fq9wnc5p4yf6b1fxnzy2j6qhlw2c5c";
+ sha256 = "01dkaa2akqrhpxxf0g2zyfdb3nx16y14qsg0a9d5n92c4yyvmwjg";
};
- cargoSha256 = "1fdgm83l9d469garfbgny6jk1fvwnwh32sybz9g7s2qzrvzzrx1d";
+ cargoSha256 = "0pm9kh3qrcv5jsbrr476982lg1j31fbvxpzs4gphxl0mv1qmp4zm";
libclang = llvmPackages.libclang.lib; #for substituteAll
@@ -58,7 +58,7 @@ rustPlatform.buildRustPackage rec {
As with most compiler related software, this will only work
inside a nix-shell with the required libraries as buildInputs.
'';
- homepage = https://github.com/rust-lang/rust-bindgen;
+ homepage = "https://github.com/rust-lang/rust-bindgen";
license = with licenses; [ bsd3 ];
platforms = platforms.unix;
maintainers = [ maintainers.ralith ];
diff --git a/pkgs/development/web/nodejs/v13.nix b/pkgs/development/web/nodejs/v13.nix
index affb86bece8..c5e3f7c4bdb 100644
--- a/pkgs/development/web/nodejs/v13.nix
+++ b/pkgs/development/web/nodejs/v13.nix
@@ -5,6 +5,6 @@ let
in
buildNodejs {
inherit enableNpm;
- version = "13.10.1";
- sha256 = "14pvqwhilq210zn830zmh04a62rj3si0ijc4ihrhdf3dvghrx2c3";
+ version = "13.11.0";
+ sha256 = "07r9xwjmiip9zmgfq77f3av3p93adc5cphj07idph1l8ws1j2h75";
}
diff --git a/pkgs/games/empty-epsilon/default.nix b/pkgs/games/empty-epsilon/default.nix
index 6560db48cb3..29a789b4084 100644
--- a/pkgs/games/empty-epsilon/default.nix
+++ b/pkgs/games/empty-epsilon/default.nix
@@ -3,8 +3,8 @@
let
major = "2020";
- minor = "01";
- patch = "15";
+ minor = "02";
+ patch = "18";
version = "${major}.${minor}.${patch}";
@@ -16,7 +16,7 @@ let
owner = "daid";
repo = "SeriousProton";
rev = "EE-${version}";
- sha256 = "0isiy18dv22cpv7wdbvqss2afha719a7i76bvw4cs14vfsdx9s8w";
+ sha256 = "1cq32jm3p40h5mipb64i9b1kcid27bpc8g6j4k0v69cfqkjpha5c";
};
nativeBuildInputs = [ cmake ];
@@ -42,7 +42,7 @@ stdenv.mkDerivation {
owner = "daid";
repo = "EmptyEpsilon";
rev = "EE-${version}";
- sha256 = "0jklfap9jd9ynhvwzr9q4icvx5yb4sqm457vcar4jads4pwsd0xk";
+ sha256 = "1hl3mbg6pw2r7ri042vm86pb2xv77jvh6pag1z96bxvx791zcnwk";
};
nativeBuildInputs = [ cmake ];
@@ -60,7 +60,7 @@ stdenv.mkDerivation {
description = "Open source bridge simulator based on Artemis";
homepage = https://daid.github.io/EmptyEpsilon/;
license = licenses.gpl2Plus;
- maintainers = with maintainers; [ fpletz lheckemann ];
+ maintainers = with maintainers; [ fpletz lheckemann ma27 ];
platforms = platforms.linux;
};
}
diff --git a/pkgs/games/mnemosyne/default.nix b/pkgs/games/mnemosyne/default.nix
index 2fb67535951..38763073ac8 100644
--- a/pkgs/games/mnemosyne/default.nix
+++ b/pkgs/games/mnemosyne/default.nix
@@ -17,6 +17,8 @@ python.pkgs.buildPythonApplication rec {
buildInputs = [ anki ];
propagatedBuildInputs = with python.pkgs; [
+ googletrans
+ gtts
pyqtwebengine
pyqt5
matplotlib
diff --git a/pkgs/games/redeclipse/default.nix b/pkgs/games/redeclipse/default.nix
index 3002fc75e63..fc6f50ef97e 100644
--- a/pkgs/games/redeclipse/default.nix
+++ b/pkgs/games/redeclipse/default.nix
@@ -1,19 +1,19 @@
{ stdenv, fetchFromGitHub, fetchurl, fetchpatch
-, curl, ed, pkgconfig, zlib, libX11
+, curl, ed, pkgconfig, freetype, zlib, libX11
, SDL2, SDL2_image, SDL2_mixer
}:
stdenv.mkDerivation rec {
pname = "redeclipse";
- version = "1.6.0";
+ version = "2.0.0";
src = fetchurl {
url = "https://github.com/redeclipse/base/releases/download/v${version}/redeclipse_${version}_nix.tar.bz2";
- sha256 = "0j98zk7nivdsap4y50dlqnql17hdila1ikvps6vicwaqb3l4gaa8";
+ sha256 = "143i713ggbk607qr4n39pi0pn8d93x9x6fcbh8rc51jb9qhi8p5i";
};
buildInputs = [
- libX11 zlib
+ libX11 freetype zlib
SDL2 SDL2_image SDL2_mixer
];
@@ -23,15 +23,6 @@ stdenv.mkDerivation rec {
makeFlags = [ "-C" "src/" "prefix=$(out)" ];
- patches = [
- # "remove gamma name hack" - Can't find `____gammaf128_r_finite` otherwise
- # Is likely to be included in next release
- (fetchpatch {
- url = "https://github.com/red-eclipse/base/commit/b16b4963c1ad81bb9ef784bc4913a4c8ab5f1bb4.diff";
- sha256 = "1bm07qrq60bbmbf5k9255qq115mcyfphfy2f7xl1yx40mb9ns65p";
- })
- ];
-
enableParallelBuilding = true;
installTargets = [ "system-install" ];
diff --git a/pkgs/misc/lilypond/default.nix b/pkgs/misc/lilypond/default.nix
index e9f8d6984af..a740323b47f 100644
--- a/pkgs/misc/lilypond/default.nix
+++ b/pkgs/misc/lilypond/default.nix
@@ -57,7 +57,7 @@ stdenv.mkDerivation {
meta = with stdenv.lib; {
description = "Music typesetting system";
- homepage = http://lilypond.org/;
+ homepage = "http://lilypond.org/";
license = licenses.gpl3;
maintainers = with maintainers; [ marcweber yurrriq ];
platforms = platforms.all;
diff --git a/pkgs/misc/lilypond/fonts.nix b/pkgs/misc/lilypond/fonts.nix
index 00335eddce8..deeedf67995 100644
--- a/pkgs/misc/lilypond/fonts.nix
+++ b/pkgs/misc/lilypond/fonts.nix
@@ -7,7 +7,6 @@ let
inherit version;
pname = "openlilypond-font-${fontName}";
-
src = fetchFromGitHub {
inherit rev sha256;
owner = "OpenLilyPondFonts";
@@ -31,8 +30,7 @@ let
'';
meta = with stdenv.lib; {
- inherit (src.meta) homepage;
- inherit (lilypond.meta) platforms;
+ inherit (lilypond.meta) homepage platforms;
description = "${fontName} font for LilyPond";
license = licenses.ofl;
maintainers = with maintainers; [ yurrriq ];
diff --git a/pkgs/misc/lilypond/with-fonts.nix b/pkgs/misc/lilypond/with-fonts.nix
index 36dbcf170dd..1036f474b14 100644
--- a/pkgs/misc/lilypond/with-fonts.nix
+++ b/pkgs/misc/lilypond/with-fonts.nix
@@ -5,7 +5,7 @@
stdenv.lib.appendToName "with-fonts" (symlinkJoin {
inherit (lilypond) meta name version ;
- paths = [ lilypond ];
+ paths = [ lilypond ] ++ openlilylib-fonts.all;
buildInputs = [ makeWrapper lndir ];
diff --git a/pkgs/os-specific/linux/kernel/common-config.nix b/pkgs/os-specific/linux/kernel/common-config.nix
index e925068421d..2c8b8de65b3 100644
--- a/pkgs/os-specific/linux/kernel/common-config.nix
+++ b/pkgs/os-specific/linux/kernel/common-config.nix
@@ -16,11 +16,12 @@
}:
with stdenv.lib;
-
- with import ../../../../lib/kernel.nix { inherit (stdenv) lib; inherit version; };
+with stdenv.lib.kernel;
+with (stdenv.lib.kernel.whenHelpers version);
let
+
# configuration items have to be part of a subattrs
flattenKConf = nested: mapAttrs (_: head) (zipAttrs (attrValues nested));
diff --git a/pkgs/os-specific/linux/kernel/hardened-config.nix b/pkgs/os-specific/linux/kernel/hardened-config.nix
index 156a4cf4423..b28ce770f7a 100644
--- a/pkgs/os-specific/linux/kernel/hardened-config.nix
+++ b/pkgs/os-specific/linux/kernel/hardened-config.nix
@@ -11,7 +11,8 @@
{ stdenv, version }:
with stdenv.lib;
-with import ../../../../lib/kernel.nix { inherit (stdenv) lib; inherit version; };
+with stdenv.lib.kernel;
+with (stdenv.lib.kernel.whenHelpers version);
assert (versionAtLeast version "4.9");
diff --git a/pkgs/os-specific/linux/kernel/mptcp-config.nix b/pkgs/os-specific/linux/kernel/mptcp-config.nix
index e5e3ee283ff..9752e63d9f9 100644
--- a/pkgs/os-specific/linux/kernel/mptcp-config.nix
+++ b/pkgs/os-specific/linux/kernel/mptcp-config.nix
@@ -1,5 +1,5 @@
{ stdenv }:
-with import ../../../../lib/kernel.nix { inherit (stdenv) lib; version = null; };
+with stdenv.lib.kernel;
{
# DRM_AMDGPU = yes;
diff --git a/pkgs/os-specific/linux/sdparm/default.nix b/pkgs/os-specific/linux/sdparm/default.nix
index 5517f163b3e..e0392e442bf 100644
--- a/pkgs/os-specific/linux/sdparm/default.nix
+++ b/pkgs/os-specific/linux/sdparm/default.nix
@@ -2,15 +2,15 @@
stdenv.mkDerivation rec {
pname = "sdparm";
- version = "1.10";
+ version = "1.11";
src = fetchurl {
url = "http://sg.danny.cz/sg/p/${pname}-${version}.tar.xz";
- sha256 = "1jjq3lzgfy4r76rc26q02lv4wm5cb4dx5nh913h489zjrr4f3jbx";
+ sha256 = "1nqjc4w2w47zavcbf5xmm53x1zbwgljaw1lpajcdi537cgy32fa8";
};
meta = with stdenv.lib; {
- homepage = http://sg.danny.cz/sg/sdparm.html;
+ homepage = "http://sg.danny.cz/sg/sdparm.html";
description = "A utility to access SCSI device parameters";
license = licenses.bsd3;
platforms = with platforms; linux;
diff --git a/pkgs/servers/ankisyncd/default.nix b/pkgs/servers/ankisyncd/default.nix
new file mode 100644
index 00000000000..e1098670123
--- /dev/null
+++ b/pkgs/servers/ankisyncd/default.nix
@@ -0,0 +1,67 @@
+{ lib
+, fetchFromGitHub
+, python3
+, anki
+}:
+
+python3.pkgs.buildPythonApplication rec {
+ pname = "ankisyncd";
+ version = "2.1.0";
+ src = fetchFromGitHub {
+ owner = "tsudoko";
+ repo = "anki-sync-server";
+ rev = version;
+ sha256 = "6a140afa94fdb1725fed716918875e3d2ad0092cb955136e381c9d826cc4927c";
+ };
+ format = "other";
+
+ installPhase = ''
+ runHook preInstall
+
+ mkdir -p $out/${python3.sitePackages}
+
+ cp -r ankisyncd utils ankisyncd.conf $out/${python3.sitePackages}
+ mkdir $out/share
+ cp ankisyncctl.py $out/share/
+
+ runHook postInstall
+ '';
+
+ fixupPhase = ''
+ PYTHONPATH="$PYTHONPATH:$out/${python3.sitePackages}:${anki}"
+
+ makeWrapper "${python3.interpreter}" "$out/bin/ankisyncd" \
+ --set PYTHONPATH $PYTHONPATH \
+ --add-flags "-m ankisyncd"
+
+ makeWrapper "${python3.interpreter}" "$out/bin/ankisyncctl" \
+ --set PYTHONPATH $PYTHONPATH \
+ --add-flags "$out/share/ankisyncctl.py"
+ '';
+
+ checkInputs = with python3.pkgs; [
+ pytest
+ webtest
+ ];
+
+ buildInputs = [ ];
+
+ propagatedBuildInputs = [ anki ];
+
+ checkPhase = ''
+ # Exclude tests that require sqlite's sqldiff command, since
+ # it isn't yet packaged for NixOS, although 2 PRs exist:
+ # - https://github.com/NixOS/nixpkgs/pull/69112
+ # - https://github.com/NixOS/nixpkgs/pull/75784
+ # Once this is merged, these tests can be run as well.
+ pytest --ignore tests/test_web_media.py tests/
+ '';
+
+ meta = with lib; {
+ description = "Self-hosted Anki sync server";
+ maintainers = with maintainers; [ matt-snider ];
+ homepage = "https://github.com/tsudoko/anki-sync-server";
+ license = licenses.agpl3;
+ platforms = platforms.linux;
+ };
+}
diff --git a/pkgs/servers/home-assistant/component-packages.nix b/pkgs/servers/home-assistant/component-packages.nix
index 2b2bdabc626..6b18dd30f30 100644
--- a/pkgs/servers/home-assistant/component-packages.nix
+++ b/pkgs/servers/home-assistant/component-packages.nix
@@ -2,7 +2,7 @@
# Do not edit!
{
- version = "0.106.1";
+ version = "0.106.6";
components = {
"abode" = ps: with ps; [ ]; # missing inputs: abodepy
"acer_projector" = ps: with ps; [ pyserial];
@@ -124,6 +124,7 @@
"configurator" = ps: with ps; [ ];
"conversation" = ps: with ps; [ aiohttp-cors];
"coolmaster" = ps: with ps; [ ]; # missing inputs: pycoolmasternet
+ "coronavirus" = ps: with ps; [ ]; # missing inputs: coronavirus
"counter" = ps: with ps; [ ];
"cover" = ps: with ps; [ ];
"cppm_tracker" = ps: with ps; [ ]; # missing inputs: clearpasspy
diff --git a/pkgs/servers/home-assistant/default.nix b/pkgs/servers/home-assistant/default.nix
index 9f7b3fed4a5..2b571fe96bf 100644
--- a/pkgs/servers/home-assistant/default.nix
+++ b/pkgs/servers/home-assistant/default.nix
@@ -67,7 +67,7 @@ let
extraBuildInputs = extraPackages py.pkgs;
# Don't forget to run parse-requirements.py after updating
- hassVersion = "0.106.1";
+ hassVersion = "0.106.6";
in with py.pkgs; buildPythonApplication rec {
pname = "homeassistant";
@@ -84,7 +84,7 @@ in with py.pkgs; buildPythonApplication rec {
owner = "home-assistant";
repo = "home-assistant";
rev = version;
- sha256 = "0i261hzjfhqnq7j8dwsnj2h2vmr4vnxkvk2ff910am1knzni3a2z";
+ sha256 = "11kv5lmm8nxp7yv3w43mzmgzkafddy0z6wl2878p96iyil1w7qhb";
};
propagatedBuildInputs = [
diff --git a/pkgs/servers/home-assistant/frontend.nix b/pkgs/servers/home-assistant/frontend.nix
index f297212442c..1446518fbc5 100644
--- a/pkgs/servers/home-assistant/frontend.nix
+++ b/pkgs/servers/home-assistant/frontend.nix
@@ -4,11 +4,11 @@ buildPythonPackage rec {
# the frontend version corresponding to a specific home-assistant version can be found here
# https://github.com/home-assistant/home-assistant/blob/master/homeassistant/components/frontend/manifest.json
pname = "home-assistant-frontend";
- version = "20200220.4";
+ version = "20200220.5";
src = fetchPypi {
inherit pname version;
- sha256 = "0cb8b6xizxz1q5r0qgwsqs53va9bxdqnp4vwf5lh8ppv9zy7hssc";
+ sha256 = "0nc44r5ybq0prsz2yid622i0xr7q0qrc4ymbk69bqg6jrmjpbdl1";
};
# no Python tests implemented
diff --git a/pkgs/servers/home-assistant/parse-requirements.py b/pkgs/servers/home-assistant/parse-requirements.py
index 65c2bcfbfd4..a5c6e9d0961 100755
--- a/pkgs/servers/home-assistant/parse-requirements.py
+++ b/pkgs/servers/home-assistant/parse-requirements.py
@@ -53,7 +53,7 @@ def get_version():
return m.group(1)
-def parse_components(version="master"):
+def parse_components(version: str = "master"):
components = {}
with tempfile.TemporaryDirectory() as tmp:
with urlopen(
@@ -61,14 +61,13 @@ def parse_components(version="master"):
) as response:
tarfile.open(fileobj=BytesIO(response.read())).extractall(tmp)
# Use part of a script from the Home Assistant codebase
- sys.path.append(os.path.join(tmp, f"home-assistant-{version}"))
+ core_path = os.path.join(tmp, f"core-{version}")
+ sys.path.append(core_path)
from script.hassfest.model import Integration
integrations = Integration.load_dir(
pathlib.Path(
- os.path.join(
- tmp, f"home-assistant-{version}", "homeassistant/components"
- )
+ os.path.join(core_path, "homeassistant/components")
)
)
for domain in sorted(integrations):
diff --git a/pkgs/servers/http/nginx/modules.nix b/pkgs/servers/http/nginx/modules.nix
index b5282d862af..16782966944 100644
--- a/pkgs/servers/http/nginx/modules.nix
+++ b/pkgs/servers/http/nginx/modules.nix
@@ -80,10 +80,10 @@ in
fastcgi-cache-purge = {
src = fetchFromGitHub {
- owner = "FRiCKLE";
+ owner = "nginx-modules";
repo = "ngx_cache_purge";
- rev = "2.3";
- sha256 = "0ib2jrbjwrhvmihhnzkp4w87fxssbbmmmj6lfdwpm6ni8p9g60dw";
+ rev = "2.5";
+ sha256 = "1f4kxagzvz10vqbcjwi57wink6xw3s1h7wlrrlrlpkmhfbf9704y";
};
};
diff --git a/pkgs/servers/http/unit/default.nix b/pkgs/servers/http/unit/default.nix
index 8b36e7de69f..c56e994ed54 100644
--- a/pkgs/servers/http/unit/default.nix
+++ b/pkgs/servers/http/unit/default.nix
@@ -17,14 +17,14 @@
with stdenv.lib;
stdenv.mkDerivation rec {
- version = "1.15.0";
+ version = "1.16.0";
pname = "unit";
src = fetchFromGitHub {
owner = "nginx";
repo = "unit";
rev = version;
- sha256 = "1dj21fcssrvbspppbhg8684vfcbn0m1abiy1r60h5fzb470k21jb";
+ sha256 = "19gclqhwccpi7y4386ap33ycwhylv4s4kwfc6ik8scmc4pw3sj9l";
};
patches = [
diff --git a/pkgs/servers/monitoring/prometheus/pushgateway.nix b/pkgs/servers/monitoring/prometheus/pushgateway.nix
index 48afc610c61..0a707519c64 100644
--- a/pkgs/servers/monitoring/prometheus/pushgateway.nix
+++ b/pkgs/servers/monitoring/prometheus/pushgateway.nix
@@ -2,7 +2,7 @@
buildGoPackage rec {
pname = "pushgateway";
- version = "0.8.0";
+ version = "1.2.0";
rev = "v${version}";
goPackagePath = "github.com/prometheus/pushgateway";
@@ -11,7 +11,7 @@ buildGoPackage rec {
inherit rev;
owner = "prometheus";
repo = "pushgateway";
- sha256 = "1mzwkxnznv6wzy7dc8rksa8gr7z92plrzls8gb8rk432zfqcbv6a";
+ sha256 = "0q57pvdfapi1xx8mw7ykvxs64alypyqbxwvrqjcrgv2jidbcd1mm";
};
buildUser = "nix@nixpkgs";
diff --git a/pkgs/servers/nextcloud/default.nix b/pkgs/servers/nextcloud/default.nix
index 22fc4ebf39e..9b23e9ac501 100644
--- a/pkgs/servers/nextcloud/default.nix
+++ b/pkgs/servers/nextcloud/default.nix
@@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
pname = "nextcloud";
- version = "18.0.1";
+ version = "18.0.2";
src = fetchurl {
url = "https://download.nextcloud.com/server/releases/${pname}-${version}.tar.bz2";
- sha256 = "1h0rxpdssn1hc65k41zbvww9r4f79vbd9bixc9ri5n7hp0say3vp";
+ sha256 = "10fbdq0366iai2kpw6v6p78mnn9gz8x0xzsbqrp109yx4c4nccyh";
};
installPhase = ''
diff --git a/pkgs/servers/sql/postgresql/ext/pgroonga.nix b/pkgs/servers/sql/postgresql/ext/pgroonga.nix
index 866dd8021d0..f57a6e8fa50 100644
--- a/pkgs/servers/sql/postgresql/ext/pgroonga.nix
+++ b/pkgs/servers/sql/postgresql/ext/pgroonga.nix
@@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
pname = "pgroonga";
- version = "2.2.2";
+ version = "2.2.5";
src = fetchurl {
url = "https://packages.groonga.org/source/${pname}/${pname}-${version}.tar.gz";
- sha256 = "0pdz2lpi7g1n9b5rg6kwhh6fr0bwf06zr642brmh53n6mp41186m";
+ sha256 = "0lwj99kdx9kfp4vfd7lfapj183mz235kj1vjfscfnkg5ypj656gz";
};
nativeBuildInputs = [ pkgconfig ];
diff --git a/pkgs/servers/ums/default.nix b/pkgs/servers/ums/default.nix
index 3fb2817277a..503ff16caee 100644
--- a/pkgs/servers/ums/default.nix
+++ b/pkgs/servers/ums/default.nix
@@ -4,11 +4,11 @@
stdenv.mkDerivation rec {
pname = "ums";
- version = "6.2.2";
+ version = "9.1.0";
src = fetchurl {
- url = "mirror://sourceforge/project/unimediaserver/Official%20Releases/Linux/" + stdenv.lib.toUpper "${pname}-${version}" + "-Java8.tgz";
- sha256 = "1qa999la9hixy0pdj9phjvr6lwqycgdvm94nc1606vz0ivf95b15";
+ url = "mirror://sourceforge/project/unimediaserver/Official%20Releases/Linux/" + stdenv.lib.toUpper "${pname}-${version}" + ".tgz";
+ sha256 = "07wprjpwqids96v5q5fhwcxqlg8jp1vy585vl2nqbfi1vf5v294s";
name = "${pname}-${version}.tgz";
};
@@ -19,6 +19,10 @@ stdenv.mkDerivation rec {
mkdir $out/bin
mv $out/documentation /$out/doc
+ # ums >= 9.0.0 ships its own JRE in the package. if we remove it, the `UMS.sh`
+ # script will correctly fall back to the JRE specified by JAVA_HOME
+ rm -rf $out/linux/jre-x64 $out/linux/jre-x86
+
makeWrapper "$out/UMS.sh" "$out/bin/ums" \
--prefix LD_LIBRARY_PATH ":" "${stdenv.lib.makeLibraryPath [ libzen libmediainfo] }" \
--set JAVA_HOME "${jre8}"
diff --git a/pkgs/shells/elvish/default.nix b/pkgs/shells/elvish/default.nix
index 80b0f386051..ad2e845f9bc 100644
--- a/pkgs/shells/elvish/default.nix
+++ b/pkgs/shells/elvish/default.nix
@@ -1,8 +1,8 @@
-{ stdenv, buildGoPackage, fetchFromGitHub }:
+{ stdenv, buildGoModule, fetchFromGitHub }:
-buildGoPackage rec {
+buildGoModule rec {
pname = "elvish";
- version = "0.12";
+ version = "0.13";
goPackagePath = "github.com/elves/elvish";
excludedPackages = [ "website" ];
@@ -15,9 +15,11 @@ buildGoPackage rec {
owner = "elves";
repo = pname;
rev = "v${version}";
- sha256 = "1vvbgkpnrnb5aaak4ks45wl0cyp0vbry8bpxl6v2dpmq9x0bscpp";
+ sha256 = "0fprii430p9w8x4wq93iqkgkwi5kypwwlnzgvlcz0mkksayk8bzg";
};
+ modSha256 = "13x4wbfj8049ygm3zbgzyr2bm4sq4x6xddrxx6shr8fydlcf1g8v";
+
meta = with stdenv.lib; {
description = "A friendly and expressive command shell";
longDescription = ''
diff --git a/pkgs/shells/nushell/default.nix b/pkgs/shells/nushell/default.nix
index 811ef762f78..9f3f0da75c9 100644
--- a/pkgs/shells/nushell/default.nix
+++ b/pkgs/shells/nushell/default.nix
@@ -15,16 +15,16 @@
rustPlatform.buildRustPackage rec {
pname = "nushell";
- version = "0.10.0";
+ version = "0.11.0";
src = fetchFromGitHub {
owner = pname;
repo = pname;
rev = version;
- sha256 = "08zqvk8qkilynfivx1jnr2yqrav64p9cy9i30jjgcqrh2gsrb9dd";
+ sha256 = "06w1118cxr5x3l7cq2wc092xvsfkgga8b6kz1gcmhwq0gf7fqirz";
};
- cargoSha256 = "1gpg0jpd5pmmny9gzzbkph1h2kqmjlapdsw04jzx852yg89lls5v";
+ cargoSha256 = "1bpb4p4j7lwb70qjsssbr878mfalil4xh8r954aaa2rlcf97fmb7";
nativeBuildInputs = [ pkg-config ]
++ lib.optionals (withStableFeatures && stdenv.isLinux) [ python3 ];
diff --git a/pkgs/tools/admin/lxd/default.nix b/pkgs/tools/admin/lxd/default.nix
index fd8ee9e04a3..c7c2881a567 100644
--- a/pkgs/tools/admin/lxd/default.nix
+++ b/pkgs/tools/admin/lxd/default.nix
@@ -1,7 +1,7 @@
{ stdenv, pkgconfig, lxc, buildGoPackage, fetchurl
, makeWrapper, acl, rsync, gnutar, xz, btrfs-progs, gzip, dnsmasq
, squashfsTools, iproute, iptables, ebtables, libcap, libco-canonical, dqlite
-, raft-canonical, sqlite-replication
+, raft-canonical, sqlite-replication, udev
, writeShellScriptBin, apparmor-profiles, apparmor-parser
, criu
, bash
@@ -9,13 +9,13 @@
buildGoPackage rec {
pname = "lxd";
- version = "3.18";
+ version = "3.22";
goPackagePath = "github.com/lxc/lxd";
src = fetchurl {
url = "https://github.com/lxc/lxd/releases/download/${pname}-${version}/${pname}-${version}.tar.gz";
- sha256 = "1p8g2gbwgn3kln5rxddpc2fxk8bvf026wjiqip2b0vvpi7h3955h";
+ sha256 = "1j60xajcycqnnkasbghcvx3dvb5iadvvq2l3hh9i0sw3dk1wx4hn";
};
preBuild = ''
@@ -45,7 +45,7 @@ buildGoPackage rec {
nativeBuildInputs = [ pkgconfig makeWrapper ];
buildInputs = [ lxc acl libcap libco-canonical.dev dqlite.dev
- raft-canonical.dev sqlite-replication ];
+ raft-canonical.dev sqlite-replication udev.dev ];
meta = with stdenv.lib; {
description = "Daemon based on liblxc offering a REST API to manage containers";
diff --git a/pkgs/tools/bluetooth/blueman/default.nix b/pkgs/tools/bluetooth/blueman/default.nix
index 1a7fb5c3a08..e351867ca1b 100644
--- a/pkgs/tools/bluetooth/blueman/default.nix
+++ b/pkgs/tools/bluetooth/blueman/default.nix
@@ -9,11 +9,11 @@ let
in stdenv.mkDerivation rec {
pname = "blueman";
- version = "2.1.1";
+ version = "2.1.2";
src = fetchurl {
url = "https://github.com/blueman-project/blueman/releases/download/${version}/${pname}-${version}.tar.xz";
- sha256 = "1hyvc5x97j8b4kvwzh58zzlc454d0h0hk440zbg8f5as9qrv5spi";
+ sha256 = "0k49hgyglsrlszckjzrvlsdm9ysns3qgvczgcmwaz02vvwnb4zai";
};
nativeBuildInputs = [
diff --git a/pkgs/tools/filesystems/btrfs-dedupe/default.nix b/pkgs/tools/filesystems/btrfs-dedupe/default.nix
deleted file mode 100644
index 40a58e4227f..00000000000
--- a/pkgs/tools/filesystems/btrfs-dedupe/default.nix
+++ /dev/null
@@ -1,29 +0,0 @@
-{ stdenv, fetchurl, rustPlatform, lzo, zlib }:
-
-with rustPlatform;
-
-buildRustPackage rec {
- pname = "btrfs-dedupe";
- version = "1.1.0";
-
-
- src = fetchurl {
- url = "https://gitlab.wellbehavedsoftware.com/well-behaved-software/btrfs-dedupe/repository/archive.tar.bz2?ref=72c6a301d20f935827b994db210bf0a1e121273a";
- sha256 = "0qy1g4crhfgs2f5cmrsjv6qscg3r66gb8n6sxhimm9ksivhjyyjp";
- };
-
- # Delete this on next update; see #79975 for details
- legacyCargoFetcher = true;
-
- cargoSha256 = "1sz3fswb76rnk7x4kpl1rnj2yxbhpx6q8kv8xxiqdr7qyphpi98r";
-
- buildInputs = [ lzo zlib ];
-
- meta = with stdenv.lib; {
- homepage = https://gitlab.wellbehavedsoftware.com/well-behaved-software/btrfs-dedupe;
- description = "BTRFS deduplication utility";
- license = licenses.mit;
- platforms = [ "x86_64-linux" ];
- maintainers = with maintainers; [ ikervagyok ];
- };
-}
diff --git a/pkgs/tools/filesystems/ceph/default.nix b/pkgs/tools/filesystems/ceph/default.nix
index e3b1d7c661c..abf6ed1361b 100644
--- a/pkgs/tools/filesystems/ceph/default.nix
+++ b/pkgs/tools/filesystems/ceph/default.nix
@@ -93,7 +93,7 @@ let
]);
sitePackages = ceph-python-env.python.sitePackages;
- version = "14.2.6";
+ version = "14.2.7";
in rec {
ceph = stdenv.mkDerivation {
pname = "ceph";
@@ -101,7 +101,7 @@ in rec {
src = fetchurl {
url = "http://download.ceph.com/tarballs/ceph-${version}.tar.gz";
- sha256 = "0qkyrb25r2a57n6k8ncb43x7hvhkmpi7abhfyi98mlz2lhmhzlm1";
+ sha256 = "0qiqhm6hvz299q54k3i4crnb5dhpq6xnn2yqih9pxn9van0dq1ln";
};
patches = [
diff --git a/pkgs/tools/misc/fselect/default.nix b/pkgs/tools/misc/fselect/default.nix
index 2a3813eb184..e508eb02ad0 100644
--- a/pkgs/tools/misc/fselect/default.nix
+++ b/pkgs/tools/misc/fselect/default.nix
@@ -1,17 +1,23 @@
-{ stdenv, fetchFromGitHub, rustPlatform }:
+{ stdenv, fetchFromGitHub, rustPlatform, installShellFiles }:
rustPlatform.buildRustPackage rec {
pname = "fselect";
- version = "0.6.8";
+ version = "0.6.9";
src = fetchFromGitHub {
owner = "jhspetersson";
repo = "fselect";
rev = version;
- sha256 = "1zccl60l557lhaaqb33myys4vp3jsnjqh3dxb22i46bff28s1w6c";
+ sha256 = "0cgzvzdsy8vbiapgk1l5dp48c3kq0xmx53yfi486mx8nwvz3ksc0";
};
- cargoSha256 = "0023adx4xkm24p3nwj0j669xns4qf8insalcnlv3r2iv4138w10l";
+ cargoSha256 = "0mjd9nmaggsszf0kx68yrvy3fqbn35v34c7q3584fv50ipqn6drb";
+
+ nativeBuildInputs = [ installShellFiles ];
+
+ postInstall = ''
+ installManPage docs/fselect.1
+ '';
meta = with stdenv.lib; {
description = "Find files with SQL-like queries";
diff --git a/pkgs/tools/misc/fzf/default.nix b/pkgs/tools/misc/fzf/default.nix
index 740b600cdb3..d337731888f 100644
--- a/pkgs/tools/misc/fzf/default.nix
+++ b/pkgs/tools/misc/fzf/default.nix
@@ -2,13 +2,13 @@
buildGoModule rec {
pname = "fzf";
- version = "0.21.0";
+ version = "0.21.0-1";
src = fetchFromGitHub {
owner = "junegunn";
repo = pname;
rev = version;
- sha256 = "0s52mq64r44dh7wwc4h96xhhbxf000dr96nim0g0dcmkmnm2p8gv";
+ sha256 = "1d4bwcmjirwkkv0m01sx9rxp01iik57iy54zxhdkkz842pxlr2xv";
};
modSha256 = "16bb0a9z49jqhh9lmq8rvl7x9vh79mi4ygkb9sm04g41g5z6ag1s";
diff --git a/pkgs/tools/misc/opentimestamps-client/default.nix b/pkgs/tools/misc/opentimestamps-client/default.nix
index 94984c57e49..8cc5cd7f6f2 100644
--- a/pkgs/tools/misc/opentimestamps-client/default.nix
+++ b/pkgs/tools/misc/opentimestamps-client/default.nix
@@ -4,7 +4,7 @@
buildPythonApplication rec {
pname = "opentimestamps-client";
- version = "0.6.0";
+ version = "0.7.0";
disabled = (!isPy3k);
# We can't use the pypi source because it doesn't include README.md which is
@@ -13,18 +13,9 @@ buildPythonApplication rec {
owner = "opentimestamps";
repo = "opentimestamps-client";
rev = "opentimestamps-client-v${version}";
- sha256 = "05m8nllqad3k69mvby5q08y22i0wrj84gqifdgcldimrrn1i00xp";
+ sha256 = "1aiq9cwr40md54swzm7wkwj0h65psxmvj2japvw79s9x0pp8iwqs";
};
- patches = [
- (fetchpatch {
- url = "https://github.com/opentimestamps/opentimestamps-client/commit/1b328269ceee66916e9a639e8d5d7d13cd70d5d8.patch";
- sha256 = "0bd3yalyvk5n4sflw9zilpay5k653ybdgkkfppyrk7c8z3i81hbl";
- })
- ];
-
- checkInputs = [ git ];
-
propagatedBuildInputs = [ opentimestamps appdirs GitPython pysocks ];
meta = {
diff --git a/pkgs/tools/misc/yubico-piv-tool/default.nix b/pkgs/tools/misc/yubico-piv-tool/default.nix
index f081f94a147..39150cfed7e 100644
--- a/pkgs/tools/misc/yubico-piv-tool/default.nix
+++ b/pkgs/tools/misc/yubico-piv-tool/default.nix
@@ -1,4 +1,6 @@
-{ stdenv, fetchurl, pkgconfig, openssl, pcsclite, check }:
+{ stdenv, fetchurl, pkgconfig, openssl, check, pcsclite, PCSC
+, withApplePCSC ? stdenv.isDarwin
+}:
stdenv.mkDerivation rec {
name = "yubico-piv-tool-2.0.0";
@@ -9,9 +11,10 @@ stdenv.mkDerivation rec {
};
nativeBuildInputs = [ pkgconfig ];
- buildInputs = [ openssl pcsclite check ];
+ buildInputs = [ openssl check ]
+ ++ (if withApplePCSC then [ PCSC ] else [ pcsclite ]);
- configureFlags = [ "--with-backend=pcsc" ];
+ configureFlags = [ "--with-backend=${if withApplePCSC then "macscard" else "pcsc"}" ];
meta = with stdenv.lib; {
homepage = https://developers.yubico.com/yubico-piv-tool/;
diff --git a/pkgs/tools/networking/mailutils/default.nix b/pkgs/tools/networking/mailutils/default.nix
index dcf377ca0c0..3e5300549db 100644
--- a/pkgs/tools/networking/mailutils/default.nix
+++ b/pkgs/tools/networking/mailutils/default.nix
@@ -5,11 +5,11 @@
stdenv.mkDerivation rec {
name = "${project}-${version}";
project = "mailutils";
- version = "3.8";
+ version = "3.9";
src = fetchurl {
url = "mirror://gnu/${project}/${name}.tar.xz";
- sha256 = "1wkn9ch664477r4d8jk9153w5msljsbj99907k7zgzpmywbs6ba7";
+ sha256 = "1g1xf2lal04nsnf1iym9n9n0wxjpqbcr9nysxpm98v4pniinqwsz";
};
postPatch = ''
diff --git a/pkgs/tools/networking/wireguard-go/default.nix b/pkgs/tools/networking/wireguard-go/default.nix
index 8832560b3b1..a722a8016bc 100644
--- a/pkgs/tools/networking/wireguard-go/default.nix
+++ b/pkgs/tools/networking/wireguard-go/default.nix
@@ -2,13 +2,13 @@
buildGoPackage rec {
pname = "wireguard-go";
- version = "0.0.20191012";
+ version = "0.0.20200121";
goPackagePath = "golang.zx2c4.com/wireguard";
src = fetchzip {
url = "https://git.zx2c4.com/wireguard-go/snapshot/wireguard-go-${version}.tar.xz";
- sha256 = "0s3hvqpz13n630yvi0476hfzrp3xcj8x61zc2hl5z70f8kvbay4i";
+ sha256 = "04ca1j8lcbyg1qg7ls23yy90s17k97i912ksxfpads0sdd3r2yc9";
};
patches = [ ./0001-Fix-darwin-build.patch ];
diff --git a/pkgs/tools/networking/yggdrasil/default.nix b/pkgs/tools/networking/yggdrasil/default.nix
index ca10adae0e4..3bf3b97c235 100644
--- a/pkgs/tools/networking/yggdrasil/default.nix
+++ b/pkgs/tools/networking/yggdrasil/default.nix
@@ -2,16 +2,16 @@
buildGoModule rec {
pname = "yggdrasil";
- version = "0.3.12";
+ version = "0.3.13";
src = fetchFromGitHub {
owner = "yggdrasil-network";
repo = "yggdrasil-go";
rev = "v${version}";
- sha256 = "03ywxamjcnhcr20vm9pn3rq3hqq49i6rfdvx44czzr30h8xp8dhw";
+ sha256 = "1k3xxarrl33sxik1dqahfllrhd501xqq5q5mcn4y5wi9lwywsy50";
};
- modSha256 = "1vqk0jyqc1qcryi247r5pbvfjw3m48l028fb2mrq1xqqfkjqrr85";
+ modSha256 = "057yl3i29kwpd129aa2rb67s5rmz898fi2a7lxv3nfjp7018s9qw";
# Change the default location of the management socket on Linux
# systems so that the yggdrasil system service unit does not have to
@@ -28,10 +28,11 @@ buildGoModule rec {
'';
meta = with lib; {
- description = "An experiment in scalable routing as an encrypted IPv6 overlay network";
+ description =
+ "An experiment in scalable routing as an encrypted IPv6 overlay network";
homepage = "https://yggdrasil-network.github.io/";
license = licenses.lgpl3;
platforms = platforms.all;
- maintainers = with maintainers; [ gazally lassulus ];
+ maintainers = with maintainers; [ ehmry gazally lassulus ];
};
}
diff --git a/pkgs/tools/package-management/cargo-release/default.nix b/pkgs/tools/package-management/cargo-release/default.nix
index 9b7d915a349..c85bcf5b66c 100644
--- a/pkgs/tools/package-management/cargo-release/default.nix
+++ b/pkgs/tools/package-management/cargo-release/default.nix
@@ -2,16 +2,16 @@
rustPlatform.buildRustPackage rec {
pname = "cargo-release";
- version = "0.13.0";
+ version = "0.13.1";
src = fetchFromGitHub {
owner = "sunng87";
repo = "cargo-release";
rev = "v${version}";
- sha256 = "1w9w43i5br94vg5m4idabh67p4ffsx2lmc2g0ak2k961vl46wr0q";
+ sha256 = "0w4p1v9ya6kai2sy4ic45s1m01ya3hlysxlc8ha698jfvzs8nnld";
};
- cargoSha256 = "1x54c6wk5cbnqcy1qpsff8lwqxs0d4qf0v71r7wl0kjp8mrmmhl4";
+ cargoSha256 = "02x268xbxd2nin9y1dm35mkk90vyx16zzp18fi4fwc8kpsdbjpai";
nativeBuildInputs = [ pkg-config ];
buildInputs = [ openssl ] ++ stdenv.lib.optional stdenv.isDarwin Security;
diff --git a/pkgs/tools/package-management/nfpm/default.nix b/pkgs/tools/package-management/nfpm/default.nix
index 60091742e0d..0b5f5edf399 100644
--- a/pkgs/tools/package-management/nfpm/default.nix
+++ b/pkgs/tools/package-management/nfpm/default.nix
@@ -2,16 +2,16 @@
buildGoModule rec {
pname = "nfpm";
- version = "1.1.10";
+ version = "1.2.0";
src = fetchFromGitHub {
owner = "goreleaser";
repo = pname;
rev = "v${version}";
- sha256 = "0qn9hybqnhyf1xb6n0m4qq2ac8h187i2pjkkik73qly1hmyq45j7";
+ sha256 = "0zl8xf74k5is8rxbirrqb5cnfgrlppr1gchfqm31305mnpicr92s";
};
- modSha256 = "037ihnvssgkzbg94yfw4lwqnhj02m187dfn1fm7i6yv13kf0gkpx";
+ modSha256 = "14izjwadl4ify0wrz0yinqvayar79h0pxxqj5n69a5dgbx09fp0l";
buildFlagsArray = [ "-ldflags=-s -w -X main.version=${version}" ];
diff --git a/pkgs/tools/security/afl/qemu-patches/syscall-glibc2_30.diff b/pkgs/tools/security/afl/qemu-patches/syscall-glibc2_30.diff
new file mode 100644
index 00000000000..aa2950bf157
--- /dev/null
+++ b/pkgs/tools/security/afl/qemu-patches/syscall-glibc2_30.diff
@@ -0,0 +1,51 @@
+--- qemu-2.10.0-clean/linux-user/syscall.c 2020-03-12 18:47:47.898592169 +0100
++++ qemu-2.10.0/linux-user/syscall.c 2020-03-13 09:13:42.461809699 +0100
+@@ -34,6 +34,7 @@
+ #include
+ #include
+ #include
++#include // https://lkml.org/lkml/2019/6/3/988
+ #include
+ #include
+ #ifdef __ia64__
+@@ -256,7 +257,9 @@ static type name (type1 arg1,type2 arg2,
+ #endif
+
+ #ifdef __NR_gettid
+-_syscall0(int, gettid)
++// taken from https://patchwork.kernel.org/patch/10862231/
++#define __NR_sys_gettid __NR_gettid
++_syscall0(int, sys_gettid)
+ #else
+ /* This is a replacement for the host gettid() and must return a host
+ errno. */
+@@ -6219,7 +6222,7 @@ static void *clone_func(void *arg)
+ cpu = ENV_GET_CPU(env);
+ thread_cpu = cpu;
+ ts = (TaskState *)cpu->opaque;
+- info->tid = gettid();
++ info->tid = sys_gettid();
+ task_settid(ts);
+ if (info->child_tidptr)
+ put_user_u32(info->tid, info->child_tidptr);
+@@ -6363,9 +6366,9 @@ static int do_fork(CPUArchState *env, un
+ mapping. We can't repeat the spinlock hack used above because
+ the child process gets its own copy of the lock. */
+ if (flags & CLONE_CHILD_SETTID)
+- put_user_u32(gettid(), child_tidptr);
++ put_user_u32(sys_gettid(), child_tidptr);
+ if (flags & CLONE_PARENT_SETTID)
+- put_user_u32(gettid(), parent_tidptr);
++ put_user_u32(sys_gettid(), parent_tidptr);
+ ts = (TaskState *)cpu->opaque;
+ if (flags & CLONE_SETTLS)
+ cpu_set_tls (env, newtls);
+@@ -11402,7 +11405,7 @@ abi_long do_syscall(void *cpu_env, int n
+ break;
+ #endif
+ case TARGET_NR_gettid:
+- ret = get_errno(gettid());
++ ret = get_errno(sys_gettid());
+ break;
+ #ifdef TARGET_NR_readahead
+ case TARGET_NR_readahead:
diff --git a/pkgs/tools/security/afl/qemu.nix b/pkgs/tools/security/afl/qemu.nix
index 479de4b4185..b841ccb93d3 100644
--- a/pkgs/tools/security/afl/qemu.nix
+++ b/pkgs/tools/security/afl/qemu.nix
@@ -52,6 +52,8 @@ stdenv.mkDerivation {
"../${afl.src.name}/qemu_mode/patches/memfd.diff"
# nix-specific patches to make installation more well-behaved
./qemu-patches/no-etc-install.patch
+ # patch for fixing qemu build on glibc >= 2.30
+ ./qemu-patches/syscall-glibc2_30.diff
];
configureFlags =
diff --git a/pkgs/tools/security/bitwarden/default.nix b/pkgs/tools/security/bitwarden/default.nix
index fbef98df82d..71f39eaf2ee 100644
--- a/pkgs/tools/security/bitwarden/default.nix
+++ b/pkgs/tools/security/bitwarden/default.nix
@@ -16,11 +16,11 @@ let
pname = "bitwarden";
version = {
- x86_64-linux = "1.16.6";
+ x86_64-linux = "1.17.0";
}.${system} or "";
sha256 = {
- x86_64-linux = "074hqm4gjljc82nhn7h6wsd74567390018fi3v38g7jh7aph10jj";
+ x86_64-linux = "01azgz1wka32z2jjdnbdyzm8fbrb34ifwirmjbvfw37yia28sd72";
}.${system} or "";
meta = with stdenv.lib; {
diff --git a/pkgs/tools/security/pcsctools/default.nix b/pkgs/tools/security/pcsctools/default.nix
index fa53b91a02f..c9c677e64c0 100644
--- a/pkgs/tools/security/pcsctools/default.nix
+++ b/pkgs/tools/security/pcsctools/default.nix
@@ -5,11 +5,11 @@
let deps = lib.makeBinPath [ wget coreutils ];
in stdenv.mkDerivation rec {
- name = "pcsc-tools-1.5.5";
+ name = "pcsc-tools-1.5.6";
src = fetchurl {
url = "http://ludovic.rousseau.free.fr/softwares/pcsc-tools/${name}.tar.bz2";
- sha256 = "01251m8hf7by8rw8fayhjxmcqvi6dp150680fpf89bqycha2vgqv";
+ sha256 = "1a2zd06c6s4sqlpm5801gj41gh5g62jb8srd7vhlcm70hg3l3nsy";
};
buildInputs = [ udev dbus perlPackages.perl pcsclite ];
@@ -29,7 +29,7 @@ in stdenv.mkDerivation rec {
meta = with lib; {
description = "Tools used to test a PC/SC driver, card or reader";
- homepage = http://ludovic.rousseau.free.fr/softwares/pcsc-tools/;
+ homepage = "http://ludovic.rousseau.free.fr/softwares/pcsc-tools/";
license = licenses.gpl2Plus;
maintainers = with maintainers; [ ];
platforms = platforms.linux;
diff --git a/pkgs/tools/system/r10k/Gemfile.lock b/pkgs/tools/system/r10k/Gemfile.lock
index f399068b56e..3ff9b646215 100644
--- a/pkgs/tools/system/r10k/Gemfile.lock
+++ b/pkgs/tools/system/r10k/Gemfile.lock
@@ -1,38 +1,40 @@
GEM
remote: https://rubygems.org/
specs:
- colored (1.2)
- cri (2.15.5)
- faraday (0.13.1)
+ colored2 (3.1.2)
+ cri (2.15.10)
+ faraday (0.17.3)
multipart-post (>= 1.2, < 3)
- faraday_middleware (0.12.2)
+ faraday_middleware (0.13.1)
faraday (>= 0.7.4, < 1.0)
fast_gettext (1.1.2)
gettext (3.2.9)
locale (>= 2.0.5)
text (>= 1.3.0)
- gettext-setup (0.30)
+ gettext-setup (0.34)
fast_gettext (~> 1.1.0)
- gettext (>= 3.0.2)
+ gettext (>= 3.0.2, < 3.3.0)
locale
- locale (2.1.2)
+ locale (2.1.3)
log4r (1.1.10)
- minitar (0.8)
- multi_json (1.13.1)
- multipart-post (2.0.0)
- puppet_forge (2.2.9)
- faraday (>= 0.9.0, < 0.14.0)
- faraday_middleware (>= 0.9.0, < 0.13.0)
+ minitar (0.9)
+ multi_json (1.14.1)
+ multipart-post (2.1.1)
+ puppet_forge (2.3.3)
+ faraday (>= 0.9.0, < 0.18.0, != 0.13.1)
+ faraday_middleware (>= 0.9.0, < 0.14.0)
gettext-setup (~> 0.11)
minitar
semantic_puppet (~> 1.0)
- r10k (3.2.0)
- colored (= 1.2)
- cri (~> 2.15.1)
+ r10k (3.4.1)
+ colored2 (= 3.1.2)
+ cri (>= 2.15.10, < 3.0.0)
+ fast_gettext (~> 1.1.0)
+ gettext (>= 3.0.2, < 3.3.0)
gettext-setup (~> 0.24)
log4r (= 1.1.10)
multi_json (~> 1.10)
- puppet_forge (~> 2.2.8)
+ puppet_forge (~> 2.3.0)
semantic_puppet (1.0.2)
text (1.3.1)
@@ -43,4 +45,4 @@ DEPENDENCIES
r10k
BUNDLED WITH
- 1.17.2
+ 1.17.3
diff --git a/pkgs/tools/system/r10k/gemset.nix b/pkgs/tools/system/r10k/gemset.nix
index b918fe788b5..d0e955d4cea 100644
--- a/pkgs/tools/system/r10k/gemset.nix
+++ b/pkgs/tools/system/r10k/gemset.nix
@@ -1,23 +1,23 @@
{
- colored = {
+ colored2 = {
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "0b0x5jmsyi0z69bm6sij1k89z7h0laag3cb4mdn7zkl9qmxb90lx";
+ sha256 = "0jlbqa9q4mvrm73aw9mxh23ygzbjiqwisl32d8szfb5fxvbjng5i";
type = "gem";
};
- version = "1.2";
+ version = "3.1.2";
};
cri = {
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "0z1z1aj7a3gf16wv31kc0mr45snlxrjavcj762rx791ymalmxkbr";
+ sha256 = "1h45kw2s4bjwgbfsrncs30av0j4zjync3wmcc6lpdnzbcxs7yms2";
type = "gem";
};
- version = "2.15.5";
+ version = "2.15.10";
};
faraday = {
dependencies = ["multipart-post"];
@@ -25,10 +25,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "1gyqsj7vlqynwvivf9485zwmcj04v1z7gq362z0b8zw2zf4ag0hw";
+ sha256 = "13aghksmni2sl15y7wfpx6k5l3lfd8j9gdyqi6cbw6jgc7bqyyn2";
type = "gem";
};
- version = "0.13.1";
+ version = "0.17.3";
};
faraday_middleware = {
dependencies = ["faraday"];
@@ -36,10 +36,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "1p7icfl28nvl8qqdsngryz1snqic9l8x6bk0dxd7ygn230y0k41d";
+ sha256 = "1a93rs58bakqck7bcihasz66a1riy22h2zpwrpmb13gp8mw3wkmr";
type = "gem";
};
- version = "0.12.2";
+ version = "0.13.1";
};
fast_gettext = {
groups = ["default"];
@@ -68,20 +68,20 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "04c243gwwlnh4m8rn1zx0w8mzhixjf9fvpfb65xcmgs5a19146j4";
+ sha256 = "1vfnayz20xd8q0sz27816kvgia9z2dpj9fy7z15da239wmmnz7ga";
type = "gem";
};
- version = "0.30";
+ version = "0.34";
};
locale = {
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "1sls9bq4krx0fmnzmlbn64dw23c4d6pz46ynjzrn9k8zyassdd0x";
+ sha256 = "0997465kxvpxm92fiwc2b16l49mngk7b68g5k35ify0m3q0yxpdn";
type = "gem";
};
- version = "2.1.2";
+ version = "2.1.3";
};
log4r = {
groups = ["default"];
@@ -98,30 +98,30 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "1dfw1q83h6jxrmivd3fsg0dsbkdhv63qns0jc1a6kf1vmhd6ihwd";
+ sha256 = "126mq86x67d1p63acrfka4zx0cx2r0vc93884jggxnrmmnzbxh13";
type = "gem";
};
- version = "0.8";
+ version = "0.9";
};
multi_json = {
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "1rl0qy4inf1mp8mybfk56dfga0mvx97zwpmq5xmiwl5r770171nv";
+ sha256 = "0xy54mjf7xg41l8qrg1bqri75agdqmxap9z466fjismc1rn2jwfr";
type = "gem";
};
- version = "1.13.1";
+ version = "1.14.1";
};
multipart-post = {
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "09k0b3cybqilk1gwrwwain95rdypixb2q9w65gd44gfzsd84xi1x";
+ sha256 = "1zgw9zlwh2a6i1yvhhc4a84ry1hv824d6g2iw2chs3k5aylpmpfj";
type = "gem";
};
- version = "2.0.0";
+ version = "2.1.1";
};
puppet_forge = {
dependencies = ["faraday" "faraday_middleware" "gettext-setup" "minitar" "semantic_puppet"];
@@ -129,21 +129,21 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "00qma88kwg2f4nh5yid9w4pqfdbwlh8bz2mmgiiwji38s0pdahba";
+ sha256 = "1lyd10ai27lxylywjxpwyxikx5hblsdchid3chymrrv55x217cny";
type = "gem";
};
- version = "2.2.9";
+ version = "2.3.3";
};
r10k = {
- dependencies = ["colored" "cri" "gettext-setup" "log4r" "multi_json" "puppet_forge"];
+ dependencies = ["colored2" "cri" "fast_gettext" "gettext" "gettext-setup" "log4r" "multi_json" "puppet_forge"];
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "0yjvklvdvx0wjgg6bhhaszdsk62cysjviwj0536z7ng25q3ci5kj";
+ sha256 = "0nlckw4yr2ph14i9h0blsdb5zmrzqh3aknkm0dg3hrcx8ygncai6";
type = "gem";
};
- version = "3.2.0";
+ version = "3.4.1";
};
semantic_puppet = {
groups = ["default"];
diff --git a/pkgs/tools/system/sg3_utils/default.nix b/pkgs/tools/system/sg3_utils/default.nix
index 67145bc3cc5..45e3287511a 100644
--- a/pkgs/tools/system/sg3_utils/default.nix
+++ b/pkgs/tools/system/sg3_utils/default.nix
@@ -1,15 +1,15 @@
{ stdenv, fetchurl }:
stdenv.mkDerivation rec {
- name = "sg3_utils-1.44";
+ name = "sg3_utils-1.45";
src = fetchurl {
url = "http://sg.danny.cz/sg/p/${name}.tgz";
- sha256 = "0yxfbkd48mbzipwmggcvpq60zybsb6anrca878si26z7496nibld";
+ sha256 = "0qasc3qm4i8swjfaywiwpgz76gdxqvm47qycxgmprbsjmxqwk1qb";
};
meta = with stdenv.lib; {
- homepage = http://sg.danny.cz/sg/;
+ homepage = "http://sg.danny.cz/sg/";
description = "Utilities that send SCSI commands to devices";
platforms = platforms.linux;
license = with licenses; [ bsd2 gpl2Plus ];
diff --git a/pkgs/tools/system/syslog-ng/default.nix b/pkgs/tools/system/syslog-ng/default.nix
index 8066f07afa9..ed104f3a9ba 100644
--- a/pkgs/tools/system/syslog-ng/default.nix
+++ b/pkgs/tools/system/syslog-ng/default.nix
@@ -7,11 +7,11 @@
stdenv.mkDerivation rec {
pname = "syslog-ng";
- version = "3.25.1";
+ version = "3.26.1";
src = fetchurl {
url = "https://github.com/${pname}/${pname}/releases/download/${pname}-${version}/${pname}-${version}.tar.gz";
- sha256 = "05v8vgs4fbzslqjca9zjk7hkiyb6yj4i2v0fi51xan6ypirrdjrl";
+ sha256 = "1kb2rdhfw4vcdxpvr7rcpg5ysr14ib43bfqdm3755wjdhqil48ch";
};
nativeBuildInputs = [ pkgconfig which ];
@@ -55,7 +55,7 @@ stdenv.mkDerivation rec {
enableParallelBuilding = true;
meta = with stdenv.lib; {
- homepage = https://www.syslog-ng.com;
+ homepage = "https://www.syslog-ng.com";
description = "Next-generation syslogd with advanced networking and filtering capabilities";
license = licenses.gpl2;
maintainers = with maintainers; [ fpletz ];
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 0606606a426..3ed3917bebd 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -126,6 +126,8 @@ in
addOpenGLRunpath = callPackage ../build-support/add-opengl-runpath { };
+ ankisyncd = callPackage ../servers/ankisyncd { };
+
avro-tools = callPackage ../development/tools/avro-tools { };
# Zip file format only allows times after year 1980, which makes e.g. Python wheel building fail with:
@@ -171,6 +173,8 @@ in
deadcode = callPackage ../development/tools/deadcode { };
+ hobbes = callPackage ../development/tools/hobbes { stdenv = gcc6Stdenv; }; # GCC 6 is latest currently supported. See https://git.io/JvK6M.
+
proto-contrib = callPackage ../development/tools/proto-contrib {};
protoc-gen-doc = callPackage ../development/tools/protoc-gen-doc {};
@@ -1295,8 +1299,6 @@ in
btrfs-progs = callPackage ../tools/filesystems/btrfs-progs { };
- btrfs-dedupe = callPackage ../tools/filesystems/btrfs-dedupe {};
-
btrbk = callPackage ../tools/backup/btrbk {
asciidoc = asciidoc-full;
};
@@ -1340,19 +1342,17 @@ in
cue2pops = callPackage ../tools/cd-dvd/cue2pops { };
- cabal2nix = haskell.lib.overrideCabal (haskell.lib.generateOptparseApplicativeCompletion "cabal2nix" haskell.packages.ghc881.cabal2nix) (drv: {
- isLibrary = false;
- enableSharedExecutables = false;
- executableToolDepends = (drv.executableToolDepends or []) ++ [ makeWrapper ];
- postInstall = ''
- exe=$out/libexec/${drv.pname}-${drv.version}/${drv.pname}
- install -D $out/bin/${drv.pname} $exe
- rm -rf $out/{bin,lib,share}
- makeWrapper $exe $out/bin/${drv.pname} \
- --prefix PATH ":" "${nix}/bin" \
- --prefix PATH ":" "${nix-prefetch-scripts}/bin"
- '' + (drv.postInstall or "");
- });
+ cabal2nix-unwrapped = haskell.lib.justStaticExecutables (haskell.lib.generateOptparseApplicativeCompletion "cabal2nix" haskellPackages.cabal2nix);
+
+ cabal2nix = symlinkJoin {
+ inherit (cabal2nix-unwrapped) name meta;
+ nativeBuildInputs = [ makeWrapper ];
+ paths = [ cabal2nix-unwrapped ];
+ postBuild = ''
+ wrapProgram $out/bin/cabal2nix \
+ --prefix PATH ":" "${lib.makeBinPath [ nix nix-prefetch-scripts ]}"
+ '';
+ };
stack2nix = with haskell.lib; overrideCabal (justStaticExecutables haskellPackages.stack2nix) (drv: {
executableToolDepends = [ makeWrapper ];
@@ -4551,6 +4551,7 @@ in
liquidsoap = callPackage ../tools/audio/liquidsoap/full.nix {
ffmpeg = ffmpeg-full;
+ ocamlPackages = ocaml-ng.ocamlPackages_4_07;
};
lksctp-tools = callPackage ../os-specific/linux/lksctp-tools { };
@@ -4820,6 +4821,8 @@ in
libgumath = callPackage ../development/libraries/libgumath { };
+ libinsane = callPackage ../development/libraries/libinsane { };
+
libipfix = callPackage ../development/libraries/libipfix { };
libircclient = callPackage ../development/libraries/libircclient { };
@@ -8306,7 +8309,7 @@ in
# Please update doc/languages-frameworks/haskell.section.md, “Our
# current default compiler is”, if you bump this:
- haskellPackages = dontRecurseIntoAttrs haskell.packages.ghc882;
+ haskellPackages = dontRecurseIntoAttrs haskell.packages.ghc883;
inherit (haskellPackages) ghc;
@@ -8359,7 +8362,9 @@ in
fsharp41 = callPackage ../development/compilers/fsharp41 { mono = mono6; };
- fstar = callPackage ../development/compilers/fstar { };
+ fstar = callPackage ../development/compilers/fstar {
+ ocamlPackages = ocaml-ng.ocamlPackages_4_07;
+ };
dotnetPackages = recurseIntoAttrs (callPackage ./dotnet-packages.nix {});
@@ -8932,7 +8937,7 @@ in
sagittarius-scheme = callPackage ../development/compilers/sagittarius-scheme {};
sbclBootstrap = callPackage ../development/compilers/sbcl/bootstrap.nix {};
- sbcl_2_0_1 = callPackage ../development/compilers/sbcl {};
+ sbcl_2_0_2 = callPackage ../development/compilers/sbcl {};
sbcl = callPackage ../development/compilers/sbcl/2.0.0.nix {};
scala_2_10 = callPackage ../development/compilers/scala/2.10.nix { };
@@ -10161,6 +10166,7 @@ in
fffuu = haskell.lib.justStaticExecutables (haskellPackages.callPackage ../tools/misc/fffuu { });
flow = callPackage ../development/tools/analysis/flow {
+ ocamlPackages = ocaml-ng.ocamlPackages_4_07;
inherit (darwin.apple_sdk.frameworks) CoreServices;
};
@@ -11054,9 +11060,6 @@ in
boost159 = callPackage ../development/libraries/boost/1.59.nix { };
boost15x = boost159;
boost160 = callPackage ../development/libraries/boost/1.60.nix { };
- boost162 = callPackage ../development/libraries/boost/1.62.nix { };
- boost163 = callPackage ../development/libraries/boost/1.63.nix { };
- boost164 = callPackage ../development/libraries/boost/1.64.nix { };
boost165 = callPackage ../development/libraries/boost/1.65.nix { };
boost166 = callPackage ../development/libraries/boost/1.66.nix { };
boost167 = callPackage ../development/libraries/boost/1.67.nix { };
@@ -12898,9 +12901,7 @@ in
libksba = callPackage ../development/libraries/libksba { };
- libksi = callPackage ../development/libraries/libksi {
- openssl = openssl_1_0_2;
- };
+ libksi = callPackage ../development/libraries/libksi { };
liblinear = callPackage ../development/libraries/liblinear { };
@@ -14903,7 +14904,9 @@ in
yubico-pam = callPackage ../development/libraries/yubico-pam { };
- yubico-piv-tool = callPackage ../tools/misc/yubico-piv-tool { };
+ yubico-piv-tool = callPackage ../tools/misc/yubico-piv-tool {
+ inherit (darwin.apple_sdk.frameworks) PCSC;
+ };
yubikey-manager = callPackage ../tools/misc/yubikey-manager { };
@@ -18624,6 +18627,9 @@ in
claws-mail = callPackage ../applications/networking/mailreaders/claws-mail {
inherit (xorg) libSM;
};
+ claws-mail-gtk3 = callPackage ../applications/networking/mailreaders/claws-mail/gtk3.nix {
+ inherit (xorg) libSM;
+ };
clfswm = callPackage ../applications/window-managers/clfswm { };
@@ -21720,7 +21726,7 @@ in
stalonetray = callPackage ../applications/window-managers/stalonetray {};
- inherit (ocamlPackages) stog;
+ inherit (ocaml-ng.ocamlPackages_4_07) stog;
stp = callPackage ../applications/science/logic/stp { };
@@ -22043,7 +22049,10 @@ in
unigine-valley = callPackage ../applications/graphics/unigine-valley { };
- inherit (ocaml-ng.ocamlPackages_4_05) unison;
+ unison = callPackage ../applications/networking/sync/unison {
+ enableX11 = config.unison.enableX11 or true;
+ ocamlPackages = ocaml-ng.ocamlPackages_4_05;
+ };
unpaper = callPackage ../tools/graphics/unpaper { };
@@ -24404,7 +24413,9 @@ in
abc-verifier = callPackage ../applications/science/logic/abc {};
- abella = callPackage ../applications/science/logic/abella {};
+ abella = callPackage ../applications/science/logic/abella {
+ ocamlPackages = ocaml-ng.ocamlPackages_4_07;
+ };
acgtk = callPackage ../applications/science/logic/acgtk {};
@@ -24412,7 +24423,9 @@ in
aspino = callPackage ../applications/science/logic/aspino {};
- beluga = callPackage ../applications/science/logic/beluga { };
+ beluga = callPackage ../applications/science/logic/beluga {
+ ocamlPackages = ocaml-ng.ocamlPackages_4_07;
+ };
boogie = dotnetPackages.Boogie;
@@ -24760,7 +24773,9 @@ in
golly = callPackage ../applications/science/misc/golly { wxGTK = wxGTK30; };
golly-beta = callPackage ../applications/science/misc/golly/beta.nix { wxGTK = wxGTK30; };
- megam = callPackage ../applications/science/misc/megam { };
+ megam = callPackage ../applications/science/misc/megam {
+ inherit (ocaml-ng.ocamlPackages_4_07) ocaml;
+ };
netlogo = callPackage ../applications/science/misc/netlogo { };
@@ -25649,7 +25664,10 @@ in
buildGoModule = buildGo112Module;
};
- inherit (callPackage ../applications/networking/cluster/terraform {})
+ inherit (callPackage ../applications/networking/cluster/terraform {
+ # terraform 0.12 crashes with go1.14 on darwin https://github.com/hashicorp/terraform/issues/24287
+ buildGoPackage = if stdenv.isDarwin then buildGo113Package else buildGoPackage;
+ })
terraform_0_11
terraform_0_11-full
terraform_0_12
diff --git a/pkgs/top-level/ocaml-packages.nix b/pkgs/top-level/ocaml-packages.nix
index 002e3bebbb2..e8a6bc21035 100644
--- a/pkgs/top-level/ocaml-packages.nix
+++ b/pkgs/top-level/ocaml-packages.nix
@@ -1198,10 +1198,6 @@ let
google-drive-ocamlfuse = callPackage ../applications/networking/google-drive-ocamlfuse { };
- unison = callPackage ../applications/networking/sync/unison {
- enableX11 = config.unison.enableX11 or true;
- };
-
hol_light = callPackage ../applications/science/logic/hol_light { };
})).overrideScope' liftJaneStreet;
@@ -1233,5 +1229,5 @@ in let inherit (pkgs) callPackage; in rec
ocamlPackages_latest = ocamlPackages_4_10;
- ocamlPackages = ocamlPackages_4_07;
+ ocamlPackages = ocamlPackages_4_08;
}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index ee2eaffbb0b..7f9f28b4539 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -511,6 +511,8 @@ in {
django-sesame = callPackage ../development/python-modules/django-sesame { };
+ bravado-core = callPackage ../development/python-modules/bravado-core { };
+
breathe = callPackage ../development/python-modules/breathe { };
brotli = callPackage ../development/python-modules/brotli { };
@@ -571,6 +573,8 @@ in {
codespell = callPackage ../development/python-modules/codespell { };
+ convertdate = callPackage ../development/python-modules/convertdate { };
+
crc32c = callPackage ../development/python-modules/crc32c { };
curio = callPackage ../development/python-modules/curio { };
@@ -1175,6 +1179,8 @@ in {
pymavlink = callPackage ../development/python-modules/pymavlink { };
+ pymeeus = callPackage ../development/python-modules/pymeeus { };
+
pymsgbox = callPackage ../development/python-modules/pymsgbox { };
pynisher = callPackage ../development/python-modules/pynisher { };
@@ -5099,8 +5105,6 @@ in {
pyinotify = callPackage ../development/python-modules/pyinotify { };
- pyinsane2 = callPackage ../development/python-modules/pyinsane2 { };
-
pyjwt = callPackage ../development/python-modules/pyjwt { };
pykickstart = callPackage ../development/python-modules/pykickstart { };