diff options
102 files changed, 2940 insertions, 1754 deletions
diff --git a/doc/functions.xml b/doc/functions.xml index 1f2d00b9e1a..3b60f46d81d 100644 --- a/doc/functions.xml +++ b/doc/functions.xml @@ -16,6 +16,7 @@ <xi:include href="functions/fhs-environments.xml" /> <xi:include href="functions/shell.xml" /> <xi:include href="functions/dockertools.xml" /> + <xi:include href="functions/snaptools.xml" /> <xi:include href="functions/appimagetools.xml" /> <xi:include href="functions/prefer-remote-fetch.xml" /> <xi:include href="functions/nix-gitignore.xml" /> diff --git a/doc/functions/snaptools.xml b/doc/functions/snaptools.xml new file mode 100644 index 00000000000..a951c36730d --- /dev/null +++ b/doc/functions/snaptools.xml @@ -0,0 +1,74 @@ +<section xmlns="http://docbook.org/ns/docbook" + xmlns:xlink="http://www.w3.org/1999/xlink" + xmlns:xi="http://www.w3.org/2001/XInclude" + xml:id="sec-pkgs-snapTools"> + <title>pkgs.snapTools</title> + + <para> + <varname>pkgs.snapTools</varname> is a set of functions for creating + Snapcraft images. Snap and Snapcraft is not used to perform these operations. + </para> + + <section xml:id="ssec-pkgs-snapTools-makeSnap-signature"> + <title>The makeSnap Function</title> + + <para> + <function>makeSnap</function> takes a single named argument, + <parameter>meta</parameter>. This argument mirrors + <link xlink:href="https://docs.snapcraft.io/snap-format">the upstream + <filename>snap.yaml</filename> format</link> exactly. + </para> + + <para> + The <parameter>base</parameter> should not be be specified, as + <function>makeSnap</function> will force set it. + </para> + + <para> + Currently, <function>makeSnap</function> does not support creating GUI + stubs. + </para> + </section> + + <section xml:id="ssec-pkgs-snapTools-build-a-snap-hello"> + <title>Build a Hello World Snap</title> + + <example xml:id="ex-snapTools-buildSnap-hello"> + <title>Making a Hello World Snap</title> + <para> + The following expression packages GNU Hello as a Snapcraft snap. + </para> +<programlisting><xi:include href="../../pkgs/build-support/snap/example-hello.nix" parse="text" /></programlisting> + <para> + <command>nix-build</command> this expression and install it with + <command>snap install ./result --dangerous</command>. + <command>hello</command> will now be the Snapcraft version of the package. + </para> + </example> + </section> + + <section xml:id="ssec-pkgs-snapTools-build-a-snap-firefox"> + <title>Build a Hello World Snap</title> + + <example xml:id="ex-snapTools-buildSnap-firefox"> + <title>Making a Graphical Snap</title> + <para> + Graphical programs require many more integrations with the host. This + example uses Firefox as an example, because it is one of the most + complicated programs we could package. + </para> +<programlisting><xi:include href="../../pkgs/build-support/snap/example-firefox.nix" parse="text" /></programlisting> + <para> + <command>nix-build</command> this expression and install it with + <command>snap install ./result --dangerous</command>. + <command>nix-example-firefox</command> will now be the Snapcraft version of + the Firefox package. + </para> + <para> + The specific meaning behind plugs can be looked up in the + <link xlink:href="https://docs.snapcraft.io/supported-interfaces">Snapcraft + interface documentation</link>. + </para> + </example> + </section> +</section> diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 8f3a692b684..ef2ab823acc 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -3462,6 +3462,11 @@ github = "mpickering"; name = "Matthew Pickering"; }; + mpoquet = { + email = "millian.poquet@gmail.com"; + github = "mpoquet"; + name = "Millian Poquet"; + }; mpscholten = { email = "marc@mpscholten.de"; github = "mpscholten"; @@ -3482,6 +3487,11 @@ github = "mrkkrp"; name = "Mark Karpov"; }; + mrmebelman = { + email = "burzakovskij@protonmail.com"; + github = "MrMebelMan"; + name = "Vladyslav Burzakovskyy"; + }; mrVanDalo = { email = "contact@ingolf-wagner.de"; github = "mrVanDalo"; diff --git a/nixos/doc/manual/release-notes/rl-1909.xml b/nixos/doc/manual/release-notes/rl-1909.xml index eae84ee1a19..8a65642270c 100644 --- a/nixos/doc/manual/release-notes/rl-1909.xml +++ b/nixos/doc/manual/release-notes/rl-1909.xml @@ -81,45 +81,45 @@ </listitem> <listitem> <para> - The options <option>services.prometheus.alertmanager.user</option> and - <option>services.prometheus.alertmanager.group</option> have been removed - because the alertmanager service is now using systemd's <link - xlink:href="http://0pointer.net/blog/dynamic-users-with-systemd.html"> - DynamicUser mechanism</link> which obviates these options. + The options <option>services.prometheus.alertmanager.user</option> and + <option>services.prometheus.alertmanager.group</option> have been removed + because the alertmanager service is now using systemd's <link + xlink:href="http://0pointer.net/blog/dynamic-users-with-systemd.html"> + DynamicUser mechanism</link> which obviates these options. </para> </listitem> <listitem> <para> - The NetworkManager systemd unit was renamed back from network-manager.service to - NetworkManager.service for better compatibility with other applications expecting this name. - The same applies to ModemManager where modem-manager.service is now called ModemManager.service again. + The NetworkManager systemd unit was renamed back from network-manager.service to + NetworkManager.service for better compatibility with other applications expecting this name. + The same applies to ModemManager where modem-manager.service is now called ModemManager.service again. </para> </listitem> <listitem> <para> - The <option>services.nzbget.configFile</option> and <option>services.nzbget.openFirewall</option> - options were removed as they are managed internally by the nzbget. The - <option>services.nzbget.dataDir</option> option hadn't actually been used by - the module for some time and so was removed as cleanup. + The <option>services.nzbget.configFile</option> and <option>services.nzbget.openFirewall</option> + options were removed as they are managed internally by the nzbget. The + <option>services.nzbget.dataDir</option> option hadn't actually been used by + the module for some time and so was removed as cleanup. </para> </listitem> <listitem> <para> - The <option>services.mysql.pidDir</option> option was removed, as it was only used by the wordpress - apache-httpd service to wait for mysql to have started up. - This can be accomplished by either describing a dependency on mysql.service (preferred) - or waiting for the (hardcoded) <filename>/run/mysqld/mysql.sock</filename> file to appear. + The <option>services.mysql.pidDir</option> option was removed, as it was only used by the wordpress + apache-httpd service to wait for mysql to have started up. + This can be accomplished by either describing a dependency on mysql.service (preferred) + or waiting for the (hardcoded) <filename>/run/mysqld/mysql.sock</filename> file to appear. </para> </listitem> <listitem> <para> - The <option>services.emby.enable</option> module has been removed, see - <option>services.jellyfin.enable</option> instead for a free software fork of Emby. + The <option>services.emby.enable</option> module has been removed, see + <option>services.jellyfin.enable</option> instead for a free software fork of Emby. - See the Jellyfin documentation: - <link xlink:href="https://jellyfin.readthedocs.io/en/latest/administrator-docs/migrate-from-emby/"> - Migrating from Emby to Jellyfin - </link> + See the Jellyfin documentation: + <link xlink:href="https://jellyfin.readthedocs.io/en/latest/administrator-docs/migrate-from-emby/"> + Migrating from Emby to Jellyfin + </link> </para> </listitem> <listitem> @@ -136,50 +136,50 @@ </listitem> <listitem> <para> - Several of the apache subservices have been replaced with full NixOS - modules including LimeSurvey and WordPress. - These modules can be enabled using the <option>services.limesurvey.enable</option> - and <option>services.wordpress.enable</option> options. + Several of the apache subservices have been replaced with full NixOS + modules including LimeSurvey and WordPress. + These modules can be enabled using the <option>services.limesurvey.enable</option> + and <option>services.wordpress.enable</option> options. </para> </listitem> <listitem> - <para> - The option <option>systemd.network.networks.<name>.routes.*.routeConfig.GatewayOnlink</option> - was renamed to <option>systemd.network.networks.<name>.routes.*.routeConfig.GatewayOnLink</option> - (capital <literal>L</literal>). This follows - <link xlink:href="https://github.com/systemd/systemd/commit/9cb8c5593443d24c19e40bfd4fc06d672f8c554c"> - upstreams renaming - </link> of the setting. - </para> + <para> + The option <option>systemd.network.networks.<name>.routes.*.routeConfig.GatewayOnlink</option> + was renamed to <option>systemd.network.networks.<name>.routes.*.routeConfig.GatewayOnLink</option> + (capital <literal>L</literal>). This follows + <link xlink:href="https://github.com/systemd/systemd/commit/9cb8c5593443d24c19e40bfd4fc06d672f8c554c"> + upstreams renaming + </link> of the setting. + </para> </listitem> <listitem> <para> - As of this release the NixOps feature <literal>autoLuks</literal> is deprecated. It no longer works - with our systemd version without manual intervention. + As of this release the NixOps feature <literal>autoLuks</literal> is deprecated. It no longer works + with our systemd version without manual intervention. </para> <para> - Whenever the usage of the module is detected the evaluation will fail with a message - explaining why and how to deal with the situation. + Whenever the usage of the module is detected the evaluation will fail with a message + explaining why and how to deal with the situation. </para> <para> - A new knob named <literal>nixops.enableDeprecatedAutoLuks</literal> - has been introduced to disable the eval failure and to acknowledge the notice was received and read. - If you plan on using the feature please note that it might break with subsequent updates. + A new knob named <literal>nixops.enableDeprecatedAutoLuks</literal> + has been introduced to disable the eval failure and to acknowledge the notice was received and read. + If you plan on using the feature please note that it might break with subsequent updates. </para> <para> - Make sure you set the <literal>_netdev</literal> option for each of the file systems referring to block - devices provided by the autoLuks module. Not doing this might render the system in a - state where it doesn't boot anymore. + Make sure you set the <literal>_netdev</literal> option for each of the file systems referring to block + devices provided by the autoLuks module. Not doing this might render the system in a + state where it doesn't boot anymore. </para> <para> - If you are actively using the <literal>autoLuks</literal> module please let us know in - <link xlink:href="https://github.com/NixOS/nixpkgs/issues/62211">issue #62211</link>. + If you are actively using the <literal>autoLuks</literal> module please let us know in + <link xlink:href="https://github.com/NixOS/nixpkgs/issues/62211">issue #62211</link>. </para> - </listitem> - <listitem> + </listitem> + <listitem> <para> - The setopt declarations will be evaluated at the end of <literal>/etc/zshrc</literal>, so any code in <xref linkend="opt-programs.zsh.interactiveShellInit" />, - <xref linkend="opt-programs.zsh.loginShellInit" /> and <xref linkend="opt-programs.zsh.promptInit" /> may break if it relies on those options being set. + The setopt declarations will be evaluated at the end of <literal>/etc/zshrc</literal>, so any code in <xref linkend="opt-programs.zsh.interactiveShellInit" />, + <xref linkend="opt-programs.zsh.loginShellInit" /> and <xref linkend="opt-programs.zsh.promptInit" /> may break if it relies on those options being set. </para> </listitem> </itemizedlist> @@ -236,36 +236,36 @@ </listitem> <listitem> <para> - The <literal>hunspellDicts.fr-any</literal> dictionary now ships with <literal>fr_FR.{aff,dic}</literal> - which is linked to <literal>fr-toutesvariantes.{aff,dic}</literal>. + The <literal>hunspellDicts.fr-any</literal> dictionary now ships with <literal>fr_FR.{aff,dic}</literal> + which is linked to <literal>fr-toutesvariantes.{aff,dic}</literal>. </para> - </listitem> - <listitem> + </listitem> + <listitem> <para> - The <literal>mysql</literal> service now runs as <literal>mysql</literal> - user. Previously, systemd did execute it as root, and mysql dropped privileges - itself. - This includes <literal>ExecStartPre=</literal> and - <literal>ExecStartPost=</literal> phases. - To accomplish that, runtime and data directory setup was delegated to - RuntimeDirectory and tmpfiles. + The <literal>mysql</literal> service now runs as <literal>mysql</literal> + user. Previously, systemd did execute it as root, and mysql dropped privileges + itself. + This includes <literal>ExecStartPre=</literal> and + <literal>ExecStartPost=</literal> phases. + To accomplish that, runtime and data directory setup was delegated to + RuntimeDirectory and tmpfiles. </para> </listitem> <listitem> <para> - With the upgrade to systemd version 242 the <literal>systemd-timesyncd</literal> - service is no longer using <literal>DynamicUser=yes</literal>. In order for the - upgrade to work we rely on an activation script to move the state from the old - to the new directory. The older directory (prior <literal>19.09</literal>) was - <literal>/var/lib/private/systemd/timesync</literal>. + With the upgrade to systemd version 242 the <literal>systemd-timesyncd</literal> + service is no longer using <literal>DynamicUser=yes</literal>. In order for the + upgrade to work we rely on an activation script to move the state from the old + to the new directory. The older directory (prior <literal>19.09</literal>) was + <literal>/var/lib/private/systemd/timesync</literal>. </para> <para> - As long as the <literal>system.config.stateVersion</literal> is below - <literal>19.09</literal> the state folder will migrated to its proper location - (<literal>/var/lib/systemd/timesync</literal>), if required. + As long as the <literal>system.config.stateVersion</literal> is below + <literal>19.09</literal> the state folder will migrated to its proper location + (<literal>/var/lib/systemd/timesync</literal>), if required. </para> - </listitem> - <listitem> + </listitem> + <listitem> <para> The package <literal>avahi</literal> is now built to look up service definitions from <literal>/etc/avahi/services</literal> instead of its @@ -275,32 +275,36 @@ in the aforementioned directory. See <citerefentry> <refentrytitle>avahi.service</refentrytitle><manvolnum>5</manvolnum> </citerefentry> for more information on custom service definitions. - Since version 0.1.19, <literal>cargo-vendor</literal> honors package - includes that are specified in the <filename>Cargo.toml</filename> - file of Rust crates. <literal>rustPlatform.buildRustPackage</literal> uses - <literal>cargo-vendor</literal> to collect and build dependent crates. - Since this change in <literal>cargo-vendor</literal> changes the set of - vendored files for most Rust packages, the hash that use used to verify - the dependencies, <literal>cargoSha256</literal>, also changes. + </para> + </listitem> + <listitem> + <para> + Since version 0.1.19, <literal>cargo-vendor</literal> honors package + includes that are specified in the <filename>Cargo.toml</filename> + file of Rust crates. <literal>rustPlatform.buildRustPackage</literal> uses + <literal>cargo-vendor</literal> to collect and build dependent crates. + Since this change in <literal>cargo-vendor</literal> changes the set of + vendored files for most Rust packages, the hash that use used to verify + the dependencies, <literal>cargoSha256</literal>, also changes. </para> <para> - The <literal>cargoSha256</literal> hashes of all in-tree derivations that - use <literal>buildRustPackage</literal> have been updated to reflect this - change. However, third-party derivations that use - <literal>buildRustPackage</literal> may have to be updated as well. + The <literal>cargoSha256</literal> hashes of all in-tree derivations that + use <literal>buildRustPackage</literal> have been updated to reflect this + change. However, third-party derivations that use + <literal>buildRustPackage</literal> may have to be updated as well. </para> </listitem> <listitem> <para> - The <literal>consul</literal> package was upgraded past version <literal>1.5</literal>, - so its deprecated legacy UI is no longer available. + The <literal>consul</literal> package was upgraded past version <literal>1.5</literal>, + so its deprecated legacy UI is no longer available. </para> </listitem> <listitem> <para> - The default resample-method for PulseAudio has been changed from the upstream default <literal>speex-float-1</literal> - to <literal>speex-float-5</literal>. Be aware that low-powered ARM-based and MIPS-based boards will struggle with this - so you'll need to set <option>hardware.pulseaudio.daemon.config.resample-method</option> back to <literal>speex-float-1</literal>. + The default resample-method for PulseAudio has been changed from the upstream default <literal>speex-float-1</literal> + to <literal>speex-float-5</literal>. Be aware that low-powered ARM-based and MIPS-based boards will struggle with this + so you'll need to set <option>hardware.pulseaudio.daemon.config.resample-method</option> back to <literal>speex-float-1</literal>. </para> </listitem> <listitem> diff --git a/nixos/modules/config/networking.nix b/nixos/modules/config/networking.nix index 8b352dad472..eab4e73e19a 100644 --- a/nixos/modules/config/networking.nix +++ b/nixos/modules/config/networking.nix @@ -233,7 +233,7 @@ in oneToString = set: ip: ip + " " + concatStringsSep " " set.${ip}; allToString = set: concatMapStringsSep "\n" (oneToString set) (attrNames set); in '' - ${allToString cfg.hosts} + ${allToString (filterAttrs (_: v: v != []) cfg.hosts)} ${cfg.extraHosts} ''; diff --git a/nixos/modules/hardware/ksm.nix b/nixos/modules/hardware/ksm.nix index d6ac69b5d65..99d46c25236 100644 --- a/nixos/modules/hardware/ksm.nix +++ b/nixos/modules/hardware/ksm.nix @@ -1,9 +1,24 @@ { config, lib, ... }: -{ - options.hardware.enableKSM = lib.mkEnableOption "Kernel Same-Page Merging"; +with lib; - config = lib.mkIf config.hardware.enableKSM { +let + cfg = config.hardware.ksm; + +in { + options.hardware.ksm = { + enable = mkEnableOption "Kernel Same-Page Merging"; + sleep = mkOption { + type = types.nullOr types.int; + default = null; + description = '' + How many milliseconds ksmd should sleep between scans. + Setting it to <literal>null</literal> uses the kernel's default time. + ''; + }; + }; + + config = mkIf cfg.enable { systemd.services.enable-ksm = { description = "Enable Kernel Same-Page Merging"; wantedBy = [ "multi-user.target" ]; @@ -11,6 +26,7 @@ script = '' if [ -e /sys/kernel/mm/ksm ]; then echo 1 > /sys/kernel/mm/ksm/run + ${optionalString (cfg.sleep != null) ''echo ${toString cfg.sleep} > /sys/kernel/mm/ksm/sleep_millisecs''} fi ''; }; diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix index c4ee28a9593..1d1995eda25 100644 --- a/nixos/modules/module-list.nix +++ b/nixos/modules/module-list.nix @@ -492,6 +492,7 @@ ./services/monitoring/heapster.nix ./services/monitoring/incron.nix ./services/monitoring/kapacitor.nix + ./services/monitoring/loki.nix ./services/monitoring/longview.nix ./services/monitoring/monit.nix ./services/monitoring/munin.nix diff --git a/nixos/modules/rename.nix b/nixos/modules/rename.nix index 7fa76dc0c68..1b77a895d71 100644 --- a/nixos/modules/rename.nix +++ b/nixos/modules/rename.nix @@ -241,6 +241,9 @@ with lib; # binfmt (mkRenamedOptionModule [ "boot" "binfmtMiscRegistrations" ] [ "boot" "binfmt" "registrations" ]) + # KSM + (mkRenamedOptionModule [ "hardware" "enableKSM" ] [ "hardware" "ksm" "enable" ]) + ] ++ (flip map [ "blackboxExporter" "collectdExporter" "fritzboxExporter" "jsonExporter" "minioExporter" "nginxExporter" "nodeExporter" "snmpExporter" "unifiExporter" "varnishExporter" ] diff --git a/nixos/modules/services/logging/graylog.nix b/nixos/modules/services/logging/graylog.nix index ee566825498..c8c4a9ff06d 100644 --- a/nixos/modules/services/logging/graylog.nix +++ b/nixos/modules/services/logging/graylog.nix @@ -108,7 +108,7 @@ in }; extraConfig = mkOption { - type = types.str; + type = types.lines; default = ""; description = "Any other configuration options you might want to add"; }; diff --git a/nixos/modules/services/misc/jackett.nix b/nixos/modules/services/misc/jackett.nix index a07f20e5c24..f2dc6635df9 100644 --- a/nixos/modules/services/misc/jackett.nix +++ b/nixos/modules/services/misc/jackett.nix @@ -34,6 +34,13 @@ in default = "jackett"; description = "Group under which Jackett runs."; }; + + package = mkOption { + type = types.package; + default = pkgs.jackett; + defaultText = "pkgs.jackett"; + description = "Jackett package to use."; + }; }; }; @@ -51,7 +58,7 @@ in Type = "simple"; User = cfg.user; Group = cfg.group; - ExecStart = "${pkgs.jackett}/bin/Jackett --NoUpdates --DataFolder '${cfg.dataDir}'"; + ExecStart = "${cfg.package}/bin/Jackett --NoUpdates --DataFolder '${cfg.dataDir}'"; Restart = "on-failure"; }; }; diff --git a/nixos/modules/services/misc/lidarr.nix b/nixos/modules/services/misc/lidarr.nix index 4c37bd74f15..40755c16217 100644 --- a/nixos/modules/services/misc/lidarr.nix +++ b/nixos/modules/services/misc/lidarr.nix @@ -68,6 +68,7 @@ in users.users = mkIf (cfg.user == "lidarr") { lidarr = { group = cfg.group; + home = "/var/lib/lidarr"; uid = config.ids.uids.lidarr; }; }; diff --git a/nixos/modules/services/misc/zoneminder.nix b/nixos/modules/services/misc/zoneminder.nix index 8d58c2b37c8..cf56ae89b39 100644 --- a/nixos/modules/services/misc/zoneminder.nix +++ b/nixos/modules/services/misc/zoneminder.nix @@ -262,7 +262,7 @@ in { fastcgi_pass ${fcgi.socketType}:${fcgi.socketAddress}; } - location /cache { + location /cache/ { alias /var/cache/${dirName}; } diff --git a/nixos/modules/services/monitoring/loki.nix b/nixos/modules/services/monitoring/loki.nix new file mode 100644 index 00000000000..4d11360d07e --- /dev/null +++ b/nixos/modules/services/monitoring/loki.nix @@ -0,0 +1,112 @@ +{ config, lib, pkgs, ... }: + +let + inherit (lib) escapeShellArgs literalExample mkEnableOption mkIf mkOption types; + + cfg = config.services.loki; + + prettyJSON = conf: + pkgs.runCommand "loki-config.json" { } '' + echo '${builtins.toJSON conf}' | ${pkgs.jq}/bin/jq 'del(._module)' > $out + ''; + +in { + options.services.loki = { + enable = mkEnableOption "loki"; + + user = mkOption { + type = types.str; + default = "loki"; + description = '' + User under which the Loki service runs. + ''; + }; + + group = mkOption { + type = types.str; + default = "loki"; + description = '' + Group under which the Loki service runs. + ''; + }; + + dataDir = mkOption { + type = types.path; + default = "/var/lib/loki"; + description = '' + Specify the directory for Loki. + ''; + }; + + configuration = mkOption { + type = types.attrs; + default = {}; + description = '' + Specify the configuration for Loki in Nix. + ''; + }; + + configFile = mkOption { + type = types.nullOr types.path; + default = null; + description = '' + Specify a configuration file that Loki should use. + ''; + }; + + extraFlags = mkOption { + type = types.listOf types.str; + default = []; + example = literalExample [ "--server.http-listen-port=3101" ]; + description = '' + Specify a list of additional command line flags, + which get escaped and are then passed to Loki. + ''; + }; + }; + + config = mkIf cfg.enable { + assertions = [{ + assertion = ( + (cfg.configuration == {} -> cfg.configFile != null) && + (cfg.configFile != null -> cfg.configuration == {}) + ); + message = '' + Please specify either + 'services.loki.configuration' or + 'services.loki.configFile'. + ''; + }]; + + users.groups.${cfg.group} = { }; + users.users.${cfg.user} = { + description = "Loki Service User"; + group = cfg.group; + home = cfg.dataDir; + createHome = true; + isSystemUser = true; + }; + + systemd.services.loki = { + description = "Loki Service Daemon"; + wantedBy = [ "multi-user.target" ]; + + serviceConfig = let + conf = if cfg.configFile == null + then prettyJSON cfg.configuration + else cfg.configFile; + in + { + ExecStart = "${pkgs.grafana-loki}/bin/loki --config.file=${conf} ${escapeShellArgs cfg.extraFlags}"; + User = cfg.user; + Restart = "always"; + PrivateTmp = true; + ProtectHome = true; + ProtectSystem = "full"; + DecvicePolicy = "closed"; + NoNewPrivileges = true; + WorkingDirectory = cfg.dataDir; + }; + }; + }; +} diff --git a/nixos/modules/services/monitoring/netdata.nix b/nixos/modules/services/monitoring/netdata.nix index f264b6dd456..f9b7550af23 100644 --- a/nixos/modules/services/monitoring/netdata.nix +++ b/nixos/modules/services/monitoring/netdata.nix @@ -141,11 +141,18 @@ in { path = (with pkgs; [ gawk curl ]) ++ lib.optional cfg.python.enable (pkgs.python3.withPackages cfg.python.extraPackages); serviceConfig = { - User = cfg.user; - Group = cfg.group; Environment="PYTHONPATH=${pkgs.netdata}/libexec/netdata/python.d/python_modules"; - ExecStart = "${pkgs.netdata}/bin/netdata -D -c ${configFile}"; + ExecStart = "${pkgs.netdata}/bin/netdata -P /run/netdata/netdata.pid -D -c ${configFile}"; + ExecReload = "${pkgs.utillinux}/bin/kill -s HUP -s USR1 -s USR2 $MAINPID"; TimeoutStopSec = 60; + # User and group + User = cfg.user; + Group = cfg.group; + # Runtime directory and mode + RuntimeDirectory = "netdata"; + RuntimeDirectoryMode = "0755"; + # Performance + LimitNOFILE = "30000"; }; }; @@ -165,6 +172,11 @@ in { permissions = "u+rx,g+rx,o-rwx"; }; + security.pam.loginLimits = [ + { domain = "netdata"; type = "soft"; item = "nofile"; value = "10000"; } + { domain = "netdata"; type = "hard"; item = "nofile"; value = "30000"; } + ]; + users.users = optional (cfg.user == defaultUser) { name = defaultUser; }; diff --git a/nixos/modules/tasks/filesystems/zfs.nix b/nixos/modules/tasks/filesystems/zfs.nix index 22578b01260..f7f07bad952 100644 --- a/nixos/modules/tasks/filesystems/zfs.nix +++ b/nixos/modules/tasks/filesystems/zfs.nix @@ -179,10 +179,9 @@ in requestEncryptionCredentials = mkOption { type = types.bool; - default = config.boot.zfs.enableUnstable; + default = true; description = '' Request encryption keys or passwords for all encrypted datasets on import. - Dataset encryption is only supported in zfsUnstable at the moment. For root pools the encryption key can be supplied via both an interactive prompt (keylocation=prompt) and from a file (keylocation=file://). Note that for data pools the encryption key can diff --git a/nixos/modules/virtualisation/kvmgt.nix b/nixos/modules/virtualisation/kvmgt.nix index bfcf51d09c4..289e26e1703 100644 --- a/nixos/modules/virtualisation/kvmgt.nix +++ b/nixos/modules/virtualisation/kvmgt.nix @@ -4,13 +4,16 @@ with lib; let cfg = config.virtualisation.kvmgt; + kernelPackages = config.boot.kernelPackages; + vgpuOptions = { uuid = mkOption { type = types.string; description = "UUID of VGPU device. You can generate one with <package>libossp_uuid</package>."; }; }; + in { options = { virtualisation.kvmgt = { @@ -45,7 +48,13 @@ in { assertion = versionAtLeast kernelPackages.kernel.version "4.16"; message = "KVMGT is not properly supported for kernels older than 4.16"; }; - boot.kernelParams = [ "i915.enable_gvt=1" ]; + + boot.kernelModules = [ "kvmgt" ]; + + boot.extraModprobeConfig = '' + options i915 enable_gvt=1 + ''; + systemd.paths = mapAttrs' (name: value: nameValuePair "kvmgt-${name}" { description = "KVMGT VGPU ${name} path"; @@ -55,6 +64,7 @@ in { }; } ) cfg.vgpus; + systemd.services = mapAttrs' (name: value: nameValuePair "kvmgt-${name}" { description = "KVMGT VGPU ${name}"; diff --git a/nixos/tests/all-tests.nix b/nixos/tests/all-tests.nix index 359f62751b9..2f527bfa090 100644 --- a/nixos/tests/all-tests.nix +++ b/nixos/tests/all-tests.nix @@ -139,6 +139,7 @@ in #lightdm = handleTest ./lightdm.nix {}; limesurvey = handleTest ./limesurvey.nix {}; login = handleTest ./login.nix {}; + loki = handleTest ./loki.nix {}; #logstash = handleTest ./logstash.nix {}; mailcatcher = handleTest ./mailcatcher.nix {}; mathics = handleTest ./mathics.nix {}; diff --git a/nixos/tests/loki.nix b/nixos/tests/loki.nix new file mode 100644 index 00000000000..9c3058d02f8 --- /dev/null +++ b/nixos/tests/loki.nix @@ -0,0 +1,37 @@ +import ./make-test.nix ({ lib, pkgs, ... }: + +{ + name = "loki"; + + meta = with lib.maintainers; { + maintainers = [ willibutz ]; + }; + + machine = { ... }: { + services.loki = { + enable = true; + configFile = "${pkgs.grafana-loki.src}/cmd/loki/loki-local-config.yaml"; + }; + systemd.services.promtail = { + description = "Promtail service for Loki test"; + wantedBy = [ "multi-user.target" ]; + + serviceConfig = { + ExecStart = '' + ${pkgs.grafana-loki}/bin/promtail --config.file ${pkgs.grafana-loki.src}/cmd/promtail/promtail-local-config.yaml + ''; + DynamicUser = true; + }; + }; + }; + + testScript = '' + $machine->start; + $machine->waitForUnit("loki.service"); + $machine->waitForUnit("promtail.service"); + $machine->waitForOpenPort(3100); + $machine->waitForOpenPort(9080); + $machine->succeed("echo 'Loki Ingestion Test' > /var/log/testlog"); + $machine->waitUntilSucceeds("${pkgs.grafana-loki}/bin/logcli --addr='http://localhost:3100' query --no-labels '{job=\"varlogs\",filename=\"/var/log/testlog\"}' | grep -q 'Loki Ingestion Test'"); + ''; +}) diff --git a/pkgs/applications/editors/emacs/site-start.el b/pkgs/applications/editors/emacs/site-start.el index 34addc33a59..de4708b8890 100644 --- a/pkgs/applications/editors/emacs/site-start.el +++ b/pkgs/applications/editors/emacs/site-start.el @@ -1,6 +1,7 @@ +;; -*- lexical-binding: t; -*- (defun nix--profile-paths () - "Returns a list of all paths in the NIX_PROFILES environment -variable, ordered from more-specific (the user profile) to the + "Return a list of all paths in NIX_PROFILES. +The list is ordered from more-specific (the user profile) to the least specific (the system profile)" (reverse (split-string (or (getenv "NIX_PROFILES") "")))) @@ -23,6 +24,7 @@ least specific (the system profile)" ;;; Make `woman' find the man pages +(defvar woman-manpath) (eval-after-load 'woman '(setq woman-manpath (append (mapcar (lambda (x) (concat x "/share/man/")) @@ -30,6 +32,7 @@ least specific (the system profile)" woman-manpath))) ;;; Make tramp work for remote NixOS machines +(defvar tramp-remote-path) (eval-after-load 'tramp-sh ;; TODO: We should also add the other `NIX_PROFILES' to this path. ;; However, these are user-specific, so we would need to discover @@ -42,6 +45,7 @@ least specific (the system profile)" ;;; the current file: ;;; from: /nix/store/<hash>-emacs-<version>/share/emacs/site-lisp/site-start.el ;;; to: /nix/store/<hash>-emacs-<version>/share/emacs/<version>/src/ +(defvar find-function-C-source-directory) (let ((emacs (file-name-directory ; .../emacs/ (directory-file-name ; .../emacs/site-lisp diff --git a/pkgs/applications/editors/neovim/default.nix b/pkgs/applications/editors/neovim/default.nix index 353d383e017..0d0877015ee 100644 --- a/pkgs/applications/editors/neovim/default.nix +++ b/pkgs/applications/editors/neovim/default.nix @@ -21,13 +21,13 @@ let in stdenv.mkDerivation rec { name = "neovim-unwrapped-${version}"; - version = "0.3.7"; + version = "0.3.8"; src = fetchFromGitHub { owner = "neovim"; repo = "neovim"; rev = "v${version}"; - sha256 = "1j6w5jvq5v7kf7diad91qs1acr427nidnk9s24yyrz0hwdd1c2lh"; + sha256 = "15flii3p4g9f65xy9jpkb8liajrvhm5ck4j39z6d6b1nkxr6ghwb"; }; patches = [ diff --git a/pkgs/applications/graphics/drawio/default.nix b/pkgs/applications/graphics/drawio/default.nix new file mode 100644 index 00000000000..70cf1c149ab --- /dev/null +++ b/pkgs/applications/graphics/drawio/default.nix @@ -0,0 +1,94 @@ +{ stdenv, lib, fetchurl, rpmextract, autoPatchelfHook, wrapGAppsHook + +# Dynamic libraries +, alsaLib, atk, at-spi2-atk, at-spi2-core, cairo, dbus, cups, expat +, gdk_pixbuf, glib, gtk3, libX11, libXScrnSaver, libXcomposite, libXcursor +, libXdamage, libXext, libXfixes, libXi, libXrandr, libXrender, libXtst +, libxcb, libuuid, nspr, nss, pango + +, systemd +}: + +stdenv.mkDerivation rec { + pname = "drawio"; + version = "10.8.0"; + + src = fetchurl { + url = "https://github.com/jgraph/drawio-desktop/releases/download/v${version}/draw.io-x86_64-${version}.rpm"; + sha256 = "0c5wymzhbp72x0yhvw7vb4akkdvj97npl9kglk79vqjbzfn5di9k"; + }; + + nativeBuildInputs = [ + autoPatchelfHook + rpmextract + wrapGAppsHook + ]; + + buildInputs = [ + alsaLib + atk + at-spi2-atk + at-spi2-core + cairo + cups + dbus + expat + gdk_pixbuf + glib + gtk3 + libX11 + libXScrnSaver + libXcomposite + libXcursor + libXdamage + libXext + libXfixes + libXi + libXrandr + libXrender + libXtst + libxcb + libuuid + nspr + nss + pango + systemd + ]; + + runtimeDependencies = [ + systemd.lib + ]; + + dontBuild = true; + dontConfigure = true; + + unpackPhase = "rpmextract ${src}"; + + installPhase = '' + mkdir -p $out/share + cp -r opt/draw.io $out/share/ + + # Application icon + mkdir -p $out/share/icons/hicolor + cp -r usr/share/icons/hicolor/0x0 $out/share/icons/hicolor/1024x1024 + + # XDG desktop item + cp -r usr/share/applications $out/share/applications + + # Symlink wrapper + mkdir -p $out/bin + ln -s $out/share/draw.io/draw.io $out/bin/draw.io + + # Update binary path + substituteInPlace $out/share/applications/draw.io.desktop \ + --replace /opt/draw.io/draw.io $out/bin/draw.io + ''; + + meta = with stdenv.lib; { + description = "A desktop application for creating diagrams"; + homepage = https://about.draw.io/; + license = licenses.asl20; + maintainers = with maintainers; [ danieldk ]; + platforms = [ "x86_64-linux" ]; + }; +} diff --git a/pkgs/applications/graphics/graphicsmagick/1.3.32-darwin-png-strlcat-fix.patch b/pkgs/applications/graphics/graphicsmagick/1.3.32-darwin-png-strlcat-fix.patch new file mode 100644 index 00000000000..91eacecbf8c --- /dev/null +++ b/pkgs/applications/graphics/graphicsmagick/1.3.32-darwin-png-strlcat-fix.patch @@ -0,0 +1,42 @@ +# reduced version of commit f30492f40f78d867b43422215057dd21de4ba447 +# from upstream hg repository: +RegisterPNGImage(): Pass correct size value to strlcat(). + +diff -r 95c4711e8bee -r f30492f40f78 coders/png.c +--- a/coders/png.c Mon Jun 17 07:24:30 2019 -0500 ++++ b/coders/png.c Mon Jun 17 18:54:43 2019 -0500 +@@ -6427,26 +6427,26 @@ + + *version='\0'; + #if defined(PNG_LIBPNG_VER_STRING) +- (void) strlcat(version,"libpng ",MaxTextExtent); +- (void) strlcat(version,PNG_LIBPNG_VER_STRING,MaxTextExtent); ++ (void) strlcat(version,"libpng ",sizeof(version)); ++ (void) strlcat(version,PNG_LIBPNG_VER_STRING,sizeof(version)); + #if (PNG_LIBPNG_VER > 10005) + if (LocaleCompare(PNG_LIBPNG_VER_STRING,png_get_header_ver(NULL)) != 0) + { +- (void) strlcat(version,",",MaxTextExtent); +- (void) strlcat(version,png_get_libpng_ver(NULL),MaxTextExtent); ++ (void) strlcat(version,",",sizeof(version)); ++ (void) strlcat(version,png_get_libpng_ver(NULL),sizeof(version)); + } + #endif + #endif + + #if defined(ZLIB_VERSION) + if (*version != '\0') +- (void) strlcat(version,", ",MaxTextExtent); +- (void) strlcat(version,"zlib ",MaxTextExtent); +- (void) strlcat(version,ZLIB_VERSION,MaxTextExtent); ++ (void) strlcat(version,", ",sizeof(version)); ++ (void) strlcat(version,"zlib ",sizeof(version)); ++ (void) strlcat(version,ZLIB_VERSION,sizeof(version)); + if (LocaleCompare(ZLIB_VERSION,zlib_version) != 0) + { +- (void) strlcat(version,",",MaxTextExtent); +- (void) strlcat(version,zlib_version,MaxTextExtent); ++ (void) strlcat(version,",",sizeof(version)); ++ (void) strlcat(version,zlib_version,sizeof(version)); + } + #endif diff --git a/pkgs/applications/graphics/graphicsmagick/default.nix b/pkgs/applications/graphics/graphicsmagick/default.nix index c93b4fe958d..84d1450da82 100644 --- a/pkgs/applications/graphics/graphicsmagick/default.nix +++ b/pkgs/applications/graphics/graphicsmagick/default.nix @@ -4,15 +4,16 @@ stdenv.mkDerivation rec { name = "graphicsmagick-${version}"; - version = "1.3.31"; + version = "1.3.32"; src = fetchurl { url = "mirror://sourceforge/graphicsmagick/GraphicsMagick-${version}.tar.xz"; - sha256 = "0y22740f25qxsqqqg26xqlfp920dm57b7hrgaqmx7azksrcvnsq9"; + sha256 = "1qclp9i31idpcbbqswmnq2q11lmv0a7cvdb1y72xcky8sshaahmq"; }; patches = [ ./disable-popen.patch + ./1.3.32-darwin-png-strlcat-fix.patch ]; configureFlags = [ diff --git a/pkgs/applications/misc/dunst/default.nix b/pkgs/applications/misc/dunst/default.nix index 309d4d54ae5..35073db2ae1 100644 --- a/pkgs/applications/misc/dunst/default.nix +++ b/pkgs/applications/misc/dunst/default.nix @@ -1,18 +1,18 @@ -{ stdenv, fetchFromGitHub, makeWrapper +{ stdenv, lib, fetchFromGitHub, makeWrapper , pkgconfig, which, perl, libXrandr , cairo, dbus, systemd, gdk_pixbuf, glib, libX11, libXScrnSaver , libXinerama, libnotify, pango, xorgproto, librsvg, dunstify ? false }: stdenv.mkDerivation rec { - name = "dunst-${version}"; - version = "1.4.0"; + pname = "dunst"; + version = "1.4.1"; src = fetchFromGitHub { owner = "dunst-project"; repo = "dunst"; rev = "v${version}"; - sha256 = "1rwbylygd88r61yrxc7ckg9svgq8b1i2falr0mk9sabqxzn9050s"; + sha256 = "0xjj1f2jr1ja5grj6wrx5jjz1sx5fpqnvkw7nqi4452j3nc4p4l2"; }; nativeBuildInputs = [ perl pkgconfig which systemd makeWrapper ]; @@ -33,19 +33,19 @@ stdenv.mkDerivation rec { buildFlags = if dunstify then [ "dunstify" ] else []; - postInstall = stdenv.lib.optionalString dunstify '' + postInstall = lib.optionalString dunstify '' install -Dm755 dunstify $out/bin '' + '' wrapProgram $out/bin/dunst \ --set GDK_PIXBUF_MODULE_FILE "$GDK_PIXBUF_MODULE_FILE" ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Lightweight and customizable notification daemon"; - homepage = https://dunst-project.org/; + homepage = "https://dunst-project.org/"; license = licenses.bsd3; # NOTE: 'unix' or even 'all' COULD work too, I'm not sure platforms = platforms.linux; - maintainers = [ maintainers.domenkozar ]; + maintainers = with maintainers; [ domenkozar ]; }; } diff --git a/pkgs/applications/misc/octoprint/default.nix b/pkgs/applications/misc/octoprint/default.nix index 1eb1a1b93fb..c0bacc2c50d 100644 --- a/pkgs/applications/misc/octoprint/default.nix +++ b/pkgs/applications/misc/octoprint/default.nix @@ -15,7 +15,6 @@ let packageOverrides = lib.foldr lib.composeExtensions (self: super: { }) ([ (mkOverride "flask" "0.10.1" "0wrkavjdjndknhp8ya8j850jq7a1cli4g5a93mg8nh1xz2gq50sc") (mkOverride "flask_login" "0.2.11" "1rg3rsjs1gwi2pw6vr9jmhaqm9b3vc9c4hfcsvp4y8agbh7g3mc3") - (mkOverride "sarge" "0.1.4" "08s8896973bz1gg0pkr592w6g4p6v47bkfvws5i91p9xf8b35yar") (mkOverride "tornado" "4.5.3" "02jzd23l4r6fswmwxaica9ldlyc2p6q8dk6dyff7j58fmdzf853d") # Octoprint holds back jinja2 to 2.8.1 due to breaking changes. diff --git a/pkgs/applications/misc/octoprint/plugins.nix b/pkgs/applications/misc/octoprint/plugins.nix index 1aca5164f6c..d8179e1b402 100644 --- a/pkgs/applications/misc/octoprint/plugins.nix +++ b/pkgs/applications/misc/octoprint/plugins.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, octoprint, python2Packages }: +{ stdenv, fetchFromGitHub, octoprint, python2Packages, marlin-calc }: let buildPlugin = args: python2Packages.buildPythonPackage (args // { @@ -123,6 +123,74 @@ let }; }; + touchui = buildPlugin rec { + pname = "TouchUI"; + version = "0.3.13"; + + src = fetchFromGitHub { + owner = "BillyBlaze"; + repo = "OctoPrint-${pname}"; + rev = version; + sha256 = "0qk12ysabdzy6cna3l4f8v3qcnppppwxxsjx2i0xn1nd0cv6yzwh"; + }; + + meta = with stdenv.lib; { + description = "Touch friendly interface for a small TFT module or phone for OctoPrint"; + homepage = "https://github.com/BillyBlaze/OctoPrint-TouchUI"; + license = licenses.agpl3; + maintainers = with maintainers; [ gebner ]; + }; + }; + + psucontrol = buildPlugin rec { + pname = "PSUControl"; + version = "0.1.8"; + + src = fetchFromGitHub { + owner = "kantlivelong"; + repo = "OctoPrint-${pname}"; + rev = version; + sha256 = "0aj38d7b7d5pzmzq841pip18cpg18wy2vrxq2nd13875597y54b8"; + }; + + preConfigure = '' + # optional; RPi.GPIO is broken on vanilla kernels + sed /RPi.GPIO/d -i requirements.txt + ''; + + meta = with stdenv.lib; { + description = "OctoPrint plugin to control ATX/AUX power supply"; + homepage = "https://github.com/kantlivelong/OctoPrint-PSUControl"; + license = licenses.agpl3; + maintainers = with maintainers; [ gebner ]; + }; + }; + + printtimegenius = buildPlugin rec { + pname = "PrintTimeGenius"; + version = "1.3.1"; + + src = fetchFromGitHub { + owner = "eyal0"; + repo = "OctoPrint-${pname}"; + rev = version; + sha256 = "0ijv1nxmikv06a00hqqkqri6wnydqh6lwcx07pmvw6jy706jhy28"; + }; + + preConfigure = '' + # PrintTimeGenius ships with marlin-calc binaries for multiple architectures + rm */analyzers/marlin-calc* + sed 's@"{}.{}".format(binary_base_name, machine)@"${marlin-calc}/bin/marlin-calc"@' -i */analyzers/analyze_progress.py + ''; + + meta = with stdenv.lib; { + description = "Better print time estimation for OctoPrint"; + homepage = "https://github.com/eyal0/OctoPrint-PrintTimeGenius"; + license = licenses.agpl3; + maintainers = with maintainers; [ gebner ]; + }; + }; + }; in self diff --git a/pkgs/applications/misc/rofi/default.nix b/pkgs/applications/misc/rofi/default.nix index 0cf297b1b5d..94381d4f6f9 100644 --- a/pkgs/applications/misc/rofi/default.nix +++ b/pkgs/applications/misc/rofi/default.nix @@ -1,15 +1,16 @@ -{ stdenv, fetchurl, autoreconfHook, pkgconfig, libxkbcommon, pango, which, git +{ stdenv, lib, fetchurl +, autoreconfHook, pkgconfig, libxkbcommon, pango, which, git , cairo, libxcb, xcbutil, xcbutilwm, xcbutilxrm, libstartup_notification , bison, flex, librsvg, check }: stdenv.mkDerivation rec { - version = "1.5.3"; - name = "rofi-unwrapped-${version}"; + pname = "rofi-unwrapped"; + version = "1.5.4"; src = fetchurl { - url = "https://github.com/DaveDavenport/rofi/releases/download/${version}/rofi-${version}.tar.gz"; - sha256 = "1mskknfnpgmaghplwcyc44qc8swb1f9qiyi67fz9i77jijjpj1lx"; + url = "https://github.com/davatorium/rofi/releases/download/${version}/rofi-${version}.tar.gz"; + sha256 = "1g1170zmh5v7slnm1sm2d08jgz6icikf8rm17apm1bjzzyw1lhk7"; }; preConfigure = '' @@ -22,11 +23,12 @@ stdenv.mkDerivation rec { buildInputs = [ libxkbcommon pango cairo git bison flex librsvg check libstartup_notification libxcb xcbutil xcbutilwm xcbutilxrm which ]; + doCheck = false; - meta = with stdenv.lib; { + meta = with lib; { description = "Window switcher, run dialog and dmenu replacement"; - homepage = https://github.com/davatorium/rofi; + homepage = "https://github.com/davatorium/rofi"; license = licenses.mit; maintainers = with maintainers; [ mbakke ma27 ]; platforms = with platforms; linux; diff --git a/pkgs/applications/misc/rofi/wrapper.nix b/pkgs/applications/misc/rofi/wrapper.nix index c2384f56faa..8c24d27f075 100644 --- a/pkgs/applications/misc/rofi/wrapper.nix +++ b/pkgs/applications/misc/rofi/wrapper.nix @@ -2,7 +2,9 @@ if theme == null then rofi-unwrapped else stdenv.mkDerivation { - name = "rofi-${rofi-unwrapped.version}"; + pname = "rofi"; + version = rofi-unwrapped.version; + buildInputs = [ makeWrapper ]; preferLocalBuild = true; passthru.unwrapped = rofi-unwrapped; diff --git a/pkgs/applications/networking/browsers/firefox/wrapper.nix b/pkgs/applications/networking/browsers/firefox/wrapper.nix index d99c2a40b08..bc167833594 100644 --- a/pkgs/applications/networking/browsers/firefox/wrapper.nix +++ b/pkgs/applications/networking/browsers/firefox/wrapper.nix @@ -28,12 +28,12 @@ let , extraPlugins ? [] , extraNativeMessagingHosts ? [] , gdkWayland ? false + , cfg ? config.${browserName} or {} }: assert gdkWayland -> (browser ? gtk3); # Can only use the wayland backend if gtk3 is being used let - cfg = config.${browserName} or {}; enableAdobeFlash = cfg.enableAdobeFlash or false; ffmpegSupport = browser.ffmpegSupport or false; gssSupport = browser.gssSupport or false; diff --git a/pkgs/applications/networking/browsers/opera/default.nix b/pkgs/applications/networking/browsers/opera/default.nix index 215bf07d4d5..732e020604a 100644 --- a/pkgs/applications/networking/browsers/opera/default.nix +++ b/pkgs/applications/networking/browsers/opera/default.nix @@ -13,6 +13,7 @@ , glib , gnome2 , gtk3 +, lib , libX11 , libxcb , libXScrnSaver @@ -39,10 +40,9 @@ let - mirror = https://get.geo.opera.com/pub/opera/desktop; - version = "60.0.3255.170"; + mirror = "https://get.geo.opera.com/pub/opera/desktop"; - rpath = stdenv.lib.makeLibraryPath [ + rpath = lib.makeLibraryPath [ # These provide shared libraries loaded when starting. If one is missing, # an error is shown in stderr. @@ -90,13 +90,14 @@ let at-spi2-core ]; -in stdenv.mkDerivation { +in stdenv.mkDerivation rec { - name = "opera-${version}"; + pname = "opera"; + version = "62.0.3331.43"; src = fetchurl { - url = "${mirror}/${version}/linux/opera-stable_${version}_amd64.deb"; - sha256 = "04bcy9qhrhps3712k229yn58ak2j93wcp613zd6l2zxb8a286991"; + url = "${mirror}/${version}/linux/${pname}-stable_${version}_amd64.deb"; + sha256 = "0zylg32zn6blkgy4bwmjzc26i712lwakahvrd24ncpfa8805f7x7"; }; unpackCmd = "${dpkg}/bin/dpkg-deb -x $curSrc ."; @@ -118,10 +119,10 @@ in stdenv.mkDerivation { done ''; - meta = { - homepage = https://www.opera.com; + meta = with lib; { + homepage = "https://www.opera.com"; description = "Web browser"; platforms = [ "x86_64-linux" ]; - license = stdenv.lib.licenses.unfree; + license = licenses.unfree; }; } diff --git a/pkgs/applications/networking/feedreaders/newsboat/default.nix b/pkgs/applications/networking/feedreaders/newsboat/default.nix index dbd49014493..2795ac4e46e 100644 --- a/pkgs/applications/networking/feedreaders/newsboat/default.nix +++ b/pkgs/applications/networking/feedreaders/newsboat/default.nix @@ -3,14 +3,14 @@ rustPlatform.buildRustPackage rec { name = "newsboat-${version}"; - version = "2.15"; + version = "2.16.1"; src = fetchurl { url = "https://newsboat.org/releases/${version}/${name}.tar.xz"; - sha256 = "1dqdcp34jmphqf3d8ik0xdhg0s66nd5rky0y8y591nidq29wws6s"; + sha256 = "0lxdsfcwa4byhfnn0gv34w3rr531f4nfqgi8j4qqmh3gncbwh8s0"; }; - cargoSha256 = "06r682vvr8m7gl443qx9ncmq8dpmdxcls68f29d0mmf7llddy5sa"; + cargoSha256 = "0ck2dgfk4fay4cjl66wqkbnq4rqrd717jl63l1mvqmvad9i19igm"; postPatch = '' substituteInPlace Makefile --replace "|| true" "" @@ -20,7 +20,7 @@ rustPlatform.buildRustPackage rec { ''; nativeBuildInputs = [ pkgconfig asciidoc docbook_xml_dtd_45 libxslt docbook_xsl ] - ++ stdenv.lib.optional stdenv.isDarwin [ makeWrapper libiconv ]; + ++ stdenv.lib.optionals stdenv.isDarwin [ makeWrapper libiconv ]; buildInputs = [ stfl sqlite curl gettext libxml2 json_c ncurses ] ++ stdenv.lib.optional stdenv.isDarwin Security; @@ -29,7 +29,8 @@ rustPlatform.buildRustPackage rec { make ''; - NIX_CFLAGS_COMPILE = "-Wno-error=sign-compare"; + NIX_CFLAGS_COMPILE = [ "-Wno-error=sign-compare" ] + ++ stdenv.lib.optional stdenv.isDarwin "-Wno-error=format-security"; doCheck = true; @@ -48,7 +49,7 @@ rustPlatform.buildRustPackage rec { meta = with stdenv.lib; { homepage = https://newsboat.org/; - description = "A fork of Newsbeuter, an RSS/Atom feed reader for the text console."; + description = "A fork of Newsbeuter, an RSS/Atom feed reader for the text console"; maintainers = with maintainers; [ dotlambda nicknovitski ]; license = licenses.mit; platforms = platforms.unix; diff --git a/pkgs/applications/science/misc/simgrid/default.nix b/pkgs/applications/science/misc/simgrid/default.nix index 554ef695a4a..d6e3f05e0e1 100644 --- a/pkgs/applications/science/misc/simgrid/default.nix +++ b/pkgs/applications/science/misc/simgrid/default.nix @@ -18,14 +18,14 @@ in stdenv.mkDerivation rec { pname = "simgrid"; - version = "3.22.2"; + version = "3.23"; src = fetchFromGitLab { domain = "framagit.org"; owner = pname; repo = pname; rev = "v${version}"; - sha256 = "02zzivp3k7n2yvlr79p9kapzxpxq9x4x7jf2vrkpkwnssv4f9b4p"; + sha256 = "068xg5ps4j4v2sqqyl4vf83nfazp54gsy84gvlw52h94c4mj4xmp"; }; nativeBuildInputs = [ cmake perl python3 boost valgrind ] @@ -106,7 +106,7 @@ stdenv.mkDerivation rec { ''; homepage = https://simgrid.org/; license = licenses.lgpl2Plus; - maintainers = with maintainers; [ mickours ]; + maintainers = with maintainers; [ mickours mpoquet ]; platforms = ["x86_64-linux"]; }; } diff --git a/pkgs/applications/version-management/git-and-tools/cgit/default.nix b/pkgs/applications/version-management/git-and-tools/cgit/default.nix index b3941809fb4..6b25ef8518c 100644 --- a/pkgs/applications/version-management/git-and-tools/cgit/default.nix +++ b/pkgs/applications/version-management/git-and-tools/cgit/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, openssl, zlib, asciidoc, libxml2, libxslt +{ stdenv, fetchurl, fetchpatch, openssl, zlib, asciidoc, libxml2, libxslt , docbook_xsl, pkgconfig, luajit , coreutils, gnused, groff, docutils , gzip, bzip2, xz @@ -22,6 +22,14 @@ stdenv.mkDerivation rec { sha256 = "14hfwfkrci829a9316hnvkglnqqw1p03cw9k56p4fcb078wbwh4b"; }; + patches = [ + (fetchpatch { + name = "prevent-dos-limit-path-length.patch"; + url = "https://git.zx2c4.com/cgit/patch/?id=54c407a74a35d4ee9ffae94cc5bc9096c9f7f54a"; + sha256 = "1qlbpqsc293lmc9hzwf1j4jr5qlv8cm1r249v3yij5s4wki1595j"; + }) + ]; + nativeBuildInputs = [ pkgconfig ] ++ [ python wrapPython ]; buildInputs = [ openssl zlib asciidoc libxml2 libxslt docbook_xsl luajit diff --git a/pkgs/applications/version-management/git-and-tools/default.nix b/pkgs/applications/version-management/git-and-tools/default.nix index 58bd6a35f11..5068647e879 100644 --- a/pkgs/applications/version-management/git-and-tools/default.nix +++ b/pkgs/applications/version-management/git-and-tools/default.nix @@ -89,6 +89,10 @@ let git-extras = callPackage ./git-extras { }; + git-gone = callPackage ./git-gone { + inherit (darwin.apple_sdk.frameworks) Security; + }; + git-hub = callPackage ./git-hub { }; git-ignore = callPackage ./git-ignore { }; diff --git a/pkgs/applications/version-management/git-and-tools/git-gone/default.nix b/pkgs/applications/version-management/git-and-tools/git-gone/default.nix new file mode 100644 index 00000000000..d445e0181f4 --- /dev/null +++ b/pkgs/applications/version-management/git-and-tools/git-gone/default.nix @@ -0,0 +1,28 @@ +{ stdenv, fetchFromGitHub, rustPlatform, pkgconfig, openssl, curl, libiconv, Security }: + +rustPlatform.buildRustPackage rec { + pname = "git-gone"; + version = "0.1.2"; + + src = fetchFromGitHub { + owner = "lunaryorn"; + repo = pname; + rev = "v${version}"; + sha256 = "0vgkx227wpg9l2zza6446wzshjhnrhba3qhabibn4gg8wwcqmmxf"; + }; + + cargoSha256 = "11h2whlgjhg3j98a9w9k29njj89wx93w0dcyf981985flin709sx"; + + nativeBuildInputs = [ pkgconfig ]; + + buildInputs = [ openssl ] + ++ stdenv.lib.optionals stdenv.isDarwin [ curl libiconv Security ]; + + meta = with stdenv.lib; { + description = "Cleanup stale Git branches of pull requests"; + homepage = "https://github.com/lunaryorn/git-gone"; + license = licenses.asl20; + maintainers = [ maintainers.marsam ]; + platforms = platforms.unix; + }; +} diff --git a/pkgs/applications/video/mjpg-streamer/default.nix b/pkgs/applications/video/mjpg-streamer/default.nix index f9d4d4698fa..70dc156d680 100644 --- a/pkgs/applications/video/mjpg-streamer/default.nix +++ b/pkgs/applications/video/mjpg-streamer/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { name = "mjpg-streamer-${version}"; - version = "2016-03-08"; + version = "unstable-2019-05-24"; src = fetchFromGitHub { owner = "jacksonliam"; repo = "mjpg-streamer"; - rev = "4060cb64e3557037fd404d10e1c1d076b672e9e8"; - sha256 = "0g7y832jsz4ylmq9qp2l4fq6bm8l6dhsbi60fr5jfqpx4l0pia8m"; + rev = "501f6362c5afddcfb41055f97ae484252c85c912"; + sha256 = "1cl159svfs1zzzrd3zgn4x7qy6751bvlnxfwf5hn5fmg4iszajw7"; }; prePatch = '' @@ -23,9 +23,10 @@ stdenv.mkDerivation rec { ''; meta = with stdenv.lib; { - homepage = https://sourceforge.net/projects/mjpg-streamer/; + homepage = "https://github.com/jacksonliam/mjpg-streamer"; description = "MJPG-streamer takes JPGs from Linux-UVC compatible webcams, filesystem or other input plugins and streams them as M-JPEG via HTTP to webbrowsers, VLC and other software"; platforms = platforms.linux; license = licenses.gpl2; + maintainers = with maintainers; [ gebner ]; }; } diff --git a/pkgs/build-support/snap/default.nix b/pkgs/build-support/snap/default.nix new file mode 100644 index 00000000000..ba527186891 --- /dev/null +++ b/pkgs/build-support/snap/default.nix @@ -0,0 +1,4 @@ +{ callPackage, hello }: +{ + makeSnap = callPackage ./make-snap.nix { }; +} diff --git a/pkgs/build-support/snap/example-firefox.nix b/pkgs/build-support/snap/example-firefox.nix new file mode 100644 index 00000000000..d58c98a65a2 --- /dev/null +++ b/pkgs/build-support/snap/example-firefox.nix @@ -0,0 +1,28 @@ +let + inherit (import <nixpkgs> { }) snapTools firefox; +in snapTools.makeSnap { + meta = { + name = "nix-example-firefox"; + summary = firefox.meta.description; + architectures = [ "amd64" ]; + apps.nix-example-firefox = { + command = "${firefox}/bin/firefox"; + plugs = [ + "pulseaudio" + "camera" + "browser-support" + "avahi-observe" + "cups-control" + "desktop" + "desktop-legacy" + "gsettings" + "home" + "network" + "mount-observe" + "removable-media" + "x11" + ]; + }; + confinement = "strict"; + }; +} diff --git a/pkgs/build-support/snap/example-hello.nix b/pkgs/build-support/snap/example-hello.nix new file mode 100644 index 00000000000..123da80c547 --- /dev/null +++ b/pkgs/build-support/snap/example-hello.nix @@ -0,0 +1,12 @@ +let + inherit (import <nixpkgs> { }) snapTools hello; +in snapTools.makeSnap { + meta = { + name = "hello"; + summary = hello.meta.description; + description = hello.meta.longDescription; + architectures = [ "amd64" ]; + confinement = "strict"; + apps.hello.command = "${hello}/bin/hello"; + }; +} diff --git a/pkgs/build-support/snap/make-snap.nix b/pkgs/build-support/snap/make-snap.nix new file mode 100644 index 00000000000..cef7500bcba --- /dev/null +++ b/pkgs/build-support/snap/make-snap.nix @@ -0,0 +1,84 @@ +{ + runCommand, squashfsTools, closureInfo, lib, jq, writeText +}: + +{ + # The meta parameter is the contents of the `snap.yaml`, NOT the + # `snapcraft.yaml`. + # + # - `snap.yaml` is what is inside of the final Snap, + # - `snapcraft.yaml` is used by `snapcraft` to build snaps + # + # Since we skip the `snapcraft` tool, we skip the `snapcraft.yaml` + # file. For more information: + # + # https://docs.snapcraft.io/snap-format + # + # Note: unsquashfs'ing an existing snap from the store can be helpful + # for determining what you you're missing. + # + meta +}: let + snap_yaml = let + # Validate the snap's meta contains a name. + # Also: automatically set the `base` parameter and the layout for + # the `/nix` bind. + validate = { name, ... } @ args: + args // { + # Combine the provided arguments with the required options. + + # base: built from https://github.com/NixOS/snapd-nix-base + # and published as The NixOS Foundation on the Snapcraft store. + base = "nix-base"; + layout = (args.layout or {}) // { + # Bind mount the Snap's root nix directory to `/nix` in the + # execution environment's filesystem namespace. + "/nix".bind = "$SNAP/nix"; + }; + }; + in writeText "snap.yaml" + (builtins.toJSON (validate meta)); + + # These are specifically required by snapd, so don't change them + # unless you've verified snapcraft / snapd can handle them. Best bet + # is to just mirror this list against how snapcraft creates images. + # from: https://github.com/snapcore/snapcraft/blob/b88e378148134383ffecf3658e3a940b67c9bcc9/snapcraft/internal/lifecycle/_packer.py#L96-L98 + mksquashfs_args = [ + "-noappend" "-comp" "xz" "-no-xattrs" "-no-fragments" + + # Note: We want -all-root every time, since all the files are + # owned by root anyway. This is true for Nix, but not true for + # other builds. + # from: https://github.com/snapcore/snapcraft/blob/b88e378148134383ffecf3658e3a940b67c9bcc9/snapcraft/internal/lifecycle/_packer.py#L100 + "-all-root" + ]; + +in runCommand "squashfs.img" { + nativeBuildInputs = [ squashfsTools jq ]; + + closureInfo = closureInfo { + rootPaths = [ snap_yaml ]; + }; +} '' + root=$PWD/root + mkdir $root + + ( + # Put the snap.yaml in to `/meta/snap.yaml`, setting the version + # to the hash part of the store path + mkdir $root/meta + version=$(echo $out | cut -d/ -f4 | cut -d- -f1) + cat ${snap_yaml} | jq ". + { version: \"$version\" }" \ + > $root/meta/snap.yaml + ) + + ( + # Copy the store closure in to the root + mkdir -p $root/nix/store + cat $closureInfo/store-paths | xargs -I{} cp -r {} $root/nix/store/ + ) + + # Generate the squashfs image. + mksquashfs $root $out \ + ${lib.concatStringsSep " " mksquashfs_args} +'' diff --git a/pkgs/data/misc/adapta-backgrounds/default.nix b/pkgs/data/misc/adapta-backgrounds/default.nix index 41f704e750c..1c35d3deef9 100644 --- a/pkgs/data/misc/adapta-backgrounds/default.nix +++ b/pkgs/data/misc/adapta-backgrounds/default.nix @@ -1,23 +1,23 @@ -{ stdenv, fetchFromGitHub, autoreconfHook }: +{ stdenv, fetchFromGitHub, meson, ninja, pkgconfig, glib }: stdenv.mkDerivation rec { - name = "adapta-backgrounds-${version}"; - version = "0.5.2.3"; + pname = "adapta-backgrounds"; + version = "0.5.3.1"; src = fetchFromGitHub { owner = "adapta-project"; repo = "adapta-backgrounds"; rev = version; - sha256 = "0n0ggcxinja81lasmpviqq3l4jiwb05bs8r5aah1im2zvls1g007"; + sha256 = "04hmbmzf97rsii8gpwy3wkljy5xhxmlsl34d63s6hfy05knclydj"; }; - nativeBuildInputs = [ autoreconfHook ]; + nativeBuildInputs = [ meson ninja pkgconfig glib ]; meta = with stdenv.lib; { description = "Wallpaper collection for adapta-project"; - homepage = https://github.com/adapta-project/adapta-backgrounds; + homepage = "https://github.com/adapta-project/adapta-backgrounds"; license = with licenses; [ gpl2 cc-by-sa-40 ]; platforms = platforms.all; - maintainers = [ maintainers.romildo ]; + maintainers = with maintainers; [ romildo ]; }; } diff --git a/pkgs/data/themes/shades-of-gray/default.nix b/pkgs/data/themes/shades-of-gray/default.nix index 35ad998e859..fb94fa00b75 100644 --- a/pkgs/data/themes/shades-of-gray/default.nix +++ b/pkgs/data/themes/shades-of-gray/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "shades-of-gray-theme"; - version = "1.1.7"; + version = "1.1.8"; src = fetchFromGitHub { owner = "WernerFP"; repo = pname; rev = version; - sha256 = "09r26izbx9sj9czc95cn4r0c1v9yj2qm84zdl047fiqa49czwbzq"; + sha256 = "08i2pkq7ygf9fs9cdrw4khrb8m1w2hvgmz064g36fh35r02sms3w"; }; buildInputs = [ gtk_engines ]; diff --git a/pkgs/desktops/gnome-3/core/mutter/default.nix b/pkgs/desktops/gnome-3/core/mutter/default.nix index a8bc4e77011..61219ca4488 100644 --- a/pkgs/desktops/gnome-3/core/mutter/default.nix +++ b/pkgs/desktops/gnome-3/core/mutter/default.nix @@ -13,6 +13,8 @@ stdenv.mkDerivation rec { pname = "mutter"; version = "3.32.2"; + outputs = [ "out" "dev" "man" ]; + src = fetchurl { url = "mirror://gnome/sources/mutter/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; sha256 = "1h577i2ap7dpfy1jg101jvc6nzccc0csgvd55ahydlr8f94frcva"; @@ -20,6 +22,7 @@ stdenv.mkDerivation rec { mesonFlags = [ "-Dxwayland-path=${xwayland}/bin/Xwayland" + "-Dinstalled_tests=false" # TODO: enable these ]; propagatedBuildInputs = [ diff --git a/pkgs/development/compilers/ghc/8.2.2.nix b/pkgs/development/compilers/ghc/8.2.2.nix index b9099699b02..9b942da25a6 100644 --- a/pkgs/development/compilers/ghc/8.2.2.nix +++ b/pkgs/development/compilers/ghc/8.2.2.nix @@ -231,6 +231,10 @@ stdenv.mkDerivation (rec { # that in turn causes GHCi to abort stripDebugFlags = [ "-S" ] ++ stdenv.lib.optional (!targetPlatform.isDarwin) "--keep-file-symbols"; + # See #63511 - the only unstripped file is the debug rts which isn't meant to + # be stripped. + dontStrip = true; + checkTarget = "test"; doCheck = false; # fails with "testsuite/tests: No such file or directory. Stop." diff --git a/pkgs/development/compilers/ghc/8.4.4.nix b/pkgs/development/compilers/ghc/8.4.4.nix index 50f6905e5b7..a355f57a5c7 100644 --- a/pkgs/development/compilers/ghc/8.4.4.nix +++ b/pkgs/development/compilers/ghc/8.4.4.nix @@ -208,6 +208,10 @@ stdenv.mkDerivation (rec { # that in turn causes GHCi to abort stripDebugFlags = [ "-S" ] ++ stdenv.lib.optional (!targetPlatform.isDarwin) "--keep-file-symbols"; + # See #63511 - the only unstripped file is the debug rts which isn't meant to + # be stripped. + dontStrip = true; + checkTarget = "test"; hardeningDisable = [ "format" ] ++ stdenv.lib.optional stdenv.targetPlatform.isMusl "pie"; diff --git a/pkgs/development/compilers/ghc/8.6.4.nix b/pkgs/development/compilers/ghc/8.6.4.nix index 5feb0a2032c..ff9ef0a5c38 100644 --- a/pkgs/development/compilers/ghc/8.6.4.nix +++ b/pkgs/development/compilers/ghc/8.6.4.nix @@ -207,6 +207,10 @@ stdenv.mkDerivation (rec { # that in turn causes GHCi to abort stripDebugFlags = [ "-S" ] ++ stdenv.lib.optional (!targetPlatform.isDarwin) "--keep-file-symbols"; + # See #63511 - the only unstripped file is the debug rts which isn't meant to + # be stripped. + dontStrip = true; + checkTarget = "test"; hardeningDisable = [ "format" ] ++ stdenv.lib.optional stdenv.targetPlatform.isMusl "pie"; diff --git a/pkgs/development/compilers/ghc/8.6.5.nix b/pkgs/development/compilers/ghc/8.6.5.nix index d84f2cca059..44ad6da2ff5 100644 --- a/pkgs/development/compilers/ghc/8.6.5.nix +++ b/pkgs/development/compilers/ghc/8.6.5.nix @@ -207,6 +207,10 @@ stdenv.mkDerivation (rec { # that in turn causes GHCi to abort stripDebugFlags = [ "-S" ] ++ stdenv.lib.optional (!targetPlatform.isDarwin) "--keep-file-symbols"; + # See #63511 - the only unstripped file is the debug rts which isn't meant to + # be stripped. + dontStrip = true; + checkTarget = "test"; hardeningDisable = [ "format" ] ++ stdenv.lib.optional stdenv.targetPlatform.isMusl "pie"; diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index 81d6c0a4458..c975b1e2a2c 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -72,7 +72,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 = "02vj13qyzjbk14ddpabycq2mwzggsk63vddffjyzaqpy9d7x35s9"; + sha256 = "11d4qyhmc774h2xyrpyn9rxx99x3vjs0fcxsg49gj5ayzmykafap"; }; }).override { dbus = if pkgs.stdenv.isLinux then self.dbus else null; diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml index ef839556b46..ee519f903ca 100644 --- a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml +++ b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml @@ -2627,7 +2627,6 @@ broken-packages: - accelerate-arithmetic - accelerate-fftw - accelerate-fourier - - accelerate-llvm - accelerate-llvm-native - accelerate-random - accelerate-typelits @@ -2691,7 +2690,6 @@ broken-packages: - aeson-applicative - aeson-decode - aeson-diff-generic - - aeson-extra - aeson-flowtyped - aeson-injector - aeson-native @@ -2719,9 +2717,6 @@ broken-packages: - airship - airtable-api - aivika-distributed - - aivika-experiment-cairo - - aivika-experiment-chart - - aivika-experiment-diagrams - ajhc - AlanDeniseEricLauren - alerta @@ -2755,8 +2750,6 @@ broken-packages: - amazon-emailer - amazon-emailer-client-snap - amazon-products - - amazonka-cognito-identity - - amazonka-ecs - amby - AMI - ampersand @@ -2869,7 +2862,6 @@ broken-packages: - asil - asn - asn1-codec - - AspectAG - assert - assertions - asset-map @@ -2881,7 +2873,6 @@ broken-packages: - async-combinators - async-dejafu - async-manager - - async-pool - async-timer - asynchronous-exceptions - aterm @@ -2903,13 +2894,11 @@ broken-packages: - AttoJson - attoparsec-data - attoparsec-enumerator - - attoparsec-ip - attoparsec-iteratee - attoparsec-text - attoparsec-text-enumerator - attoparsec-time - attoparsec-trans - - attoparsec-uri - attosplit - Attrac - atuin @@ -3014,7 +3003,6 @@ broken-packages: - bdcs-api - beam - beam-newtype-field - - beam-postgres - beam-th - beamable - beautifHOL @@ -3022,8 +3010,6 @@ broken-packages: - Befunge93 - bein - belka - - bench-graph - - bench-show - BenchmarkHistory - bencodex - berkeleydb @@ -3033,9 +3019,7 @@ broken-packages: - besout - bet - betacode - - betris - bff - - bgmax - bgzf - bhoogle - bibdb @@ -3093,7 +3077,6 @@ broken-packages: - bindynamic - binembed - binembed-example - - bins - bio - bio-sequence - bioace @@ -3128,6 +3111,7 @@ broken-packages: - bird - BirdPP - bisect-binary + - bishbosh - bit-array - bit-stream - bitcoin-hs @@ -3200,10 +3184,8 @@ broken-packages: - boombox - boomslang - borel - - boring - boring-window-switcher - bot - - bound-extras - bounded-array - bowntz - braid @@ -3220,7 +3202,6 @@ broken-packages: - bricks-rendering - bricks-syntax - brillig - - broadcast-chan - broadcast-chan-conduit - broadcast-chan-pipes - broadcast-chan-tests @@ -3259,7 +3240,7 @@ broken-packages: - butterflies - bv-sized - bytable - - bytestring-arbitrary + - byteslice - bytestring-builder-varword - bytestring-class - bytestring-csv @@ -3291,7 +3272,6 @@ broken-packages: - cabal-ghc-dynflags - cabal-ghci - cabal-graphdeps - - cabal-helper - Cabal-ide-backend - cabal-info - cabal-install-bundle @@ -3322,7 +3302,6 @@ broken-packages: - cabin - cabocha - cached - - cacophony - caffegraph - cairo-core - cake @@ -3340,7 +3319,6 @@ broken-packages: - call-haskell-from-anything - camfort - campfire - - canon - canonical-filepath - canonical-json - canteven-http @@ -3351,7 +3329,6 @@ broken-packages: - cao - cap - Capabilities - - capability - capataz - capnp - capped-list @@ -3377,7 +3354,6 @@ broken-packages: - cash - cassandra-cql - Cassava - - cassava-streams - cassette - cassy - castle @@ -3426,10 +3402,6 @@ broken-packages: - chalkboard - chalkboard-viewer - charade - - Chart - - Chart-cairo - - Chart-diagrams - - Chart-gtk - chart-histogram - Chart-simple - chart-unit @@ -3438,8 +3410,8 @@ broken-packages: - chatwork - cheapskate-terminal - check-pvp - - Checked - checked + - Checked - checkmate - chessIO - chevalier-common @@ -3582,7 +3554,6 @@ broken-packages: - colorless - colorless-http-client - colorless-scotty - - colour-accelerate - colour-space - coltrane - columbia @@ -3594,8 +3565,6 @@ broken-packages: - combinatorial-problems - Combinatorrent - combobuffer - - comfort-array - - comic - Command - commander - Commando @@ -3614,8 +3583,6 @@ broken-packages: - competition - compilation - complexity - - componentm - - componentm-devel - compose-trans - composite-aeson - composite-aeson-refined @@ -3637,15 +3604,14 @@ broken-packages: - concrete-haskell-autogen - concrete-relaxng-parser - concrete-typerep - - concurrency-benchmarks - concurrent-buffer - Concurrent-Cache - concurrent-machines - concurrent-state - Concurrential - ConcurrentUtils - - Condor - condor + - Condor - condorcet - conductive-base - conductive-hsc3 @@ -3653,15 +3619,11 @@ broken-packages: - conduit-audio-lame - conduit-audio-samplerate - conduit-find - - conduit-merge - conduit-network-stream - conduit-resumablesink - conduit-throttle - conduit-tokenize-attoparsec - - conduit-vfs - - conduit-vfs-zip - conf - - confcrypt - conffmt - confide - config-parser @@ -3679,7 +3641,6 @@ broken-packages: - connection-string - Conscript - consistent - - console-program - const-math-ghc-plugin - constrained-categories - constrained-category @@ -3690,7 +3651,6 @@ broken-packages: - constraint-reflection - ConstraintKinds - constraints-emerge - - constraints-extras - constructive-algebra - consul-haskell - Consumer @@ -3709,7 +3669,6 @@ broken-packages: - continuum - continuum-client - Contract - - control-event - control-monad-attempt - control-monad-exception - control-monad-exception-monadsfd @@ -3724,14 +3683,8 @@ broken-packages: - convert-annotation - convertible-ascii - convertible-text - - copilot - - copilot-c99 - copilot-cbmc - - copilot-core - - copilot-language - - copilot-libraries - copilot-sbv - - copilot-theorem - copr - COrdering - core @@ -3812,7 +3765,6 @@ broken-packages: - crystalfontz - cse-ghc-plugin - csg - - csound-catalog - CSPM-cspm - CSPM-FiringRules - CSPM-Frontend @@ -3829,7 +3781,6 @@ broken-packages: - cube - cuboid - cudd - - curl-runnings - currency-convert - curry-frontend - CurryDB @@ -3839,15 +3790,14 @@ broken-packages: - curves - custom-prelude - CV - - cyclotomic - cypher - d-bus - d3js - dag - DAG-Tournament - Dangerous - - Dao - dao + - Dao - dapi - darcs-benchmark - darcs-beta @@ -3881,7 +3831,6 @@ broken-packages: - data-fin - data-fin-simple - data-flagset - - data-interval - data-ivar - data-kiln - data-layer @@ -3902,8 +3851,8 @@ broken-packages: - data-repr - data-result - data-rev - - Data-Rope - data-rope + - Data-Rope - data-rtuple - data-size - data-spacepart @@ -4019,7 +3968,6 @@ broken-packages: - deunicode - devil - dewdrop - - df1 - dfinity-radix-tree - Dflow - dfsbuild @@ -4027,11 +3975,7 @@ broken-packages: - dgs - dhall-check - dhall-nix - - dhall-to-cabal - dhcp-lease-parser - - di - - di-df1 - - di-handle - dia-base - dia-functions - diagrams-boolean @@ -4097,12 +4041,9 @@ broken-packages: - disjoint-set-stateful - diskhash - disposable - - Dist - dist-upload - distance - DisTract - - distributed-closure - - distributed-fork - distributed-fork-aws-lambda - distributed-process - distributed-process-async @@ -4130,6 +4071,7 @@ broken-packages: - dixi - djembe - djinn-th + - dl-fedora - dmenu - dmenu-pkill - dmenu-pmount @@ -4142,7 +4084,6 @@ broken-packages: - doc-review - doccheck - docidx - - docker - docker-build-cacher - dockercook - DocTest @@ -4194,7 +4135,6 @@ broken-packages: - dsh-sql - dsmc - dsmc-tools - - dson - dson-parsec - DSTM - dstring @@ -4234,8 +4174,6 @@ broken-packages: - easy-api - easyjson - easyplot - - easytensor - - easytensor-vulkan - ebeats - ebnf-bff - ecma262 @@ -4252,8 +4190,7 @@ broken-packages: - editline - EditTimeReport - effect-handlers - - effects - - effects-parser + - effect-stack - effin - egison-quote - egison-tutorial @@ -4268,23 +4205,19 @@ broken-packages: - ekg-elasticsearch - ekg-influxdb - ekg-log - - ekg-prometheus-adapter - ekg-push - ekg-rrd - elevator - elision - elm-websocket - - elsa - emacs-keys - email - email-header - email-postmark - - email-validator - emailparse - embeddock - embeddock-example - embroidery - - emd - emgm - Emping - Empty @@ -4296,7 +4229,6 @@ broken-packages: - engine-io-snap - engine-io-wai - engine-io-yesod - - ENIG - entangle - EntrezHTTP - entwine @@ -4373,7 +4305,6 @@ broken-packages: - eventful-dynamodb - eventful-postgresql - eventlog2html - - eventloop - EventSocket - eventsource-geteventstore-store - eventstore @@ -4382,7 +4313,6 @@ broken-packages: - exact-real - exact-real-positional - except-exceptions - - exception-hierarchy - exception-monads-fd - exchangerates - execs @@ -4412,7 +4342,6 @@ broken-packages: - extemp - extended-categories - extensible-data - - extensible-effects-concurrent - Extra - extract-dependencies - extractelf @@ -4421,6 +4350,7 @@ broken-packages: - f-ree-hack-cheats-free-v-bucks-generator - Facebook-Password-Hacker-Online-Latest-Version - faceted + - factory - Facts - factual-api - fadno @@ -4429,7 +4359,6 @@ broken-packages: - failable-list - failure-detector - FailureT - - fake - fake-type - faktory - falling-turnip @@ -4443,23 +4372,13 @@ broken-packages: - fastedit - fastirc - fastly - - fastparser - FastPush - FastxPipe - fathead-util - fault-tree - - fay - - fay-base - fay-builder - - fay-dom - - fay-geoposition - fay-hsx - - fay-jquery - - fay-ref - fay-simplejson - - fay-text - - fay-uri - - fay-websockets - fb-persistent - fbmessenger-api - fca @@ -4509,15 +4428,14 @@ broken-packages: - FileManipCompat - fileneglect - filepath-io-access - - FilePather - filepather + - FilePather - Files - FileSystem - filesystem-conduit - filesystem-enumerator - filesystem-trees - fillit - - fin - final-pretty-printer - Finance-Quote-Yahoo - Finance-Treasury @@ -4532,6 +4450,7 @@ broken-packages: - first-and-last - firstify - FirstOrderTheory + - fishfood - fit - fitsio - fix-parser-simple @@ -4659,8 +4578,6 @@ broken-packages: - fresh - friday-devil - friday-scale-dct - - friendly - - front - frown - frp-arduino - frpnow @@ -4679,7 +4596,6 @@ broken-packages: - FTPLine - ftshell - full-sessions - - full-text-search - fullstop - funbot - funbot-client @@ -4749,7 +4665,6 @@ broken-packages: - GeneralTicTacToe - generators - generic-accessors - - generic-aeson - generic-binary - generic-church - generic-enum @@ -4761,7 +4676,6 @@ broken-packages: - generic-tree - generic-xml - generic-xmlpickler - - generics-eot - genericserialize - genesis - genesis-test @@ -4793,9 +4707,7 @@ broken-packages: - gh-labeler - ghc-core-smallstep - ghc-datasize - - ghc-dump-core - ghc-dump-tree - - ghc-dump-util - ghc-dup - ghc-events-analyze - ghc-events-parallel @@ -4806,7 +4718,6 @@ broken-packages: - ghc-man-completion - ghc-mod - ghc-parmake - - ghc-parser - ghc-pkg-autofix - ghc-pkg-lib - ghc-proofs @@ -4826,8 +4737,6 @@ broken-packages: - ghci-lib - ghci-ng - ghcjs-base-stub - - ghcjs-dom - - ghcjs-dom-jsaddle - ghcjs-dom-jsffi - ghcjs-fetch - ghcjs-hplay @@ -4870,7 +4779,6 @@ broken-packages: - git-fmt - git-gpush - git-jump - - git-monitor - git-object - git-remote-ipfs - git-repair @@ -4888,12 +4796,9 @@ broken-packages: - gitit - gitlab-api - gitlib-cross - - gitlib-libgit2 - gitlib-s3 - - gitlib-test - gitlib-utils - gitson - - gitter - glade - gladexml-accessor - glapp @@ -4906,7 +4811,6 @@ broken-packages: - gli - glicko - glider-nlp - - glirc - GLMatrix - glob-posix - global @@ -4915,7 +4819,6 @@ broken-packages: - glome-hs - GlomeTrace - GlomeView - - gloss-accelerate - gloss-banana - gloss-devil - gloss-export @@ -4923,10 +4826,6 @@ broken-packages: - gloss-sodium - glpk-hs - glue - - glue-common - - glue-core - - glue-ekg - - glue-example - gmap - gmndl - gnome-desktop @@ -4956,7 +4855,6 @@ broken-packages: - googlepolyline - GoogleSB - GoogleTranslate - - gopher-proxy - gopherbot - gore-and-ash - gore-and-ash-actor @@ -4971,7 +4869,6 @@ broken-packages: - GotoT-transformers - gotta-go-fast - gpah - - GPipe - GPipe-Collada - GPipe-Examples - GPipe-GLFW @@ -5034,7 +4931,6 @@ broken-packages: - GroteTrap - groundhog-converters - group-with - - grouped-list - growler - GrowlNotify - grpc-etcd-client @@ -5109,8 +5005,6 @@ broken-packages: - hackmanager - hactor - hactors - - haddock - - haddock-api - haddock-leksah - haddock-test - haddocset @@ -5138,15 +5032,9 @@ broken-packages: - hakyll-contrib-links - hakyll-convert - hakyll-dhall - - hakyll-dir-list - - hakyll-favicon - hakyll-filestore - - hakyll-images - hakyll-ogmarkup - hakyll-R - - hakyll-sass - - hakyll-series - - hakyll-shakespeare - hakyll-shortcode - hakyll-shortcut-links - halberd @@ -5208,7 +5096,6 @@ broken-packages: - happstack-state - happstack-util - happstack-yui - - happy-hour - happy-meta - happybara - happybara-webkit @@ -5229,9 +5116,7 @@ broken-packages: - haroonga-httpd - harpy - harvest-api - - has - has-th - - HasBigDecimal - HasCacBDD - hascas - Haschoo @@ -5266,7 +5151,6 @@ broken-packages: - haskell-conll - haskell-course-preludes - haskell-disque - - haskell-docs - haskell-eigen-util - haskell-formatter - haskell-ftp @@ -5278,7 +5162,6 @@ broken-packages: - haskell-lsp-client - haskell-ml - haskell-mpfr - - haskell-names - haskell-neo4j-client - haskell-openflow - haskell-overridez @@ -5453,8 +5336,8 @@ broken-packages: - hdaemonize-buildfix - hdbc-aeson - HDBC-mysql - - HDBC-postgresql-hstore - hdbc-postgresql-hstore + - HDBC-postgresql-hstore - hdbi - hdbi-conduit - hdbi-postgresql @@ -5468,7 +5351,6 @@ broken-packages: - hdiscount - hdm - hdo - - hdocs - hdph - hdph-closure - hdr-histogram @@ -5543,7 +5425,6 @@ broken-packages: - hexquote - hext - heyefi - - heyting-algebras - hF2 - hfann - hfd @@ -5576,7 +5457,6 @@ broken-packages: - hgrib - hharp - HHDL - - hhp - hi-file-parser - hi3status - hiccup @@ -5590,7 +5470,6 @@ broken-packages: - hierarchy - hiernotify - Hieroglyph - - higgledy - HiggsSet - higherorder - highjson @@ -5610,7 +5489,6 @@ broken-packages: - hinter - hinvaders - hinze-streams - - hip - hipbot - hipchat-hs - hipe @@ -5653,15 +5531,14 @@ broken-packages: - hlibfam - HList - HListPP - - HLogger - hlogger + - HLogger - hlongurl - hls - hlwm - hly - hmark - hmarkup - - hmatrix-backprop - hmatrix-banded - hmatrix-mmap - hmatrix-morpheus @@ -5786,7 +5663,6 @@ broken-packages: - hR - hranker - HRay - - hrfsize - hricket - Hricket - hriemann @@ -5943,8 +5819,6 @@ broken-packages: - hsreadability - hsseccomp - hsSqlite3 - - hssqlppp - - hssqlppp-th - HsSVN - hstatistics - hstats @@ -6048,24 +5922,18 @@ broken-packages: - hw-dump - hw-eliasfano - hw-excess - - hw-fingertree - hw-ip - hw-json - hw-json-lens - - hw-json-simd - hw-json-simple-cursor - hw-json-standard-cursor - hw-packed-vector - - hw-parser - - hw-prim - - hw-prim-bits - hw-rankselect - hw-rankselect-base - hw-simd - hw-streams - hw-succinct - hw-uri - - hw-vector - hw-xml - hwall-auth-iitk - hweblib @@ -6165,6 +6033,7 @@ broken-packages: - imap - imapget - imbib + - imgur - imgurder - imj-animation - imj-base @@ -6235,7 +6104,6 @@ broken-packages: - invertible-hlist - io-capture - io-reactive - - ion - IOR - IORefCAS - iostring @@ -6250,7 +6118,6 @@ broken-packages: - iptables-helpers - iptadmin - IPv6DB - - ipython-kernel - Irc - irc-dcc - irc-fun-bot @@ -6283,16 +6150,7 @@ broken-packages: - iterIO - iterio-server - ivor - - ivory - - ivory-backend-c - ivory-bitdata - - ivory-eval - - ivory-examples - - ivory-hw - - ivory-opts - - ivory-quickcheck - - ivory-serialize - - ivory-stdlib - ivy-web - ixdopp - ixmonad @@ -6300,14 +6158,13 @@ broken-packages: - iyql - j2hs - jack-bindings - - JackMiniMix - jackminimix + - JackMiniMix - jacobi-roots - jaeger-flamegraph - jail - jalaali - jalla - - jammittools - jarfind - jarify - jason @@ -6342,7 +6199,6 @@ broken-packages: - jonathanscard - jpeg - js-good-parts - - jsaddle-dom - jsaddle-hello - jsaddle-warp - jsaddle-wkwebview @@ -6373,7 +6229,7 @@ broken-packages: - JSONb - jsonextfilter - JsonGrammar - - JSONParser + - jsonpath - jsonresume - jsonrpc-conduit - jsons-to-schema @@ -6401,10 +6257,9 @@ broken-packages: - kademlia - kafka-client - kaleidoscope - - Kalman - kalman + - Kalman - kangaroo - - kanji - kansas-lava - kansas-lava-cores - kansas-lava-papilio @@ -6419,10 +6274,8 @@ broken-packages: - katip-syslog - katt - kawaii - - kazura-queue - kd-tree - kdesrc-build-extra - - kdt - keccak - keera-hails-i18n - keera-hails-mvc-environment-gtk @@ -6472,7 +6325,6 @@ broken-packages: - ktx - kure - kure-your-boilerplate - - kurita - KyotoCabinet - l-bfgs-b - L-seed @@ -6487,7 +6339,6 @@ broken-packages: - lambda-calculator - lambda-canvas - lambda-devs - - lambda-options - lambda-toolbox - lambda2js - lambdaBase @@ -6571,7 +6422,6 @@ broken-packages: - language-vhdl - language-webidl - lapack - - lapack-comfort-array - Lastik - lat - latest-npm-version @@ -6604,7 +6454,6 @@ broken-packages: - leanpub-wreq - leapseconds - learn - - learn-physics - learn-physics-examples - Learning - leetify @@ -6614,7 +6463,6 @@ broken-packages: - legion-extra - leksah-server - lendingclub - - lens-accelerate - lens-filesystem - lens-prelude - lens-text-encoding @@ -6638,7 +6486,6 @@ broken-packages: - libconfig - libcspm - libexpect - - libffi-dynamic - libGenI - libhbb - libinfluxdb @@ -6656,7 +6503,6 @@ broken-packages: - librandomorg - librato - libsystemd-daemon - - libsystemd-journal - libtagc - libxls - libxml-enumerator @@ -6676,7 +6522,6 @@ broken-packages: - linda - linden - line-drawing - - linear-accelerate - linear-algebra-cblas - linear-circuit - linear-code @@ -6707,7 +6552,6 @@ broken-packages: - lio-simple - lipsum-gen - liquid - - liquidhaskell-cabal-demo - list-fusion-probe - list-mux - list-prompt @@ -6736,7 +6580,6 @@ broken-packages: - llvm-general - llvm-general-pure - llvm-general-quote - - llvm-hs - llvm-hs-pretty - llvm-ht - llvm-pkg-config @@ -6764,7 +6607,6 @@ broken-packages: - logging-effect-extra - logging-effect-extra-file - logging-effect-extra-handler - - logging-facade-journald - Logic - logic-classes - logic-TPTP @@ -6806,12 +6648,10 @@ broken-packages: - LslPlus - lsp-test - lsystem - - ltext - ltk - lua-bc - luachunk - luautils - - lucid-svg - lucienne - Lucu - lui @@ -6842,7 +6682,6 @@ broken-packages: - madlang - mage - magic-wormhole - - magicbane - MagicHaskeller - magico - magma @@ -6880,7 +6719,6 @@ broken-packages: - mangopay - manifold-random - manifolds - - manifolds-core - map-exts - map-reduce-folds - map-syntax @@ -6941,13 +6779,12 @@ broken-packages: - mecab - mech - Mecha - - Mechs - mechs + - Mechs - med-module - mediabus - mediabus-fdk-aac - mediabus-rtp - - median-stream - mediawiki - medium-sdk-haskell - mellon-core @@ -7018,7 +6855,6 @@ broken-packages: - miniplex - minirotate - ministg - - minitypeset-opengl - minst-idx - mios - mirror-tweet @@ -7034,25 +6870,25 @@ broken-packages: - ml-w - mlist - mltool + - mmark + - mmark-cli + - mmark-ext - mmtf - mmtl - mmtl-base - moan - Mobile-Legends-Hack-Cheats - - mockazo - - model - modelicaparser - modify-fasta - modsplit - - modular - modular-prelude - modular-prelude-classy - modularity - module-management - modulespection - modulo - - Moe - moe + - Moe - MoeDict - mohws - mole @@ -7087,7 +6923,6 @@ broken-packages: - monad-unify - monad-var - monad-wrap - - monadacme - MonadCatchIO-mtl - MonadCatchIO-mtl-foreign - MonadCatchIO-transformers @@ -7126,7 +6961,6 @@ broken-packages: - monzo - moo - moonshine - - more-containers - morfette - morfeusz - morley @@ -7138,11 +6972,6 @@ broken-packages: - morte - mosaico-lib - moss - - moto - - moto-postgresql - - motor - - motor-diagrams - - motor-reflection - mount - movie-monad - mp @@ -7160,8 +6989,6 @@ broken-packages: - mrifk - mrm - ms - - msgpack - - msgpack-aeson - msgpack-idl - msgpack-rpc - msh @@ -7186,7 +7013,6 @@ broken-packages: - multiaddr - multiarg - multibase - - multifile - multifocal - multihash - multihash-serialise @@ -7198,7 +7024,6 @@ broken-packages: - multirec-alt-deriver - multirec-binary - multisetrewrite - - multistate - multivariant - Munkres-simple - muon @@ -7225,7 +7050,6 @@ broken-packages: - mvc - mvc-updates - mvclient - - mwc-random-accelerate - mxnet - mxnet-dataiter - mxnet-examples @@ -7260,7 +7084,6 @@ broken-packages: - nanovg - nanovg-simple - nanq - - naqsha - narc - nat-sized-numbers - nationstates @@ -7286,13 +7109,11 @@ broken-packages: - nested-sequence - NestedFunctor - nestedmap - - net-spider - net-spider-pangraph - net-spider-rpl - netclock - netcore - netease-fm - - netlib-comfort-array - netlines - netrium - NetSNMP @@ -7332,7 +7153,6 @@ broken-packages: - network-transport-inmemory - network-transport-tcp - network-transport-tests - - network-transport-zeromq - network-voicetext - network-wai-router - network-websocket @@ -7357,12 +7177,10 @@ broken-packages: - nice-html - nicovideo-translator - nikepub - - nimber - Ninjas - nirum - nitro - niv - - nix-eval - nixfromnpm - nixpkgs-update - nkjp @@ -7392,7 +7210,6 @@ broken-packages: - notifications-tray-icon - notmuch-haskell - notmuch-web - - NoTrace - np-linear - nptools - ntha @@ -7410,17 +7227,14 @@ broken-packages: - numeric-qq - numeric-ranges - numerical - - numhask - numhask-array - numhask-hedgehog - numhask-histogram - numhask-prelude - numhask-range - - numhask-space - numhask-test - Nussinov78 - Nutri - - nvim-hs-ghcid - NXT - NXTDSL - nylas @@ -7456,11 +7270,10 @@ broken-packages: - oidc-client - ois-input-manager - olwrapper - - om-elm - omaketex - ombra - - Omega - omega + - Omega - omnifmt - on-a-horse - onama @@ -7475,11 +7288,9 @@ broken-packages: - open-haddock - open-pandoc - open-signals - - open-typerep - OpenAFP - OpenAFP-Utils - openapi-petstore - - opench-meteo - OpenCL - OpenCLRaw - OpenCLWrappers @@ -7545,7 +7356,6 @@ broken-packages: - packunused - pacman-memcache - padKONTROL - - pads-haskell - pagarme - PageIO - pagure-hook-receiver @@ -7553,7 +7363,6 @@ broken-packages: - pam - panda - pandoc-include - - pandoc-include-code - pandoc-japanese-filters - pandoc-lens - pandoc-plantuml-diagrams @@ -7580,7 +7389,6 @@ broken-packages: - Parallel-Arrows-Eden - parallel-tasks - parameterized - - parameterized-utils - paramtree - paranoia - parco @@ -7611,7 +7419,6 @@ broken-packages: - pasta - pastis - pasty - - patat - patches-vector - Pathfinder - pathfindingcore @@ -7646,7 +7453,6 @@ broken-packages: - pedestrian-dag - peg - peggy - - pencil - penny - penny-bin - penny-lib @@ -7656,8 +7462,8 @@ broken-packages: - peregrin - perf - perf-analysis - - PerfectHash - perfecthash + - PerfectHash - perhaps - periodic - perm @@ -7692,7 +7498,6 @@ broken-packages: - peyotls-codec - pez - pg-harness - - pg-harness-server - pg-recorder - pg-store - pg-transact @@ -7718,7 +7523,6 @@ broken-packages: - picoparsec - picosat - pictikz - - pidfile - pier - pier-core - piet @@ -7750,7 +7554,6 @@ broken-packages: - pipes-p2p - pipes-p2p-examples - pipes-protolude - - pipes-random - pipes-rt - pipes-s3 - pipes-shell @@ -7772,7 +7575,6 @@ broken-packages: - plan-applicative - plan-b - planar-graph - - planb-token-introspection - planet-mitchell - planet-mitchell-test - plankton @@ -7789,7 +7591,6 @@ broken-packages: - Plot-ho-matic - plot-lab - plot-light-examples - - plots - PlslTools - plugins - plugins-auto @@ -7827,7 +7628,6 @@ broken-packages: - polysoup - polytypeable - polytypeable-utils - - pomaps - pomodoro - pomohoro - ponder @@ -7838,10 +7638,10 @@ broken-packages: - poppler - portager - porte - - porter - PortFusion - ports - posix-acl + - posix-api - posix-realtime - posix-waitpid - postcodes @@ -7895,13 +7695,11 @@ broken-packages: - presburger - press - presto-hdbc - - pretty-ghci - pretty-ncols - pretty-relative-time - prettyprinter-vty - preview - prim-array - - prim-instances - primes-type - primitive-addr - primitive-atomic @@ -7909,7 +7707,6 @@ broken-packages: - primitive-containers - primitive-extras - primitive-indexed - - primitive-maybe - primitive-simd - primitive-sort - primitive-unlifted @@ -7947,7 +7744,6 @@ broken-packages: - project-m36 - projectile - prolog-graph - - prometheus - prometheus-effect - promise - pronounce @@ -7974,7 +7770,6 @@ broken-packages: - proxy-mapping - psc-ide - pseudo-trie - - pthread - PTQ - ptr - publicsuffixlistcreate @@ -8046,7 +7841,6 @@ broken-packages: - QuickAnnotate - quickbooks - quickcheck-arbitrary-template - - quickcheck-classes - quickcheck-poly - quickcheck-property-comb - quickcheck-property-monad @@ -8078,7 +7872,6 @@ broken-packages: - quoridor-hs - qux - R-pandoc - - raaz - rad - radium - radium-formula-parser @@ -8111,7 +7904,6 @@ broken-packages: - rank1dynamic - rank2classes - Ranka - - rapid - rapid-term - rasa - rasa-example-config @@ -8137,8 +7929,6 @@ broken-packages: - razom-text-util - rbr - rc - - rcu - - rdf - rdf4h - rdioh - react-flux @@ -8188,12 +7978,9 @@ broken-packages: - refcount - Referees - refh - - refined - reflection-extras - reflex-animation - reflex-backend-wai - - reflex-basic-host - - reflex-dom-core - reflex-dom-svg - reflex-gloss - reflex-gloss-scene @@ -8236,9 +8023,7 @@ broken-packages: - reified-records - reify - relacion - - relation - relational-postgresql8 - - relational-record-examples - relative-date - reload - remark @@ -8258,7 +8043,6 @@ broken-packages: - repa-flow - repa-linear-algebra - repa-plugin - - repa-scalar - repa-series - repa-stream - repa-v4l2 @@ -8318,13 +8102,8 @@ broken-packages: - rfc-redis - rfc-servant - rfc1413-server - - rhine - - rhine-gloss - rhythm-game-tutorial - - ribosome - RichConditional - - ridley - - ridley-extras - riemann - riff - ring-buffer @@ -8350,14 +8129,12 @@ broken-packages: - RNAFoldProgs - RNAlien - RNAwolf - - rncryptor - rng-utils - rob - robin - robots-txt - roc-cluster - roc-cluster-demo - - rocksdb-query - roku-api - rollbar-hs - roller @@ -8387,7 +8164,6 @@ broken-packages: - rspp - rss-conduit - rss2irc - - rtnetlink - rtorrent-rpc - rts-loader - ruby-marshal @@ -8411,11 +8187,6 @@ broken-packages: - safe-json - safe-lazy-io - safe-length - - safe-money - - safe-money-aeson - - safe-money-cereal - - safe-money-serialise - - safe-money-store - safe-money-xmlbf - safe-plugins - safe-printf @@ -8428,7 +8199,6 @@ broken-packages: - saferoute - sai-shape-syb - sajson - - salak - salak-toml - salak-yaml - Salsa @@ -8473,7 +8243,6 @@ broken-packages: - scenegraph - schedevr - schedule-planner - - scheduler - schedyield - schematic - scholdoc @@ -8481,6 +8250,7 @@ broken-packages: - scholdoc-texmath - scholdoc-types - SciBaseTypes + - scidb-hquery - science-constants-dimensional - SciFlow - SciFlow-drmaa @@ -8532,21 +8302,18 @@ broken-packages: - SelectSequencesFromMSA - selenium - selenium-server - - self-extract - selinux - Semantique - semdoc - semi-iso - semialign - semialign-indexed - - semibounded-lattices - Semigroup - semigroupoids-syntax - semigroups-actions - semilattices - semiring - semiring-num - - semver-range - sendgrid-haskell - sendgrid-v3 - sensei @@ -8599,7 +8366,6 @@ broken-packages: - servant-pool - servant-postgresql - servant-proto-lens - - servant-purescript - servant-pushbullet-client - servant-py - servant-quickcheck @@ -8684,7 +8450,6 @@ broken-packages: - shorten-strings - ShortestPathProblems - showdown - - shower - shpider - shuffle - si-clock @@ -8692,7 +8457,6 @@ broken-packages: - sifflet - sifflet-lib - sigma-ij - - sign - signals - signed-multiset - silvi @@ -8725,7 +8489,6 @@ broken-packages: - simple-tabular - simple-tar - simple-templates - - simple-ui - simple-units - simple-vec3 - simple-zipper @@ -8738,7 +8501,6 @@ broken-packages: - simplenote - simpleprelude - SimpleServer - - simplest-sqlite - simseq - singleton-dict - singleton-typelits @@ -8770,13 +8532,11 @@ broken-packages: - Slides - slim - sloane - - slope-field - slot-lambda - sloth - slug - small-bytearray-builder - smallarray - - smallcaps - smallcheck-laws - smallcheck-lens - smallpt-hs @@ -8810,7 +8570,6 @@ broken-packages: - snap-configuration-utilities - snap-error-collector - snap-extras - - snap-language - snap-routes - snap-stream - snap-testing @@ -8910,7 +8669,6 @@ broken-packages: - sparsecheck - sparser - spata - - spatial-rotations - special-functors - special-keys - specialize-th @@ -8934,10 +8692,7 @@ broken-packages: - splot - Spock - Spock-api-ghcjs - - Spock-api-server - Spock-auth - - Spock-core - - Spock-digestive - Spock-lucid - Spock-worker - spoonutil @@ -8958,6 +8713,7 @@ broken-packages: - sqlvalue-list - sqsd-local - squeal-postgresql + - squeeze - srcinst - sscan - sscgi @@ -8996,7 +8752,6 @@ broken-packages: - stackage-upload - stackage2nix - standalone-derive-topdown - - standalone-haddock - starling - stash - Stasis @@ -9017,9 +8772,7 @@ broken-packages: - statsd - statsd-client - statsdi - - staversion - stb-image-redux - - stb-truetype - stdata - stdf - stdio @@ -9029,13 +8782,11 @@ broken-packages: - stemmer-german - stepwise - stgi - - STL - stm-chunked-queues - stm-containers - stm-firehose - stm-hamt - stm-io-hooks - - stm-lifted - stm-promise - stm-stats - stmcontrol @@ -9059,15 +8810,11 @@ broken-packages: - stream-monad - streamdeck - streamed - - streaming-benchmarks - streaming-brotli - streaming-cassava - - streaming-concurrency - streaming-conduit - streaming-fft - streaming-lzma - - streaming-osm - - streaming-pcap - streaming-png - streaming-postgresql-simple - streaming-process @@ -9086,7 +8833,6 @@ broken-packages: - stripe-haskell - stripe-http-client - stripe-http-streams - - strongswan-sql - structural-induction - structural-traversal - structured-mongoDB @@ -9099,7 +8845,6 @@ broken-packages: - subleq-toolchain - submark - subsample - - substring-parser - subwordgraph - successors - suffix-array @@ -9129,8 +8874,8 @@ broken-packages: - SVD2HS - svfactor - svg-builder-fork - - SVG2Q - svg2q + - SVG2Q - svgutils - svm-simple - svndump @@ -9149,7 +8894,6 @@ broken-packages: - sym-plot - symantic - symantic-cli - - symantic-grammar - symantic-http-test - symantic-lib - symengine @@ -9157,7 +8901,6 @@ broken-packages: - sync - sync-mht - syncthing-hs - - syntactic - syntax - syntax-attoparsec - syntax-example @@ -9184,11 +8927,10 @@ broken-packages: - t3-server - ta - table - - table-layout - table-tennis - tableaux - - Tables - tables + - Tables - tablestorage - Tablify - tabloid @@ -9230,7 +8972,6 @@ broken-packages: - tasty-jenkins-xml - tasty-laws - tasty-lens - - tasty-quickcheck-laws - tasty-stats - tasty-tap - tasty-travis @@ -9244,7 +8985,6 @@ broken-packages: - tcp - tcp-streams-openssl - tdd-util - - tdigest-Chart - tds - TeaHS - teams @@ -9277,7 +9017,6 @@ broken-packages: - terminal-punch - terminal-text - termination-combinators - - termonad - termplot - terntup - terrahs @@ -9343,7 +9082,6 @@ broken-packages: - th-typegraph - thank-you-stars - theatre - - themoviedb - thentos-cookie-session - Theora - theoremquest @@ -9355,14 +9093,12 @@ broken-packages: - Thingie - thorn - threadmanager - - threads-supervisor - threadscope - threepenny-gui-contextmenu - threepenny-gui-flexbox - thrift - throttled-io-loop - through-text - - throwable-exceptions - thumbnail-plus - tic-tac-toe - tickle @@ -9381,7 +9117,6 @@ broken-packages: - time-http - time-io-access - time-machine - - time-parsers - time-quote - time-recurrence - time-series @@ -9420,7 +9155,6 @@ broken-packages: - to-string-class - to-string-instances - toboggan - - todo - todos - tofromxml - toilet @@ -9434,8 +9168,8 @@ broken-packages: - tomland - too-many-cells - toodles - - Top - top + - Top - topkata - torch - TORCS @@ -9453,9 +9187,7 @@ broken-packages: - trace-function-call - traced - tracetree - - tracing - tracker - - trackit - traction - tracy - traildb @@ -9476,10 +9208,6 @@ broken-packages: - translatable-intset - translate - translate-cli - - trasa - - trasa-client - - trasa-server - - trasa-th - travis - travis-meta-yaml - trawl @@ -9509,7 +9237,6 @@ broken-packages: - tries - trigger - trimpolya - - triplesec - tripLL - trivia - tropical @@ -9540,7 +9267,6 @@ broken-packages: - twee - tweet-hs - twentefp-eventloop-graphics - - twentefp-eventloop-trees - twentefp-graphs - twentefp-rosetree - twentefp-trees @@ -9619,7 +9345,6 @@ broken-packages: - unagi-bloomfilter - unagi-streams - unamb-custom - - unbeliever - unbound - unbounded-delays-units - unboxed-containers @@ -9661,7 +9386,6 @@ broken-packages: - unsequential - unused - uom-plugin - - up - update-nix-fetchgit - Updater - uploadcare @@ -9681,7 +9405,6 @@ broken-packages: - urldecode - UrlDisp - urldisp-happstack - - urlpath - URLT - urn - urn-random @@ -9707,6 +9430,7 @@ broken-packages: - uuagc-bootstrap - uuagc-diagrams - uuid-aeson + - uuid-orphans - uvector - uvector-algorithms - uxadt @@ -9717,7 +9441,6 @@ broken-packages: - vacuum-graphviz - vacuum-opengl - vacuum-ubigraph - - vado - valid-names - validate-input - validated-literals @@ -9731,7 +9454,6 @@ broken-packages: - variable-precision - variables - variation - - vault-tool - vault-tool-server - vault-trans - vaultaire-common @@ -9740,7 +9462,6 @@ broken-packages: - vcf - vcsgui - vcswrapper - - vec - Vec-Boolean - Vec-OpenGLRaw - Vec-Transform @@ -9751,7 +9472,6 @@ broken-packages: - vector-clock - vector-conduit - vector-endian - - vector-extras - vector-functorlazy - vector-heterogenous - vector-instances-collections @@ -9769,7 +9489,6 @@ broken-packages: - verilog - versioning - versioning-servant - - vflow-types - vfr-waypoints - vgrep - vhd @@ -9779,7 +9498,6 @@ broken-packages: - views - vigilance - Villefort - - vimeta - vimus - vintage-basic - vinyl-json @@ -9809,7 +9527,6 @@ broken-packages: - vty-ui - vty-ui-extras - vulkan - - vulkan-api - waargonaut - wacom-daemon - waddle @@ -9844,7 +9561,6 @@ broken-packages: - wai-request-spec - wai-responsible - wai-router - - wai-routes - wai-routing - wai-secure-cookies - wai-session-alt @@ -9899,12 +9615,12 @@ broken-packages: - webfinger-client - webify - webkit-javascriptcore - - webkit2gtk3-javascriptcore - Webrexp - webserver - webshow - websockets-rpc - webwire + - weekdaze - weighted - weighted-regexp - welshy @@ -9919,7 +9635,6 @@ broken-packages: - whiskers - whitespace - why3 - - wide-word - WikimediaParser - wikipedia4epub - wild-bind-indicator @@ -9931,7 +9646,6 @@ broken-packages: - Wired - wires - wiring - - withdependencies - wkt - wkt-geom - wl-pprint-ansiterm @@ -9945,7 +9659,6 @@ broken-packages: - wolf - word2vec-model - WordAlignment - - wordchoice - wordify - WordNet - WordNet-ghc74 @@ -9969,8 +9682,6 @@ broken-packages: - writer-cps-lens - writer-cps-monads-tf - writer-cps-morph - - ws - - ws-chans - wsdl - wsedit - wss-client @@ -10035,7 +9746,6 @@ broken-packages: - xml2x - xmlbf-xmlhtml - XmlHtmlWriter - - XMLParser - xmltv - XMMS - xmms2-client @@ -10070,8 +9780,6 @@ broken-packages: - yahoo-web-search - yajl - yajl-enumerator - - yam - - yam-datasource - yam-job - yam-redis - yam-servant @@ -10100,7 +9808,6 @@ broken-packages: - yate - yavie - yaya - - yaya-hedgehog - yaya-unsafe - ycextra - yeller @@ -10134,7 +9841,6 @@ broken-packages: - yesod-dsl - yesod-examples - yesod-fast-devel - - yesod-fay - yesod-form-richtext - yesod-gitrev - yesod-goodies @@ -10145,7 +9851,6 @@ broken-packages: - yesod-mangopay - yesod-paginate - yesod-pagination - - yesod-paginator - yesod-paypal-rest - yesod-platform - yesod-pnotify @@ -10222,9 +9927,7 @@ broken-packages: - zeromq3-haskell - zeromq4-clone-pattern - zeromq4-conduit - - zeromq4-haskell == 0.7.* - zeromq4-patterns - - zeromq4-simple - zeroth - ZFS - zifter @@ -10254,7 +9957,5 @@ broken-packages: - zre - zsh-battery - zsyntax - - ztar - zuramaru - Zwaluw - - zxcvbn-c diff --git a/pkgs/development/haskell-modules/configuration-nix.nix b/pkgs/development/haskell-modules/configuration-nix.nix index 8f35799af05..9d40b8d98a2 100644 --- a/pkgs/development/haskell-modules/configuration-nix.nix +++ b/pkgs/development/haskell-modules/configuration-nix.nix @@ -492,7 +492,11 @@ self: super: builtins.intersectAttrs super { servant-streaming-server = dontCheck super.servant-streaming-server; # https://github.com/haskell-servant/servant/pull/1128 - servant-client-core = appendPatch super.servant-client-core ./patches/servant-client-core-streamBody.patch; + servant-client-core = if (pkgs.lib.getVersion super.servant-client-core) == "0.15" then + appendPatch super.servant-client-core ./patches/servant-client-core-streamBody.patch + else + super.servant-client-core; + # tests run executable, relying on PATH # without this, tests fail with "Couldn't launch intero process" diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix index 712a918ebfe..c7443a42e5b 100644 --- a/pkgs/development/haskell-modules/hackage-packages.nix +++ b/pkgs/development/haskell-modules/hackage-packages.nix @@ -1104,20 +1104,21 @@ self: { }) {}; "AspectAG" = callPackage - ({ mkDerivation, base, containers, HList, mtl, template-haskell }: + ({ mkDerivation, base, containers, ghc-prim, mtl, tagged + , template-haskell, th-strict-compat + }: mkDerivation { pname = "AspectAG"; - version = "0.3.6.1"; - sha256 = "01pglvf38v5ii2w03kdlgngxbb3ih0j5bsilv5qwc9vrh2iwirhf"; - revision = "1"; - editedCabalFile = "0w0098491vypmvhpy23bzs2vdbym4qfllxymysc1j4gjx8q81dnm"; + version = "0.5.0.0"; + sha256 = "039k40swscsg21b4k4a3q95migvkflcp7sgx2a8gpzanrkx3ckz2"; + revision = "2"; + editedCabalFile = "1afrgn3hhkfrb3khfnbj7x9p4dh8j682zjhp5lc7s7syr8zp8pxy"; libraryHaskellDepends = [ - base containers HList mtl template-haskell + base containers ghc-prim mtl tagged template-haskell + th-strict-compat ]; - description = "Attribute Grammars in the form of an EDSL"; - license = "LGPL"; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; + description = "Strongly typed Attribute Grammars implemented using type-level programming"; + license = stdenv.lib.licenses.gpl3; }) {}; "AttoBencode" = callPackage @@ -2874,8 +2875,6 @@ self: { ]; description = "A library for generating 2D Charts and Plots"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "Chart-cairo" = callPackage @@ -2892,8 +2891,6 @@ self: { ]; description = "Cairo backend for Charts"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "Chart-diagrams" = callPackage @@ -2915,8 +2912,6 @@ self: { ]; description = "Diagrams backend for Charts"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "Chart-gtk" = callPackage @@ -2933,8 +2928,6 @@ self: { ]; description = "Utility functions for using the chart library with GTK"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "Chart-simple" = callPackage @@ -4547,8 +4540,6 @@ self: { testHaskellDepends = [ base containers MonadRandom ]; description = "A Haskell library for probability distributions"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "DistanceTransform" = callPackage @@ -4903,8 +4894,6 @@ self: { ]; description = "Auto Korean conjugator/adjustor/adopter/converter"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "Earley" = callPackage @@ -6600,8 +6589,6 @@ self: { ]; description = "Typesafe functional GPU graphics programming"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "GPipe-Collada" = callPackage @@ -9695,8 +9682,6 @@ self: { testHaskellDepends = [ base hspec QuickCheck ]; description = "A library for arbitrary precision decimal numbers"; license = stdenv.lib.licenses.asl20; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "HasCacBDD" = callPackage @@ -11134,8 +11119,6 @@ self: { libraryHaskellDepends = [ base parsec ]; description = "Parse JSON"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "JSONb" = callPackage @@ -13991,8 +13974,6 @@ self: { testHaskellDepends = [ base ]; description = "Remove all the functions come from Debug.Trace after debugging"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "Noise" = callPackage @@ -17083,8 +17064,6 @@ self: { libraryHaskellDepends = [ attoparsec base bytestring cereal text ]; description = "STL 3D geometry format parsing and pretty-printing"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "STLinkUSB" = callPackage @@ -17130,15 +17109,17 @@ self: { }) {}; "STMonadTrans" = callPackage - ({ mkDerivation, array, base, Cabal, mtl }: + ({ mkDerivation, array, base, mtl, tasty, tasty-hunit + , tasty-quickcheck, transformers + }: mkDerivation { pname = "STMonadTrans"; - version = "0.4.3"; - sha256 = "1nr26fnmi5fdjc6d00w13kjhmfyvb5b837d0006w4dj0yxndaksp"; - revision = "1"; - editedCabalFile = "09kqrv9a4yhsdpix49h9qjw0j2fhxrgkjnfrnyxg1nspmqrvl50m"; + version = "0.4.4"; + sha256 = "00vih8xi5jf4jc4h6i9jwxb29w40gx8lakcg3fc1900b0r02ms0s"; libraryHaskellDepends = [ array base mtl ]; - testHaskellDepends = [ array base Cabal mtl ]; + testHaskellDepends = [ + base tasty tasty-hunit tasty-quickcheck transformers + ]; description = "A monad transformer version of the ST monad"; license = stdenv.lib.licenses.bsd3; }) {}; @@ -18153,8 +18134,6 @@ self: { libraryHaskellDepends = [ base hvect mtl Spock-api Spock-core ]; description = "Another Haskell web framework for rapid development"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "Spock-auth" = callPackage @@ -18196,8 +18175,6 @@ self: { ]; description = "Another Haskell web framework for rapid development"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "Spock-digestive" = callPackage @@ -18214,8 +18191,6 @@ self: { ]; description = "Digestive functors support for Spock"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "Spock-lucid" = callPackage @@ -20581,8 +20556,6 @@ self: { libraryHaskellDepends = [ base parsec ]; description = "A library to parse xml"; license = stdenv.lib.licenses.gpl3; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "XMMS" = callPackage @@ -21578,8 +21551,6 @@ self: { ]; description = "Accelerate backend component generating LLVM IR"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "accelerate-llvm-native" = callPackage @@ -23253,8 +23224,6 @@ self: { ]; description = "Extra goodies for aeson"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "aeson-extra_0_4_1_2" = callPackage @@ -23284,7 +23253,6 @@ self: { description = "Extra goodies for aeson"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "aeson-filthy" = callPackage @@ -24312,8 +24280,6 @@ self: { ]; description = "Cairo-based charting backend for the Aivika simulation library"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "aivika-experiment-chart" = callPackage @@ -24331,8 +24297,6 @@ self: { ]; description = "Simulation experiments with charting for the Aivika library"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "aivika-experiment-diagrams" = callPackage @@ -24349,8 +24313,6 @@ self: { ]; description = "Diagrams-based charting backend for the Aivika simulation library"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "aivika-gpss" = callPackage @@ -25926,8 +25888,6 @@ self: { ]; description = "Amazon Cognito Identity SDK"; license = stdenv.lib.licenses.mpl20; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "amazonka-cognito-idp" = callPackage @@ -26281,8 +26241,6 @@ self: { ]; description = "Amazon EC2 Container Service SDK"; license = stdenv.lib.licenses.mpl20; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "amazonka-efs" = callPackage @@ -27911,6 +27869,34 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "amqp_0_18_3" = 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.18.3"; + sha256 = "1cyzazl3hz5yd2i220b4g8xs0fm47xqlwyvgarxbnn5gnrm8ys21"; + 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 @@ -32142,8 +32128,6 @@ self: { ]; description = "A modified version of async that supports worker groups and many-to-many task dependencies"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "async-refresh" = callPackage @@ -32624,8 +32608,8 @@ self: { }: mkDerivation { pname = "ats-pkg"; - version = "3.2.5.16"; - sha256 = "044i1a6faw7r7ds910wk99mmg09ks1gdzc1md114nml614n3fqih"; + version = "3.2.5.17"; + sha256 = "0ss71fn4d1grasgm1rvg7y4sngfnhsknmf6gxby0yvwfm95fi8aj"; isLibrary = true; isExecutable = true; enableSeparateDataOutput = true; @@ -32907,8 +32891,6 @@ self: { ]; description = "Parse IP data types with attoparsec"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "attoparsec-iso8601" = callPackage @@ -33052,8 +33034,6 @@ self: { ]; description = "URI parser / printer using attoparsec"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "attoparsec-varword" = callPackage @@ -33399,6 +33379,19 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "auto-update_0_1_6" = callPackage + ({ mkDerivation, base, exceptions, hspec, HUnit, retry }: + mkDerivation { + pname = "auto-update"; + version = "0.1.6"; + sha256 = "1i36xc2i34aync8271x3pv515l3zb53i518dybn8ghqkhzf27q7l"; + libraryHaskellDepends = [ base ]; + testHaskellDepends = [ base exceptions hspec HUnit retry ]; + description = "Efficiently run periodic, on-demand actions"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "autoexporter" = callPackage ({ mkDerivation, base, Cabal, directory, filepath }: mkDerivation { @@ -35192,6 +35185,19 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "bank-holidays-england_0_2_0_1" = callPackage + ({ mkDerivation, base, containers, hspec, QuickCheck, time }: + mkDerivation { + pname = "bank-holidays-england"; + version = "0.2.0.1"; + sha256 = "0vnadqs924k54f5zdm0airnss47gafqbrak59wvrmc667xn01k0h"; + libraryHaskellDepends = [ base containers time ]; + testHaskellDepends = [ base containers hspec QuickCheck time ]; + description = "Calculation of bank holidays in England and Wales"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "banwords" = callPackage ({ mkDerivation, attoparsec, base, bytestring, data-default, HUnit , test-framework, test-framework-hunit, text, vector @@ -35229,6 +35235,23 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "barbies_1_1_3_0" = callPackage + ({ mkDerivation, base, bifunctors, QuickCheck, tasty, tasty-hunit + , tasty-quickcheck + }: + mkDerivation { + pname = "barbies"; + version = "1.1.3.0"; + sha256 = "0fb7d0fr46zm8y00nipq8vvq5fvhsx41jj52zvz27f690azpj961"; + libraryHaskellDepends = [ base bifunctors ]; + testHaskellDepends = [ + base QuickCheck tasty tasty-hunit tasty-quickcheck + ]; + description = "Classes for working with types that can change clothes"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "barchart" = callPackage ({ mkDerivation, base, cmdargs, csv, diagrams, filepath }: mkDerivation { @@ -36414,8 +36437,6 @@ self: { ]; description = "Connection layer between beam and postgres"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "beam-sqlite" = callPackage @@ -36616,6 +36637,8 @@ self: { pname = "bench"; version = "1.0.12"; sha256 = "1sy97qpv6paar2d5syppk6lc06wjx6qyz5aidsmh30jq853nydx6"; + revision = "1"; + editedCabalFile = "0sk6vkjwk7g1diwah67ifj7s69qvwi52ngaijkfx5prn0vz24ldn"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -36639,8 +36662,6 @@ self: { testHaskellDepends = [ base split text ]; description = "Plot and compare benchmarks"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "bench-show" = callPackage @@ -36659,8 +36680,6 @@ self: { testHaskellDepends = [ base split text ]; description = "Show, plot and compare benchmark results"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "benchmark-function" = callPackage @@ -36904,8 +36923,6 @@ self: { ]; description = "A horizontal version of tetris for braille users"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "between" = callPackage @@ -36989,8 +37006,6 @@ self: { libraryHaskellDepends = [ attoparsec base bytestring time ]; description = "Parse BgMax-files"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "bgzf" = callPackage @@ -38904,8 +38919,6 @@ self: { ]; description = "Aggregate continuous values into discrete bins"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "bio" = callPackage @@ -39278,6 +39291,8 @@ self: { ]; description = "Plays chess"; license = "GPL"; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "bit-array" = callPackage @@ -41098,14 +41113,14 @@ self: { }) {}; "board-games" = callPackage - ({ mkDerivation, array, base, cgi, containers, html, httpd-shed - , network-uri, non-empty, QuickCheck, random, transformers - , utility-ht + ({ mkDerivation, array, base, cgi, containers, criterion, html + , httpd-shed, network-uri, non-empty, QuickCheck, random + , transformers, utility-ht }: mkDerivation { pname = "board-games"; - version = "0.2"; - sha256 = "1plgnwlpx0bw0wjwd0dxbh616vy37frclwir692x1fr2lq85y98c"; + version = "0.2.1"; + sha256 = "1gsbk1m58f82b1ic0fv1ygslz4lyxxdl0a849q5hl4qbl9s7rbqb"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -41120,6 +41135,9 @@ self: { array base containers non-empty QuickCheck random transformers utility-ht ]; + benchmarkHaskellDepends = [ + base containers criterion non-empty utility-ht + ]; description = "Three games for inclusion in a web server"; license = "GPL"; }) {}; @@ -41659,14 +41677,14 @@ self: { pname = "boring"; version = "0.1.2"; sha256 = "0978dq53rpb7clz1ydjm6x38nrx0vkp3safqcbjp2kq6jlaz29jr"; + revision = "1"; + editedCabalFile = "010k2mw8q3iby78ak56xamp6pzdwijn92r64r76hblw32k1i80c0"; libraryHaskellDepends = [ adjunctions base base-compat constraints dec fin generics-sop singleton-bool streams tagged transformers transformers-compat vec ]; description = "Boring and Absurd types"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "boring-game" = callPackage @@ -41784,8 +41802,6 @@ self: { ]; description = "ScopeH and ScopeT extras for bound"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "bound-gen" = callPackage @@ -42088,8 +42104,8 @@ self: { }: mkDerivation { pname = "brick"; - version = "0.47"; - sha256 = "1glj71qajc2rdn9akhhh0yryhps57s33x0i2fb4mf12zg8pp5kj7"; + version = "0.47.1"; + sha256 = "0s0frxr6spgxzzvnym8rf40wj261clv7yfy2fxgm8iyjrr0ki49h"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -42348,8 +42364,6 @@ self: { ]; description = "Haskell source code formatter"; license = stdenv.lib.licenses.agpl3; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "broadcast-chan" = callPackage @@ -42364,8 +42378,6 @@ self: { benchmarkHaskellDepends = [ async base criterion deepseq stm ]; description = "Closable, fair, single-wakeup channel type that avoids 0 reader space leaks"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "broadcast-chan-conduit" = callPackage @@ -43384,8 +43396,6 @@ self: { ]; description = "Chops a command or program invocation into digestable pieces"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "butter" = callPackage @@ -43655,16 +43665,16 @@ self: { }) {}; "byteslice" = callPackage - ({ mkDerivation, base, primitive }: + ({ mkDerivation, base, primitive, primitive-addr }: mkDerivation { pname = "byteslice"; - version = "0.1.0.0"; - sha256 = "13qzkhj2ify1q097n1zrjwjkw2803153vp9a4281i5idkm7x9pfg"; - revision = "1"; - editedCabalFile = "191drdfs4frgg5pg7fa0qh5ikik9lnm6kbrj1bmmnmzr4s9vdklv"; - libraryHaskellDepends = [ base primitive ]; - description = "Slicing ByteArray and MutableByteArray"; + version = "0.1.1.0"; + sha256 = "08abffrd6psiab220d8081lcs7ba7fvr7waqzykdk8i5dcm9iyvb"; + libraryHaskellDepends = [ base primitive primitive-addr ]; + description = "Slicing managed and unmanaged memory"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "bytestring_0_10_8_2" = callPackage @@ -43702,8 +43712,6 @@ self: { ]; description = "Arbitrary instances for ByteStrings"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "bytestring-builder" = callPackage @@ -44825,8 +44833,6 @@ self: { doCheck = false; description = "Simple interface to some of Cabal's configuration state, mainly used by ghc-mod"; license = stdenv.lib.licenses.gpl3; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "cabal-info" = callPackage @@ -45734,6 +45740,44 @@ self: { license = stdenv.lib.licenses.asl20; }) {}; + "cachix_0_2_1" = callPackage + ({ mkDerivation, async, base, base16-bytestring, base64-bytestring + , bytestring, cachix-api, conduit, conduit-extra, cookie + , cryptonite, dhall, directory, ed25519, filepath, fsnotify, here + , hspec, hspec-discover, http-client, http-client-tls, http-conduit + , http-types, lzma-conduit, megaparsec, memory, mmorph, netrc + , optparse-applicative, process, protolude, resourcet, retry + , safe-exceptions, servant, servant-auth, servant-auth-client + , servant-client, servant-client-core, servant-conduit, temporary + , text, unix, uri-bytestring, versions + }: + mkDerivation { + pname = "cachix"; + version = "0.2.1"; + sha256 = "1yz0qfpp8d2n4h9k9cy394zgqg24vvb9ahzxdsvabjwbpmg9sijv"; + isLibrary = true; + isExecutable = true; + enableSeparateDataOutput = true; + libraryHaskellDepends = [ + async base base16-bytestring base64-bytestring bytestring + cachix-api conduit conduit-extra cookie cryptonite dhall directory + ed25519 filepath fsnotify here http-client http-client-tls + http-conduit http-types lzma-conduit megaparsec memory mmorph netrc + optparse-applicative process protolude resourcet retry + safe-exceptions servant servant-auth servant-auth-client + servant-client servant-client-core servant-conduit text unix + uri-bytestring versions + ]; + executableHaskellDepends = [ base cachix-api ]; + executableToolDepends = [ hspec-discover ]; + testHaskellDepends = [ + base cachix-api directory here hspec protolude temporary + ]; + description = "Command line client for Nix binary cache hosting https://cachix.org"; + license = stdenv.lib.licenses.asl20; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "cachix-api" = callPackage ({ mkDerivation, aeson, base, base16-bytestring, bytestring , conduit, cookie, cryptonite, deepseq, exceptions, hspec @@ -45769,6 +45813,42 @@ self: { license = stdenv.lib.licenses.asl20; }) {}; + "cachix-api_0_2_1" = callPackage + ({ mkDerivation, aeson, base, base16-bytestring, bytestring + , conduit, cookie, cryptonite, deepseq, exceptions, hspec + , hspec-discover, http-api-data, http-media, lens, memory + , protolude, resourcet, servant, servant-auth, servant-auth-server + , servant-auth-swagger, servant-client, servant-swagger + , servant-swagger-ui-core, string-conv, swagger2, text + , transformers + }: + mkDerivation { + pname = "cachix-api"; + version = "0.2.1"; + sha256 = "1ja724ji12whjhyw135yi2fq323a65h4bj37r43b5d9ir1c04g67"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + aeson base base16-bytestring bytestring conduit cookie cryptonite + deepseq exceptions http-api-data http-media lens memory resourcet + servant servant-auth servant-auth-server servant-auth-swagger + servant-client servant-swagger string-conv swagger2 text + transformers + ]; + executableHaskellDepends = [ aeson base ]; + testHaskellDepends = [ + aeson base base16-bytestring bytestring conduit cookie cryptonite + hspec http-api-data http-media lens memory protolude servant + servant-auth servant-auth-server servant-auth-swagger + servant-swagger servant-swagger-ui-core string-conv swagger2 text + transformers + ]; + testToolDepends = [ hspec-discover ]; + description = "Servant HTTP API specification for https://cachix.org"; + license = stdenv.lib.licenses.asl20; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "cacophony" = callPackage ({ mkDerivation, aeson, async, attoparsec, base, base16-bytestring , bytestring, criterion, cryptonite, deepseq, directory, exceptions @@ -45794,8 +45874,6 @@ self: { ]; description = "A library implementing the Noise protocol"; license = stdenv.lib.licenses.publicDomain; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "caf" = callPackage @@ -46279,8 +46357,6 @@ self: { libraryHaskellDepends = [ arithmoi array base containers random ]; description = "Arithmetic for Psychedelically Large Numbers"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "canonical-filepath" = callPackage @@ -46516,8 +46592,6 @@ self: { ]; description = "Extensional capabilities and deriving combinators"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "capataz" = callPackage @@ -47410,8 +47484,6 @@ self: { ]; description = "io-streams interface for the cassava CSV library"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "cassette" = callPackage @@ -50918,8 +50990,8 @@ self: { }: mkDerivation { pname = "clckwrks"; - version = "0.24.0.12"; - sha256 = "1m14nnxwkgn68f0hc1sbbn29vrlrwl2bs102rn1h0czcy6nwg2cx"; + version = "0.24.0.15"; + sha256 = "1b9cjx4i196rdj1p4w243rk6pxk8h2fnwda9jadzj61nxz5sc3xv"; enableSeparateDataOutput = true; setupHaskellDepends = [ base Cabal ]; libraryHaskellDepends = [ @@ -53395,8 +53467,6 @@ self: { libraryHaskellDepends = [ accelerate base ]; description = "Working with colours in Accelerate"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "colour-space" = callPackage @@ -53720,8 +53790,6 @@ self: { ]; description = "Arrays where the index type is a function of the shape type"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "comfort-graph" = callPackage @@ -53756,8 +53824,6 @@ self: { ]; description = "A format for describing comics"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "comma" = callPackage @@ -54350,8 +54416,6 @@ self: { ]; description = "Monad for allocation and cleanup of application resources"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "componentm-devel" = callPackage @@ -54365,8 +54429,6 @@ self: { ]; description = "Easy REPL driven development using ComponentM"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "composable-associations" = callPackage @@ -55105,8 +55167,6 @@ self: { ]; description = "Benchmarks to compare concurrency APIs"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "concurrent-barrier" = callPackage @@ -55534,8 +55594,6 @@ self: { ]; description = "Conduit-based algorithms"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "conduit-audio" = callPackage @@ -55814,8 +55872,6 @@ self: { libraryHaskellDepends = [ base conduit mtl ]; description = "Merge multiple sorted conduits"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "conduit-network-stream" = callPackage @@ -55943,8 +55999,6 @@ self: { ]; description = "Virtual file system for Conduit; disk, pure, and in-memory impls"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "conduit-vfs-zip" = callPackage @@ -55971,8 +56025,6 @@ self: { ]; description = "Zip archive interface for the Conduit Virtual File System"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "conduit-zstd" = callPackage @@ -55991,8 +56043,6 @@ self: { ]; description = "Conduit-based ZStd Compression"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "conf" = callPackage @@ -56062,8 +56112,6 @@ self: { text transformers ]; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "confcrypt_0_2_3_3" = callPackage @@ -56100,7 +56148,6 @@ self: { ]; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "confetti" = callPackage @@ -56642,8 +56689,6 @@ self: { ]; description = "Interpret the command line and a config file as commands and options"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "console-prompt" = callPackage @@ -56921,8 +56966,6 @@ self: { executableHaskellDepends = [ aeson base constraints ]; description = "Utility package for constraints"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "constrictor" = callPackage @@ -57417,8 +57460,6 @@ self: { testHaskellDepends = [ base containers stm time ]; description = "Event scheduling system"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "control-iso" = callPackage @@ -57878,8 +57919,6 @@ self: { ]; description = "A stream DSL for writing embedded C programs"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "copilot-c99" = callPackage @@ -57897,8 +57936,6 @@ self: { ]; description = "A compiler for Copilot targeting C99"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "copilot-cbmc" = callPackage @@ -57930,8 +57967,6 @@ self: { ]; description = "An intermediate representation for Copilot"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "copilot-language" = callPackage @@ -57948,8 +57983,6 @@ self: { ]; description = "A Haskell-embedded DSL for monitoring hard real-time distributed systems"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "copilot-libraries" = callPackage @@ -57965,8 +57998,6 @@ self: { ]; description = "Libraries for the Copilot language"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "copilot-sbv" = callPackage @@ -58001,8 +58032,6 @@ self: { ]; description = "k-induction for Copilot"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "copr" = callPackage @@ -60587,8 +60616,6 @@ self: { ]; description = "a gallery of Csound instruments"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "csound-expression" = callPackage @@ -61225,8 +61252,6 @@ self: { testHaskellDepends = [ base directory hspec hspec-expectations ]; description = "A framework for declaratively writing curl based API tests"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "curlhs" = callPackage @@ -61610,8 +61635,6 @@ self: { ]; description = "A subfield of the complex numbers for exact calculation"; license = stdenv.lib.licenses.gpl3; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "cypher" = callPackage @@ -63227,8 +63250,6 @@ self: { ]; description = "Interval datatype, interval arithmetic and interval-based containers"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "data-inttrie" = callPackage @@ -66984,8 +67005,6 @@ self: { ]; description = "Type, render and parse the df1 hierarchical structured log format"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "dfinity-radix-tree" = callPackage @@ -67142,6 +67161,8 @@ self: { pname = "dhall"; version = "1.24.0"; sha256 = "1n04jk45qjl00wx7gxzp36j7d1m1ca7h7y4qlp8gxhykpkr6zzv7"; + revision = "1"; + editedCabalFile = "1b0gqva12rh0fynddal7q8jy6i3yax79br8xbfp9kh7936w9cs1j"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -67268,6 +67289,8 @@ self: { pname = "dhall-json"; version = "1.3.0"; sha256 = "176i30shaklranbhmb4m4zqn13cn9hd6lqiqdjv9qmckkapbkjpi"; + revision = "1"; + editedCabalFile = "101xfp3zg9i7qyibknjpcdhha8sc024xmylphiwb509h3fjy3yks"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -67336,6 +67359,8 @@ self: { pname = "dhall-text"; version = "1.0.18"; sha256 = "1nwvj67glqyn5yd62ni16wqppv8d3hy7d9aw87p35zkch1vr8vsd"; + revision = "1"; + editedCabalFile = "1dynw76kmca5l43jqrmgmzbdd7hqixiyfpb4pcx4dzr6ghar49s7"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -67353,16 +67378,16 @@ self: { }: mkDerivation { pname = "dhall-to-cabal"; - version = "1.3.3.0"; - sha256 = "0nh7sn8hzm38prx4c2h9azw351gns4mscjnn7dsgxpn34l5yyql7"; + version = "1.3.4.0"; + sha256 = "1z69nx98wgrjhgra0rw6lvsgnjzmqpixjwd673nvs79jg98yafm7"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ - base bytestring Cabal containers contravariant dhall filepath text - transformers vector + base bytestring Cabal containers contravariant dhall filepath + microlens text transformers vector ]; executableHaskellDepends = [ - base bytestring Cabal dhall directory filepath microlens + base bytestring Cabal containers dhall directory filepath microlens optparse-applicative prettyprinter text transformers ]; testHaskellDepends = [ @@ -67371,8 +67396,6 @@ self: { ]; description = "Compile Dhall expressions to Cabal files"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "dhcp-lease-parser" = callPackage @@ -67408,8 +67431,6 @@ self: { ]; description = "Typeful hierarchical structured logging using di, mtl and df1"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "di-core" = callPackage @@ -67448,8 +67469,6 @@ self: { ]; description = "Write logs in the df1 format using the di logging framework"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "di-handle" = callPackage @@ -67463,8 +67482,6 @@ self: { ]; description = "IO support for file handles in di-core"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "di-monad" = callPackage @@ -69660,8 +69677,6 @@ self: { testHaskellDepends = [ base binary hspec QuickCheck ]; description = "Serializable closures for distributed programming"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "distributed-fork" = callPackage @@ -69680,8 +69695,6 @@ self: { testHaskellDepends = [ base tasty tasty-hunit unix ]; description = "Like 'forkIO', but uses remote machines instead of local threads"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "distributed-fork-aws-lambda" = callPackage @@ -70489,6 +70502,28 @@ self: { broken = true; }) {}; + "dl-fedora" = callPackage + ({ mkDerivation, base, bytestring, directory, filepath + , http-directory, http-types, optparse-applicative, regex-posix + , simple-cmd, simple-cmd-args, text, unix, xdg-userdirs + }: + mkDerivation { + pname = "dl-fedora"; + version = "0.5"; + sha256 = "1zfdf2s8cq171ik3iwq0zcha60i3czpjiy9bqa5wxczbwp0jpaxa"; + isLibrary = false; + isExecutable = true; + executableHaskellDepends = [ + base bytestring directory filepath http-directory http-types + optparse-applicative regex-posix simple-cmd simple-cmd-args text + unix xdg-userdirs + ]; + description = "Fedora image download tool"; + license = stdenv.lib.licenses.gpl3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; + }) {}; + "dlist" = callPackage ({ mkDerivation, base, Cabal, deepseq, QuickCheck }: mkDerivation { @@ -70866,8 +70901,6 @@ self: { ]; description = "An API client for docker written in Haskell"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "docker-build-cacher" = callPackage @@ -71467,6 +71500,36 @@ self: { broken = true; }) {}; + "dotenv_0_8_0_1" = callPackage + ({ mkDerivation, base, base-compat, containers, directory + , exceptions, hspec, hspec-megaparsec, megaparsec + , optparse-applicative, process, text, transformers, yaml + }: + mkDerivation { + pname = "dotenv"; + version = "0.8.0.1"; + sha256 = "1mp6j3wcxiz75yjf9bnb4kc5gw09v0ax1fz0hhh9i2glxi53m27l"; + isLibrary = true; + isExecutable = true; + enableSeparateDataOutput = true; + libraryHaskellDepends = [ + base base-compat containers directory exceptions megaparsec process + text transformers yaml + ]; + executableHaskellDepends = [ + base base-compat megaparsec optparse-applicative process text + transformers yaml + ]; + testHaskellDepends = [ + base base-compat containers directory exceptions hspec + hspec-megaparsec megaparsec process text transformers yaml + ]; + description = "Loads environment variables from dotenv files"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; + }) {}; + "dotfs" = callPackage ({ mkDerivation, base, bytestring, containers, directory, filepath , haskell-src, HFuse, HUnit, parsec, process, QuickCheck @@ -72284,8 +72347,6 @@ self: { libraryHaskellDepends = [ base parsec ]; description = "Haskell Doge Serialized Object Notation Parser"; license = stdenv.lib.licenses.gpl3; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "dson-parsec" = callPackage @@ -73438,8 +73499,6 @@ self: { ]; description = "Pure, type-indexed haskell vector, matrix, and tensor library"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "easytensor-vulkan" = callPackage @@ -73451,8 +73510,6 @@ self: { libraryHaskellDepends = [ base dimensions easytensor vulkan-api ]; description = "Use easytensor with vulkan-api"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "easytest" = callPackage @@ -74032,6 +74089,19 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "effect-stack" = callPackage + ({ mkDerivation, base, constraints, mtl, transformers }: + mkDerivation { + pname = "effect-stack"; + version = "0.2.1"; + sha256 = "0sram572nbzpgwb3vi5fmg2f4ynsh693q05w0n5yjj8zl4a7p4ds"; + libraryHaskellDepends = [ base constraints mtl transformers ]; + description = "Reducing the pain of transformer stacks with duplicated effects"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; + }) {}; + "effective-aspects" = callPackage ({ mkDerivation, base, Cabal, ghc-prim, hashtables, HUnit, mtl , QuickCheck, test-framework, test-framework-hunit @@ -74083,8 +74153,6 @@ self: { libraryHaskellDepends = [ base containers newtype-generics void ]; description = "Computational Effects"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "effects-parser" = callPackage @@ -74096,8 +74164,6 @@ self: { libraryHaskellDepends = [ base effects ]; description = "Parser Effect for the Control.Effects Library"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "effin" = callPackage @@ -74536,8 +74602,6 @@ self: { testHaskellDepends = [ base ]; description = "Easily expose your EKG metrics to Prometheus"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "ekg-push" = callPackage @@ -75216,8 +75280,6 @@ self: { testHaskellDepends = [ base directory filepath tasty tasty-hunit ]; description = "A tiny language for understanding the lambda-calculus"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "emacs-keys" = callPackage @@ -75367,8 +75429,6 @@ self: { ]; description = "Perform basic syntax and deliverability checks on email addresses"; license = stdenv.lib.licenses.agpl3; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "emailaddress" = callPackage @@ -75494,8 +75554,6 @@ self: { testHaskellDepends = [ base containers HUnit ]; description = "Empirical Mode Decomposition and Hilbert-Huang Transform"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "emgm" = callPackage @@ -77853,17 +77911,18 @@ self: { ({ mkDerivation, aeson, array, attoparsec, base, blaze-html , bytestring, containers, file-embed, filepath, ghc-events , hashtables, hvega, mtl, optparse-applicative, semigroups, text + , time }: mkDerivation { pname = "eventlog2html"; - version = "0.1.0"; - sha256 = "0sa2bfj9697qgnxgc3ki6aw4i7jc0i9jl2a5shk0cgpks29h3xkx"; + version = "0.2.0"; + sha256 = "106jydjz8lg80xmj2ahllvqz57dfkf8qybm6nqib3hrw956igy4c"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ aeson array attoparsec base blaze-html bytestring containers file-embed filepath ghc-events hashtables hvega mtl - optparse-applicative semigroups text + optparse-applicative semigroups text time ]; executableHaskellDepends = [ aeson base filepath text ]; description = "Visualise an eventlog"; @@ -77886,8 +77945,6 @@ self: { ]; description = "A different take on an IO system. Based on Amanda's IO loop, this eventloop takes a function that maps input events to output events. It can easily be extended by modules that represent IO devices or join multiple modules together."; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "eventsource-api" = callPackage @@ -78228,8 +78285,6 @@ self: { libraryHaskellDepends = [ base template-haskell ]; description = "Exception type hierarchy with TemplateHaskell"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "exception-mailer" = callPackage @@ -79140,6 +79195,18 @@ self: { broken = true; }) {}; + "extend-record-data-th" = callPackage + ({ mkDerivation, attoparsec, base, template-haskell, text }: + mkDerivation { + pname = "extend-record-data-th"; + version = "0.1.0.2"; + sha256 = "1gy730iic17hiiqf08j4riz1086wpz6iv7i5carc04mi39zdjf4h"; + libraryHaskellDepends = [ attoparsec base template-haskell text ]; + testHaskellDepends = [ attoparsec base template-haskell text ]; + description = "TH to define a new record data type that extends the existing record data type"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "extended-categories" = callPackage ({ mkDerivation, base, constraints, ghc-prim, tagged }: mkDerivation { @@ -79269,8 +79336,6 @@ self: { testToolDepends = [ tasty-discover ]; description = "Message passing concurrency as extensible-effect"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "extensible-exceptions" = callPackage @@ -79499,6 +79564,8 @@ self: { ]; description = "Rational arithmetic in an irrational world"; license = "GPL"; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "facts" = callPackage @@ -79709,8 +79776,6 @@ self: { testHaskellDepends = [ base hspec random text time ]; description = "Randomly generated fake data"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "fake-type" = callPackage @@ -80202,8 +80267,6 @@ self: { benchmarkHaskellDepends = [ base bytestring criterion ]; description = "A fast, but bare bones, bytestring parser combinators library"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "fastpbkdf2" = callPackage @@ -80300,8 +80363,6 @@ self: { executableHaskellDepends = [ base mtl optparse-applicative split ]; description = "A compiler for Fay, a Haskell subset that compiles to JavaScript"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "fay-base" = callPackage @@ -80314,8 +80375,6 @@ self: { libraryHaskellDepends = [ base fay ]; description = "The base package for Fay"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "fay-builder" = callPackage @@ -80349,8 +80408,6 @@ self: { libraryHaskellDepends = [ fay-base ]; description = "DOM FFI wrapper library for Fay"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "fay-geoposition" = callPackage @@ -80363,8 +80420,6 @@ self: { libraryHaskellDepends = [ fay-base fay-text ]; description = "W3C compliant implementation of GeoPosition API"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "fay-hsx" = callPackage @@ -80391,8 +80446,6 @@ self: { libraryHaskellDepends = [ fay-base fay-text ]; description = "jQuery bindings for Fay"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "fay-ref" = callPackage @@ -80405,8 +80458,6 @@ self: { libraryHaskellDepends = [ fay-base ]; description = "Like IORef but for Fay"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "fay-simplejson" = callPackage @@ -80435,8 +80486,6 @@ self: { libraryHaskellDepends = [ fay fay-base text ]; description = "Fay Text type represented as JavaScript strings"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "fay-uri" = callPackage @@ -80449,8 +80498,6 @@ self: { libraryHaskellDepends = [ fay-base ]; description = "Persistent FFI bindings for using jsUri in Fay"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "fay-websockets" = callPackage @@ -80463,8 +80510,6 @@ self: { libraryHaskellDepends = [ fay-base ]; description = "Websockets FFI library for Fay"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "fb" = callPackage @@ -82140,8 +82185,21 @@ self: { testHaskellDepends = [ base inspection-testing tagged ]; description = "Nat and Fin: peano naturals and finite numbers"; license = stdenv.lib.licenses.bsd3; + }) {}; + + "fin_0_1" = callPackage + ({ mkDerivation, base, dec, deepseq, hashable, inspection-testing + , tagged + }: + mkDerivation { + pname = "fin"; + version = "0.1"; + sha256 = "17nv26cznhslrfb1ajcgxa9g3zacvk3prmncr7f8d7rvh42g2gnn"; + libraryHaskellDepends = [ base dec deepseq hashable ]; + testHaskellDepends = [ base inspection-testing tagged ]; + description = "Nat and Fin: peano naturals and finite numbers"; + license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "final" = callPackage @@ -82498,6 +82556,8 @@ self: { ]; description = "Calculates file-size frequency-distribution"; license = "GPL"; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "fit" = callPackage @@ -84062,6 +84122,18 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "fmlist_0_9_3" = callPackage + ({ mkDerivation, base }: + mkDerivation { + pname = "fmlist"; + version = "0.9.3"; + sha256 = "1w9nhm2zybdx4c1lalkajwqr8wcs731lfjld2r8gknd7y96x8pwf"; + libraryHaskellDepends = [ base ]; + description = "FoldMap lists"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "fmt" = callPackage ({ mkDerivation, base, base64-bytestring, bytestring, call-stack , containers, criterion, deepseq, doctest, doctest-discover @@ -86234,8 +86306,6 @@ self: { ]; description = "Attempt to pretty-print any input"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "friendly-time" = callPackage @@ -86306,8 +86376,6 @@ self: { ]; description = "A reactive frontend web framework"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "frontmatter" = callPackage @@ -86797,8 +86865,6 @@ self: { ]; description = "In-memory full text search engine"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "fullstop" = callPackage @@ -87435,6 +87501,8 @@ self: { pname = "fused-effects-exceptions"; version = "0.1.1.0"; sha256 = "0b9rj752ry72n6ln4fj9n6m2d1qfdxp229hzkgxznag0rr3bm5rd"; + revision = "1"; + editedCabalFile = "1sg9gvv5lf4z7h70szjcqilhxxjmkiyriz95qyvahplln9p6281l"; libraryHaskellDepends = [ base fused-effects safe-exceptions unliftio-core ]; @@ -87837,20 +87905,28 @@ self: { }) {}; "galois-field" = callPackage - ({ mkDerivation, base, criterion, integer-gmp, protolude, tasty - , tasty-discover, tasty-quickcheck + ({ mkDerivation, base, criterion, integer-gmp, MonadRandom + , protolude, tasty, tasty-discover, tasty-quickcheck + , wl-pprint-text }: mkDerivation { pname = "galois-field"; - version = "0.1.0"; - sha256 = "0s5sbnk8sn859s4v53qmyr04mvxryc5w26v8ig8ngac5354bwv9h"; - libraryHaskellDepends = [ base integer-gmp protolude ]; + version = "0.2.0"; + sha256 = "19q08k5aqnp1vcvlnlw6h4qmlh80dj1rglzckzf7ak78ifcwm1m8"; + libraryHaskellDepends = [ + base integer-gmp MonadRandom protolude tasty-quickcheck + wl-pprint-text + ]; testHaskellDepends = [ - base integer-gmp protolude tasty tasty-discover tasty-quickcheck + base integer-gmp MonadRandom protolude tasty tasty-discover + tasty-quickcheck wl-pprint-text ]; testToolDepends = [ tasty-discover ]; - benchmarkHaskellDepends = [ base criterion integer-gmp protolude ]; - description = "Galois field"; + benchmarkHaskellDepends = [ + base criterion integer-gmp MonadRandom protolude tasty-quickcheck + wl-pprint-text + ]; + description = "Galois field library"; license = stdenv.lib.licenses.mit; }) {}; @@ -88719,8 +88795,6 @@ self: { ]; description = "Derivation of Aeson instances using GHC generics"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "generic-arbitrary" = callPackage @@ -88905,6 +88979,26 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "generic-lens_1_2_0_0" = callPackage + ({ mkDerivation, base, criterion, deepseq, doctest, HUnit + , inspection-testing, lens, profunctors, QuickCheck, tagged, text + }: + mkDerivation { + pname = "generic-lens"; + version = "1.2.0.0"; + sha256 = "0qf49s01xkbhlfclc4a3ybhhf65g6mmigkkqj2psdjndgjdaxhb2"; + libraryHaskellDepends = [ base profunctors tagged text ]; + testHaskellDepends = [ + base doctest HUnit inspection-testing lens profunctors + ]; + benchmarkHaskellDepends = [ + base criterion deepseq lens QuickCheck + ]; + description = "Generically derive traversals, lenses and prisms"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "generic-lens-labels" = callPackage ({ mkDerivation, base, generic-lens }: mkDerivation { @@ -89113,8 +89207,6 @@ self: { testToolDepends = [ markdown-unlit ]; description = "A library for generic programming that aims to be easy to understand"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "generics-mrsop" = callPackage @@ -90556,8 +90648,6 @@ self: { ]; description = "An AST and compiler plugin for dumping GHC's Core representation"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "ghc-dump-tree" = callPackage @@ -90607,8 +90697,6 @@ self: { ]; description = "Handy tools for working with @ghc-dump@ dumps"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "ghc-dup" = callPackage @@ -91068,8 +91156,6 @@ self: { libraryToolDepends = [ cpphs happy ]; description = "Haskell source parser from GHC"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "ghc-paths" = callPackage @@ -91657,6 +91743,33 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "ghcid_0_7_5" = callPackage + ({ mkDerivation, ansi-terminal, base, cmdargs, containers + , directory, extra, filepath, fsnotify, process, tasty, tasty-hunit + , terminal-size, time, unix + }: + mkDerivation { + pname = "ghcid"; + version = "0.7.5"; + sha256 = "0ics4ibkr9p8pd81hfr7wk1wi10rjbsmwqcln8sda61p9v46pdh4"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + ansi-terminal base cmdargs directory extra filepath process time + ]; + executableHaskellDepends = [ + ansi-terminal base cmdargs containers directory extra filepath + fsnotify process terminal-size time unix + ]; + testHaskellDepends = [ + ansi-terminal base cmdargs containers directory extra filepath + fsnotify process tasty tasty-hunit terminal-size time unix + ]; + description = "GHCi based bare bones IDE"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "ghcjs-ajax" = callPackage ({ mkDerivation, aeson, base, http-types, text }: mkDerivation { @@ -91742,8 +91855,6 @@ self: { ]; description = "DOM library that supports both GHCJS and GHC"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "ghcjs-dom-hello" = callPackage @@ -91778,8 +91889,6 @@ self: { doHaddock = false; description = "DOM library that supports both GHCJS and GHC using jsaddle"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "ghcjs-dom-jsffi" = callPackage @@ -93467,8 +93576,8 @@ self: { }: mkDerivation { pname = "git-annex"; - version = "7.20190626"; - sha256 = "1xjywj2hn40cqwvdh8iaixgx9iscgnsmrwkn3xrlz7gjw858n3lv"; + version = "7.20190708"; + sha256 = "18s563swrp8mx479995pdhhmn40y3xwlbm1z3w63qsnjqmj7zlij"; configureFlags = [ "-fassistant" "-f-benchmark" "-fdbus" "-f-debuglocks" "-fmagicmime" "-f-networkbsd" "-fpairing" "-fproduction" "-fs3" "-ftorrentparser" @@ -93718,8 +93827,6 @@ self: { ]; description = "Passively snapshots working tree changes efficiently"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "git-object" = callPackage @@ -94368,8 +94475,6 @@ self: { ]; description = "Libgit2 backend for gitlib"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "gitlib-s3" = callPackage @@ -94432,8 +94537,6 @@ self: { ]; description = "Test library for confirming gitlib backend compliance"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "gitlib-utils" = callPackage @@ -94511,8 +94614,6 @@ self: { ]; description = "Gitter.im API client"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "givegif" = callPackage @@ -94976,8 +95077,6 @@ self: { testHaskellDepends = [ base HUnit ]; description = "Console IRC client"; license = stdenv.lib.licenses.isc; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "gll" = callPackage @@ -95150,8 +95249,6 @@ self: { libraryHaskellDepends = [ accelerate base gloss gloss-rendering ]; description = "Extras to interface Gloss and Accelerate"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "gloss-algorithms" = callPackage @@ -95396,8 +95493,6 @@ self: { testToolDepends = [ hspec-discover ]; description = "Make better services and clients"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "glue-core" = callPackage @@ -95422,8 +95517,6 @@ self: { testToolDepends = [ hspec-discover ]; description = "Make better services and clients"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "glue-ekg" = callPackage @@ -95448,8 +95541,6 @@ self: { testToolDepends = [ hspec-discover ]; description = "Make better services and clients"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "glue-example" = callPackage @@ -95470,8 +95561,6 @@ self: { ]; description = "Make better services and clients"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "gluturtle" = callPackage @@ -98369,8 +98458,6 @@ self: { ]; description = "proxy gopher over http"; license = stdenv.lib.licenses.gpl3; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "gopherbot" = callPackage @@ -100317,8 +100404,6 @@ self: { benchmarkHaskellDepends = [ base criterion ]; description = "Grouped lists. Equal consecutive elements are grouped."; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "groupoid" = callPackage @@ -101662,6 +101747,56 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "hOpenPGP_2_8" = callPackage + ({ mkDerivation, aeson, asn1-encoding, attoparsec, base + , base16-bytestring, base64-bytestring, bifunctors, binary + , binary-conduit, bytestring, bzlib, conduit, conduit-extra + , containers, criterion, crypto-cipher-types, cryptonite, errors + , hashable, incremental-parser, ixset-typed, lens, memory + , monad-loops, nettle, network, network-uri, newtype + , openpgp-asciiarmor, prettyprinter, QuickCheck + , quickcheck-instances, resourcet, semigroups, split, tasty + , tasty-hunit, tasty-quickcheck, text, time, time-locale-compat + , transformers, unliftio-core, unordered-containers, zlib + }: + mkDerivation { + pname = "hOpenPGP"; + version = "2.8"; + sha256 = "1n6cpwgg934ii3b4ap2gp347q3k4b64dc9x37d4bj51hs6910pmw"; + libraryHaskellDepends = [ + aeson asn1-encoding attoparsec base base16-bytestring + base64-bytestring bifunctors binary binary-conduit bytestring bzlib + conduit conduit-extra containers crypto-cipher-types cryptonite + errors hashable incremental-parser ixset-typed lens memory + monad-loops nettle network-uri newtype openpgp-asciiarmor + prettyprinter resourcet semigroups split text time + time-locale-compat transformers unliftio-core unordered-containers + zlib + ]; + testHaskellDepends = [ + aeson asn1-encoding attoparsec base base16-bytestring bifunctors + binary binary-conduit bytestring bzlib conduit conduit-extra + containers crypto-cipher-types cryptonite errors hashable + incremental-parser ixset-typed lens memory monad-loops nettle + network network-uri newtype prettyprinter QuickCheck + quickcheck-instances resourcet semigroups split tasty tasty-hunit + tasty-quickcheck text time time-locale-compat transformers + unliftio-core unordered-containers zlib + ]; + benchmarkHaskellDepends = [ + aeson base base16-bytestring base64-bytestring bifunctors binary + binary-conduit bytestring bzlib conduit conduit-extra containers + criterion crypto-cipher-types cryptonite errors hashable + incremental-parser ixset-typed lens memory monad-loops nettle + network network-uri newtype openpgp-asciiarmor prettyprinter + resourcet semigroups split text time time-locale-compat + transformers unliftio-core unordered-containers zlib + ]; + description = "native Haskell implementation of OpenPGP (RFC4880)"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "hPDB" = callPackage ({ mkDerivation, base, bytestring, containers, deepseq, directory , ghc-prim, iterable, linear, mmap, mtl, Octree, parallel @@ -102862,7 +102997,6 @@ self: { description = "A documentation-generation tool for Haskell libraries"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "haddock_2_17_5" = callPackage @@ -102880,7 +103014,6 @@ self: { description = "A documentation-generation tool for Haskell libraries"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "haddock" = callPackage @@ -102897,8 +103030,6 @@ self: { preCheck = "unset GHC_PACKAGE_PATH"; description = "A documentation-generation tool for Haskell libraries"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "haddock-api_2_15_0_2" = callPackage @@ -102918,7 +103049,6 @@ self: { description = "A documentation-generation tool for Haskell libraries"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "haddock-api_2_16_1" = callPackage @@ -102938,7 +103068,6 @@ self: { description = "A documentation-generation tool for Haskell libraries"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "haddock-api_2_17_4" = callPackage @@ -102961,7 +103090,6 @@ self: { description = "A documentation-generation tool for Haskell libraries"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "haddock-api" = callPackage @@ -102987,8 +103115,6 @@ self: { testToolDepends = [ hspec-discover ]; description = "A documentation-generation tool for Haskell libraries"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "haddock-cheatsheet" = callPackage @@ -103118,25 +103244,26 @@ self: { "hadolint" = callPackage ({ mkDerivation, aeson, base, bytestring, containers, directory - , filepath, gitrev, hspec, HUnit, language-docker, megaparsec, mtl - , optparse-applicative, ShellCheck, split, text, void, yaml + , filepath, gitrev, hspec, HsYAML, HUnit, language-docker + , megaparsec, mtl, optparse-applicative, ShellCheck, split, text + , void }: mkDerivation { pname = "hadolint"; - version = "1.17.0"; - sha256 = "1pr19wdga1vim0s29hi9fa27yy5r20mcpg6r0m836xccjw1mpk20"; + version = "1.17.1"; + sha256 = "199kpx6wfshky0slgjv0h6ckibrsywy3r3j393r9ln4wcjzs31yi"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ - aeson base bytestring containers directory filepath language-docker - megaparsec mtl ShellCheck split text void yaml + aeson base bytestring containers directory filepath HsYAML + language-docker megaparsec mtl ShellCheck split text void ]; executableHaskellDepends = [ base containers gitrev language-docker megaparsec optparse-applicative text ]; testHaskellDepends = [ - aeson base bytestring hspec HUnit language-docker megaparsec + aeson base bytestring hspec HsYAML HUnit language-docker megaparsec ShellCheck split text ]; description = "Dockerfile Linter JavaScript API"; @@ -103807,8 +103934,6 @@ self: { ]; description = "Allow Hakyll to create hierarchical menues from directories"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "hakyll-elm" = callPackage @@ -103837,8 +103962,6 @@ self: { executableHaskellDepends = [ base hakyll ]; testHaskellDepends = [ base ]; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "hakyll-filestore" = callPackage @@ -103878,8 +104001,6 @@ self: { ]; description = "Hakyll utilities to work with images"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "hakyll-ogmarkup" = callPackage @@ -103908,8 +104029,6 @@ self: { ]; description = "Hakyll SASS compiler over hsass"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "hakyll-series" = callPackage @@ -103921,8 +104040,6 @@ self: { libraryHaskellDepends = [ base containers hakyll ]; description = "Adds series functionality to hakyll"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "hakyll-shakespeare" = callPackage @@ -103940,8 +104057,6 @@ self: { ]; description = "Hakyll Hamlet compiler"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "hakyll-shortcode" = callPackage @@ -105461,8 +105576,6 @@ self: { libraryHaskellDepends = [ base Chart Chart-diagrams ]; description = "Generate simple okay-looking bar plots without much effort"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "happy-meta" = callPackage @@ -105797,8 +105910,6 @@ self: { libraryHaskellDepends = [ base QuickCheck ]; description = "Entity based records"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "has-th" = callPackage @@ -107018,8 +107129,6 @@ self: { testHaskellDepends = [ base ]; description = "A program to find and display the docs and type of a name"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "haskell-eigen-util" = callPackage @@ -107602,8 +107711,6 @@ self: { ]; description = "Name resolution library for Haskell"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "haskell-names_0_9_6" = callPackage @@ -107628,7 +107735,6 @@ self: { description = "Name resolution library for Haskell"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "haskell-neo4j-client" = callPackage @@ -109205,8 +109311,8 @@ self: { ({ mkDerivation, base }: mkDerivation { pname = "haskeme"; - version = "0.1.0.2"; - sha256 = "1fi9mvcn64c164kd37vb9fx9kxq7pnx6wpdqykn08ywydhpx5bsj"; + version = "0.1.0.3"; + sha256 = "14hrimm52v5hlgkdkqwijxrfnzj8x46bg3kh9nw1vlflf97053wf"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base ]; @@ -110679,6 +110785,23 @@ self: { broken = true; }) {}; + "hasql-optparse-applicative_0_3_0_5" = callPackage + ({ mkDerivation, base-prelude, hasql, hasql-pool + , optparse-applicative + }: + mkDerivation { + pname = "hasql-optparse-applicative"; + version = "0.3.0.5"; + sha256 = "0q5ggbx3xlzq0lv6i6wac9zsf0x4k91cf1n5rg6q96wg90f0dxxq"; + libraryHaskellDepends = [ + base-prelude hasql hasql-pool optparse-applicative + ]; + description = "\"optparse-applicative\" parsers for \"hasql\""; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; + }) {}; + "hasql-pool" = callPackage ({ mkDerivation, base-prelude, hasql, hspec, resource-pool, time }: mkDerivation { @@ -112408,8 +112531,6 @@ self: { testHaskellDepends = [ base containers mtl ]; description = "Haskell docs tool"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "hdph" = callPackage @@ -114486,8 +114607,6 @@ self: { ]; description = "Heyting and Boolean algebras"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "hfann" = callPackage @@ -115093,8 +115212,6 @@ self: { ]; description = "Happy Haskell Programming"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "hi" = callPackage @@ -115448,8 +115565,6 @@ self: { ]; description = "Partial types as a type constructor"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "highWaterMark" = callPackage @@ -116012,6 +116127,28 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "hint_0_9_0_1" = callPackage + ({ mkDerivation, base, containers, directory, exceptions + , extensible-exceptions, filepath, ghc, ghc-boot, ghc-paths, HUnit + , mtl, random, temporary, unix + }: + mkDerivation { + pname = "hint"; + version = "0.9.0.1"; + sha256 = "15cnam704p7ynk70lqz3nvy91src5bd9amfdknvkfzpi5yf2825b"; + libraryHaskellDepends = [ + base directory exceptions filepath ghc ghc-boot ghc-paths mtl + random temporary unix + ]; + testHaskellDepends = [ + base containers directory exceptions extensible-exceptions filepath + HUnit unix + ]; + description = "Runtime Haskell interpreter (GHC API wrapper)"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "hint-server" = callPackage ({ mkDerivation, base, eprocess, exceptions, hint, monad-loops, mtl }: @@ -116124,8 +116261,6 @@ self: { ]; description = "Haskell Image Processing (HIP) Library"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "hipbot" = callPackage @@ -116725,8 +116860,8 @@ self: { }: mkDerivation { pname = "hkgr"; - version = "0.2.1"; - sha256 = "1062r7gip76q6dzvakx6fs1qiq0922ffa2qdkp4ml6d3bn9jj6d5"; + version = "0.2.2"; + sha256 = "1wz2yy3fiwy4601p0ir24dvv7yzfrqf99z07m8whc6gr2ypsnfjc"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -117523,8 +117658,6 @@ self: { ]; description = "hmatrix operations lifted for backprop"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "hmatrix-banded" = callPackage @@ -118364,6 +118497,26 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "hoauth2_1_8_8" = callPackage + ({ mkDerivation, aeson, base, bytestring, exceptions, http-conduit + , http-types, microlens, text, unordered-containers, uri-bytestring + , uri-bytestring-aeson + }: + mkDerivation { + pname = "hoauth2"; + version = "1.8.8"; + sha256 = "0ji9887m11k3dh7n36g0m9q1gy4d4729ygvapdzqfa3vi501ndwa"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + aeson base bytestring exceptions http-conduit http-types microlens + text unordered-containers uri-bytestring uri-bytestring-aeson + ]; + description = "Haskell OAuth2 authentication client"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "hob" = callPackage ({ mkDerivation, base, bytestring, containers, directory, filepath , glib, gtk-largeTreeStore, gtk3, gtksourceview3, hspec, mtl, pango @@ -120828,8 +120981,6 @@ self: { testHaskellDepends = [ base process tasty tasty-hunit ]; description = "File size in human readable format"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "hricket" = callPackage @@ -125017,8 +125168,8 @@ self: { }: mkDerivation { pname = "hssqlppp"; - version = "0.6.1"; - sha256 = "06rqf8gkz2f1ay1vd3ba0nzv9n1098vxm9sc9ls4dk2ismab7cgz"; + version = "0.6.2"; + sha256 = "0lzy6laqxi6v6hlz9j2kvxm9rc4i89m9lnffymfkfwxlrgq7wg0s"; libraryHaskellDepends = [ base containers mtl parsec pretty pretty-show syb text transformers uniplate @@ -125029,8 +125180,6 @@ self: { ]; description = "SQL parser and type checker"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "hssqlppp-th" = callPackage @@ -125039,8 +125188,8 @@ self: { }: mkDerivation { pname = "hssqlppp-th"; - version = "0.6.1"; - sha256 = "09mxb2pmnk43bvdl7f58r8wxaw3h372sy174p42k8pphlss9amkg"; + version = "0.6.2"; + sha256 = "1p17srzz09iikxn47yr7qmv5g6z7c5kc5svlszmxlhs5j0kgahb0"; libraryHaskellDepends = [ base hssqlppp syb template-haskell text ]; @@ -125049,8 +125198,6 @@ self: { ]; description = "hssqlppp extras which need template-haskell"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "hstatistics" = callPackage @@ -128458,8 +128605,6 @@ self: { testToolDepends = [ hspec-discover ]; description = "Generic finger-tree structure, with example instances"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "hw-fingertree-strict" = callPackage @@ -128626,7 +128771,7 @@ self: { broken = true; }) {}; - "hw-json_1_2_0_2" = callPackage + "hw-json_1_3_0_1" = callPackage ({ mkDerivation, aeson, ansi-wl-pprint, attoparsec, base , bits-extra, bytestring, criterion, directory, dlist, generic-lens , hedgehog, hspec, hspec-discover, hw-balancedparens, hw-bits @@ -128638,8 +128783,8 @@ self: { }: mkDerivation { pname = "hw-json"; - version = "1.2.0.2"; - sha256 = "1vk1rxaq6sr9d49q6vcggbwckfl0j33mb1wf8vqafgrnsyvi8fxk"; + version = "1.3.0.1"; + sha256 = "10m4f4jv3wb4n4na1d1a26s81n7clxgmj2745xs9yrax1wvqnjg0"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -128708,8 +128853,6 @@ self: { testHaskellDepends = [ base bytestring hw-prim lens vector ]; description = "SIMD-based JSON semi-indexer"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "hw-json-simple-cursor" = callPackage @@ -128757,13 +128900,14 @@ self: { }: mkDerivation { pname = "hw-json-standard-cursor"; - version = "0.1.1.0"; - sha256 = "1bvi5nfym8808dl3saqrnrnw5dgsmlcgpk2lgm9cn5cw5f13rkll"; + version = "0.2.1.1"; + sha256 = "0z0lxzciyw6b49w1s88yx9lcqgk0fjmh1zv7qs3jnn9sk0bqldh5"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ - array base bits-extra bytestring hw-balancedparens hw-bits hw-prim - hw-rankselect hw-rankselect-base mmap vector word8 + array base bits-extra bytestring hw-balancedparens hw-bits + hw-json-simd hw-prim hw-rankselect hw-rankselect-base mmap vector + word8 ]; executableHaskellDepends = [ base bytestring generic-lens hw-balancedparens hw-json-simd hw-prim @@ -128978,8 +129122,6 @@ self: { testToolDepends = [ hspec-discover ]; description = "Simple parser support"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "hw-prim" = callPackage @@ -129004,8 +129146,6 @@ self: { ]; description = "Primitive functions and data types"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "hw-prim_0_6_2_29" = callPackage @@ -129031,7 +129171,6 @@ self: { description = "Primitive functions and data types"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "hw-prim-bits" = callPackage @@ -129052,8 +129191,6 @@ self: { benchmarkHaskellDepends = [ base criterion vector ]; description = "Primitive support for bit manipulation"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "hw-rankselect" = callPackage @@ -129091,7 +129228,7 @@ self: { broken = true; }) {}; - "hw-rankselect_0_13_1_0" = callPackage + "hw-rankselect_0_13_2_0" = callPackage ({ mkDerivation, base, bytestring, conduit, criterion, deepseq , directory, generic-lens, hedgehog, hspec, hspec-discover , hw-balancedparens, hw-bits, hw-fingertree, hw-hedgehog @@ -129100,10 +129237,8 @@ self: { }: mkDerivation { pname = "hw-rankselect"; - version = "0.13.1.0"; - sha256 = "0v9nqpcryyyxgvyfncmqywrk9ny4lvv8i45c6xbdn8gs6llz6r5x"; - revision = "2"; - editedCabalFile = "1gahqmfgcici3dmv8m7fi531a0x79ddh7rn1rwizpnr446vqgfdn"; + version = "0.13.2.0"; + sha256 = "00k163jalapxdlcmcvi4ddk60bsj34f7ng05agvh1374kybqscb4"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -129293,8 +129428,6 @@ self: { testHaskellDepends = [ base hspec QuickCheck vector ]; description = "Vector type with convenient typeclass instances"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "hw-xml" = callPackage @@ -129307,8 +129440,8 @@ self: { }: mkDerivation { pname = "hw-xml"; - version = "0.2.0.0"; - sha256 = "0gnwmc75cvk2wv7xgjdfhzbai3fkwvl57mclpra0dav3p56vjrn3"; + version = "0.3.0.0"; + sha256 = "1f7q4vqrj5iv2c2dcgc6cld6zaqqp8d575fnali1lg3fv5n1g69k"; isLibrary = true; isExecutable = true; enableSeparateDataOutput = true; @@ -130563,6 +130696,8 @@ self: { pname = "hyraxAbif"; version = "0.2.3.15"; sha256 = "1wfmlqgk751ij30x0dkyc9fyc6j1a96l0s7fjj1sywdvawd8cfh1"; + revision = "1"; + editedCabalFile = "07i4ippga6cnwr9yl6nkrhakl9sim73fprf29lnmsvdc8ynbifcd"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -132001,6 +132136,23 @@ self: { broken = true; }) {}; + "imgur" = callPackage + ({ mkDerivation, base, data-default-class, http-client, req, text + , xml-conduit, xml-lens + }: + mkDerivation { + pname = "imgur"; + version = "1.0"; + sha256 = "140n07ygfjnyxfqbq2vzfgsk93b3j5m2s61jcivx74z6sc7g867h"; + libraryHaskellDepends = [ + base data-default-class http-client req text xml-conduit xml-lens + ]; + description = "A function to post an image to imgur"; + license = stdenv.lib.licenses.asl20; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; + }) {}; + "imgurder" = callPackage ({ mkDerivation, base, curl, directory, haskell98, hxt, hxt-xpath , url @@ -134849,8 +135001,6 @@ self: { ]; description = "EDSL for concurrent, realtime, embedded programming on top of Ivory"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "ioref-stable" = callPackage @@ -135246,8 +135396,6 @@ self: { ]; description = "A library for creating kernels for IPython frontends"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "ipython-kernel_0_10_0_0" = callPackage @@ -135271,7 +135419,6 @@ self: { description = "A library for creating kernels for IPython frontends"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "irc" = callPackage @@ -136246,8 +136393,6 @@ self: { libraryToolDepends = [ alex happy ]; description = "Safe embedded C programming"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "ivory-artifact" = callPackage @@ -136283,8 +136428,6 @@ self: { ]; description = "Ivory C backend"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "ivory-bitdata" = callPackage @@ -136323,8 +136466,6 @@ self: { ]; description = "Simple concrete evaluator for Ivory programs"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "ivory-examples" = callPackage @@ -136347,8 +136488,6 @@ self: { ]; description = "Ivory examples"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "ivory-hw" = callPackage @@ -136361,8 +136500,6 @@ self: { libraryHaskellDepends = [ base filepath ivory ivory-artifact ]; description = "Ivory hardware model (STM32F4)"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "ivory-opts" = callPackage @@ -136379,8 +136516,6 @@ self: { ]; description = "Ivory compiler optimizations"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "ivory-quickcheck" = callPackage @@ -136402,8 +136537,6 @@ self: { ]; description = "QuickCheck driver for Ivory"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "ivory-serialize" = callPackage @@ -136420,8 +136553,6 @@ self: { ]; description = "Serialization library for Ivory"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "ivory-stdlib" = callPackage @@ -136434,8 +136565,6 @@ self: { libraryHaskellDepends = [ base filepath ivory ivory-artifact ]; description = "Ivory standard library"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "ivy-web" = callPackage @@ -136794,8 +136923,6 @@ self: { executableHaskellDepends = [ base boxes directory filepath ]; description = "Export sheet music and audio from Windows/Mac app Jammit"; license = stdenv.lib.licenses.gpl3; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "japanese-calendar" = callPackage @@ -137687,8 +137814,6 @@ self: { ]; description = "DOM library that uses jsaddle to support both GHCJS and GHC"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "jsaddle-hello" = callPackage @@ -138609,6 +138734,28 @@ self: { broken = true; }) {}; + "jsonpath" = callPackage + ({ mkDerivation, aeson, aeson-casing, attoparsec, base, bytestring + , file-embed, hspec, hspec-attoparsec, text, unordered-containers + , vector + }: + mkDerivation { + pname = "jsonpath"; + version = "0.1.0.0"; + sha256 = "0lr0sw30siaycw92b1xbnlrjn1pb7y8l9dflrjzr5d9k43lnrz42"; + libraryHaskellDepends = [ + aeson attoparsec base text unordered-containers vector + ]; + testHaskellDepends = [ + aeson aeson-casing attoparsec base bytestring file-embed hspec + hspec-attoparsec text unordered-containers vector + ]; + description = "Library to parse and execute JSONPath"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; + }) {}; + "jsonresume" = callPackage ({ mkDerivation, aeson, base, bytestring, old-locale, text, time , unordered-containers @@ -139395,8 +139542,6 @@ self: { benchmarkHaskellDepends = [ aeson base containers criterion text ]; description = "Perform æ¼¢å—検定 (Japan Kanji Aptitude Test) level analysis on Japanese Kanji"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "kansas-comet" = callPackage @@ -139938,8 +140083,6 @@ self: { ]; description = "Fast concurrent queues much inspired by unagi-chan"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "kbq-gu" = callPackage @@ -140027,8 +140170,6 @@ self: { ]; description = "Fast and flexible k-d trees for various types of point queries"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "keccak" = callPackage @@ -141182,6 +141323,25 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "korea-holidays" = callPackage + ({ mkDerivation, aeson, base, hspec, monad-extras, split + , template-haskell, yaml + }: + mkDerivation { + pname = "korea-holidays"; + version = "0.1.0.3"; + sha256 = "0v240dkvqy1jhkq1mzhyaiyg62m8lbbm79bc2g31jy9b7r1h93i2"; + enableSeparateDataOutput = true; + libraryHaskellDepends = [ + aeson base monad-extras split template-haskell yaml + ]; + testHaskellDepends = [ + aeson base hspec monad-extras split template-haskell yaml + ]; + description = "Korea Holidays"; + license = stdenv.lib.licenses.mit; + }) {}; + "korfu" = callPackage ({ mkDerivation, base, bio, bytestring, haskell98, simpleargs }: mkDerivation { @@ -141383,8 +141543,6 @@ self: { testHaskellDepends = [ base ]; description = "Find the alpha emoji"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "kyotocabinet" = callPackage @@ -141749,8 +141907,6 @@ self: { ]; description = "Declarative command-line parser using type-driven pattern matching"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "lambda-placeholders" = callPackage @@ -143792,8 +143948,6 @@ self: { ]; description = "Auto-generated interface to Fortran LAPACK via comfort-array"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "lapack-ffi" = callPackage @@ -143830,6 +143984,29 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "lapack-ffi-tools_0_1_2_1" = callPackage + ({ mkDerivation, base, bytestring, cassava, containers + , explicit-exception, filepath, non-empty, optparse-applicative + , parsec, pathtype, transformers, unordered-containers, utility-ht + , vector + }: + mkDerivation { + pname = "lapack-ffi-tools"; + version = "0.1.2.1"; + sha256 = "0hk54psm066acgn24mw5dbbhz4a0nqvyks75302cabijbp524gdh"; + isLibrary = false; + isExecutable = true; + enableSeparateDataOutput = true; + executableHaskellDepends = [ + base bytestring cassava containers explicit-exception filepath + non-empty optparse-applicative parsec pathtype transformers + unordered-containers utility-ht vector + ]; + description = "Generator for Haskell interface to Fortran LAPACK"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "large-hashable" = callPackage ({ mkDerivation, aeson, base, base16-bytestring, byteable, bytes , bytestring, cereal, containers, cryptohash, deepseq, hashable @@ -144795,8 +144972,6 @@ self: { ]; description = "Haskell code for learning physics"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "learn-physics-examples" = callPackage @@ -145104,8 +145279,6 @@ self: { libraryHaskellDepends = [ accelerate base lens ]; description = "Instances to mix lens with accelerate"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "lens-action" = callPackage @@ -145165,8 +145338,8 @@ self: { ({ mkDerivation, base, containers, either, hspec, lens }: mkDerivation { pname = "lens-errors"; - version = "0.2.0.0"; - sha256 = "1993nrb745nbrcai10jysrh8v4pdhzwnv9rg3x3zmaszgc5zzc2h"; + version = "0.2.2.0"; + sha256 = "0wr5wfzrmacf0s53511p9dg5ymx0wk2d5771jd90pgk7v3cr39j6"; libraryHaskellDepends = [ base either lens ]; testHaskellDepends = [ base containers either hspec lens ]; description = "Error handling in lens chains"; @@ -145302,6 +145475,8 @@ self: { pname = "lens-process"; version = "0.3.0.0"; sha256 = "1bp2mw38qvlq98596pn1illb6c1l8prd6qrzrg0g6xin98sqigb0"; + revision = "1"; + editedCabalFile = "1wwj258gq4qg97dx7pn2sxj8znrlb5sm2xcidwkhyrs45r75500b"; setupHaskellDepends = [ base Cabal cabal-doctest ]; libraryHaskellDepends = [ base filepath lens process ]; testHaskellDepends = [ @@ -145984,8 +146159,6 @@ self: { librarySystemDepends = [ ffi ]; description = "LibFFI interface with dynamic bidirectional type-driven binding generation"; license = stdenv.lib.licenses.publicDomain; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {ffi = null;}; "libgit" = callPackage @@ -146640,8 +146813,6 @@ self: { libraryPkgconfigDepends = [ systemd ]; description = "Haskell bindings to libsystemd-journal"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {inherit (pkgs) systemd;}; "libtagc" = callPackage @@ -147420,8 +147591,6 @@ self: { testHaskellDepends = [ base doctest ]; description = "Lifting linear vector spaces into Accelerate"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "linear-algebra-cblas" = callPackage @@ -148226,7 +148395,6 @@ self: { description = "Demo of Liquid Haskell integration for Cabal and Stack"; license = "unknown"; hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "lispparser" = callPackage @@ -149023,8 +149191,6 @@ self: { ]; description = "General purpose LLVM bindings"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {llvm-config = null;}; "llvm-hs-pretty" = callPackage @@ -150051,8 +150217,6 @@ self: { ]; description = "Journald back-end for logging-facade"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "logging-facade-syslog" = callPackage @@ -150132,13 +150296,14 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "logict_0_7_0_0" = callPackage - ({ mkDerivation, base, mtl }: + "logict_0_7_0_1" = callPackage + ({ mkDerivation, base, mtl, tasty, tasty-hunit }: mkDerivation { pname = "logict"; - version = "0.7.0.0"; - sha256 = "0c33ng5ck7nx7cl7nyl9vprqqi0k3q8l3k935b6gjzn7vzyg5iy6"; + version = "0.7.0.1"; + sha256 = "1zzcfxdl156rrr120vjcn2wawa2qdrninm6d4mxj215ig1a3aak5"; libraryHaskellDepends = [ base mtl ]; + testHaskellDepends = [ base mtl tasty tasty-hunit ]; description = "A backtracking logic-programming monad"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; @@ -150915,7 +151080,7 @@ self: { broken = true; }) {}; - "lsp-test_0_5_4_0" = callPackage + "lsp-test_0_6_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 @@ -150924,8 +151089,8 @@ self: { }: mkDerivation { pname = "lsp-test"; - version = "0.5.4.0"; - sha256 = "028nvfdchc73klwd3wm14bxzdrfvk5f5axbizz4gqijb0v1mha6p"; + version = "0.6.0.0"; + sha256 = "01l5i41907rqxrndhqmnb2kcp62k4mz1dpbamp7zvff22pyd5zzv"; libraryHaskellDepends = [ aeson aeson-pretty ansi-terminal async base bytestring conduit conduit-parse containers data-default Diff directory filepath @@ -151010,8 +151175,6 @@ self: { ]; description = "Parameterized file evaluator"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "ltiv1p1" = callPackage @@ -151250,8 +151413,6 @@ self: { ]; description = "DSL for SVG using lucid for HTML"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "lucienne" = callPackage @@ -152201,8 +152362,6 @@ self: { ]; description = "A web framework that integrates Servant, RIO, EKG, fast-logger, wai-cli…"; license = stdenv.lib.licenses.publicDomain; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "magico" = callPackage @@ -153152,8 +153311,6 @@ self: { libraryHaskellDepends = [ base call-stack tagged vector-space ]; description = "The basic classes for the manifolds hierarchy"; license = stdenv.lib.licenses.gpl3; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "map-classes" = callPackage @@ -155074,8 +155231,6 @@ self: { testHaskellDepends = [ base QuickCheck ]; description = "Constant-time queries for the median of a stream of numeric data"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "mediawiki" = callPackage @@ -156417,12 +156572,12 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "microlens_0_4_11_1" = callPackage + "microlens_0_4_11_2" = callPackage ({ mkDerivation, base }: mkDerivation { pname = "microlens"; - version = "0.4.11.1"; - sha256 = "0ndfsh5kdi854hbbb9z218141dyx0xvkh0sq74c86jdll1a7xfsn"; + version = "0.4.11.2"; + sha256 = "1z6zdprpr193a56r5s67q75554rrqyp2kk6srxn1gif7fd54sj2f"; libraryHaskellDepends = [ base ]; description = "A tiny lens library with no dependencies"; license = stdenv.lib.licenses.bsd3; @@ -156607,14 +156762,14 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "microlens-th_0_4_3_1" = callPackage + "microlens-th_0_4_3_2" = callPackage ({ mkDerivation, base, containers, microlens, template-haskell , th-abstraction, transformers }: mkDerivation { pname = "microlens-th"; - version = "0.4.3.1"; - sha256 = "1d8lix252lwif307faahf9y1r2mwlmmrp4q69icarln2viphdpw7"; + version = "0.4.3.2"; + sha256 = "0wz27ir4fs4231a20iiy2ghnyyg4qd75h45k6602017pww1hv44x"; libraryHaskellDepends = [ base containers microlens template-haskell th-abstraction transformers @@ -156792,8 +156947,8 @@ self: { }: mkDerivation { pname = "midi-music-box"; - version = "0.0.1"; - sha256 = "1b705392srj3pb8mm5bqzwj2p00yzyiysy4wyknfmc395555qkaz"; + version = "0.0.1.1"; + sha256 = "15i28iw6ssl7f8iivqyxgd8rg3vg76hspsyv347195d74xb5s7zb"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -157570,8 +157725,6 @@ self: { ]; description = "Layout and render text with TrueType fonts using OpenGL"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "miniutter" = callPackage @@ -158161,8 +158314,8 @@ self: { pname = "mmark"; version = "0.0.7.0"; sha256 = "0g7mx3xvvj8vgcids231zlz9kp7z3zjrq4xfhdm0wk0v1k51dflx"; - revision = "1"; - editedCabalFile = "1mj781f8b0hc57lw2zp1qag4sdxn0bkyzm5m321xagwk32iwz9qc"; + revision = "2"; + editedCabalFile = "06hr9p2lqyh4zx38i601yd24acbl08p69l0pwh8266qvfripcsm9"; enableSeparateDataOutput = true; libraryHaskellDepends = [ aeson base case-insensitive containers deepseq dlist email-validate @@ -158177,6 +158330,37 @@ self: { benchmarkHaskellDepends = [ base criterion text weigh ]; description = "Strict markdown processor for writers"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; + }) {}; + + "mmark_0_0_7_1" = callPackage + ({ mkDerivation, aeson, base, case-insensitive, containers + , criterion, deepseq, dlist, email-validate, foldl, hashable, hspec + , hspec-megaparsec, html-entity-map, lucid, megaparsec, microlens + , microlens-th, modern-uri, mtl, parser-combinators, QuickCheck + , text, text-metrics, unordered-containers, weigh, yaml + }: + mkDerivation { + pname = "mmark"; + version = "0.0.7.1"; + sha256 = "0apc582ck0g5ih0rpcljsfvss646ng62bjm37nj5z6k48symh16n"; + enableSeparateDataOutput = true; + libraryHaskellDepends = [ + aeson base case-insensitive containers deepseq dlist email-validate + foldl hashable html-entity-map lucid megaparsec microlens + microlens-th modern-uri mtl parser-combinators text text-metrics + unordered-containers yaml + ]; + testHaskellDepends = [ + aeson base foldl hspec hspec-megaparsec lucid megaparsec modern-uri + QuickCheck text + ]; + benchmarkHaskellDepends = [ base criterion text weigh ]; + description = "Strict markdown processor for writers"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "mmark-cli" = callPackage @@ -158189,6 +158373,8 @@ self: { pname = "mmark-cli"; version = "0.0.5.0"; sha256 = "15qrp2q1flx9csqvj8zx9w1jqg8pwfi0v7wpia7n7vg09jgydhby"; + revision = "1"; + editedCabalFile = "11yrsr4hpl5vxrfav1nfg3gidcr1qy0rjv5mkh5hqsxdpxy6c7aj"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -158198,6 +158384,8 @@ self: { ]; description = "Command line interface to the MMark markdown processor"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "mmark-ext" = callPackage @@ -158220,6 +158408,8 @@ self: { testToolDepends = [ hspec-discover ]; description = "Commonly useful extensions for the MMark markdown processor"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "mmorph" = callPackage @@ -158330,8 +158520,6 @@ self: { ]; description = "Mock records of functions easily"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "mockery" = callPackage @@ -158384,8 +158572,6 @@ self: { ]; description = "Derive a model of a data type using Generics"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "modelicaparser" = callPackage @@ -158490,8 +158676,6 @@ self: { libraryHaskellDepends = [ base ghc-typelits-knownnat ]; description = "Type-safe modular arithmetic"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "modular-arithmetic" = callPackage @@ -159892,8 +160076,6 @@ self: { libraryHaskellDepends = [ base transformers ]; description = "The Acme and AcmeT monads"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "monadbi" = callPackage @@ -160763,17 +160945,15 @@ self: { }) {}; "more-containers" = callPackage - ({ mkDerivation, base, containers, hspec }: + ({ mkDerivation, base, binary, containers, hspec }: mkDerivation { pname = "more-containers"; - version = "0.2.0.1"; - sha256 = "0lb0s1jdkv04i3mdvplrmdylp2raw7v3jfn4gpm86180j8i6qr6a"; - libraryHaskellDepends = [ base containers ]; - testHaskellDepends = [ base containers hspec ]; + version = "0.2.1.2"; + sha256 = "104ffslcjr8rfbsjy2g49v8l3nx9xrfqglmwcsfgar0n0xnh62ds"; + libraryHaskellDepends = [ base binary containers ]; + testHaskellDepends = [ base binary containers hspec ]; description = "A few more collections"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "more-extensible-effects" = callPackage @@ -161098,8 +161278,6 @@ self: { ]; description = "General purpose migrations library"; license = stdenv.lib.licenses.asl20; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "moto-postgresql" = callPackage @@ -161115,8 +161293,6 @@ self: { ]; description = "PostgreSQL-based migrations registry for moto"; license = stdenv.lib.licenses.asl20; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "motor" = callPackage @@ -161138,8 +161314,6 @@ self: { testHaskellDepends = [ base indexed indexed-extras row-types ]; description = "Type-safe effectful state machines in Haskell"; license = stdenv.lib.licenses.mpl20; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "motor-diagrams" = callPackage @@ -161159,8 +161333,6 @@ self: { testToolDepends = [ hspec-discover ]; description = "Generate state diagrams from Motor FSM typeclasses"; license = stdenv.lib.licenses.mpl20; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "motor-reflection" = callPackage @@ -161178,8 +161350,6 @@ self: { testToolDepends = [ hspec-discover ]; description = "Reflect on Motor FSM typeclasses to obtain runtime representations"; license = stdenv.lib.licenses.mpl20; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "mount" = callPackage @@ -161577,8 +161747,8 @@ self: { }: mkDerivation { pname = "ms-tds"; - version = "0.1.0.4"; - sha256 = "0937a0iawdw1xspx7xjfn7xw83kbk4radkgjhrlb5hs5sj9phvz4"; + version = "0.2.0.0"; + sha256 = "0675h4w8nayvh2gm644anz8sqk37b1n5ia4w5fgyaf9y6drafyda"; libraryHaskellDepends = [ array base binary bytestring crypto-random data-default-class mtl network template-haskell text time tls uuid-types x509-store @@ -161611,8 +161781,6 @@ self: { ]; description = "A Haskell implementation of MessagePack"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "msgpack-aeson" = callPackage @@ -161631,8 +161799,6 @@ self: { testHaskellDepends = [ aeson base msgpack tasty tasty-hunit ]; description = "Aeson adapter for MessagePack"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "msgpack-idl" = callPackage @@ -161719,8 +161885,8 @@ self: { }: mkDerivation { pname = "mssql-simple"; - version = "0.1.0.4"; - sha256 = "00mybypxy9kni94xnggkkkzk9xmx2r7q71hk2nsg0vcygfzvmpnk"; + version = "0.2.0.0"; + sha256 = "1pqw2kr8fyy62kmamvm600zsqri9d2201kixvr6gdy6z0ivyl0sz"; libraryHaskellDepends = [ base binary bytestring hostname ms-tds network text time tls ]; @@ -162258,8 +162424,6 @@ self: { ]; description = "create many files from one"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "multifocal" = callPackage @@ -162718,8 +162882,6 @@ self: { testHaskellDepends = [ base hspec transformers ]; description = "like mtl's ReaderT / WriterT / StateT, but more than one contained value/type"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "multivariant" = callPackage @@ -163468,8 +163630,6 @@ self: { libraryHaskellDepends = [ accelerate base mwc-random ]; description = "Generate Accelerate arrays filled with high quality pseudorandom numbers"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "mwc-random-monad" = callPackage @@ -164567,8 +164727,6 @@ self: { doHaddock = false; description = "A library for working with anything map related"; license = "(Apache-2.0 OR BSD-3-Clause)"; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "narc" = callPackage @@ -165336,8 +165494,6 @@ self: { ]; description = "A graph database middleware to maintain a time-varying graph"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "net-spider-pangraph" = callPackage @@ -165481,8 +165637,6 @@ self: { ]; description = "Helper modules for comfort-array wrappers to BLAS and LAPACK"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "netlib-ffi" = callPackage @@ -166861,8 +167015,6 @@ self: { ]; description = "ZeroMQ backend for network-transport"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "network-uri" = callPackage @@ -167586,8 +167738,6 @@ self: { libraryHaskellDepends = [ base integer-logarithms ]; description = "Finite nimber arithmetic"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "nirum" = callPackage @@ -167775,8 +167925,6 @@ self: { testHaskellDepends = [ base QuickCheck tasty tasty-quickcheck ]; description = "Evaluate Haskell expressions using Nix to get packages"; license = "GPL"; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "nix-paths" = callPackage @@ -169289,8 +169437,6 @@ self: { libraryHaskellDepends = [ base ]; description = "numeric classes"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "numhask-array" = callPackage @@ -169402,8 +169548,6 @@ self: { ]; description = "numerical spaces"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "numhask-test" = callPackage @@ -169587,8 +169731,6 @@ self: { executableHaskellDepends = [ base nvim-hs ]; description = "Neovim plugin that runs ghcid to update the quickfix list"; license = stdenv.lib.licenses.asl20; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "nvvm" = callPackage @@ -170471,8 +170613,6 @@ self: { ]; description = "Haskell utilities for building embedded Elm programs"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "omaketex" = callPackage @@ -171034,8 +171174,6 @@ self: { benchmarkHaskellDepends = [ base criterion ]; description = "Open type representations and dynamic types"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "open-union" = callPackage @@ -171107,8 +171245,6 @@ self: { libraryHaskellDepends = [ aeson base data-default text time ]; description = "A Haskell implementation of the Swiss Meteo Net data API"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "opencog-atomspace" = callPackage @@ -171970,8 +172106,8 @@ self: { }: mkDerivation { pname = "optima"; - version = "0.3.0.2"; - sha256 = "116h7rdv7g2h5bjxr883s15hg9l194q3nkyn045w2ygapk4xsimg"; + version = "0.3.0.3"; + sha256 = "1m6lbwy5y8nmgadqx6lax1laqgs90gbg9waffbd962n2xscbwbww"; libraryHaskellDepends = [ attoparsec attoparsec-data base optparse-applicative text text-builder @@ -172134,14 +172270,31 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "optparse-applicative_0_15_0_0" = callPackage + ({ mkDerivation, ansi-wl-pprint, base, bytestring, process + , QuickCheck, transformers, transformers-compat + }: + mkDerivation { + pname = "optparse-applicative"; + version = "0.15.0.0"; + sha256 = "0210rv7scp2063n8pr39bzy7dbl2777zwdnnx6kp3c34jilssjxg"; + libraryHaskellDepends = [ + ansi-wl-pprint base process transformers transformers-compat + ]; + testHaskellDepends = [ base bytestring QuickCheck ]; + description = "Utilities and combinators for parsing command line options"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "optparse-applicative-simple" = callPackage ({ mkDerivation, attoparsec, attoparsec-data, base-prelude , optparse-applicative, rerebase, text }: mkDerivation { pname = "optparse-applicative-simple"; - version = "1.1"; - sha256 = "0v6nwgk94ax0k281fyxfi42njfi0rw36vrhak9i8k7h5z43xkfr3"; + version = "1.1.0.2"; + sha256 = "0vpb2y9niy00msxbz11r6v3qc399lr2rl3x0ih6hpxrm8iihypv7"; libraryHaskellDepends = [ attoparsec attoparsec-data base-prelude optparse-applicative text ]; @@ -172171,8 +172324,8 @@ self: { pname = "optparse-generic"; version = "1.3.0"; sha256 = "13rr3hq26dpmbami8vb6d1ig9ywk6jia22sp5dkp6jkfc1c9k4l0"; - revision = "1"; - editedCabalFile = "1fnbgrdzfbw5fhncqv9jl8k752b1rna6nir92k646p8k5zq9hr1d"; + revision = "2"; + editedCabalFile = "1ldkzq0g70y2w69ywg2d5agrd74y7c4iblg3yflyvmzifr11d1ls"; libraryHaskellDepends = [ base bytestring Only optparse-applicative semigroups system-filepath text time transformers void @@ -172400,8 +172553,8 @@ self: { ({ mkDerivation, base, containers }: mkDerivation { pname = "ordered-containers"; - version = "0.2.1"; - sha256 = "1ycmlwyyflxd2bmrxqydkznqpz98sbs3c84zsszdmwn2dgyjgm01"; + version = "0.2.2"; + sha256 = "1j92dm36s0cfhc7s4k3dk36ibkvr6w1nhaq6q1m5vkbh1qrwfnn7"; libraryHaskellDepends = [ base containers ]; description = "Set- and Map-like types that remember the order elements were inserted"; license = stdenv.lib.licenses.bsd3; @@ -173214,8 +173367,6 @@ self: { ]; description = "PADS data description language for Haskell"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "pagarme" = callPackage @@ -173352,34 +173503,36 @@ self: { license = stdenv.lib.licenses.mit; }) {}; - "pairing_0_3_1" = callPackage + "pairing_0_4_1" = callPackage ({ mkDerivation, arithmoi, base, binary, bytestring, criterion - , cryptonite, errors, integer-logarithms, memory, protolude - , QuickCheck, quickcheck-instances, random, tasty, tasty-discover - , tasty-hunit, tasty-quickcheck, wl-pprint-text + , errors, galois-field, hexstring, integer-logarithms, memory + , MonadRandom, protolude, QuickCheck, quickcheck-instances, random + , tasty, tasty-discover, tasty-hunit, tasty-quickcheck + , wl-pprint-text }: mkDerivation { pname = "pairing"; - version = "0.3.1"; - sha256 = "0acg7kix9yi5mjssb9j0f9ign9qm551vgiiv3864gw1lmcrxh2ip"; + version = "0.4.1"; + sha256 = "0phw8caxrxyr2wlk8gcmrr8k03d0vnc4rq5c88dh3bb9jz4fdpcw"; libraryHaskellDepends = [ - arithmoi base binary bytestring cryptonite errors - integer-logarithms memory protolude QuickCheck random + arithmoi base binary bytestring errors galois-field + integer-logarithms memory MonadRandom protolude QuickCheck random wl-pprint-text ]; testHaskellDepends = [ - arithmoi base binary bytestring cryptonite errors - integer-logarithms memory protolude QuickCheck quickcheck-instances - random tasty tasty-discover tasty-hunit tasty-quickcheck - wl-pprint-text + arithmoi base binary bytestring errors galois-field hexstring + integer-logarithms memory MonadRandom protolude QuickCheck + quickcheck-instances random tasty tasty-discover tasty-hunit + tasty-quickcheck wl-pprint-text ]; testToolDepends = [ tasty-discover ]; benchmarkHaskellDepends = [ - arithmoi base binary bytestring criterion cryptonite errors - integer-logarithms memory protolude QuickCheck quickcheck-instances - random tasty tasty-hunit tasty-quickcheck wl-pprint-text + arithmoi base binary bytestring criterion errors galois-field + integer-logarithms memory MonadRandom protolude QuickCheck + quickcheck-instances random tasty tasty-hunit tasty-quickcheck + wl-pprint-text ]; - description = "Optimal ate pairing over Barreto-Naehrig curves"; + description = "Bilinear pairings"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; }) {}; @@ -173782,10 +173935,11 @@ self: { }: mkDerivation { pname = "pandoc-include-code"; - version = "1.3.0.0"; - sha256 = "1klmshyakhli0g9prqnllyrh9hsj67lps5b1cxh3jjlb6mxg5ic4"; + version = "1.4.0.0"; + sha256 = "0s3dayslfpnivr5h6napcrdh35bay7797z8nxjhr7c78ni7gdax9"; isLibrary = true; isExecutable = true; + enableSeparateDataOutput = true; libraryHaskellDepends = [ base filepath mtl pandoc-types process text unordered-containers ]; @@ -173796,8 +173950,6 @@ self: { ]; description = "A Pandoc filter for including code from source files"; license = stdenv.lib.licenses.mpl20; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "pandoc-japanese-filters" = callPackage @@ -173834,6 +173986,31 @@ self: { broken = true; }) {}; + "pandoc-markdown-ghci-filter" = callPackage + ({ mkDerivation, aeson, base, containers, ghcid, pandoc + , pandoc-types, QuickCheck, tasty, tasty-hunit, tasty-quickcheck + , text + }: + mkDerivation { + pname = "pandoc-markdown-ghci-filter"; + version = "0.1.0.0"; + sha256 = "1m5hiqwkn1a0y3awrk8s7b9wwasspjaa3gdnck6w9xf7vgb5bgza"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + aeson base containers ghcid pandoc pandoc-types text + ]; + executableHaskellDepends = [ + aeson base containers ghcid pandoc pandoc-types text + ]; + testHaskellDepends = [ + aeson base containers ghcid pandoc pandoc-types QuickCheck tasty + tasty-hunit tasty-quickcheck text + ]; + description = "Pandoc-filter to evaluate `code` section in markdown and auto-embed output"; + license = stdenv.lib.licenses.mit; + }) {}; + "pandoc-placetable" = callPackage ({ mkDerivation, aeson, base, bytestring, explicit-exception , http-conduit, pandoc-types, spreadsheet, text, utf8-string @@ -174020,8 +174197,8 @@ self: { ({ mkDerivation }: mkDerivation { pname = "pandora"; - version = "0.1.6"; - sha256 = "0cz6f17yh2zdr3zp3ld4pvi7xil5byi539dlqjslx8r442si694p"; + version = "0.1.7"; + sha256 = "1wmp5c7b9scdrhrh50cpjfpcw1riw4kxs1vy935mzwja1y4zalsj"; description = "A box of patterns and paradigms"; license = stdenv.lib.licenses.mit; }) {}; @@ -174810,8 +174987,6 @@ self: { ]; description = "Classes and data structures for working with data-kind indexed types"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "paramtree" = callPackage @@ -175856,8 +176031,6 @@ self: { ]; description = "Terminal-based presentations using Pandoc"; license = stdenv.lib.licenses.gpl2; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "patch-combinators" = callPackage @@ -177008,8 +177181,6 @@ self: { ]; description = "Static site generator"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "penn-treebank" = callPackage @@ -178565,8 +178736,6 @@ self: { ]; description = "REST service for creating temporary PostgreSQL databases"; license = stdenv.lib.licenses.agpl3; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "pg-recorder" = callPackage @@ -179299,8 +179468,6 @@ self: { libraryHaskellDepends = [ base unix ]; description = "Run an IO action protected by a pidfile"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "pier" = callPackage @@ -179641,6 +179808,30 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "pipes_4_3_11" = callPackage + ({ mkDerivation, base, criterion, exceptions, mmorph, mtl + , optparse-applicative, QuickCheck, semigroups, test-framework + , test-framework-quickcheck2, transformers, void + }: + mkDerivation { + pname = "pipes"; + version = "4.3.11"; + sha256 = "0h70djd6x306rci8zp356klqj6376xry6mkhyr12301adfhag8vv"; + libraryHaskellDepends = [ + base exceptions mmorph mtl semigroups transformers void + ]; + testHaskellDepends = [ + base mtl QuickCheck test-framework test-framework-quickcheck2 + transformers + ]; + benchmarkHaskellDepends = [ + base criterion mtl optparse-applicative transformers + ]; + description = "Compositional pipelines"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "pipes-aeson" = callPackage ({ mkDerivation, aeson, attoparsec, base, bytestring, pipes , pipes-attoparsec, pipes-bytestring, pipes-parse, transformers @@ -180496,8 +180687,6 @@ self: { libraryHaskellDepends = [ base mwc-random pipes vector ]; description = "Producers for handling randomness"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "pipes-rt" = callPackage @@ -181088,8 +181277,6 @@ self: { ]; description = "Token Introspection for PlanB"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "planet-mitchell" = callPackage @@ -181541,8 +181728,6 @@ self: { ]; description = "Diagrams based plotting library"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "plotserver-api" = callPackage @@ -182108,18 +182293,22 @@ self: { }) {}; "poly" = callPackage - ({ mkDerivation, base, primitive, QuickCheck, quickcheck-classes - , semirings, tasty, tasty-quickcheck, vector + ({ mkDerivation, base, gauge, primitive, QuickCheck + , quickcheck-classes, semirings, tasty, tasty-quickcheck, vector + , vector-algorithms }: mkDerivation { pname = "poly"; - version = "0.2.0.0"; - sha256 = "19jdm2508ncwcci8bi9hwpaak3cymhbynnk3whmh0g6rny6zdla4"; - libraryHaskellDepends = [ base primitive semirings vector ]; + version = "0.3.0.0"; + sha256 = "0kwh1n9b6zh21kg2036v02jpr9xvvay6x72b044j4la65pal5h8i"; + libraryHaskellDepends = [ + base primitive semirings vector vector-algorithms + ]; testHaskellDepends = [ base QuickCheck quickcheck-classes semirings tasty tasty-quickcheck vector ]; + benchmarkHaskellDepends = [ base gauge semirings vector ]; description = "Polynomials"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; @@ -182288,26 +182477,26 @@ self: { ({ mkDerivation, async, base, containers, criterion, doctest , first-class-families, free, freer-simple, hspec, hspec-discover , inspection-testing, mtl, syb, template-haskell, th-abstraction - , transformers, unagi-chan + , transformers, type-errors, unagi-chan }: mkDerivation { pname = "polysemy"; - version = "0.5.1.0"; - sha256 = "0yf4imiyca9mgqws2ak4c6vnwjzfdc6kmmmb301b6l75gyywinhn"; + version = "0.7.0.0"; + sha256 = "0p9f5m2invppncmd1d9sim1kvnzcgramnq3y1vr0bisg02y0c8dc"; libraryHaskellDepends = [ async base containers first-class-families mtl syb template-haskell - th-abstraction transformers unagi-chan + th-abstraction transformers type-errors unagi-chan ]; testHaskellDepends = [ async base containers doctest first-class-families hspec inspection-testing mtl syb template-haskell th-abstraction - transformers unagi-chan + transformers type-errors unagi-chan ]; testToolDepends = [ hspec-discover ]; benchmarkHaskellDepends = [ async base containers criterion first-class-families free freer-simple mtl syb template-haskell th-abstraction transformers - unagi-chan + type-errors unagi-chan ]; description = "Higher-order, low-boilerplate, zero-cost free monads"; license = stdenv.lib.licenses.bsd3; @@ -182339,20 +182528,20 @@ self: { }) {}; "polysemy-plugin" = callPackage - ({ mkDerivation, base, containers, ghc, ghc-tcplugins-extra, hspec - , hspec-discover, inspection-testing, polysemy - , should-not-typecheck, syb, transformers + ({ mkDerivation, base, containers, doctest, ghc + , ghc-tcplugins-extra, hspec, hspec-discover, inspection-testing + , polysemy, should-not-typecheck, syb, transformers }: mkDerivation { pname = "polysemy-plugin"; - version = "0.2.1.1"; - sha256 = "0ikdlcdzscvnkhdjf8wl41cypdyg4mfx1i6km4izcdjx2fa4gsqn"; + version = "0.2.2.0"; + sha256 = "1z8dyhcg2r9vb8m93khjzvmzc3lk7zaj64yjjdsnjmzzv13k8hl5"; libraryHaskellDepends = [ base containers ghc ghc-tcplugins-extra polysemy syb transformers ]; testHaskellDepends = [ - base containers ghc ghc-tcplugins-extra hspec inspection-testing - polysemy should-not-typecheck syb transformers + base containers doctest ghc ghc-tcplugins-extra hspec + inspection-testing polysemy should-not-typecheck syb transformers ]; testToolDepends = [ hspec-discover ]; description = "Disambiguate obvious uses of effects"; @@ -182485,8 +182674,6 @@ self: { ]; description = "Maps and sets of partial orders"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "pomodoro" = callPackage @@ -182862,8 +183049,6 @@ self: { libraryHaskellDepends = [ base ]; description = "Implementation of the Porter stemming algorithm"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "ports" = callPackage @@ -182939,15 +183124,21 @@ self: { }) {inherit (pkgs) acl;}; "posix-api" = callPackage - ({ mkDerivation, base, primitive, tasty, tasty-hunit }: + ({ mkDerivation, base, primitive, primitive-addr, primitive-offset + , primitive-unlifted, tasty, tasty-hunit + }: mkDerivation { pname = "posix-api"; - version = "0.2.1.0"; - sha256 = "1vxasjdy3l41brzyrjqv13zazm1ryqy496p2rfvm19062bfpixji"; - libraryHaskellDepends = [ base primitive ]; + version = "0.3.0.0"; + sha256 = "172271qakd2w8hg68m57p8avwwb2cm8hds0qzq53559p2n1z69xq"; + libraryHaskellDepends = [ + base primitive primitive-addr primitive-offset primitive-unlifted + ]; testHaskellDepends = [ base primitive tasty tasty-hunit ]; description = "posix bindings"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "posix-error-codes" = callPackage @@ -184889,8 +185080,6 @@ self: { ]; description = "Functionality for beautifying GHCi"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "pretty-hex" = callPackage @@ -185271,8 +185460,6 @@ self: { testHaskellDepends = [ base QuickCheck quickcheck-classes ]; description = "Prim typeclass instances"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "prim-ref" = callPackage @@ -185532,8 +185719,6 @@ self: { ]; description = "Arrays of Maybes"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "primitive-offset" = callPackage @@ -185613,8 +185798,8 @@ self: { ({ mkDerivation, base, primitive, stm }: mkDerivation { pname = "primitive-unlifted"; - version = "0.1.1.0"; - sha256 = "183lg1jbbs9b1ahwzdsf5d75djcqr6c0hjvd1liwz5i13ad3qdcr"; + version = "0.1.2.0"; + sha256 = "1zq5fx032shxsk23hlyj9js8jdbg4r17l0gigsrbrnlajnwk4683"; libraryHaskellDepends = [ base primitive ]; testHaskellDepends = [ base primitive stm ]; description = "Primitive GHC types with unlifted types inside"; @@ -186751,8 +186936,6 @@ self: { ]; description = "Prometheus Haskell Client"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "prometheus-client" = callPackage @@ -187947,8 +188130,6 @@ self: { testToolDepends = [ hspec-discover ]; description = "Bindings for the pthread library"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "ptr" = callPackage @@ -188508,33 +188689,31 @@ self: { }) {}; "purescript" = callPackage - ({ mkDerivation, aeson, aeson-better-errors, ansi-terminal - , ansi-wl-pprint, array, base, base-compat, blaze-html, bower-json - , boxes, bytestring, Cabal, cheapskate, clock, containers - , data-ordlist, deepseq, directory, dlist, edit-distance - , file-embed, filepath, fsnotify, gitrev, Glob, happy, haskeline - , hspec, hspec-discover, http-types, HUnit, language-javascript - , lifted-async, lifted-base, microlens-platform, monad-control - , monad-logger, mtl, network, optparse-applicative, parallel - , parsec, pattern-arrows, process, protolude, regex-tdfa, safe - , scientific, semigroups, sourcemap, split, stm, stringsearch, syb - , tasty, tasty-golden, tasty-hspec, tasty-quickcheck, text, time - , transformers, transformers-base, transformers-compat - , unordered-containers, utf8-string, vector, wai, wai-websockets - , warp, websockets + ({ mkDerivation, aeson, aeson-better-errors, aeson-pretty + , ansi-terminal, ansi-wl-pprint, array, base, base-compat + , blaze-html, bower-json, boxes, bytestring, Cabal, cheapskate + , clock, containers, data-ordlist, deepseq, directory, dlist + , edit-distance, file-embed, filepath, fsnotify, gitrev, Glob + , happy, haskeline, hspec, hspec-discover, http-types, HUnit + , language-javascript, lifted-async, lifted-base + , microlens-platform, monad-control, monad-logger, mtl, network + , optparse-applicative, parallel, parsec, pattern-arrows, process + , protolude, regex-tdfa, safe, scientific, semigroups, sourcemap + , split, stm, stringsearch, syb, tasty, tasty-golden, tasty-hspec + , tasty-quickcheck, text, time, transformers, transformers-base + , transformers-compat, unordered-containers, utf8-string, vector + , wai, wai-websockets, warp, websockets }: mkDerivation { pname = "purescript"; - version = "0.13.0"; - sha256 = "1cpdbb48a8qs57adc37qkcfaszj3m6gds6gdq07iq11b6gmfzr3q"; - revision = "2"; - editedCabalFile = "156myqg8f72mb493pqm94vkiza9s5cb6hq082wgljclynjdlw6l9"; + version = "0.13.2"; + sha256 = "0g4g2xsn3r5xxqndlyg1yxnsdgj27l5zll9q6wly119mkcllvvql"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ - aeson aeson-better-errors ansi-terminal array base base-compat - blaze-html bower-json boxes bytestring Cabal cheapskate clock - containers data-ordlist deepseq directory dlist edit-distance + aeson aeson-better-errors aeson-pretty ansi-terminal array base + base-compat blaze-html bower-json boxes bytestring Cabal cheapskate + clock containers data-ordlist deepseq directory dlist edit-distance file-embed filepath fsnotify Glob haskeline language-javascript lifted-async lifted-base microlens-platform monad-control monad-logger mtl parallel parsec pattern-arrows process protolude @@ -188544,22 +188723,23 @@ self: { ]; libraryToolDepends = [ happy ]; executableHaskellDepends = [ - aeson aeson-better-errors ansi-terminal ansi-wl-pprint array base - base-compat blaze-html bower-json boxes bytestring Cabal cheapskate - clock containers data-ordlist deepseq directory dlist edit-distance - file-embed filepath fsnotify gitrev Glob haskeline http-types - language-javascript lifted-async lifted-base microlens-platform - monad-control monad-logger mtl network optparse-applicative - parallel parsec pattern-arrows process protolude regex-tdfa safe - scientific semigroups sourcemap split stm stringsearch syb text - time transformers transformers-base transformers-compat - unordered-containers utf8-string vector wai wai-websockets warp - websockets + aeson aeson-better-errors aeson-pretty ansi-terminal ansi-wl-pprint + array base base-compat blaze-html bower-json boxes bytestring Cabal + cheapskate clock containers data-ordlist deepseq directory dlist + edit-distance file-embed filepath fsnotify gitrev Glob haskeline + http-types language-javascript lifted-async lifted-base + microlens-platform monad-control monad-logger mtl network + optparse-applicative parallel parsec pattern-arrows process + protolude regex-tdfa safe scientific semigroups sourcemap split stm + stringsearch syb text time transformers transformers-base + transformers-compat unordered-containers utf8-string vector wai + wai-websockets warp websockets ]; + executableToolDepends = [ happy ]; testHaskellDepends = [ - aeson aeson-better-errors ansi-terminal array base base-compat - blaze-html bower-json boxes bytestring Cabal cheapskate clock - containers data-ordlist deepseq directory dlist edit-distance + aeson aeson-better-errors aeson-pretty ansi-terminal array base + base-compat blaze-html bower-json boxes bytestring Cabal cheapskate + clock containers data-ordlist deepseq directory dlist edit-distance file-embed filepath fsnotify Glob haskeline hspec hspec-discover HUnit language-javascript lifted-async lifted-base microlens-platform monad-control monad-logger mtl parallel parsec @@ -188569,7 +188749,7 @@ self: { transformers-base transformers-compat unordered-containers utf8-string vector ]; - testToolDepends = [ hspec-discover ]; + testToolDepends = [ happy hspec-discover ]; doCheck = false; description = "PureScript Programming Language Compiler"; license = stdenv.lib.licenses.bsd3; @@ -189360,6 +189540,38 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "qnap-decrypt_0_3_5" = callPackage + ({ mkDerivation, base, binary, bytestring, cipher-aes128, conduit + , conduit-extra, crypto-api, directory, filepath, hspec, HUnit + , optparse-applicative, streaming-commons, tagged, temporary + , utf8-string + }: + mkDerivation { + pname = "qnap-decrypt"; + version = "0.3.5"; + sha256 = "1mm08bm2jzcnh1zal7zdiyryl3z5z91ch2vyyl0p29nbwl2q06xb"; + isLibrary = true; + isExecutable = true; + enableSeparateDataOutput = true; + libraryHaskellDepends = [ + base binary bytestring cipher-aes128 conduit conduit-extra + crypto-api directory streaming-commons tagged utf8-string + ]; + executableHaskellDepends = [ + base binary bytestring cipher-aes128 conduit conduit-extra + crypto-api directory filepath optparse-applicative + streaming-commons tagged utf8-string + ]; + testHaskellDepends = [ + base binary bytestring cipher-aes128 conduit conduit-extra + crypto-api directory filepath hspec HUnit streaming-commons tagged + temporary utf8-string + ]; + description = "Decrypt files encrypted by QNAP's Hybrid Backup Sync"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "qq-literals" = callPackage ({ mkDerivation, base, network-uri, template-haskell }: mkDerivation { @@ -190080,8 +190292,6 @@ self: { ]; description = "QuickCheck common typeclasses"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "quickcheck-classes_0_6_2_1" = callPackage @@ -190106,7 +190316,6 @@ self: { description = "QuickCheck common typeclasses"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "quickcheck-combinators" = callPackage @@ -190974,8 +191183,6 @@ self: { ]; description = "The raaz cryptographic library"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "rabocsv2qif" = callPackage @@ -191064,8 +191271,8 @@ self: { }: mkDerivation { pname = "radius"; - version = "0.6.0.2"; - sha256 = "0phk439nirjxf96dvm03yv9pmvhr7022gl5zwd4bmi09i6ydf6hz"; + version = "0.6.0.3"; + sha256 = "01mj0b0pasx60d93pi843vzhj31949wgf41l59jd2ps6ykhayx5b"; libraryHaskellDepends = [ base binary bytestring cryptonite iproute memory ]; @@ -191994,8 +192201,6 @@ self: { ]; description = "Rapid prototyping with GHCi: hot reloading of running components and reload-surviving values"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "rapid-term" = callPackage @@ -192264,6 +192469,8 @@ self: { pname = "rasterific-svg"; version = "0.3.3.2"; sha256 = "1i0pl1hin1ipi3l0074ywd1khacpbvz3x0frx0j0hmbfiv4n3nq2"; + revision = "1"; + editedCabalFile = "19i9wlk951d85dqnmbgrnz0fg4xcw7cbv9cs2h8b440lycj3p4cv"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -192337,8 +192544,8 @@ self: { }: mkDerivation { pname = "rating-chgk-info"; - version = "0.3.6.4"; - sha256 = "0sfrsjlxlg08k0g8g65v21i2qr1ibq0cfgy7sayb1xbkqc319jvr"; + version = "0.3.6.5"; + sha256 = "08qfrrhc8kg95jvhv5m99zrb062w64z1jzm46zm4ah6mdjlpac18"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -192724,8 +192931,6 @@ self: { ]; description = "Read-Copy-Update for Haskell"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "rdf" = callPackage @@ -192746,8 +192951,6 @@ self: { ]; description = "Representation and Incremental Processing of RDF Data"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "rdf4h" = callPackage @@ -193458,13 +193661,13 @@ self: { , cubicbezier, diagrams, diagrams-contrib, diagrams-core , diagrams-lib, diagrams-svg, directory, filepath, fsnotify , hashable, JuicyPixels, lens, linear, matrices, matrix, mtl - , palette, parallel, process, reanimate-svg, svg-builder, text - , time, unix, websockets, xml + , open-browser, palette, parallel, process, reanimate-svg + , svg-builder, text, time, websockets, xml }: mkDerivation { pname = "reanimate"; - version = "0.1.4.1"; - sha256 = "04yzlznyrd4c21732ijl1y5c8kg6x3139jv3d5qvcxphsmkxw81f"; + version = "0.1.5.0"; + sha256 = "1jh9inlx92qn3klzi9385nfvphrwmmdbbs2gql019bdwmyhd815x"; isLibrary = true; isExecutable = true; enableSeparateDataOutput = true; @@ -193472,8 +193675,8 @@ self: { attoparsec base bytestring containers cubicbezier diagrams diagrams-contrib diagrams-core diagrams-lib diagrams-svg directory filepath fsnotify hashable JuicyPixels lens linear matrices matrix - mtl palette parallel process reanimate-svg svg-builder text time - unix websockets xml + mtl open-browser palette parallel process reanimate-svg svg-builder + text time websockets xml ]; description = "Animation library based on SVGs"; license = stdenv.lib.licenses.publicDomain; @@ -194354,8 +194557,6 @@ self: { testHaskellDepends = [ base doctest ]; description = "Refinement types with static and runtime checking"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "reflection" = callPackage @@ -194492,8 +194693,6 @@ self: { executableHaskellDepends = [ base mtl reflex ]; description = "A basic `reflex` host for backend work"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "reflex-dom" = callPackage @@ -195854,8 +196053,6 @@ self: { testToolDepends = [ hspec-discover ]; description = "A data structure representing Relations on Sets"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "relational-postgresql8" = callPackage @@ -195961,8 +196158,6 @@ self: { ]; description = "Examples of Haskell Relationa Record"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "relational-schemas" = callPackage @@ -196610,8 +196805,6 @@ self: { ]; description = "Scalar data types and conversions"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "repa-series" = callPackage @@ -198328,8 +198521,6 @@ self: { ]; description = "Functional Reactive Programming with type-level clocks"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "rhine-gloss" = callPackage @@ -198344,8 +198535,6 @@ self: { executableHaskellDepends = [ base ]; description = "Gloss backend for Rhine"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "rhythm-game-tutorial" = callPackage @@ -198482,7 +198671,6 @@ self: { description = "api extensions for nvim-hs"; license = "unknown"; hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "ribosome-root" = callPackage @@ -198576,8 +198764,6 @@ self: { ]; description = "Quick metrics to grow your app strong"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "ridley-extras" = callPackage @@ -198595,8 +198781,6 @@ self: { testHaskellDepends = [ base ]; description = "Handy metrics that don't belong to ridley"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "riemann" = callPackage @@ -199135,8 +199319,6 @@ self: { benchmarkHaskellDepends = [ base bytestring criterion ]; description = "Haskell implementation of the RNCryptor file format"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "rng-utils" = callPackage @@ -199347,8 +199529,6 @@ self: { ]; description = "RocksDB database querying library for Haskell"; license = stdenv.lib.licenses.publicDomain; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "roguestar" = callPackage @@ -200416,24 +200596,25 @@ self: { }) {inherit (pkgs) rtl-sdr;}; "rtnetlink" = callPackage - ({ mkDerivation, base, bytestring, cereal, hspec, monad-loops, mtl - , pretty-hex, random, socket, transformers, unix + ({ mkDerivation, base, bits-bytestring, bytestring, cereal + , exceptions, hspec, linux-namespaces, pretty-hex, random, socket + , transformers, unix }: mkDerivation { pname = "rtnetlink"; - version = "0.1.0.4"; - sha256 = "0z07ckrjkycfsh7a4llz7sr0fp9p1890kn5nd3imgmrs1d5s0wir"; + version = "0.2.0.1"; + sha256 = "1ly3cgkbnz24p33vlgbllmxx25f0b3d1rzr05gzcnhjlg7nxwwga"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ - base bytestring cereal monad-loops mtl pretty-hex random socket - transformers unix + base bits-bytestring bytestring cereal exceptions pretty-hex random + socket transformers unix + ]; + testHaskellDepends = [ + base bytestring exceptions hspec linux-namespaces socket unix ]; - testHaskellDepends = [ base hspec socket unix ]; description = "Manipulate network devices, addresses, and routes on Linux"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "rtorrent-rpc" = callPackage @@ -201085,8 +201266,6 @@ self: { ]; description = "Type-safe and lossless encoding and manipulation of money, fiat currencies, crypto currencies and precious metals"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "safe-money-aeson" = callPackage @@ -201104,8 +201283,6 @@ self: { ]; description = "Instances from the aeson library for the safe-money library"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "safe-money-cereal" = callPackage @@ -201123,8 +201300,6 @@ self: { ]; description = "Instances from the cereal library for the safe-money library"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "safe-money-serialise" = callPackage @@ -201142,8 +201317,6 @@ self: { ]; description = "Instances from the serialise library for the safe-money library"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "safe-money-store" = callPackage @@ -201161,8 +201334,6 @@ self: { ]; description = "Instances from the store library for the safe-money library"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "safe-money-xmlbf" = callPackage @@ -201490,8 +201661,6 @@ self: { ]; description = "Configuration Loader"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "salak_0_2_9_3" = callPackage @@ -201515,7 +201684,6 @@ self: { description = "Configuration Loader"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "salak-toml" = callPackage @@ -202781,8 +202949,8 @@ self: { }: mkDerivation { pname = "scheduler"; - version = "1.4.0"; - sha256 = "0y8niw7nyi80v87nh432sf6sj5pxfqmx3sbiaws0vc17z529n4y2"; + version = "1.4.1"; + sha256 = "1m8l780pv9il661faa0angq05a5db9jpkyxxkil73285fx459fkl"; setupHaskellDepends = [ base Cabal cabal-doctest ]; libraryHaskellDepends = [ atomic-primops base deepseq exceptions primitive unliftio-core @@ -202797,8 +202965,6 @@ self: { ]; description = "Work stealing scheduler"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "schedyield" = callPackage @@ -203001,6 +203167,39 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "scidb-hquery" = callPackage + ({ mkDerivation, alex, array, base, BNFC, bytestring, Cabal + , connection, cryptonite, data-default-class, directory, exceptions + , filepath, happy, haskeline, hostname-validate, HTTP, http-client + , http-client-tls, http-conduit, http-types, memory, mtl, network + , process, regex, safe, split, terminal-size, text, tls, x509-store + }: + mkDerivation { + pname = "scidb-hquery"; + version = "2.8.0.432"; + sha256 = "0swjsgf84kwkzv7nwrnrzlpxbhdvi3i5pnnjrlgql9x4c30bqw6i"; + isLibrary = true; + isExecutable = true; + setupHaskellDepends = [ base Cabal filepath ]; + libraryHaskellDepends = [ + array base bytestring connection cryptonite data-default-class + exceptions haskeline hostname-validate HTTP http-client + http-client-tls http-conduit http-types memory mtl network process + regex safe split terminal-size text tls x509-store + ]; + libraryToolDepends = [ alex BNFC happy ]; + executableHaskellDepends = [ + array base bytestring connection cryptonite data-default-class + directory exceptions filepath haskeline hostname-validate HTTP + http-client http-client-tls http-conduit http-types memory mtl + network process regex safe split terminal-size text tls x509-store + ]; + description = "Haskell query for SciDB via shim"; + license = stdenv.lib.licenses.gpl3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; + }) {}; + "science-constants" = callPackage ({ mkDerivation, base }: mkDerivation { @@ -204537,12 +204736,12 @@ self: { }: mkDerivation { pname = "selective"; - version = "0.2"; - sha256 = "0xg0pd3vffdxfzwkiirhnzqwqsshfb7grs7a7p3lf4yrd08h90ms"; + version = "0.3"; + sha256 = "135lq99h1iaip44d5kh7wpb3fcf8f6ypn5rxngm5agazy6ia42as"; libraryHaskellDepends = [ base containers transformers ]; testHaskellDepends = [ base containers mtl QuickCheck tasty tasty-expected-failure - tasty-quickcheck + tasty-quickcheck transformers ]; description = "Selective applicative functors"; license = stdenv.lib.licenses.mit; @@ -204617,8 +204816,6 @@ self: { executableHaskellDepends = [ base ]; description = "A Haskell library to make self-extracting executables"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "selfrestart" = callPackage @@ -204754,8 +204951,6 @@ self: { testHaskellDepends = [ base ]; description = "A Haskell implementation of semibounded lattices"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "semigroupoid-extras" = callPackage @@ -204993,8 +205188,6 @@ self: { ]; description = "An implementation of semver and semantic version ranges"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "sendfile" = callPackage @@ -206193,7 +206386,7 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "servant-checked-exceptions_2_1_0_0" = callPackage + "servant-checked-exceptions_2_2_0_0" = callPackage ({ mkDerivation, base, bytestring, hspec-wai, http-types, servant , servant-checked-exceptions-core, servant-client , servant-client-core, servant-server, tasty, tasty-hspec @@ -206201,8 +206394,8 @@ self: { }: mkDerivation { pname = "servant-checked-exceptions"; - version = "2.1.0.0"; - sha256 = "0dbbixk3852phxhfcj84v3525yp5nl5krcrw53wsgc91r0w529s7"; + version = "2.2.0.0"; + sha256 = "1shbnrjk2d0lq9nskl95jkfgr4ad79nx4k87zjg4c4m6m09nf5bh"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -206240,20 +206433,21 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "servant-checked-exceptions-core_2_1_0_0" = callPackage - ({ mkDerivation, aeson, base, bytestring, doctest, Glob, http-media - , http-types, profunctors, servant, servant-docs, tagged, text - , world-peace + "servant-checked-exceptions-core_2_2_0_0" = callPackage + ({ mkDerivation, aeson, base, bytestring, contravariant, doctest + , Glob, http-media, http-types, mtl, profunctors, servant + , servant-docs, tagged, text, transformers, world-peace }: mkDerivation { pname = "servant-checked-exceptions-core"; - version = "2.1.0.0"; - sha256 = "1qmmbqniipx7bpinbjh9z0i2n0v71y6p3jak629aw0403rhq92pz"; + version = "2.2.0.0"; + sha256 = "1irakwsdj6f0yjp0cpgai6x01yq99qd2rwy1w3pb7xwiksdnxx6c"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ - aeson base bytestring http-media http-types profunctors servant - servant-docs tagged text world-peace + aeson base bytestring contravariant http-media http-types mtl + profunctors servant servant-docs tagged text transformers + world-peace ]; testHaskellDepends = [ base doctest Glob ]; description = "Checked exceptions for Servant APIs"; @@ -207384,8 +207578,6 @@ self: { ]; description = "Generate PureScript accessor functions for you servant API"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "servant-pushbullet-client" = callPackage @@ -209994,10 +210186,8 @@ self: { ({ mkDerivation, base, markdown-unlit, process, text }: mkDerivation { pname = "shellmet"; - version = "0.0.1"; - sha256 = "11c53h3dvhmnkjhcjw1xjr1kx6pvdmayf86i5b6zhpl4q3q2ixlk"; - revision = "1"; - editedCabalFile = "0v6j5fgmbbqizqx800adnkij1b1b8f7zkjmyfqvcpgljgg6xada5"; + version = "0.0.2.0"; + sha256 = "04ylwpwzd2g3604xyqr4g8zd9dp13hrb8kajajrymv6hafm85m3i"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base process text ]; @@ -210454,18 +210644,20 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "show-prettyprint_0_3" = callPackage - ({ mkDerivation, ansi-wl-pprint, base, doctest, prettyprinter - , trifecta + "show-prettyprint_0_3_0_1" = callPackage + ({ mkDerivation, ansi-wl-pprint, base, containers, doctest + , prettyprinter, trifecta }: mkDerivation { pname = "show-prettyprint"; - version = "0.3"; - sha256 = "1q5q7gr73m059gslj1fpmydhqr28yav1v6jjshl2cv3yhmpp2zsy"; + version = "0.3.0.1"; + sha256 = "030dzprz07ib41f8pg2409zdxymvkk8jq4m0vczvgaajq3gghkdk"; libraryHaskellDepends = [ ansi-wl-pprint base prettyprinter trifecta ]; - testHaskellDepends = [ base doctest ]; + testHaskellDepends = [ + base containers doctest prettyprinter trifecta + ]; description = "Robust prettyprinter for output of auto-generated Show instances"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; @@ -210519,8 +210711,6 @@ self: { ]; description = "Clean up the formatting of 'show' output"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "shpider" = callPackage @@ -210774,8 +210964,6 @@ self: { ]; description = "Arithmetic over signs and sets of signs"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "signal" = callPackage @@ -211160,12 +211348,12 @@ self: { }) {}; "simple-enumeration" = callPackage - ({ mkDerivation, base, doctest }: + ({ mkDerivation, base, doctest, integer-gmp }: mkDerivation { pname = "simple-enumeration"; - version = "0.1"; - sha256 = "08zqs36v8vm3iqz9pnj6df0f8c15j9gl0883xxbr27nma9mwqygx"; - libraryHaskellDepends = [ base ]; + version = "0.2"; + sha256 = "0792fcn7mxvhdvsqgc335lcyp89zcdk3fbfqyckz9fsmf6382hv4"; + libraryHaskellDepends = [ base integer-gmp ]; testHaskellDepends = [ base doctest ]; description = "Finite or countably infinite sequences of values"; license = stdenv.lib.licenses.bsd3; @@ -211591,20 +211779,16 @@ self: { }) {}; "simple-sql-parser" = callPackage - ({ mkDerivation, base, HUnit, mtl, parsec, pretty, test-framework - , test-framework-hunit - }: + ({ mkDerivation, base, mtl, parsec, pretty, tasty, tasty-hunit }: mkDerivation { pname = "simple-sql-parser"; - version = "0.4.4"; - sha256 = "1j1p94mfb7kzrayi39xcwmagxcf5j9lvxi7niqxc5jr70958csnl"; + version = "0.5.0"; + sha256 = "0d063wyrz8qynngy499i00hjkacd0xg01qni1wx2cbrcxg0xwcpd"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base mtl parsec pretty ]; - testHaskellDepends = [ - base HUnit mtl parsec pretty test-framework test-framework-hunit - ]; - description = "A parser for SQL queries"; + testHaskellDepends = [ base mtl parsec pretty tasty tasty-hunit ]; + description = "A parser for SQL"; license = stdenv.lib.licenses.bsd3; }) {}; @@ -211721,8 +211905,6 @@ self: { ]; description = "UI library for terminal"; license = stdenv.lib.licenses.gpl2; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "simple-units" = callPackage @@ -211941,8 +212123,6 @@ self: { librarySystemDepends = [ sqlite ]; description = "Simplest SQLite3 binding"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {inherit (pkgs) sqlite;}; "simplex" = callPackage @@ -213126,8 +213306,6 @@ self: { ]; description = "Visualize mathematical function's slope fields"; license = stdenv.lib.licenses.gpl3; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "slot-lambda" = callPackage @@ -213249,8 +213427,6 @@ self: { ]; description = "Flatten camel case text in LaTeX files"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "smallcheck" = callPackage @@ -213367,8 +213543,8 @@ self: { }: mkDerivation { pname = "smap"; - version = "0.3.2"; - sha256 = "1x98m7sw661f2h4y4xwc86d611x5vzvnnhp6c8fgxjbxq04dzg6y"; + version = "0.3.3"; + sha256 = "17qdn1ag4pdizgdng1747jdpad6xca208w7633pw24j5nkfy72dx"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -214085,8 +214261,8 @@ self: { }: mkDerivation { pname = "snap-extras"; - version = "0.12.2.1"; - sha256 = "0mzvw49v6i77ysdlxfrdva5kn0vj9p5h2br6qlwvhdwqq8269gqp"; + version = "0.12.3.0"; + sha256 = "0r21fmmhn90rjvgxmlcq5f1q8dxd1y2zr62z2llcnl206a2hpm2x"; isLibrary = true; isExecutable = true; enableSeparateDataOutput = true; @@ -214120,8 +214296,6 @@ self: { ]; description = "Language handling for Snap"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "snap-loader-dynamic" = callPackage @@ -215765,22 +215939,29 @@ self: { }) {}; "sockets" = callPackage - ({ mkDerivation, async, base, bytestring, entropy, error-codes, ip - , posix-api, primitive, stm, tasty, tasty-hunit, text + ({ mkDerivation, async, base, byteslice, bytestring, entropy + , error-codes, ip, posix-api, primitive, primitive-addr + , primitive-offset, primitive-unlifted, stm, tasty, tasty-hunit + , text }: mkDerivation { pname = "sockets"; - version = "0.3.1.0"; - sha256 = "0i1h7m7yrsgz8srmpm9fw2wa1jj0cfxah2alp7q88zpgyaz2zr9d"; + version = "0.4.0.0"; + sha256 = "0xv8341kvy6br88lj4g17hqci9sn8qbm063iv69gmfbyp5x7fs9d"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ - base bytestring error-codes ip posix-api primitive stm text + base byteslice bytestring error-codes ip posix-api primitive + primitive-addr primitive-offset primitive-unlifted stm text ]; testHaskellDepends = [ - async base bytestring ip primitive tasty tasty-hunit + async base byteslice bytestring ip primitive primitive-addr + primitive-unlifted tasty tasty-hunit + ]; + benchmarkHaskellDepends = [ + base byteslice bytestring entropy ip primitive ]; - benchmarkHaskellDepends = [ base bytestring entropy ip primitive ]; + doHaddock = false; description = "High-level network sockets"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; @@ -216675,8 +216856,6 @@ self: { ]; description = "Rotate about any suitable axis"; license = stdenv.lib.licenses.gpl3; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "spawn" = callPackage @@ -217894,6 +218073,8 @@ self: { ]; description = "A file-packing application"; license = "GPL"; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "sr-extra" = callPackage @@ -219146,8 +219327,6 @@ self: { ]; description = "Generate standalone haddock documentation for a set of packages"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "star" = callPackage @@ -219787,8 +219966,6 @@ self: { ]; description = "What version is the package X in stackage lts-Y.ZZ?"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "stb-image" = callPackage @@ -219825,8 +220002,6 @@ self: { libraryHaskellDepends = [ array base bytestring containers ]; description = "A wrapper around Sean Barrett's TrueType rasterizer library"; license = stdenv.lib.licenses.publicDomain; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "std" = callPackage @@ -220290,8 +220465,6 @@ self: { libraryHaskellDepends = [ base stm transformers ]; description = "Software Transactional Memory lifted to MonadIO"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "stm-linkedlist" = callPackage @@ -220707,6 +220880,58 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "store_0_5_1_2" = callPackage + ({ mkDerivation, array, async, base, base-orphans + , base64-bytestring, bifunctors, bytestring, cereal, cereal-vector + , clock, containers, contravariant, criterion, cryptohash, deepseq + , directory, filepath, free, ghc-prim, hashable, hspec + , hspec-smallcheck, integer-gmp, lifted-base, monad-control + , mono-traversable, network, primitive, resourcet, safe, semigroups + , smallcheck, store-core, syb, template-haskell, text, th-lift + , th-lift-instances, th-orphans, th-reify-many, th-utilities, time + , transformers, unordered-containers, vector + , vector-binary-instances, void, weigh + }: + mkDerivation { + pname = "store"; + version = "0.5.1.2"; + sha256 = "1abwlcj0z17hj5h94cbg1sgqfdsdgjhgfgd2aaspsn4zdfk5bjc5"; + libraryHaskellDepends = [ + array async base base-orphans base64-bytestring bifunctors + bytestring containers contravariant cryptohash deepseq directory + filepath free ghc-prim hashable hspec hspec-smallcheck integer-gmp + lifted-base monad-control mono-traversable network primitive + resourcet safe semigroups smallcheck store-core syb + template-haskell text th-lift th-lift-instances th-orphans + th-reify-many th-utilities time transformers unordered-containers + vector void + ]; + testHaskellDepends = [ + array async base base-orphans base64-bytestring bifunctors + bytestring clock containers contravariant cryptohash deepseq + directory filepath free ghc-prim hashable hspec hspec-smallcheck + integer-gmp lifted-base monad-control mono-traversable network + primitive resourcet safe semigroups smallcheck store-core syb + template-haskell text th-lift th-lift-instances th-orphans + th-reify-many th-utilities time transformers unordered-containers + vector void + ]; + benchmarkHaskellDepends = [ + array async base base-orphans base64-bytestring bifunctors + bytestring cereal cereal-vector containers contravariant criterion + cryptohash deepseq directory filepath free ghc-prim hashable hspec + hspec-smallcheck integer-gmp lifted-base monad-control + mono-traversable network primitive resourcet safe semigroups + smallcheck store-core syb template-haskell text th-lift + th-lift-instances th-orphans th-reify-many th-utilities time + transformers unordered-containers vector vector-binary-instances + void weigh + ]; + description = "Fast binary serialization"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "store-core" = callPackage ({ mkDerivation, base, bytestring, ghc-prim, primitive, text , transformers @@ -221102,8 +221327,6 @@ self: { ]; description = "Benchmarks to compare streaming packages"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "streaming-binary" = callPackage @@ -221251,8 +221474,6 @@ self: { ]; description = "Concurrency support for the streaming ecosystem"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "streaming-conduit" = callPackage @@ -221368,8 +221589,6 @@ self: { ]; description = "A hand-written streaming byte parser for OpenStreetMap Protobuf data"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "streaming-pcap" = callPackage @@ -221391,8 +221610,6 @@ self: { ]; description = "Stream packets via libpcap"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "streaming-png" = callPackage @@ -222209,8 +222426,8 @@ self: { pname = "strip-ansi-escape"; version = "0.1.0.0"; sha256 = "0yxz4ygckhzav8s2vbd6355gclk1zs6xk0s0s90nxd7yxhahfpx8"; - revision = "1"; - editedCabalFile = "1zbw389ki2s5lywqigvdp1hj8y8r91s3ad6hrxfcp57i1bl68ymw"; + revision = "2"; + editedCabalFile = "0pzp5wya73l732waxjl3fza3kkr7ip7bgsj6xhvsi1k0n69yvwh8"; libraryHaskellDepends = [ attoparsec base text ]; testHaskellDepends = [ base hspec QuickCheck text ]; description = "Strip ANSI escape code from string"; @@ -222452,8 +222669,6 @@ self: { ]; description = "Interface library for strongSwan SQL backend"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "strptime" = callPackage @@ -222795,28 +223010,21 @@ self: { }) {}; "suavemente" = callPackage - ({ mkDerivation, base, blaze-markup, bytestring, diagrams-core - , diagrams-lib, diagrams-svg, interpolatedstring-perl6, lens, mtl - , servant, servant-blaze, servant-server, servant-websockets, stm - , streaming, svg-builder, transformers, warp, websockets + ({ mkDerivation, aeson, base, blaze-markup, bytestring, colour + , containers, diagrams-core, diagrams-lib, diagrams-svg + , interpolatedstring-perl6, lens, mtl, servant, servant-blaze + , servant-server, servant-websockets, stm, streaming, svg-builder + , text, transformers, warp, websockets }: mkDerivation { pname = "suavemente"; - version = "0.1.0.0"; - sha256 = "1595jc7lqvdk60p0cc3vjag7lgd90ayfwb16n70i1j9sz3b2qvva"; - isLibrary = true; - isExecutable = true; + version = "0.2.0.0"; + sha256 = "0m5sfa3sx67mx1wsps0vpr4g4vq64rmdml6p930r1jp3b4rd41wa"; libraryHaskellDepends = [ - base blaze-markup bytestring diagrams-core diagrams-lib - diagrams-svg interpolatedstring-perl6 lens mtl servant - servant-blaze servant-server servant-websockets stm streaming - svg-builder transformers warp websockets - ]; - executableHaskellDepends = [ - base blaze-markup bytestring diagrams-core diagrams-lib - diagrams-svg interpolatedstring-perl6 lens mtl servant + aeson base blaze-markup bytestring colour containers diagrams-core + diagrams-lib diagrams-svg interpolatedstring-perl6 lens mtl servant servant-blaze servant-server servant-websockets stm streaming - svg-builder transformers warp websockets + svg-builder text transformers warp websockets ]; description = "An applicative functor that seamlessly talks to HTML inputs"; license = stdenv.lib.licenses.bsd3; @@ -222962,8 +223170,6 @@ self: { ]; description = "Match / replace substrings with a parser combinators"; license = stdenv.lib.licenses.asl20; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "subtitleParser" = callPackage @@ -224406,8 +224612,6 @@ self: { ]; description = "Library for symantic grammars"; license = stdenv.lib.licenses.gpl3; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "symantic-http" = callPackage @@ -224789,8 +224993,6 @@ self: { benchmarkHaskellDepends = [ base criterion deepseq ]; description = "Generic representation and manipulation of abstract syntax"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "syntactical" = callPackage @@ -225719,8 +225921,6 @@ self: { ]; description = "Layout text as grid or table"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "table-tennis" = callPackage @@ -227334,8 +227534,6 @@ self: { testHaskellDepends = [ base QuickCheck tasty ]; description = "Pre-built tasty trees for checking lawful class properties using QuickCheck"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "tasty-rerun" = callPackage @@ -227750,8 +227948,6 @@ self: { ]; description = "Chart generation from tdigest"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "tdoc" = callPackage @@ -228911,8 +229107,8 @@ self: { }: mkDerivation { pname = "termonad"; - version = "1.2.0.0"; - sha256 = "1qfiby52nqyxq0vmz9dipi4c3qlvsbaji3z67p1vhwf0ccswlx5y"; + version = "1.3.0.0"; + sha256 = "1vyvh0b7r1l060yhm9j572yzlpvz3pba50snaqi9cicvddrj3aj9"; isLibrary = true; isExecutable = true; enableSeparateDataOutput = true; @@ -228932,8 +229128,6 @@ self: { ]; description = "Terminal emulator configurable in Haskell"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {inherit (pkgs) gtk3; vte_291 = pkgs.vte;}; "termplot" = callPackage @@ -230248,6 +230442,25 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "text-printer_0_5_0_1" = callPackage + ({ mkDerivation, base, bytestring, pretty, QuickCheck, semigroups + , test-framework, test-framework-quickcheck2, text, text-latin1 + }: + mkDerivation { + pname = "text-printer"; + version = "0.5.0.1"; + sha256 = "065m64f5l4yyccb04c7bwax09wk6aafm2v9sl3w8w1asqw7ni9sq"; + libraryHaskellDepends = [ + base bytestring pretty semigroups text text-latin1 + ]; + testHaskellDepends = [ + base QuickCheck test-framework test-framework-quickcheck2 + ]; + description = "Abstract interface for text builders/printers"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "text-regex-replace" = callPackage ({ mkDerivation, attoparsec, base, hspec, QuickCheck, smallcheck , text, text-icu @@ -231441,8 +231654,6 @@ self: { ]; description = "Haskell API bindings for http://themoviedb.org"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "themplate" = callPackage @@ -231782,8 +231993,6 @@ self: { ]; description = "Simple, IO-based library for Erlang-style thread supervision"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "threadscope" = callPackage @@ -232018,8 +232227,6 @@ self: { testToolDepends = [ tasty-discover ]; description = "throwable-exceptions gives the easy way to throw exceptions"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "thumbnail" = callPackage @@ -232651,8 +232858,6 @@ self: { ]; description = "Parsers for types in `time`"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "time-patterns" = callPackage @@ -233957,8 +234162,6 @@ self: { libraryHaskellDepends = [ base ]; description = "A todo bottom"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "todos" = callPackage @@ -234252,7 +234455,7 @@ self: { broken = true; }) {}; - "tomland_1_0_1_0" = callPackage + "tomland_1_1_0_0" = callPackage ({ mkDerivation, aeson, base, bytestring, containers, deepseq , gauge, hashable, hedgehog, hspec-megaparsec, htoml , htoml-megaparsec, markdown-unlit, megaparsec, mtl, parsec @@ -234262,8 +234465,8 @@ self: { }: mkDerivation { pname = "tomland"; - version = "1.0.1.0"; - sha256 = "1f5819bxv9ybj5ygpndlhyfsjl3i6x03xfrgpxnjkjk0pyjmywx2"; + version = "1.1.0.0"; + sha256 = "0ip3pp76jf6di18r10ksxw35a2594k7h1iygm0b4k77m4fx4bqzn"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -235049,8 +235252,6 @@ self: { ]; description = "Distributed tracing"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "tracker" = callPackage @@ -235082,8 +235283,6 @@ self: { ]; description = "A command-line tool for live monitoring"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "traction" = callPackage @@ -235667,8 +235866,6 @@ self: { testHaskellDepends = [ base doctest ]; description = "Type Safe Web Routing"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "trasa-client" = callPackage @@ -235685,8 +235882,6 @@ self: { ]; description = "Type safe http requests"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "trasa-reflex" = callPackage @@ -235720,8 +235915,6 @@ self: { ]; description = "Type safe web server"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "trasa-th" = callPackage @@ -235738,8 +235931,6 @@ self: { testHaskellDepends = [ base trasa ]; description = "Template Haskell to generate trasa routes"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "traverse-with-class" = callPackage @@ -236441,8 +236632,6 @@ self: { ]; description = "TripleSec is a simple, triple-paranoid, symmetric encryption library"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "trivia" = callPackage @@ -237228,8 +237417,8 @@ self: { pname = "turtle"; version = "1.5.14"; sha256 = "10sxbmis82z5r2ksfkik5kryz5i0xwihz9drc1dzz4fb76kkb67z"; - revision = "2"; - editedCabalFile = "0inmpmcagv6kqhq4bqrpmygv5an8cqna0p14x3jggw8vz3a741xp"; + revision = "3"; + editedCabalFile = "0rmmfqsphhv7h72a8lbdbpqi3rc4k6k83x8p9mamh57108qrs3xy"; libraryHaskellDepends = [ ansi-wl-pprint async base bytestring clock containers directory exceptions foldl hostname managed optional-args @@ -237390,8 +237579,6 @@ self: { libraryHaskellDepends = [ base eventloop ]; description = "Tree type and show functions for lab assignment of University of Twente. Contains RoseTree and RedBlackTree"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "twentefp-graphs" = callPackage @@ -238133,13 +238320,20 @@ self: { }) {}; "type-errors" = callPackage - ({ mkDerivation, base, doctest, first-class-families }: + ({ mkDerivation, base, doctest, first-class-families, syb + , template-haskell, th-abstraction + }: mkDerivation { pname = "type-errors"; - version = "0.1.0.0"; - sha256 = "1zfix76m145gnq8h20dcr8qy84fyjfcnjhxnm5xg5nhqb8p4zj1b"; - libraryHaskellDepends = [ base first-class-families ]; - testHaskellDepends = [ base doctest first-class-families ]; + version = "0.2.0.0"; + sha256 = "1d1fi4ij18q39rpibc056mgvly75zqixkba4l8bn307c62f50k8p"; + libraryHaskellDepends = [ + base first-class-families syb template-haskell th-abstraction + ]; + testHaskellDepends = [ + base doctest first-class-families syb template-haskell + th-abstraction + ]; description = "Tools for writing better type errors"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; @@ -239802,8 +239996,6 @@ self: { ]; description = "Opinionated Haskell Interoperability"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "unbound" = callPackage @@ -241687,8 +241879,6 @@ self: { ]; description = "Command-line tool to generate paths for moving upward in a file system"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "up-grade" = callPackage @@ -242162,8 +242352,6 @@ self: { ]; description = "Painfully simple URL deployment"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "urn" = callPackage @@ -242895,15 +243083,15 @@ self: { }: mkDerivation { pname = "uuid-orphans"; - version = "1.4.2"; - sha256 = "1rsaskv8xhj773abijsq3xi3maa0ixw1k2qywcmw4bdm25pyxsr2"; - revision = "1"; - editedCabalFile = "1nzr5cyl7w6a7wsbhbh403mlzaiscf02awrsm6kdnkfzgnlq39jg"; + version = "1.4.3"; + sha256 = "0bfjyc6dg0k7vrd0i1w7ijdld3ns46jdy3dhybh9r2k08kr7fkgy"; libraryHaskellDepends = [ base safecopy text th-lift uuid-types web-routes ]; description = "Orphan instances for the UUID datatype"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "uuid-quasi" = callPackage @@ -243174,8 +243362,6 @@ self: { ]; description = "Runs commands on remote machines using ssh"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "valid" = callPackage @@ -243683,8 +243869,6 @@ self: { ]; description = "Client library for HashiCorp's Vault tool (via HTTP API)"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "vault-tool-server" = callPackage @@ -243933,8 +244117,26 @@ self: { benchmarkHaskellDepends = [ base criterion fin vector ]; description = "Vec: length-indexed (sized) list"; license = stdenv.lib.licenses.bsd3; + }) {}; + + "vec_0_1_1_1" = callPackage + ({ mkDerivation, adjunctions, base, base-compat, criterion, deepseq + , distributive, fin, hashable, inspection-testing, lens + , semigroupoids, tagged, transformers, vector + }: + mkDerivation { + pname = "vec"; + version = "0.1.1.1"; + sha256 = "0gzypyi4vv5ajysbmnpicm8r2qh95nmmrj9l6hp30b95i36cb5as"; + libraryHaskellDepends = [ + adjunctions base base-compat deepseq distributive fin hashable lens + semigroupoids transformers + ]; + testHaskellDepends = [ base fin inspection-testing tagged ]; + benchmarkHaskellDepends = [ base criterion fin vector ]; + description = "Vec: length-indexed (sized) list"; + license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "vect" = callPackage @@ -244201,8 +244403,6 @@ self: { ]; description = "Utilities for the \"vector\" library"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "vector-fftw" = callPackage @@ -244725,8 +244925,6 @@ self: { ]; description = "types for ingesting vflow data with aeson"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "vfr-waypoints" = callPackage @@ -244935,8 +245133,6 @@ self: { executableHaskellDepends = [ base ]; description = "Frontend for video metadata tagging tools"; license = stdenv.lib.licenses.bsd2; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "vimus" = callPackage @@ -245706,8 +245902,6 @@ self: { libraryHaskellDepends = [ base ]; description = "Low-level low-overhead vulkan api bindings"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "waargonaut" = callPackage @@ -247232,8 +247426,6 @@ self: { ]; description = "Typesafe URLs for Wai applications"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "wai-routing" = callPackage @@ -248990,8 +249182,6 @@ self: { libraryPkgconfigDepends = [ webkitgtk ]; description = "JavaScriptCore FFI from webkitgtk"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {inherit (pkgs) webkitgtk;}; "webkitgtk3" = callPackage @@ -249312,6 +249502,8 @@ self: { ]; description = "A school-timetable problem-solver"; license = "GPL"; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "weigh" = callPackage @@ -249620,8 +249812,6 @@ self: { ]; description = "Data types for large but fixed width signed and unsigned integers"; license = stdenv.lib.licenses.bsd2; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "wigner-symbols" = callPackage @@ -250043,8 +250233,6 @@ self: { testHaskellDepends = [ base conduit hspec HUnit mtl ]; description = "Run computations that depend on one or more elements in a stream"; license = stdenv.lib.licenses.gpl3; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "witherable" = callPackage @@ -250532,8 +250720,6 @@ self: { benchmarkHaskellDepends = [ base criterion pandoc text ]; description = "Get word counts and distributions"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "wordcloud" = callPackage @@ -250845,6 +251031,23 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "world-peace_1_0_0_0" = callPackage + ({ mkDerivation, aeson, base, deepseq, doctest, Glob, profunctors + , should-not-typecheck, tagged, tasty, tasty-hunit, text + }: + mkDerivation { + pname = "world-peace"; + version = "1.0.0.0"; + sha256 = "1fx8f7dfrslqwmkbcyff5q7iafa5znc73f77il7y87hz23q9yzmx"; + libraryHaskellDepends = [ aeson base deepseq profunctors tagged ]; + testHaskellDepends = [ + base doctest Glob should-not-typecheck tasty tasty-hunit text + ]; + description = "Open Union and Open Product Types"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "wp-archivebot" = callPackage ({ mkDerivation, base, feed, HTTP, network, parallel, tagsoup }: mkDerivation { @@ -251304,8 +251507,6 @@ self: { ]; description = "A simple CLI utility for interacting with a websocket"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "ws-chans" = callPackage @@ -251328,8 +251529,6 @@ self: { ]; description = "Unagi chan based websocket client"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "wsdl" = callPackage @@ -254260,8 +254459,6 @@ self: { ]; description = "Yam Web"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "yam_0_6_3" = callPackage @@ -254296,7 +254493,6 @@ self: { description = "A wrapper of servant"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "yam-app" = callPackage @@ -254351,8 +254547,6 @@ self: { ]; description = "Yam DataSource Middleware"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "yam-datasource_0_6_3" = callPackage @@ -254371,7 +254565,6 @@ self: { description = "Yam DataSource Middleware"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "yam-job" = callPackage @@ -254763,8 +254956,8 @@ self: { pname = "yampa-canvas"; version = "0.2.3"; sha256 = "0a1pq1psmc4490isr19z4prnqq1w3374vkfmzpw9s20s2p6k5y7r"; - revision = "1"; - editedCabalFile = "0i1nni9skh2xdp3z8gd137v0l7z8zxcmwhpaq1i4qbgx1llyi96b"; + revision = "2"; + editedCabalFile = "1zyb6z4q46f09lsnswk3z401p5nry65k5cp3jypbcwc8m122hgb1"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base blank-canvas stm time Yampa ]; @@ -255095,8 +255288,6 @@ self: { libraryHaskellDepends = [ base deriving-compat hedgehog yaya ]; description = "Hedgehog testing support for the Yaya recursion scheme library"; license = stdenv.lib.licenses.agpl3; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "yaya-unsafe" = callPackage @@ -256233,8 +256424,6 @@ self: { ]; description = "Utilities for using the Fay Haskell-to-JS compiler with Yesod"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "yesod-fb" = callPackage @@ -256625,8 +256814,6 @@ self: { ]; description = "A pagination approach for yesod"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "yesod-paypal-rest" = callPackage @@ -258782,8 +258969,6 @@ self: { ]; description = "Bindings to ZeroMQ 4.x"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {inherit (pkgs) zeromq;}; "zeromq4-haskell_0_8_0" = callPackage @@ -258846,8 +259031,6 @@ self: { ]; description = "More constrained extensions to zeromq4-haskell"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "zeroth" = callPackage @@ -259701,8 +259884,6 @@ self: { ]; description = "Creating and extracting arbitrary archives"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "zuramaru" = callPackage @@ -259754,8 +259935,6 @@ self: { libraryHaskellDepends = [ base ]; description = "Password strength estimation"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; } diff --git a/pkgs/development/interpreters/clojure/default.nix b/pkgs/development/interpreters/clojure/default.nix index 4fe1e182095..8df64de3acb 100644 --- a/pkgs/development/interpreters/clojure/default.nix +++ b/pkgs/development/interpreters/clojure/default.nix @@ -1,12 +1,12 @@ -{ stdenv, fetchurl, jdk, rlwrap, makeWrapper }: +{ stdenv, fetchurl, jdk11, rlwrap, makeWrapper }: stdenv.mkDerivation rec { - name = "clojure-${version}"; - version = "1.10.0.442"; + pname = "clojure"; + version = "1.10.1.462"; src = fetchurl { url = "https://download.clojure.org/install/clojure-tools-${version}.tar.gz"; - sha256 = "147pkid3pvw60gq8vansid3x6wwfy9pqdbla3wfd5qaxqbcrhclw"; + sha256 = "0mi7fzqvkg2ihigxkkamc742m1iba0yzy8ivciavzmpcnw128sc6"; }; buildInputs = [ makeWrapper ]; @@ -14,11 +14,11 @@ stdenv.mkDerivation rec { outputs = [ "out" "prefix" ]; installPhase = let - binPath = stdenv.lib.makeBinPath [ rlwrap jdk ]; + binPath = stdenv.lib.makeBinPath [ rlwrap jdk11 ]; in '' mkdir -p $prefix/libexec cp clojure-tools-${version}.jar $prefix/libexec - cp {,example-}deps.edn $prefix + cp example-deps.edn $prefix substituteInPlace clojure --replace PREFIX $prefix @@ -50,7 +50,7 @@ stdenv.mkDerivation rec { offers a software transactional memory system and reactive Agent system that ensure clean, correct, multithreaded designs. ''; - maintainers = with maintainers; [ the-kenny ]; + maintainers = with maintainers; [ jlesquembre ]; platforms = platforms.unix; }; } diff --git a/pkgs/development/interpreters/python/cpython/3.8/no-ldconfig.patch b/pkgs/development/interpreters/python/cpython/3.8/no-ldconfig.patch new file mode 100644 index 00000000000..a1f9d68eb16 --- /dev/null +++ b/pkgs/development/interpreters/python/cpython/3.8/no-ldconfig.patch @@ -0,0 +1,100 @@ +From 597e73f2a4b2f0b508127931b36d5540d6941823 Mon Sep 17 00:00:00 2001 +From: Frederik Rietdijk <fridh@fridh.nl> +Date: Mon, 28 Aug 2017 09:24:06 +0200 +Subject: [PATCH] Don't use ldconfig + +--- + Lib/ctypes/util.py | 70 ++---------------------------------------------------- + 1 file changed, 2 insertions(+), 68 deletions(-) + +diff --git a/Lib/ctypes/util.py b/Lib/ctypes/util.py +index 5e8b31a854..7b45ce6c15 100644 +--- a/Lib/ctypes/util.py ++++ b/Lib/ctypes/util.py +@@ -94,46 +94,7 @@ elif os.name == "posix": + import re, tempfile + + def _findLib_gcc(name): +- # Run GCC's linker with the -t (aka --trace) option and examine the +- # library name it prints out. The GCC command will fail because we +- # haven't supplied a proper program with main(), but that does not +- # matter. +- expr = os.fsencode(r'[^\(\)\s]*lib%s\.[^\(\)\s]*' % re.escape(name)) +- +- c_compiler = shutil.which('gcc') +- if not c_compiler: +- c_compiler = shutil.which('cc') +- if not c_compiler: +- # No C compiler available, give up +- return None +- +- temp = tempfile.NamedTemporaryFile() +- try: +- args = [c_compiler, '-Wl,-t', '-o', temp.name, '-l' + name] +- +- env = dict(os.environ) +- env['LC_ALL'] = 'C' +- env['LANG'] = 'C' +- try: +- proc = subprocess.Popen(args, +- stdout=subprocess.PIPE, +- stderr=subprocess.STDOUT, +- env=env) +- except OSError: # E.g. bad executable +- return None +- with proc: +- trace = proc.stdout.read() +- finally: +- try: +- temp.close() +- except FileNotFoundError: +- # Raised if the file was already removed, which is the normal +- # behaviour of GCC if linking fails +- pass +- res = re.search(expr, trace) +- if not res: +- return None +- return os.fsdecode(res.group(0)) ++ return None + + + if sys.platform == "sunos5": +@@ -255,34 +216,7 @@ elif os.name == "posix": + else: + + def _findSoname_ldconfig(name): +- import struct +- if struct.calcsize('l') == 4: +- machine = os.uname().machine + '-32' +- else: +- machine = os.uname().machine + '-64' +- mach_map = { +- 'x86_64-64': 'libc6,x86-64', +- 'ppc64-64': 'libc6,64bit', +- 'sparc64-64': 'libc6,64bit', +- 's390x-64': 'libc6,64bit', +- 'ia64-64': 'libc6,IA-64', +- } +- abi_type = mach_map.get(machine, 'libc6') +- +- # XXX assuming GLIBC's ldconfig (with option -p) +- regex = r'\s+(lib%s\.[^\s]+)\s+\(%s' +- regex = os.fsencode(regex % (re.escape(name), abi_type)) +- try: +- with subprocess.Popen(['/sbin/ldconfig', '-p'], +- stdin=subprocess.DEVNULL, +- stderr=subprocess.DEVNULL, +- stdout=subprocess.PIPE, +- env={'LC_ALL': 'C', 'LANG': 'C'}) as p: +- res = re.search(regex, p.stdout.read()) +- if res: +- return os.fsdecode(res.group(1)) +- except OSError: +- pass ++ return None + + def _findLib_ld(name): + # See issue #9998 for why this is needed +-- +2.15.0 + diff --git a/pkgs/development/interpreters/python/default.nix b/pkgs/development/interpreters/python/default.nix index 119c0a2728b..7f21d03fc3a 100644 --- a/pkgs/development/interpreters/python/default.nix +++ b/pkgs/development/interpreters/python/default.nix @@ -98,6 +98,19 @@ in { inherit passthruFun; }; + python38 = callPackage ./cpython { + self = python38; + sourceVersion = { + major = "3"; + minor = "8"; + patch = "0"; + suffix = "b2"; + }; + sha256 = "1rh9dz5vmc56y45d6j2wfjw4m7x25i6v8vyld4mrqh06s2gn1hbl"; + inherit (darwin) CF configd; + inherit passthruFun; + }; + pypy27 = callPackage ./pypy { self = pypy27; sourceVersion = { diff --git a/pkgs/development/interpreters/supercollider/default.nix b/pkgs/development/interpreters/supercollider/default.nix index c16b57dcb9c..057375182f5 100644 --- a/pkgs/development/interpreters/supercollider/default.nix +++ b/pkgs/development/interpreters/supercollider/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl, cmake, pkgconfig, alsaLib , libjack2, libsndfile, fftw, curl, gcc -, libXt, qtbase, qttools, qtwebkit, readline -, useSCEL ? false, emacs +, libXt, qtbase, qttools, qtwebengine +, readline, qtwebsockets, useSCEL ? false, emacs }: let optional = stdenv.lib.optional; @@ -9,12 +9,12 @@ in stdenv.mkDerivation rec { name = "supercollider-${version}"; - version = "3.9.3"; + version = "3.10.2"; src = fetchurl { url = "https://github.com/supercollider/supercollider/releases/download/Version-${version}/SuperCollider-${version}-Source-linux.tar.bz2"; - sha256 = "1d8ixfl100jvlialxdizp8wqsl1mp5pi2bam25vp97bhjd59cfdr"; + sha256 = "0ynz1ydcpsd5h57h1n4a7avm6p1cif5a8rkmz4qpr46pr8z9p6iq"; }; hardeningDisable = [ "stackprotector" ]; @@ -27,14 +27,15 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake pkgconfig qttools ]; buildInputs = [ - gcc libjack2 libsndfile fftw curl libXt qtbase qtwebkit readline ] + gcc libjack2 libsndfile fftw curl libXt qtbase qtwebengine qtwebsockets readline ] ++ optional (!stdenv.isDarwin) alsaLib ++ optional useSCEL emacs; - meta = { + meta = with stdenv.lib; { description = "Programming language for real time audio synthesis"; homepage = http://supercollider.sourceforge.net/; - license = stdenv.lib.licenses.gpl3Plus; + maintainers = with maintainers; [ mrmebelman ]; + license = licenses.gpl3; platforms = [ "x686-linux" "x86_64-linux" ]; }; } diff --git a/pkgs/development/libraries/accountsservice/default.nix b/pkgs/development/libraries/accountsservice/default.nix index c20167138b7..8713663ecca 100644 --- a/pkgs/development/libraries/accountsservice/default.nix +++ b/pkgs/development/libraries/accountsservice/default.nix @@ -1,45 +1,77 @@ -{ stdenv, fetchurl, pkgconfig, glib, intltool, makeWrapper, shadow -, gobject-introspection, polkit, systemd, coreutils, meson, dbus -, ninja, python3 }: +{ stdenv +, fetchurl +, fetchpatch +, substituteAll +, pkgconfig +, glib +, shadow +, gobject-introspection +, polkit +, systemd +, coreutils +, meson +, dbus +, ninja +, python3 +, gettext +}: stdenv.mkDerivation rec { - name = "accountsservice-${version}"; + pname = "accountsservice"; version = "0.6.55"; + outputs = [ "out" "dev" ]; + src = fetchurl { - url = "https://www.freedesktop.org/software/accountsservice/accountsservice-${version}.tar.xz"; + url = "https://www.freedesktop.org/software/${pname}/${pname}-${version}.tar.xz"; sha256 = "16wwd633jak9ajyr1f1h047rmd09fhf3kzjz6g5xjsz0lwcj8azz"; }; - nativeBuildInputs = [ pkgconfig makeWrapper meson ninja python3 ]; + nativeBuildInputs = [ + dbus + gettext + gobject-introspection + meson + ninja + pkgconfig + python3 + ]; + + buildInputs = [ + glib + polkit + ]; - buildInputs = [ glib intltool gobject-introspection polkit systemd dbus ]; + mesonFlags = [ + "-Dadmin_group=wheel" + "-Dlocalstatedir=/var" + "-Dsystemdsystemunitdir=${placeholder ''out''}/etc/systemd/system" + ]; - mesonFlags = [ "-Dsystemdsystemunitdir=etc/systemd/system" - "-Dlocalstatedir=/var" ]; - prePatch = '' + postPatch = '' chmod +x meson_post_install.py patchShebangs meson_post_install.py - - substituteInPlace src/daemon.c --replace '"/usr/sbin/useradd"' '"${shadow}/bin/useradd"' \ - --replace '"/usr/sbin/userdel"' '"${shadow}/bin/userdel"' - substituteInPlace src/user.c --replace '"/usr/sbin/usermod"' '"${shadow}/bin/usermod"' \ - --replace '"/usr/bin/chage"' '"${shadow}/bin/chage"' \ - --replace '"/usr/bin/passwd"' '"${shadow}/bin/passwd"' \ - --replace '"/bin/cat"' '"${coreutils}/bin/cat"' ''; patches = [ + (substituteAll { + src = ./fix-paths.patch; + inherit shadow coreutils; + }) ./no-create-dirs.patch ./Disable-methods-that-change-files-in-etc.patch + # Systemd unit improvements. Notably using StateDirectory eliminating the + # need of an ad-hoc script. + (fetchpatch { + url = "https://gitlab.freedesktop.org/accountsservice/accountsservice/commit/152b845bbd3ca2a64516691493a160825f1a2046.patch"; + sha256 = "114wrf5mwj5bgc5v1g05md4ridcnwdrwppr3bjz96sknwh5hk8s5"; + }) + (fetchpatch { + url = "https://gitlab.freedesktop.org/accountsservice/accountsservice/commit/0e712e935abd26499ff5995ab363e5bfd9ee7c4c.patch"; + sha256 = "1y60a5fmgfqjzprwpizilrazqn3mggdlgc5sgcpsprsp62fv78rl"; + }) ]; - preFixup = '' - wrapProgram "$out/libexec/accounts-daemon" \ - --run "${coreutils}/bin/mkdir -p /var/lib/AccountsService/users" \ - --run "${coreutils}/bin/mkdir -p /var/lib/AccountsService/icons" - ''; - meta = with stdenv.lib; { description = "D-Bus interface for user account query and manipulation"; homepage = https://www.freedesktop.org/wiki/Software/AccountsService; diff --git a/pkgs/development/libraries/accountsservice/fix-paths.patch b/pkgs/development/libraries/accountsservice/fix-paths.patch new file mode 100644 index 00000000000..0bf6ee3d91a --- /dev/null +++ b/pkgs/development/libraries/accountsservice/fix-paths.patch @@ -0,0 +1,125 @@ +diff --git a/src/daemon.c b/src/daemon.c +index c52bda3..75d214e 100644 +--- a/src/daemon.c ++++ b/src/daemon.c +@@ -1106,7 +1106,7 @@ daemon_create_user_authorized_cb (Daemon *daemon, + + sys_log (context, "create user '%s'", cd->user_name); + +- argv[0] = "/usr/sbin/useradd"; ++ argv[0] = "@shadow@/bin/useradd"; + argv[1] = "-m"; + argv[2] = "-c"; + argv[3] = cd->real_name; +@@ -1318,7 +1318,7 @@ daemon_delete_user_authorized_cb (Daemon *daemon, + + user_set_saved (user, FALSE); + +- argv[0] = "/usr/sbin/userdel"; ++ argv[0] = "@shadow@/bin/userdel"; + if (ud->remove_files) { + argv[1] = "-f"; + argv[2] = "-r"; +diff --git a/src/user.c b/src/user.c +index 9f57af5..e65289d 100644 +--- a/src/user.c ++++ b/src/user.c +@@ -844,7 +844,7 @@ user_change_real_name_authorized_cb (Daemon *daemon, + accounts_user_get_uid (ACCOUNTS_USER (user)), + name); + +- argv[0] = "/usr/sbin/usermod"; ++ argv[0] = "@shadown@/bin/usermod"; + argv[1] = "-c"; + argv[2] = name; + argv[3] = "--"; +@@ -913,7 +913,7 @@ user_change_user_name_authorized_cb (Daemon *daemon, + accounts_user_get_uid (ACCOUNTS_USER (user)), + name); + +- argv[0] = "/usr/sbin/usermod"; ++ argv[0] = "@shadow@/bin/usermod"; + argv[1] = "-l"; + argv[2] = name; + argv[3] = "--"; +@@ -1321,7 +1321,7 @@ user_change_home_dir_authorized_cb (Daemon *daemon, + accounts_user_get_uid (ACCOUNTS_USER (user)), + home_dir); + +- argv[0] = "/usr/sbin/usermod"; ++ argv[0] = "@shadow@/bin/usermod"; + argv[1] = "-m"; + argv[2] = "-d"; + argv[3] = home_dir; +@@ -1378,7 +1378,7 @@ user_change_shell_authorized_cb (Daemon *daemon, + accounts_user_get_uid (ACCOUNTS_USER (user)), + shell); + +- argv[0] = "/usr/sbin/usermod"; ++ argv[0] = "@shadow@/bin/usermod"; + argv[1] = "-s"; + argv[2] = shell; + argv[3] = "--"; +@@ -1520,7 +1520,7 @@ user_change_icon_file_authorized_cb (Daemon *daemon, + return; + } + +- argv[0] = "/bin/cat"; ++ argv[0] = "@coreutils@/bin/cat"; + argv[1] = filename; + argv[2] = NULL; + +@@ -1601,7 +1601,7 @@ user_change_locked_authorized_cb (Daemon *daemon, + locked ? "locking" : "unlocking", + accounts_user_get_user_name (ACCOUNTS_USER (user)), + accounts_user_get_uid (ACCOUNTS_USER (user))); +- argv[0] = "/usr/sbin/usermod"; ++ argv[0] = "@shadow@/bin/usermod"; + argv[1] = locked ? "-L" : "-U"; + argv[2] = "--"; + argv[3] = accounts_user_get_user_name (ACCOUNTS_USER (user)); +@@ -1726,7 +1726,7 @@ user_change_account_type_authorized_cb (Daemon *daemon, + + g_free (groups); + +- argv[0] = "/usr/sbin/usermod"; ++ argv[0] = "@shadow@/bin/usermod"; + argv[1] = "-G"; + argv[2] = str->str; + argv[3] = "--"; +@@ -1794,7 +1794,7 @@ user_change_password_mode_authorized_cb (Daemon *daemon, + if (mode == PASSWORD_MODE_SET_AT_LOGIN || + mode == PASSWORD_MODE_NONE) { + +- argv[0] = "/usr/bin/passwd"; ++ argv[0] = "/run/wrappers/bin/passwd"; + argv[1] = "-d"; + argv[2] = "--"; + argv[3] = accounts_user_get_user_name (ACCOUNTS_USER (user)); +@@ -1806,7 +1806,7 @@ user_change_password_mode_authorized_cb (Daemon *daemon, + } + + if (mode == PASSWORD_MODE_SET_AT_LOGIN) { +- argv[0] = "/usr/bin/chage"; ++ argv[0] = "@shadow@/bin/chage"; + argv[1] = "-d"; + argv[2] = "0"; + argv[3] = "--"; +@@ -1827,7 +1827,7 @@ user_change_password_mode_authorized_cb (Daemon *daemon, + accounts_user_set_locked (ACCOUNTS_USER (user), FALSE); + } + else if (accounts_user_get_locked (ACCOUNTS_USER (user))) { +- argv[0] = "/usr/sbin/usermod"; ++ argv[0] = "@shadow@/bin/usermod"; + argv[1] = "-U"; + argv[2] = "--"; + argv[3] = accounts_user_get_user_name (ACCOUNTS_USER (user)); +@@ -1905,7 +1905,7 @@ user_change_password_authorized_cb (Daemon *daemon, + + g_object_freeze_notify (G_OBJECT (user)); + +- argv[0] = "/usr/sbin/usermod"; ++ argv[0] = "@shadow@/bin/usermod"; + argv[1] = "-p"; + argv[2] = strings[0]; + argv[3] = "--"; diff --git a/pkgs/development/libraries/leatherman/default.nix b/pkgs/development/libraries/leatherman/default.nix index 9ab68e578fb..95924050ff3 100644 --- a/pkgs/development/libraries/leatherman/default.nix +++ b/pkgs/development/libraries/leatherman/default.nix @@ -2,10 +2,10 @@ stdenv.mkDerivation rec { name = "leatherman-${version}"; - version = "1.6.0"; + version = "1.7.0"; src = fetchFromGitHub { - sha256 = "1dy1iisc0h1l28ff72pq7vxa4mj5zpq2jflpdghhx8yqksxhii4k"; + sha256 = "0n6vcbc43hdaxg5inl2b43bsksdkj3k0qxis6gkkclipivp8pz0p"; rev = version; repo = "leatherman"; owner = "puppetlabs"; diff --git a/pkgs/development/libraries/packr/default.nix b/pkgs/development/libraries/packr/default.nix index c44695cb70a..bc8133aaf82 100644 --- a/pkgs/development/libraries/packr/default.nix +++ b/pkgs/development/libraries/packr/default.nix @@ -5,16 +5,16 @@ buildGoModule rec { pname = "packr"; - version = "2.5.1"; + version = "2.5.2"; src = fetchFromGitHub { owner = "gobuffalo"; repo = pname; rev = "v${version}"; - sha256 = "070hpnsr5w1r1cg9wl80cafmhkx4z3s29wq04fa7rk49hmwml4jy"; + sha256 = "1ciffa5xbd93fylwz93wr4m4fj83dcla55dmdshaqz28rbsapnc1"; }; - modSha256 = "0xvpk9jjcqac44s4fp0jwpljxvs0ypjwc5qfg0w90s2r7jn50fxn"; + modSha256 = "086gydrl3i35hawb5m7rsb4a0llcpdpgid1xfw2z9n6jkwkclw4n"; meta = with lib; { description = "The simple and easy way to embed static files into Go binaries"; diff --git a/pkgs/development/ocaml-modules/hmap/default.nix b/pkgs/development/ocaml-modules/hmap/default.nix new file mode 100644 index 00000000000..563d39909c8 --- /dev/null +++ b/pkgs/development/ocaml-modules/hmap/default.nix @@ -0,0 +1,41 @@ +{ stdenv +, lib +, fetchurl +, findlib +, ocaml +, ocamlbuild +, topkg +}: + +let + minimumSupportedOcamlVersion = "4.02.0"; +in +assert lib.versionOlder minimumSupportedOcamlVersion ocaml.version; + +stdenv.mkDerivation rec { + pname = "hmap"; + version = "0.8.1"; + name = "ocaml${ocaml.version}-${pname}-${version}"; + + src = fetchurl { + url = "http://erratique.ch/software/hmap/releases/${pname}-${version}.tbz"; + sha256 = "10xyjy4ab87z7jnghy0wnla9wrmazgyhdwhr4hdmxxdn28dxn03a"; + }; + + buildInputs = [ ocaml ocamlbuild findlib topkg ]; + + inherit (topkg) installPhase; + + buildPhase = "${topkg.run} build --tests true"; + + doCheck = true; + + checkPhase = "${topkg.run} test"; + + meta = { + description = "Heterogeneous value maps for OCaml"; + homepage = "https://erratique.ch/software/hmap"; + license = lib.licenses.isc; + maintainers = [ lib.maintainers.pmahoney ]; + }; +} diff --git a/pkgs/development/ocaml-modules/opium/default.nix b/pkgs/development/ocaml-modules/opium/default.nix new file mode 100644 index 00000000000..06784b445e3 --- /dev/null +++ b/pkgs/development/ocaml-modules/opium/default.nix @@ -0,0 +1,30 @@ +{ buildDunePackage + +, ppx_sexp_conv +, ppx_fields_conv + +, cmdliner +, cohttp-lwt-unix +, logs +, magic-mime +, opium_kernel +, stringext + +, alcotest +}: + +buildDunePackage rec { + pname = "opium"; + inherit (opium_kernel) version src meta minimumOCamlVersion; + + doCheck = true; + + buildInputs = [ + ppx_sexp_conv ppx_fields_conv + alcotest + ]; + + propagatedBuildInputs = [ + opium_kernel cmdliner cohttp-lwt-unix magic-mime logs stringext + ]; +} diff --git a/pkgs/development/ocaml-modules/opium_kernel/default.nix b/pkgs/development/ocaml-modules/opium_kernel/default.nix new file mode 100644 index 00000000000..8388e108fef --- /dev/null +++ b/pkgs/development/ocaml-modules/opium_kernel/default.nix @@ -0,0 +1,42 @@ +{ lib +, buildDunePackage +, fetchFromGitHub + +, ppx_fields_conv +, ppx_sexp_conv + +, cohttp-lwt +, ezjsonm +, hmap +}: + +buildDunePackage rec { + pname = "opium_kernel"; + version = "0.17.1"; + + minimumOCamlVersion = "4.04.1"; + + src = fetchFromGitHub { + owner = "rgrinberg"; + repo = "opium"; + rev = "v${version}"; + sha256 = "03xzh0ik6k3c0yn1w1avph667vdagwclzimwwrlf9qdxnzxvcnp3"; + }; + + doCheck = true; + + buildInputs = [ + ppx_sexp_conv ppx_fields_conv + ]; + + propagatedBuildInputs = [ + hmap cohttp-lwt ezjsonm + ]; + + meta = { + description = "Sinatra like web toolkit for OCaml based on cohttp & lwt"; + homepage = "https://github.com/rgrinberg/opium"; + license = lib.licenses.mit; + maintainers = [ lib.maintainers.pmahoney ]; + }; +} diff --git a/pkgs/development/python-modules/altair/default.nix b/pkgs/development/python-modules/altair/default.nix index 9e3a97c1312..4d78ad80cc3 100644 --- a/pkgs/development/python-modules/altair/default.nix +++ b/pkgs/development/python-modules/altair/default.nix @@ -5,11 +5,11 @@ buildPythonPackage rec { pname = "altair"; - version = "3.0.1"; + version = "3.1.0"; src = fetchPypi { inherit pname version; - sha256 = "63934563a7a7b7186335858206a0b9be6043163b8b54a26cd3b3299a9e5e391f"; + sha256 = "1zdznkybw3g8fd280h5j5cnnwcv30610gp8fl8vwqda1w2p6pgvp"; }; postPatch = '' diff --git a/pkgs/development/python-modules/fido2/default.nix b/pkgs/development/python-modules/fido2/default.nix index 96ba82f6d98..8922d6e0519 100644 --- a/pkgs/development/python-modules/fido2/default.nix +++ b/pkgs/development/python-modules/fido2/default.nix @@ -5,11 +5,11 @@ buildPythonPackage rec { pname = "fido2"; - version = "0.5.0"; + version = "0.7.0"; src = fetchPypi { inherit pname version; - sha256 = "1pl8d2pr6jzqj4y9qiaddhjgnl92kikjxy0bgzm2jshkzzic8mp3"; + sha256 = "11wdcjymw8y6wxgp29gbhdxff3lpc5yp5fcqnr5vnj88g192ic27"; }; propagatedBuildInputs = [ six cryptography ]; diff --git a/pkgs/development/python-modules/marshmallow-sqlalchemy/default.nix b/pkgs/development/python-modules/marshmallow-sqlalchemy/default.nix index 01f80473fee..22f9b445d24 100644 --- a/pkgs/development/python-modules/marshmallow-sqlalchemy/default.nix +++ b/pkgs/development/python-modules/marshmallow-sqlalchemy/default.nix @@ -4,7 +4,7 @@ buildPythonPackage rec { pname = "marshmallow-sqlalchemy"; - version = "0.16.3"; + version = "0.17.0"; meta = { homepage = "https://github.com/marshmallow-code/marshmallow-sqlalchemy"; @@ -14,7 +14,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "0qzpl53r58fk328cn41365c6jkliwmj41v16zkyjxb9d4s2mvn14"; + sha256 = "17pnbv28n9vy3q66ckxfdbb9k1riy6s8lg63zfm5jsx00f0zqqnn"; }; propagatedBuildInputs = [ marshmallow sqlalchemy ]; diff --git a/pkgs/development/python-modules/nvchecker/default.nix b/pkgs/development/python-modules/nvchecker/default.nix index 7ceffb7a8dd..f21624acf14 100644 --- a/pkgs/development/python-modules/nvchecker/default.nix +++ b/pkgs/development/python-modules/nvchecker/default.nix @@ -1,19 +1,18 @@ -{ stdenv, buildPythonPackage, fetchPypi, pythonOlder, pytest, setuptools, structlog, pytest-asyncio, pytest_xdist, flaky, tornado, pycurl }: +{ stdenv, buildPythonPackage, fetchPypi, pythonOlder, pytest, setuptools, structlog, pytest-asyncio, flaky, tornado, pycurl }: buildPythonPackage rec { pname = "nvchecker"; - version = "1.4.3"; + version = "1.4.4"; src = fetchPypi { inherit pname version; - sha256 = "0v340wkq4sn9pvcpjh076l8mcqkn3nrn7if8p6iysk02bjxvknbv"; + sha256 = "6276ed2a897a30ccd71bfd7cf9e6b7842f37f3d5a86d7a70fe46f437c62b1875"; }; propagatedBuildInputs = [ setuptools structlog tornado pycurl ]; - checkInputs = [ pytest pytest-asyncio pytest_xdist flaky ]; + checkInputs = [ pytest pytest-asyncio flaky ]; - # Disable tests for now, because our version of pytest seems to be too new - # https://github.com/lilydjwg/nvchecker/commit/42a02efec84824a073601e1c2de30339d251e4c7 + # requires network access doCheck = false; checkPhase = '' diff --git a/pkgs/development/python-modules/python-jsonrpc-server/default.nix b/pkgs/development/python-modules/python-jsonrpc-server/default.nix index 02705492095..29c6950070a 100644 --- a/pkgs/development/python-modules/python-jsonrpc-server/default.nix +++ b/pkgs/development/python-modules/python-jsonrpc-server/default.nix @@ -5,13 +5,13 @@ buildPythonPackage rec { pname = "python-jsonrpc-server"; - version = "0.1.2"; + version = "0.2.0"; src = fetchFromGitHub { owner = "palantir"; repo = "python-jsonrpc-server"; rev = version; - sha256 = "0k55rpywghapk5db8dgp2jj5v5654q6m571s1gcz1mpn2qxkz69l"; + sha256 = "054b0xm5z3f82jwp7zj21pkh7gwj9jd933jhymdx49n1n1iynfn0"; }; postPatch = '' diff --git a/pkgs/development/python-modules/python-language-server/default.nix b/pkgs/development/python-modules/python-language-server/default.nix index 09ded676b74..54c5418ae67 100644 --- a/pkgs/development/python-modules/python-language-server/default.nix +++ b/pkgs/development/python-modules/python-language-server/default.nix @@ -1,5 +1,5 @@ { stdenv, buildPythonPackage, fetchFromGitHub, pythonOlder, isPy27 -, configparser, futures, future, jedi, pluggy, python-jsonrpc-server +, backports_functools_lru_cache, configparser, futures, future, jedi, pluggy, python-jsonrpc-server , pytest, mock, pytestcov, coverage , # Allow building a limited set of providers, e.g. ["pycodestyle"]. providers ? ["*"] @@ -54,7 +54,7 @@ buildPythonPackage rec { ++ stdenv.lib.optional (withProvider "rope") rope ++ stdenv.lib.optional (withProvider "yapf") yapf ++ stdenv.lib.optional isPy27 configparser - ++ stdenv.lib.optional (pythonOlder "3.2") futures; + ++ stdenv.lib.optionals (pythonOlder "3.2") [ backports_functools_lru_cache futures ]; meta = with stdenv.lib; { homepage = https://github.com/palantir/python-language-server; diff --git a/pkgs/development/python-modules/soco/default.nix b/pkgs/development/python-modules/soco/default.nix index 4c938490eb4..3f0d16cc8a8 100644 --- a/pkgs/development/python-modules/soco/default.nix +++ b/pkgs/development/python-modules/soco/default.nix @@ -1,22 +1,28 @@ { lib, buildPythonPackage, fetchPypi, xmltodict, requests # Test dependencies -, pytest_3, pytestcov, coveralls, pylint, flake8, graphviz, mock, sphinx +, pytest, pytestcov, coveralls, pylint, flake8, graphviz, mock, sphinx , sphinx_rtd_theme }: buildPythonPackage rec { pname = "soco"; - version = "0.16"; + version = "0.17"; src = fetchPypi { inherit pname version; - sha256 = "7bed4475e3f134283af1f520a9b2e6ce2a8e69bdc1b58ee68528b3d093972424"; + sha256 = "15zw6i5z5p8vsa3lp20rjizhv4lzz935r73im0xm6zsl71bsgvj8"; }; + postPatch = '' + # https://github.com/SoCo/SoCo/pull/670 + substituteInPlace requirements-dev.txt \ + --replace "pytest-cov>=2.4.0,<2.6" "pytest-cov>=2.4.0" + ''; + propagatedBuildInputs = [ xmltodict requests ]; checkInputs = [ - pytest_3 pytestcov coveralls pylint flake8 graphviz mock sphinx + pytest pytestcov coveralls pylint flake8 graphviz mock sphinx sphinx_rtd_theme ]; diff --git a/pkgs/development/tools/cachix/default.nix b/pkgs/development/tools/cachix/default.nix index a127fb137f6..3a6380698af 100644 --- a/pkgs/development/tools/cachix/default.nix +++ b/pkgs/development/tools/cachix/default.nix @@ -1,3 +1,8 @@ { haskellPackages, haskell }: -(haskell.lib.doDistribute haskellPackages.cachix).bin +(haskellPackages.override { + overrides = self: super: { + cachix = haskell.lib.enableSeparateBinOutput (haskell.lib.doDistribute (self.cachix_0_2_1 or self.cachix)); + cachix-api = self.cachix-api_0_2_1 or self.cachix-api; + }; +}).cachix.bin diff --git a/pkgs/development/tools/gotools/default.nix b/pkgs/development/tools/gotools/default.nix index 9bb57bfe502..d83f0ec4014 100644 --- a/pkgs/development/tools/gotools/default.nix +++ b/pkgs/development/tools/gotools/default.nix @@ -2,16 +2,26 @@ buildGoModule rec { name = "gotools-unstable-${version}"; - version = "2019-06-03"; - rev = "8aaa1484dc108aa23dcf2d4a09371c0c9e280f6b"; + version = "2019-07-06"; + rev = "72ffa07ba3db8d09f5215feec0f89464f3028f8e"; src = fetchgit { inherit rev; url = "https://go.googlesource.com/tools"; - sha256 = "0sa41fi38b6pvz7jjr6vqrd152qjvmbcagm1qdxw41vqcdw3ljx3"; + sha256 = "0c0s5aiwj807vxfzwrah32spwq8cnxvy0j117i5cbsqw2df80pgv"; }; - modSha256 = "0cm7fwb1k5hvbhh86kagzsw5vwgkr6dr7glhbjxg5xaahlhx2w5w"; + # Build of golang.org/x/tools/gopls fails with: + # can't load package: package golang.org/x/tools/gopls: unknown import path "golang.org/x/tools/gopls": cannot find module providing package golang.org/x/tools/gopls + # That is most probably caused by golang.org/x/tools/gopls containing a separate Go module. + # In order to fix this, we simply remove the module. + # Note that build of golang.org/x/tools/cmd/gopls provides identical binary as golang.org/x/tools/gopls. + # See https://github.com/NixOS/nixpkgs/pull/64335. + postPatch = '' + rm -rf gopls + ''; + + modSha256 = "16nkrpki9fnxsrxxxs9ljz49plcz393z0sqq2knkk30pmncpwd3q"; postConfigure = '' # Make the builtin tools available here diff --git a/pkgs/development/tools/misc/travis/Gemfile b/pkgs/development/tools/misc/travis/Gemfile index 9b1967e6b9b..0a470854aaf 100644 --- a/pkgs/development/tools/misc/travis/Gemfile +++ b/pkgs/development/tools/misc/travis/Gemfile @@ -1,3 +1,3 @@ source "https://rubygems.org" -gem "travis", "1.8.9" +gem "travis", "1.8.10" diff --git a/pkgs/development/tools/misc/travis/Gemfile.lock b/pkgs/development/tools/misc/travis/Gemfile.lock index 3dc948a7cd8..c5ac09cb9e6 100644 --- a/pkgs/development/tools/misc/travis/Gemfile.lock +++ b/pkgs/development/tools/misc/travis/Gemfile.lock @@ -2,14 +2,14 @@ GEM remote: https://rubygems.org/ specs: addressable (2.4.0) - backports (3.11.4) - ethon (0.11.0) + backports (3.15.0) + ethon (0.12.0) ffi (>= 1.3.0) - faraday (0.15.2) + faraday (0.15.4) multipart-post (>= 1.2, < 3) - faraday_middleware (0.12.2) + faraday_middleware (0.13.1) faraday (>= 0.7.4, < 1.0) - ffi (1.9.25) + ffi (1.11.1) gh (0.15.1) addressable (~> 2.4.0) backports @@ -18,17 +18,17 @@ GEM net-http-persistent (~> 2.9) net-http-pipeline highline (1.7.10) - json (2.1.0) + json (2.2.0) launchy (2.4.3) addressable (~> 2.3) multi_json (1.13.1) - multipart-post (2.0.0) + multipart-post (2.1.1) net-http-persistent (2.9.4) net-http-pipeline (1.0.1) pusher-client (0.6.2) json websocket (~> 1.0) - travis (1.8.9) + travis (1.8.10) backports faraday (~> 0.9) faraday_middleware (~> 0.9, >= 0.9.1) @@ -45,7 +45,7 @@ PLATFORMS ruby DEPENDENCIES - travis (= 1.8.9) + travis (= 1.8.10) BUNDLED WITH - 1.14.6 + 1.17.2 diff --git a/pkgs/development/tools/misc/travis/gemset.nix b/pkgs/development/tools/misc/travis/gemset.nix index 2ca55dbdee3..09d5d41454e 100644 --- a/pkgs/development/tools/misc/travis/gemset.nix +++ b/pkgs/development/tools/misc/travis/gemset.nix @@ -10,45 +10,45 @@ backports = { source = { remotes = ["https://rubygems.org"]; - sha256 = "1hshjxww2h7s0dk57njrygq4zpp0nlqrjfya7zwm27iq3rhc3y8g"; + sha256 = "0cczfi1yp7a68bg7ipzi4lvrmi4xsi36n9a19krr4yb3nfwd8fn2"; type = "gem"; }; - version = "3.11.4"; + version = "3.15.0"; }; ethon = { dependencies = ["ffi"]; source = { remotes = ["https://rubygems.org"]; - sha256 = "0y70szwm2p0b9qfvpqrzjrgm3jz0ig65vlbfr6ppc3z0m1h7kv48"; + sha256 = "0gggrgkcq839mamx7a8jbnp2h7x2ykfn34ixwskwb0lzx2ak17g9"; type = "gem"; }; - version = "0.11.0"; + version = "0.12.0"; }; faraday = { dependencies = ["multipart-post"]; source = { remotes = ["https://rubygems.org"]; - sha256 = "14lg0c4bphk16rccc5jmaan6nfcvmy0caiahpc61f9zfwpsj7ymg"; + sha256 = "0s72m05jvzc1pd6cw1i289chas399q0a14xrwg4rvkdwy7bgzrh0"; type = "gem"; }; - version = "0.15.2"; + version = "0.15.4"; }; faraday_middleware = { dependencies = ["faraday"]; source = { remotes = ["https://rubygems.org"]; - sha256 = "1p7icfl28nvl8qqdsngryz1snqic9l8x6bk0dxd7ygn230y0k41d"; + sha256 = "1a93rs58bakqck7bcihasz66a1riy22h2zpwrpmb13gp8mw3wkmr"; type = "gem"; }; - version = "0.12.2"; + version = "0.13.1"; }; ffi = { source = { remotes = ["https://rubygems.org"]; - sha256 = "0jpm2dis1j7zvvy3lg7axz9jml316zrn7s0j59vyq3qr127z0m7q"; + sha256 = "06mvxpjply8qh4j3fj9wh08kdzwkbnvsiysh0vrhlk5cwxzjmblh"; type = "gem"; }; - version = "1.9.25"; + version = "1.11.1"; }; gh = { dependencies = ["addressable" "backports" "faraday" "multi_json" "net-http-persistent" "net-http-pipeline"]; @@ -70,10 +70,10 @@ json = { source = { remotes = ["https://rubygems.org"]; - sha256 = "01v6jjpvh3gnq6sgllpfqahlgxzj50ailwhj9b3cd20hi2dx0vxp"; + sha256 = "0sx97bm9by389rbzv8r1f43h06xcz8vwi3h5jv074gvparql7lcx"; type = "gem"; }; - version = "2.1.0"; + version = "2.2.0"; }; launchy = { dependencies = ["addressable"]; @@ -95,10 +95,10 @@ multipart-post = { source = { remotes = ["https://rubygems.org"]; - sha256 = "09k0b3cybqilk1gwrwwain95rdypixb2q9w65gd44gfzsd84xi1x"; + sha256 = "1zgw9zlwh2a6i1yvhhc4a84ry1hv824d6g2iw2chs3k5aylpmpfj"; type = "gem"; }; - version = "2.0.0"; + version = "2.1.1"; }; net-http-persistent = { source = { @@ -129,10 +129,10 @@ dependencies = ["backports" "faraday" "faraday_middleware" "gh" "highline" "launchy" "pusher-client" "typhoeus"]; source = { remotes = ["https://rubygems.org"]; - sha256 = "0lw206zr2waic1kmm6x9qj91975g035wfsvbqs09z1cy8cvp63yw"; + sha256 = "0ggdksipvnkl7s0g84l4wfpm9v70x9id8xvb9jmn3l0hhlk54dsk"; type = "gem"; }; - version = "1.8.9"; + version = "1.8.10"; }; typhoeus = { dependencies = ["ethon"]; @@ -151,4 +151,4 @@ }; version = "1.2.8"; }; -} \ No newline at end of file +} diff --git a/pkgs/development/tools/rubocop/Gemfile.lock b/pkgs/development/tools/rubocop/Gemfile.lock index 314daff01c2..91fca663bf2 100644 --- a/pkgs/development/tools/rubocop/Gemfile.lock +++ b/pkgs/development/tools/rubocop/Gemfile.lock @@ -2,12 +2,12 @@ GEM remote: https://rubygems.org/ specs: ast (2.4.0) - jaro_winkler (1.5.2) + jaro_winkler (1.5.3) parallel (1.17.0) parser (2.6.3.0) ast (~> 2.4.0) rainbow (3.0.0) - rubocop (0.71.0) + rubocop (0.72.0) jaro_winkler (~> 1.5.1) parallel (~> 1.10) parser (>= 2.6) diff --git a/pkgs/development/tools/rubocop/default.nix b/pkgs/development/tools/rubocop/default.nix index 288ccfa1524..b91a36cb061 100644 --- a/pkgs/development/tools/rubocop/default.nix +++ b/pkgs/development/tools/rubocop/default.nix @@ -11,7 +11,7 @@ bundlerEnv rec { description = "Automatic Ruby code style checking tool"; homepage = "https://docs.rubocop.org/"; license = licenses.mit; - maintainers = with maintainers; [ leemachin ]; + maintainers = with maintainers; [ marsam leemachin ]; platforms = platforms.unix; }; } diff --git a/pkgs/development/tools/rubocop/gemset.nix b/pkgs/development/tools/rubocop/gemset.nix index 89428cdab0b..1f83bbf96b7 100644 --- a/pkgs/development/tools/rubocop/gemset.nix +++ b/pkgs/development/tools/rubocop/gemset.nix @@ -14,10 +14,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1zz27z88qznix4r65gd9h56gl177snlfpgv10b0s69vi8qpl909l"; + sha256 = "1930v0chc1q4fr7hn0y1j34mw0v032a8kh0by4d4sbz8ksy056kf"; type = "gem"; }; - version = "1.5.2"; + version = "1.5.3"; }; parallel = { groups = ["default"]; @@ -56,10 +56,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0mjyrf1dmf58i40izs8rp2j4mqnyd4qpah9svmkwhs33ckxsjh6b"; + sha256 = "192vmm9ah6b4wyabawaszpr8n3z93y3ymykp3m4pncrbwngmn3m2"; type = "gem"; }; - version = "0.71.0"; + version = "0.72.0"; }; ruby-progressbar = { groups = ["default"]; diff --git a/pkgs/development/tools/rust/cargo-inspect/default.nix b/pkgs/development/tools/rust/cargo-inspect/default.nix new file mode 100644 index 00000000000..ec2325fc625 --- /dev/null +++ b/pkgs/development/tools/rust/cargo-inspect/default.nix @@ -0,0 +1,23 @@ +{ lib, rustPlatform, fetchFromGitHub }: + +rustPlatform.buildRustPackage rec { + pname = "cargo-inspect"; + version = "0.10.1"; + + src = fetchFromGitHub { + owner = "mre"; + repo = pname; + rev = version; + sha256 = "0rjy8jlar939fkl7wi8a6zxsrl4axz2nrhv745ny8x38ii4sfbzr"; + }; + + cargoSha256 = "1pxvcf991w0jfxdissvwal5slrx7vpk3rqkzwk4hxfv0mjiqxsg5"; + + meta = with lib; { + description = "See what Rust is doing behind the curtains"; + homepage = https://github.com/mre/cargo-inspect; + license = with licenses; [ mit asl20 ]; + platforms = platforms.all; + maintainers = with maintainers; [ minijackson ]; + }; +} diff --git a/pkgs/development/tools/rust/pyo3-pack/default.nix b/pkgs/development/tools/rust/pyo3-pack/default.nix index 91d25fe6807..a17d50262a0 100644 --- a/pkgs/development/tools/rust/pyo3-pack/default.nix +++ b/pkgs/development/tools/rust/pyo3-pack/default.nix @@ -5,16 +5,16 @@ let inherit (darwin.apple_sdk.frameworks) Security; in rustPlatform.buildRustPackage rec { name = "pyo3-pack-${version}"; - version = "0.5.0"; + version = "0.6.1"; src = fetchFromGitHub { owner = "PyO3"; repo = "pyo3-pack"; rev = "v${version}"; - sha256 = "0577v8nqjbb7l7fqvac706bg9zrcp8fbh9ca1mkj44db12v02kgb"; + sha256 = "0zk0jhr7lnl9z6c8pbk7si3wa8b1kqzj3wrslc1n5fjla7xx8fzn"; }; - cargoSha256 = "1prwgkgvg11cbpx086irrafg59mfvnykadagcp3qgyry6d82blsv"; + cargoSha256 = "13gycipxc17baxg8nvjzkw96i1pxgncx7qjcrm9aab7p9vi2vrih"; nativeBuildInputs = [ pkgconfig ]; diff --git a/pkgs/misc/screensavers/xscreensaver/default.nix b/pkgs/misc/screensavers/xscreensaver/default.nix index 6a9dfaef497..3edfa9553d6 100644 --- a/pkgs/misc/screensavers/xscreensaver/default.nix +++ b/pkgs/misc/screensavers/xscreensaver/default.nix @@ -5,12 +5,12 @@ }: stdenv.mkDerivation rec { - version = "5.40"; - name = "xscreensaver-${version}"; + version = "5.43"; + pname = "xscreensaver"; src = fetchurl { - url = "https://www.jwz.org/xscreensaver/${name}.tar.gz"; - sha256 = "1q2sr7h6ps6d3hk8895g12rrcqiihjl7py1ly077ikv4866r181h"; + url = "https://www.jwz.org/${pname}/${pname}-${version}.tar.gz"; + sha256 = "1m43nfcpagv03zwlivpzp82qdv590s5c8vjjn4iirqjl6mzvdshp"; }; buildInputs = diff --git a/pkgs/misc/vim-plugins/generated.nix b/pkgs/misc/vim-plugins/generated.nix index 723ff0812c7..64b250e3a4c 100644 --- a/pkgs/misc/vim-plugins/generated.nix +++ b/pkgs/misc/vim-plugins/generated.nix @@ -61,12 +61,12 @@ let ale = buildVimPluginFrom2Nix { pname = "ale"; - version = "2019-07-02"; + version = "2019-07-06"; src = fetchFromGitHub { owner = "w0rp"; repo = "ale"; - rev = "a5240009ba5ff22daad95c306f7dec372d46bda0"; - sha256 = "1l588l3b2h2bcc15xyn3v6rbh8irnh9jzdx0515sp4pcch1gqgfj"; + rev = "6c47d7fc352659cd2dc869a9a46a04a8492fc829"; + sha256 = "1xk69prw20d37zw6q83yiv31nw9hrlqprrs9yxrqrlh0zdgn7cn9"; }; }; @@ -248,12 +248,12 @@ let coc-nvim = buildVimPluginFrom2Nix { pname = "coc-nvim"; - version = "2019-07-05"; + version = "2019-07-08"; src = fetchFromGitHub { owner = "neoclide"; repo = "coc.nvim"; - rev = "709928f6fbbd2d0fb0b51ee89458b62da8220a4e"; - sha256 = "04f8aj337r4347f06pyalbfpqp7isk7sbp9qlv32r28m6l6iw86q"; + rev = "8c7241d7e3f56bc2efda92c05e0148dcf7c41bc6"; + sha256 = "0agn16dj800sydqwjdr85m3d66hfbn8hh1azb2hsniwd5d1qkr6v"; }; }; @@ -425,34 +425,34 @@ let denite-git = buildVimPluginFrom2Nix { pname = "denite-git"; - version = "2019-04-29"; + version = "2019-07-08"; src = fetchFromGitHub { owner = "chemzqm"; repo = "denite-git"; - rev = "b6a0c7d08a1477a1607ba8be3a33c1352f93d79d"; - sha256 = "001848nr3pdzv6z2c9a262n63gcln1dr98qamkr5c5khxc1da322"; + rev = "b3b3742f263475cc0e16c1c03845e46d0c0faa16"; + sha256 = "15m7y4mzzysfhmmzwj7q6y8d2rcczn6fvicw77j7njssf9fmwc10"; }; }; denite-nvim = buildVimPluginFrom2Nix { pname = "denite-nvim"; - version = "2019-07-01"; + version = "2019-07-08"; src = fetchFromGitHub { owner = "Shougo"; repo = "denite.nvim"; - rev = "90f8367cefbb443ba0d5b363c63be087a5937d43"; - sha256 = "164sxi42yyqbj2v4vklmphhjqfq54ci9n21hcl3hwbrfgrh5i67i"; + rev = "8a9f52235c32011c91ad3630bed88cdcc6b55b08"; + sha256 = "0wvawl32w3zg04l513h7cby0ks4zzxli6m3yzyyv92ajnkmj4n0h"; }; }; deol-nvim = buildVimPluginFrom2Nix { pname = "deol-nvim"; - version = "2019-06-24"; + version = "2019-07-07"; src = fetchFromGitHub { owner = "Shougo"; repo = "deol.nvim"; - rev = "85f0e6dde132c670eda32eb98c6a6f3d7b31a984"; - sha256 = "154cdczdwzwx24c8ggasll3yf86y1r4z5hb3rld42m2dpbnhcrns"; + rev = "4879e34f353cc8c2ac8cb5c14e3efebc15c05ab0"; + sha256 = "12r2770b78rm9xx0pb4qgfzlyjmhdji4q6iga2pflxik6rk0gw4c"; }; }; @@ -549,12 +549,12 @@ let deoplete-nvim = buildVimPluginFrom2Nix { pname = "deoplete-nvim"; - version = "2019-06-30"; + version = "2019-07-06"; src = fetchFromGitHub { owner = "Shougo"; repo = "deoplete.nvim"; - rev = "2ac0da55367db0b9d8920bb7bcbc051f9b07b90c"; - sha256 = "05j2s6332p7gbpwg2hfimvvmk0qaah9danl5d8brq1w34bs79vjd"; + rev = "fc55354e8521599ae509a8ed7c05438199933c8b"; + sha256 = "0zk390jybshd10fzg5r2bfc7gj0n3cr28wdpbzri4lvddnj7x3wa"; }; }; @@ -783,12 +783,12 @@ let gist-vim = buildVimPluginFrom2Nix { pname = "gist-vim"; - version = "2018-11-09"; + version = "2019-07-08"; src = fetchFromGitHub { owner = "mattn"; repo = "gist-vim"; - rev = "3abf2444bb6a7744a64b4a2c2b02d6761a7de072"; - sha256 = "197j6bhyfggxka9mycyk3mr6sawf7rnaz74csk47d2qlkfs4zf0v"; + rev = "e485c6c24a62b378a2a4c8687e36e7f54ceca18c"; + sha256 = "1fkm7aada088l9f5rf6fk1valfanwzfrsfip9w4q9w2mqvd7n1kn"; }; }; @@ -1002,6 +1002,17 @@ let }; }; + jq-vim = buildVimPluginFrom2Nix { + pname = "jq-vim"; + version = "2019-05-21"; + src = fetchFromGitHub { + owner = "vito-c"; + repo = "jq.vim"; + rev = "6e056fa297ce58d45500b0937b8214400e9a50fa"; + sha256 = "0dfsym34xiza9221bdsr51jykcxmz8bnkzi846bqxxjxiw0p3yk1"; + }; + }; + julia-vim = buildVimPluginFrom2Nix { pname = "julia-vim"; version = "2019-06-26"; @@ -1059,12 +1070,12 @@ let lh-vim-lib = buildVimPluginFrom2Nix { pname = "lh-vim-lib"; - version = "2019-07-03"; + version = "2019-07-05"; src = fetchFromGitHub { owner = "LucHermitte"; repo = "lh-vim-lib"; - rev = "269722248fdff3787240e083702cb0dc9472472d"; - sha256 = "0z0sgkb136fnb43z5hbksn3402sm8281q0vv4yqhla9aw4553yqd"; + rev = "a265823c00098cda2e2a3d29eb40d244a3b6103f"; + sha256 = "00i37ng5v3wabjmhlx7a0cdpn6k49dy99ar8bmh4c7r82894qf2j"; }; }; @@ -1279,12 +1290,12 @@ let neoformat = buildVimPluginFrom2Nix { pname = "neoformat"; - version = "2019-06-13"; + version = "2019-07-05"; src = fetchFromGitHub { owner = "sbdchd"; repo = "neoformat"; - rev = "b60a530de93a1131a320fa10a289c9ffee771a1e"; - sha256 = "0f6drp06f0r6c5d777i5dh3kks1j73945ip8ng51v4803m7m2g3g"; + rev = "5be5c1e6eeea2a26f706a54c5b9bab8746763e89"; + sha256 = "1chi9qkg06jv79vp3y9c4y49qijrbsn62xjgkwjpvm7hiay4b6z3"; }; }; @@ -1301,23 +1312,23 @@ let neomake = buildVimPluginFrom2Nix { pname = "neomake"; - version = "2019-06-28"; + version = "2019-07-07"; src = fetchFromGitHub { owner = "neomake"; repo = "neomake"; - rev = "43007dac3e4c761caee7a5d8c74172da2af08ea6"; - sha256 = "1bxz0czckmc2cw7kh8cd1rcg0sg2pj7vjdlgwd0bmqr6x9xarp0d"; + rev = "3fe8bea59e6f19538968ea41ac33d6418071ffd6"; + sha256 = "0rnwzwk4vqvnp42854vxzxllyqap44p9wfppp89c1j0x2hi3ylih"; }; }; neomru-vim = buildVimPluginFrom2Nix { pname = "neomru-vim"; - version = "2019-06-30"; + version = "2019-07-06"; src = fetchFromGitHub { owner = "Shougo"; repo = "neomru.vim"; - rev = "53f9cd784b78839e865cabc43f6a7efacc4c8cad"; - sha256 = "05xss5546n1pinhh1bpp4gmsxjbmdlp08lpzxrrq4gkyqddxdkqd"; + rev = "79e6c9d04b75d67a1494435a4fb25573373cb1dc"; + sha256 = "194cr8nkkqrz3f9l9ymxdbnwgbrafn1i6lhrqalskawq6kn7kb21"; }; }; @@ -1400,12 +1411,12 @@ let nerdtree = buildVimPluginFrom2Nix { pname = "nerdtree"; - version = "2019-07-04"; + version = "2019-07-07"; src = fetchFromGitHub { owner = "scrooloose"; repo = "nerdtree"; - rev = "89a1a4355bd9572d0f5b3d23733c243c6e7b05c2"; - sha256 = "0khc6dzngc9f19rnqdq69biawjy7xfs17dnix2gz6j9z8jsx794x"; + rev = "2f0d48d632dc303095084b382cb665ae57ad2e63"; + sha256 = "0zlfam5kvz3cyl40hk5g6bpmmwm62g6l73wf408q0v8k0zn87mb7"; }; }; @@ -1521,12 +1532,12 @@ let papercolor-theme = buildVimPluginFrom2Nix { pname = "papercolor-theme"; - version = "2019-06-19"; + version = "2019-07-07"; src = fetchFromGitHub { owner = "NLKNguyen"; repo = "papercolor-theme"; - rev = "8e7343ce8f28d5177939e394043ce0250e6f9a6e"; - sha256 = "08d0y7xr72d42jgb0y3w2qxl6i7kv4alqaplzmiw8xkd0m3dxss8"; + rev = "20f3b25cdd772d4483eb8ced453f94f93b6126e1"; + sha256 = "1yck7f48v9rz7wq2q2b372bv07qmpj562ncwfdiavsgy6wms3p4b"; }; }; @@ -1873,12 +1884,12 @@ let swift-vim = buildVimPluginFrom2Nix { pname = "swift-vim"; - version = "2018-09-12"; + version = "2019-07-09"; src = fetchFromGitHub { owner = "keith"; repo = "swift.vim"; - rev = "5e330f026d4184c917cc156410634551dbd9a944"; - sha256 = "1gx2vg5w6r7k9070j03wz3bzjdkw3g01nkahd5jawk9z10ifswax"; + rev = "d3d66151598b5d6dda159524baa9c66b3d1bf5ad"; + sha256 = "0pq4nwdhnw3qzz3xaz9fpbf3p0l6vrmjkqj4lrfymafbmxc94j6w"; }; }; @@ -2643,12 +2654,12 @@ let vim-devicons = buildVimPluginFrom2Nix { pname = "vim-devicons"; - version = "2019-07-03"; + version = "2019-07-08"; src = fetchFromGitHub { owner = "ryanoasis"; repo = "vim-devicons"; - rev = "69028519c368304a6bf95f629b924c2ea85c69db"; - sha256 = "0kndqqknl2c7rcd9ssfc7q0w84m6776gyszra52xhc1wlgdi0r77"; + rev = "0c9e6faaf246767c850eb92f48c4bdc068cdf235"; + sha256 = "1kmdzf34clhvcjwxr47phvw835nfhm70swar5s6cf2pis1wllmjw"; }; }; @@ -2676,12 +2687,12 @@ let vim-dispatch = buildVimPluginFrom2Nix { pname = "vim-dispatch"; - version = "2019-06-30"; + version = "2019-07-01"; src = fetchFromGitHub { owner = "tpope"; repo = "vim-dispatch"; - rev = "a625661cd1d35b454c9b2a9452dbfec46c4d3e17"; - sha256 = "1v7qjslkyrrpbb780j1450piv5jb02qbidfh0863g615hz2mbnni"; + rev = "5b58b6dc290ece1c37e806e46ee117f5722a535a"; + sha256 = "17lzf60lm7z4r5cmfdb5di1c1rabczsjq5i0qck4l6j3xlv449xj"; }; }; @@ -2797,12 +2808,12 @@ let vim-fireplace = buildVimPluginFrom2Nix { pname = "vim-fireplace"; - version = "2019-07-05"; + version = "2019-07-07"; src = fetchFromGitHub { owner = "tpope"; repo = "vim-fireplace"; - rev = "ab8ffc76e56d5a3f187c3eefd11dfa3306491fde"; - sha256 = "1mwmja6y68sq8fsv2zy118mx3gy1cz8p9cigydnj1p7fxbn88km8"; + rev = "7c7641d18a8c530b70363e19f3f258b597b42484"; + sha256 = "0fpiv936qisadl87p9rim1y5qw0wwvl9clmy27rhy5bbspwr8pdr"; }; }; @@ -2841,12 +2852,12 @@ let vim-flutter = buildVimPluginFrom2Nix { pname = "vim-flutter"; - version = "2019-06-23"; + version = "2019-07-08"; src = fetchFromGitHub { owner = "thosakwe"; repo = "vim-flutter"; - rev = "8d7a9158cca84c4ea2a5ebc066607652fab7a9e8"; - sha256 = "0kjr7nlqkkzlvh6p9j996bbcgd0frakla591y4ln12qwa7ys0gd1"; + rev = "7f12c91b9f3789ab3559eeed9ed8905afcca6dfb"; + sha256 = "07hx5hdqw0scgviqn92xjx8zcfl4ils94cdsp9jh2h98jqhcic1p"; }; }; @@ -2863,12 +2874,12 @@ let vim-fugitive = buildVimPluginFrom2Nix { pname = "vim-fugitive"; - version = "2019-07-05"; + version = "2019-07-08"; src = fetchFromGitHub { owner = "tpope"; repo = "vim-fugitive"; - rev = "137433c3c058e0a70f45697ad515e3a881877f95"; - sha256 = "0aairxdj4ci2kpns9ff214348i0d24nr8nki6nwbxd88ivw4z09h"; + rev = "102b3a50e20d857b38e4c392b78be9a340669a70"; + sha256 = "0q7icsjycxw4l5awapkj8sig297f37hcyk5s4ns0ldrylh0xckl9"; }; }; @@ -2927,6 +2938,17 @@ let }; }; + vim-glsl = buildVimPluginFrom2Nix { + pname = "vim-glsl"; + version = "2017-10-15"; + src = fetchFromGitHub { + owner = "tikhomirov"; + repo = "vim-glsl"; + rev = "697eca9784ffac39308e1fd45e0300582c3d060b"; + sha256 = "0qj00wgshx0pm6w1p682kc6s4xnzshnwx0sr65b24g1m495ck4q4"; + }; + }; + vim-go = buildVimPluginFrom2Nix { pname = "vim-go"; version = "2019-07-04"; @@ -3160,12 +3182,12 @@ let vim-javascript = buildVimPluginFrom2Nix { pname = "vim-javascript"; - version = "2019-06-24"; + version = "2019-07-08"; src = fetchFromGitHub { owner = "pangloss"; repo = "vim-javascript"; - rev = "8a599c5e84bb064e2345867332ecbcc252e3b04a"; - sha256 = "1hyn592812hav4n7g488ysmrqw0c2bjkwvfwkzz9xpwj1v25f2yl"; + rev = "7cc6baebaf0065fd8c31cc9216c87bfa543eb71a"; + sha256 = "0d905n5v4c8vifp229lijrylq6ajlsmxkl1w603nzkappw8kky1s"; }; }; @@ -3579,12 +3601,12 @@ let vim-plug = buildVimPluginFrom2Nix { pname = "vim-plug"; - version = "2019-06-17"; + version = "2019-07-09"; src = fetchFromGitHub { owner = "junegunn"; repo = "vim-plug"; - rev = "f1ad2d864ab43c56bf86ce01be9971f62bc14f6c"; - sha256 = "071vr96ckm1bwf6nfziv4fw4spz44d5g65fcx2b61fb36azwxggh"; + rev = "fddbcb8f1a37e216504b3d14859a0a992a81cd5d"; + sha256 = "1ijdmp081r9dpn4ryr6j36s56ahz3lnn9g72akby4hj6da1bj4mb"; }; }; @@ -3865,12 +3887,12 @@ let vim-snippets = buildVimPluginFrom2Nix { pname = "vim-snippets"; - version = "2019-06-02"; + version = "2019-07-06"; src = fetchFromGitHub { owner = "honza"; repo = "vim-snippets"; - rev = "a11cf5b47fcb9de72b5c8694a4e2fe2dca8c0ae7"; - sha256 = "12k2ybk4dpc13spy2pxxnlip5rfzdbb3yjhr37hsgxhhjw6hibrq"; + rev = "c8e8b35e9a56aab5b1ef871a164b6e8d6ea79ad0"; + sha256 = "0lb6kmg4ckrxhys0k9gss3hp60x0mik10sm0y5g8yf74a1vzysvf"; }; }; @@ -4008,23 +4030,23 @@ let vim-terraform = buildVimPluginFrom2Nix { pname = "vim-terraform"; - version = "2019-06-20"; + version = "2019-07-08"; src = fetchFromGitHub { owner = "hashivim"; repo = "vim-terraform"; - rev = "996917464cd6b6fd7f11905ac4d77314fcac5593"; - sha256 = "1bqqizqsn1nzqg02vis9v0rndkw24n3dkvrd799s04818rncm84m"; + rev = "6ee2aab70d8cd3d2405b3042141c94766ea461b0"; + sha256 = "1zld21a0l94hg3qvpb6rzi8kvv9f86mn7pl95rjvs022vfprry05"; }; }; vim-test = buildVimPluginFrom2Nix { pname = "vim-test"; - version = "2019-06-25"; + version = "2019-07-06"; src = fetchFromGitHub { owner = "janko-m"; repo = "vim-test"; - rev = "3507d31dccde27ea27e2858e00784d5be18565f4"; - sha256 = "0ap9bbk0qa3cz1rxykgrd5hv582av2n36x6s52awg90d4hx37inp"; + rev = "113c3bd92a18a0b20b0c63f8335139021afc8b0f"; + sha256 = "0ijxnbgz5l3y5gdavh0z7173dn7930xyn2rzz0sbja9m53f8yik7"; }; }; @@ -4283,34 +4305,34 @@ let vimproc-vim = buildVimPluginFrom2Nix { pname = "vimproc-vim"; - version = "2019-03-10"; + version = "2019-07-08"; src = fetchFromGitHub { owner = "Shougo"; repo = "vimproc.vim"; - rev = "eb5b2b1248ccc8b1b9e84d7658508e38b964d17d"; - sha256 = "0h9na94cg396mldqdasdkv30z67zp5r36794dlhh9j5kblc00x0v"; + rev = "0328ac6096ac57d647bed1ee59c8b616b3ba2858"; + sha256 = "1apg6zjpqagj8m7rai64awp2n4s77grjlyr56hdk09bh9678wg31"; }; }; vimshell-vim = buildVimPluginFrom2Nix { pname = "vimshell-vim"; - version = "2018-06-02"; + version = "2019-07-07"; src = fetchFromGitHub { owner = "Shougo"; repo = "vimshell.vim"; - rev = "03bf7673a5098918a533000d67dca97546695237"; - sha256 = "1ckxjap9kz8skbjchg561sqyd5y5qwacg8mabmniy78qa7i3qdzi"; + rev = "8aa928d4652286ad3106f6ef2cbbbf7eadec5a52"; + sha256 = "1qwccpsfjsap8lggq8k9cmvdzq1mgn1ss4bsdplk1pj7prlj9pxb"; }; }; vimtex = buildVimPluginFrom2Nix { pname = "vimtex"; - version = "2019-07-04"; + version = "2019-07-07"; src = fetchFromGitHub { owner = "lervag"; repo = "vimtex"; - rev = "e0522f353d7d1ee69a1c7d26c512fa8af1921f43"; - sha256 = "0hqn9hmlim53s7gbaxzv3z7rg7lj5ayd42z5vqmkwsj4y2lmkzkb"; + rev = "bdc7ba470e477255ddb26c84c8934da58904c475"; + sha256 = "0hazv9xqjag6fgg7y34ilcnjd3pah259r1jazxwbkdxrzgc0pmhw"; }; }; @@ -4371,12 +4393,23 @@ let webapi-vim = buildVimPluginFrom2Nix { pname = "webapi-vim"; - version = "2018-03-14"; + version = "2019-07-08"; src = fetchFromGitHub { owner = "mattn"; repo = "webapi-vim"; - rev = "252250381a9509257bfb06b9f95441e41e3e23b5"; - sha256 = "0g37d1i6rxsj6f31g9jy2bhr8ng3jwmnvqqcmw19vbql4v56zq6a"; + rev = "263e31b11948de7b20290b6ffc118e2c3223e2d2"; + sha256 = "08dd6qqvf24y5c49j2rirwfp78q6i5b7f6ng93gfkrx6adacin5d"; + }; + }; + + wmgraphviz-vim = buildVimPluginFrom2Nix { + pname = "wmgraphviz-vim"; + version = "2018-04-26"; + src = fetchFromGitHub { + owner = "wannesm"; + repo = "wmgraphviz.vim"; + rev = "f08ff5becd1e6e81d681ff2926f2cce29f63cb18"; + sha256 = "12mb0lbkrzrxyawd9gg6igmsaylvsixcslim0lcgsrd551l9lq2l"; }; }; @@ -4449,12 +4482,12 @@ let youcompleteme = buildVimPluginFrom2Nix { pname = "youcompleteme"; - version = "2019-06-29"; + version = "2019-07-05"; src = fetchFromGitHub { owner = "valloric"; repo = "youcompleteme"; - rev = "d556a43c1af6a4e4075e875934e250f589df0dee"; - sha256 = "05vl8gri43k8psjmhaybhm27ycm8hdgrdaqcy89sznpww5lm1nx8"; + rev = "04c3505129cd80b92f1b6177dca8aecc55cb0760"; + sha256 = "09ws8m6s7lzs2174xanrcz8jd6sfczisv3zb5czskizkgph6vkkj"; fetchSubmodules = true; }; }; @@ -4494,12 +4527,12 @@ let zig-vim = buildVimPluginFrom2Nix { pname = "zig-vim"; - version = "2019-07-03"; + version = "2019-07-08"; src = fetchFromGitHub { owner = "zig-lang"; repo = "zig.vim"; - rev = "2cbecaea8bd2d804d8ff1d74013e402a64ecb786"; - sha256 = "11ab4msfkl101340wdrn7am5rx3ll9b0r90f9mv9wxj531fizyvy"; + rev = "78c6336a9c28a1ae7e9699a65e7b46475e530978"; + sha256 = "009vjz75may02ahhh5v72nxaxpk4arghvisszsxk8dnqrc251avi"; }; }; diff --git a/pkgs/misc/vim-plugins/overrides.nix b/pkgs/misc/vim-plugins/overrides.nix index 0aa0fde972d..cbeb4789e71 100644 --- a/pkgs/misc/vim-plugins/overrides.nix +++ b/pkgs/misc/vim-plugins/overrides.nix @@ -111,10 +111,10 @@ self: super: { coc-nvim = let - version = "0.0.71"; + version = "0.0.72"; index_js = fetchzip { url = "https://github.com/neoclide/coc.nvim/releases/download/v${version}/coc.tar.gz"; - sha256 = "1bhkyrmrpriizg3f76x4vp94f2bfwcf7a6cp3jvv7vj4zaqhsjzz"; + sha256 = "128wlbnpz4gwpfnmzry5k52d58fyp9nccha314ndfnr9xgd6r52y"; }; in super.coc-nvim.overrideAttrs(old: { # you still need to enable the node js provider in your nvim config @@ -416,19 +416,19 @@ self: super: { youcompleteme = super.youcompleteme.overrideAttrs(old: { buildPhase = '' substituteInPlace plugin/youcompleteme.vim \ - --replace "'ycm_path_to_python_interpreter', '''" \ - "'ycm_path_to_python_interpreter', '${python}/bin/python'" + --replace "'ycm_python_interpreter_path', '''" \ + "'ycm_python_interpreter_path', '${python3}/bin/python'" rm -r third_party/ycmd ln -s ${ycmd}/lib/ycmd third_party ''; - meta = { + meta = with stdenv.lib; { description = "A code-completion engine for Vim"; - homepage = https://github.com/Valloric/YouCompleteMe; - license = stdenv.lib.licenses.gpl3; - maintainers = with stdenv.lib.maintainers; [marcweber jagajaga]; - platforms = stdenv.lib.platforms.unix; + homepage = "https://github.com/Valloric/YouCompleteMe"; + license = licenses.gpl3; + maintainers = with maintainers; [ marcweber jagajaga ]; + platforms = platforms.unix; }; }); diff --git a/pkgs/misc/vim-plugins/vim-plugin-names b/pkgs/misc/vim-plugins/vim-plugin-names index ab6416748fa..b0e4dad8911 100644 --- a/pkgs/misc/vim-plugins/vim-plugin-names +++ b/pkgs/misc/vim-plugins/vim-plugin-names @@ -44,8 +44,8 @@ CoatiSoftware/vim-sourcetrail cocopon/iceberg.vim ctjhoa/spacevim ctrlpvim/ctrlp.vim -dag/vim-fish dag/vim2hs +dag/vim-fish dannyob/quickfixstatus dart-lang/dart-vim-plugin davidhalter/jedi-vim @@ -164,8 +164,8 @@ lepture/vim-jinja lervag/vimtex lfilho/cosco.vim LnL7/vim-nix -LucHermitte/lh-vim-lib LucHermitte/lh-brackets +LucHermitte/lh-vim-lib ludovicchabant/vim-gutentags ludovicchabant/vim-lawrencium lukaszkorecki/workflowish @@ -231,9 +231,9 @@ ncm2/ncm2-ultisnips neoclide/coc.nvim neoclide/vim-easygit neomake/neomake -neovim/nvimdev.nvim neovimhaskell/haskell-vim neovimhaskell/nvim-hs.vim +neovim/nvimdev.nvim neutaaaaan/iosvkem nixprime/cpsm NLKNguyen/papercolor-theme @@ -324,6 +324,7 @@ thinca/vim-scouter thinca/vim-themis thinca/vim-visualstar thosakwe/vim-flutter +tikhomirov/vim-glsl tomasr/molokai tomlion/vim-solidity tommcdo/vim-lion @@ -363,14 +364,15 @@ valloric/youcompleteme vhda/verilog_systemverilog.vim vim-airline/vim-airline vim-airline/vim-airline-themes +vimoutliner/vimoutliner vim-pandoc/vim-pandoc vim-pandoc/vim-pandoc-after vim-pandoc/vim-pandoc-syntax vim-ruby/vim-ruby -vim-scripts/a.vim vim-scripts/align vim-scripts/argtextobj.vim vim-scripts/autoload_cscope.vim +vim-scripts/a.vim vim-scripts/bats.vim vim-scripts/changeColorScheme.vim vim-scripts/Colour-Sampler-Pack @@ -389,11 +391,12 @@ vim-scripts/taglist.vim vim-scripts/wombat256.vim vim-scripts/YankRing.vim vim-utils/vim-husk -vimoutliner/vimoutliner vimwiki/vimwiki +vito-c/jq.vim vmchale/dhall-vim w0rp/ale wakatime/vim-wakatime +wannesm/wmgraphviz.vim wellle/targets.vim wellle/tmux-complete.vim will133/vim-dirdiff diff --git a/pkgs/misc/vscode-extensions/cpptools/default.nix b/pkgs/misc/vscode-extensions/cpptools/default.nix index 37e5759c858..a60dad9b7b7 100644 --- a/pkgs/misc/vscode-extensions/cpptools/default.nix +++ b/pkgs/misc/vscode-extensions/cpptools/default.nix @@ -1,4 +1,7 @@ -{ stdenv, fetchzip, vscode-utils, jq, mono, clang-tools, writeScript, runtimeShell +{ stdenv, vscode-utils +, fetchurl, unzip +, mono, writeScript, runtimeShell +, jq, clang-tools , gdbUseFixed ? true, gdb # The gdb default setting will be fixed to specified. Use version from `PATH` otherwise. }: @@ -30,25 +33,37 @@ assert gdbUseFixed -> null != gdb; let gdbDefaultsTo = if gdbUseFixed then "${gdb}/bin/gdb" else "gdb"; - langComponentBinaries = stdenv.mkDerivation { + langComponentBinaries = stdenv.mkDerivation rec { name = "cpptools-language-component-binaries"; - src = fetchzip { + src = fetchurl { # Follow https://go.microsoft.com/fwlink/?linkid=2037608 - url = "https://download.visualstudio.microsoft.com/download/pr/97ed3eeb-b31e-421c-92dc-4f3a98af301e/069a1e6ab1b4b017853a7e9e08067744/bin_linux.zip"; - sha256 = "19flm4vcrg89x0b20bd0g45apabzfqgvcpjddnmyk312jc242gmb"; + url = "https://download.visualstudio.microsoft.com/download/pr/fd05d7fd-b771-4746-9c54-b5b30afcd82e/1f443716d6156a265bf50cb6e53fa999/bin_linux.zip"; + sha256 = "198xnq709clibjmd8rrv0haniy2m3qvhn89hg9hpj6lvg9lsr7a4"; }; - patchPhase = '' - elfInterpreter="${stdenv.glibc.out}/lib/ld-linux-x86-64.so.2" - patchelf --set-interpreter "$elfInterpreter" ./Microsoft.VSCode.CPP.Extension.linux - patchelf --set-interpreter "$elfInterpreter" ./Microsoft.VSCode.CPP.IntelliSense.Msvc.linux - chmod a+x ./Microsoft.VSCode.CPP.Extension.linux ./Microsoft.VSCode.CPP.IntelliSense.Msvc.linux + sourceRoot = name; + + nativeBuildInputs = [ unzip ]; + + unpackPhase = '' + runHook preUnpack + unzip -d $name $src || true + runHook postUnpack ''; installPhase = '' + runHook preInstall mkdir -p "$out/bin" - find . -mindepth 1 -maxdepth 1 | xargs cp -a -t "$out/bin" + cp -a -t "$out/bin" ./bin/* + runHook postInstall + ''; + + postFixup = '' + elfInterpreter="$(cat $NIX_CC/nix-support/dynamic-linker)" + patchelf --set-interpreter "$elfInterpreter" $out/bin/Microsoft.VSCode.CPP.Extension.linux + patchelf --set-interpreter "$elfInterpreter" $out/bin/Microsoft.VSCode.CPP.IntelliSense.Msvc.linux + chmod a+x $out/bin/Microsoft.VSCode.CPP.Extension.linux $out/bin/Microsoft.VSCode.CPP.IntelliSense.Msvc.linux ''; }; @@ -68,8 +83,8 @@ vscode-utils.buildVscodeMarketplaceExtension { mktplcRef = { name = "cpptools"; publisher = "ms-vscode"; - version = "0.23.1"; - sha256 = "08kfzvyl8vgjmhqzpp7pxw0gd87jr5g7z15ag4cpcil4inq4c8k3"; + version = "0.24.0"; + sha256 = "0b0rwj3aadd4kf561zpzv95r96dqvhkn7db8d7rz3naaqydz0z8i"; }; buildInputs = [ @@ -80,16 +95,12 @@ vscode-utils.buildVscodeMarketplaceExtension { mv ./package.json ./package_ori.json # 1. Add activation events so that the extension is functional. This listing is empty when unpacking the extension but is filled at runtime. - # 2. Patch `packages.json` so that nix's *gdb* is used as default value for `miDebuggerPath`. + # 2. Patch `package.json` so that nix's *gdb* is used as default value for `miDebuggerPath`. cat ./package_ori.json | \ jq --slurpfile actEvts ${./package-activation-events.json} '(.activationEvents) = $actEvts[0]' | \ jq '(.contributes.debuggers[].configurationAttributes | .attach , .launch | .properties.miDebuggerPath | select(. != null) | select(.default == "/usr/bin/gdb") | .default) = "${gdbDefaultsTo}"' > \ ./package.json - # Patch `packages.json` so that nix's *gdb* is used as default value for `miDebuggerPath`. - substituteInPlace "./package.json" \ - --replace "\"default\": \"/usr/bin/gdb\"" "\"default\": \"${gdbDefaultsTo}\"" - # Prevent download/install of extensions touch "./install.lock" diff --git a/pkgs/os-specific/linux/kernel/linux-5.2.nix b/pkgs/os-specific/linux/kernel/linux-5.2.nix new file mode 100644 index 00000000000..094c5abf244 --- /dev/null +++ b/pkgs/os-specific/linux/kernel/linux-5.2.nix @@ -0,0 +1,18 @@ +{ stdenv, buildPackages, fetchurl, perl, buildLinux, modDirVersionArg ? null, ... } @ args: + +with stdenv.lib; + +buildLinux (args // rec { + version = "5.2"; + + # modDirVersion needs to be x.y.z, will automatically add .0 if needed + modDirVersion = if (modDirVersionArg == null) then concatStrings (intersperse "." (take 3 (splitString "." "${version}.0"))) else modDirVersionArg; + + # branchVersion needs to be x.y + extraMeta.branch = concatStrings (intersperse "." (take 2 (splitString "." version))); + + src = fetchurl { + url = "mirror://kernel/linux/kernel/v5.x/linux-${version}.tar.xz"; + sha256 = "1ry11b5sc20jh7flnp94m20627jzl3l09rzmfjsk3a71fbv6dbal"; + }; +} // (args.argsOverride or {})) diff --git a/pkgs/servers/jellyfin/default.nix b/pkgs/servers/jellyfin/default.nix index 45f58cc7ab9..9345fbe03d6 100644 --- a/pkgs/servers/jellyfin/default.nix +++ b/pkgs/servers/jellyfin/default.nix @@ -18,12 +18,12 @@ let in stdenv.mkDerivation rec { pname = "jellyfin"; - version = "10.3.5"; + version = "10.3.6"; # Impossible to build anything offline with dotnet src = fetchurl { url = "https://github.com/jellyfin/jellyfin/releases/download/v${version}/jellyfin_${version}_portable.tar.gz"; - sha256 = "12asyrj2ax699gaf8402xfx049n6x0v8j5sba229vw1s66c2m8j2"; + sha256 = "1vkb952y4n2gxgm2grxmpx93mljzfqm1m9f13lbw7qdhxb80zy41"; }; buildInputs = [ diff --git a/pkgs/servers/sql/postgresql/ext/plv8.nix b/pkgs/servers/sql/postgresql/ext/plv8.nix index 4b7c1235ca9..b3befc58295 100644 --- a/pkgs/servers/sql/postgresql/ext/plv8.nix +++ b/pkgs/servers/sql/postgresql/ext/plv8.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation rec { pname = "plv8"; - version = "2.3.11"; + version = "2.3.12"; nativeBuildInputs = [ perl ]; buildInputs = [ v8 postgresql ]; @@ -11,26 +11,26 @@ stdenv.mkDerivation rec { owner = "plv8"; repo = "plv8"; rev = "v${version}"; - sha256 = "0bv2b8xxdqqhj6nwyc8kwhi5m5i7i1yl078sk3bnnc84b0mnza5x"; + sha256 = "1yi1ibiibvd0x4z5dm698w32ljrj3yr4j25jm1zkgkwd4ii8y644"; }; - makeFlags = [ "--makefile=Makefile.shared" ]; + makefile = "Makefile.shared"; + + buildFlags = [ "all" ]; preConfigure = '' patchShebangs ./generate_upgrade.sh ''; - buildPhase = "make -f Makefile.shared all"; - installPhase = '' - mkdir -p $out/bin + mkdir -p $out/bin # For buildEnv to setup proper symlinks. See #22653 install -D plv8*.so -t $out/lib install -D {plls,plcoffee,plv8}{--${version}.sql,.control} -t $out/share/postgresql/extension ''; meta = with stdenv.lib; { - description = "PL/v8 - A Procedural Language in JavaScript powered by V8"; - homepage = https://pgxn.org/dist/plv8/; + description = "V8 Engine Javascript Procedural Language add-on for PostgreSQL"; + homepage = "https://plv8.github.io/"; maintainers = with maintainers; [ volth ]; platforms = platforms.linux; license = licenses.postgresql; diff --git a/pkgs/servers/zoneminder/default.nix b/pkgs/servers/zoneminder/default.nix index 9c1e3ffe0b7..5a052df9e0a 100644 --- a/pkgs/servers/zoneminder/default.nix +++ b/pkgs/servers/zoneminder/default.nix @@ -89,6 +89,8 @@ in stdenv.mkDerivation rec { patches = [ ./default-to-http-1dot1.patch + # Explicitly link with dynamic linking library to fix build + ./link-with-libdl.patch ]; postPatch = '' diff --git a/pkgs/servers/zoneminder/link-with-libdl.patch b/pkgs/servers/zoneminder/link-with-libdl.patch new file mode 100644 index 00000000000..53aaf9b25f7 --- /dev/null +++ b/pkgs/servers/zoneminder/link-with-libdl.patch @@ -0,0 +1,17 @@ +--- a/src/CMakeLists.txt ++++ b/src/CMakeLists.txt +@@ -20,10 +20,10 @@ add_executable(zms zms.cpp) + include_directories(libbcrypt/include/bcrypt) + include_directories(jwt-cpp/include/jwt-cpp) + +-target_link_libraries(zmc zm ${ZM_EXTRA_LIBS} ${ZM_BIN_LIBS}) +-target_link_libraries(zma zm ${ZM_EXTRA_LIBS} ${ZM_BIN_LIBS}) +-target_link_libraries(zmu zm ${ZM_EXTRA_LIBS} ${ZM_BIN_LIBS}) +-target_link_libraries(zms zm ${ZM_EXTRA_LIBS} ${ZM_BIN_LIBS}) ++target_link_libraries(zmc zm ${ZM_EXTRA_LIBS} ${ZM_BIN_LIBS} ${CMAKE_DL_LIBS}) ++target_link_libraries(zma zm ${ZM_EXTRA_LIBS} ${ZM_BIN_LIBS} ${CMAKE_DL_LIBS}) ++target_link_libraries(zmu zm ${ZM_EXTRA_LIBS} ${ZM_BIN_LIBS} ${CMAKE_DL_LIBS}) ++target_link_libraries(zms zm ${ZM_EXTRA_LIBS} ${ZM_BIN_LIBS} ${CMAKE_DL_LIBS}) + + # Generate man files for the binaries destined for the bin folder + FOREACH(CBINARY zma zmc zmu) diff --git a/pkgs/tools/admin/eksctl/default.nix b/pkgs/tools/admin/eksctl/default.nix index 1370049d42b..bb4c89dd4dc 100644 --- a/pkgs/tools/admin/eksctl/default.nix +++ b/pkgs/tools/admin/eksctl/default.nix @@ -1,33 +1,32 @@ -{ lib, buildGoPackage, fetchFromGitHub }: +{ lib, buildGoModule, fetchFromGitHub }: -buildGoPackage rec { +buildGoModule rec { pname = "eksctl"; - version = "0.1.38"; + version = "0.1.39"; src = fetchFromGitHub { owner = "weaveworks"; repo = "eksctl"; rev = version; - sha256 = "1nhsy4d1a1vh7g2ibcxnzgxnldfyh51hiq4v4vy123487b6ndqd0"; + sha256 = "11y2pb5jn64v89a9hwi25rakrnsvhyjyr8kdrjk81d6hhrfkz3g0"; }; - goPackagePath = "github.com/weaveworks/eksctl"; + modSha256 = "1lmkwx0r19c2wg9nm85k92nlxjzr8q917jf3f333yf3csfyiix2f"; subPackages = [ "cmd/eksctl" ]; buildFlags = '' - -ldflags=-s - -ldflags=-w -tags netgo -tags release ''; postInstall = '' - mkdir -p "$bin/share/"{bash-completion/completions,zsh/site-functions} - $bin/bin/eksctl completion bash > "$bin/share/bash-completion/completions/eksctl" - $bin/bin/eksctl completion zsh > "$bin/share/zsh/site-functions/_eksctl" + mkdir -p "$out/share/"{bash-completion/completions,zsh/site-functions} + + $out/bin/eksctl completion bash > "$out/share/bash-completion/completions/eksctl" + $out/bin/eksctl completion zsh > "$out/share/zsh/site-functions/_eksctl" ''; meta = with lib; { diff --git a/pkgs/tools/backup/iceshelf/default.nix b/pkgs/tools/backup/iceshelf/default.nix new file mode 100644 index 00000000000..546339ca002 --- /dev/null +++ b/pkgs/tools/backup/iceshelf/default.nix @@ -0,0 +1,35 @@ +{ stdenv, lib, fetchFromGitHub, git, awscli, python3 }: + +python3.pkgs.buildPythonApplication rec { + pname = "iceshelf"; + version = "unstable-2019-07-03"; + + format = "other"; + + src = fetchFromGitHub { + owner = "mrworf"; + repo = pname; + rev = "26768dde3fc54fa412e523eb8f8552e866b4853b"; + sha256 = "08rcbd14vn7312rmk2hyvdzvhibri31c4r5lzdrwb1n1y9q761qm"; + }; + + propagatedBuildInputs = [ + git + awscli + python3.pkgs.python-gnupg + ]; + + installPhase = '' + mkdir -p $out/bin $out/share/doc/${pname} $out/${python3.sitePackages} + cp -v iceshelf iceshelf-restore $out/bin + cp -v iceshelf.sample.conf $out/share/doc/${pname}/ + cp -rv modules $out/${python3.sitePackages} + ''; + + meta = with lib; { + description = "A simple tool to allow storage of signed, encrypted, incremental backups using Amazon's Glacier storage"; + license = licenses.lgpl2; + homepage = "https://github.com/mrworf/iceshelf"; + maintainers = with maintainers; [ mmahut ]; + }; +} diff --git a/pkgs/tools/filesystems/squashfs/default.nix b/pkgs/tools/filesystems/squashfs/default.nix index 2fd3d52bdf6..59a786116df 100644 --- a/pkgs/tools/filesystems/squashfs/default.nix +++ b/pkgs/tools/filesystems/squashfs/default.nix @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { # This patch adds an option to pad filesystems (increasing size) in # exchange for better chunking / binary diff calculation. - ./squashfs-tools-4.3-4k-align.patch + ./squashfs-tools-4.4-4k-align.patch ] ++ stdenv.lib.optional stdenv.isDarwin ./darwin.patch; buildInputs = [ zlib xz zstd ] diff --git a/pkgs/tools/filesystems/squashfs/squashfs-tools-4.3-4k-align.patch b/pkgs/tools/filesystems/squashfs/squashfs-tools-4.4-4k-align.patch index cd4308b489f..c9c3dd3d760 100644 --- a/pkgs/tools/filesystems/squashfs/squashfs-tools-4.3-4k-align.patch +++ b/pkgs/tools/filesystems/squashfs/squashfs-tools-4.4-4k-align.patch @@ -16,24 +16,20 @@ increased_size = (number_of_unfragmented_files_in_image + number of fragments) * The 4k alignment can be enabled by flag '-4k-align' --- - squashfs-tools/mksquashfs.c | 16 ++++++++++++++++ - 1 file changed, 16 insertions(+) - -diff --git a/squashfs-tools/mksquashfs.c b/squashfs-tools/mksquashfs.c -index 8b1376f..683973d 100644 ---- a/squashfs-tools/mksquashfs.c -+++ b/squashfs-tools/mksquashfs.c -@@ -99,6 +99,8 @@ int old_exclude = TRUE; +diff -u a/squashfs-tools/mksquashfs.c b/squashfs-tools/mksquashfs.c +--- a/squashfs-tools/mksquashfs.c 2019-07-06 15:50:22.214873176 +0000 ++++ b/squashfs-tools/mksquashfs.c 2019-07-06 15:51:22.244802582 +0000 +@@ -100,7 +100,9 @@ int use_regex = FALSE; int nopad = FALSE; int exit_on_error = FALSE; - static off_t squashfs_start_offset = 0; +int do_4k_align = FALSE; + static off_t squashfs_start_offset = 0; +#define ALIGN_UP(bytes, size) (bytes = (bytes + size - 1) & ~(size - 1)) - + long long global_uid = -1, global_gid = -1; - -@@ -1513,6 +1515,9 @@ void unlock_fragments() + +@@ -1495,6 +1497,9 @@ * queue at this time. */ while(!queue_empty(locked_fragment)) { @@ -41,9 +37,9 @@ index 8b1376f..683973d 100644 + if(do_4k_align) + ALIGN_UP(bytes, 4096); write_buffer = queue_get(locked_fragment); - frg = write_buffer->block; + frg = write_buffer->block; size = SQUASHFS_COMPRESSED_SIZE_BLOCK(fragment_table[frg].size); -@@ -2420,6 +2420,9 @@ +@@ -2414,6 +2419,9 @@ compressed_size = SQUASHFS_COMPRESSED_SIZE_BLOCK(c_byte); write_buffer->size = compressed_size; if(fragments_locked == FALSE) { @@ -53,18 +49,18 @@ index 8b1376f..683973d 100644 fragment_table[file_buffer->block].size = c_byte; fragment_table[file_buffer->block].start_block = bytes; write_buffer->block = bytes; -@@ -2761,6 +2769,10 @@ int write_file_blocks(squashfs_inode *inode, struct dir_ent *dir_ent, +@@ -2728,6 +2736,10 @@ long long sparse = 0; struct file_buffer *fragment_buffer = NULL; - + + // 4k align the start of each file. + if(do_4k_align) + ALIGN_UP(bytes, 4096); + if(pre_duplicate(read_size)) return write_file_blocks_dup(inode, dir_ent, read_buffer, dup); - -@@ -4692,6 +4704,7 @@ void write_filesystem_tables(struct squashfs_super_block *sBlk, int nopad) + +@@ -4808,6 +4820,7 @@ "compressed", no_fragments ? "no" : noF ? "uncompressed" : "compressed", no_xattrs ? "no" : noX ? "uncompressed" : "compressed", noI || noId ? "uncompressed" : "compressed"); @@ -72,7 +68,7 @@ index 8b1376f..683973d 100644 printf("\tduplicates are %sremoved\n", duplicate_checking ? "" : "not "); printf("Filesystem size %.2f Kbytes (%.2f Mbytes)\n", bytes / 1024.0, -@@ -5346,6 +5359,8 @@ print_compressor_options: +@@ -5570,6 +5583,8 @@ root_name = argv[i]; } else if(strcmp(argv[i], "-version") == 0) { VERSION(); @@ -81,7 +77,7 @@ index 8b1376f..683973d 100644 } else { ERROR("%s: invalid option\n\n", argv[0]); printOptions: -@@ -5387,6 +5402,7 @@ printOptions: +@@ -5613,6 +5628,7 @@ ERROR("\t\t\tdirectory containing that directory, " "rather than the\n"); ERROR("\t\t\tcontents of the directory\n"); @@ -89,5 +85,3 @@ index 8b1376f..683973d 100644 ERROR("\nFilesystem filter options:\n"); ERROR("-p <pseudo-definition>\tAdd pseudo file " "definition\n"); --- -2.14.1.480.gb18f417b89-goog (previously; hand-patched by charles-dyfis-net) diff --git a/pkgs/tools/misc/flashrom/default.nix b/pkgs/tools/misc/flashrom/default.nix index b45df3f57b5..a7ca7700c71 100644 --- a/pkgs/tools/misc/flashrom/default.nix +++ b/pkgs/tools/misc/flashrom/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "flashrom-${version}"; - version = "1.0.1"; + version = "1.1"; src = fetchurl { url = "https://download.flashrom.org/releases/flashrom-v${version}.tar.bz2"; - sha256 = "0i6yrrl69hrqmwd7azj7x3j46m0qpvzmk3b5basym7mnlpfzhyfm"; + sha256 = "06afq680n9p34hi3vrkn12vd1pfyq2062db9qqbi4hi21k3skbdf"; }; # Newer versions of libusb deprecate some API flashrom uses. diff --git a/pkgs/tools/misc/marlin-calc/default.nix b/pkgs/tools/misc/marlin-calc/default.nix new file mode 100644 index 00000000000..34b10a550f6 --- /dev/null +++ b/pkgs/tools/misc/marlin-calc/default.nix @@ -0,0 +1,31 @@ +{ stdenv, fetchFromGitHub }: + +stdenv.mkDerivation rec { + pname = "marlin-calc"; + version = "2019-06-04"; + + src = fetchFromGitHub { + owner = "eyal0"; + repo = "Marlin"; + rev = "4120d1c72d6c32e9c5cc745c05d20963ba4bbca3"; + sha256 = "06aly7s4k1r31njm43sbxq9a0127sw43pnaddh92a3cc39rbj2va"; + }; + + buildPhase = '' + cd Marlin/src + c++ module/planner.cpp module/calc.cpp feature/fwretract.cpp \ + -O2 -Wall -std=gnu++11 -o marlin-calc + ''; + + installPhase = '' + install -Dm0755 {,$out/bin/}marlin-calc + ''; + + meta = with stdenv.lib; { + homepage = "https://github.com/eyal0/Marlin"; + description = "Marlin 3D printer timing simulator"; + license = licenses.gpl3; + maintainers = with maintainers; [ gebner ]; + platforms = platforms.unix; + }; +} diff --git a/pkgs/tools/networking/wireguard-tools/default.nix b/pkgs/tools/networking/wireguard-tools/default.nix index eef34c53f19..f918949a027 100644 --- a/pkgs/tools/networking/wireguard-tools/default.nix +++ b/pkgs/tools/networking/wireguard-tools/default.nix @@ -1,14 +1,23 @@ -{ stdenv, fetchzip, openresolv ? null, libmnl ? null, procps ? null, iproute ? null, makeWrapper ? null, wireguard-go ? null }: +{ + stdenv, fetchzip, + + iproute ? null, + libmnl ? null, + makeWrapper ? null, + openresolv ? null, + procps ? null, + wireguard-go ? null, +}: with stdenv.lib; stdenv.mkDerivation rec { - name = "wireguard-tools-${version}"; - version = "0.0.20190601"; + pname = "wireguard-tools"; + version = "0.0.20190702"; src = fetchzip { url = "https://git.zx2c4.com/WireGuard/snapshot/WireGuard-${version}.tar.xz"; - sha256 = "0glcshf4dk2kfdkqc0x6ds45kpw6amsi8p2m81bfpmgnaglcbp7c"; + sha256 = "1xl4hzqrny3855s7h1k24py81gdjyfv0mhv6y528f6p0h38r89s3"; }; sourceRoot = "source/src/tools"; @@ -39,10 +48,10 @@ stdenv.mkDerivation rec { passthru.updateScript = ./update.sh; - meta = with stdenv.lib; { + meta = { description = "Tools for the WireGuard secure network tunnel"; - downloadPage = https://git.zx2c4.com/WireGuard/refs/; - homepage = https://www.wireguard.com/; + downloadPage = "https://git.zx2c4.com/WireGuard/refs/"; + homepage = "https://www.wireguard.com/"; license = licenses.gpl2; maintainers = with maintainers; [ elseym ericsagnes mic92 zx2c4 ]; platforms = platforms.unix; diff --git a/pkgs/tools/package-management/conda/default.nix b/pkgs/tools/package-management/conda/default.nix index 5ddcee6d1d3..71dd7861808 100644 --- a/pkgs/tools/package-management/conda/default.nix +++ b/pkgs/tools/package-management/conda/default.nix @@ -5,6 +5,7 @@ , makeWrapper , buildFHSUserEnv , libselinux +, libarchive , xorg # Conda installs its packages and environments under this directory , installationPath ? "~/.conda" @@ -59,6 +60,7 @@ in # Some other required environment variables export FONTCONFIG_FILE=/etc/fonts/fonts.conf export QTCOMPOSE=${xorg.libX11}/share/X11/locale + export LIBARCHIVE=${libarchive.lib}/lib/libarchive.so ''; meta = { diff --git a/pkgs/tools/security/kbfs/default.nix b/pkgs/tools/security/kbfs/default.nix deleted file mode 100644 index 9cd6ccca388..00000000000 --- a/pkgs/tools/security/kbfs/default.nix +++ /dev/null @@ -1,28 +0,0 @@ -{ stdenv, buildGoPackage, fetchFromGitHub }: - -buildGoPackage rec { - name = "kbfs-${version}"; - version = "2.11.0"; - - goPackagePath = "github.com/keybase/kbfs"; - subPackages = [ "kbfsfuse" "kbfsgit/git-remote-keybase" ]; - - dontRenameImports = true; - - src = fetchFromGitHub { - owner = "keybase"; - repo = "kbfs"; - rev = "v${version}"; - sha256 = "1qlns7vpyj3ivm7d3vvlmx3iksl7hpcg87yh30f3n64c8jk0xc83"; - }; - - buildFlags = [ "-tags production" ]; - - meta = with stdenv.lib; { - homepage = https://www.keybase.io; - description = "The Keybase FS FUSE driver"; - platforms = platforms.unix; - maintainers = with maintainers; [ rvolosatovs bennofs np ]; - license = licenses.bsd3; - }; -} diff --git a/pkgs/tools/security/keybase/kbfs.nix b/pkgs/tools/security/keybase/kbfs.nix new file mode 100644 index 00000000000..302e996213d --- /dev/null +++ b/pkgs/tools/security/keybase/kbfs.nix @@ -0,0 +1,22 @@ +{ stdenv, buildGoPackage, fetchFromGitHub, keybase }: + +buildGoPackage rec { + pname = "kbfs"; + + inherit (keybase) src version; + + goPackagePath = "github.com/keybase/client"; + subPackages = [ "go/kbfs/kbfsfuse" "go/kbfs/kbfsgit/git-remote-keybase" ]; + + dontRenameImports = true; + + buildFlags = [ "-tags production" ]; + + meta = with stdenv.lib; { + homepage = "https://keybase.io/docs/kbfs"; + description = "The Keybase filesystem"; + platforms = platforms.unix; + maintainers = with maintainers; [ rvolosatovs bennofs np ]; + license = licenses.bsd3; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 7f7d7d6982b..3521eacddba 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -179,6 +179,8 @@ in dockerTools = callPackage ../build-support/docker { }; + snapTools = callPackage ../build-support/snap { }; + nix-prefetch-docker = callPackage ../build-support/docker/nix-prefetch-docker.nix { }; docker-compose = python3Packages.callPackage ../applications/virtualization/docker-compose {}; @@ -1697,6 +1699,8 @@ in lynis = callPackage ../tools/security/lynis { }; + marlin-calc = callPackage ../tools/misc/marlin-calc {}; + mathics = pythonPackages.mathics; masscan = callPackage ../tools/security/masscan { @@ -3724,6 +3728,8 @@ in icecast = callPackage ../servers/icecast { }; + iceshelf = callPackage ../tools/backup/iceshelf { }; + darkice = callPackage ../tools/audio/darkice { }; deco = callPackage ../applications/misc/deco { }; @@ -3990,7 +3996,7 @@ in inherit (darwin.apple_sdk.frameworks) AVFoundation AudioToolbox ImageIO CoreMedia Foundation CoreGraphics MediaToolbox; }; - kbfs = callPackage ../tools/security/kbfs { }; + kbfs = callPackage ../tools/security/keybase/kbfs.nix { }; keybase-gui = callPackage ../tools/security/keybase/gui.nix { }; @@ -8063,6 +8069,7 @@ in cargo-bloat = callPackage ../development/tools/rust/cargo-bloat { }; cargo-expand = callPackage ../development/tools/rust/cargo-expand { }; cargo-fuzz = callPackage ../development/tools/rust/cargo-fuzz { }; + cargo-inspect = callPackage ../development/tools/rust/cargo-inspect { }; cargo-make = callPackage ../development/tools/rust/cargo-make { inherit (darwin.apple_sdk.frameworks) Security; }; @@ -8530,6 +8537,7 @@ in python35Full = python35.override{x11Support=true;}; python36Full = python36.override{x11Support=true;}; python37Full = python37.override{x11Support=true;}; + python38Full = python38.override{x11Support=true;}; # pythonPackages further below, but assigned here because they need to be in sync pythonPackages = python.pkgs; @@ -8537,13 +8545,14 @@ in python3Packages = python3.pkgs; pythonInterpreters = callPackage ./../development/interpreters/python {}; - inherit (pythonInterpreters) python27 python35 python36 python37 pypy27 pypy35; + inherit (pythonInterpreters) python27 python35 python36 python37 python38 pypy27 pypy35; # Python package sets. python27Packages = lib.hiPrioSet (recurseIntoAttrs python27.pkgs); python35Packages = python35.pkgs; python36Packages = python36.pkgs; python37Packages = recurseIntoAttrs python37.pkgs; + python38Packages = python38.pkgs; pypyPackages = pypy.pkgs; pypy2Packages = pypy2.pkgs; pypy27Packages = pypy27.pkgs; @@ -9854,7 +9863,7 @@ in ycmd = callPackage ../development/tools/misc/ycmd { inherit (darwin.apple_sdk.frameworks) Cocoa; - python = python2; + python = python3; }; yodl = callPackage ../development/tools/misc/yodl { }; @@ -15353,6 +15362,14 @@ in ]; }; + linux_5_2 = callPackage ../os-specific/linux/kernel/linux-5.2.nix { + kernelPatches = + [ kernelPatches.bridge_stp_helper + kernelPatches.modinst_arg_list_too_long + kernelPatches.export_kernel_fpu_functions + ]; + }; + linux_testing = callPackage ../os-specific/linux/kernel/linux-testing.nix { kernelPatches = [ kernelPatches.bridge_stp_helper @@ -15544,7 +15561,7 @@ in linux = linuxPackages.kernel; # Update this when adding the newest kernel major version! - linuxPackages_latest = linuxPackages_5_1; + linuxPackages_latest = linuxPackages_5_2; linux_latest = linuxPackages_latest.kernel; # Build the kernel modules for the some of the kernels. @@ -15555,6 +15572,7 @@ in linuxPackages_4_14 = recurseIntoAttrs (linuxPackagesFor pkgs.linux_4_14); linuxPackages_4_19 = recurseIntoAttrs (linuxPackagesFor pkgs.linux_4_19); linuxPackages_5_1 = recurseIntoAttrs (linuxPackagesFor pkgs.linux_5_1); + linuxPackages_5_2 = recurseIntoAttrs (linuxPackagesFor pkgs.linux_5_2); # When adding to this list: # - Update linuxPackages_latest to the latest version @@ -17415,6 +17433,8 @@ in dragonfly-reverb = callPackage ../applications/audio/dragonfly-reverb { }; + drawio = callPackage ../applications/graphics/drawio {}; + drawpile = libsForQt5.callPackage ../applications/graphics/drawpile { }; drawpile-server-headless = libsForQt5.callPackage ../applications/graphics/drawpile { buildClient = false; @@ -19308,6 +19328,17 @@ in polybar = callPackage ../applications/misc/polybar { }; + polybarFull = callPackage ../applications/misc/polybar { + alsaSupport = true; + githubSupport = true; + mpdSupport = true; + pulseSupport = true; + iwSupport = true; + nlSupport = true; + i3Support = true; + i3GapsSupport = true; + }; + ptex = callPackage ../development/libraries/ptex {}; qtcurve = libsForQt5.callPackage ../misc/themes/qtcurve {}; diff --git a/pkgs/top-level/ocaml-packages.nix b/pkgs/top-level/ocaml-packages.nix index 820d5af1151..ffa25ada3e7 100644 --- a/pkgs/top-level/ocaml-packages.nix +++ b/pkgs/top-level/ocaml-packages.nix @@ -271,6 +271,8 @@ let higlo = callPackage ../development/ocaml-modules/higlo { }; + hmap = callPackage ../development/ocaml-modules/hmap { }; + imagelib = callPackage ../development/ocaml-modules/imagelib { }; inotify = callPackage ../development/ocaml-modules/inotify { }; @@ -551,6 +553,10 @@ let opam-file-format = callPackage ../development/ocaml-modules/opam-file-format { }; + opium = callPackage ../development/ocaml-modules/opium { }; + + opium_kernel = callPackage ../development/ocaml-modules/opium_kernel { }; + opti = callPackage ../development/ocaml-modules/opti { }; optint = callPackage ../development/ocaml-modules/optint { }; diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 2ec132264a9..ace40b3b209 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -18,7 +18,7 @@ let packages = ( self: let - inherit (python.passthru) isPy27 isPy33 isPy34 isPy35 isPy36 isPy37 isPy3k isPyPy pythonAtLeast pythonOlder; + inherit (python.passthru) isPy27 isPy33 isPy34 isPy35 isPy36 isPy37 isPy38 isPy3k isPyPy pythonAtLeast pythonOlder; callPackage = pkgs.newScope self; @@ -1647,10 +1647,10 @@ in { openant = callPackage ../development/python-modules/openant { }; - opencv = toPythonModule (pkgs.opencv.override { + opencv = disabledIf isPy3k (toPythonModule (pkgs.opencv.override { enablePython = true; pythonPackages = self; - }); + })); opencv3 = toPythonModule (pkgs.opencv3.override { enablePython = true; |