diff --git a/doc/languages-frameworks/go.xml b/doc/languages-frameworks/go.xml
index bd1ee8eba275..53c891e66f87 100644
--- a/doc/languages-frameworks/go.xml
+++ b/doc/languages-frameworks/go.xml
@@ -66,6 +66,15 @@ pet = buildGoModule rec {
+
+
+ modSha256 can also take null as an input.
+
+ When `null` is used as a value, the derivation won't be a
+ fixed-output derivation but disable the build sandbox instead. This can be useful outside
+ of nixpkgs where re-generating the modSha256 on each mod.sum changes is cumbersome,
+ but will fail to build by Hydra, as builds with a disabled sandbox are discouraged.
+
diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix
index 2faf225080e4..4952972eb4de 100644
--- a/maintainers/maintainer-list.nix
+++ b/maintainers/maintainer-list.nix
@@ -2005,7 +2005,7 @@
name = "Edward Tjörnhammar";
};
eelco = {
- email = "eelco.dolstra@logicblox.com";
+ email = "edolstra+nixpkgs@gmail.com";
github = "edolstra";
githubId = 1148549;
name = "Eelco Dolstra";
@@ -2968,7 +2968,12 @@
infinisil = {
email = "contact@infinisil.com";
github = "infinisil";
+ githubId = 20525370;
name = "Silvan Mosberger";
+ keys = [{
+ longkeyid = "rsa4096/0x422E9EDAE0157170";
+ fingerprint = "6C2B 55D4 4E04 8266 6B7D DA1A 422E 9EDA E015 7170";
+ }];
};
ingenieroariel = {
email = "ariel@nunez.co";
@@ -4898,12 +4903,6 @@
githubId = 364510;
name = "Tobias Geerinckx-Rice";
};
- ndowens = {
- email = "ndowens04@gmail.com";
- github = "ndowens";
- githubId = 117743;
- name = "Nathan Owens";
- };
neeasade = {
email = "nathanisom27@gmail.com";
github = "neeasade";
diff --git a/nixos/doc/manual/configuration/abstractions.xml b/nixos/doc/manual/configuration/abstractions.xml
index 5bf0635cc1aa..df9ff2615e1a 100644
--- a/nixos/doc/manual/configuration/abstractions.xml
+++ b/nixos/doc/manual/configuration/abstractions.xml
@@ -11,50 +11,46 @@
{
=
- [ { hostName = "example.org";
- documentRoot = "/webroot";
+ { "blog.example.org" = {
+ documentRoot = "/webroot/blog.example.org";
adminAddr = "alice@example.org";
- enableUserDir = true;
- }
- { hostName = "example.org";
- documentRoot = "/webroot";
+ forceSSL = true;
+ enableACME = true;
+ enablePHP = true;
+ };
+ "wiki.example.org" = {
+ documentRoot = "/webroot/wiki.example.org";
adminAddr = "alice@example.org";
- enableUserDir = true;
- enableSSL = true;
- sslServerCert = "/root/ssl-example-org.crt";
- sslServerKey = "/root/ssl-example-org.key";
- }
- ];
+ forceSSL = true;
+ enableACME = true;
+ enablePHP = true;
+ };
+ };
}
It defines two virtual hosts with nearly identical configuration; the only
- difference is that the second one has SSL enabled. To prevent this
+ difference is the document root directories. To prevent this
duplication, we can use a let:
let
- exampleOrgCommon =
- { hostName = "example.org";
- documentRoot = "/webroot";
- adminAddr = "alice@example.org";
- enableUserDir = true;
+ commonConfig =
+ { adminAddr = "alice@example.org";
+ forceSSL = true;
+ enableACME = true;
};
in
{
=
- [ exampleOrgCommon
- (exampleOrgCommon // {
- enableSSL = true;
- sslServerCert = "/root/ssl-example-org.crt";
- sslServerKey = "/root/ssl-example-org.key";
- })
- ];
+ { "blog.example.org" = (commonConfig // { documentRoot = "/webroot/blog.example.org"; });
+ "wiki.example.org" = (commonConfig // { documentRoot = "/webroot/wiki.example.com"; });
+ };
}
- The let exampleOrgCommon = ...
- defines a variable named exampleOrgCommon. The
+ The let commonConfig = ...
+ defines a variable named commonConfig. The
// operator merges two attribute sets, so the
configuration of the second virtual host is the set
- exampleOrgCommon extended with the SSL options.
+ commonConfig extended with the document root option.
@@ -63,13 +59,13 @@ in
{
=
- let exampleOrgCommon = ...; in
- [ exampleOrgCommon
- (exampleOrgCommon // { ... })
- ];
+ let commonConfig = ...; in
+ { "blog.example.org" = (commonConfig // { ... })
+ "wiki.example.org" = (commonConfig // { ... })
+ };
}
- but not { let exampleOrgCommon = ...; in
+ but not { let commonConfig = ...; in
...; } since attributes (as opposed to
attribute values) are not expressions.
@@ -77,80 +73,29 @@ in
Functions provide another method of abstraction. For
instance, suppose that we want to generate lots of different virtual hosts,
- all with identical configuration except for the host name. This can be done
+ all with identical configuration except for the document root. This can be done
as follows:
{
=
let
- makeVirtualHost = name:
- { hostName = name;
- documentRoot = "/webroot";
+ makeVirtualHost = webroot:
+ { documentRoot = webroot;
adminAddr = "alice@example.org";
+ forceSSL = true;
+ enableACME = true;
};
in
- [ (makeVirtualHost "example.org")
- (makeVirtualHost "example.com")
- (makeVirtualHost "example.gov")
- (makeVirtualHost "example.nl")
- ];
+ { "example.org" = (makeVirtualHost "/webroot/example.org");
+ "example.com" = (makeVirtualHost "/webroot/example.com");
+ "example.gov" = (makeVirtualHost "/webroot/example.gov");
+ "example.nl" = (makeVirtualHost "/webroot/example.nl");
+ };
}
Here, makeVirtualHost is a function that takes a single
- argument name and returns the configuration for a virtual
+ argument webroot and returns the configuration for a virtual
host. That function is then called for several names to produce the list of
virtual host configurations.
-
-
- We can further improve on this by using the function map,
- which applies another function to every element in a list:
-
-{
- =
- let
- makeVirtualHost = ...;
- in map makeVirtualHost
- [ "example.org" "example.com" "example.gov" "example.nl" ];
-}
-
- (The function map is called a higher-order
- function because it takes another function as an argument.)
-
-
-
- What if you need more than one argument, for instance, if we want to use a
- different documentRoot for each virtual host? Then we can
- make makeVirtualHost a function that takes a
- set as its argument, like this:
-
-{
- =
- let
- makeVirtualHost = { name, root }:
- { hostName = name;
- documentRoot = root;
- adminAddr = "alice@example.org";
- };
- in map makeVirtualHost
- [ { name = "example.org"; root = "/sites/example.org"; }
- { name = "example.com"; root = "/sites/example.com"; }
- { name = "example.gov"; root = "/sites/example.gov"; }
- { name = "example.nl"; root = "/sites/example.nl"; }
- ];
-}
-
- But in this case (where every root is a subdirectory of
- /sites named after the virtual host), it would have been
- shorter to define makeVirtualHost as
-
-makeVirtualHost = name:
- { hostName = name;
- documentRoot = "/sites/${name}";
- adminAddr = "alice@example.org";
- };
-
- Here, the construct ${...}
- allows the result of an expression to be spliced into a string.
-
diff --git a/nixos/doc/manual/configuration/config-file.xml b/nixos/doc/manual/configuration/config-file.xml
index eadafb94b8f6..7ccb5b3664ea 100644
--- a/nixos/doc/manual/configuration/config-file.xml
+++ b/nixos/doc/manual/configuration/config-file.xml
@@ -27,7 +27,7 @@
{ = true;
= "alice@example.org";
- = "/webroot";
+ services.httpd.virtualHosts.localhost.documentRoot = "/webroot";
}
defines a configuration with three option definitions that together enable
@@ -50,7 +50,11 @@
httpd = {
enable = true;
adminAddr = "alice@example.org";
- documentRoot = "/webroot";
+ virtualHosts = {
+ localhost = {
+ documentRoot = "/webroot";
+ };
+ };
};
};
}
diff --git a/nixos/doc/manual/man-nixos-install.xml b/nixos/doc/manual/man-nixos-install.xml
index 45bbd5d81ff0..93082f914bee 100644
--- a/nixos/doc/manual/man-nixos-install.xml
+++ b/nixos/doc/manual/man-nixos-install.xml
@@ -14,6 +14,26 @@
nixos-install
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -134,6 +154,23 @@
This command accepts the following options:
+
+ /
+
+ Increases the level of verbosity of diagnostic messages
+ printed on standard error. For each Nix operation, the information
+ printed on standard output is well-defined; any diagnostic
+ information is printed on standard error, never on standard
+ output.
+ Please note that this option may be specified repeatedly.
+
+
+
+ /
+
+ Print the full build logs of nix build to stderr.
+
+
diff --git a/nixos/doc/manual/release-notes/rl-2003.xml b/nixos/doc/manual/release-notes/rl-2003.xml
index 10ba1c180f6f..13f4c62c018a 100644
--- a/nixos/doc/manual/release-notes/rl-2003.xml
+++ b/nixos/doc/manual/release-notes/rl-2003.xml
@@ -264,6 +264,14 @@ services.xserver.displayManager.defaultSession = "xfce+icewm";
in container config.
+
+
+ The kresd services deprecates the interfaces option
+ in favor of the listenPlain option which requires full
+ systemd.socket compatible
+ declaration which always include a port.
+
+
Virtual console options have been reorganized and can be found under
@@ -317,16 +325,38 @@ services.xserver.displayManager.defaultSession = "xfce+icewm";
- The awstats module has been rewritten
+ The awstats module has been rewritten
to serve stats via static html pages, updated on a timer, over nginx,
- instead of dynamic cgi pages over apache.
+ instead of dynamic cgi pages over apache.
Minor changes will be required to migrate existing configurations. Details of the
- required changes can seen by looking through the awstats
+ required changes can seen by looking through the awstats
module.
+
+
+ The httpd module no longer provides options to support serving web content without defining a virtual host. As a
+ result of this the services.httpd.logPerVirtualHost
+ option now defaults to true instead of false. Please update your
+ configuration to make use of services.httpd.virtualHosts.
+
+
+ The services.httpd.virtualHosts.<name>
+ option has changed type from a list of submodules to an attribute set of submodules, better matching
+ services.nginx.virtualHosts.<name>.
+
+
+ This change comes with the addition of the following options which mimic the functionality of their nginx counterparts:
+ services.httpd.virtualHosts.<name>.addSSL,
+ services.httpd.virtualHosts.<name>.forceSSL,
+ services.httpd.virtualHosts.<name>.onlySSL,
+ services.httpd.virtualHosts.<name>.enableACME,
+ services.httpd.virtualHosts.<name>.acmeRoot, and
+ services.httpd.virtualHosts.<name>.useACMEHost.
+
+
diff --git a/nixos/modules/config/swap.nix b/nixos/modules/config/swap.nix
index fed3fa3bc7c8..d0fc0d4a3ea4 100644
--- a/nixos/modules/config/swap.nix
+++ b/nixos/modules/config/swap.nix
@@ -58,7 +58,7 @@ let
device = mkOption {
example = "/dev/sda3";
type = types.str;
- description = "Path of the device.";
+ description = "Path of the device or swap file.";
};
label = mkOption {
diff --git a/nixos/modules/installer/tools/nixos-generate-config.pl b/nixos/modules/installer/tools/nixos-generate-config.pl
index 7f98756a7d9f..629c56814a16 100644
--- a/nixos/modules/installer/tools/nixos-generate-config.pl
+++ b/nixos/modules/installer/tools/nixos-generate-config.pl
@@ -501,7 +501,7 @@ if (-f $fb_modes_file && -r $fb_modes_file) {
my $console_width = $1, my $console_height = $2;
if ($console_width > 1920) {
push @attrs, "# High-DPI console";
- push @attrs, 'i18n.consoleFont = lib.mkDefault "${pkgs.terminus_font}/share/consolefonts/ter-u28n.psf.gz";';
+ push @attrs, 'console.font = lib.mkDefault "${pkgs.terminus_font}/share/consolefonts/ter-u28n.psf.gz";';
}
}
diff --git a/nixos/modules/installer/tools/nixos-install.sh b/nixos/modules/installer/tools/nixos-install.sh
index 8685cb345e1e..a3ff3fe2c0c1 100644
--- a/nixos/modules/installer/tools/nixos-install.sh
+++ b/nixos/modules/installer/tools/nixos-install.sh
@@ -14,6 +14,8 @@ extraBuildFlags=()
mountPoint=/mnt
channelPath=
system=
+verbosity=()
+buildLogs=
while [ "$#" -gt 0 ]; do
i="$1"; shift 1
@@ -55,6 +57,12 @@ while [ "$#" -gt 0 ]; do
--debug)
set -x
;;
+ -v*|--verbose)
+ verbosity+=("$i")
+ ;;
+ -L|--print-build-logs)
+ buildLogs="$i"
+ ;;
*)
echo "$0: unknown option \`$i'"
exit 1
@@ -94,7 +102,7 @@ if [[ -z $system ]]; then
outLink="$tmpdir/system"
nix build --out-link "$outLink" --store "$mountPoint" "${extraBuildFlags[@]}" \
--extra-substituters "$sub" \
- -f '' system -I "nixos-config=$NIXOS_CONFIG"
+ -f '' system -I "nixos-config=$NIXOS_CONFIG" ${verbosity[@]} ${buildLogs}
system=$(readlink -f $outLink)
fi
@@ -103,7 +111,7 @@ fi
# a progress bar.
nix-env --store "$mountPoint" "${extraBuildFlags[@]}" \
--extra-substituters "$sub" \
- -p $mountPoint/nix/var/nix/profiles/system --set "$system"
+ -p $mountPoint/nix/var/nix/profiles/system --set "$system" ${verbosity[@]}
# Copy the NixOS/Nixpkgs sources to the target as the initial contents
# of the NixOS channel.
@@ -115,7 +123,8 @@ if [[ -z $noChannelCopy ]]; then
echo "copying channel..."
mkdir -p $mountPoint/nix/var/nix/profiles/per-user/root
nix-env --store "$mountPoint" "${extraBuildFlags[@]}" --extra-substituters "$sub" \
- -p $mountPoint/nix/var/nix/profiles/per-user/root/channels --set "$channelPath" --quiet
+ -p $mountPoint/nix/var/nix/profiles/per-user/root/channels --set "$channelPath" --quiet \
+ ${verbosity[@]}
install -m 0700 -d $mountPoint/root/.nix-defexpr
ln -sfn /nix/var/nix/profiles/per-user/root/channels $mountPoint/root/.nix-defexpr/channels
fi
diff --git a/nixos/modules/services/backup/borgbackup.nix b/nixos/modules/services/backup/borgbackup.nix
index 10d42325a6b1..a2eb80c55a8c 100644
--- a/nixos/modules/services/backup/borgbackup.nix
+++ b/nixos/modules/services/backup/borgbackup.nix
@@ -68,7 +68,7 @@ let
{ BORG_PASSPHRASE = passphrase; }
else { };
- mkBackupService = name: cfg:
+ mkBackupService = name: cfg:
let
userHome = config.users.users.${cfg.user}.home;
in nameValuePair "borgbackup-job-${name}" {
@@ -98,6 +98,23 @@ let
inherit (cfg) startAt;
};
+ # utility function around makeWrapper
+ mkWrapperDrv = {
+ original, name, set ? {}
+ }:
+ pkgs.runCommandNoCC "${name}-wrapper" {
+ buildInputs = [ pkgs.makeWrapper ];
+ } (with lib; ''
+ makeWrapper "${original}" "$out/bin/${name}" \
+ ${concatStringsSep " \\\n " (mapAttrsToList (name: value: ''--set ${name} "${value}"'') set)}
+ '');
+
+ mkBorgWrapper = name: cfg: mkWrapperDrv {
+ original = "${pkgs.borgbackup}/bin/borg";
+ name = "borg-job-${name}";
+ set = { BORG_REPO = cfg.repo; } // (mkPassEnv cfg) // cfg.environment;
+ };
+
# Paths listed in ReadWritePaths must exist before service is started
mkActivationScript = name: cfg:
let
@@ -176,7 +193,11 @@ in {
###### interface
options.services.borgbackup.jobs = mkOption {
- description = "Deduplicating backups using BorgBackup.";
+ description = ''
+ Deduplicating backups using BorgBackup.
+ Adding a job will cause a borg-job-NAME wrapper to be added
+ to your system path, so that you can perform maintenance easily.
+ '';
default = { };
example = literalExample ''
{
@@ -623,6 +644,6 @@ in {
users = mkMerge (mapAttrsToList mkUsersConfig repos);
- environment.systemPackages = with pkgs; [ borgbackup ];
+ environment.systemPackages = with pkgs; [ borgbackup ] ++ (mapAttrsToList mkBorgWrapper jobs);
});
}
diff --git a/nixos/modules/services/hardware/udev.nix b/nixos/modules/services/hardware/udev.nix
index 83ab93bd7cfc..50997bb9bb1b 100644
--- a/nixos/modules/services/hardware/udev.nix
+++ b/nixos/modules/services/hardware/udev.nix
@@ -221,8 +221,8 @@ in
type = types.lines;
description = ''
Additional hwdb files. They'll be written
- into file 10-local.hwdb. Thus they are
- read before all other files.
+ into file 99-local.hwdb. Thus they are
+ read after all other files.
'';
};
diff --git a/nixos/modules/services/logging/awstats.nix b/nixos/modules/services/logging/awstats.nix
index d51c9a5cffab..5939d7808f7f 100644
--- a/nixos/modules/services/logging/awstats.nix
+++ b/nixos/modules/services/logging/awstats.nix
@@ -65,6 +65,7 @@ let
"ValidHTTPCodes" = "404";
}
'';
+ description = "Extra configuration to be appendend to awstats.\${name}.conf.";
};
webService = {
diff --git a/nixos/modules/services/misc/ethminer.nix b/nixos/modules/services/misc/ethminer.nix
index 2958cf214473..95afb0460fb8 100644
--- a/nixos/modules/services/misc/ethminer.nix
+++ b/nixos/modules/services/misc/ethminer.nix
@@ -71,7 +71,7 @@ in
maxPower = mkOption {
type = types.int;
- default = 115;
+ default = 113;
description = "Miner max watt usage.";
};
@@ -92,7 +92,9 @@ in
serviceConfig = {
DynamicUser = true;
+ ExecStartPre = "${pkgs.ethminer}/bin/.ethminer-wrapped --list-devices";
ExecStartPost = optional (cfg.toolkit == "cuda") "+${getBin config.boot.kernelPackages.nvidia_x11}/bin/nvidia-smi -pl ${toString cfg.maxPower}";
+ Restart = "always";
};
environment = {
diff --git a/nixos/modules/services/monitoring/nagios.nix b/nixos/modules/services/monitoring/nagios.nix
index 6a3b97769462..4128bc12030f 100644
--- a/nixos/modules/services/monitoring/nagios.nix
+++ b/nixos/modules/services/monitoring/nagios.nix
@@ -8,6 +8,7 @@ let
nagiosState = "/var/lib/nagios";
nagiosLogDir = "/var/log/nagios";
+ urlPath = "/nagios";
nagiosObjectDefs = cfg.objectDefs;
@@ -49,12 +50,12 @@ let
''
main_config_file=${cfg.mainConfigFile}
use_authentication=0
- url_html_path=${cfg.urlPath}
+ url_html_path=${urlPath}
'';
extraHttpdConfig =
''
- ScriptAlias ${cfg.urlPath}/cgi-bin ${pkgs.nagios}/sbin
+ ScriptAlias ${urlPath}/cgi-bin ${pkgs.nagios}/sbin
Options ExecCGI
@@ -62,7 +63,7 @@ let
SetEnv NAGIOS_CGI_CONFIG ${cfg.cgiConfigFile}
- Alias ${cfg.urlPath} ${pkgs.nagios}/share
+ Alias ${urlPath} ${pkgs.nagios}/share
Options None
@@ -72,6 +73,10 @@ let
in
{
+ imports = [
+ (mkRemovedOptionModule [ "services" "nagios" "urlPath" ] "The urlPath option has been removed as it is hard coded to /nagios in the nagios package.")
+ ];
+
options = {
services.nagios = {
enable = mkOption {
@@ -128,13 +133,20 @@ in
";
};
- urlPath = mkOption {
- default = "/nagios";
- description = "
- The URL path under which the Nagios web interface appears.
- That is, you can access the Nagios web interface through
- http://server/urlPath.
- ";
+ virtualHost = mkOption {
+ type = types.submodule (import ../web-servers/apache-httpd/per-server-options.nix);
+ example = literalExample ''
+ { hostName = "example.org";
+ adminAddr = "webmaster@example.org";
+ enableSSL = true;
+ sslServerCert = "/var/lib/acme/example.org/full.pem";
+ sslServerKey = "/var/lib/acme/example.org/key.pem";
+ }
+ '';
+ description = ''
+ Apache configuration can be done by adapting .
+ See for further information.
+ '';
};
};
};
@@ -182,6 +194,8 @@ in
'';
};
- services.httpd.extraConfig = optionalString cfg.enableWebInterface extraHttpdConfig;
+ services.httpd.virtualHosts = optionalAttrs cfg.enableWebInterface {
+ ${cfg.virtualHost.hostName} = mkMerge [ cfg.virtualHost { extraConfig = extraHttpdConfig; } ];
+ };
};
}
diff --git a/nixos/modules/services/networking/kresd.nix b/nixos/modules/services/networking/kresd.nix
index fc516c01230a..574074944d5e 100644
--- a/nixos/modules/services/networking/kresd.nix
+++ b/nixos/modules/services/networking/kresd.nix
@@ -13,6 +13,17 @@ in
{
meta.maintainers = [ maintainers.vcunat /* upstream developer */ ];
+ imports = [
+ (mkChangedOptionModule [ "services" "kresd" "interfaces" ] [ "services" "kresd" "listenPlain" ]
+ (config:
+ let value = getAttrFromPath [ "services" "kresd" "interfaces" ] config;
+ in map
+ (iface: if elem ":" (stringToCharacters iface) then "[${iface}]:53" else "${iface}:53") # Syntax depends on being IPv6 or IPv4.
+ value
+ )
+ )
+ ];
+
###### interface
options.services.kresd = {
enable = mkOption {
@@ -39,11 +50,12 @@ in
Directory for caches. They are intended to survive reboots.
'';
};
- interfaces = mkOption {
+ listenPlain = mkOption {
type = with types; listOf str;
- default = [ "::1" "127.0.0.1" ];
+ default = [ "[::1]:53" "127.0.0.1:53" ];
description = ''
- What addresses the server should listen on. (UDP+TCP 53)
+ What addresses and ports the server should listen on.
+ For detailed syntax see ListenStream in man systemd.socket.
'';
};
listenTLS = mkOption {
@@ -51,7 +63,7 @@ in
default = [];
example = [ "198.51.100.1:853" "[2001:db8::1]:853" "853" ];
description = ''
- Addresses on which kresd should provide DNS over TLS (see RFC 7858).
+ Addresses and ports on which kresd should provide DNS over TLS (see RFC 7858).
For detailed syntax see ListenStream in man systemd.socket.
'';
};
@@ -76,10 +88,7 @@ in
systemd.sockets.kresd = rec {
wantedBy = [ "sockets.target" ];
before = wantedBy;
- listenStreams = map
- # Syntax depends on being IPv6 or IPv4.
- (iface: if elem ":" (stringToCharacters iface) then "[${iface}]:53" else "${iface}:53")
- cfg.interfaces;
+ listenStreams = cfg.listenPlain;
socketConfig = {
ListenDatagram = listenStreams;
FreeBind = true;
diff --git a/nixos/modules/services/web-apps/limesurvey.nix b/nixos/modules/services/web-apps/limesurvey.nix
index bd524524130d..e00a47191c6f 100644
--- a/nixos/modules/services/web-apps/limesurvey.nix
+++ b/nixos/modules/services/web-apps/limesurvey.nix
@@ -3,7 +3,7 @@
let
inherit (lib) mkDefault mkEnableOption mkForce mkIf mkMerge mkOption;
- inherit (lib) mapAttrs optional optionalString types;
+ inherit (lib) literalExample mapAttrs optional optionalString types;
cfg = config.services.limesurvey;
fpm = config.services.phpfpm.pools.limesurvey;
@@ -100,19 +100,15 @@ in
};
virtualHost = mkOption {
- type = types.submodule ({
- options = import ../web-servers/apache-httpd/per-server-options.nix {
- inherit lib;
- forMainServer = false;
- };
- });
- example = {
- hostName = "survey.example.org";
- enableSSL = true;
- adminAddr = "webmaster@example.org";
- sslServerCert = "/var/lib/acme/survey.example.org/full.pem";
- sslServerKey = "/var/lib/acme/survey.example.org/key.pem";
- };
+ type = types.submodule (import ../web-servers/apache-httpd/per-server-options.nix);
+ example = literalExample ''
+ {
+ hostName = "survey.example.org";
+ adminAddr = "webmaster@example.org";
+ forceSSL = true;
+ enableACME = true;
+ }
+ '';
description = ''
Apache configuration can be done by adapting services.httpd.virtualHosts.<name>.
See for further information.
@@ -184,7 +180,7 @@ in
config = {
tempdir = "${stateDir}/tmp";
uploaddir = "${stateDir}/upload";
- force_ssl = mkIf cfg.virtualHost.enableSSL "on";
+ force_ssl = mkIf (cfg.virtualHost.addSSL || cfg.virtualHost.forceSSL || cfg.virtualHost.onlySSL) "on";
config.defaultlang = "en";
};
};
@@ -215,38 +211,36 @@ in
enable = true;
adminAddr = mkDefault cfg.virtualHost.adminAddr;
extraModules = [ "proxy_fcgi" ];
- virtualHosts = [ (mkMerge [
- cfg.virtualHost {
- documentRoot = mkForce "${pkg}/share/limesurvey";
- extraConfig = ''
- Alias "/tmp" "${stateDir}/tmp"
-
- AllowOverride all
- Require all granted
- Options -Indexes +FollowSymlinks
-
+ virtualHosts.${cfg.virtualHost.hostName} = mkMerge [ cfg.virtualHost {
+ documentRoot = mkForce "${pkg}/share/limesurvey";
+ extraConfig = ''
+ Alias "/tmp" "${stateDir}/tmp"
+
+ AllowOverride all
+ Require all granted
+ Options -Indexes +FollowSymlinks
+
- Alias "/upload" "${stateDir}/upload"
-
- AllowOverride all
- Require all granted
- Options -Indexes
-
+ Alias "/upload" "${stateDir}/upload"
+
+ AllowOverride all
+ Require all granted
+ Options -Indexes
+
-
-
-
- SetHandler "proxy:unix:${fpm.socket}|fcgi://localhost/"
-
-
+
+
+
+ SetHandler "proxy:unix:${fpm.socket}|fcgi://localhost/"
+
+
- AllowOverride all
- Options -Indexes
- DirectoryIndex index.php
-
- '';
- }
- ]) ];
+ AllowOverride all
+ Options -Indexes
+ DirectoryIndex index.php
+
+ '';
+ } ];
};
systemd.tmpfiles.rules = [
diff --git a/nixos/modules/services/web-apps/mediawiki.nix b/nixos/modules/services/web-apps/mediawiki.nix
index 43edc04e1a49..8a109b39bb57 100644
--- a/nixos/modules/services/web-apps/mediawiki.nix
+++ b/nixos/modules/services/web-apps/mediawiki.nix
@@ -64,7 +64,7 @@ let
$wgScriptPath = "";
## The protocol and server name to use in fully-qualified URLs
- $wgServer = "${if cfg.virtualHost.enableSSL then "https" else "http"}://${cfg.virtualHost.hostName}";
+ $wgServer = "${if cfg.virtualHost.addSSL || cfg.virtualHost.forceSSL || cfg.virtualHost.onlySSL then "https" else "http"}://${cfg.virtualHost.hostName}";
## The URL path to static resources (images, scripts, etc.)
$wgResourceBasePath = $wgScriptPath;
@@ -290,19 +290,13 @@ in
};
virtualHost = mkOption {
- type = types.submodule ({
- options = import ../web-servers/apache-httpd/per-server-options.nix {
- inherit lib;
- forMainServer = false;
- };
- });
+ type = types.submodule (import ../web-servers/apache-httpd/per-server-options.nix);
example = literalExample ''
{
hostName = "mediawiki.example.org";
- enableSSL = true;
adminAddr = "webmaster@example.org";
- sslServerCert = "/var/lib/acme/mediawiki.example.org/full.pem";
- sslServerKey = "/var/lib/acme/mediawiki.example.org/key.pem";
+ forceSSL = true;
+ enableACME = true;
}
'';
description = ''
@@ -389,31 +383,28 @@ in
services.httpd = {
enable = true;
- adminAddr = mkDefault cfg.virtualHost.adminAddr;
extraModules = [ "proxy_fcgi" ];
- virtualHosts = [ (mkMerge [
- cfg.virtualHost {
- documentRoot = mkForce "${pkg}/share/mediawiki";
- extraConfig = ''
-
-
-
- SetHandler "proxy:unix:${fpm.socket}|fcgi://localhost/"
-
-
+ virtualHosts.${cfg.virtualHost.hostName} = mkMerge [ cfg.virtualHost {
+ documentRoot = mkForce "${pkg}/share/mediawiki";
+ extraConfig = ''
+
+
+
+ SetHandler "proxy:unix:${fpm.socket}|fcgi://localhost/"
+
+
- Require all granted
- DirectoryIndex index.php
- AllowOverride All
-
- '' + optionalString (cfg.uploadsDir != null) ''
- Alias "/images" "${cfg.uploadsDir}"
-
- Require all granted
-
- '';
- }
- ]) ];
+ Require all granted
+ DirectoryIndex index.php
+ AllowOverride All
+
+ '' + optionalString (cfg.uploadsDir != null) ''
+ Alias "/images" "${cfg.uploadsDir}"
+
+ Require all granted
+
+ '';
+ } ];
};
systemd.tmpfiles.rules = [
diff --git a/nixos/modules/services/web-apps/moodle.nix b/nixos/modules/services/web-apps/moodle.nix
index ac59f9e0012a..595d070d940a 100644
--- a/nixos/modules/services/web-apps/moodle.nix
+++ b/nixos/modules/services/web-apps/moodle.nix
@@ -32,7 +32,7 @@ let
'dbcollation' => 'utf8mb4_unicode_ci',
);
- $CFG->wwwroot = '${if cfg.virtualHost.enableSSL then "https" else "http"}://${cfg.virtualHost.hostName}';
+ $CFG->wwwroot = '${if cfg.virtualHost.addSSL || cfg.virtualHost.forceSSL || cfg.virtualHost.onlySSL then "https" else "http"}://${cfg.virtualHost.hostName}';
$CFG->dataroot = '${stateDir}';
$CFG->admin = 'admin';
@@ -140,19 +140,15 @@ in
};
virtualHost = mkOption {
- type = types.submodule ({
- options = import ../web-servers/apache-httpd/per-server-options.nix {
- inherit lib;
- forMainServer = false;
- };
- });
- example = {
- hostName = "moodle.example.org";
- enableSSL = true;
- adminAddr = "webmaster@example.org";
- sslServerCert = "/var/lib/acme/moodle.example.org/full.pem";
- sslServerKey = "/var/lib/acme/moodle.example.org/key.pem";
- };
+ type = types.submodule (import ../web-servers/apache-httpd/per-server-options.nix);
+ example = literalExample ''
+ {
+ hostName = "moodle.example.org";
+ adminAddr = "webmaster@example.org";
+ forceSSL = true;
+ enableACME = true;
+ }
+ '';
description = ''
Apache configuration can be done by adapting .
See for further information.
@@ -241,22 +237,20 @@ in
enable = true;
adminAddr = mkDefault cfg.virtualHost.adminAddr;
extraModules = [ "proxy_fcgi" ];
- virtualHosts = [ (mkMerge [
- cfg.virtualHost {
- documentRoot = mkForce "${cfg.package}/share/moodle";
- extraConfig = ''
-
-
-
- SetHandler "proxy:unix:${fpm.socket}|fcgi://localhost/"
-
-
- Options -Indexes
- DirectoryIndex index.php
-
- '';
- }
- ]) ];
+ virtualHosts.${cfg.virtualHost.hostName} = mkMerge [ cfg.virtualHost {
+ documentRoot = mkForce "${cfg.package}/share/moodle";
+ extraConfig = ''
+
+
+
+ SetHandler "proxy:unix:${fpm.socket}|fcgi://localhost/"
+
+
+ Options -Indexes
+ DirectoryIndex index.php
+
+ '';
+ } ];
};
systemd.tmpfiles.rules = [
diff --git a/nixos/modules/services/web-apps/wordpress.nix b/nixos/modules/services/web-apps/wordpress.nix
index 13d21a0b4aed..ad4f39fbf52c 100644
--- a/nixos/modules/services/web-apps/wordpress.nix
+++ b/nixos/modules/services/web-apps/wordpress.nix
@@ -3,7 +3,7 @@
let
inherit (lib) mkDefault mkEnableOption mkForce mkIf mkMerge mkOption types;
inherit (lib) any attrValues concatMapStringsSep flatten literalExample;
- inherit (lib) mapAttrs' mapAttrsToList nameValuePair optional optionalAttrs optionalString;
+ inherit (lib) mapAttrs mapAttrs' mapAttrsToList nameValuePair optional optionalAttrs optionalString;
eachSite = config.services.wordpress;
user = "wordpress";
@@ -209,18 +209,12 @@ let
};
virtualHost = mkOption {
- type = types.submodule ({
- options = import ../web-servers/apache-httpd/per-server-options.nix {
- inherit lib;
- forMainServer = false;
- };
- });
+ type = types.submodule (import ../web-servers/apache-httpd/per-server-options.nix);
example = literalExample ''
{
- enableSSL = true;
adminAddr = "webmaster@example.org";
- sslServerCert = "/var/lib/acme/wordpress.example.org/full.pem";
- sslServerKey = "/var/lib/acme/wordpress.example.org/key.pem";
+ forceSSL = true;
+ enableACME = true;
}
'';
description = ''
@@ -304,41 +298,37 @@ in
services.httpd = {
enable = true;
extraModules = [ "proxy_fcgi" ];
- virtualHosts = mapAttrsToList (hostName: cfg:
- (mkMerge [
- cfg.virtualHost {
- documentRoot = mkForce "${pkg hostName cfg}/share/wordpress";
- extraConfig = ''
-
-
-
- SetHandler "proxy:unix:${config.services.phpfpm.pools."wordpress-${hostName}".socket}|fcgi://localhost/"
-
-
+ virtualHosts = mapAttrs (hostName: cfg: mkMerge [ cfg.virtualHost {
+ documentRoot = mkForce "${pkg hostName cfg}/share/wordpress";
+ extraConfig = ''
+
+
+
+ SetHandler "proxy:unix:${config.services.phpfpm.pools."wordpress-${hostName}".socket}|fcgi://localhost/"
+
+
- # standard wordpress .htaccess contents
-
- RewriteEngine On
- RewriteBase /
- RewriteRule ^index\.php$ - [L]
- RewriteCond %{REQUEST_FILENAME} !-f
- RewriteCond %{REQUEST_FILENAME} !-d
- RewriteRule . /index.php [L]
-
+ # standard wordpress .htaccess contents
+
+ RewriteEngine On
+ RewriteBase /
+ RewriteRule ^index\.php$ - [L]
+ RewriteCond %{REQUEST_FILENAME} !-f
+ RewriteCond %{REQUEST_FILENAME} !-d
+ RewriteRule . /index.php [L]
+
- DirectoryIndex index.php
- Require all granted
- Options +FollowSymLinks
-
+ DirectoryIndex index.php
+ Require all granted
+ Options +FollowSymLinks
+
- # https://wordpress.org/support/article/hardening-wordpress/#securing-wp-config-php
-
- Require all denied
-
- '';
- }
- ])
- ) eachSite;
+ # https://wordpress.org/support/article/hardening-wordpress/#securing-wp-config-php
+
+ Require all denied
+
+ '';
+ } ]) eachSite;
};
systemd.tmpfiles.rules = flatten (mapAttrsToList (hostName: cfg: [
diff --git a/nixos/modules/services/web-apps/zabbix.nix b/nixos/modules/services/web-apps/zabbix.nix
index 09538726b7cd..ee8447810c6d 100644
--- a/nixos/modules/services/web-apps/zabbix.nix
+++ b/nixos/modules/services/web-apps/zabbix.nix
@@ -113,19 +113,15 @@ in
};
virtualHost = mkOption {
- type = types.submodule ({
- options = import ../web-servers/apache-httpd/per-server-options.nix {
- inherit lib;
- forMainServer = false;
- };
- });
- example = {
- hostName = "zabbix.example.org";
- enableSSL = true;
- adminAddr = "webmaster@example.org";
- sslServerCert = "/var/lib/acme/zabbix.example.org/full.pem";
- sslServerKey = "/var/lib/acme/zabbix.example.org/key.pem";
- };
+ type = types.submodule (import ../web-servers/apache-httpd/per-server-options.nix);
+ example = literalExample ''
+ {
+ hostName = "zabbix.example.org";
+ adminAddr = "webmaster@example.org";
+ forceSSL = true;
+ enableACME = true;
+ }
+ '';
description = ''
Apache configuration can be done by adapting services.httpd.virtualHosts.<name>.
See for further information.
@@ -190,23 +186,21 @@ in
enable = true;
adminAddr = mkDefault cfg.virtualHost.adminAddr;
extraModules = [ "proxy_fcgi" ];
- virtualHosts = [ (mkMerge [
- cfg.virtualHost {
- documentRoot = mkForce "${cfg.package}/share/zabbix";
- extraConfig = ''
-
-
-
- SetHandler "proxy:unix:${fpm.socket}|fcgi://localhost/"
-
-
- AllowOverride all
- Options -Indexes
- DirectoryIndex index.php
-
- '';
- }
- ]) ];
+ virtualHosts.${cfg.virtualHost.hostName} = mkMerge [ cfg.virtualHost {
+ documentRoot = mkForce "${cfg.package}/share/zabbix";
+ extraConfig = ''
+
+
+
+ SetHandler "proxy:unix:${fpm.socket}|fcgi://localhost/"
+
+
+ AllowOverride all
+ Options -Indexes
+ DirectoryIndex index.php
+
+ '';
+ } ];
};
users.users.${user} = mapAttrs (name: mkDefault) {
diff --git a/nixos/modules/services/web-servers/apache-httpd/default.nix b/nixos/modules/services/web-servers/apache-httpd/default.nix
index 850d3052533a..8e3be3162988 100644
--- a/nixos/modules/services/web-servers/apache-httpd/default.nix
+++ b/nixos/modules/services/web-servers/apache-httpd/default.nix
@@ -18,22 +18,20 @@ let
mod_perl = pkgs.apacheHttpdPackages.mod_perl.override { apacheHttpd = httpd; };
- defaultListen = cfg: if cfg.enableSSL
- then [{ip = "*"; port = 443;}]
- else [{ip = "*"; port = 80;}];
+ vhosts = attrValues mainCfg.virtualHosts;
- getListen = cfg:
- if cfg.listen == []
- then defaultListen cfg
- else cfg.listen;
+ mkListenInfo = hostOpts:
+ if hostOpts.listen != [] then hostOpts.listen
+ else (
+ optional (hostOpts.onlySSL || hostOpts.addSSL || hostOpts.forceSSL) { ip = "*"; port = 443; ssl = true; } ++
+ optional (!hostOpts.onlySSL) { ip = "*"; port = 80; ssl = false; }
+ );
- listenToString = l: "${l.ip}:${toString l.port}";
+ listenInfo = unique (concatMap mkListenInfo vhosts);
- allHosts = [mainCfg] ++ mainCfg.virtualHosts;
+ enableSSL = any (listen: listen.ssl) listenInfo;
- enableSSL = any (vhost: vhost.enableSSL) allHosts;
-
- enableUserDir = any (vhost: vhost.enableUserDir) allHosts;
+ enableUserDir = any (vhost: vhost.enableUserDir) vhosts;
# NOTE: generally speaking order of modules is very important
modules =
@@ -115,122 +113,137 @@ let
'';
+ mkVHostConf = hostOpts:
+ let
+ adminAddr = if hostOpts.adminAddr != null then hostOpts.adminAddr else mainCfg.adminAddr;
+ listen = filter (listen: !listen.ssl) (mkListenInfo hostOpts);
+ listenSSL = filter (listen: listen.ssl) (mkListenInfo hostOpts);
- perServerConf = isMainServer: cfg: let
+ useACME = hostOpts.enableACME || hostOpts.useACMEHost != null;
+ sslCertDir =
+ if hostOpts.enableACME then config.security.acme.certs.${hostOpts.hostName}.directory
+ else if hostOpts.useACMEHost != null then config.security.acme.certs.${hostOpts.useACMEHost}.directory
+ else abort "This case should never happen.";
- # Canonical name must not include a trailing slash.
- canonicalNames =
- let defaultPort = (head (defaultListen cfg)).port; in
- map (port:
- (if cfg.enableSSL then "https" else "http") + "://" +
- cfg.hostName +
- (if port != defaultPort then ":${toString port}" else "")
- ) (map (x: x.port) (getListen cfg));
+ sslServerCert = if useACME then "${sslCertDir}/full.pem" else hostOpts.sslServerCert;
+ sslServerKey = if useACME then "${sslCertDir}/key.pem" else hostOpts.sslServerKey;
+ sslServerChain = if useACME then "${sslCertDir}/fullchain.pem" else hostOpts.sslServerChain;
- maybeDocumentRoot = fold (svc: acc:
- if acc == null then svc.documentRoot else assert svc.documentRoot == null; acc
- ) null ([ cfg ]);
+ acmeChallenge = optionalString useACME ''
+ Alias /.well-known/acme-challenge/ "${hostOpts.acmeRoot}/.well-known/acme-challenge/"
+
+ AllowOverride None
+ Options MultiViews Indexes SymLinksIfOwnerMatch IncludesNoExec
+ Require method GET POST OPTIONS
+ Require all granted
+
+ '';
+ in
+ optionalString (listen != []) ''
+
+ ServerName ${hostOpts.hostName}
+ ${concatMapStrings (alias: "ServerAlias ${alias}\n") hostOpts.serverAliases}
+ ServerAdmin ${adminAddr}
+
+ SSLEngine off
+
+ ${acmeChallenge}
+ ${if hostOpts.forceSSL then ''
+
+ RewriteEngine on
+ RewriteCond %{REQUEST_URI} !^/.well-known/acme-challenge [NC]
+ RewriteCond %{HTTPS} off
+ RewriteRule (.*) https://%{HTTP_HOST}%{REQUEST_URI}
+
+ '' else mkVHostCommonConf hostOpts}
+
+ '' +
+ optionalString (listenSSL != []) ''
+
+ ServerName ${hostOpts.hostName}
+ ${concatMapStrings (alias: "ServerAlias ${alias}\n") hostOpts.serverAliases}
+ ServerAdmin ${adminAddr}
+ SSLEngine on
+ SSLCertificateFile ${sslServerCert}
+ SSLCertificateKeyFile ${sslServerKey}
+ ${optionalString (sslServerChain != null) "SSLCertificateChainFile ${sslServerChain}"}
+ ${acmeChallenge}
+ ${mkVHostCommonConf hostOpts}
+
+ ''
+ ;
- documentRoot = if maybeDocumentRoot != null then maybeDocumentRoot else
- pkgs.runCommand "empty" { preferLocalBuild = true; } "mkdir -p $out";
+ mkVHostCommonConf = hostOpts:
+ let
+ documentRoot = if hostOpts.documentRoot != null
+ then hostOpts.documentRoot
+ else pkgs.runCommand "empty" { preferLocalBuild = true; } "mkdir -p $out"
+ ;
+ in
+ ''
+ ${optionalString mainCfg.logPerVirtualHost ''
+ ErrorLog ${mainCfg.logDir}/error-${hostOpts.hostName}.log
+ CustomLog ${mainCfg.logDir}/access-${hostOpts.hostName}.log ${hostOpts.logFormat}
+ ''}
- documentRootConf = ''
- DocumentRoot "${documentRoot}"
+ ${optionalString (hostOpts.robotsEntries != "") ''
+ Alias /robots.txt ${pkgs.writeText "robots.txt" hostOpts.robotsEntries}
+ ''}
-
- Options Indexes FollowSymLinks
- AllowOverride None
- ${allGranted}
-
- '';
+ DocumentRoot "${documentRoot}"
- # If this is a vhost, the include the entries for the main server as well.
- robotsTxt = concatStringsSep "\n" (filter (x: x != "") ([ cfg.robotsEntries ] ++ lib.optional (!isMainServer) mainCfg.robotsEntries));
+
+ Options Indexes FollowSymLinks
+ AllowOverride None
+ ${allGranted}
+
- in ''
- ${concatStringsSep "\n" (map (n: "ServerName ${n}") canonicalNames)}
+ ${optionalString hostOpts.enableUserDir ''
+ UserDir public_html
+ UserDir disabled root
+
+ AllowOverride FileInfo AuthConfig Limit Indexes
+ Options MultiViews Indexes SymLinksIfOwnerMatch IncludesNoExec
+
+ Require all granted
+
+
+ Require all denied
+
+
+ ''}
- ${concatMapStrings (alias: "ServerAlias ${alias}\n") cfg.serverAliases}
+ ${optionalString (hostOpts.globalRedirect != null && hostOpts.globalRedirect != "") ''
+ RedirectPermanent / ${hostOpts.globalRedirect}
+ ''}
- ${if cfg.sslServerCert != null then ''
- SSLCertificateFile ${cfg.sslServerCert}
- SSLCertificateKeyFile ${cfg.sslServerKey}
- ${if cfg.sslServerChain != null then ''
- SSLCertificateChainFile ${cfg.sslServerChain}
- '' else ""}
- '' else ""}
+ ${
+ let makeFileConf = elem: ''
+ Alias ${elem.urlPath} ${elem.file}
+ '';
+ in concatMapStrings makeFileConf hostOpts.servedFiles
+ }
+ ${
+ let makeDirConf = elem: ''
+ Alias ${elem.urlPath} ${elem.dir}/
+
+ Options +Indexes
+ ${allGranted}
+ AllowOverride All
+
+ '';
+ in concatMapStrings makeDirConf hostOpts.servedDirs
+ }
- ${if cfg.enableSSL then ''
- SSLEngine on
- '' else if enableSSL then /* i.e., SSL is enabled for some host, but not this one */
- ''
- SSLEngine off
- '' else ""}
-
- ${if isMainServer || cfg.adminAddr != null then ''
- ServerAdmin ${cfg.adminAddr}
- '' else ""}
-
- ${if !isMainServer && mainCfg.logPerVirtualHost then ''
- ErrorLog ${mainCfg.logDir}/error-${cfg.hostName}.log
- CustomLog ${mainCfg.logDir}/access-${cfg.hostName}.log ${cfg.logFormat}
- '' else ""}
-
- ${optionalString (robotsTxt != "") ''
- Alias /robots.txt ${pkgs.writeText "robots.txt" robotsTxt}
- ''}
-
- ${if isMainServer || maybeDocumentRoot != null then documentRootConf else ""}
-
- ${if cfg.enableUserDir then ''
-
- UserDir public_html
- UserDir disabled root
-
-
- AllowOverride FileInfo AuthConfig Limit Indexes
- Options MultiViews Indexes SymLinksIfOwnerMatch IncludesNoExec
-
- ${allGranted}
-
-
- ${allDenied}
-
-
-
- '' else ""}
-
- ${if cfg.globalRedirect != null && cfg.globalRedirect != "" then ''
- RedirectPermanent / ${cfg.globalRedirect}
- '' else ""}
-
- ${
- let makeFileConf = elem: ''
- Alias ${elem.urlPath} ${elem.file}
- '';
- in concatMapStrings makeFileConf cfg.servedFiles
- }
-
- ${
- let makeDirConf = elem: ''
- Alias ${elem.urlPath} ${elem.dir}/
-
- Options +Indexes
- ${allGranted}
- AllowOverride All
-
- '';
- in concatMapStrings makeDirConf cfg.servedDirs
- }
-
- ${cfg.extraConfig}
- '';
+ ${hostOpts.extraConfig}
+ ''
+ ;
confFile = pkgs.writeText "httpd.conf" ''
ServerRoot ${httpd}
-
+ ServerName ${config.networking.hostName}
DefaultRuntimeDir ${runtimeDir}/runtime
PidFile ${runtimeDir}/httpd.pid
@@ -246,10 +259,9 @@ let
${let
- listen = concatMap getListen allHosts;
- toStr = listen: "Listen ${listenToString listen}\n";
- uniqueListen = uniqList {inputList = map toStr listen;};
- in concatStrings uniqueListen
+ toStr = listen: "Listen ${listen.ip}:${toString listen.port} ${if listen.ssl then "https" else "http"}";
+ uniqueListen = uniqList {inputList = map toStr listenInfo;};
+ in concatStringsSep "\n" uniqueListen
}
User ${mainCfg.user}
@@ -297,17 +309,9 @@ let
${allGranted}
- # Generate directives for the main server.
- ${perServerConf true mainCfg}
+ ${mainCfg.extraConfig}
- ${let
- makeVirtualHost = vhost: ''
-
- ${perServerConf false vhost}
-
- '';
- in concatMapStrings makeVirtualHost mainCfg.virtualHosts
- }
+ ${concatMapStringsSep "\n" mkVHostConf vhosts}
'';
# Generate the PHP configuration file. Should probably be factored
@@ -329,6 +333,21 @@ in
imports = [
(mkRemovedOptionModule [ "services" "httpd" "extraSubservices" ] "Most existing subservices have been ported to the NixOS module system. Please update your configuration accordingly.")
(mkRemovedOptionModule [ "services" "httpd" "stateDir" ] "The httpd module now uses /run/httpd as a runtime directory.")
+
+ # virtualHosts options
+ (mkRemovedOptionModule [ "services" "httpd" "documentRoot" ] "Please define a virtual host using `services.httpd.virtualHosts`.")
+ (mkRemovedOptionModule [ "services" "httpd" "enableSSL" ] "Please define a virtual host using `services.httpd.virtualHosts`.")
+ (mkRemovedOptionModule [ "services" "httpd" "enableUserDir" ] "Please define a virtual host using `services.httpd.virtualHosts`.")
+ (mkRemovedOptionModule [ "services" "httpd" "globalRedirect" ] "Please define a virtual host using `services.httpd.virtualHosts`.")
+ (mkRemovedOptionModule [ "services" "httpd" "hostName" ] "Please define a virtual host using `services.httpd.virtualHosts`.")
+ (mkRemovedOptionModule [ "services" "httpd" "listen" ] "Please define a virtual host using `services.httpd.virtualHosts`.")
+ (mkRemovedOptionModule [ "services" "httpd" "robotsEntries" ] "Please define a virtual host using `services.httpd.virtualHosts`.")
+ (mkRemovedOptionModule [ "services" "httpd" "servedDirs" ] "Please define a virtual host using `services.httpd.virtualHosts`.")
+ (mkRemovedOptionModule [ "services" "httpd" "servedFiles" ] "Please define a virtual host using `services.httpd.virtualHosts`.")
+ (mkRemovedOptionModule [ "services" "httpd" "serverAliases" ] "Please define a virtual host using `services.httpd.virtualHosts`.")
+ (mkRemovedOptionModule [ "services" "httpd" "sslServerCert" ] "Please define a virtual host using `services.httpd.virtualHosts`.")
+ (mkRemovedOptionModule [ "services" "httpd" "sslServerChain" ] "Please define a virtual host using `services.httpd.virtualHosts`.")
+ (mkRemovedOptionModule [ "services" "httpd" "sslServerKey" ] "Please define a virtual host using `services.httpd.virtualHosts`.")
];
###### interface
@@ -391,9 +410,25 @@ in
'';
};
+ adminAddr = mkOption {
+ type = types.str;
+ example = "admin@example.org";
+ description = "E-mail address of the server administrator.";
+ };
+
+ logFormat = mkOption {
+ type = types.str;
+ default = "common";
+ example = "combined";
+ description = ''
+ Log format for log files. Possible values are: combined, common, referer, agent.
+ See for more details.
+ '';
+ };
+
logPerVirtualHost = mkOption {
type = types.bool;
- default = false;
+ default = true;
description = ''
If enabled, each virtual host gets its own
access.log and
@@ -429,26 +464,28 @@ in
};
virtualHosts = mkOption {
- type = types.listOf (types.submodule (
- { options = import ./per-server-options.nix {
- inherit lib;
- forMainServer = false;
+ type = with types; attrsOf (submodule (import ./per-server-options.nix));
+ default = {
+ localhost = {
+ documentRoot = "${httpd}/htdocs";
+ };
+ };
+ example = literalExample ''
+ {
+ "foo.example.com" = {
+ forceSSL = true;
+ documentRoot = "/var/www/foo.example.com"
+ };
+ "bar.example.com" = {
+ addSSL = true;
+ documentRoot = "/var/www/bar.example.com";
};
- }));
- default = [];
- example = [
- { hostName = "foo";
- documentRoot = "/data/webroot-foo";
}
- { hostName = "bar";
- documentRoot = "/data/webroot-bar";
- }
- ];
+ '';
description = ''
- Specification of the virtual hosts served by Apache. Each
+ Specification of the virtual hosts served by Apache. Each
element should be an attribute set specifying the
- configuration of the virtual host. The available options
- are the non-global options permissible for the main host.
+ configuration of the virtual host.
'';
};
@@ -534,13 +571,7 @@ in
example = "All -SSLv2 -SSLv3";
description = "Allowed SSL/TLS protocol versions.";
};
- }
-
- # Include the options shared between the main server and virtual hosts.
- // (import ./per-server-options.nix {
- inherit lib;
- forMainServer = true;
- });
+ };
};
@@ -549,11 +580,31 @@ in
config = mkIf config.services.httpd.enable {
- assertions = [ { assertion = mainCfg.enableSSL == true
- -> mainCfg.sslServerCert != null
- && mainCfg.sslServerKey != null;
- message = "SSL is enabled for httpd, but sslServerCert and/or sslServerKey haven't been specified."; }
- ];
+ assertions = [
+ {
+ assertion = all (hostOpts: !hostOpts.enableSSL) vhosts;
+ message = ''
+ The option `services.httpd.virtualHosts..enableSSL` no longer has any effect; please remove it.
+ Select one of `services.httpd.virtualHosts..addSSL`, `services.httpd.virtualHosts..forceSSL`,
+ or `services.httpd.virtualHosts..onlySSL`.
+ '';
+ }
+ {
+ assertion = all (hostOpts: with hostOpts; !(addSSL && onlySSL) && !(forceSSL && onlySSL) && !(addSSL && forceSSL)) vhosts;
+ message = ''
+ Options `services.httpd.virtualHosts..addSSL`,
+ `services.httpd.virtualHosts..onlySSL` and `services.httpd.virtualHosts..forceSSL`
+ are mutually exclusive.
+ '';
+ }
+ {
+ assertion = all (hostOpts: !(hostOpts.enableACME && hostOpts.useACMEHost != null)) vhosts;
+ message = ''
+ Options `services.httpd.virtualHosts..enableACME` and
+ `services.httpd.virtualHosts..useACMEHost` are mutually exclusive.
+ '';
+ }
+ ];
users.users = optionalAttrs (mainCfg.user == "wwwrun") (singleton
{ name = "wwwrun";
@@ -567,6 +618,15 @@ in
gid = config.ids.gids.wwwrun;
});
+ security.acme.certs = mapAttrs (name: hostOpts: {
+ user = mainCfg.user;
+ group = mkDefault mainCfg.group;
+ email = if hostOpts.adminAddr != null then hostOpts.adminAddr else mainCfg.adminAddr;
+ webroot = hostOpts.acmeRoot;
+ extraDomains = genAttrs hostOpts.serverAliases (alias: null);
+ postRun = "systemctl reload httpd.service";
+ }) (filterAttrs (name: hostOpts: hostOpts.enableACME) mainCfg.virtualHosts);
+
environment.systemPackages = [httpd];
services.httpd.phpOptions =
@@ -605,10 +665,14 @@ in
];
systemd.services.httpd =
+ let
+ vhostsACME = filter (hostOpts: hostOpts.enableACME) vhosts;
+ in
{ description = "Apache HTTPD";
wantedBy = [ "multi-user.target" ];
- after = [ "network.target" "fs.target" ];
+ wants = concatLists (map (hostOpts: [ "acme-${hostOpts.hostName}.service" "acme-selfsigned-${hostOpts.hostName}.service" ]) vhostsACME);
+ after = [ "network.target" "fs.target" ] ++ map (hostOpts: "acme-selfsigned-${hostOpts.hostName}.service") vhostsACME;
path =
[ httpd pkgs.coreutils pkgs.gnugrep ]
diff --git a/nixos/modules/services/web-servers/apache-httpd/per-server-options.nix b/nixos/modules/services/web-servers/apache-httpd/per-server-options.nix
index c36207d54607..f2e92cda05f6 100644
--- a/nixos/modules/services/web-servers/apache-httpd/per-server-options.nix
+++ b/nixos/modules/services/web-servers/apache-httpd/per-server-options.nix
@@ -1,174 +1,235 @@
-# This file defines the options that can be used both for the Apache
-# main server configuration, and for the virtual hosts. (The latter
-# has additional options that affect the web server as a whole, like
-# the user/group to run under.)
-
-{ forMainServer, lib }:
-
-with lib;
-
+{ config, lib, name, ... }:
+let
+ inherit (lib) mkOption types;
+in
{
+ options = {
+
+ hostName = mkOption {
+ type = types.str;
+ default = name;
+ description = "Canonical hostname for the server.";
+ };
+
+ serverAliases = mkOption {
+ type = types.listOf types.str;
+ default = [];
+ example = ["www.example.org" "www.example.org:8080" "example.org"];
+ description = ''
+ Additional names of virtual hosts served by this virtual host configuration.
+ '';
+ };
+
+ listen = mkOption {
+ type = with types; listOf (submodule ({
+ options = {
+ port = mkOption {
+ type = types.port;
+ description = "Port to listen on";
+ };
+ ip = mkOption {
+ type = types.str;
+ default = "*";
+ description = "IP to listen on. 0.0.0.0 for IPv4 only, * for all.";
+ };
+ ssl = mkOption {
+ type = types.bool;
+ default = false;
+ description = "Whether to enable SSL (https) support.";
+ };
+ };
+ }));
+ default = [];
+ example = [
+ { ip = "195.154.1.1"; port = 443; ssl = true;}
+ { ip = "192.154.1.1"; port = 80; }
+ { ip = "*"; port = 8080; }
+ ];
+ description = ''
+ Listen addresses and ports for this virtual host.
+
+ This option overrides addSSL, forceSSL and onlySSL.
+
+ '';
+ };
+
+ enableSSL = mkOption {
+ type = types.bool;
+ visible = false;
+ default = false;
+ };
+
+ addSSL = mkOption {
+ type = types.bool;
+ default = false;
+ description = ''
+ Whether to enable HTTPS in addition to plain HTTP. This will set defaults for
+ listen to listen on all interfaces on the respective default
+ ports (80, 443).
+ '';
+ };
+
+ onlySSL = mkOption {
+ type = types.bool;
+ default = false;
+ description = ''
+ Whether to enable HTTPS and reject plain HTTP connections. This will set
+ defaults for listen to listen on all interfaces on port 443.
+ '';
+ };
+
+ forceSSL = mkOption {
+ type = types.bool;
+ default = false;
+ description = ''
+ Whether to add a separate nginx server block that permanently redirects (301)
+ all plain HTTP traffic to HTTPS. This will set defaults for
+ listen to listen on all interfaces on the respective default
+ ports (80, 443), where the non-SSL listens are used for the redirect vhosts.
+ '';
+ };
+
+ enableACME = mkOption {
+ type = types.bool;
+ default = false;
+ description = ''
+ Whether to ask Let's Encrypt to sign a certificate for this vhost.
+ Alternately, you can use an existing certificate through .
+ '';
+ };
+
+ useACMEHost = mkOption {
+ type = types.nullOr types.str;
+ default = null;
+ description = ''
+ A host of an existing Let's Encrypt certificate to use.
+ This is useful if you have many subdomains and want to avoid hitting the
+ rate limit.
+ Alternately, you can generate a certificate through .
+ Note that this option does not create any certificates, nor it does add subdomains to existing ones – you will need to create them manually using .
+ '';
+ };
+
+ acmeRoot = mkOption {
+ type = types.str;
+ default = "/var/lib/acme/acme-challenges";
+ description = "Directory for the acme challenge which is PUBLIC, don't put certs or keys in here";
+ };
+
+ sslServerCert = mkOption {
+ type = types.path;
+ example = "/var/host.cert";
+ description = "Path to server SSL certificate.";
+ };
+
+ sslServerKey = mkOption {
+ type = types.path;
+ example = "/var/host.key";
+ description = "Path to server SSL certificate key.";
+ };
+
+ sslServerChain = mkOption {
+ type = types.nullOr types.path;
+ default = null;
+ example = "/var/ca.pem";
+ description = "Path to server SSL chain file.";
+ };
+
+ adminAddr = mkOption {
+ type = types.nullOr types.str;
+ default = null;
+ example = "admin@example.org";
+ description = "E-mail address of the server administrator.";
+ };
+
+ documentRoot = mkOption {
+ type = types.nullOr types.path;
+ default = null;
+ example = "/data/webserver/docs";
+ description = ''
+ The path of Apache's document root directory. If left undefined,
+ an empty directory in the Nix store will be used as root.
+ '';
+ };
+
+ servedDirs = mkOption {
+ type = types.listOf types.attrs;
+ default = [];
+ example = [
+ { urlPath = "/nix";
+ dir = "/home/eelco/Dev/nix-homepage";
+ }
+ ];
+ description = ''
+ This option provides a simple way to serve static directories.
+ '';
+ };
+
+ servedFiles = mkOption {
+ type = types.listOf types.attrs;
+ default = [];
+ example = [
+ { urlPath = "/foo/bar.png";
+ file = "/home/eelco/some-file.png";
+ }
+ ];
+ description = ''
+ This option provides a simple way to serve individual, static files.
+ '';
+ };
+
+ extraConfig = mkOption {
+ type = types.lines;
+ default = "";
+ example = ''
+
+ Options FollowSymlinks
+ AllowOverride All
+
+ '';
+ description = ''
+ These lines go to httpd.conf verbatim. They will go after
+ directories and directory aliases defined by default.
+ '';
+ };
+
+ enableUserDir = mkOption {
+ type = types.bool;
+ default = false;
+ description = ''
+ Whether to enable serving ~/public_html as
+ /~username.
+ '';
+ };
+
+ globalRedirect = mkOption {
+ type = types.nullOr types.str;
+ default = null;
+ example = http://newserver.example.org/;
+ description = ''
+ If set, all requests for this host are redirected permanently to
+ the given URL.
+ '';
+ };
+
+ logFormat = mkOption {
+ type = types.str;
+ default = "common";
+ example = "combined";
+ description = ''
+ Log format for Apache's log files. Possible values are: combined, common, referer, agent.
+ '';
+ };
+
+ robotsEntries = mkOption {
+ type = types.lines;
+ default = "";
+ example = "Disallow: /foo/";
+ description = ''
+ Specification of pages to be ignored by web crawlers. See for details.
+ '';
+ };
- hostName = mkOption {
- type = types.str;
- default = "localhost";
- description = "Canonical hostname for the server.";
};
-
- serverAliases = mkOption {
- type = types.listOf types.str;
- default = [];
- example = ["www.example.org" "www.example.org:8080" "example.org"];
- description = ''
- Additional names of virtual hosts served by this virtual host configuration.
- '';
- };
-
- listen = mkOption {
- type = types.listOf (types.submodule (
- {
- options = {
- port = mkOption {
- type = types.int;
- description = "port to listen on";
- };
- ip = mkOption {
- type = types.str;
- default = "*";
- description = "Ip to listen on. 0.0.0.0 for ipv4 only, * for all.";
- };
- };
- } ));
- description = ''
- List of { /* ip: "*"; */ port = 80;} to listen on
- '';
-
- default = [];
- };
-
- enableSSL = mkOption {
- type = types.bool;
- default = false;
- description = "Whether to enable SSL (https) support.";
- };
-
- # Note: sslServerCert and sslServerKey can be left empty, but this
- # only makes sense for virtual hosts (they will inherit from the
- # main server).
-
- sslServerCert = mkOption {
- type = types.nullOr types.path;
- default = null;
- example = "/var/host.cert";
- description = "Path to server SSL certificate.";
- };
-
- sslServerKey = mkOption {
- type = types.path;
- example = "/var/host.key";
- description = "Path to server SSL certificate key.";
- };
-
- sslServerChain = mkOption {
- type = types.nullOr types.path;
- default = null;
- example = "/var/ca.pem";
- description = "Path to server SSL chain file.";
- };
-
- adminAddr = mkOption ({
- type = types.nullOr types.str;
- example = "admin@example.org";
- description = "E-mail address of the server administrator.";
- } // (if forMainServer then {} else {default = null;}));
-
- documentRoot = mkOption {
- type = types.nullOr types.path;
- default = null;
- example = "/data/webserver/docs";
- description = ''
- The path of Apache's document root directory. If left undefined,
- an empty directory in the Nix store will be used as root.
- '';
- };
-
- servedDirs = mkOption {
- type = types.listOf types.attrs;
- default = [];
- example = [
- { urlPath = "/nix";
- dir = "/home/eelco/Dev/nix-homepage";
- }
- ];
- description = ''
- This option provides a simple way to serve static directories.
- '';
- };
-
- servedFiles = mkOption {
- type = types.listOf types.attrs;
- default = [];
- example = [
- { urlPath = "/foo/bar.png";
- file = "/home/eelco/some-file.png";
- }
- ];
- description = ''
- This option provides a simple way to serve individual, static files.
- '';
- };
-
- extraConfig = mkOption {
- type = types.lines;
- default = "";
- example = ''
-
- Options FollowSymlinks
- AllowOverride All
-
- '';
- description = ''
- These lines go to httpd.conf verbatim. They will go after
- directories and directory aliases defined by default.
- '';
- };
-
- enableUserDir = mkOption {
- type = types.bool;
- default = false;
- description = ''
- Whether to enable serving ~/public_html as
- /~username.
- '';
- };
-
- globalRedirect = mkOption {
- type = types.nullOr types.str;
- default = null;
- example = http://newserver.example.org/;
- description = ''
- If set, all requests for this host are redirected permanently to
- the given URL.
- '';
- };
-
- logFormat = mkOption {
- type = types.str;
- default = "common";
- example = "combined";
- description = ''
- Log format for Apache's log files. Possible values are: combined, common, referer, agent.
- '';
- };
-
- robotsEntries = mkOption {
- type = types.lines;
- default = "";
- example = "Disallow: /foo/";
- description = ''
- Specification of pages to be ignored by web crawlers. See for details.
- '';
- };
-
}
diff --git a/nixos/modules/services/web-servers/nginx/default.nix b/nixos/modules/services/web-servers/nginx/default.nix
index 9b476ba7f1e5..ada7a25604c4 100644
--- a/nixos/modules/services/web-servers/nginx/default.nix
+++ b/nixos/modules/services/web-servers/nginx/default.nix
@@ -671,6 +671,7 @@ in
systemd.tmpfiles.rules = [
"d '${cfg.stateDir}' 0750 ${cfg.user} ${cfg.group} - -"
"d '${cfg.stateDir}/logs' 0750 ${cfg.user} ${cfg.group} - -"
+ "Z '${cfg.stateDir}' - ${cfg.user} ${cfg.group} - -"
];
systemd.services.nginx = {
diff --git a/nixos/modules/services/x11/display-managers/default.nix b/nixos/modules/services/x11/display-managers/default.nix
index 2d809b5cc9fd..1efd07393765 100644
--- a/nixos/modules/services/x11/display-managers/default.nix
+++ b/nixos/modules/services/x11/display-managers/default.nix
@@ -380,7 +380,7 @@ in
wms = filter (s: s.manage == "window") cfg.displayManager.session;
# Script responsible for starting the window manager and the desktop manager.
- xsession = wm: dm: pkgs.writeScript "xsession" ''
+ xsession = dm: wm: pkgs.writeScript "xsession" ''
#! ${pkgs.bash}/bin/bash
# Legacy session script used to construct .desktop files from
diff --git a/nixos/tests/all-tests.nix b/nixos/tests/all-tests.nix
index e6822055a18a..111643ad69c3 100644
--- a/nixos/tests/all-tests.nix
+++ b/nixos/tests/all-tests.nix
@@ -132,6 +132,7 @@ in
jellyfin = handleTest ./jellyfin.nix {};
jenkins = handleTest ./jenkins.nix {};
kafka = handleTest ./kafka.nix {};
+ keepalived = handleTest ./keepalived.nix {};
kerberos = handleTest ./kerberos/default.nix {};
kernel-latest = handleTest ./kernel-latest.nix {};
kernel-lts = handleTest ./kernel-lts.nix {};
diff --git a/nixos/tests/ec2.nix b/nixos/tests/ec2.nix
index 384fce67c227..c649ce852dad 100644
--- a/nixos/tests/ec2.nix
+++ b/nixos/tests/ec2.nix
@@ -113,7 +113,7 @@ in {
services.httpd = {
enable = true;
adminAddr = "test@example.org";
- documentRoot = "${pkgs.valgrind.doc}/share/doc/valgrind/html";
+ virtualHosts.localhost.documentRoot = "${pkgs.valgrind.doc}/share/doc/valgrind/html";
};
networking.firewall.allowedTCPPorts = [ 80 ];
}
diff --git a/nixos/tests/haproxy.nix b/nixos/tests/haproxy.nix
index b6fed3e2108f..79f34b07faf4 100644
--- a/nixos/tests/haproxy.nix
+++ b/nixos/tests/haproxy.nix
@@ -23,12 +23,14 @@ import ./make-test-python.nix ({ pkgs, ...}: {
};
services.httpd = {
enable = true;
- documentRoot = pkgs.writeTextDir "index.txt" "We are all good!";
- adminAddr = "notme@yourhost.local";
- listen = [{
- ip = "::1";
- port = 8000;
- }];
+ virtualHosts.localhost = {
+ documentRoot = pkgs.writeTextDir "index.txt" "We are all good!";
+ adminAddr = "notme@yourhost.local";
+ listen = [{
+ ip = "::1";
+ port = 8000;
+ }];
+ };
};
};
};
diff --git a/nixos/tests/hitch/default.nix b/nixos/tests/hitch/default.nix
index 106120256412..904d12619d70 100644
--- a/nixos/tests/hitch/default.nix
+++ b/nixos/tests/hitch/default.nix
@@ -16,7 +16,7 @@ import ../make-test-python.nix ({ pkgs, ... }:
services.httpd = {
enable = true;
- documentRoot = ./example;
+ virtualHosts.localhost.documentRoot = ./example;
adminAddr = "noone@testing.nowhere";
};
};
diff --git a/nixos/tests/keepalived.nix b/nixos/tests/keepalived.nix
new file mode 100644
index 000000000000..d0bf9d465200
--- /dev/null
+++ b/nixos/tests/keepalived.nix
@@ -0,0 +1,42 @@
+import ./make-test-python.nix ({ pkgs, ... }: {
+ name = "keepalived";
+
+ nodes = {
+ node1 = { pkgs, ... }: {
+ networking.firewall.extraCommands = "iptables -A INPUT -p vrrp -j ACCEPT";
+ services.keepalived.enable = true;
+ services.keepalived.vrrpInstances.test = {
+ interface = "eth1";
+ state = "MASTER";
+ priority = 50;
+ virtualIps = [{ addr = "192.168.1.200"; }];
+ virtualRouterId = 1;
+ };
+ environment.systemPackages = [ pkgs.tcpdump ];
+ };
+ node2 = { pkgs, ... }: {
+ networking.firewall.extraCommands = "iptables -A INPUT -p vrrp -j ACCEPT";
+ services.keepalived.enable = true;
+ services.keepalived.vrrpInstances.test = {
+ interface = "eth1";
+ state = "MASTER";
+ priority = 100;
+ virtualIps = [{ addr = "192.168.1.200"; }];
+ virtualRouterId = 1;
+ };
+ environment.systemPackages = [ pkgs.tcpdump ];
+ };
+ };
+
+ testScript = ''
+ # wait for boot time delay to pass
+ for node in [node1, node2]:
+ node.wait_until_succeeds(
+ "systemctl show -p LastTriggerUSecMonotonic keepalived-boot-delay.timer | grep -vq 'LastTriggerUSecMonotonic=0'"
+ )
+ node.wait_for_unit("keepalived")
+ node2.wait_until_succeeds("ip addr show dev eth1 | grep -q 192.168.1.200")
+ node1.fail("ip addr show dev eth1 | grep -q 192.168.1.200")
+ node1.succeed("ping -c1 192.168.1.200")
+ '';
+})
diff --git a/nixos/tests/mumble.nix b/nixos/tests/mumble.nix
index 652d49a24b1c..e9b6d14c6a1f 100644
--- a/nixos/tests/mumble.nix
+++ b/nixos/tests/mumble.nix
@@ -1,4 +1,4 @@
-import ./make-test.nix ({ pkgs, ...} :
+import ./make-test-python.nix ({ pkgs, ...} :
let
client = { pkgs, ... }: {
@@ -24,50 +24,50 @@ in
};
testScript = ''
- startAll;
+ start_all()
- $server->waitForUnit("murmur.service");
- $client1->waitForX;
- $client2->waitForX;
+ server.wait_for_unit("murmur.service")
+ client1.wait_for_x()
+ client2.wait_for_x()
- $client1->execute("mumble mumble://client1\@server/test &");
- $client2->execute("mumble mumble://client2\@server/test &");
+ client1.execute("mumble mumble://client1\@server/test &")
+ client2.execute("mumble mumble://client2\@server/test &")
# cancel client audio configuration
- $client1->waitForWindow(qr/Audio Tuning Wizard/);
- $client2->waitForWindow(qr/Audio Tuning Wizard/);
- $server->sleep(5); # wait because mumble is slow to register event handlers
- $client1->sendKeys("esc");
- $client2->sendKeys("esc");
+ client1.wait_for_window(r"Audio Tuning Wizard")
+ client2.wait_for_window(r"Audio Tuning Wizard")
+ server.sleep(5) # wait because mumble is slow to register event handlers
+ client1.send_key("esc")
+ client2.send_key("esc")
# cancel client cert configuration
- $client1->waitForWindow(qr/Certificate Management/);
- $client2->waitForWindow(qr/Certificate Management/);
- $server->sleep(5); # wait because mumble is slow to register event handlers
- $client1->sendKeys("esc");
- $client2->sendKeys("esc");
+ client1.wait_for_window(r"Certificate Management")
+ client2.wait_for_window(r"Certificate Management")
+ server.sleep(5) # wait because mumble is slow to register event handlers
+ client1.send_key("esc")
+ client2.send_key("esc")
# accept server certificate
- $client1->waitForWindow(qr/^Mumble$/);
- $client2->waitForWindow(qr/^Mumble$/);
- $server->sleep(5); # wait because mumble is slow to register event handlers
- $client1->sendChars("y");
- $client2->sendChars("y");
- $server->sleep(5); # wait because mumble is slow to register event handlers
+ client1.wait_for_window(r"^Mumble$")
+ client2.wait_for_window(r"^Mumble$")
+ server.sleep(5) # wait because mumble is slow to register event handlers
+ client1.send_chars("y")
+ client2.send_chars("y")
+ server.sleep(5) # wait because mumble is slow to register event handlers
# sometimes the wrong of the 2 windows is focused, we switch focus and try pressing "y" again
- $client1->sendKeys("alt-tab");
- $client2->sendKeys("alt-tab");
- $server->sleep(5); # wait because mumble is slow to register event handlers
- $client1->sendChars("y");
- $client2->sendChars("y");
+ client1.send_key("alt-tab")
+ client2.send_key("alt-tab")
+ server.sleep(5) # wait because mumble is slow to register event handlers
+ client1.send_chars("y")
+ client2.send_chars("y")
# Find clients in logs
- $server->waitUntilSucceeds("journalctl -eu murmur -o cat | grep -q client1");
- $server->waitUntilSucceeds("journalctl -eu murmur -o cat | grep -q client2");
+ server.wait_until_succeeds("journalctl -eu murmur -o cat | grep -q client1")
+ server.wait_until_succeeds("journalctl -eu murmur -o cat | grep -q client2")
- $server->sleep(5); # wait to get screenshot
- $client1->screenshot("screen1");
- $client2->screenshot("screen2");
+ server.sleep(5) # wait to get screenshot
+ client1.screenshot("screen1")
+ client2.screenshot("screen2")
'';
})
diff --git a/nixos/tests/nginx-sso.nix b/nixos/tests/nginx-sso.nix
index e19992cb6bf7..8834fc31c387 100644
--- a/nixos/tests/nginx-sso.nix
+++ b/nixos/tests/nginx-sso.nix
@@ -1,4 +1,4 @@
-import ./make-test.nix ({ pkgs, ... }: {
+import ./make-test-python.nix ({ pkgs, ... }: {
name = "nginx-sso";
meta = {
maintainers = with pkgs.stdenv.lib.maintainers; [ delroth ];
@@ -27,18 +27,22 @@ import ./make-test.nix ({ pkgs, ... }: {
};
testScript = ''
- startAll;
+ start_all()
- $machine->waitForUnit("nginx-sso.service");
- $machine->waitForOpenPort(8080);
+ machine.wait_for_unit("nginx-sso.service")
+ machine.wait_for_open_port(8080)
- # No valid user -> 401.
- $machine->fail("curl -sSf http://localhost:8080/auth");
+ with subtest("No valid user -> 401"):
+ machine.fail("curl -sSf http://localhost:8080/auth")
- # Valid user but no matching ACL -> 403.
- $machine->fail("curl -sSf -H 'Authorization: Token MyToken' http://localhost:8080/auth");
+ with subtest("Valid user but no matching ACL -> 403"):
+ machine.fail(
+ "curl -sSf -H 'Authorization: Token MyToken' http://localhost:8080/auth"
+ )
- # Valid user and matching ACL -> 200.
- $machine->succeed("curl -sSf -H 'Authorization: Token MyToken' -H 'X-Application: MyApp' http://localhost:8080/auth");
+ with subtest("Valid user and matching ACL -> 200"):
+ machine.succeed(
+ "curl -sSf -H 'Authorization: Token MyToken' -H 'X-Application: MyApp' http://localhost:8080/auth"
+ )
'';
})
diff --git a/nixos/tests/nginx.nix b/nixos/tests/nginx.nix
index d0b7306ae83b..55d2c9309084 100644
--- a/nixos/tests/nginx.nix
+++ b/nixos/tests/nginx.nix
@@ -4,7 +4,7 @@
# 2. whether the ETag header is properly generated whenever we're serving
# files in Nix store paths
# 3. nginx doesn't restart on configuration changes (only reloads)
-import ./make-test.nix ({ pkgs, ... }: {
+import ./make-test-python.nix ({ pkgs, ... }: {
name = "nginx";
meta = with pkgs.stdenv.lib.maintainers; {
maintainers = [ mbbx6spp ];
@@ -69,43 +69,46 @@ import ./make-test.nix ({ pkgs, ... }: {
justReloadSystem = "${nodes.webserver.config.system.build.toplevel}/fine-tune/child-2";
reloadRestartSystem = "${nodes.webserver.config.system.build.toplevel}/fine-tune/child-3";
in ''
- my $url = 'http://localhost/index.html';
+ url = "http://localhost/index.html"
- sub checkEtag {
- my $etag = $webserver->succeed(
- 'curl -v '.$url.' 2>&1 | sed -n -e "s/^< [Ee][Tt][Aa][Gg]: *//p"'
- );
- $etag =~ s/\r?\n$//;
- my $httpCode = $webserver->succeed(
- 'curl -w "%{http_code}" -X HEAD -H \'If-None-Match: '.$etag.'\' '.$url
- );
- chomp $httpCode;
- die "HTTP code is not 304" unless $httpCode == 304;
- return $etag;
- }
- $webserver->waitForUnit("nginx");
- $webserver->waitForOpenPort("80");
+ def check_etag():
+ etag = webserver.succeed(
+ f'curl -v {url} 2>&1 | sed -n -e "s/^< etag: *//ip"'
+ ).rstrip()
+ http_code = webserver.succeed(
+ f"curl -w '%{{http_code}}' --head --fail -H 'If-None-Match: {etag}' {url}"
+ )
+ assert http_code.split("\n")[-1] == "304"
- subtest "check ETag if serving Nix store paths", sub {
- my $oldEtag = checkEtag;
- $webserver->succeed("${etagSystem}/bin/switch-to-configuration test >&2");
- $webserver->sleep(1); # race condition
- my $newEtag = checkEtag;
- die "Old ETag $oldEtag is the same as $newEtag" if $oldEtag eq $newEtag;
- };
+ return etag
- subtest "config is reloaded on nixos-rebuild switch", sub {
- $webserver->succeed("${justReloadSystem}/bin/switch-to-configuration test >&2");
- $webserver->waitForOpenPort("8080");
- $webserver->fail("journalctl -u nginx | grep -q -i stopped");
- $webserver->succeed("journalctl -u nginx | grep -q -i reloaded");
- };
- subtest "restart when nginx package changes", sub {
- $webserver->succeed("${reloadRestartSystem}/bin/switch-to-configuration test >&2");
- $webserver->waitForUnit("nginx");
- $webserver->succeed("journalctl -u nginx | grep -q -i stopped");
- };
+ webserver.wait_for_unit("nginx")
+ webserver.wait_for_open_port(80)
+
+ with subtest("check ETag if serving Nix store paths"):
+ old_etag = check_etag()
+ webserver.succeed(
+ "${etagSystem}/bin/switch-to-configuration test >&2"
+ )
+ webserver.sleep(1)
+ new_etag = check_etag()
+ assert old_etag != new_etag
+
+ with subtest("config is reloaded on nixos-rebuild switch"):
+ webserver.succeed(
+ "${justReloadSystem}/bin/switch-to-configuration test >&2"
+ )
+ webserver.wait_for_open_port(8080)
+ webserver.fail("journalctl -u nginx | grep -q -i stopped")
+ webserver.succeed("journalctl -u nginx | grep -q -i reloaded")
+
+ with subtest("restart when nginx package changes"):
+ webserver.succeed(
+ "${reloadRestartSystem}/bin/switch-to-configuration test >&2"
+ )
+ webserver.wait_for_unit("nginx")
+ webserver.succeed("journalctl -u nginx | grep -q -i stopped")
'';
})
diff --git a/nixos/tests/proxy.nix b/nixos/tests/proxy.nix
index 1f39e903cddb..3859d429c21b 100644
--- a/nixos/tests/proxy.nix
+++ b/nixos/tests/proxy.nix
@@ -1,4 +1,4 @@
-import ./make-test.nix ({ pkgs, ...} :
+import ./make-test.nix ({ pkgs, ...} :
let
@@ -7,7 +7,7 @@ let
{ services.httpd.enable = true;
services.httpd.adminAddr = "foo@example.org";
- services.httpd.documentRoot = "${pkgs.valgrind.doc}/share/doc/valgrind/html";
+ services.httpd.virtualHosts.localhost.documentRoot = "${pkgs.valgrind.doc}/share/doc/valgrind/html";
networking.firewall.allowedTCPPorts = [ 80 ];
};
@@ -26,11 +26,11 @@ in
{ services.httpd.enable = true;
services.httpd.adminAddr = "bar@example.org";
services.httpd.extraModules = [ "proxy_balancer" "lbmethod_byrequests" ];
-
- services.httpd.extraConfig =
- ''
- ExtendedStatus on
-
+ services.httpd.extraConfig = ''
+ ExtendedStatus on
+ '';
+ services.httpd.virtualHosts.localhost = {
+ extraConfig = ''
Require all granted
SetHandler server-status
@@ -50,6 +50,7 @@ in
# For testing; don't want to wait forever for dead backend servers.
ProxyTimeout 5
'';
+ };
networking.firewall.allowedTCPPorts = [ 80 ];
};
diff --git a/nixos/tests/upnp.nix b/nixos/tests/upnp.nix
index d2e7fdd4fbeb..a7d837ea0708 100644
--- a/nixos/tests/upnp.nix
+++ b/nixos/tests/upnp.nix
@@ -56,9 +56,11 @@ in
networking.firewall.enable = false;
services.httpd.enable = true;
- services.httpd.listen = [{ ip = "*"; port = 9000; }];
- services.httpd.adminAddr = "foo@example.org";
- services.httpd.documentRoot = "/tmp";
+ services.httpd.virtualHosts.localhost = {
+ listen = [{ ip = "*"; port = 9000; }];
+ adminAddr = "foo@example.org";
+ documentRoot = "/tmp";
+ };
};
client2 =
diff --git a/pkgs/applications/audio/flacon/default.nix b/pkgs/applications/audio/flacon/default.nix
index 9dd5da4c1a90..c1ccd6add78a 100644
--- a/pkgs/applications/audio/flacon/default.nix
+++ b/pkgs/applications/audio/flacon/default.nix
@@ -29,6 +29,6 @@ stdenv.mkDerivation rec {
homepage = https://flacon.github.io/;
license = licenses.lgpl21;
platforms = platforms.linux;
- maintainers = with maintainers; [ ndowens nico202 ];
+ maintainers = with maintainers; [ nico202 ];
};
}
diff --git a/pkgs/applications/audio/renoise/default.nix b/pkgs/applications/audio/renoise/default.nix
index 7b2d92ad59d3..2fb1943e0e57 100644
--- a/pkgs/applications/audio/renoise/default.nix
+++ b/pkgs/applications/audio/renoise/default.nix
@@ -14,7 +14,7 @@ in
stdenv.mkDerivation rec {
pname = "renoise";
- version = "3.2.0";
+ version = "3.2.1";
src =
if stdenv.hostPlatform.system == "x86_64-linux" then
@@ -24,7 +24,7 @@ stdenv.mkDerivation rec {
"https://files.renoise.com/demo/Renoise_${urlVersion version}_Demo_Linux.tar.gz"
"https://web.archive.org/web/https://files.renoise.com/demo/Renoise_${urlVersion version}_Demo_Linux.tar.gz"
];
- sha256 = "0cfczzpk1ddz61nk4d72fydbm5nbgxqp95v81by2n87s1wffjjhi";
+ sha256 = "0dhcidgnjzd4abw0xw1waj9mazp03nbvjcr2xx09l8gnfrkvny46";
}
else
releasePath
diff --git a/pkgs/applications/audio/spotify/default.nix b/pkgs/applications/audio/spotify/default.nix
index bc95ec625bbb..b763e6e6122f 100644
--- a/pkgs/applications/audio/spotify/default.nix
+++ b/pkgs/applications/audio/spotify/default.nix
@@ -159,7 +159,7 @@ stdenv.mkDerivation {
homepage = https://www.spotify.com/;
description = "Play music from the Spotify music service";
license = licenses.unfree;
- maintainers = with maintainers; [ eelco ftrvxmtrx sheenobu mudri timokau ];
+ maintainers = with maintainers; [ eelco ftrvxmtrx sheenobu mudri timokau ma27 ];
platforms = [ "x86_64-linux" ];
};
}
diff --git a/pkgs/applications/audio/x42-plugins/default.nix b/pkgs/applications/audio/x42-plugins/default.nix
index 967f3f4f92ba..bae9cef71501 100644
--- a/pkgs/applications/audio/x42-plugins/default.nix
+++ b/pkgs/applications/audio/x42-plugins/default.nix
@@ -3,12 +3,12 @@
, libGLU, lv2, gtk2, cairo, pango, fftwFloat, zita-convolver }:
stdenv.mkDerivation rec {
- version = "20191013";
+ version = "20191215";
pname = "x42-plugins";
src = fetchurl {
url = "https://gareus.org/misc/x42-plugins/${pname}-${version}.tar.xz";
- sha256 = "18kn1bmc0s6dp834kc51ibifzzn3bxwya4p8s8yq9f4mpmkghi24";
+ sha256 = "1mwfvhsvc0qgjyiwd8pmmam1mav43lmv39fljhmj9yri558v5g1c";
};
nativeBuildInputs = [ pkgconfig ];
diff --git a/pkgs/applications/editors/emacs-modes/manual-packages.nix b/pkgs/applications/editors/emacs-modes/manual-packages.nix
index d773de4375cb..c3c21b40a659 100644
--- a/pkgs/applications/editors/emacs-modes/manual-packages.nix
+++ b/pkgs/applications/editors/emacs-modes/manual-packages.nix
@@ -113,6 +113,8 @@
perl-completion =
callPackage ./perl-completion { };
+ pod-mode = callPackage ./pod-mode { };
+
railgun = callPackage ./railgun { };
structured-haskell-mode = self.shm;
diff --git a/pkgs/applications/editors/emacs-modes/pod-mode/default.nix b/pkgs/applications/editors/emacs-modes/pod-mode/default.nix
new file mode 100644
index 000000000000..198adefc0163
--- /dev/null
+++ b/pkgs/applications/editors/emacs-modes/pod-mode/default.nix
@@ -0,0 +1,18 @@
+{ trivialBuild, lib, fetchurl }:
+
+trivialBuild rec {
+ pname = "pod-mode";
+ version = "1.04";
+
+ src = fetchurl {
+ url = "mirror://cpan/authors/id/F/FL/FLORA/pod-mode-${version}.tar.gz";
+ sha256 = "1wr0khymkaa65blrc5nya607c1a3sjsww49bbf8f0a6176as71sv";
+ };
+
+ meta = with lib; {
+ description = "Major mode for editing .pod-files";
+ license = licenses.gpl2Plus;
+ maintainers = with maintainers; [ qyliss ];
+ platform = platforms.all;
+ };
+}
diff --git a/pkgs/applications/editors/glow/default.nix b/pkgs/applications/editors/glow/default.nix
new file mode 100644
index 000000000000..0e30d879b0ca
--- /dev/null
+++ b/pkgs/applications/editors/glow/default.nix
@@ -0,0 +1,21 @@
+{ lib, buildGoModule, fetchFromGitHub }:
+
+buildGoModule rec {
+ pname = "glow";
+ version = "0.1.3";
+
+ src = fetchFromGitHub {
+ owner = "charmbracelet";
+ repo = "glow";
+ rev = "v${version}";
+ sha256 = "16zadrp42y01hi83hg47cw6c9zpw8z4xfssb5pxkmd2ynihaxfv5";
+ };
+
+ modSha256 = "1q67j9wg0kgb41zjgdbcrywxbwh597n8shwnwgl2xa6f7fvzpr4f";
+
+ meta = src.meta // {
+ description = "Render markdown on the CLI";
+ maintainers = with lib.maintainers; [ ehmry filalex77 ];
+ license = lib.licenses.mit;
+ };
+}
diff --git a/pkgs/applications/editors/jetbrains/default.nix b/pkgs/applications/editors/jetbrains/default.nix
index 48af3c9b014f..7f0447833176 100644
--- a/pkgs/applications/editors/jetbrains/default.nix
+++ b/pkgs/applications/editors/jetbrains/default.nix
@@ -150,7 +150,7 @@ let
with on-the-fly code analysis, error prevention and
automated refactorings for PHP and JavaScript code.
'';
- maintainers = with maintainers; [ schristo ];
+ maintainers = with maintainers; [ schristo ma27 ];
platforms = platforms.linux;
};
});
diff --git a/pkgs/applications/editors/nano/default.nix b/pkgs/applications/editors/nano/default.nix
index 7b2992201fc7..4197792d7365 100644
--- a/pkgs/applications/editors/nano/default.nix
+++ b/pkgs/applications/editors/nano/default.nix
@@ -20,11 +20,11 @@ let
in stdenv.mkDerivation rec {
pname = "nano";
- version = "4.6";
+ version = "4.7";
src = fetchurl {
url = "mirror://gnu/nano/${pname}-${version}.tar.xz";
- sha256 = "1s98jsvkfar6qmd5n5l1n1k59623dnc93ciyvlhxjkvpad0kmb4v";
+ sha256 = "1x9nqy2kgaz6087p63i71gdjsqbdc9jjpx1ymlyclfakvsby3h2q";
};
nativeBuildInputs = [ texinfo ] ++ optional enableNls gettext;
@@ -38,15 +38,6 @@ in stdenv.mkDerivation rec {
(stdenv.lib.enableFeature enableTiny "tiny")
];
- patches = [
- (fetchurl {
- # fix compilation on macOS, where 'st_mtim' is unknown
- # upstream patch not in 4.6
- url = "https://git.savannah.gnu.org/cgit/nano.git/patch/?id=f516cddce749c3bf938271ef3182b9169ac8cbcc";
- sha256 = "0gqymvr5vxxypr7y3sm252rsi4gjqp597l01x0lkxyvxsn45a4sx";
- })
- ];
-
postInstall = ''
cp ${nixSyntaxHighlight}/nix.nanorc $out/share/nano/
'';
diff --git a/pkgs/applications/editors/neovim/default.nix b/pkgs/applications/editors/neovim/default.nix
index b3e2ed510153..2fff5cdce854 100644
--- a/pkgs/applications/editors/neovim/default.nix
+++ b/pkgs/applications/editors/neovim/default.nix
@@ -2,7 +2,6 @@
, libuv, lua, ncurses, pkgconfig
, unibilium, xsel, gperf
, libvterm-neovim
-, withJemalloc ? true, jemalloc
, glibcLocales ? null, procps ? null
# now defaults to false because some tests can be flaky (clipboard etc)
@@ -50,8 +49,7 @@ in
ncurses
neovimLuaEnv
unibilium
- ] ++ optional withJemalloc jemalloc
- ++ optional stdenv.isDarwin libiconv
+ ] ++ optional stdenv.isDarwin libiconv
++ optionals doCheck [ glibcLocales procps ]
;
@@ -92,16 +90,11 @@ in
hardeningDisable = [ "fortify" ];
preConfigure = stdenv.lib.optionalString stdenv.isDarwin ''
- export DYLD_LIBRARY_PATH=${jemalloc}/lib
substituteInPlace src/nvim/CMakeLists.txt --replace " util" ""
'';
postInstall = stdenv.lib.optionalString stdenv.isLinux ''
sed -i -e "s|'xsel|'${xsel}/bin/xsel|g" $out/share/nvim/runtime/autoload/provider/clipboard.vim
- '' + stdenv.lib.optionalString (withJemalloc && stdenv.isDarwin) ''
- install_name_tool -change libjemalloc.1.dylib \
- ${jemalloc}/lib/libjemalloc.1.dylib \
- $out/bin/nvim
'';
# export PATH=$PWD/build/bin:${PATH}
@@ -126,7 +119,7 @@ in
# those contributions were copied from Vim (identified in the commit logs
# by the vim-patch token). See LICENSE for details."
license = with licenses; [ asl20 vim ];
- maintainers = with maintainers; [ manveru rvolosatovs ];
+ maintainers = with maintainers; [ manveru rvolosatovs ma27 ];
platforms = platforms.unix;
};
}
diff --git a/pkgs/applications/editors/rednotebook/default.nix b/pkgs/applications/editors/rednotebook/default.nix
index 6bb40f0166d1..622c4a680f59 100644
--- a/pkgs/applications/editors/rednotebook/default.nix
+++ b/pkgs/applications/editors/rednotebook/default.nix
@@ -5,13 +5,13 @@
buildPythonApplication rec {
pname = "rednotebook";
- version = "2.14";
+ version = "2.15";
src = fetchFromGitHub {
owner = "jendrikseipp";
repo = "rednotebook";
rev = "v${version}";
- sha256 = "1xs2wvm9g8vypz25li7rm8m0j4dsdpqpajcvrc756x5m149dxc08";
+ sha256 = "1p43xncqb898rgfx4vv1nxy6dj57pvxpc0b5j3kgs58ir70rg1js";
};
# We have not packaged tests.
diff --git a/pkgs/applications/graphics/darktable/default.nix b/pkgs/applications/graphics/darktable/default.nix
index 4f4f04af28b1..53e04dc7f784 100644
--- a/pkgs/applications/graphics/darktable/default.nix
+++ b/pkgs/applications/graphics/darktable/default.nix
@@ -3,16 +3,16 @@
, ilmbase, gtk3, intltool, lcms2, lensfun, libX11, libexif, libgphoto2, libjpeg
, libpng, librsvg, libtiff, openexr, osm-gps-map, pkgconfig, sqlite, libxslt
, openjpeg, lua, pugixml, colord, colord-gtk, libwebp, libsecret, gnome3
-, ocl-icd, pcre, gtk-mac-integration, isocodes
+, ocl-icd, pcre, gtk-mac-integration, isocodes, llvmPackages
}:
stdenv.mkDerivation rec {
- version = "2.6.3";
+ version = "3.0.0";
pname = "darktable";
src = fetchurl {
url = "https://github.com/darktable-org/darktable/releases/download/release-${version}/darktable-${version}.tar.xz";
- sha256 = "a518999c8458472edfc04577026ce5047d74553052af0f52d10ba8ce601b78f0";
+ sha256 = "7195a5ff7ee95ab7c5a57e4e84f8c90cc4728b2c917359203c21293ab754c0db";
};
nativeBuildInputs = [ cmake ninja llvm pkgconfig intltool perl desktop-file-utils wrapGAppsHook ];
@@ -24,7 +24,8 @@ stdenv.mkDerivation rec {
libwebp libsecret gnome3.adwaita-icon-theme osm-gps-map pcre isocodes
] ++ stdenv.lib.optionals stdenv.isLinux [
colord colord-gtk libX11 ocl-icd
- ] ++ stdenv.lib.optional stdenv.isDarwin gtk-mac-integration;
+ ] ++ stdenv.lib.optional stdenv.isDarwin gtk-mac-integration
+ ++ stdenv.lib.optional stdenv.cc.isClang llvmPackages.openmp;
cmakeFlags = [
"-DBUILD_USERMANUAL=False"
diff --git a/pkgs/applications/graphics/feh/default.nix b/pkgs/applications/graphics/feh/default.nix
index de7d76ec45f2..1eb99a9a7e41 100644
--- a/pkgs/applications/graphics/feh/default.nix
+++ b/pkgs/applications/graphics/feh/default.nix
@@ -43,7 +43,7 @@ stdenv.mkDerivation rec {
description = "A light-weight image viewer";
homepage = "https://feh.finalrewind.org/";
license = licenses.mit;
- maintainers = with maintainers; [ viric willibutz globin ];
+ maintainers = with maintainers; [ viric willibutz globin ma27 ];
platforms = platforms.unix;
};
}
diff --git a/pkgs/applications/graphics/openimageio/2.x.nix b/pkgs/applications/graphics/openimageio/2.x.nix
index bbd2f0b59298..9c4a8b229391 100644
--- a/pkgs/applications/graphics/openimageio/2.x.nix
+++ b/pkgs/applications/graphics/openimageio/2.x.nix
@@ -1,5 +1,6 @@
{ stdenv
, fetchFromGitHub
+, fetchpatch
, boost
, cmake
, ilmbase
@@ -14,15 +15,22 @@
stdenv.mkDerivation rec {
pname = "openimageio";
- version = "2.0.12";
+ version = "2.1.9.0";
src = fetchFromGitHub {
owner = "OpenImageIO";
repo = "oiio";
rev = "Release-${version}";
- sha256 = "0v3k33jb0glb30jdhq3c732a9dxvnidaclz6b2wpqwik8l3658mj";
+ sha256 = "1bbxx3bcc5jlb90ffxbk29gb8227097rdr8vg97vj9axw2mjd5si";
};
+ patches = [
+ (fetchpatch {
+ url = "https://github.com/OpenImageIO/oiio/pull/2441/commits/e9bdd69596103edf41b659ad8ab0ca4ce002f6f5.patch";
+ sha256 = "0x1wmjf1jrm19d1izhs1cs3y1if9al1zx48lahkfswyjag3r5dn0";
+ })
+ ];
+
outputs = [ "bin" "out" "dev" "doc" ];
nativeBuildInputs = [
diff --git a/pkgs/applications/graphics/pqiv/default.nix b/pkgs/applications/graphics/pqiv/default.nix
index 1ad51e92d472..7639a2a9c761 100644
--- a/pkgs/applications/graphics/pqiv/default.nix
+++ b/pkgs/applications/graphics/pqiv/default.nix
@@ -22,7 +22,7 @@ stdenv.mkDerivation (rec {
description = "Powerful image viewer with minimal UI";
homepage = http://www.pberndt.com/Programme/Linux/pqiv;
license = licenses.gpl3;
- maintainers = [ maintainers.ndowens ];
+ maintainers = [];
platforms = platforms.linux;
};
})
diff --git a/pkgs/applications/graphics/sane/backends/generic.nix b/pkgs/applications/graphics/sane/backends/generic.nix
index 92cec3ca82c2..0e8a5f34f6c1 100644
--- a/pkgs/applications/graphics/sane/backends/generic.nix
+++ b/pkgs/applications/graphics/sane/backends/generic.nix
@@ -1,5 +1,5 @@
{ stdenv
-, avahi, libjpeg, libusb1, libv4l, net_snmp, libpng
+, avahi, libjpeg, libusb1, libv4l, net-snmp, libpng
, gettext, pkgconfig
# List of { src name backend } attibute sets - see installFirmware below:
@@ -24,7 +24,7 @@ stdenv.mkDerivation {
++ stdenv.lib.optional (libusb1 != null) "--enable-libusb_1_0"
;
- buildInputs = [ avahi libusb1 libv4l net_snmp libpng ];
+ buildInputs = [ avahi libusb1 libv4l net-snmp libpng ];
nativeBuildInputs = [ gettext pkgconfig ];
enableParallelBuilding = true;
diff --git a/pkgs/applications/kde/kontact.nix b/pkgs/applications/kde/kontact.nix
index bb44762e65c5..978baa925e5a 100644
--- a/pkgs/applications/kde/kontact.nix
+++ b/pkgs/applications/kde/kontact.nix
@@ -2,7 +2,7 @@
mkDerivation, lib, kdepimTeam,
extra-cmake-modules, kdoctools,
qtwebengine,
- kcmutils, kcrash, kdbusaddons, kwindowsystem,
+ kcmutils, kcrash, kdbusaddons, kparts, kwindowsystem,
akonadi, grantleetheme, kdepim-apps-libs, kontactinterface, kpimtextedit,
mailcommon, libkdepim
}:
@@ -16,7 +16,7 @@ mkDerivation {
nativeBuildInputs = [ extra-cmake-modules kdoctools ];
buildInputs = [
qtwebengine
- kcmutils kcrash kdbusaddons kwindowsystem
+ kcmutils kcrash kdbusaddons kparts kwindowsystem
akonadi grantleetheme kdepim-apps-libs kontactinterface kpimtextedit
mailcommon libkdepim
];
diff --git a/pkgs/applications/misc/golden-cheetah/default.nix b/pkgs/applications/misc/golden-cheetah/default.nix
index 7fba1d49d747..dde1c32e805f 100644
--- a/pkgs/applications/misc/golden-cheetah/default.nix
+++ b/pkgs/applications/misc/golden-cheetah/default.nix
@@ -1,6 +1,6 @@
{ stdenv, fetchFromGitHub, mkDerivation
-, qtbase, qtsvg, qtserialport, qtwebkit, qtmultimedia, qttools
-, qtconnectivity, qtcharts
+, qtbase, qtsvg, qtserialport, qtwebengine, qtmultimedia, qttools
+, qtconnectivity, qtcharts, libusb
, yacc, flex, zlib, qmake, makeDesktopItem, makeWrapper
}:
@@ -16,18 +16,18 @@ let
};
in mkDerivation rec {
pname = "golden-cheetah";
- version = "3.5-DEV1903";
+ version = "3.5-RC2X";
src = fetchFromGitHub {
owner = "GoldenCheetah";
repo = "GoldenCheetah";
- rev = "v${version}";
- sha256 = "130b0hm04i0hf97rs1xrdfhbal5vjsknj3x4cdxjh7rgbg2p1sm3";
+ rev = "V${version}";
+ sha256 = "1d85700gjbcw2badwz225rjdr954ai89900vp8sal04sk79wbr6g";
};
buildInputs = [
- qtbase qtsvg qtserialport qtwebkit qtmultimedia qttools zlib
- qtconnectivity qtcharts
+ qtbase qtsvg qtserialport qtwebengine qtmultimedia qttools zlib
+ qtconnectivity qtcharts libusb
];
nativeBuildInputs = [ flex makeWrapper qmake yacc ];
@@ -39,7 +39,14 @@ in mkDerivation rec {
cp src/gcconfig.pri.in src/gcconfig.pri
cp qwt/qwtconfig.pri.in qwt/qwtconfig.pri
echo 'QMAKE_LRELEASE = ${qttools.dev}/bin/lrelease' >> src/gcconfig.pri
+ echo 'LIBUSB_INSTALL = ${libusb}' >> src/gcconfig.pri
+ echo 'LIBUSB_INCLUDE = ${libusb.dev}/include' >> src/gcconfig.pri
+ echo 'LIBUSB_LIBS = -L${libusb}/lib -lusb' >> src/gcconfig.pri
sed -i -e '21,23d' qwt/qwtconfig.pri # Removed forced installation to /usr/local
+
+ # Use qtwebengine instead of qtwebkit
+ substituteInPlace src/gcconfig.pri \
+ --replace "#DEFINES += NOWEBKIT" "DEFINES += NOWEBKIT"
'';
installPhase = ''
@@ -53,9 +60,6 @@ in mkDerivation rec {
runHook postInstall
'';
- # RCC: Error in 'Resources/application.qrc': Cannot find file 'translations/gc_fr.qm'
- enableParallelBuilding = false;
-
meta = with stdenv.lib; {
description = "Performance software for cyclists, runners and triathletes";
platforms = platforms.linux;
diff --git a/pkgs/applications/misc/hugo/default.nix b/pkgs/applications/misc/hugo/default.nix
index d6f8983c5eeb..4251d2c1f368 100644
--- a/pkgs/applications/misc/hugo/default.nix
+++ b/pkgs/applications/misc/hugo/default.nix
@@ -2,7 +2,7 @@
buildGoModule rec {
pname = "hugo";
- version = "0.61.0";
+ version = "0.62.0";
goPackagePath = "github.com/gohugoio/hugo";
@@ -10,10 +10,10 @@ buildGoModule rec {
owner = "gohugoio";
repo = pname;
rev = "v${version}";
- sha256 = "1ad70g4gb44dk48pbgk48jzs44b6l7ksxb739ahp7vs1nyvvgffr";
+ sha256 = "0z14qhsjgwqgm7kj25y0zh4b42bwd7zhcmwjxzkk6chzw7fwq375";
};
- modSha256 = "1jb1iqlp1005aj8smcgznmwnqaysi5g5wcsj8nvvm70hhc9j8wns";
+ modSha256 = "0dwv5qnglv00jj7vlps76zlfpkzsplf93401j2l03xfvmvadifrs";
buildFlags = "-tags extended";
diff --git a/pkgs/applications/misc/josm/default.nix b/pkgs/applications/misc/josm/default.nix
index a3cbdabeacf6..be620192dc3d 100644
--- a/pkgs/applications/misc/josm/default.nix
+++ b/pkgs/applications/misc/josm/default.nix
@@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
pname = "josm";
- version = "15492";
+ version = "15553";
src = fetchurl {
url = "https://josm.openstreetmap.de/download/josm-snapshot-${version}.jar";
- sha256 = "0x7ndcrlvrvk2fd4pyn10npr3778khcwg6xzzh19vdw4glh5zfcl";
+ sha256 = "07kkc19r9xkb5jim26nnmajp0jzvg3absgx55z5qnna6r189ba2j";
};
buildInputs = [ jdk11 makeWrapper ];
diff --git a/pkgs/applications/misc/lutris/chrootenv.nix b/pkgs/applications/misc/lutris/chrootenv.nix
index 58492259b090..086128508866 100644
--- a/pkgs/applications/misc/lutris/chrootenv.nix
+++ b/pkgs/applications/misc/lutris/chrootenv.nix
@@ -97,7 +97,7 @@ in buildFHSUserEnv {
libcap libtiff libva libgphoto2 libxslt libtxc_dxtn libsndfile giflib zlib glib
alsaLib zziplib bash dbus keyutils zip cabextract freetype unzip coreutils
readline gcc SDL SDL2 curl graphite2 gtk2 gtk3 udev ncurses wayland libglvnd
- vulkan-loader xdg_utils sqlite
+ vulkan-loader xdg_utils sqlite gnutls
# PCSX2 // TODO: "libgobject-2.0.so.0: wrong ELF class: ELFCLASS64"
diff --git a/pkgs/applications/misc/rofi/default.nix b/pkgs/applications/misc/rofi/default.nix
index eabf77f0e951..d8e600f60193 100644
--- a/pkgs/applications/misc/rofi/default.nix
+++ b/pkgs/applications/misc/rofi/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, lib, fetchurl, makeWrapper
+{ stdenv, lib, fetchurl
, autoreconfHook, pkgconfig, libxkbcommon, pango, which, git
, cairo, libxcb, xcbutil, xcbutilwm, xcbutilxrm, libstartup_notification
, bison, flex, librsvg, check
@@ -19,23 +19,18 @@ stdenv.mkDerivation rec {
sed -i 's/~root/~nobody/g' test/helper-expand.c
'';
- nativeBuildInputs = [ autoreconfHook pkgconfig makeWrapper ];
+ nativeBuildInputs = [ autoreconfHook pkgconfig ];
buildInputs = [ libxkbcommon pango cairo git bison flex librsvg check
libstartup_notification libxcb xcbutil xcbutilwm xcbutilxrm which
];
- postInstall = ''
- wrapProgram $out/bin/rofi-theme-selector \
- --prefix XDG_DATA_DIRS : $out/share
- '';
-
doCheck = false;
meta = with lib; {
description = "Window switcher, run dialog and dmenu replacement";
homepage = "https://github.com/davatorium/rofi";
license = licenses.mit;
- maintainers = with maintainers; [ mbakke ma27 ];
+ maintainers = with maintainers; [ mbakke ];
platforms = with platforms; linux;
};
}
diff --git a/pkgs/applications/misc/rofi/wrapper.nix b/pkgs/applications/misc/rofi/wrapper.nix
index 8c24d27f0752..1c7284a2db26 100644
--- a/pkgs/applications/misc/rofi/wrapper.nix
+++ b/pkgs/applications/misc/rofi/wrapper.nix
@@ -1,6 +1,5 @@
-{ stdenv, rofi-unwrapped, makeWrapper, theme ? null }:
+{ stdenv, rofi-unwrapped, makeWrapper, hicolor-icon-theme, theme ? null }:
-if theme == null then rofi-unwrapped else
stdenv.mkDerivation {
pname = "rofi";
version = rofi-unwrapped.version;
@@ -14,8 +13,15 @@ stdenv.mkDerivation {
rm $out/bin
mkdir $out/bin
ln -s ${rofi-unwrapped}/bin/* $out/bin
+
rm $out/bin/rofi
- makeWrapper ${rofi-unwrapped}/bin/rofi $out/bin/rofi --add-flags "-theme ${theme}"
+ makeWrapper ${rofi-unwrapped}/bin/rofi $out/bin/rofi \
+ --prefix XDG_DATA_DIRS : ${hicolor-icon-theme}/share \
+ ${if theme != null then ''--add-flags "-theme ${theme}"'' else ""}
+
+ rm $out/bin/rofi-theme-selector
+ makeWrapper ${rofi-unwrapped}/bin/rofi-theme-selector $out/bin/rofi-theme-selector \
+ --prefix XDG_DATA_DIRS : $out/share
'';
meta = rofi-unwrapped.meta // {
diff --git a/pkgs/applications/misc/simplenote/default.nix b/pkgs/applications/misc/simplenote/default.nix
index 1829407705b9..b3ad833e3f2a 100644
--- a/pkgs/applications/misc/simplenote/default.nix
+++ b/pkgs/applications/misc/simplenote/default.nix
@@ -16,10 +16,10 @@ let
pname = "simplenote";
- version = "1.11.0";
+ version = "1.12.0";
sha256 = {
- x86_64-linux = "1ljam1yfiy1lh6lrknrq7cdqpj1q7f655mxjiiwv3izp98qr1f8s";
+ x86_64-linux = "0y9b4haaj7qxr92wnwacziljqrkf4vlyqq3rvis8ribq6zr5b24w";
}.${system} or throwSystem;
meta = with stdenv.lib; {
@@ -87,6 +87,7 @@ let
postFixup = ''
makeWrapper $out/opt/Simplenote/simplenote $out/bin/simplenote \
+ --prefix LD_LIBRARY_PATH : "${stdenv.lib.makeLibraryPath [ stdenv.cc.cc ] }" \
"''${gappsWrapperArgs[@]}"
'';
};
diff --git a/pkgs/applications/misc/syncthingtray/default.nix b/pkgs/applications/misc/syncthingtray/default.nix
index 857dcfaf69f2..5a722ffe1119 100644
--- a/pkgs/applications/misc/syncthingtray/default.nix
+++ b/pkgs/applications/misc/syncthingtray/default.nix
@@ -20,14 +20,14 @@
}:
mkDerivation rec {
- version = "0.10.3";
+ version = "0.10.4";
pname = "syncthingtray";
src = fetchFromGitHub {
owner = "Martchus";
repo = "syncthingtray";
rev = "v${version}";
- sha256 = "12s1v65h4z051k4gi1b5f3z4hpbgqnhkjnz2xv5bdwhs24zxrrif";
+ sha256 = "068v63bb1bq6vz7byhnd28l6dmr4jmivailxmjv86wakbsqvlhbi";
};
buildInputs = [ qtbase cpp-utilities qtutilities ]
diff --git a/pkgs/applications/misc/taizen/default.nix b/pkgs/applications/misc/taizen/default.nix
index ee516ac97aa7..8d58c8887481 100644
--- a/pkgs/applications/misc/taizen/default.nix
+++ b/pkgs/applications/misc/taizen/default.nix
@@ -1,4 +1,4 @@
-{ rustPlatform, lib, fetchFromGitHub, ncurses, openssl, pkgconfig }:
+{ rustPlatform, lib, fetchFromGitHub, ncurses, openssl, pkgconfig, Security, stdenv }:
rustPlatform.buildRustPackage rec {
pname = "taizen";
@@ -11,7 +11,7 @@ rustPlatform.buildRustPackage rec {
sha256 = "09izgx7icvizskdy9kplk0am61p7550fsd0v42zcihq2vap2j92z";
};
- buildInputs = [ ncurses openssl ];
+ buildInputs = [ ncurses openssl ] ++ lib.optional stdenv.isDarwin Security;
nativeBuildInputs = [ pkgconfig ];
cargoSha256 = "0h8ybhb17pqhhfjcmq1l70kp8g1yyq38228lcf86byk3r2ar2rkg";
diff --git a/pkgs/applications/misc/worker/default.nix b/pkgs/applications/misc/worker/default.nix
index 6ff09a5b4b0e..d4b34e2bb7f9 100644
--- a/pkgs/applications/misc/worker/default.nix
+++ b/pkgs/applications/misc/worker/default.nix
@@ -15,6 +15,6 @@ stdenv.mkDerivation rec {
description = "A two-pane file manager with advanced file manipulation features";
homepage = http://www.boomerangsworld.de/cms/worker/index.html;
license = licenses.gpl2;
- maintainers = [ maintainers.ndowens ];
+ maintainers = [];
};
}
diff --git a/pkgs/applications/misc/xmrig/default.nix b/pkgs/applications/misc/xmrig/default.nix
index 441cab3dd7b6..b1bf98704c58 100644
--- a/pkgs/applications/misc/xmrig/default.nix
+++ b/pkgs/applications/misc/xmrig/default.nix
@@ -4,13 +4,13 @@
stdenv.mkDerivation rec {
pname = "xmrig";
- version = "5.1.0";
+ version = "5.4.0";
src = fetchFromGitHub {
owner = "xmrig";
repo = "xmrig";
rev = "v${version}";
- sha256 = "1lkw7xrj20ppfmv7abki9i60yjks9i7nr8ni9p6n7rilfbp4603k";
+ sha256 = "1rwnlhzhasfa2iklrp897c0z7nvav2bz2z6nk41fvwwd3bsay2sf";
};
nativeBuildInputs = [ cmake ];
diff --git a/pkgs/applications/networking/browsers/browsh/default.nix b/pkgs/applications/networking/browsers/browsh/default.nix
index c3f5cb131645..2b910fe0c5c4 100644
--- a/pkgs/applications/networking/browsers/browsh/default.nix
+++ b/pkgs/applications/networking/browsers/browsh/default.nix
@@ -1,14 +1,14 @@
{ stdenv, buildGoPackage, fetchurl, fetchFromGitHub, go-bindata }:
let
- version = "1.5.2";
+ version = "1.6.4";
# TODO: must build the extension instead of downloading it. But since it's
# literally an asset that is indifferent regardless of the platform, this
# might be just enough.
webext = fetchurl {
url = "https://github.com/browsh-org/browsh/releases/download/v${version}/browsh-${version}-an.fx.xpi";
- sha256 = "0b9aycyif0hfhfkivlnvinr13r9h4qyxx768286966p67napbd63";
+ sha256 = "1shf1s9s525wns5vrsc4ns21zjxm1si43lx6v0q8ma6vd5x5445l";
};
in buildGoPackage rec {
@@ -23,7 +23,7 @@ in buildGoPackage rec {
owner = "browsh-org";
repo = "browsh";
rev = "v${version}";
- sha256 = "1z78kgxrbi2jy20rbq6kx5mjk4gpg58w4rb3flp42l9p7bhdbr2h";
+ sha256 = "0gvf5k1gm81xxg7ha309kgfkgl5357dli0fbc4z01rmfgbl0rfa0";
};
buildInputs = [ go-bindata ];
diff --git a/pkgs/applications/networking/browsers/browsh/deps.nix b/pkgs/applications/networking/browsers/browsh/deps.nix
index fae04b4d6a58..9a6a898beb5b 100644
--- a/pkgs/applications/networking/browsers/browsh/deps.nix
+++ b/pkgs/applications/networking/browsers/browsh/deps.nix
@@ -1,3 +1,4 @@
+# file generated from Gopkg.lock using dep2nix (https://github.com/nixcloud/dep2nix)
[
{
goPackagePath = "github.com/NYTimes/gziphandler";
@@ -49,8 +50,8 @@
fetch = {
type = "git";
url = "https://github.com/gorilla/websocket";
- rev = "5ed622c449da6d44c3c8329331ff47a9e5844f71";
- sha256 = "1yhcwraijdk6lx7f6m9p6i1b3zfh2hq80l1nfpnckfn10gh72aw7";
+ rev = "66b9c49e59c6c48f0ffce28c2d8b8a5678502c6d";
+ sha256 = "00i4vb31nsfkzzk7swvx3i75r2d960js3dri1875vypk3v2s0pzk";
};
}
{
@@ -103,8 +104,8 @@
fetch = {
type = "git";
url = "https://github.com/mitchellh/mapstructure";
- rev = "f15292f7a699fcc1a38a80977f80a046874ba8ac";
- sha256 = "0zm3nhdvmj3f8q0vg2sjfw1sm3pwsw0ggz501awz95w99664a8al";
+ rev = "3536a929edddb9a5b34bd6861dc4a9647cb459fe";
+ sha256 = "03bpv28jz9zhn4947saqwi328ydj7f6g6pf1m2d4m5zdh5jlfkrr";
};
}
{
@@ -166,8 +167,8 @@
fetch = {
type = "git";
url = "https://github.com/spf13/cast";
- rev = "8965335b8c7107321228e3e3702cab9832751bac";
- sha256 = "177bk7lq40jbgv9p9r80aydpaccfk8ja3a7jjhfwiwk9r1pa4rr2";
+ rev = "8c9545af88b134710ab1cd196795e7f2388358d7";
+ sha256 = "0xq1ffqj8y8h7dcnm0m9lfrh0ga7pssnn2c1dnr09chqbpn4bdc5";
};
}
{
@@ -184,8 +185,8 @@
fetch = {
type = "git";
url = "https://github.com/spf13/pflag";
- rev = "3ebe029320b2676d667ae88da602a5f854788a8a";
- sha256 = "11yxs0wqy70wj106fkz8r923yg4ncnc2mbw33v48zmlg4a1rasgp";
+ rev = "298182f68c66c05229eb03ac171abe6e309ee79a";
+ sha256 = "1cj3cjm7d3zk0mf1xdybh0jywkbbw7a6yr3y22x9sis31scprswd";
};
}
{
@@ -260,4 +261,4 @@
sha256 = "01wj12jzsdqlnidpyjssmj0r4yavlqy7dwrg7adqd8dicjc4ncsa";
};
}
-]
+]
\ No newline at end of file
diff --git a/pkgs/applications/networking/browsers/chromium/common.nix b/pkgs/applications/networking/browsers/chromium/common.nix
index 7ce1c35e9eb1..31e699161968 100644
--- a/pkgs/applications/networking/browsers/chromium/common.nix
+++ b/pkgs/applications/networking/browsers/chromium/common.nix
@@ -16,7 +16,7 @@
, libXScrnSaver, libXcursor, libXtst, libGLU, libGL
, protobuf, speechd, libXdamage, cups
, ffmpeg, libxslt, libxml2, at-spi2-core
-, jdk
+, jre
# optional dependencies
, libgcrypt ? null # gnomeSupport || cupsSupport
@@ -124,7 +124,7 @@ let
glib gtk3 dbus-glib
libXScrnSaver libXcursor libXtst libGLU libGL
pciutils protobuf speechd libXdamage at-spi2-core
- jdk.jre
+ jre
] ++ optional gnomeKeyringSupport libgnome-keyring3
++ optionals gnomeSupport [ gnome.GConf libgcrypt ]
++ optionals cupsSupport [ libgcrypt cups ]
diff --git a/pkgs/applications/networking/browsers/chromium/plugins.nix b/pkgs/applications/networking/browsers/chromium/plugins.nix
index 3abdef62eefc..ef0b5ac0eb67 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.293";
+ version = "32.0.0.303";
src = fetchzip {
url = "https://fpdownload.adobe.com/pub/flashplayer/pdc/${version}/flash_player_ppapi_linux.x86_64.tar.gz";
- sha256 = "0rgriqdbyrzpm1bcph35bhzd5dz21yim56z93hkmbpdqg7767dwm";
+ sha256 = "0b2cw8y9rif2p0lyy2ir1v5lchxlsh543b9c743a2p85c9p7q62b";
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 585b7426eb67..7e3705a3b0bd 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.293";
+ version = "32.0.0.303";
src = fetchurl {
url =
@@ -85,14 +85,14 @@ stdenv.mkDerivation rec {
sha256 =
if debug then
if arch == "x86_64" then
- "0lz1na68gdi9n23hfj5c731dbskm9684cwar7ji8yjfhfryfg5yn"
+ "05hfc5ywmcvp6zf8aqmzjp3qy3byp0zdl0ssrv9gvzcskdqkhsj2"
else
- "10gm2ynndlyk66fndfbh7ah5ssqpyw8415i10n3lpw940x201dk0"
+ "12hl8lvxz648ha70gi3v85mwf0nnayjiaslr669vjan3ww94jymv"
else
if arch == "x86_64" then
- "0hmlv0v9lbgxrmz0n7czfnrbrwjwxhy99gsr5g1m0aqgw0y61clc"
+ "0x0mabgswly2v8z13832pkbjsv404aq61pback6sgmp2lyycdg6w"
else
- "0qdw4f48xhnkzdly3jz63v14nmzd0gg49az5wxb08ghs8laaqlik";
+ "16kbpf1i3aqlrfbfh5ncg1n46ncl9hp6qdp36s5j3ivbc68pj81z";
};
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 0f7ded95f40f..28b4c8a36c93 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.293";
+ version = "32.0.0.303";
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
- "13mrknvl3yd8vrcs7mp6szz6f9ssfs72apzvc60f9qfwkhiwlg87"
+ "0xkzlv90lpyy54j6pllknrp1l9vjyh6dsl63l4c8cgh4i830gi14"
else
- "0isvmzyi4isxvxxc5ksplcqc5cafpvbrln3dddpms8zps2dxpyzi";
+ "0mi3ggv6zhzmdd1h68cgl87n6izhp0pbkhnidd2gl2cp95f23c2d";
};
nativeBuildInputs = [ unzip ];
diff --git a/pkgs/applications/networking/feedreaders/newsboat/default.nix b/pkgs/applications/networking/feedreaders/newsboat/default.nix
index 8ff8041e467b..e24e47f2fe7f 100644
--- a/pkgs/applications/networking/feedreaders/newsboat/default.nix
+++ b/pkgs/applications/networking/feedreaders/newsboat/default.nix
@@ -1,16 +1,18 @@
-{ stdenv, rustPlatform, fetchurl, stfl, sqlite, curl, gettext, pkgconfig, libxml2, json_c, ncurses
+{ stdenv, rustPlatform, fetchFromGitHub, stfl, sqlite, curl, gettext, pkgconfig, libxml2, json_c, ncurses
, asciidoc, docbook_xml_dtd_45, libxslt, docbook_xsl, libiconv, Security, makeWrapper }:
rustPlatform.buildRustPackage rec {
pname = "newsboat";
- version = "2.17.1";
+ version = "2.18";
- src = fetchurl {
- url = "https://newsboat.org/releases/${version}/${pname}-${version}.tar.xz";
- sha256 = "15qr2y35yvl0hzsf34d863n8v042v78ks6ksh5p1awvi055x5sy1";
+ src = fetchFromGitHub {
+ owner = "newsboat";
+ repo = "newsboat";
+ rev = "r${version}";
+ sha256 = "1bg2qjkzdawn4fnn0w7jhw1dk6191w8axnqra43z21pinfyim6da";
};
- cargoSha256 = "0db4j6y43gacazrvcmq823fzl5pdfdlg8mkjpysrw6h9fxisq83f";
+ cargoSha256 = "0q0iqd8y9rph8pwild5i2kv00h217a166c88hxpmbrigq9w960lp";
postPatch = ''
substituteInPlace Makefile --replace "|| true" ""
diff --git a/pkgs/applications/networking/instant-messengers/jitsi/default.nix b/pkgs/applications/networking/instant-messengers/jitsi/default.nix
index 04a31ba403a2..7e01f97fe0df 100644
--- a/pkgs/applications/networking/instant-messengers/jitsi/default.nix
+++ b/pkgs/applications/networking/instant-messengers/jitsi/default.nix
@@ -66,6 +66,6 @@ stdenv.mkDerivation rec {
description = "Open Source Video Calls and Chat";
license = licenses.lgpl21Plus;
platforms = platforms.linux;
- maintainers = with maintainers; [ ndowens ];
+ maintainers = with maintainers; [];
};
}
diff --git a/pkgs/applications/networking/instant-messengers/mikutter/Gemfile b/pkgs/applications/networking/instant-messengers/mikutter/Gemfile
index 3ebd745e4f1a..216af305b4ad 100644
--- a/pkgs/applications/networking/instant-messengers/mikutter/Gemfile
+++ b/pkgs/applications/networking/instant-messengers/mikutter/Gemfile
@@ -7,34 +7,30 @@ def source(url)
source 'https://rubygems.org'
-ruby '>= 2.3.0'
+ruby '>= 2.5.0'
group :default do
- gem 'oauth', '>= 0.5.1'
- gem 'json_pure', '~> 1.8'
- gem 'addressable', '>= 2.5.2', '< 2.6'
- gem 'diva', '>= 0.3.2', '< 2.0'
- gem 'memoist', '>= 0.16', '< 0.17'
- gem 'ruby-hmac', '~> 0.4'
- gem 'typed-array', '~> 0.1'
- gem 'delayer', '~> 0.0'
- gem 'pluggaloid', '>= 1.1.1', '< 2.0'
- gem 'delayer-deferred', '>= 2.0', '< 3.0'
- gem 'twitter-text', '>= 2.1.0'
+ gem 'addressable','>= 2.7.0', '< 2.8'
+ gem 'delayer','>= 1.0.1', '< 1.1'
+ gem 'delayer-deferred','>= 2.1.1', '< 2.2'
+ gem 'diva','>= 1.0.1', '< 1.1'
+ gem 'memoist','>= 0.16.2', '< 0.17'
+ gem 'oauth','>= 0.5.4'
+ gem 'pluggaloid','>= 1.2.0', '< 1.3'
+ gem 'typed-array','>= 0.1.2', '< 0.2'
end
group :test do
- gem 'test-unit', '~> 3.0'
- gem 'rake', '~> 10.1'
- gem 'watch', '~> 0.1'
- gem 'mocha', '~> 0.14'
- gem 'webmock', '~> 1.17'
- gem 'ruby-prof'
+ gem 'test-unit','>= 3.3.4', '< 4.0'
+ gem 'rake','>= 13.0.1'
+ gem 'mocha','>= 1.11.1'
+ gem 'webmock','>= 3.7.6'
+ gem 'ruby-prof','>= 1.1.0'
end
group :plugin do
- Dir.glob(File.expand_path(File.join(__dir__, 'core/plugin/*/Gemfile'))){ |path|
+ Dir.glob(File.expand_path(File.join(__dir__, 'plugin/*/Gemfile'))){ |path|
eval File.open(path).read
}
Dir.glob(File.join(File.expand_path(ENV['MIKUTTER_CONFROOT'] || '~/.mikutter'), 'plugin/*/Gemfile')){ |path|
diff --git a/pkgs/applications/networking/instant-messengers/mikutter/Gemfile.lock b/pkgs/applications/networking/instant-messengers/mikutter/Gemfile.lock
index 2e1f2fbd3820..63f9a63849b1 100644
--- a/pkgs/applications/networking/instant-messengers/mikutter/Gemfile.lock
+++ b/pkgs/applications/networking/instant-messengers/mikutter/Gemfile.lock
@@ -1,117 +1,103 @@
GEM
remote: https://rubygems.org/
specs:
- addressable (2.5.2)
- public_suffix (>= 2.0.2, < 4.0)
- atk (3.3.2)
- glib2 (= 3.3.2)
+ addressable (2.7.0)
+ public_suffix (>= 2.0.2, < 5.0)
+ atk (3.4.1)
+ glib2 (= 3.4.1)
cairo (1.16.4)
native-package-installer (>= 1.0.3)
pkg-config (>= 1.2.2)
- cairo-gobject (3.3.2)
+ cairo-gobject (3.4.1)
cairo (>= 1.16.2)
- glib2 (= 3.3.2)
+ glib2 (= 3.4.1)
crack (0.4.3)
safe_yaml (~> 1.0.0)
- delayer (0.0.2)
- delayer-deferred (2.0.0)
- delayer (>= 0.0.2, < 0.1)
- diva (0.3.2)
- addressable (>= 2.5, < 2.6)
- gdk_pixbuf2 (3.3.2)
- gio2 (= 3.3.2)
+ delayer (1.0.1)
+ delayer-deferred (2.1.1)
+ delayer (>= 1.0, < 2.0)
+ diva (1.0.1)
+ addressable (>= 2.5.2, < 2.8)
+ gdk_pixbuf2 (3.4.1)
+ gio2 (= 3.4.1)
gettext (3.2.9)
locale (>= 2.0.5)
text (>= 1.3.0)
- gio2 (3.3.2)
- gobject-introspection (= 3.3.2)
- glib2 (3.3.2)
+ gio2 (3.4.1)
+ gobject-introspection (= 3.4.1)
+ glib2 (3.4.1)
native-package-installer (>= 1.0.3)
- pkg-config (>= 1.2.2)
- gobject-introspection (3.3.2)
- glib2 (= 3.3.2)
- gtk2 (3.3.2)
- atk (= 3.3.2)
- gdk_pixbuf2 (= 3.3.2)
- pango (= 3.3.2)
- hashdiff (0.3.9)
+ pkg-config (>= 1.3.5)
+ gobject-introspection (3.4.1)
+ glib2 (= 3.4.1)
+ gtk2 (3.4.1)
+ atk (= 3.4.1)
+ gdk_pixbuf2 (= 3.4.1)
+ pango (= 3.4.1)
+ hashdiff (1.0.0)
httpclient (2.8.3)
- idn-ruby (0.1.0)
instance_storage (1.0.0)
- irb (1.0.0)
- json_pure (1.8.6)
+ io-console (0.5.3)
+ irb (1.2.1)
+ reline (>= 0.0.1)
locale (2.1.2)
- memoist (0.16.0)
- metaclass (0.0.4)
+ memoist (0.16.2)
mini_portile2 (2.4.0)
- mocha (0.14.0)
- metaclass (~> 0.0.1)
- moneta (1.1.1)
- native-package-installer (1.0.7)
- nokogiri (1.10.3)
+ mocha (1.11.1)
+ moneta (1.2.1)
+ native-package-installer (1.0.9)
+ nokogiri (1.10.7)
mini_portile2 (~> 2.4.0)
oauth (0.5.4)
- pango (3.3.2)
- cairo-gobject (= 3.3.2)
- gobject-introspection (= 3.3.2)
- pkg-config (1.3.7)
- pluggaloid (1.1.2)
- delayer
+ pango (3.4.1)
+ cairo-gobject (= 3.4.1)
+ gobject-introspection (= 3.4.1)
+ pkg-config (1.4.0)
+ pluggaloid (1.2.0)
+ delayer (>= 1.0.0, < 2.0)
instance_storage (>= 1.0.0, < 2.0.0)
- power_assert (1.1.4)
- public_suffix (3.0.3)
- rake (10.5.0)
- ruby-hmac (0.4.0)
- ruby-prof (0.17.0)
+ power_assert (1.1.5)
+ public_suffix (4.0.1)
+ rake (13.0.1)
+ reline (0.1.2)
+ io-console (~> 0.5)
+ ruby-prof (1.1.0)
safe_yaml (1.0.5)
- test-unit (3.3.2)
+ test-unit (3.3.4)
power_assert
text (1.3.1)
- totoridipjp (0.1.0)
- twitter-text (3.0.0)
- idn-ruby
- unf (~> 0.1.0)
typed-array (0.1.2)
- unf (0.1.4)
- unf_ext
- unf_ext (0.0.7.6)
- watch (0.1.0)
- webmock (1.24.6)
+ webmock (3.7.6)
addressable (>= 2.3.6)
crack (>= 0.3.2)
- hashdiff
+ hashdiff (>= 0.4.0, < 2.0.0)
PLATFORMS
ruby
DEPENDENCIES
- addressable (>= 2.5.2, < 2.6)
- delayer (~> 0.0)
- delayer-deferred (>= 2.0, < 3.0)
- diva (>= 0.3.2, < 2.0)
+ addressable (>= 2.7.0, < 2.8)
+ delayer (>= 1.0.1, < 1.1)
+ delayer-deferred (>= 2.1.1, < 2.2)
+ diva (>= 1.0.1, < 1.1)
gettext (>= 3.2.9, < 3.3)
- gtk2 (= 3.3.2)
+ gtk2 (= 3.4.1)
httpclient
- irb (>= 1.0.0, < 1.1)
- json_pure (~> 1.8)
- memoist (>= 0.16, < 0.17)
- mocha (~> 0.14)
+ irb (>= 1.2.0, < 1.3)
+ memoist (>= 0.16.2, < 0.17)
+ mocha (>= 1.11.1)
moneta
nokogiri
- oauth (>= 0.5.1)
- pluggaloid (>= 1.1.1, < 2.0)
- rake (~> 10.1)
- ruby-hmac (~> 0.4)
- ruby-prof
- test-unit (~> 3.0)
- totoridipjp
- twitter-text (>= 2.1.0)
- typed-array (~> 0.1)
- watch (~> 0.1)
- webmock (~> 1.17)
+ oauth (>= 0.5.4)
+ pluggaloid (>= 1.2.0, < 1.3)
+ rake (>= 13.0.1)
+ ruby-prof (>= 1.1.0)
+ test-unit (>= 3.3.4, < 4.0)
+ typed-array (>= 0.1.2, < 0.2)
+ webmock (>= 3.7.6)
RUBY VERSION
- ruby 2.5.5p157
+ ruby 2.7.0p0
BUNDLED WITH
- 1.17.2
+ 2.1.2
diff --git a/pkgs/applications/networking/instant-messengers/mikutter/default.nix b/pkgs/applications/networking/instant-messengers/mikutter/default.nix
index 3e2718c9c573..5778a2dea3b0 100644
--- a/pkgs/applications/networking/instant-messengers/mikutter/default.nix
+++ b/pkgs/applications/networking/instant-messengers/mikutter/default.nix
@@ -7,23 +7,24 @@
# find latest version at: http://mikutter.hachune.net/download#download
# run these commands:
#
-# wget http://mikutter.hachune.net/bin/mikutter.3.8.7.tar.gz
-# tar xvf mikutter.3.8.7.tar.gz
+# wget http://mikutter.hachune.net/bin/mikutter.4.0.0.tar.gz
+# mkdir mikutter
# cd mikutter
+# tar xvf ../mikutter.4.0.0.tar.gz
# find . -not -name Gemfile -exec rm {} \;
# find . -type d -exec rmdir -p --ignore-fail-on-non-empty {} \;
# cd ..
# mv mikutter/* .
-# rm mikutter.3.8.7.tar.gz
+# rm mikutter.4.0.0.tar.gz
# rm gemset.nix Gemfile.lock; nix-shell -p bundler bundix --run 'bundle lock && bundix'
stdenv.mkDerivation rec {
pname = "mikutter";
- version = "3.8.7";
+ version = "4.0.0";
src = fetchurl {
url = "https://mikutter.hachune.net/bin/mikutter.${version}.tar.gz";
- sha256 = "1griypcd1xgyfd9wc3ls32grpw4ig0xxdiygpdinzr3bigfmd7iv";
+ sha256 = "0nx14vlp7p69m2vw0s6kbiyymsfq0r2jd4nm0v5c4xb9avkpgc8g";
};
env = bundlerEnv {
@@ -36,8 +37,11 @@ stdenv.mkDerivation rec {
buildInputs = [ alsaUtils libnotify which gtk2 ruby atk gobject-introspection ];
nativeBuildInputs = [ wrapGAppsHook ];
- postUnpack = ''
- rm -rf $sourceRoot/vendor
+ unpackPhase = ''
+ mkdir source
+ cd source
+ unpackFile $src
+ rm -rf vendor
'';
installPhase = ''
@@ -73,5 +77,6 @@ stdenv.mkDerivation rec {
homepage = https://mikutter.hachune.net;
platforms = ruby.meta.platforms;
license = licenses.mit;
+ broken = true;
};
}
diff --git a/pkgs/applications/networking/instant-messengers/mikutter/gemset.nix b/pkgs/applications/networking/instant-messengers/mikutter/gemset.nix
index 5f3ef945b3d4..88ea97be1caf 100644
--- a/pkgs/applications/networking/instant-messengers/mikutter/gemset.nix
+++ b/pkgs/applications/networking/instant-messengers/mikutter/gemset.nix
@@ -5,10 +5,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "0viqszpkggqi8hq87pqp0xykhvz60g99nwmkwsb0v45kc2liwxvk";
+ sha256 = "1fvchp2rhp2rmigx7qglf69xvjqvzq7x0g49naliw29r2bz656sy";
type = "gem";
};
- version = "2.5.2";
+ version = "2.7.0";
};
atk = {
dependencies = ["glib2"];
@@ -16,10 +16,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "17c5ixwyg16lbbjix2prk7fa6lm0vkxvc1z6m6inc6jgkb1x0700";
+ sha256 = "0a8q9a1f6x4gy55p8cf52a22bnpjgn18ad9n959x0f4gybbhs948";
type = "gem";
};
- version = "3.3.2";
+ version = "3.4.1";
};
cairo = {
dependencies = ["native-package-installer" "pkg-config"];
@@ -38,10 +38,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "12q441a5vnfvbcnli4fpq2svb75vq1wvs2rlgsp6fv38fh6fgsfz";
+ sha256 = "0gkxdfslcvrwrs48giilji3bgxd5bwijwq33p9h00r10jzfg2028";
type = "gem";
};
- version = "3.3.2";
+ version = "3.4.1";
};
crack = {
dependencies = ["safe_yaml"];
@@ -59,10 +59,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "156vy4x1d2jgafkjaafzfz7g8ghl4p5zgbl859b8slp4wdxy3v1r";
+ sha256 = "09p4rkh3dpdm1mhq721m4d6zvxqqp44kg7069s8l7kmaf7nv2nb3";
type = "gem";
};
- version = "0.0.2";
+ version = "1.0.1";
};
delayer-deferred = {
dependencies = ["delayer"];
@@ -70,10 +70,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "0zvqphyzngj5wghgbb2nd1qj2qvj2plsz9vx8hz24c7bfq55n4xz";
+ sha256 = "1mbdxn1hskjqf3zlj4waxl71ccvbj6lk81c99769paxw4fajwrgx";
type = "gem";
};
- version = "2.0.0";
+ version = "2.1.1";
};
diva = {
dependencies = ["addressable"];
@@ -81,10 +81,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "0rp125gdlq7jqq7x8la52pdpimhx5wr66frcgf6z4jm927rjw84d";
+ sha256 = "182gws1zihhpl7r3m8jsf29maqg9xdhj46s9lidbldar8clpl23h";
type = "gem";
};
- version = "0.3.2";
+ version = "1.0.1";
};
gdk_pixbuf2 = {
dependencies = ["gio2"];
@@ -92,10 +92,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "071z8a8khs5qb43ri5hbvaijwbx43mick7cjfmhn6javifkzijk7";
+ sha256 = "0194gzn0kialfh0j7crllvp808r64sg6dh297x69b0av21ar5pam";
type = "gem";
};
- version = "3.3.2";
+ version = "3.4.1";
};
gettext = {
dependencies = ["locale" "text"];
@@ -114,10 +114,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "1f131yd9zzfsjn8i4k8xkl7xm3c5f9sm7irvwxnqqh635qccfz8n";
+ sha256 = "1l3jpgbdvb55xhcmpkcqgwx5068dfyi8kijfvzhbqh96ng0p1m7g";
type = "gem";
};
- version = "3.3.2";
+ version = "3.4.1";
};
glib2 = {
dependencies = ["native-package-installer" "pkg-config"];
@@ -125,10 +125,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "13r1i8gkgxj0fjz7bdnqqrsvszl7dffbf85ghx2f8p7zrcbzlk3p";
+ sha256 = "18clyn0fp0h5alnkf9i2bqd6wvl78h468pdbzs1csqnba8vw4q1c";
type = "gem";
};
- version = "3.3.2";
+ version = "3.4.1";
};
gobject-introspection = {
dependencies = ["glib2"];
@@ -136,10 +136,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "15njcm0yg4qpwkhyx6gf2nxvjl6fxm9jffan8zrl2xyh68yr4jf7";
+ sha256 = "1a3x8qiisbax3x0izj8l5w66r53ba5ma53ax2jhdbhbvaxx3d02n";
type = "gem";
};
- version = "3.3.2";
+ version = "3.4.1";
};
gtk2 = {
dependencies = ["atk" "gdk_pixbuf2" "pango"];
@@ -147,20 +147,20 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "1a4lj6anmvr82cwrg8swzglz90jss995zr7bvsiwr876qqdwv7qs";
+ sha256 = "17az8g0n1yzz90kdbjg2hpabi04qccda7v6lin76bs637ivfg2md";
type = "gem";
};
- version = "3.3.2";
+ version = "3.4.1";
};
hashdiff = {
groups = ["default" "test"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "1qji49afni3c90zws617x514xi7ik70g2iwngj9skq68mjcq6y4x";
+ sha256 = "18jqpbvidrlnq3xf0hkdbs00607jgz35lry6gjw4bcxgh52am2mk";
type = "gem";
};
- version = "0.3.9";
+ version = "1.0.0";
};
httpclient = {
groups = ["plugin"];
@@ -172,16 +172,6 @@
};
version = "2.8.3";
};
- idn-ruby = {
- groups = ["default"];
- platforms = [];
- source = {
- remotes = ["https://rubygems.org"];
- sha256 = "07vblcyk3g72sbq12xz7xj28snpxnh3sbcnxy8bglqbfqqhvmawr";
- type = "gem";
- };
- version = "0.1.0";
- };
instance_storage = {
groups = ["default"];
platforms = [];
@@ -192,25 +182,26 @@
};
version = "1.0.0";
};
- irb = {
+ io-console = {
groups = ["default" "plugin"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "181d88hns00fpw8szg8hbchflwq69wp3y5zvd3dyqjzbq91v1dcr";
+ sha256 = "0srn91ly4cc5qvyj3r87sc7v8dnm52qj1hczzxmysib6ffparngd";
type = "gem";
};
- version = "1.0.0";
+ version = "0.5.3";
};
- json_pure = {
- groups = ["default"];
+ irb = {
+ dependencies = ["reline"];
+ groups = ["default" "plugin"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "1vllrpm2hpsy5w1r7000mna2mhd7yfrmd8hi713lk0n9mv27bmam";
+ sha256 = "1r1y8i46qd5izdszzzn5jxvwvq00m89rk0hm8cs8f21p7nlwmh5w";
type = "gem";
};
- version = "1.8.6";
+ version = "1.2.1";
};
locale = {
groups = ["default" "plugin"];
@@ -227,20 +218,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "0pq8fhqh8w25qcw9v3vzfb0i6jp0k3949ahxc3wrwz2791dpbgbh";
+ sha256 = "0i9wpzix3sjhf6d9zw60dm4371iq8kyz7ckh2qapan2vyaim6b55";
type = "gem";
};
- version = "0.16.0";
- };
- metaclass = {
- groups = ["default" "test"];
- platforms = [];
- source = {
- remotes = ["https://rubygems.org"];
- sha256 = "0hp99y2b1nh0nr8pc398n3f8lakgci6pkrg4bf2b2211j1f6hsc5";
- type = "gem";
- };
- version = "0.0.4";
+ version = "0.16.2";
};
mini_portile2 = {
groups = ["default" "plugin"];
@@ -253,35 +234,34 @@
version = "2.4.0";
};
mocha = {
- dependencies = ["metaclass"];
groups = ["test"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "0id1x7g46fzy8f4jna20ys329ydaj3sad75qs9db2a6nd7f0zc2b";
+ sha256 = "06i2q5qjr9mvjgjc8w41pdf3qalw340y33wjvzc0rp4a1cbbb7pp";
type = "gem";
};
- version = "0.14.0";
+ version = "1.11.1";
};
moneta = {
groups = ["plugin"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "1mbs9w3c13phza8008mwlx8s991fzigml7pncq94i1c2flz9vw95";
+ sha256 = "0q7fskfdc0h5dhl8aamg3ypybd6cyl4x0prh4803gj7hxr17jfm1";
type = "gem";
};
- version = "1.1.1";
+ version = "1.2.1";
};
native-package-installer = {
groups = ["default" "plugin"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "03qrzhk807f98bdwy6c37acksyb5fnairdz4jpl7y3fifh7k7yfn";
+ sha256 = "0piclgf6pw7hr10x57x0hn675djyna4sb3xc97yb9vh66wkx1fl0";
type = "gem";
};
- version = "1.0.7";
+ version = "1.0.9";
};
nokogiri = {
dependencies = ["mini_portile2"];
@@ -289,10 +269,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "02bjydih0j515szfv9mls195cvpyidh6ixm7dwbl3s2sbaxxk5s4";
+ sha256 = "0r0qpgf80h764k176yr63gqbs2z0xbsp8vlvs2a79d5r9vs83kln";
type = "gem";
};
- version = "1.10.3";
+ version = "1.10.7";
};
oauth = {
groups = ["default"];
@@ -310,20 +290,20 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "0lbhjsd6y42iw572xcynd6gcapczjki41h932s90rkh6022pbm9p";
+ sha256 = "1d0cn50qgpifrcv8qx72wi6l9xalw3ryngbfmm9xpg9vx5rl1qbp";
type = "gem";
};
- version = "3.3.2";
+ version = "3.4.1";
};
pkg-config = {
groups = ["default" "plugin"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "1s56ym0chq3fycl29vqabcalqdcf7y2f25pmihjwqgbmrmzdyvr1";
+ sha256 = "1cxdpr2wlz9b587avlq04a1da5fz1vdw8jvr6lx23mcq7mqh2xcx";
type = "gem";
};
- version = "1.3.7";
+ version = "1.4.0";
};
pluggaloid = {
dependencies = ["delayer" "instance_storage"];
@@ -331,60 +311,61 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "0fkm6y7aq132icmmv4k8mqw08fxqil8k52l8li642jyi79hvzrqh";
+ sha256 = "1gv0rjjdic8c41gfr3kyyphvf0fmv5rzcf6qd57zjdfcn6fvi3hh";
type = "gem";
};
- version = "1.1.2";
+ version = "1.2.0";
};
power_assert = {
groups = ["default" "test"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "072y5ixw59ad47hkfj6nl2i4zcyad8snfxfsyyrgjkiqnvqwvbvq";
+ sha256 = "1dii0wkfa0jm8sk9b20zl1z4980dmrjh0zqnii058485pp3ws10s";
type = "gem";
};
- version = "1.1.4";
+ version = "1.1.5";
};
public_suffix = {
groups = ["default" "test"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "08q64b5br692dd3v0a9wq9q5dvycc6kmiqmjbdxkxbfizggsvx6l";
+ sha256 = "0xnfv2j2bqgdpg2yq9i2rxby0w2sc9h5iyjkpaas2xknwrgmhdb0";
type = "gem";
};
- version = "3.0.3";
+ version = "4.0.1";
};
rake = {
groups = ["test"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "0jcabbgnjc788chx31sihc5pgbqnlc1c75wakmqlbjdm8jns2m9b";
+ sha256 = "0w6qza25bq1s825faaglkx1k6d59aiyjjk3yw3ip5sb463mhhai9";
type = "gem";
};
- version = "10.5.0";
+ version = "13.0.1";
};
- ruby-hmac = {
- groups = ["default"];
+ reline = {
+ dependencies = ["io-console"];
+ groups = ["default" "plugin"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "01zym41f8fqbmxfz8zv19627swi62ka3gp33bfbkc87v5k7mw954";
+ sha256 = "0908ijrngc3wkn5iny7d0kxkp74w6ixk2nwzzngplplfla1vkp8x";
type = "gem";
};
- version = "0.4.0";
+ version = "0.1.2";
};
ruby-prof = {
groups = ["test"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "02z4lh1iv1d8751a1l6r4hfc9mp61gf80g4qc4l6gbync3j3hf2c";
+ sha256 = "18ga5f4h1fnwn0xh910kpnw4cg3lq3jqljd3h16bdw9pgc5ff7dn";
type = "gem";
};
- version = "0.17.0";
+ version = "1.1.0";
};
safe_yaml = {
groups = ["default" "test"];
@@ -402,10 +383,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "0hf47w70ajvwdchx0psq3dir26hh902x9sz0iwbxqj8z9w1kc6sd";
+ sha256 = "0mrkpb6wz0cs1740kaca240k4ymmkbvb2v5xaxsy6vynqw8n0g6z";
type = "gem";
};
- version = "3.3.2";
+ version = "3.3.4";
};
text = {
groups = ["default" "plugin"];
@@ -417,27 +398,6 @@
};
version = "1.3.1";
};
- totoridipjp = {
- groups = ["plugin"];
- platforms = [];
- source = {
- remotes = ["https://rubygems.org"];
- sha256 = "03ci9hbwc6xf4x0lkm6px4jgbmi37n8plsjhbf2ir5vka9f29lck";
- type = "gem";
- };
- version = "0.1.0";
- };
- twitter-text = {
- dependencies = ["idn-ruby" "unf"];
- groups = ["default"];
- platforms = [];
- source = {
- remotes = ["https://rubygems.org"];
- sha256 = "1ibk4bl9hrq0phlg7zplkilsqgniji6yvid1a7k09rs0ai422jax";
- type = "gem";
- };
- version = "3.0.0";
- };
typed-array = {
groups = ["default"];
platforms = [];
@@ -448,46 +408,15 @@
};
version = "0.1.2";
};
- unf = {
- dependencies = ["unf_ext"];
- groups = ["default"];
- platforms = [];
- source = {
- remotes = ["https://rubygems.org"];
- sha256 = "0bh2cf73i2ffh4fcpdn9ir4mhq8zi50ik0zqa1braahzadx536a9";
- type = "gem";
- };
- version = "0.1.4";
- };
- unf_ext = {
- groups = ["default"];
- platforms = [];
- source = {
- remotes = ["https://rubygems.org"];
- sha256 = "1ll6w64ibh81qwvjx19h8nj7mngxgffg7aigjx11klvf5k2g4nxf";
- type = "gem";
- };
- version = "0.0.7.6";
- };
- watch = {
- groups = ["test"];
- platforms = [];
- source = {
- remotes = ["https://rubygems.org"];
- sha256 = "02g4g6ynnldyjjzrh19r584gj4z6ksff7h0ajz5jdwhpp5y7cghx";
- type = "gem";
- };
- version = "0.1.0";
- };
webmock = {
dependencies = ["addressable" "crack" "hashdiff"];
groups = ["test"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "03vlr6axajz6c7xmlk0w1kvkxc92f8y2zp27wq1z6yk916ry25n5";
+ sha256 = "19xvs7gdf8r75bmyb17w9g367qxzqnlrmbdda1y36cn1vrlnf2l8";
type = "gem";
};
- version = "1.24.6";
+ version = "3.7.6";
};
}
\ No newline at end of file
diff --git a/pkgs/applications/networking/instant-messengers/mikutter/core/plugin/gtk/Gemfile b/pkgs/applications/networking/instant-messengers/mikutter/plugin/gtk/Gemfile
similarity index 59%
rename from pkgs/applications/networking/instant-messengers/mikutter/core/plugin/gtk/Gemfile
rename to pkgs/applications/networking/instant-messengers/mikutter/plugin/gtk/Gemfile
index efe602edc4f2..3306c29e3cbf 100644
--- a/pkgs/applications/networking/instant-messengers/mikutter/core/plugin/gtk/Gemfile
+++ b/pkgs/applications/networking/instant-messengers/mikutter/plugin/gtk/Gemfile
@@ -1,3 +1,4 @@
source 'https://rubygems.org'
-gem 'gtk2', '3.3.2'
+gem 'gtk2', '3.4.1'
+
diff --git a/pkgs/applications/networking/instant-messengers/mikutter/core/plugin/image_file_cache/Gemfile b/pkgs/applications/networking/instant-messengers/mikutter/plugin/image_file_cache/Gemfile
similarity index 100%
rename from pkgs/applications/networking/instant-messengers/mikutter/core/plugin/image_file_cache/Gemfile
rename to pkgs/applications/networking/instant-messengers/mikutter/plugin/image_file_cache/Gemfile
diff --git a/pkgs/applications/networking/instant-messengers/mikutter/core/plugin/photo_support/Gemfile b/pkgs/applications/networking/instant-messengers/mikutter/plugin/photo_support/Gemfile
similarity index 77%
rename from pkgs/applications/networking/instant-messengers/mikutter/core/plugin/photo_support/Gemfile
rename to pkgs/applications/networking/instant-messengers/mikutter/plugin/photo_support/Gemfile
index ee2ecf52d42e..66016eee9c46 100644
--- a/pkgs/applications/networking/instant-messengers/mikutter/core/plugin/photo_support/Gemfile
+++ b/pkgs/applications/networking/instant-messengers/mikutter/plugin/photo_support/Gemfile
@@ -2,4 +2,3 @@ source 'https://rubygems.org'
gem 'nokogiri'
gem 'httpclient'
-gem 'totoridipjp'
diff --git a/pkgs/applications/networking/instant-messengers/mikutter/core/plugin/uitranslator/Gemfile b/pkgs/applications/networking/instant-messengers/mikutter/plugin/uitranslator/Gemfile
similarity index 73%
rename from pkgs/applications/networking/instant-messengers/mikutter/core/plugin/uitranslator/Gemfile
rename to pkgs/applications/networking/instant-messengers/mikutter/plugin/uitranslator/Gemfile
index 61424d395f9b..14ebffd4e0ad 100644
--- a/pkgs/applications/networking/instant-messengers/mikutter/core/plugin/uitranslator/Gemfile
+++ b/pkgs/applications/networking/instant-messengers/mikutter/plugin/uitranslator/Gemfile
@@ -2,5 +2,5 @@ source 'https://rubygems.org'
group :default do
gem 'gettext', '>= 3.2.9', '< 3.3'
- gem 'irb', '>= 1.0.0', '< 1.1'
+ gem 'irb', '>= 1.2.0', '< 1.3'
end
diff --git a/pkgs/applications/networking/instant-messengers/rambox/bare.nix b/pkgs/applications/networking/instant-messengers/rambox/bare.nix
index a23dbda6cb2a..a0e91ab2f658 100644
--- a/pkgs/applications/networking/instant-messengers/rambox/bare.nix
+++ b/pkgs/applications/networking/instant-messengers/rambox/bare.nix
@@ -18,7 +18,7 @@ stdenv.mkDerivation rec {
inherit src;
nodejs = nodejs-10_x;
- sha256 = "0qsgr8cq81yismal5sqr02skakqpynwwzk5s98dr5bg91y361fgy";
+ sha256 = "0slzw4791nl7v6sca9xlhzx16p91m92ln2agbkbdx4zpgasg4gnq";
};
patches = [ ./isDev.patch ];
diff --git a/pkgs/applications/networking/irc/epic5/default.nix b/pkgs/applications/networking/irc/epic5/default.nix
index a90446a87fa9..0cf06a1f4522 100644
--- a/pkgs/applications/networking/irc/epic5/default.nix
+++ b/pkgs/applications/networking/irc/epic5/default.nix
@@ -33,7 +33,7 @@ stdenv.mkDerivation rec {
homepage = http://epicsol.org;
description = "A IRC client that offers a great ircII interface";
license = licenses.bsd3;
- maintainers = [ maintainers.ndowens ];
+ maintainers = [];
};
}
diff --git a/pkgs/applications/networking/p2p/gnunet/default.nix b/pkgs/applications/networking/p2p/gnunet/default.nix
index eff2499be9df..4967e0e27feb 100644
--- a/pkgs/applications/networking/p2p/gnunet/default.nix
+++ b/pkgs/applications/networking/p2p/gnunet/default.nix
@@ -5,11 +5,11 @@
stdenv.mkDerivation rec {
pname = "gnunet";
- version = "0.11.8";
+ version = "0.12.0";
src = fetchurl {
url = "mirror://gnu/gnunet/${pname}-${version}.tar.gz";
- sha256 = "1zkmcq75sfr3iyg8rgxp9dbl7fwsvc1a71rc0vgisghcbrx1n7yj";
+ sha256 = "1bz0sbhbsivi1bcabk3vpxqnh4vgp86vrmiwkyb5fiqfjviar111";
};
enableParallelBuilding = true;
diff --git a/pkgs/applications/networking/sniffers/wireshark/default.nix b/pkgs/applications/networking/sniffers/wireshark/default.nix
index ef1e07ca9763..67365405cc20 100644
--- a/pkgs/applications/networking/sniffers/wireshark/default.nix
+++ b/pkgs/applications/networking/sniffers/wireshark/default.nix
@@ -10,7 +10,7 @@ assert withQt -> qt5 != null;
with stdenv.lib;
let
- version = "3.0.5";
+ version = "3.2.0";
variant = if withQt then "qt" else "cli";
in stdenv.mkDerivation {
@@ -20,7 +20,7 @@ in stdenv.mkDerivation {
src = fetchurl {
url = "https://www.wireshark.org/download/src/all-versions/wireshark-${version}.tar.xz";
- sha256 = "087qv7nd7zlbckvcs37fkkg7v0mw0hjd5yfbghqym764fpjgqlf5";
+ sha256 = "0v5nn7i2nbqr59jsw8cs2052hr7xd96x1sa3480g8ks5kahk7zac";
};
cmakeFlags = [
diff --git a/pkgs/applications/office/kmymoney/default.nix b/pkgs/applications/office/kmymoney/default.nix
index 966c36f18233..c7b4377c3dcb 100644
--- a/pkgs/applications/office/kmymoney/default.nix
+++ b/pkgs/applications/office/kmymoney/default.nix
@@ -10,7 +10,7 @@
# Needed for running tests:
, qtbase, xvfb_run
-, python3Packages
+, python2, python3Packages
}:
stdenv.mkDerivation rec {
@@ -28,8 +28,8 @@ stdenv.mkDerivation rec {
enableParallelBuilding = true;
nativeBuildInputs = [
- doxygen extra-cmake-modules graphviz kdoctools python3Packages.wrapPython
- wrapQtAppsHook
+ doxygen extra-cmake-modules graphviz kdoctools python2
+ python3Packages.wrapPython wrapQtAppsHook
];
buildInputs = [
diff --git a/pkgs/applications/office/pympress/default.nix b/pkgs/applications/office/pympress/default.nix
index 2ce6e8a0220b..b4307eb286e5 100644
--- a/pkgs/applications/office/pympress/default.nix
+++ b/pkgs/applications/office/pympress/default.nix
@@ -12,11 +12,11 @@
python3Packages.buildPythonApplication rec {
pname = "pympress";
- version = "1.4.0";
+ version = "1.5.1";
src = python3Packages.fetchPypi {
inherit pname version;
- sha256 = "101wj6m931bj0ah6niw79i8ywb5zlb2783g7n7dmkhw6ay3jj4vq";
+ sha256 = "173d9scf2z29qg279jf33zcl7sgc3wp662fgpm943bn9667q18wf";
};
nativeBuildInputs = [
diff --git a/pkgs/applications/office/tryton/default.nix b/pkgs/applications/office/tryton/default.nix
index 971f2f645f87..4867fec514b1 100644
--- a/pkgs/applications/office/tryton/default.nix
+++ b/pkgs/applications/office/tryton/default.nix
@@ -20,13 +20,13 @@ with stdenv.lib;
python3Packages.buildPythonApplication rec {
pname = "tryton";
- version = "5.4.0";
+ version = "5.4.1";
disabled = !python3Packages.isPy3k;
src = python3Packages.fetchPypi {
inherit pname version;
- sha256 = "0wbq8y8z0n6c5b3h5ynlawn3z79a3hkb1fkmblz4pwnj0jfnbswd";
+ sha256 = "0lk47qv944yc2b1ifhinp07af839r408w83rj8zzy8b43cwkpsxd";
};
nativeBuildInputs = [
diff --git a/pkgs/applications/science/logic/aspino/default.nix b/pkgs/applications/science/logic/aspino/default.nix
index 6af7eaf3a5b8..82458d7c5663 100644
--- a/pkgs/applications/science/logic/aspino/default.nix
+++ b/pkgs/applications/science/logic/aspino/default.nix
@@ -40,7 +40,7 @@ stdenv.mkDerivation {
meta = with stdenv.lib; {
description = "SAT/PseudoBoolean/MaxSat/ASP solver using glucose";
- maintainers = with maintainers; [ gebner ma27 ];
+ maintainers = with maintainers; [ gebner ];
platforms = platforms.unix;
license = licenses.asl20;
homepage = https://alviano.net/software/maxino/;
diff --git a/pkgs/applications/science/math/sage/sage-src.nix b/pkgs/applications/science/math/sage/sage-src.nix
index dc8ba48e45e8..4530cbf69f4c 100644
--- a/pkgs/applications/science/math/sage/sage-src.nix
+++ b/pkgs/applications/science/math/sage/sage-src.nix
@@ -118,6 +118,13 @@ stdenv.mkDerivation rec {
url = "https://git.sagemath.org/sage.git/patch?id=fcc11d6effa39f375bc5f4ea5831fb7a2f2767da";
sha256 = "0hnmc8ld3bblks0hcjvjjaydkgwdr1cs3dbl2ys4gfq964pjgqwc";
})
+
+ # https://trac.sagemath.org/ticket/28911
+ (fetchpatch {
+ name = "sympy-1.5.patch";
+ url = "https://git.sagemath.org/sage.git/patch/?h=c6d0308db15efd611211d26cfcbefbd180fc0831";
+ sha256 = "0nwai2jr22h49km4hx3kwafs3mzsc5kwsv7mqwjf6ibwfx2bbgyq";
+ })
];
patches = nixPatches ++ bugfixPatches ++ packageUpgradePatches;
diff --git a/pkgs/applications/science/misc/root/default.nix b/pkgs/applications/science/misc/root/default.nix
index 7a03369febeb..b901e40a194a 100644
--- a/pkgs/applications/science/misc/root/default.nix
+++ b/pkgs/applications/science/misc/root/default.nix
@@ -1,5 +1,6 @@
-{ stdenv, fetchurl, cmake, gl2ps, gsl, libX11, libXpm, libXft, libXext
-, libGLU, libGL, libxml2, lz4, lzma, pcre, pkgconfig, python, xxHash, zlib
+{ stdenv, fetchurl, makeWrapper, cmake, gl2ps, gsl, libX11, libXpm, libXft
+, libXext, libGLU, libGL, libxml2, lz4, lzma, pcre, pkgconfig, python, xxHash
+, zlib
, Cocoa, OpenGL, noSplash ? false }:
stdenv.mkDerivation rec {
@@ -11,7 +12,7 @@ stdenv.mkDerivation rec {
sha256 = "196ghma6g5a7sqz52wyjkgvmh4hj4vqwppm0zwdypy33hgy8anii";
};
- nativeBuildInputs = [ cmake pkgconfig ];
+ nativeBuildInputs = [ makeWrapper cmake pkgconfig ];
buildInputs = [ gl2ps pcre python zlib libxml2 lz4 lzma gsl xxHash ]
++ stdenv.lib.optionals (!stdenv.isDarwin) [ libX11 libXpm libXft libXext libGLU libGL ]
++ stdenv.lib.optionals (stdenv.isDarwin) [ Cocoa OpenGL ]
@@ -73,6 +74,13 @@ stdenv.mkDerivation rec {
enableParallelBuilding = true;
+ postInstall = ''
+ for prog in rootbrowse rootcp rooteventselector rootls rootmkdir rootmv rootprint rootrm rootslimtree; do
+ wrapProgram "$out/bin/$prog" \
+ --prefix PYTHONPATH : "$out/lib"
+ done
+ '';
+
setupHook = ./setup-hook.sh;
meta = with stdenv.lib; {
diff --git a/pkgs/applications/science/robotics/mavproxy/default.nix b/pkgs/applications/science/robotics/mavproxy/default.nix
index 890e824cf2ef..0348d0153099 100644
--- a/pkgs/applications/science/robotics/mavproxy/default.nix
+++ b/pkgs/applications/science/robotics/mavproxy/default.nix
@@ -3,11 +3,11 @@
buildPythonApplication rec {
pname = "MAVProxy";
- version = "1.8.17";
+ version = "1.8.18";
src = fetchPypi {
inherit pname version;
- sha256 = "193hjilsmbljbgj7v6icy3b4hzm14l0z6v05v7ycx6larij5xj2r";
+ sha256 = "1fi4m3591wws5cq43q8aljf91mzs6i9yhn9rimhpfrskbyf9knvm";
};
propagatedBuildInputs = [
diff --git a/pkgs/applications/version-management/git-and-tools/delta/default.nix b/pkgs/applications/version-management/git-and-tools/delta/default.nix
index 2551c980fa81..96c2c8622f86 100644
--- a/pkgs/applications/version-management/git-and-tools/delta/default.nix
+++ b/pkgs/applications/version-management/git-and-tools/delta/default.nix
@@ -18,6 +18,6 @@ rustPlatform.buildRustPackage rec {
description = "A syntax-highlighting pager for git";
changelog = "https://github.com/dandavison/delta/releases/tag/${version}";
license = licenses.mit;
- maintainers = [ maintainers.marsam ];
+ maintainers = with maintainers; [ marsam ma27 ];
};
}
diff --git a/pkgs/applications/version-management/mercurial/default.nix b/pkgs/applications/version-management/mercurial/default.nix
index ee0ab3756663..792e647324ae 100644
--- a/pkgs/applications/version-management/mercurial/default.nix
+++ b/pkgs/applications/version-management/mercurial/default.nix
@@ -1,21 +1,19 @@
-{ stdenv, fetchurl, python2Packages, makeWrapper, unzip
+{ stdenv, fetchurl, python3Packages, makeWrapper, unzip
, guiSupport ? false, tk ? null
, ApplicationServices
-, mercurialSrc ? fetchurl rec {
- meta.name = "mercurial-${meta.version}";
- meta.version = "4.9.1";
- url = "https://mercurial-scm.org/release/${meta.name}.tar.gz";
- sha256 = "0iybbkd9add066729zg01kwz5hhc1s6lhp9rrnsmzq6ihyxj3p8v";
- }
}:
let
- inherit (python2Packages) docutils hg-git dulwich python;
+ inherit (python3Packages) docutils dulwich python;
-in python2Packages.buildPythonApplication {
+in python3Packages.buildPythonApplication rec {
+ pname = "mercurial";
+ version = "5.2.1";
- inherit (mercurialSrc.meta) name version;
- src = mercurialSrc;
+ src = fetchurl {
+ url = "https://mercurial-scm.org/release/mercurial-${version}.tar.gz";
+ sha256 = "1pxkd37b0a1mi2zakk1hi122lgz1ffy2fxdnbs8acwlqpw55bc8q";
+ };
format = "other";
@@ -24,41 +22,39 @@ in python2Packages.buildPythonApplication {
buildInputs = [ makeWrapper docutils unzip ]
++ stdenv.lib.optionals stdenv.isDarwin [ ApplicationServices ];
- propagatedBuildInputs = [ hg-git dulwich ];
+ propagatedBuildInputs = [ dulwich ];
makeFlags = [ "PREFIX=$(out)" ];
- postInstall = (stdenv.lib.optionalString guiSupport
- ''
- mkdir -p $out/etc/mercurial
- cp contrib/hgk $out/bin
- cat >> $out/etc/mercurial/hgrc << EOF
- [extensions]
- hgk=$out/lib/${python.libPrefix}/site-packages/hgext/hgk.py
- EOF
- # setting HG so that hgk can be run itself as well (not only hg view)
- WRAP_TK=" --set TK_LIBRARY ${tk}/lib/${tk.libPrefix}
- --set HG $out/bin/hg
- --prefix PATH : ${tk}/bin "
- '') +
- ''
- for i in $(cd $out/bin && ls); do
- wrapProgram $out/bin/$i \
- $WRAP_TK
- done
+ postInstall = (stdenv.lib.optionalString guiSupport ''
+ mkdir -p $out/etc/mercurial
+ cp contrib/hgk $out/bin
+ cat >> $out/etc/mercurial/hgrc << EOF
+ [extensions]
+ hgk=$out/lib/${python.libPrefix}/site-packages/hgext/hgk.py
+ EOF
+ # setting HG so that hgk can be run itself as well (not only hg view)
+ WRAP_TK=" --set TK_LIBRARY ${tk}/lib/${tk.libPrefix}
+ --set HG $out/bin/hg
+ --prefix PATH : ${tk}/bin "
+ '') + ''
+ for i in $(cd $out/bin && ls); do
+ wrapProgram $out/bin/$i \
+ $WRAP_TK
+ done
- # copy hgweb.cgi to allow use in apache
- mkdir -p $out/share/cgi-bin
- cp -v hgweb.cgi contrib/hgweb.wsgi $out/share/cgi-bin
- chmod u+x $out/share/cgi-bin/hgweb.cgi
+ # copy hgweb.cgi to allow use in apache
+ mkdir -p $out/share/cgi-bin
+ cp -v hgweb.cgi contrib/hgweb.wsgi $out/share/cgi-bin
+ chmod u+x $out/share/cgi-bin/hgweb.cgi
- # install bash/zsh completions
- install -v -m644 -D contrib/bash_completion $out/share/bash-completion/completions/_hg
- install -v -m644 -D contrib/zsh_completion $out/share/zsh/site-functions/_hg
- '';
+ # install bash/zsh completions
+ install -v -m644 -D contrib/bash_completion $out/share/bash-completion/completions/_hg
+ install -v -m644 -D contrib/zsh_completion $out/share/zsh/site-functions/_hg
+ '';
meta = {
- inherit (mercurialSrc.meta) version;
+ inherit version;
description = "A fast, lightweight SCM system for very large distributed projects";
homepage = https://www.mercurial-scm.org;
downloadPage = https://www.mercurial-scm.org/release/;
diff --git a/pkgs/applications/version-management/tortoisehg/default.nix b/pkgs/applications/version-management/tortoisehg/default.nix
index 779c33627e8f..653db11ab5d3 100644
--- a/pkgs/applications/version-management/tortoisehg/default.nix
+++ b/pkgs/applications/version-management/tortoisehg/default.nix
@@ -1,43 +1,38 @@
-{ lib, fetchurl, python2Packages
-, mercurial
+{ lib, fetchurl, python3Packages
+, mercurial, qt5
}@args:
let
tortoisehgSrc = fetchurl rec {
meta.name = "tortoisehg-${meta.version}";
- meta.version = "5.0.2";
- url = "https://bitbucket.org/tortoisehg/targz/downloads/${meta.name}.tar.gz";
- sha256 = "1fkawx4ymaacah2wpv2w7rxmv1mx08mg4x4r4fxh41jz1njjb8sz";
+ meta.version = "5.2.1";
+ url = "https://bitbucket.org/tortoisehg/thg/get/14221e991a5b623e0072d3bd340b759dbe9072ca.tar.gz";
+ sha256 = "01rpzf5z99izcdda1ps9bhqvhw6qghagd8c1y7x19rv223zi05dv";
};
- mercurial =
- if args.mercurial.meta.version == tortoisehgSrc.meta.version
- then args.mercurial
- else args.mercurial.override {
- mercurialSrc = fetchurl rec {
- meta.name = "mercurial-${meta.version}";
- meta.version = tortoisehgSrc.meta.version;
- url = "https://mercurial-scm.org/release/${meta.name}.tar.gz";
- sha256 = "1y60hfc8gh4ha9sw650qs7hndqmvbn0qxpmqwpn4q18z5xwm1f19";
- };
- };
-
-in python2Packages.buildPythonApplication {
+ tortoiseMercurial = mercurial.overridePythonAttrs (old: rec {
+ inherit (tortoisehgSrc.meta) version;
+ src = fetchurl {
+ url = "https://mercurial-scm.org/release/mercurial-${version}.tar.gz";
+ sha256 = "1pxkd37b0a1mi2zakk1hi122lgz1ffy2fxdnbs8acwlqpw55bc8q";
+ };
+ });
+in python3Packages.buildPythonApplication {
inherit (tortoisehgSrc.meta) name version;
src = tortoisehgSrc;
- pythonPath = with python2Packages; [ pyqt4 mercurial qscintilla iniparse ];
-
- propagatedBuildInputs = with python2Packages; [ qscintilla iniparse ];
+ propagatedBuildInputs = with python3Packages; [
+ tortoiseMercurial qscintilla-qt5 iniparse
+ ];
+ nativeBuildInputs = [ qt5.wrapQtAppsHook ];
doCheck = false; # tests fail with "thg: cannot connect to X server"
- dontStrip = true;
- buildPhase = "";
- installPhase = ''
- ${python2Packages.python.executable} setup.py install --prefix=$out
+ postInstall = ''
mkdir -p $out/share/doc/tortoisehg
- cp COPYING.txt $out/share/doc/tortoisehg/Copying.txt.gz
- ln -s $out/bin/thg $out/bin/tortoisehg #convenient alias
+ cp COPYING.txt $out/share/doc/tortoisehg/Copying.txt
+ # convenient alias
+ ln -s $out/bin/thg $out/bin/tortoisehg
+ wrapQtApp $out/bin/thg
'';
checkPhase = ''
@@ -45,7 +40,7 @@ in python2Packages.buildPythonApplication {
$out/bin/thg version
'';
- passthru.mercurial = mercurial;
+ passthru.mercurial = tortoiseMercurial;
meta = {
description = "Qt based graphical tool for working with Mercurial";
diff --git a/pkgs/applications/version-management/yadm/default.nix b/pkgs/applications/version-management/yadm/default.nix
index 4995216b8b63..f3ddf8059b29 100644
--- a/pkgs/applications/version-management/yadm/default.nix
+++ b/pkgs/applications/version-management/yadm/default.nix
@@ -1,6 +1,6 @@
{ stdenv, fetchFromGitHub, git, gnupg }:
-let version = "2.0.1"; in
+let version = "2.3.0"; in
stdenv.mkDerivation {
pname = "yadm";
inherit version;
@@ -11,7 +11,7 @@ stdenv.mkDerivation {
owner = "TheLocehiliosan";
repo = "yadm";
rev = version;
- sha256 = "0knz2p0xyid65z6gdmjqfcqljqilxhqi02v4n6n4akl2i12kk193";
+ sha256 = "1by21dh48qbi33wlyyvdwz7ac1lxrblzcr5v7hlnc4cbcgvgs1a0";
};
dontConfigure = true;
diff --git a/pkgs/applications/video/minitube/default.nix b/pkgs/applications/video/minitube/default.nix
index f1f757d588fd..635779187a81 100644
--- a/pkgs/applications/video/minitube/default.nix
+++ b/pkgs/applications/video/minitube/default.nix
@@ -34,6 +34,6 @@ stdenv.mkDerivation rec {
homepage = https://flavio.tordini.org/minitube;
license = licenses.gpl3Plus;
platforms = platforms.linux;
- maintainers = with maintainers; [ ma27 ];
+ maintainers = with maintainers; [ ];
};
}
diff --git a/pkgs/applications/video/mpv/default.nix b/pkgs/applications/video/mpv/default.nix
index 91a9f4a7d010..c333790d6a67 100644
--- a/pkgs/applications/video/mpv/default.nix
+++ b/pkgs/applications/video/mpv/default.nix
@@ -52,7 +52,7 @@
, zimgSupport ? true, zimg ? null
, archiveSupport ? false, libarchive ? null
, jackaudioSupport ? false, libjack2 ? null
-, openalSupport ? true, openalSoft ? null
+, openalSupport ? true, openalSoft ? null
, vapoursynthSupport ? false, vapoursynth ? null
}:
@@ -105,13 +105,13 @@ let
in stdenv.mkDerivation rec {
pname = "mpv";
- version = "0.30.0";
+ version = "0.31.0";
src = fetchFromGitHub {
owner = "mpv-player";
repo = "mpv";
rev = "v${version}";
- sha256 = "17mxjgcfljlv6h0ik3332xsqbs0ybvk6dkwflyl0cjh15vl1iv6f";
+ sha256 = "138m09l4wi6ifbi15z76j578plmxkclhlzfryasfcdp8hswhs59r";
};
postPatch = ''
@@ -197,7 +197,6 @@ in stdenv.mkDerivation rec {
# Ensure youtube-dl is available in $PATH for mpv
wrapperFlags =
-
''--prefix PATH : "${luaEnv}/bin" \''
+ optionalString youtubeSupport ''
--prefix PATH : "${youtube-dl}/bin" \
@@ -235,7 +234,7 @@ in stdenv.mkDerivation rec {
description = "A media player that supports many video formats (MPlayer and mplayer2 fork)";
homepage = https://mpv.io;
license = licenses.gpl2Plus;
- maintainers = with maintainers; [ AndersonTorres fpletz globin ivan ];
+ maintainers = with maintainers; [ AndersonTorres fpletz globin ivan ma27 tadeokondrak ];
platforms = platforms.darwin ++ platforms.linux;
longDescription = ''
diff --git a/pkgs/applications/video/xine-ui/default.nix b/pkgs/applications/video/xine-ui/default.nix
index 4d3d88d5be8d..e92d73845911 100644
--- a/pkgs/applications/video/xine-ui/default.nix
+++ b/pkgs/applications/video/xine-ui/default.nix
@@ -2,11 +2,11 @@
, lirc, shared-mime-info, libjpeg }:
stdenv.mkDerivation rec {
- name = "xine-ui-0.99.10";
+ name = "xine-ui-0.99.12";
src = fetchurl {
url = "mirror://sourceforge/xine/${name}.tar.xz";
- sha256 = "0i3jzhiipfs5p1jbxviwh42zcfzag6iqc6yycaan0vrqm90an86a";
+ sha256 = "10zmmss3hm8gjjyra20qhdc0lb1m6sym2nb2w62bmfk8isfw9gsl";
};
nativeBuildInputs = [ pkgconfig shared-mime-info ];
diff --git a/pkgs/applications/virtualization/podman/default.nix b/pkgs/applications/virtualization/podman/default.nix
index 9d94ced0bf21..fe7640be1c80 100644
--- a/pkgs/applications/virtualization/podman/default.nix
+++ b/pkgs/applications/virtualization/podman/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, pkgconfig
+{ stdenv, fetchFromGitHub, pkgconfig, installShellFiles
, buildGoPackage, gpgme, lvm2, btrfs-progs, libseccomp, systemd
, go-md2man
}:
@@ -18,7 +18,7 @@ buildGoPackage rec {
outputs = [ "bin" "out" "man" ];
- nativeBuildInputs = [ pkgconfig go-md2man ];
+ nativeBuildInputs = [ pkgconfig go-md2man installShellFiles ];
buildInputs = [ btrfs-progs libseccomp gpgme lvm2 systemd ];
@@ -30,6 +30,8 @@ buildGoPackage rec {
installPhase = ''
install -Dm555 bin/podman $bin/bin/podman
+ installShellCompletion --bash completions/bash/podman
+ installShellCompletion --zsh completions/zsh/_podman
MANDIR=$man/share/man make install.man
'';
diff --git a/pkgs/applications/virtualization/remotebox/default.nix b/pkgs/applications/virtualization/remotebox/default.nix
index d8a2878e3f79..58710365b6ef 100644
--- a/pkgs/applications/virtualization/remotebox/default.nix
+++ b/pkgs/applications/virtualization/remotebox/default.nix
@@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
pname = "remotebox";
- version = "2.6";
+ version = "2.7";
src = fetchurl {
url = "http://remotebox.knobgoblin.org.uk/downloads/RemoteBox-${version}.tar.bz2";
- sha256 = "1bbdnf13vp35ddfmk4pn167vfxgmdw0fd8bqg51wd8dd4cj8y3wp";
+ sha256 = "0csf6gd7pqq4abia4z0zpzlq865ri1z0821kjy7p3iawqlfn75pb";
};
buildInputs = with perlPackages; [ perl Glib Gtk2 Pango SOAPLite ];
diff --git a/pkgs/applications/virtualization/x11docker/default.nix b/pkgs/applications/virtualization/x11docker/default.nix
index af136f7e545a..0d6b3632bc76 100644
--- a/pkgs/applications/virtualization/x11docker/default.nix
+++ b/pkgs/applications/virtualization/x11docker/default.nix
@@ -1,12 +1,12 @@
{ stdenv, fetchFromGitHub, makeWrapper, nx-libs, xorg, getopt, gnugrep, gawk, ps, mount, iproute }:
stdenv.mkDerivation rec {
pname = "x11docker";
- version = "6.4.0";
+ version = "6.5.0";
src = fetchFromGitHub {
owner = "mviereck";
repo = "x11docker";
rev = "v${version}";
- sha256 = "0s8gk2kqxkfwx1x44g19ckm7rqgrcax59y8brgmigajqizik7sql";
+ sha256 = "1lh45cxzpdwvhahlcayzqwq1q5hra25mszs13j0dswklcjvjqw8b";
};
nativeBuildInputs = [ makeWrapper ];
diff --git a/pkgs/applications/window-managers/awesome/default.nix b/pkgs/applications/window-managers/awesome/default.nix
index b8f31e5b512a..54244d4dc8d8 100644
--- a/pkgs/applications/window-managers/awesome/default.nix
+++ b/pkgs/applications/window-managers/awesome/default.nix
@@ -86,7 +86,7 @@ stdenv.mkDerivation rec {
description = "Highly configurable, dynamic window manager for X";
homepage = https://awesomewm.org/;
license = licenses.gpl2Plus;
- maintainers = with maintainers; [ lovek323 rasendubi ndowens ];
+ maintainers = with maintainers; [ lovek323 rasendubi ];
platforms = platforms.linux;
};
}
diff --git a/pkgs/applications/window-managers/i3/layout-manager.nix b/pkgs/applications/window-managers/i3/layout-manager.nix
index afa14b48451a..85d103e172aa 100644
--- a/pkgs/applications/window-managers/i3/layout-manager.nix
+++ b/pkgs/applications/window-managers/i3/layout-manager.nix
@@ -34,6 +34,6 @@ stdenv.mkDerivation rec {
description = "Saving, loading and managing layouts for i3wm.";
license = licenses.mit;
platforms = platforms.linux;
- maintainers = with maintainers; [ ma27 ];
+ maintainers = with maintainers; [ ];
};
}
diff --git a/pkgs/applications/window-managers/sway/default.nix b/pkgs/applications/window-managers/sway/default.nix
index 6b4c33dc0771..c9427fbf695c 100644
--- a/pkgs/applications/window-managers/sway/default.nix
+++ b/pkgs/applications/window-managers/sway/default.nix
@@ -44,6 +44,6 @@ stdenv.mkDerivation rec {
homepage = https://swaywm.org;
license = licenses.mit;
platforms = platforms.linux;
- maintainers = with maintainers; [ primeos synthetica ];
+ maintainers = with maintainers; [ primeos synthetica ma27 ];
};
}
diff --git a/pkgs/desktops/mate/caja/default.nix b/pkgs/desktops/mate/caja/default.nix
index 2b3aa73708a1..c460a2cf2dc0 100644
--- a/pkgs/desktops/mate/caja/default.nix
+++ b/pkgs/desktops/mate/caja/default.nix
@@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
pname = "caja";
- version = "1.22.2";
+ version = "1.22.3";
src = fetchurl {
url = "https://pub.mate-desktop.org/releases/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
- sha256 = "1c5yr4b8pzd7nz7g7ln9jwp4fx6qgq8vgbv4spfryy53il3gv75h";
+ sha256 = "1w2liq9h1kr5zyaaq82xz8pic04qi5sra8kaycfg1iddmknkfqn7";
};
nativeBuildInputs = [
diff --git a/pkgs/desktops/mate/mate-control-center/0001-Search-system-themes-in-system-data-dirs.patch b/pkgs/desktops/mate/mate-control-center/0001-Search-system-themes-in-system-data-dirs.patch
new file mode 100644
index 000000000000..fb2917b36bb5
--- /dev/null
+++ b/pkgs/desktops/mate/mate-control-center/0001-Search-system-themes-in-system-data-dirs.patch
@@ -0,0 +1,81 @@
+From 74fb65a2574c93a2b20a51875a5e336f727ff4bc Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Jos=C3=A9=20Romildo=20Malaquias?=
+Date: Wed, 25 Dec 2019 18:48:38 -0300
+Subject: [PATCH] Search system themes in system data dirs
+
+---
+ capplets/common/gtkrc-utils.c | 20 ++++++++++++--------
+ capplets/common/mate-theme-info.c | 18 +++++++++++-------
+ 2 files changed, 23 insertions(+), 15 deletions(-)
+
+diff --git a/capplets/common/gtkrc-utils.c b/capplets/common/gtkrc-utils.c
+index 011c8a1..27e01da 100644
+--- a/capplets/common/gtkrc-utils.c
++++ b/capplets/common/gtkrc-utils.c
+@@ -60,15 +60,19 @@ gchar* gtkrc_find_named(const gchar* name)
+
+ if (!path)
+ {
+- gchar* theme_dir = gtk_rc_get_theme_dir();
+- path = g_build_filename(theme_dir, name, subpath, NULL);
+- g_free(theme_dir);
++ const gchar * const * dirs = g_get_system_data_dirs();
+
+- if (!g_file_test(path, G_FILE_TEST_EXISTS))
+- {
+- g_free (path);
+- path = NULL;
+- }
++ if (dirs != NULL)
++ for (; !path && *dirs != NULL; ++dirs)
++ {
++ path = g_build_filename(*dirs, "themes", name, subpath, NULL);
++
++ if (!g_file_test(path, G_FILE_TEST_EXISTS))
++ {
++ g_free (path);
++ path = NULL;
++ }
++ }
+ }
+
+ return path;
+diff --git a/capplets/common/mate-theme-info.c b/capplets/common/mate-theme-info.c
+index 54ae3ae..a738f0b 100644
+--- a/capplets/common/mate-theme-info.c
++++ b/capplets/common/mate-theme-info.c
+@@ -1763,6 +1763,7 @@ mate_theme_color_scheme_equal (const gchar *s1, const gchar *s2)
+ void
+ mate_theme_init ()
+ {
++ const gchar * const * dirs;
+ GFile *top_theme_dir;
+ gchar *top_theme_dir_string;
+ static gboolean initted = FALSE;
+@@ -1783,13 +1784,16 @@ mate_theme_init ()
+ theme_hash_by_uri = g_hash_table_new_full (g_str_hash, g_str_equal, g_free, NULL);
+ theme_hash_by_name = g_hash_table_new_full (g_str_hash, g_str_equal, g_free, NULL);
+
+- /* Add all the toplevel theme dirs. */
+- /* $datadir/themes */
+- top_theme_dir_string = gtk_rc_get_theme_dir ();
+- top_theme_dir = g_file_new_for_path (top_theme_dir_string);
+- g_free (top_theme_dir_string);
+- add_top_theme_dir_monitor (top_theme_dir, 1, NULL);
+- g_object_unref (top_theme_dir);
++ /* Add all the toplevel theme dirs following the XDG Base Directory Specification */
++ dirs = g_get_system_data_dirs ();
++ if (dirs != NULL)
++ for (; *dirs != NULL; ++dirs) {
++ top_theme_dir_string = g_build_filename (*dirs, "themes", NULL);
++ top_theme_dir = g_file_new_for_path (top_theme_dir_string);
++ g_free (top_theme_dir_string);
++ add_top_theme_dir_monitor (top_theme_dir, 1, NULL);
++ g_object_unref (top_theme_dir);
++ }
+
+ /* ~/.themes */
+ top_theme_dir_string = g_build_filename (g_get_home_dir (), ".themes", NULL);
+--
+2.24.1
+
diff --git a/pkgs/desktops/mate/mate-control-center/default.nix b/pkgs/desktops/mate/mate-control-center/default.nix
index d5c39a67d208..2451c403c82d 100644
--- a/pkgs/desktops/mate/mate-control-center/default.nix
+++ b/pkgs/desktops/mate/mate-control-center/default.nix
@@ -38,6 +38,8 @@ stdenv.mkDerivation rec {
];
patches = [
+ # see https://github.com/mate-desktop/mate-control-center/pull/528
+ ./0001-Search-system-themes-in-system-data-dirs.patch
# look up keyboard shortcuts in system data dirs
./mate-control-center.keybindings-dir.patch
];
diff --git a/pkgs/development/compilers/cudatoolkit/default.nix b/pkgs/development/compilers/cudatoolkit/default.nix
index 9c983a38e4e1..6531316fa12b 100644
--- a/pkgs/development/compilers/cudatoolkit/default.nix
+++ b/pkgs/development/compilers/cudatoolkit/default.nix
@@ -129,5 +129,13 @@ in rec {
gcc = gcc7;
};
- cudatoolkit_10 = cudatoolkit_10_1;
+ cudatoolkit_10_2 = common {
+ version = "10.2.89";
+ url = "http://developer.download.nvidia.com/compute/cuda/10.2/Prod/local_installers/cuda_10.2.89_440.33.01_linux.run";
+ sha256 = "04fasl9sjkb1jvchvqgaqxprnprcz7a8r52249zp2ijarzyhf3an";
+
+ gcc = gcc7;
+ };
+
+ cudatoolkit_10 = cudatoolkit_10_2;
}
diff --git a/pkgs/development/compilers/ghc/8.10.1.nix b/pkgs/development/compilers/ghc/8.10.1.nix
new file mode 100644
index 000000000000..25226d4d0e6b
--- /dev/null
+++ b/pkgs/development/compilers/ghc/8.10.1.nix
@@ -0,0 +1,232 @@
+{ stdenv, pkgsBuildTarget, targetPackages
+
+# build-tools
+, bootPkgs
+, autoconf, automake, coreutils, fetchurl, perl, python3, m4, sphinx
+, bash
+
+, libiconv ? null, ncurses
+
+, # GHC can be built with system libffi or a bundled one.
+ libffi ? null
+
+, useLLVM ? !stdenv.targetPlatform.isx86
+, # LLVM is conceptually a run-time-only depedendency, but for
+ # non-x86, we need LLVM to bootstrap later stages, so it becomes a
+ # build-time dependency too.
+ buildLlvmPackages, llvmPackages
+
+, # If enabled, GHC will be built with the GPL-free but slower integer-simple
+ # library instead of the faster but GPLed integer-gmp library.
+ enableIntegerSimple ? !(stdenv.lib.any (stdenv.lib.meta.platformMatch stdenv.hostPlatform) gmp.meta.platforms), gmp
+
+, # If enabled, use -fPIC when compiling static libs.
+ enableRelocatedStaticLibs ? stdenv.targetPlatform != stdenv.hostPlatform
+
+, # Whether to build dynamic libs for the standard library (on the target
+ # platform). Static libs are always built.
+ enableShared ? !stdenv.targetPlatform.isWindows && !stdenv.targetPlatform.useiOSPrebuilt
+
+, # Whetherto build terminfo.
+ enableTerminfo ? !stdenv.targetPlatform.isWindows
+
+, # What flavour to build. An empty string indicates no
+ # specific flavour and falls back to ghc default values.
+ ghcFlavour ? stdenv.lib.optionalString (stdenv.targetPlatform != stdenv.hostPlatform)
+ (if useLLVM then "perf-cross" else "perf-cross-ncg")
+
+, # Whether to disable the large address space allocator
+ # necessary fix for iOS: https://www.reddit.com/r/haskell/comments/4ttdz1/building_an_osxi386_to_iosarm64_cross_compiler/d5qvd67/
+ disableLargeAddressSpace ? stdenv.targetPlatform.isDarwin && stdenv.targetPlatform.isAarch64
+}:
+
+assert !enableIntegerSimple -> gmp != null;
+
+let
+ inherit (stdenv) buildPlatform hostPlatform targetPlatform;
+
+ inherit (bootPkgs) ghc;
+
+ # TODO(@Ericson2314) Make unconditional
+ targetPrefix = stdenv.lib.optionalString
+ (targetPlatform != hostPlatform)
+ "${targetPlatform.config}-";
+
+ buildMK = ''
+ BuildFlavour = ${ghcFlavour}
+ ifneq \"\$(BuildFlavour)\" \"\"
+ include mk/flavours/\$(BuildFlavour).mk
+ endif
+ DYNAMIC_GHC_PROGRAMS = ${if enableShared then "YES" else "NO"}
+ INTEGER_LIBRARY = ${if enableIntegerSimple then "integer-simple" else "integer-gmp"}
+ '' + stdenv.lib.optionalString (targetPlatform != hostPlatform) ''
+ Stage1Only = ${if targetPlatform.system == hostPlatform.system then "NO" else "YES"}
+ CrossCompilePrefix = ${targetPrefix}
+ HADDOCK_DOCS = NO
+ BUILD_SPHINX_HTML = NO
+ BUILD_SPHINX_PDF = NO
+ '' + stdenv.lib.optionalString enableRelocatedStaticLibs ''
+ GhcLibHcOpts += -fPIC
+ GhcRtsHcOpts += -fPIC
+ '' + stdenv.lib.optionalString targetPlatform.useAndroidPrebuilt ''
+ EXTRA_CC_OPTS += -std=gnu99
+ '';
+
+ # Splicer will pull out correct variations
+ libDeps = platform: stdenv.lib.optional enableTerminfo [ ncurses ]
+ ++ [libffi]
+ ++ stdenv.lib.optional (!enableIntegerSimple) gmp
+ ++ stdenv.lib.optional (platform.libc != "glibc" && !targetPlatform.isWindows) libiconv;
+
+ toolsForTarget = [
+ pkgsBuildTarget.targetPackages.stdenv.cc
+ ] ++ stdenv.lib.optional useLLVM buildLlvmPackages.llvm;
+
+ targetCC = builtins.head toolsForTarget;
+
+in
+stdenv.mkDerivation (rec {
+ version = "8.10.0.20191210";
+ name = "${targetPrefix}ghc-${version}";
+
+ src = fetchurl {
+ url = "https://downloads.haskell.org/ghc/8.10.1-alpha2/ghc-${version}-src.tar.xz";
+ sha256 = "1mmv8s9cs41kp7wh1qqnzin5wv32cvs3lmzgda7njz0ssqb0mmvj";
+ };
+
+ enableParallelBuilding = true;
+
+ outputs = [ "out" "doc" ];
+
+ postPatch = "patchShebangs .";
+
+ # GHC is a bit confused on its cross terminology.
+ preConfigure = ''
+ for env in $(env | grep '^TARGET_' | sed -E 's|\+?=.*||'); do
+ export "''${env#TARGET_}=''${!env}"
+ done
+ # GHC is a bit confused on its cross terminology, as these would normally be
+ # the *host* tools.
+ export CC="${targetCC}/bin/${targetCC.targetPrefix}cc"
+ export CXX="${targetCC}/bin/${targetCC.targetPrefix}cxx"
+ # Use gold to work around https://sourceware.org/bugzilla/show_bug.cgi?id=16177
+ export LD="${targetCC.bintools}/bin/${targetCC.bintools.targetPrefix}ld${stdenv.lib.optionalString (targetPlatform.isLinux && !(targetPlatform.useLLVM or false)) ".gold"}"
+ export AS="${targetCC.bintools.bintools}/bin/${targetCC.bintools.targetPrefix}as"
+ export AR="${targetCC.bintools.bintools}/bin/${targetCC.bintools.targetPrefix}ar"
+ export NM="${targetCC.bintools.bintools}/bin/${targetCC.bintools.targetPrefix}nm"
+ export RANLIB="${targetCC.bintools.bintools}/bin/${targetCC.bintools.targetPrefix}ranlib"
+ export READELF="${targetCC.bintools.bintools}/bin/${targetCC.bintools.targetPrefix}readelf"
+ export STRIP="${targetCC.bintools.bintools}/bin/${targetCC.bintools.targetPrefix}strip"
+
+ echo -n "${buildMK}" > mk/build.mk
+ sed -i -e 's|-isysroot /Developer/SDKs/MacOSX10.5.sdk||' configure
+ '' + stdenv.lib.optionalString (!stdenv.isDarwin) ''
+ export NIX_LDFLAGS+=" -rpath $out/lib/ghc-${version}"
+ '' + stdenv.lib.optionalString stdenv.isDarwin ''
+ export NIX_LDFLAGS+=" -no_dtrace_dof"
+ '' + stdenv.lib.optionalString targetPlatform.useAndroidPrebuilt ''
+ sed -i -e '5i ,("armv7a-unknown-linux-androideabi", ("e-m:e-p:32:32-i64:64-v128:64:128-a:0:32-n32-S64", "cortex-a8", ""))' llvm-targets
+ '' + stdenv.lib.optionalString targetPlatform.isMusl ''
+ echo "patching llvm-targets for musl targets..."
+ echo "Cloning these existing '*-linux-gnu*' targets:"
+ grep linux-gnu llvm-targets | sed 's/^/ /'
+ echo "(go go gadget sed)"
+ sed -i 's,\(^.*linux-\)gnu\(.*\)$,\0\n\1musl\2,' llvm-targets
+ echo "llvm-targets now contains these '*-linux-musl*' targets:"
+ grep linux-musl llvm-targets | sed 's/^/ /'
+
+ echo "And now patching to preserve '-musleabi' as done with '-gnueabi'"
+ # (aclocal.m4 is actual source, but patch configure as well since we don't re-gen)
+ for x in configure aclocal.m4; do
+ substituteInPlace $x \
+ --replace '*-android*|*-gnueabi*)' \
+ '*-android*|*-gnueabi*|*-musleabi*)'
+ done
+ '';
+
+ # TODO(@Ericson2314): Always pass "--target" and always prefix.
+ configurePlatforms = [ "build" "host" ]
+ ++ stdenv.lib.optional (targetPlatform != hostPlatform) "target";
+ # `--with` flags for libraries needed for RTS linker
+ configureFlags = [
+ "--datadir=$doc/share/doc/ghc"
+ "--with-curses-includes=${ncurses.dev}/include" "--with-curses-libraries=${ncurses.out}/lib"
+ ] ++ stdenv.lib.optionals (libffi != null) ["--with-system-libffi" "--with-ffi-includes=${targetPackages.libffi.dev}/include" "--with-ffi-libraries=${targetPackages.libffi.out}/lib"
+ ] ++ stdenv.lib.optional (targetPlatform == hostPlatform && !enableIntegerSimple) [
+ "--with-gmp-includes=${targetPackages.gmp.dev}/include" "--with-gmp-libraries=${targetPackages.gmp.out}/lib"
+ ] ++ stdenv.lib.optional (targetPlatform == hostPlatform && hostPlatform.libc != "glibc" && !targetPlatform.isWindows) [
+ "--with-iconv-includes=${libiconv}/include" "--with-iconv-libraries=${libiconv}/lib"
+ ] ++ stdenv.lib.optionals (targetPlatform != hostPlatform) [
+ "--enable-bootstrap-with-devel-snapshot"
+ ] ++ stdenv.lib.optionals (targetPlatform.isAarch32) [
+ "CFLAGS=-fuse-ld=gold"
+ "CONF_GCC_LINKER_OPTS_STAGE1=-fuse-ld=gold"
+ "CONF_GCC_LINKER_OPTS_STAGE2=-fuse-ld=gold"
+ ] ++ stdenv.lib.optionals (disableLargeAddressSpace) [
+ "--disable-large-address-space"
+ ];
+
+ # Make sure we never relax`$PATH` and hooks support for compatability.
+ strictDeps = true;
+
+ # Don’t add -liconv to LDFLAGS automatically so that GHC will add it itself.
+ dontAddExtraLibs = true;
+
+ nativeBuildInputs = [
+ perl autoconf automake m4 python3 sphinx
+ ghc bootPkgs.alex bootPkgs.happy bootPkgs.hscolour
+ ];
+
+ # For building runtime libs
+ depsBuildTarget = toolsForTarget;
+
+ buildInputs = [ perl bash ] ++ (libDeps hostPlatform);
+
+ propagatedBuildInputs = [ targetPackages.stdenv.cc ]
+ ++ stdenv.lib.optional useLLVM llvmPackages.llvm;
+
+ depsTargetTarget = map stdenv.lib.getDev (libDeps targetPlatform);
+ depsTargetTargetPropagated = map (stdenv.lib.getOutput "out") (libDeps targetPlatform);
+
+ # required, because otherwise all symbols from HSffi.o are stripped, and
+ # that in turn causes GHCi to abort
+ stripDebugFlags = [ "-S" ] ++ stdenv.lib.optional (!targetPlatform.isDarwin) "--keep-file-symbols";
+
+ checkTarget = "test";
+
+ hardeningDisable = [ "format" ] ++ stdenv.lib.optional stdenv.targetPlatform.isMusl "pie";
+
+ postInstall = ''
+ # Install the bash completion file.
+ install -D -m 444 utils/completion/ghc.bash $out/share/bash-completion/completions/${targetPrefix}ghc
+
+ # Patch scripts to include "readelf" and "cat" in $PATH.
+ for i in "$out/bin/"*; do
+ test ! -h $i || continue
+ egrep --quiet '^#!' <(head -n 1 $i) || continue
+ sed -i -e '2i export PATH="$PATH:${stdenv.lib.makeBinPath [ targetPackages.stdenv.cc.bintools coreutils ]}"' $i
+ done
+ '';
+
+ passthru = {
+ inherit bootPkgs targetPrefix;
+
+ inherit llvmPackages;
+ inherit enableShared;
+
+ # Our Cabal compiler name
+ haskellCompilerName = "ghc-${version}";
+ };
+
+ meta = {
+ homepage = http://haskell.org/ghc;
+ description = "The Glasgow Haskell Compiler";
+ maintainers = with stdenv.lib.maintainers; [ marcweber andres peti ];
+ inherit (ghc.meta) license platforms;
+ };
+
+} // stdenv.lib.optionalAttrs targetPlatform.useAndroidPrebuilt {
+ dontStrip = true;
+ dontPatchELF = true;
+ noAuditTmpdir = true;
+})
diff --git a/pkgs/development/compilers/ghc/8.8.2.nix b/pkgs/development/compilers/ghc/8.8.2.nix
new file mode 100644
index 000000000000..4ed99a8402aa
--- /dev/null
+++ b/pkgs/development/compilers/ghc/8.8.2.nix
@@ -0,0 +1,232 @@
+{ stdenv, pkgsBuildTarget, targetPackages
+
+# build-tools
+, bootPkgs
+, autoconf, automake, coreutils, fetchurl, perl, python3, m4, sphinx
+, bash
+
+, libiconv ? null, ncurses
+
+, # GHC can be built with system libffi or a bundled one.
+ libffi ? null
+
+, useLLVM ? !stdenv.targetPlatform.isx86
+, # LLVM is conceptually a run-time-only depedendency, but for
+ # non-x86, we need LLVM to bootstrap later stages, so it becomes a
+ # build-time dependency too.
+ buildLlvmPackages, llvmPackages
+
+, # If enabled, GHC will be built with the GPL-free but slower integer-simple
+ # library instead of the faster but GPLed integer-gmp library.
+ enableIntegerSimple ? !(stdenv.lib.any (stdenv.lib.meta.platformMatch stdenv.hostPlatform) gmp.meta.platforms), gmp
+
+, # If enabled, use -fPIC when compiling static libs.
+ enableRelocatedStaticLibs ? stdenv.targetPlatform != stdenv.hostPlatform
+
+, # Whether to build dynamic libs for the standard library (on the target
+ # platform). Static libs are always built.
+ enableShared ? !stdenv.targetPlatform.isWindows && !stdenv.targetPlatform.useiOSPrebuilt
+
+, # Whetherto build terminfo.
+ enableTerminfo ? !stdenv.targetPlatform.isWindows
+
+, # What flavour to build. An empty string indicates no
+ # specific flavour and falls back to ghc default values.
+ ghcFlavour ? stdenv.lib.optionalString (stdenv.targetPlatform != stdenv.hostPlatform)
+ (if useLLVM then "perf-cross" else "perf-cross-ncg")
+
+, # Whether to disable the large address space allocator
+ # necessary fix for iOS: https://www.reddit.com/r/haskell/comments/4ttdz1/building_an_osxi386_to_iosarm64_cross_compiler/d5qvd67/
+ disableLargeAddressSpace ? stdenv.targetPlatform.isDarwin && stdenv.targetPlatform.isAarch64
+}:
+
+assert !enableIntegerSimple -> gmp != null;
+
+let
+ inherit (stdenv) buildPlatform hostPlatform targetPlatform;
+
+ inherit (bootPkgs) ghc;
+
+ # TODO(@Ericson2314) Make unconditional
+ targetPrefix = stdenv.lib.optionalString
+ (targetPlatform != hostPlatform)
+ "${targetPlatform.config}-";
+
+ buildMK = ''
+ BuildFlavour = ${ghcFlavour}
+ ifneq \"\$(BuildFlavour)\" \"\"
+ include mk/flavours/\$(BuildFlavour).mk
+ endif
+ DYNAMIC_GHC_PROGRAMS = ${if enableShared then "YES" else "NO"}
+ INTEGER_LIBRARY = ${if enableIntegerSimple then "integer-simple" else "integer-gmp"}
+ '' + stdenv.lib.optionalString (targetPlatform != hostPlatform) ''
+ Stage1Only = ${if targetPlatform.system == hostPlatform.system then "NO" else "YES"}
+ CrossCompilePrefix = ${targetPrefix}
+ HADDOCK_DOCS = NO
+ BUILD_SPHINX_HTML = NO
+ BUILD_SPHINX_PDF = NO
+ '' + stdenv.lib.optionalString enableRelocatedStaticLibs ''
+ GhcLibHcOpts += -fPIC
+ GhcRtsHcOpts += -fPIC
+ '' + stdenv.lib.optionalString targetPlatform.useAndroidPrebuilt ''
+ EXTRA_CC_OPTS += -std=gnu99
+ '';
+
+ # Splicer will pull out correct variations
+ libDeps = platform: stdenv.lib.optional enableTerminfo [ ncurses ]
+ ++ [libffi]
+ ++ stdenv.lib.optional (!enableIntegerSimple) gmp
+ ++ stdenv.lib.optional (platform.libc != "glibc" && !targetPlatform.isWindows) libiconv;
+
+ toolsForTarget = [
+ pkgsBuildTarget.targetPackages.stdenv.cc
+ ] ++ stdenv.lib.optional useLLVM buildLlvmPackages.llvm;
+
+ targetCC = builtins.head toolsForTarget;
+
+in
+stdenv.mkDerivation (rec {
+ version = "8.8.1.20191211";
+ name = "${targetPrefix}ghc-${version}";
+
+ src = fetchurl {
+ url = "https://downloads.haskell.org/ghc/8.8.2-rc1/ghc-${version}-src.tar.xz";
+ sha256 = "1gl4fzakjbhd94v1saxmr9sfzgk22m1b95jq51rxm93b2g4cixl4";
+ };
+
+ enableParallelBuilding = true;
+
+ outputs = [ "out" "doc" ];
+
+ postPatch = "patchShebangs .";
+
+ # GHC is a bit confused on its cross terminology.
+ preConfigure = ''
+ for env in $(env | grep '^TARGET_' | sed -E 's|\+?=.*||'); do
+ export "''${env#TARGET_}=''${!env}"
+ done
+ # GHC is a bit confused on its cross terminology, as these would normally be
+ # the *host* tools.
+ export CC="${targetCC}/bin/${targetCC.targetPrefix}cc"
+ export CXX="${targetCC}/bin/${targetCC.targetPrefix}cxx"
+ # Use gold to work around https://sourceware.org/bugzilla/show_bug.cgi?id=16177
+ export LD="${targetCC.bintools}/bin/${targetCC.bintools.targetPrefix}ld${stdenv.lib.optionalString (targetPlatform.isLinux && !(targetPlatform.useLLVM or false)) ".gold"}"
+ export AS="${targetCC.bintools.bintools}/bin/${targetCC.bintools.targetPrefix}as"
+ export AR="${targetCC.bintools.bintools}/bin/${targetCC.bintools.targetPrefix}ar"
+ export NM="${targetCC.bintools.bintools}/bin/${targetCC.bintools.targetPrefix}nm"
+ export RANLIB="${targetCC.bintools.bintools}/bin/${targetCC.bintools.targetPrefix}ranlib"
+ export READELF="${targetCC.bintools.bintools}/bin/${targetCC.bintools.targetPrefix}readelf"
+ export STRIP="${targetCC.bintools.bintools}/bin/${targetCC.bintools.targetPrefix}strip"
+
+ echo -n "${buildMK}" > mk/build.mk
+ sed -i -e 's|-isysroot /Developer/SDKs/MacOSX10.5.sdk||' configure
+ '' + stdenv.lib.optionalString (!stdenv.isDarwin) ''
+ export NIX_LDFLAGS+=" -rpath $out/lib/ghc-${version}"
+ '' + stdenv.lib.optionalString stdenv.isDarwin ''
+ export NIX_LDFLAGS+=" -no_dtrace_dof"
+ '' + stdenv.lib.optionalString targetPlatform.useAndroidPrebuilt ''
+ sed -i -e '5i ,("armv7a-unknown-linux-androideabi", ("e-m:e-p:32:32-i64:64-v128:64:128-a:0:32-n32-S64", "cortex-a8", ""))' llvm-targets
+ '' + stdenv.lib.optionalString targetPlatform.isMusl ''
+ echo "patching llvm-targets for musl targets..."
+ echo "Cloning these existing '*-linux-gnu*' targets:"
+ grep linux-gnu llvm-targets | sed 's/^/ /'
+ echo "(go go gadget sed)"
+ sed -i 's,\(^.*linux-\)gnu\(.*\)$,\0\n\1musl\2,' llvm-targets
+ echo "llvm-targets now contains these '*-linux-musl*' targets:"
+ grep linux-musl llvm-targets | sed 's/^/ /'
+
+ echo "And now patching to preserve '-musleabi' as done with '-gnueabi'"
+ # (aclocal.m4 is actual source, but patch configure as well since we don't re-gen)
+ for x in configure aclocal.m4; do
+ substituteInPlace $x \
+ --replace '*-android*|*-gnueabi*)' \
+ '*-android*|*-gnueabi*|*-musleabi*)'
+ done
+ '';
+
+ # TODO(@Ericson2314): Always pass "--target" and always prefix.
+ configurePlatforms = [ "build" "host" ]
+ ++ stdenv.lib.optional (targetPlatform != hostPlatform) "target";
+ # `--with` flags for libraries needed for RTS linker
+ configureFlags = [
+ "--datadir=$doc/share/doc/ghc"
+ "--with-curses-includes=${ncurses.dev}/include" "--with-curses-libraries=${ncurses.out}/lib"
+ ] ++ stdenv.lib.optionals (libffi != null) ["--with-system-libffi" "--with-ffi-includes=${targetPackages.libffi.dev}/include" "--with-ffi-libraries=${targetPackages.libffi.out}/lib"
+ ] ++ stdenv.lib.optional (targetPlatform == hostPlatform && !enableIntegerSimple) [
+ "--with-gmp-includes=${targetPackages.gmp.dev}/include" "--with-gmp-libraries=${targetPackages.gmp.out}/lib"
+ ] ++ stdenv.lib.optional (targetPlatform == hostPlatform && hostPlatform.libc != "glibc" && !targetPlatform.isWindows) [
+ "--with-iconv-includes=${libiconv}/include" "--with-iconv-libraries=${libiconv}/lib"
+ ] ++ stdenv.lib.optionals (targetPlatform != hostPlatform) [
+ "--enable-bootstrap-with-devel-snapshot"
+ ] ++ stdenv.lib.optionals (targetPlatform.isAarch32) [
+ "CFLAGS=-fuse-ld=gold"
+ "CONF_GCC_LINKER_OPTS_STAGE1=-fuse-ld=gold"
+ "CONF_GCC_LINKER_OPTS_STAGE2=-fuse-ld=gold"
+ ] ++ stdenv.lib.optionals (disableLargeAddressSpace) [
+ "--disable-large-address-space"
+ ];
+
+ # Make sure we never relax`$PATH` and hooks support for compatability.
+ strictDeps = true;
+
+ # Don’t add -liconv to LDFLAGS automatically so that GHC will add it itself.
+ dontAddExtraLibs = true;
+
+ nativeBuildInputs = [
+ perl autoconf automake m4 python3 sphinx
+ ghc bootPkgs.alex bootPkgs.happy bootPkgs.hscolour
+ ];
+
+ # For building runtime libs
+ depsBuildTarget = toolsForTarget;
+
+ buildInputs = [ perl bash ] ++ (libDeps hostPlatform);
+
+ propagatedBuildInputs = [ targetPackages.stdenv.cc ]
+ ++ stdenv.lib.optional useLLVM llvmPackages.llvm;
+
+ depsTargetTarget = map stdenv.lib.getDev (libDeps targetPlatform);
+ depsTargetTargetPropagated = map (stdenv.lib.getOutput "out") (libDeps targetPlatform);
+
+ # required, because otherwise all symbols from HSffi.o are stripped, and
+ # that in turn causes GHCi to abort
+ stripDebugFlags = [ "-S" ] ++ stdenv.lib.optional (!targetPlatform.isDarwin) "--keep-file-symbols";
+
+ checkTarget = "test";
+
+ hardeningDisable = [ "format" ] ++ stdenv.lib.optional stdenv.targetPlatform.isMusl "pie";
+
+ postInstall = ''
+ # Install the bash completion file.
+ install -D -m 444 utils/completion/ghc.bash $out/share/bash-completion/completions/${targetPrefix}ghc
+
+ # Patch scripts to include "readelf" and "cat" in $PATH.
+ for i in "$out/bin/"*; do
+ test ! -h $i || continue
+ egrep --quiet '^#!' <(head -n 1 $i) || continue
+ sed -i -e '2i export PATH="$PATH:${stdenv.lib.makeBinPath [ targetPackages.stdenv.cc.bintools coreutils ]}"' $i
+ done
+ '';
+
+ passthru = {
+ inherit bootPkgs targetPrefix;
+
+ inherit llvmPackages;
+ inherit enableShared;
+
+ # Our Cabal compiler name
+ haskellCompilerName = "ghc-${version}";
+ };
+
+ meta = {
+ homepage = http://haskell.org/ghc;
+ description = "The Glasgow Haskell Compiler";
+ maintainers = with stdenv.lib.maintainers; [ marcweber andres peti ];
+ inherit (ghc.meta) license platforms;
+ };
+
+} // stdenv.lib.optionalAttrs targetPlatform.useAndroidPrebuilt {
+ dontStrip = true;
+ dontPatchELF = true;
+ noAuditTmpdir = true;
+})
diff --git a/pkgs/development/compilers/ponyc/default.nix b/pkgs/development/compilers/ponyc/default.nix
index 33a3a1216dd2..c21bcfb2ecc8 100644
--- a/pkgs/development/compilers/ponyc/default.nix
+++ b/pkgs/development/compilers/ponyc/default.nix
@@ -3,13 +3,13 @@
stdenv.mkDerivation ( rec {
pname = "ponyc";
- version = "0.33.0";
+ version = "0.33.1";
src = fetchFromGitHub {
owner = "ponylang";
repo = pname;
rev = version;
- sha256 = "0a0sw902nrayg0s1zrkhfpvrmdqw19nif67hsv0ijrckcq37bjcz";
+ sha256 = "0wqbnvxdzzwr9q4v9ha9r9jjymr6y8ba1rb2lkzrng4g9p6xqbxy";
};
buildInputs = [ llvm makeWrapper which libxml2 ];
diff --git a/pkgs/development/go-modules/generic/default.nix b/pkgs/development/go-modules/generic/default.nix
index b3c583da51e4..1bffb71e8f9d 100644
--- a/pkgs/development/go-modules/generic/default.nix
+++ b/pkgs/development/go-modules/generic/default.nix
@@ -14,6 +14,10 @@
, modRoot ? "./"
# modSha256 is the sha256 of the vendored dependencies
+#
+# CAUTION: if `null` is used as a value, the derivation won't be a
+# fixed-output derivation but disable the build sandbox instead. Don't use
+# this in nixpkgs as Hydra won't build those packages.
, modSha256
# We want parallel builds by default
@@ -84,10 +88,16 @@ let
'';
dontFixup = true;
- outputHashMode = "recursive";
- outputHashAlgo = "sha256";
- outputHash = modSha256;
- }; in modArgs // overrideModAttrs modArgs);
+ }; in modArgs // (
+ if modSha256 == null then
+ { __noChroot = true; }
+ else
+ {
+ outputHashMode = "recursive";
+ outputHashAlgo = "sha256";
+ outputHash = modSha256;
+ }
+ ) // overrideModAttrs modArgs);
package = go.stdenv.mkDerivation (args // {
nativeBuildInputs = [ removeReferencesTo go ] ++ nativeBuildInputs;
diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix
index 90030c0c8d1a..52cc2f1e9434 100644
--- a/pkgs/development/haskell-modules/configuration-common.nix
+++ b/pkgs/development/haskell-modules/configuration-common.nix
@@ -74,7 +74,7 @@ self: super: {
name = "git-annex-${super.git-annex.version}-src";
url = "git://git-annex.branchable.com/";
rev = "refs/tags/" + super.git-annex.version;
- sha256 = "04l1yrjq7n4nlzkmkg73xp6p7vpw1iq53mrmyb8162wqb7zapg4f";
+ sha256 = "1i4arhwbc05iz8hl7kk843m2f49i3ysby1kxcm9qfhpk7z9nyzj4";
};
}).override {
dbus = if pkgs.stdenv.isLinux then self.dbus else null;
@@ -643,7 +643,7 @@ self: super: {
# ideal, but Chris doesn't seem to make official releases any more.
structured-haskell-mode = overrideCabal super.structured-haskell-mode (drv: {
src = pkgs.fetchFromGitHub {
- owner = "chrisdone";
+ owner = "projectional-haskell";
repo = "structured-haskell-mode";
rev = "7f9df73f45d107017c18ce4835bbc190dfe6782e";
sha256 = "1jcc30048j369jgsbbmkb63whs4wb37bq21jrm3r6ry22izndsqa";
@@ -659,15 +659,6 @@ self: super: {
ln -s $lispdir $data/share/emacs/site-lisp
'';
});
- descriptive = overrideSrc super.descriptive {
- version = "20180514-git";
- src = pkgs.fetchFromGitHub {
- owner = "chrisdone";
- repo = "descriptive";
- rev = "c088960113b2add758553e41cbe439d183b750cd";
- sha256 = "17p65ihcvm1ghq23ww6phh8gdj7hwxlypjvh9jabsxvfbp2s8mrk";
- };
- };
# Make elisp files available at a location where people expect it.
hindent = (overrideCabal super.hindent (drv: {
@@ -1057,7 +1048,30 @@ self: super: {
generateOptparseApplicativeCompletion "dhall" (
dontCheck super.dhall
);
- dhall_1_28_0 = dontCheck super.dhall_1_28_0;
+ # https://github.com/dhall-lang/dhall-haskell/commit/dedd5e0ea6fd12f87d887af3d2220eebc61ee8af
+ # This raises the lower bound on prettyprinter to 1.5.1 since
+ # `removeTrailingWhitespace` is buggy in earlier versions.
+ # This will probably be able to be removed when we update to LTS-15.
+ dhall_1_28_0 =
+ dontCheck (super.dhall_1_28_0.override {
+ prettyprinter = self.prettyprinter_1_5_1;
+ prettyprinter-ansi-terminal =
+ self.prettyprinter-ansi-terminal.override {
+ prettyprinter = self.prettyprinter_1_5_1;
+ };
+ });
+ dhall-bash_1_0_25 = super.dhall-bash_1_0_25.override { dhall = self.dhall_1_28_0; };
+ dhall-json_1_6_0 = super.dhall-json_1_6_0.override {
+ dhall = self.dhall_1_28_0;
+ prettyprinter = self.prettyprinter_1_5_1;
+ prettyprinter-ansi-terminal =
+ self.prettyprinter-ansi-terminal.override {
+ prettyprinter = self.prettyprinter_1_5_1;
+ };
+ };
+
+ # Tests for dhall access the network.
+ dhall_1_27_0 = dontCheck super.dhall_1_27_0;
# Missing test files in source distribution, fixed once 1.4.0 is bumped
# https://github.com/dhall-lang/dhall-haskell/pull/997
@@ -1322,9 +1336,29 @@ self: super: {
# needs newer version of the systemd package
spacecookie = super.spacecookie.override { systemd = self.systemd_2_2_0; };
- # ghcide needs the latest versions of haskell-lsp.
- ghcide = super.ghcide.override { haskell-lsp = self.haskell-lsp_0_18_0_0; lsp-test = self.lsp-test_0_8_2_0; };
- haskell-lsp_0_18_0_0 = super.haskell-lsp_0_18_0_0.override { haskell-lsp-types = self.haskell-lsp-types_0_18_0_0; };
- lsp-test_0_8_2_0 = (dontCheck super.lsp-test_0_8_2_0).override { haskell-lsp = self.haskell-lsp_0_18_0_0; };
+ # 2019-12-19 - glirc wants regex-tdfa >=1.3 which results in errors with regex-base which errors more
+ # hoping to make a proper derivation with plugins enabled and more reliable building -- kiwi
+ glirc = doJailbreak super.glirc;
+
+ # apply patches from https://github.com/snapframework/snap-server/pull/126
+ # manually until they are accepted upstream
+ snap-server = overrideCabal super.snap-server (drv: {
+ patches = [(pkgs.fetchpatch {
+ # allow compilation with network >= 3
+ url = https://github.com/snapframework/snap-server/pull/126/commits/4338fe15d68e11e3c7fd0f9862f818864adc1d45.patch;
+ sha256 = "1nlw9lckm3flzkmhkzwc7zxhdh9ns33w8p8ds8nf574nqr5cr8bv";
+ })
+ (pkgs.fetchpatch {
+ # prefer fdSocket over unsafeFdSocket
+ url = https://github.com/snapframework/snap-server/pull/126/commits/410de2df123b1d56b3093720e9c6a1ad79fe9de6.patch;
+ sha256 = "08psvw0xny64q4bw1nwg01pkzh01ak542lw6k1ps7cdcwaxk0n94";
+ })];
+ });
+
+ # https://github.com/haskell-servant/servant-blaze/issues/17
+ servant-blaze = doJailbreak super.servant-blaze;
+
+ # https://github.com/haskell-servant/servant-ekg/issues/15
+ servant-ekg = doJailbreak super.servant-ekg;
} // import ./configuration-tensorflow.nix {inherit pkgs haskellLib;} self super
diff --git a/pkgs/development/haskell-modules/configuration-ghc-8.10.x.nix b/pkgs/development/haskell-modules/configuration-ghc-8.10.x.nix
new file mode 100644
index 000000000000..e2164f8686f2
--- /dev/null
+++ b/pkgs/development/haskell-modules/configuration-ghc-8.10.x.nix
@@ -0,0 +1,44 @@
+{ pkgs, haskellLib }:
+
+with haskellLib;
+
+self: super: {
+
+ # This compiler version needs llvm 9.x.
+ llvmPackages = pkgs.llvmPackages_9;
+
+ # Disable GHC 8.10.x core libraries.
+ array = null;
+ base = null;
+ binary = null;
+ bytestring = null;
+ Cabal = null;
+ containers = null;
+ deepseq = null;
+ directory = null;
+ filepath = null;
+ ghc-boot = null;
+ ghc-boot-th = null;
+ ghc-compact = null;
+ ghc-heap = null;
+ ghc-prim = null;
+ ghci = null;
+ haskeline = null;
+ hpc = null;
+ integer-gmp = null;
+ libiserv = null;
+ mtl = null;
+ parsec = null;
+ pretty = null;
+ process = null;
+ rts = null;
+ stm = null;
+ template-haskell = null;
+ terminfo = null;
+ text = null;
+ time = null;
+ transformers = null;
+ unix = null;
+ xhtml = null;
+
+}
diff --git a/pkgs/development/haskell-modules/configuration-ghc-8.8.x.nix b/pkgs/development/haskell-modules/configuration-ghc-8.8.x.nix
index b785c5314797..02f2f67462dc 100644
--- a/pkgs/development/haskell-modules/configuration-ghc-8.8.x.nix
+++ b/pkgs/development/haskell-modules/configuration-ghc-8.8.x.nix
@@ -91,7 +91,7 @@ self: super: {
microlens-th = self.microlens-th_0_4_3_2;
network = self.network_3_1_1_1;
optparse-applicative = self.optparse-applicative_0_15_1_0;
- pandoc = self.pandoc_2_9;
+ pandoc = self.pandoc_2_9_1;
pandoc-types = self.pandoc-types_1_20;
prettyprinter = self.prettyprinter_1_5_1;
primitive = dontCheck super.primitive_0_7_0_0; # evaluating the test suite gives an infinite recursion
diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml
index 0645db14eb0b..ef6eada4c2d6 100644
--- a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml
+++ b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml
@@ -43,7 +43,7 @@ core-packages:
- ghcjs-base-0
default-package-overrides:
- # LTS Haskell 14.17
+ # LTS Haskell 14.18
- abstract-deque ==0.3
- abstract-deque-tests ==0.3
- abstract-par ==0.3.3
@@ -73,7 +73,7 @@ default-package-overrides:
- alarmclock ==0.7.0.2
- alerts ==0.1.2.0
- alex ==3.2.5
- - alg ==0.2.12.0
+ - alg ==0.2.13.0
- algebraic-graphs ==0.4
- Allure ==0.9.5.0
- almost-fix ==0.0.2
@@ -202,7 +202,7 @@ default-package-overrides:
- bitcoin-types ==0.9.2
- bits ==0.5.2
- bitset-word8 ==0.1.1.1
- - bits-extra ==0.0.1.4
+ - bits-extra ==0.0.1.5
- bitvec ==1.0.2.0
- bitx-bitcoin ==0.12.0.0
- blake2 ==0.3.0
@@ -235,7 +235,7 @@ default-package-overrides:
- bower-json ==1.0.0.1
- boxes ==0.1.5
- brick ==0.47.1
- - brittany ==0.12.1.0
+ - brittany ==0.12.1.1
- bsb-http-chunked ==0.0.0.4
- bson ==0.3.2.8
- bson-lens ==0.1.1
@@ -266,8 +266,8 @@ default-package-overrides:
- cabal2spec ==2.2.2.1
- cabal-doctest ==1.0.8
- cabal-file-th ==0.2.6
- - cabal-rpm ==1.0.1
- - cache ==0.1.2.0
+ - cabal-rpm ==1.0.2
+ - cache ==0.1.3.0
- cacophony ==0.10.1
- calendar-recycling ==0.0.0.1
- call-stack ==0.1.0
@@ -371,7 +371,7 @@ default-package-overrides:
- concurrent-split ==0.0.1.1
- concurrent-supply ==0.1.8
- cond ==0.4.1.1
- - conduit ==1.3.1.1
+ - conduit ==1.3.1.2
- conduit-algorithms ==0.0.11.0
- conduit-combinators ==1.3.0
- conduit-concurrent-map ==0.1.1
@@ -523,9 +523,9 @@ default-package-overrides:
- diagrams-core ==1.4.2
- diagrams-lib ==1.4.3
- diagrams-postscript ==1.4.1
- - diagrams-rasterific ==1.4.1.1
+ - diagrams-rasterific ==1.4.2
- diagrams-solve ==0.1.1
- - diagrams-svg ==1.4.2
+ - diagrams-svg ==1.4.3
- di-core ==1.0.4
- dictionary-sharing ==0.1.0.0
- Diff ==0.3.4
@@ -595,7 +595,6 @@ default-package-overrides:
- elm-bridge ==0.5.2
- elm-core-sources ==1.0.0
- elm-export ==0.6.0.1
- - elm-street ==0.0.1
- emacs-module ==0.1.1
- email-validate ==2.3.2.12
- emd ==0.1.5.1
@@ -662,7 +661,7 @@ default-package-overrides:
- fgl ==5.7.0.1
- fib ==0.1
- filecache ==0.4.1
- - file-embed ==0.0.11
+ - file-embed ==0.0.11.1
- file-embed-lzma ==0
- filelock ==0.1.1.4
- filemanip ==0.3.6.3
@@ -670,8 +669,8 @@ default-package-overrides:
- filepattern ==0.1.1
- fileplow ==0.1.0.0
- filter-logger ==0.6.0.0
- - filtrable ==0.1.2.0
- - fin ==0.1
+ - filtrable ==0.1.3.0
+ - fin ==0.1.1
- FindBin ==0.0.5
- fingertree ==0.1.4.2
- finite-typelits ==0.1.4.2
@@ -718,7 +717,7 @@ default-package-overrides:
- free-vl ==0.1.4
- friendly-time ==0.4.1
- frisby ==0.2.2
- - from-sum ==0.2.1.0
+ - from-sum ==0.2.2.0
- frontmatter ==0.1.0.2
- fsnotify ==0.3.0.1
- fsnotify-conduit ==0.1.1.1
@@ -854,7 +853,7 @@ default-package-overrides:
- HandsomeSoup ==0.4.2
- hapistrano ==0.3.10.0
- happy ==1.19.12
- - hasbolt ==0.1.3.6
+ - hasbolt ==0.1.4.0
- hashable ==1.2.7.0
- hashable-time ==0.2.0.2
- hashids ==1.0.2.4
@@ -895,7 +894,7 @@ default-package-overrides:
- hedgehog ==1.0.1
- hedgehog-corpus ==0.1.0
- hedgehog-fn ==1.0
- - hedis ==0.12.10
+ - hedis ==0.12.11
- hedn ==0.2.0.1
- here ==1.2.13
- heredoc ==0.2.0.0
@@ -1005,7 +1004,7 @@ default-package-overrides:
- html-entities ==1.1.4.3
- html-entity-map ==0.1.0.0
- htoml ==1.0.0.3
- - http2 ==1.6.5
+ - http2 ==2.0.3
- HTTP ==4000.3.14
- http-api-data ==0.4.1.1
- http-client ==0.6.4
@@ -1376,7 +1375,8 @@ default-package-overrides:
- mono-traversable ==1.0.13.0
- mono-traversable-instances ==0.1.0.0
- mono-traversable-keys ==0.1.0
- - more-containers ==0.2.1.2
+ - more-containers ==0.2.2.0
+ - morpheus-graphql ==0.8.0
- mountpoints ==1.0.2
- mpi-hs ==0.5.3.0
- msgpack ==1.0.1.0
@@ -1387,12 +1387,12 @@ default-package-overrides:
- multiarg ==0.30.0.10
- multimap ==1.2.1
- multipart ==0.1.3
- - multiset ==0.3.4.1
+ - multiset ==0.3.4.3
- multistate ==0.8.0.2
- murmur3 ==1.0.3
- murmur-hash ==0.1.0.9
- MusicBrainz ==0.4.1
- - mustache ==2.3.0
+ - mustache ==2.3.1
- mutable-containers ==0.3.4
- mwc-probability ==2.1.0
- mwc-probability-transition ==0.4
@@ -1558,7 +1558,7 @@ default-package-overrides:
- persistable-record ==0.6.0.4
- persistable-types-HDBC-pg ==0.0.3.5
- persistent ==2.9.2
- - persistent-iproute ==0.2.3
+ - persistent-iproute ==0.2.4
- persistent-mysql ==2.9.0
- persistent-mysql-haskell ==0.5.2
- persistent-pagination ==0.1.1.0
@@ -1681,10 +1681,11 @@ default-package-overrides:
- pure-zlib ==0.6.6
- pushbullet-types ==0.4.1.0
- pusher-http-haskell ==1.5.1.11
+ - PyF ==0.8.1.2
- qchas ==1.1.0.1
- qm-interpolated-string ==0.3.0.0
- qnap-decrypt ==0.3.5
- - qrcode-core ==0.9.1
+ - qrcode-core ==0.9.2
- qrcode-juicypixels ==0.8.0
- quadratic-irrational ==0.1.0
- QuasiText ==0.1.2.6
@@ -1858,7 +1859,6 @@ default-package-overrides:
- serialise ==0.2.1.0
- servant ==0.16.2
- servant-auth ==0.3.2.0
- - servant-auth-client ==0.4.0.0
- servant-auth-docs ==0.2.10.0
- servant-auth-server ==0.4.4.0
- servant-auth-swagger ==0.2.10.0
@@ -1923,7 +1923,7 @@ default-package-overrides:
- silently ==1.2.5.1
- simple ==0.11.3
- simple-cabal ==0.1.1
- - simple-cmd ==0.2.0.1
+ - simple-cmd ==0.2.1
- simple-cmd-args ==0.1.4
- simple-log ==0.9.12
- simple-reflect ==0.3.3
@@ -1986,7 +1986,7 @@ default-package-overrides:
- StateVar ==1.2
- static-text ==0.2.0.4
- statistics ==0.15.1.1
- - stb-image-redux ==0.2.1.2
+ - stb-image-redux ==0.2.1.3
- step-function ==0.2
- stm-chans ==3.0.0.4
- stm-conduit ==4.0.1
@@ -2148,6 +2148,7 @@ default-package-overrides:
- th-test-utils ==1.0.1
- th-utilities ==0.2.3.1
- thyme ==0.3.5.5
+ - tidal ==1.4.5
- tile ==0.3.0.0
- time-compat ==1.9.2.2
- timeit ==2.0
@@ -2278,7 +2279,7 @@ default-package-overrides:
- users-test ==0.5.0.1
- utf8-light ==0.4.2
- utf8-string ==1.0.1.1
- - util ==0.1.14.1
+ - util ==0.1.15.0
- utility-ht ==0.0.14
- uuid ==1.3.13
- uuid-types ==1.0.3
@@ -2341,8 +2342,8 @@ default-package-overrides:
- wai-slack-middleware ==0.2.0
- wai-transformers ==0.1.0
- wai-websockets ==3.0.1.2
- - warp ==3.2.28
- - warp-tls ==3.2.8
+ - warp ==3.3.5
+ - warp-tls ==3.2.9
- warp-tls-uid ==0.2.0.6
- wave ==0.2.0
- wcwidth ==0.0.2
@@ -2367,7 +2368,6 @@ default-package-overrides:
- windns ==0.1.0.1
- winery ==1.1.3
- wire-streams ==0.1.1.0
- - witherable ==0.3.4
- with-location ==0.1.0
- witness ==0.4
- wizards ==1.0.3
@@ -2489,6 +2489,7 @@ extra-packages:
- control-monad-free < 0.6 # newer versions don't compile with anything but GHC 7.8.x
- dbus <1 # for xmonad-0.26
- deepseq == 1.3.0.1 # required to build Cabal with GHC 6.12.3
+ - dhall == 1.27.0 # required for spago 0.13.0. Probably can be removed when next version of spago is available.
- generic-deriving == 1.10.5.* # new versions don't compile with GHC 7.10.x
- gloss < 1.9.3 # new versions don't compile with GHC 7.8.x
- haddock == 2.22.* # required on GHC 8.0.x
@@ -2575,6 +2576,8 @@ package-maintainers:
- elm-export-persistent
- pipes-mongodb
- streaming-wai
+ kiwi:
+ - glirc
psibi:
- path-pieces
- persistent
@@ -5080,7 +5083,6 @@ broken-packages:
- gli
- glicko
- glider-nlp
- - glirc
- GLMatrix
- glob-posix
- global
@@ -6438,6 +6440,7 @@ broken-packages:
- ip2proxy
- ipatch
- ipc
+ - ipfs
- ipld-cid
- ipopt-hs
- ipprint
@@ -6530,6 +6533,7 @@ broken-packages:
- jmonkey
- jni
- jobqueue
+ - jobs-ui
- join
- join-api
- joinlist
@@ -7247,6 +7251,8 @@ broken-packages:
- mmsyn2
- mmsyn4
- mmsyn6ukr
+ - mmsyn7h
+ - mmsyn7ukr
- mmtf
- mmtl
- mmtl-base
@@ -8063,7 +8069,6 @@ broken-packages:
- postgresql-simple-queue
- postgresql-simple-sop
- postgresql-simple-typed
- - postgresql-simple-url
- postgresql-typed
- postgresql-typed-lifted
- postgrest
@@ -9199,7 +9204,6 @@ broken-packages:
- stack-run-auto
- stack-type
- stack-wrapper
- - stack2cabal
- stack2nix
- stackage
- stackage-build-plan
diff --git a/pkgs/development/haskell-modules/configuration-nix.nix b/pkgs/development/haskell-modules/configuration-nix.nix
index 472e4c66fc73..6886a35c0a80 100644
--- a/pkgs/development/haskell-modules/configuration-nix.nix
+++ b/pkgs/development/haskell-modules/configuration-nix.nix
@@ -592,12 +592,19 @@ self: super: builtins.intersectAttrs super {
'';
});
- # On Darwin, git-annex mis-detects options to `cp`, so we wrap the binary to
- # ensure it uses Nixpkgs' coreutils.
git-annex = with pkgs;
if (!stdenv.isLinux) then
let path = stdenv.lib.makeBinPath [ coreutils ];
in overrideCabal (addBuildTool super.git-annex makeWrapper) (_drv: {
+ # This is an instance of https://github.com/NixOS/nix/pull/1085
+ # Fails with:
+ # gpg: can't connect to the agent: File name too long
+ postPatch = stdenv.lib.optionalString stdenv.isDarwin ''
+ substituteInPlace Test.hs \
+ --replace ', testCase "crypto" test_crypto' ""
+ '';
+ # On Darwin, git-annex mis-detects options to `cp`, so we wrap the
+ # binary to ensure it uses Nixpkgs' coreutils.
postFixup = ''
wrapProgram $out/bin/git-annex \
--prefix PATH : "${path}"
@@ -644,8 +651,8 @@ self: super: builtins.intersectAttrs super {
# we can safely jailbreak spago and use the older directory package from
# LTS-14.
spagoWithOverrides = doJailbreak (super.spago.override {
- # spago requires the latest version of dhall.
- directory = self.dhall_1_28_0;
+ # spago requires dhall_1_27_0.
+ dhall = self.dhall_1_27_0;
});
docsSearchAppJsFile = pkgs.fetchurl {
@@ -683,13 +690,9 @@ self: super: builtins.intersectAttrs super {
'';
});
- # Haddock generation is broken for spago.
- # https://github.com/spacchetti/spago/issues/511
- spagoWithoutHaddocks = dontHaddock spagoFixHpack;
-
# Because of the problem above with pulling in hspec defaults to the
# package.yaml file, the tests are disabled.
- spagoWithoutChecks = dontCheck spagoWithoutHaddocks;
+ spagoWithoutChecks = dontCheck spagoFixHpack;
in
spagoWithoutChecks;
}
diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix
index 0ec409dc8ed7..ea742c3e2594 100644
--- a/pkgs/development/haskell-modules/hackage-packages.nix
+++ b/pkgs/development/haskell-modules/hackage-packages.nix
@@ -1611,8 +1611,8 @@ self: {
}:
mkDerivation {
pname = "BiobaseEnsembl";
- version = "0.1.0.0";
- sha256 = "1knbi8azq5n8kdgmbx4f2d14x6z94vj540ickq4dcspmbvslr0kf";
+ version = "0.2.0.0";
+ sha256 = "0nfgadp5708rb3yzsq0cgiqkpv0rnh3fqil118zlw8akq61rd1m3";
libraryHaskellDepends = [
aeson attoparsec base binary bytestring cereal containers deepseq
directory either-unwrap text vector word8
@@ -12488,6 +12488,8 @@ self: {
pname = "ListLike";
version = "4.6.3";
sha256 = "10vn7gslx4zzjq547cwpzdfb4c5w3nsfis6qr03dr9c4fdzj61lx";
+ revision = "1";
+ editedCabalFile = "1xi5mlk6jm73fdxsjcp41ffr3ygwwykcjf20c122k7hgpkzg1lms";
libraryHaskellDepends = [
array base bytestring containers deepseq dlist fmlist text
utf8-string vector
@@ -13186,10 +13188,8 @@ self: {
}:
mkDerivation {
pname = "MiniAgda";
- version = "0.2019.3.29";
- sha256 = "1lix2p2ly6pjag1gkqfjfdm1jnq5rd9hqgr940jbkgyna75hk9a9";
- revision = "1";
- editedCabalFile = "1hiz5g69n1fwknwq7lhq01kzn4cm53zd6l62r747pdc30xm04rqr";
+ version = "0.2019.12.13";
+ sha256 = "15v5yijhylrwy0lc4n9a8p75dadr9xc57xajgir3jg618l0wh5lc";
isLibrary = false;
isExecutable = true;
enableSeparateDataOutput = true;
@@ -14075,7 +14075,7 @@ self: {
license = stdenv.lib.licenses.bsd3;
hydraPlatforms = stdenv.lib.platforms.none;
broken = true;
- }) {inherit (pkgs) net_snmp;};
+ }) {net_snmp = null;};
"Network-NineP" = callPackage
({ mkDerivation, async, base, binary, bytestring, containers
@@ -17571,6 +17571,8 @@ self: {
pname = "SciBaseTypes";
version = "0.1.0.0";
sha256 = "1c0cgzxhamgswn1zhrarbx5vrmzl160nk8dadzi6mphwd2rv6lfr";
+ revision = "1";
+ editedCabalFile = "025v2s4097mzqyf5bzzz2xnxcc4nckcvaz72pnrxs3d8bbszd26i";
libraryHaskellDepends = [
aeson base binary cereal deepseq hashable lens log-domain mtl
semirings vector vector-th-unbox
@@ -18589,17 +18591,16 @@ self: {
}) {};
"StockholmAlignment" = callPackage
- ({ mkDerivation, base, colour, diagrams-cairo, diagrams-lib
- , directory, either-unwrap, filepath, parsec, ParsecTools, SVGFonts
- , text, vector
+ ({ mkDerivation, base, directory, either-unwrap, filepath, parsec
+ , ParsecTools, text, vector
}:
mkDerivation {
pname = "StockholmAlignment";
- version = "1.2.0";
- sha256 = "0zz437d771cb4zpjzcddjl8xvz9qxmj1pyxql70lqczvqrk6k78y";
+ version = "1.3.0";
+ sha256 = "1wc23pmcw246na7zwd6ka6v00kxn754pr3b069y7zn8l0lxby45p";
libraryHaskellDepends = [
- base colour diagrams-cairo diagrams-lib directory either-unwrap
- filepath parsec ParsecTools SVGFonts text vector
+ base directory either-unwrap filepath parsec ParsecTools text
+ vector
];
description = "Libary for Stockholm aligmnent format";
license = stdenv.lib.licenses.gpl3;
@@ -19092,14 +19093,14 @@ self: {
"Taxonomy" = callPackage
({ mkDerivation, aeson, base, bytestring, either-unwrap, fgl
- , graphviz, parsec, text, vector
+ , parsec, text, vector
}:
mkDerivation {
pname = "Taxonomy";
- version = "2.0.0";
- sha256 = "1b2x0lkg5pgjk1jyanbi8g9rs1sr7llihyjhdfsg6fajklrzh3m9";
+ version = "2.1.0";
+ sha256 = "1l64ma631q1gh57gwg09mpxz66hkhqbc9f9dn2bhy681p8ia7j50";
libraryHaskellDepends = [
- aeson base bytestring either-unwrap fgl graphviz parsec text vector
+ aeson base bytestring either-unwrap fgl parsec text vector
];
description = "Libary for parsing, processing and vizualization of taxonomy data";
license = stdenv.lib.licenses.gpl3;
@@ -23561,16 +23562,17 @@ self: {
"aeson-gadt-th" = callPackage
({ mkDerivation, aeson, aeson-qq, base, containers, dependent-map
, dependent-sum, dependent-sum-template, hspec, HUnit
- , template-haskell, transformers
+ , template-haskell, th-abstraction, th-extras, transformers
}:
mkDerivation {
pname = "aeson-gadt-th";
- version = "0.2.1.2";
- sha256 = "1azms3ilfkqvyxxm2zjr55wali8vxx294lv924wn4ni5rqxhmjcq";
+ version = "0.2.2";
+ sha256 = "1nk0897569cldp7fhzc51mj8f93dx3nwk0fxy2pr41wmrbqrxw1k";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [
- aeson base containers dependent-sum template-haskell transformers
+ aeson base containers dependent-sum template-haskell th-abstraction
+ th-extras transformers
];
executableHaskellDepends = [
aeson base dependent-map dependent-sum dependent-sum-template
@@ -24864,8 +24866,21 @@ self: {
({ mkDerivation, base, dual, util }:
mkDerivation {
pname = "alg";
- version = "0.2.12.0";
- sha256 = "0dglxav21z60jsjh6s14v466bg0z3m3wqx1c78kxk9cziz27dm3s";
+ version = "0.2.13.0";
+ sha256 = "1xv9nr21jvgk94d0cdc3xlp0fs7v3h4gcrx45aaqm6d2203lshz0";
+ libraryHaskellDepends = [ base dual util ];
+ description = "Algebraic structures";
+ license = stdenv.lib.licenses.bsd3;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ broken = true;
+ }) {};
+
+ "alg_0_2_13_1" = callPackage
+ ({ mkDerivation, base, dual, util }:
+ mkDerivation {
+ pname = "alg";
+ version = "0.2.13.1";
+ sha256 = "0764j2njb86qdskck3nvbrh61v99hqdhf8aj9irblm6smdlrv4l3";
libraryHaskellDepends = [ base dual util ];
description = "Algebraic structures";
license = stdenv.lib.licenses.bsd3;
@@ -28142,6 +28157,34 @@ self: {
license = stdenv.lib.licenses.bsd3;
}) {};
+ "amqp_0_19_0" = callPackage
+ ({ mkDerivation, base, binary, bytestring, clock, connection
+ , containers, data-binary-ieee754, hspec, hspec-expectations
+ , monad-control, network, network-uri, split, stm, text, vector
+ , xml
+ }:
+ mkDerivation {
+ pname = "amqp";
+ version = "0.19.0";
+ sha256 = "1v2jwf9y6mw9f89a9ca66p42da8g5n1ain89gjr7sv6v6r2jxinj";
+ isLibrary = true;
+ isExecutable = true;
+ libraryHaskellDepends = [
+ base binary bytestring clock connection containers
+ data-binary-ieee754 monad-control network network-uri split stm
+ text vector
+ ];
+ executableHaskellDepends = [ base containers xml ];
+ testHaskellDepends = [
+ base binary bytestring clock connection containers
+ data-binary-ieee754 hspec hspec-expectations network network-uri
+ split stm text vector
+ ];
+ description = "Client library for AMQP servers (currently only RabbitMQ)";
+ license = stdenv.lib.licenses.bsd3;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ }) {};
+
"amqp-conduit" = callPackage
({ mkDerivation, amqp, base, bytestring, conduit, exceptions, hspec
, HUnit, lifted-base, monad-control, mtl, resourcet, text
@@ -28166,18 +28209,19 @@ self: {
"amqp-utils" = callPackage
({ mkDerivation, amqp, base, bytestring, connection, containers
- , data-default-class, hinotify, magic, network, process, text, time
- , tls, unix, x509-system
+ , data-default-class, directory, hinotify, magic, network, process
+ , text, time, tls, unix, utf8-string, x509-system
}:
mkDerivation {
pname = "amqp-utils";
- version = "0.4.1.0";
- sha256 = "1p0pvl88xp9m0b9k7nqxln3702kp4lk05f60mag3swa09rvzcg47";
+ version = "0.4.2.0";
+ sha256 = "1fycix8q5mbx975jwv659d0ag4h6yk7a6saxn4jy1xi8z8qsvdjr";
isLibrary = false;
isExecutable = true;
executableHaskellDepends = [
amqp base bytestring connection containers data-default-class
- hinotify magic network process text time tls unix x509-system
+ directory hinotify magic network process text time tls unix
+ utf8-string x509-system
];
description = "Generic Haskell AMQP tools";
license = stdenv.lib.licenses.gpl3;
@@ -28215,8 +28259,8 @@ self: {
({ mkDerivation, base, deepseq, parsec }:
mkDerivation {
pname = "amrun";
- version = "0.0.0.5";
- sha256 = "1y0azhsjarv26lkny1wckdz45bs87wbga29hbg6w59wc2gjkbxqz";
+ version = "0.0.0.6";
+ sha256 = "01hnjzlww282hjlc6vbn51qps577hx4ll3pz4g5kn0r4h2bylad9";
isLibrary = false;
isExecutable = true;
executableHaskellDepends = [ base deepseq parsec ];
@@ -29352,8 +29396,8 @@ self: {
}:
mkDerivation {
pname = "aosd";
- version = "0.2.1";
- sha256 = "0zma3ypjnqn8c9pk4zfyzzwn27l3wb6l6xnjjydn90fxsmpa1vh6";
+ version = "0.2.2";
+ sha256 = "1lx3afjniaj1dinik8mnqy8aam8ads55k7sr4hjmcqx85xwl4ssx";
libraryHaskellDepends = [
base bindings-DSL cairo colour monad-control pango transformers X11
];
@@ -30766,8 +30810,8 @@ self: {
}:
mkDerivation {
pname = "archive-sig";
- version = "0.2.0.2";
- sha256 = "0pfznlkw0vj8y1ahsmiy904hkhkf76qgqlp6h3hlgzrmhdy5yz9d";
+ version = "0.2.1.2";
+ sha256 = "03fwzl7pkb025adzv1jzh96k0h91b1w7arxza7q53i492n96qg8i";
libraryHaskellDepends = [
base bytestring composition-prelude dir-traverse
];
@@ -31094,20 +31138,19 @@ self: {
}) {};
"arith-encode" = callPackage
- ({ mkDerivation, arithmoi, array, base, binary, Cabal, containers
- , fgl, hashable, HUnit-Plus, unordered-containers
+ ({ mkDerivation, arithmoi, array, base, binary, containers
+ , hashable, HUnit-Plus, integer-logarithms, unordered-containers
}:
mkDerivation {
pname = "arith-encode";
- version = "1.0.0";
- sha256 = "1wqm2jcc2dac31gvad6pmnq0wbajpj488h93xl93vfipsbak0cm8";
+ version = "1.0.1";
+ sha256 = "0dpfhn2xwjjf318f431s8xgnr827ayjak8s8cs6672la8rqgfpb5";
libraryHaskellDepends = [
- arithmoi array base binary Cabal containers fgl hashable
+ arithmoi array base binary containers hashable integer-logarithms
unordered-containers
];
testHaskellDepends = [
- arithmoi array base binary Cabal containers fgl hashable HUnit-Plus
- unordered-containers
+ base binary containers hashable HUnit-Plus unordered-containers
];
description = "A practical arithmetic encoding (aka Godel numbering) library";
license = stdenv.lib.licenses.bsd3;
@@ -31722,6 +31765,21 @@ self: {
broken = true;
}) {};
+ "ascii-holidays" = callPackage
+ ({ mkDerivation, base, random, random-shuffle, terminfo, time }:
+ mkDerivation {
+ pname = "ascii-holidays";
+ version = "0.1.0.1";
+ sha256 = "10ply90c2dwfgfz419q9nklm26w2xlxkz6ynqn9qfl7p9j6rhix0";
+ isLibrary = false;
+ isExecutable = true;
+ executableHaskellDepends = [
+ base random random-shuffle terminfo time
+ ];
+ description = "ASCII animations for the holidays!";
+ license = stdenv.lib.licenses.gpl3;
+ }) {};
+
"ascii-progress" = callPackage
({ mkDerivation, async, base, concurrent-output, data-default
, hspec, QuickCheck, time
@@ -32968,8 +33026,8 @@ self: {
}:
mkDerivation {
pname = "ats-pkg";
- version = "3.4.0.1";
- sha256 = "0lfmlsnxa7fvifqay4xvnkl8cpbx7a6vbfb0szvb5j0nfa8607n6";
+ version = "3.4.0.5";
+ sha256 = "1hqaz5sybj9cyd17k1883nq936jf6815sprxdgbdrbw7rsfx39al";
isLibrary = true;
isExecutable = true;
enableSeparateDataOutput = true;
@@ -34117,6 +34175,38 @@ self: {
license = stdenv.lib.licenses.bsd3;
}) {};
+ "avro-piper" = callPackage
+ ({ mkDerivation, aeson, avro, base, bytestring, conduit
+ , conduit-combinators, conduit-extra, hedgehog, hspec
+ , hw-hspec-hedgehog, hw-kafka-avro, mtl, optparse-applicative
+ , scientific, stringsearch, text, unordered-containers
+ }:
+ mkDerivation {
+ pname = "avro-piper";
+ version = "1.0.1";
+ sha256 = "0py25d3y7jx9amcydfnkwipq3rhqpimh18qjvfj1jls8yi9jkvp0";
+ isLibrary = true;
+ isExecutable = true;
+ libraryHaskellDepends = [
+ aeson avro base bytestring conduit conduit-combinators
+ conduit-extra hw-kafka-avro mtl optparse-applicative scientific
+ stringsearch text unordered-containers
+ ];
+ executableHaskellDepends = [
+ aeson avro base bytestring conduit conduit-combinators
+ conduit-extra hw-kafka-avro mtl optparse-applicative scientific
+ stringsearch text unordered-containers
+ ];
+ testHaskellDepends = [
+ aeson avro base bytestring conduit conduit-combinators
+ conduit-extra hedgehog hspec hw-hspec-hedgehog hw-kafka-avro mtl
+ optparse-applicative scientific stringsearch text
+ unordered-containers
+ ];
+ description = "Tool for decoding avro";
+ license = stdenv.lib.licenses.bsd3;
+ }) {};
+
"avwx" = callPackage
({ mkDerivation, attoparsec, base, HTTP, lens, optparse-applicative
, parsers, pretty-show, text
@@ -35656,6 +35746,18 @@ self: {
license = stdenv.lib.licenses.bsd3;
}) {};
+ "barbies-th" = callPackage
+ ({ mkDerivation, barbies, base, template-haskell }:
+ mkDerivation {
+ pname = "barbies-th";
+ version = "0";
+ sha256 = "12h6yzl1rqi24ybif5bciljazjxnbvhq5wi9iyjg8zhjmklb6sgr";
+ libraryHaskellDepends = [ barbies base template-haskell ];
+ testHaskellDepends = [ barbies base ];
+ description = "Create strippable HKD via TH";
+ license = stdenv.lib.licenses.bsd3;
+ }) {};
+
"barbly" = callPackage
({ mkDerivation, aeson, async, attoparsec, base, bytestring, mtl
, optparse-applicative, shh, text
@@ -40281,24 +40383,6 @@ self: {
}) {};
"bits-extra" = callPackage
- ({ mkDerivation, base, criterion, ghc-prim, hedgehog, hspec
- , hspec-discover, hw-hedgehog, hw-hspec-hedgehog, vector
- }:
- mkDerivation {
- pname = "bits-extra";
- version = "0.0.1.4";
- sha256 = "1hkl71661hh8czd7hrfwj48blav4g3jdy3nl06bw2iw8bkl00nz2";
- libraryHaskellDepends = [ base ghc-prim vector ];
- testHaskellDepends = [
- base ghc-prim hedgehog hspec hw-hedgehog hw-hspec-hedgehog
- ];
- testToolDepends = [ hspec-discover ];
- benchmarkHaskellDepends = [ base criterion ghc-prim vector ];
- description = "Useful bitwise operations";
- license = stdenv.lib.licenses.bsd3;
- }) {};
-
- "bits-extra_0_0_1_5" = callPackage
({ mkDerivation, base, criterion, doctest, doctest-discover
, ghc-prim, hedgehog, hspec, hspec-discover, hw-hedgehog
, hw-hspec-hedgehog, vector
@@ -40316,7 +40400,6 @@ self: {
benchmarkHaskellDepends = [ base criterion ghc-prim vector ];
description = "Useful bitwise operations";
license = stdenv.lib.licenses.bsd3;
- hydraPlatforms = stdenv.lib.platforms.none;
}) {};
"bits-extras" = callPackage
@@ -40405,8 +40488,8 @@ self: {
}:
mkDerivation {
pname = "bitstream";
- version = "0.2.0.4";
- sha256 = "1j00r6jv9yp0h476gz7yalrlnxhkrdrl1w73d3zl98kyf207q2sy";
+ version = "0.3.0.0";
+ sha256 = "12cyvrd7za5zh1idi5q4w0qbv0l4kjlsjascz6z4w2877zji7bvh";
libraryHaskellDepends = [
base base-unicode-symbols bytestring vector
];
@@ -42215,6 +42298,8 @@ self: {
pname = "boots-app";
version = "0.2.0.1";
sha256 = "0wk177f6ljcqd0ya7cddvx3i6sdwx0wl9fz1idzfa8klb8pnkghh";
+ revision = "1";
+ editedCabalFile = "0a69kvlilg1nmyxvlbm79hidg0zwjrgd556nnl73k08mgsk2xj1v";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [
@@ -43059,45 +43144,6 @@ self: {
}) {};
"brittany" = callPackage
- ({ mkDerivation, aeson, base, butcher, bytestring, cmdargs
- , containers, czipwith, data-tree-print, deepseq, directory, extra
- , filepath, ghc, ghc-boot-th, ghc-exactprint, ghc-paths, hspec
- , monad-memo, mtl, multistate, neat-interpolation, parsec, pretty
- , random, safe, semigroups, strict, syb, text, transformers
- , uniplate, unsafe, yaml
- }:
- mkDerivation {
- pname = "brittany";
- version = "0.12.1.0";
- sha256 = "1r5nbw63hv5nq02lx6igin70lbzbdglldb2lf1m52jpiwwz5j0i4";
- isLibrary = true;
- isExecutable = true;
- libraryHaskellDepends = [
- aeson base butcher bytestring cmdargs containers czipwith
- data-tree-print deepseq directory extra filepath ghc ghc-boot-th
- ghc-exactprint ghc-paths monad-memo mtl multistate
- neat-interpolation pretty random safe semigroups strict syb text
- transformers uniplate unsafe yaml
- ];
- executableHaskellDepends = [
- aeson base butcher bytestring cmdargs containers czipwith
- data-tree-print deepseq directory extra filepath ghc ghc-boot-th
- ghc-exactprint ghc-paths monad-memo mtl multistate
- neat-interpolation pretty safe semigroups strict syb text
- transformers uniplate unsafe yaml
- ];
- testHaskellDepends = [
- aeson base butcher bytestring cmdargs containers czipwith
- data-tree-print deepseq directory extra filepath ghc ghc-boot-th
- ghc-exactprint ghc-paths hspec monad-memo mtl multistate
- neat-interpolation parsec pretty safe semigroups strict syb text
- transformers uniplate unsafe yaml
- ];
- description = "Haskell source code formatter";
- license = stdenv.lib.licenses.agpl3;
- }) {};
-
- "brittany_0_12_1_1" = callPackage
({ mkDerivation, aeson, base, butcher, bytestring, cmdargs
, containers, czipwith, data-tree-print, deepseq, directory, extra
, filepath, ghc, ghc-boot-th, ghc-exactprint, ghc-paths, hspec
@@ -43134,7 +43180,6 @@ self: {
];
description = "Haskell source code formatter";
license = stdenv.lib.licenses.agpl3;
- hydraPlatforms = stdenv.lib.platforms.none;
}) {};
"broadcast-chan" = callPackage
@@ -45953,8 +45998,8 @@ self: {
}:
mkDerivation {
pname = "cabal-macosx";
- version = "0.2.4.1";
- sha256 = "01l0m11q5knq1n9vx73515dpzw1mwxf7qin8qfb5ci21yxg91mww";
+ version = "0.2.4.2";
+ sha256 = "1ah1bj32xcjqc90cqc7y5mkyg985h8ffb6nbbxlzxfr0a3nkzka8";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [
@@ -46094,28 +46139,6 @@ self: {
}) {};
"cabal-rpm" = callPackage
- ({ mkDerivation, base, bytestring, Cabal, directory, filepath
- , http-client, http-client-tls, http-conduit, process, simple-cabal
- , simple-cmd, simple-cmd-args, time, unix
- }:
- mkDerivation {
- pname = "cabal-rpm";
- version = "1.0.1";
- sha256 = "0p0z5yar9dzbssqy1flwvj15gnfyi708n9pf8ij8h15bya9qrg3a";
- isLibrary = false;
- isExecutable = true;
- executableHaskellDepends = [
- base bytestring Cabal directory filepath http-client
- http-client-tls http-conduit process simple-cabal simple-cmd
- simple-cmd-args time unix
- ];
- description = "RPM packaging tool for Haskell Cabal-based packages";
- license = stdenv.lib.licenses.gpl3;
- hydraPlatforms = stdenv.lib.platforms.none;
- broken = true;
- }) {};
-
- "cabal-rpm_1_0_2" = callPackage
({ mkDerivation, base, bytestring, Cabal, directory, filepath
, http-client, http-client-tls, http-conduit, optparse-applicative
, process, simple-cabal, simple-cmd, simple-cmd-args, time, unix
@@ -46643,22 +46666,6 @@ self: {
}) {cabocha = null;};
"cache" = callPackage
- ({ mkDerivation, base, clock, hashable, hspec, stm, transformers
- , unordered-containers
- }:
- mkDerivation {
- pname = "cache";
- version = "0.1.2.0";
- sha256 = "12mxziwz8qn26v5xkp0bh13jqf9hd8pi9flm68nz82p15vhcs01s";
- libraryHaskellDepends = [
- base clock hashable stm transformers unordered-containers
- ];
- testHaskellDepends = [ base clock hspec stm transformers ];
- description = "An in-memory key/value store with expiration support";
- license = stdenv.lib.licenses.bsd3;
- }) {};
-
- "cache_0_1_3_0" = callPackage
({ mkDerivation, base, clock, hashable, hspec, stm, transformers
, unordered-containers
}:
@@ -46672,7 +46679,6 @@ self: {
testHaskellDepends = [ base clock hspec stm transformers ];
description = "An in-memory key/value store with expiration support";
license = stdenv.lib.licenses.bsd3;
- hydraPlatforms = stdenv.lib.platforms.none;
}) {};
"cached" = callPackage
@@ -46874,8 +46880,8 @@ self: {
}:
mkDerivation {
pname = "cairo";
- version = "0.13.6.1";
- sha256 = "04vjia6pfx5nkrjvxrjj774gsljmhzlyjm8ir88l32ygry2f0rbg";
+ version = "0.13.8.0";
+ sha256 = "09g93jzackry9yi4xsd5d6h75z0r7mbw2s2w7wd2af4dmp76l2d9";
enableSeparateDataOutput = true;
setupHaskellDepends = [ base Cabal gtk2hs-buildtools ];
libraryHaskellDepends = [
@@ -47350,8 +47356,8 @@ self: {
({ mkDerivation, base, deepseq, hspec, HUnit, mtl }:
mkDerivation {
pname = "can-i-haz";
- version = "0.3.0.0";
- sha256 = "0m77szr91q8p7n9c91chafzypiadi565a4k3y949m1cd3r3b0pjr";
+ version = "0.3.1.0";
+ sha256 = "0pwwl5pawvd1sygc8k7ichfk15inhcy4has40zplqqws5lmm6mz8";
libraryHaskellDepends = [ base mtl ];
testHaskellDepends = [ base deepseq hspec HUnit mtl ];
description = "Generic implementation of the Has and CoHas patterns";
@@ -48700,6 +48706,19 @@ self: {
broken = true;
}) {};
+ "category_0_2_5_0" = callPackage
+ ({ mkDerivation, alg, base, dual, transformers }:
+ mkDerivation {
+ pname = "category";
+ version = "0.2.5.0";
+ sha256 = "0iya7q3b1z1bxv4amsibmc1lrmf7dng76nzcnanwy300jm1n42w7";
+ libraryHaskellDepends = [ alg base dual transformers ];
+ description = "Categorical types and classes";
+ license = stdenv.lib.licenses.bsd3;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ broken = true;
+ }) {};
+
"category-extras" = callPackage
({ mkDerivation, adjunctions, bifunctors, categories, comonad
, comonad-extras, comonad-transformers, comonads-fd, contravariant
@@ -52483,15 +52502,12 @@ self: {
}) {};
"cli-setup" = callPackage
- ({ mkDerivation, base, bytestring, directory, file-embed, process
- }:
+ ({ mkDerivation, base, directory, process }:
mkDerivation {
pname = "cli-setup";
- version = "0.2.1.2";
- sha256 = "0fh9lp8r73mslhwxcjpfzvm0j0qbq0prr4bkkwq2v16izg14ccda";
- libraryHaskellDepends = [
- base bytestring directory file-embed process
- ];
+ version = "0.2.1.4";
+ sha256 = "09ycy8500si810ysn70khc2np1zy21a1647kva8lkcj4pjbb1bvx";
+ libraryHaskellDepends = [ base directory process ];
description = "Helper setup scripts for packaging command-line tools";
license = stdenv.lib.licenses.bsd3;
}) {};
@@ -53777,8 +53793,8 @@ self: {
}:
mkDerivation {
pname = "cobot-io";
- version = "0.1.2.3";
- sha256 = "0z4im9z5yi18kdw99d50zbcala619hba3iwka7ny5krladnz75ha";
+ version = "0.1.2.5";
+ sha256 = "1md3dyfaybhmfprw3qdwqvlh0r73wy8smf8j8jkdrlkxqw6vhd1f";
libraryHaskellDepends = [
array attoparsec base binary bytestring containers data-msgpack
deepseq http-conduit hyraxAbif lens linear mtl split text vector
@@ -53801,8 +53817,8 @@ self: {
}:
mkDerivation {
pname = "cobot-tools";
- version = "0.1.2.1";
- sha256 = "0qd3w9y3fps7kkpkvdh3wd54mm9z6ikr16f9f8jvn2gza0xc4l0m";
+ version = "0.1.2.2";
+ sha256 = "07vazc4k8y867ba0m3pd177087cwdkdjmd5zkj39ravg44yx6hhm";
libraryHaskellDepends = [
array base bytestring cobot containers data-default data-msgpack
deepseq lens mtl regex-tdfa text
@@ -54138,6 +54154,44 @@ self: {
license = stdenv.lib.licenses.bsd3;
}) {};
+ "coformat" = callPackage
+ ({ mkDerivation, aeson, async, async-pool, base, bytestring
+ , can-i-haz, command-qq, containers, dom-selector, extra
+ , fast-logger, generic-data, hashable, html-conduit, interpolate
+ , lens, lens-aeson, monad-logger, mtl, optparse-generic, scientific
+ , temporary, text, unordered-containers, xml-conduit, yaml
+ }:
+ mkDerivation {
+ pname = "coformat";
+ version = "0.2.1.0";
+ sha256 = "1s6nh389d6p8ll1v32hifamb1a8vhd194v86ff8r0in7bzc54kfj";
+ isLibrary = true;
+ isExecutable = true;
+ libraryHaskellDepends = [
+ aeson async async-pool base bytestring can-i-haz command-qq
+ containers dom-selector extra fast-logger generic-data hashable
+ html-conduit interpolate lens lens-aeson monad-logger mtl
+ optparse-generic scientific temporary text unordered-containers
+ xml-conduit yaml
+ ];
+ executableHaskellDepends = [
+ aeson async async-pool base bytestring can-i-haz command-qq
+ containers dom-selector extra fast-logger generic-data hashable
+ html-conduit interpolate lens lens-aeson monad-logger mtl
+ optparse-generic scientific temporary text unordered-containers
+ xml-conduit yaml
+ ];
+ testHaskellDepends = [
+ aeson async async-pool base bytestring can-i-haz command-qq
+ containers dom-selector extra fast-logger generic-data hashable
+ html-conduit interpolate lens lens-aeson monad-logger mtl
+ optparse-generic scientific temporary text unordered-containers
+ xml-conduit yaml
+ ];
+ description = "Generate clang-format config based on some existing code base";
+ license = stdenv.lib.licenses.bsd3;
+ }) {};
+
"cofunctor" = callPackage
({ mkDerivation, base }:
mkDerivation {
@@ -56855,8 +56909,8 @@ self: {
}:
mkDerivation {
pname = "conduit";
- version = "1.3.1.1";
- sha256 = "18izjgff4pmrknc8py06yvg3g6x27nx0rzmlwjxcflwm5v4szpw4";
+ version = "1.3.1.2";
+ sha256 = "12c21vrij63z60y3xd0dkg0da8sdhfq6nj5s3p5qknys5klwpqkq";
libraryHaskellDepends = [
base bytestring directory exceptions filepath mono-traversable mtl
primitive resourcet text transformers unix unliftio-core vector
@@ -59337,8 +59391,8 @@ self: {
}:
mkDerivation {
pname = "copilot-c99";
- version = "3.1";
- sha256 = "1cwypmis5dcdzjasq03wcas4lnml7l4a4ymw1v55aybfmz94mxc3";
+ version = "3.1.1";
+ sha256 = "0hja6fp7n4zrhm73fvjkisspc7cyp53blhn4maqis8lw27svjq66";
libraryHaskellDepends = [
base containers copilot-core directory filepath language-c99
language-c99-simple language-c99-util mtl pretty
@@ -60046,8 +60100,8 @@ self: {
}:
mkDerivation {
pname = "cpkg";
- version = "0.2.3.6";
- sha256 = "16kx2rlxkai9qswixx3145ajdnz3m0655cmv3gl37njdp3dwa8qf";
+ version = "0.2.3.7";
+ sha256 = "12hpi46p8fh36jq7xbgv16xihxx6hgpcn0bssc97zv3il4b5zk9m";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [
@@ -68741,6 +68795,55 @@ self: {
license = stdenv.lib.licenses.bsd3;
}) {};
+ "dhall_1_27_0" = callPackage
+ ({ mkDerivation, aeson, aeson-pretty, ansi-terminal, base
+ , bytestring, case-insensitive, cborg, cborg-json, containers
+ , contravariant, cryptonite, data-fix, deepseq, Diff, directory
+ , doctest, dotgen, either, exceptions, filepath, foldl, gauge
+ , generic-random, hashable, haskeline, http-client, http-client-tls
+ , http-types, lens-family-core, megaparsec, memory, mockery, mtl
+ , network-uri, optparse-applicative, parsers, prettyprinter
+ , prettyprinter-ansi-terminal, profunctors, QuickCheck
+ , quickcheck-instances, repline, scientific, semigroups, serialise
+ , special-values, spoon, tasty, tasty-expected-failure, tasty-hunit
+ , tasty-quickcheck, template-haskell, text, th-lift-instances
+ , transformers, transformers-compat, turtle, unordered-containers
+ , uri-encode, vector
+ }:
+ mkDerivation {
+ pname = "dhall";
+ version = "1.27.0";
+ sha256 = "04hpf0g8anhynrc3gd96cg1z4qadrk2xg9094qjm68d2kv6zx2g1";
+ isLibrary = true;
+ isExecutable = true;
+ libraryHaskellDepends = [
+ aeson aeson-pretty ansi-terminal base bytestring case-insensitive
+ cborg cborg-json containers contravariant cryptonite data-fix
+ deepseq Diff directory dotgen either exceptions filepath hashable
+ haskeline http-client http-client-tls http-types lens-family-core
+ megaparsec memory mtl network-uri optparse-applicative parsers
+ prettyprinter prettyprinter-ansi-terminal profunctors repline
+ scientific serialise template-haskell text th-lift-instances
+ transformers transformers-compat unordered-containers uri-encode
+ vector
+ ];
+ executableHaskellDepends = [ base ];
+ testHaskellDepends = [
+ base bytestring cborg containers data-fix deepseq directory doctest
+ either filepath foldl generic-random lens-family-core megaparsec
+ mockery prettyprinter QuickCheck quickcheck-instances scientific
+ semigroups serialise special-values spoon tasty
+ tasty-expected-failure tasty-hunit tasty-quickcheck text
+ transformers turtle unordered-containers vector
+ ];
+ benchmarkHaskellDepends = [
+ base bytestring containers directory gauge serialise text
+ ];
+ description = "A configuration language guaranteed to terminate";
+ license = stdenv.lib.licenses.bsd3;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ }) {};
+
"dhall_1_28_0" = callPackage
({ mkDerivation, aeson, aeson-pretty, ansi-terminal, atomic-write
, base, bytestring, case-insensitive, cborg, cborg-json, containers
@@ -69689,27 +69792,6 @@ self: {
}) {};
"diagrams-rasterific" = callPackage
- ({ mkDerivation, base, bytestring, containers, data-default-class
- , diagrams-core, diagrams-lib, file-embed, filepath, FontyFruity
- , hashable, JuicyPixels, lens, mtl, optparse-applicative
- , Rasterific
- }:
- mkDerivation {
- pname = "diagrams-rasterific";
- version = "1.4.1.1";
- sha256 = "0raki8c20s40y5xy2ax8y38xl3y40fb9qv95ax3qgnmi46s8fapp";
- enableSeparateDataOutput = true;
- libraryHaskellDepends = [
- base bytestring containers data-default-class diagrams-core
- diagrams-lib file-embed filepath FontyFruity hashable JuicyPixels
- lens mtl optparse-applicative Rasterific
- ];
- testHaskellDepends = [ base diagrams-core diagrams-lib ];
- description = "Rasterific backend for diagrams";
- license = stdenv.lib.licenses.bsd3;
- }) {};
-
- "diagrams-rasterific_1_4_2" = callPackage
({ mkDerivation, base, bytestring, containers, data-default-class
, diagrams-core, diagrams-lib, file-embed, filepath, FontyFruity
, hashable, JuicyPixels, lens, mtl, optparse-applicative
@@ -69727,7 +69809,6 @@ self: {
testHaskellDepends = [ base diagrams-core diagrams-lib ];
description = "Rasterific backend for diagrams";
license = stdenv.lib.licenses.bsd3;
- hydraPlatforms = stdenv.lib.platforms.none;
}) {};
"diagrams-reflex" = callPackage
@@ -69782,27 +69863,6 @@ self: {
}) {};
"diagrams-svg" = callPackage
- ({ mkDerivation, base, base64-bytestring, bytestring, colour
- , containers, diagrams-core, diagrams-lib, filepath, hashable
- , JuicyPixels, lens, monoid-extras, mtl, optparse-applicative
- , semigroups, split, svg-builder, text
- }:
- mkDerivation {
- pname = "diagrams-svg";
- version = "1.4.2";
- sha256 = "1lnyxx45yawqas7hmvvannwaa3ycf1l9g40lsl2m8sl2ja6vcmal";
- revision = "2";
- editedCabalFile = "15sn85xaachw4cj56w61bjcwrbf4qmnkfl8mbgdapxi5k0y4f2qv";
- libraryHaskellDepends = [
- base base64-bytestring bytestring colour containers diagrams-core
- diagrams-lib filepath hashable JuicyPixels lens monoid-extras mtl
- optparse-applicative semigroups split svg-builder text
- ];
- description = "SVG backend for diagrams drawing EDSL";
- license = stdenv.lib.licenses.bsd3;
- }) {};
-
- "diagrams-svg_1_4_3" = callPackage
({ mkDerivation, base, base64-bytestring, bytestring, colour
, containers, diagrams-core, diagrams-lib, filepath, hashable
, JuicyPixels, lens, monoid-extras, mtl, optparse-applicative
@@ -69819,7 +69879,6 @@ self: {
];
description = "SVG backend for diagrams drawing EDSL";
license = stdenv.lib.licenses.bsd3;
- hydraPlatforms = stdenv.lib.platforms.none;
}) {};
"diagrams-tikz" = callPackage
@@ -70772,14 +70831,14 @@ self: {
}) {};
"dir-traverse" = callPackage
- ({ mkDerivation, base, criterion, directory, dirstream, pipes
- , pipes-safe, system-filepath
+ ({ mkDerivation, base, criterion, directory, dirstream, filepath
+ , pipes, pipes-safe, system-filepath
}:
mkDerivation {
pname = "dir-traverse";
- version = "0.2.1.0";
- sha256 = "08xzl64clnx3mfx5bw82kpksagyl4bajkaxmbl1dpnmdc4jz35ks";
- libraryHaskellDepends = [ base directory ];
+ version = "0.2.2.2";
+ sha256 = "0wckqnfmdmfgp7kkvjc2pzg9610xqfnam5myv9xcq04cr3h3dy8g";
+ libraryHaskellDepends = [ base directory filepath ];
benchmarkHaskellDepends = [
base criterion directory dirstream pipes pipes-safe system-filepath
];
@@ -70929,12 +70988,12 @@ self: {
broken = true;
}) {};
- "directory_1_3_4_0" = callPackage
+ "directory_1_3_5_0" = callPackage
({ mkDerivation, base, filepath, time, unix }:
mkDerivation {
pname = "directory";
- version = "1.3.4.0";
- sha256 = "19akp75rb3zwjfxcjamj05br865rd54y1gbyyfrb3a9506zcpsfm";
+ version = "1.3.5.0";
+ sha256 = "0lzx67630dsvwf3iraabdsqxbpzal2irbdxav87sq9bj818v1rb9";
libraryHaskellDepends = [ base filepath time unix ];
testHaskellDepends = [ base filepath time unix ];
description = "Platform-agnostic library for filesystem operations";
@@ -74410,6 +74469,19 @@ self: {
broken = true;
}) {};
+ "dual_0_1_0_3" = callPackage
+ ({ mkDerivation, base }:
+ mkDerivation {
+ pname = "dual";
+ version = "0.1.0.3";
+ sha256 = "1w8haw9q7cljiq58nh7fmywbgcxnx8xz33zx8gr9imkagh56gwv3";
+ libraryHaskellDepends = [ base ];
+ description = "Dual category";
+ license = stdenv.lib.licenses.bsd3;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ broken = true;
+ }) {};
+
"dual-game" = callPackage
({ mkDerivation, base, bifunctors, cereal, gloss, network
, websockets
@@ -76208,8 +76280,8 @@ self: {
}:
mkDerivation {
pname = "egison";
- version = "3.10.1";
- sha256 = "047l2knxhzlrmc4n6xaannnwa1zhq7lxr3iswwrji5xcqbbag5xp";
+ version = "3.10.2";
+ sha256 = "04kk635qiv6y5g6y9gjhlh5x5ds7js127r8p2qdhq4da1yb39pqi";
isLibrary = true;
isExecutable = true;
enableSeparateDataOutput = true;
@@ -77175,28 +77247,6 @@ self: {
}) {};
"elm-street" = callPackage
- ({ mkDerivation, aeson, base, directory, filepath, prettyprinter
- , servant, servant-server, text, time, wai, warp
- }:
- mkDerivation {
- pname = "elm-street";
- version = "0.0.1";
- sha256 = "09rc10k6g23wf7b095rk6i2d9h5axlcmfpimhmbpqhm8vyqg72l7";
- isLibrary = true;
- isExecutable = true;
- libraryHaskellDepends = [
- aeson base directory filepath prettyprinter text time
- ];
- executableHaskellDepends = [
- base servant servant-server wai warp
- ];
- testHaskellDepends = [ base ];
- doHaddock = false;
- description = "Crossing the road between Haskell and Elm";
- license = stdenv.lib.licenses.mpl20;
- }) {};
-
- "elm-street_0_1_0_2" = callPackage
({ mkDerivation, aeson, base, bytestring, directory, filepath
, hspec, prettyprinter, servant, servant-server, text, time, wai
, warp
@@ -77217,7 +77267,26 @@ self: {
doHaddock = false;
description = "Crossing the road between Haskell and Elm";
license = stdenv.lib.licenses.mpl20;
- hydraPlatforms = stdenv.lib.platforms.none;
+ }) {};
+
+ "elm-syntax" = callPackage
+ ({ mkDerivation, base, bound, deriving-compat, prettyprinter
+ , protolude, text, unordered-containers
+ }:
+ mkDerivation {
+ pname = "elm-syntax";
+ version = "0.1.0.0";
+ sha256 = "1c8dg5kd0h36j030ig59n1gg1g7y569k92nxg416w4y18z7gir72";
+ libraryHaskellDepends = [
+ base bound deriving-compat prettyprinter protolude text
+ unordered-containers
+ ];
+ testHaskellDepends = [
+ base bound deriving-compat prettyprinter protolude text
+ unordered-containers
+ ];
+ description = "Elm syntax and pretty-printing";
+ license = stdenv.lib.licenses.bsd3;
}) {};
"elm-websocket" = callPackage
@@ -77322,19 +77391,21 @@ self: {
}) {};
"elocrypt" = callPackage
- ({ mkDerivation, base, hlint, MonadRandom, proctest, QuickCheck
- , random, tasty, tasty-quickcheck, tasty-th
+ ({ mkDerivation, base, containers, hlint, MonadRandom, proctest
+ , QuickCheck, random, tasty, tasty-quickcheck, tasty-th
}:
mkDerivation {
pname = "elocrypt";
- version = "2.0.1";
- sha256 = "1sb0xb4dx39vmr60slrlr85hwi6drmqdibv0faiw7k48rxvcz1ak";
+ version = "2.1.0";
+ sha256 = "1mz400y28qminfz39zl2wsia6hv2pmvg836gc18z6hakmw80jnmk";
+ revision = "1";
+ editedCabalFile = "04ciqcmycpms6qvbh04fkq7kli7mcd031x9lqhv2ps46f4v9zx1b";
isLibrary = true;
isExecutable = true;
- libraryHaskellDepends = [ base MonadRandom random ];
+ libraryHaskellDepends = [ base containers MonadRandom random ];
executableHaskellDepends = [ base random ];
testHaskellDepends = [
- base hlint MonadRandom proctest QuickCheck random tasty
+ base containers hlint MonadRandom proctest QuickCheck random tasty
tasty-quickcheck tasty-th
];
description = "Generate easy-to-remember, hard-to-guess passwords";
@@ -78248,19 +78319,17 @@ self: {
}) {};
"enumeration" = callPackage
- ({ mkDerivation, arith-encode, arithmoi, base, binary, Cabal
- , containers, heap, HUnit-Plus
+ ({ mkDerivation, arith-encode, base, binary, containers, heap
+ , HUnit-Plus, integer-logarithms
}:
mkDerivation {
pname = "enumeration";
- version = "0.1.0";
- sha256 = "17d7vm2nkyhxw2f0wk6llrw9y5kqzgqlgswv98wrpnpsspwmx0bk";
+ version = "0.2.0";
+ sha256 = "0lhyvsiibzk70czway3wx5wsm1gjfxip47clf4l5nskq1qxs9q8l";
libraryHaskellDepends = [
- arith-encode arithmoi base binary Cabal containers heap
- ];
- testHaskellDepends = [
- arith-encode arithmoi base binary Cabal containers heap HUnit-Plus
+ arith-encode base binary containers heap integer-logarithms
];
+ testHaskellDepends = [ arith-encode base binary HUnit-Plus ];
description = "A practical API for building recursive enumeration procedures and enumerating datatypes";
license = stdenv.lib.licenses.bsd3;
hydraPlatforms = stdenv.lib.platforms.none;
@@ -79930,25 +79999,28 @@ self: {
}) {};
"evdev" = callPackage
- ({ mkDerivation, base, bytestring, c2hs, composition, containers
- , either, evdev, extra, hinotify, posix-paths, process, rawfilepath
- , safe, streamly, time, unix
+ ({ mkDerivation, base, bytestring, c2hs, containers, either, evdev
+ , extra, hinotify, libevdev, monad-loops, paths, posix-paths
+ , process, rawfilepath, safe, streamly, streamly-fsnotify, time
+ , unix
}:
mkDerivation {
pname = "evdev";
- version = "0.2.0.1";
- sha256 = "0b005anc3bxs8ys5zmzzs81n4wmjabvv7fbcj5w62ddsjfq38p62";
+ version = "1.2.0.0";
+ sha256 = "1sjpqnf6gb8mb4n4sf8d60byx5s0vjpwhp7n0lkf2ikckwlc7y73";
libraryHaskellDepends = [
- base bytestring composition containers either extra hinotify
- posix-paths process rawfilepath safe streamly time unix
+ base bytestring containers either extra hinotify monad-loops paths
+ posix-paths process rawfilepath safe streamly streamly-fsnotify
+ time unix
];
librarySystemDepends = [ evdev ];
+ libraryPkgconfigDepends = [ libevdev ];
libraryToolDepends = [ c2hs ];
description = "Bindings to libevdev";
license = stdenv.lib.licenses.bsd3;
hydraPlatforms = stdenv.lib.platforms.none;
broken = true;
- }) {evdev = null;};
+ }) {evdev = null; inherit (pkgs) libevdev;};
"eve" = callPackage
({ mkDerivation, base, containers, data-default, free, hspec
@@ -81563,23 +81635,21 @@ self: {
}) {};
"extensible" = callPackage
- ({ mkDerivation, aeson, barbies, base, bytestring, cassava, comonad
- , constraints, deepseq, exceptions, ghc-prim, hashable, lens
- , membership, monad-skeleton, mtl, prettyprinter, primitive
- , profunctors, QuickCheck, resourcet, StateVar, tagged
- , template-haskell, text, th-lift, transformers
+ ({ mkDerivation, aeson, base, bytestring, cassava, comonad
+ , constraints, deepseq, ghc-prim, hashable, lens, membership
+ , monad-skeleton, prettyprinter, primitive, profunctors, QuickCheck
+ , StateVar, tagged, template-haskell, text, th-lift, transformers
, unordered-containers, vector
}:
mkDerivation {
pname = "extensible";
- version = "0.6.1";
- sha256 = "1h96kn622qyx27xap79ywq4kx4q82x4b3kxviakhqwxlvf2sklg2";
+ version = "0.7";
+ sha256 = "1nil9qvgrbd42hv198msm7apma67m9dqi5cqgfvjgfcgdms46dk2";
libraryHaskellDepends = [
- aeson barbies base bytestring cassava comonad constraints deepseq
- exceptions ghc-prim hashable membership monad-skeleton mtl
- prettyprinter primitive profunctors QuickCheck resourcet StateVar
- tagged template-haskell text th-lift transformers
- unordered-containers vector
+ aeson base bytestring cassava comonad constraints deepseq ghc-prim
+ hashable membership monad-skeleton prettyprinter primitive
+ profunctors QuickCheck StateVar tagged template-haskell text
+ th-lift transformers unordered-containers vector
];
testHaskellDepends = [ base lens QuickCheck template-haskell ];
description = "Extensible, efficient, optics-friendly data types and effects";
@@ -81673,6 +81743,24 @@ self: {
license = stdenv.lib.licenses.bsd3;
}) {};
+ "extensible-skeleton" = callPackage
+ ({ mkDerivation, base, exceptions, extensible, membership
+ , monad-skeleton, mtl, profunctors, resourcet, template-haskell
+ , transformers
+ }:
+ mkDerivation {
+ pname = "extensible-skeleton";
+ version = "0";
+ sha256 = "0bv6589p8cpzsr167yi98vm0bzkcfgazkxbj35f74ykh8zwqlqfl";
+ libraryHaskellDepends = [
+ base exceptions extensible membership monad-skeleton mtl
+ profunctors resourcet template-haskell transformers
+ ];
+ testHaskellDepends = [ base extensible ];
+ description = "Operational-based extensible effect library";
+ license = stdenv.lib.licenses.bsd3;
+ }) {};
+
"extensible-sp" = callPackage
({ mkDerivation, base, lens }:
mkDerivation {
@@ -82169,7 +82257,7 @@ self: {
license = stdenv.lib.licenses.bsd3;
}) {};
- "fakedata_0_4_0" = callPackage
+ "fakedata_0_5_0" = callPackage
({ mkDerivation, base, bytestring, containers, deepseq, directory
, exceptions, filepath, gauge, hashable, hspec, hspec-discover
, random, template-haskell, text, time, unordered-containers
@@ -82177,8 +82265,8 @@ self: {
}:
mkDerivation {
pname = "fakedata";
- version = "0.4.0";
- sha256 = "0q90aa92wraqjnj256bpv34mhsl42wyp31y2g4nv2sgzj7mi9jjg";
+ version = "0.5.0";
+ sha256 = "0xbdbxbj3phrzhg5ifp0s479sjrkm6p3pvvia2i4j1fmq313d9k7";
enableSeparateDataOutput = true;
libraryHaskellDepends = [
base bytestring containers directory exceptions filepath hashable
@@ -83273,12 +83361,12 @@ self: {
license = stdenv.lib.licenses.gpl3;
}) {};
- "fedora-dists_1_1_0" = callPackage
+ "fedora-dists_1_1_1" = callPackage
({ mkDerivation, base }:
mkDerivation {
pname = "fedora-dists";
- version = "1.1.0";
- sha256 = "01knh6bvym4d7rsh9mlrn89nwddxp5rsvgsg4271k0z4xkjsr7i8";
+ version = "1.1.1";
+ sha256 = "10yf8hjbrwjwdsfys87cysim8zfknqp1vv336ym8b5qlx700b2ji";
libraryHaskellDepends = [ base ];
description = "Library for Fedora distribution versions";
license = stdenv.lib.licenses.gpl3;
@@ -84268,8 +84356,8 @@ self: {
}:
mkDerivation {
pname = "file-embed";
- version = "0.0.11";
- sha256 = "0l6dkwccbzzyx8rcav03lya2334dgi3vfwk96h7l93l0fc4x19gf";
+ version = "0.0.11.1";
+ sha256 = "1ml9j5jln9g86qqi7akcxyfy8d2jb46y1sfk817j1s4babzff4x1";
libraryHaskellDepends = [
base bytestring directory filepath template-haskell
];
@@ -84475,8 +84563,8 @@ self: {
({ mkDerivation, base, bytestring, filepath, QuickCheck, unix }:
mkDerivation {
pname = "filepath-bytestring";
- version = "1.4.2.1.0";
- sha256 = "1q2d02p87yfvqbqhgry6lzqkjhscqfacpcxgnc6xz9b1rvg1mwvj";
+ version = "1.4.2.1.1";
+ sha256 = "06shdskjj391hb9295slm9gg2rbn5fdq5v6fg0mgn3yl5dv8q5dx";
libraryHaskellDepends = [ base bytestring unix ];
testHaskellDepends = [ base bytestring filepath QuickCheck ];
description = "Library for manipulating RawFilePaths in a cross platform way";
@@ -84700,30 +84788,14 @@ self: {
({ mkDerivation, base }:
mkDerivation {
pname = "filtrable";
- version = "0.1.2.0";
- sha256 = "1bgy3pydi7paiia63kygrg7fjjs7fm73jqfmlmw4szcbjmv8xq8k";
+ version = "0.1.3.0";
+ sha256 = "1viazb01xnw7siwrsynaxqcjrgc96gqfgmj4vxl5r3lbnb34wdl0";
libraryHaskellDepends = [ base ];
description = "Class of filtrable containers";
license = stdenv.lib.licenses.bsd3;
}) {};
"fin" = callPackage
- ({ mkDerivation, base, dec, deepseq, hashable, inspection-testing
- , tagged
- }:
- mkDerivation {
- pname = "fin";
- version = "0.1";
- sha256 = "17nv26cznhslrfb1ajcgxa9g3zacvk3prmncr7f8d7rvh42g2gnn";
- revision = "1";
- editedCabalFile = "0kdhmjpifbl1r44jy2spj82gdadd849zz6i0y7mw1ii25w91yb50";
- libraryHaskellDepends = [ base dec deepseq hashable ];
- testHaskellDepends = [ base inspection-testing tagged ];
- description = "Nat and Fin: peano naturals and finite numbers";
- license = stdenv.lib.licenses.bsd3;
- }) {};
-
- "fin_0_1_1" = callPackage
({ mkDerivation, base, dec, deepseq, hashable, inspection-testing
, QuickCheck, tagged
}:
@@ -84735,7 +84807,6 @@ self: {
testHaskellDepends = [ base inspection-testing tagged ];
description = "Nat and Fin: peano naturals and finite numbers";
license = stdenv.lib.licenses.bsd3;
- hydraPlatforms = stdenv.lib.platforms.none;
}) {};
"final" = callPackage
@@ -88983,12 +89054,12 @@ self: {
}) {};
"from-sum" = callPackage
- ({ mkDerivation, base, doctest, Glob, mtl }:
+ ({ mkDerivation, base, doctest, Glob, transformers }:
mkDerivation {
pname = "from-sum";
- version = "0.2.1.0";
- sha256 = "0rv66a7mhswb4sqkyarg9kxxfpiymsmrk49gprq8mpwq7d1qmvd1";
- libraryHaskellDepends = [ base mtl ];
+ version = "0.2.2.0";
+ sha256 = "05fppk2hkxn67xfl6kdzdp2a5mfz63dv4yx7mvr9fbdrarxrf326";
+ libraryHaskellDepends = [ base transformers ];
testHaskellDepends = [ base doctest Glob ];
description = "Canonical fromMaybeM and fromEitherM functions";
license = stdenv.lib.licenses.bsd3;
@@ -90247,8 +90318,8 @@ self: {
({ mkDerivation, base, fused-effects, hspec, microlens }:
mkDerivation {
pname = "fused-effects-lens";
- version = "1.0.0.0";
- sha256 = "0qix94bw9rzv7frwxn4d9l8bz133fbmazzsvmilfz6bm6k8ci6nx";
+ version = "1.1.0.0";
+ sha256 = "0812yfzy784mr1wdbfd7yi249pgdf5ndm7qsy6vk8rs09arpwwxh";
libraryHaskellDepends = [ base fused-effects microlens ];
testHaskellDepends = [ base fused-effects hspec microlens ];
description = "Monadic lens combinators for fused-effects";
@@ -90320,8 +90391,8 @@ self: {
}:
mkDerivation {
pname = "futhark";
- version = "0.13.1";
- sha256 = "0h92q21hg3850f7hv5n497mn90dv3hxp8fa3cl29gwkn0pkaz33b";
+ version = "0.13.2";
+ sha256 = "0wxhymhwfny03n15g29ydrnqblq23szw6l622ifwxz0mk9h71z1d";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [
@@ -90481,6 +90552,26 @@ self: {
license = stdenv.lib.licenses.bsd3;
}) {};
+ "fuzzyset_0_2_0" = callPackage
+ ({ mkDerivation, base, data-default, hspec, ieee754, text
+ , text-metrics, unordered-containers, vector
+ }:
+ mkDerivation {
+ pname = "fuzzyset";
+ version = "0.2.0";
+ sha256 = "0wx8bccfr1k5ax97x5w01mzrpjfwns27xgcr12xf6vbyi7q14mfg";
+ libraryHaskellDepends = [
+ base data-default text text-metrics unordered-containers vector
+ ];
+ testHaskellDepends = [
+ base data-default hspec ieee754 text text-metrics
+ unordered-containers vector
+ ];
+ description = "Fuzzy set for approximate string matching";
+ license = stdenv.lib.licenses.bsd3;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ }) {};
+
"fuzzytime" = callPackage
({ mkDerivation, base, cmdargs, directory, old-time, process }:
mkDerivation {
@@ -94750,6 +94841,8 @@ self: {
pname = "ghcide";
version = "0.0.5";
sha256 = "014l2gg7ln2q9c7qpga45iicxi5mcyjzllvyiwb4vd8rmbkvr1bm";
+ revision = "2";
+ editedCabalFile = "157ch1bk9r66pca8fiywwj1brpg2mbnarvlzic3yl829v6kcmrvj";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [
@@ -96253,8 +96346,8 @@ self: {
}:
mkDerivation {
pname = "gio";
- version = "0.13.6.1";
- sha256 = "0lj913029v0h035lri2mkkd8ypc3asb30igj5rrcs6miwhfkmbcf";
+ version = "0.13.8.0";
+ sha256 = "1wx35fm7jba69x33mhp0h6j0lszi62hmmb1inflx7gax0ncmk2n2";
enableSeparateDataOutput = true;
setupHaskellDepends = [ base Cabal gtk2hs-buildtools ];
libraryHaskellDepends = [
@@ -96400,8 +96493,8 @@ self: {
}:
mkDerivation {
pname = "git-annex";
- version = "7.20191114";
- sha256 = "1afrn5g3b80f3n6ncfph6pmf9jdpc7a6ay55k2pmkn96pyv4hfmm";
+ version = "7.20191218";
+ sha256 = "1dy5255x2cx68313p6vchqy5q1l0na8ckf5mkfi080hkhq8vj2q6";
configureFlags = [
"-fassistant" "-f-benchmark" "-fdbus" "-f-debuglocks" "-fmagicmime"
"-f-networkbsd" "-fpairing" "-fproduction" "-fs3" "-ftorrentparser"
@@ -96937,8 +97030,8 @@ self: {
}:
mkDerivation {
pname = "github-backup";
- version = "1.20171126";
- sha256 = "0fk3dp11acgw88rhb7pi8kb98m9x96jwdavcb7gz1jdcx391xy4s";
+ version = "1.20191219";
+ sha256 = "0yi0i342qh1wm7j81qa6mhyfjp4psbw4vrpp0m1c9zjbymfpcymk";
isLibrary = false;
isExecutable = true;
setupHaskellDepends = [
@@ -97280,8 +97373,8 @@ self: {
}:
mkDerivation {
pname = "gitlab-haskell";
- version = "0.1.4";
- sha256 = "09va5xbb2qya149gzrm3d3q9g6s4axxx6qkv4z764dryqq7fm7ly";
+ version = "0.1.5";
+ sha256 = "01wll1aik3x9bj5z29h12srj7skyqk6v1g4rvrd86zd9zvxqr6cw";
libraryHaskellDepends = [
aeson base bytestring connection http-conduit http-types text time
transformers unliftio unliftio-core
@@ -97858,8 +97951,8 @@ self: {
}:
mkDerivation {
pname = "glib";
- version = "0.13.7.1";
- sha256 = "1h15ir53wc8l5cp09kr71nhk0zn39nm20bmhx2adgp2m68mj5ypp";
+ version = "0.13.8.0";
+ sha256 = "18k1drykl3mpmyj43kp9nvkzr9g3allr19ihscmxwc1w9ss6zklw";
setupHaskellDepends = [ base Cabal gtk2hs-buildtools ];
libraryHaskellDepends = [
base bytestring containers text utf8-string
@@ -97941,8 +98034,7 @@ self: {
testHaskellDepends = [ base HUnit ];
description = "Console IRC client";
license = stdenv.lib.licenses.isc;
- hydraPlatforms = stdenv.lib.platforms.none;
- broken = true;
+ maintainers = with stdenv.lib.maintainers; [ kiwi ];
}) {};
"gll" = callPackage
@@ -101693,8 +101785,8 @@ self: {
}:
mkDerivation {
pname = "gothic";
- version = "0.1.1";
- sha256 = "0bm8m77lcvi9c8smv0z4n23f6gw3aw47g0q47aqjcpipwmjcqvhm";
+ version = "0.1.2";
+ sha256 = "1glfjcisrm97hyja6ijzikmrkillgvrk3xn0gmsmrnfp8mn5jmjp";
libraryHaskellDepends = [
aeson base binary bytestring connection exceptions hashable
http-client http-client-tls http-conduit http-types lens lens-aeson
@@ -102584,8 +102676,8 @@ self: {
}:
mkDerivation {
pname = "graphql";
- version = "0.6.0.0";
- sha256 = "0gippn2y1ngykfz33825r4r4m5km7m8qch7ijics1q9d1jnszs5a";
+ version = "0.6.1.0";
+ sha256 = "0x0526kb29ndrhb9dy9iwxj9r3qij7sy4zjhjqfx3hc7334rdpda";
enableSeparateDataOutput = true;
libraryHaskellDepends = [
aeson base containers megaparsec text transformers
@@ -103277,6 +103369,26 @@ self: {
license = stdenv.lib.licenses.bsd3;
}) {};
+ "groundhog_0_11_0" = callPackage
+ ({ mkDerivation, aeson, attoparsec, base, base64-bytestring
+ , bytestring, containers, monad-control, mtl, resourcet
+ , safe-exceptions, scientific, text, time, transformers
+ , transformers-base, transformers-compat
+ }:
+ mkDerivation {
+ pname = "groundhog";
+ version = "0.11.0";
+ sha256 = "1kx5jdzi7qrb399z23s5khvvllks5qyjl9y5spwssf6d6n9r6w82";
+ libraryHaskellDepends = [
+ aeson attoparsec base base64-bytestring bytestring containers
+ monad-control mtl resourcet safe-exceptions scientific text time
+ transformers transformers-base transformers-compat
+ ];
+ description = "Type-safe datatype-database mapping library";
+ license = stdenv.lib.licenses.bsd3;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ }) {};
+
"groundhog-converters" = callPackage
({ mkDerivation, aeson, base, bimap, bytestring, containers
, groundhog, groundhog-sqlite, groundhog-th, tasty, tasty-hunit
@@ -103320,6 +103432,30 @@ self: {
license = stdenv.lib.licenses.bsd3;
}) {};
+ "groundhog-inspector_0_11_0" = callPackage
+ ({ mkDerivation, aeson-pretty, base, bytestring, cmdargs
+ , containers, groundhog, groundhog-sqlite, groundhog-th, mtl
+ , regex-compat, syb, template-haskell, text, time, transformers
+ }:
+ mkDerivation {
+ pname = "groundhog-inspector";
+ version = "0.11.0";
+ sha256 = "19lvwfg655dg0v6ny64hhdlbdj38w5dbn988kzjyshdjmisswy1r";
+ isLibrary = true;
+ isExecutable = true;
+ libraryHaskellDepends = [
+ aeson-pretty base bytestring containers groundhog groundhog-th
+ regex-compat syb template-haskell text time transformers
+ ];
+ executableHaskellDepends = [
+ base bytestring cmdargs containers groundhog groundhog-sqlite
+ groundhog-th mtl
+ ];
+ description = "Type-safe datatype-database mapping library";
+ license = stdenv.lib.licenses.bsd3;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ }) {};
+
"groundhog-mysql" = callPackage
({ mkDerivation, base, bytestring, containers, groundhog
, monad-control, monad-logger, mysql, mysql-simple, resource-pool
@@ -103337,6 +103473,24 @@ self: {
license = stdenv.lib.licenses.bsd3;
}) {};
+ "groundhog-mysql_0_11" = callPackage
+ ({ mkDerivation, base, bytestring, containers, groundhog
+ , monad-control, monad-logger, mysql, mysql-simple, resource-pool
+ , resourcet, text, time, transformers
+ }:
+ mkDerivation {
+ pname = "groundhog-mysql";
+ version = "0.11";
+ sha256 = "0xir9181c0h5f5hrg1drzd2g7cgr77zghg1i7fcwl6h9prpp6ira";
+ libraryHaskellDepends = [
+ base bytestring containers groundhog monad-control monad-logger
+ mysql mysql-simple resource-pool resourcet text time transformers
+ ];
+ description = "MySQL backend for the groundhog library";
+ license = stdenv.lib.licenses.bsd3;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ }) {};
+
"groundhog-postgresql" = callPackage
({ mkDerivation, aeson, attoparsec, base, blaze-builder, bytestring
, containers, groundhog, monad-control, postgresql-libpq
@@ -103356,6 +103510,25 @@ self: {
license = stdenv.lib.licenses.bsd3;
}) {};
+ "groundhog-postgresql_0_11" = callPackage
+ ({ mkDerivation, aeson, attoparsec, base, bytestring, containers
+ , groundhog, monad-control, postgresql-libpq, postgresql-simple
+ , resource-pool, resourcet, text, time, transformers, vector
+ }:
+ mkDerivation {
+ pname = "groundhog-postgresql";
+ version = "0.11";
+ sha256 = "0c8xqdsv1mi9pp1cnnbj8anf8mb3y6hjg965giw9jsmxf2b4d80x";
+ libraryHaskellDepends = [
+ aeson attoparsec base bytestring containers groundhog monad-control
+ postgresql-libpq postgresql-simple resource-pool resourcet text
+ time transformers vector
+ ];
+ description = "PostgreSQL backend for the groundhog library";
+ license = stdenv.lib.licenses.bsd3;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ }) {};
+
"groundhog-sqlite" = callPackage
({ mkDerivation, base, bytestring, containers, direct-sqlite
, groundhog, monad-control, resource-pool, resourcet, text
@@ -103373,6 +103546,24 @@ self: {
license = stdenv.lib.licenses.bsd3;
}) {};
+ "groundhog-sqlite_0_11_0" = callPackage
+ ({ mkDerivation, base, bytestring, containers, direct-sqlite
+ , groundhog, monad-control, resource-pool, resourcet, text
+ , transformers, unordered-containers
+ }:
+ mkDerivation {
+ pname = "groundhog-sqlite";
+ version = "0.11.0";
+ sha256 = "03vnnja0rbk2v8qws0m37hs6imh001pj5hy00gx5xr7kwayvc13g";
+ libraryHaskellDepends = [
+ base bytestring containers direct-sqlite groundhog monad-control
+ resource-pool resourcet text transformers unordered-containers
+ ];
+ description = "Sqlite3 backend for the groundhog library";
+ license = stdenv.lib.licenses.bsd3;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ }) {};
+
"groundhog-th" = callPackage
({ mkDerivation, aeson, base, bytestring, containers, groundhog
, libyaml, template-haskell, text, time, unordered-containers, yaml
@@ -103389,6 +103580,23 @@ self: {
license = stdenv.lib.licenses.bsd3;
}) {};
+ "groundhog-th_0_11" = callPackage
+ ({ mkDerivation, aeson, base, bytestring, containers, groundhog
+ , libyaml, template-haskell, text, time, unordered-containers, yaml
+ }:
+ mkDerivation {
+ pname = "groundhog-th";
+ version = "0.11";
+ sha256 = "1rqzqwcvk9shgprgfvl54s67n3img2wnvq98mvbnmr6pfxgcy2az";
+ libraryHaskellDepends = [
+ aeson base bytestring containers groundhog libyaml template-haskell
+ text time unordered-containers yaml
+ ];
+ description = "Type-safe datatype-database mapping library";
+ license = stdenv.lib.licenses.bsd3;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ }) {};
+
"group-by-date" = callPackage
({ mkDerivation, base, explicit-exception, filemanip, hsshellscript
, pathtype, time, transformers, unix-compat, utility-ht
@@ -103675,8 +103883,8 @@ self: {
}:
mkDerivation {
pname = "gscholar-rss";
- version = "0.2.3.1";
- sha256 = "0iqrh6h2r7xr9xqk9w7yg1hilghcs0pp5mqq3s2rwmk2drp255l3";
+ version = "0.2.4.1";
+ sha256 = "09f6l7j8pax8c07myg3zbla3davgi88aib3g0nb55vnlcs33qrq6";
isLibrary = false;
isExecutable = true;
executableHaskellDepends = [
@@ -103858,8 +104066,8 @@ self: {
}:
mkDerivation {
pname = "gtk";
- version = "0.15.3";
- sha256 = "0lbf79zfpnz273g7ycr8j7im3bsyzn1d5r9mfv6k80nwzr43dw51";
+ version = "0.15.4";
+ sha256 = "1wm42m4963abqiswkc3ngwf9jm4z9kyyx2h8w064f62ngnkdz84z";
enableSeparateDataOutput = true;
setupHaskellDepends = [ base Cabal gtk2hs-buildtools ];
libraryHaskellDepends = [
@@ -104042,8 +104250,8 @@ self: {
}:
mkDerivation {
pname = "gtk2hs-buildtools";
- version = "0.13.5.4";
- sha256 = "1flxsacxwmabzzalhn8558kmj95z01c0lmikrn56nxh7p62nxm25";
+ version = "0.13.8.0";
+ sha256 = "1645pgrs9cj6imhpdpkbkhr9mn9005wbqlvily5f8iaf02zpvfwd";
isLibrary = true;
isExecutable = true;
enableSeparateDataOutput = true;
@@ -104196,8 +104404,8 @@ self: {
}:
mkDerivation {
pname = "gtk3";
- version = "0.15.3";
- sha256 = "10xkgmgncnwdy0f9f1bkcw68msp575zcwkncw9d2nqpa5cdh2qx7";
+ version = "0.15.4";
+ sha256 = "17g93j8az1gqgf9kxg1k1lls6c0if45bzgbhrc99qgm8s9f2dr1c";
isLibrary = true;
isExecutable = true;
enableSeparateDataOutput = true;
@@ -106466,6 +106674,27 @@ self: {
broken = true;
}) {};
+ "haggle" = callPackage
+ ({ mkDerivation, base, containers, deepseq, fgl, hashable, HUnit
+ , monad-primitive, primitive, QuickCheck, ref-tf, test-framework
+ , test-framework-hunit, test-framework-quickcheck2, vector
+ }:
+ mkDerivation {
+ pname = "haggle";
+ version = "0.1.0.0";
+ sha256 = "0fpbmllp0p23c258gam7xm0dvwphw0zpmydmg9ygl4yl1kiav470";
+ libraryHaskellDepends = [
+ base containers deepseq hashable monad-primitive primitive ref-tf
+ vector
+ ];
+ testHaskellDepends = [
+ base containers fgl HUnit QuickCheck test-framework
+ test-framework-hunit test-framework-quickcheck2
+ ];
+ description = "A graph library offering mutable, immutable, and inductive graphs";
+ license = stdenv.lib.licenses.bsd3;
+ }) {};
+
"haha" = callPackage
({ mkDerivation, base, containers, time }:
mkDerivation {
@@ -107634,6 +107863,17 @@ self: {
license = stdenv.lib.licenses.bsd3;
}) {};
+ "hanabi-dealer" = callPackage
+ ({ mkDerivation, base, containers, random }:
+ mkDerivation {
+ pname = "hanabi-dealer";
+ version = "0.2.0.0";
+ sha256 = "086mvplnkapzc697mmqxi2z4fhm4ix7kjq4fkqzv1yj592qz4q9h";
+ libraryHaskellDepends = [ base containers random ];
+ description = "Hanabi card game";
+ license = stdenv.lib.licenses.bsd3;
+ }) {};
+
"handa-data" = callPackage
({ mkDerivation, base }:
mkDerivation {
@@ -108696,6 +108936,24 @@ self: {
license = stdenv.lib.licenses.bsd2;
}) {};
+ "happy-dot" = callPackage
+ ({ mkDerivation, array, base, clock, happy, HUnit, language-dot
+ , pretty, transformers, xml
+ }:
+ mkDerivation {
+ pname = "happy-dot";
+ version = "1.0.0.0";
+ sha256 = "1m7i6akv2009g1q5jhrv14fkq12kq5zkk11g8f0zsgflljd4w5a2";
+ libraryHaskellDepends = [ array base pretty transformers ];
+ libraryToolDepends = [ happy ];
+ testHaskellDepends = [ array base HUnit pretty transformers xml ];
+ benchmarkHaskellDepends = [
+ array base clock language-dot transformers xml
+ ];
+ description = "Parser for dot made with happy";
+ license = stdenv.lib.licenses.gpl3;
+ }) {};
+
"happy-hour" = callPackage
({ mkDerivation, base, Chart, Chart-diagrams }:
mkDerivation {
@@ -108900,8 +109158,8 @@ self: {
}:
mkDerivation {
pname = "harg";
- version = "0.4.0.0";
- sha256 = "0il36pwzmkc1dj39kybyp6hv4s7d60dl5rx1fkfm23dcg6a9r0dc";
+ version = "0.4.1.0";
+ sha256 = "1h1hdhlm5fjfm5cr052gf6cxp6r4lnz9a3b68ypj4b716hymir44";
libraryHaskellDepends = [
aeson barbies base bytestring directory higgledy
optparse-applicative split text yaml
@@ -109085,8 +109343,8 @@ self: {
}:
mkDerivation {
pname = "hasbolt";
- version = "0.1.3.6";
- sha256 = "0sgxvgvxqykslbjslrb5mzmaaar4nbc59p94qhk7rzbjsas01vp2";
+ version = "0.1.4.0";
+ sha256 = "1varlzj2c0sfxza6wfacrkjxq022qdvbzf8zhi3zbv1fnqqcvz0j";
libraryHaskellDepends = [
base binary bytestring connection containers data-binary-ieee754
data-default mtl network text
@@ -109098,6 +109356,27 @@ self: {
license = stdenv.lib.licenses.bsd3;
}) {};
+ "hasbolt_0_1_4_1" = callPackage
+ ({ mkDerivation, base, binary, bytestring, connection, containers
+ , data-binary-ieee754, data-default, hex, hspec, mtl, network
+ , QuickCheck, text
+ }:
+ mkDerivation {
+ pname = "hasbolt";
+ version = "0.1.4.1";
+ sha256 = "1p2gffh6ym221sgrhlns209p6s0j3qbmam5a0b3s06663qgzvh5b";
+ libraryHaskellDepends = [
+ base binary bytestring connection containers data-binary-ieee754
+ data-default mtl network text
+ ];
+ testHaskellDepends = [
+ base bytestring containers hex hspec QuickCheck text
+ ];
+ description = "Haskell driver for Neo4j 3+ (BOLT protocol)";
+ license = stdenv.lib.licenses.bsd3;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ }) {};
+
"hasbolt-extras" = callPackage
({ mkDerivation, aeson, aeson-casing, base, bytestring, containers
, data-default, doctest, free, hasbolt, lens, mtl
@@ -109106,8 +109385,8 @@ self: {
}:
mkDerivation {
pname = "hasbolt-extras";
- version = "0.0.0.25";
- sha256 = "0cd0c6vcyfzrg3bzs1mv2c7alr7ncz5gkj6r70n2fb41mxnz9i2l";
+ version = "0.0.1.0";
+ sha256 = "1d5n60nsvzkgf4wf2fy99qgp6bby4bmhldycda0hlgkch1m6lqqc";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [
@@ -110680,6 +110959,36 @@ self: {
hydraPlatforms = stdenv.lib.platforms.none;
}) {};
+ "haskell-lsp_0_19_0_0" = callPackage
+ ({ mkDerivation, aeson, async, attoparsec, base, bytestring
+ , containers, data-default, directory, filepath, hashable
+ , haskell-lsp-types, hslogger, hspec, hspec-discover, lens, mtl
+ , network-uri, QuickCheck, quickcheck-instances, rope-utf16-splay
+ , sorted-list, stm, temporary, text, time, unordered-containers
+ }:
+ mkDerivation {
+ pname = "haskell-lsp";
+ version = "0.19.0.0";
+ sha256 = "0cjmjrcd3rg8jc6rfk73jirmvay07jps9gdjd97clxz90w3mm24i";
+ isLibrary = true;
+ isExecutable = true;
+ libraryHaskellDepends = [
+ aeson async attoparsec base bytestring containers data-default
+ directory filepath hashable haskell-lsp-types hslogger lens mtl
+ network-uri rope-utf16-splay sorted-list stm temporary text time
+ unordered-containers
+ ];
+ testHaskellDepends = [
+ aeson base bytestring containers data-default directory filepath
+ hashable hspec lens network-uri QuickCheck quickcheck-instances
+ rope-utf16-splay sorted-list stm text
+ ];
+ testToolDepends = [ hspec-discover ];
+ description = "Haskell library for the Microsoft Language Server Protocol";
+ license = stdenv.lib.licenses.mit;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ }) {};
+
"haskell-lsp-client" = callPackage
({ mkDerivation, aeson, base, bytestring, containers, directory
, haskell-lsp, lens, process, text, unix
@@ -110737,6 +111046,24 @@ self: {
hydraPlatforms = stdenv.lib.platforms.none;
}) {};
+ "haskell-lsp-types_0_19_0_0" = callPackage
+ ({ mkDerivation, aeson, base, bytestring, data-default, deepseq
+ , filepath, hashable, lens, network-uri, scientific, text
+ , unordered-containers
+ }:
+ mkDerivation {
+ pname = "haskell-lsp-types";
+ version = "0.19.0.0";
+ sha256 = "089rxcdz02hq68ihc26r7dwsn8hl7f7096vcb0dyd2jda0ganhm9";
+ libraryHaskellDepends = [
+ aeson base bytestring data-default deepseq filepath hashable lens
+ network-uri scientific text unordered-containers
+ ];
+ description = "Haskell library for the Microsoft Language Server Protocol, data types";
+ license = stdenv.lib.licenses.mit;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ }) {};
+
"haskell-menu" = callPackage
({ mkDerivation, base, containers }:
mkDerivation {
@@ -111437,6 +111764,28 @@ self: {
license = stdenv.lib.licenses.bsd3;
}) {};
+ "haskell-to-elm" = callPackage
+ ({ mkDerivation, aeson, base, bound, elm-syntax, generics-sop
+ , protolude, text, time, unordered-containers
+ }:
+ mkDerivation {
+ pname = "haskell-to-elm";
+ version = "0.2.0.0";
+ sha256 = "0y3ayjfspajnsk6r47fkkqafbf15f9lshgizihndrnb3smkyzgw9";
+ isLibrary = true;
+ isExecutable = true;
+ libraryHaskellDepends = [
+ aeson base bound elm-syntax generics-sop protolude text time
+ unordered-containers
+ ];
+ testHaskellDepends = [
+ aeson base bound elm-syntax generics-sop protolude text time
+ unordered-containers
+ ];
+ description = "Generate Elm types and JSON encoders and decoders from Haskell types";
+ license = stdenv.lib.licenses.bsd3;
+ }) {};
+
"haskell-token-utils" = callPackage
({ mkDerivation, base, containers, Diff, directory, dual-tree, ghc
, ghc-mod, ghc-paths, ghc-prim, ghc-syb-utils, haskell-src-exts
@@ -112371,8 +112720,8 @@ self: {
({ mkDerivation, base, haskell-src-exts }:
mkDerivation {
pname = "haskellish";
- version = "0.1.1";
- sha256 = "1smgr42m4dz6yd8w34dmc3w2l06jllli831bq66l3mdbrfb3964h";
+ version = "0.1.2";
+ sha256 = "0qsd65pf3nfadf98nnabya0x9li0ldq1b3fpdy36k97pmf44x0qw";
libraryHaskellDepends = [ base haskell-src-exts ];
description = "For parsing Haskell-ish languages";
license = stdenv.lib.licenses.bsd3;
@@ -112682,8 +113031,8 @@ self: {
}:
mkDerivation {
pname = "haskoin-bitcoind";
- version = "0.3.0";
- sha256 = "1b46mhjna32n41bj16ca58cijypls1n74aqhk785vla9v9ib9828";
+ version = "0.4.1";
+ sha256 = "1m5j03brslh0xgc7nm2b0cyk8l2zb140f71y5bcj28aaips3yyr0";
libraryHaskellDepends = [
base base16-bytestring bytestring cereal haskoin-core monad-control
mtl network-bitcoin text transformers transformers-base
@@ -112836,8 +113185,8 @@ self: {
}:
mkDerivation {
pname = "haskoin-store";
- version = "0.18.9";
- sha256 = "0gfvlah265mdc52nxkb2mlq1qblli0fm7lrxhwbggjjssj0jbp05";
+ version = "0.19.2";
+ sha256 = "0jrjjxydmm9pncqihks2dl2k22lmryw8cxjdsg3hpkqkzdz8brvi";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [
@@ -113504,18 +113853,19 @@ self: {
}) {};
"haskus-utils-data" = callPackage
- ({ mkDerivation, base, containers, extra, haskus-utils-types, mtl
- , recursion-schemes, transformers
+ ({ mkDerivation, base, containers, doctest, extra, ghc-prim
+ , haskus-utils-types, mtl, recursion-schemes, transformers
}:
mkDerivation {
pname = "haskus-utils-data";
- version = "1.1.1";
- sha256 = "1igwlprfknz3aydls849a3l7agm5zqn8c90aqw547bc0asjcsnll";
+ version = "1.2";
+ sha256 = "0dn07zj9v5yl0mpcnblk2y17x30wg8fag4hv9mfp3kn003217f89";
libraryHaskellDepends = [
- base containers extra haskus-utils-types mtl recursion-schemes
- transformers
+ base containers extra ghc-prim haskus-utils-types mtl
+ recursion-schemes transformers
];
- description = "Haskus utility modules";
+ testHaskellDepends = [ base doctest ];
+ description = "Haskus data utility modules";
license = stdenv.lib.licenses.bsd3;
}) {};
@@ -113523,8 +113873,8 @@ self: {
({ mkDerivation, base, doctest }:
mkDerivation {
pname = "haskus-utils-types";
- version = "1.4.1";
- sha256 = "0nypn55fj86llpgdlsbr5qk7jkix5qazz03f8c5a8kn787n2bkpz";
+ version = "1.5";
+ sha256 = "1mbgnx4i82g9bq1qpvjjs9yb683gfja5bws8y26mzjl4igk6izsy";
libraryHaskellDepends = [ base ];
testHaskellDepends = [ base doctest ];
description = "Haskus types utility modules";
@@ -113538,13 +113888,16 @@ self: {
}:
mkDerivation {
pname = "haskus-utils-variant";
- version = "2.6.1";
- sha256 = "1zq76dsp29warrr0ym4lp9lrgar7yairwp91qklf3k6qb8h41qw8";
+ version = "3.0";
+ sha256 = "128i47aqp1h8j4yganj7l8svdb1ax5vx9h4j55k56wh5yxrg5aan";
libraryHaskellDepends = [
base deepseq exceptions haskus-utils-data haskus-utils-types
template-haskell transformers
];
- testHaskellDepends = [ base doctest tasty tasty-quickcheck ];
+ testHaskellDepends = [
+ base doctest haskus-utils-data haskus-utils-types tasty
+ tasty-quickcheck
+ ];
benchmarkHaskellDepends = [ base criterion deepseq QuickCheck ];
description = "Variant and EADT";
license = stdenv.lib.licenses.bsd3;
@@ -113996,8 +114349,8 @@ self: {
}:
mkDerivation {
pname = "hasql-th";
- version = "0.3.0.1";
- sha256 = "03wfzwf3rr83j158757llq23zi17pkpmpracwisbz4acvk0vb3s0";
+ version = "0.4";
+ sha256 = "0c87l9lf2h6z33apmh13dy9imdv0klpk4p22zmw9i88gg5x91yvw";
libraryHaskellDepends = [
base bytestring case-insensitive containers contravariant
fast-builder foldl hashable hasql headed-megaparsec megaparsec
@@ -114599,10 +114952,8 @@ self: {
}:
mkDerivation {
pname = "haxr";
- version = "3000.11.3";
- sha256 = "1ab422ngg63w91a71j17swzzdxk0y2053fijml0illarcrd77cnj";
- revision = "3";
- editedCabalFile = "1jycnkzcxk6ny3ql5mv438xwmcifxprsrsaxqnbmslm6m43d6yxf";
+ version = "3000.11.3.1";
+ sha256 = "1wyb848mb0b6idkbi5jarsf6qi1zzl3yh6xd05g228kykii8k9mg";
libraryHaskellDepends = [
array base base-compat base64-bytestring blaze-builder bytestring
HaXml HsOpenSSL http-streams http-types io-streams mtl mtl-compat
@@ -116213,8 +116564,8 @@ self: {
}:
mkDerivation {
pname = "hedis";
- version = "0.12.10";
- sha256 = "0n9rm73h9lgrqavzjlakb95jvpg0lfjhj6grb5rgwpi4rhvqiygb";
+ version = "0.12.11";
+ sha256 = "1n83zwg011n9w2v1zz4mwpms9jh3c8mk700zya4as1jg83748xww";
libraryHaskellDepends = [
async base bytestring bytestring-lexing deepseq errors HTTP mtl
network network-uri resource-pool scanner stm text time tls
@@ -118633,23 +118984,28 @@ self: {
}) {};
"hie-bios" = callPackage
- ({ mkDerivation, base, base16-bytestring, bytestring, containers
- , cryptohash-sha1, deepseq, directory, extra, file-embed, filepath
- , ghc, process, temporary, text, time, transformers, unix-compat
+ ({ mkDerivation, base, base16-bytestring, bytestring, conduit
+ , conduit-extra, containers, cryptohash-sha1, deepseq, directory
+ , extra, file-embed, filepath, ghc, hslogger, process, tasty
+ , tasty-hunit, temporary, text, time, transformers, unix-compat
, unordered-containers, vector, yaml
}:
mkDerivation {
pname = "hie-bios";
- version = "0.2.1";
- sha256 = "12gqchrqscf7qnmid3k8wizxax4157dggg6kr1dipbwn36dczhrv";
+ version = "0.3.2";
+ sha256 = "1609rvjgh1laqxl4c1bh0j3bq5yysbbaflx6hn8npr0ckq2ckvir";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [
- base base16-bytestring bytestring containers cryptohash-sha1
- deepseq directory extra file-embed filepath ghc process temporary
- text time transformers unix-compat unordered-containers vector yaml
+ base base16-bytestring bytestring conduit conduit-extra containers
+ cryptohash-sha1 deepseq directory extra file-embed filepath ghc
+ hslogger process temporary text time transformers unix-compat
+ unordered-containers vector yaml
];
executableHaskellDepends = [ base directory filepath ghc ];
+ testHaskellDepends = [
+ base directory filepath ghc tasty tasty-hunit
+ ];
description = "Set up a GHC API session";
license = stdenv.lib.licenses.bsd3;
}) {};
@@ -121470,19 +121826,18 @@ self: {
"hmp3-ng" = callPackage
({ mkDerivation, array, base, binary, bytestring, clock, containers
- , directory, hscurses, mersenne-random, monad-extras, mtl, ncurses
- , pcre-light, process, unix, utf8-string, zlib
+ , directory, hscurses, monad-extras, mtl, ncurses, pcre-light
+ , process, random, unix, utf8-string, zlib
}:
mkDerivation {
pname = "hmp3-ng";
- version = "2.7.3.1";
- sha256 = "1g4r9kkd0cqcarg220bj481b2j1gid68l0dfycy47hl8glqhv2w9";
+ version = "2.9.3";
+ sha256 = "0h1lg4faffqf86wk2hi68x3f0y2r2nypqcvb879wal24whh31v7v";
isLibrary = false;
isExecutable = true;
executableHaskellDepends = [
array base binary bytestring clock containers directory hscurses
- mersenne-random monad-extras mtl pcre-light process unix
- utf8-string zlib
+ monad-extras mtl pcre-light process random unix utf8-string zlib
];
executableSystemDepends = [ ncurses ];
description = "A 2019 fork of an ncurses mp3 player written in Haskell";
@@ -121850,15 +122205,15 @@ self: {
license = stdenv.lib.licenses.bsd3;
}) {};
- "hoauth2_1_9_0" = callPackage
+ "hoauth2_1_9_1" = callPackage
({ mkDerivation, aeson, base, binary, bytestring, exceptions
, http-conduit, http-types, microlens, text, unordered-containers
, uri-bytestring, uri-bytestring-aeson
}:
mkDerivation {
pname = "hoauth2";
- version = "1.9.0";
- sha256 = "1br1g6xp0s73aj8nsx3rjdpji3lvp19b4xaxhn87fqbnnhczg39z";
+ version = "1.9.1";
+ sha256 = "1pm8124x5zdy5zj6qriv16im067dyz9vx5z2ga8c3x6rx06bs15m";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [
@@ -123042,8 +123397,8 @@ self: {
}:
mkDerivation {
pname = "hoppy-docs";
- version = "0.6.0";
- sha256 = "0wgzjzjnj1f9mw1099l5h2fh8y91v45a243paksb5dp76y27baxg";
+ version = "0.7.0";
+ sha256 = "1kj72jn0sfvf68lf9n2v7v2qqw1g3kjyr6s6zlyvs6p2k3fw4ync";
libraryHaskellDepends = [
base haskell-src hoppy-generator hoppy-runtime
];
@@ -123059,8 +123414,8 @@ self: {
}:
mkDerivation {
pname = "hoppy-generator";
- version = "0.6.0";
- sha256 = "1y10s0lbc0k7vir2h7bgghxmjh3zgja764i6w1j056rr0qh9v5bj";
+ version = "0.7.0";
+ sha256 = "0v21a3nwk94ggrk8fyjmlb93rnrsh7s3xbqnk1p236h0gycsh1q3";
libraryHaskellDepends = [
base bytestring containers directory filepath haskell-src mtl
process temporary text
@@ -123075,8 +123430,8 @@ self: {
({ mkDerivation, base, Cabal, containers, directory, filepath }:
mkDerivation {
pname = "hoppy-runtime";
- version = "0.6.0";
- sha256 = "0zlh84ibyvyl9wxmiyjgm26s6avjvqphg17bmsls69pqawzzgphy";
+ version = "0.7.0";
+ sha256 = "0rkyili7kbxj22rvs4056vhcgwpjzgigmwcrj6iph5pfzxnnl40q";
libraryHaskellDepends = [
base Cabal containers directory filepath
];
@@ -123090,8 +123445,8 @@ self: {
({ mkDerivation, base, filepath, haskell-src, hoppy-generator }:
mkDerivation {
pname = "hoppy-std";
- version = "0.6.0";
- sha256 = "0z7jmhv9xkmky8gn0qgk6f3l3w943qvfhwlq18p1gf6x7iq1ijdg";
+ version = "0.7.0";
+ sha256 = "0yr73dalwljp23ls9za07cnabs65aypgbrjjv76zhxbsqqcc82a3";
enableSeparateDataOutput = true;
libraryHaskellDepends = [
base filepath haskell-src hoppy-generator
@@ -124597,6 +124952,18 @@ self: {
license = "GPL";
}) {};
+ "hs-bibutils_6_8_0_0" = callPackage
+ ({ mkDerivation, base, syb }:
+ mkDerivation {
+ pname = "hs-bibutils";
+ version = "6.8.0.0";
+ sha256 = "0syhh413qmajv56gaqz7p3b2yb6f0x9cx8zgds6fa3yzcqw7zasc";
+ libraryHaskellDepends = [ base syb ];
+ description = "Haskell bindings to bibutils, the bibliography conversion utilities";
+ license = "GPL";
+ hydraPlatforms = stdenv.lib.platforms.none;
+ }) {};
+
"hs-blake2" = callPackage
({ mkDerivation, base, bytestring, bytestring-arbitrary, criterion
, cryptohash, libb2, QuickCheck, tasty, tasty-quickcheck
@@ -126902,8 +127269,8 @@ self: {
}:
mkDerivation {
pname = "hsinspect";
- version = "0.0.8";
- sha256 = "1lqczihv7qjh1yy51qds4sg95riwaq1i0fd9mgn3kvhgbyx1r9nn";
+ version = "0.0.10";
+ sha256 = "0ydb0dqy3javffb8a4gfn840wlh2l3ixxxzj7sc53bqanadlg1in";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [
@@ -130362,6 +130729,33 @@ self: {
license = stdenv.lib.licenses.bsd3;
}) {};
+ "http-download_0_1_0_1" = callPackage
+ ({ mkDerivation, base, base64-bytestring, bytestring, conduit
+ , conduit-extra, cryptonite, cryptonite-conduit, directory
+ , exceptions, filepath, hspec, hspec-discover, http-client
+ , http-conduit, http-types, memory, path, path-io, retry, rio
+ , rio-prettyprint
+ }:
+ mkDerivation {
+ pname = "http-download";
+ version = "0.1.0.1";
+ sha256 = "1f1haybqflprm3gwnxsyi6pyz7k4b5qyiq4wqq81wb7nsrr4h943";
+ libraryHaskellDepends = [
+ base base64-bytestring bytestring conduit conduit-extra cryptonite
+ cryptonite-conduit directory exceptions filepath http-client
+ http-conduit http-types memory path path-io retry rio
+ rio-prettyprint
+ ];
+ testHaskellDepends = [
+ base cryptonite hspec hspec-discover http-client path path-io retry
+ rio rio-prettyprint
+ ];
+ testToolDepends = [ hspec-discover ];
+ description = "Verified downloads with retries";
+ license = stdenv.lib.licenses.bsd3;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ }) {};
+
"http-encodings" = callPackage
({ mkDerivation, base, bytestring, HTTP, iconv, mime, mtl, parsec
, text, utf8-string, zlib
@@ -130884,37 +131278,6 @@ self: {
}) {};
"http2" = callPackage
- ({ mkDerivation, aeson, aeson-pretty, array, base
- , base16-bytestring, bytestring, case-insensitive, containers
- , criterion, directory, doctest, filepath, Glob, heaps, hspec
- , mwc-random, network-byte-order, psqueues, stm, text
- , unordered-containers, vector, word8
- }:
- mkDerivation {
- pname = "http2";
- version = "1.6.5";
- sha256 = "1vlmy8vnp6ml2n2pr11aa5fzigldsscgzmibrni64ykgfvpd3sqn";
- isLibrary = true;
- isExecutable = true;
- libraryHaskellDepends = [
- array base bytestring case-insensitive containers
- network-byte-order psqueues stm
- ];
- testHaskellDepends = [
- aeson aeson-pretty array base base16-bytestring bytestring
- case-insensitive containers directory doctest filepath Glob hspec
- network-byte-order psqueues stm text unordered-containers vector
- word8
- ];
- benchmarkHaskellDepends = [
- array base bytestring case-insensitive containers criterion heaps
- mwc-random network-byte-order psqueues stm
- ];
- description = "HTTP/2 library including frames, priority queues and HPACK";
- license = stdenv.lib.licenses.bsd3;
- }) {};
-
- "http2_2_0_3" = callPackage
({ mkDerivation, aeson, aeson-pretty, array, base
, base16-bytestring, bytestring, case-insensitive, containers
, directory, doctest, filepath, gauge, Glob, heaps, hspec
@@ -130943,7 +131306,6 @@ self: {
];
description = "HTTP/2 library";
license = stdenv.lib.licenses.bsd3;
- hydraPlatforms = stdenv.lib.platforms.none;
}) {};
"http2-client" = callPackage
@@ -131820,14 +132182,14 @@ self: {
license = stdenv.lib.licenses.bsd3;
}) {};
- "hvega_0_4_1_1" = callPackage
+ "hvega_0_4_1_2" = callPackage
({ mkDerivation, aeson, aeson-pretty, base, bytestring, containers
, filepath, tasty, tasty-golden, text, unordered-containers, vector
}:
mkDerivation {
pname = "hvega";
- version = "0.4.1.1";
- sha256 = "1dmb5w250l11p7hyzi7v9b286s4qdalg41bz1ckahrwaaaz8qa1d";
+ version = "0.4.1.2";
+ sha256 = "0vf7hwhq8s8w3zjgag80gm54bxk5bm9q0mmriqy1790vrxb51276";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [
@@ -131919,25 +132281,25 @@ self: {
broken = true;
}) {};
- "hw-balancedparens_0_3_0_2" = callPackage
- ({ mkDerivation, base, criterion, deepseq, hedgehog, hspec
- , hspec-discover, hw-bits, hw-excess, hw-fingertree
- , hw-hspec-hedgehog, hw-prim, hw-rankselect-base, transformers
- , vector
+ "hw-balancedparens_0_3_0_3" = callPackage
+ ({ mkDerivation, base, criterion, deepseq, doctest
+ , doctest-discover, hedgehog, hspec, hspec-discover, hw-bits
+ , hw-excess, hw-fingertree, hw-hspec-hedgehog, hw-prim
+ , hw-rankselect-base, transformers, vector
}:
mkDerivation {
pname = "hw-balancedparens";
- version = "0.3.0.2";
- sha256 = "1x961b5jq5hal5k3dc98xpldpsillxf4vkbc4m7yw05bmas0smia";
+ version = "0.3.0.3";
+ sha256 = "07jng6plapizb0kazqfd4x7y5yazhggwvagkwc273a92ynw57bsi";
libraryHaskellDepends = [
base deepseq hedgehog hspec hw-bits hw-excess hw-fingertree hw-prim
hw-rankselect-base vector
];
testHaskellDepends = [
- base hedgehog hspec hw-bits hw-hspec-hedgehog hw-prim
- hw-rankselect-base transformers vector
+ base doctest doctest-discover hedgehog hspec hw-bits
+ hw-hspec-hedgehog hw-prim hw-rankselect-base transformers vector
];
- testToolDepends = [ hspec-discover ];
+ testToolDepends = [ doctest-discover hspec-discover ];
benchmarkHaskellDepends = [
base criterion hedgehog hw-bits hw-prim vector
];
@@ -134359,8 +134721,8 @@ self: {
({ mkDerivation, base, containers, QuickCheck, text }:
mkDerivation {
pname = "hzenhan";
- version = "0.0.1";
- sha256 = "1n7nrkngr395n6dhgdkqwbx2dmq6hmmfggyv62nr29kxf580hd8k";
+ version = "0.0.4";
+ sha256 = "1gbrzjjdihgzj63sp2h4762zybyhd5rxa8rpvsjra21qvvch12mx";
libraryHaskellDepends = [ base containers text ];
testHaskellDepends = [ base containers QuickCheck text ];
description = "Zenhan library for Haskell";
@@ -135276,6 +135638,8 @@ self: {
pname = "ihaskell";
version = "0.10.0.2";
sha256 = "01jk48kj5z7n547z1lg78c0bphpjyv2nfzjrh4jv7xygkw5asqxb";
+ revision = "1";
+ editedCabalFile = "0jhgnw5wrpmbp3g6zllwlmmyzyja5ry8i7dss7q8gpbvk2inlfl3";
isLibrary = true;
isExecutable = true;
enableSeparateDataOutput = true;
@@ -135435,8 +135799,8 @@ self: {
({ mkDerivation, aeson, base, hvega, ihaskell, text }:
mkDerivation {
pname = "ihaskell-hvega";
- version = "0.2.0.2";
- sha256 = "0xbv8801wxslcs9fsjssvdldz6nq8zmxm6l4pwkv8zpasqzq4k9q";
+ version = "0.2.1.0";
+ sha256 = "1zpr00zn3nap5w1baih975r8hvaqqyp7y4acy10p688imicg5wgy";
libraryHaskellDepends = [ aeson base hvega ihaskell text ];
description = "IHaskell display instance for hvega types";
license = stdenv.lib.licenses.bsd3;
@@ -135615,6 +135979,24 @@ self: {
license = stdenv.lib.licenses.bsd3;
}) {};
+ "ilist_0_4_0_0" = callPackage
+ ({ mkDerivation, base, criterion, hspec, lens, loop, transformers
+ , vector
+ }:
+ mkDerivation {
+ pname = "ilist";
+ version = "0.4.0.0";
+ sha256 = "105qz5x03fa713ghxvmivawsaq3l9zf5ab4n09j7i7ryj3dwp4nv";
+ libraryHaskellDepends = [ base ];
+ testHaskellDepends = [ base hspec transformers ];
+ benchmarkHaskellDepends = [
+ base criterion lens loop transformers vector
+ ];
+ description = "Optimised list functions for doing index-related things";
+ license = stdenv.lib.licenses.mpl20;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ }) {};
+
"illuminate" = callPackage
({ mkDerivation, alex, array, base, containers, filemanip, filepath
, hscolour, html, utf8-string, xhtml
@@ -137648,6 +138030,17 @@ self: {
broken = true;
}) {};
+ "intcode" = callPackage
+ ({ mkDerivation, base, containers, primitive }:
+ mkDerivation {
+ pname = "intcode";
+ version = "0.1.0.0";
+ sha256 = "0lca33wd0dfrih0si6w5h6wi5rmv6sx3j5kam9q4j0kc1laj268r";
+ libraryHaskellDepends = [ base containers primitive ];
+ description = "Advent of Code 2019 intcode interpreter";
+ license = stdenv.lib.licenses.isc;
+ }) {};
+
"integer-gmp_1_0_2_0" = callPackage
({ mkDerivation, ghc-prim }:
mkDerivation {
@@ -138206,8 +138599,8 @@ self: {
({ mkDerivation, base, containers, text, vector, word8 }:
mkDerivation {
pname = "intmap-graph";
- version = "1.0";
- sha256 = "066js08brg2prmnvqchmpp42i7sd0jn7lxpzsalnvzivi49nkbx4";
+ version = "1.0.0.1";
+ sha256 = "0mrwimi4r1y60l674w8vavv4c5fzqm6v1f71hkcvxkwa3fpl56m6";
libraryHaskellDepends = [ base containers text vector word8 ];
description = "A graph library that allows to explore edges after their type";
license = stdenv.lib.licenses.bsd3;
@@ -138949,6 +139342,34 @@ self: {
license = stdenv.lib.licenses.mit;
}) {};
+ "ipfs" = callPackage
+ ({ mkDerivation, aeson, base, bytestring, data-has, directory
+ , directory-tree, doctest, envy, flow, Glob, http-client, ip, lens
+ , lens-aeson, monad-logger, QuickCheck, regex-compat, rio
+ , servant-client, servant-client-core, servant-multipart
+ , servant-server, swagger2, text, vector, yaml
+ }:
+ mkDerivation {
+ pname = "ipfs";
+ version = "1.0.0";
+ sha256 = "0grbmjl2dybqp3c8ljgj6ql0g3yivxb0nsbyw3bwk1a4g2c9bd0g";
+ libraryHaskellDepends = [
+ aeson base bytestring data-has envy flow Glob http-client ip lens
+ monad-logger regex-compat rio servant-client servant-client-core
+ servant-multipart servant-server swagger2 text vector
+ ];
+ testHaskellDepends = [
+ aeson base bytestring data-has directory directory-tree doctest
+ envy flow Glob http-client ip lens lens-aeson monad-logger
+ QuickCheck regex-compat rio servant-client servant-client-core
+ servant-multipart servant-server swagger2 text vector yaml
+ ];
+ description = "Access IPFS locally and remotely";
+ license = stdenv.lib.licenses.agpl3Plus;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ broken = true;
+ }) {};
+
"ipfs-api" = callPackage
({ mkDerivation, aeson, base, bytestring, http-media, http-types
, servant, text
@@ -141132,14 +141553,14 @@ self: {
}) {};
"jira-wiki-markup" = callPackage
- ({ mkDerivation, base, parsec, tasty, tasty-hunit, text }:
+ ({ mkDerivation, base, mtl, parsec, tasty, tasty-hunit, text }:
mkDerivation {
pname = "jira-wiki-markup";
- version = "0.1.1";
- sha256 = "1a6vk4aryppay87fyirxprwklqvpjh6nj9x2k9s3ybrwhapf1wdx";
+ version = "1.0.0";
+ sha256 = "1sl2jjcsqg61si33mxjwpf8zdn56kbbgcwqqqzbgifx2qbv4wmf8";
isLibrary = true;
isExecutable = true;
- libraryHaskellDepends = [ base parsec text ];
+ libraryHaskellDepends = [ base mtl parsec text ];
executableHaskellDepends = [ base text ];
testHaskellDepends = [ base parsec tasty tasty-hunit text ];
description = "Handle Jira wiki markup";
@@ -141312,6 +141733,28 @@ self: {
broken = true;
}) {};
+ "jobs-ui" = callPackage
+ ({ mkDerivation, base, bytestring, containers, deepseq
+ , digestive-functors, digestive-functors-lucid, file-embed
+ , http-types, hvect, lucid, mtl, pretty-relative-time, Spock
+ , Spock-digestive, Spock-lucid, stm, text, time, transformers, warp
+ }:
+ mkDerivation {
+ pname = "jobs-ui";
+ version = "0.2.0.0";
+ sha256 = "0k5n1nqxlqlqnxcznmwqz9m4sdy8hhg3gv8m1bikc3d5im1rap7j";
+ libraryHaskellDepends = [
+ base bytestring containers deepseq digestive-functors
+ digestive-functors-lucid file-embed http-types hvect lucid mtl
+ pretty-relative-time Spock Spock-digestive Spock-lucid stm text
+ time transformers warp
+ ];
+ description = "A library for creating a jobs management website running custom jobs";
+ license = stdenv.lib.licenses.asl20;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ broken = true;
+ }) {};
+
"join" = callPackage
({ mkDerivation, base, haskell98, multisetrewrite, stm }:
mkDerivation {
@@ -141561,36 +142004,36 @@ self: {
}) {};
"jsaddle" = callPackage
- ({ mkDerivation, aeson, attoparsec, base, base64-bytestring
- , bytestring, containers, deepseq, exceptions, filepath, ghc-prim
- , http-types, lens, primitive, process, random, ref-tf, scientific
- , stm, text, time, transformers, unliftio-core
+ ({ mkDerivation, aeson, attoparsec, base, base-compat
+ , base64-bytestring, bytestring, containers, deepseq, exceptions
+ , filepath, ghc-prim, http-types, lens, primitive, process, random
+ , ref-tf, scientific, stm, text, time, transformers, unliftio-core
, unordered-containers, vector
}:
mkDerivation {
pname = "jsaddle";
- version = "0.9.6.0";
- sha256 = "1ym0h00icxh4dwy3xwvxh985hr3ly7r147vm7spzb44xfn532pa8";
+ version = "0.9.7.0";
+ sha256 = "1hd1ybacng2qydf23dn4qggls2mmz21aay7q947ifdaxg83mv6aq";
libraryHaskellDepends = [
- aeson attoparsec base base64-bytestring bytestring containers
- deepseq exceptions filepath ghc-prim http-types lens primitive
- process random ref-tf scientific stm text time transformers
- unliftio-core unordered-containers vector
+ aeson attoparsec base base-compat base64-bytestring bytestring
+ containers deepseq exceptions filepath ghc-prim http-types lens
+ primitive process random ref-tf scientific stm text time
+ transformers unliftio-core unordered-containers vector
];
description = "Interface for JavaScript that works with GHCJS and GHC";
license = stdenv.lib.licenses.mit;
}) {};
"jsaddle-clib" = callPackage
- ({ mkDerivation, aeson, base, bytestring, data-default, jsaddle
- , text
+ ({ mkDerivation, aeson, base, base-compat, bytestring, data-default
+ , jsaddle, text
}:
mkDerivation {
pname = "jsaddle-clib";
- version = "0.9.6.0";
- sha256 = "0nfdn5s11rzzma5s4rajs1477sy0xsa7wc19q00xfbpfkdq48193";
+ version = "0.9.7.0";
+ sha256 = "1n1mafr6gnfzmndjs4w7g813dx2khaq4knkhcaqbr2lsbr5yrmg1";
libraryHaskellDepends = [
- aeson base bytestring data-default jsaddle text
+ aeson base base-compat bytestring data-default jsaddle text
];
description = "Interface for JavaScript that works with GHCJS and GHC";
license = stdenv.lib.licenses.mit;
@@ -141602,10 +142045,8 @@ self: {
}:
mkDerivation {
pname = "jsaddle-dom";
- version = "0.9.3.2";
- sha256 = "1qc135w1y4f2mbky36dmb0ggcbwkv1vnmszw5lkhkxhkcag2sf07";
- revision = "1";
- editedCabalFile = "0vhqqbcpbrsnbmix0wkkm1d21qwrpicbzjwy42p48g7whg0lf0d5";
+ version = "0.9.4.0";
+ sha256 = "0k70x8dv67v585qm9ycb1m32cc47zvr2ka8nbqxazyw09i498h22";
setupHaskellDepends = [ base Cabal ];
libraryHaskellDepends = [
base base-compat exceptions jsaddle lens text transformers
@@ -141638,8 +142079,8 @@ self: {
}:
mkDerivation {
pname = "jsaddle-warp";
- version = "0.9.6.0";
- sha256 = "0j34cix4g5zfbbac6cggcp224s69ijirifg69js8lh3x8n5sgpg5";
+ version = "0.9.7.0";
+ sha256 = "09pqcnyy2pj48xm8qzs1jyav8a4si0bfw43w0qql74ak137ll60c";
libraryHaskellDepends = [
aeson base bytestring containers foreign-store http-types jsaddle
stm text time transformers wai wai-websockets warp websockets
@@ -141665,8 +142106,8 @@ self: {
}:
mkDerivation {
pname = "jsaddle-webkit2gtk";
- version = "0.9.6.0";
- sha256 = "0daw67lxqbbw643mvna5dr9xqrqacqp2i3gqpkarb2xadq5da2lq";
+ version = "0.9.7.0";
+ sha256 = "1q4sz2s95pknsr6r8cdqrlmw0b64q4nzllrlhb80knpfxamzyjzp";
libraryHaskellDepends = [
aeson base bytestring directory gi-gio gi-glib gi-gtk
gi-javascriptcore gi-webkit2 haskell-gi-base haskell-gi-overloading
@@ -141702,8 +142143,8 @@ self: {
}:
mkDerivation {
pname = "jsaddle-wkwebview";
- version = "0.9.6.0";
- sha256 = "1i5pmwj9ijd3rm1gvyp8n64q1gr1qnijj4ry6mk4h8lij4d9ic67";
+ version = "0.9.7.0";
+ sha256 = "04ni6q8x9c5zqmdm1kfp3yygcflpdf5hx4r568fm5b6rjxi3zhf6";
libraryHaskellDepends = [
aeson base bytestring containers data-default directory jsaddle
text
@@ -141981,6 +142422,24 @@ self: {
broken = true;
}) {};
+ "json-directory" = callPackage
+ ({ mkDerivation, aeson, base, bytestring, directory, filepath, text
+ , unordered-containers
+ }:
+ mkDerivation {
+ pname = "json-directory";
+ version = "0.1.0.0";
+ sha256 = "1pkna0f0al0p391s6i3rnylmh5ydf8jphd728cr14gqlvfq3hqy8";
+ isLibrary = true;
+ isExecutable = true;
+ libraryHaskellDepends = [
+ aeson base directory filepath text unordered-containers
+ ];
+ executableHaskellDepends = [ aeson base bytestring ];
+ description = "Load JSON from files in a directory structure";
+ license = stdenv.lib.licenses.bsd3;
+ }) {};
+
"json-encoder" = callPackage
({ mkDerivation, base, base-prelude, bytestring
, bytestring-tree-builder, contravariant, contravariant-extras
@@ -146692,18 +147151,18 @@ self: {
}) {};
"language-bash" = callPackage
- ({ mkDerivation, base, parsec, pretty, process, QuickCheck, tasty
- , tasty-expected-failure, tasty-hunit, tasty-quickcheck
- , transformers
+ ({ mkDerivation, base, directory, filepath, parsec, prettyprinter
+ , process, QuickCheck, tasty, tasty-expected-failure, tasty-golden
+ , tasty-hunit, tasty-quickcheck, transformers
}:
mkDerivation {
pname = "language-bash";
- version = "0.8.0";
- sha256 = "16lkqy1skc82cyxsh313184dbm31hrsi3w1729ci8lw8dybmz6ax";
- libraryHaskellDepends = [ base parsec pretty transformers ];
+ version = "0.9.0";
+ sha256 = "1n4icdd478b1j0rr79qyxx2g4xm8yvsplfw3mkdsskb79zmq5gga";
+ libraryHaskellDepends = [ base parsec prettyprinter transformers ];
testHaskellDepends = [
- base parsec process QuickCheck tasty tasty-expected-failure
- tasty-hunit tasty-quickcheck
+ base directory filepath parsec process QuickCheck tasty
+ tasty-expected-failure tasty-golden tasty-hunit tasty-quickcheck
];
description = "Parsing and pretty-printing Bash shell scripts";
license = stdenv.lib.licenses.bsd3;
@@ -149937,6 +150396,25 @@ self: {
broken = true;
}) {};
+ "lex-applicative" = callPackage
+ ({ mkDerivation, base, dlist, gauge, hs-functors
+ , parser-combinators, regex-applicative, text, ucd
+ , unicode-transforms, util
+ }:
+ mkDerivation {
+ pname = "lex-applicative";
+ version = "0.0.0.1";
+ sha256 = "0dc48xgvky480a1rl9zfyz3ychjlxnyssdmpbzkb795kdkmny2nz";
+ libraryHaskellDepends = [
+ base dlist hs-functors parser-combinators regex-applicative text
+ ucd unicode-transforms util
+ ];
+ testHaskellDepends = [ base util ];
+ benchmarkHaskellDepends = [ base gauge util ];
+ description = "See README for more info";
+ license = stdenv.lib.licenses.bsd3;
+ }) {};
+
"lexer-applicative" = callPackage
({ mkDerivation, base, deepseq, regex-applicative, srcloc, tasty
, tasty-hunit
@@ -150155,8 +150633,8 @@ self: {
}:
mkDerivation {
pname = "libarchive";
- version = "2.1.2.0";
- sha256 = "00j1xrfwcmfb2dhz04dy4p2aryp751mmp6hpdcbm2xdhzdxrgkjf";
+ version = "2.1.3.2";
+ sha256 = "1z934rl8dm4ncp7qs6kqm2hiir41k5ysrpp44nb6rgzs8f8x46mr";
setupHaskellDepends = [ base Cabal chs-cabal ];
libraryHaskellDepends = [
base bytestring composition-prelude deepseq dlist filepath mtl
@@ -151372,8 +151850,8 @@ self: {
}:
mkDerivation {
pname = "lightstep-haskell";
- version = "0.4.4";
- sha256 = "0y1pvb4ic9q3ma9vjlsg0spw3wq6ll9za8nys88083bm08098wfd";
+ version = "0.4.5";
+ sha256 = "19bzwx2vklagyddr3cnk33ydlwyjnq12chbmj3djg9a8ar9rsrph";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [
@@ -155389,7 +155867,7 @@ self: {
license = stdenv.lib.licenses.bsd3;
}) {};
- "lsp-test_0_8_2_0" = callPackage
+ "lsp-test_0_9_0_0" = callPackage
({ mkDerivation, aeson, aeson-pretty, ansi-terminal, async, base
, bytestring, conduit, conduit-parse, containers, data-default
, Diff, directory, filepath, haskell-lsp, hspec, lens, mtl
@@ -155398,8 +155876,8 @@ self: {
}:
mkDerivation {
pname = "lsp-test";
- version = "0.8.2.0";
- sha256 = "1762avrs4fkkd9v8i76giaf6km5f3lds5laickn7la7zq7ysh8a3";
+ version = "0.9.0.0";
+ sha256 = "0igd27msf3ya4i3pby434d0pa51qpr27vxyfv0q4i38ajj4ndsx4";
libraryHaskellDepends = [
aeson aeson-pretty ansi-terminal async base bytestring conduit
conduit-parse containers data-default Diff directory filepath
@@ -156079,8 +156557,8 @@ self: {
}:
mkDerivation {
pname = "lzlib";
- version = "0.3.0.1";
- sha256 = "0rq7kafqnv16313ymcq6vcslgf4ls4zjw7n5i73vp7iwsh80pl5d";
+ version = "0.3.0.5";
+ sha256 = "0mlwcchikmiaq6scs48g2snaiwcznwrcfksn4yij4hagjz734rpq";
libraryHaskellDepends = [ base bytestring ];
libraryToolDepends = [ c2hs ];
testHaskellDepends = [ base bytestring directory hspec ];
@@ -157727,19 +158205,17 @@ self: {
}:
mkDerivation {
pname = "map-reduce-folds";
- version = "0.1.0.1";
- sha256 = "0jvgg1wk8qaxd7w3d5y7hr62xswy7xqs7b12jdjwzxm7d6k47lvq";
- isLibrary = true;
- isExecutable = true;
+ version = "0.1.0.3";
+ sha256 = "0hkdsip3d9nvdalsra7bg7ynah3vv46lg07c7f01psv031gkhgik";
libraryHaskellDepends = [
base containers discrimination foldl hashable hashtables parallel
profunctors split streaming streamly text unordered-containers
vector
];
- executableHaskellDepends = [
- base containers foldl profunctors text unordered-containers
+ testHaskellDepends = [
+ base containers foldl hedgehog profunctors text
+ unordered-containers
];
- testHaskellDepends = [ base containers foldl hedgehog ];
benchmarkHaskellDepends = [
base containers criterion deepseq foldl profunctors random text
unordered-containers
@@ -157835,6 +158311,17 @@ self: {
license = stdenv.lib.licenses.bsd3;
}) {};
+ "maquinitas-tidal" = callPackage
+ ({ mkDerivation, base }:
+ mkDerivation {
+ pname = "maquinitas-tidal";
+ version = "0.1.0";
+ sha256 = "1gdbcjhcdgk1jx674rbh4lr1xbcks18xiygywsh3pv846wh3m0n6";
+ libraryHaskellDepends = [ base ];
+ description = "library for MIDI control of hardware";
+ license = stdenv.lib.licenses.mit;
+ }) {};
+
"marihana" = callPackage
({ mkDerivation, base, directory, filepath, process }:
mkDerivation {
@@ -162851,8 +163338,8 @@ self: {
({ mkDerivation, base, vector }:
mkDerivation {
pname = "mmsyn2";
- version = "0.1.6.1";
- sha256 = "0z9crc0x1mi467a3b1q5xrj7syp2m8zb1p69w8l9bhjhab780ljy";
+ version = "0.1.7.0";
+ sha256 = "1laskxwmylmg7mzm4h6z013s7rhfxf9y1mrvy4dp1cc80kq3scg0";
libraryHaskellDepends = [ base vector ];
description = "The library that can be used for multiple (Ord a) => a -> b transformations";
license = stdenv.lib.licenses.mit;
@@ -162864,8 +163351,8 @@ self: {
({ mkDerivation, base, directory }:
mkDerivation {
pname = "mmsyn3";
- version = "0.1.3.0";
- sha256 = "0asxxv2ykwn82lr744ihfip8lhck888l3rvn4qadjdapv1sn3zfx";
+ version = "0.1.4.0";
+ sha256 = "1i93744jprkg94lwcas2hvb341m6j08ncn1lzlz6d8z2blpd5z4w";
libraryHaskellDepends = [ base directory ];
description = "A small library to deal with executable endings";
license = stdenv.lib.licenses.mit;
@@ -162876,8 +163363,8 @@ self: {
}:
mkDerivation {
pname = "mmsyn4";
- version = "0.1.2.0";
- sha256 = "0q3lxkfknmw1jfv8kf3vz09zdkxqrqpzdb5zxxmy1v92g8hgvxs6";
+ version = "0.1.5.0";
+ sha256 = "0bwdngcasppsfk7znijzimgrrbiilapz4cqg45j2xvd5niaqkfkm";
isLibrary = false;
isExecutable = true;
executableHaskellDepends = [
@@ -162906,8 +163393,8 @@ self: {
}:
mkDerivation {
pname = "mmsyn6ukr";
- version = "0.5.1.0";
- sha256 = "1jmbfs0yi7r9lmaxq3dfyrw1rrwhknb7v4xfhrz3w7s8jg3vqs2x";
+ version = "0.6.2.0";
+ sha256 = "1qmyak0srd3ksj8kk8a8dyy6cbg9kdacdlldnpw46778a5792k0m";
isLibrary = true;
isExecutable = true;
enableSeparateDataOutput = true;
@@ -162923,6 +163410,50 @@ self: {
broken = true;
}) {};
+ "mmsyn7h" = callPackage
+ ({ mkDerivation, base, bytestring, directory, mmsyn2, mmsyn3
+ , mmsyn6ukr, process, vector
+ }:
+ mkDerivation {
+ pname = "mmsyn7h";
+ version = "0.2.1.0";
+ sha256 = "0ip5w42wrng87lyygawqdfwfi5ba9qam5ryc1mf7mzfcfajpfh3b";
+ isLibrary = true;
+ isExecutable = true;
+ libraryHaskellDepends = [
+ base bytestring directory mmsyn2 mmsyn3 mmsyn6ukr process vector
+ ];
+ executableHaskellDepends = [
+ base bytestring directory mmsyn2 mmsyn3 mmsyn6ukr process vector
+ ];
+ description = "A program and a library that produces a sound recording specified by the Ukrainian text";
+ license = stdenv.lib.licenses.mit;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ broken = true;
+ }) {};
+
+ "mmsyn7ukr" = callPackage
+ ({ mkDerivation, base, bytestring, directory, mmsyn2, mmsyn3
+ , mmsyn6ukr, process, vector
+ }:
+ mkDerivation {
+ pname = "mmsyn7ukr";
+ version = "0.3.0.1";
+ sha256 = "0pl8yhc1c888xxbn5y6yksdfdwakx46c9nr1mwv474ra266fkcmp";
+ isLibrary = true;
+ isExecutable = true;
+ libraryHaskellDepends = [
+ base bytestring directory mmsyn2 mmsyn3 mmsyn6ukr process vector
+ ];
+ executableHaskellDepends = [
+ base bytestring directory mmsyn2 mmsyn3 mmsyn6ukr process vector
+ ];
+ description = "A simple basic interface to some SoX functionality or to produce a voice that can be used by mmsyn7h";
+ license = stdenv.lib.licenses.mit;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ broken = true;
+ }) {};
+
"mmtf" = callPackage
({ mkDerivation, array, base, binary, bytestring, containers
, data-msgpack, deepseq, hspec, http-conduit, QuickCheck, text
@@ -165093,6 +165624,30 @@ self: {
license = stdenv.lib.licenses.mit;
}) {};
+ "mono-traversable_1_0_15_1" = callPackage
+ ({ mkDerivation, base, bytestring, containers, foldl, gauge
+ , hashable, hspec, HUnit, mwc-random, QuickCheck, semigroups, split
+ , text, transformers, unordered-containers, vector
+ , vector-algorithms
+ }:
+ mkDerivation {
+ pname = "mono-traversable";
+ version = "1.0.15.1";
+ sha256 = "1psxhfjmpv3y54wy8f8dwa43finlj7aw2mry67pg521gxmwmppy2";
+ libraryHaskellDepends = [
+ base bytestring containers hashable split text transformers
+ unordered-containers vector vector-algorithms
+ ];
+ testHaskellDepends = [
+ base bytestring containers foldl hspec HUnit QuickCheck semigroups
+ text transformers unordered-containers vector
+ ];
+ benchmarkHaskellDepends = [ base gauge mwc-random vector ];
+ description = "Type classes for mapping, folding, and traversing monomorphic containers";
+ license = stdenv.lib.licenses.mit;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ }) {};
+
"mono-traversable-instances" = callPackage
({ mkDerivation, base, comonad, containers, dlist, dlist-instances
, mono-traversable, semigroupoids, semigroups, transformers
@@ -165546,8 +166101,8 @@ self: {
({ mkDerivation, base, binary, containers, hspec }:
mkDerivation {
pname = "more-containers";
- version = "0.2.1.2";
- sha256 = "104ffslcjr8rfbsjy2g49v8l3nx9xrfqglmwcsfgar0n0xnh62ds";
+ version = "0.2.2.0";
+ sha256 = "1i4klvfwgw608sy81mqqvd107b187gkib2rwsz6aqc4rh0vm0a87";
libraryHaskellDepends = [ base binary containers ];
testHaskellDepends = [ base binary containers hspec ];
description = "A few more collections";
@@ -165608,44 +166163,46 @@ self: {
"morley" = callPackage
({ mkDerivation, aeson, aeson-options, aeson-pretty, base-noprelude
- , base16-bytestring, base58-bytestring, binary, bytestring
+ , base16-bytestring, base58-bytestring, bimap, binary, bytestring
, constraints, containers, cryptonite, data-default, directory
- , filepath, fmt, formatting, generic-arbitrary, ghc-prim, hex-text
- , hspec, hspec-expectations, HUnit, lens, megaparsec, memory
- , morley-prelude, mtl, named, optparse-applicative
- , parser-combinators, pretty-simple, qm-interpolated-string
- , QuickCheck, quickcheck-arbitrary-adt, quickcheck-instances
- , singletons, syb, tasty, tasty-ant-xml, tasty-discover
- , tasty-hspec, tasty-quickcheck, template-haskell, text, time
- , timerep, transformers-compat, vector, vinyl, wl-pprint-text
+ , filepath, first-class-families, fmt, formatting, ghc-prim, gitrev
+ , hex-text, hspec, hspec-expectations, HUnit, interpolate, lens
+ , megaparsec, memory, morley-prelude, mtl, named
+ , optparse-applicative, parser-combinators, pretty-simple
+ , pretty-terminal, QuickCheck, quickcheck-arbitrary-adt
+ , quickcheck-instances, show-type, singletons, spoon, syb, tasty
+ , tasty-ant-xml, tasty-discover, tasty-hspec, tasty-hunit
+ , tasty-quickcheck, template-haskell, text, time, timerep
+ , transformers-compat, unordered-containers, vector, vinyl
+ , wl-pprint-text
}:
mkDerivation {
pname = "morley";
- version = "0.3.0.1";
- sha256 = "042kzx6n7jc6chqjvm7l14gpyywvy2s193xsnsvax5cisppm752m";
+ version = "0.5.0";
+ sha256 = "0p84m66iklsqs8hhz33755lrqrjmp7xc9x62qbqj5bdg9mfi6kl2";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [
aeson aeson-options aeson-pretty base-noprelude base16-bytestring
- base58-bytestring binary bytestring constraints containers
- cryptonite data-default filepath fmt formatting ghc-prim hex-text
- hspec lens megaparsec memory morley-prelude mtl named
- parser-combinators QuickCheck quickcheck-arbitrary-adt
- quickcheck-instances singletons syb tasty tasty-ant-xml
- template-haskell text time timerep transformers-compat vector vinyl
- wl-pprint-text
+ base58-bytestring bimap binary bytestring constraints containers
+ cryptonite data-default first-class-families fmt formatting
+ ghc-prim gitrev hex-text hspec interpolate lens megaparsec memory
+ morley-prelude mtl named parser-combinators pretty-terminal
+ QuickCheck quickcheck-arbitrary-adt quickcheck-instances show-type
+ singletons syb tasty tasty-ant-xml tasty-hunit template-haskell
+ text time timerep transformers-compat unordered-containers vector
+ vinyl wl-pprint-text
];
executableHaskellDepends = [
- base-noprelude data-default directory filepath fmt megaparsec
- morley-prelude named optparse-applicative pretty-simple text
+ base-noprelude fmt morley-prelude named optparse-applicative
+ pretty-simple
];
testHaskellDepends = [
- aeson base-noprelude bytestring containers data-default directory
- filepath fmt formatting generic-arbitrary hex-text hspec
- hspec-expectations HUnit lens megaparsec morley-prelude mtl
- qm-interpolated-string QuickCheck quickcheck-arbitrary-adt
- quickcheck-instances singletons syb tasty tasty-hspec
- tasty-quickcheck text
+ aeson base-noprelude bimap bytestring constraints containers
+ data-default directory filepath fmt formatting hex-text hspec
+ hspec-expectations HUnit lens megaparsec morley-prelude QuickCheck
+ quickcheck-arbitrary-adt quickcheck-instances singletons spoon syb
+ tasty tasty-hspec tasty-quickcheck text unordered-containers vinyl
];
testToolDepends = [ tasty-discover ];
description = "Developer tools for the Michelson Language";
@@ -165658,8 +166215,8 @@ self: {
({ mkDerivation, base-noprelude, universum }:
mkDerivation {
pname = "morley-prelude";
- version = "0.2.0.1";
- sha256 = "0dc0hi1gnw5ri7m0fl0pk3frgsnav1al4b6h4kwamhz4qh3av9b2";
+ version = "0.3.0";
+ sha256 = "1nrwrz54xg0v9v8f1caccpdav1d0nnjqy8r8wmj5cgf9y30jfzjf";
libraryHaskellDepends = [ base-noprelude universum ];
description = "A custom prelude used in Morley";
license = stdenv.lib.licenses.agpl3Plus;
@@ -165696,8 +166253,8 @@ self: {
}:
mkDerivation {
pname = "morpheus-graphql";
- version = "0.7.1";
- sha256 = "1yh49icsq68xbw9gmvqssy4piaqb97cy39jg4a20360j9sfr87dp";
+ version = "0.8.0";
+ sha256 = "1b2c39mgh66vkgzhz857m8mlb3kymxnfli0v3z9mrj39a75m6imz";
enableSeparateDataOutput = true;
libraryHaskellDepends = [
aeson base bytestring containers megaparsec mtl scientific
@@ -166363,8 +166920,8 @@ self: {
}:
mkDerivation {
pname = "ms-tds";
- version = "0.4.0.0";
- sha256 = "0smdr7inwix9hbllj5r217pa17i6ha0wbciqnq9cjsjs9wjnybhh";
+ version = "0.4.0.1";
+ sha256 = "1yjvbn6a50wvcibvi5na6x1d7864zyspqhljvr0dpcfrz3s2yc31";
libraryHaskellDepends = [
array base binary bytestring crypto-random data-default-class mtl
network template-haskell text time tls uuid-types x509-store
@@ -167464,15 +168021,17 @@ self: {
}) {};
"multiset" = callPackage
- ({ mkDerivation, base, containers, deepseq, doctest, Glob }:
+ ({ mkDerivation, base, checkers, containers, deepseq, doctest
+ , QuickCheck, tasty, tasty-quickcheck
+ }:
mkDerivation {
pname = "multiset";
- version = "0.3.4.1";
- sha256 = "05iynv54mgfwil7l81ni8mrhhb5vz3fdls13vm2m3dnwqgp7vzxh";
- revision = "1";
- editedCabalFile = "1ddnvzpa9h21p013dwzf0iv2fvvf8mba6vaccf4anamvwa327kcl";
+ version = "0.3.4.3";
+ sha256 = "1i0mjjdv8ayfars014nch5p3jlbl1wlr1bbkp7q2iknkllasxz3r";
libraryHaskellDepends = [ base containers deepseq ];
- testHaskellDepends = [ base doctest Glob ];
+ testHaskellDepends = [
+ base checkers doctest QuickCheck tasty tasty-quickcheck
+ ];
description = "The Data.MultiSet container type";
license = stdenv.lib.licenses.bsd3;
}) {};
@@ -168046,8 +168605,8 @@ self: {
}:
mkDerivation {
pname = "mustache";
- version = "2.3.0";
- sha256 = "1q3vadcvv2pxg6rpp92jq5zy784jxphdfpf6xn9y6wg9g3jn7201";
+ version = "2.3.1";
+ sha256 = "0j5kzlirirnj2lscxgc6r9j0if8s3pvxswjblma6yxpw6qyzk2xc";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [
@@ -170136,8 +170695,8 @@ self: {
}:
mkDerivation {
pname = "net-mqtt";
- version = "0.6.2.1";
- sha256 = "09l9m213x1v7cvrfr039hg2c1pa4dknyhj827h9n0w9pawj61r55";
+ version = "0.6.2.2";
+ sha256 = "08svb0k43aqycbms2cabng49dgsiwsjw10lqmjsm18iasgr53gk0";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [
@@ -170899,8 +171458,8 @@ self: {
}:
mkDerivation {
pname = "network-arbitrary";
- version = "0.4.0.7";
- sha256 = "1bqdp7g40dxjin5530sb7mv9ga7qi86ppm4y41wfdyv26kl8lc7f";
+ version = "0.5.0.0";
+ sha256 = "1d3m0ycibbvnjbns4havp25x9i5ri6kirv579k1xnb82by4nkqap";
libraryHaskellDepends = [
base bytestring http-media http-types network-uri QuickCheck
];
@@ -170940,20 +171499,21 @@ self: {
"network-bitcoin" = callPackage
({ mkDerivation, aeson, attoparsec, base, bytestring, cookie, HTTP
- , http-client, http-types, network, network-uri, QuickCheck, text
- , time, unordered-containers, vector
+ , http-client, http-types, network, network-uri, QuickCheck, tasty
+ , tasty-quickcheck, text, time, unordered-containers, vector
}:
mkDerivation {
pname = "network-bitcoin";
- version = "1.8.3";
- sha256 = "1pllz4il53j9sf6xlxjl3ci3r1n348y6mg0vdy19xy19zy1rjz1q";
+ version = "1.9.1";
+ sha256 = "12ywzix3fpvlrd43v0q03lbm877pi2dz2x9w421sxvb6gvd2q7s0";
libraryHaskellDepends = [
aeson attoparsec base bytestring cookie HTTP http-client http-types
network network-uri text time unordered-containers vector
];
testHaskellDepends = [
aeson attoparsec base bytestring cookie HTTP http-client http-types
- network QuickCheck text time unordered-containers vector
+ network QuickCheck tasty tasty-quickcheck text time
+ unordered-containers vector
];
description = "An interface to bitcoind";
license = stdenv.lib.licenses.bsd3;
@@ -172619,8 +173179,8 @@ self: {
}:
mkDerivation {
pname = "niv";
- version = "0.2.8";
- sha256 = "0nggarlbfc8x5y7rp8n5fdzy3xipykxq4fk6irz1jsz4m6fbi9a4";
+ version = "0.2.9";
+ sha256 = "1rmmipa33a8nip6fn616ihdiqdax15niblzspfk8ckrz5fpj2476";
isLibrary = true;
isExecutable = true;
enableSeparateDataOutput = true;
@@ -174205,6 +174765,17 @@ self: {
broken = true;
}) {};
+ "numeric-domains" = callPackage
+ ({ mkDerivation, base }:
+ mkDerivation {
+ pname = "numeric-domains";
+ version = "0.1.0.0";
+ sha256 = "0n5wcg2snpivbp6giqrcd1y97215y6n3hbgbnb6w2gi7qsmyyq10";
+ libraryHaskellDepends = [ base ];
+ description = "Numeric Domains";
+ license = stdenv.lib.licenses.bsd3;
+ }) {};
+
"numeric-extras" = callPackage
({ mkDerivation, base }:
mkDerivation {
@@ -174381,21 +174952,20 @@ self: {
}) {};
"numhask-array" = callPackage
- ({ mkDerivation, adjunctions, base, deepseq, dimensions
- , distributive, doctest, hedgehog, numhask-hedgehog
- , numhask-prelude, protolude, singletons, vector
+ ({ mkDerivation, adjunctions, base, deepseq, distributive, doctest
+ , hedgehog, hmatrix, numhask, numhask-hedgehog, numhask-prelude
+ , protolude, vector
}:
mkDerivation {
pname = "numhask-array";
- version = "0.3.0.1";
- sha256 = "02pcjnj1y3q053czra9697b4xgyq8dr9ynp7yz3lj9ksnn8dpx5n";
+ version = "0.5.0.0";
+ sha256 = "0gx2p7b7xb1x5nfp5szdvsbylqsci9bmmz5jmy86c4z13srxmkkq";
libraryHaskellDepends = [
- adjunctions base deepseq dimensions distributive numhask-prelude
- protolude singletons vector
+ adjunctions base deepseq distributive hmatrix numhask
+ numhask-prelude protolude vector
];
testHaskellDepends = [
- adjunctions base dimensions doctest hedgehog numhask-hedgehog
- numhask-prelude
+ base doctest hedgehog numhask-hedgehog numhask-prelude
];
description = "n-dimensional arrays";
license = stdenv.lib.licenses.bsd3;
@@ -175896,8 +176466,8 @@ self: {
({ mkDerivation, base, containers, doctest }:
mkDerivation {
pname = "op";
- version = "0.3.0.0";
- sha256 = "0as0nswa28mbw7qp1p1pjvvr4iv6zd81rka9g51fy2w52260lmpv";
+ version = "0.4.0.0";
+ sha256 = "17wng5pl4d92nkrmbzwi1c8l3cdh9ms50p6m7vvc4z1x4gnp9lf9";
libraryHaskellDepends = [ base ];
testHaskellDepends = [ base containers doctest ];
description = "Common operators encouraging large-scale easy reading";
@@ -178125,23 +178695,23 @@ self: {
}) {};
"overloaded" = callPackage
- ({ mkDerivation, base, bytestring, containers, fin, generic-lens
- , ghc, HUnit, lens, optics-core, record-hasfield, singleton-bool
- , sop-core, split, syb, symbols, tasty, tasty-hunit, text, time
- , vec
+ ({ mkDerivation, base, bin, bytestring, containers, fin
+ , generic-lens, ghc, HUnit, lens, optics-core, ral, record-hasfield
+ , singleton-bool, sop-core, split, syb, symbols, tasty, tasty-hunit
+ , text, time, vec
}:
mkDerivation {
pname = "overloaded";
- version = "0.1.3";
- sha256 = "0yz94zzcwdw34c5v9qmqak9bwqz8gq1s80phf9rn8p0bg6a4l0h4";
+ version = "0.2";
+ sha256 = "1kp3vbdfwp9caicmj2k1qznbsn844pm75sy8ywwm86334f08vshk";
libraryHaskellDepends = [
- base bytestring containers fin ghc optics-core record-hasfield
- sop-core split syb symbols text time vec
+ base bin bytestring containers fin ghc optics-core ral
+ record-hasfield sop-core split syb symbols text time vec
];
testHaskellDepends = [
- base bytestring containers fin generic-lens HUnit lens optics-core
- record-hasfield singleton-bool sop-core symbols tasty tasty-hunit
- text time vec
+ base bin bytestring containers fin generic-lens HUnit lens
+ optics-core ral record-hasfield singleton-bool sop-core symbols
+ tasty tasty-hunit text time vec
];
doHaddock = false;
description = "Overloaded pragmas as a plugin";
@@ -178823,25 +179393,25 @@ self: {
maintainers = with stdenv.lib.maintainers; [ peti ];
}) {};
- "pandoc_2_9" = callPackage
+ "pandoc_2_9_1" = callPackage
({ mkDerivation, aeson, aeson-pretty, attoparsec, base
, base64-bytestring, binary, blaze-html, blaze-markup, bytestring
, case-insensitive, cmark-gfm, containers, criterion, data-default
, deepseq, Diff, directory, doclayout, doctemplates, emojis
, exceptions, executable-path, filepath, Glob, haddock-library
, hslua, hslua-module-system, hslua-module-text, HsYAML, HTTP
- , http-client, http-client-tls, http-types, ipynb, JuicyPixels, mtl
- , network, network-uri, pandoc-types, parsec, process, QuickCheck
- , random, safe, scientific, SHA, skylighting, skylighting-core
- , split, syb, tagsoup, tasty, tasty-golden, tasty-hunit, tasty-lua
- , tasty-quickcheck, temporary, texmath, text, text-conversions
- , time, unicode-transforms, unix, unordered-containers, vector
- , weigh, xml, zip-archive, zlib
+ , http-client, http-client-tls, http-types, ipynb, jira-wiki-markup
+ , JuicyPixels, mtl, network, network-uri, pandoc-types, parsec
+ , process, QuickCheck, random, safe, scientific, SHA, skylighting
+ , skylighting-core, split, syb, tagsoup, tasty, tasty-golden
+ , tasty-hunit, tasty-lua, tasty-quickcheck, temporary, texmath
+ , text, text-conversions, time, unicode-transforms, unix
+ , unordered-containers, vector, weigh, xml, zip-archive, zlib
}:
mkDerivation {
pname = "pandoc";
- version = "2.9";
- sha256 = "1j4n7r4rh22ba4m4h3psy2jm3cxfd6pxlbpw0z613z01g30mr90c";
+ version = "2.9.1";
+ sha256 = "1ywbsx8389vp4a85sxajdgj0vis4v8y6zkq87lla0s1lprk3am0a";
configureFlags = [ "-fhttps" "-f-trypandoc" ];
isLibrary = true;
isExecutable = true;
@@ -178852,11 +179422,11 @@ self: {
containers data-default deepseq directory doclayout doctemplates
emojis exceptions filepath Glob haddock-library hslua
hslua-module-system hslua-module-text HsYAML HTTP http-client
- http-client-tls http-types ipynb JuicyPixels mtl network
- network-uri pandoc-types parsec process random safe scientific SHA
- skylighting skylighting-core split syb tagsoup temporary texmath
- text text-conversions time unicode-transforms unix
- unordered-containers vector xml zip-archive zlib
+ http-client-tls http-types ipynb jira-wiki-markup JuicyPixels mtl
+ network network-uri pandoc-types parsec process random safe
+ scientific SHA skylighting skylighting-core split syb tagsoup
+ temporary texmath text text-conversions time unicode-transforms
+ unix unordered-containers vector xml zip-archive zlib
];
executableHaskellDepends = [ base ];
testHaskellDepends = [
@@ -178978,8 +179548,8 @@ self: {
}:
mkDerivation {
pname = "pandoc-crossref";
- version = "0.3.6.0";
- sha256 = "0k1wvkjhlwgr8njsrjiivzyb1pbi17y6nxky4pb5wkkg57fd5847";
+ version = "0.3.6.1";
+ sha256 = "1fk06lg9hx5gdmjf4qsgl4p34y676v33l8yc0hyrdx81v8yicp5m";
isLibrary = true;
isExecutable = true;
enableSeparateDataOutput = true;
@@ -179111,8 +179681,8 @@ self: {
}:
mkDerivation {
pname = "pandoc-include-code";
- version = "1.4.0.0";
- sha256 = "0s3dayslfpnivr5h6napcrdh35bay7797z8nxjhr7c78ni7gdax9";
+ version = "1.5.0.0";
+ sha256 = "07ah6f28sb68wdp3514jmxgh2bdvwqdn60ym8j0qbk98i9gsj0ax";
isLibrary = true;
isExecutable = true;
enableSeparateDataOutput = true;
@@ -179122,7 +179692,7 @@ self: {
executableHaskellDepends = [ base pandoc-types ];
testHaskellDepends = [
base hspec hspec-expectations pandoc-types tasty tasty-hspec
- tasty-hunit
+ tasty-hunit text
];
description = "A Pandoc filter for including code from source files";
license = stdenv.lib.licenses.mpl20;
@@ -179449,8 +180019,8 @@ self: {
}:
mkDerivation {
pname = "pango";
- version = "0.13.6.1";
- sha256 = "1b17nap158ml58ks0zsdqx6v7gbdwaha1m0rw4bh4if7h0ai9vxp";
+ version = "0.13.8.0";
+ sha256 = "1skyfj0phd5hzpk86lj7qx0g6n09b1cfijlf759p7v34f47g6w2s";
enableSeparateDataOutput = true;
setupHaskellDepends = [ base Cabal filepath gtk2hs-buildtools ];
libraryHaskellDepends = [
@@ -180503,6 +181073,31 @@ self: {
license = "GPL";
}) {};
+ "parquet-hs" = callPackage
+ ({ mkDerivation, aeson, base, binary, binary-conduit, bytestring
+ , conduit, conduit-extra, containers, error-util, filepath
+ , generic-lens, hspec, http-client, http-conduit, http-types, lens
+ , lifted-async, monad-logger, mtl, pinch, process, QuickCheck, safe
+ , serialise, text, unordered-containers
+ }:
+ mkDerivation {
+ pname = "parquet-hs";
+ version = "0.1.0.0";
+ sha256 = "128fmwz2jnljrbj5zagw4wqqnv7zn0xs4cmaisp6qrxjsfjfiy2j";
+ libraryHaskellDepends = [
+ aeson base binary binary-conduit bytestring conduit conduit-extra
+ containers error-util generic-lens http-client http-conduit
+ http-types lens lifted-async monad-logger mtl pinch safe serialise
+ text unordered-containers
+ ];
+ testHaskellDepends = [
+ aeson base binary bytestring conduit filepath hspec monad-logger
+ mtl process QuickCheck text
+ ];
+ description = "Streaming Parquet reader";
+ license = stdenv.lib.licenses.bsd3;
+ }) {};
+
"parse-dimacs" = callPackage
({ mkDerivation, array, base, bytestring, parsec }:
mkDerivation {
@@ -183365,24 +183960,6 @@ self: {
}) {};
"persistent-iproute" = callPackage
- ({ mkDerivation, aeson, aeson-iproute, base, bytestring
- , http-api-data, iproute, path-pieces, persistent, text
- }:
- mkDerivation {
- pname = "persistent-iproute";
- version = "0.2.3";
- sha256 = "1amzxmwispqi29ln50mfj43i1srl53n5iz7lsq8rxhd1x8fa35gm";
- revision = "1";
- editedCabalFile = "1jly9db968q5j5ly75f77hwxrhky3s6xx8ydgsjn5cdr9rc4iz8k";
- libraryHaskellDepends = [
- aeson aeson-iproute base bytestring http-api-data iproute
- path-pieces persistent text
- ];
- description = "Persistent instances for types in iproute";
- license = stdenv.lib.licenses.bsd3;
- }) {};
-
- "persistent-iproute_0_2_4" = callPackage
({ mkDerivation, aeson, aeson-iproute, base, bytestring
, http-api-data, iproute, path-pieces, persistent, text
}:
@@ -183396,7 +183973,6 @@ self: {
];
description = "Persistent instances for types in iproute";
license = stdenv.lib.licenses.bsd3;
- hydraPlatforms = stdenv.lib.platforms.none;
}) {};
"persistent-map" = callPackage
@@ -184320,25 +184896,24 @@ self: {
broken = true;
}) {};
- "pg-transact_0_2_1_0" = callPackage
- ({ mkDerivation, base, bytestring, exceptions, hspec
- , hspec-discover, hspec-expectations-lifted, monad-control
+ "pg-transact_0_3_1_1" = callPackage
+ ({ mkDerivation, async, base, bytestring, exceptions, hspec
+ , hspec-expectations-lifted, monad-control, postgresql-libpq
, postgresql-simple, tmp-postgres, transformers
}:
mkDerivation {
pname = "pg-transact";
- version = "0.2.1.0";
- sha256 = "1wh4qf00ggyx6ff3llpcbnlbhn61c3yqqd3ljjglwv2bfjhrgajh";
+ version = "0.3.1.1";
+ sha256 = "1z101hbfan8aidq7lcnzzni4b7ji8sbbqx1yar6ykf6wmzmn2pcd";
libraryHaskellDepends = [
base bytestring exceptions monad-control postgresql-simple
transformers
];
testHaskellDepends = [
- base bytestring exceptions hspec hspec-discover
- hspec-expectations-lifted postgresql-simple tmp-postgres
+ async base bytestring exceptions hspec hspec-expectations-lifted
+ postgresql-libpq postgresql-simple tmp-postgres
];
- testToolDepends = [ hspec-discover ];
- description = "Another postgresql-simple transaction monad";
+ description = "A postgresql-simple transaction monad";
license = stdenv.lib.licenses.bsd3;
hydraPlatforms = stdenv.lib.platforms.none;
broken = true;
@@ -188969,16 +189544,18 @@ self: {
}) {inherit (pkgs) acl;};
"posix-api" = callPackage
- ({ mkDerivation, base, primitive, primitive-addr, primitive-offset
- , primitive-unlifted, tasty, tasty-hunit
+ ({ mkDerivation, base, byteslice, primitive, primitive-addr
+ , primitive-offset, primitive-unlifted, systemd, tasty, tasty-hunit
}:
mkDerivation {
pname = "posix-api";
- version = "0.3.2.0";
- sha256 = "1ki45p31cc1zplzsi9kln85rm556rwk5yvwgsb75bcgqwg6xpcl8";
+ version = "0.3.3.0";
+ sha256 = "0a4npmhgnpq7ya21zijsxhyndr9swlknh6v7rn6y9qbva4q3gjx7";
libraryHaskellDepends = [
- base primitive primitive-addr primitive-offset primitive-unlifted
+ base byteslice primitive primitive-addr primitive-offset
+ primitive-unlifted
];
+ librarySystemDepends = [ systemd ];
testHaskellDepends = [
base primitive primitive-unlifted tasty tasty-hunit
];
@@ -188986,7 +189563,7 @@ self: {
license = stdenv.lib.licenses.bsd3;
hydraPlatforms = stdenv.lib.platforms.none;
broken = true;
- }) {};
+ }) {inherit (pkgs) systemd;};
"posix-error-codes" = callPackage
({ mkDerivation, base }:
@@ -189779,8 +190356,6 @@ self: {
];
description = "Parse postgres:// url into ConnectInfo";
license = stdenv.lib.licenses.mit;
- hydraPlatforms = stdenv.lib.platforms.none;
- broken = true;
}) {};
"postgresql-syntax" = callPackage
@@ -190566,8 +191141,8 @@ self: {
}:
mkDerivation {
pname = "predicate-typed";
- version = "0.6.0.0";
- sha256 = "0fk30pn759fg9v2k5gw51hk6vkp2vq4sh574zlqdk4vx6r2r5jrp";
+ version = "0.6.0.1";
+ sha256 = "1izg98ql496qn8dvn3blz2654bhy8901x7hfh0dxqqzrm1gi5bf4";
libraryHaskellDepends = [
aeson base binary bytestring comonad containers deepseq directory
ghc-prim hashable lens mtl pcre-heavy pcre-light pretty
@@ -191211,15 +191786,15 @@ self: {
maintainers = with stdenv.lib.maintainers; [ cdepillabout ];
}) {};
- "pretty-simple_3_1_1_0" = callPackage
+ "pretty-simple_3_2_0_0" = callPackage
({ mkDerivation, ansi-terminal, base, Cabal, cabal-doctest
, containers, criterion, doctest, Glob, mtl, QuickCheck
, template-haskell, text, transformers
}:
mkDerivation {
pname = "pretty-simple";
- version = "3.1.1.0";
- sha256 = "073x8jwnar4p7615dk0x92d76in2xwsgpip3w3hgq948c4ydmv58";
+ version = "3.2.0.0";
+ sha256 = "0jbxyjiyshbc5q5avbmm5ms8n8m0zm540gl3x7vz8k22pcb65jv8";
isLibrary = true;
isExecutable = true;
setupHaskellDepends = [ base Cabal cabal-doctest ];
@@ -192669,21 +193244,26 @@ self: {
}) {};
"profunctor-optics" = callPackage
- ({ mkDerivation, base, comonad, connections, containers
- , distributive, doctest, ilist, mtl, newtype-generics
- , profunctor-arrows, profunctors, rings, semigroupoids, tagged
- , transformers, unliftio-core
+ ({ mkDerivation, adjunctions, base, comonad, connections
+ , containers, distributive, doctest, hedgehog, ilist, mtl
+ , newtype-generics, profunctor-arrows, profunctors, rings
+ , semigroupoids, tagged, transformers, unliftio-core
}:
mkDerivation {
pname = "profunctor-optics";
- version = "0.0.0.2";
- sha256 = "0xf7aikcbp1vgdd5bd4rf94w6iavwbxrxbr67prddqanv3jmjqn9";
+ version = "0.0.0.4";
+ sha256 = "0r3ixf0j1iass289mkxkjrmljxhybqk7bqz3acinf5qh52318kk5";
+ isLibrary = true;
+ isExecutable = true;
libraryHaskellDepends = [
- base comonad connections containers distributive ilist mtl
+ adjunctions base comonad connections distributive mtl
newtype-generics profunctor-arrows profunctors rings semigroupoids
tagged transformers unliftio-core
];
- testHaskellDepends = [ base containers doctest mtl ];
+ executableHaskellDepends = [
+ adjunctions base containers doctest ilist mtl
+ ];
+ testHaskellDepends = [ base connections hedgehog ];
description = "An optics library compatible with the typeclasses in 'profunctors'";
license = stdenv.lib.licenses.bsd3;
hydraPlatforms = stdenv.lib.platforms.none;
@@ -195793,8 +196373,8 @@ self: {
}:
mkDerivation {
pname = "qrcode-core";
- version = "0.9.1";
- sha256 = "1mklz3r4z2ifzsl061rqjhrnis1a1fyvaxlp6dws4y95dy4slm92";
+ version = "0.9.2";
+ sha256 = "17a21a65n3hm739q7kgvpd4wvqz3i5y9bdkl6072ch87j0baqmpy";
libraryHaskellDepends = [
base binary bytestring case-insensitive containers dlist primitive
text vector
@@ -195854,8 +196434,8 @@ self: {
}:
mkDerivation {
pname = "qtah-cpp-qt5";
- version = "0.5.1";
- sha256 = "1pwqc5i6viyk3ik8vh2zd9k25vj9y1r9mmikxwzjhv6jwc8sb5pb";
+ version = "0.6.0";
+ sha256 = "1v355mfs67rh2rcn71rkai0c16y3aqcb7q33ykhrghcl7238ym9h";
setupHaskellDepends = [ base Cabal directory filepath process ];
libraryHaskellDepends = [ base process qtah-generator ];
librarySystemDepends = [ qtbase ];
@@ -195871,8 +196451,8 @@ self: {
}:
mkDerivation {
pname = "qtah-examples";
- version = "0.5.0";
- sha256 = "087sspnaw39zcymkm0xzyzdbc4g96zlpa45b2i6mfshxi4g38af5";
+ version = "0.6.0";
+ sha256 = "0zak709bgc9r8bydj834hkzix9zripnhi5z792ryr3k7anmyy6fv";
isLibrary = false;
isExecutable = true;
executableHaskellDepends = [
@@ -195885,21 +196465,21 @@ self: {
}) {};
"qtah-generator" = callPackage
- ({ mkDerivation, base, Cabal, containers, directory, filepath
- , haskell-src, hoppy-generator, hoppy-std, mtl, process
+ ({ mkDerivation, base, bytestring, Cabal, containers, directory
+ , filepath, haskell-src, hoppy-generator, hoppy-std, mtl, process
, transformers
}:
mkDerivation {
pname = "qtah-generator";
- version = "0.5.0";
- sha256 = "0kbc3dpmkxxi2ms6a7dga02g19vq9fm0hz53y9x6iyfpnlpk1sy7";
+ version = "0.6.0";
+ sha256 = "0w7fsn2j5g5miv12gm3d0x52xypbshdmxza6imjnpz01kljhqhpm";
isLibrary = true;
isExecutable = true;
setupHaskellDepends = [ base Cabal directory filepath ];
libraryHaskellDepends = [ base ];
executableHaskellDepends = [
- base containers directory filepath haskell-src hoppy-generator
- hoppy-std mtl process transformers
+ base bytestring containers directory filepath haskell-src
+ hoppy-generator hoppy-std mtl process transformers
];
doHaddock = false;
description = "Generator for Qtah Qt bindings";
@@ -195915,8 +196495,8 @@ self: {
}:
mkDerivation {
pname = "qtah-qt5";
- version = "0.5.1";
- sha256 = "082mz3j3bk7hlagwdw0y399r8jid2wf6xzsdd2wnc4n6z6w6p8gx";
+ version = "0.6.0";
+ sha256 = "1irinnq1iryphnnqg05l3icirvzkh5xm4cdwhqvshbin7i6gv0bs";
setupHaskellDepends = [ base Cabal directory filepath ];
libraryHaskellDepends = [
base binary bytestring hoppy-runtime qtah-cpp-qt5 qtah-generator
@@ -199642,6 +200222,28 @@ self: {
license = stdenv.lib.licenses.bsd3;
}) {};
+ "read-ctags" = callPackage
+ ({ mkDerivation, base, bytestring, containers, directory, hspec
+ , optparse-applicative, text
+ }:
+ mkDerivation {
+ pname = "read-ctags";
+ version = "0.1.0.0";
+ sha256 = "1w6f8p6v3sry42pg8zizfyagknfmpn47vzk3a2c2n2bv1ib0v1hf";
+ isLibrary = true;
+ isExecutable = true;
+ libraryHaskellDepends = [
+ base bytestring containers directory text
+ ];
+ executableHaskellDepends = [
+ base bytestring containers directory optparse-applicative text
+ ];
+ testHaskellDepends = [
+ base bytestring containers directory hspec text
+ ];
+ license = stdenv.lib.licenses.mit;
+ }) {};
+
"read-editor" = callPackage
({ mkDerivation, base, directory, process }:
mkDerivation {
@@ -200893,8 +201495,8 @@ self: {
}:
mkDerivation {
pname = "reflex";
- version = "0.6.2.4";
- sha256 = "1gm8w2ri16apy3b13i2f17pk1nsrsi0vbcrkckd1abbm4r4i16cd";
+ version = "0.6.3";
+ sha256 = "0nrmc86dinkxvfyj1wh57g816hzqxs583ipaqiq9gipadsa2jgcs";
libraryHaskellDepends = [
base bifunctors comonad constraints-extras containers data-default
dependent-map dependent-sum exception-transformers haskell-src-exts
@@ -201011,8 +201613,8 @@ self: {
}:
mkDerivation {
pname = "reflex-dom";
- version = "0.5.2.0";
- sha256 = "01sqql44jcn7d9xcb00br99zgyghiyqzcmncfpz4dgik10dam1hv";
+ version = "0.5.3";
+ sha256 = "04xnalhrckz5idnx1d4d93nz8fnxnjsd03kciln36wwd895bcmrk";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [
@@ -201074,8 +201676,8 @@ self: {
}:
mkDerivation {
pname = "reflex-dom-core";
- version = "0.5.2.0";
- sha256 = "1vqd6viqg9di9z0wchi3ffcia4spljf3dal8l21k7qhwcbz4g3jz";
+ version = "0.5.3";
+ sha256 = "0znymqld4d6fp8l14y0gn86nbffaw8b0ql0y7bj3vnx80crjc32j";
libraryHaskellDepends = [
aeson base bifunctors bimap blaze-builder bytestring constraints
containers contravariant data-default dependent-map dependent-sum
@@ -203173,8 +203775,8 @@ self: {
pname = "repa";
version = "3.4.1.4";
sha256 = "17m3wl4hvf04fxwm4fflhnv41yl9bm263hnbpxc8x6xqwifplq23";
- revision = "2";
- editedCabalFile = "16kyy7ck3yki0mlcap0bbiadcn18yn6x90m4s2prkasi9ip0pcs8";
+ revision = "3";
+ editedCabalFile = "17hxj42cm82sac42by78jgbjjn5r3qv7n4919llaq17a2k1np0sw";
libraryHaskellDepends = [
base bytestring ghc-prim QuickCheck template-haskell vector
];
@@ -203188,6 +203790,8 @@ self: {
pname = "repa-algorithms";
version = "3.4.1.3";
sha256 = "1bhg1vr85j9mqm9lg1577dvlgzdbkh9f48h0ll6h03jfw7knyn6y";
+ revision = "1";
+ editedCabalFile = "0lvb1sn95qca9m1b8cy0a2j9gjzqm8g5v68ykglffjskv78d0jfm";
libraryHaskellDepends = [ base repa vector ];
description = "Algorithms using the Repa array library";
license = stdenv.lib.licenses.bsd3;
@@ -203278,8 +203882,8 @@ self: {
pname = "repa-examples";
version = "3.4.1.2";
sha256 = "1lqqnk3prvw1pr2wi4rhymb8ij6mjp9mcsvjcllnxv567mz9gr4d";
- revision = "2";
- editedCabalFile = "0aghk6pav63hx13dzmp9v9izq7zv4kdc0vbbv2wr14i234ghljh9";
+ revision = "3";
+ editedCabalFile = "149wg57xkbnqymcmbd7i20kj37zyz0a4qm9426nkrrhkvs1acx52";
isLibrary = false;
isExecutable = true;
executableHaskellDepends = [
@@ -203338,8 +203942,8 @@ self: {
pname = "repa-io";
version = "3.4.1.1";
sha256 = "1nm9kfin6fv016r02l74c9hf8pr1rz7s33i833cqpyw8m6bcmnxm";
- revision = "3";
- editedCabalFile = "027vn7an0hm3ysnzk19y0dbjpah0wpg96dgb55149x1310vwybxl";
+ revision = "4";
+ editedCabalFile = "1lswfxmfn31gm2ayqwns9q9kpbad69scxpq6ybyzxkb9jd0jx4bl";
libraryHaskellDepends = [
base binary bmp bytestring old-time repa vector
];
@@ -203386,6 +203990,8 @@ self: {
pname = "repa-scalar";
version = "4.2.3.3";
sha256 = "1qjzrmz010gm50in0yja817r6wl0n2iybd00dsfpcspdaq91ahvb";
+ revision = "1";
+ editedCabalFile = "14p7m3fyl3h6asxcb3lh67f3ypw85109fxfag5aycdr39g5xa6rm";
libraryHaskellDepends = [
base bytestring double-conversion primitive time vector
];
@@ -207636,6 +208242,8 @@ self: {
pname = "rvar";
version = "0.2.0.3";
sha256 = "1h3bii1pamkv7656280i6zx7fpdwgbn2ysfijpd2s65szlpsz2np";
+ revision = "1";
+ editedCabalFile = "1ifwwjlhc3l8ycjmmarw6v1nm7jxpgqw2ly0q35idlj0jc0nbxn6";
libraryHaskellDepends = [
base MonadPrompt mtl random-source transformers
];
@@ -207935,7 +208543,7 @@ self: {
broken = true;
}) {};
- "safe-json_1_0_0" = callPackage
+ "safe-json_1_1_0" = callPackage
({ mkDerivation, aeson, base, bytestring, containers, dlist
, generic-arbitrary, hashable, quickcheck-instances, scientific
, tasty, tasty-hunit, tasty-quickcheck, temporary, text, time
@@ -207943,8 +208551,8 @@ self: {
}:
mkDerivation {
pname = "safe-json";
- version = "1.0.0";
- sha256 = "0i5wryhfiqdqxgzzk9ywnlh4y8hvanrm2mqa0niavf4jgvkkfalh";
+ version = "1.1.0";
+ sha256 = "18zsf2dccgf755a8g4ar3zc7ilmampsrvqa6f9p27zrayl7j87hw";
libraryHaskellDepends = [
aeson base bytestring containers dlist hashable scientific tasty
tasty-hunit tasty-quickcheck text time unordered-containers
@@ -209622,6 +210230,27 @@ self: {
broken = true;
}) {};
+ "schedule" = callPackage
+ ({ mkDerivation, async, base, checkers, containers, doctest, extra
+ , lens, primitive, safe, stm, system-time-monotonic, tasty
+ , tasty-hunit, tasty-quickcheck, text, time, transformers
+ }:
+ mkDerivation {
+ pname = "schedule";
+ version = "0.2.0.0";
+ sha256 = "02sfzvkz0r1lyqbsiba866jhcfb5f223z09zj437d31vayn6nzay";
+ libraryHaskellDepends = [
+ async base containers extra lens primitive safe stm
+ system-time-monotonic text time transformers
+ ];
+ testHaskellDepends = [
+ base checkers doctest primitive tasty tasty-hunit tasty-quickcheck
+ transformers
+ ];
+ description = "Pure deterministic scheduled computations";
+ license = stdenv.lib.licenses.gpl3Plus;
+ }) {};
+
"schedule-planner" = callPackage
({ mkDerivation, aeson, base, bytestring, composition, containers
, HTTP, http-types, mtl, options, text, text-icu, transformers, wai
@@ -209698,21 +210327,21 @@ self: {
"schemas" = callPackage
({ mkDerivation, aeson, aeson-pretty, base, bifunctors, bytestring
, free, generic-lens, generics-sop, hashable, hspec, lens
- , lens-aeson, pretty-simple, profunctors, QuickCheck, scientific
- , text, transformers, unordered-containers, vector
+ , lens-aeson, mtl, pretty-simple, profunctors, QuickCheck
+ , scientific, text, transformers, unordered-containers, vector
}:
mkDerivation {
pname = "schemas";
- version = "0.3.0.2";
- sha256 = "1rpsnfa98ckiaz5av9m2x6p96a5ilayry45nsplbrf70xaawz4nq";
+ version = "0.4.0.0";
+ sha256 = "1i8sapi31dwlhjvkhgcznd1mfw1h86hgg310x6zkz2m1wkazy5yr";
libraryHaskellDepends = [
aeson base bifunctors bytestring free generics-sop hashable lens
- lens-aeson profunctors scientific text transformers
+ lens-aeson mtl profunctors scientific text transformers
unordered-containers vector
];
testHaskellDepends = [
aeson aeson-pretty base bytestring generic-lens generics-sop hspec
- lens pretty-simple QuickCheck text transformers
+ lens mtl pretty-simple QuickCheck text transformers
unordered-containers
];
description = "schema guided serialization";
@@ -211238,6 +211867,30 @@ self: {
license = stdenv.lib.licenses.publicDomain;
}) {inherit (pkgs) secp256k1;};
+ "secp256k1-haskell_0_1_6" = callPackage
+ ({ mkDerivation, base, base16-bytestring, bytestring, cereal
+ , entropy, hashable, hspec, hspec-discover, HUnit, libsecp256k1
+ , mtl, QuickCheck, string-conversions
+ }:
+ mkDerivation {
+ pname = "secp256k1-haskell";
+ version = "0.1.6";
+ sha256 = "1xasiii9g6ypn9y89q7ramkgz7vx87fr21qqbh1657my4aaipv03";
+ libraryHaskellDepends = [
+ base base16-bytestring bytestring cereal entropy hashable
+ QuickCheck string-conversions
+ ];
+ libraryPkgconfigDepends = [ libsecp256k1 ];
+ testHaskellDepends = [
+ base base16-bytestring bytestring cereal entropy hashable hspec
+ HUnit mtl QuickCheck string-conversions
+ ];
+ testToolDepends = [ hspec-discover ];
+ description = "Bindings for secp256k1 library from Bitcoin Core";
+ license = stdenv.lib.licenses.publicDomain;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ }) {libsecp256k1 = null;};
+
"secp256k1-legacy" = callPackage
({ mkDerivation, base, base16-bytestring, bytestring, Cabal, cereal
, cryptohash, entropy, HUnit, mtl, QuickCheck, string-conversions
@@ -211722,6 +212375,8 @@ self: {
pname = "semialign-extras";
version = "0.1.0.0";
sha256 = "0wnaspwfj9rm7g9mz2q9xad5a9rvkfsrjb5lir64csppy3p11276";
+ revision = "1";
+ editedCabalFile = "0cz85cbv6qiv1rvlhnxxlibfys2qj5bfsjwwhmnkq91wm69scwpy";
libraryHaskellDepends = [
base lens semialign semialign-indexed these witherable
];
@@ -214991,6 +215646,28 @@ self: {
license = stdenv.lib.licenses.bsd3;
}) {};
+ "servant-to-elm" = callPackage
+ ({ mkDerivation, aeson, base, bound, elm-syntax, haskell-to-elm
+ , http-types, protolude, servant, text
+ }:
+ mkDerivation {
+ pname = "servant-to-elm";
+ version = "0.2.0.0";
+ sha256 = "0kj42y6jb5cqylkvj0iwm857vliagfgbh7rgyzbrgz834r7n5cri";
+ isLibrary = true;
+ isExecutable = true;
+ libraryHaskellDepends = [
+ aeson base bound elm-syntax haskell-to-elm http-types protolude
+ servant text
+ ];
+ testHaskellDepends = [
+ aeson base bound elm-syntax haskell-to-elm http-types protolude
+ servant text
+ ];
+ description = "Automatically generate Elm clients for Servant APIs";
+ license = stdenv.lib.licenses.bsd3;
+ }) {};
+
"servant-tracing" = callPackage
({ mkDerivation, aeson, async, base, bytestring, bytestring-lexing
, containers, hashable, http-api-data, http-client, HUnit
@@ -215219,8 +215896,8 @@ self: {
}:
mkDerivation {
pname = "serverless-haskell";
- version = "0.9.4";
- sha256 = "11svl9km810xw4vbn3vd9jqnv9fglf5jqfyfshnjachiz38fdsih";
+ version = "0.10.0";
+ sha256 = "0ja15985r9jywlkc85r3qchi6i9mbkyjh3b0fkn6vwc8gh644nrk";
libraryHaskellDepends = [
aeson aeson-casing aeson-extra amazonka-core amazonka-kinesis
amazonka-s3 base bytestring case-insensitive http-types iproute
@@ -216255,14 +216932,15 @@ self: {
"shake" = callPackage
({ mkDerivation, base, binary, bytestring, deepseq, directory
- , extra, filepath, filepattern, hashable, heaps, js-dgtable
- , js-flot, js-jquery, primitive, process, QuickCheck, random, time
- , transformers, unix, unordered-containers, utf8-string
+ , extra, file-embed, filepath, filepattern, hashable, heaps
+ , js-dgtable, js-flot, js-jquery, primitive, process, QuickCheck
+ , random, template-haskell, time, transformers, unix
+ , unordered-containers, utf8-string
}:
mkDerivation {
pname = "shake";
- version = "0.18.3";
- sha256 = "0ywcdzxly8zvz2p3v5b3lp5bnkwsqxvdas7ysrhgxbhi3bnjvzjf";
+ version = "0.18.4";
+ sha256 = "0vpgs6f365p1s09h30g2a6qy4y0rxi3pyxcg14kiag9k504af9i0";
isLibrary = true;
isExecutable = true;
enableSeparateDataOutput = true;
@@ -216272,9 +216950,10 @@ self: {
random time transformers unix unordered-containers utf8-string
];
executableHaskellDepends = [
- base binary bytestring deepseq directory extra filepath filepattern
- hashable heaps js-dgtable js-flot js-jquery primitive process
- random time transformers unix unordered-containers utf8-string
+ base binary bytestring deepseq directory extra file-embed filepath
+ filepattern hashable heaps js-dgtable js-flot js-jquery primitive
+ process random template-haskell time transformers unix
+ unordered-containers utf8-string
];
testHaskellDepends = [
base binary bytestring deepseq directory extra filepath filepattern
@@ -216320,8 +216999,8 @@ self: {
}:
mkDerivation {
pname = "shake-cabal";
- version = "0.2.1.1";
- sha256 = "0d3c1v7pj568fj65fz7dd4h72wpnzz75n1k974nmjbx12vphfd1i";
+ version = "0.2.2.1";
+ sha256 = "1vyz95qa5f6k0lqf24w60dmlszs1sv0sqv2p0sncn8ll7g785sx1";
libraryHaskellDepends = [
base binary Cabal composition-prelude deepseq directory filepath
hashable shake
@@ -217422,6 +218101,18 @@ self: {
license = stdenv.lib.licenses.bsd3;
}) {};
+ "shortcut-links_0_5_0_0" = callPackage
+ ({ mkDerivation, base, text }:
+ mkDerivation {
+ pname = "shortcut-links";
+ version = "0.5.0.0";
+ sha256 = "0y5q3m5sqwwhahq8fx1alc2531jfgr4nng8yfpib8sg57n0wggwf";
+ libraryHaskellDepends = [ base text ];
+ description = "Link shortcuts for use in text markup";
+ license = stdenv.lib.licenses.mpl20;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ }) {};
+
"shorten-strings" = callPackage
({ mkDerivation, base, text }:
mkDerivation {
@@ -218053,17 +218744,6 @@ self: {
}) {};
"simple-cmd" = callPackage
- ({ mkDerivation, base, directory, filepath, process, unix }:
- mkDerivation {
- pname = "simple-cmd";
- version = "0.2.0.1";
- sha256 = "0kd0kr27q72ay5jzrnyqnbbfl4q1lyrlq13s74iphxx4s2yzn03p";
- libraryHaskellDepends = [ base directory filepath process unix ];
- description = "Simple String-based process commands";
- license = stdenv.lib.licenses.bsd3;
- }) {};
-
- "simple-cmd_0_2_1" = callPackage
({ mkDerivation, base, directory, filepath, process, unix }:
mkDerivation {
pname = "simple-cmd";
@@ -218072,7 +218752,6 @@ self: {
libraryHaskellDepends = [ base directory filepath process unix ];
description = "Simple String-based process commands";
license = stdenv.lib.licenses.bsd3;
- hydraPlatforms = stdenv.lib.platforms.none;
}) {};
"simple-cmd-args" = callPackage
@@ -220112,8 +220791,8 @@ self: {
}:
mkDerivation {
pname = "slick";
- version = "1.0.1.0";
- sha256 = "0zmg8k12dd8apjd6bjjhf5vdfc927pq372r5gvyjx5rmrfkcwx4l";
+ version = "1.0.1.1";
+ sha256 = "1n1a7jpn37dzfmk9z51d6yhg2iaraqw55qnlap0d6zk1lnc3drib";
libraryHaskellDepends = [
aeson base bytestring directory extra mustache pandoc shake text
unordered-containers
@@ -221341,8 +222020,8 @@ self: {
pname = "snap-server";
version = "1.1.1.1";
sha256 = "0lw475wp0lnrbgc3jcfif3qjjc3pmrh2k74d8cgpnc1304g6a2s5";
- revision = "2";
- editedCabalFile = "12yr0yc7xqxsia84756qalr96fa2lz0sd3mfww2i8784ndlbkfwf";
+ revision = "3";
+ editedCabalFile = "1xma33r1by1q79qqbb70lwf4d846qlqs0f22rzrd3cdzkzcf9qf5";
configureFlags = [ "-fopenssl" ];
isLibrary = true;
isExecutable = true;
@@ -223232,24 +223911,26 @@ self: {
}) {};
"souffle-haskell" = callPackage
- ({ mkDerivation, base, hspec, mtl, template-haskell
- , type-errors-pretty
+ ({ mkDerivation, base, hspec, mtl, souffle, template-haskell, text
+ , type-errors-pretty, vector
}:
mkDerivation {
pname = "souffle-haskell";
- version = "0.0.1";
- sha256 = "1sz5xaw24fknq4y9a9cpp36h6fm46ipclp3nwmpqpnc5svsslgbz";
+ version = "0.1.0";
+ sha256 = "0m8p9fx4avv4kf4hbr248rk9k3vixzkx4gqmcslfra3d79akjyad";
libraryHaskellDepends = [
- base mtl template-haskell type-errors-pretty
+ base mtl template-haskell text type-errors-pretty vector
];
+ libraryToolDepends = [ souffle ];
testHaskellDepends = [
- base hspec mtl template-haskell type-errors-pretty
+ base hspec mtl template-haskell text type-errors-pretty vector
];
+ testToolDepends = [ souffle ];
description = "Souffle Datalog bindings for Haskell";
license = stdenv.lib.licenses.mit;
hydraPlatforms = stdenv.lib.platforms.none;
broken = true;
- }) {};
+ }) {inherit (pkgs) souffle;};
"sound-collage" = callPackage
({ mkDerivation, array, base, Cabal, carray, containers, fft
@@ -225907,8 +226588,6 @@ self: {
];
description = "Convert stack projects to cabal.project + cabal.project.freeze";
license = stdenv.lib.licenses.gpl3Plus;
- hydraPlatforms = stdenv.lib.platforms.none;
- broken = true;
}) {};
"stack2nix" = callPackage
@@ -227066,7 +227745,7 @@ self: {
license = stdenv.lib.licenses.publicDomain;
}) {};
- "stb-image-redux" = callPackage
+ "stb-image-redux_0_2_1_2" = callPackage
({ mkDerivation, base, hspec, vector }:
mkDerivation {
pname = "stb-image-redux";
@@ -227080,6 +227759,20 @@ self: {
broken = true;
}) {};
+ "stb-image-redux" = callPackage
+ ({ mkDerivation, base, hspec, vector }:
+ mkDerivation {
+ pname = "stb-image-redux";
+ version = "0.2.1.3";
+ sha256 = "01xm1vlyfmnnvr5vy9ry7cjwv9ffip0s4zlxcyvfnsgja08l5ni4";
+ libraryHaskellDepends = [ base vector ];
+ testHaskellDepends = [ base hspec vector ];
+ description = "Image loading and writing microlibrary";
+ license = stdenv.lib.licenses.bsd3;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ broken = true;
+ }) {};
+
"stb-truetype" = callPackage
({ mkDerivation, array, base, bytestring, containers }:
mkDerivation {
@@ -228633,8 +229326,8 @@ self: {
}:
mkDerivation {
pname = "streaming-events";
- version = "1.0.0";
- sha256 = "12rbw1gvcfl2svlsm7x1v01j9bk0fdh6x7j1c0v6a9xjmwq2bgv6";
+ version = "1.0.1";
+ sha256 = "0cgd3lvxb91jd1nkw4vci5zjp6s6q545cqgd9fq6i4mxrgn7ky7h";
libraryHaskellDepends = [
attoparsec base binary bytestring http-client streaming
streaming-attoparsec streaming-bytestring wai-extra
@@ -229045,17 +229738,16 @@ self: {
}) {};
"strelka-core" = callPackage
- ({ mkDerivation, base, base-prelude, bifunctors, bytestring
- , hashable, mtl, semigroups, text, transformers
- , unordered-containers
+ ({ mkDerivation, base, bytestring, hashable, mmorph, mtl, text
+ , transformers, unordered-containers
}:
mkDerivation {
pname = "strelka-core";
- version = "0.3.0.1";
- sha256 = "0hksf6p2pjvlvpgyndrcza16n0zyjaykqxzwy0igvylkwg1684qy";
+ version = "0.3.1";
+ sha256 = "1gy382layyir0cy96igf5kyfsjzvqpb4v8bca5vl911rwmp5095v";
libraryHaskellDepends = [
- base base-prelude bifunctors bytestring hashable mtl semigroups
- text transformers unordered-containers
+ base bytestring hashable mmorph mtl text transformers
+ unordered-containers
];
description = "Core components of \"strelka\"";
license = stdenv.lib.licenses.mit;
@@ -229388,6 +230080,36 @@ self: {
license = stdenv.lib.licenses.bsd3;
}) {};
+ "string-interpolate_0_2_0_0" = callPackage
+ ({ mkDerivation, base, bytestring, criterion, formatting
+ , haskell-src-meta, hspec, interpolate, interpolatedstring-perl6
+ , neat-interpolation, QuickCheck, quickcheck-instances
+ , quickcheck-text, quickcheck-unicode, random-shuffle
+ , template-haskell, text, text-conversions, unordered-containers
+ , utf8-string
+ }:
+ mkDerivation {
+ pname = "string-interpolate";
+ version = "0.2.0.0";
+ sha256 = "084mkh9xx9dcy7j92kca6rv580v8223n7xgm9csy51mn0h2lg6wq";
+ libraryHaskellDepends = [
+ base bytestring haskell-src-meta template-haskell text
+ text-conversions utf8-string
+ ];
+ testHaskellDepends = [
+ base bytestring hspec QuickCheck quickcheck-instances
+ quickcheck-text quickcheck-unicode random-shuffle text
+ unordered-containers
+ ];
+ benchmarkHaskellDepends = [
+ base bytestring criterion formatting interpolate
+ interpolatedstring-perl6 neat-interpolation QuickCheck text
+ ];
+ description = "Haskell string/text/bytestring interpolation that just works";
+ license = stdenv.lib.licenses.bsd3;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ }) {};
+
"string-isos" = callPackage
({ mkDerivation, base, bytestring, mono-traversable, safe, text
, type-iso
@@ -230583,23 +231305,49 @@ self: {
broken = true;
}) {};
- "summoner-tui" = callPackage
- ({ mkDerivation, base, base-noprelude, brick, directory, filepath
- , microlens, microlens-th, relude, summoner, text, vty
+ "summoner_1_4_0_0" = callPackage
+ ({ mkDerivation, aeson, ansi-terminal, base, bytestring, containers
+ , directory, filepath, generic-deriving, gitrev, hedgehog, hspec
+ , neat-interpolation, optparse-applicative, process, relude
+ , shellmet, text, time, tomland, tree-diff
}:
mkDerivation {
- pname = "summoner-tui";
- version = "0.1.0";
- sha256 = "0ic9faw55qjljwz8r0nz8jmdw2pcc40nqc0zp07hshqh8qbiswl9";
- revision = "1";
- editedCabalFile = "0rjnrhh62m2jy74dqdiywkk2gqs1dds97h55qxc50qysdiiwmmal";
+ pname = "summoner";
+ version = "1.4.0.0";
+ sha256 = "0niakfpnk86n69n7kazlv2z00g211b9lgp2b8qphlr4xyz3b7fn0";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [
- base-noprelude brick directory filepath microlens microlens-th
- relude summoner text vty
+ aeson ansi-terminal base bytestring containers directory filepath
+ generic-deriving gitrev neat-interpolation optparse-applicative
+ process relude shellmet text time tomland
];
- executableHaskellDepends = [ base ];
+ executableHaskellDepends = [ base relude ];
+ testHaskellDepends = [
+ base directory filepath hedgehog hspec neat-interpolation relude
+ text tomland tree-diff
+ ];
+ description = "Tool for scaffolding fully configured batteries-included production-level Haskell projects";
+ license = stdenv.lib.licenses.mpl20;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ broken = true;
+ }) {};
+
+ "summoner-tui" = callPackage
+ ({ mkDerivation, base, brick, directory, filepath, microlens
+ , microlens-th, relude, summoner, text, vty
+ }:
+ mkDerivation {
+ pname = "summoner-tui";
+ version = "1.4.0.0";
+ sha256 = "0vz4nd5wwjdk8n9n1lwa5b8xs863fkkcq56rwy0fifp1xr4184si";
+ isLibrary = true;
+ isExecutable = true;
+ libraryHaskellDepends = [
+ base brick directory filepath microlens microlens-th relude
+ summoner text vty
+ ];
+ executableHaskellDepends = [ base relude ];
description = "Tool for scaffolding fully configured batteries-included production-level Haskell projects using TUI";
license = stdenv.lib.licenses.mpl20;
hydraPlatforms = stdenv.lib.platforms.none;
@@ -231283,8 +232031,8 @@ self: {
}:
mkDerivation {
pname = "svgcairo";
- version = "0.13.2.0";
- sha256 = "1h3phyq9g7lmw0mf75hlccvixgwffvkfnlyy1g34hwh9i5nj0aqw";
+ version = "0.13.2.1";
+ sha256 = "19jq5nf3v6774d0imbz5dkajriqx3fa93zvxjyqh1nm5birczaj8";
enableSeparateDataOutput = true;
setupHaskellDepends = [ base Cabal gtk2hs-buildtools ];
libraryHaskellDepends = [ base cairo glib mtl text ];
@@ -234375,8 +235123,8 @@ self: {
}:
mkDerivation {
pname = "taskwarrior";
- version = "0.1.1.0";
- sha256 = "1vr25n4q4rb5z760dpd247h3z6r8ydqgg5z5hihmps1vhazvxa8c";
+ version = "0.1.2.0";
+ sha256 = "1kmmlb3d9bfc47lvlv8v3zxp3cymv3v5i2m86m4iglhg0x6lyawp";
libraryHaskellDepends = [
aeson base bytestring process random string-interpolate text time
unordered-containers uuid
@@ -234841,8 +235589,8 @@ self: {
}:
mkDerivation {
pname = "tasty-rerun";
- version = "1.1.15";
- sha256 = "008pwf3mqn18vxzxym6zbfm7kf4g415g3722r41vdbh972xkz3w2";
+ version = "1.1.16";
+ sha256 = "1xrm7z5dhg7zfpq7xr1pdwqsgrvxsb5r5ia063lcxlxk2dizrib2";
libraryHaskellDepends = [
base containers mtl optparse-applicative split stm tagged tasty
transformers
@@ -235105,24 +235853,24 @@ self: {
}) {};
"tcod-haskell" = callPackage
- ({ mkDerivation, base, bytestring, containers, inline-c, repa, sdl2
- , tcod, vector
+ ({ mkDerivation, base, bytestring, containers, inline-c, libtcod
+ , repa, sdl2, vector
}:
mkDerivation {
pname = "tcod-haskell";
- version = "0.2.0.0";
- sha256 = "131qdd7h2890as35lfb3kx37j3vrz33ajxp5n4cl65rdrdk5vfxc";
+ version = "0.3.0.0";
+ sha256 = "08pcjzc2kc6aaba7n2j3sbglqpcml47s0mpgfgkbngrnzzs7hrj7";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [
base bytestring containers inline-c repa sdl2 vector
];
- librarySystemDepends = [ tcod ];
+ libraryPkgconfigDepends = [ libtcod ];
description = "Bindings to libtcod roguelike engine";
license = stdenv.lib.licenses.bsd3;
hydraPlatforms = stdenv.lib.platforms.none;
broken = true;
- }) {tcod = null;};
+ }) {inherit (pkgs) libtcod;};
"tconfig" = callPackage
({ mkDerivation, base, containers }:
@@ -236514,8 +237262,8 @@ self: {
}:
mkDerivation {
pname = "tesla";
- version = "0.1.0.0";
- sha256 = "1asifxkc73n8g30qmr1nr83vpvgx8smi505322n9sknlb1hadgms";
+ version = "0.1.0.1";
+ sha256 = "0rk1i9pl6x6f58hbij287aaab7ac3iy3ngs2bqb2990zqfh12ir4";
libraryHaskellDepends = [
aeson base bytestring casing containers generic-deriving lens
lens-aeson mtl template-haskell text time vector wreq
@@ -239453,6 +240201,31 @@ self: {
license = stdenv.lib.licenses.bsd3;
}) {};
+ "threepenny-gui_0_8_3_1" = callPackage
+ ({ mkDerivation, aeson, async, base, bytestring, containers
+ , data-default, deepseq, exceptions, file-embed, filepath, hashable
+ , safe, snap-core, snap-server, stm, template-haskell, text
+ , transformers, unordered-containers, vault, vector, websockets
+ , websockets-snap
+ }:
+ mkDerivation {
+ pname = "threepenny-gui";
+ version = "0.8.3.1";
+ sha256 = "08jmnyaskbfzwzyghs9ccmq6rdfxcgw0si7p6kc5ppi86gxdr5sl";
+ isLibrary = true;
+ isExecutable = true;
+ enableSeparateDataOutput = true;
+ libraryHaskellDepends = [
+ aeson async base bytestring containers data-default deepseq
+ exceptions file-embed filepath hashable safe snap-core snap-server
+ stm template-haskell text transformers unordered-containers vault
+ vector websockets websockets-snap
+ ];
+ description = "GUI framework that uses the web browser as a display";
+ license = stdenv.lib.licenses.bsd3;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ }) {};
+
"threepenny-gui-contextmenu" = callPackage
({ mkDerivation, base, threepenny-gui }:
mkDerivation {
@@ -239650,8 +240423,8 @@ self: {
}:
mkDerivation {
pname = "thumbnail-polish";
- version = "0.0.1.0";
- sha256 = "09b5689anqbll8x7mwcwbcm5qwsxvayglfk3k3p55jwp142z75ir";
+ version = "0.0.1.1";
+ sha256 = "1bl45s6cb5pak3g5w3p98n7dipg1b8fapq7y5radzlwkgjchp600";
libraryHaskellDepends = [
base bytestring data-default directory filepath friday friday-devil
nonce resourcet text
@@ -239836,6 +240609,28 @@ self: {
license = stdenv.lib.licenses.gpl3;
}) {};
+ "tidal_1_4_6" = callPackage
+ ({ mkDerivation, base, bifunctors, bytestring, clock, colour
+ , containers, criterion, deepseq, hosc, microspec, mwc-random
+ , network, parsec, primitive, random, text, transformers, vector
+ , weigh
+ }:
+ mkDerivation {
+ pname = "tidal";
+ version = "1.4.6";
+ sha256 = "1mgyss58kwvdp39qznqxkks8vvyq5w802g60rvmc26ipilhm1rd9";
+ enableSeparateDataOutput = true;
+ libraryHaskellDepends = [
+ base bifunctors bytestring clock colour containers deepseq hosc
+ mwc-random network parsec primitive random text transformers vector
+ ];
+ testHaskellDepends = [ base containers microspec parsec ];
+ benchmarkHaskellDepends = [ base criterion weigh ];
+ description = "Pattern language for improvised music";
+ license = stdenv.lib.licenses.gpl3;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ }) {};
+
"tidal-midi" = callPackage
({ mkDerivation, base, containers, PortMidi, tidal, time
, transformers
@@ -241448,7 +242243,7 @@ self: {
broken = true;
}) {};
- "tmp-postgres_1_31_0_1" = callPackage
+ "tmp-postgres_1_34_0_0" = callPackage
({ mkDerivation, ansi-wl-pprint, async, base, base64-bytestring
, bytestring, containers, criterion, cryptohash-sha1, deepseq
, directory, generic-monoid, hspec, mtl, network, port-utils
@@ -241457,8 +242252,8 @@ self: {
}:
mkDerivation {
pname = "tmp-postgres";
- version = "1.31.0.1";
- sha256 = "0nlg0hi0rcfk77jm927i1w63mh4x9y1p4j3fqbd13c2a6pg084vw";
+ version = "1.34.0.0";
+ sha256 = "0845bjp1vgpkms865p311zv758z1i1y8874s1gmjn0c8jwgi48cs";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [
@@ -241472,7 +242267,7 @@ self: {
temporary
];
testHaskellDepends = [
- base containers directory generic-monoid hspec mtl network
+ async base containers directory generic-monoid hspec mtl network
port-utils postgres-options postgresql-simple process temporary
unix
];
@@ -241731,6 +242526,31 @@ self: {
license = stdenv.lib.licenses.bsd2;
}) {};
+ "token-search" = callPackage
+ ({ mkDerivation, aeson, base, bytestring, conduit, hashable, hspec
+ , process, streaming-commons, text, unordered-containers
+ }:
+ mkDerivation {
+ pname = "token-search";
+ version = "0.1.0.0";
+ sha256 = "1df0yvmwskhw1pr9wxxlhp6p74y1nfxxadaqdjvgfd2sz2kb4v4l";
+ isLibrary = true;
+ isExecutable = true;
+ libraryHaskellDepends = [
+ base bytestring conduit hashable process streaming-commons text
+ unordered-containers
+ ];
+ executableHaskellDepends = [
+ aeson base bytestring conduit hashable process streaming-commons
+ text unordered-containers
+ ];
+ testHaskellDepends = [
+ base bytestring conduit hashable hspec process streaming-commons
+ text unordered-containers
+ ];
+ license = stdenv.lib.licenses.mit;
+ }) {};
+
"tokenify" = callPackage
({ mkDerivation, base, containers, text }:
mkDerivation {
@@ -242021,6 +242841,19 @@ self: {
license = stdenv.lib.licenses.mit;
}) {};
+ "tonatona_0_1_1_0" = callPackage
+ ({ mkDerivation, base, doctest, Glob, rio, tonaparser }:
+ mkDerivation {
+ pname = "tonatona";
+ version = "0.1.1.0";
+ sha256 = "17hd93m2i79pb39z00x0sdvhfds3b5fgyhld8pr64rlnr9wm039l";
+ libraryHaskellDepends = [ base rio tonaparser ];
+ testHaskellDepends = [ base doctest Glob rio tonaparser ];
+ description = "meta application framework";
+ license = stdenv.lib.licenses.mit;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ }) {};
+
"tonatona-google-server-api" = callPackage
({ mkDerivation, base, doctest, Glob, google-server-api
, monad-logger, persistent, persistent-sqlite, resource-pool
@@ -243657,8 +244490,8 @@ self: {
}:
mkDerivation {
pname = "tree-sitter";
- version = "0.7.1.0";
- sha256 = "1xbgii27xn858373nly4q73y1ghrpv069pxjd5bc30rff611rqvz";
+ version = "0.7.2.0";
+ sha256 = "1gq30qjywg6cgbzgxxfngkn5c4kbddnij7wdvz8x7k1yb13ra0hd";
libraryHaskellDepends = [
aeson base bytestring containers directory filepath fused-effects
semantic-source split template-haskell text unordered-containers
@@ -243671,18 +244504,28 @@ self: {
}) {};
"tree-sitter-go" = callPackage
- ({ mkDerivation, base, template-haskell, tree-sitter }:
+ ({ mkDerivation, base, bytestring, hedgehog, pathtype
+ , semantic-source, tasty, tasty-hedgehog, tasty-hunit
+ , template-haskell, text, tree-sitter, tree-sitter-test-helpers
+ }:
mkDerivation {
pname = "tree-sitter-go";
- version = "0.3.0.0";
- sha256 = "07r8dlx8r3g1sdc23w544clb658wiw5rjl33m967li5sq7g1w1aj";
- libraryHaskellDepends = [ base template-haskell tree-sitter ];
+ version = "0.4.0.0";
+ sha256 = "0i469134jc1i665nr5j3z3al8lgsv74mm5x7rk4gm159kpfm1z1r";
+ enableSeparateDataOutput = true;
+ libraryHaskellDepends = [
+ base semantic-source template-haskell tree-sitter
+ ];
+ testHaskellDepends = [
+ base bytestring hedgehog pathtype tasty tasty-hedgehog tasty-hunit
+ text tree-sitter tree-sitter-test-helpers
+ ];
doHaddock = false;
description = "Tree-sitter grammar/parser for Go";
license = stdenv.lib.licenses.bsd3;
hydraPlatforms = stdenv.lib.platforms.none;
broken = true;
- }) {};
+ }) {tree-sitter-test-helpers = null;};
"tree-sitter-haskell" = callPackage
({ mkDerivation, base, template-haskell, tree-sitter }:
@@ -243782,46 +244625,76 @@ self: {
}) {tree-sitter-test-helpers = null;};
"tree-sitter-ruby" = callPackage
- ({ mkDerivation, base, template-haskell, tree-sitter }:
+ ({ mkDerivation, base, bytestring, hedgehog, pathtype
+ , semantic-source, tasty, tasty-hedgehog, tasty-hunit
+ , template-haskell, text, tree-sitter, tree-sitter-test-helpers
+ }:
mkDerivation {
pname = "tree-sitter-ruby";
- version = "0.3.1.0";
- sha256 = "0kndnmnhfff4d936irvsc545x3npxqspf21qwwqwn4c5n3ispv2p";
- libraryHaskellDepends = [ base template-haskell tree-sitter ];
+ version = "0.4.0.0";
+ sha256 = "1y26956bryax1n17yf49hqczcig1qd5fk5j39arj93464x142ba9";
+ enableSeparateDataOutput = true;
+ libraryHaskellDepends = [
+ base semantic-source template-haskell tree-sitter
+ ];
+ testHaskellDepends = [
+ base bytestring hedgehog pathtype tasty tasty-hedgehog tasty-hunit
+ text tree-sitter tree-sitter-test-helpers
+ ];
doHaddock = false;
description = "Tree-sitter grammar/parser for Ruby";
license = stdenv.lib.licenses.bsd3;
hydraPlatforms = stdenv.lib.platforms.none;
broken = true;
- }) {};
+ }) {tree-sitter-test-helpers = null;};
"tree-sitter-tsx" = callPackage
- ({ mkDerivation, base, template-haskell, tree-sitter }:
+ ({ mkDerivation, base, bytestring, hedgehog, pathtype
+ , semantic-source, tasty, tasty-hedgehog, tasty-hunit
+ , template-haskell, text, tree-sitter, tree-sitter-test-helpers
+ }:
mkDerivation {
pname = "tree-sitter-tsx";
- version = "0.3.0.0";
- sha256 = "029dapll3jw4m0fxmbxn3nj4jgi8j777ajyc8zx8m2f12zly3y5i";
- libraryHaskellDepends = [ base template-haskell tree-sitter ];
+ version = "0.4.0.0";
+ sha256 = "0q5v1fm9ia83074gkamz06hlcmdkd4vabjfrjqcra7mrvrj1pqa2";
+ enableSeparateDataOutput = true;
+ libraryHaskellDepends = [
+ base semantic-source template-haskell tree-sitter
+ ];
+ testHaskellDepends = [
+ base bytestring hedgehog pathtype tasty tasty-hedgehog tasty-hunit
+ text tree-sitter tree-sitter-test-helpers
+ ];
doHaddock = false;
description = "Tree-sitter grammar/parser for TSX";
license = stdenv.lib.licenses.bsd3;
hydraPlatforms = stdenv.lib.platforms.none;
broken = true;
- }) {};
+ }) {tree-sitter-test-helpers = null;};
"tree-sitter-typescript" = callPackage
- ({ mkDerivation, base, template-haskell, tree-sitter }:
+ ({ mkDerivation, base, bytestring, hedgehog, pathtype
+ , semantic-source, tasty, tasty-hedgehog, tasty-hunit
+ , template-haskell, text, tree-sitter, tree-sitter-test-helpers
+ }:
mkDerivation {
pname = "tree-sitter-typescript";
- version = "0.3.0.0";
- sha256 = "0gkhbsmrjkf6q4bwlhws2zmnkhjval7qrbvqlcnmmvx384aiis72";
- libraryHaskellDepends = [ base template-haskell tree-sitter ];
+ version = "0.4.0.0";
+ sha256 = "0sbvsfipwf2j809kkjcgbqq4k44h69x9dl07dvngjyfimkccv758";
+ enableSeparateDataOutput = true;
+ libraryHaskellDepends = [
+ base semantic-source template-haskell tree-sitter
+ ];
+ testHaskellDepends = [
+ base bytestring hedgehog pathtype tasty tasty-hedgehog tasty-hunit
+ text tree-sitter tree-sitter-test-helpers
+ ];
doHaddock = false;
description = "Tree-sitter grammar/parser for TypeScript";
license = stdenv.lib.licenses.bsd3;
hydraPlatforms = stdenv.lib.platforms.none;
broken = true;
- }) {};
+ }) {tree-sitter-test-helpers = null;};
"tree-traversals" = callPackage
({ mkDerivation, base, containers, doctest, mtl }:
@@ -244571,12 +245444,12 @@ self: {
}:
mkDerivation {
pname = "ttc";
- version = "0.1.0.1";
- sha256 = "12c781fsa1i2iw03ysdh5fpg0912w9kmzgixzq16kb4mdb0crq30";
- isLibrary = true;
- isExecutable = true;
+ version = "0.2.0.0";
+ sha256 = "1vl3fp0d9v674gg6zbmafvrb97zqxcjlpp5j77msjn1kl7ki6xs7";
libraryHaskellDepends = [ base bytestring template-haskell text ];
- testHaskellDepends = [ base bytestring tasty tasty-hunit text ];
+ testHaskellDepends = [
+ base bytestring tasty tasty-hunit template-haskell text
+ ];
description = "Textual Type Classes";
license = stdenv.lib.licenses.mit;
}) {};
@@ -246898,8 +247771,8 @@ self: {
}:
mkDerivation {
pname = "typesafe-precure";
- version = "0.7.6.1";
- sha256 = "1sc74y1nqydshrycf309636f49h0nbc5bfiix991nxrv9grwslpi";
+ version = "0.7.6.2";
+ sha256 = "0nhb8v17ycjjldcvhyjc1qk7r4hqhqdw6gw9fp0mbvn5cbpi0xrm";
libraryHaskellDepends = [
aeson aeson-pretty autoexporter base bytestring dlist
monad-skeleton template-haskell text th-data-compat
@@ -247736,6 +248609,20 @@ self: {
license = stdenv.lib.licenses.bsd3;
}) {};
+ "unboxed-references" = callPackage
+ ({ mkDerivation, base, vector }:
+ mkDerivation {
+ pname = "unboxed-references";
+ version = "0.1.0";
+ sha256 = "0qdaf0xxc3a44a7mrfiyz9df8hnaj7bsdvdglsqz8f5andfy4ix9";
+ isLibrary = true;
+ isExecutable = true;
+ libraryHaskellDepends = [ base vector ];
+ executableHaskellDepends = [ base vector ];
+ description = "A library for reference cells backed by unboxed-vectors";
+ license = stdenv.lib.licenses.bsd3;
+ }) {};
+
"unboxing-vector" = callPackage
({ mkDerivation, base, deepseq, HUnit, mono-traversable, primitive
, should-not-typecheck, vector
@@ -248097,6 +248984,20 @@ self: {
broken = true;
}) {};
+ "unicode-show_0_1_0_4" = callPackage
+ ({ mkDerivation, base, hspec, QuickCheck }:
+ mkDerivation {
+ pname = "unicode-show";
+ version = "0.1.0.4";
+ sha256 = "158vnv6d7s1ahm3fr5s8ns585bcds8pf19rsglsyfk33qps3il9i";
+ libraryHaskellDepends = [ base ];
+ testHaskellDepends = [ base hspec QuickCheck ];
+ description = "print and show in unicode";
+ license = stdenv.lib.licenses.bsd3;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ broken = true;
+ }) {};
+
"unicode-symbols" = callPackage
({ mkDerivation, base, containers }:
mkDerivation {
@@ -250371,6 +251272,19 @@ self: {
broken = true;
}) {};
+ "utf" = callPackage
+ ({ mkDerivation, base, gauge, util }:
+ mkDerivation {
+ pname = "utf";
+ version = "0.0.0.0";
+ sha256 = "0j441d8k4299798d4w78vbxvs3qh9w124zwl0f91rmydw9q4hg37";
+ libraryHaskellDepends = [ base util ];
+ testHaskellDepends = [ base ];
+ benchmarkHaskellDepends = [ base gauge ];
+ description = "UTF-8";
+ license = stdenv.lib.licenses.bsd3;
+ }) {};
+
"utf8-env" = callPackage
({ mkDerivation, base, mtl, utf8-string }:
mkDerivation {
@@ -250445,13 +251359,25 @@ self: {
({ mkDerivation, base, transformers }:
mkDerivation {
pname = "util";
- version = "0.1.14.1";
- sha256 = "17y07674dkhgq8yxrdfqj3ycaw5232rc1dnfh7r0v4ca2fyhx5a8";
+ version = "0.1.15.0";
+ sha256 = "0ybjl0mibvdmqppknypljaajsjx7ls4js6yqh0viinrwq8ayf0wj";
libraryHaskellDepends = [ base transformers ];
description = "Utilities";
license = stdenv.lib.licenses.bsd3;
}) {};
+ "util_0_1_17_0" = callPackage
+ ({ mkDerivation, base, transformers }:
+ mkDerivation {
+ pname = "util";
+ version = "0.1.17.0";
+ sha256 = "1wyjxrnzianif6msk7qvib92lksy66hx4rkdb7sda0a4h704960c";
+ libraryHaskellDepends = [ base transformers ];
+ description = "Utilities";
+ license = stdenv.lib.licenses.bsd3;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ }) {};
+
"util-exception" = callPackage
({ mkDerivation, base, basic, control, lifted-base-tf, util }:
mkDerivation {
@@ -251076,8 +252002,8 @@ self: {
}:
mkDerivation {
pname = "vado";
- version = "0.0.11";
- sha256 = "1cx8qdzfg2wn6q6q3vhkh6lmwqfkyf8ypvbbv6kyjai1smb1qfac";
+ version = "0.0.12";
+ sha256 = "0qirhdzbcx5mqlbgh24ckcmivi38hqr53im9g6cydzslnk7ys41w";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [
@@ -252542,8 +253468,8 @@ self: {
}:
mkDerivation {
pname = "venzone";
- version = "1.0.0.4";
- sha256 = "1jqhv6xi0yn970h0wlzhlhrfwjr44drpwvys9kvfi4di7cg4pc74";
+ version = "1.0.0.5";
+ sha256 = "1f8v5xhw6ak6qckrb96rjfpn7h8lm3cq7p0w0k54mrg5ixm4paba";
isLibrary = false;
isExecutable = true;
enableSeparateDataOutput = true;
@@ -252691,23 +253617,24 @@ self: {
({ mkDerivation, alex, array, base, binary, blaze-html, bytestring
, Cabal, cabal-doctest, criterion, cryptonite, deepseq, DRBG
, exceptions, fgl, fgl-visualize, filepath, gitrev, hedgehog, lens
- , lifted-base, memory, monad-control, optparse-applicative, parsec
- , prettyprinter, random, recursion-schemes, shakespeare, shelly
- , statistics, tasty, tasty-hedgehog, tasty-hunit, template-haskell
- , text, time, tomland, transformers, transformers-base
- , unordered-containers, vector
+ , lifted-base, memory, monad-control, mtl, optparse-applicative
+ , parsec, prettyprinter, random, recursion-schemes, shakespeare
+ , shelly, statistics, tasty, tasty-hedgehog, tasty-hunit
+ , template-haskell, text, time, tomland, transformers
+ , transformers-base, unordered-containers, vector
}:
mkDerivation {
pname = "verismith";
- version = "0.4.0.0";
- sha256 = "1f2yzspw12slmhywvdnqfwzxn3v6qvzwgjm7lsjx72lb3611w4z3";
+ version = "0.6.0.2";
+ sha256 = "1rjcsdizzhc1lr2mfh0r6dhhabnbz1gjva7xkr3z3mqzsqp9jm5f";
isLibrary = true;
isExecutable = true;
+ enableSeparateDataOutput = true;
setupHaskellDepends = [ base Cabal cabal-doctest ];
libraryHaskellDepends = [
array base binary blaze-html bytestring cryptonite deepseq DRBG
exceptions fgl fgl-visualize filepath gitrev hedgehog lens
- lifted-base memory monad-control optparse-applicative parsec
+ lifted-base memory monad-control mtl optparse-applicative parsec
prettyprinter random recursion-schemes shakespeare shelly
statistics template-haskell text time tomland transformers
transformers-base unordered-containers vector
@@ -255874,40 +256801,6 @@ self: {
}) {};
"warp" = callPackage
- ({ mkDerivation, array, async, auto-update, base, bsb-http-chunked
- , bytestring, case-insensitive, containers, directory, doctest
- , gauge, ghc-prim, hashable, hspec, http-client, http-date
- , http-types, http2, HUnit, iproute, lifted-base, network, process
- , QuickCheck, simple-sendfile, stm, streaming-commons, text, time
- , time-manager, transformers, unix, unix-compat, vault, wai, word8
- }:
- mkDerivation {
- pname = "warp";
- version = "3.2.28";
- sha256 = "0w2w3aiccpb2f8zssqiszcxzqdysihqi5xply23lwif5arz4saw7";
- libraryHaskellDepends = [
- array async auto-update base bsb-http-chunked bytestring
- case-insensitive containers ghc-prim hashable http-date http-types
- http2 iproute network simple-sendfile stm streaming-commons text
- time-manager unix unix-compat vault wai word8
- ];
- testHaskellDepends = [
- array async auto-update base bsb-http-chunked bytestring
- case-insensitive containers directory doctest ghc-prim hashable
- hspec http-client http-date http-types http2 HUnit iproute
- lifted-base network process QuickCheck simple-sendfile stm
- streaming-commons text time time-manager transformers unix
- unix-compat vault wai word8
- ];
- benchmarkHaskellDepends = [
- auto-update base bytestring containers gauge hashable http-date
- http-types network time-manager unix unix-compat
- ];
- description = "A fast, light-weight web server for WAI applications";
- license = stdenv.lib.licenses.mit;
- }) {};
-
- "warp_3_3_4" = callPackage
({ mkDerivation, array, async, auto-update, base, bsb-http-chunked
, bytestring, case-insensitive, containers, directory, gauge
, ghc-prim, hashable, hspec, http-client, http-date, http-types
@@ -255917,8 +256810,8 @@ self: {
}:
mkDerivation {
pname = "warp";
- version = "3.3.4";
- sha256 = "0v9r892xgzaf260fsk2gx747ipkf9b2c1fsjgynwy355xrip8z06";
+ version = "3.3.5";
+ sha256 = "09kd8p61xxwi3jnx7y6idjr03cblfzysssvzcvvv7mfcqr5sf165";
libraryHaskellDepends = [
array async auto-update base bsb-http-chunked bytestring
case-insensitive containers ghc-prim hashable http-date http-types
@@ -255938,7 +256831,6 @@ self: {
];
description = "A fast, light-weight web server for WAI applications";
license = stdenv.lib.licenses.mit;
- hydraPlatforms = stdenv.lib.platforms.none;
}) {};
"warp-dynamic" = callPackage
@@ -256016,8 +256908,8 @@ self: {
}:
mkDerivation {
pname = "warp-tls";
- version = "3.2.8";
- sha256 = "1z5jzl40x1gp249fk8h51gkw6m3hzxchm2bp3kbpqdgmw8r5im8y";
+ version = "3.2.9";
+ sha256 = "1bwd6fi0pfcszz7f7r41bjxmx1vq0594088l3hbj0s23m4lxzhs1";
libraryHaskellDepends = [
base bytestring cryptonite data-default-class network
streaming-commons tls tls-session-manager wai warp
@@ -256489,31 +257381,29 @@ self: {
({ mkDerivation, aeson, attoparsec, base, bifunctors, box, clay
, foldl, generic-lens, interpolatedstring-perl6, javascript-bridge
, JuicyPixels, language-javascript, lens, lucid, lucid-svg, mmorph
- , mtl, optparse-generic, protolude, scotty, streaming, tasty
- , tasty-hspec, text, text-format, transformers
- , unordered-containers, wai, wai-extra, wai-middleware-static
+ , mtl, optparse-generic, scotty, streaming, tasty, tasty-hspec
+ , text, text-format, transformers, unordered-containers, wai
+ , wai-extra, wai-middleware-static
}:
mkDerivation {
pname = "web-rep";
- version = "0.1.3";
- sha256 = "174q9zaznsy5v9zypxxf6c5xi5syyhdzmwgi07siqp07in8w1jvf";
+ version = "0.2.0";
+ sha256 = "0mxsqx9gigi70xj372qrwsfahy1ra17jhagvrv6y7pzzl3g0rfws";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [
aeson attoparsec base bifunctors box clay foldl generic-lens
interpolatedstring-perl6 javascript-bridge JuicyPixels
- language-javascript lens lucid lucid-svg mmorph mtl protolude
- scotty streaming text text-format transformers unordered-containers
+ language-javascript lens lucid lucid-svg mmorph mtl scotty
+ streaming text text-format transformers unordered-containers
wai-middleware-static
];
executableHaskellDepends = [
- attoparsec base box lens lucid optparse-generic protolude scotty
- text wai wai-extra wai-middleware-static
+ attoparsec base box lens lucid optparse-generic scotty text wai
+ wai-extra wai-middleware-static
];
- testHaskellDepends = [
- base lens lucid protolude tasty tasty-hspec text
- ];
- description = "representations of a web pag";
+ testHaskellDepends = [ base lens lucid tasty tasty-hspec text ];
+ description = "representations of a web page";
license = stdenv.lib.licenses.mit;
hydraPlatforms = stdenv.lib.platforms.none;
broken = true;
@@ -257179,8 +258069,8 @@ self: {
({ mkDerivation, base, Cabal, gtk2hs-buildtools, webkitgtk }:
mkDerivation {
pname = "webkit2gtk3-javascriptcore";
- version = "0.14.3.0";
- sha256 = "1gsa7lvv0xidy4i9d8bjqc0hpbzx1vvp9npzj2q8x1l68f9vjj5j";
+ version = "0.14.4.0";
+ sha256 = "0njp5m8m9qz7ra9z8ni103bnicfshiixxy44na8m3mzjqrchczww";
setupHaskellDepends = [ base Cabal gtk2hs-buildtools ];
libraryHaskellDepends = [ base ];
libraryPkgconfigDepends = [ webkitgtk ];
@@ -258233,20 +259123,37 @@ self: {
"witherable" = callPackage
({ mkDerivation, base, base-orphans, containers, hashable, lens
, monoidal-containers, transformers, transformers-compat
- , unordered-containers, vector
+ , unordered-containers, vector, witherable-class
}:
mkDerivation {
pname = "witherable";
- version = "0.3.4";
- sha256 = "19qkb8ww3vp446jr1yd4x4wxqm725lc6n2f3d1n3hb925x2djcd6";
+ version = "0.3.5";
+ sha256 = "13r4g5fg3fgl3zall0daljivnk4gm1lm2s8qir1izwkmq25081wb";
libraryHaskellDepends = [
base base-orphans containers hashable lens monoidal-containers
transformers transformers-compat unordered-containers vector
+ witherable-class
];
description = "filterable traversable";
license = stdenv.lib.licenses.bsd3;
}) {};
+ "witherable-class" = callPackage
+ ({ mkDerivation, base, base-orphans, containers, hashable
+ , transformers, unordered-containers, vector
+ }:
+ mkDerivation {
+ pname = "witherable-class";
+ version = "0";
+ sha256 = "0jb8yq9i0rlbmcd5rbg95m2w26zbmi7iwph5v7wghiari751r2bp";
+ libraryHaskellDepends = [
+ base base-orphans containers hashable transformers
+ unordered-containers vector
+ ];
+ description = "Witherable = Traversable + Filterable";
+ license = stdenv.lib.licenses.bsd3;
+ }) {};
+
"witness" = callPackage
({ mkDerivation, base, constraints, semigroupoids, transformers }:
mkDerivation {
@@ -260137,8 +261044,8 @@ self: {
}:
mkDerivation {
pname = "xcffib";
- version = "0.8.1";
- sha256 = "183f7rpckhr3cipwci6hfhrfilqq5jijkwp98r5wi0l43inj29jc";
+ version = "0.9.0";
+ sha256 = "0nxy4dfwz1wgj6dvg1jp3k4zblwpgiydmv7p20s5scyzgii8jsfk";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [
@@ -263101,8 +264008,8 @@ self: {
}:
mkDerivation {
pname = "yarn-lock";
- version = "0.6.1";
- sha256 = "19lkg7qj6m9afy6v6bkkcczz7yp8fsn7q2bpbcnyc06cnkn6hcdn";
+ version = "0.6.2";
+ sha256 = "06wha8cm7hw83d32fq5r8mpzh5pwmf67dxsw8qxqw26qy8pnby96";
libraryHaskellDepends = [
base containers either megaparsec protolude text
];
@@ -263118,36 +264025,37 @@ self: {
}) {};
"yarn2nix" = callPackage
- ({ mkDerivation, aeson, ansi-wl-pprint, async-pool, base
- , bytestring, containers, data-fix, directory, filepath, hnix, mtl
- , neat-interpolation, optparse-applicative, process, protolude
+ ({ mkDerivation, aeson, async-pool, base, bytestring, containers
+ , data-fix, directory, filepath, hnix, mtl, neat-interpolation
+ , optparse-applicative, prettyprinter, process, protolude
, regex-tdfa, regex-tdfa-text, stm, tasty, tasty-hunit
, tasty-quickcheck, tasty-th, text, transformers, unix
, unordered-containers, yarn-lock
}:
mkDerivation {
pname = "yarn2nix";
- version = "0.7.0";
- sha256 = "0rna9z1vm05f99a0dkvvv893als9x2zjifzc4gphwylgkih7d826";
+ version = "0.8.0";
+ sha256 = "05xwpjyi37qlwfj954zpn6f4iwyvy6hsgc8h5vpckbnnp8ak1ndw";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [
- aeson ansi-wl-pprint async-pool base bytestring containers data-fix
- directory filepath hnix mtl process protolude regex-tdfa
+ aeson async-pool base bytestring containers data-fix directory
+ filepath hnix mtl prettyprinter process protolude regex-tdfa
regex-tdfa-text stm text transformers unordered-containers
yarn-lock
];
executableHaskellDepends = [
- aeson ansi-wl-pprint async-pool base bytestring containers data-fix
- directory filepath hnix mtl optparse-applicative process protolude
- regex-tdfa regex-tdfa-text stm text transformers unix
+ aeson async-pool base bytestring containers data-fix directory
+ filepath hnix mtl optparse-applicative prettyprinter process
+ protolude regex-tdfa regex-tdfa-text stm text transformers unix
unordered-containers yarn-lock
];
testHaskellDepends = [
- aeson ansi-wl-pprint async-pool base bytestring containers data-fix
- directory filepath hnix mtl neat-interpolation process protolude
- regex-tdfa regex-tdfa-text stm tasty tasty-hunit tasty-quickcheck
- tasty-th text transformers unordered-containers yarn-lock
+ aeson async-pool base bytestring containers data-fix directory
+ filepath hnix mtl neat-interpolation prettyprinter process
+ protolude regex-tdfa regex-tdfa-text stm tasty tasty-hunit
+ tasty-quickcheck tasty-th text transformers unordered-containers
+ yarn-lock
];
description = "Convert yarn.lock files to nix expressions";
license = stdenv.lib.licenses.mit;
@@ -266318,8 +267226,8 @@ self: {
pname = "yoctoparsec";
version = "0.1.0.0";
sha256 = "0p9kw60glcgrjfx04x3innn3rqnh12yrv4wh0a0fivcx8b9kj1yp";
- revision = "2";
- editedCabalFile = "149a34hpbm6fkkmck70wgqg6792yl91kjirpwf6wdkkr4ga0v514";
+ revision = "3";
+ editedCabalFile = "1yvbslg8y6kvagdjnm0wbknlf1pigqlk8hiqpvmicmqgaiaaxlb7";
libraryHaskellDepends = [ base free mtl ];
description = "A truly tiny monadic parsing library";
license = stdenv.lib.licenses.mit;
@@ -266576,13 +267484,13 @@ self: {
}) {};
"yx" = callPackage
- ({ mkDerivation, array, base, bytestring, hspec, lattices }:
+ ({ mkDerivation, array, base, bytestring, hspec, lattices, mtl }:
mkDerivation {
pname = "yx";
- version = "0.0.3.0";
- sha256 = "068xdmi5dn00cx58qrc5hx6vz6byvnh5cp803j7inlynziw3fcgz";
- libraryHaskellDepends = [ array base bytestring lattices ];
- testHaskellDepends = [ array base bytestring hspec ];
+ version = "0.0.4.1";
+ sha256 = "0mkizcy996q7vm1d2izcxym8aw3dnzyz5nsrmbcchf0ywijw7xzi";
+ libraryHaskellDepends = [ array base bytestring lattices mtl ];
+ testHaskellDepends = [ array base bytestring hspec mtl ];
description = "Row-major coordinates";
license = stdenv.lib.licenses.bsd3;
hydraPlatforms = stdenv.lib.platforms.none;
@@ -267257,18 +268165,20 @@ self: {
}) {};
"zinza" = callPackage
- ({ mkDerivation, base, bytestring, containers, parsec, tasty
- , tasty-golden, tasty-hunit, text, transformers
+ ({ mkDerivation, base, bytestring, containers, parsec, QuickCheck
+ , quickcheck-instances, tasty, tasty-golden, tasty-hunit
+ , tasty-quickcheck, text, transformers
}:
mkDerivation {
pname = "zinza";
- version = "0.1";
- sha256 = "0p7m15qkp7lsdhckkj2xz7ck54kkaz8pw0gz9dddll57mqjyy6zk";
+ version = "0.2";
+ sha256 = "1sy4chm8zan0ixgvvq4vm3fzvhqykn315l333al84768nly9rjv8";
libraryHaskellDepends = [
base containers parsec text transformers
];
testHaskellDepends = [
- base bytestring containers tasty tasty-golden tasty-hunit
+ base bytestring containers QuickCheck quickcheck-instances tasty
+ tasty-golden tasty-hunit tasty-quickcheck
];
description = "Typed templates with jinja like syntax";
license = stdenv.lib.licenses.gpl2Plus;
@@ -267304,6 +268214,35 @@ self: {
license = stdenv.lib.licenses.bsd3;
}) {};
+ "zip_1_3_0" = callPackage
+ ({ mkDerivation, base, bytestring, bzlib-conduit, case-insensitive
+ , cereal, conduit, conduit-extra, containers, digest, directory
+ , dlist, exceptions, filepath, hspec, monad-control, mtl
+ , QuickCheck, resourcet, temporary, text, time, transformers
+ , transformers-base
+ }:
+ mkDerivation {
+ pname = "zip";
+ version = "1.3.0";
+ sha256 = "1wcx48fqvhj823sqgr61rv692hlld3ckp2vyahd8wk3h590sncni";
+ isLibrary = true;
+ isExecutable = true;
+ libraryHaskellDepends = [
+ base bytestring bzlib-conduit case-insensitive cereal conduit
+ conduit-extra containers digest directory dlist exceptions filepath
+ monad-control mtl resourcet text time transformers
+ transformers-base
+ ];
+ executableHaskellDepends = [ base filepath ];
+ testHaskellDepends = [
+ base bytestring conduit containers directory dlist exceptions
+ filepath hspec QuickCheck temporary text time transformers
+ ];
+ description = "Operations on zip archives";
+ license = stdenv.lib.licenses.bsd3;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ }) {};
+
"zip-archive" = callPackage
({ mkDerivation, array, base, binary, bytestring, containers
, digest, directory, filepath, HUnit, mtl, pretty, process
diff --git a/pkgs/development/haskell-modules/non-hackage-packages.nix b/pkgs/development/haskell-modules/non-hackage-packages.nix
index c292eeec128f..092af07637f0 100644
--- a/pkgs/development/haskell-modules/non-hackage-packages.nix
+++ b/pkgs/development/haskell-modules/non-hackage-packages.nix
@@ -15,5 +15,5 @@ self: super: {
# spago is not released to Hackage.
# https://github.com/spacchetti/spago/issues/512
- spago = self.callPackage ../tools/purescript/spago { };
+ spago = self.callPackage ../tools/purescript/spago/spago.nix { };
}
diff --git a/pkgs/development/interpreters/ruby/default.nix b/pkgs/development/interpreters/ruby/default.nix
index d70c7e70f33b..ee9b61259bb0 100644
--- a/pkgs/development/interpreters/ruby/default.nix
+++ b/pkgs/development/interpreters/ruby/default.nix
@@ -3,7 +3,7 @@
, zlib, openssl, gdbm, ncurses, readline, groff, libyaml, libffi, autoreconfHook, bison
, autoconf, libiconv, libobjc, libunwind, Foundation
, buildEnv, bundler, bundix
-, makeWrapper, buildRubyGem, defaultGemConfig
+, makeWrapper, buildRubyGem, defaultGemConfig, removeReferencesTo
} @ args:
let
@@ -27,6 +27,7 @@ let
ver = version;
tag = ver.gitTag;
atLeast25 = lib.versionAtLeast ver.majMin "2.5";
+ atLeast27 = lib.versionAtLeast ver.majMin "2.7";
baseruby = self.override {
useRailsExpress = false;
docSupport = false;
@@ -44,6 +45,11 @@ let
, groff, docSupport ? true
, libyaml, yamlSupport ? true
, libffi, fiddleSupport ? true
+ # ruby -e "puts RbConfig::CONFIG['configure_args']"
+ # puts a reference to the C compiler in the binary.
+ # This might be required by some gems at runtime,
+ # but we allow to strip it out for smaller closure size.
+ , removeReferencesTo, removeReferenceToCC ? false
, autoreconfHook, bison, autoconf
, buildEnv, bundler, bundix
, libiconv, libobjc, libunwind, Foundation
@@ -111,6 +117,12 @@ let
cp ${config}/config.sub tool/
'';
+ # Force the revision.h generation. Somehow `revision.tmp` is an empty
+ # file and because we don't add `git` to buildInputs, hence the check is
+ # always true.
+ # https://github.com/ruby/ruby/commit/97a5af62a318fcd93a4e5e4428d576c0280ddbae
+ buildFlags = lib.optionals atLeast27 [ "REVISION_LATEST=0" ];
+
configureFlags = ["--enable-shared" "--enable-pthread" "--with-soname=ruby_${tag}"]
++ op useRailsExpress "--with-baseruby=${baseruby}/bin/ruby"
++ op (!docSupport) "--disable-install-doc"
@@ -144,7 +156,14 @@ let
postInstall = ''
# Remove unnecessary groff reference from runtime closure, since it's big
sed -i '/NROFF/d' $out/lib/ruby/*/*/rbconfig.rb
-
+ ${
+ lib.optionalString removeReferenceToCC ''
+ # Get rid of the CC runtime dependency
+ ${removeReferencesTo}/bin/remove-references-to \
+ -t ${stdenv.cc} \
+ $out/lib/libruby*
+ ''
+ }
# Bundler tries to create this directory
mkdir -p $out/nix-support
cat > $out/nix-support/setup-hook </dev/null 2>&1 && pwd )"
+
+# Spago derivation created with cabal2nix.
+spago_derivation_file="${script_dir}/spago.nix"
+
+# This is the current revision of spago in Nixpkgs.
+old_version="$(sed -En 's/.*\bversion = "(.*?)".*/\1/p' "$spago_derivation_file")"
+
+# This is the latest release version of spago on GitHub.
+new_version=$(curl --silent "https://api.github.com/repos/spacchetti/spago/releases" | jq '.[0].tag_name' --raw-output)
+
+echo "Updating spago from old version $old_version to new version $new_version."
+echo "Running cabal2nix and outputting to ${spago_derivation_file}..."
+
+cabal2nix --revision "$new_version" "https://github.com/spacchetti/spago.git" > "$spago_derivation_file"
+
+echo "Finished."
diff --git a/pkgs/development/tools/react-native-debugger/default.nix b/pkgs/development/tools/react-native-debugger/default.nix
index dfa31b30a7e4..15c61da13c07 100644
--- a/pkgs/development/tools/react-native-debugger/default.nix
+++ b/pkgs/development/tools/react-native-debugger/default.nix
@@ -78,6 +78,6 @@ in stdenv.mkDerivation rec {
homepage = https://github.com/jhen0409/react-native-debugger;
license = licenses.mit;
description = "The standalone app based on official debugger of React Native, and includes React Inspector / Redux DevTools";
- maintainers = with maintainers; [ ma27 ];
+ maintainers = with maintainers; [ ];
};
}
diff --git a/pkgs/development/tools/repository-managers/nexus/default.nix b/pkgs/development/tools/repository-managers/nexus/default.nix
index 95a9e78383f3..a727eebe0541 100644
--- a/pkgs/development/tools/repository-managers/nexus/default.nix
+++ b/pkgs/development/tools/repository-managers/nexus/default.nix
@@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
pname = "nexus";
- version = "3.19.1-01";
+ version = "3.20.1-01";
src = fetchurl {
url = "https://sonatype-download.global.ssl.fastly.net/nexus/3/nexus-${version}-unix.tar.gz";
- sha256 = "0kjzp5n6pkgx5s21jfmh6pbgnjlvs89kcjqikv4lgc5yia264bks";
+ sha256 = "0l8fwcnpbc35lqadyrsljvr4rr5kp9gkx5dxs9i35mg2f0z9bagv";
};
preferLocalBuild = true;
diff --git a/pkgs/development/tools/rust/cargo-expand/default.nix b/pkgs/development/tools/rust/cargo-expand/default.nix
index 41fc993c62f4..cec7a509dc12 100644
--- a/pkgs/development/tools/rust/cargo-expand/default.nix
+++ b/pkgs/development/tools/rust/cargo-expand/default.nix
@@ -2,16 +2,16 @@
rustPlatform.buildRustPackage rec {
pname = "cargo-expand";
- version = "0.4.16";
+ version = "0.4.17";
src = fetchFromGitHub {
owner = "dtolnay";
repo = pname;
rev = version;
- sha256 = "0cf539y20hlwxbk0zfs1and99hkb0fqg7m3a6dfd80hwx0dm0xmx";
+ sha256 = "043adbvc1slswwygibgghfl2ryry3ja1x3zjz39qqv63f81pd5id";
};
- cargoSha256 = "1bspciy7sfx887hwxmckrnjy7b6kpy6g51yraw25yl302mzzng21";
+ cargoSha256 = "1dasyyy2nkr4i5nhlzlwij3b972h2a43j94kvlbc9kvnnb44aymn";
buildInputs = [ llvmPackages.libclang ]
++ stdenv.lib.optional stdenv.isDarwin darwin.apple_sdk.frameworks.Security;
diff --git a/pkgs/development/tools/rust/cargo-make/default.nix b/pkgs/development/tools/rust/cargo-make/default.nix
index e4cb070464c1..5b550d5c1fbf 100644
--- a/pkgs/development/tools/rust/cargo-make/default.nix
+++ b/pkgs/development/tools/rust/cargo-make/default.nix
@@ -33,7 +33,7 @@ rustPlatform.buildRustPackage rec {
description = "A Rust task runner and build tool";
homepage = "https://github.com/sagiegurari/cargo-make";
license = licenses.asl20;
- maintainers = with maintainers; [ xrelkd ma27 ];
+ maintainers = with maintainers; [ xrelkd ];
platforms = platforms.all;
};
}
diff --git a/pkgs/development/tools/unityhub/default.nix b/pkgs/development/tools/unityhub/default.nix
new file mode 100644
index 000000000000..be98ba67c792
--- /dev/null
+++ b/pkgs/development/tools/unityhub/default.nix
@@ -0,0 +1,39 @@
+{ stdenv, fetchurl, appimageTools, gsettings-desktop-schemas, gtk3 }:
+
+let
+ pname = "unityhub";
+ version = "2.2.2";
+in
+
+appimageTools.wrapType2 rec {
+ name = "${pname}-${version}";
+
+ extraPkgs = (pkgs: with pkgs; with xorg; [ gtk2 gdk_pixbuf glib libGL libGLU nss nspr
+ alsaLib cups gnome2.GConf libcap fontconfig freetype pango
+ cairo dbus dbus-glib libdbusmenu libdbusmenu-gtk2 expat zlib libpng12 udev tbb
+ libpqxx gtk3 libsecret lsb-release openssl nodejs ncurses5
+
+ libX11 libXcursor libXdamage libXfixes libXrender libXi
+ libXcomposite libXext libXrandr libXtst libSM libICE libxcb ]);
+
+ profile = ''
+ export XDG_DATA_DIRS=${gsettings-desktop-schemas}/share/gsettings-schemas/${gsettings-desktop-schemas.name}:${gtk3}/share/gsettings-schemas/${gtk3.name}:$XDG_DATA_DIRS
+ '';
+
+ src = fetchurl {
+ url = "https://public-cdn.cloud.unity3d.com/hub/prod/UnityHub.AppImage";
+ sha256 = "1rx7ih94ig3pd1yx1d3fpx7zpixq3j5birkpnzkh778qqsdrg0nf";
+ };
+
+ meta = with stdenv.lib; {
+ homepage = https://unity3d.com/;
+ description = "Game development tool";
+ longDescription = ''
+ Popular development platform for creating 2D and 3D multiplatform games
+ and interactive experiences.
+ '';
+ license = licenses.unfree;
+ platforms = [ "x86_64-linux" ];
+ maintainers = with maintainers; [ tesq0 ];
+ };
+}
diff --git a/pkgs/development/web/postman/default.nix b/pkgs/development/web/postman/default.nix
index 7c56cd827ca2..3a0a8f343568 100644
--- a/pkgs/development/web/postman/default.nix
+++ b/pkgs/development/web/postman/default.nix
@@ -7,11 +7,11 @@
stdenv.mkDerivation rec {
pname = "postman";
- version = "7.12.0";
+ version = "7.14.0";
src = fetchurl {
url = "https://dl.pstmn.io/download/version/${version}/linux64";
- sha256 = "0sz7cidajrsj43vq5g8jrkxlrp97r7n8dfr9gp8l0wxnidiqm401";
+ sha256 = "0565qvn5bnx1mc1ibxrqszzvls0gkg10js55439lwygfhkal0lvy";
name = "${pname}.tar.gz";
};
diff --git a/pkgs/misc/drivers/hplip/3.16.11.nix b/pkgs/misc/drivers/hplip/3.16.11.nix
index 993a5144a9dc..3b03c300db3f 100644
--- a/pkgs/misc/drivers/hplip/3.16.11.nix
+++ b/pkgs/misc/drivers/hplip/3.16.11.nix
@@ -1,7 +1,7 @@
{ stdenv, fetchurl, substituteAll
, pkgconfig
, cups, libjpeg, libusb1, python2Packages, sane-backends, dbus, usbutils
-, net_snmp, openssl, nettools
+, net-snmp, openssl, nettools
, bash, coreutils, utillinux
, qtSupport ? true
, withPlugin ? false
@@ -55,7 +55,7 @@ python2Packages.buildPythonApplication {
libusb1
sane-backends
dbus
- net_snmp
+ net-snmp
openssl
];
diff --git a/pkgs/misc/drivers/hplip/3.18.5.nix b/pkgs/misc/drivers/hplip/3.18.5.nix
index 3b78f015f7da..ab1794c12514 100644
--- a/pkgs/misc/drivers/hplip/3.18.5.nix
+++ b/pkgs/misc/drivers/hplip/3.18.5.nix
@@ -2,7 +2,7 @@
, pkgconfig
, cups, zlib, libjpeg, libusb1, python2Packages, sane-backends
, dbus, file, ghostscript, usbutils
-, net_snmp, openssl, perl, nettools
+, net-snmp, openssl, perl, nettools
, bash, coreutils, utillinux
, withQt5 ? true
, withPlugin ? false
@@ -59,7 +59,7 @@ python2Packages.buildPythonApplication {
dbus
file
ghostscript
- net_snmp
+ net-snmp
openssl
perl
zlib
diff --git a/pkgs/misc/drivers/hplip/default.nix b/pkgs/misc/drivers/hplip/default.nix
index d81032ef270f..ecb74f39ab9a 100644
--- a/pkgs/misc/drivers/hplip/default.nix
+++ b/pkgs/misc/drivers/hplip/default.nix
@@ -2,7 +2,7 @@
, pkgconfig
, cups, zlib, libjpeg, libusb1, python3Packages, sane-backends
, dbus, file, ghostscript, usbutils
-, net_snmp, openssl, perl, nettools
+, net-snmp, openssl, perl, nettools
, bash, coreutils, utillinux
, withQt5 ? true
, withPlugin ? false
@@ -58,7 +58,7 @@ python3Packages.buildPythonApplication {
dbus
file
ghostscript
- net_snmp
+ net-snmp
openssl
perl
zlib
diff --git a/pkgs/misc/emulators/mame/default.nix b/pkgs/misc/emulators/mame/default.nix
index d98232b10588..3c205a703759 100644
--- a/pkgs/misc/emulators/mame/default.nix
+++ b/pkgs/misc/emulators/mame/default.nix
@@ -1,9 +1,10 @@
{ stdenv, mkDerivation, fetchFromGitHub, makeDesktopItem, makeWrapper
-, python, pkgconfig, SDL2, SDL2_ttf, alsaLib, which, qtbase, libXinerama }:
+, python, pkgconfig, SDL2, SDL2_ttf, alsaLib, which, qtbase, libXinerama
+, installShellFiles }:
let
majorVersion = "0";
- minorVersion = "216";
+ minorVersion = "217";
desktopItem = makeDesktopItem {
name = "MAME";
@@ -22,7 +23,7 @@ in mkDerivation {
owner = "mamedev";
repo = "mame";
rev = "mame${majorVersion}${minorVersion}";
- sha256 = "0dmmw08pxxznvadrc51zg27jc9fjh688355w8kxkmi7k8qa367r0";
+ sha256 = "0yzn29fp72k2g5xgv47ss6fr3sk9wdxw9f52nwld1baxr2adc0qx";
};
hardeningDisable = [ "fortify" ];
@@ -33,7 +34,7 @@ in mkDerivation {
dontWrapQtApps = true;
buildInputs = [ SDL2 SDL2_ttf alsaLib qtbase libXinerama ];
- nativeBuildInputs = [ python pkgconfig which makeWrapper ];
+ nativeBuildInputs = [ python pkgconfig which makeWrapper installShellFiles ];
# by default MAME assumes that paths with stock resources
# are relative and that you run MAME changing to
@@ -54,9 +55,7 @@ in mkDerivation {
find ${dest} -maxdepth 1 -executable -type f -exec mv -t $out/bin {} \;
install -Dm755 src/osd/sdl/taputil.sh $out/bin/taputil.sh
- mkdir -p $out/share/man/man{1,6}
- mv ${dest}/docs/man/*.1 $out/share/man/man1
- mv ${dest}/docs/man/*.6 $out/share/man/man6
+ installManPage ${dest}/docs/man/*.1 ${dest}/docs/man/*.6
mv artwork plugins samples ${dest}
diff --git a/pkgs/misc/frescobaldi/default.nix b/pkgs/misc/frescobaldi/default.nix
index 2b38ed57c285..aae469f3005d 100644
--- a/pkgs/misc/frescobaldi/default.nix
+++ b/pkgs/misc/frescobaldi/default.nix
@@ -35,7 +35,7 @@ python3Packages.buildPythonApplication rec {
fonts and keyboard shortcuts
'';
license = licenses.gpl2Plus;
- maintainers = with maintainers; [ sepi ma27 ];
+ maintainers = with maintainers; [ sepi ];
platforms = platforms.all;
};
}
diff --git a/pkgs/misc/screensavers/xlockmore/default.nix b/pkgs/misc/screensavers/xlockmore/default.nix
index 5e8fa725080e..c43a8acf8850 100644
--- a/pkgs/misc/screensavers/xlockmore/default.nix
+++ b/pkgs/misc/screensavers/xlockmore/default.nix
@@ -2,11 +2,11 @@
, libXdmcp, libXt }:
stdenv.mkDerivation rec {
- name = "xlockmore-5.60";
+ name = "xlockmore-5.61";
src = fetchurl {
url = "http://sillycycle.com/xlock/${name}.tar.xz";
- sha256 = "16v7y9g42a4g2dlhj5qfcax9ydg814zfxb8c9yj69c6kl51xdh79";
+ sha256 = "012wsfcphahwwylyfk9c848nwj1v08hpnja2yfs0j8pnq7milnva";
curlOpts = "--user-agent 'Mozilla/5.0'";
};
diff --git a/pkgs/misc/vscode-extensions/default.nix b/pkgs/misc/vscode-extensions/default.nix
index 5d4fafacadde..22e97cd4d880 100644
--- a/pkgs/misc/vscode-extensions/default.nix
+++ b/pkgs/misc/vscode-extensions/default.nix
@@ -122,6 +122,8 @@ in
ms-vscode.cpptools = callPackage ./cpptools {};
+ ms-vscode-remote.remote-ssh = callPackage ./remote-ssh {};
+
ms-python.python = callPackage ./python {
extractNuGet = callPackage ./python/extract-nuget.nix { };
};
diff --git a/pkgs/misc/vscode-extensions/remote-ssh/default.nix b/pkgs/misc/vscode-extensions/remote-ssh/default.nix
new file mode 100644
index 000000000000..fe053dd7ea3d
--- /dev/null
+++ b/pkgs/misc/vscode-extensions/remote-ssh/default.nix
@@ -0,0 +1,55 @@
+{ stdenv
+, vscode-utils
+, useLocalExtensions ? false}:
+# Note that useLocalExtensions requires that vscode-server is not running
+# on host. If it is, you'll need to remove ~/.vscode-server,
+# and redo the install by running "Connect to host" on client
+
+let
+ inherit (vscode-utils) buildVscodeMarketplaceExtension;
+
+ # patch runs on remote machine hence use of which
+ # links to local node if version is 12
+ patch = ''
+ f="/home/''$USER/.vscode-server/bin/''$COMMIT_ID/node"
+ localNodePath=''$(which node)
+ if [ -x "''$localNodePath" ]; then
+ localNodeVersion=''$(node -v)
+ if [ "\''${localNodeVersion:1:2}" = "12" ]; then
+ echo PATCH: replacing ''$f with ''$localNodePath
+ rm ''$f
+ ln -s ''$localNodePath ''$f
+ fi
+ fi
+ ${stdenv.lib.optionalString useLocalExtensions ''
+ # Use local extensions
+ if [ -d ~/.vscode/extensions ]; then
+ if ! test -L "~/.vscode-server/extensions"; then
+ mkdir -p ~/.vscode-server
+ ln -s ~/.vscode/extensions ~/.vscode-server/
+ fi
+ fi
+ ''}
+ '';
+in
+ buildVscodeMarketplaceExtension {
+ mktplcRef = {
+ name = "remote-ssh";
+ publisher = "ms-vscode-remote";
+ version = "0.48.0";
+ sha256 = "04q53gljqh5snkrdf5l69g0ahn1s5z35a4ipfcbf1rsjjmm85a19";
+ };
+
+ postPatch = ''
+ substituteInPlace "out/extension.js" \
+ --replace "# install extensions" '${patch}'
+ '';
+
+ meta = with stdenv.lib; {
+ description ="Use any remote machine with a SSH server as your development environment.";
+ license = licenses.unfree;
+ maintainers = with maintainers; [
+ tbenst
+ ];
+ };
+ }
diff --git a/pkgs/os-specific/linux/bpftool/default.nix b/pkgs/os-specific/linux/bpftool/default.nix
index c54e3e38e9b5..8b288fc046a6 100644
--- a/pkgs/os-specific/linux/bpftool/default.nix
+++ b/pkgs/os-specific/linux/bpftool/default.nix
@@ -1,13 +1,13 @@
{ stdenv
, libopcodes, libbfd, libelf
-, linuxPackages_latest
+, linuxPackages_latest, zlib
}:
stdenv.mkDerivation {
pname = "bpftool";
inherit (linuxPackages_latest.kernel) version src;
- buildInputs = [ libopcodes libbfd libelf ];
+ buildInputs = [ libopcodes libbfd libelf zlib ];
preConfigure = ''
cd tools/bpf/bpftool
diff --git a/pkgs/os-specific/linux/digimend/default.nix b/pkgs/os-specific/linux/digimend/default.nix
index 40f801881fcd..94f32d2c4329 100644
--- a/pkgs/os-specific/linux/digimend/default.nix
+++ b/pkgs/os-specific/linux/digimend/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, kernel }:
+{ stdenv, fetchFromGitHub, fetchpatch, kernel }:
assert stdenv.lib.versionAtLeast kernel.version "3.5";
@@ -20,6 +20,15 @@ stdenv.mkDerivation rec {
sed 's/depmod /true /' -i Makefile
'';
+ patches = [
+ # Fix build on Linux kernel >= 5.4
+ # https://github.com/DIGImend/digimend-kernel-drivers/pull/331
+ (fetchpatch {
+ url = "https://github.com/DIGImend/digimend-kernel-drivers/commit/fb8a2eb6a9198bb35aaccb81e22dd5ebe36124d1.patch";
+ sha256 = "1j7l5hsk59gccydpf7n6xx1ki4rm6aka7k879a7ah5jn8p1ylgw9";
+ })
+ ];
+
nativeBuildInputs = kernel.moduleBuildDependencies;
postInstall = ''
diff --git a/pkgs/os-specific/linux/ell/default.nix b/pkgs/os-specific/linux/ell/default.nix
index bd0ddb4ce1df..5cbddac82f01 100644
--- a/pkgs/os-specific/linux/ell/default.nix
+++ b/pkgs/os-specific/linux/ell/default.nix
@@ -7,14 +7,14 @@
stdenv.mkDerivation rec {
pname = "ell";
- version = "0.26";
+ version = "0.27";
outputs = [ "out" "dev" ];
src = fetchgit {
url = "https://git.kernel.org/pub/scm/libs/${pname}/${pname}.git";
rev = version;
- sha256 = "1gnqd7dghwkcn48f6fr9qvkkm976b3x4bn3l7l2k9pamzpng084i";
+ sha256 = "0pr9c4h535ggj54zfah9m3wziiwlig7r1hxpfx16s2s11ylrl9gd";
};
patches = [
diff --git a/pkgs/os-specific/linux/firmware/firmware-linux-nonfree/default.nix b/pkgs/os-specific/linux/firmware/firmware-linux-nonfree/default.nix
index 8db9d4fb3b5d..6e535cce8985 100644
--- a/pkgs/os-specific/linux/firmware/firmware-linux-nonfree/default.nix
+++ b/pkgs/os-specific/linux/firmware/firmware-linux-nonfree/default.nix
@@ -2,12 +2,12 @@
stdenv.mkDerivation rec {
pname = "firmware-linux-nonfree";
- version = "2019-10-22";
+ version = "2019-12-15";
src = fetchgit {
url = "https://git.kernel.org/pub/scm/linux/kernel/git/firmware/linux-firmware.git";
rev = lib.replaceStrings ["-"] [""] version;
- sha256 = "03ycc55h7vgd4fmb7v7gl7lplf7pg7acs16aa2rramgldxqvyx7j";
+ sha256 = "01zwmgva2263ksssqhhi46jh5kzb6z1a4xs8agsb2mbwifxf84cl";
};
installFlags = [ "DESTDIR=$(out)" ];
@@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
outputHashMode = "recursive";
outputHashAlgo = "sha256";
- outputHash = "15nm0xh2xq8mnk7a66iljcklc15gvh6jcpz2d9llg1fkv6w8lqc6";
+ outputHash = "1jp2bb87jbcml1q3r4yilf9l3pirr19zb70l6mlxlmbqml50zwzd";
meta = with stdenv.lib; {
description = "Binary firmware collection packaged by kernel.org";
diff --git a/pkgs/os-specific/linux/iwd/default.nix b/pkgs/os-specific/linux/iwd/default.nix
index 2d9554a48942..8e1bbd374cfb 100644
--- a/pkgs/os-specific/linux/iwd/default.nix
+++ b/pkgs/os-specific/linux/iwd/default.nix
@@ -13,12 +13,12 @@
stdenv.mkDerivation rec {
pname = "iwd";
- version = "1.2";
+ version = "1.4";
src = fetchgit {
url = https://git.kernel.org/pub/scm/network/wireless/iwd.git;
rev = version;
- sha256 = "10fwi31ym6hvn0vvh9fy0swzs3mfnpcwg95np4i5ksmw8k0kj0hf";
+ sha256 = "13sig2lbiyi4x74ag37gvdqx5w18w6hmq9hc1ir4a1cqqf50v61v";
};
nativeBuildInputs = [
diff --git a/pkgs/os-specific/linux/kernel/linux-libre.nix b/pkgs/os-specific/linux/kernel/linux-libre.nix
index 707ca7ff7ec6..a7d1d7e175b1 100644
--- a/pkgs/os-specific/linux/kernel/linux-libre.nix
+++ b/pkgs/os-specific/linux/kernel/linux-libre.nix
@@ -1,7 +1,7 @@
{ stdenv, lib, fetchsvn, linux
, scripts ? fetchsvn {
url = "https://www.fsfla.org/svn/fsfla/software/linux-libre/releases/branches/";
- rev = "17145";
+ rev = "17151";
sha256 = "0hyd7wp73w4555d42xcvk4x4nxrfckbzah2ckb4d2aqzxab87789";
}
, ...
diff --git a/pkgs/os-specific/linux/kernel/linux-testing.nix b/pkgs/os-specific/linux/kernel/linux-testing.nix
index f89a7c937308..dcb274c92545 100644
--- a/pkgs/os-specific/linux/kernel/linux-testing.nix
+++ b/pkgs/os-specific/linux/kernel/linux-testing.nix
@@ -3,7 +3,7 @@
with stdenv.lib;
buildLinux (args // rec {
- version = "5.5-rc2";
+ version = "5.5-rc3";
extraMeta.branch = "5.5";
# modDirVersion needs to be x.y.z, will always add .0
@@ -11,7 +11,7 @@ buildLinux (args // rec {
src = fetchurl {
url = "https://git.kernel.org/torvalds/t/linux-${version}.tar.gz";
- sha256 = "1fs432ld5k1j68hflqdxby9mxa6a7xnw1m6z5lfb9341gjw078xc";
+ sha256 = "1rf394d1d6c0mvf6006gq1bscq3jjcvj9xxmdwallfwpp9igs8id";
};
# Should the testing kernels ever be built on Hydra?
diff --git a/pkgs/os-specific/linux/macchanger/default.nix b/pkgs/os-specific/linux/macchanger/default.nix
index ec76cda97692..1f1c4b4d7c11 100644
--- a/pkgs/os-specific/linux/macchanger/default.nix
+++ b/pkgs/os-specific/linux/macchanger/default.nix
@@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
meta = with stdenv.lib; {
description = "A utility for viewing/manipulating the MAC address of network interfaces";
- maintainers = with maintainers; [ joachifm ];
+ maintainers = with maintainers; [ joachifm ma27 ];
license = licenses.gpl2Plus;
homepage = https://www.gnu.org/software/macchanger;
platforms = platforms.linux;
diff --git a/pkgs/os-specific/linux/multipath-tools/default.nix b/pkgs/os-specific/linux/multipath-tools/default.nix
index 628b14b6a483..9a76e5873d4f 100644
--- a/pkgs/os-specific/linux/multipath-tools/default.nix
+++ b/pkgs/os-specific/linux/multipath-tools/default.nix
@@ -27,10 +27,10 @@ stdenv.mkDerivation rec {
makeFlags = [
"LIB=lib"
"prefix=$(out)"
- "mandir=$(out)/share/man/man8"
+ "man8dir=$(out)/share/man/man8"
"man5dir=$(out)/share/man/man5"
"man3dir=$(out)/share/man/man3"
- "unitdir=$(out)/lib/systemd/system"
+ "SYSTEMDPATH=lib"
];
meta = with stdenv.lib; {
diff --git a/pkgs/servers/amqp/qpid-cpp/default.nix b/pkgs/servers/amqp/qpid-cpp/default.nix
index 6d2bf10cd912..086256cf093e 100644
--- a/pkgs/servers/amqp/qpid-cpp/default.nix
+++ b/pkgs/servers/amqp/qpid-cpp/default.nix
@@ -16,7 +16,7 @@ let
description = "An AMQP message broker and a C++ messaging API";
license = licenses.asl20;
platforms = platforms.linux;
- maintainers = with maintainers; [ cpages ma27 ];
+ maintainers = with maintainers; [ cpages ];
};
qpid-cpp = stdenv.mkDerivation {
diff --git a/pkgs/servers/corosync/default.nix b/pkgs/servers/corosync/default.nix
index faa9976bed8a..2d7acda90af5 100644
--- a/pkgs/servers/corosync/default.nix
+++ b/pkgs/servers/corosync/default.nix
@@ -1,5 +1,5 @@
{ stdenv, fetchurl, makeWrapper, pkgconfig, nss, nspr, libqb
-, dbus, rdma-core, libstatgrab, net_snmp
+, dbus, rdma-core, libstatgrab, net-snmp
, enableDbus ? false
, enableInfiniBandRdma ? false
, enableMonitoring ? false
@@ -23,7 +23,7 @@ stdenv.mkDerivation rec {
] ++ optional enableDbus dbus
++ optional enableInfiniBandRdma rdma-core
++ optional enableMonitoring libstatgrab
- ++ optional enableSnmp net_snmp;
+ ++ optional enableSnmp net-snmp;
configureFlags = [
"--sysconfdir=/etc"
diff --git a/pkgs/servers/dns/bind/default.nix b/pkgs/servers/dns/bind/default.nix
index e13967d7af17..5e4a07bdf25e 100644
--- a/pkgs/servers/dns/bind/default.nix
+++ b/pkgs/servers/dns/bind/default.nix
@@ -10,11 +10,11 @@ assert enablePython -> python3 != null;
stdenv.mkDerivation rec {
pname = "bind";
- version = "9.14.8";
+ version = "9.14.9";
src = fetchurl {
url = "https://ftp.isc.org/isc/bind9/${version}/${pname}-${version}.tar.gz";
- sha256 = "0xm0xrpgxq6gk6r6aa2w0lygnq02y1p614dmyjdmlsfnrrsslig5";
+ sha256 = "0g2ph3hlw86yib8hv13qgkb4i84s9zv22r4k6yqlycm2izamwmr9";
};
outputs = [ "out" "lib" "dev" "man" "dnsutils" "host" ];
diff --git a/pkgs/servers/dns/dnsdist/default.nix b/pkgs/servers/dns/dnsdist/default.nix
index cb004a596d22..0c236fe93155 100644
--- a/pkgs/servers/dns/dnsdist/default.nix
+++ b/pkgs/servers/dns/dnsdist/default.nix
@@ -1,22 +1,26 @@
{ stdenv, fetchurl, pkgconfig, systemd
, boost, libsodium, libedit, re2
-, net_snmp, lua, protobuf, openssl }: stdenv.mkDerivation rec {
+, net-snmp, lua, protobuf, openssl, zlib, h2o
+}:
+
+stdenv.mkDerivation rec {
pname = "dnsdist";
- version = "1.3.2";
+ version = "1.4.0";
src = fetchurl {
url = "https://downloads.powerdns.com/releases/dnsdist-${version}.tar.bz2";
- sha256 = "1i3b1vpk9a8zbx9aby2s1ckkzhlvzgn11hcgj3b8x2j1b9771rqb";
+ sha256 = "1h0x5xd13j8xxrrinb7d55851m6n9w0r15wx9m3c50dk7qngldm3";
};
- nativeBuildInputs = [ pkgconfig ];
- buildInputs = [ systemd boost libsodium libedit re2 net_snmp lua protobuf openssl ];
+ nativeBuildInputs = [ pkgconfig protobuf ];
+ buildInputs = [ systemd boost libsodium libedit re2 net-snmp lua openssl zlib h2o ];
configureFlags = [
"--enable-libsodium"
"--enable-re2"
"--enable-dnscrypt"
"--enable-dns-over-tls"
+ "--enable-dns-over-https"
"--with-protobuf=yes"
"--with-net-snmp"
"--disable-dependency-tracking"
@@ -26,6 +30,8 @@
doCheck = true;
+ enableParallelBuilding = true;
+
meta = with stdenv.lib; {
description = "DNS Loadbalancer";
homepage = "https://dnsdist.org";
diff --git a/pkgs/servers/dns/pdns-recursor/default.nix b/pkgs/servers/dns/pdns-recursor/default.nix
index 0a584ce1acaa..e5fc3ac5bb9a 100644
--- a/pkgs/servers/dns/pdns-recursor/default.nix
+++ b/pkgs/servers/dns/pdns-recursor/default.nix
@@ -8,11 +8,11 @@ with stdenv.lib;
stdenv.mkDerivation rec {
pname = "pdns-recursor";
- version = "4.2.0";
+ version = "4.2.1";
src = fetchurl {
url = "https://downloads.powerdns.com/releases/pdns-recursor-${version}.tar.bz2";
- sha256 = "1hn2nw8v6gccwxwm36xczsac4bhxf8b8r7akri2wdp3gh70p4g7h";
+ sha256 = "07w9av3v9zjnb1fhknmza168yxsq4zr2jqcla7yg10ajrhsk534d";
};
nativeBuildInputs = [ pkgconfig ];
diff --git a/pkgs/servers/http/h2o/default.nix b/pkgs/servers/http/h2o/default.nix
index a8de0d7e0849..d599956cfda9 100644
--- a/pkgs/servers/http/h2o/default.nix
+++ b/pkgs/servers/http/h2o/default.nix
@@ -1,6 +1,6 @@
{ stdenv, fetchFromGitHub
, pkgconfig, cmake, ninja
-, libressl, libuv, zlib
+, openssl, libuv, zlib
}:
stdenv.mkDerivation rec {
@@ -18,7 +18,7 @@ stdenv.mkDerivation rec {
enableParallelBuilding = true;
nativeBuildInputs = [ pkgconfig cmake ninja ];
- buildInputs = [ libressl libuv zlib ];
+ buildInputs = [ openssl libuv zlib ];
meta = with stdenv.lib; {
description = "Optimized HTTP/1 and HTTP/2 server";
diff --git a/pkgs/servers/http/hiawatha/default.nix b/pkgs/servers/http/hiawatha/default.nix
index a3bcb64e6c05..4e799774569c 100644
--- a/pkgs/servers/http/hiawatha/default.nix
+++ b/pkgs/servers/http/hiawatha/default.nix
@@ -50,7 +50,7 @@ stdenv.mkDerivation rec {
description = "An advanced and secure webserver";
license = licenses.gpl2;
platforms = platforms.unix; # "Hiawatha runs perfectly on Linux, BSD and MacOS X"
- maintainers = [ maintainers.ndowens ];
+ maintainers = [];
};
}
diff --git a/pkgs/servers/ldap/389/default.nix b/pkgs/servers/ldap/389/default.nix
index e7bff373c3a8..8de4c471e22a 100644
--- a/pkgs/servers/ldap/389/default.nix
+++ b/pkgs/servers/ldap/389/default.nix
@@ -1,5 +1,5 @@
{ stdenv, fetchurl, fetchpatch, autoreconfHook, pkgconfig, doxygen, perl, pam, nspr, nss, openldap
-, db, cyrus_sasl, svrcore, icu, net_snmp, kerberos, pcre, perlPackages, libevent, openssl, python
+, db, cyrus_sasl, svrcore, icu, net-snmp, kerberos, pcre, perlPackages, libevent, openssl, python
}:
stdenv.mkDerivation rec {
@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ autoreconfHook pkgconfig doxygen ];
buildInputs = [
perl pam nspr nss openldap db cyrus_sasl svrcore icu
- net_snmp kerberos pcre libevent openssl python
+ net-snmp kerberos pcre libevent openssl python
] ++ (with perlPackages; [ MozillaLdap NetAddrIP DBFile ]);
patches = [
@@ -46,7 +46,9 @@ stdenv.mkDerivation rec {
"--with-db-inc=${db.dev}/include"
"--with-db-lib=${db.out}/lib"
"--with-sasl=${cyrus_sasl.dev}"
- "--with-netsnmp=${net_snmp}"
+ "--with-netsnmp=yes"
+ "--with-netsnmp-inc=${stdenv.lib.getDev net-snmp}/include"
+ "--with-netsnmp-lib=${stdenv.lib.getLib net-snmp}/lib"
];
enableParallelBuilding = true;
diff --git a/pkgs/servers/mail/spamassassin/default.nix b/pkgs/servers/mail/spamassassin/default.nix
index 95d39c999ee7..f3032bfc86aa 100644
--- a/pkgs/servers/mail/spamassassin/default.nix
+++ b/pkgs/servers/mail/spamassassin/default.nix
@@ -12,9 +12,11 @@ perlPackages.buildPerlPackage rec {
# https://bz.apache.org/SpamAssassin/show_bug.cgi?id=7434
patches = [ ./sa-update_add--siteconfigpath.patch ];
- buildInputs = [ makeWrapper ] ++ (with perlPackages; [ HTMLParser NetDNS NetAddrIP DBFile HTTPDate MailDKIM
- LWP IOSocketSSL DBI EncodeDetect IPCountry NetIdent Razor2ClientAgent MailSPF NetDNSResolverProgrammable
- Socket6 ]);
+ buildInputs = [ makeWrapper ] ++ (with perlPackages; [
+ HTMLParser NetCIDRLite NetDNS NetAddrIP DBFile HTTPDate MailDKIM LWP
+ IOSocketSSL DBI EncodeDetect IPCountry NetIdent Razor2ClientAgent MailSPF
+ NetDNSResolverProgrammable Socket6
+ ]);
# Enabling 'taint' mode is desirable, but that flag disables support
# for the PERL5LIB environment variable. Needs further investigation.
diff --git a/pkgs/servers/monitoring/net-snmp/default.nix b/pkgs/servers/monitoring/net-snmp/default.nix
index 2bbab30d9ecd..ed2abbc7fc8a 100644
--- a/pkgs/servers/monitoring/net-snmp/default.nix
+++ b/pkgs/servers/monitoring/net-snmp/default.nix
@@ -1,4 +1,5 @@
-{ stdenv, fetchurl, fetchpatch, autoreconfHook, file, openssl, perl, perlPackages, unzip, nettools, ncurses }:
+{ stdenv, fetchurl, fetchpatch, autoreconfHook, removeReferencesTo
+, file, openssl, perl, perlPackages, unzip, nettools, ncurses }:
stdenv.mkDerivation rec {
name = "net-snmp-5.8";
@@ -19,6 +20,8 @@ stdenv.mkDerivation rec {
./0002-autoconf-version.patch
];
+ outputs = [ "bin" "out" "dev" "lib" ];
+
configureFlags =
[ "--with-default-snmp-version=3"
"--with-sys-location=Unknown"
@@ -34,17 +37,21 @@ stdenv.mkDerivation rec {
substituteInPlace testing/fulltests/support/simple_TESTCONF.sh --replace "/bin/netstat" "${nettools}/bin/netstat"
'';
- nativeBuildInputs = [ autoreconfHook nettools ];
- buildInputs = [ file perl unzip openssl ncurses ];
- propagatedBuildInputs = with perlPackages; [ perl JSON Tk TermReadKey ];
+ nativeBuildInputs = [ autoreconfHook nettools removeReferencesTo ];
+ buildInputs = with perlPackages; [ file perl unzip openssl ncurses JSON Tk TermReadKey ];
enableParallelBuilding = true;
doCheck = false; # tries to use networking
postInstall = ''
- for f in "$out/lib/"*.la $out/bin/net-snmp-config $out/bin/net-snmp-create-v3-user; do
+ for f in "$lib/lib/"*.la $bin/bin/net-snmp-config $bin/bin/net-snmp-create-v3-user; do
sed 's|-L${openssl.dev}|-L${openssl.out}|g' -i $f
done
+ mkdir $dev/bin
+ mv $bin/bin/net-snmp-config $dev/bin
+ # libraries contain configure options
+ find $lib/lib -type f -exec remove-references-to -t $bin '{}' +
+ find $lib/lib -type f -exec remove-references-to -t $dev '{}' +
'';
meta = with stdenv.lib; {
diff --git a/pkgs/servers/monitoring/plugins/default.nix b/pkgs/servers/monitoring/plugins/default.nix
index 62f40b59d374..887256c85afa 100644
--- a/pkgs/servers/monitoring/plugins/default.nix
+++ b/pkgs/servers/monitoring/plugins/default.nix
@@ -1,5 +1,5 @@
{ stdenv, fetchFromGitHub, fetchpatch, autoreconfHook
-, coreutils, gnugrep, gnused, lm_sensors, net_snmp, openssh, openssl, perl
+, coreutils, gnugrep, gnused, lm_sensors, net-snmp, openssh, openssl, perl
, dnsutils, libdbi, libmysqlclient, zlib, openldap, procps
, runtimeShell }:
@@ -9,7 +9,7 @@ let
majorVersion = "2.2";
minorVersion = ".0";
- binPath = makeBinPath [ coreutils gnugrep gnused lm_sensors net_snmp procps ];
+ binPath = makeBinPath [ coreutils gnugrep gnused lm_sensors net-snmp procps ];
in stdenv.mkDerivation {
name = "monitoring-plugins-${majorVersion}${minorVersion}";
@@ -48,7 +48,7 @@ in stdenv.mkDerivation {
'';
# !!! make openssh a runtime dependency only
- buildInputs = [ dnsutils libdbi libmysqlclient net_snmp openldap openssh openssl perl procps zlib ];
+ buildInputs = [ dnsutils libdbi libmysqlclient net-snmp openldap openssh openssl perl procps zlib ];
nativeBuildInputs = [ autoreconfHook ];
diff --git a/pkgs/servers/monitoring/prometheus/snmp-exporter.nix b/pkgs/servers/monitoring/prometheus/snmp-exporter.nix
index dfa81d4da832..f3dfccee3bce 100644
--- a/pkgs/servers/monitoring/prometheus/snmp-exporter.nix
+++ b/pkgs/servers/monitoring/prometheus/snmp-exporter.nix
@@ -1,4 +1,4 @@
-{ stdenv, buildGoPackage, fetchFromGitHub, net_snmp }:
+{ stdenv, buildGoPackage, fetchFromGitHub, net-snmp }:
buildGoPackage rec {
pname = "snmp_exporter";
@@ -13,7 +13,7 @@ buildGoPackage rec {
sha256 = "1cnz1wapxs3fkghzy6v90s56vd0ngynypyapcpbmx5y66rlpdxx6";
};
- buildInputs = [ net_snmp ];
+ buildInputs = [ net-snmp ];
doCheck = true;
diff --git a/pkgs/servers/monitoring/zabbix/proxy.nix b/pkgs/servers/monitoring/zabbix/proxy.nix
index 53932af6a18f..697492d96277 100644
--- a/pkgs/servers/monitoring/zabbix/proxy.nix
+++ b/pkgs/servers/monitoring/zabbix/proxy.nix
@@ -1,6 +1,6 @@
{ stdenv, fetchurl, pkgconfig, libevent, libiconv, openssl, pcre, zlib
, odbcSupport ? true, unixODBC
-, snmpSupport ? true, net_snmp
+, snmpSupport ? true, net-snmp
, sshSupport ? true, libssh2
, sqliteSupport ? false, sqlite
, mysqlSupport ? false, libmysqlclient
@@ -34,7 +34,7 @@ in
zlib
]
++ optional odbcSupport unixODBC
- ++ optional snmpSupport net_snmp
+ ++ optional snmpSupport net-snmp
++ optional sqliteSupport sqlite
++ optional sshSupport libssh2
++ optional mysqlSupport libmysqlclient
diff --git a/pkgs/servers/monitoring/zabbix/server.nix b/pkgs/servers/monitoring/zabbix/server.nix
index ac5dcca901d5..4046cc7d8bb5 100644
--- a/pkgs/servers/monitoring/zabbix/server.nix
+++ b/pkgs/servers/monitoring/zabbix/server.nix
@@ -2,7 +2,7 @@
, jabberSupport ? true, iksemel
, ldapSupport ? true, openldap
, odbcSupport ? true, unixODBC
-, snmpSupport ? true, net_snmp
+, snmpSupport ? true, net-snmp
, sshSupport ? true, libssh2
, mysqlSupport ? false, libmysqlclient
, postgresqlSupport ? false, postgresql
@@ -38,7 +38,7 @@ in
++ optional odbcSupport unixODBC
++ optional jabberSupport iksemel
++ optional ldapSupport openldap
- ++ optional snmpSupport net_snmp
+ ++ optional snmpSupport net-snmp
++ optional sshSupport libssh2
++ optional mysqlSupport libmysqlclient
++ optional postgresqlSupport postgresql;
diff --git a/pkgs/servers/quagga/default.nix b/pkgs/servers/quagga/default.nix
index fc130965cf10..bd679fd3ff82 100644
--- a/pkgs/servers/quagga/default.nix
+++ b/pkgs/servers/quagga/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, libcap, libnl, readline, net_snmp, less, perl, texinfo,
+{ stdenv, fetchurl, libcap, libnl, readline, net-snmp, less, perl, texinfo,
pkgconfig, c-ares }:
stdenv.mkDerivation rec {
@@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
};
buildInputs =
- [ readline net_snmp c-ares ]
+ [ readline net-snmp c-ares ]
++ stdenv.lib.optionals stdenv.isLinux [ libcap libnl ];
nativeBuildInputs = [ pkgconfig perl texinfo ];
diff --git a/pkgs/servers/roundcube/default.nix b/pkgs/servers/roundcube/default.nix
index 8278674faf1c..d73b21b19486 100644
--- a/pkgs/servers/roundcube/default.nix
+++ b/pkgs/servers/roundcube/default.nix
@@ -27,7 +27,7 @@ stdenv.mkDerivation rec {
meta = {
description = "Open Source Webmail Software";
- maintainers = with stdenv.lib.maintainers; [ vskilet globin ];
+ maintainers = with stdenv.lib.maintainers; [ vskilet globin ma27 ];
license = stdenv.lib.licenses.gpl3;
platforms = stdenv.lib.platforms.all;
};
diff --git a/pkgs/servers/web-apps/mediawiki/default.nix b/pkgs/servers/web-apps/mediawiki/default.nix
index 490459f2e250..d16d59af6b90 100644
--- a/pkgs/servers/web-apps/mediawiki/default.nix
+++ b/pkgs/servers/web-apps/mediawiki/default.nix
@@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
pname = "mediawiki";
- version = "1.33.1";
+ version = "1.34.0";
src = with stdenv.lib; fetchurl {
url = "https://releases.wikimedia.org/mediawiki/${versions.majorMinor version}/${pname}-${version}.tar.gz";
- sha256 = "19x10vsgg2fhcpmfvdswwilqwa65byrsmzvhk2v8bsxzhp6s95vx";
+ sha256 = "1lckjnharwxh9xb7gxdxrkb0r3xgd0dh4019cnbixn5mmzgc696y";
};
prePatch = ''
diff --git a/pkgs/shells/zsh/gradle-completion/default.nix b/pkgs/shells/zsh/gradle-completion/default.nix
index ed46a21325c5..d13fd8aee00f 100644
--- a/pkgs/shells/zsh/gradle-completion/default.nix
+++ b/pkgs/shells/zsh/gradle-completion/default.nix
@@ -30,6 +30,6 @@ stdenv.mkDerivation rec {
description = "Gradle tab completion for bash and zsh";
homepage = https://github.com/gradle/gradle-completion;
license = licenses.mit;
- maintainers = with maintainers; [ ma27 ];
+ maintainers = with maintainers; [ ];
};
}
diff --git a/pkgs/shells/zsh/oh-my-zsh/default.nix b/pkgs/shells/zsh/oh-my-zsh/default.nix
index 3b1faeef97ec..7ada25ee4dd6 100644
--- a/pkgs/shells/zsh/oh-my-zsh/default.nix
+++ b/pkgs/shells/zsh/oh-my-zsh/default.nix
@@ -4,13 +4,13 @@
{ stdenv, fetchgit }:
stdenv.mkDerivation rec {
- version = "2019-12-22";
+ version = "2019-12-29";
pname = "oh-my-zsh";
- rev = "38929084f98684b9267d7f0cfe3e7f9aa5f861d2";
+ rev = "d56d6dc145e20dbea9c45f7aa1c09f8e2b5859a1";
src = fetchgit { inherit rev;
url = "https://github.com/ohmyzsh/ohmyzsh";
- sha256 = "0iwyfl8gk3hzd5hpryr0sk96n9p5m3riqdnaclmpasa0dyynd2ya";
+ sha256 = "1plzmyk4j3zb4xxrys2w19r18nqhgp267pa3s0ipizr9bi1ijqdm";
};
pathsToLink = [ "/share/oh-my-zsh" ];
diff --git a/pkgs/tools/X11/xsecurelock/default.nix b/pkgs/tools/X11/xsecurelock/default.nix
index 30d7f69aeb57..8349953f4ff1 100644
--- a/pkgs/tools/X11/xsecurelock/default.nix
+++ b/pkgs/tools/X11/xsecurelock/default.nix
@@ -4,13 +4,13 @@
stdenv.mkDerivation rec {
pname = "xsecurelock";
- version = "1.5.1";
+ version = "1.6.0";
src = fetchFromGitHub {
owner = "google";
repo = "xsecurelock";
rev = "v${version}";
- sha256 = "1if8byaby18ydkrk4k5yy8n0981x1dfqikq59gfpb7c2rv0vgi7i";
+ sha256 = "0zdwszscdw0p7kwpqqv1dywn00bq1wak2x602lb6hdmkffspi8bg";
};
nativeBuildInputs = [
diff --git a/pkgs/tools/admin/tigervnc/default.nix b/pkgs/tools/admin/tigervnc/default.nix
index 78fa4359c914..1c2243d04f11 100644
--- a/pkgs/tools/admin/tigervnc/default.nix
+++ b/pkgs/tools/admin/tigervnc/default.nix
@@ -11,14 +11,14 @@
with stdenv.lib;
stdenv.mkDerivation rec {
- version = "1.10.0";
+ version = "1.10.1";
pname = "tigervnc";
src = fetchFromGitHub {
owner = "TigerVNC";
repo = "tigervnc";
- rev = "v1.10.0";
- sha256 = "0l0x7cq65wv9n93r952qsikwzcls1sq3r32mx0c4wg19dha0x1m4";
+ rev = "v1.10.1";
+ sha256 = "001n189d2f3psn7nxgl8188ml6f7jbk26cxn2835y3mnlk5lmhgr";
};
inherit fontDirectories;
diff --git a/pkgs/tools/archivers/sharutils/default.nix b/pkgs/tools/archivers/sharutils/default.nix
index a03c9610e357..0dfd234bc758 100644
--- a/pkgs/tools/archivers/sharutils/default.nix
+++ b/pkgs/tools/archivers/sharutils/default.nix
@@ -62,7 +62,7 @@ stdenv.mkDerivation rec {
'';
homepage = https://www.gnu.org/software/sharutils/;
license = licenses.gpl3Plus;
- maintainers = [ maintainers.ndowens ];
+ maintainers = [];
platforms = platforms.all;
};
}
diff --git a/pkgs/tools/backup/rsnapshot/default.nix b/pkgs/tools/backup/rsnapshot/default.nix
index 6abd7002f8d7..9f6204db2d8f 100644
--- a/pkgs/tools/backup/rsnapshot/default.nix
+++ b/pkgs/tools/backup/rsnapshot/default.nix
@@ -1,11 +1,11 @@
{ fetchurl, stdenv, perl, openssh, rsync, logger }:
stdenv.mkDerivation rec {
- name = "rsnapshot-1.4.2";
+ name = "rsnapshot-1.4.3";
src = fetchurl {
url = "http://rsnapshot.org/downloads/${name}.tar.gz";
- sha256 = "05jfy99a0xs6lvsjfp3wz21z0myqhmwl2grn3jr9clijbg282ah4";
+ sha256 = "1lavqmmsf53pim0nvming7fkng6p0nk2a51k2c2jdq0l7snpl31b";
};
propagatedBuildInputs = [perl openssh rsync logger];
diff --git a/pkgs/tools/inputmethods/ibus-engines/ibus-typing-booster/default.nix b/pkgs/tools/inputmethods/ibus-engines/ibus-typing-booster/default.nix
index 6656739e622c..f1ca4226b477 100644
--- a/pkgs/tools/inputmethods/ibus-engines/ibus-typing-booster/default.nix
+++ b/pkgs/tools/inputmethods/ibus-engines/ibus-typing-booster/default.nix
@@ -35,7 +35,7 @@ stdenv.mkDerivation rec {
homepage = https://mike-fabian.github.io/ibus-typing-booster/;
license = licenses.gpl3Plus;
description = "A typing booster engine for the IBus platform";
- maintainers = with maintainers; [ ma27 ];
+ maintainers = with maintainers; [ ];
isIbusEngine = true;
};
}
diff --git a/pkgs/tools/misc/3llo/default.nix b/pkgs/tools/misc/3llo/default.nix
index 1f59d1f16a78..82a8d2aaad12 100644
--- a/pkgs/tools/misc/3llo/default.nix
+++ b/pkgs/tools/misc/3llo/default.nix
@@ -26,6 +26,6 @@ bundlerApp {
description = "Trello interactive CLI on terminal";
license = licenses.mit;
homepage = https://github.com/qcam/3llo;
- maintainers = with maintainers; [ ma27 ];
+ maintainers = with maintainers; [ ];
};
}
diff --git a/pkgs/tools/misc/debianutils/default.nix b/pkgs/tools/misc/debianutils/default.nix
index b924d5a74eae..74aec9bae6a0 100644
--- a/pkgs/tools/misc/debianutils/default.nix
+++ b/pkgs/tools/misc/debianutils/default.nix
@@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
pname = "debianutils";
- version = "4.9";
+ version = "4.9.1";
src = fetchurl {
url = "mirror://debian/pool/main/d/${pname}/${pname}_${version}.tar.xz";
- sha256 = "0gq7m2glwdhai93ms2qlnqjlynczzncxsddcq8l5yc6bp1f5r5r0";
+ sha256 = "14a0fqdpwdw72790jjm01g5n7lwwaf9d6k78fflbysn5v62nd0mg";
};
meta = with stdenv.lib; {
diff --git a/pkgs/tools/misc/ethminer/default.nix b/pkgs/tools/misc/ethminer/default.nix
index 8a270ed0fef6..1ec99f12d821 100644
--- a/pkgs/tools/misc/ethminer/default.nix
+++ b/pkgs/tools/misc/ethminer/default.nix
@@ -1,16 +1,31 @@
-{ stdenv, fetchFromGitHub, opencl-headers, cmake, jsoncpp, boost, makeWrapper,
- cudatoolkit, mesa, ethash, opencl-info, ocl-icd, openssl, pkg-config, cli11 }:
+{
+ stdenv,
+ fetchFromGitHub,
+ opencl-headers,
+ cmake,
+ jsoncpp,
+ boost,
+ makeWrapper,
+ cudatoolkit,
+ mesa,
+ ethash,
+ opencl-info,
+ ocl-icd,
+ openssl,
+ pkg-config,
+ cli11
+}:
stdenv.mkDerivation rec {
pname = "ethminer";
- version = "0.18.0-rc.0";
+ version = "0.18.0";
src =
fetchFromGitHub {
owner = "ethereum-mining";
repo = "ethminer";
rev = "v${version}";
- sha256 = "0gwnwxahjfwr4d2aci7y3w206nc5ifssl28ildva98ys0d24wy7z";
+ sha256 = "10b6s35axmx8kyzn2vid6l5nnzcaf4nkk7f5f7lg3cizv6lsj707";
fetchSubmodules = true;
};
diff --git a/pkgs/tools/misc/fzf/default.nix b/pkgs/tools/misc/fzf/default.nix
index 19df7be9ab03..9de5ca0df782 100644
--- a/pkgs/tools/misc/fzf/default.nix
+++ b/pkgs/tools/misc/fzf/default.nix
@@ -60,7 +60,7 @@ buildGoModule rec {
homepage = "https://github.com/junegunn/fzf";
description = "A command-line fuzzy finder written in Go";
license = licenses.mit;
- maintainers = with maintainers; [ filalex77 ];
+ maintainers = with maintainers; [ filalex77 ma27 ];
platforms = platforms.unix;
};
}
diff --git a/pkgs/tools/misc/lnav/default.nix b/pkgs/tools/misc/lnav/default.nix
index da7db422377d..90560d321573 100644
--- a/pkgs/tools/misc/lnav/default.nix
+++ b/pkgs/tools/misc/lnav/default.nix
@@ -44,7 +44,7 @@ stdenv.mkDerivation rec {
downloadPage = "https://github.com/tstack/lnav/releases";
license = licenses.bsd2;
version = "0.8.5";
- maintainers = [ maintainers.dochang ];
+ maintainers = with maintainers; [ dochang ma27 ];
platforms = platforms.unix;
};
diff --git a/pkgs/tools/misc/lorri/default.nix b/pkgs/tools/misc/lorri/default.nix
index 914578c47ec9..8be6cf5a8a3b 100644
--- a/pkgs/tools/misc/lorri/default.nix
+++ b/pkgs/tools/misc/lorri/default.nix
@@ -10,7 +10,6 @@
# Apple dependencies
, CoreServices
, Security
-, cf-private
}:
rustPlatform.buildRustPackage rec {
@@ -40,7 +39,7 @@ rustPlatform.buildRustPackage rec {
nativeBuildInputs = with pkgs; [ nix direnv which ];
buildInputs =
- stdenv.lib.optionals stdenv.isDarwin [ CoreServices Security cf-private ];
+ stdenv.lib.optionals stdenv.isDarwin [ CoreServices Security ];
passthru = {
updater = with builtins; writeScript "copy-runtime-nix.sh" ''
diff --git a/pkgs/tools/misc/partition-manager/default.nix b/pkgs/tools/misc/partition-manager/default.nix
index 1c094c291d89..ab3c4b5a6c46 100644
--- a/pkgs/tools/misc/partition-manager/default.nix
+++ b/pkgs/tools/misc/partition-manager/default.nix
@@ -27,6 +27,6 @@ in mkDerivation rec {
description = "KDE Partition Manager";
license = licenses.gpl2;
homepage = https://www.kde.org/applications/system/kdepartitionmanager/;
- maintainers = with maintainers; [ peterhoeg ma27 ];
+ maintainers = with maintainers; [ peterhoeg ];
};
}
diff --git a/pkgs/tools/misc/pipelight/default.nix b/pkgs/tools/misc/pipelight/default.nix
index 20b45360f01b..4c7e9d0892ca 100644
--- a/pkgs/tools/misc/pipelight/default.nix
+++ b/pkgs/tools/misc/pipelight/default.nix
@@ -19,7 +19,7 @@ in stdenv.mkDerivation rec {
buildInputs = [ wine_custom libX11 libGLU libGL curl ];
- propagatedbuildInputs = [ curl cabextract ];
+ NIX_CFLAGS_COMPILE = [ "-fpermissive" ];
patches = [ ./pipelight.patch ];
diff --git a/pkgs/tools/misc/snapper/default.nix b/pkgs/tools/misc/snapper/default.nix
index ccd432704044..ee47c17065f0 100644
--- a/pkgs/tools/misc/snapper/default.nix
+++ b/pkgs/tools/misc/snapper/default.nix
@@ -1,17 +1,17 @@
{ stdenv, fetchFromGitHub
, autoreconfHook, pkgconfig, docbook_xsl, libxslt, docbook_xml_dtd_45
, acl, attr, boost, btrfs-progs, dbus, diffutils, e2fsprogs, libxml2
-, lvm2, pam, python, utillinux, fetchpatch }:
+, lvm2, pam, python, utillinux, fetchpatch, json_c }:
stdenv.mkDerivation rec {
pname = "snapper";
- version = "0.8.6";
+ version = "0.8.7";
src = fetchFromGitHub {
owner = "openSUSE";
repo = "snapper";
rev = "v${version}";
- sha256 = "1czx8brfhbfi614mqw46d38xwq6w7d5aca3pibwx8zz47rn99w6d";
+ sha256 = "0605j4f3plb6q8lwf82y2jhply6dwj49jgxk8j16wsbf5k7lqzfq";
};
nativeBuildInputs = [
@@ -20,7 +20,7 @@ stdenv.mkDerivation rec {
];
buildInputs = [
acl attr boost btrfs-progs dbus diffutils e2fsprogs libxml2
- lvm2 pam python utillinux
+ lvm2 pam python utillinux json_c
];
patches = [
@@ -33,7 +33,7 @@ stdenv.mkDerivation rec {
postPatch = ''
# Hard-coded root paths, hard-coded root paths everywhere...
- for file in {client,data,pam,scripts}/Makefile.am; do
+ for file in {client,data,pam,scripts,zypp-plugin}/Makefile.am; do
substituteInPlace $file \
--replace '$(DESTDIR)/usr' "$out" \
--replace "DESTDIR" "out" \
diff --git a/pkgs/tools/misc/ttfautohint/default.nix b/pkgs/tools/misc/ttfautohint/default.nix
index bfb97c22b1d3..f82917239e64 100644
--- a/pkgs/tools/misc/ttfautohint/default.nix
+++ b/pkgs/tools/misc/ttfautohint/default.nix
@@ -35,7 +35,7 @@ stdenv.mkDerivation rec {
'';
homepage = https://www.freetype.org/ttfautohint;
license = licenses.gpl2Plus; # or the FreeType License (BSD + advertising clause)
- maintainers = with maintainers; [ goibhniu ndowens ];
+ maintainers = with maintainers; [ goibhniu ];
platforms = platforms.unix;
};
diff --git a/pkgs/tools/misc/uutils-coreutils/default.nix b/pkgs/tools/misc/uutils-coreutils/default.nix
index a32ce090ecdd..9d928a3701ec 100644
--- a/pkgs/tools/misc/uutils-coreutils/default.nix
+++ b/pkgs/tools/misc/uutils-coreutils/default.nix
@@ -32,7 +32,7 @@ rustPlatform.buildRustPackage {
CLI utils in Rust. This repo is to aggregate the GNU coreutils rewrites.
'';
homepage = https://github.com/uutils/coreutils;
- maintainers = with maintainers; [ ma27 ];
+ maintainers = with maintainers; [ ];
license = licenses.mit;
platforms = platforms.unix;
};
diff --git a/pkgs/tools/misc/youtube-dl/default.nix b/pkgs/tools/misc/youtube-dl/default.nix
index 7ca9f18d30a6..415ec83be2f7 100644
--- a/pkgs/tools/misc/youtube-dl/default.nix
+++ b/pkgs/tools/misc/youtube-dl/default.nix
@@ -18,11 +18,11 @@ buildPythonPackage rec {
# The websites youtube-dl deals with are a very moving target. That means that
# downloads break constantly. Because of that, updates should always be backported
# to the latest stable release.
- version = "2019.11.28";
+ version = "2019.12.25";
src = fetchurl {
url = "https://yt-dl.org/downloads/${version}/${pname}-${version}.tar.gz";
- sha256 = "19xiwdn3l0kizyj7cik9vyhgrlwg7ss4wl4hy2pbbbqwh5vwppwk";
+ sha256 = "13f7wv9v77zilhif0ndgjv4wn9glhmm14yh7axdcx5wglrgz38hf";
};
nativeBuildInputs = [ makeWrapper ];
@@ -65,6 +65,6 @@ buildPythonPackage rec {
'';
license = licenses.publicDomain;
platforms = with platforms; linux ++ darwin;
- maintainers = with maintainers; [ bluescreen303 phreedom AndersonTorres fpletz enzime ];
+ maintainers = with maintainers; [ bluescreen303 phreedom AndersonTorres fpletz enzime ma27 ];
};
}
diff --git a/pkgs/tools/networking/acme-client/default.nix b/pkgs/tools/networking/acme-client/default.nix
index bf1c96b66b27..06c2898248d0 100644
--- a/pkgs/tools/networking/acme-client/default.nix
+++ b/pkgs/tools/networking/acme-client/default.nix
@@ -12,13 +12,13 @@ with stdenv.lib;
stdenv.mkDerivation rec {
pname = "acme-client";
- version = "0.2.4";
+ version = "0.2.5";
src = fetchFromGitHub {
owner = "graywolf";
repo = "acme-client-portable";
rev = "v${version}";
- sha256 = "1yq2lkrnjwjs0h9mijqysnjmr7kp4zcq1f4cxr9n1db7pw8446xb";
+ sha256 = "1d9yk87nj5gizkq26m4wqfh4xhlrn5xlfj7mfgvrpsdiwibqxrrw";
};
nativeBuildInputs = [ autoreconfHook bison pkgconfig ];
diff --git a/pkgs/tools/networking/airfield/default.nix b/pkgs/tools/networking/airfield/default.nix
index c53cce49a388..a31bc57904d5 100644
--- a/pkgs/tools/networking/airfield/default.nix
+++ b/pkgs/tools/networking/airfield/default.nix
@@ -64,7 +64,7 @@ in stdenv.mkDerivation {
description = "A web-interface for hipache-proxy";
license = licenses.mit;
homepage = https://github.com/emblica/airfield;
- maintainers = with maintainers; [ offline ma27 ];
+ maintainers = with maintainers; [ offline ];
platforms = platforms.linux;
};
}
diff --git a/pkgs/tools/networking/argus/default.nix b/pkgs/tools/networking/argus/default.nix
index 72c0a78a447b..bb9abccc933a 100644
--- a/pkgs/tools/networking/argus/default.nix
+++ b/pkgs/tools/networking/argus/default.nix
@@ -1,5 +1,5 @@
{ stdenv, fetchurl, libpcap, bison, flex, cyrus_sasl, tcp_wrappers,
- pkgconfig, procps, which, wget, lsof, net_snmp, perl }:
+ pkgconfig, procps, which, wget, lsof, net-snmp, perl }:
stdenv.mkDerivation rec {
pname = "argus";
@@ -10,9 +10,9 @@ stdenv.mkDerivation rec {
sha256 = "1zzf688dbbcb5z2r9v1p28rddns6znzx35nc05ygza6lp7aknkna";
};
- nativeBuildInputs = [ pkgconfig ];
- buildInputs = [ libpcap bison cyrus_sasl tcp_wrappers flex ];
- propagatedBuildInputs = [ procps which wget lsof net_snmp ];
+ nativeBuildInputs = [ pkgconfig bison flex ];
+ buildInputs = [ libpcap cyrus_sasl tcp_wrappers ];
+ propagatedBuildInputs = [ procps which wget lsof net-snmp ];
patchPhase = ''
substituteInPlace events/argus-extip.pl \
@@ -23,8 +23,8 @@ stdenv.mkDerivation rec {
substituteInPlace events/argus-vmstat.sh \
--replace vm_stat ${procps}/bin/vmstat
substituteInPlace events/argus-snmp.sh \
- --replace /usr/bin/snmpget ${net_snmp}/bin/snmpget \
- --replace /usr/bin/snmpwalk ${net_snmp}/bin/snmpwalk
+ --replace /usr/bin/snmpget ${stdenv.lib.getBin net-snmp}/bin/snmpget \
+ --replace /usr/bin/snmpwalk ${stdenv.lib.getBin net-snmp}/bin/snmpwalk
'';
meta = with stdenv.lib; {
diff --git a/pkgs/tools/networking/dhcpcd/default.nix b/pkgs/tools/networking/dhcpcd/default.nix
index d63c63ab1d27..20b017ee67cb 100644
--- a/pkgs/tools/networking/dhcpcd/default.nix
+++ b/pkgs/tools/networking/dhcpcd/default.nix
@@ -4,11 +4,11 @@ stdenv.mkDerivation rec {
# when updating this to >=7, check, see previous reverts:
# nix-build -A nixos.tests.networking.scripted.macvlan.x86_64-linux nixos/release-combined.nix
pname = "dhcpcd";
- version = "8.1.2";
+ version = "8.1.4";
src = fetchurl {
url = "mirror://roy/${pname}/${pname}-${version}.tar.xz";
- sha256 = "1b9mihp1mf2vng92fgks764a6pwf2gx7ccw6knja79c42nmyglyb";
+ sha256 = "0gf1qif25wy5lffzw39pi4sshmpxz1f4a1m9sglj7am1gaix3817";
};
nativeBuildInputs = [ pkgconfig ];
diff --git a/pkgs/tools/networking/ifstat-legacy/default.nix b/pkgs/tools/networking/ifstat-legacy/default.nix
index 756e77f1157e..72aaaa1e1706 100644
--- a/pkgs/tools/networking/ifstat-legacy/default.nix
+++ b/pkgs/tools/networking/ifstat-legacy/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, autoreconfHook, net_snmp }:
+{ stdenv, fetchurl, autoreconfHook, net-snmp }:
stdenv.mkDerivation rec {
pname = "ifstat-legacy";
@@ -9,7 +9,7 @@ stdenv.mkDerivation rec {
sha256 = "01zmv6vk5kh5xmd563xws8a1qnxjb6b6kv59yzz9r3rrghxhd6c5";
};
- buildInputs = [ net_snmp ];
+ buildInputs = [ net-snmp ];
nativeBuildInputs = [ autoreconfHook ];
diff --git a/pkgs/tools/networking/keepalived/default.nix b/pkgs/tools/networking/keepalived/default.nix
index 4e1894db98cc..87748211425f 100644
--- a/pkgs/tools/networking/keepalived/default.nix
+++ b/pkgs/tools/networking/keepalived/default.nix
@@ -1,32 +1,28 @@
-{ stdenv, fetchFromGitHub, fetchpatch, libnfnetlink, libnl, net_snmp, openssl, pkgconfig }:
+{ stdenv, fetchFromGitHub, nixosTests
+, libnfnetlink, libnl, net-snmp, openssl
+, pkgconfig, autoreconfHook }:
stdenv.mkDerivation rec {
pname = "keepalived";
- version = "1.4.5";
+ version = "2.0.19";
src = fetchFromGitHub {
owner = "acassen";
repo = "keepalived";
rev = "v${version}";
- sha256 = "12r80rcfxrys826flaqcdlfhcr7q4ccsd62ra1svy9545vf02qmx";
+ sha256 = "05jgr0f04z69x3zf3b9z04wczl15fnh69bs6j0yw55fij1k9nj4d";
};
- patches = [
- (fetchpatch {
- name = "CVE-2018-19115.patch";
- url = "https://github.com/acassen/keepalived/pull/961/commits/f28015671a4b04785859d1b4b1327b367b6a10e9.patch";
- sha256 = "1jnwk7x4qdgv7fb4jzw6sihv62n8wv04myhgwm2vxn8nfkcgd1mm";
- })
- ];
-
buildInputs = [
libnfnetlink
libnl
- net_snmp
+ net-snmp
openssl
];
- nativeBuildInputs = [ pkgconfig ];
+ passthru.tests.keepalived = nixosTests.keepalived;
+
+ nativeBuildInputs = [ pkgconfig autoreconfHook ];
configureFlags = [
"--enable-sha1"
diff --git a/pkgs/tools/networking/lldpd/default.nix b/pkgs/tools/networking/lldpd/default.nix
index b8ba1357f5f8..23dbb60767e7 100644
--- a/pkgs/tools/networking/lldpd/default.nix
+++ b/pkgs/tools/networking/lldpd/default.nix
@@ -1,5 +1,5 @@
{ stdenv, lib, fetchurl, pkgconfig, removeReferencesTo
-, libevent, readline, net_snmp, openssl
+, libevent, readline, net-snmp, openssl
}:
stdenv.mkDerivation rec {
@@ -19,7 +19,7 @@ stdenv.mkDerivation rec {
];
nativeBuildInputs = [ pkgconfig removeReferencesTo ];
- buildInputs = [ libevent readline net_snmp openssl ];
+ buildInputs = [ libevent readline net-snmp openssl ];
enableParallelBuilding = true;
diff --git a/pkgs/tools/networking/ocserv/default.nix b/pkgs/tools/networking/ocserv/default.nix
index 55d3b6ff81c1..c0535794cc6e 100644
--- a/pkgs/tools/networking/ocserv/default.nix
+++ b/pkgs/tools/networking/ocserv/default.nix
@@ -21,6 +21,6 @@ stdenv.mkDerivation rec {
homepage = https://gitlab.com/openconnect/ocserv;
license = licenses.gpl2;
description = "This program is openconnect VPN server (ocserv), a server for the openconnect VPN client.";
- maintainers = with maintainers; [ ma27 ];
+ maintainers = with maintainers; [ ];
};
}
diff --git a/pkgs/tools/networking/offlineimap/default.nix b/pkgs/tools/networking/offlineimap/default.nix
index a14f8187b7d9..983ba0184738 100644
--- a/pkgs/tools/networking/offlineimap/default.nix
+++ b/pkgs/tools/networking/offlineimap/default.nix
@@ -2,14 +2,14 @@
asciidoc, cacert, libxml2, libxslt, docbook_xsl }:
python2Packages.buildPythonApplication rec {
- version = "7.3.0";
+ version = "7.3.2";
pname = "offlineimap";
src = fetchFromGitHub {
owner = "OfflineIMAP";
repo = "offlineimap";
rev = "v${version}";
- sha256 = "0v32s09zgi3jg2grwh1xzzgzpw333b9qflai7zh2hv3fx9xnfbyj";
+ sha256 = "0rmj1ws6hljqnfap3p3js5s46kx85yc02hjkiki5zg44wn3hswjg";
};
postPatch = ''
@@ -23,7 +23,7 @@ python2Packages.buildPythonApplication rec {
doCheck = false;
nativeBuildInputs = [ asciidoc libxml2 libxslt docbook_xsl ];
- propagatedBuildInputs = with python2Packages; [ six kerberos rfc6555 ];
+ propagatedBuildInputs = with python2Packages; [ six kerberos rfc6555 pysocks ];
postInstall = ''
make -C docs man
@@ -35,6 +35,6 @@ python2Packages.buildPythonApplication rec {
description = "Synchronize emails between two repositories, so that you can read the same mailbox from multiple computers";
homepage = http://offlineimap.org;
license = stdenv.lib.licenses.gpl2Plus;
- maintainers = with stdenv.lib.maintainers; [ endocrimes ma27 ];
+ maintainers = with stdenv.lib.maintainers; [ endocrimes ];
};
}
diff --git a/pkgs/tools/networking/swaks/default.nix b/pkgs/tools/networking/swaks/default.nix
index 8dee8989c064..81d0935f0b08 100644
--- a/pkgs/tools/networking/swaks/default.nix
+++ b/pkgs/tools/networking/swaks/default.nix
@@ -25,7 +25,7 @@ stdenv.mkDerivation rec {
homepage = "http://www.jetmore.org/john/code/swaks/";
description = "A featureful, flexible, scriptable, transaction-oriented SMTP test tool";
license = licenses.gpl2;
- maintainers = with maintainers; [ ndowens ];
+ maintainers = with maintainers; [];
platforms = platforms.all;
};
diff --git a/pkgs/tools/security/age/default.nix b/pkgs/tools/security/age/default.nix
new file mode 100644
index 000000000000..bde597ba9f30
--- /dev/null
+++ b/pkgs/tools/security/age/default.nix
@@ -0,0 +1,27 @@
+{ lib, buildGoModule, fetchFromGitHub }:
+
+buildGoModule rec {
+ pname = "age";
+ version = "1.0.0-beta2";
+ goPackagePath = "github.com/FiloSottile/age";
+ modSha256 = "0kwdwhkxgqjd8h1p7pm4h4xidp2vk840h1j4qya4qz8bjf9vskl9";
+
+ subPackages = [
+ "cmd/age"
+ "cmd/age-keygen"
+ ];
+
+ src = fetchFromGitHub {
+ owner = "FiloSottile";
+ repo = "age";
+ rev = "v${version}";
+ sha256 = "1n1ww8yjw0mg00dvnfmggww9kwp1hls0a85iv6vx9k89mzv8mdrq";
+ };
+
+ meta = with lib; {
+ homepage = "https://age-encryption.org/";
+ description = "Modern encryption tool with small explicit keys";
+ license = licenses.bsd3;
+ maintainers = with maintainers; [ tazjin ];
+ };
+}
diff --git a/pkgs/tools/security/notary/default.nix b/pkgs/tools/security/notary/default.nix
index f1a61adabbb6..d1e2ee58e483 100644
--- a/pkgs/tools/security/notary/default.nix
+++ b/pkgs/tools/security/notary/default.nix
@@ -59,7 +59,7 @@ buildGoPackage rec {
'';
license = licenses.asl20;
homepage = https://github.com/theupdateframework/notary;
- maintainers = with maintainers; [ vdemeester ma27 ];
+ maintainers = with maintainers; [ vdemeester ];
platforms = platforms.unix;
};
}
diff --git a/pkgs/tools/security/rng-tools/default.nix b/pkgs/tools/security/rng-tools/default.nix
index 4238fc5be334..bd289200fe80 100644
--- a/pkgs/tools/security/rng-tools/default.nix
+++ b/pkgs/tools/security/rng-tools/default.nix
@@ -14,13 +14,13 @@ with stdenv.lib;
stdenv.mkDerivation rec {
pname = "rng-tools";
- version = "6.8";
+ version = "6.9";
src = fetchFromGitHub {
owner = "nhorman";
repo = "rng-tools";
rev = "v${version}";
- sha256 = "1clm9i9xg3j79q0d6vinn6dx0nwh1fvzcmkqpcbay7mwsgkknvw2";
+ sha256 = "065jf26s8zkicb95zc9ilksjdq9gqrh5vcx3mhi6mypbnamn6w98";
};
postPatch = ''
diff --git a/pkgs/tools/security/tpm-quote-tools/default.nix b/pkgs/tools/security/tpm-quote-tools/default.nix
index 5d54758cc7c2..f7526ac7225d 100644
--- a/pkgs/tools/security/tpm-quote-tools/default.nix
+++ b/pkgs/tools/security/tpm-quote-tools/default.nix
@@ -26,7 +26,7 @@ stdenv.mkDerivation rec {
'';
homepage = http://tpmquotetools.sourceforge.net/;
license = licenses.bsd3;
- maintainers = with maintainers; [ ak ndowens ];
+ maintainers = with maintainers; [ ak ];
platforms = platforms.linux;
};
}
diff --git a/pkgs/tools/system/augeas/default.nix b/pkgs/tools/system/augeas/default.nix
index a99df36beb6d..08731cd6db23 100644
--- a/pkgs/tools/system/augeas/default.nix
+++ b/pkgs/tools/system/augeas/default.nix
@@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
description = "Configuration editing tool";
license = licenses.lgpl2;
homepage = http://augeas.net/;
- maintainers = with maintainers; [ offline ndowens ];
+ maintainers = with maintainers; [ offline ];
platforms = platforms.unix;
};
}
diff --git a/pkgs/tools/system/collectd/plugins.nix b/pkgs/tools/system/collectd/plugins.nix
index c29ebc925bcd..f1a87847a5ce 100644
--- a/pkgs/tools/system/collectd/plugins.nix
+++ b/pkgs/tools/system/collectd/plugins.nix
@@ -24,7 +24,7 @@
, lm_sensors
, mongoc
, mosquitto
-, net_snmp
+, net-snmp
, postgresql
, protobufc
, python
@@ -243,10 +243,10 @@ let
buildInputs = stdenv.lib.optionals stdenv.isLinux [ libatasmart udev ];
};
snmp = {
- buildInputs = stdenv.lib.optionals stdenv.isLinux [ net_snmp ];
+ buildInputs = stdenv.lib.optionals stdenv.isLinux [ net-snmp ];
};
snmp_agent = {
- buildInputs = stdenv.lib.optionals stdenv.isLinux [ net_snmp ];
+ buildInputs = stdenv.lib.optionals stdenv.isLinux [ net-snmp ];
};
statsd = {};
swap = {};
diff --git a/pkgs/tools/system/di/default.nix b/pkgs/tools/system/di/default.nix
index b69d440499fd..6aaa0eeddfe0 100644
--- a/pkgs/tools/system/di/default.nix
+++ b/pkgs/tools/system/di/default.nix
@@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
homepage = https://gentoo.com/di/;
license = licenses.zlib;
updateWalker = true;
- maintainers = with maintainers; [ manveru ndowens ];
+ maintainers = with maintainers; [ manveru ];
platforms = platforms.all;
};
}
diff --git a/pkgs/tools/system/hwinfo/default.nix b/pkgs/tools/system/hwinfo/default.nix
index 18b452b3ca7f..d323f048ba05 100644
--- a/pkgs/tools/system/hwinfo/default.nix
+++ b/pkgs/tools/system/hwinfo/default.nix
@@ -34,7 +34,7 @@ stdenv.mkDerivation rec {
description = "Hardware detection tool from openSUSE";
license = licenses.gpl2;
homepage = https://github.com/openSUSE/hwinfo;
- maintainers = with maintainers; [ bobvanderlinden ndowens ];
+ maintainers = with maintainers; [ bobvanderlinden ];
platforms = platforms.linux;
};
}
diff --git a/pkgs/tools/system/ioping/default.nix b/pkgs/tools/system/ioping/default.nix
index 274e65bb41dc..b4ab0f04d1c0 100644
--- a/pkgs/tools/system/ioping/default.nix
+++ b/pkgs/tools/system/ioping/default.nix
@@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
meta = with stdenv.lib; {
description = "Disk I/O latency measuring tool";
- maintainers = with maintainers; [ raskin ndowens ];
+ maintainers = with maintainers; [ raskin ];
platforms = platforms.unix;
license = licenses.gpl3Plus;
homepage = https://github.com/koct9i/ioping;
diff --git a/pkgs/tools/system/plan9port/default.nix b/pkgs/tools/system/plan9port/default.nix
index 9776960327e1..9a4a22385584 100644
--- a/pkgs/tools/system/plan9port/default.nix
+++ b/pkgs/tools/system/plan9port/default.nix
@@ -53,7 +53,7 @@ stdenv.mkDerivation {
xorgproto libX11 libXext libXt fontconfig
freetype # fontsrv wants ft2build.h provides system fonts for acme and sam.
] ++ stdenv.lib.optionals stdenv.isDarwin (with darwin.apple_sdk.frameworks; [
- darwin.cf-private Carbon Cocoa IOKit Metal QuartzCore
+ Carbon Cocoa IOKit Metal QuartzCore
]);
builder = ./builder.sh;
diff --git a/pkgs/tools/system/rsyslog/default.nix b/pkgs/tools/system/rsyslog/default.nix
index 96f0a754f61b..d12411d6145c 100644
--- a/pkgs/tools/system/rsyslog/default.nix
+++ b/pkgs/tools/system/rsyslog/default.nix
@@ -1,6 +1,6 @@
{ stdenv, fetchurl, pkgconfig, autoreconfHook, libestr, json_c, zlib, pythonPackages, fastJson
, libkrb5 ? null, systemd ? null, jemalloc ? null, libmysqlclient ? null, postgresql ? null
-, libdbi ? null, net_snmp ? null, libuuid ? null, curl ? null, gnutls ? null
+, libdbi ? null, net-snmp ? null, libuuid ? null, curl ? null, gnutls ? null
, libgcrypt ? null, liblognorm ? null, openssl ? null, librelp ? null, libksi ? null
, liblogging ? null, libnet ? null, hadoop ? null, rdkafka ? null
, libmongo-client ? null, czmq ? null, rabbitmq-c ? null, hiredis ? null, mongoc ? null
@@ -24,7 +24,7 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ pkgconfig autoreconfHook ];
buildInputs = [
fastJson libestr json_c zlib pythonPackages.docutils libkrb5 jemalloc
- postgresql libdbi net_snmp libuuid curl gnutls libgcrypt liblognorm openssl
+ postgresql libdbi net-snmp libuuid curl gnutls libgcrypt liblognorm openssl
librelp libksi liblogging libnet hadoop rdkafka libmongo-client czmq
rabbitmq-c hiredis mongoc
] ++ stdenv.lib.optional (libmysqlclient != null) libmysqlclient
@@ -54,7 +54,7 @@ stdenv.mkDerivation rec {
(mkFlag (libmysqlclient != null) "mysql")
(mkFlag (postgresql != null) "pgsql")
(mkFlag (libdbi != null) "libdbi")
- (mkFlag (net_snmp != null) "snmp")
+ (mkFlag (net-snmp != null) "snmp")
(mkFlag (libuuid != null) "uuid")
(mkFlag (curl != null) "elasticsearch")
(mkFlag (gnutls != null) "gnutls")
diff --git a/pkgs/tools/system/stress-ng/default.nix b/pkgs/tools/system/stress-ng/default.nix
index c98634e11994..c8748efc3023 100644
--- a/pkgs/tools/system/stress-ng/default.nix
+++ b/pkgs/tools/system/stress-ng/default.nix
@@ -4,11 +4,11 @@
stdenv.mkDerivation rec {
pname = "stress-ng";
- version = "0.10.11";
+ version = "0.10.14";
src = fetchurl {
url = "https://kernel.ubuntu.com/~cking/tarballs/${pname}/${pname}-${version}.tar.xz";
- sha256 = "16z45fmvncpa0bv91dpwarqfm9p7aiqkmlcpmv2y23rh6sikhkdq";
+ sha256 = "0lazjxrlqzhxd6fg3y1vh38h66v8swkd9q2say4m6sglzkfqdfnq";
};
postPatch = ''
diff --git a/pkgs/tools/system/xe/default.nix b/pkgs/tools/system/xe/default.nix
index 02d904724404..02e36dbc31c5 100644
--- a/pkgs/tools/system/xe/default.nix
+++ b/pkgs/tools/system/xe/default.nix
@@ -18,6 +18,6 @@ stdenv.mkDerivation rec {
homepage = https://github.com/chneukirchen/xe;
license = licenses.publicDomain;
platforms = platforms.all;
- maintainers = with maintainers; [ cstrahan ndowens ];
+ maintainers = with maintainers; [ cstrahan ];
};
}
diff --git a/pkgs/tools/text/catdoc/default.nix b/pkgs/tools/text/catdoc/default.nix
index d4f402709157..64ef092f36be 100644
--- a/pkgs/tools/text/catdoc/default.nix
+++ b/pkgs/tools/text/catdoc/default.nix
@@ -22,6 +22,6 @@ stdenv.mkDerivation rec {
description = "MS-Word/Excel/PowerPoint to text converter";
platforms = platforms.all;
license = licenses.gpl2;
- maintainers = with maintainers; [ ndowens ];
+ maintainers = with maintainers; [];
};
}
diff --git a/pkgs/tools/text/discount/default.nix b/pkgs/tools/text/discount/default.nix
index 561ee06136d8..c1183d4c5a01 100644
--- a/pkgs/tools/text/discount/default.nix
+++ b/pkgs/tools/text/discount/default.nix
@@ -27,7 +27,7 @@ stdenv.mkDerivation rec {
description = "Implementation of Markdown markup language in C";
homepage = http://www.pell.portland.or.us/~orc/Code/discount/;
license = licenses.bsd3;
- maintainers = with maintainers; [ shell ndowens ];
+ maintainers = with maintainers; [ shell ];
platforms = platforms.unix;
};
}
diff --git a/pkgs/tools/text/dos2unix/default.nix b/pkgs/tools/text/dos2unix/default.nix
index 146338df9163..b7efe02f4cdb 100644
--- a/pkgs/tools/text/dos2unix/default.nix
+++ b/pkgs/tools/text/dos2unix/default.nix
@@ -17,6 +17,6 @@ stdenv.mkDerivation rec {
homepage = "https://waterlan.home.xs4all.nl/dos2unix.html";
changelog = "https://sourceforge.net/p/dos2unix/dos2unix/ci/dos2unix-${version}/tree/dos2unix/NEWS.txt?format=raw";
license = licenses.bsd2;
- maintainers = with maintainers; [ c0bw3b ndowens ];
+ maintainers = with maintainers; [ c0bw3b ];
};
}
diff --git a/pkgs/tools/text/highlight/default.nix b/pkgs/tools/text/highlight/default.nix
index 3a9e8e9ceaf7..51cafeb8c4a4 100644
--- a/pkgs/tools/text/highlight/default.nix
+++ b/pkgs/tools/text/highlight/default.nix
@@ -49,7 +49,7 @@ let
description = "Source code highlighting tool";
homepage = "http://www.andre-simon.de/doku/highlight/en/highlight.php";
platforms = platforms.unix;
- maintainers = with maintainers; [ ndowens willibutz ];
+ maintainers = with maintainers; [ willibutz ];
};
};
diff --git a/pkgs/tools/text/kytea/default.nix b/pkgs/tools/text/kytea/default.nix
index 600907311ef2..621408866e8c 100644
--- a/pkgs/tools/text/kytea/default.nix
+++ b/pkgs/tools/text/kytea/default.nix
@@ -25,7 +25,7 @@ stdenv.mkDerivation rec {
license = licenses.asl20;
- maintainers = with maintainers; [ ericsagnes ndowens ];
+ maintainers = with maintainers; [ ericsagnes ];
platforms = platforms.unix;
};
diff --git a/pkgs/tools/text/numdiff/default.nix b/pkgs/tools/text/numdiff/default.nix
index 415ff0b31b75..f7543dc0f70e 100644
--- a/pkgs/tools/text/numdiff/default.nix
+++ b/pkgs/tools/text/numdiff/default.nix
@@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
'';
homepage = https://www.nongnu.org/numdiff/;
license = licenses.gpl3Plus;
- maintainers = with maintainers; [ ndowens ];
+ maintainers = with maintainers; [];
platforms = platforms.gnu ++ platforms.linux;
};
}
diff --git a/pkgs/tools/text/qgrep/default.nix b/pkgs/tools/text/qgrep/default.nix
index 5f0e7461361d..c45398e31a1f 100644
--- a/pkgs/tools/text/qgrep/default.nix
+++ b/pkgs/tools/text/qgrep/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub }:
+{ stdenv, fetchFromGitHub, CoreServices, CoreFoundation, fetchpatch }:
stdenv.mkDerivation rec {
version = "1.1";
@@ -12,6 +12,20 @@ stdenv.mkDerivation rec {
fetchSubmodules = true;
};
+ patches = stdenv.lib.optionals stdenv.isDarwin [
+ (fetchpatch {
+ url = "https://github.com/zeux/qgrep/commit/21c4d1a5ab0f0bdaa0b5ca993c1315c041418cc6.patch";
+ sha256 = "0wpxzrd9pmhgbgby17vb8279xwvkxfdd99gvv7r74indgdxqg7v8";
+ })
+ ];
+
+ buildInputs = stdenv.lib.optionals stdenv.isDarwin [ CoreServices CoreFoundation ];
+
+ postPatch = stdenv.lib.optionalString stdenv.isAarch64 ''
+ substituteInPlace Makefile \
+ --replace "-msse2" "" --replace "-DUSE_SSE2" ""
+ '';
+
installPhase = ''
install -Dm755 qgrep $out/bin/qgrep
'';
@@ -23,5 +37,4 @@ stdenv.mkDerivation rec {
maintainers = [ maintainers.yrashk ];
platforms = platforms.all;
};
-
}
diff --git a/pkgs/tools/text/ripgrep-all/default.nix b/pkgs/tools/text/ripgrep-all/default.nix
index d41be25231cb..df54724d3847 100644
--- a/pkgs/tools/text/ripgrep-all/default.nix
+++ b/pkgs/tools/text/ripgrep-all/default.nix
@@ -57,7 +57,7 @@ rustPlatform.buildRustPackage rec {
'';
homepage = https://github.com/phiresky/ripgrep-all;
license = with licenses; [ agpl3Plus ];
- maintainers = with maintainers; [ zaninime ];
+ maintainers = with maintainers; [ zaninime ma27 ];
platforms = platforms.all;
};
}
diff --git a/pkgs/tools/text/ripgrep/default.nix b/pkgs/tools/text/ripgrep/default.nix
index 77cc625f7f82..963ef99c68a1 100644
--- a/pkgs/tools/text/ripgrep/default.nix
+++ b/pkgs/tools/text/ripgrep/default.nix
@@ -36,7 +36,7 @@ rustPlatform.buildRustPackage rec {
description = "A utility that combines the usability of The Silver Searcher with the raw speed of grep";
homepage = https://github.com/BurntSushi/ripgrep;
license = with licenses; [ unlicense /* or */ mit ];
- maintainers = with maintainers; [ tailhook globin ];
+ maintainers = with maintainers; [ tailhook globin ma27 ];
platforms = platforms.all;
};
}
diff --git a/pkgs/tools/text/wgetpaste/default.nix b/pkgs/tools/text/wgetpaste/default.nix
index 7b08cffe42db..3360fd4cbe09 100644
--- a/pkgs/tools/text/wgetpaste/default.nix
+++ b/pkgs/tools/text/wgetpaste/default.nix
@@ -24,7 +24,7 @@ stdenv.mkDerivation rec {
description = "Command-line interface to various pastebins";
homepage = http://wgetpaste.zlin.dk/;
license = stdenv.lib.licenses.publicDomain;
- maintainers = with stdenv.lib.maintainers; [ qknight domenkozar ndowens ];
+ maintainers = with stdenv.lib.maintainers; [ qknight domenkozar ];
platforms = stdenv.lib.platforms.all;
};
}
diff --git a/pkgs/tools/text/xurls/default.nix b/pkgs/tools/text/xurls/default.nix
index 6e66090d88f0..c8d10a6e2699 100644
--- a/pkgs/tools/text/xurls/default.nix
+++ b/pkgs/tools/text/xurls/default.nix
@@ -17,7 +17,7 @@ buildGoPackage rec {
meta = with stdenv.lib; {
description = "Extract urls from text";
homepage = https://github.com/mvdan/xurls;
- maintainers = with maintainers; [ koral ndowens ];
+ maintainers = with maintainers; [ koral ];
platforms = platforms.unix;
license = licenses.bsd3;
};
diff --git a/pkgs/tools/typesetting/fop/default.nix b/pkgs/tools/typesetting/fop/default.nix
index c681eaa6ddc6..0b5c79756bd6 100644
--- a/pkgs/tools/typesetting/fop/default.nix
+++ b/pkgs/tools/typesetting/fop/default.nix
@@ -46,6 +46,6 @@ stdenv.mkDerivation rec {
homepage = https://xmlgraphics.apache.org/fop/;
license = licenses.asl20;
platforms = platforms.all;
- maintainers = with maintainers; [ bjornfor ndowens ];
+ maintainers = with maintainers; [ bjornfor ];
};
}
diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix
index 8ce5d12bd68f..4911f96fad62 100644
--- a/pkgs/top-level/aliases.nix
+++ b/pkgs/top-level/aliases.nix
@@ -394,6 +394,7 @@ mapAliases ({
smbclient = samba; # added 2018-04-25
slim = throw "slim has been removed. Please use a different display-manager"; # added 2019-11-11
slimThemes = throw "slimThemes has been removed because slim has been also"; # added 2019-11-11
+ net_snmp = net-snmp; # added 2019-12-21
spaceOrbit = space-orbit; # addewd 2016-05-23
speech_tools = speech-tools; # added 2018-04-25
speedtest_cli = speedtest-cli; # added 2015-02-17
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 68de5e9f9dc4..e0442bd68c2a 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -508,6 +508,8 @@ in
acpica-tools = callPackage ../tools/system/acpica-tools { };
+ act = callPackage ../development/tools/misc/act {};
+
actdiag = with python3.pkgs; toPythonApplication actdiag;
actkbd = callPackage ../tools/system/actkbd { };
@@ -2081,7 +2083,7 @@ in
libmysqlclient = null;
postgresql = null;
libdbi = null;
- net_snmp = null;
+ net-snmp = null;
libuuid = null;
gnutls = null;
libgcrypt = null;
@@ -2516,6 +2518,8 @@ in
caps2esc = callPackage ../tools/inputmethods/interception-tools/caps2esc.nix { };
};
+ age = callPackage ../tools/security/age { };
+
brotli = callPackage ../tools/compression/brotli { };
biosdevname = callPackage ../tools/networking/biosdevname { };
@@ -5908,7 +5912,9 @@ in
qesteidutil = libsForQt5.callPackage ../tools/security/qesteidutil { } ;
qdigidoc = libsForQt5.callPackage ../tools/security/qdigidoc { } ;
- qgrep = callPackage ../tools/text/qgrep {};
+ qgrep = callPackage ../tools/text/qgrep {
+ inherit (darwin.apple_sdk.frameworks) CoreServices CoreFoundation;
+ };
qhull = callPackage ../development/libraries/qhull { };
@@ -8155,7 +8161,7 @@ in
purescript-psa = nodePackages.purescript-psa;
- spago = haskell.lib.justStaticExecutables haskellPackages.spago;
+ spago = callPackage ../development/tools/purescript/spago { };
pulp = nodePackages.pulp;
@@ -8523,7 +8529,6 @@ in
llvmPackages_latest = llvmPackages_9;
lorri = callPackage ../tools/misc/lorri {
- inherit (darwin) cf-private;
inherit (darwin.apple_sdk.frameworks) CoreServices Security;
};
@@ -8946,6 +8951,8 @@ in
clojure = callPackage ../development/interpreters/clojure { };
+ clojure-lsp = callPackage ../development/tools/misc/clojure-lsp { };
+
clooj = callPackage ../development/interpreters/clojure/clooj.nix { };
dhall = callPackage ../development/interpreters/dhall { };
@@ -9353,7 +9360,23 @@ in
})
ruby_2_4
ruby_2_5
- ruby_2_6;
+ ruby_2_6
+ ruby_2_7;
+
+ rubyMinimal = ruby.override {
+ # gem support is minimal overhead
+ rubygemsSupport = true;
+ useRailsExpress = false;
+ zlibSupport = false;
+ opensslSupport = false;
+ gdbmSupport = false;
+ cursesSupport = false;
+ docSupport = false;
+ yamlSupport = false;
+ fiddleSupport = false;
+ # remove gcc from runtime closure
+ removeReferenceToCC = true;
+ };
ruby = ruby_2_6;
@@ -10572,7 +10595,7 @@ in
texlab = callPackage ../development/tools/misc/texlab {
inherit (darwin.apple_sdk.frameworks) Security;
- texlab-citeproc-build-deps = nodePackages."texlab-citeproc-build-deps-../tools/misc/texlab/citeproc";
+ inherit (nodePackages) texlab-citeproc-build-deps;
};
tflint = callPackage ../development/tools/analysis/tflint { };
@@ -11645,6 +11668,8 @@ in
glib-networking = callPackage ../development/libraries/glib-networking {};
+ glirc = haskell.lib.justStaticExecutables haskellPackages.glirc;
+
gom = callPackage ../development/libraries/gom { };
ace = callPackage ../development/libraries/ace { };
@@ -15442,7 +15467,7 @@ in
check-esxi-hardware = callPackage ../servers/monitoring/plugins/esxi.nix {};
- net_snmp = callPackage ../servers/monitoring/net-snmp { };
+ net-snmp = callPackage ../servers/monitoring/net-snmp { };
newrelic-sysmond = callPackage ../servers/monitoring/newrelic-sysmond { };
@@ -19165,6 +19190,8 @@ in
inherit (darwin) IOKit;
};
+ glow = callPackage ../applications/editors/glow { };
+
glowing-bear = callPackage ../applications/networking/irc/glowing-bear { };
gmtk = callPackage ../development/libraries/gmtk { };
@@ -21387,6 +21414,7 @@ in
swift-im = libsForQt5.callPackage ../applications/networking/instant-messengers/swift-im {
inherit (gnome2) GConf;
+ boost = boost168;
};
sylpheed = callPackage ../applications/networking/mailreaders/sylpheed { };
@@ -21435,7 +21463,9 @@ in
tailor = callPackage ../applications/version-management/tailor {};
- taizen = callPackage ../applications/misc/taizen { };
+ taizen = callPackage ../applications/misc/taizen {
+ inherit (darwin.apple_sdk.frameworks) Security;
+ };
tangogps = callPackage ../applications/misc/tangogps {
gconf = gnome2.GConf;
@@ -21653,6 +21683,8 @@ in
twinkle = qt5.callPackage ../applications/networking/instant-messengers/twinkle { };
+ ueberzug = with python3Packages; toPythonApplication ueberzug;
+
umurmur = callPackage ../applications/networking/umurmur { };
udocker = pythonPackages.callPackage ../tools/virtualization/udocker { };
@@ -24514,7 +24546,9 @@ in
dpkg = callPackage ../tools/package-management/dpkg { };
- ekiga = callPackage ../applications/networking/instant-messengers/ekiga { };
+ ekiga = callPackage ../applications/networking/instant-messengers/ekiga {
+ boost = boost167;
+ };
dumb = callPackage ../misc/dumb { };
@@ -25232,6 +25266,8 @@ in
inherit (gnome2) GConf;
};
+ unityhub = callPackage ../development/tools/unityhub { };
+
urbit = callPackage ../misc/urbit { };
utf8proc = callPackage ../development/libraries/utf8proc { };
diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix
index 8f1133d9ba26..c4c18b264f1d 100644
--- a/pkgs/top-level/haskell-packages.nix
+++ b/pkgs/top-level/haskell-packages.nix
@@ -62,6 +62,18 @@ in {
buildLlvmPackages = buildPackages.llvmPackages_7;
llvmPackages = pkgs.llvmPackages_7;
};
+ ghc882 = callPackage ../development/compilers/ghc/8.8.2.nix {
+ bootPkgs = packages.ghc863Binary;
+ inherit (buildPackages.python3Packages) sphinx;
+ buildLlvmPackages = buildPackages.llvmPackages_7;
+ llvmPackages = pkgs.llvmPackages_7;
+ };
+ ghc8101 = callPackage ../development/compilers/ghc/8.10.1.nix {
+ bootPkgs = packages.ghc863Binary;
+ inherit (buildPackages.python3Packages) sphinx;
+ buildLlvmPackages = buildPackages.llvmPackages_9;
+ llvmPackages = pkgs.llvmPackages_9;
+ };
ghcHEAD = callPackage ../development/compilers/ghc/head.nix {
bootPkgs = packages.ghc863Binary;
inherit (buildPackages.python3Packages) sphinx;
@@ -120,6 +132,16 @@ in {
ghc = bh.compiler.ghc881;
compilerConfig = callPackage ../development/haskell-modules/configuration-ghc-8.8.x.nix { };
};
+ ghc882 = callPackage ../development/haskell-modules {
+ buildHaskellPackages = bh.packages.ghc882;
+ ghc = bh.compiler.ghc882;
+ compilerConfig = callPackage ../development/haskell-modules/configuration-ghc-8.8.x.nix { };
+ };
+ ghc8101 = callPackage ../development/haskell-modules {
+ buildHaskellPackages = bh.packages.ghc8101;
+ ghc = bh.compiler.ghc8101;
+ compilerConfig = callPackage ../development/haskell-modules/configuration-ghc-8.10.x.nix { };
+ };
ghcHEAD = callPackage ../development/haskell-modules {
buildHaskellPackages = bh.packages.ghcHEAD;
ghc = bh.compiler.ghcHEAD;
diff --git a/pkgs/top-level/ocaml-packages.nix b/pkgs/top-level/ocaml-packages.nix
index 4f884e91e264..ab7457b380a5 100644
--- a/pkgs/top-level/ocaml-packages.nix
+++ b/pkgs/top-level/ocaml-packages.nix
@@ -191,6 +191,8 @@ let
cppo = callPackage ../development/tools/ocaml/cppo { };
+ cpu = callPackage ../development/ocaml-modules/cpu { };
+
cpuid = callPackage ../development/ocaml-modules/cpuid { };
crunch = callPackage ../development/tools/ocaml/crunch { };
@@ -833,8 +835,6 @@ let
sedlex = callPackage ../development/ocaml-modules/sedlex { };
- setcore = callPackage ../development/ocaml-modules/setcore { };
-
sodium = callPackage ../development/ocaml-modules/sodium { };
spelll = callPackage ../development/ocaml-modules/spelll { };
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index ec8df2017414..273695af1363 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -717,8 +717,6 @@ in {
helper = callPackage ../development/python-modules/helper { };
- histbook = callPackage ../development/python-modules/histbook { };
-
hdmedians = callPackage ../development/python-modules/hdmedians { };
hocr-tools = callPackage ../development/python-modules/hocr-tools { };
@@ -1803,7 +1801,7 @@ in {
easysnmp = callPackage ../development/python-modules/easysnmp {
openssl = pkgs.openssl;
- net_snmp = pkgs.net_snmp;
+ net-snmp = pkgs.net-snmp;
};
iowait = callPackage ../development/python-modules/iowait {};
@@ -2598,6 +2596,8 @@ in {
then callPackage ../development/python-modules/gurobipy/linux.nix {}
else throw "gurobipy not yet supported on ${stdenv.hostPlatform.system}";
+ hass-nabucasa = callPackage ../development/python-modules/hass-nabucasa { };
+
hbmqtt = callPackage ../development/python-modules/hbmqtt { };
hiro = callPackage ../development/python-modules/hiro {};
@@ -5188,6 +5188,8 @@ in {
snowballstemmer = callPackage ../development/python-modules/snowballstemmer { };
+ snitun = callPackage ../development/python-modules/snitun { };
+
snscrape = callPackage ../development/python-modules/snscrape { };
snug = callPackage ../development/python-modules/snug { };
@@ -5358,6 +5360,10 @@ in {
uarray = callPackage ../development/python-modules/uarray { };
+ ueberzug = callPackage ../development/python-modules/ueberzug {
+ inherit (pkgs.xorg) libX11 libXext;
+ };
+
ukpostcodeparser = callPackage ../development/python-modules/ukpostcodeparser { };
umap-learn = callPackage ../development/python-modules/umap-learn { };