diff --git a/doc/cross-compilation.xml b/doc/cross-compilation.xml
index c7187d86d1b..3b90596bcc2 100644
--- a/doc/cross-compilation.xml
+++ b/doc/cross-compilation.xml
@@ -47,9 +47,13 @@
In Nixpkgs, these three platforms are defined as attribute sets under the
- names buildPlatform, hostPlatform, and
- targetPlatform. They are always defined as attributes in
- the standard environment. That means one can access them like:
+ names buildPlatform, hostPlatform,
+ and targetPlatform. All three are always defined as
+ attributes in the standard environment, and at the top level. That means
+ one can get at them just like a dependency in a function that is imported
+ with callPackage:
+{ stdenv, buildPlatform, hostPlatform, fooDep, barDep, .. }: ...buildPlatform...
+ , or just off stdenv:
{ stdenv, fooDep, barDep, .. }: ...stdenv.buildPlatform...
.
diff --git a/doc/languages-frameworks/vim.section.md b/doc/languages-frameworks/vim.section.md
index 1d6a4fe8da8..f0a6559c3d5 100644
--- a/doc/languages-frameworks/vim.section.md
+++ b/doc/languages-frameworks/vim.section.md
@@ -5,11 +5,16 @@ date: 2016-06-25
---
# User's Guide to Vim Plugins/Addons/Bundles/Scripts in Nixpkgs
-You'll get a vim(-your-suffix) in PATH also loading the plugins you want.
+Both Neovim and Vim can be configured to include your favorite plugins
+and additional libraries.
+
Loading can be deferred; see examples.
-Vim packages, VAM (=vim-addon-manager) and Pathogen are supported to load
-packages.
+At the moment we support three different methods for managing plugins:
+
+- Vim packages (*recommend*)
+- VAM (=vim-addon-manager)
+- Pathogen
## Custom configuration
@@ -25,7 +30,19 @@ vim_configurable.customize {
}
```
-## Vim packages
+For Neovim the `configure` argument can be overridden to achieve the same:
+
+```
+neovim.override {
+ configure = {
+ customRC = ''
+ # here your custom configuration goes!
+ '';
+ };
+}
+```
+
+## Managing plugins with Vim packages
To store you plugins in Vim packages the following example can be used:
@@ -38,13 +55,50 @@ vim_configurable.customize {
opt = [ phpCompletion elm-vim ];
# To automatically load a plugin when opening a filetype, add vimrc lines like:
# autocmd FileType php :packadd phpCompletion
- }
-};
+ };
+}
```
-## VAM
+For Neovim the syntax is
-### dependencies by Vim plugins
+```
+neovim.override {
+ configure = {
+ customRC = ''
+ # here your custom configuration goes!
+ '';
+ packages.myVimPackage = with pkgs.vimPlugins; {
+ # see examples below how to use custom packages
+ start = [ ];
+ opt = [ ];
+ };
+ };
+}
+```
+
+The resulting package can be added to `packageOverrides` in `~/.nixpkgs/config.nix` to make it installable:
+
+```
+{
+ packageOverrides = pkgs: with pkgs; {
+ myVim = vim_configurable.customize {
+ name = "vim-with-plugins";
+ # add here code from the example section
+ };
+ myNeovim = neovim.override {
+ configure = {
+ # add here code from the example section
+ };
+ };
+ };
+}
+```
+
+After that you can install your special grafted `myVim` or `myNeovim` packages.
+
+## Managing plugins with VAM
+
+### Handling dependencies of Vim plugins
VAM introduced .json files supporting dependencies without versioning
assuming that "using latest version" is ok most of the time.
@@ -125,6 +179,18 @@ Sample output2:
]
+## Adding new plugins to nixpkgs
+
+In `pkgs/misc/vim-plugins/vim-plugin-names` we store the plugin names
+for all vim plugins we automatically generate plugins for.
+The format of this file `github username/github repository`:
+For example https://github.com/scrooloose/nerdtree becomes `scrooloose/nerdtree`.
+After adding your plugin to this file run the `./update.py` in the same folder.
+This will updated a file called `generated.nix` and make your plugin accessible in the
+`vimPlugins` attribute set (`vimPlugins.nerdtree` in our example).
+If additional steps to the build process of the plugin are required, add an
+override to the `pkgs/misc/vim-plugins/default.nix` in the same directory.
+
## Important repositories
- [vim-pi](https://bitbucket.org/vimcommunity/vim-pi) is a plugin repository
diff --git a/lib/licenses.nix b/lib/licenses.nix
index 6f0e4217c19..c4db280645a 100644
--- a/lib/licenses.nix
+++ b/lib/licenses.nix
@@ -355,6 +355,11 @@ lib.mapAttrs (n: v: v // { shortName = n; }) rec {
fullName = "Independent JPEG Group License";
};
+ imagemagick = spdx {
+ fullName = "ImageMagick License";
+ spdxId = "imagemagick";
+ };
+
inria-compcert = {
fullName = "INRIA Non-Commercial License Agreement for the CompCert verified compiler";
url = "http://compcert.inria.fr/doc/LICENSE";
diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix
index ecec7bbaf7e..837c4f46dee 100644
--- a/maintainers/maintainer-list.nix
+++ b/maintainers/maintainer-list.nix
@@ -1847,6 +1847,11 @@
github = "jerith666";
name = "Matt McHenry";
};
+ jethro = {
+ email = "jethrokuan95@gmail.com";
+ github = "jethrokuan";
+ name = "Jethro Kuan";
+ };
jfb = {
email = "james@yamtime.com";
github = "tftio";
@@ -4163,6 +4168,11 @@
github = "tomsmeets";
name = "Tom Smeets";
};
+ toonn = {
+ email = "nnoot@toonn.io";
+ github = "toonn";
+ name = "Toon Nolten";
+ };
travisbhartwell = {
email = "nafai@travishartwell.net";
github = "travisbhartwell";
@@ -4518,6 +4528,11 @@
github = "y0no";
name = "Yoann Ono";
};
+ yarny = {
+ email = "41838844+Yarny0@users.noreply.github.com";
+ github = "Yarny0";
+ name = "Yarny";
+ };
yarr = {
email = "savraz@gmail.com";
github = "Eternity-Yarr";
diff --git a/nixos/doc/manual/installation/upgrading.xml b/nixos/doc/manual/installation/upgrading.xml
index 85e5082575d..69668b1d4bd 100644
--- a/nixos/doc/manual/installation/upgrading.xml
+++ b/nixos/doc/manual/installation/upgrading.xml
@@ -52,10 +52,13 @@
To see what channels are available, go to
- . (Note that the URIs of the
+ . (Note that the URIs of the
various channels redirect to a directory that contains the channel’s latest
- version and includes ISO images and VirtualBox appliances.)
+ version and includes ISO images and VirtualBox appliances.) Please note that
+ during the release process, channels that are not yet released will be
+ present here as well. See the Getting NixOS page
+ to find the newest
+ supported stable release.
When you first install NixOS, you’re automatically subscribed to the NixOS
diff --git a/nixos/doc/manual/release-notes/rl-1809.xml b/nixos/doc/manual/release-notes/rl-1809.xml
index 9ec465d8955..9c8cd7c49c8 100644
--- a/nixos/doc/manual/release-notes/rl-1809.xml
+++ b/nixos/doc/manual/release-notes/rl-1809.xml
@@ -451,6 +451,14 @@ inherit (pkgs.nixos {
deprecated. Use networking.networkmanager.dns instead.
+
+
+ The Kubernetes package has been bumped to major version 1.11.
+ Please consult the
+ release notes
+ for details on new features and api changes.
+
+
The option
diff --git a/nixos/lib/eval-config.nix b/nixos/lib/eval-config.nix
index d005fc61dc4..f71e264c347 100644
--- a/nixos/lib/eval-config.nix
+++ b/nixos/lib/eval-config.nix
@@ -36,7 +36,11 @@ let
_file = ./eval-config.nix;
key = _file;
config = {
- nixpkgs.localSystem = lib.mkDefault { inherit system; };
+ # Explicit `nixpkgs.system` or `nixpkgs.localSystem` should override
+ # this. Since the latter defaults to the former, the former should
+ # default to the argument. That way this new default could propagate all
+ # they way through, but has the last priority behind everything else.
+ nixpkgs.system = lib.mkDefault system;
_module.args.pkgs = lib.mkIf (pkgs_ != null) (lib.mkForce pkgs_);
};
};
diff --git a/nixos/modules/config/xdg/mime.nix b/nixos/modules/config/xdg/mime.nix
index f1b672234a3..4323a49ea1d 100644
--- a/nixos/modules/config/xdg/mime.nix
+++ b/nixos/modules/config/xdg/mime.nix
@@ -7,7 +7,7 @@ with lib;
type = types.bool;
default = true;
description = ''
- Whether to install files to support the
+ Whether to install files to support the
XDG Shared MIME-info specification and the
XDG MIME Applications specification.
'';
@@ -17,18 +17,18 @@ with lib;
config = mkIf config.xdg.mime.enable {
environment.pathsToLink = [ "/share/mime" ];
- environment.systemPackages = [
- # this package also installs some useful data, as well as its utilities
- pkgs.shared-mime-info
+ environment.systemPackages = [
+ # this package also installs some useful data, as well as its utilities
+ pkgs.shared-mime-info
];
environment.extraSetup = ''
- if [ -w $out/share/mime ]; then
- XDG_DATA_DIRS=$out/share ${pkgs.shared-mime-info}/bin/update-mime-database -V $out/share/mime > /dev/null
+ if [ -w $out/share/mime ] && [ -d $out/share/mime/packages ]; then
+ XDG_DATA_DIRS=$out/share ${pkgs.shared-mime-info}/bin/update-mime-database -V $out/share/mime > /dev/null
fi
if [ -w $out/share/applications ]; then
- ${pkgs.desktop-file-utils}/bin/update-desktop-database $out/share/applications
+ ${pkgs.desktop-file-utils}/bin/update-desktop-database $out/share/applications
fi
'';
};
diff --git a/nixos/modules/misc/ids.nix b/nixos/modules/misc/ids.nix
index 8292cdc995e..aafeb997c32 100644
--- a/nixos/modules/misc/ids.nix
+++ b/nixos/modules/misc/ids.nix
@@ -53,7 +53,7 @@
tomcat = 16;
#audio = 17; # unused
#floppy = 18; # unused
- #uucp = 19; # unused
+ uucp = 19;
#lp = 20; # unused
#proc = 21; # unused
pulseaudio = 22; # must match `pulseaudio' GID
diff --git a/nixos/modules/misc/nixpkgs.nix b/nixos/modules/misc/nixpkgs.nix
index 8fbe218b232..7f9833e184a 100644
--- a/nixos/modules/misc/nixpkgs.nix
+++ b/nixos/modules/misc/nixpkgs.nix
@@ -62,12 +62,11 @@ in
pkgs = mkOption {
defaultText = literalExample
''import "''${nixos}/.." {
- inherit (config.nixpkgs) config overlays localSystem crossSystem;
+ inherit (cfg) config overlays localSystem crossSystem;
}
'';
default = import ../../.. {
- localSystem = { inherit (cfg) system; } // cfg.localSystem;
- inherit (cfg) config overlays crossSystem;
+ inherit (cfg) config overlays localSystem crossSystem;
};
type = pkgsType;
example = literalExample ''import {}'';
@@ -140,8 +139,11 @@ in
localSystem = mkOption {
type = types.attrs; # TODO utilize lib.systems.parsedPlatform
- default = { system = builtins.currentSystem; };
+ default = { inherit (cfg) system; };
example = { system = "aarch64-linux"; config = "aarch64-unknown-linux-gnu"; };
+ # Make sure that the final value has all fields for sake of other modules
+ # referring to this. TODO make `lib.systems` itself use the module system.
+ apply = lib.systems.elaborate;
defaultText = literalExample
''(import "''${nixos}/../lib").lib.systems.examples.aarch64-multiplatform'';
description = ''
@@ -180,6 +182,7 @@ in
system = mkOption {
type = types.str;
example = "i686-linux";
+ default = { system = builtins.currentSystem; };
description = ''
Specifies the Nix platform type on which NixOS should be built.
It is better to specify nixpkgs.localSystem instead.
@@ -196,6 +199,7 @@ in
See nixpkgs.localSystem for more information.
+ Ignored when nixpkgs.localSystem is set.
Ignored when nixpkgs.pkgs is set.
'';
};
diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix
index 2b14f769ae4..f51a30aec2e 100644
--- a/nixos/modules/module-list.nix
+++ b/nixos/modules/module-list.nix
@@ -245,6 +245,7 @@
./services/desktops/gnome3/gnome-user-share.nix
./services/desktops/gnome3/gpaste.nix
./services/desktops/gnome3/gvfs.nix
+ ./services/desktops/gnome3/rygel.nix
./services/desktops/gnome3/seahorse.nix
./services/desktops/gnome3/sushi.nix
./services/desktops/gnome3/tracker.nix
@@ -516,6 +517,7 @@
./services/networking/heyefi.nix
./services/networking/hostapd.nix
./services/networking/htpdate.nix
+ ./services/networking/hylafax/default.nix
./services/networking/i2pd.nix
./services/networking/i2p.nix
./services/networking/iodine.nix
diff --git a/nixos/modules/security/acme.nix b/nixos/modules/security/acme.nix
index 946da92d80e..092704c6fc3 100644
--- a/nixos/modules/security/acme.nix
+++ b/nixos/modules/security/acme.nix
@@ -302,15 +302,15 @@ in
workdir="$(mktemp -d)"
# Create CA
- openssl genrsa -des3 -passout pass:x -out $workdir/ca.pass.key 2048
- openssl rsa -passin pass:x -in $workdir/ca.pass.key -out $workdir/ca.key
+ openssl genrsa -des3 -passout pass:xxxx -out $workdir/ca.pass.key 2048
+ openssl rsa -passin pass:xxxx -in $workdir/ca.pass.key -out $workdir/ca.key
openssl req -new -key $workdir/ca.key -out $workdir/ca.csr \
-subj "/C=UK/ST=Warwickshire/L=Leamington/O=OrgName/OU=Security Department/CN=example.com"
openssl x509 -req -days 1 -in $workdir/ca.csr -signkey $workdir/ca.key -out $workdir/ca.crt
# Create key
- openssl genrsa -des3 -passout pass:x -out $workdir/server.pass.key 2048
- openssl rsa -passin pass:x -in $workdir/server.pass.key -out $workdir/server.key
+ openssl genrsa -des3 -passout pass:xxxx -out $workdir/server.pass.key 2048
+ openssl rsa -passin pass:xxxx -in $workdir/server.pass.key -out $workdir/server.key
openssl req -new -key $workdir/server.key -out $workdir/server.csr \
-subj "/C=UK/ST=Warwickshire/L=Leamington/O=OrgName/OU=IT Department/CN=example.com"
openssl x509 -req -days 1 -in $workdir/server.csr -CA $workdir/ca.crt \
diff --git a/nixos/modules/services/computing/slurm/slurm.nix b/nixos/modules/services/computing/slurm/slurm.nix
index 1e1c5bc9f03..09174ed39f5 100644
--- a/nixos/modules/services/computing/slurm/slurm.nix
+++ b/nixos/modules/services/computing/slurm/slurm.nix
@@ -8,6 +8,7 @@ let
# configuration file can be generated by http://slurm.schedmd.com/configurator.html
configFile = pkgs.writeTextDir "slurm.conf"
''
+ ClusterName=${cfg.clusterName}
${optionalString (cfg.controlMachine != null) ''controlMachine=${cfg.controlMachine}''}
${optionalString (cfg.controlAddr != null) ''controlAddr=${cfg.controlAddr}''}
${optionalString (cfg.nodeName != null) ''nodeName=${cfg.nodeName}''}
@@ -105,6 +106,15 @@ in
'';
};
+ clusterName = mkOption {
+ type = types.str;
+ default = "default";
+ example = "myCluster";
+ description = ''
+ Necessary to distinguish accounting records in a multi-cluster environment.
+ '';
+ };
+
nodeName = mkOption {
type = types.nullOr types.str;
default = null;
diff --git a/nixos/modules/services/desktops/gnome3/rygel.nix b/nixos/modules/services/desktops/gnome3/rygel.nix
new file mode 100644
index 00000000000..55d5e703aa1
--- /dev/null
+++ b/nixos/modules/services/desktops/gnome3/rygel.nix
@@ -0,0 +1,30 @@
+# rygel service.
+{ config, lib, pkgs, ... }:
+
+with lib;
+
+{
+ ###### interface
+ options = {
+ services.gnome3.rygel = {
+ enable = mkOption {
+ default = false;
+ description = ''
+ Whether to enable Rygel UPnP Mediaserver.
+
+ You will need to also allow UPnP connections in firewall, see the following comment.
+ '';
+ type = types.bool;
+ };
+ };
+ };
+
+ ###### implementation
+ config = mkIf config.services.gnome3.rygel.enable {
+ environment.systemPackages = [ pkgs.gnome3.rygel ];
+
+ services.dbus.packages = [ pkgs.gnome3.rygel ];
+
+ systemd.packages = [ pkgs.gnome3.rygel ];
+ };
+}
diff --git a/nixos/modules/services/monitoring/datadog-agent.nix b/nixos/modules/services/monitoring/datadog-agent.nix
index e545e06b349..35c08f5e7e3 100644
--- a/nixos/modules/services/monitoring/datadog-agent.nix
+++ b/nixos/modules/services/monitoring/datadog-agent.nix
@@ -8,7 +8,6 @@ let
ddConf = {
dd_url = "https://app.datadoghq.com";
skip_ssl_validation = "no";
- api_key = "";
confd_path = "/etc/datadog-agent/conf.d";
additional_checksd = "/etc/datadog-agent/checks.d";
use_dogstatsd = true;
@@ -16,6 +15,7 @@ let
// optionalAttrs (cfg.logLevel != null) { log_level = cfg.logLevel; }
// optionalAttrs (cfg.hostname != null) { inherit (cfg) hostname; }
// optionalAttrs (cfg.tags != null ) { tags = concatStringsSep ", " cfg.tags; }
+ // optionalAttrs (cfg.enableLiveProcessCollection) { process_config = { enabled = "true"; }; }
// cfg.extraConfig;
# Generate Datadog configuration files for each configured checks.
@@ -125,6 +125,13 @@ in {
'';
};
+ enableLiveProcessCollection = mkOption {
+ description = ''
+ Whether to enable the live process collection agent.
+ '';
+ default = false;
+ type = types.bool;
+ };
checks = mkOption {
description = ''
Configuration for all Datadog checks. Keys of this attribute
@@ -229,6 +236,15 @@ in {
path = [ datadogPkg pkgs.python pkgs.sysstat pkgs.procps pkgs.jdk ];
serviceConfig.ExecStart = "${datadogPkg}/bin/dd-jmxfetch";
});
+
+ datadog-process-agent = lib.mkIf cfg.enableLiveProcessCollection (makeService {
+ description = "Datadog Live Process Agent";
+ path = [ ];
+ script = ''
+ export DD_API_KEY=$(head -n 1 ${cfg.apiKeyFile})
+ ${pkgs.datadog-process-agent}/bin/agent --config /etc/datadog-agent/datadog.yaml
+ '';
+ });
};
environment.etc = etcfiles;
diff --git a/nixos/modules/services/monitoring/grafana.nix b/nixos/modules/services/monitoring/grafana.nix
index 3e801f9b838..c30647f5460 100644
--- a/nixos/modules/services/monitoring/grafana.nix
+++ b/nixos/modules/services/monitoring/grafana.nix
@@ -235,7 +235,7 @@ in {
but without GF_ prefix
'';
default = {};
- type = types.attrsOf types.str;
+ type = with types; attrsOf (either str path);
};
};
diff --git a/nixos/modules/services/networking/hylafax/default.nix b/nixos/modules/services/networking/hylafax/default.nix
new file mode 100644
index 00000000000..4c63b822d16
--- /dev/null
+++ b/nixos/modules/services/networking/hylafax/default.nix
@@ -0,0 +1,29 @@
+{ config, lib, pkgs, ... }:
+
+{
+
+ imports = [
+ ./options.nix
+ ./systemd.nix
+ ];
+
+ config = lib.modules.mkIf config.services.hylafax.enable {
+ environment.systemPackages = [ pkgs.hylafaxplus ];
+ users.users.uucp = {
+ uid = config.ids.uids.uucp;
+ group = "uucp";
+ description = "Unix-to-Unix CoPy system";
+ isSystemUser = true;
+ inherit (config.users.users.nobody) home;
+ };
+ assertions = [{
+ assertion = config.services.hylafax.modems != {};
+ message = ''
+ HylaFAX cannot be used without modems.
+ Please define at least one modem with
+ .
+ '';
+ }];
+ };
+
+}
diff --git a/nixos/modules/services/networking/hylafax/faxq-default.nix b/nixos/modules/services/networking/hylafax/faxq-default.nix
new file mode 100644
index 00000000000..a2630ce66b7
--- /dev/null
+++ b/nixos/modules/services/networking/hylafax/faxq-default.nix
@@ -0,0 +1,12 @@
+{ ... }:
+
+# see man:hylafax-config(5)
+
+{
+
+ ModemGroup = [ ''"any:.*"'' ];
+ ServerTracing = "0x78701";
+ SessionTracing = "0x78701";
+ UUCPLockDir = "/var/lock";
+
+}
diff --git a/nixos/modules/services/networking/hylafax/faxq-wait.sh b/nixos/modules/services/networking/hylafax/faxq-wait.sh
new file mode 100755
index 00000000000..8c39e9d20c1
--- /dev/null
+++ b/nixos/modules/services/networking/hylafax/faxq-wait.sh
@@ -0,0 +1,29 @@
+#! @shell@ -e
+
+# skip this if there are no modems at all
+if ! stat -t "@spoolAreaPath@"/etc/config.* >/dev/null 2>&1
+then
+ exit 0
+fi
+
+echo "faxq started, waiting for modem(s) to initialize..."
+
+for i in `seq @timeoutSec@0 -1 0` # gracefully timeout
+do
+ sleep 0.1
+ # done if status files exist, but don't mention initialization
+ if \
+ stat -t "@spoolAreaPath@"/status/* >/dev/null 2>&1 \
+ && \
+ ! grep --silent --ignore-case 'initializing server' \
+ "@spoolAreaPath@"/status/*
+ then
+ echo "modem(s) apparently ready"
+ exit 0
+ fi
+ # if i reached 0, modems probably failed to initialize
+ if test $i -eq 0
+ then
+ echo "warning: modem initialization timed out"
+ fi
+done
diff --git a/nixos/modules/services/networking/hylafax/hfaxd-default.nix b/nixos/modules/services/networking/hylafax/hfaxd-default.nix
new file mode 100644
index 00000000000..8999dae57f4
--- /dev/null
+++ b/nixos/modules/services/networking/hylafax/hfaxd-default.nix
@@ -0,0 +1,10 @@
+{ ... }:
+
+# see man:hfaxd(8)
+
+{
+
+ ServerTracing = "0x91";
+ XferLogFile = "/clientlog";
+
+}
diff --git a/nixos/modules/services/networking/hylafax/modem-default.nix b/nixos/modules/services/networking/hylafax/modem-default.nix
new file mode 100644
index 00000000000..7529b5b0aaf
--- /dev/null
+++ b/nixos/modules/services/networking/hylafax/modem-default.nix
@@ -0,0 +1,22 @@
+{ pkgs, ... }:
+
+# see man:hylafax-config(5)
+
+{
+
+ TagLineFont = "etc/LiberationSans-25.pcf";
+ TagLineLocale = ''en_US.UTF-8'';
+
+ AdminGroup = "root"; # groups that can change server config
+ AnswerRotary = "fax"; # don't accept anything else but faxes
+ LogFileMode = "0640";
+ PriorityScheduling = true;
+ RecvFileMode = "0640";
+ ServerTracing = "0x78701";
+ SessionTracing = "0x78701";
+ UUCPLockDir = "/var/lock";
+
+ SendPageCmd = ''${pkgs.coreutils}/bin/false''; # prevent pager transmit
+ SendUUCPCmd = ''${pkgs.coreutils}/bin/false''; # prevent UUCP transmit
+
+}
diff --git a/nixos/modules/services/networking/hylafax/options.nix b/nixos/modules/services/networking/hylafax/options.nix
new file mode 100644
index 00000000000..4ac6d3fa843
--- /dev/null
+++ b/nixos/modules/services/networking/hylafax/options.nix
@@ -0,0 +1,375 @@
+{ config, lib, pkgs, ... }:
+
+let
+
+ inherit (lib.options) literalExample mkEnableOption mkOption;
+ inherit (lib.types) bool enum int lines loaOf nullOr path str submodule;
+ inherit (lib.modules) mkDefault mkIf mkMerge;
+
+ commonDescr = ''
+ Values can be either strings or integers
+ (which will be added to the config file verbatimly)
+ or lists thereof
+ (which will be translated to multiple
+ lines with the same configuration key).
+ Boolean values are translated to "Yes" or "No".
+ The default contains some reasonable
+ configuration to yield an operational system.
+ '';
+
+ str1 = lib.types.addCheck str (s: s!=""); # non-empty string
+ int1 = lib.types.addCheck int (i: i>0); # positive integer
+
+ configAttrType =
+ # Options in HylaFAX configuration files can be
+ # booleans, strings, integers, or list thereof
+ # representing multiple config directives with the same key.
+ # This type definition resolves all
+ # those types into a list of strings.
+ let
+ inherit (lib.types) attrsOf coercedTo listOf;
+ innerType = coercedTo bool (x: if x then "Yes" else "No")
+ (coercedTo int (toString) str);
+ in
+ attrsOf (coercedTo innerType lib.singleton (listOf innerType));
+
+ cfg = config.services.hylafax;
+
+ modemConfigOptions = { name, config, ... }: {
+ options = {
+ name = mkOption {
+ type = str1;
+ example = "ttyS1";
+ description = ''
+ Name of modem device,
+ will be searched for in /dev.
+ '';
+ };
+ type = mkOption {
+ type = str1;
+ example = "cirrus";
+ description = ''
+ Name of modem configuration file,
+ will be searched for in config
+ in the spooling area directory.
+ '';
+ };
+ config = mkOption {
+ type = configAttrType;
+ example = {
+ AreaCode = "49";
+ LocalCode = "30";
+ FAXNumber = "123456";
+ LocalIdentifier = "LostInBerlin";
+ };
+ description = ''
+ Attribute set of values for the given modem.
+ ${commonDescr}
+ Options defined here override options in
+ for this modem.
+ '';
+ };
+ };
+ config.name = mkDefault name;
+ config.config.Include = [ "config/${config.type}" ];
+ };
+
+ defaultConfig =
+ let
+ inherit (config.security) wrapperDir;
+ inherit (config.services.mail.sendmailSetuidWrapper) program;
+ mkIfDefault = cond: value: mkIf cond (mkDefault value);
+ noWrapper = config.services.mail.sendmailSetuidWrapper==null;
+ # If a sendmail setuid wrapper exists,
+ # we add the path to the default configuration file.
+ # Otherwise, we use `false` to provoke
+ # an error if hylafax tries to use it.
+ c.sendmailPath = mkMerge [
+ (mkIfDefault noWrapper ''${pkgs.coreutils}/bin/false'')
+ (mkIfDefault (!noWrapper) ''${wrapperDir}/${program}'')
+ ];
+ importDefaultConfig = file:
+ lib.attrsets.mapAttrs
+ (lib.trivial.const mkDefault)
+ (import file { inherit pkgs; });
+ c.commonModemConfig = importDefaultConfig ./modem-default.nix;
+ c.faxqConfig = importDefaultConfig ./faxq-default.nix;
+ c.hfaxdConfig = importDefaultConfig ./hfaxd-default.nix;
+ in
+ c;
+
+ localConfig =
+ let
+ c.hfaxdConfig.UserAccessFile = cfg.userAccessFile;
+ c.faxqConfig = lib.attrsets.mapAttrs
+ (lib.trivial.const (v: mkIf (v!=null) v))
+ {
+ AreaCode = cfg.areaCode;
+ CountryCode = cfg.countryCode;
+ LongDistancePrefix = cfg.longDistancePrefix;
+ InternationalPrefix = cfg.internationalPrefix;
+ };
+ c.commonModemConfig = c.faxqConfig;
+ in
+ c;
+
+in
+
+
+{
+
+
+ options.services.hylafax = {
+
+ enable = mkEnableOption ''HylaFAX server'';
+
+ autostart = mkOption {
+ type = bool;
+ default = true;
+ example = false;
+ description = ''
+ Autostart the HylaFAX queue manager at system start.
+ If this is false, the queue manager
+ will still be started if there are pending
+ jobs or if a user tries to connect to it.
+ '';
+ };
+
+ countryCode = mkOption {
+ type = nullOr str1;
+ default = null;
+ example = "49";
+ description = ''Country code for server and all modems.'';
+ };
+
+ areaCode = mkOption {
+ type = nullOr str1;
+ default = null;
+ example = "30";
+ description = ''Area code for server and all modems.'';
+ };
+
+ longDistancePrefix = mkOption {
+ type = nullOr str;
+ default = null;
+ example = "0";
+ description = ''Long distance prefix for server and all modems.'';
+ };
+
+ internationalPrefix = mkOption {
+ type = nullOr str;
+ default = null;
+ example = "00";
+ description = ''International prefix for server and all modems.'';
+ };
+
+ spoolAreaPath = mkOption {
+ type = path;
+ default = "/var/spool/fax";
+ description = ''
+ The spooling area will be created/maintained
+ at the location given here.
+ '';
+ };
+
+ userAccessFile = mkOption {
+ type = path;
+ default = "/etc/hosts.hfaxd";
+ description = ''
+ The hosts.hfaxd
+ file entry in the spooling area
+ will be symlinked to the location given here.
+ This file must exist and be
+ readable only by the uucp user.
+ See hosts.hfaxd(5) for details.
+ This configuration permits access for all users:
+
+ environment.etc."hosts.hfaxd" = {
+ mode = "0600";
+ user = "uucp";
+ text = ".*";
+ };
+
+ Note that host-based access can be controlled with
+ ;
+ by default, only 127.0.0.1 is permitted to connect.
+ '';
+ };
+
+ sendmailPath = mkOption {
+ type = path;
+ example = literalExample "''${pkgs.postfix}/bin/sendmail";
+ # '' ; # fix vim
+ description = ''
+ Path to sendmail program.
+ The default uses the local sendmail wrapper
+ (see ),
+ otherwise the false
+ binary to cause an error if used.
+ '';
+ };
+
+ hfaxdConfig = mkOption {
+ type = configAttrType;
+ example.RecvqProtection = "0400";
+ description = ''
+ Attribute set of lines for the global
+ hfaxd config file etc/hfaxd.conf.
+ ${commonDescr}
+ '';
+ };
+
+ faxqConfig = mkOption {
+ type = configAttrType;
+ example = {
+ InternationalPrefix = "00";
+ LongDistancePrefix = "0";
+ };
+ description = ''
+ Attribute set of lines for the global
+ faxq config file etc/config.
+ ${commonDescr}
+ '';
+ };
+
+ commonModemConfig = mkOption {
+ type = configAttrType;
+ example = {
+ InternationalPrefix = "00";
+ LongDistancePrefix = "0";
+ };
+ description = ''
+ Attribute set of default values for
+ modem config files etc/config.*.
+ ${commonDescr}
+ Think twice before changing
+ paths of fax-processing scripts.
+ '';
+ };
+
+ modems = mkOption {
+ type = loaOf (submodule [ modemConfigOptions ]);
+ default = {};
+ example.ttyS1 = {
+ type = "cirrus";
+ config = {
+ FAXNumber = "123456";
+ LocalIdentifier = "Smith";
+ };
+ };
+ description = ''
+ Description of installed modems.
+ At least on modem must be defined
+ to enable the HylaFAX server.
+ '';
+ };
+
+ spoolExtraInit = mkOption {
+ type = lines;
+ default = "";
+ example = ''chmod 0755 . # everyone may read my faxes'';
+ description = ''
+ Additional shell code that is executed within the
+ spooling area directory right after its setup.
+ '';
+ };
+
+ faxcron.enable.spoolInit = mkEnableOption ''
+ Purge old files from the spooling area with
+ faxcron
+ each time the spooling area is initialized.
+ '';
+ faxcron.enable.frequency = mkOption {
+ type = nullOr str1;
+ default = null;
+ example = "daily";
+ description = ''
+ Purge old files from the spooling area with
+ faxcron with the given frequency
+ (see systemd.time(7)).
+ '';
+ };
+ faxcron.infoDays = mkOption {
+ type = int1;
+ default = 30;
+ description = ''
+ Set the expiration time for data in the
+ remote machine information directory in days.
+ '';
+ };
+ faxcron.logDays = mkOption {
+ type = int1;
+ default = 30;
+ description = ''
+ Set the expiration time for
+ session trace log files in days.
+ '';
+ };
+ faxcron.rcvDays = mkOption {
+ type = int1;
+ default = 7;
+ description = ''
+ Set the expiration time for files in
+ the received facsimile queue in days.
+ '';
+ };
+
+ faxqclean.enable.spoolInit = mkEnableOption ''
+ Purge old files from the spooling area with
+ faxqclean
+ each time the spooling area is initialized.
+ '';
+ faxqclean.enable.frequency = mkOption {
+ type = nullOr str1;
+ default = null;
+ example = "daily";
+ description = ''
+ Purge old files from the spooling area with
+ faxcron with the given frequency
+ (see systemd.time(7)).
+ '';
+ };
+ faxqclean.archiving = mkOption {
+ type = enum [ "never" "as-flagged" "always" ];
+ default = "as-flagged";
+ example = "always";
+ description = ''
+ Enable or suppress job archiving:
+ never disables job archiving,
+ as-flagged archives jobs that
+ have been flagged for archiving by sendfax,
+ always forces archiving of all jobs.
+ See also sendfax(1) and faxqclean(8).
+ '';
+ };
+ faxqclean.doneqMinutes = mkOption {
+ type = int1;
+ default = 15;
+ example = literalExample ''24*60'';
+ description = ''
+ Set the job
+ age threshold (in minutes) that controls how long
+ jobs may reside in the doneq directory.
+ '';
+ };
+ faxqclean.docqMinutes = mkOption {
+ type = int1;
+ default = 60;
+ example = literalExample ''24*60'';
+ description = ''
+ Set the document
+ age threshold (in minutes) that controls how long
+ unreferenced files may reside in the docq directory.
+ '';
+ };
+
+ };
+
+
+ config.services.hylafax =
+ mkIf
+ (config.services.hylafax.enable)
+ (mkMerge [ defaultConfig localConfig ])
+ ;
+
+}
diff --git a/nixos/modules/services/networking/hylafax/spool.sh b/nixos/modules/services/networking/hylafax/spool.sh
new file mode 100755
index 00000000000..31e930e8c59
--- /dev/null
+++ b/nixos/modules/services/networking/hylafax/spool.sh
@@ -0,0 +1,111 @@
+#! @shell@ -e
+
+# The following lines create/update the HylaFAX spool directory:
+# Subdirectories/files with persistent data are kept,
+# other directories/files are removed/recreated,
+# mostly from the template spool
+# directory in the HylaFAX package.
+
+# This block explains how the spool area is
+# derived from the spool template in the HylaFAX package:
+#
+# + capital letter: directory; file otherwise
+# + P/p: persistent directory
+# + F/f: directory with symlinks per entry
+# + T/t: temporary data
+# + S/s: single symlink into package
+# |
+# | + u: change ownership to uucp:uucp
+# | + U: ..also change access mode to user-only
+# | |
+# archive P U
+# bin S
+# client T u (client connection info)
+# config S
+# COPYRIGHT s
+# dev T u (maybe some FIFOs)
+# docq P U
+# doneq P U
+# etc F contains customized config files!
+# etc/hosts.hfaxd f
+# etc/xferfaxlog f
+# info P u (database of called devices)
+# log P u (communication logs)
+# pollq P U
+# recvq P u
+# sendq P U
+# status T u (modem status info files)
+# tmp T U
+
+
+shopt -s dotglob # if bash sees "*", it also includes dot files
+lnsym () { ln --symbol "$@" ; }
+lnsymfrc () { ln --symbolic --force "$@" ; }
+cprd () { cp --remove-destination "$@" ; }
+update () { install --owner=@faxuser@ --group=@faxgroup@ "$@" ; }
+
+
+## create/update spooling area
+
+update --mode=0750 -d "@spoolAreaPath@"
+cd "@spoolAreaPath@"
+
+persist=(archive docq doneq info log pollq recvq sendq)
+
+# remove entries that don't belong here
+touch dummy # ensure "*" resolves to something
+for k in *
+do
+ keep=0
+ for j in "${persist[@]}" xferfaxlog clientlog faxcron.lastrun
+ do
+ if test "$k" == "$j"
+ then
+ keep=1
+ break
+ fi
+ done
+ if test "$keep" == "0"
+ then
+ rm --recursive "$k"
+ fi
+done
+
+# create persistent data directories (unless they exist already)
+update --mode=0700 -d "${persist[@]}"
+chmod 0755 info log recvq
+
+# create ``xferfaxlog``, ``faxcron.lastrun``, ``clientlog``
+touch clientlog faxcron.lastrun xferfaxlog
+chown @faxuser@:@faxgroup@ clientlog faxcron.lastrun xferfaxlog
+
+# create symlinks for frozen directories/files
+lnsym --target-directory=. "@hylafax@"/spool/{COPYRIGHT,bin,config}
+
+# create empty temporary directories
+update --mode=0700 -d client dev status
+update -d tmp
+
+
+## create and fill etc
+
+install -d "@spoolAreaPath@/etc"
+cd "@spoolAreaPath@/etc"
+
+# create symlinks to all files in template's etc
+lnsym --target-directory=. "@hylafax@/spool/etc"/*
+
+# set LOCKDIR in setup.cache
+sed --regexp-extended 's|^(UUCP_LOCKDIR=).*$|\1'"'@lockPath@'|g" --in-place setup.cache
+
+# etc/{xferfaxlog,lastrun} are stored in the spool root
+lnsymfrc --target-directory=. ../xferfaxlog
+lnsymfrc --no-target-directory ../faxcron.lastrun lastrun
+
+# etc/hosts.hfaxd is provided by the NixOS configuration
+lnsymfrc --no-target-directory "@userAccessFile@" hosts.hfaxd
+
+# etc/config and etc/config.${DEVID} must be copied:
+# hfaxd reads these file after locking itself up in a chroot
+cprd --no-target-directory "@globalConfigPath@" config
+cprd --target-directory=. "@modemConfigPath@"/*
diff --git a/nixos/modules/services/networking/hylafax/systemd.nix b/nixos/modules/services/networking/hylafax/systemd.nix
new file mode 100644
index 00000000000..91d9c1a37da
--- /dev/null
+++ b/nixos/modules/services/networking/hylafax/systemd.nix
@@ -0,0 +1,249 @@
+{ config, lib, pkgs, ... }:
+
+
+let
+
+ inherit (lib) mkIf mkMerge;
+ inherit (lib) concatStringsSep optionalString;
+
+ cfg = config.services.hylafax;
+ mapModems = lib.flip map (lib.attrValues cfg.modems);
+
+ mkConfigFile = name: conf:
+ # creates hylafax config file,
+ # makes sure "Include" is listed *first*
+ let
+ mkLines = conf:
+ (lib.concatLists
+ (lib.flip lib.mapAttrsToList conf
+ (k: map (v: ''${k}: ${v}'')
+ )));
+ include = mkLines { Include = conf.Include or []; };
+ other = mkLines ( conf // { Include = []; } );
+ in
+ pkgs.writeText ''hylafax-config${name}''
+ (concatStringsSep "\n" (include ++ other));
+
+ globalConfigPath = mkConfigFile "" cfg.faxqConfig;
+
+ modemConfigPath =
+ let
+ mkModemConfigFile = { config, name, ... }:
+ mkConfigFile ''.${name}''
+ (cfg.commonModemConfig // config);
+ mkLine = { name, type, ... }@modem: ''
+ # check if modem config file exists:
+ test -f "${pkgs.hylafaxplus}/spool/config/${type}"
+ ln \
+ --symbolic \
+ --no-target-directory \
+ "${mkModemConfigFile modem}" \
+ "$out/config.${name}"
+ '';
+ in
+ pkgs.runCommand "hylafax-config-modems" {}
+ ''mkdir --parents "$out/" ${concatStringsSep "\n" (mapModems mkLine)}'';
+
+ setupSpoolScript = pkgs.substituteAll {
+ name = "hylafax-setup-spool.sh";
+ src = ./spool.sh;
+ isExecutable = true;
+ inherit (pkgs.stdenv) shell;
+ hylafax = pkgs.hylafaxplus;
+ faxuser = "uucp";
+ faxgroup = "uucp";
+ lockPath = "/var/lock";
+ inherit globalConfigPath modemConfigPath;
+ inherit (cfg) sendmailPath spoolAreaPath userAccessFile;
+ };
+
+ waitFaxqScript = pkgs.substituteAll {
+ # This script checks the modems status files
+ # and waits until all modems report readiness.
+ name = "hylafax-faxq-wait-start.sh";
+ src = ./faxq-wait.sh;
+ isExecutable = true;
+ timeoutSec = toString 10;
+ inherit (pkgs.stdenv) shell;
+ inherit (cfg) spoolAreaPath;
+ };
+
+ sockets."hylafax-hfaxd" = {
+ description = "HylaFAX server socket";
+ documentation = [ "man:hfaxd(8)" ];
+ wantedBy = [ "multi-user.target" ];
+ listenStreams = [ "127.0.0.1:4559" ];
+ socketConfig.FreeBind = true;
+ socketConfig.Accept = true;
+ };
+
+ paths."hylafax-faxq" = {
+ description = "HylaFAX queue manager sendq watch";
+ documentation = [ "man:faxq(8)" "man:sendq(5)" ];
+ wantedBy = [ "multi-user.target" ];
+ pathConfig.PathExistsGlob = [ ''${cfg.spoolAreaPath}/sendq/q*'' ];
+ };
+
+ timers = mkMerge [
+ (
+ mkIf (cfg.faxcron.enable.frequency!=null)
+ { "hylafax-faxcron".timerConfig.Persistent = true; }
+ )
+ (
+ mkIf (cfg.faxqclean.enable.frequency!=null)
+ { "hylafax-faxqclean".timerConfig.Persistent = true; }
+ )
+ ];
+
+ hardenService =
+ # Add some common systemd service hardening settings,
+ # but allow each service (here) to override
+ # settings by explicitely setting those to `null`.
+ # More hardening would be nice but makes
+ # customizing hylafax setups very difficult.
+ # If at all, it should only be added along
+ # with some options to customize it.
+ let
+ hardening = {
+ PrivateDevices = true; # breaks /dev/tty...
+ PrivateNetwork = true;
+ PrivateTmp = true;
+ ProtectControlGroups = true;
+ #ProtectHome = true; # breaks custom spool dirs
+ ProtectKernelModules = true;
+ ProtectKernelTunables = true;
+ #ProtectSystem = "strict"; # breaks custom spool dirs
+ RestrictNamespaces = true;
+ RestrictRealtime = true;
+ };
+ filter = key: value: (value != null) || ! (lib.hasAttr key hardening);
+ apply = service: lib.filterAttrs filter (hardening // (service.serviceConfig or {}));
+ in
+ service: service // { serviceConfig = apply service; };
+
+ services."hylafax-spool" = {
+ description = "HylaFAX spool area preparation";
+ documentation = [ "man:hylafax-server(4)" ];
+ script = ''
+ ${setupSpoolScript}
+ cd "${cfg.spoolAreaPath}"
+ ${cfg.spoolExtraInit}
+ if ! test -f "${cfg.spoolAreaPath}/etc/hosts.hfaxd"
+ then
+ echo hosts.hfaxd is missing
+ exit 1
+ fi
+ '';
+ serviceConfig.ExecStop = ''${setupSpoolScript}'';
+ serviceConfig.RemainAfterExit = true;
+ serviceConfig.Type = "oneshot";
+ unitConfig.RequiresMountsFor = [ cfg.spoolAreaPath ];
+ };
+
+ services."hylafax-faxq" = {
+ description = "HylaFAX queue manager";
+ documentation = [ "man:faxq(8)" ];
+ requires = [ "hylafax-spool.service" ];
+ after = [ "hylafax-spool.service" ];
+ wants = mapModems ( { name, ... }: ''hylafax-faxgetty@${name}.service'' );
+ wantedBy = mkIf cfg.autostart [ "multi-user.target" ];
+ serviceConfig.Type = "forking";
+ serviceConfig.ExecStart = ''${pkgs.hylafaxplus}/spool/bin/faxq -q "${cfg.spoolAreaPath}"'';
+ # This delays the "readiness" of this service until
+ # all modems are initialized (or a timeout is reached).
+ # Otherwise, sending a fax with the fax service
+ # stopped will always yield a failed send attempt:
+ # The fax service is started when the job is created with
+ # `sendfax`, but modems need some time to initialize.
+ serviceConfig.ExecStartPost = [ ''${waitFaxqScript}'' ];
+ # faxquit fails if the pipe is already gone
+ # (e.g. the service is already stopping)
+ serviceConfig.ExecStop = ''-${pkgs.hylafaxplus}/spool/bin/faxquit -q "${cfg.spoolAreaPath}"'';
+ # disable some systemd hardening settings
+ serviceConfig.PrivateDevices = null;
+ serviceConfig.RestrictRealtime = null;
+ };
+
+ services."hylafax-hfaxd@" = {
+ description = "HylaFAX server";
+ documentation = [ "man:hfaxd(8)" ];
+ after = [ "hylafax-faxq.service" ];
+ requires = [ "hylafax-faxq.service" ];
+ serviceConfig.StandardInput = "socket";
+ serviceConfig.StandardOutput = "socket";
+ serviceConfig.ExecStart = ''${pkgs.hylafaxplus}/spool/bin/hfaxd -q "${cfg.spoolAreaPath}" -d -I'';
+ unitConfig.RequiresMountsFor = [ cfg.userAccessFile ];
+ # disable some systemd hardening settings
+ serviceConfig.PrivateDevices = null;
+ serviceConfig.PrivateNetwork = null;
+ };
+
+ services."hylafax-faxcron" = rec {
+ description = "HylaFAX spool area maintenance";
+ documentation = [ "man:faxcron(8)" ];
+ after = [ "hylafax-spool.service" ];
+ requires = [ "hylafax-spool.service" ];
+ wantedBy = mkIf cfg.faxcron.enable.spoolInit requires;
+ startAt = mkIf (cfg.faxcron.enable.frequency!=null) cfg.faxcron.enable.frequency;
+ serviceConfig.ExecStart = concatStringsSep " " [
+ ''${pkgs.hylafaxplus}/spool/bin/faxcron''
+ ''-q "${cfg.spoolAreaPath}"''
+ ''-info ${toString cfg.faxcron.infoDays}''
+ ''-log ${toString cfg.faxcron.logDays}''
+ ''-rcv ${toString cfg.faxcron.rcvDays}''
+ ];
+ };
+
+ services."hylafax-faxqclean" = rec {
+ description = "HylaFAX spool area queue cleaner";
+ documentation = [ "man:faxqclean(8)" ];
+ after = [ "hylafax-spool.service" ];
+ requires = [ "hylafax-spool.service" ];
+ wantedBy = mkIf cfg.faxqclean.enable.spoolInit requires;
+ startAt = mkIf (cfg.faxqclean.enable.frequency!=null) cfg.faxqclean.enable.frequency;
+ serviceConfig.ExecStart = concatStringsSep " " [
+ ''${pkgs.hylafaxplus}/spool/bin/faxqclean''
+ ''-q "${cfg.spoolAreaPath}"''
+ ''-v''
+ (optionalString (cfg.faxqclean.archiving!="never") ''-a'')
+ (optionalString (cfg.faxqclean.archiving=="always") ''-A'')
+ ''-j ${toString (cfg.faxqclean.doneqMinutes*60)}''
+ ''-d ${toString (cfg.faxqclean.docqMinutes*60)}''
+ ];
+ };
+
+ mkFaxgettyService = { name, ... }:
+ lib.nameValuePair ''hylafax-faxgetty@${name}'' rec {
+ description = "HylaFAX faxgetty for %I";
+ documentation = [ "man:faxgetty(8)" ];
+ bindsTo = [ "dev-%i.device" ];
+ requires = [ "hylafax-spool.service" ];
+ after = bindsTo ++ requires;
+ before = [ "hylafax-faxq.service" "getty.target" ];
+ unitConfig.StopWhenUnneeded = true;
+ unitConfig.AssertFileNotEmpty = ''${cfg.spoolAreaPath}/etc/config.%I'';
+ serviceConfig.UtmpIdentifier = "%I";
+ serviceConfig.TTYPath = "/dev/%I";
+ serviceConfig.Restart = "always";
+ serviceConfig.KillMode = "process";
+ serviceConfig.IgnoreSIGPIPE = false;
+ serviceConfig.ExecStart = ''-${pkgs.hylafaxplus}/spool/bin/faxgetty -q "${cfg.spoolAreaPath}" /dev/%I'';
+ # faxquit fails if the pipe is already gone
+ # (e.g. the service is already stopping)
+ serviceConfig.ExecStop = ''-${pkgs.hylafaxplus}/spool/bin/faxquit -q "${cfg.spoolAreaPath}" %I'';
+ # disable some systemd hardening settings
+ serviceConfig.PrivateDevices = null;
+ serviceConfig.RestrictRealtime = null;
+ };
+
+ modemServices =
+ lib.listToAttrs (mapModems mkFaxgettyService);
+
+in
+
+{
+ config.systemd = mkIf cfg.enable {
+ inherit sockets timers paths;
+ services = lib.mapAttrs (lib.const hardenService) (services // modemServices);
+ };
+}
diff --git a/nixos/modules/services/networking/i2pd.nix b/nixos/modules/services/networking/i2pd.nix
index 3afafaf3fed..0e9b354cfca 100644
--- a/nixos/modules/services/networking/i2pd.nix
+++ b/nixos/modules/services/networking/i2pd.nix
@@ -8,6 +8,17 @@ let
homeDir = "/var/lib/i2pd";
+ strOpt = k: v: k + " = " + v;
+ boolOpt = k: v: k + " = " + boolToString v;
+ intOpt = k: v: k + " = " + toString v;
+ lstOpt = k: xs: k + " = " + concatStringsSep "," xs;
+ optionalNullString = o: s: optional (! isNull s) (strOpt o s);
+ optionalNullBool = o: b: optional (! isNull b) (boolOpt o b);
+ optionalNullInt = o: i: optional (! isNull i) (intOpt o i);
+ optionalEmptyList = o: l: optional ([] != l) (lstOpt o l);
+
+ mkEnableTrueOption = name: mkEnableOption name // { default = true; };
+
mkEndpointOpt = name: addr: port: {
enable = mkEnableOption name;
name = mkOption {
@@ -18,42 +29,54 @@ let
address = mkOption {
type = types.str;
default = addr;
- description = "Bind address for ${name} endpoint. Default: " + addr;
+ description = "Bind address for ${name} endpoint.";
};
port = mkOption {
type = types.int;
default = port;
- description = "Bind port for ${name} endoint. Default: " + toString port;
+ description = "Bind port for ${name} endoint.";
};
};
- mkKeyedEndpointOpt = name: addr: port: keyFile:
+ i2cpOpts = name: {
+ length = mkOption {
+ type = types.int;
+ description = "Guaranteed minimum hops for ${name} tunnels.";
+ default = 3;
+ };
+ quantity = mkOption {
+ type = types.int;
+ description = "Number of simultaneous ${name} tunnels.";
+ default = 5;
+ };
+ };
+
+ mkKeyedEndpointOpt = name: addr: port: keyloc:
(mkEndpointOpt name addr port) // {
keys = mkOption {
- type = types.str;
- default = "";
+ type = with types; nullOr str;
+ default = keyloc;
description = ''
File to persist ${lib.toUpper name} keys.
'';
};
+ inbound = i2cpOpts name;
+ outbound = i2cpOpts name;
+ latency.min = mkOption {
+ type = with types; nullOr int;
+ description = "Min latency for tunnels.";
+ default = null;
+ };
+ latency.max = mkOption {
+ type = with types; nullOr int;
+ description = "Max latency for tunnels.";
+ default = null;
+ };
};
- commonTunOpts = let
- i2cpOpts = {
- length = mkOption {
- type = types.int;
- description = "Guaranteed minimum hops.";
- default = 3;
- };
- quantity = mkOption {
- type = types.int;
- description = "Number of simultaneous tunnels.";
- default = 5;
- };
- };
- in name: {
- outbound = i2cpOpts;
- inbound = i2cpOpts;
+ commonTunOpts = name: {
+ outbound = i2cpOpts name;
+ inbound = i2cpOpts name;
crypto.tagsToSend = mkOption {
type = types.int;
description = "Number of ElGamal/AES tags to send.";
@@ -70,94 +93,142 @@ let
};
} // mkEndpointOpt name "127.0.0.1" 0;
- i2pdConf = pkgs.writeText "i2pd.conf" ''
- # DO NOT EDIT -- this file has been generated automatically.
- loglevel = ${cfg.logLevel}
-
- ipv4 = ${boolToString cfg.enableIPv4}
- ipv6 = ${boolToString cfg.enableIPv6}
- notransit = ${boolToString cfg.notransit}
- floodfill = ${boolToString cfg.floodfill}
- netid = ${toString cfg.netid}
- ${if isNull cfg.bandwidth then "" else "bandwidth = ${toString cfg.bandwidth}" }
- ${if isNull cfg.port then "" else "port = ${toString cfg.port}"}
-
- [limits]
- transittunnels = ${toString cfg.limits.transittunnels}
-
- [upnp]
- enabled = ${boolToString cfg.upnp.enable}
- name = ${cfg.upnp.name}
-
- [precomputation]
- elgamal = ${boolToString cfg.precomputation.elgamal}
-
- [reseed]
- verify = ${boolToString cfg.reseed.verify}
- file = ${cfg.reseed.file}
- urls = ${builtins.concatStringsSep "," cfg.reseed.urls}
-
- [addressbook]
- defaulturl = ${cfg.addressbook.defaulturl}
- subscriptions = ${builtins.concatStringsSep "," cfg.addressbook.subscriptions}
-
- ${flip concatMapStrings
+ sec = name: "\n[" + name + "]";
+ notice = "# DO NOT EDIT -- this file has been generated automatically.";
+ i2pdConf = let
+ opts = [
+ notice
+ (strOpt "loglevel" cfg.logLevel)
+ (boolOpt "logclftime" cfg.logCLFTime)
+ (boolOpt "ipv4" cfg.enableIPv4)
+ (boolOpt "ipv6" cfg.enableIPv6)
+ (boolOpt "notransit" cfg.notransit)
+ (boolOpt "floodfill" cfg.floodfill)
+ (intOpt "netid" cfg.netid)
+ ] ++ (optionalNullInt "bandwidth" cfg.bandwidth)
+ ++ (optionalNullInt "port" cfg.port)
+ ++ (optionalNullString "family" cfg.family)
+ ++ (optionalNullString "datadir" cfg.dataDir)
+ ++ (optionalNullInt "share" cfg.share)
+ ++ (optionalNullBool "ssu" cfg.ssu)
+ ++ (optionalNullBool "ntcp" cfg.ntcp)
+ ++ (optionalNullString "ntcpproxy" cfg.ntcpProxy)
+ ++ (optionalNullString "ifname" cfg.ifname)
+ ++ (optionalNullString "ifname4" cfg.ifname4)
+ ++ (optionalNullString "ifname6" cfg.ifname6)
+ ++ [
+ (sec "limits")
+ (intOpt "transittunnels" cfg.limits.transittunnels)
+ (intOpt "coresize" cfg.limits.coreSize)
+ (intOpt "openfiles" cfg.limits.openFiles)
+ (intOpt "ntcphard" cfg.limits.ntcpHard)
+ (intOpt "ntcpsoft" cfg.limits.ntcpSoft)
+ (intOpt "ntcpthreads" cfg.limits.ntcpThreads)
+ (sec "upnp")
+ (boolOpt "enabled" cfg.upnp.enable)
+ (sec "precomputation")
+ (boolOpt "elgamal" cfg.precomputation.elgamal)
+ (sec "reseed")
+ (boolOpt "verify" cfg.reseed.verify)
+ ] ++ (optionalNullString "file" cfg.reseed.file)
+ ++ (optionalEmptyList "urls" cfg.reseed.urls)
+ ++ (optionalNullString "floodfill" cfg.reseed.floodfill)
+ ++ (optionalNullString "zipfile" cfg.reseed.zipfile)
+ ++ (optionalNullString "proxy" cfg.reseed.proxy)
+ ++ [
+ (sec "trust")
+ (boolOpt "enabled" cfg.trust.enable)
+ (boolOpt "hidden" cfg.trust.hidden)
+ ] ++ (optionalEmptyList "routers" cfg.trust.routers)
+ ++ (optionalNullString "family" cfg.trust.family)
+ ++ [
+ (sec "websockets")
+ (boolOpt "enabled" cfg.websocket.enable)
+ (strOpt "address" cfg.websocket.address)
+ (intOpt "port" cfg.websocket.port)
+ (sec "exploratory")
+ (intOpt "inbound.length" cfg.exploratory.inbound.length)
+ (intOpt "inbound.quantity" cfg.exploratory.inbound.quantity)
+ (intOpt "outbound.length" cfg.exploratory.outbound.length)
+ (intOpt "outbound.quantity" cfg.exploratory.outbound.quantity)
+ (sec "ntcp2")
+ (boolOpt "enabled" cfg.ntcp2.enable)
+ (boolOpt "published" cfg.ntcp2.published)
+ (intOpt "port" cfg.ntcp2.port)
+ (sec "addressbook")
+ (strOpt "defaulturl" cfg.addressbook.defaulturl)
+ ] ++ (optionalEmptyList "subscriptions" cfg.addressbook.subscriptions)
+ ++ (flip map
(collect (proto: proto ? port && proto ? address && proto ? name) cfg.proto)
- (proto: ''
- [${proto.name}]
- enabled = ${boolToString proto.enable}
- address = ${proto.address}
- port = ${toString proto.port}
- ${if proto ? keys then "keys = ${proto.keys}" else ""}
- ${if proto ? auth then "auth = ${boolToString proto.auth}" else ""}
- ${if proto ? user then "user = ${proto.user}" else ""}
- ${if proto ? pass then "pass = ${proto.pass}" else ""}
- ${if proto ? outproxy then "outproxy = ${proto.outproxy}" else ""}
- ${if proto ? outproxyPort then "outproxyport = ${toString proto.outproxyPort}" else ""}
- '')
- }
- '';
+ (proto: let protoOpts = [
+ (sec proto.name)
+ (boolOpt "enabled" proto.enable)
+ (strOpt "address" proto.address)
+ (intOpt "port" proto.port)
+ ] ++ (if proto ? keys then optionalNullString "keys" proto.keys else [])
+ ++ (if proto ? auth then optionalNullBool "auth" proto.auth else [])
+ ++ (if proto ? user then optionalNullString "user" proto.user else [])
+ ++ (if proto ? pass then optionalNullString "pass" proto.pass else [])
+ ++ (if proto ? strictHeaders then optionalNullBool "strictheaders" proto.strictHeaders else [])
+ ++ (if proto ? hostname then optionalNullString "hostname" proto.hostname else [])
+ ++ (if proto ? outproxy then optionalNullString "outproxy" proto.outproxy else [])
+ ++ (if proto ? outproxyPort then optionalNullInt "outproxyport" proto.outproxyPort else [])
+ ++ (if proto ? outproxyEnable then optionalNullBool "outproxy.enabled" proto.outproxyEnable else []);
+ in (concatStringsSep "\n" protoOpts)
+ ));
+ in
+ pkgs.writeText "i2pd.conf" (concatStringsSep "\n" opts);
- i2pdTunnelConf = pkgs.writeText "i2pd-tunnels.conf" ''
- # DO NOT EDIT -- this file has been generated automatically.
- ${flip concatMapStrings
+ tunnelConf = let opts = [
+ notice
+ (flip map
(collect (tun: tun ? port && tun ? destination) cfg.outTunnels)
- (tun: ''
- [${tun.name}]
- type = client
- destination = ${tun.destination}
- destinationport = ${toString tun.destinationPort}
- keys = ${tun.keys}
- address = ${tun.address}
- port = ${toString tun.port}
- inbound.length = ${toString tun.inbound.length}
- outbound.length = ${toString tun.outbound.length}
- inbound.quantity = ${toString tun.inbound.quantity}
- outbound.quantity = ${toString tun.outbound.quantity}
- crypto.tagsToSend = ${toString tun.crypto.tagsToSend}
- '')
- }
- ${flip concatMapStrings
+ (tun: let outTunOpts = [
+ (sec tun.name)
+ "type = client"
+ (intOpt "port" tun.port)
+ (strOpt "destination" tun.destination)
+ ] ++ (if tun ? destinationPort then optionalNullInt "destinationport" tun.destinationPort else [])
+ ++ (if tun ? keys then
+ optionalNullString "keys" tun.keys else [])
+ ++ (if tun ? address then
+ optionalNullString "address" tun.address else [])
+ ++ (if tun ? inbound.length then
+ optionalNullInt "inbound.length" tun.inbound.length else [])
+ ++ (if tun ? inbound.quantity then
+ optionalNullInt "inbound.quantity" tun.inbound.quantity else [])
+ ++ (if tun ? outbound.length then
+ optionalNullInt "outbound.length" tun.outbound.length else [])
+ ++ (if tun ? outbound.quantity then
+ optionalNullInt "outbound.quantity" tun.outbound.quantity else [])
+ ++ (if tun ? crypto.tagsToSend then
+ optionalNullInt "crypto.tagstosend" tun.crypto.tagsToSend else []);
+ in concatStringsSep "\n" outTunOpts))
+ (flip map
(collect (tun: tun ? port && tun ? address) cfg.inTunnels)
- (tun: ''
- [${tun.name}]
- type = server
- destination = ${tun.destination}
- keys = ${tun.keys}
- host = ${tun.address}
- port = ${toString tun.port}
- inport = ${toString tun.inPort}
- accesslist = ${builtins.concatStringsSep "," tun.accessList}
- '')
- }
- '';
+ (tun: let inTunOpts = [
+ (sec tun.name)
+ "type = server"
+ (intOpt "port" tun.port)
+ (strOpt "host" tun.address)
+ ] ++ (if tun ? destination then
+ optionalNullString "destination" tun.destination else [])
+ ++ (if tun ? keys then
+ optionalNullString "keys" tun.keys else [])
+ ++ (if tun ? inPort then
+ optionalNullInt "inport" tun.inPort else [])
+ ++ (if tun ? accessList then
+ optionalEmptyList "accesslist" tun.accessList else []);
+ in concatStringsSep "\n" inTunOpts))];
+ in pkgs.writeText "i2pd-tunnels.conf" opts;
i2pdSh = pkgs.writeScriptBin "i2pd" ''
#!/bin/sh
exec ${pkgs.i2pd}/bin/i2pd \
${if isNull cfg.address then "" else "--host="+cfg.address} \
+ --service \
--conf=${i2pdConf} \
- --tunconf=${i2pdTunnelConf}
+ --tunconf=${tunnelConf}
'';
in
@@ -170,9 +241,7 @@ in
services.i2pd = {
- enable = mkOption {
- type = types.bool;
- default = false;
+ enable = mkEnableOption "I2Pd daemon" // {
description = ''
Enables I2Pd as a running service upon activation.
Please read http://i2pd.readthedocs.io/en/latest/ for further
@@ -192,6 +261,8 @@ in
'';
};
+ logCLFTime = mkEnableOption "Full CLF-formatted date and time to log";
+
address = mkOption {
type = with types; nullOr str;
default = null;
@@ -200,17 +271,72 @@ in
'';
};
- notransit = mkOption {
- type = types.bool;
- default = false;
+ family = mkOption {
+ type = with types; nullOr str;
+ default = null;
+ description = ''
+ Specify a family the router belongs to.
+ '';
+ };
+
+ dataDir = mkOption {
+ type = with types; nullOr str;
+ default = null;
+ description = ''
+ Alternative path to storage of i2pd data (RI, keys, peer profiles, ...)
+ '';
+ };
+
+ share = mkOption {
+ type = types.int;
+ default = 100;
+ description = ''
+ Limit of transit traffic from max bandwidth in percents.
+ '';
+ };
+
+ ifname = mkOption {
+ type = with types; nullOr str;
+ default = null;
+ description = ''
+ Network interface to bind to.
+ '';
+ };
+
+ ifname4 = mkOption {
+ type = with types; nullOr str;
+ default = null;
+ description = ''
+ IPv4 interface to bind to.
+ '';
+ };
+
+ ifname6 = mkOption {
+ type = with types; nullOr str;
+ default = null;
+ description = ''
+ IPv6 interface to bind to.
+ '';
+ };
+
+ ntcpProxy = mkOption {
+ type = with types; nullOr str;
+ default = null;
+ description = ''
+ Proxy URL for NTCP transport.
+ '';
+ };
+
+ ntcp = mkEnableTrueOption "ntcp";
+ ssu = mkEnableTrueOption "ssu";
+
+ notransit = mkEnableOption "notransit" // {
description = ''
Tells the router to not accept transit tunnels during startup.
'';
};
- floodfill = mkOption {
- type = types.bool;
- default = false;
+ floodfill = mkEnableOption "floodfill" // {
description = ''
If the router is declared to be unreachable and needs introduction nodes.
'';
@@ -241,51 +367,20 @@ in
'';
};
- enableIPv4 = mkOption {
- type = types.bool;
- default = true;
+ enableIPv4 = mkEnableTrueOption "IPv4 connectivity";
+ enableIPv6 = mkEnableOption "IPv6 connectivity";
+ nat = mkEnableTrueOption "NAT bypass";
+
+ upnp.enable = mkEnableOption "UPnP service discovery";
+ upnp.name = mkOption {
+ type = types.str;
+ default = "I2Pd";
description = ''
- Enables IPv4 connectivity. Enabled by default.
+ Name i2pd appears in UPnP forwardings list.
'';
};
- enableIPv6 = mkOption {
- type = types.bool;
- default = false;
- description = ''
- Enables IPv6 connectivity. Disabled by default.
- '';
- };
-
- nat = mkOption {
- type = types.bool;
- default = true;
- description = ''
- Assume router is NATed. Enabled by default.
- '';
- };
-
- upnp = {
- enable = mkOption {
- type = types.bool;
- default = false;
- description = ''
- Enables UPnP.
- '';
- };
-
- name = mkOption {
- type = types.str;
- default = "I2Pd";
- description = ''
- Name i2pd appears in UPnP forwardings list.
- '';
- };
- };
-
- precomputation.elgamal = mkOption {
- type = types.bool;
- default = true;
+ precomputation.elgamal = mkEnableTrueOption "Precomputed ElGamal tables" // {
description = ''
Whenever to use precomputated tables for ElGamal.
i2pd defaults to false
@@ -296,76 +391,154 @@ in
'';
};
- reseed = {
- verify = mkOption {
- type = types.bool;
- default = false;
- description = ''
- Request SU3 signature verification
- '';
- };
+ reseed.verify = mkEnableOption "SU3 signature verification";
- file = mkOption {
- type = types.str;
- default = "";
- description = ''
- Full path to SU3 file to reseed from
- '';
- };
-
- urls = mkOption {
- type = with types; listOf str;
- default = [
- "https://reseed.i2p-project.de/"
- "https://i2p.mooo.com/netDb/"
- "https://netdb.i2p2.no/"
- "https://us.reseed.i2p2.no:444/"
- "https://uk.reseed.i2p2.no:444/"
- "https://i2p.manas.ca:8443/"
- ];
- description = ''
- Reseed URLs
- '';
- };
+ reseed.file = mkOption {
+ type = with types; nullOr str;
+ default = null;
+ description = ''
+ Full path to SU3 file to reseed from.
+ '';
};
- addressbook = {
- defaulturl = mkOption {
- type = types.str;
- default = "http://joajgazyztfssty4w2on5oaqksz6tqoxbduy553y34mf4byv6gpq.b32.i2p/export/alive-hosts.txt";
- description = ''
- AddressBook subscription URL for initial setup
- '';
- };
- subscriptions = mkOption {
- type = with types; listOf str;
- default = [
- "http://inr.i2p/export/alive-hosts.txt"
- "http://i2p-projekt.i2p/hosts.txt"
- "http://stats.i2p/cgi-bin/newhosts.txt"
- ];
- description = ''
- AddressBook subscription URLs
- '';
- };
+ reseed.urls = mkOption {
+ type = with types; listOf str;
+ default = [];
+ description = ''
+ Reseed URLs.
+ '';
+ };
+
+ reseed.floodfill = mkOption {
+ type = with types; nullOr str;
+ default = null;
+ description = ''
+ Path to router info of floodfill to reseed from.
+ '';
+ };
+
+ reseed.zipfile = mkOption {
+ type = with types; nullOr str;
+ default = null;
+ description = ''
+ Path to local .zip file to reseed from.
+ '';
+ };
+
+ reseed.proxy = mkOption {
+ type = with types; nullOr str;
+ default = null;
+ description = ''
+ URL for reseed proxy, supports http/socks.
+ '';
+ };
+
+ addressbook.defaulturl = mkOption {
+ type = types.str;
+ default = "http://joajgazyztfssty4w2on5oaqksz6tqoxbduy553y34mf4byv6gpq.b32.i2p/export/alive-hosts.txt";
+ description = ''
+ AddressBook subscription URL for initial setup
+ '';
+ };
+ addressbook.subscriptions = mkOption {
+ type = with types; listOf str;
+ default = [
+ "http://inr.i2p/export/alive-hosts.txt"
+ "http://i2p-projekt.i2p/hosts.txt"
+ "http://stats.i2p/cgi-bin/newhosts.txt"
+ ];
+ description = ''
+ AddressBook subscription URLs
+ '';
+ };
+
+ trust.enable = mkEnableOption "Explicit trust options";
+
+ trust.family = mkOption {
+ type = with types; nullOr str;
+ default = null;
+ description = ''
+ Router Familiy to trust for first hops.
+ '';
+ };
+
+ trust.routers = mkOption {
+ type = with types; listOf str;
+ default = [];
+ description = ''
+ Only connect to the listed routers.
+ '';
+ };
+
+ trust.hidden = mkEnableOption "Router concealment.";
+
+ websocket = mkEndpointOpt "websockets" "127.0.0.1" 7666;
+
+ exploratory.inbound = i2cpOpts "exploratory";
+ exploratory.outbound = i2cpOpts "exploratory";
+
+ ntcp2.enable = mkEnableTrueOption "NTCP2.";
+ ntcp2.published = mkEnableOption "NTCP2 publication.";
+ ntcp2.port = mkOption {
+ type = types.int;
+ default = 0;
+ description = ''
+ Port to listen for incoming NTCP2 connections (0=auto).
+ '';
};
limits.transittunnels = mkOption {
type = types.int;
default = 2500;
description = ''
- Maximum number of active transit sessions
+ Maximum number of active transit sessions.
+ '';
+ };
+
+ limits.coreSize = mkOption {
+ type = types.int;
+ default = 0;
+ description = ''
+ Maximum size of corefile in Kb (0 - use system limit).
+ '';
+ };
+
+ limits.openFiles = mkOption {
+ type = types.int;
+ default = 0;
+ description = ''
+ Maximum number of open files (0 - use system default).
+ '';
+ };
+
+ limits.ntcpHard = mkOption {
+ type = types.int;
+ default = 0;
+ description = ''
+ Maximum number of active transit sessions.
+ '';
+ };
+
+ limits.ntcpSoft = mkOption {
+ type = types.int;
+ default = 0;
+ description = ''
+ Threshold to start probabalistic backoff with ntcp sessions (default: use system limit).
+ '';
+ };
+
+ limits.ntcpThreads = mkOption {
+ type = types.int;
+ default = 1;
+ description = ''
+ Maximum number of threads used by NTCP DH worker.
'';
};
proto.http = (mkEndpointOpt "http" "127.0.0.1" 7070) // {
- auth = mkOption {
- type = types.bool;
- default = false;
- description = ''
- Enable authentication for webconsole.
- '';
- };
+
+ auth = mkEnableOption "Webconsole authentication";
+
user = mkOption {
type = types.str;
default = "i2pd";
@@ -373,6 +546,7 @@ in
Username for webconsole access
'';
};
+
pass = mkOption {
type = types.str;
default = "i2pd";
@@ -380,11 +554,35 @@ in
Password for webconsole access.
'';
};
+
+ strictHeaders = mkOption {
+ type = with types; nullOr bool;
+ default = null;
+ description = ''
+ Enable strict host checking on WebUI.
+ '';
+ };
+
+ hostname = mkOption {
+ type = with types; nullOr str;
+ default = null;
+ description = ''
+ Expected hostname for WebUI.
+ '';
+ };
};
- proto.httpProxy = mkKeyedEndpointOpt "httpproxy" "127.0.0.1" 4444 "";
- proto.socksProxy = (mkKeyedEndpointOpt "socksproxy" "127.0.0.1" 4447 "")
+ proto.httpProxy = (mkKeyedEndpointOpt "httpproxy" "127.0.0.1" 4444 "httpproxy-keys.dat")
// {
+ outproxy = mkOption {
+ type = with types; nullOr str;
+ default = null;
+ description = "Upstream outproxy bind address.";
+ };
+ };
+ proto.socksProxy = (mkKeyedEndpointOpt "socksproxy" "127.0.0.1" 4447 "socksproxy-keys.dat")
+ // {
+ outproxyEnable = mkEnableOption "SOCKS outproxy";
outproxy = mkOption {
type = types.str;
default = "127.0.0.1";
@@ -408,8 +606,8 @@ in
{ name, ... }: {
options = {
destinationPort = mkOption {
- type = types.int;
- default = 0;
+ type = with types; nullOr int;
+ default = null;
description = "Connect to particular port at destination.";
};
} // commonTunOpts name;
diff --git a/nixos/modules/services/networking/networkmanager.nix b/nixos/modules/services/networking/networkmanager.nix
index d5af4648e8f..2d76e0676b2 100644
--- a/nixos/modules/services/networking/networkmanager.nix
+++ b/nixos/modules/services/networking/networkmanager.nix
@@ -406,25 +406,25 @@ in {
{ source = configFile;
target = "NetworkManager/NetworkManager.conf";
}
- { source = "${networkmanager-openvpn}/etc/NetworkManager/VPN/nm-openvpn-service.name";
+ { source = "${networkmanager-openvpn}/lib/NetworkManager/VPN/nm-openvpn-service.name";
target = "NetworkManager/VPN/nm-openvpn-service.name";
}
- { source = "${networkmanager-vpnc}/etc/NetworkManager/VPN/nm-vpnc-service.name";
+ { source = "${networkmanager-vpnc}/lib/NetworkManager/VPN/nm-vpnc-service.name";
target = "NetworkManager/VPN/nm-vpnc-service.name";
}
- { source = "${networkmanager-openconnect}/etc/NetworkManager/VPN/nm-openconnect-service.name";
+ { source = "${networkmanager-openconnect}/lib/NetworkManager/VPN/nm-openconnect-service.name";
target = "NetworkManager/VPN/nm-openconnect-service.name";
}
- { source = "${networkmanager-fortisslvpn}/etc/NetworkManager/VPN/nm-fortisslvpn-service.name";
+ { source = "${networkmanager-fortisslvpn}/lib/NetworkManager/VPN/nm-fortisslvpn-service.name";
target = "NetworkManager/VPN/nm-fortisslvpn-service.name";
}
- { source = "${networkmanager-l2tp}/etc/NetworkManager/VPN/nm-l2tp-service.name";
+ { source = "${networkmanager-l2tp}/lib/NetworkManager/VPN/nm-l2tp-service.name";
target = "NetworkManager/VPN/nm-l2tp-service.name";
}
- { source = "${networkmanager_strongswan}/etc/NetworkManager/VPN/nm-strongswan-service.name";
+ { source = "${networkmanager_strongswan}/lib/NetworkManager/VPN/nm-strongswan-service.name";
target = "NetworkManager/VPN/nm-strongswan-service.name";
}
- { source = "${networkmanager-iodine}/etc/NetworkManager/VPN/nm-iodine-service.name";
+ { source = "${networkmanager-iodine}/lib/NetworkManager/VPN/nm-iodine-service.name";
target = "NetworkManager/VPN/nm-iodine-service.name";
}
] ++ optional (cfg.appendNameservers == [] || cfg.insertNameservers == [])
diff --git a/nixos/modules/services/networking/zeronet.nix b/nixos/modules/services/networking/zeronet.nix
index 2377cb2c8f1..8b60799891c 100644
--- a/nixos/modules/services/networking/zeronet.nix
+++ b/nixos/modules/services/networking/zeronet.nix
@@ -12,6 +12,8 @@ let
log_dir = ${cfg.logDir}
'' + lib.optionalString (cfg.port != null) ''
ui_port = ${toString cfg.port}
+ '' + lib.optionalString (cfg.torAlways) ''
+ tor = always
'' + cfg.extraConfig;
};
in with lib; {
@@ -35,11 +37,17 @@ in with lib; {
port = mkOption {
type = types.nullOr types.int;
default = null;
- example = 15441;
- description = "Optional zeronet port.";
+ example = 43110;
+ description = "Optional zeronet web UI port.";
};
tor = mkOption {
+ type = types.bool;
+ default = false;
+ description = "Use TOR for zeronet traffic where possible.";
+ };
+
+ torAlways = mkOption {
type = types.bool;
default = false;
description = "Use TOR for all zeronet traffic.";
@@ -60,9 +68,13 @@ in with lib; {
services.tor = mkIf cfg.tor {
enable = true;
controlPort = 9051;
- extraConfig = "CookieAuthentication 1";
+ extraConfig = ''
+ CacheDirectoryGroupReadable 1
+ CookieAuthentication 1
+ CookieAuthFileGroupReadable 1
+ '';
};
-
+
systemd.services.zeronet = {
description = "zeronet";
after = [ "network.target" (optionalString cfg.tor "tor.service") ];
diff --git a/nixos/modules/services/security/sks.nix b/nixos/modules/services/security/sks.nix
index 62308428f32..9f0261038d5 100644
--- a/nixos/modules/services/security/sks.nix
+++ b/nixos/modules/services/security/sks.nix
@@ -3,78 +3,112 @@
with lib;
let
-
cfg = config.services.sks;
-
sksPkg = cfg.package;
-in
-
-{
+in {
+ meta.maintainers = with maintainers; [ primeos calbrecht jcumming ];
options = {
services.sks = {
- enable = mkEnableOption "sks";
+ enable = mkEnableOption ''
+ SKS (synchronizing key server for OpenPGP) and start the database
+ server. You need to create "''${dataDir}/dump/*.gpg" for the initial
+ import'';
package = mkOption {
default = pkgs.sks;
defaultText = "pkgs.sks";
type = types.package;
- description = "
- Which sks derivation to use.
- ";
+ description = "Which SKS derivation to use.";
+ };
+
+ dataDir = mkOption {
+ type = types.path;
+ default = "/var/db/sks";
+ example = "/var/lib/sks";
+ # TODO: The default might change to "/var/lib/sks" as this is more
+ # common. There's also https://github.com/NixOS/nixpkgs/issues/26256
+ # and "/var/db" is not FHS compliant (seems to come from BSD).
+ description = ''
+ Data directory (-basedir) for SKS, where the database and all
+ configuration files are located (e.g. KDB, PTree, membership and
+ sksconf).
+ '';
};
hkpAddress = mkOption {
default = [ "127.0.0.1" "::1" ];
type = types.listOf types.str;
- description = "
- Wich ip addresses the sks-keyserver is listening on.
- ";
+ description = ''
+ Domain names, IPv4 and/or IPv6 addresses to listen on for HKP
+ requests.
+ '';
};
hkpPort = mkOption {
default = 11371;
- type = types.int;
- description = "
- Which port the sks-keyserver is listening on.
- ";
+ type = types.ints.u16;
+ description = "HKP port to listen on.";
+ };
+
+ webroot = mkOption {
+ type = types.nullOr types.path;
+ default = "${sksPkg.webSamples}/OpenPKG";
+ defaultText = "\${pkgs.sks.webSamples}/OpenPKG";
+ description = ''
+ Source directory (will be symlinked, if not null) for the files the
+ built-in webserver should serve. SKS (''${pkgs.sks.webSamples})
+ provides the following examples: "HTML5", "OpenPKG", and "XHTML+ES".
+ The index file can be named index.html, index.htm, index.xhtm, or
+ index.xhtml. Files with the extensions .css, .es, .js, .jpg, .jpeg,
+ .png, or .gif are supported. Subdirectories and filenames with
+ anything other than alphanumeric characters and the '.' character
+ will be ignored.
+ '';
};
};
};
config = mkIf cfg.enable {
- environment.systemPackages = [ sksPkg ];
-
- users.users.sks = {
- createHome = true;
- home = "/var/db/sks";
- isSystemUser = true;
- shell = "${pkgs.coreutils}/bin/true";
+ users = {
+ users.sks = {
+ isSystemUser = true;
+ description = "SKS user";
+ home = cfg.dataDir;
+ createHome = true;
+ group = "sks";
+ useDefaultShell = true;
+ packages = [ sksPkg pkgs.db ];
+ };
+ groups.sks = { };
};
systemd.services = let
hkpAddress = "'" + (builtins.concatStringsSep " " cfg.hkpAddress) + "'" ;
hkpPort = builtins.toString cfg.hkpPort;
- home = config.users.users.sks.home;
- user = config.users.users.sks.name;
in {
- sks-keyserver = {
+ "sks-db" = {
+ description = "SKS database server";
+ after = [ "network.target" ];
wantedBy = [ "multi-user.target" ];
preStart = ''
- mkdir -p ${home}/dump
- ${pkgs.sks}/bin/sks build ${home}/dump/*.gpg -n 10 -cache 100 || true #*/
- ${pkgs.sks}/bin/sks cleandb || true
- ${pkgs.sks}/bin/sks pbuild -cache 20 -ptree_cache 70 || true
+ ${lib.optionalString (cfg.webroot != null)
+ "ln -sfT \"${cfg.webroot}\" web"}
+ mkdir -p dump
+ ${sksPkg}/bin/sks build dump/*.gpg -n 10 -cache 100 || true #*/
+ ${sksPkg}/bin/sks cleandb || true
+ ${sksPkg}/bin/sks pbuild -cache 20 -ptree_cache 70 || true
'';
serviceConfig = {
- WorkingDirectory = home;
- User = user;
+ WorkingDirectory = "~";
+ User = "sks";
+ Group = "sks";
Restart = "always";
- ExecStart = "${pkgs.sks}/bin/sks db -hkp_address ${hkpAddress} -hkp_port ${hkpPort}";
+ ExecStart = "${sksPkg}/bin/sks db -hkp_address ${hkpAddress} -hkp_port ${hkpPort}";
};
};
};
diff --git a/nixos/modules/services/x11/desktop-managers/gnome3.nix b/nixos/modules/services/x11/desktop-managers/gnome3.nix
index faf5214130d..eb86f7b53bb 100644
--- a/nixos/modules/services/x11/desktop-managers/gnome3.nix
+++ b/nixos/modules/services/x11/desktop-managers/gnome3.nix
@@ -110,6 +110,7 @@ in {
services.gnome3.gnome-terminal-server.enable = mkDefault true;
services.gnome3.gnome-user-share.enable = mkDefault true;
services.gnome3.gvfs.enable = true;
+ services.gnome3.rygel.enable = mkDefault true;
services.gnome3.seahorse.enable = mkDefault true;
services.gnome3.sushi.enable = mkDefault true;
services.gnome3.tracker.enable = mkDefault true;
diff --git a/nixos/modules/tasks/network-interfaces.nix b/nixos/modules/tasks/network-interfaces.nix
index 20a740ce1f0..815523093dd 100644
--- a/nixos/modules/tasks/network-interfaces.nix
+++ b/nixos/modules/tasks/network-interfaces.nix
@@ -341,7 +341,7 @@ in
You should try to make this ID unique among your machines. You can
generate a random 32-bit ID using the following commands:
- cksum /etc/machine-id | while read c rest; do printf "%x" $c; done
+ head -c 8 /etc/machine-id
(this derives it from the machine-id that systemd generates) or
diff --git a/pkgs/applications/altcoins/bitcoin-abc.nix b/pkgs/applications/altcoins/bitcoin-abc.nix
index bd365e16730..1e11f0eefc4 100644
--- a/pkgs/applications/altcoins/bitcoin-abc.nix
+++ b/pkgs/applications/altcoins/bitcoin-abc.nix
@@ -38,6 +38,7 @@ stdenv.mkDerivation rec {
homepage = https://bitcoinabc.org/;
maintainers = with maintainers; [ lassulus ];
license = licenses.mit;
+ broken = stdenv.isDarwin;
platforms = platforms.unix;
};
}
diff --git a/pkgs/applications/altcoins/bitcoin-classic.nix b/pkgs/applications/altcoins/bitcoin-classic.nix
index 31c8ed6fc8d..34faf77e980 100644
--- a/pkgs/applications/altcoins/bitcoin-classic.nix
+++ b/pkgs/applications/altcoins/bitcoin-classic.nix
@@ -46,6 +46,7 @@ stdenv.mkDerivation rec {
homepage = https://bitcoinclassic.com/;
maintainers = with maintainers; [ jefdaj ];
license = licenses.mit;
+ broken = stdenv.isDarwin;
platforms = platforms.unix;
};
}
diff --git a/pkgs/applications/altcoins/bitcoin-unlimited.nix b/pkgs/applications/altcoins/bitcoin-unlimited.nix
index 5a67dc565aa..13ec55bb589 100644
--- a/pkgs/applications/altcoins/bitcoin-unlimited.nix
+++ b/pkgs/applications/altcoins/bitcoin-unlimited.nix
@@ -62,6 +62,7 @@ stdenv.mkDerivation rec {
homepage = https://www.bitcoinunlimited.info/;
maintainers = with maintainers; [ DmitryTsygankov ];
license = licenses.mit;
+ broken = stdenv.isDarwin;
platforms = platforms.unix;
};
}
diff --git a/pkgs/applications/altcoins/bitcoin-xt.nix b/pkgs/applications/altcoins/bitcoin-xt.nix
index feb2924f865..cab1b388a12 100644
--- a/pkgs/applications/altcoins/bitcoin-xt.nix
+++ b/pkgs/applications/altcoins/bitcoin-xt.nix
@@ -43,6 +43,7 @@ stdenv.mkDerivation rec{
homepage = https://bitcoinxt.software/;
maintainers = with maintainers; [ jefdaj ];
license = licenses.mit;
+ broken = stdenv.isDarwin;
platforms = platforms.unix;
};
}
diff --git a/pkgs/applications/altcoins/btc1.nix b/pkgs/applications/altcoins/btc1.nix
index 95e03ee6a21..2f85a894797 100644
--- a/pkgs/applications/altcoins/btc1.nix
+++ b/pkgs/applications/altcoins/btc1.nix
@@ -1,6 +1,8 @@
-{ stdenv, fetchurl, pkgconfig, autoreconfHook, openssl, db48, boost
-, zlib, miniupnpc, qt4, utillinux, protobuf, qrencode, libevent
-, withGui }:
+{ stdenv, fetchurl, pkgconfig, autoreconfHook, hexdump, openssl, db48
+, boost, zlib, miniupnpc, qt4, utillinux, protobuf, qrencode, libevent
+, AppKit
+, withGui ? !stdenv.isDarwin
+}:
with stdenv.lib;
stdenv.mkDerivation rec{
@@ -12,11 +14,10 @@ stdenv.mkDerivation rec{
sha256 = "0v0g2wb4nsnhddxzb63vj2bc1mgyj05vqm5imicjfz8prvgc0si8";
};
- nativeBuildInputs = [ pkgconfig autoreconfHook ];
- buildInputs = [ openssl db48 boost zlib
- miniupnpc protobuf libevent]
- ++ optionals stdenv.isLinux [ utillinux ]
- ++ optionals withGui [ qt4 qrencode ];
+ nativeBuildInputs = [ pkgconfig autoreconfHook hexdump ];
+ buildInputs = [ openssl db48 boost zlib miniupnpc protobuf libevent ]
+ ++ optionals withGui [ qt4 qrencode ]
+ ++ optional stdenv.isDarwin AppKit;
configureFlags = [ "--with-boost-libdir=${boost.out}/lib" ]
++ optionals withGui [ "--with-gui=qt4" ];
diff --git a/pkgs/applications/altcoins/default.nix b/pkgs/applications/altcoins/default.nix
index 95d79a8650f..f075903332b 100644
--- a/pkgs/applications/altcoins/default.nix
+++ b/pkgs/applications/altcoins/default.nix
@@ -1,4 +1,4 @@
-{ callPackage, boost155, boost165, openssl_1_1_0, haskellPackages, darwin, libsForQt5, miniupnpc_2, python3, buildGo110Package }:
+{ callPackage, boost155, boost165, openssl_1_1, haskellPackages, darwin, libsForQt5, miniupnpc_2, python3, buildGo110Package }:
rec {
@@ -32,8 +32,11 @@ rec {
boost = boost165; withGui = false;
};
- btc1 = callPackage ./btc1.nix { boost = boost165; withGui = true; };
- btc1d = callPackage ./btc1.nix { boost = boost165; withGui = false; };
+ btc1 = callPackage ./btc1.nix {
+ inherit (darwin.apple_sdk.frameworks) AppKit;
+ boost = boost165;
+ };
+ btc1d = btc1.override { withGui = false; };
cryptop = python3.pkgs.callPackage ./cryptop { };
@@ -59,8 +62,10 @@ rec {
buildGoPackage = buildGo110Package;
};
- litecoin = callPackage ./litecoin.nix { withGui = true; };
- litecoind = callPackage ./litecoin.nix { withGui = false; };
+ litecoin = callPackage ./litecoin.nix {
+ inherit (darwin.apple_sdk.frameworks) AppKit;
+ };
+ litecoind = litecoin.override { withGui = false; };
masari = callPackage ./masari.nix { };
@@ -85,7 +90,7 @@ rec {
zcash = callPackage ./zcash {
withGui = false;
- openssl = openssl_1_1_0;
+ openssl = openssl_1_1;
};
parity = callPackage ./parity { };
diff --git a/pkgs/applications/altcoins/ethsign/default.nix b/pkgs/applications/altcoins/ethsign/default.nix
index 35fd4bc718c..8e89de4d690 100644
--- a/pkgs/applications/altcoins/ethsign/default.nix
+++ b/pkgs/applications/altcoins/ethsign/default.nix
@@ -54,6 +54,7 @@ buildGoPackage rec {
meta = with stdenv.lib; {
homepage = https://github.com/dapphub/ethsign;
description = "Make raw signed Ethereum transactions";
+ broken = stdenv.isDarwin; # test with CoreFoundation 10.11
license = [licenses.gpl3];
};
}
diff --git a/pkgs/applications/altcoins/litecoin.nix b/pkgs/applications/altcoins/litecoin.nix
index b930923e8f4..ed268e34946 100644
--- a/pkgs/applications/altcoins/litecoin.nix
+++ b/pkgs/applications/altcoins/litecoin.nix
@@ -2,9 +2,12 @@
, pkgconfig, autoreconfHook
, openssl, db48, boost, zlib, miniupnpc
, glib, protobuf, utillinux, qt4, qrencode
-, withGui, libevent }:
+, AppKit
+, withGui ? true, libevent
+}:
with stdenv.lib;
+
stdenv.mkDerivation rec {
name = "litecoin" + (toString (optional (!withGui) "d")) + "-" + version;
@@ -20,6 +23,7 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ pkgconfig autoreconfHook ];
buildInputs = [ openssl db48 boost zlib
miniupnpc glib protobuf utillinux libevent ]
+ ++ optionals stdenv.isDarwin [ AppKit ]
++ optionals withGui [ qt4 qrencode ];
configureFlags = [ "--with-boost-libdir=${boost.out}/lib" ]
@@ -39,6 +43,7 @@ stdenv.mkDerivation rec {
homepage = https://litecoin.org/;
platforms = platforms.unix;
license = licenses.mit;
- maintainers = with maintainers; [ offline AndersonTorres ];
+ broken = stdenv.isDarwin;
+ maintainers = with maintainers; [ offline AndersonTorres ];
};
}
diff --git a/pkgs/applications/altcoins/nano-wallet/default.nix b/pkgs/applications/altcoins/nano-wallet/default.nix
index 7491e830628..4667d402987 100644
--- a/pkgs/applications/altcoins/nano-wallet/default.nix
+++ b/pkgs/applications/altcoins/nano-wallet/default.nix
@@ -3,13 +3,13 @@
stdenv.mkDerivation rec {
name = "nano-wallet-${version}";
- version = "15.2";
+ version = "16.0";
src = fetchFromGitHub {
owner = "nanocurrency";
repo = "raiblocks";
rev = "V${version}";
- sha256 = "0ngsnaczw5y709zk52flp6m2c83q3kxfgz0bzi8rzfjxp10ncnz3";
+ sha256 = "0fk8jlas3khdh3nlv40krsjdifxp9agblvzap6k93wmm9y34h41c";
fetchSubmodules = true;
};
diff --git a/pkgs/applications/audio/banshee/default.nix b/pkgs/applications/audio/banshee/default.nix
deleted file mode 100644
index 8a4e8893c8d..00000000000
--- a/pkgs/applications/audio/banshee/default.nix
+++ /dev/null
@@ -1,57 +0,0 @@
-{ stdenv, lib, fetchurl, intltool, pkgconfig, gstreamer, gst-plugins-base
-, gst-plugins-good, gst-plugins-bad, gst-plugins-ugly, gst-ffmpeg, glib
-, mono, mono-addins, dbus-sharp-1_0, dbus-sharp-glib-1_0, notify-sharp, gtk-sharp-2_0
-, boo, gdata-sharp, taglib-sharp, sqlite, gnome-sharp, gconf, gtk-sharp-beans, gio-sharp
-, libmtp, libgpod, mono-zeroconf }:
-
-stdenv.mkDerivation rec {
- name = "banshee-${version}";
- version = "2.6.2";
-
- src = fetchurl {
- url = "https://ftp.gnome.org/pub/GNOME/sources/banshee/2.6/banshee-${version}.tar.xz";
- sha256 = "1y30p8wxx5li39i5gpq2wib0ympy8llz0gyi6ri9bp730ndhhz7p";
- };
-
- dontStrip = true;
-
- nativeBuildInputs = [ pkgconfig intltool ];
- buildInputs = [
- gtk-sharp-2_0.gtk gstreamer gst-plugins-base gst-plugins-good
- gst-plugins-bad gst-plugins-ugly gst-ffmpeg
- mono dbus-sharp-1_0 dbus-sharp-glib-1_0 mono-addins notify-sharp
- gtk-sharp-2_0 boo gdata-sharp taglib-sharp sqlite gnome-sharp gconf gtk-sharp-beans
- gio-sharp libmtp libgpod mono-zeroconf
- ];
-
- makeFlags = [ "PREFIX=$(out)" ];
-
- postPatch = ''
- patchShebangs data/desktop-files/update-desktop-file.sh
- patchShebangs build/private-icon-theme-installer
- sed -i "s,DOCDIR=.*,DOCDIR=$out/lib/monodoc," configure
- '';
-
- postInstall = let
- ldLibraryPath = lib.makeLibraryPath [ gtk-sharp-2_0.gtk gtk-sharp-2_0 sqlite gconf glib gstreamer ];
-
- monoGACPrefix = lib.concatStringsSep ":" [
- mono dbus-sharp-1_0 dbus-sharp-glib-1_0 mono-addins notify-sharp gtk-sharp-2_0
- boo gdata-sharp taglib-sharp sqlite gnome-sharp gconf gtk-sharp-beans
- gio-sharp libmtp libgpod mono-zeroconf
- ];
- in ''
- sed -e '2a export MONO_GAC_PREFIX=${monoGACPrefix}' \
- -e 's|LD_LIBRARY_PATH=|LD_LIBRARY_PATH=${ldLibraryPath}:|' \
- -e "s|GST_PLUGIN_PATH=|GST_PLUGIN_PATH=$GST_PLUGIN_SYSTEM_PATH:|" \
- -e 's| mono | ${mono}/bin/mono |' \
- -i $out/bin/banshee
- '';
- meta = with lib; {
- homepage = "http://banshee.fm/";
- description = "A music player written in C# using GNOME technologies";
- platforms = platforms.linux;
- maintainers = [ maintainers.zohl ];
- license = licenses.mit;
- };
-}
diff --git a/pkgs/applications/audio/lollypop/default.nix b/pkgs/applications/audio/lollypop/default.nix
index 2256fa1893d..6571a45b2a5 100644
--- a/pkgs/applications/audio/lollypop/default.nix
+++ b/pkgs/applications/audio/lollypop/default.nix
@@ -1,11 +1,15 @@
-{ stdenv, fetchgit, meson, ninja, pkgconfig, wrapGAppsHook
-, appstream-glib, desktop-file-utils, gobjectIntrospection
-, python36Packages, gnome3, glib, gst_all_1 }:
+{ stdenv, fetchgit, meson, ninja, pkgconfig
+, python3, gtk3, gst_all_1, libsecret, libsoup
+, appstream-glib, desktop-file-utils, gnome3
+, gobjectIntrospection, wrapGAppsHook }:
-stdenv.mkDerivation rec {
+python3.pkgs.buildPythonApplication rec {
version = "0.9.522";
name = "lollypop-${version}";
+ format = "other";
+ doCheck = false;
+
src = fetchgit {
url = "https://gitlab.gnome.org/World/lollypop";
rev = "refs/tags/${version}";
@@ -13,26 +17,30 @@ stdenv.mkDerivation rec {
sha256 = "0f2brwv884cvmxj644jcj9sg5hix3wvnjy2ndg0fh5cxyqz0kwn5";
};
- nativeBuildInputs = with python36Packages; [
+ nativeBuildInputs = with python3.pkgs; [
appstream-glib
desktop-file-utils
gobjectIntrospection
meson
ninja
- python36Packages.python
pkgconfig
wrapGAppsHook
- wrapPython
];
- buildInputs = [ glib ] ++ (with gnome3; [
- gsettings-desktop-schemas gtk3 libsecret libsoup totem-pl-parser
- ]) ++ (with gst_all_1; [
- gst-libav gst-plugins-bad gst-plugins-base gst-plugins-good gst-plugins-ugly
+ buildInputs = with gst_all_1; [
+ gnome3.totem-pl-parser
+ gst-libav
+ gst-plugins-bad
+ gst-plugins-base
+ gst-plugins-good
+ gst-plugins-ugly
gstreamer
- ]);
+ gtk3
+ libsecret
+ libsoup
+ ];
- pythonPath = with python36Packages; [
+ pythonPath = with python3.pkgs; [
beautifulsoup4
gst-python
pillow
@@ -42,11 +50,14 @@ stdenv.mkDerivation rec {
pylast
];
- postFixup = "wrapPythonPrograms";
-
postPatch = ''
- chmod +x ./meson_post_install.py
- patchShebangs ./meson_post_install.py
+ chmod +x meson_post_install.py
+ patchShebangs meson_post_install.py
+ '';
+
+ preFixup = ''
+ buildPythonPath "$out/libexec/lollypop-sp $pythonPath"
+ patchPythonScript "$out/libexec/lollypop-sp"
'';
meta = with stdenv.lib; {
diff --git a/pkgs/applications/audio/milkytracker/decompressor_gzip.patch b/pkgs/applications/audio/milkytracker/decompressor_gzip.patch
deleted file mode 100644
index c64421116de..00000000000
--- a/pkgs/applications/audio/milkytracker/decompressor_gzip.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-https://bugs.archlinux.org/task/31324
-https://410333.bugs.gentoo.org/attachment.cgi?id=322456
-
-diff -ur src.old/compression/DecompressorGZIP.cpp src/compression/DecompressorGZIP.cpp
---- src.old/compression/DecompressorGZIP.cpp 2012-08-28 17:54:46.000000000 +0200
-+++ src/compression/DecompressorGZIP.cpp 2012-08-28 17:55:21.000000000 +0200
-@@ -57,11 +57,11 @@
-
- bool DecompressorGZIP::decompress(const PPSystemString& outFileName, Hints hint)
- {
-- gzFile *gz_input_file = NULL;
-+ gzFile gz_input_file = NULL;
- int len = 0;
- pp_uint8 *buf;
-
-- if ((gz_input_file = (void **)gzopen (fileName.getStrBuffer(), "r")) == NULL)
-+ if ((gz_input_file = gzopen (fileName.getStrBuffer(), "r")) == NULL)
- return false;
-
- if ((buf = new pp_uint8[0x10000]) == NULL)
diff --git a/pkgs/applications/audio/milkytracker/default.nix b/pkgs/applications/audio/milkytracker/default.nix
index 6a71971c5fd..6b3abeb1e23 100644
--- a/pkgs/applications/audio/milkytracker/default.nix
+++ b/pkgs/applications/audio/milkytracker/default.nix
@@ -1,29 +1,26 @@
-{ stdenv, fetchurl, SDL2, alsaLib, cmake, libjack2, perl
-, zlib, zziplib, pkgconfig, makeWrapper
-}:
+{ stdenv, fetchFromGitHub, cmake, pkgconfig, makeWrapper
+, SDL2, alsaLib, libjack2, lhasa, perl, rtmidi, zlib, zziplib }:
stdenv.mkDerivation rec {
- version = "1.01";
+ version = "1.02.00";
name = "milkytracker-${version}";
- src = fetchurl {
- url = "https://github.com/milkytracker/MilkyTracker/archive/v${version}.00.tar.gz";
- sha256 = "1dvnddsnn9c83lz4dlm0cfjpc0m524amfkbalxbswdy0qc8cj1wv";
+ src = fetchFromGitHub {
+ owner = "milkytracker";
+ repo = "MilkyTracker";
+ rev = "v${version}";
+ sha256 = "05a6d7l98k9i82dwrgi855dnccm3f2lkb144gi244vhk1156n0ca";
};
- preBuild=''
- export CPATH=${zlib.out}/lib
- '';
-
nativeBuildInputs = [ cmake pkgconfig makeWrapper ];
- buildInputs = [ SDL2 alsaLib libjack2 perl zlib zziplib ];
+ buildInputs = [ SDL2 alsaLib libjack2 lhasa perl rtmidi zlib zziplib ];
- meta = {
+ meta = with stdenv.lib; {
description = "Music tracker application, similar to Fasttracker II";
homepage = http://milkytracker.org;
- license = stdenv.lib.licenses.gpl3Plus;
+ license = licenses.gpl3Plus;
platforms = [ "x86_64-linux" "i686-linux" ];
- maintainers = [ stdenv.lib.maintainers.zoomulator ];
+ maintainers = with maintainers; [ zoomulator ];
};
}
diff --git a/pkgs/applications/audio/morituri/default.nix b/pkgs/applications/audio/morituri/default.nix
deleted file mode 100644
index d4c67bb5622..00000000000
--- a/pkgs/applications/audio/morituri/default.nix
+++ /dev/null
@@ -1,55 +0,0 @@
-{ stdenv, fetchgit, pythonPackages, cdparanoia, cdrdao
-, gst-python, gst-plugins-base, gst-plugins-good
-, utillinux, makeWrapper, substituteAll, autoreconfHook }:
-
-let
- inherit (pythonPackages) python;
-in stdenv.mkDerivation rec {
- name = "morituri-${version}";
- version = "0.2.3.20151109";
- namePrefix = "";
-
- src = fetchgit {
- url = "https://github.com/thomasvs/morituri.git";
- fetchSubmodules = true;
- rev = "135b2f7bf27721177e3aeb1d26403f1b29116599";
- sha256 = "1sl5y5j3gdbynf2v0gf9dwd2hzawj8lm8ywadid7qm34yn8lx12k";
- };
-
- pythonPath = with pythonPackages; [
- pygobject2 gst-python musicbrainzngs
- pycdio pyxdg setuptools
- CDDB
- ];
-
- nativeBuildInputs = [ autoreconfHook ];
- buildInputs = [
- python cdparanoia cdrdao utillinux makeWrapper
- gst-plugins-base gst-plugins-good
- ] ++ pythonPath;
-
- patches = [
- (substituteAll {
- src = ./paths.patch;
- inherit cdrdao cdparanoia python utillinux;
- })
- ];
-
- # This package contains no binaries to patch or strip.
- dontPatchELF = true;
- dontStrip = true;
-
- postInstall = ''
- wrapProgram "$out/bin/rip" \
- --prefix PYTHONPATH : "$PYTHONPATH" \
- --prefix GST_PLUGIN_SYSTEM_PATH : "$GST_PLUGIN_SYSTEM_PATH"
- '';
-
- meta = with stdenv.lib; {
- homepage = http://thomas.apestaart.org/morituri/trac/;
- description = "A CD ripper aiming for accuracy over speed";
- maintainers = with maintainers; [ rycee jgeerds ];
- license = licenses.gpl3Plus;
- platforms = platforms.linux;
- };
-}
diff --git a/pkgs/applications/audio/morituri/paths.patch b/pkgs/applications/audio/morituri/paths.patch
deleted file mode 100644
index b3372dae48b..00000000000
--- a/pkgs/applications/audio/morituri/paths.patch
+++ /dev/null
@@ -1,87 +0,0 @@
-diff --git a/doc/Makefile.am b/doc/Makefile.am
-index c115c2c..78c883e 100644
---- a/doc/Makefile.am
-+++ b/doc/Makefile.am
-@@ -24,7 +24,7 @@ morituri.ics: $(top_srcdir)/morituri.doap
- man_MANS = rip.1
-
- rip.1: $(top_srcdir)/morituri/extern/python-command/scripts/help2man $(top_srcdir)/morituri
-- PYTHONPATH=$(top_srcdir) $(PYTHON) $(top_srcdir)/morituri/extern/python-command/scripts/help2man morituri.rip.main.Rip rip > rip.1
-+ PYTHONPATH=$(top_srcdir):$(PYTHONPATH) $(PYTHON) $(top_srcdir)/morituri/extern/python-command/scripts/help2man morituri.rip.main.Rip rip > rip.1
-
- clean-local:
- @rm -rf reference
-diff --git a/morituri/common/program.py b/morituri/common/program.py
-index d340fdd..15cb751 100644
---- a/morituri/common/program.py
-+++ b/morituri/common/program.py
-@@ -92,13 +92,13 @@ class Program(log.Loggable):
- """
- Load the given device.
- """
-- os.system('eject -t %s' % device)
-+ os.system('@utillinux@/bin/eject -t %s' % device)
-
- def ejectDevice(self, device):
- """
- Eject the given device.
- """
-- os.system('eject %s' % device)
-+ os.system('@utillinux@/bin/eject %s' % device)
-
- def unmountDevice(self, device):
- """
-@@ -112,7 +112,7 @@ class Program(log.Loggable):
- proc = open('/proc/mounts').read()
- if device in proc:
- print 'Device %s is mounted, unmounting' % device
-- os.system('umount %s' % device)
-+ os.system('@utillinux@/bin/umount %s' % device)
-
- def getFastToc(self, runner, toc_pickle, device):
- """
-Submodule morituri/extern/python-command contains modified content
-diff --git a/morituri/program/cdparanoia.py b/morituri/program/cdparanoia.py
-index 46176d5..fce14a5 100644
---- a/morituri/program/cdparanoia.py
-+++ b/morituri/program/cdparanoia.py
-@@ -278,7 +278,7 @@ class ReadTrackTask(log.Loggable, task.Task):
- stopTrack, stopOffset)
-
- bufsize = 1024
-- argv = ["cdparanoia", "--stderr-progress",
-+ argv = ["@cdparanoia@/bin/cdparanoia", "--stderr-progress",
- "--sample-offset=%d" % self._offset, ]
- if self._device:
- argv.extend(["--force-cdrom-device", self._device, ])
-@@ -551,7 +551,7 @@ _VERSION_RE = re.compile(
-
- def getCdParanoiaVersion():
- getter = common.VersionGetter('cdparanoia',
-- ["cdparanoia", "-V"],
-+ ["@cdparanoia@/bin/cdparanoia", "-V"],
- _VERSION_RE,
- "%(version)s %(release)s")
-
-diff --git a/morituri/program/cdrdao.py b/morituri/program/cdrdao.py
-index c6fba64..c4d0306 100644
---- a/morituri/program/cdrdao.py
-+++ b/morituri/program/cdrdao.py
-@@ -257,7 +257,7 @@ class CDRDAOTask(ctask.PopenTask):
-
- def start(self, runner):
- self.debug('Starting cdrdao with options %r', self.options)
-- self.command = ['cdrdao', ] + self.options
-+ self.command = ['@cdrdao@/bin/cdrdao', ] + self.options
-
- ctask.PopenTask.start(self, runner)
-
-@@ -515,7 +515,7 @@ _VERSION_RE = re.compile(
-
- def getCDRDAOVersion():
- getter = common.VersionGetter('cdrdao',
-- ["cdrdao"],
-+ ["@cdrdao@/bin/cdrdao"],
- _VERSION_RE,
- "%(version)s")
-
diff --git a/pkgs/applications/audio/pulseaudio-modules-bt/default.nix b/pkgs/applications/audio/pulseaudio-modules-bt/default.nix
new file mode 100644
index 00000000000..e3d07fcc245
--- /dev/null
+++ b/pkgs/applications/audio/pulseaudio-modules-bt/default.nix
@@ -0,0 +1,63 @@
+{ stdenv
+, runCommand
+, fetchFromGitHub
+, libpulseaudio
+, pulseaudio
+, pkgconfig
+, libtool
+, cmake
+, bluez
+, dbus
+, sbc
+}:
+
+let
+ pulseSources = runCommand "pulseaudio-sources" {} ''
+ mkdir $out
+ tar -xf ${pulseaudio.src}
+ mv pulseaudio*/* $out/
+ '';
+
+in stdenv.mkDerivation rec {
+ name = "pulseaudio-modules-bt-${version}";
+ version = "unstable-2018-09-11";
+
+ src = fetchFromGitHub {
+ owner = "EHfive";
+ repo = "pulseaudio-modules-bt";
+ rev = "9c6ad75382f3855916ad2feaa6b40e37356d80cc";
+ sha256 = "1iz4m3y6arsvwcyvqc429w252dl3apnhvl1zhyvfxlbg00d2ii0h";
+ fetchSubmodules = true;
+ };
+
+ nativeBuildInputs = [
+ pkgconfig
+ cmake
+ ];
+
+ buildInputs = [
+ libpulseaudio
+ pulseaudio
+ libtool
+ bluez
+ dbus
+ sbc
+ ];
+
+ NIX_CFLAGS_COMPILE = [
+ "-L${pulseaudio}/lib/pulseaudio"
+ ];
+
+ prePatch = ''
+ rm -r pa
+ ln -s ${pulseSources} pa
+ '';
+
+ meta = with stdenv.lib; {
+ homepage = https://github.com/EHfive/pulseaudio-modules-bt;
+ description = "SBC, Sony LDAC codec (A2DP Audio) support for Pulseaudio";
+ platforms = platforms.linux;
+ license = licenses.mit;
+ maintainers = with maintainers; [ adisbladis ];
+ };
+}
diff --git a/pkgs/applications/audio/qmmp/default.nix b/pkgs/applications/audio/qmmp/default.nix
index dc12baefed1..f58e75c9e26 100644
--- a/pkgs/applications/audio/qmmp/default.nix
+++ b/pkgs/applications/audio/qmmp/default.nix
@@ -29,11 +29,11 @@
# handle that.
stdenv.mkDerivation rec {
- name = "qmmp-1.2.2";
+ name = "qmmp-1.2.3";
src = fetchurl {
url = "http://qmmp.ylsoftware.com/files/${name}.tar.bz2";
- sha256 = "01nnyg8m3p3px1fj3lfsqqv9zh1388dwx1bm2qv4v87jywimgp79";
+ sha256 = "05lqmj22vr5ch1i0928d64ybdnn3qc66s9lgarx5s6x6ffr6589j";
};
buildInputs =
diff --git a/pkgs/applications/audio/rosegarden/default.nix b/pkgs/applications/audio/rosegarden/default.nix
index e57d85de05a..0b2bd9507e5 100644
--- a/pkgs/applications/audio/rosegarden/default.nix
+++ b/pkgs/applications/audio/rosegarden/default.nix
@@ -3,12 +3,12 @@
, liblo, liblrdf, libsamplerate, libsndfile, lirc ? null, qtbase }:
stdenv.mkDerivation (rec {
- version = "17.12.1";
+ version = "18.06";
name = "rosegarden-${version}";
src = fetchurl {
url = "mirror://sourceforge/rosegarden/${name}.tar.bz2";
- sha256 = "155kqbxg85wqv0w97cmmx8wq0r4xb3qpnk20lfma04vj8k6hc1mg";
+ sha256 = "04qc80sqb2ji42pq3mayhvqqn39hlxzymsywpbpzfpchr19chxx7";
};
patchPhase = ''
diff --git a/pkgs/applications/audio/snd/default.nix b/pkgs/applications/audio/snd/default.nix
index 7c96fd364c1..0709917a044 100644
--- a/pkgs/applications/audio/snd/default.nix
+++ b/pkgs/applications/audio/snd/default.nix
@@ -4,11 +4,11 @@
}:
stdenv.mkDerivation rec {
- name = "snd-18.6";
+ name = "snd-18.7";
src = fetchurl {
url = "mirror://sourceforge/snd/${name}.tar.gz";
- sha256 = "1jyqkkz2a6zw0jn9y15xd3027r8glkpw794fjk6hd3al1byjhz2z";
+ sha256 = "1d7g043r534shwsq5s4xsywgn5qv96v9wnhdx04j21s9w7fy9ypl";
};
nativeBuildInputs = [ pkgconfig ];
diff --git a/pkgs/applications/audio/vocal/default.nix b/pkgs/applications/audio/vocal/default.nix
new file mode 100644
index 00000000000..97f59ee5f94
--- /dev/null
+++ b/pkgs/applications/audio/vocal/default.nix
@@ -0,0 +1,52 @@
+{ stdenv, fetchFromGitHub, cmake, ninja, pkgconfig, vala, gtk3, libxml2, granite, webkitgtk, clutter-gtk
+, clutter-gst, libunity, libnotify, sqlite, gst_all_1, libsoup, json-glib, gnome3, gobjectIntrospection, wrapGAppsHook }:
+
+stdenv.mkDerivation rec {
+ pname = "vocal";
+ version = "2.2.0";
+
+ name = "${pname}-${version}";
+
+ src = fetchFromGitHub {
+ owner = "needle-and-thread";
+ repo = pname;
+ rev = version;
+ sha256 = "09cm4azyaa9fmfymygf25gf0klpm5p04k6bc1i90jhw0f1im8sgl";
+ };
+
+ nativeBuildInputs = [
+ cmake
+ gobjectIntrospection
+ libxml2
+ ninja
+ pkgconfig
+ vala
+ wrapGAppsHook
+ ];
+
+ buildInputs = with gst_all_1; [
+ clutter-gst
+ clutter-gtk
+ gnome3.libgee
+ granite
+ gst-plugins-base
+ gst-plugins-good
+ gstreamer
+ json-glib
+ libnotify
+ libunity
+ sqlite
+ webkitgtk
+ ];
+
+ meta = with stdenv.lib; {
+ description = "The podcast client for the modern free desktop";
+ longDescription = ''
+ Vocal is a powerful, fast, and intuitive application that helps users find new podcasts, manage their libraries, and enjoy the best that indepedent audio and video publishing has to offer. Vocal features full support for both episode downloading and streaming, native system integration, iTunes store search and top 100 charts (with international results support), iTunes link parsing, OPML importing and exporting, and so much more. Plus, it has great smart features like automatically keeping your library clean from old files, and the ability to set custom skip intervals.
+ '';
+ homepage = https://github.com/needle-and-thread/vocal;
+ license = licenses.gpl3Plus;
+ maintainers = with maintainers; [ worldofpeace ];
+ platforms = platforms.linux;
+ };
+}
diff --git a/pkgs/applications/audio/whipper/default.nix b/pkgs/applications/audio/whipper/default.nix
new file mode 100644
index 00000000000..162d5459d64
--- /dev/null
+++ b/pkgs/applications/audio/whipper/default.nix
@@ -0,0 +1,48 @@
+{ stdenv, fetchFromGitHub, python2, cdparanoia, cdrdao, flac
+, sox, accuraterip-checksum, utillinux, substituteAll }:
+
+python2.pkgs.buildPythonApplication rec {
+ name = "whipper-${version}";
+ version = "0.7.0";
+
+ src = fetchFromGitHub {
+ owner = "JoeLametta";
+ repo = "whipper";
+ rev = "v${version}";
+ sha256 = "04m8s0s9dcnly9l6id8vv99n9kbjrjid79bss52ay9yvwng0frmj";
+ };
+
+ pythonPath = with python2.pkgs; [
+ pygobject2 musicbrainzngs urllib3 chardet
+ pycdio setuptools mutagen
+ requests
+ ];
+
+ checkInputs = with python2.pkgs; [
+ twisted
+ ];
+
+ patches = [
+ (substituteAll {
+ src = ./paths.patch;
+ inherit cdrdao cdparanoia utillinux flac sox;
+ accurateripChecksum = accuraterip-checksum;
+ })
+ ];
+
+ # some tests require internet access
+ # https://github.com/JoeLametta/whipper/issues/291
+ doCheck = false;
+
+ preCheck = ''
+ HOME=$TMPDIR
+ '';
+
+ meta = with stdenv.lib; {
+ homepage = https://github.com/JoeLametta/whipper;
+ description = "A CD ripper aiming for accuracy over speed";
+ maintainers = with maintainers; [ rycee jgeerds ];
+ license = licenses.gpl3Plus;
+ platforms = platforms.linux;
+ };
+}
diff --git a/pkgs/applications/audio/whipper/paths.patch b/pkgs/applications/audio/whipper/paths.patch
new file mode 100644
index 00000000000..9fe9f7a57c5
--- /dev/null
+++ b/pkgs/applications/audio/whipper/paths.patch
@@ -0,0 +1,105 @@
+--- a/whipper/program/arc.py
++++ b/whipper/program/arc.py
+@@ -3,8 +3,8 @@
+ import logging
+ logger = logging.getLogger(__name__)
+
+-ARB = 'accuraterip-checksum'
+-FLAC = 'flac'
++ARB = '@accurateripChecksum@/bin/accuraterip-checksum'
++FLAC = '@flac@/bin/flac'
+
+
+ def _execute(cmd, **redirects):
+--- a/whipper/program/cdparanoia.py
++++ b/whipper/program/cdparanoia.py
+@@ -280,10 +280,10 @@
+
+ bufsize = 1024
+ if self._overread:
+- argv = ["cd-paranoia", "--stderr-progress",
++ argv = ["@cdparanoia@/bin/cdparanoia", "--stderr-progress",
+ "--sample-offset=%d" % self._offset, "--force-overread", ]
+ else:
+- argv = ["cd-paranoia", "--stderr-progress",
++ argv = ["@cdparanoia@/bin/cdparanoia", "--stderr-progress",
+ "--sample-offset=%d" % self._offset, ]
+ if self._device:
+ argv.extend(["--force-cdrom-device", self._device, ])
+@@ -560,7 +560,7 @@
+
+ def getCdParanoiaVersion():
+ getter = common.VersionGetter('cd-paranoia',
+- ["cd-paranoia", "-V"],
++ ["@cdparanoia@/bin/cdparanoia", "-V"],
+ _VERSION_RE,
+ "%(version)s %(release)s")
+
+@@ -585,7 +585,7 @@
+ def __init__(self, device=None):
+ # cdparanoia -A *always* writes cdparanoia.log
+ self.cwd = tempfile.mkdtemp(suffix='.whipper.cache')
+- self.command = ['cd-paranoia', '-A']
++ self.command = ['@cdparanoia@/bin/cdparanoia', '-A']
+ if device:
+ self.command += ['-d', device]
+
+--- a/whipper/program/cdrdao.py
++++ b/whipper/program/cdrdao.py
+@@ -9,7 +9,7 @@
+ import logging
+ logger = logging.getLogger(__name__)
+
+-CDRDAO = 'cdrdao'
++CDRDAO = '@cdrdao@/bin/cdrdao'
+
+
+ def read_toc(device, fast_toc=False):
+--- a/whipper/program/sox.py
++++ b/whipper/program/sox.py
+@@ -4,7 +4,7 @@
+ import logging
+ logger = logging.getLogger(__name__)
+
+-SOX = 'sox'
++SOX = '@sox@/bin/sox'
+
+
+ def peak_level(track_path):
+--- a/whipper/program/soxi.py
++++ b/whipper/program/soxi.py
+@@ -6,7 +6,7 @@
+ import logging
+ logger = logging.getLogger(__name__)
+
+-SOXI = 'soxi'
++SOXI = '@sox@/bin/soxi'
+
+
+ class AudioLengthTask(ctask.PopenTask):
+--- a/whipper/program/utils.py
++++ b/whipper/program/utils.py
+@@ -9,7 +9,7 @@
+ Eject the given device.
+ """
+ logger.debug("ejecting device %s", device)
+- os.system('eject %s' % device)
++ os.system('@utillinux@/bin/eject %s' % device)
+
+
+ def load_device(device):
+@@ -17,7 +17,7 @@
+ Load the given device.
+ """
+ logger.debug("loading (eject -t) device %s", device)
+- os.system('eject -t %s' % device)
++ os.system('@utillinux@/bin/eject -t %s' % device)
+
+
+ def unmount_device(device):
+@@ -32,4 +32,4 @@
+ proc = open('/proc/mounts').read()
+ if device in proc:
+ print 'Device %s is mounted, unmounting' % device
+- os.system('umount %s' % device)
++ os.system('@utillinux@/bin/umount %s' % device)
diff --git a/pkgs/applications/editors/android-studio/default.nix b/pkgs/applications/editors/android-studio/default.nix
index 199793a44fb..2385cd31cfa 100644
--- a/pkgs/applications/editors/android-studio/default.nix
+++ b/pkgs/applications/editors/android-studio/default.nix
@@ -13,14 +13,14 @@ let
sha256Hash = "0xx6yprylmcb32ipmwdcfkgddlm1nrxi1w68miclvgrbk015brf2";
};
betaVersion = {
- version = "3.2.0.24"; # "Android Studio 3.2 RC 2"
- build = "181.4974118";
- sha256Hash = "0sj848pzpsbmnfi2692gg73v6m72hr1pwlk5x8q912w60iypi3pz";
+ version = "3.2.0.25"; # "Android Studio 3.2 RC 3"
+ build = "181.4987877";
+ sha256Hash = "0mriakxxchc0wbqkl236pp4fsqbq3gb2qrkdg5hx9zz763dc59gp";
};
latestVersion = { # canary & dev
- version = "3.3.0.7"; # "Android Studio 3.3 Canary 8"
- build = "182.4978721";
- sha256Hash = "0xa19wrw1a6y7f2jdv8699yqv7g34h3zdw3wc0ql0447afzwg9a9";
+ version = "3.3.0.9"; # "Android Studio 3.3 Canary 10"
+ build = "182.4996246";
+ sha256Hash = "0g6hhfhlfj9szw48z22n869n6d0rw5fhljazj63dmw6i4v6rd92g";
};
in rec {
# Old alias
diff --git a/pkgs/applications/editors/aseprite/default.nix b/pkgs/applications/editors/aseprite/default.nix
index 429b2430fce..7af3742349a 100644
--- a/pkgs/applications/editors/aseprite/default.nix
+++ b/pkgs/applications/editors/aseprite/default.nix
@@ -1,5 +1,5 @@
-{ stdenv, lib, fetchFromGitHub, cmake, pkgconfig
-, curl, freetype, giflib, libjpeg, libpng, libwebp, pixman, tinyxml, zlib
+{ stdenv, lib, fetchFromGitHub, fetchpatch, cmake, pkgconfig
+, curl, freetype, giflib, harfbuzz, libjpeg, libpng, libwebp, pixman, tinyxml, zlib
, libX11, libXext, libXcursor, libXxf86vm
, unfree ? false
, cmark
@@ -11,7 +11,7 @@
stdenv.mkDerivation rec {
name = "aseprite-${version}";
- version = if unfree then "1.2.4" else "1.1.7";
+ version = if unfree then "1.2.9" else "1.1.7";
src = fetchFromGitHub {
owner = "aseprite";
@@ -19,16 +19,27 @@ stdenv.mkDerivation rec {
rev = "v${version}";
fetchSubmodules = true;
sha256 = if unfree
- then "1rnf4a8vgddz8x55rpqaihlxmqip1kgpdhqb4d3l71h1zmidg5k3"
+ then "0a9xk163j0984n8nn6pqf27n83gr6w7g25wkiv591zx88pa6cpbd"
else "0gd49lns2bpzbkwax5jf9x1xmg1j8ij997kcxr2596cwiswnw4di";
};
nativeBuildInputs = [ cmake pkgconfig ];
buildInputs = [
- curl freetype giflib libjpeg libpng libwebp pixman tinyxml zlib
+ curl freetype giflib harfbuzz libjpeg libpng libwebp pixman tinyxml zlib
libX11 libXext libXcursor libXxf86vm
- ] ++ lib.optionals unfree [ cmark ];
+ ] ++ lib.optionals unfree [ cmark harfbuzz ];
+
+ patches = lib.optionals unfree [
+ (fetchpatch {
+ url = "https://github.com/aseprite/aseprite/commit/cfb4dac6feef1f39e161c23c886055a8f9acfd0d.patch";
+ sha256 = "1qhjfpngg8b1vvb9w26lhjjfamfx57ih0p31km3r5l96nm85l7f9";
+ })
+ (fetchpatch {
+ url = "https://github.com/orivej/aseprite/commit/ea87e65b357ad0bd65467af5529183b5a48a8c17.patch";
+ sha256 = "1vwn8ivap1pzdh444sdvvkndp55iz146nhmd80xbm8cyzn3qmg91";
+ })
+ ];
postPatch = ''
sed -i src/config.h -e "s-\\(#define VERSION\\) .*-\\1 \"$version\"-"
@@ -49,6 +60,7 @@ stdenv.mkDerivation rec {
"-DWITH_WEBP_SUPPORT=ON"
] ++ lib.optionals unfree [
"-DUSE_SHARED_CMARK=ON"
+ "-DUSE_SHARED_HARFBUZZ=ON"
# Aseprite needs internal freetype headers.
"-DUSE_SHARED_FREETYPE=OFF"
# Disable libarchive programs.
diff --git a/pkgs/applications/editors/emacs/default.nix b/pkgs/applications/editors/emacs/default.nix
index 0a304fabe60..c1bfdf8157d 100644
--- a/pkgs/applications/editors/emacs/default.nix
+++ b/pkgs/applications/editors/emacs/default.nix
@@ -4,8 +4,9 @@
, alsaLib, cairo, acl, gpm, AppKit, GSS, ImageIO, m17n_lib, libotf
, systemd ? null
, withX ? !stdenv.isDarwin
-, withGTK2 ? false, gtk2 ? null
-, withGTK3 ? true, gtk3 ? null, gsettings-desktop-schemas ? null
+, withNS ? stdenv.isDarwin
+, withGTK2 ? false, gtk2-x11 ? null
+, withGTK3 ? true, gtk3-x11 ? null, gsettings-desktop-schemas ? null
, withXwidgets ? false, webkitgtk ? null, wrapGAppsHook ? null, glib-networking ? null
, withCsrc ? true
, srcRepo ? false, autoconf ? null, automake ? null, texinfo ? null
@@ -13,10 +14,12 @@
assert (libXft != null) -> libpng != null; # probably a bug
assert stdenv.isDarwin -> libXaw != null; # fails to link otherwise
-assert withGTK2 -> withX || stdenv.isDarwin;
-assert withGTK3 -> withX || stdenv.isDarwin;
-assert withGTK2 -> !withGTK3 && gtk2 != null;
-assert withGTK3 -> !withGTK2 && gtk3 != null;
+assert withNS -> !withX;
+assert withNS -> stdenv.isDarwin;
+assert (withGTK2 && !withNS) -> withX;
+assert (withGTK3 && !withNS) -> withX;
+assert withGTK2 -> !withGTK3 && gtk2-x11 != null;
+assert withGTK3 -> !withGTK2 && gtk3-x11 != null;
assert withXwidgets -> withGTK3 && webkitgtk != null;
let
@@ -56,19 +59,22 @@ stdenv.mkDerivation rec {
++ lib.optionals stdenv.isLinux [ dbus libselinux systemd ]
++ lib.optionals withX
[ xlibsWrapper libXaw Xaw3d libXpm libpng libjpeg libungif libtiff librsvg libXft
- imagemagick gconf m17n_lib libotf ]
- ++ lib.optional (withX && withGTK2) gtk2
- ++ lib.optionals (withX && withGTK3) [ gtk3 gsettings-desktop-schemas ]
+ imagemagick gconf ]
+ ++ lib.optionals (stdenv.isLinux && withX) [ m17n_lib libotf ]
+ ++ lib.optional (withX && withGTK2) gtk2-x11
+ ++ lib.optionals (withX && withGTK3) [ gtk3-x11 gsettings-desktop-schemas ]
++ lib.optional (stdenv.isDarwin && withX) cairo
++ lib.optionals (withX && withXwidgets) [ webkitgtk ];
- propagatedBuildInputs = lib.optionals stdenv.isDarwin [ AppKit GSS ImageIO ];
+ propagatedBuildInputs = lib.optionals withNS [ AppKit GSS ImageIO ];
hardeningDisable = [ "format" ];
configureFlags = [ "--with-modules" ] ++
- (if stdenv.isDarwin
- then [ "--with-ns" "--disable-ns-self-contained" ]
+ (lib.optional stdenv.isDarwin
+ (lib.withFeature withNS "ns")) ++
+ (if withNS
+ then [ "--disable-ns-self-contained" ]
else if withX
then [ "--with-x-toolkit=${toolkit}" "--with-xft" ]
else [ "--with-x=no" "--with-xpm=no" "--with-jpeg=no" "--with-png=no"
@@ -103,7 +109,7 @@ stdenv.mkDerivation rec {
cp $srcdir/TAGS $dstdir
echo '((nil . ((tags-file-name . "TAGS"))))' > $dstdir/.dir-locals.el
done
- '' + lib.optionalString stdenv.isDarwin ''
+ '' + lib.optionalString withNS ''
mkdir -p $out/Applications
mv nextstep/Emacs.app $out/Applications
'';
diff --git a/pkgs/applications/editors/focuswriter/default.nix b/pkgs/applications/editors/focuswriter/default.nix
index 706f2f015b1..000797c9b70 100644
--- a/pkgs/applications/editors/focuswriter/default.nix
+++ b/pkgs/applications/editors/focuswriter/default.nix
@@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
name = "focuswriter-${version}";
- version = "1.6.15";
+ version = "1.6.16";
src = fetchurl {
url = "https://gottcode.org/focuswriter/focuswriter-${version}-src.tar.bz2";
- sha256 = "0afs9cm5q7zxag28m427ycwwxkbn47zw7v111x7963ydqyn9gr9q";
+ sha256 = "1warfv9d485a7ysmjazxw4zvi9l0ih1021s6c5adkc86m88k296m";
};
nativeBuildInputs = [ pkgconfig qmake qttools ];
diff --git a/pkgs/applications/editors/leo-editor/default.nix b/pkgs/applications/editors/leo-editor/default.nix
index 2084a047a08..a2274be463e 100644
--- a/pkgs/applications/editors/leo-editor/default.nix
+++ b/pkgs/applications/editors/leo-editor/default.nix
@@ -1,29 +1,20 @@
-{ stdenv, python3, libsForQt56, fetchFromGitHub, makeWrapper, makeDesktopItem }:
+{ stdenv, python3, fetchFromGitHub, makeWrapper, makeDesktopItem }:
-let
- packageOverrides = self: super: {
- pyqt56 = libsForQt56.callPackage ../../../development/python-modules/pyqt/5.x.nix {
- pythonPackages = self;
- };
- };
-
- pythonPackages = (python3.override { inherit packageOverrides; }).pkgs;
-in
stdenv.mkDerivation rec {
name = "leo-editor-${version}";
- version = "5.6";
+ version = "5.7.3";
src = fetchFromGitHub {
owner = "leo-editor";
repo = "leo-editor";
rev = version;
- sha256 = "1k6q3gvaf05bi0mzkmmb1p6wrgxwri7ivn38p6f0m0wfd3f70x2j";
+ sha256 = "0ri6l6cxwva450l05af5vs1lsgrz6ciwd02njdgphs9pm1vwxbl9";
};
dontBuild = true;
nativeBuildInputs = [ makeWrapper python3 ];
- propagatedBuildInputs = with pythonPackages; [ pyqt56 docutils ];
+ propagatedBuildInputs = with python3.pkgs; [ pyqt5 docutils ];
desktopItem = makeDesktopItem rec {
name = "leo-editor";
diff --git a/pkgs/applications/editors/nano/default.nix b/pkgs/applications/editors/nano/default.nix
index 64b8e48b288..9c50d8e8b78 100644
--- a/pkgs/applications/editors/nano/default.nix
+++ b/pkgs/applications/editors/nano/default.nix
@@ -14,17 +14,17 @@ let
nixSyntaxHighlight = fetchFromGitHub {
owner = "seitz";
repo = "nanonix";
- rev = "7483fd8b79f1f3f2179dbbd46aa400df4320ba10";
- sha256 = "10pv75kfrgnziz8sr83hdbb0c3klm2fmsdw3i5cpqqf5va1fzb8h";
+ rev = "bf8d898efaa10dce3f7972ff765b58c353b4b4ab";
+ sha256 = "0773s5iz8aw9npgyasb0r2ybp6gvy2s9sq51az8w7h52bzn5blnn";
};
in stdenv.mkDerivation rec {
name = "nano-${version}";
- version = "2.9.8";
+ version = "3.0";
src = fetchurl {
url = "mirror://gnu/nano/${name}.tar.xz";
- sha256 = "122lm0z97wk3mgnbn8m4d769d4j9rxyc9z7s89xd4gsdp8qsrpn2";
+ sha256 = "1868hg9s584fwjrh0fzdrixmxc2qhw520z4q5iv68kjiajivr9g0";
};
nativeBuildInputs = [ texinfo ] ++ optional enableNls gettext;
diff --git a/pkgs/applications/editors/nano/nanorc/default.nix b/pkgs/applications/editors/nano/nanorc/default.nix
new file mode 100644
index 00000000000..fb30036e146
--- /dev/null
+++ b/pkgs/applications/editors/nano/nanorc/default.nix
@@ -0,0 +1,29 @@
+{ stdenv, fetchFromGitHub }:
+
+stdenv.mkDerivation rec {
+ name = "nanorc-${version}";
+ version = "2018-09-05";
+
+ src = fetchFromGitHub {
+ owner = "scopatz";
+ repo = "nanorc";
+ rev = "1e589cb729d24fba470228d429e6dde07973d597";
+ sha256 = "136yxr38lzrfv8bar0c6c56rh54q9s94zpwa19f425crh44drppl";
+ };
+
+ dontBuild = true;
+
+ installPhase = ''
+ mkdir -p $out/share
+
+ install *.nanorc $out/share/
+ '';
+
+ meta = {
+ description = "Improved Nano Syntax Highlighting Files";
+ homepage = https://github.com/scopatz/nanorc;
+ license = stdenv.lib.licenses.gpl3;
+ maintainers = with stdenv.lib.maintainers; [ nequissimus ];
+ platforms = stdenv.lib.platforms.all;
+ };
+}
diff --git a/pkgs/applications/editors/neovim/qt.nix b/pkgs/applications/editors/neovim/qt.nix
index baeb3879735..cfdcd7fe939 100644
--- a/pkgs/applications/editors/neovim/qt.nix
+++ b/pkgs/applications/editors/neovim/qt.nix
@@ -3,13 +3,13 @@
stdenv.mkDerivation rec {
name = "neovim-qt-${version}";
- version = "0.2.9";
+ version = "0.2.10";
src = fetchFromGitHub {
owner = "equalsraf";
repo = "neovim-qt";
rev = "v${version}";
- sha256 = "014zqfbbv7q85z64h1iw88l37vhrvhjv7xxd0a76j7d1m2769kqs";
+ sha256 = "0hq3w9d6qbzf0j7zm3ls0wpvnab64kypb4i0bhmsnk605mvx63r4";
};
cmakeFlags = [
diff --git a/pkgs/applications/editors/quilter/default.nix b/pkgs/applications/editors/quilter/default.nix
new file mode 100644
index 00000000000..4d4cb0239bf
--- /dev/null
+++ b/pkgs/applications/editors/quilter/default.nix
@@ -0,0 +1,73 @@
+{ stdenv, fetchFromGitHub, fetchpatch, vala, pkgconfig, meson, ninja, python3
+, granite, gtk3, desktop-file-utils, gnome3, gtksourceview, webkitgtk, gtkspell3
+, discount, gobjectIntrospection, wrapGAppsHook }:
+
+stdenv.mkDerivation rec {
+ pname = "quilter";
+ version = "1.6.3";
+
+ name = "${pname}-${version}";
+
+ src = fetchFromGitHub {
+ owner = "lainsce";
+ repo = pname;
+ rev = version;
+ sha256 = "1wa0i6dgg6fgb7q9z33v9qmn1a1dn3ik58v1f3a49dvd5xyf8q6q";
+ };
+
+ nativeBuildInputs = [
+ desktop-file-utils
+ gobjectIntrospection
+ meson
+ ninja
+ pkgconfig
+ python3
+ vala
+ wrapGAppsHook
+ ];
+
+ buildInputs = [
+ discount
+ granite
+ gtk3
+ gtksourceview
+ gtkspell3
+ webkitgtk
+ gnome3.libgee
+ ];
+
+ patches = [
+ # Fix build with vala 0.42 - Drop these in next release
+ (fetchpatch {
+ url = "https://github.com/lainsce/quilter/commit/a58838213cd7f2d33048c7b34b96dc8875612624.patch";
+ sha256 = "1a4w1zql4zfk8scgrrssrm9n3sh5fsc1af5zvrqk8skbv7f2c80n";
+ })
+ (fetchpatch {
+ url = "https://github.com/lainsce/quilter/commit/d1800ce830343a1715bc83da3339816554896be5.patch";
+ sha256 = "0xl5iz8bgx5661vbbq8qa1wkfvw9d3da67x564ckjfi05zq1vddz";
+ })
+ # Correct libMarkdown dependency discovery: See https://github.com/lainsce/quilter/pull/170
+ (fetchpatch {
+ url = "https://github.com/lainsce/quilter/commit/8b1f3a60bd14cb86c1c62f9917c5f0c12bc4e459.patch";
+ sha256 = "1kjc6ygf9yjvqfa4xhzxiava3338swp9wbjhpfaa3pyz3ayh188n";
+ })
+ # post_install script cleanups: See https://github.com/lainsce/quilter/pull/171
+ (fetchpatch {
+ url = "https://github.com/lainsce/quilter/commit/55bf3b10cd94fcc40b0867bbdb1931a09f577922.patch";
+ sha256 = "1330amichaif2qfrh4qkxwqbcpr87ipik7vzjbjdm2bv3jz9353r";
+ })
+ ];
+
+ postPatch = ''
+ chmod +x meson/post_install.py
+ patchShebangs meson/post_install.py
+ '';
+
+ meta = with stdenv.lib; {
+ description = "Focus on your writing - designed for elementary OS";
+ homepage = https://github.com/lainsce/quilter;
+ license = licenses.gpl2Plus;
+ maintainers = with maintainers; [ worldofpeace ];
+ platforms = platforms.linux;
+ };
+}
diff --git a/pkgs/applications/editors/thonny/default.nix b/pkgs/applications/editors/thonny/default.nix
new file mode 100644
index 00000000000..a4ea354ebf6
--- /dev/null
+++ b/pkgs/applications/editors/thonny/default.nix
@@ -0,0 +1,43 @@
+{ stdenv, fetchFromBitbucket, python3 }:
+
+with python3.pkgs;
+
+buildPythonApplication rec {
+ pname = "thonny";
+ version = "3.0.0b3";
+
+ src = fetchFromBitbucket {
+ owner = "plas";
+ repo = pname;
+ rev = "a511d4539c532b6dddf6d7f1586d30e1ac35bd86";
+ sha256 = "1s3pp97r6p3j81idglnml4faxryk7saszxmv3gys1agdfj75qczr";
+ };
+
+ propagatedBuildInputs = with python3.pkgs; [ jedi pyserial tkinter docutils pylint ];
+
+ preInstall = ''
+ export HOME=$(mktemp -d)
+ '';
+
+ preFixup = ''
+ wrapProgram "$out/bin/thonny" \
+ --prefix PYTHONPATH : $PYTHONPATH:$(toPythonPath ${python3.pkgs.jedi})
+ '';
+
+ # Tests need a DISPLAY
+ doCheck = false;
+
+ meta = with stdenv.lib; {
+ description = "Python IDE for beginners";
+ longDescription = ''
+ Thonny is a Python IDE for beginners. It supports different ways
+ of stepping through the code, step-by-step expression
+ evaluation, detailed visualization of the call stack and a mode
+ for explaining the concepts of references and heap.
+ '';
+ homepage = https://www.thonny.org/;
+ license = licenses.mit;
+ maintainers = with maintainers; [ leenaars ];
+ platforms = platforms.linux;
+ };
+}
diff --git a/pkgs/applications/editors/vim/common.nix b/pkgs/applications/editors/vim/common.nix
index 2ce6563be0b..87a525b3302 100644
--- a/pkgs/applications/editors/vim/common.nix
+++ b/pkgs/applications/editors/vim/common.nix
@@ -1,12 +1,12 @@
{ lib, fetchFromGitHub }:
rec {
- version = "8.1.0146";
+ version = "8.1.0348";
src = fetchFromGitHub {
owner = "vim";
repo = "vim";
rev = "v${version}";
- sha256 = "1v33h08j15zii0ipw5py18ghsaxlbar0nyx365z1acjhk4vhn9nb";
+ sha256 = "0f18kpywnph708mvj1fpi06qb53nbhc26ngjh2kvfxwawn63k8ab";
};
enableParallelBuilding = true;
diff --git a/pkgs/applications/graphics/PythonMagick/default.nix b/pkgs/applications/graphics/PythonMagick/default.nix
index f0b4a991f74..938df76e257 100644
--- a/pkgs/applications/graphics/PythonMagick/default.nix
+++ b/pkgs/applications/graphics/PythonMagick/default.nix
@@ -1,6 +1,6 @@
# This expression provides Python bindings to ImageMagick. Python libraries are supposed to be called via `python-packages.nix`.
-{stdenv, fetchurl, python, boost, pkgconfig, imagemagick}:
+{ stdenv, fetchurl, python, pkgconfig, imagemagick, autoreconfHook }:
stdenv.mkDerivation rec {
name = "pythonmagick-${version}";
@@ -11,10 +11,18 @@ stdenv.mkDerivation rec {
sha256 = "137278mfb5079lns2mmw73x8dhpzgwha53dyl00mmhj2z25varpn";
};
- nativeBuildInputs = [ pkgconfig ];
- buildInputs = [python boost imagemagick];
+ postPatch = ''
+ rm configure
+ '';
- meta = {
+ configureFlags = [ "--with-boost=${python.pkgs.boost}" ];
+
+ nativeBuildInputs = [ pkgconfig autoreconfHook ];
+ buildInputs = [ python python.pkgs.boost imagemagick ];
+
+ meta = with stdenv.lib; {
homepage = http://www.imagemagick.org/script/api.php;
+ license = licenses.imagemagick;
+ description = "PythonMagick provides object oriented bindings for the ImageMagick Library.";
};
}
diff --git a/pkgs/applications/graphics/antimony/default.nix b/pkgs/applications/graphics/antimony/default.nix
index 334a5a33dad..aa6305ce831 100644
--- a/pkgs/applications/graphics/antimony/default.nix
+++ b/pkgs/applications/graphics/antimony/default.nix
@@ -1,29 +1,34 @@
-{ stdenv, fetchFromGitHub, libpng, python3, boost, libGLU_combined, qtbase, ncurses, cmake, flex, lemon }:
+{ stdenv, fetchFromGitHub, libpng, python3
+, libGLU_combined, qtbase, ncurses
+, cmake, flex, lemon
+}:
let
- gitRev = "020910c25614a3752383511ede5a1f5551a8bd39";
- gitBranch = "master";
+ gitRev = "60a58688e552f12501980c4bdab034ab0f2ba059";
+ gitBranch = "develop";
gitTag = "0.9.3";
in
stdenv.mkDerivation rec {
name = "antimony-${version}";
- version = gitTag;
+ version = "2018-07-17";
src = fetchFromGitHub {
- owner = "mkeeter";
- repo = "antimony";
- rev = gitTag;
- sha256 = "1vm5h5py8l3b8h4pbmm8s3wlxvlw492xfwnlwx0nvl0cjs8ba6r4";
+ owner = "mkeeter";
+ repo = "antimony";
+ rev = gitRev;
+ sha256 = "0pgf6kr23xw012xsil56j5gq78mlirmrlqdm09m5wlgcf4vr6xnl";
};
patches = [ ./paths-fix.patch ];
postPatch = ''
- sed -i "s,/usr/local,$out,g" app/CMakeLists.txt app/app/app.cpp app/app/main.cpp
+ sed -i "s,/usr/local,$out,g" \
+ app/CMakeLists.txt app/app/app.cpp app/app/main.cpp
+ sed -i "s,python-py35,python36," CMakeLists.txt
'';
buildInputs = [
- libpng python3 (boost.override { python = python3; })
+ libpng python3 python3.pkgs.boost
libGLU_combined qtbase ncurses
];
@@ -41,6 +46,7 @@ in
description = "A computer-aided design (CAD) tool from a parallel universe";
homepage = "https://github.com/mkeeter/antimony";
license = licenses.mit;
+ maintainers = with maintainers; [ rnhmjoj ];
platforms = platforms.linux;
};
}
diff --git a/pkgs/applications/graphics/imv/default.nix b/pkgs/applications/graphics/imv/default.nix
index 9def3f16ad0..cdbf5f44687 100644
--- a/pkgs/applications/graphics/imv/default.nix
+++ b/pkgs/applications/graphics/imv/default.nix
@@ -26,7 +26,7 @@ stdenv.mkDerivation rec {
homepage = https://github.com/eXeC64/imv;
license = licenses.gpl2;
maintainers = with maintainers; [ rnhmjoj ];
- platforms = [ "x86_64-linux" ];
+ platforms = [ "i686-linux" "x86_64-linux" ];
};
}
diff --git a/pkgs/applications/graphics/kipi-plugins/default.nix b/pkgs/applications/graphics/kipi-plugins/default.nix
index 48a94a5253d..f7faba7c41a 100644
--- a/pkgs/applications/graphics/kipi-plugins/default.nix
+++ b/pkgs/applications/graphics/kipi-plugins/default.nix
@@ -7,11 +7,11 @@
stdenv.mkDerivation rec {
name = "kipi-plugins-${version}";
- version = "5.2.0";
+ version = "5.9.0";
src = fetchurl {
url = "http://download.kde.org/stable/digikam/digikam-${version}.tar.xz";
- sha256 = "0q4j7iv20cxgfsr14qwzx05wbp2zkgc7cg2pi7ibcnwba70ky96g";
+ sha256 = "06qdalf2mwx2f43p3bljy3vn5bk8n3x539kha6ky2vzxvkp343b6";
};
prePatch = ''
diff --git a/pkgs/applications/graphics/krita/default.nix b/pkgs/applications/graphics/krita/default.nix
index d4ac9720e15..0abe90e0ba7 100644
--- a/pkgs/applications/graphics/krita/default.nix
+++ b/pkgs/applications/graphics/krita/default.nix
@@ -3,7 +3,7 @@
, kguiaddons, ki18n, kitemmodels, kitemviews, kwindowsystem
, kio, kcrash
, boost, libraw, fftw, eigen, exiv2, libheif, lcms2, gsl, openexr, giflib
-, openjpeg, opencolorio, vc, poppler_qt5, curl, ilmbase
+, openjpeg, opencolorio, vc, poppler, curl, ilmbase
, qtmultimedia, qtx11extras
, python3
}:
@@ -23,7 +23,7 @@ mkDerivation rec {
karchive kconfig kwidgetsaddons kcompletion kcoreaddons kguiaddons
ki18n kitemmodels kitemviews kwindowsystem kio kcrash
boost libraw fftw eigen exiv2 lcms2 gsl openexr libheif giflib
- openjpeg opencolorio poppler_qt5 curl ilmbase
+ openjpeg opencolorio poppler curl ilmbase
qtmultimedia qtx11extras
python3
] ++ lib.optional (stdenv.hostPlatform.isi686 || stdenv.hostPlatform.isx86_64) vc;
diff --git a/pkgs/applications/graphics/qcomicbook/default.nix b/pkgs/applications/graphics/qcomicbook/default.nix
index d67c8ef9b02..c37e21ec898 100644
--- a/pkgs/applications/graphics/qcomicbook/default.nix
+++ b/pkgs/applications/graphics/qcomicbook/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, pkgconfig, cmake, qtbase, qttools, qtx11extras, poppler_qt5 }:
+{ stdenv, fetchFromGitHub, pkgconfig, cmake, qtbase, qttools, qtx11extras, poppler }:
stdenv.mkDerivation rec {
name = "qcomicbook-${version}";
@@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
];
buildInputs = [
- qtbase qttools qtx11extras poppler_qt5
+ qtbase qttools qtx11extras poppler
];
postInstall = ''
diff --git a/pkgs/applications/kde/fetch.sh b/pkgs/applications/kde/fetch.sh
index c7cc617f163..d4830a9e239 100644
--- a/pkgs/applications/kde/fetch.sh
+++ b/pkgs/applications/kde/fetch.sh
@@ -1 +1 @@
-WGET_ARGS=( https://download.kde.org/stable/applications/18.08.0/ -A '*.tar.xz' )
+WGET_ARGS=( https://download.kde.org/stable/applications/18.08.1/ -A '*.tar.xz' )
diff --git a/pkgs/applications/kde/srcs.nix b/pkgs/applications/kde/srcs.nix
index decf0f4a314..bc7b7407d6a 100644
--- a/pkgs/applications/kde/srcs.nix
+++ b/pkgs/applications/kde/srcs.nix
@@ -3,1715 +3,1715 @@
{
akonadi = {
- version = "18.08.0";
+ version = "18.08.1";
src = fetchurl {
- url = "${mirror}/stable/applications/18.08.0/src/akonadi-18.08.0.tar.xz";
- sha256 = "06a1n84w4bfljyariyajzpn1sajkn4dwpsrr47pz38vf1m6dp7mz";
- name = "akonadi-18.08.0.tar.xz";
+ url = "${mirror}/stable/applications/18.08.1/src/akonadi-18.08.1.tar.xz";
+ sha256 = "0fipz3xnbgqk7f9pxfm3p38fniddb76scpb80fvb2v6gn0snlabi";
+ name = "akonadi-18.08.1.tar.xz";
};
};
akonadi-calendar = {
- version = "18.08.0";
+ version = "18.08.1";
src = fetchurl {
- url = "${mirror}/stable/applications/18.08.0/src/akonadi-calendar-18.08.0.tar.xz";
- sha256 = "1qlqvsv4gs50v9dd3nbw8wyq0vgvxvslhnk1hnqpyvh0skcwslh5";
- name = "akonadi-calendar-18.08.0.tar.xz";
+ url = "${mirror}/stable/applications/18.08.1/src/akonadi-calendar-18.08.1.tar.xz";
+ sha256 = "1knwr8s1qn13fan1pq31pr3dk219cmv96mwvd36ir0bd2l7vkmcs";
+ name = "akonadi-calendar-18.08.1.tar.xz";
};
};
akonadi-calendar-tools = {
- version = "18.08.0";
+ version = "18.08.1";
src = fetchurl {
- url = "${mirror}/stable/applications/18.08.0/src/akonadi-calendar-tools-18.08.0.tar.xz";
- sha256 = "1d5kr7nxfy7y9ybi4qnfbfci5kc44ya916j9wgb18r6rfdhdwsxr";
- name = "akonadi-calendar-tools-18.08.0.tar.xz";
+ url = "${mirror}/stable/applications/18.08.1/src/akonadi-calendar-tools-18.08.1.tar.xz";
+ sha256 = "1l4idxwi9h0bff1cwwsm7s4m9bcw4vp4ip5r87vc7687hhphc27l";
+ name = "akonadi-calendar-tools-18.08.1.tar.xz";
};
};
akonadiconsole = {
- version = "18.08.0";
+ version = "18.08.1";
src = fetchurl {
- url = "${mirror}/stable/applications/18.08.0/src/akonadiconsole-18.08.0.tar.xz";
- sha256 = "0qrwgjdmqa5jj8vcbs6n733v462sxnf4jcmh2khjddf2h5na6q86";
- name = "akonadiconsole-18.08.0.tar.xz";
+ url = "${mirror}/stable/applications/18.08.1/src/akonadiconsole-18.08.1.tar.xz";
+ sha256 = "031garrv2q3rv6qjjkzm3rmmd25f6j17sz2yv4hn3zgzydkjjskn";
+ name = "akonadiconsole-18.08.1.tar.xz";
};
};
akonadi-contacts = {
- version = "18.08.0";
+ version = "18.08.1";
src = fetchurl {
- url = "${mirror}/stable/applications/18.08.0/src/akonadi-contacts-18.08.0.tar.xz";
- sha256 = "0jqs0llpxq34j4glgzsfifk5yd24x6smky550s66bjzkyg3j2s2m";
- name = "akonadi-contacts-18.08.0.tar.xz";
+ url = "${mirror}/stable/applications/18.08.1/src/akonadi-contacts-18.08.1.tar.xz";
+ sha256 = "1p7192f7n6g7ihj05f7zzqpzl33sbvzsg479lkl120rmvzbjhfxn";
+ name = "akonadi-contacts-18.08.1.tar.xz";
};
};
akonadi-import-wizard = {
- version = "18.08.0";
+ version = "18.08.1";
src = fetchurl {
- url = "${mirror}/stable/applications/18.08.0/src/akonadi-import-wizard-18.08.0.tar.xz";
- sha256 = "00my9ja8clz758s3x2jjlsxlpc8zfs8vlq4vh9i2vmsacqwrfy24";
- name = "akonadi-import-wizard-18.08.0.tar.xz";
+ url = "${mirror}/stable/applications/18.08.1/src/akonadi-import-wizard-18.08.1.tar.xz";
+ sha256 = "0x80nfa04ffwdvv861ahpgrbnx48ad28ii5glcg5pp5a840jx72s";
+ name = "akonadi-import-wizard-18.08.1.tar.xz";
};
};
akonadi-mime = {
- version = "18.08.0";
+ version = "18.08.1";
src = fetchurl {
- url = "${mirror}/stable/applications/18.08.0/src/akonadi-mime-18.08.0.tar.xz";
- sha256 = "0jj9l1zjh72crj8gfifpn73c5xiyycjgv0cm1qalf370cd1sdx80";
- name = "akonadi-mime-18.08.0.tar.xz";
+ url = "${mirror}/stable/applications/18.08.1/src/akonadi-mime-18.08.1.tar.xz";
+ sha256 = "04xf5kbf30y5g4amx1x3nvkfypid232l4jamx3lnhia5x4kn2q5g";
+ name = "akonadi-mime-18.08.1.tar.xz";
};
};
akonadi-notes = {
- version = "18.08.0";
+ version = "18.08.1";
src = fetchurl {
- url = "${mirror}/stable/applications/18.08.0/src/akonadi-notes-18.08.0.tar.xz";
- sha256 = "0x2v8ylnli29ld6y9vqj18a4bph4zm34zymdmrp3swll1j6xib7q";
- name = "akonadi-notes-18.08.0.tar.xz";
+ url = "${mirror}/stable/applications/18.08.1/src/akonadi-notes-18.08.1.tar.xz";
+ sha256 = "1ib7a7y37mq0dj0arxg2f41a30d8i637359ixhcf9sgpcs3xysns";
+ name = "akonadi-notes-18.08.1.tar.xz";
};
};
akonadi-search = {
- version = "18.08.0";
+ version = "18.08.1";
src = fetchurl {
- url = "${mirror}/stable/applications/18.08.0/src/akonadi-search-18.08.0.tar.xz";
- sha256 = "0fsn7mm1h9m9h3zm2z2fdghbw7m6wdbgfhg7b4iish2br375qh1s";
- name = "akonadi-search-18.08.0.tar.xz";
+ url = "${mirror}/stable/applications/18.08.1/src/akonadi-search-18.08.1.tar.xz";
+ sha256 = "0r7bwfjq9z6ky3riap5gnffzb9k7hwslfprk0jad63dl0djj4qzw";
+ name = "akonadi-search-18.08.1.tar.xz";
};
};
akregator = {
- version = "18.08.0";
+ version = "18.08.1";
src = fetchurl {
- url = "${mirror}/stable/applications/18.08.0/src/akregator-18.08.0.tar.xz";
- sha256 = "1s044m9l8z6safqcarjplmlksappjkx7iry3k8s2p6ld4w377w3c";
- name = "akregator-18.08.0.tar.xz";
+ url = "${mirror}/stable/applications/18.08.1/src/akregator-18.08.1.tar.xz";
+ sha256 = "1js6fbz7hhj0pyjgaz5zhi5bbyw2l9v2gkpj8f8jw4ria2hiz4w8";
+ name = "akregator-18.08.1.tar.xz";
};
};
analitza = {
- version = "18.08.0";
+ version = "18.08.1";
src = fetchurl {
- url = "${mirror}/stable/applications/18.08.0/src/analitza-18.08.0.tar.xz";
- sha256 = "1sqr94mbblqry9a1nkmg6py2w0p1wlnbim99kadmp56ypf483rw7";
- name = "analitza-18.08.0.tar.xz";
+ url = "${mirror}/stable/applications/18.08.1/src/analitza-18.08.1.tar.xz";
+ sha256 = "11zzrgjl2fjbpjagzpzff0aq83ss5037pj4g83wi3qqvlkhphzf2";
+ name = "analitza-18.08.1.tar.xz";
};
};
ark = {
- version = "18.08.0";
+ version = "18.08.1";
src = fetchurl {
- url = "${mirror}/stable/applications/18.08.0/src/ark-18.08.0.tar.xz";
- sha256 = "0dp7lrc0nqwwshcsi1408lqyycqhxgx18bmnf1sq7ysh6d1w6i75";
- name = "ark-18.08.0.tar.xz";
+ url = "${mirror}/stable/applications/18.08.1/src/ark-18.08.1.tar.xz";
+ sha256 = "1k95qnjn4xgi0dnypfiwa86n0zwckkh5qnc54mv9g1xvvzah04cq";
+ name = "ark-18.08.1.tar.xz";
};
};
artikulate = {
- version = "18.08.0";
+ version = "18.08.1";
src = fetchurl {
- url = "${mirror}/stable/applications/18.08.0/src/artikulate-18.08.0.tar.xz";
- sha256 = "12bkfxpaz352823c639q3bal9j6fcaamypv2ql08rn44h9zdjvk8";
- name = "artikulate-18.08.0.tar.xz";
+ url = "${mirror}/stable/applications/18.08.1/src/artikulate-18.08.1.tar.xz";
+ sha256 = "1cvd6sm45j2gg0ga7j3vyz89lrl1ghlwq6516rsxrvsy3vg7vdmy";
+ name = "artikulate-18.08.1.tar.xz";
};
};
audiocd-kio = {
- version = "18.08.0";
+ version = "18.08.1";
src = fetchurl {
- url = "${mirror}/stable/applications/18.08.0/src/audiocd-kio-18.08.0.tar.xz";
- sha256 = "0mh1cfz0dn28i9hqyjmz2cm50qkxzj0qkrvar59p03i2r8vqybf8";
- name = "audiocd-kio-18.08.0.tar.xz";
+ url = "${mirror}/stable/applications/18.08.1/src/audiocd-kio-18.08.1.tar.xz";
+ sha256 = "11wz5glih8jf9l85ncfhg91nyvh7s6q25gfy0vnqk8k0a98h0ghi";
+ name = "audiocd-kio-18.08.1.tar.xz";
};
};
baloo-widgets = {
- version = "18.08.0";
+ version = "18.08.1";
src = fetchurl {
- url = "${mirror}/stable/applications/18.08.0/src/baloo-widgets-18.08.0.tar.xz";
- sha256 = "026lm8m7bp8q1akwgfvzsyyam7jknndif3vmij4x5ra7yy5xa0s9";
- name = "baloo-widgets-18.08.0.tar.xz";
+ url = "${mirror}/stable/applications/18.08.1/src/baloo-widgets-18.08.1.tar.xz";
+ sha256 = "1ab86j0akmz8vqkg3xhx1qlp27ndsg183irhfap313maw88bzwxp";
+ name = "baloo-widgets-18.08.1.tar.xz";
};
};
blinken = {
- version = "18.08.0";
+ version = "18.08.1";
src = fetchurl {
- url = "${mirror}/stable/applications/18.08.0/src/blinken-18.08.0.tar.xz";
- sha256 = "0ivpv27vgzchm0r8zlb02w6l0a8xsi7q173660bjv1ynwalgn3bm";
- name = "blinken-18.08.0.tar.xz";
+ url = "${mirror}/stable/applications/18.08.1/src/blinken-18.08.1.tar.xz";
+ sha256 = "0xzk8ddgr55sil00dl6b00m0x5az81yhd1cklr6mahjgg7w822br";
+ name = "blinken-18.08.1.tar.xz";
};
};
bomber = {
- version = "18.08.0";
+ version = "18.08.1";
src = fetchurl {
- url = "${mirror}/stable/applications/18.08.0/src/bomber-18.08.0.tar.xz";
- sha256 = "0z83hkvs7h0pg91sczmvkkn7yc8xfch5hl7l25b7kac4c9qznzix";
- name = "bomber-18.08.0.tar.xz";
+ url = "${mirror}/stable/applications/18.08.1/src/bomber-18.08.1.tar.xz";
+ sha256 = "0x4z8fa2klhabr99al3iyyf9aq3pm8rk1gi6cjghjgwrrcav7an7";
+ name = "bomber-18.08.1.tar.xz";
};
};
bovo = {
- version = "18.08.0";
+ version = "18.08.1";
src = fetchurl {
- url = "${mirror}/stable/applications/18.08.0/src/bovo-18.08.0.tar.xz";
- sha256 = "0bbkm0c801rcvk8z0idbasn1m7cdd2mpbpb1ap9ghgv2vjbln7va";
- name = "bovo-18.08.0.tar.xz";
+ url = "${mirror}/stable/applications/18.08.1/src/bovo-18.08.1.tar.xz";
+ sha256 = "1jwq9wjkdhy8bvkxg4lvb1m4qqw0zr84ws096nk6pccqk7xlkpr2";
+ name = "bovo-18.08.1.tar.xz";
};
};
calendarsupport = {
- version = "18.08.0";
+ version = "18.08.1";
src = fetchurl {
- url = "${mirror}/stable/applications/18.08.0/src/calendarsupport-18.08.0.tar.xz";
- sha256 = "0ps4963c2wbmlwp7aks16jw2pz74fqlxarhsnjj3r339575inzw2";
- name = "calendarsupport-18.08.0.tar.xz";
+ url = "${mirror}/stable/applications/18.08.1/src/calendarsupport-18.08.1.tar.xz";
+ sha256 = "0hh8jr81hcqyhm9fp0s27g52077d9li8x8rrg3bd18lw3flib0fq";
+ name = "calendarsupport-18.08.1.tar.xz";
};
};
cantor = {
- version = "18.08.0";
+ version = "18.08.1";
src = fetchurl {
- url = "${mirror}/stable/applications/18.08.0/src/cantor-18.08.0.tar.xz";
- sha256 = "08sqr1nxn9a24z4jicmjn9zn64xv3yyy054rzblr2h2hi3n6fqdy";
- name = "cantor-18.08.0.tar.xz";
+ url = "${mirror}/stable/applications/18.08.1/src/cantor-18.08.1.tar.xz";
+ sha256 = "05cvyrf17lvh85qrcg1yf8x2c9d3l9wgbvnlhw4idx06crhvwvbb";
+ name = "cantor-18.08.1.tar.xz";
};
};
cervisia = {
- version = "18.08.0";
+ version = "18.08.1";
src = fetchurl {
- url = "${mirror}/stable/applications/18.08.0/src/cervisia-18.08.0.tar.xz";
- sha256 = "1avc18vv2lb27w5ybiajsr65c65zpvbv43ihz4gcjv7awqf754w7";
- name = "cervisia-18.08.0.tar.xz";
+ url = "${mirror}/stable/applications/18.08.1/src/cervisia-18.08.1.tar.xz";
+ sha256 = "1hir8ssr2yjjkly8kh8qdxqlgaa29q94kpsrk1crcdl67vrc8pph";
+ name = "cervisia-18.08.1.tar.xz";
};
};
dolphin = {
- version = "18.08.0";
+ version = "18.08.1";
src = fetchurl {
- url = "${mirror}/stable/applications/18.08.0/src/dolphin-18.08.0.tar.xz";
- sha256 = "1r3g3qssawhav3dx9a9qdd7dqcjj1ynm6ravj5wx39h4qdflrysy";
- name = "dolphin-18.08.0.tar.xz";
+ url = "${mirror}/stable/applications/18.08.1/src/dolphin-18.08.1.tar.xz";
+ sha256 = "1f8w1315kg5mnz0jfdbynw5kapg529kwr3qc98nh83q4vfrjr7yj";
+ name = "dolphin-18.08.1.tar.xz";
};
};
dolphin-plugins = {
- version = "18.08.0";
+ version = "18.08.1";
src = fetchurl {
- url = "${mirror}/stable/applications/18.08.0/src/dolphin-plugins-18.08.0.tar.xz";
- sha256 = "1j96bkc3xah4ca3a9asplpf152dp234r2bzs5wg25b3aw7zp5siv";
- name = "dolphin-plugins-18.08.0.tar.xz";
+ url = "${mirror}/stable/applications/18.08.1/src/dolphin-plugins-18.08.1.tar.xz";
+ sha256 = "0wa09n3x255d3rn5sndvyybawj2aq0sm0fdvqz7sbnm1c67g6akd";
+ name = "dolphin-plugins-18.08.1.tar.xz";
};
};
dragon = {
- version = "18.08.0";
+ version = "18.08.1";
src = fetchurl {
- url = "${mirror}/stable/applications/18.08.0/src/dragon-18.08.0.tar.xz";
- sha256 = "020vnnzd7crvrv8dbcf41h04hpr2ayrfk6ayxhxpazrzic1sxxx6";
- name = "dragon-18.08.0.tar.xz";
+ url = "${mirror}/stable/applications/18.08.1/src/dragon-18.08.1.tar.xz";
+ sha256 = "1r9zdia4r1g77c456zi1yv3vjrccww6lqrhplwg90bw8091isc7s";
+ name = "dragon-18.08.1.tar.xz";
};
};
eventviews = {
- version = "18.08.0";
+ version = "18.08.1";
src = fetchurl {
- url = "${mirror}/stable/applications/18.08.0/src/eventviews-18.08.0.tar.xz";
- sha256 = "1ca499dzqsy2n6c0s0vrwvjykc4vd5s4m2bkn0vdg2dbyyx9fncj";
- name = "eventviews-18.08.0.tar.xz";
+ url = "${mirror}/stable/applications/18.08.1/src/eventviews-18.08.1.tar.xz";
+ sha256 = "0h5aqjncsmhgjqsj65j12bx4rb5rf4604fs6h04lda8jrk2qla3y";
+ name = "eventviews-18.08.1.tar.xz";
};
};
ffmpegthumbs = {
- version = "18.08.0";
+ version = "18.08.1";
src = fetchurl {
- url = "${mirror}/stable/applications/18.08.0/src/ffmpegthumbs-18.08.0.tar.xz";
- sha256 = "1rbfbwnyync4j15qzdhn47gksr6jm97pgkld2x3p564gi98w0vrn";
- name = "ffmpegthumbs-18.08.0.tar.xz";
+ url = "${mirror}/stable/applications/18.08.1/src/ffmpegthumbs-18.08.1.tar.xz";
+ sha256 = "11gwrw3fm6di4z5a04jqxfvm176mh20h8pfpv0c0zq9qipr1khkc";
+ name = "ffmpegthumbs-18.08.1.tar.xz";
};
};
filelight = {
- version = "18.08.0";
+ version = "18.08.1";
src = fetchurl {
- url = "${mirror}/stable/applications/18.08.0/src/filelight-18.08.0.tar.xz";
- sha256 = "1wx6q0gq4zlg95a93sg7zqkbaka1pcn99jsjkdncq1z4lfphppk9";
- name = "filelight-18.08.0.tar.xz";
+ url = "${mirror}/stable/applications/18.08.1/src/filelight-18.08.1.tar.xz";
+ sha256 = "03sz1bnz7w3b4227hvfidi225ci5i83z022fgkb632b0dp2l9m8p";
+ name = "filelight-18.08.1.tar.xz";
};
};
granatier = {
- version = "18.08.0";
+ version = "18.08.1";
src = fetchurl {
- url = "${mirror}/stable/applications/18.08.0/src/granatier-18.08.0.tar.xz";
- sha256 = "06nzgpwvgvbh6hf5yxmcxigh3n72qa0mbiv7k56157yyvxigk62q";
- name = "granatier-18.08.0.tar.xz";
+ url = "${mirror}/stable/applications/18.08.1/src/granatier-18.08.1.tar.xz";
+ sha256 = "062qh639n1k919n67k2xn5h829gr0ncczif9mffw8ggvqqrzh560";
+ name = "granatier-18.08.1.tar.xz";
};
};
grantlee-editor = {
- version = "18.08.0";
+ version = "18.08.1";
src = fetchurl {
- url = "${mirror}/stable/applications/18.08.0/src/grantlee-editor-18.08.0.tar.xz";
- sha256 = "06m2n5rcgp63xgnr5jdzly7fda8zx5r3ki07ldxz1xivd985zmfp";
- name = "grantlee-editor-18.08.0.tar.xz";
+ url = "${mirror}/stable/applications/18.08.1/src/grantlee-editor-18.08.1.tar.xz";
+ sha256 = "0wl8ii23wh1xakf6vcsv7n259kw0b3lpz7qnfmhz8nwj3k890g9q";
+ name = "grantlee-editor-18.08.1.tar.xz";
};
};
grantleetheme = {
- version = "18.08.0";
+ version = "18.08.1";
src = fetchurl {
- url = "${mirror}/stable/applications/18.08.0/src/grantleetheme-18.08.0.tar.xz";
- sha256 = "1mk80hfra4nmrcb0ff3n7l33pbw6j5lypb3ip7g4c1p8qik6imfv";
- name = "grantleetheme-18.08.0.tar.xz";
+ url = "${mirror}/stable/applications/18.08.1/src/grantleetheme-18.08.1.tar.xz";
+ sha256 = "1ydi89smsim4lvgwclm9xsnldimsy45b69qsipz9vhhck4pccd7n";
+ name = "grantleetheme-18.08.1.tar.xz";
};
};
gwenview = {
- version = "18.08.0";
+ version = "18.08.1";
src = fetchurl {
- url = "${mirror}/stable/applications/18.08.0/src/gwenview-18.08.0.tar.xz";
- sha256 = "1nv9a7pj0h2m3wxzy03jw3pi5ps3xqvq9sx7mblq8p4klga2pcnl";
- name = "gwenview-18.08.0.tar.xz";
+ url = "${mirror}/stable/applications/18.08.1/src/gwenview-18.08.1.tar.xz";
+ sha256 = "0p32v9y2gz5q4j1vz0yqw90qg8l7nbyzxqn7pqwrzbhlycsx7mp9";
+ name = "gwenview-18.08.1.tar.xz";
};
};
incidenceeditor = {
- version = "18.08.0";
+ version = "18.08.1";
src = fetchurl {
- url = "${mirror}/stable/applications/18.08.0/src/incidenceeditor-18.08.0.tar.xz";
- sha256 = "1s88i1l30b30an8lwc8sdlzfm1cvmb9n5786bs9y0jfgw01wdl7j";
- name = "incidenceeditor-18.08.0.tar.xz";
+ url = "${mirror}/stable/applications/18.08.1/src/incidenceeditor-18.08.1.tar.xz";
+ sha256 = "0da1jba66pvjar5wxcx2q9dhfwj2mlwk17h0j9xc9kgxj2y0bzx9";
+ name = "incidenceeditor-18.08.1.tar.xz";
};
};
juk = {
- version = "18.08.0";
+ version = "18.08.1";
src = fetchurl {
- url = "${mirror}/stable/applications/18.08.0/src/juk-18.08.0.tar.xz";
- sha256 = "1lzw9ih4771vdxqngc0ja57v9y6wlgf8dbmnjax74ryi232py1d9";
- name = "juk-18.08.0.tar.xz";
+ url = "${mirror}/stable/applications/18.08.1/src/juk-18.08.1.tar.xz";
+ sha256 = "17mylgsw11nc64y0if3imrs2hsxwfdflnn1a4f5p64awrzid04mc";
+ name = "juk-18.08.1.tar.xz";
};
};
k3b = {
- version = "18.08.0";
+ version = "18.08.1";
src = fetchurl {
- url = "${mirror}/stable/applications/18.08.0/src/k3b-18.08.0.tar.xz";
- sha256 = "1lm9140xc5mq1szyc4vkms6b3qhl4b3yn74kqp942b8k9djn17md";
- name = "k3b-18.08.0.tar.xz";
+ url = "${mirror}/stable/applications/18.08.1/src/k3b-18.08.1.tar.xz";
+ sha256 = "1vv7pr1i3vj778m763mv1bzrq29kaqm02hnllhgq4dcci3hafn6a";
+ name = "k3b-18.08.1.tar.xz";
};
};
kaccounts-integration = {
- version = "18.08.0";
+ version = "18.08.1";
src = fetchurl {
- url = "${mirror}/stable/applications/18.08.0/src/kaccounts-integration-18.08.0.tar.xz";
- sha256 = "0wvqhf9br8nqqacyn6j4k2323w6nixkfzlajkmx872d31d7aqf11";
- name = "kaccounts-integration-18.08.0.tar.xz";
+ url = "${mirror}/stable/applications/18.08.1/src/kaccounts-integration-18.08.1.tar.xz";
+ sha256 = "18nbj4vyakhxvzy35j4b7iap06lp7zwhfpylfpnshjbcrb724qzs";
+ name = "kaccounts-integration-18.08.1.tar.xz";
};
};
kaccounts-providers = {
- version = "18.08.0";
+ version = "18.08.1";
src = fetchurl {
- url = "${mirror}/stable/applications/18.08.0/src/kaccounts-providers-18.08.0.tar.xz";
- sha256 = "1zxyqwdrf9pp5b1vnd8p4wz21ciavffjxd68vcjjyj8bba30c51l";
- name = "kaccounts-providers-18.08.0.tar.xz";
+ url = "${mirror}/stable/applications/18.08.1/src/kaccounts-providers-18.08.1.tar.xz";
+ sha256 = "0ygiyv5fxf6b62sfibm621cz5cxin6qa1mnjpdxfj72xj8p7dbd7";
+ name = "kaccounts-providers-18.08.1.tar.xz";
};
};
kaddressbook = {
- version = "18.08.0";
+ version = "18.08.1";
src = fetchurl {
- url = "${mirror}/stable/applications/18.08.0/src/kaddressbook-18.08.0.tar.xz";
- sha256 = "1wgqqnikv9qyrb4nvkm7h91r1iqfkmbpdp67lcw4jkglqghnn2qc";
- name = "kaddressbook-18.08.0.tar.xz";
+ url = "${mirror}/stable/applications/18.08.1/src/kaddressbook-18.08.1.tar.xz";
+ sha256 = "0917d7m2nvgadkns8im7fzzqp2m5i21m4nrw75hv6bil7v0cshnn";
+ name = "kaddressbook-18.08.1.tar.xz";
};
};
kajongg = {
- version = "18.08.0";
+ version = "18.08.1";
src = fetchurl {
- url = "${mirror}/stable/applications/18.08.0/src/kajongg-18.08.0.tar.xz";
- sha256 = "0dfrwzq1p9ikff52qi50ckb769pfij7gzn61r6pdkkfjgy86364y";
- name = "kajongg-18.08.0.tar.xz";
+ url = "${mirror}/stable/applications/18.08.1/src/kajongg-18.08.1.tar.xz";
+ sha256 = "0apjydg0q9yvvnlirhhvri2bqwzrkrq85fzphi49pr5ki3ah03dz";
+ name = "kajongg-18.08.1.tar.xz";
};
};
kalarm = {
- version = "18.08.0";
+ version = "18.08.1";
src = fetchurl {
- url = "${mirror}/stable/applications/18.08.0/src/kalarm-18.08.0.tar.xz";
- sha256 = "0415yq61q700slmm6vskd92pc2sp1027flghgans80i29617zgaq";
- name = "kalarm-18.08.0.tar.xz";
+ url = "${mirror}/stable/applications/18.08.1/src/kalarm-18.08.1.tar.xz";
+ sha256 = "1558nls14a22pwjnk59fpgmb4ddrdvzf3rdhl0nf6kkgr0ma0p1w";
+ name = "kalarm-18.08.1.tar.xz";
};
};
kalarmcal = {
- version = "18.08.0";
+ version = "18.08.1";
src = fetchurl {
- url = "${mirror}/stable/applications/18.08.0/src/kalarmcal-18.08.0.tar.xz";
- sha256 = "0ss56dy451lbbq872sarqcyapf4g6kgw78s88hgs7z5mlyj8xnll";
- name = "kalarmcal-18.08.0.tar.xz";
+ url = "${mirror}/stable/applications/18.08.1/src/kalarmcal-18.08.1.tar.xz";
+ sha256 = "02shp4m85frjs4kp5n2kv3nz5frjfrckm7zkjlnwn6lrg6jz7q0f";
+ name = "kalarmcal-18.08.1.tar.xz";
};
};
kalgebra = {
- version = "18.08.0";
+ version = "18.08.1";
src = fetchurl {
- url = "${mirror}/stable/applications/18.08.0/src/kalgebra-18.08.0.tar.xz";
- sha256 = "0fv4v7xnspqjbc7x6n2gcyjssm15apszbvj4gs1w2lwlbbr3i224";
- name = "kalgebra-18.08.0.tar.xz";
+ url = "${mirror}/stable/applications/18.08.1/src/kalgebra-18.08.1.tar.xz";
+ sha256 = "1996vbcvbpkvmya291w2kxfjwkm3baqflx04drrglildsrn6q07w";
+ name = "kalgebra-18.08.1.tar.xz";
};
};
kalzium = {
- version = "18.08.0";
+ version = "18.08.1";
src = fetchurl {
- url = "${mirror}/stable/applications/18.08.0/src/kalzium-18.08.0.tar.xz";
- sha256 = "0bjpiir1xxwvhs4xgnvbhphw24iif9g4kj9zg61bqcvq5zxf821x";
- name = "kalzium-18.08.0.tar.xz";
+ url = "${mirror}/stable/applications/18.08.1/src/kalzium-18.08.1.tar.xz";
+ sha256 = "0sp89xi94xpix1gpz1s7qya1ki7lbbx93yr17bmhlp4dhyfqbzw5";
+ name = "kalzium-18.08.1.tar.xz";
};
};
kamera = {
- version = "18.08.0";
+ version = "18.08.1";
src = fetchurl {
- url = "${mirror}/stable/applications/18.08.0/src/kamera-18.08.0.tar.xz";
- sha256 = "169vsxnpcgxws27hcap2l5wjbfyxxi30321c8r3p8fm2klvbc8nw";
- name = "kamera-18.08.0.tar.xz";
+ url = "${mirror}/stable/applications/18.08.1/src/kamera-18.08.1.tar.xz";
+ sha256 = "03p94azchdgr19mbgpgkvb3rlddik3bjl6iy3j0yd99frlns15ck";
+ name = "kamera-18.08.1.tar.xz";
};
};
kamoso = {
- version = "18.08.0";
+ version = "18.08.1";
src = fetchurl {
- url = "${mirror}/stable/applications/18.08.0/src/kamoso-18.08.0.tar.xz";
- sha256 = "1a8azx7rdbzznh9qwzg0x6w50vb5bc6cmd442j2hhdwkl15dqpwd";
- name = "kamoso-18.08.0.tar.xz";
+ url = "${mirror}/stable/applications/18.08.1/src/kamoso-18.08.1.tar.xz";
+ sha256 = "11hm8q2v3x1rhm2smiqm9gmscbpdkyfb6x4sl0xrnm36m7ps54qb";
+ name = "kamoso-18.08.1.tar.xz";
};
};
kanagram = {
- version = "18.08.0";
+ version = "18.08.1";
src = fetchurl {
- url = "${mirror}/stable/applications/18.08.0/src/kanagram-18.08.0.tar.xz";
- sha256 = "02v3xlkfphkk86y8yrw10lq7f4wc7gmh02ms2w00aqrllkpja4vn";
- name = "kanagram-18.08.0.tar.xz";
+ url = "${mirror}/stable/applications/18.08.1/src/kanagram-18.08.1.tar.xz";
+ sha256 = "0mq8qrvvn30axhizzlzhzp5vl9q1ys7s7p5v525flyyz9fs011dz";
+ name = "kanagram-18.08.1.tar.xz";
};
};
kapman = {
- version = "18.08.0";
+ version = "18.08.1";
src = fetchurl {
- url = "${mirror}/stable/applications/18.08.0/src/kapman-18.08.0.tar.xz";
- sha256 = "03fhxn8zckidkab56fzgwai0d1ac5k3il32w881gq5z012ms013h";
- name = "kapman-18.08.0.tar.xz";
+ url = "${mirror}/stable/applications/18.08.1/src/kapman-18.08.1.tar.xz";
+ sha256 = "0grq9yllpaa267lx654n39mj7ll0g2pj6s42fq7b7236naqyna3d";
+ name = "kapman-18.08.1.tar.xz";
};
};
kapptemplate = {
- version = "18.08.0";
+ version = "18.08.1";
src = fetchurl {
- url = "${mirror}/stable/applications/18.08.0/src/kapptemplate-18.08.0.tar.xz";
- sha256 = "10fyvwxf6xmn8jdc4p3m3jpb8ykaga1jmwx2hzhf8c6a3rrcxvvb";
- name = "kapptemplate-18.08.0.tar.xz";
+ url = "${mirror}/stable/applications/18.08.1/src/kapptemplate-18.08.1.tar.xz";
+ sha256 = "1dp9831hzmh9gd3qwvfyb2ihindl5c42jvmmrhnmfbz1j199z98w";
+ name = "kapptemplate-18.08.1.tar.xz";
};
};
kate = {
- version = "18.08.0";
+ version = "18.08.1";
src = fetchurl {
- url = "${mirror}/stable/applications/18.08.0/src/kate-18.08.0.tar.xz";
- sha256 = "1licprflzcsrfap7klr1ia2kl2z2cp16zgznphrqkkn9n6x7xz67";
- name = "kate-18.08.0.tar.xz";
+ url = "${mirror}/stable/applications/18.08.1/src/kate-18.08.1.tar.xz";
+ sha256 = "1jsdk6jfff36fcb1x0vxl0iqa1xrl0400bm7fhp1gv9m553pkysa";
+ name = "kate-18.08.1.tar.xz";
};
};
katomic = {
- version = "18.08.0";
+ version = "18.08.1";
src = fetchurl {
- url = "${mirror}/stable/applications/18.08.0/src/katomic-18.08.0.tar.xz";
- sha256 = "07d9irgqrawll18fi3b2mrjj416gpkn43bsriifkraqf8yrn3m4s";
- name = "katomic-18.08.0.tar.xz";
+ url = "${mirror}/stable/applications/18.08.1/src/katomic-18.08.1.tar.xz";
+ sha256 = "0cd8l7hn89xr5spq107nqxz7dx12drvv70siqx896d8lfpkmh96d";
+ name = "katomic-18.08.1.tar.xz";
};
};
kbackup = {
- version = "18.08.0";
+ version = "18.08.1";
src = fetchurl {
- url = "${mirror}/stable/applications/18.08.0/src/kbackup-18.08.0.tar.xz";
- sha256 = "14nmk7dwrmkfv7kz4r64vzy46n48g3l1iqj0937qnpbqk12yvak9";
- name = "kbackup-18.08.0.tar.xz";
+ url = "${mirror}/stable/applications/18.08.1/src/kbackup-18.08.1.tar.xz";
+ sha256 = "15x75biiwixiw0j329pcxhh5sfyqm82x2rdfb0nqp0zz01cwicv6";
+ name = "kbackup-18.08.1.tar.xz";
};
};
kblackbox = {
- version = "18.08.0";
+ version = "18.08.1";
src = fetchurl {
- url = "${mirror}/stable/applications/18.08.0/src/kblackbox-18.08.0.tar.xz";
- sha256 = "0nd4nsx7yyiy1g1g4v0gaw0m6r3kb07gnn8236bch6xxy9xcdzhb";
- name = "kblackbox-18.08.0.tar.xz";
+ url = "${mirror}/stable/applications/18.08.1/src/kblackbox-18.08.1.tar.xz";
+ sha256 = "00xd6k9ndm1jbr1j2mhi8xfcxqdiwzwnb1cvr35a22r414lbc3cw";
+ name = "kblackbox-18.08.1.tar.xz";
};
};
kblocks = {
- version = "18.08.0";
+ version = "18.08.1";
src = fetchurl {
- url = "${mirror}/stable/applications/18.08.0/src/kblocks-18.08.0.tar.xz";
- sha256 = "1pnxzfp3bd089bjbdsi0iwjpw60p36lb110yb61cv0vb54g1sia1";
- name = "kblocks-18.08.0.tar.xz";
+ url = "${mirror}/stable/applications/18.08.1/src/kblocks-18.08.1.tar.xz";
+ sha256 = "0y9hfxb9rpijpkm1r697v1w5q3gny8pa3ax5y0qq6695j2h7c52p";
+ name = "kblocks-18.08.1.tar.xz";
};
};
kblog = {
- version = "18.08.0";
+ version = "18.08.1";
src = fetchurl {
- url = "${mirror}/stable/applications/18.08.0/src/kblog-18.08.0.tar.xz";
- sha256 = "00q7266lx29bfgzhfmb192l8h3qwgpj3yyfc0lykkbhjf6d9w783";
- name = "kblog-18.08.0.tar.xz";
+ url = "${mirror}/stable/applications/18.08.1/src/kblog-18.08.1.tar.xz";
+ sha256 = "0ickxhz7y098zx88308774kkz8wf6v51ydlnbmnayb8lyaw8ms8i";
+ name = "kblog-18.08.1.tar.xz";
};
};
kbounce = {
- version = "18.08.0";
+ version = "18.08.1";
src = fetchurl {
- url = "${mirror}/stable/applications/18.08.0/src/kbounce-18.08.0.tar.xz";
- sha256 = "0x07lxqip9l2k9mdpan03yh17ammkd1f242l2p3qq3j1s71bpznm";
- name = "kbounce-18.08.0.tar.xz";
+ url = "${mirror}/stable/applications/18.08.1/src/kbounce-18.08.1.tar.xz";
+ sha256 = "1k2qmdhm3sllxhsz6hhs94fndm1lrifhh7md2lmws2l2977ymkpi";
+ name = "kbounce-18.08.1.tar.xz";
};
};
kbreakout = {
- version = "18.08.0";
+ version = "18.08.1";
src = fetchurl {
- url = "${mirror}/stable/applications/18.08.0/src/kbreakout-18.08.0.tar.xz";
- sha256 = "1jrix92p48zcpgwvfxn484bw1k8ynfacm4iww14splx2d9skj489";
- name = "kbreakout-18.08.0.tar.xz";
+ url = "${mirror}/stable/applications/18.08.1/src/kbreakout-18.08.1.tar.xz";
+ sha256 = "06mxh67pyg7fv8x152kd79xzrfnlw22x4x3iklhbngsk1cqsg62r";
+ name = "kbreakout-18.08.1.tar.xz";
};
};
kbruch = {
- version = "18.08.0";
+ version = "18.08.1";
src = fetchurl {
- url = "${mirror}/stable/applications/18.08.0/src/kbruch-18.08.0.tar.xz";
- sha256 = "1gkij27hl847bc2jdnjqvigncdmb11spj2rsy825rsnpiqxbqv8f";
- name = "kbruch-18.08.0.tar.xz";
+ url = "${mirror}/stable/applications/18.08.1/src/kbruch-18.08.1.tar.xz";
+ sha256 = "0m4m1xqp2aqkqs7cgj8z5c6b3s64d330bfgsq7mnm2wakmc69x9g";
+ name = "kbruch-18.08.1.tar.xz";
};
};
kcachegrind = {
- version = "18.08.0";
+ version = "18.08.1";
src = fetchurl {
- url = "${mirror}/stable/applications/18.08.0/src/kcachegrind-18.08.0.tar.xz";
- sha256 = "13nqcxh21apxpzg51alsgn34hps21nr7aqyh60kd4fbmmsxrqll0";
- name = "kcachegrind-18.08.0.tar.xz";
+ url = "${mirror}/stable/applications/18.08.1/src/kcachegrind-18.08.1.tar.xz";
+ sha256 = "0llqmziq0h6wx3inxc2rmph1qs68fb34q09fvhfasg43l8y8a6cm";
+ name = "kcachegrind-18.08.1.tar.xz";
};
};
kcalc = {
- version = "18.08.0";
+ version = "18.08.1";
src = fetchurl {
- url = "${mirror}/stable/applications/18.08.0/src/kcalc-18.08.0.tar.xz";
- sha256 = "04bdbdyc9lky6i0dkm6w9f2k3gvr9zq5b9yc6qhl4smdiivlqjb6";
- name = "kcalc-18.08.0.tar.xz";
+ url = "${mirror}/stable/applications/18.08.1/src/kcalc-18.08.1.tar.xz";
+ sha256 = "139pjh31k9cy608h7yl9kxq48x6dsm5c0gcbndqc6nsjwd88ck04";
+ name = "kcalc-18.08.1.tar.xz";
};
};
kcalcore = {
- version = "18.08.0";
+ version = "18.08.1";
src = fetchurl {
- url = "${mirror}/stable/applications/18.08.0/src/kcalcore-18.08.0.tar.xz";
- sha256 = "0sdzx0ygq89np2cj22v06m9j00nwbqn97rm43nffgixwvrlf1wy5";
- name = "kcalcore-18.08.0.tar.xz";
+ url = "${mirror}/stable/applications/18.08.1/src/kcalcore-18.08.1.tar.xz";
+ sha256 = "0kf92imqm9lqisfy3i25qn0g588p35w23xl0vmx75i67pzr3jcjn";
+ name = "kcalcore-18.08.1.tar.xz";
};
};
kcalutils = {
- version = "18.08.0";
+ version = "18.08.1";
src = fetchurl {
- url = "${mirror}/stable/applications/18.08.0/src/kcalutils-18.08.0.tar.xz";
- sha256 = "12s2anmwi3q95kjl197jis90vi5gzpxs0b4xj4m6n4lzmnyjvfxl";
- name = "kcalutils-18.08.0.tar.xz";
+ url = "${mirror}/stable/applications/18.08.1/src/kcalutils-18.08.1.tar.xz";
+ sha256 = "1z346k9aniv3bq9c1dak3x5hzymi71ygns773r4agzm4kdn8ghwh";
+ name = "kcalutils-18.08.1.tar.xz";
};
};
kcharselect = {
- version = "18.08.0";
+ version = "18.08.1";
src = fetchurl {
- url = "${mirror}/stable/applications/18.08.0/src/kcharselect-18.08.0.tar.xz";
- sha256 = "1gfzzzk5admdclw75qhnsf3271p2lr0fgqzxvclcxppwmv5j56aq";
- name = "kcharselect-18.08.0.tar.xz";
+ url = "${mirror}/stable/applications/18.08.1/src/kcharselect-18.08.1.tar.xz";
+ sha256 = "06r9q03rs00zqs0dpb0wxa9663pc2i51hsf83c0z9jnkpq6sjijb";
+ name = "kcharselect-18.08.1.tar.xz";
};
};
kcolorchooser = {
- version = "18.08.0";
+ version = "18.08.1";
src = fetchurl {
- url = "${mirror}/stable/applications/18.08.0/src/kcolorchooser-18.08.0.tar.xz";
- sha256 = "1sxlx6cnpm0yfbrbk1pqaf0lsf1mgzdnkszr30hwz6z5lvvzj73l";
- name = "kcolorchooser-18.08.0.tar.xz";
+ url = "${mirror}/stable/applications/18.08.1/src/kcolorchooser-18.08.1.tar.xz";
+ sha256 = "027afkj0mllvnwdrrfjnpp4769dp5ixrdmd17r59q2hja0wz6cpf";
+ name = "kcolorchooser-18.08.1.tar.xz";
};
};
kcontacts = {
- version = "18.08.0";
+ version = "18.08.1";
src = fetchurl {
- url = "${mirror}/stable/applications/18.08.0/src/kcontacts-18.08.0.tar.xz";
- sha256 = "0cil96cd383gvqa2dw1lhaw3vi3m04y4rpjqmiapzwnn4ck0v1ii";
- name = "kcontacts-18.08.0.tar.xz";
+ url = "${mirror}/stable/applications/18.08.1/src/kcontacts-18.08.1.tar.xz";
+ sha256 = "1y0drw7n9mhyq84brqxz4rr666pqj5ww94f2i8k34chdzkcqsr52";
+ name = "kcontacts-18.08.1.tar.xz";
};
};
kcron = {
- version = "18.08.0";
+ version = "18.08.1";
src = fetchurl {
- url = "${mirror}/stable/applications/18.08.0/src/kcron-18.08.0.tar.xz";
- sha256 = "14lkaz1b6hnpwvxnnx3mgv3fg86vm1g45fggfx25x6x72kiihhzq";
- name = "kcron-18.08.0.tar.xz";
+ url = "${mirror}/stable/applications/18.08.1/src/kcron-18.08.1.tar.xz";
+ sha256 = "1blalii8b6i8b1cknwcarbj84m6rrffsjamgnzyz6l81l43b0j9m";
+ name = "kcron-18.08.1.tar.xz";
};
};
kdav = {
- version = "18.08.0";
+ version = "18.08.1";
src = fetchurl {
- url = "${mirror}/stable/applications/18.08.0/src/kdav-18.08.0.tar.xz";
- sha256 = "13jwc4623f9mx64i7fb3ha5gwbqgfd54dirbvcyyglrzipxmgja1";
- name = "kdav-18.08.0.tar.xz";
+ url = "${mirror}/stable/applications/18.08.1/src/kdav-18.08.1.tar.xz";
+ sha256 = "046h72gvcc9wxq0rn5ribf3lr03q6zq6acz2c3kxsbdw6kbypb2x";
+ name = "kdav-18.08.1.tar.xz";
};
};
kdebugsettings = {
- version = "18.08.0";
+ version = "18.08.1";
src = fetchurl {
- url = "${mirror}/stable/applications/18.08.0/src/kdebugsettings-18.08.0.tar.xz";
- sha256 = "1ddqcfq2icsk2xmfr02jawdgxyydhx4yyhrfd7pk8cfw66rm23br";
- name = "kdebugsettings-18.08.0.tar.xz";
+ url = "${mirror}/stable/applications/18.08.1/src/kdebugsettings-18.08.1.tar.xz";
+ sha256 = "0n6lvccm803g9ilwwdka0srvak14i8lk5g149c6qmd73wywqdk84";
+ name = "kdebugsettings-18.08.1.tar.xz";
};
};
kde-dev-scripts = {
- version = "18.08.0";
+ version = "18.08.1";
src = fetchurl {
- url = "${mirror}/stable/applications/18.08.0/src/kde-dev-scripts-18.08.0.tar.xz";
- sha256 = "1glnm91wn3xdd6zqqy2p178f05z5wn3gr1i6jyqb0zkl8ansy3yi";
- name = "kde-dev-scripts-18.08.0.tar.xz";
+ url = "${mirror}/stable/applications/18.08.1/src/kde-dev-scripts-18.08.1.tar.xz";
+ sha256 = "1y162wn5mpi0c3wa8vjb2al2mizz292jzj22wvdzp19vliy32j95";
+ name = "kde-dev-scripts-18.08.1.tar.xz";
};
};
kde-dev-utils = {
- version = "18.08.0";
+ version = "18.08.1";
src = fetchurl {
- url = "${mirror}/stable/applications/18.08.0/src/kde-dev-utils-18.08.0.tar.xz";
- sha256 = "1dk510kgjgvycdyzr5mwq9z1b3xr8hlpm4ahfwlfn299gl563fwf";
- name = "kde-dev-utils-18.08.0.tar.xz";
+ url = "${mirror}/stable/applications/18.08.1/src/kde-dev-utils-18.08.1.tar.xz";
+ sha256 = "1w5r7w7s5iaaxaxicd42nh2dhmc7anfqpv9n92rrk1hwpmjbphg5";
+ name = "kde-dev-utils-18.08.1.tar.xz";
};
};
kdeedu-data = {
- version = "18.08.0";
+ version = "18.08.1";
src = fetchurl {
- url = "${mirror}/stable/applications/18.08.0/src/kdeedu-data-18.08.0.tar.xz";
- sha256 = "1ph3bw4xgmgh28j9vnj9v1amgisy3f44whpwwhzin9zgzz0cw3gw";
- name = "kdeedu-data-18.08.0.tar.xz";
+ url = "${mirror}/stable/applications/18.08.1/src/kdeedu-data-18.08.1.tar.xz";
+ sha256 = "0gpg1haawwi1d1p1pwzx2127kkdpg4i833312cl637v5qgvg7xhc";
+ name = "kdeedu-data-18.08.1.tar.xz";
};
};
kdegraphics-mobipocket = {
- version = "18.08.0";
+ version = "18.08.1";
src = fetchurl {
- url = "${mirror}/stable/applications/18.08.0/src/kdegraphics-mobipocket-18.08.0.tar.xz";
- sha256 = "0p3bci612qbqnbps4g4yb2kd1rs6kx2ppcls6vpfb035c28ygf7a";
- name = "kdegraphics-mobipocket-18.08.0.tar.xz";
+ url = "${mirror}/stable/applications/18.08.1/src/kdegraphics-mobipocket-18.08.1.tar.xz";
+ sha256 = "13jw2gn3wc946zdgr2hi1nsd6m518idn4q5wq0ym715mfbfs17zn";
+ name = "kdegraphics-mobipocket-18.08.1.tar.xz";
};
};
kdegraphics-thumbnailers = {
- version = "18.08.0";
+ version = "18.08.1";
src = fetchurl {
- url = "${mirror}/stable/applications/18.08.0/src/kdegraphics-thumbnailers-18.08.0.tar.xz";
- sha256 = "0dwfphz70y0g43a9nxfda78qwsv7y4llx1f51x6n8jl64kpxnijw";
- name = "kdegraphics-thumbnailers-18.08.0.tar.xz";
+ url = "${mirror}/stable/applications/18.08.1/src/kdegraphics-thumbnailers-18.08.1.tar.xz";
+ sha256 = "0h9h5d81bjmjcgbxh3sy776rddpxxcwyj0jjix67q37kndbap4k0";
+ name = "kdegraphics-thumbnailers-18.08.1.tar.xz";
};
};
kdenetwork-filesharing = {
- version = "18.08.0";
+ version = "18.08.1";
src = fetchurl {
- url = "${mirror}/stable/applications/18.08.0/src/kdenetwork-filesharing-18.08.0.tar.xz";
- sha256 = "0l5f9ffwsk0s9r87kid9k1a7j2v4lcdzbn2w4qb2pg22k92k8p67";
- name = "kdenetwork-filesharing-18.08.0.tar.xz";
+ url = "${mirror}/stable/applications/18.08.1/src/kdenetwork-filesharing-18.08.1.tar.xz";
+ sha256 = "1bfqk57d1xfqbig1r8cymlp0pgsfmrix5nr4m1a015rmpqnvb92d";
+ name = "kdenetwork-filesharing-18.08.1.tar.xz";
};
};
kdenlive = {
- version = "18.08.0";
+ version = "18.08.1";
src = fetchurl {
- url = "${mirror}/stable/applications/18.08.0/src/kdenlive-18.08.0.tar.xz";
- sha256 = "06d0viqma7kivzv3hbsiirkfhbj28mdr2nr3f5ic56381q3ps923";
- name = "kdenlive-18.08.0.tar.xz";
+ url = "${mirror}/stable/applications/18.08.1/src/kdenlive-18.08.1.tar.xz";
+ sha256 = "1ampvjlxn3q8l3mi4nap4lq3hgxzmp6ic88hzmkdj41vpm01flpf";
+ name = "kdenlive-18.08.1.tar.xz";
};
};
kdepim-addons = {
- version = "18.08.0";
+ version = "18.08.1";
src = fetchurl {
- url = "${mirror}/stable/applications/18.08.0/src/kdepim-addons-18.08.0.tar.xz";
- sha256 = "05141013jdaascsb7ihbmd4f1lh1r6ah5w39wp5vky6ma35zv2l1";
- name = "kdepim-addons-18.08.0.tar.xz";
+ url = "${mirror}/stable/applications/18.08.1/src/kdepim-addons-18.08.1.tar.xz";
+ sha256 = "0fgggq0dl4qy0wha4jjarxgjly54s9fpqkm2macfq2bgvdbsjrgj";
+ name = "kdepim-addons-18.08.1.tar.xz";
};
};
kdepim-apps-libs = {
- version = "18.08.0";
+ version = "18.08.1";
src = fetchurl {
- url = "${mirror}/stable/applications/18.08.0/src/kdepim-apps-libs-18.08.0.tar.xz";
- sha256 = "0zpx3nilrsvgmgx5visppyx3kn2g5k8fnhfy649k6wa35p846495";
- name = "kdepim-apps-libs-18.08.0.tar.xz";
+ url = "${mirror}/stable/applications/18.08.1/src/kdepim-apps-libs-18.08.1.tar.xz";
+ sha256 = "0v4vvrjh1amlrvmf61cjfb2yr1j4j0qypf5349spnnlwjjrxn2hw";
+ name = "kdepim-apps-libs-18.08.1.tar.xz";
};
};
kdepim-runtime = {
- version = "18.08.0";
+ version = "18.08.1";
src = fetchurl {
- url = "${mirror}/stable/applications/18.08.0/src/kdepim-runtime-18.08.0.tar.xz";
- sha256 = "0b1jbksxks32s8gjzrjhh4nja089j5dq75yaiil99w11f7nfpkar";
- name = "kdepim-runtime-18.08.0.tar.xz";
+ url = "${mirror}/stable/applications/18.08.1/src/kdepim-runtime-18.08.1.tar.xz";
+ sha256 = "0133d86z1fggzg15jk2p8pg42zcv3khikpgdlyvz4si3canmvkwj";
+ name = "kdepim-runtime-18.08.1.tar.xz";
};
};
kdesdk-kioslaves = {
- version = "18.08.0";
+ version = "18.08.1";
src = fetchurl {
- url = "${mirror}/stable/applications/18.08.0/src/kdesdk-kioslaves-18.08.0.tar.xz";
- sha256 = "1fpg4sdbgzvlc9z7wwxxbp466fhybphvmcdpplbr7ws3588792cb";
- name = "kdesdk-kioslaves-18.08.0.tar.xz";
+ url = "${mirror}/stable/applications/18.08.1/src/kdesdk-kioslaves-18.08.1.tar.xz";
+ sha256 = "1nn4bzywd42ijbzlcnkdlr84n1p6argrd1gz91yyyrhqark7ma76";
+ name = "kdesdk-kioslaves-18.08.1.tar.xz";
};
};
kdesdk-thumbnailers = {
- version = "18.08.0";
+ version = "18.08.1";
src = fetchurl {
- url = "${mirror}/stable/applications/18.08.0/src/kdesdk-thumbnailers-18.08.0.tar.xz";
- sha256 = "047rnzn2lsbhfll0fp4vdf4jsyixg7vmpl2xyvi1y85df5nvv2pc";
- name = "kdesdk-thumbnailers-18.08.0.tar.xz";
+ url = "${mirror}/stable/applications/18.08.1/src/kdesdk-thumbnailers-18.08.1.tar.xz";
+ sha256 = "1c133n4qf9jkgzhccipspwk3r8mbja0k8556ng0wxnhayzmv2sx9";
+ name = "kdesdk-thumbnailers-18.08.1.tar.xz";
};
};
kdf = {
- version = "18.08.0";
+ version = "18.08.1";
src = fetchurl {
- url = "${mirror}/stable/applications/18.08.0/src/kdf-18.08.0.tar.xz";
- sha256 = "1flv6qjb936fcj5crshy26qy9y2p7j9i3hlidr9lsk81wsyjkqqg";
- name = "kdf-18.08.0.tar.xz";
+ url = "${mirror}/stable/applications/18.08.1/src/kdf-18.08.1.tar.xz";
+ sha256 = "1m5hwfhzvikh7isakbvzyc3y98zdky4iz8vdsi7nnyb6d8n2hbrr";
+ name = "kdf-18.08.1.tar.xz";
};
};
kdialog = {
- version = "18.08.0";
+ version = "18.08.1";
src = fetchurl {
- url = "${mirror}/stable/applications/18.08.0/src/kdialog-18.08.0.tar.xz";
- sha256 = "04xhp4pdn7gv69gwydz9afml27qj9mrqz2hnrhcsf29pw3vq0hli";
- name = "kdialog-18.08.0.tar.xz";
+ url = "${mirror}/stable/applications/18.08.1/src/kdialog-18.08.1.tar.xz";
+ sha256 = "0s8a3y8sjhyq8lf3i8r6ligg1s9nbhxsd34vncw3lkbq60xkyhrr";
+ name = "kdialog-18.08.1.tar.xz";
};
};
kdiamond = {
- version = "18.08.0";
+ version = "18.08.1";
src = fetchurl {
- url = "${mirror}/stable/applications/18.08.0/src/kdiamond-18.08.0.tar.xz";
- sha256 = "14c5i2fj9scvkqffz95lrqj49vfg7yh7gfc4s3zzg2sl91j7hwzq";
- name = "kdiamond-18.08.0.tar.xz";
+ url = "${mirror}/stable/applications/18.08.1/src/kdiamond-18.08.1.tar.xz";
+ sha256 = "0vcqdadb9kbmxnycaba6g9hiiyxqybqiw1i4zldlw5x4gnj7dcv2";
+ name = "kdiamond-18.08.1.tar.xz";
};
};
keditbookmarks = {
- version = "18.08.0";
+ version = "18.08.1";
src = fetchurl {
- url = "${mirror}/stable/applications/18.08.0/src/keditbookmarks-18.08.0.tar.xz";
- sha256 = "1zsfmcyb9s782k6knlv56mrssazdid6i70g74is46s59sgfdd9fl";
- name = "keditbookmarks-18.08.0.tar.xz";
+ url = "${mirror}/stable/applications/18.08.1/src/keditbookmarks-18.08.1.tar.xz";
+ sha256 = "10nzhsyia1q0m26icqb20qh8s8n6r5vlb5q498gw8dv3rzsmh6sf";
+ name = "keditbookmarks-18.08.1.tar.xz";
};
};
kfind = {
- version = "18.08.0";
+ version = "18.08.1";
src = fetchurl {
- url = "${mirror}/stable/applications/18.08.0/src/kfind-18.08.0.tar.xz";
- sha256 = "1bvln7iq2ikcrzaa53wskpqwzmndjvc84a2jdjqzirmh6pqzlf3h";
- name = "kfind-18.08.0.tar.xz";
+ url = "${mirror}/stable/applications/18.08.1/src/kfind-18.08.1.tar.xz";
+ sha256 = "15w4cdvz35yyfyfaxb4mnxynlbryixydkwmx7lkmhlwnk3zjmskr";
+ name = "kfind-18.08.1.tar.xz";
};
};
kfloppy = {
- version = "18.08.0";
+ version = "18.08.1";
src = fetchurl {
- url = "${mirror}/stable/applications/18.08.0/src/kfloppy-18.08.0.tar.xz";
- sha256 = "1clz5651d11pm77mi57nzr274zwshx2qhglfn6jxiif9yz6s9dfp";
- name = "kfloppy-18.08.0.tar.xz";
+ url = "${mirror}/stable/applications/18.08.1/src/kfloppy-18.08.1.tar.xz";
+ sha256 = "07v3q4jiw728s9akwhy27hczp4hxhp7f8c6g59gdqm0ply0vgxk6";
+ name = "kfloppy-18.08.1.tar.xz";
};
};
kfourinline = {
- version = "18.08.0";
+ version = "18.08.1";
src = fetchurl {
- url = "${mirror}/stable/applications/18.08.0/src/kfourinline-18.08.0.tar.xz";
- sha256 = "1agmzlwy4izrmi58cf08cg34h155inmws3ghp524jz1li6rqvzfr";
- name = "kfourinline-18.08.0.tar.xz";
+ url = "${mirror}/stable/applications/18.08.1/src/kfourinline-18.08.1.tar.xz";
+ sha256 = "03g8g0s2214fqkqp4lyh9m8f382s8xwzi0yqz0yigyq1w5igcl9p";
+ name = "kfourinline-18.08.1.tar.xz";
};
};
kgeography = {
- version = "18.08.0";
+ version = "18.08.1";
src = fetchurl {
- url = "${mirror}/stable/applications/18.08.0/src/kgeography-18.08.0.tar.xz";
- sha256 = "0nj3lg8q84wvh1pypix619bdr9xm6s9s5vywciq8ggskqa2qrdc5";
- name = "kgeography-18.08.0.tar.xz";
+ url = "${mirror}/stable/applications/18.08.1/src/kgeography-18.08.1.tar.xz";
+ sha256 = "1pqs2sk88idzc8xr85qy689palkf5y5l4pfqkd9xfkb87041rl93";
+ name = "kgeography-18.08.1.tar.xz";
};
};
kget = {
- version = "18.08.0";
+ version = "18.08.1";
src = fetchurl {
- url = "${mirror}/stable/applications/18.08.0/src/kget-18.08.0.tar.xz";
- sha256 = "0vpphsfgqa4h1bsj0k6lz591ymd5zy3ng86fl4l1qv36kh5b3sr4";
- name = "kget-18.08.0.tar.xz";
+ url = "${mirror}/stable/applications/18.08.1/src/kget-18.08.1.tar.xz";
+ sha256 = "1ax6sdkpvzg37sp05fx083h0nn78a2zpfpr2l74j3qwq2yssy298";
+ name = "kget-18.08.1.tar.xz";
};
};
kgoldrunner = {
- version = "18.08.0";
+ version = "18.08.1";
src = fetchurl {
- url = "${mirror}/stable/applications/18.08.0/src/kgoldrunner-18.08.0.tar.xz";
- sha256 = "13i3b8z2pbvh90ykv365s30az9r33is8wp8ys33kz88z26260rsv";
- name = "kgoldrunner-18.08.0.tar.xz";
+ url = "${mirror}/stable/applications/18.08.1/src/kgoldrunner-18.08.1.tar.xz";
+ sha256 = "1wbdranw0fq8qynn13d0wkb7fckfzqbz2g920gyx2igw0bblcj0y";
+ name = "kgoldrunner-18.08.1.tar.xz";
};
};
kgpg = {
- version = "18.08.0";
+ version = "18.08.1";
src = fetchurl {
- url = "${mirror}/stable/applications/18.08.0/src/kgpg-18.08.0.tar.xz";
- sha256 = "12d6vqfcrgmqajk383p9gx9l49digm51km00slwkb15yjzgsjckx";
- name = "kgpg-18.08.0.tar.xz";
+ url = "${mirror}/stable/applications/18.08.1/src/kgpg-18.08.1.tar.xz";
+ sha256 = "1i3g7x18khnyvwnvgpnv6xdfbv29w65x8d8ml60zb8siipbnlwb5";
+ name = "kgpg-18.08.1.tar.xz";
};
};
khangman = {
- version = "18.08.0";
+ version = "18.08.1";
src = fetchurl {
- url = "${mirror}/stable/applications/18.08.0/src/khangman-18.08.0.tar.xz";
- sha256 = "0vcyak1pqq894d10jn4s8948fz8py6kjhgrbvjk2ksp28fzsb1q2";
- name = "khangman-18.08.0.tar.xz";
+ url = "${mirror}/stable/applications/18.08.1/src/khangman-18.08.1.tar.xz";
+ sha256 = "1nc9lbjxlwr4aqsl6idjyhqxd5wampcz7a6zgq6py03n8mr811qy";
+ name = "khangman-18.08.1.tar.xz";
};
};
khelpcenter = {
- version = "18.08.0";
+ version = "18.08.1";
src = fetchurl {
- url = "${mirror}/stable/applications/18.08.0/src/khelpcenter-18.08.0.tar.xz";
- sha256 = "1ykw91s1w5953646ylxm49bq0bjgxd8yp29r09644q12qmi1w9ay";
- name = "khelpcenter-18.08.0.tar.xz";
+ url = "${mirror}/stable/applications/18.08.1/src/khelpcenter-18.08.1.tar.xz";
+ sha256 = "1k60yqnpkplj0k0b8h27zyhviqs6ddwhygmv7cpmnwa1d7kvhdwi";
+ name = "khelpcenter-18.08.1.tar.xz";
};
};
kidentitymanagement = {
- version = "18.08.0";
+ version = "18.08.1";
src = fetchurl {
- url = "${mirror}/stable/applications/18.08.0/src/kidentitymanagement-18.08.0.tar.xz";
- sha256 = "1rrdxbil0z0vmv0h0d6jdlwa3sfs3nncq39wmydhwx09phk7db85";
- name = "kidentitymanagement-18.08.0.tar.xz";
+ url = "${mirror}/stable/applications/18.08.1/src/kidentitymanagement-18.08.1.tar.xz";
+ sha256 = "0w1lmfcjq2fb65l3vd9qzq037j7r3dd49aqh8bnrwkjslshy7iwz";
+ name = "kidentitymanagement-18.08.1.tar.xz";
};
};
kig = {
- version = "18.08.0";
+ version = "18.08.1";
src = fetchurl {
- url = "${mirror}/stable/applications/18.08.0/src/kig-18.08.0.tar.xz";
- sha256 = "0kgsar7sp3a7x72gnagi2hwajbl1yaaj493qjnwzlwidjjrlzmhb";
- name = "kig-18.08.0.tar.xz";
+ url = "${mirror}/stable/applications/18.08.1/src/kig-18.08.1.tar.xz";
+ sha256 = "1haf21widyfi0afixyfczk944l048w8dvlmgkwvfqhmgiiz52g72";
+ name = "kig-18.08.1.tar.xz";
};
};
kigo = {
- version = "18.08.0";
+ version = "18.08.1";
src = fetchurl {
- url = "${mirror}/stable/applications/18.08.0/src/kigo-18.08.0.tar.xz";
- sha256 = "1ws0diq3kb8f15v30cj0hc0ii4d14dca7fb3p8vvm8r4ly7gqbdr";
- name = "kigo-18.08.0.tar.xz";
+ url = "${mirror}/stable/applications/18.08.1/src/kigo-18.08.1.tar.xz";
+ sha256 = "1dmb3cmbi473wpkbnv895nyxxhqmp09ihghvxir77khjpmask04a";
+ name = "kigo-18.08.1.tar.xz";
};
};
killbots = {
- version = "18.08.0";
+ version = "18.08.1";
src = fetchurl {
- url = "${mirror}/stable/applications/18.08.0/src/killbots-18.08.0.tar.xz";
- sha256 = "165g1zll7wq6gyz1lzaf1x17j2nagd66lj015qxifjpn9fd475mm";
- name = "killbots-18.08.0.tar.xz";
+ url = "${mirror}/stable/applications/18.08.1/src/killbots-18.08.1.tar.xz";
+ sha256 = "184glirpf8jzy91769d13rck3vnh96s171h6sfqab755857wj960";
+ name = "killbots-18.08.1.tar.xz";
};
};
kimagemapeditor = {
- version = "18.08.0";
+ version = "18.08.1";
src = fetchurl {
- url = "${mirror}/stable/applications/18.08.0/src/kimagemapeditor-18.08.0.tar.xz";
- sha256 = "1r3hngzvidv1yz7kd7l8l78gqdhjvw9smciv1vkzf7dk9qarlyfq";
- name = "kimagemapeditor-18.08.0.tar.xz";
+ url = "${mirror}/stable/applications/18.08.1/src/kimagemapeditor-18.08.1.tar.xz";
+ sha256 = "1w0yinp58f7x4ss2m069736faagwil7ay8gd5w79a5frqizsj36d";
+ name = "kimagemapeditor-18.08.1.tar.xz";
};
};
kimap = {
- version = "18.08.0";
+ version = "18.08.1";
src = fetchurl {
- url = "${mirror}/stable/applications/18.08.0/src/kimap-18.08.0.tar.xz";
- sha256 = "12lslmprwmibijlpwng4acmmhdfhm1dgvqsazbyvsr8jagkryxmq";
- name = "kimap-18.08.0.tar.xz";
+ url = "${mirror}/stable/applications/18.08.1/src/kimap-18.08.1.tar.xz";
+ sha256 = "0na135np2li231kzxfjy4wb5bbgkkyll66x8jd4y0lxvc4cwipfd";
+ name = "kimap-18.08.1.tar.xz";
};
};
kio-extras = {
- version = "18.08.0";
+ version = "18.08.1";
src = fetchurl {
- url = "${mirror}/stable/applications/18.08.0/src/kio-extras-18.08.0.tar.xz";
- sha256 = "1k5azz26zwsflnsgv4r0i8z8jph060wpksyqfpkz0vfsf3lv0k3n";
- name = "kio-extras-18.08.0.tar.xz";
+ url = "${mirror}/stable/applications/18.08.1/src/kio-extras-18.08.1.tar.xz";
+ sha256 = "03q68bc53q656pw733g2j2wkbag6hbqpwszkap2h4pn011cihgyw";
+ name = "kio-extras-18.08.1.tar.xz";
};
};
kiriki = {
- version = "18.08.0";
+ version = "18.08.1";
src = fetchurl {
- url = "${mirror}/stable/applications/18.08.0/src/kiriki-18.08.0.tar.xz";
- sha256 = "1fciiq490iwcz86g9pqp8g0s40zf7a3zan132iqmscpl71hsv01b";
- name = "kiriki-18.08.0.tar.xz";
+ url = "${mirror}/stable/applications/18.08.1/src/kiriki-18.08.1.tar.xz";
+ sha256 = "1kc2flpfqvfijrazvnk7mk03myy7f7lqia1r9lxg1g3xx095jqhz";
+ name = "kiriki-18.08.1.tar.xz";
};
};
kiten = {
- version = "18.08.0";
+ version = "18.08.1";
src = fetchurl {
- url = "${mirror}/stable/applications/18.08.0/src/kiten-18.08.0.tar.xz";
- sha256 = "1gzgfj0p0s5yjhwx6hldc8s0cs6p2bn5gd8sy29sicg13wjvhkmj";
- name = "kiten-18.08.0.tar.xz";
+ url = "${mirror}/stable/applications/18.08.1/src/kiten-18.08.1.tar.xz";
+ sha256 = "1i1pgfxvcqh5jbbk39b6rlc0s67z2naw5glxhkg3nrvxy9yxw9n2";
+ name = "kiten-18.08.1.tar.xz";
};
};
kitinerary = {
- version = "18.08.0";
+ version = "18.08.1";
src = fetchurl {
- url = "${mirror}/stable/applications/18.08.0/src/kitinerary-18.08.0.tar.xz";
- sha256 = "14jwlkfy9z6q2pnjmlcy5gihc75n6qnsck05zycs4qsxa4srpn0l";
- name = "kitinerary-18.08.0.tar.xz";
+ url = "${mirror}/stable/applications/18.08.1/src/kitinerary-18.08.1.tar.xz";
+ sha256 = "0bv1nwwi2mc0l3vfvx29d46l7b876qf4bch9g84zmdcas37w786l";
+ name = "kitinerary-18.08.1.tar.xz";
};
};
kjumpingcube = {
- version = "18.08.0";
+ version = "18.08.1";
src = fetchurl {
- url = "${mirror}/stable/applications/18.08.0/src/kjumpingcube-18.08.0.tar.xz";
- sha256 = "001a2ayl74hi89j8i3553qx0cs8w7f4myskq3qa01rg3w4pb3wl2";
- name = "kjumpingcube-18.08.0.tar.xz";
+ url = "${mirror}/stable/applications/18.08.1/src/kjumpingcube-18.08.1.tar.xz";
+ sha256 = "1qfzydbpd86zsb0yfy5xdaqlbh1awm70lg1nzbqn99rl47vsm85b";
+ name = "kjumpingcube-18.08.1.tar.xz";
};
};
kldap = {
- version = "18.08.0";
+ version = "18.08.1";
src = fetchurl {
- url = "${mirror}/stable/applications/18.08.0/src/kldap-18.08.0.tar.xz";
- sha256 = "1825146vi1lq1383qmn8ix70d2rc2cfwp95vpn4divf9aqwmc4x0";
- name = "kldap-18.08.0.tar.xz";
+ url = "${mirror}/stable/applications/18.08.1/src/kldap-18.08.1.tar.xz";
+ sha256 = "1knf61whi1raj66z55a8535rj911na15zkq0vcb8djz6cg3xw29r";
+ name = "kldap-18.08.1.tar.xz";
};
};
kleopatra = {
- version = "18.08.0";
+ version = "18.08.1";
src = fetchurl {
- url = "${mirror}/stable/applications/18.08.0/src/kleopatra-18.08.0.tar.xz";
- sha256 = "1wwjn2p2vblr6fdfcy1s5gf3h5cnclc4lj5vsi5cxyp7d86ij49c";
- name = "kleopatra-18.08.0.tar.xz";
+ url = "${mirror}/stable/applications/18.08.1/src/kleopatra-18.08.1.tar.xz";
+ sha256 = "0g65qxz6v1glh86fvgpb89ay1221qbnz97mnzw8fb26aar838s8y";
+ name = "kleopatra-18.08.1.tar.xz";
};
};
klettres = {
- version = "18.08.0";
+ version = "18.08.1";
src = fetchurl {
- url = "${mirror}/stable/applications/18.08.0/src/klettres-18.08.0.tar.xz";
- sha256 = "1g84swzlynyl7r2ln52n7w9q0yf6540dd9hj3j0zsp1y2hb9fns8";
- name = "klettres-18.08.0.tar.xz";
+ url = "${mirror}/stable/applications/18.08.1/src/klettres-18.08.1.tar.xz";
+ sha256 = "0k5c9j9w0d95fzs7103nx13cxz9q5ivn34wq8px0ma9jaig1w1j9";
+ name = "klettres-18.08.1.tar.xz";
};
};
klickety = {
- version = "18.08.0";
+ version = "18.08.1";
src = fetchurl {
- url = "${mirror}/stable/applications/18.08.0/src/klickety-18.08.0.tar.xz";
- sha256 = "1jrxabmnv0s38i255x7xycn12fgpkmr4p1y0ydk5x98zrv4vn8y0";
- name = "klickety-18.08.0.tar.xz";
+ url = "${mirror}/stable/applications/18.08.1/src/klickety-18.08.1.tar.xz";
+ sha256 = "1zx7f4hpcgfrfbgmmhfj9p9l604bzhg06zznfgq40774m4d5m992";
+ name = "klickety-18.08.1.tar.xz";
};
};
klines = {
- version = "18.08.0";
+ version = "18.08.1";
src = fetchurl {
- url = "${mirror}/stable/applications/18.08.0/src/klines-18.08.0.tar.xz";
- sha256 = "14ks53xh6hhlrmiqa7a1f7z42i035qw3v72dpbc8bw20vg53bzpy";
- name = "klines-18.08.0.tar.xz";
+ url = "${mirror}/stable/applications/18.08.1/src/klines-18.08.1.tar.xz";
+ sha256 = "1wwvzvwshxj03s3ywpg65lfj32xcd3yj4y7fhdms8xjn0b341grc";
+ name = "klines-18.08.1.tar.xz";
};
};
kmag = {
- version = "18.08.0";
+ version = "18.08.1";
src = fetchurl {
- url = "${mirror}/stable/applications/18.08.0/src/kmag-18.08.0.tar.xz";
- sha256 = "00ni6clpgwcr6b2yanmgplsb5jqmqxjiymd3572fkj7q8m17ak7f";
- name = "kmag-18.08.0.tar.xz";
+ url = "${mirror}/stable/applications/18.08.1/src/kmag-18.08.1.tar.xz";
+ sha256 = "1a1xml73yhfrqzw37apgmf1f88x58ws09vfdrp8zchawskcm3yi2";
+ name = "kmag-18.08.1.tar.xz";
};
};
kmahjongg = {
- version = "18.08.0";
+ version = "18.08.1";
src = fetchurl {
- url = "${mirror}/stable/applications/18.08.0/src/kmahjongg-18.08.0.tar.xz";
- sha256 = "0lflx8jxk2yv7bsywwmbk5l54gyhbyv65996fg82z6lw9hrr5wrb";
- name = "kmahjongg-18.08.0.tar.xz";
+ url = "${mirror}/stable/applications/18.08.1/src/kmahjongg-18.08.1.tar.xz";
+ sha256 = "1rdimx9kdm9n3g4856672z0spwsj5ihd40yx17vbzc3lhyqnk0w1";
+ name = "kmahjongg-18.08.1.tar.xz";
};
};
kmail = {
- version = "18.08.0";
+ version = "18.08.1";
src = fetchurl {
- url = "${mirror}/stable/applications/18.08.0/src/kmail-18.08.0.tar.xz";
- sha256 = "1xj2z4ix9zba6k3cdnakr7f0nfij1z925j3vp0gimkgyvbcb28vr";
- name = "kmail-18.08.0.tar.xz";
+ url = "${mirror}/stable/applications/18.08.1/src/kmail-18.08.1.tar.xz";
+ sha256 = "12097jncdx5zdsr99lmsvhiymarymgbd004vmxm6rni0hq1aqzkl";
+ name = "kmail-18.08.1.tar.xz";
};
};
kmail-account-wizard = {
- version = "18.08.0";
+ version = "18.08.1";
src = fetchurl {
- url = "${mirror}/stable/applications/18.08.0/src/kmail-account-wizard-18.08.0.tar.xz";
- sha256 = "1hc6zqys2qncljvsl9j48ns77kkq5zabj5a2kzg953dgcdv5x25r";
- name = "kmail-account-wizard-18.08.0.tar.xz";
+ url = "${mirror}/stable/applications/18.08.1/src/kmail-account-wizard-18.08.1.tar.xz";
+ sha256 = "0jzqqn07q0jsggss2r5pjgp0fhfgngvv0rjzyh12lzsn4l8iyd6z";
+ name = "kmail-account-wizard-18.08.1.tar.xz";
};
};
kmailtransport = {
- version = "18.08.0";
+ version = "18.08.1";
src = fetchurl {
- url = "${mirror}/stable/applications/18.08.0/src/kmailtransport-18.08.0.tar.xz";
- sha256 = "0dfws0pzq3jf1h6j5qzjm96fz1ci4v57j4s9fbry10vyn4racpq8";
- name = "kmailtransport-18.08.0.tar.xz";
+ url = "${mirror}/stable/applications/18.08.1/src/kmailtransport-18.08.1.tar.xz";
+ sha256 = "196cjbnzqcp1ayqpn4vy8ah55nskhv07xrfrm8h0baxj90jd01xn";
+ name = "kmailtransport-18.08.1.tar.xz";
};
};
kmbox = {
- version = "18.08.0";
+ version = "18.08.1";
src = fetchurl {
- url = "${mirror}/stable/applications/18.08.0/src/kmbox-18.08.0.tar.xz";
- sha256 = "11dh1lgjhiy4bvpvrk1rw23fgjil45ch3lazqc4jp21d1skrr1v4";
- name = "kmbox-18.08.0.tar.xz";
+ url = "${mirror}/stable/applications/18.08.1/src/kmbox-18.08.1.tar.xz";
+ sha256 = "0sjl64cjr2dxvjklpdl2p25vjbvzi0w42m5s3fzlqam9avmckfia";
+ name = "kmbox-18.08.1.tar.xz";
};
};
kmime = {
- version = "18.08.0";
+ version = "18.08.1";
src = fetchurl {
- url = "${mirror}/stable/applications/18.08.0/src/kmime-18.08.0.tar.xz";
- sha256 = "0kci9b2c67hzbl4hjwkkzk9j7g1l5wy1d8qrm1jwk8s7ccndindw";
- name = "kmime-18.08.0.tar.xz";
+ url = "${mirror}/stable/applications/18.08.1/src/kmime-18.08.1.tar.xz";
+ sha256 = "00jxsnwkx4c9x1cm7w6r5z39d4962d0w6b8irdczix4r660xf56x";
+ name = "kmime-18.08.1.tar.xz";
};
};
kmines = {
- version = "18.08.0";
+ version = "18.08.1";
src = fetchurl {
- url = "${mirror}/stable/applications/18.08.0/src/kmines-18.08.0.tar.xz";
- sha256 = "0z0fidlcp0kf9vmdgfyzrwi9yk5mfwhkzlqlbfy1631xisz158yn";
- name = "kmines-18.08.0.tar.xz";
+ url = "${mirror}/stable/applications/18.08.1/src/kmines-18.08.1.tar.xz";
+ sha256 = "0csjr16s6jjj6z0963kc5jqwywjf9mvsa8c7x751h76kci1x53b0";
+ name = "kmines-18.08.1.tar.xz";
};
};
kmix = {
- version = "18.08.0";
+ version = "18.08.1";
src = fetchurl {
- url = "${mirror}/stable/applications/18.08.0/src/kmix-18.08.0.tar.xz";
- sha256 = "084l5dpms26jwd894xnqr054hxjzlxcp2wm2rq37y3cbriia2xgh";
- name = "kmix-18.08.0.tar.xz";
+ url = "${mirror}/stable/applications/18.08.1/src/kmix-18.08.1.tar.xz";
+ sha256 = "1i5wgdmr8sml9cqjlgmi2i4v8lgksa7pnp91cgj75bmcy68sv0gj";
+ name = "kmix-18.08.1.tar.xz";
};
};
kmousetool = {
- version = "18.08.0";
+ version = "18.08.1";
src = fetchurl {
- url = "${mirror}/stable/applications/18.08.0/src/kmousetool-18.08.0.tar.xz";
- sha256 = "0lcr8hpflaw5lrfydwi5sf069hfb19qifb7wh7qxh7j1b2z8w4gf";
- name = "kmousetool-18.08.0.tar.xz";
+ url = "${mirror}/stable/applications/18.08.1/src/kmousetool-18.08.1.tar.xz";
+ sha256 = "0drpzdsry3xj4wm50850wf9rg3banbfaspbrmj1vwinbyz6f7pwz";
+ name = "kmousetool-18.08.1.tar.xz";
};
};
kmouth = {
- version = "18.08.0";
+ version = "18.08.1";
src = fetchurl {
- url = "${mirror}/stable/applications/18.08.0/src/kmouth-18.08.0.tar.xz";
- sha256 = "0naqn9pl7jldfna9l3i3kdv8rkw0nky4ppsvqghlrb9jf4dy8lfm";
- name = "kmouth-18.08.0.tar.xz";
+ url = "${mirror}/stable/applications/18.08.1/src/kmouth-18.08.1.tar.xz";
+ sha256 = "0ywadz614w308vsss7b25xx4ddqyabr15miz9x7izffh67dhvm97";
+ name = "kmouth-18.08.1.tar.xz";
};
};
kmplot = {
- version = "18.08.0";
+ version = "18.08.1";
src = fetchurl {
- url = "${mirror}/stable/applications/18.08.0/src/kmplot-18.08.0.tar.xz";
- sha256 = "0lvw351iz2gdzkphrf8hxgqbjqi4pqvxqk2zjbly4fzwbgk261bd";
- name = "kmplot-18.08.0.tar.xz";
+ url = "${mirror}/stable/applications/18.08.1/src/kmplot-18.08.1.tar.xz";
+ sha256 = "1287pk524lfqvadq2rc8226v9qiwqh80fj1gjhsw6y3vhj88dpvg";
+ name = "kmplot-18.08.1.tar.xz";
};
};
knavalbattle = {
- version = "18.08.0";
+ version = "18.08.1";
src = fetchurl {
- url = "${mirror}/stable/applications/18.08.0/src/knavalbattle-18.08.0.tar.xz";
- sha256 = "0b21z3qqhsyafsa6rx9mc560hrw0046npqjmi5jpmczl6y9mr78q";
- name = "knavalbattle-18.08.0.tar.xz";
+ url = "${mirror}/stable/applications/18.08.1/src/knavalbattle-18.08.1.tar.xz";
+ sha256 = "0jxzgv06mysjalm0gfig3h6a9b84nkrq1qchi47h9x8cfaspba9r";
+ name = "knavalbattle-18.08.1.tar.xz";
};
};
knetwalk = {
- version = "18.08.0";
+ version = "18.08.1";
src = fetchurl {
- url = "${mirror}/stable/applications/18.08.0/src/knetwalk-18.08.0.tar.xz";
- sha256 = "04yfxxihfdqhrs126796k498v8valhd73q2bagcx59lj7iymxszj";
- name = "knetwalk-18.08.0.tar.xz";
+ url = "${mirror}/stable/applications/18.08.1/src/knetwalk-18.08.1.tar.xz";
+ sha256 = "1bg4jaijvhb312cpwrfr4chmxj3fcj3k9caw5xwzrgdgw7prrbax";
+ name = "knetwalk-18.08.1.tar.xz";
};
};
knotes = {
- version = "18.08.0";
+ version = "18.08.1";
src = fetchurl {
- url = "${mirror}/stable/applications/18.08.0/src/knotes-18.08.0.tar.xz";
- sha256 = "0dvjafmf57z10lx8fb4y4na73qq3dfmqfa2w01b3sdzns0nzaqig";
- name = "knotes-18.08.0.tar.xz";
+ url = "${mirror}/stable/applications/18.08.1/src/knotes-18.08.1.tar.xz";
+ sha256 = "1cihancavh5z5781gy6h8cikwbsw2p5hb2wbwakzjs3ld31nsjcv";
+ name = "knotes-18.08.1.tar.xz";
};
};
kolf = {
- version = "18.08.0";
+ version = "18.08.1";
src = fetchurl {
- url = "${mirror}/stable/applications/18.08.0/src/kolf-18.08.0.tar.xz";
- sha256 = "0bcd4k7v5sid98h95xbqm5l0dcjkv367mdgzhr6yizlqpyg6c132";
- name = "kolf-18.08.0.tar.xz";
+ url = "${mirror}/stable/applications/18.08.1/src/kolf-18.08.1.tar.xz";
+ sha256 = "1ngzjmlhx471rfy486fpglpihydskrvwiqnl6xrp6fw1wg9pbd6b";
+ name = "kolf-18.08.1.tar.xz";
};
};
kollision = {
- version = "18.08.0";
+ version = "18.08.1";
src = fetchurl {
- url = "${mirror}/stable/applications/18.08.0/src/kollision-18.08.0.tar.xz";
- sha256 = "029pwgwmsm9m284m1sbi2zzhhwbz6rlq68jd783ir6cq2z3llvjp";
- name = "kollision-18.08.0.tar.xz";
+ url = "${mirror}/stable/applications/18.08.1/src/kollision-18.08.1.tar.xz";
+ sha256 = "0is63m9zw8s53pf73c2a7f2wkvrsg70wk49x6rpzb28jmsgm1xi2";
+ name = "kollision-18.08.1.tar.xz";
};
};
kolourpaint = {
- version = "18.08.0";
+ version = "18.08.1";
src = fetchurl {
- url = "${mirror}/stable/applications/18.08.0/src/kolourpaint-18.08.0.tar.xz";
- sha256 = "0p08xc8ai1cllbdwmv46xzcpv70mn6zwd4f62xsh71hhpg8fbqpi";
- name = "kolourpaint-18.08.0.tar.xz";
+ url = "${mirror}/stable/applications/18.08.1/src/kolourpaint-18.08.1.tar.xz";
+ sha256 = "101vz981kl006q8kirs9d9bsp1bpjzcl22bbswgjny6niqlzd5lm";
+ name = "kolourpaint-18.08.1.tar.xz";
};
};
kompare = {
- version = "18.08.0";
+ version = "18.08.1";
src = fetchurl {
- url = "${mirror}/stable/applications/18.08.0/src/kompare-18.08.0.tar.xz";
- sha256 = "0md4qw29q5mnsz0k4a3dl6fdgff33w4kg59qy02kp3pvqav9r1zx";
- name = "kompare-18.08.0.tar.xz";
+ url = "${mirror}/stable/applications/18.08.1/src/kompare-18.08.1.tar.xz";
+ sha256 = "0ksdf5c6a3rhq0r8g8hiai53pzk37jiicislfik6y8f71rq0crqv";
+ name = "kompare-18.08.1.tar.xz";
};
};
konqueror = {
- version = "18.08.0";
+ version = "18.08.1";
src = fetchurl {
- url = "${mirror}/stable/applications/18.08.0/src/konqueror-18.08.0.tar.xz";
- sha256 = "12zw4bgmmc35vghi8phm93x9lmhfgpxxfvz0grxa4gxcxqjyzzcq";
- name = "konqueror-18.08.0.tar.xz";
+ url = "${mirror}/stable/applications/18.08.1/src/konqueror-18.08.1.tar.xz";
+ sha256 = "0bz9vyagcrm7yihrx464hkf30y5rx6p9cvx8hq0sblvb7m4308y7";
+ name = "konqueror-18.08.1.tar.xz";
};
};
konquest = {
- version = "18.08.0";
+ version = "18.08.1";
src = fetchurl {
- url = "${mirror}/stable/applications/18.08.0/src/konquest-18.08.0.tar.xz";
- sha256 = "0pvx4ss8dpxd6q4jnxim3pwyxjvhcy1xihn7s3513hy0h4wabv6s";
- name = "konquest-18.08.0.tar.xz";
+ url = "${mirror}/stable/applications/18.08.1/src/konquest-18.08.1.tar.xz";
+ sha256 = "1y3afkna2xg47qk9iwh3gsxbp1plf5y7k87svk8nzbh6aa8pillx";
+ name = "konquest-18.08.1.tar.xz";
};
};
konsole = {
- version = "18.08.0";
+ version = "18.08.1";
src = fetchurl {
- url = "${mirror}/stable/applications/18.08.0/src/konsole-18.08.0.tar.xz";
- sha256 = "1p119ky78zxi8l08xnfklrg21c6124q1fbjvbybf6l0qq3mzwy77";
- name = "konsole-18.08.0.tar.xz";
+ url = "${mirror}/stable/applications/18.08.1/src/konsole-18.08.1.tar.xz";
+ sha256 = "05i9mkw4ygpy6ilqkkm5s7m9kva9ds0gr5gszci7z52m7y67s27d";
+ name = "konsole-18.08.1.tar.xz";
};
};
kontact = {
- version = "18.08.0";
+ version = "18.08.1";
src = fetchurl {
- url = "${mirror}/stable/applications/18.08.0/src/kontact-18.08.0.tar.xz";
- sha256 = "0027zinl9s92vxhlzv9mak9fgzygqw5ml6i6x659pl3mc889fr7j";
- name = "kontact-18.08.0.tar.xz";
+ url = "${mirror}/stable/applications/18.08.1/src/kontact-18.08.1.tar.xz";
+ sha256 = "136sfr6gwf2cdlc54hc5p1wzcrjpnan0rzmzs21cwpp9gsvmsjvq";
+ name = "kontact-18.08.1.tar.xz";
};
};
kontactinterface = {
- version = "18.08.0";
+ version = "18.08.1";
src = fetchurl {
- url = "${mirror}/stable/applications/18.08.0/src/kontactinterface-18.08.0.tar.xz";
- sha256 = "0mcvpmvczqpsqj83vqfv9zwz7jj3az65nq45xg1l476j8sva278n";
- name = "kontactinterface-18.08.0.tar.xz";
+ url = "${mirror}/stable/applications/18.08.1/src/kontactinterface-18.08.1.tar.xz";
+ sha256 = "1w96wyr5kinaghnaima1pcq5hz8qyzvvyjpsk3dg8h3is86npvkb";
+ name = "kontactinterface-18.08.1.tar.xz";
};
};
kopete = {
- version = "18.08.0";
+ version = "18.08.1";
src = fetchurl {
- url = "${mirror}/stable/applications/18.08.0/src/kopete-18.08.0.tar.xz";
- sha256 = "0g79zv187pj7c2p33qsnkpmvrxpcx1iiy9lcrdz3acgzgvpfh5dk";
- name = "kopete-18.08.0.tar.xz";
+ url = "${mirror}/stable/applications/18.08.1/src/kopete-18.08.1.tar.xz";
+ sha256 = "0i38hvnp1qiwva6gd3p7zs962bhi5fviysr8wzm7296f1hv1rz4k";
+ name = "kopete-18.08.1.tar.xz";
};
};
korganizer = {
- version = "18.08.0";
+ version = "18.08.1";
src = fetchurl {
- url = "${mirror}/stable/applications/18.08.0/src/korganizer-18.08.0.tar.xz";
- sha256 = "0qifd6l93jjj7sxf3kllm3dq13p738zlvbpxg24wzc3gllyq4ip1";
- name = "korganizer-18.08.0.tar.xz";
+ url = "${mirror}/stable/applications/18.08.1/src/korganizer-18.08.1.tar.xz";
+ sha256 = "0wdpcjar64f8bii3xbbj08dfnd0290xwdvlr09p1pfmlllp09l0v";
+ name = "korganizer-18.08.1.tar.xz";
};
};
kpat = {
- version = "18.08.0";
+ version = "18.08.1";
src = fetchurl {
- url = "${mirror}/stable/applications/18.08.0/src/kpat-18.08.0.tar.xz";
- sha256 = "0dm9alimp2ibf5fpgbafiaz3lh9irvq2539jp6l61jqcv7801fml";
- name = "kpat-18.08.0.tar.xz";
+ url = "${mirror}/stable/applications/18.08.1/src/kpat-18.08.1.tar.xz";
+ sha256 = "0cmdfmd8pcwwwq4hjcfjscdl36p9gmw9shmqimjnqm60i5ivlz65";
+ name = "kpat-18.08.1.tar.xz";
};
};
kpimtextedit = {
- version = "18.08.0";
+ version = "18.08.1";
src = fetchurl {
- url = "${mirror}/stable/applications/18.08.0/src/kpimtextedit-18.08.0.tar.xz";
- sha256 = "0ciivvpfcsjzpc620zalx7k5ybh6bf53y19lvr1dgad29j6j871q";
- name = "kpimtextedit-18.08.0.tar.xz";
+ url = "${mirror}/stable/applications/18.08.1/src/kpimtextedit-18.08.1.tar.xz";
+ sha256 = "0v47hb9nvx3bq3ybsqng6546qxk5yi66kd0mm2g7bdx9iq060x0j";
+ name = "kpimtextedit-18.08.1.tar.xz";
};
};
kpkpass = {
- version = "18.08.0";
+ version = "18.08.1";
src = fetchurl {
- url = "${mirror}/stable/applications/18.08.0/src/kpkpass-18.08.0.tar.xz";
- sha256 = "1wgycyx8nn9kaqbxvlps44g1nzr2qpr6mb7m22q5qcykly0i5wzl";
- name = "kpkpass-18.08.0.tar.xz";
+ url = "${mirror}/stable/applications/18.08.1/src/kpkpass-18.08.1.tar.xz";
+ sha256 = "11d125rd35p44phksxrbzaixasgrsa4z9ym98h69ylyk2mm8h9lk";
+ name = "kpkpass-18.08.1.tar.xz";
};
};
kqtquickcharts = {
- version = "18.08.0";
+ version = "18.08.1";
src = fetchurl {
- url = "${mirror}/stable/applications/18.08.0/src/kqtquickcharts-18.08.0.tar.xz";
- sha256 = "0ykf5xfzjsanj5rmn5qrhhqfb93i19mrwzsqq8pngaimcqb70cdk";
- name = "kqtquickcharts-18.08.0.tar.xz";
+ url = "${mirror}/stable/applications/18.08.1/src/kqtquickcharts-18.08.1.tar.xz";
+ sha256 = "1qki34i42hzr0zg0hydg4axsakfl7fydl23sn2xlvxyixw8yvcwi";
+ name = "kqtquickcharts-18.08.1.tar.xz";
};
};
krdc = {
- version = "18.08.0";
+ version = "18.08.1";
src = fetchurl {
- url = "${mirror}/stable/applications/18.08.0/src/krdc-18.08.0.tar.xz";
- sha256 = "03j3cn088mr8cd6vjkv19k5ayrhgh9mbyr0lkj9rr16z6861avmr";
- name = "krdc-18.08.0.tar.xz";
+ url = "${mirror}/stable/applications/18.08.1/src/krdc-18.08.1.tar.xz";
+ sha256 = "05fkpwcl1ivprvqy8x1h8akc2fxqnfh80vbis1k1gy8wanizigg9";
+ name = "krdc-18.08.1.tar.xz";
};
};
kreversi = {
- version = "18.08.0";
+ version = "18.08.1";
src = fetchurl {
- url = "${mirror}/stable/applications/18.08.0/src/kreversi-18.08.0.tar.xz";
- sha256 = "18qqfaxb34b0z6cdz9h2z0hkmr1vv85j7ra8gzhy35k40dgvhgqm";
- name = "kreversi-18.08.0.tar.xz";
+ url = "${mirror}/stable/applications/18.08.1/src/kreversi-18.08.1.tar.xz";
+ sha256 = "1srn6czbhmlglnmnkg9pl9qs1b98ckfralydivk14y40m24s4j0b";
+ name = "kreversi-18.08.1.tar.xz";
};
};
krfb = {
- version = "18.08.0";
+ version = "18.08.1";
src = fetchurl {
- url = "${mirror}/stable/applications/18.08.0/src/krfb-18.08.0.tar.xz";
- sha256 = "1zaran8lbhrnlr2nz12xis4b7q0krynzqyix14diiiysrfsmnwqm";
- name = "krfb-18.08.0.tar.xz";
+ url = "${mirror}/stable/applications/18.08.1/src/krfb-18.08.1.tar.xz";
+ sha256 = "0p4jyl8dya1xvhisv30h86hnjyjc9sqaqj0d2zx447nqm479k9kw";
+ name = "krfb-18.08.1.tar.xz";
};
};
kross-interpreters = {
- version = "18.08.0";
+ version = "18.08.1";
src = fetchurl {
- url = "${mirror}/stable/applications/18.08.0/src/kross-interpreters-18.08.0.tar.xz";
- sha256 = "1g3fgva8h0s1ld38m38iawjr04bsh572lazizr9a460nwk60nmsi";
- name = "kross-interpreters-18.08.0.tar.xz";
+ url = "${mirror}/stable/applications/18.08.1/src/kross-interpreters-18.08.1.tar.xz";
+ sha256 = "1vkai4v553anbbdb38rccfg65zww93gw2v05kmr0hk62n13lqbh2";
+ name = "kross-interpreters-18.08.1.tar.xz";
};
};
kruler = {
- version = "18.08.0";
+ version = "18.08.1";
src = fetchurl {
- url = "${mirror}/stable/applications/18.08.0/src/kruler-18.08.0.tar.xz";
- sha256 = "0fv3186xhyvfi9zz48r4facy9x8m8y53qfl7x1rs0y1hq2d2k3nh";
- name = "kruler-18.08.0.tar.xz";
+ url = "${mirror}/stable/applications/18.08.1/src/kruler-18.08.1.tar.xz";
+ sha256 = "13gksm8mpnlvsi5v4a4fpbqb4mxq3l6giycwryi0qrh6bw33xak9";
+ name = "kruler-18.08.1.tar.xz";
};
};
kshisen = {
- version = "18.08.0";
+ version = "18.08.1";
src = fetchurl {
- url = "${mirror}/stable/applications/18.08.0/src/kshisen-18.08.0.tar.xz";
- sha256 = "11q717m7m37902bchbgpdgsward4w2c9bwjns3xs4c3pyx1w7mg4";
- name = "kshisen-18.08.0.tar.xz";
+ url = "${mirror}/stable/applications/18.08.1/src/kshisen-18.08.1.tar.xz";
+ sha256 = "07w7rps4wh8ibhjnk1s80x9p1mvnl5yw37fnjz3byknk2a10lcm4";
+ name = "kshisen-18.08.1.tar.xz";
};
};
ksirk = {
- version = "18.08.0";
+ version = "18.08.1";
src = fetchurl {
- url = "${mirror}/stable/applications/18.08.0/src/ksirk-18.08.0.tar.xz";
- sha256 = "1wxf1g5vfcnvz9n28ja17iawc1997vhz6p75bq84jmls51pxjkzn";
- name = "ksirk-18.08.0.tar.xz";
+ url = "${mirror}/stable/applications/18.08.1/src/ksirk-18.08.1.tar.xz";
+ sha256 = "0rqjxfrnbbmcx07l0rlyfv8mlka5hm4a59q8zsk6x2vii18yhi49";
+ name = "ksirk-18.08.1.tar.xz";
};
};
ksmtp = {
- version = "18.08.0";
+ version = "18.08.1";
src = fetchurl {
- url = "${mirror}/stable/applications/18.08.0/src/ksmtp-18.08.0.tar.xz";
- sha256 = "13jkxrlycgk9qqw5v16i1rax8lwany7fd1n6m2875saxmjm9qi0s";
- name = "ksmtp-18.08.0.tar.xz";
+ url = "${mirror}/stable/applications/18.08.1/src/ksmtp-18.08.1.tar.xz";
+ sha256 = "0kznmx1qbv3kf0cqxwqgfwy1k79awrf6v46ni97h2fwrw90af9w9";
+ name = "ksmtp-18.08.1.tar.xz";
};
};
ksnakeduel = {
- version = "18.08.0";
+ version = "18.08.1";
src = fetchurl {
- url = "${mirror}/stable/applications/18.08.0/src/ksnakeduel-18.08.0.tar.xz";
- sha256 = "0ixbv4b9ngb82f4s58hzjvmmifkjy5v59g76kpb5dv9nqb9x8833";
- name = "ksnakeduel-18.08.0.tar.xz";
+ url = "${mirror}/stable/applications/18.08.1/src/ksnakeduel-18.08.1.tar.xz";
+ sha256 = "0l0b94mx948zas3q27qn2dpvwfiqyd08zv2izl947prwg4mvmb0q";
+ name = "ksnakeduel-18.08.1.tar.xz";
};
};
kspaceduel = {
- version = "18.08.0";
+ version = "18.08.1";
src = fetchurl {
- url = "${mirror}/stable/applications/18.08.0/src/kspaceduel-18.08.0.tar.xz";
- sha256 = "0qw3lkiwwrzicyqqr6fs78ljhn5z4vsvcvcn9l5j18qkmi2fd2dk";
- name = "kspaceduel-18.08.0.tar.xz";
+ url = "${mirror}/stable/applications/18.08.1/src/kspaceduel-18.08.1.tar.xz";
+ sha256 = "1fjk0i2f72kzzg321w96989nqw0zfvv9iyv28ywg2pjb62nj9z2x";
+ name = "kspaceduel-18.08.1.tar.xz";
};
};
ksquares = {
- version = "18.08.0";
+ version = "18.08.1";
src = fetchurl {
- url = "${mirror}/stable/applications/18.08.0/src/ksquares-18.08.0.tar.xz";
- sha256 = "01g9jkd5cq1ga9k9brr8yiny3idmj88c4n1cm2qi10d9n1vd4fja";
- name = "ksquares-18.08.0.tar.xz";
+ url = "${mirror}/stable/applications/18.08.1/src/ksquares-18.08.1.tar.xz";
+ sha256 = "0m30yw3hwh9jmwfwabnmjg2l19q4c4b8qcxp2ywp2xzxggvs3ssd";
+ name = "ksquares-18.08.1.tar.xz";
};
};
ksudoku = {
- version = "18.08.0";
+ version = "18.08.1";
src = fetchurl {
- url = "${mirror}/stable/applications/18.08.0/src/ksudoku-18.08.0.tar.xz";
- sha256 = "0fc7d6bs0ba51nypx4bn5hylfx9h6xlam7wjw1i7fr2yr8fdv9id";
- name = "ksudoku-18.08.0.tar.xz";
+ url = "${mirror}/stable/applications/18.08.1/src/ksudoku-18.08.1.tar.xz";
+ sha256 = "1ma0009prjmi59jym0qbfqan7iyp3h4pa7q5sdqykk77mlqm1z81";
+ name = "ksudoku-18.08.1.tar.xz";
};
};
ksystemlog = {
- version = "18.08.0";
+ version = "18.08.1";
src = fetchurl {
- url = "${mirror}/stable/applications/18.08.0/src/ksystemlog-18.08.0.tar.xz";
- sha256 = "1m5y8rawhi03vnpdw75npdd7hc830a5b2kkrz1112g959psv00ah";
- name = "ksystemlog-18.08.0.tar.xz";
+ url = "${mirror}/stable/applications/18.08.1/src/ksystemlog-18.08.1.tar.xz";
+ sha256 = "0c05gzqn51mg7ag6nyir1z3jdy5wd4bfka8lx2gigf6kjqyq4yny";
+ name = "ksystemlog-18.08.1.tar.xz";
};
};
kteatime = {
- version = "18.08.0";
+ version = "18.08.1";
src = fetchurl {
- url = "${mirror}/stable/applications/18.08.0/src/kteatime-18.08.0.tar.xz";
- sha256 = "18pm15s7q4xwzi61m2l8k6qplf948lq36iv9nh5sf4p6vp6syay2";
- name = "kteatime-18.08.0.tar.xz";
+ url = "${mirror}/stable/applications/18.08.1/src/kteatime-18.08.1.tar.xz";
+ sha256 = "0przpgn2kwvnmfsqxncb1wx4xxr696j6zpgwwx3bhqfd89dc0bgm";
+ name = "kteatime-18.08.1.tar.xz";
};
};
ktimer = {
- version = "18.08.0";
+ version = "18.08.1";
src = fetchurl {
- url = "${mirror}/stable/applications/18.08.0/src/ktimer-18.08.0.tar.xz";
- sha256 = "0g81daqdmfsmbnzjq74zxrbnjxjbi6nd6kl0acmjg7832l30m4js";
- name = "ktimer-18.08.0.tar.xz";
+ url = "${mirror}/stable/applications/18.08.1/src/ktimer-18.08.1.tar.xz";
+ sha256 = "0bwkxl619d4gar2piyk63lds85sz43gghg02cifsjvdvjfqfqbhp";
+ name = "ktimer-18.08.1.tar.xz";
};
};
ktnef = {
- version = "18.08.0";
+ version = "18.08.1";
src = fetchurl {
- url = "${mirror}/stable/applications/18.08.0/src/ktnef-18.08.0.tar.xz";
- sha256 = "007gjmjyi5r8110w4fv7n5gl67ddn1dg0pb119qr3r82iba8qiqi";
- name = "ktnef-18.08.0.tar.xz";
+ url = "${mirror}/stable/applications/18.08.1/src/ktnef-18.08.1.tar.xz";
+ sha256 = "184isgr9c5amwrlzlkji9q0dhl06936r2axdn5kjy2shbn7j7hz2";
+ name = "ktnef-18.08.1.tar.xz";
};
};
ktouch = {
- version = "18.08.0";
+ version = "18.08.1";
src = fetchurl {
- url = "${mirror}/stable/applications/18.08.0/src/ktouch-18.08.0.tar.xz";
- sha256 = "0pgckza5cn52aapa39d12dighx698jzb877iiml2n9870whifkms";
- name = "ktouch-18.08.0.tar.xz";
+ url = "${mirror}/stable/applications/18.08.1/src/ktouch-18.08.1.tar.xz";
+ sha256 = "1z23i7h6s31b3az6fk22whp1zs7np20wji5bcwvck1cv5a0nlpvc";
+ name = "ktouch-18.08.1.tar.xz";
};
};
ktp-accounts-kcm = {
- version = "18.08.0";
+ version = "18.08.1";
src = fetchurl {
- url = "${mirror}/stable/applications/18.08.0/src/ktp-accounts-kcm-18.08.0.tar.xz";
- sha256 = "16k7dprj75g2lgsmnnmn9n6zgwnp64zsjci5y2vk0cp8ndlr1j54";
- name = "ktp-accounts-kcm-18.08.0.tar.xz";
+ url = "${mirror}/stable/applications/18.08.1/src/ktp-accounts-kcm-18.08.1.tar.xz";
+ sha256 = "1pnq61vjvzs3lnxf52ski36arxyy5930gdh3858d7nq66dqcvw19";
+ name = "ktp-accounts-kcm-18.08.1.tar.xz";
};
};
ktp-approver = {
- version = "18.08.0";
+ version = "18.08.1";
src = fetchurl {
- url = "${mirror}/stable/applications/18.08.0/src/ktp-approver-18.08.0.tar.xz";
- sha256 = "1nh75yzprhbn0af33qsrs81vxk1brlxjf1jal7p8fpr47qdwhzvd";
- name = "ktp-approver-18.08.0.tar.xz";
+ url = "${mirror}/stable/applications/18.08.1/src/ktp-approver-18.08.1.tar.xz";
+ sha256 = "0sxp79rscfph5iscbpcqyp08szfipnsb0a3k4idlxfxp8bxv1kr2";
+ name = "ktp-approver-18.08.1.tar.xz";
};
};
ktp-auth-handler = {
- version = "18.08.0";
+ version = "18.08.1";
src = fetchurl {
- url = "${mirror}/stable/applications/18.08.0/src/ktp-auth-handler-18.08.0.tar.xz";
- sha256 = "0akmbrn9z0ind3jmz2azixyvr9glai66j6dynszn59svvjxp0fiz";
- name = "ktp-auth-handler-18.08.0.tar.xz";
+ url = "${mirror}/stable/applications/18.08.1/src/ktp-auth-handler-18.08.1.tar.xz";
+ sha256 = "18lnffiq0wh02j140ya3474sbq6nbb5yj6yavhm1dl0y0pap4mxl";
+ name = "ktp-auth-handler-18.08.1.tar.xz";
};
};
ktp-call-ui = {
- version = "18.08.0";
+ version = "18.08.1";
src = fetchurl {
- url = "${mirror}/stable/applications/18.08.0/src/ktp-call-ui-18.08.0.tar.xz";
- sha256 = "0z23vcvz6nyc6klqqys4ivh33j21kww4fgcm5dvvlf940cc9gr3h";
- name = "ktp-call-ui-18.08.0.tar.xz";
+ url = "${mirror}/stable/applications/18.08.1/src/ktp-call-ui-18.08.1.tar.xz";
+ sha256 = "1mqgwblz86qbdfhlzncc5wzvqwhki4kx5afbihgynjr13d4jjldp";
+ name = "ktp-call-ui-18.08.1.tar.xz";
};
};
ktp-common-internals = {
- version = "18.08.0";
+ version = "18.08.1";
src = fetchurl {
- url = "${mirror}/stable/applications/18.08.0/src/ktp-common-internals-18.08.0.tar.xz";
- sha256 = "1sj1k8x8d2lk8xsqckjzg6zz01gqh3yj52yar56lngn1cjnnf6ak";
- name = "ktp-common-internals-18.08.0.tar.xz";
+ url = "${mirror}/stable/applications/18.08.1/src/ktp-common-internals-18.08.1.tar.xz";
+ sha256 = "1r4ac7q8hpsldwagz4hsslsx962vxq8hmlhjs5r5h5c89r2qhpil";
+ name = "ktp-common-internals-18.08.1.tar.xz";
};
};
ktp-contact-list = {
- version = "18.08.0";
+ version = "18.08.1";
src = fetchurl {
- url = "${mirror}/stable/applications/18.08.0/src/ktp-contact-list-18.08.0.tar.xz";
- sha256 = "0yx64rz6k5dv6s4wsadjqc0fcx6j7blhy15cbnh8r2pbwf0ilk2w";
- name = "ktp-contact-list-18.08.0.tar.xz";
+ url = "${mirror}/stable/applications/18.08.1/src/ktp-contact-list-18.08.1.tar.xz";
+ sha256 = "09zfmqhpm907x1fcd3v7cvbgxx8sy1krjyidand77adl8ayiq59c";
+ name = "ktp-contact-list-18.08.1.tar.xz";
};
};
ktp-contact-runner = {
- version = "18.08.0";
+ version = "18.08.1";
src = fetchurl {
- url = "${mirror}/stable/applications/18.08.0/src/ktp-contact-runner-18.08.0.tar.xz";
- sha256 = "0i4zc6bksnb4iajz91wbw140dh7p0rg3hzhi563pn3siy9id442s";
- name = "ktp-contact-runner-18.08.0.tar.xz";
+ url = "${mirror}/stable/applications/18.08.1/src/ktp-contact-runner-18.08.1.tar.xz";
+ sha256 = "0cv65v2kkfqg6kny3zl3k0kg5af3wbi42jjni0r37rsgaknmg45x";
+ name = "ktp-contact-runner-18.08.1.tar.xz";
};
};
ktp-desktop-applets = {
- version = "18.08.0";
+ version = "18.08.1";
src = fetchurl {
- url = "${mirror}/stable/applications/18.08.0/src/ktp-desktop-applets-18.08.0.tar.xz";
- sha256 = "0i5sniidcgkvq2scf76pkshrj89gvkzjjslgqaxvqrgvyagsaski";
- name = "ktp-desktop-applets-18.08.0.tar.xz";
+ url = "${mirror}/stable/applications/18.08.1/src/ktp-desktop-applets-18.08.1.tar.xz";
+ sha256 = "04pkknx46zkn5v7946s23n4m1gr28w1cwpsyz8mkww8xfxk52x2y";
+ name = "ktp-desktop-applets-18.08.1.tar.xz";
};
};
ktp-filetransfer-handler = {
- version = "18.08.0";
+ version = "18.08.1";
src = fetchurl {
- url = "${mirror}/stable/applications/18.08.0/src/ktp-filetransfer-handler-18.08.0.tar.xz";
- sha256 = "15mifrbxxr8lvq7nflxwsz46ywnqmjv1d3irzq1xfcpl47907qhg";
- name = "ktp-filetransfer-handler-18.08.0.tar.xz";
+ url = "${mirror}/stable/applications/18.08.1/src/ktp-filetransfer-handler-18.08.1.tar.xz";
+ sha256 = "07m25ydhpa92d6pqgrhj6mvhirsf6c1i1xnxjmybrmf8v4cy1z8v";
+ name = "ktp-filetransfer-handler-18.08.1.tar.xz";
};
};
ktp-kded-module = {
- version = "18.08.0";
+ version = "18.08.1";
src = fetchurl {
- url = "${mirror}/stable/applications/18.08.0/src/ktp-kded-module-18.08.0.tar.xz";
- sha256 = "12rnnf2nm2kn2904b475qh9ql50yx583jga31389l012whm4gqqf";
- name = "ktp-kded-module-18.08.0.tar.xz";
+ url = "${mirror}/stable/applications/18.08.1/src/ktp-kded-module-18.08.1.tar.xz";
+ sha256 = "0f8m3avph7w8yrlgpwsf6ykgbzzj7mrh973v2w6gw2iwz2ps0bbm";
+ name = "ktp-kded-module-18.08.1.tar.xz";
};
};
ktp-send-file = {
- version = "18.08.0";
+ version = "18.08.1";
src = fetchurl {
- url = "${mirror}/stable/applications/18.08.0/src/ktp-send-file-18.08.0.tar.xz";
- sha256 = "0m8p8w4hqanccf7g0za5yh30z2nxv8dxi09mg1fniypqaw4cp2n7";
- name = "ktp-send-file-18.08.0.tar.xz";
+ url = "${mirror}/stable/applications/18.08.1/src/ktp-send-file-18.08.1.tar.xz";
+ sha256 = "1d9k2xmyrxk4s6dr1a0dgi4j4j5y5f73r57aldr5k821w425ssmg";
+ name = "ktp-send-file-18.08.1.tar.xz";
};
};
ktp-text-ui = {
- version = "18.08.0";
+ version = "18.08.1";
src = fetchurl {
- url = "${mirror}/stable/applications/18.08.0/src/ktp-text-ui-18.08.0.tar.xz";
- sha256 = "04ygny9m823h30hi5qgjz1nk7dj44hdqa9ga0ai9cazxnavvsx57";
- name = "ktp-text-ui-18.08.0.tar.xz";
+ url = "${mirror}/stable/applications/18.08.1/src/ktp-text-ui-18.08.1.tar.xz";
+ sha256 = "07ydrwsg2xv6vxsp6n2li6d5dfc92bdikdjqq266dqb35mb6wbx4";
+ name = "ktp-text-ui-18.08.1.tar.xz";
};
};
ktuberling = {
- version = "18.08.0";
+ version = "18.08.1";
src = fetchurl {
- url = "${mirror}/stable/applications/18.08.0/src/ktuberling-18.08.0.tar.xz";
- sha256 = "1m9mdv7hdsrnzjcdnmqrl82mafa9psbr5k7b6m3llh95f61b4jpn";
- name = "ktuberling-18.08.0.tar.xz";
+ url = "${mirror}/stable/applications/18.08.1/src/ktuberling-18.08.1.tar.xz";
+ sha256 = "176fdw99ni02nz3kv62dbiw7887a5kvmxsm8bg3viwyymcs8aay8";
+ name = "ktuberling-18.08.1.tar.xz";
};
};
kturtle = {
- version = "18.08.0";
+ version = "18.08.1";
src = fetchurl {
- url = "${mirror}/stable/applications/18.08.0/src/kturtle-18.08.0.tar.xz";
- sha256 = "0mwhnsbwj92zrgyjdfi18pxsfyaxa8pzdmh5k20m0jrh76gkhjr0";
- name = "kturtle-18.08.0.tar.xz";
+ url = "${mirror}/stable/applications/18.08.1/src/kturtle-18.08.1.tar.xz";
+ sha256 = "1r3w5hbzw2f4794j690wgm7x3dfxfyqnaylhjcrxqmqydkc54w2c";
+ name = "kturtle-18.08.1.tar.xz";
};
};
kubrick = {
- version = "18.08.0";
+ version = "18.08.1";
src = fetchurl {
- url = "${mirror}/stable/applications/18.08.0/src/kubrick-18.08.0.tar.xz";
- sha256 = "1affzpwq45r1cqb9ra8w24rrszvvzxiik4ng6jf54dik8sk7wrnn";
- name = "kubrick-18.08.0.tar.xz";
+ url = "${mirror}/stable/applications/18.08.1/src/kubrick-18.08.1.tar.xz";
+ sha256 = "0nwd0n8rx7dzbwjvkhnmvb2g4g7lasng7745klcdwk40ww223b60";
+ name = "kubrick-18.08.1.tar.xz";
};
};
kwalletmanager = {
- version = "18.08.0";
+ version = "18.08.1";
src = fetchurl {
- url = "${mirror}/stable/applications/18.08.0/src/kwalletmanager-18.08.0.tar.xz";
- sha256 = "10yri44d68n6hc4dn78wgqzw394krwjqr6azwd6qgxjp6asc8n69";
- name = "kwalletmanager-18.08.0.tar.xz";
+ url = "${mirror}/stable/applications/18.08.1/src/kwalletmanager-18.08.1.tar.xz";
+ sha256 = "08hr7ii6dybbmipppay2gxiwak8rqbrxrwbjz0206cyav16bbp7q";
+ name = "kwalletmanager-18.08.1.tar.xz";
};
};
kwave = {
- version = "18.08.0";
+ version = "18.08.1";
src = fetchurl {
- url = "${mirror}/stable/applications/18.08.0/src/kwave-18.08.0.tar.xz";
- sha256 = "0aimhn8hgjnwhv0j2hiyiqgh5bslm7rs13yc8sk0kh1vix6909mp";
- name = "kwave-18.08.0.tar.xz";
+ url = "${mirror}/stable/applications/18.08.1/src/kwave-18.08.1.tar.xz";
+ sha256 = "1gsxzpf8ij7bw6s4dbdl8kvyz21wy76dxi4wqwdggi29gvxzpi76";
+ name = "kwave-18.08.1.tar.xz";
};
};
kwordquiz = {
- version = "18.08.0";
+ version = "18.08.1";
src = fetchurl {
- url = "${mirror}/stable/applications/18.08.0/src/kwordquiz-18.08.0.tar.xz";
- sha256 = "1aghybg72anwj6vz3s3zr5i5wflackvfwl9n39mvxddm4ajnw1km";
- name = "kwordquiz-18.08.0.tar.xz";
+ url = "${mirror}/stable/applications/18.08.1/src/kwordquiz-18.08.1.tar.xz";
+ sha256 = "0bkxvw2g64r2k87m05mdxwh25lbixcga406x9i64z5dmgpsb7d9m";
+ name = "kwordquiz-18.08.1.tar.xz";
};
};
libgravatar = {
- version = "18.08.0";
+ version = "18.08.1";
src = fetchurl {
- url = "${mirror}/stable/applications/18.08.0/src/libgravatar-18.08.0.tar.xz";
- sha256 = "0yqd99lax1w5r1fy4rmbv9lk988zvq2yydkrdgh8vymxjljg5xa4";
- name = "libgravatar-18.08.0.tar.xz";
+ url = "${mirror}/stable/applications/18.08.1/src/libgravatar-18.08.1.tar.xz";
+ sha256 = "0axmf5ph5ahs4124fi016hjj559472k2apgfsbnf9q80d6y25lgf";
+ name = "libgravatar-18.08.1.tar.xz";
};
};
libkcddb = {
- version = "18.08.0";
+ version = "18.08.1";
src = fetchurl {
- url = "${mirror}/stable/applications/18.08.0/src/libkcddb-18.08.0.tar.xz";
- sha256 = "1ns90vcbp21mwsbvndmk97fpd8n7152iw783q7bqfy1n3ggzkz5x";
- name = "libkcddb-18.08.0.tar.xz";
+ url = "${mirror}/stable/applications/18.08.1/src/libkcddb-18.08.1.tar.xz";
+ sha256 = "1qy3zid9n7irkiz6vizmhwljrg3wcxxgcch58nmacg7fdxwcnnn1";
+ name = "libkcddb-18.08.1.tar.xz";
};
};
libkcompactdisc = {
- version = "18.08.0";
+ version = "18.08.1";
src = fetchurl {
- url = "${mirror}/stable/applications/18.08.0/src/libkcompactdisc-18.08.0.tar.xz";
- sha256 = "0pgn65knay7fgk2zdgqd29wfhqk9x4zlpp4ywjwb2zsvzz51j9f8";
- name = "libkcompactdisc-18.08.0.tar.xz";
+ url = "${mirror}/stable/applications/18.08.1/src/libkcompactdisc-18.08.1.tar.xz";
+ sha256 = "075i81gpb4c1wgzbv6nnvhgkz2sww0y5zqh8sxw67r46rz4rjwak";
+ name = "libkcompactdisc-18.08.1.tar.xz";
};
};
libkdcraw = {
- version = "18.08.0";
+ version = "18.08.1";
src = fetchurl {
- url = "${mirror}/stable/applications/18.08.0/src/libkdcraw-18.08.0.tar.xz";
- sha256 = "0xpkkgxsmvrldnprzqrxaz67jb5cv6vndg8flbkagvp0s7mnw56x";
- name = "libkdcraw-18.08.0.tar.xz";
+ url = "${mirror}/stable/applications/18.08.1/src/libkdcraw-18.08.1.tar.xz";
+ sha256 = "0fp01s9fw3m9li5v8cd2zmvy6xrysdqddzcal1xm5df2qj6xnk1d";
+ name = "libkdcraw-18.08.1.tar.xz";
};
};
libkdegames = {
- version = "18.08.0";
+ version = "18.08.1";
src = fetchurl {
- url = "${mirror}/stable/applications/18.08.0/src/libkdegames-18.08.0.tar.xz";
- sha256 = "1jl3snqyg3p3l4hddg7ag2mkgi49qvzml8p82zdn3sf5fhka1g70";
- name = "libkdegames-18.08.0.tar.xz";
+ url = "${mirror}/stable/applications/18.08.1/src/libkdegames-18.08.1.tar.xz";
+ sha256 = "05xqmg0g08gd45d1q1wblyj5002fvcs72iazif6j7lj9zy60x3qw";
+ name = "libkdegames-18.08.1.tar.xz";
};
};
libkdepim = {
- version = "18.08.0";
+ version = "18.08.1";
src = fetchurl {
- url = "${mirror}/stable/applications/18.08.0/src/libkdepim-18.08.0.tar.xz";
- sha256 = "1gfwfmr5iqkwb490d3mm32892q47pc73b6c8zygm7mn5cjb5376l";
- name = "libkdepim-18.08.0.tar.xz";
+ url = "${mirror}/stable/applications/18.08.1/src/libkdepim-18.08.1.tar.xz";
+ sha256 = "0rq7y5r15d1r8s9v1mip780xyh11011j1w2id0cbll9a3fhjfgy9";
+ name = "libkdepim-18.08.1.tar.xz";
};
};
libkeduvocdocument = {
- version = "18.08.0";
+ version = "18.08.1";
src = fetchurl {
- url = "${mirror}/stable/applications/18.08.0/src/libkeduvocdocument-18.08.0.tar.xz";
- sha256 = "1i5vmjfczd71654cpxd11djwk852aqg5lkn98pa8qvjy7v85jynn";
- name = "libkeduvocdocument-18.08.0.tar.xz";
+ url = "${mirror}/stable/applications/18.08.1/src/libkeduvocdocument-18.08.1.tar.xz";
+ sha256 = "1nchaip5rcgvazbn3bsiycsa5wcvqj3c0xz48isaz1rmirw4dkan";
+ name = "libkeduvocdocument-18.08.1.tar.xz";
};
};
libkexiv2 = {
- version = "18.08.0";
+ version = "18.08.1";
src = fetchurl {
- url = "${mirror}/stable/applications/18.08.0/src/libkexiv2-18.08.0.tar.xz";
- sha256 = "0cdh5wd2lvm9m4nyz2yv5ksszk1pc8ajzwq9c467m74lvb1p2had";
- name = "libkexiv2-18.08.0.tar.xz";
+ url = "${mirror}/stable/applications/18.08.1/src/libkexiv2-18.08.1.tar.xz";
+ sha256 = "0v0g626hjpksb8kxgp0kzx84a6hf3qq66if2hxh82kis5xdzbj4l";
+ name = "libkexiv2-18.08.1.tar.xz";
};
};
libkgapi = {
- version = "18.08.0";
+ version = "18.08.1";
src = fetchurl {
- url = "${mirror}/stable/applications/18.08.0/src/libkgapi-18.08.0.tar.xz";
- sha256 = "1aax7djyp1104b8sbrpfhf5c8j30g3hac973lpblfqg0yhkd9lw0";
- name = "libkgapi-18.08.0.tar.xz";
+ url = "${mirror}/stable/applications/18.08.1/src/libkgapi-18.08.1.tar.xz";
+ sha256 = "0rsfk8n4z67m371vnglin16l33ankv0i60l07c8znr7jllkyzf7r";
+ name = "libkgapi-18.08.1.tar.xz";
};
};
libkgeomap = {
- version = "18.08.0";
+ version = "18.08.1";
src = fetchurl {
- url = "${mirror}/stable/applications/18.08.0/src/libkgeomap-18.08.0.tar.xz";
- sha256 = "00hjz7amg2rf5s74465s44ac6kd33q4mvsa9ynpljisll5avlhan";
- name = "libkgeomap-18.08.0.tar.xz";
+ url = "${mirror}/stable/applications/18.08.1/src/libkgeomap-18.08.1.tar.xz";
+ sha256 = "1mnf43bpklyxh1schphndc7izknnzn3ymwppq4anysb9k603s7n4";
+ name = "libkgeomap-18.08.1.tar.xz";
};
};
libkipi = {
- version = "18.08.0";
+ version = "18.08.1";
src = fetchurl {
- url = "${mirror}/stable/applications/18.08.0/src/libkipi-18.08.0.tar.xz";
- sha256 = "1g34ryzr4vx5657c4j4w3b57n5ir6miwp1k60qk7av73qsik7a7d";
- name = "libkipi-18.08.0.tar.xz";
+ url = "${mirror}/stable/applications/18.08.1/src/libkipi-18.08.1.tar.xz";
+ sha256 = "166njf2w6qy30xiccagnpsb7ggcvqmdkp1djahfwmvjwqqxqq9ic";
+ name = "libkipi-18.08.1.tar.xz";
};
};
libkleo = {
- version = "18.08.0";
+ version = "18.08.1";
src = fetchurl {
- url = "${mirror}/stable/applications/18.08.0/src/libkleo-18.08.0.tar.xz";
- sha256 = "0vscfz794yp9hnrn4r4phbip2mqi3jvi41m5mpjd5pw11644d66c";
- name = "libkleo-18.08.0.tar.xz";
+ url = "${mirror}/stable/applications/18.08.1/src/libkleo-18.08.1.tar.xz";
+ sha256 = "1q1s335rmh2k2hmx4k67ik9wy2wa4n271fv21k6sg0l3h58z3fc6";
+ name = "libkleo-18.08.1.tar.xz";
};
};
libkmahjongg = {
- version = "18.08.0";
+ version = "18.08.1";
src = fetchurl {
- url = "${mirror}/stable/applications/18.08.0/src/libkmahjongg-18.08.0.tar.xz";
- sha256 = "0xzv7vawwq0gm10h9mfrsy5m5zpk1n3s338al0h9vskvhznphy83";
- name = "libkmahjongg-18.08.0.tar.xz";
+ url = "${mirror}/stable/applications/18.08.1/src/libkmahjongg-18.08.1.tar.xz";
+ sha256 = "0vvmm0mp2s5bl28vn7nq49b3izfy1myxx7c55qq6h3pmml70alp9";
+ name = "libkmahjongg-18.08.1.tar.xz";
};
};
libkomparediff2 = {
- version = "18.08.0";
+ version = "18.08.1";
src = fetchurl {
- url = "${mirror}/stable/applications/18.08.0/src/libkomparediff2-18.08.0.tar.xz";
- sha256 = "0nx66198vn6zrv012i4p2ghc2slxqccfb3fhd9zszzpnyd08zs27";
- name = "libkomparediff2-18.08.0.tar.xz";
+ url = "${mirror}/stable/applications/18.08.1/src/libkomparediff2-18.08.1.tar.xz";
+ sha256 = "114w3xcd31i0y5fk4cr9d075mmvx746hsnm6grc8mkhi6diplxs1";
+ name = "libkomparediff2-18.08.1.tar.xz";
};
};
libksane = {
- version = "18.08.0";
+ version = "18.08.1";
src = fetchurl {
- url = "${mirror}/stable/applications/18.08.0/src/libksane-18.08.0.tar.xz";
- sha256 = "09wx6haaw0rjcjdh2c05b2zrpz57zlhx9x9jy9hw28byrf71i0k0";
- name = "libksane-18.08.0.tar.xz";
+ url = "${mirror}/stable/applications/18.08.1/src/libksane-18.08.1.tar.xz";
+ sha256 = "0vi0kph8klnm3br9f9ifs5zgnncw83wrvk3kmxc412i28216qgf1";
+ name = "libksane-18.08.1.tar.xz";
};
};
libksieve = {
- version = "18.08.0";
+ version = "18.08.1";
src = fetchurl {
- url = "${mirror}/stable/applications/18.08.0/src/libksieve-18.08.0.tar.xz";
- sha256 = "0xnjw2q1hlmrlzdi776459v5w3l88bxpzzpqc93xmq39xh7xqq7b";
- name = "libksieve-18.08.0.tar.xz";
+ url = "${mirror}/stable/applications/18.08.1/src/libksieve-18.08.1.tar.xz";
+ sha256 = "06agi9wkj455sx0inn6hiahmqlfjaa3ffr8i7zfs2rfzw78qvg20";
+ name = "libksieve-18.08.1.tar.xz";
};
};
lokalize = {
- version = "18.08.0";
+ version = "18.08.1";
src = fetchurl {
- url = "${mirror}/stable/applications/18.08.0/src/lokalize-18.08.0.tar.xz";
- sha256 = "17h634abxzg3kx182qxdx6gyz0knl61yn32nlf76l0cv0bqc2xz5";
- name = "lokalize-18.08.0.tar.xz";
+ url = "${mirror}/stable/applications/18.08.1/src/lokalize-18.08.1.tar.xz";
+ sha256 = "1k5vn3jnvqvdc4bn1hdfjjp3snfcpc5i3925kns760vpvdm4a9in";
+ name = "lokalize-18.08.1.tar.xz";
};
};
lskat = {
- version = "18.08.0";
+ version = "18.08.1";
src = fetchurl {
- url = "${mirror}/stable/applications/18.08.0/src/lskat-18.08.0.tar.xz";
- sha256 = "05ckhh8270hjj94ks9zg6pypa2dm1d2r4l219gq456rrhyj9zv13";
- name = "lskat-18.08.0.tar.xz";
+ url = "${mirror}/stable/applications/18.08.1/src/lskat-18.08.1.tar.xz";
+ sha256 = "11snjlsmcsh4nkcfdzjdl0jia8g350xj2hgilqk5b9jir0j8rsyp";
+ name = "lskat-18.08.1.tar.xz";
};
};
mailcommon = {
- version = "18.08.0";
+ version = "18.08.1";
src = fetchurl {
- url = "${mirror}/stable/applications/18.08.0/src/mailcommon-18.08.0.tar.xz";
- sha256 = "06j66326wbvgnmacmbhvszbhdcw6h3pzxwcnbbz66n0zz2y4m5gd";
- name = "mailcommon-18.08.0.tar.xz";
+ url = "${mirror}/stable/applications/18.08.1/src/mailcommon-18.08.1.tar.xz";
+ sha256 = "1791ph0r5b9a0k2qgjrbxsz8drg23v5bdn832d695yy9q9rgxvwx";
+ name = "mailcommon-18.08.1.tar.xz";
};
};
mailimporter = {
- version = "18.08.0";
+ version = "18.08.1";
src = fetchurl {
- url = "${mirror}/stable/applications/18.08.0/src/mailimporter-18.08.0.tar.xz";
- sha256 = "0gywzd882mkjf9q07wg2hi4js4gqvyjxf3y0lgq22k5bd5gpfxbs";
- name = "mailimporter-18.08.0.tar.xz";
+ url = "${mirror}/stable/applications/18.08.1/src/mailimporter-18.08.1.tar.xz";
+ sha256 = "1rnmhfi54a9vlmvqjv2hsj967q886dkbv6nqn5imz11s8a97anb9";
+ name = "mailimporter-18.08.1.tar.xz";
};
};
marble = {
- version = "18.08.0";
+ version = "18.08.1";
src = fetchurl {
- url = "${mirror}/stable/applications/18.08.0/src/marble-18.08.0.tar.xz";
- sha256 = "1ylcdnf0rw0a51jcy183p9xcir4j7jlm6dmhk4k13zvzv16pcwvf";
- name = "marble-18.08.0.tar.xz";
+ url = "${mirror}/stable/applications/18.08.1/src/marble-18.08.1.tar.xz";
+ sha256 = "1vc6l68fvqdncvpmd8995v4hawi4w4zn3yjfpnghgvmvs30bak4p";
+ name = "marble-18.08.1.tar.xz";
};
};
mbox-importer = {
- version = "18.08.0";
+ version = "18.08.1";
src = fetchurl {
- url = "${mirror}/stable/applications/18.08.0/src/mbox-importer-18.08.0.tar.xz";
- sha256 = "08n46q2xxvjbbcr4754x7qw4p3yffmrpvzxi7k2i48ifxhs2awqj";
- name = "mbox-importer-18.08.0.tar.xz";
+ url = "${mirror}/stable/applications/18.08.1/src/mbox-importer-18.08.1.tar.xz";
+ sha256 = "1sqn11404xc9k76kz9zmm526dkzlk1ywnf15128plvyj6576wwaq";
+ name = "mbox-importer-18.08.1.tar.xz";
};
};
messagelib = {
- version = "18.08.0";
+ version = "18.08.1";
src = fetchurl {
- url = "${mirror}/stable/applications/18.08.0/src/messagelib-18.08.0.tar.xz";
- sha256 = "0d1bb0n9izwlk9fbwyf1hvwkrng1b6im574fxpkgk73ivb72ppfx";
- name = "messagelib-18.08.0.tar.xz";
+ url = "${mirror}/stable/applications/18.08.1/src/messagelib-18.08.1.tar.xz";
+ sha256 = "17z8c60dnhwzgpls3b6hsvyjgjpjybw7cfkc05xn1yihi5gr2rxs";
+ name = "messagelib-18.08.1.tar.xz";
};
};
minuet = {
- version = "18.08.0";
+ version = "18.08.1";
src = fetchurl {
- url = "${mirror}/stable/applications/18.08.0/src/minuet-18.08.0.tar.xz";
- sha256 = "0gvla9ig912wrg6vvdmqv2hyybr08a45crx69l31hcd13h9pmyg6";
- name = "minuet-18.08.0.tar.xz";
+ url = "${mirror}/stable/applications/18.08.1/src/minuet-18.08.1.tar.xz";
+ sha256 = "06jwrra25v2al0jw7dvp7h41jmw48d784ky74xi9lx4ma4h4vsvg";
+ name = "minuet-18.08.1.tar.xz";
};
};
okular = {
- version = "18.08.0";
+ version = "18.08.1";
src = fetchurl {
- url = "${mirror}/stable/applications/18.08.0/src/okular-18.08.0.tar.xz";
- sha256 = "11wwh0vb1l2dw2zhcg6f92y7vb5i5kaqwi8kszz8sd874ydpp8pn";
- name = "okular-18.08.0.tar.xz";
+ url = "${mirror}/stable/applications/18.08.1/src/okular-18.08.1.tar.xz";
+ sha256 = "1in053a3ir4qw2fabrv69g6kxr2hmdwq360kikmwdgsb6a7a8sjk";
+ name = "okular-18.08.1.tar.xz";
};
};
palapeli = {
- version = "18.08.0";
+ version = "18.08.1";
src = fetchurl {
- url = "${mirror}/stable/applications/18.08.0/src/palapeli-18.08.0.tar.xz";
- sha256 = "1a1k44q62raw1kxkyg8cspvwxzr1islbwzcb7sj63cmzsmwfhkg1";
- name = "palapeli-18.08.0.tar.xz";
+ url = "${mirror}/stable/applications/18.08.1/src/palapeli-18.08.1.tar.xz";
+ sha256 = "17c6xlmjz8nnnvp4xa27yzrx2vrsjlznjm2awj70z923js5kzfhl";
+ name = "palapeli-18.08.1.tar.xz";
};
};
parley = {
- version = "18.08.0";
+ version = "18.08.1";
src = fetchurl {
- url = "${mirror}/stable/applications/18.08.0/src/parley-18.08.0.tar.xz";
- sha256 = "1cy58fs1jaz1zga4dwfr80m0p6cgzc5ip26ds2x2lpygx7pbjcc6";
- name = "parley-18.08.0.tar.xz";
+ url = "${mirror}/stable/applications/18.08.1/src/parley-18.08.1.tar.xz";
+ sha256 = "1bwj806qm2g3n57f1svaz6x5y238xl0b3pmp4cg29a9c090gcj0r";
+ name = "parley-18.08.1.tar.xz";
};
};
picmi = {
- version = "18.08.0";
+ version = "18.08.1";
src = fetchurl {
- url = "${mirror}/stable/applications/18.08.0/src/picmi-18.08.0.tar.xz";
- sha256 = "1x2ya0vwxwc56rfskl3l83nw0vpdh1lzshh0sdal3rfw0s8w895x";
- name = "picmi-18.08.0.tar.xz";
+ url = "${mirror}/stable/applications/18.08.1/src/picmi-18.08.1.tar.xz";
+ sha256 = "0bc3zs5ql1yfriq3pbxc0cb010n8rygqglpz8c2qinnsgf9wb305";
+ name = "picmi-18.08.1.tar.xz";
};
};
pimcommon = {
- version = "18.08.0";
+ version = "18.08.1";
src = fetchurl {
- url = "${mirror}/stable/applications/18.08.0/src/pimcommon-18.08.0.tar.xz";
- sha256 = "1j6pj7f52ya0jgzq97g65zl3mpv7hn002flv35qlg5srzdllm3pd";
- name = "pimcommon-18.08.0.tar.xz";
+ url = "${mirror}/stable/applications/18.08.1/src/pimcommon-18.08.1.tar.xz";
+ sha256 = "0h8g374bdnf9nm43flz9wg1ddcdppqxng1vq58vqlviiy32qf86p";
+ name = "pimcommon-18.08.1.tar.xz";
};
};
pim-data-exporter = {
- version = "18.08.0";
+ version = "18.08.1";
src = fetchurl {
- url = "${mirror}/stable/applications/18.08.0/src/pim-data-exporter-18.08.0.tar.xz";
- sha256 = "1spbkwv9kqzky958nymr5plz8rgzxbn6xzgy7k9pkpvynd1a54hz";
- name = "pim-data-exporter-18.08.0.tar.xz";
+ url = "${mirror}/stable/applications/18.08.1/src/pim-data-exporter-18.08.1.tar.xz";
+ sha256 = "01spb3lfs3rsl1h6d6lrszssj1rnbv1p21np75x4rm7qxzdn7wy7";
+ name = "pim-data-exporter-18.08.1.tar.xz";
};
};
pim-sieve-editor = {
- version = "18.08.0";
+ version = "18.08.1";
src = fetchurl {
- url = "${mirror}/stable/applications/18.08.0/src/pim-sieve-editor-18.08.0.tar.xz";
- sha256 = "0nqv530rlamlngxwy3cpbyjj75akx3k9lcifgymlbm4ipp9k125c";
- name = "pim-sieve-editor-18.08.0.tar.xz";
+ url = "${mirror}/stable/applications/18.08.1/src/pim-sieve-editor-18.08.1.tar.xz";
+ sha256 = "09npw10dgzk7z3022d1np4qvmbwb07lxjj2nd4k1hxnkcjaz242d";
+ name = "pim-sieve-editor-18.08.1.tar.xz";
};
};
poxml = {
- version = "18.08.0";
+ version = "18.08.1";
src = fetchurl {
- url = "${mirror}/stable/applications/18.08.0/src/poxml-18.08.0.tar.xz";
- sha256 = "04sy8v3n12asz8hfh107y5irhxzlpkzgc3zjw8qfygflzg9a48cz";
- name = "poxml-18.08.0.tar.xz";
+ url = "${mirror}/stable/applications/18.08.1/src/poxml-18.08.1.tar.xz";
+ sha256 = "1zazxxh4j8ihlb5v33b5wgj4ddqqhd809lzhxq28dq0mg7wvqcm8";
+ name = "poxml-18.08.1.tar.xz";
};
};
print-manager = {
- version = "18.08.0";
+ version = "18.08.1";
src = fetchurl {
- url = "${mirror}/stable/applications/18.08.0/src/print-manager-18.08.0.tar.xz";
- sha256 = "1mi2aqsh5irlnlgkajkkxhazyafhpndrxckcc2kmrh00d4cxhivn";
- name = "print-manager-18.08.0.tar.xz";
+ url = "${mirror}/stable/applications/18.08.1/src/print-manager-18.08.1.tar.xz";
+ sha256 = "0ixamp14m3p13j1c6nc9x6043600k2anfw12mn1yg4f8q5fb6dnf";
+ name = "print-manager-18.08.1.tar.xz";
};
};
rocs = {
- version = "18.08.0";
+ version = "18.08.1";
src = fetchurl {
- url = "${mirror}/stable/applications/18.08.0/src/rocs-18.08.0.tar.xz";
- sha256 = "1c3i11mg6xs64wjyph51hqr6j428hh71ljdq4ajhysql7l5kbhhx";
- name = "rocs-18.08.0.tar.xz";
+ url = "${mirror}/stable/applications/18.08.1/src/rocs-18.08.1.tar.xz";
+ sha256 = "1kchipj3q29zfp60l81q52m6gb4fcmawcl42rvzr4mxf4h7dw72n";
+ name = "rocs-18.08.1.tar.xz";
};
};
signon-kwallet-extension = {
- version = "18.08.0";
+ version = "18.08.1";
src = fetchurl {
- url = "${mirror}/stable/applications/18.08.0/src/signon-kwallet-extension-18.08.0.tar.xz";
- sha256 = "024ay0z9inbf7k54iq5v78cxh4q8x1ypvd8r3w80dyygjw2dw743";
- name = "signon-kwallet-extension-18.08.0.tar.xz";
+ url = "${mirror}/stable/applications/18.08.1/src/signon-kwallet-extension-18.08.1.tar.xz";
+ sha256 = "1wf9xffjxyqn5vwwnp4wbn22lby5vc396snc3imdp1bx4z5ffck4";
+ name = "signon-kwallet-extension-18.08.1.tar.xz";
};
};
spectacle = {
- version = "18.08.0";
+ version = "18.08.1";
src = fetchurl {
- url = "${mirror}/stable/applications/18.08.0/src/spectacle-18.08.0.tar.xz";
- sha256 = "1gc2qza529jld1zngzs98zmd3734h13phviswqpg93qnbr9hxskr";
- name = "spectacle-18.08.0.tar.xz";
+ url = "${mirror}/stable/applications/18.08.1/src/spectacle-18.08.1.tar.xz";
+ sha256 = "0xvw6l0712gmb3dvq9hnyp7r160rvmvmm3mvgapj4z5c00m8a1d7";
+ name = "spectacle-18.08.1.tar.xz";
};
};
step = {
- version = "18.08.0";
+ version = "18.08.1";
src = fetchurl {
- url = "${mirror}/stable/applications/18.08.0/src/step-18.08.0.tar.xz";
- sha256 = "15hjbisv3adsn0vavlcl3iy3vz6mf1fv0qj4ykmxckblcyhm1mgg";
- name = "step-18.08.0.tar.xz";
+ url = "${mirror}/stable/applications/18.08.1/src/step-18.08.1.tar.xz";
+ sha256 = "1b7cvrhdbfkqg72phbgbl15v8c4nr6b1b9fw8i1vam028a97bq8z";
+ name = "step-18.08.1.tar.xz";
};
};
svgpart = {
- version = "18.08.0";
+ version = "18.08.1";
src = fetchurl {
- url = "${mirror}/stable/applications/18.08.0/src/svgpart-18.08.0.tar.xz";
- sha256 = "0q71nn1xsdh7ag60szl836lif9ywnv3dlv8w0sn3zfa7yv0cbraa";
- name = "svgpart-18.08.0.tar.xz";
+ url = "${mirror}/stable/applications/18.08.1/src/svgpart-18.08.1.tar.xz";
+ sha256 = "07mm5vzd5lslr5x7r71ac3hp3s779i89nz4d84550pk0qdn3qpmb";
+ name = "svgpart-18.08.1.tar.xz";
};
};
sweeper = {
- version = "18.08.0";
+ version = "18.08.1";
src = fetchurl {
- url = "${mirror}/stable/applications/18.08.0/src/sweeper-18.08.0.tar.xz";
- sha256 = "1j87cb9bbfn42f2xn9k6j8ailgn18b5ribjf4sgglx2h1l3vpq51";
- name = "sweeper-18.08.0.tar.xz";
+ url = "${mirror}/stable/applications/18.08.1/src/sweeper-18.08.1.tar.xz";
+ sha256 = "1vmdk38j03qj0l5gc27dc242j0cj7k2c5zfq2xrvjb44rxfirdy4";
+ name = "sweeper-18.08.1.tar.xz";
};
};
syndication = {
- version = "18.08.0";
+ version = "18.08.1";
src = fetchurl {
- url = "${mirror}/stable/applications/18.08.0/src/syndication-18.08.0.tar.xz";
- sha256 = "17j3ks7bmr3p71lvrm8bzbfai5sw3frwrwl0ckbg1rwhkbsi3d71";
- name = "syndication-18.08.0.tar.xz";
+ url = "${mirror}/stable/applications/18.08.1/src/syndication-18.08.1.tar.xz";
+ sha256 = "0lirbr8zb1j5kalki6v98wmcg5z25xj1wamszd81h9wlkgk5aqd0";
+ name = "syndication-18.08.1.tar.xz";
};
};
umbrello = {
- version = "18.08.0";
+ version = "18.08.1";
src = fetchurl {
- url = "${mirror}/stable/applications/18.08.0/src/umbrello-18.08.0.tar.xz";
- sha256 = "0rs92l6disjha8w5nx05qjbidib4a9yyab7f4cd4sjnjfcw3i1px";
- name = "umbrello-18.08.0.tar.xz";
+ url = "${mirror}/stable/applications/18.08.1/src/umbrello-18.08.1.tar.xz";
+ sha256 = "16p283jz5v5j40i1i7c9fk36bhs2k30rk17l3nikmf0qd7j5n6ir";
+ name = "umbrello-18.08.1.tar.xz";
};
};
zeroconf-ioslave = {
- version = "18.08.0";
+ version = "18.08.1";
src = fetchurl {
- url = "${mirror}/stable/applications/18.08.0/src/zeroconf-ioslave-18.08.0.tar.xz";
- sha256 = "05j8k8la4gcydazzhhxq8700w1l4q57yylcar1wzs108icp03rkm";
- name = "zeroconf-ioslave-18.08.0.tar.xz";
+ url = "${mirror}/stable/applications/18.08.1/src/zeroconf-ioslave-18.08.1.tar.xz";
+ sha256 = "0m1yhm17chz49xs6nh1n8dqdkbnr8kkig9p2f9nmvypnfagygpsi";
+ name = "zeroconf-ioslave-18.08.1.tar.xz";
};
};
}
diff --git a/pkgs/applications/misc/dbeaver/default.nix b/pkgs/applications/misc/dbeaver/default.nix
index 35698a32331..77cad142d41 100644
--- a/pkgs/applications/misc/dbeaver/default.nix
+++ b/pkgs/applications/misc/dbeaver/default.nix
@@ -7,7 +7,7 @@
stdenv.mkDerivation rec {
name = "dbeaver-ce-${version}";
- version = "5.1.6";
+ version = "5.2.0";
desktopItem = makeDesktopItem {
name = "dbeaver";
@@ -30,7 +30,7 @@ stdenv.mkDerivation rec {
src = fetchurl {
url = "https://dbeaver.io/files/${version}/dbeaver-ce-${version}-linux.gtk.x86_64.tar.gz";
- sha256 = "1zypadnyhinm6mfv91s7zs2s55bhzgkqhl6ai6x3yqwhvayc02nn";
+ sha256 = "13j2qc4g24d2gmkxj9zpqrcbai9aq8rassrq3c9mp9ir6sf4q0jf";
};
installPhase = ''
diff --git a/pkgs/applications/misc/electrum/default.nix b/pkgs/applications/misc/electrum/default.nix
index ed2f0626e5d..95754579c48 100644
--- a/pkgs/applications/misc/electrum/default.nix
+++ b/pkgs/applications/misc/electrum/default.nix
@@ -1,12 +1,24 @@
{ stdenv, fetchurl, python3, python3Packages, zbar }:
+let
+ qdarkstyle = python3Packages.buildPythonPackage rec {
+ pname = "QDarkStyle";
+ version = "2.5.4";
+ src = python3Packages.fetchPypi {
+ inherit pname version;
+ sha256 = "1w715m1i5pycfqcpkrggpn0rs9cakx6cm5v8rggcxnf4p0i0kdiy";
+ };
+ doCheck = false; # no tests
+ };
+in
+
python3Packages.buildPythonApplication rec {
name = "electrum-${version}";
- version = "3.1.3";
+ version = "3.2.3";
src = fetchurl {
url = "https://download.electrum.org/${version}/Electrum-${version}.tar.gz";
- sha256 = "05m28yd3zr9awjhaqikf4rg08j5i4ygm750ip1z27wl446sysniy";
+ sha256 = "022iw4cq0c009wvqn7wd815jc0nv8198lq3cawn8h6c28hw2mhs1";
};
propagatedBuildInputs = with python3Packages; [
@@ -17,12 +29,14 @@ python3Packages.buildPythonApplication rec {
pbkdf2
protobuf
pyaes
- pycrypto
+ pycryptodomex
pyqt5
pysocks
+ qdarkstyle
qrcode
requests
tlslite
+ typing
# plugins
keepkey
@@ -35,10 +49,10 @@ python3Packages.buildPythonApplication rec {
preBuild = ''
sed -i 's,usr_share = .*,usr_share = "'$out'/share",g' setup.py
- pyrcc5 icons.qrc -o gui/qt/icons_rc.py
+ pyrcc5 icons.qrc -o electrum/gui/qt/icons_rc.py
# Recording the creation timestamps introduces indeterminism to the build
- sed -i '/Created: .*/d' gui/qt/icons_rc.py
- sed -i "s|name = 'libzbar.*'|name='${zbar}/lib/libzbar.so'|" lib/qrscanner.py
+ sed -i '/Created: .*/d' electrum/gui/qt/icons_rc.py
+ sed -i "s|name = 'libzbar.*'|name='${zbar}/lib/libzbar.so'|" electrum/qrscanner.py
'';
postInstall = ''
diff --git a/pkgs/applications/misc/glava/default.nix b/pkgs/applications/misc/glava/default.nix
index e0535eeca38..1eb0d0048f6 100644
--- a/pkgs/applications/misc/glava/default.nix
+++ b/pkgs/applications/misc/glava/default.nix
@@ -1,24 +1,14 @@
-{ stdenv, fetchurl, writeScript, fetchFromGitHub
+{ stdenv, fetchgit, fetchurl, writeScript
, libGL, libX11, libXext, python3, libXrandr, libXrender, libpulseaudio, libXcomposite
, enableGlfw ? false, glfw }:
let
inherit (stdenv.lib) optional makeLibraryPath;
- version = "1.4.5";
- gladVersion = "0.1.24";
- # glad
- # https://github.com/wacossusca34/glava/issues/46#issuecomment-397816520
- glad = fetchFromGitHub {
- owner = "Dav1dde";
- repo = "glad";
- rev = "v${gladVersion}";
- sha256 = "0s2c9w064kqa5i07w8zmvgpg1pa3wj86l1nhgw7w56cjhq7cf8h8";
- };
# gl.xml
gl = fetchurl {
- url = https://raw.githubusercontent.com/KhronosGroup/OpenGL-Registry/a24f3f7a4c924fdbc666024f99c70e5b8e34c819/xml/gl.xml;
- sha256 = "1mskxjmhb35m8qv255pibf633d8sn1w9rdsf0lj75bhlgy0zi5c7";
+ url = https://raw.githubusercontent.com/KhronosGroup/OpenGL-Registry/56312cfe680e4be5ae61bbf1c628e420f8731718/xml/gl.xml;
+ sha256 = "1c45bcgaxiic5gmb3gkrd9qcvascvij97vz5y6fc3a2y7x3gjc5l";
};
# EGL 1.5
egl = fetchurl {
@@ -43,12 +33,12 @@ let
in
stdenv.mkDerivation rec {
name = "glava-${version}";
+ version = "1.5.1";
- src = fetchFromGitHub {
- owner = "wacossusca34";
- repo = "glava";
+ src = fetchgit {
+ url = "https://github.com/wacossusca34/glava.git";
rev = "v${version}";
- sha256 = "1zfw8samrzxxbny709rcdz1z77cw1cd46wlfnf7my02kipmqn0nr";
+ sha256 = "1k8x0a0g2pm7ficsk4az9s7mjbm85a987apjg5c4y6iyldxgd6sb";
};
buildInputs = [
@@ -65,7 +55,6 @@ in
];
patchPhase = ''
- cp -r --no-preserve=all ${glad}/* glad
mkdir -p glad/include/KHR
cp ${gl} glad/gl.xml
diff --git a/pkgs/applications/misc/josm/default.nix b/pkgs/applications/misc/josm/default.nix
index e753c5ded95..fc10bc852e5 100644
--- a/pkgs/applications/misc/josm/default.nix
+++ b/pkgs/applications/misc/josm/default.nix
@@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
name = "josm-${version}";
- version = "14066";
+ version = "14178";
src = fetchurl {
url = "https://josm.openstreetmap.de/download/josm-snapshot-${version}.jar";
- sha256 = "06mhaz5vr19ydqc5irhgcbl0s8fifwvaq60iz2nsnlxb1pw89xia";
+ sha256 = "08an4s8vbcd8vyinnvd7cxmgnrsy47j78a94nk6vq244gp7v5n0r";
};
buildInputs = [ jre10 makeWrapper ];
diff --git a/pkgs/applications/misc/mediainfo-gui/default.nix b/pkgs/applications/misc/mediainfo-gui/default.nix
index b6ec3305cb3..3ff07ba2008 100644
--- a/pkgs/applications/misc/mediainfo-gui/default.nix
+++ b/pkgs/applications/misc/mediainfo-gui/default.nix
@@ -2,11 +2,11 @@
, desktop-file-utils, libSM, imagemagick }:
stdenv.mkDerivation rec {
- version = "18.05";
+ version = "18.08";
name = "mediainfo-gui-${version}";
src = fetchurl {
url = "https://mediaarea.net/download/source/mediainfo/${version}/mediainfo_${version}.tar.xz";
- sha256 = "0rgsfplisf729n1j3fyg82wpw88aahisrddn5wq9yx8hz6m96h6r";
+ sha256 = "0l4bhrgwfn3da6cr0jz5vs17sk7k0bc26nk7hymv04xifns5999n";
};
nativeBuildInputs = [ autoreconfHook pkgconfig ];
diff --git a/pkgs/applications/misc/mediainfo/default.nix b/pkgs/applications/misc/mediainfo/default.nix
index 5b2f8125f72..d222ad1e53e 100644
--- a/pkgs/applications/misc/mediainfo/default.nix
+++ b/pkgs/applications/misc/mediainfo/default.nix
@@ -1,11 +1,11 @@
{ stdenv, fetchurl, autoreconfHook, pkgconfig, libzen, libmediainfo, zlib }:
stdenv.mkDerivation rec {
- version = "18.05";
+ version = "18.08";
name = "mediainfo-${version}";
src = fetchurl {
url = "https://mediaarea.net/download/source/mediainfo/${version}/mediainfo_${version}.tar.xz";
- sha256 = "0rgsfplisf729n1j3fyg82wpw88aahisrddn5wq9yx8hz6m96h6r";
+ sha256 = "0l4bhrgwfn3da6cr0jz5vs17sk7k0bc26nk7hymv04xifns5999n";
};
nativeBuildInputs = [ autoreconfHook pkgconfig ];
diff --git a/pkgs/applications/misc/notejot/default.nix b/pkgs/applications/misc/notejot/default.nix
new file mode 100644
index 00000000000..59ba45e6f37
--- /dev/null
+++ b/pkgs/applications/misc/notejot/default.nix
@@ -0,0 +1,47 @@
+{ stdenv, fetchFromGitHub, vala, pkgconfig, meson, ninja, python3, granite
+, gtk3, gnome3, gtksourceview, json-glib, gobjectIntrospection, wrapGAppsHook }:
+
+stdenv.mkDerivation rec {
+ pname = "notejot";
+ version = "1.4.5";
+
+ name = "${pname}-${version}";
+
+ src = fetchFromGitHub {
+ owner = "lainsce";
+ repo = pname;
+ rev = version;
+ sha256 = "0mjig4y2rb6v2dyzya44mfz0dxgp5wnjs3kdavf9ha2jzjjr5xyb";
+ };
+
+ nativeBuildInputs = [
+ gobjectIntrospection
+ meson
+ ninja
+ pkgconfig
+ python3
+ vala
+ wrapGAppsHook
+ ];
+
+ buildInputs = [
+ gnome3.libgee
+ granite
+ gtk3
+ gtksourceview
+ json-glib
+ ];
+
+ postPatch = ''
+ chmod +x meson/post_install.py
+ patchShebangs meson/post_install.py
+ '';
+
+ meta = with stdenv.lib; {
+ description = "Stupidly-simple sticky notes applet";
+ homepage = https://github.com/lainsce/notejot;
+ license = licenses.gpl2Plus;
+ maintainers = with maintainers; [ worldofpeace ];
+ platforms = platforms.linux;
+ };
+}
diff --git a/pkgs/applications/misc/ranger/default.nix b/pkgs/applications/misc/ranger/default.nix
index 33b8c33033e..6d883d89de3 100644
--- a/pkgs/applications/misc/ranger/default.nix
+++ b/pkgs/applications/misc/ranger/default.nix
@@ -7,13 +7,13 @@ assert imagePreviewSupport -> w3m != null;
python3Packages.buildPythonApplication rec {
name = "ranger-${version}";
- version = "1.9.1";
+ version = "1.9.2";
src = fetchFromGitHub {
owner = "ranger";
repo = "ranger";
rev = "v${version}";
- sha256= "1zhds37j1scxa9b183qbrjwxqldrdk581c5xiy81vg17sndb1kqj";
+ sha256= "1ws6g8z1m1hfp8bv4msvbaa9f7948p687jmc8h69yib4jkv3qyax";
};
checkInputs = with python3Packages; [ pytest ];
@@ -51,6 +51,6 @@ python3Packages.buildPythonApplication rec {
homepage = http://ranger.github.io/;
license = licenses.gpl3;
platforms = platforms.unix;
- maintainers = [ maintainers.magnetophon ];
+ maintainers = [ maintainers.toonn maintainers.magnetophon ];
};
}
diff --git a/pkgs/applications/misc/sequeler/default.nix b/pkgs/applications/misc/sequeler/default.nix
index cc676bb28e2..89b4e33a927 100644
--- a/pkgs/applications/misc/sequeler/default.nix
+++ b/pkgs/applications/misc/sequeler/default.nix
@@ -4,7 +4,7 @@
let
- version = "0.6.0";
+ version = "0.6.2";
sqlGda = libgda.override {
mysqlSupport = true;
postgresSupport = true;
@@ -17,7 +17,7 @@ in stdenv.mkDerivation rec {
owner = "Alecaddd";
repo = "sequeler";
rev = "v${version}";
- sha256 = "04x3fg665201g3zy66sicfna4vac4n1pmrahbra90gvfzaia1cai";
+ sha256 = "0j5z3z34jc1acclmlkjpv7fcs4f2gf0bcfnvcpn3zdzw9fzj0sw7";
};
nativeBuildInputs = [ meson ninja pkgconfig vala gobjectIntrospection gettext wrapGAppsHook python3 desktop-file-utils ];
diff --git a/pkgs/applications/misc/solaar/default.nix b/pkgs/applications/misc/solaar/default.nix
index afe944e868e..e26071dd361 100644
--- a/pkgs/applications/misc/solaar/default.nix
+++ b/pkgs/applications/misc/solaar/default.nix
@@ -1,5 +1,5 @@
-{fetchFromGitHub, stdenv, gtk3, python34Packages, gobjectIntrospection}:
-python34Packages.buildPythonApplication rec {
+{fetchFromGitHub, stdenv, gtk3, pythonPackages, gobjectIntrospection}:
+pythonPackages.buildPythonApplication rec {
name = "solaar-unstable-${version}";
version = "2018-02-02";
namePrefix = "";
@@ -10,7 +10,7 @@ python34Packages.buildPythonApplication rec {
sha256 = "0zy5vmjzdybnjf0mpp8rny11sc43gmm8172svsm9s51h7x0v83y3";
};
- propagatedBuildInputs = [python34Packages.pygobject3 python34Packages.pyudev gobjectIntrospection gtk3];
+ propagatedBuildInputs = [pythonPackages.pygobject3 pythonPackages.pyudev gobjectIntrospection gtk3];
postInstall = ''
wrapProgram "$out/bin/solaar" \
--prefix PYTHONPATH : "$PYTHONPATH" \
diff --git a/pkgs/applications/misc/taskjuggler/Gemfile.lock b/pkgs/applications/misc/taskjuggler/Gemfile.lock
index d1642e76fa6..ebd04c20ea6 100644
--- a/pkgs/applications/misc/taskjuggler/Gemfile.lock
+++ b/pkgs/applications/misc/taskjuggler/Gemfile.lock
@@ -1,15 +1,15 @@
GEM
remote: http://rubygems.org/
specs:
- mail (2.6.3)
- mime-types (>= 1.16, < 3)
- mime-types (2.6.1)
- taskjuggler (3.5.0)
+ mail (2.7.0)
+ mini_mime (>= 0.1.1)
+ mini_mime (1.0.1)
+ taskjuggler (3.6.0)
mail (>= 2.4.3)
term-ansicolor (>= 1.0.7)
- term-ansicolor (1.3.2)
+ term-ansicolor (1.6.0)
tins (~> 1.0)
- tins (1.6.0)
+ tins (1.16.3)
PLATFORMS
ruby
@@ -18,4 +18,4 @@ DEPENDENCIES
taskjuggler
BUNDLED WITH
- 1.10.5
+ 1.14.6
diff --git a/pkgs/applications/misc/taskjuggler/default.nix b/pkgs/applications/misc/taskjuggler/default.nix
index c5429b6c851..f3f9285b312 100644
--- a/pkgs/applications/misc/taskjuggler/default.nix
+++ b/pkgs/applications/misc/taskjuggler/default.nix
@@ -1,16 +1,21 @@
-{ lib, bundlerEnv, ruby }:
+{ lib, bundlerApp, ruby }:
-bundlerEnv {
- name = "taskjuggler-3.5.0";
+bundlerApp {
+ pname = "taskjuggler";
inherit ruby;
gemdir = ./.;
+ exes = [
+ "tj3" "tj3client" "tj3d" "tj3man" "tj3ss_receiver" "tj3ss_sender"
+ "tj3ts_receiver" "tj3ts_sender" "tj3ts_summary" "tj3webd"
+ ];
+
meta = {
- broken = true; # needs ruby 2.0
description = "A modern and powerful project management tool";
homepage = http://taskjuggler.org/;
license = lib.licenses.gpl2;
platforms = lib.platforms.unix;
+ maintainers = [ lib.maintainers.manveru ];
};
}
diff --git a/pkgs/applications/misc/taskjuggler/gemset.nix b/pkgs/applications/misc/taskjuggler/gemset.nix
index e65ab3451a6..24c1e431177 100644
--- a/pkgs/applications/misc/taskjuggler/gemset.nix
+++ b/pkgs/applications/misc/taskjuggler/gemset.nix
@@ -1,47 +1,55 @@
{
- "mail" = {
- version = "2.6.3";
+ mail = {
+ dependencies = ["mini_mime"];
+ groups = ["default"];
+ platforms = [];
source = {
+ remotes = ["http://rubygems.org"];
+ sha256 = "10dyifazss9mgdzdv08p47p344wmphp5pkh5i73s7c04ra8y6ahz";
type = "gem";
- sha256 = "1nbg60h3cpnys45h7zydxwrl200p7ksvmrbxnwwbpaaf9vnf3znp";
};
- dependencies = [
- "mime-types"
- ];
+ version = "2.7.0";
};
- "mime-types" = {
- version = "2.6.1";
+ mini_mime = {
+ groups = ["default"];
+ platforms = [];
source = {
+ remotes = ["http://rubygems.org"];
+ sha256 = "1q4pshq387lzv9m39jv32vwb8wrq3wc4jwgl4jk209r4l33v09d3";
type = "gem";
- sha256 = "1vnrvf245ijfyxzjbj9dr6i1hkjbyrh4yj88865wv9bs75axc5jv";
};
+ version = "1.0.1";
};
- "taskjuggler" = {
- version = "3.5.0";
+ taskjuggler = {
+ dependencies = ["mail" "term-ansicolor"];
+ groups = ["default"];
+ platforms = [];
source = {
+ remotes = ["http://rubygems.org"];
+ sha256 = "0ky3cydl3szhdyxsy4k6zxzjlbll7mlq025aj6xd5jmh49k3pfbp";
type = "gem";
- sha256 = "0r84rlc7a6w7p9nc9mgycbs5h0hq0kzscjq7zj3296xyf0afiwj2";
};
- dependencies = [
- "mail"
- "term-ansicolor"
- ];
+ version = "3.6.0";
};
- "term-ansicolor" = {
- version = "1.3.2";
+ term-ansicolor = {
+ dependencies = ["tins"];
+ groups = ["default"];
+ platforms = [];
source = {
+ remotes = ["http://rubygems.org"];
+ sha256 = "1b1wq9ljh7v3qyxkk8vik2fqx2qzwh5lval5f92llmldkw7r7k7b";
type = "gem";
- sha256 = "0ydbbyjmk5p7fsi55ffnkq79jnfqx65c3nj8d9rpgl6sw85ahyys";
};
- dependencies = [
- "tins"
- ];
- };
- "tins" = {
version = "1.6.0";
- source = {
- type = "gem";
- sha256 = "02qarvy17nbwvslfgqam8y6y7479cwmb1a6di9z18hzka4cf90hz";
- };
};
-}
+ tins = {
+ groups = ["default"];
+ platforms = [];
+ source = {
+ remotes = ["http://rubygems.org"];
+ sha256 = "0g95xs4nvx5n62hb4fkbkd870l9q3y9adfc4h8j21phj9mxybkb8";
+ type = "gem";
+ };
+ version = "1.16.3";
+ };
+}
\ No newline at end of file
diff --git a/pkgs/applications/misc/tilix/default.nix b/pkgs/applications/misc/tilix/default.nix
index e101005e44e..98e320b7aaf 100644
--- a/pkgs/applications/misc/tilix/default.nix
+++ b/pkgs/applications/misc/tilix/default.nix
@@ -4,13 +4,13 @@
stdenv.mkDerivation rec {
name = "tilix-${version}";
- version = "1.8.3";
+ version = "1.8.5";
src = fetchFromGitHub {
owner = "gnunn1";
repo = "tilix";
rev = "${version}";
- sha256 = "05x2nyyb5w3122j90g0f7lh9jl7xi1nk176sl01vl2ks7zar00dq";
+ sha256 = "1ixhkssz0xn3x75n2iw6gd3hka6bgmgwfgbvblbjhhx8gcpbw3s7";
};
nativeBuildInputs = [
diff --git a/pkgs/applications/misc/worker/default.nix b/pkgs/applications/misc/worker/default.nix
index bfb43d3e49d..f9267411dda 100644
--- a/pkgs/applications/misc/worker/default.nix
+++ b/pkgs/applications/misc/worker/default.nix
@@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
name = "worker-${version}";
- version = "3.15.1";
+ version = "3.15.2";
src = fetchurl {
url = "http://www.boomerangsworld.de/cms/worker/downloads/${name}.tar.gz";
- sha256 = "05h25dxqff4xhmrk7j9j11yxpqa4qm7m3xprv7yldryc1mbvnpwi";
+ sha256 = "0km17ls51vp4nxlppf58vvxxymyx6w3xlzjc8wghxpjj098v4pp8";
};
buildInputs = [ libX11 ];
diff --git a/pkgs/applications/misc/xca/default.nix b/pkgs/applications/misc/xca/default.nix
index ee4300cde0f..7b95cf002ca 100644
--- a/pkgs/applications/misc/xca/default.nix
+++ b/pkgs/applications/misc/xca/default.nix
@@ -1,15 +1,15 @@
-{ mkDerivation, lib, fetchFromGitHub, autoreconfHook, perl, pkgconfig, which
+{ mkDerivation, lib, fetchFromGitHub, autoreconfHook, perl, pkgconfig
, libtool, openssl, qtbase, qttools }:
mkDerivation rec {
name = "xca-${version}";
- version = "2.1.0";
+ version = "2.1.1";
src = fetchFromGitHub {
owner = "chris2511";
repo = "xca";
rev = "RELEASE.${version}";
- sha256 = "039qz6hh43hx8dcw2bq71mgy95zk09jyd3xxpldmxxd5d69zcr8m";
+ sha256 = "1d09329a80axwqhxixwasd8scsmh23vsq1076amy5c8173s4ambi";
};
postPatch = ''
@@ -17,15 +17,15 @@ mkDerivation rec {
--replace /usr/bin/perl ${perl}/bin/perl
'';
- buildInputs = [ libtool openssl qtbase qttools ];
+ buildInputs = [ libtool openssl qtbase ];
- nativeBuildInputs = [ autoreconfHook pkgconfig which ];
+ nativeBuildInputs = [ autoreconfHook pkgconfig qttools ];
enableParallelBuilding = true;
meta = with lib; {
- description = "Interface for managing asymetric keys like RSA or DSA";
- homepage = http://xca.sourceforge.net/;
+ description = "An x509 certificate generation tool, handling RSA, DSA and EC keys, certificate signing requests (PKCS#10) and CRLs";
+ homepage = https://hohnstaedt.de/xca/;
license = licenses.bsd3;
maintainers = with maintainers; [ offline peterhoeg ];
platforms = platforms.all;
diff --git a/pkgs/applications/networking/browsers/chromium/common.nix b/pkgs/applications/networking/browsers/chromium/common.nix
index ebc700a7f37..6b9f7225c84 100644
--- a/pkgs/applications/networking/browsers/chromium/common.nix
+++ b/pkgs/applications/networking/browsers/chromium/common.nix
@@ -1,4 +1,4 @@
-{ stdenv, ninja, which, nodejs, fetchurl, fetchpatch, gnutar
+{ stdenv, gn, ninja, which, nodejs, fetchurl, fetchpatch, gnutar
# default dependencies
, bzip2, flac, speex, libopus
@@ -139,11 +139,6 @@ let
# (gentooPatch "" "0000000000000000000000000000000000000000000000000000000000000000")
./patches/fix-freetype.patch
./patches/nix_plugin_paths_68.patch
- ] ++ optionals (versionRange "68" "69") [
- ./patches/remove-webp-include-68.patch
- (githubPatch "4d10424f9e2a06978cdd6cdf5403fcaef18e49fc" "11la1jycmr5b5rw89mzcdwznmd2qh28sghvz9klr1qhmsmw1vzjc")
- (githubPatch "56cb5f7da1025f6db869e840ed34d3b98b9ab899" "04mp5r1yvdvdx6m12g3lw3z51bzh7m3gr73mhblkn4wxdbvi3dcs")
- ] ++ optionals (versionAtLeast version "69") [
./patches/remove-webp-include-69.patch
] ++ optional enableWideVine ./patches/widevine.patch;
@@ -243,15 +238,11 @@ let
configurePhase = ''
runHook preConfigure
- # Build gn
- python tools/gn/bootstrap/bootstrap.py -v -s --no-clean
- PATH="$PWD/out/Release:$PATH"
-
# This is to ensure expansion of $out.
libExecPath="${libExecPath}"
python build/linux/unbundle/replace_gn_files.py \
--system-libraries ${toString gnSystemLibraries}
- gn gen --args=${escapeShellArg gnFlags} out/Release | tee gn-gen-outputs.txt
+ ${gn}/bin/gn gen --args=${escapeShellArg gnFlags} out/Release | tee gn-gen-outputs.txt
# Fail if `gn gen` contains a WARNING.
grep -o WARNING gn-gen-outputs.txt && echo "Found gn WARNING, exiting nix build" && exit 1
diff --git a/pkgs/applications/networking/browsers/chromium/patches/remove-webp-include-68.patch b/pkgs/applications/networking/browsers/chromium/patches/remove-webp-include-68.patch
deleted file mode 100644
index 1995bf1fa8f..00000000000
--- a/pkgs/applications/networking/browsers/chromium/patches/remove-webp-include-68.patch
+++ /dev/null
@@ -1,12 +0,0 @@
---- a/third_party/blink/renderer/platform/image-encoders/image_encoder.h
-+++ b/third_party/blink/renderer/platform/image-encoders/image_encoder.h
-@@ -8,7 +8,7 @@
- #include "third_party/blink/renderer/platform/platform_export.h"
- #include "third_party/blink/renderer/platform/wtf/vector.h"
- #include "third_party/libjpeg/jpeglib.h" // for JPEG_MAX_DIMENSION
--#include "third_party/libwebp/src/webp/encode.h" // for WEBP_MAX_DIMENSION
-+#define WEBP_MAX_DIMENSION 16383
- #include "third_party/skia/include/core/SkStream.h"
- #include "third_party/skia/include/encode/SkJpegEncoder.h"
- #include "third_party/skia/include/encode/SkPngEncoder.h"
-
diff --git a/pkgs/applications/networking/browsers/chromium/plugins.nix b/pkgs/applications/networking/browsers/chromium/plugins.nix
index 84c4e620262..9faa7e5e31f 100644
--- a/pkgs/applications/networking/browsers/chromium/plugins.nix
+++ b/pkgs/applications/networking/browsers/chromium/plugins.nix
@@ -98,11 +98,11 @@ let
flash = stdenv.mkDerivation rec {
name = "flashplayer-ppapi-${version}";
- version = "30.0.0.154";
+ version = "31.0.0.108";
src = fetchzip {
url = "https://fpdownload.adobe.com/pub/flashplayer/pdc/${version}/flash_player_ppapi_linux.x86_64.tar.gz";
- sha256 = "0bi9b6syx7x2avixgjwanrvynzanf89xm2g3nxazw9qgxxc1cp48";
+ sha256 = "0dcwyx0fp7wbsx0cyi7xpwq0nnvcvkzfgi6zyy75487820ssc4h1";
stripRoot = false;
};
diff --git a/pkgs/applications/networking/browsers/chromium/upstream-info.nix b/pkgs/applications/networking/browsers/chromium/upstream-info.nix
index 89b6a7ce312..ebf73012907 100644
--- a/pkgs/applications/networking/browsers/chromium/upstream-info.nix
+++ b/pkgs/applications/networking/browsers/chromium/upstream-info.nix
@@ -1,18 +1,18 @@
# This file is autogenerated from update.sh in the same directory.
{
beta = {
- sha256 = "0w5k1446j45796vj8p6kv5cdrkrxyr7rh8d8vavplfldbvg36bdw";
- sha256bin64 = "0a7gmbcps3b85rhwgrvg41m9db2n3igwr4hncm7kcqnq5hr60v8s";
- version = "69.0.3497.32";
+ sha256 = "0i3iz6c05ykqxbq58sx954nky0gd0schl7ik2r56p3jqsk8cfnhn";
+ sha256bin64 = "03k5y1nyzx26mxwxmdijkl2kj49vm5vhbxhakfxxjg3r1v0rsqrs";
+ version = "69.0.3497.81";
};
dev = {
- sha256 = "15gk2jbjv3iy4hg4xm1f66x5jqfqh9f98wfzrcsd5ix3ki3f9g3c";
- sha256bin64 = "1lir6q31dnjsbrz99bfx74r5j6f0c1a443ky1k0idbx6ysvr8nnm";
- version = "70.0.3521.2";
+ sha256 = "1lx6dfd6w675b4kyrci8ikc8rfmjc1aqmm7bimxp3h4p97j5wml1";
+ sha256bin64 = "0fsxj9h25glp3akw0x2rc488w5zr5v5yvl6ry7fy8w70fqgynffj";
+ version = "70.0.3538.9";
};
stable = {
- sha256 = "1676y2axl5ihvv8jid2i9wp4i4awxzij5nwvd5zx98506l3088bh";
- sha256bin64 = "0d352maw1630g0hns3c0g0n95bp5iqh7nzs8bnv48kxz87snmpdj";
- version = "68.0.3440.106";
+ sha256 = "0i3iz6c05ykqxbq58sx954nky0gd0schl7ik2r56p3jqsk8cfnhn";
+ sha256bin64 = "1f3shb85jynxq37vjxxkkxrjayqgvpss1zws5i28x6i9nygfzay7";
+ version = "69.0.3497.81";
};
}
diff --git a/pkgs/applications/networking/browsers/eolie/default.nix b/pkgs/applications/networking/browsers/eolie/default.nix
index 8d7f4e6cc70..91c5f697132 100644
--- a/pkgs/applications/networking/browsers/eolie/default.nix
+++ b/pkgs/applications/networking/browsers/eolie/default.nix
@@ -1,45 +1,53 @@
-{ stdenv, fetchgit, meson, ninja, pkgconfig, wrapGAppsHook
-, desktop-file-utils, gobjectIntrospection, python36Packages
-, gnome3, gst_all_1, gtkspell3, hunspell }:
+{ stdenv, fetchgit, meson, ninja, pkgconfig
+, python3, gtk3, libsecret, gst_all_1, webkitgtk
+, glib-networking, gtkspell3, hunspell, desktop-file-utils
+, gobjectIntrospection, wrapGAppsHook }:
-stdenv.mkDerivation rec {
+python3.pkgs.buildPythonApplication rec {
name = "eolie-${version}";
- version = "0.9.35";
+ version = "0.9.36";
+
+ format = "other";
+ doCheck = false;
src = fetchgit {
url = "https://gitlab.gnome.org/World/eolie";
rev = "refs/tags/${version}";
fetchSubmodules = true;
- sha256 = "0x3p1fgx1fhrnr7vkkpnl34401r6k6xg2mrjff7ncb1k57q522k7";
+ sha256 = "1pqs6lddkj7nvxdwf0yncwdcr7683mpvx3912vn7b1f2q2zkp1fv";
};
- nativeBuildInputs = with python36Packages; [
+ nativeBuildInputs = [
desktop-file-utils
gobjectIntrospection
meson
ninja
pkgconfig
wrapGAppsHook
- wrapPython
];
- buildInputs = [ gtkspell3 hunspell python36Packages.pygobject3 ] ++ (with gnome3; [
- glib glib-networking gsettings-desktop-schemas gtk3 webkitgtk libsecret
- ]) ++ (with gst_all_1; [
- gst-libav gst-plugins-base gst-plugins-ugly gstreamer
- ]);
+ buildInputs = with gst_all_1; [
+ glib-networking
+ gst-libav
+ gst-plugins-base
+ gst-plugins-ugly
+ gstreamer
+ gtk3
+ gtkspell3
+ hunspell
+ libsecret
+ webkitgtk
+ ];
- pythonPath = with python36Packages; [
+ pythonPath = with python3.pkgs; [
beautifulsoup4
pycairo
pygobject3
python-dateutil
];
- postFixup = "wrapPythonPrograms";
-
postPatch = ''
- chmod +x meson_post_install.py # patchShebangs requires executable file
+ chmod +x meson_post_install.py
patchShebangs meson_post_install.py
'';
diff --git a/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer/default.nix b/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer/default.nix
index 72e1a08f40b..07ef1397f9f 100644
--- a/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer/default.nix
+++ b/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer/default.nix
@@ -73,25 +73,25 @@ let
in
stdenv.mkDerivation rec {
name = "flashplayer-${version}";
- version = "30.0.0.154";
+ version = "31.0.0.108";
src = fetchurl {
url =
if debug then
- "https://fpdownload.macromedia.com/pub/flashplayer/updaters/30/flash_player_npapi_linux_debug.${arch}.tar.gz"
+ "https://fpdownload.macromedia.com/pub/flashplayer/updaters/31/flash_player_npapi_linux_debug.${arch}.tar.gz"
else
"https://fpdownload.adobe.com/get/flashplayer/pdc/${version}/flash_player_npapi_linux.${arch}.tar.gz";
sha256 =
if debug then
if arch == "x86_64" then
- "04hfh0vn1n70gdpfydq0sj94d6rkbk80h4pmy3rsfvhg0x540wx8"
+ "1mn29ahxjf6pdy2zp2na14cz46jrl88f54kp3bs3cz75syyizyb6"
else
- "073327sszbvkglh5b18axmwv40sy2vyacdhcd1fx82qskv44sfda"
+ "0inpj6bcsn5lh8gdv1wxpgipzrmpc553nhr68a55b2wff9fkv1ci"
else
if arch == "x86_64" then
- "03ypgzy88ck5rn1q971v0km9yw3p10ly1zkxh239v6nx0hs35w84"
+ "1dfgsl5jf8ja9f7wwkzj5bfz1v5rdsyf4qhg1shqqldadmyyha7p"
else
- "0rld7i659ccp4gvcvdkqkc1lajvlss5d4qndzf9aqiksvdknv62x";
+ "0yiqwwqs3z9zzkfgqzjwqqdr2vaj1ia5xychs9fgxix3y4j934da";
};
nativeBuildInputs = [ unzip ];
diff --git a/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer/standalone.nix b/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer/standalone.nix
index ba8a8de9320..03255e6eecc 100644
--- a/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer/standalone.nix
+++ b/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer/standalone.nix
@@ -49,19 +49,19 @@
stdenv.mkDerivation rec {
name = "flashplayer-standalone-${version}";
- version = "30.0.0.154";
+ version = "31.0.0.108";
src = fetchurl {
url =
if debug then
- "https://fpdownload.macromedia.com/pub/flashplayer/updaters/30/flash_player_sa_linux_debug.x86_64.tar.gz"
+ "https://fpdownload.macromedia.com/pub/flashplayer/updaters/31/flash_player_sa_linux_debug.x86_64.tar.gz"
else
- "https://fpdownload.macromedia.com/pub/flashplayer/updaters/30/flash_player_sa_linux.x86_64.tar.gz";
+ "https://fpdownload.macromedia.com/pub/flashplayer/updaters/31/flash_player_sa_linux.x86_64.tar.gz";
sha256 =
if debug then
- "133zhgc5fh6s0xr93lv70xcrgvaj7lhjxk5w7xz79h3mp185p3g4"
+ "0i047fvj3x9lx7x8bf7jl1ybf9xpmr6g77q0h7n2s8qvscsw0pmm"
else
- "1xz1l5q0zahalh0l4mkrwhmfrmcli3sckg3rcfnllizq9rbfzcmr";
+ "19wfs452ix57yfi4cy2din6mi5jky9hjzbdjny1bl8w32fy8xmm3";
};
nativeBuildInputs = [ unzip ];
diff --git a/pkgs/applications/networking/browsers/qutebrowser/default.nix b/pkgs/applications/networking/browsers/qutebrowser/default.nix
index a3b6c036416..b71eea79155 100644
--- a/pkgs/applications/networking/browsers/qutebrowser/default.nix
+++ b/pkgs/applications/networking/browsers/qutebrowser/default.nix
@@ -55,10 +55,13 @@ in python3Packages.buildPythonApplication rec {
propagatedBuildInputs = with python3Packages; [
pyyaml pyqt5 jinja2 pygments
pypeg2 cssutils pyopengl attrs
+ # scripts and userscripts libs
+ tldextract beautifulsoup4
+ pyreadability pykeepass stem
];
postPatch = ''
- sed -i "s,/usr/share/qutebrowser,$out/share/qutebrowser,g" qutebrowser/utils/standarddir.py
+ sed -i "s,/usr/share/,$out/share/,g" qutebrowser/utils/standarddir.py
'' + lib.optionalString withPdfReader ''
sed -i "s,/usr/share/pdf.js,${pdfjs},g" qutebrowser/browser/pdfjs.py
'';
@@ -81,15 +84,15 @@ in python3Packages.buildPythonApplication rec {
"$out/share/icons/hicolor/scalable/apps/qutebrowser.svg"
# Install scripts
- sed -i "s,/usr/bin/qutebrowser,$out/bin/qutebrowser,g" scripts/open_url_in_instance.sh
- install -Dm755 -t "$out/share/qutebrowser/scripts/" scripts/open_url_in_instance.sh
+ sed -i "s,/usr/bin/,$out/bin/,g" scripts/open_url_in_instance.sh
+ install -Dm755 -t "$out/share/qutebrowser/scripts/" $(find scripts -type f)
install -Dm755 -t "$out/share/qutebrowser/userscripts/" misc/userscripts/*
- # Install and patch python scripts
+ # Patch python scripts
buildPythonPath "$out $propagatedBuildInputs"
- for i in importer dictcli keytester utils; do
- install -Dm755 -t "$out/share/qutebrowser/scripts/" scripts/$i.py
- patchPythonScript "$out/share/qutebrowser/scripts/$i.py"
+ scripts=$(grep -rl python "$out"/share/qutebrowser/{user,}scripts/)
+ for i in $scripts; do
+ patchPythonScript "$i"
done
'';
@@ -97,10 +100,10 @@ in python3Packages.buildPythonApplication rec {
wrapProgram $out/bin/qutebrowser --add-flags "--backend webkit"
'';
- meta = {
- homepage = https://github.com/The-Compiler/qutebrowser;
+ meta = with stdenv.lib; {
+ homepage = https://github.com/The-Compiler/qutebrowser;
description = "Keyboard-focused browser with a minimal GUI";
- license = stdenv.lib.licenses.gpl3Plus;
- maintainers = [ stdenv.lib.maintainers.jagajaga ];
+ license = licenses.gpl3Plus;
+ maintainers = with maintainers; [ jagajaga rnhmjoj ];
};
}
diff --git a/pkgs/applications/networking/browsers/tor-browser-bundle-bin/default.nix b/pkgs/applications/networking/browsers/tor-browser-bundle-bin/default.nix
index ffa5d447252..d9ff1b5c54d 100644
--- a/pkgs/applications/networking/browsers/tor-browser-bundle-bin/default.nix
+++ b/pkgs/applications/networking/browsers/tor-browser-bundle-bin/default.nix
@@ -14,7 +14,7 @@
, freetype
, gdk_pixbuf
, glib
-, gtk2
+, gtk3
, libxcb
, libX11
, libXext
@@ -42,8 +42,10 @@
# Wrapper runtime
, coreutils
, glibcLocales
-, hicolor-icon-theme
+, defaultIconTheme
+, runtimeShell
, shared-mime-info
+, gsettings-desktop-schemas
# Whether to disable multiprocess support to work around crashing tabs
# TODO: fix the underlying problem instead of this terrible work-around
@@ -70,7 +72,7 @@ let
freetype
gdk_pixbuf
glib
- gtk2
+ gtk3
libxcb
libX11
libXext
@@ -101,7 +103,7 @@ let
fteLibPath = makeLibraryPath [ stdenv.cc.cc gmp ];
# Upstream source
- version = "7.5.6";
+ version = "8.0";
lang = "en-US";
@@ -111,7 +113,7 @@ let
"https://github.com/TheTorProject/gettorbrowser/releases/download/v${version}/tor-browser-linux64-${version}_${lang}.tar.xz"
"https://dist.torproject.org/torbrowser/${version}/tor-browser-linux64-${version}_${lang}.tar.xz"
];
- sha256 = "07z7lg5firyah0897pr04wqnbgf4mvsnk3gq2zgsg1rrwladxz5s";
+ sha256 = "139cizh33x3nzr0f4b2q3cchrv9l01n3c2v0v0mghq30hap55p79";
};
"i686-linux" = fetchurl {
@@ -119,7 +121,7 @@ let
"https://github.com/TheTorProject/gettorbrowser/releases/download/v${version}/tor-browser-linux32-${version}_${lang}.tar.xz"
"https://dist.torproject.org/torbrowser/${version}/tor-browser-linux32-${version}_${lang}.tar.xz"
];
- sha256 = "1s0k82ch7ypjyc5k5rb4skb9ylnp7b9ipvf8gb7pdhb8m4zjk461";
+ sha256 = "1vw5wh193vs5x3wizz34m2nyzlxpn24727hdxqpiqwlhwhj7y3nx";
};
};
in
@@ -154,10 +156,14 @@ stdenv.mkDerivation rec {
pushd "$TBB_IN_STORE"
# Set ELF interpreter
- for exe in firefox TorBrowser/Tor/tor ; do
+ for exe in firefox.real TorBrowser/Tor/tor ; do
+ echo "Setting ELF interpreter on $exe ..." >&2
patchelf --set-interpreter "$interp" "$exe"
done
+ # firefox is a wrapper that checks for a more recent libstdc++ & appends it to the ld path
+ mv firefox.real firefox
+
# The final libPath. Note, we could split this into firefoxLibPath
# and torLibPath for accuracy, but this is more convenient ...
libPath=${libPath}:$TBB_IN_STORE:$TBB_IN_STORE/TorBrowser/Tor
@@ -219,7 +225,7 @@ stdenv.mkDerivation rec {
// Insist on using IPC for communicating with Tor
//
- // Defaults to creating $TBB_HOME/TorBrowser/Data/Tor/{socks,control}.socket
+ // Defaults to creating \$TBB_HOME/TorBrowser/Data/Tor/{socks,control}.socket
lockPref("extensions.torlauncher.control_port_use_ipc", true);
lockPref("extensions.torlauncher.socks_port_use_ipc", true);
@@ -245,10 +251,6 @@ stdenv.mkDerivation rec {
sed -i "$FONTCONFIG_FILE" \
-e "s,fonts,$TBB_IN_STORE/fonts,"
- # Move default extension overrides into distribution dir, to avoid
- # having to synchronize between local state and store.
- mv TorBrowser/Data/Browser/profile.default/preferences/extension-overrides.js defaults/pref/torbrowser.js
-
# Preload extensions by moving into the runtime instead of storing under the
# user's profile directory.
mv "$TBB_IN_STORE/TorBrowser/Data/Browser/profile.default/extensions/"* \
@@ -264,14 +266,19 @@ stdenv.mkDerivation rec {
EOF
WRAPPER_XDG_DATA_DIRS=${concatMapStringsSep ":" (x: "${x}/share") [
- hicolor-icon-theme
+ defaultIconTheme
shared-mime-info
]}
+ WRAPPER_XDG_DATA_DIRS+=":"${concatMapStringsSep ":" (x: "${x}/share/gsettings-schemas/${x.name}") [
+ glib
+ gsettings-desktop-schemas
+ gtk3
+ ]};
# Generate wrapper
mkdir -p $out/bin
cat > "$out/bin/tor-browser" << EOF
- #! ${stdenv.shell}
+ #! ${runtimeShell}
set -o errexit -o nounset
PATH=${makeBinPath [ coreutils ]}
@@ -384,11 +391,7 @@ stdenv.mkDerivation rec {
cp $desktopItem/share/applications"/"* $out/share/applications
sed -i $out/share/applications/torbrowser.desktop \
-e "s,Exec=.*,Exec=$out/bin/tor-browser," \
- -e "s,Icon=.*,Icon=$out/share/pixmaps/torbrowser.png,"
-
- # Install icons
- mkdir -p $out/share/pixmaps
- cp browser/icons/mozicon128.png $out/share/pixmaps/torbrowser.png
+ -e "s,Icon=.*,Icon=web-browser,"
# Check installed apps
echo "Checking bundled Tor ..."
diff --git a/pkgs/applications/networking/charles/default.nix b/pkgs/applications/networking/charles/default.nix
index 8a60023b435..3f019d17702 100644
--- a/pkgs/applications/networking/charles/default.nix
+++ b/pkgs/applications/networking/charles/default.nix
@@ -14,11 +14,11 @@ let
in stdenv.mkDerivation rec {
name = "charles-${version}";
- version = "4.2.6";
+ version = "4.2.7";
src = fetchurl {
url = "https://www.charlesproxy.com/assets/release/${version}/charles-proxy-${version}.tar.gz";
- sha256 = "1hjfimyr9nnbbxadwni02d2xl64ybarh42l1g6hlslq5qwl8ywzb";
+ sha256 = "1nycw3wpbfwj4ijjaq5k0f4xipj8j605fs0yjzgl66gmv7r583rd";
};
buildInputs = [ makeWrapper ];
diff --git a/pkgs/applications/networking/cluster/click/default.nix b/pkgs/applications/networking/cluster/click/default.nix
index 7fd4cd9fa82..2c7a026b277 100644
--- a/pkgs/applications/networking/cluster/click/default.nix
+++ b/pkgs/applications/networking/cluster/click/default.nix
@@ -4,17 +4,18 @@ with rustPlatform;
buildRustPackage rec {
name = "click-${version}";
- version = "0.3.1";
- rev = "b5dfb4a8f8344330a098cb61523695dfe0fd296a";
+ version = "0.3.2";
src = fetchFromGitHub {
+ rev = "v${version}";
owner = "databricks";
repo = "click";
- sha256 = "0a2hq4hcxkkx7gs5dv7sr3j5jy2dby4r6y090z7zl2xy5wydr7bi";
- inherit rev;
+ sha256 = "0sbj41kypn637z1w115w2h5v6bxz3y6w5ikgpx3ihsh89lkc19d2";
};
- cargoSha256 = "03vgbkv9xsnx44vivbbhjgxv9drp0yjnimgy6hwm32x74r00k3hj";
+ cargoSha256 = "05asqp5312a1g26pvf5hgqhc4kj3iw2hdvml2ycvga33sxb7zm7r";
+
+ patches = [ ./fix_cargo_lock_version.patch ];
buildInputs = stdenv.lib.optionals stdenv.isDarwin [ darwin.apple_sdk.frameworks.Security ];
diff --git a/pkgs/applications/networking/cluster/click/fix_cargo_lock_version.patch b/pkgs/applications/networking/cluster/click/fix_cargo_lock_version.patch
new file mode 100644
index 00000000000..bc4db7ef7c1
--- /dev/null
+++ b/pkgs/applications/networking/cluster/click/fix_cargo_lock_version.patch
@@ -0,0 +1,13 @@
+diff --git a/Cargo.lock b/Cargo.lock
+index ff80350..c86c6fe 100644
+--- a/Cargo.lock
++++ b/Cargo.lock
+@@ -111,7 +111,7 @@ dependencies = [
+
+ [[package]]
+ name = "click"
+-version = "0.3.1"
++version = "0.3.2"
+ dependencies = [
+ "ansi_term 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "base64 0.5.2 (registry+https://github.com/rust-lang/crates.io-index)",
diff --git a/pkgs/applications/networking/cluster/cni/plugins.nix b/pkgs/applications/networking/cluster/cni/plugins.nix
index 8a006edda6a..6cecd3bd66c 100644
--- a/pkgs/applications/networking/cluster/cni/plugins.nix
+++ b/pkgs/applications/networking/cluster/cni/plugins.nix
@@ -2,13 +2,13 @@
stdenv.mkDerivation rec {
name = "cni-plugins-${version}";
- version = "0.7.1";
+ version = "0.7.3";
src = fetchFromGitHub {
owner = "containernetworking";
repo = "plugins";
rev = "v${version}";
- sha256 = "1sywllwnr6lc812sgkqjdd3y10r82shl88dlnwgnbgzs738q2vp2";
+ sha256 = "1saaszzxy4x3jkqd9ac6cphmzfim7x84h28c9i7az46px40blzm1";
};
buildInputs = [ go ];
diff --git a/pkgs/applications/networking/cluster/flink/default.nix b/pkgs/applications/networking/cluster/flink/default.nix
index 402a03b77f4..fe7b73a9e9b 100644
--- a/pkgs/applications/networking/cluster/flink/default.nix
+++ b/pkgs/applications/networking/cluster/flink/default.nix
@@ -1,25 +1,15 @@
{ stdenv, fetchurl, makeWrapper, jre
-, version ? "1.5" }:
+, version ? "1.6" }:
let
versionMap = {
- "1.3" = {
- flinkVersion = "1.3.3";
- scalaVersion = "2.11";
- sha256 = "0gfm48k5adr14gnhqri9cd01i9dprd0nwmnnz3yrpd20nq4ap4qy";
- hadoopBundle = "-hadoop27";
- };
- "1.4" = {
- flinkVersion = "1.4.2";
- scalaVersion = "2.11";
- sha256 = "0x3cikys5brin0kx9zr69xfp8k5w6g8141yrrr26ks7gpss2x636";
- hadoopBundle = "";
- };
"1.5" = {
- flinkVersion = "1.5.0";
- scalaVersion = "2.11";
- sha256 = "0n5023dj8ivmbhqxmb3abmfh3ahb9vmcywq5i0ll5p7xxcw2c1cv";
- hadoopBundle = "";
+ flinkVersion = "1.5.3";
+ sha256 = "1fq7pd5qpchkkwhh30h3l9rhf298jfcfv2dc50z39qmwwijdjajk";
+ };
+ "1.6" = {
+ flinkVersion = "1.6.0";
+ sha256 = "18fnpldzs36qx7myr9rmym9g9p3qkgnd1z3lfkpbaw590ddaqr9i";
};
};
in
@@ -30,7 +20,7 @@ stdenv.mkDerivation rec {
name = "flink-${flinkVersion}";
src = fetchurl {
- url = "mirror://apache/flink/${name}/${name}-bin${hadoopBundle}-scala_${scalaVersion}.tgz";
+ url = "mirror://apache/flink/${name}/${name}-bin-scala_2.11.tgz";
inherit sha256;
};
diff --git a/pkgs/applications/networking/cluster/helm/default.nix b/pkgs/applications/networking/cluster/helm/default.nix
index d09e65a4caa..bd00404b536 100644
--- a/pkgs/applications/networking/cluster/helm/default.nix
+++ b/pkgs/applications/networking/cluster/helm/default.nix
@@ -5,10 +5,10 @@ let
then "linux-amd64"
else "darwin-amd64";
checksum = if isLinux
- then "1fk6w6sajdi6iphxrzi9r7xfyaf923nxcqnl01s6x3f611fjvbjn"
- else "1jzgy641hm3khj0bakfbr5wd5zl3s7w5jb622fjv2jxwmnv7dxiv";
+ then "1zig6ihmxcaw2wsbdd85yf1zswqcifw0hvbp1zws7r5ihd4yv8hg"
+ else "1l8y9i8vhibhwbn5kn5qp722q4dcx464kymlzy2bkmhiqbxnnkkw";
pname = "helm";
- version = "2.9.1";
+ version = "2.10.0";
in
stdenv.mkDerivation {
name = "${pname}-${version}";
diff --git a/pkgs/applications/networking/cluster/heptio-ark/default.nix b/pkgs/applications/networking/cluster/heptio-ark/default.nix
index 1860874c436..f786bff01d6 100644
--- a/pkgs/applications/networking/cluster/heptio-ark/default.nix
+++ b/pkgs/applications/networking/cluster/heptio-ark/default.nix
@@ -2,7 +2,7 @@
buildGoPackage rec {
name = "heptio-ark-${version}";
- version = "0.9.0";
+ version = "0.9.4";
goPackagePath = "github.com/heptio/ark";
@@ -10,7 +10,7 @@ buildGoPackage rec {
rev = "v${version}";
owner = "heptio";
repo = "ark";
- sha256 = "0b3jsgs35l8kk63pjnqn3911pyb397fyvsmd3jd8vzjawisgpdp7";
+ sha256 = "01z0zkw7l6haxky9l45iqqnvs6104xx4195jm250nv9j1x8n59ai";
};
postInstall = "rm $bin/bin/generate";
diff --git a/pkgs/applications/networking/cluster/kubernetes/default.nix b/pkgs/applications/networking/cluster/kubernetes/default.nix
index 01bf3467af9..96dab6aa66a 100644
--- a/pkgs/applications/networking/cluster/kubernetes/default.nix
+++ b/pkgs/applications/networking/cluster/kubernetes/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, lib, fetchFromGitHub, removeReferencesTo, which, go_1_9, go-bindata, makeWrapper, rsync
+{ stdenv, lib, fetchFromGitHub, removeReferencesTo, which, go_1_10, go-bindata, makeWrapper, rsync
, components ? [
"cmd/kubeadm"
"cmd/kubectl"
@@ -15,17 +15,16 @@ with lib;
stdenv.mkDerivation rec {
name = "kubernetes-${version}";
- version = "1.10.5";
+ version = "1.11.3";
src = fetchFromGitHub {
owner = "kubernetes";
repo = "kubernetes";
rev = "v${version}";
- sha256 = "1k6ayb43l68l0qw31cc4k1pwvm8aks3l2xm0gdxdxbbww1mnzix2";
+ sha256 = "1gwb5gs9l0adv3qc70wf8dwvbjh1mmgd3hh1jkwsbbnach28dvzb";
};
- # Build using golang v1.9 in accordance with https://github.com/kubernetes/kubernetes/blob/master/CHANGELOG-1.10.md#external-dependencies
- buildInputs = [ removeReferencesTo makeWrapper which go_1_9 rsync go-bindata ];
+ buildInputs = [ removeReferencesTo makeWrapper which go_1_10 rsync go-bindata ];
outputs = ["out" "man" "pause"];
@@ -39,7 +38,7 @@ stdenv.mkDerivation rec {
patchShebangs ./hack
'';
- WHAT="--use_go_build ${concatStringsSep " " components}";
+ WHAT="${concatStringsSep " " components}";
postBuild = ''
./hack/generate-docs.sh
@@ -53,8 +52,11 @@ stdenv.mkDerivation rec {
cp build/pause/pause "$pause/bin/pause"
cp -R docs/man/man1 "$man/share/man"
+ cp cluster/addons/addon-manager/namespace.yaml $out/share
cp cluster/addons/addon-manager/kube-addons.sh $out/bin/kube-addons
patchShebangs $out/bin/kube-addons
+ substituteInPlace $out/bin/kube-addons \
+ --replace /opt/namespace.yaml $out/share/namespace.yaml
wrapProgram $out/bin/kube-addons --set "KUBECTL_BIN" "$out/bin/kubectl"
$out/bin/kubectl completion bash > $out/share/bash-completion/completions/kubectl
@@ -62,7 +64,7 @@ stdenv.mkDerivation rec {
'';
preFixup = ''
- find $out/bin $pause/bin -type f -exec remove-references-to -t ${go_1_9} '{}' +
+ find $out/bin $pause/bin -type f -exec remove-references-to -t ${go_1_10} '{}' +
'';
meta = {
diff --git a/pkgs/applications/networking/ftp/taxi/default.nix b/pkgs/applications/networking/ftp/taxi/default.nix
new file mode 100644
index 00000000000..503b685ce28
--- /dev/null
+++ b/pkgs/applications/networking/ftp/taxi/default.nix
@@ -0,0 +1,47 @@
+{ stdenv, fetchFromGitHub, vala, pkgconfig, meson, ninja, python3, granite
+, gtk3, gnome3, libsoup, libsecret, gobjectIntrospection, wrapGAppsHook }:
+
+stdenv.mkDerivation rec {
+ pname = "taxi";
+ version = "0.0.1";
+
+ name = "${pname}-${version}";
+
+ src = fetchFromGitHub {
+ owner = "Alecaddd";
+ repo = pname;
+ rev = "v${version}";
+ sha256 = "01c552w68576pnsyqbwy3hjhbww6vys3r3s0wxjdiscjqj1aawqg";
+ };
+
+ nativeBuildInputs = [
+ gobjectIntrospection
+ meson
+ ninja
+ pkgconfig
+ python3
+ vala
+ wrapGAppsHook
+ ];
+
+ buildInputs = [
+ gnome3.libgee
+ granite
+ gtk3
+ libsecret
+ libsoup
+ ];
+
+ postPatch = ''
+ chmod +x meson/post_install.py
+ patchShebangs meson/post_install.py
+ '';
+
+ meta = with stdenv.lib; {
+ description = "The FTP Client that drives you anywhere";
+ homepage = https://github.com/Alecaddd/taxi;
+ license = licenses.gpl3Plus;
+ maintainers = with maintainers; [ worldofpeace ];
+ platforms = platforms.linux;
+ };
+}
diff --git a/pkgs/applications/networking/instant-messengers/linphone/default.nix b/pkgs/applications/networking/instant-messengers/linphone/default.nix
index 1b257ea61dc..4282e99a712 100644
--- a/pkgs/applications/networking/instant-messengers/linphone/default.nix
+++ b/pkgs/applications/networking/instant-messengers/linphone/default.nix
@@ -4,6 +4,7 @@
, mediastreamer-openh264, bctoolbox, makeWrapper, fetchFromGitHub, cmake
, libmatroska, bcunit, doxygen, gdk_pixbuf, glib, cairo, pango, polarssl
, python, graphviz, belcard
+, withGui ? true
}:
stdenv.mkDerivation rec {
@@ -18,6 +19,12 @@ stdenv.mkDerivation rec {
sha256 = "0az2ywrpx11sqfb4s4r2v726avcjf4k15bvrqj7xvhz7hdndmh0j";
};
+ cmakeFlags = stdenv.lib.optional withGui [ "-DENABLE_GTK_UI=ON" ];
+
+ postPatch = ''
+ touch coreapi/liblinphone_gitversion.h
+ '';
+
buildInputs = [
readline openldap cyrus_sasl libupnp zlib libxml2 gtk2 libnotify speex ffmpeg libX11
polarssl libsoup udev ortp mediastreamer sqlite belle-sip libosip libexosip
diff --git a/pkgs/applications/networking/instant-messengers/matrique/default.nix b/pkgs/applications/networking/instant-messengers/matrique/default.nix
new file mode 100644
index 00000000000..91ba8e7175c
--- /dev/null
+++ b/pkgs/applications/networking/instant-messengers/matrique/default.nix
@@ -0,0 +1,55 @@
+{ stdenv, fetchFromGitLab, fetchFromGitHub, qmake
+, qtquickcontrols2, qtmultimedia, qtgraphicaleffects
+, libqmatrixclient
+}:
+
+let
+
+ libqmatrixclient_git = libqmatrixclient.overrideDerivation (oldAttrs: {
+ name = "libqmatrixclient-git-for-matrique";
+ src = fetchFromGitHub {
+ owner = "QMatrixClient";
+ repo = "libqmatrixclient";
+ rev = "d9ff200f";
+ sha256 = "0qxkffg1499wnn8rbndq6z51sz6hiij2pkp40cvs530sl0zg0c69";
+ };
+ });
+
+ SortFilterProxyModel = fetchFromGitLab {
+ owner = "b0";
+ repo = "SortFilterProxyModel";
+ rev = "3c2c125c";
+ sha256 = "1494dvq7kiq0ymf5f9hr47pw80zv3m3dncnaw1pnzs7mhkf2s5fr";
+ };
+
+in stdenv.mkDerivation rec {
+ name = "matrique-${version}";
+ version = "250";
+
+ src = fetchFromGitLab {
+ owner = "b0";
+ repo = "matrique";
+ rev = version;
+ sha256 = "0l7ag2q3l8ixczwc43igvkkl81g5s5j032gzizmgpzb1bjpdgry7";
+ };
+
+ postPatch = ''
+ rm -r include/*
+ ln -sf ${libqmatrixclient_git.src} include/libqmatrixclient
+ ln -sf ${SortFilterProxyModel} include/SortFilterProxyModel
+ '';
+
+ nativeBuildInputs = [ qmake ];
+ buildInputs = [
+ qtquickcontrols2 qtmultimedia qtgraphicaleffects
+ libqmatrixclient_git
+ ];
+
+ meta = with stdenv.lib; {
+ inherit (src.meta) homepage;
+ description = "A glossy client for Matrix";
+ maintainers = with maintainers; [ fpletz ];
+ license = licenses.gpl3;
+ platforms = platforms.linux;
+ };
+}
diff --git a/pkgs/applications/networking/instant-messengers/nheko/default.nix b/pkgs/applications/networking/instant-messengers/nheko/default.nix
index cf9558b4b95..6716305df8b 100644
--- a/pkgs/applications/networking/instant-messengers/nheko/default.nix
+++ b/pkgs/applications/networking/instant-messengers/nheko/default.nix
@@ -1,39 +1,9 @@
-{
- lib, stdenv, fetchFromGitHub, fetchurl,
- cmake, doxygen, lmdb, qt5, qtmacextras
+{ lib, stdenv, fetchFromGitHub, fetchurl
+, cmake, lmdb, qt5, qtmacextras, mtxclient
+, boost, spdlog, olm, pkgconfig
}:
let
- json_hpp = fetchurl {
- url = https://github.com/nlohmann/json/releases/download/v3.1.2/json.hpp;
- sha256 = "fbdfec4b4cf63b3b565d09f87e6c3c183bdd45c5be1864d3fcb338f6f02c1733";
- };
-
- variant_hpp = fetchurl {
- url = https://github.com/mpark/variant/releases/download/v1.3.0/variant.hpp;
- sha256 = "1vjiz1x5l8ynqqyb5l9mlrzgps526v45hbmwjilv4brgyi5445fq";
- };
-
- matrix-structs = stdenv.mkDerivation rec {
- name = "matrix-structs-git";
-
- src = fetchFromGitHub {
- owner = "mujx";
- repo = "matrix-structs";
- rev = "5e57c2385a79b6629d1998fec4a7c0baee23555e";
- sha256 = "112b7gnvr04g1ak7fnc7ch7w2n825j4qkw0jb49xx06ag93nb6m6";
- };
-
- postUnpack = ''
- cp ${json_hpp} "$sourceRoot/include/json.hpp"
- cp ${variant_hpp} "$sourceRoot/include/variant.hpp"
- '';
-
- patches = [ ./fetchurls.patch ];
-
- nativeBuildInputs = [ cmake doxygen ];
- };
-
tweeny = fetchFromGitHub {
owner = "mobius3";
repo = "tweeny";
@@ -50,19 +20,15 @@ let
in
stdenv.mkDerivation rec {
name = "nheko-${version}";
- version = "0.4.3";
+ version = "0.5.5";
src = fetchFromGitHub {
owner = "mujx";
repo = "nheko";
rev = "v${version}";
- sha256 = "0qjia42nam3hj835k2jb5b6j6n56rdkb8rn67yqf45xdz8ypmbmv";
+ sha256 = "0k5gmfwmisfavliyz0nfsmwy317ps8a4r3l1d831giqp9pvqvi0i";
};
- # This patch is likely not strictly speaking needed, but will help detect when
- # a dependency is updated, so that the fetches up there can be updated too
- patches = [ ./external-deps.patch ];
-
# If, on Darwin, you encounter the error
# error: must specify at least one argument for '...' parameter of variadic
# macro [-Werror,-Wgnu-zero-variadic-macro-arguments]
@@ -79,25 +45,30 @@ stdenv.mkDerivation rec {
# export CFLAGS=-Wno-error=gnu-zero-variadic-macro-arguments
#'';
+ postPatch = ''
+ mkdir -p .deps/include/
+ ln -s ${tweeny}/include .deps/include/tweeny
+ ln -s ${spdlog} .deps/spdlog
+ '';
+
cmakeFlags = [
- "-DMATRIX_STRUCTS_LIBRARY=${matrix-structs}/lib/static/libmatrix_structs.a"
- "-DMATRIX_STRUCTS_INCLUDE_DIR=${matrix-structs}/include/matrix_structs"
- "-DTWEENY_INCLUDE_DIR=${tweeny}/include"
+ "-DTWEENY_INCLUDE_DIR=.deps/include"
"-DLMDBXX_INCLUDE_DIR=${lmdbxx}"
];
- nativeBuildInputs = [ cmake ];
+ nativeBuildInputs = [ cmake pkgconfig ];
buildInputs = [
- lmdb lmdbxx matrix-structs qt5.qtbase qt5.qtmultimedia qt5.qttools tweeny
+ mtxclient olm boost lmdb spdlog
+ qt5.qtbase qt5.qtmultimedia qt5.qttools
] ++ lib.optional stdenv.isDarwin qtmacextras;
enableParallelBuilding = true;
meta = with stdenv.lib; {
description = "Desktop client for the Matrix protocol";
- maintainers = with maintainers; [ ekleog ];
- platforms = platforms.all;
+ maintainers = with maintainers; [ ekleog fpletz ];
+ platforms = platforms.unix;
license = licenses.gpl3Plus;
};
}
diff --git a/pkgs/applications/networking/instant-messengers/nheko/external-deps.patch b/pkgs/applications/networking/instant-messengers/nheko/external-deps.patch
deleted file mode 100644
index fa388edfb75..00000000000
--- a/pkgs/applications/networking/instant-messengers/nheko/external-deps.patch
+++ /dev/null
@@ -1,94 +0,0 @@
-diff --git a/cmake/LMDBXX.cmake b/cmake/LMDBXX.cmake
-index 3b9817d..e69de29 100644
---- a/cmake/LMDBXX.cmake
-+++ b/cmake/LMDBXX.cmake
-@@ -1,23 +0,0 @@
--include(ExternalProject)
--
--#
--# Build lmdbxx.
--#
--
--set(THIRD_PARTY_ROOT ${CMAKE_SOURCE_DIR}/.third-party)
--set(LMDBXX_ROOT ${THIRD_PARTY_ROOT}/lmdbxx)
--
--set(LMDBXX_INCLUDE_DIR ${LMDBXX_ROOT})
--
--ExternalProject_Add(
-- lmdbxx
--
-- GIT_REPOSITORY https://github.com/bendiken/lmdbxx
-- GIT_TAG 0b43ca87d8cfabba392dfe884eb1edb83874de02
--
-- BUILD_IN_SOURCE 1
-- SOURCE_DIR ${LMDBXX_ROOT}
-- CONFIGURE_COMMAND ""
-- BUILD_COMMAND ""
-- INSTALL_COMMAND ""
--)
-diff --git a/cmake/MatrixStructs.cmake b/cmake/MatrixStructs.cmake
-index cef00f6..e69de29 100644
---- a/cmake/MatrixStructs.cmake
-+++ b/cmake/MatrixStructs.cmake
-@@ -1,33 +0,0 @@
--include(ExternalProject)
--
--#
--# Build matrix-structs.
--#
--
--set(THIRD_PARTY_ROOT ${CMAKE_SOURCE_DIR}/.third-party)
--set(MATRIX_STRUCTS_ROOT ${THIRD_PARTY_ROOT}/matrix_structs)
--set(MATRIX_STRUCTS_INCLUDE_DIR ${MATRIX_STRUCTS_ROOT}/include)
--set(MATRIX_STRUCTS_LIBRARY matrix_structs)
--
--link_directories(${MATRIX_STRUCTS_ROOT})
--
--set(WINDOWS_FLAGS "")
--
--if(MSVC)
-- set(WINDOWS_FLAGS "-DCMAKE_GENERATOR_PLATFORM=x64")
--endif()
--
--ExternalProject_Add(
-- MatrixStructs
--
-- GIT_REPOSITORY https://github.com/mujx/matrix-structs
-- GIT_TAG 5e57c2385a79b6629d1998fec4a7c0baee23555e
--
-- BUILD_IN_SOURCE 1
-- SOURCE_DIR ${MATRIX_STRUCTS_ROOT}
-- CONFIGURE_COMMAND ${CMAKE_COMMAND}
-- -DCMAKE_BUILD_TYPE=Release ${MATRIX_STRUCTS_ROOT}
-- ${WINDOWS_FLAGS}
-- BUILD_COMMAND ${CMAKE_COMMAND} --build ${MATRIX_STRUCTS_ROOT} --config Release
-- INSTALL_COMMAND ""
--)
-diff --git a/cmake/Tweeny.cmake b/cmake/Tweeny.cmake
-index 537ac92..e69de29 100644
---- a/cmake/Tweeny.cmake
-+++ b/cmake/Tweeny.cmake
-@@ -1,23 +0,0 @@
--include(ExternalProject)
--
--#
--# Build tweeny
--#
--
--set(THIRD_PARTY_ROOT ${CMAKE_SOURCE_DIR}/.third-party)
--set(TWEENY_ROOT ${THIRD_PARTY_ROOT}/tweeny)
--
--set(TWEENY_INCLUDE_DIR ${TWEENY_ROOT}/include)
--
--ExternalProject_Add(
-- Tweeny
--
-- GIT_REPOSITORY https://github.com/mobius3/tweeny
-- GIT_TAG b94ce07cfb02a0eb8ac8aaf66137dabdaea857cf
--
-- BUILD_IN_SOURCE 1
-- SOURCE_DIR ${TWEENY_ROOT}
-- CONFIGURE_COMMAND ""
-- BUILD_COMMAND ""
-- INSTALL_COMMAND ""
--)
diff --git a/pkgs/applications/networking/instant-messengers/nheko/fetchurls.patch b/pkgs/applications/networking/instant-messengers/nheko/fetchurls.patch
deleted file mode 100644
index e2f72f600ed..00000000000
--- a/pkgs/applications/networking/instant-messengers/nheko/fetchurls.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 077ac37..c639d71 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -18,16 +18,6 @@ include(Doxygen)
- #
- include(CompilerFlags)
-
--file(DOWNLOAD
-- "https://github.com/nlohmann/json/releases/download/v3.1.2/json.hpp"
-- ${PROJECT_SOURCE_DIR}/include/json.hpp
-- EXPECTED_HASH SHA256=fbdfec4b4cf63b3b565d09f87e6c3c183bdd45c5be1864d3fcb338f6f02c1733)
--
--file(DOWNLOAD
-- "https://github.com/mpark/variant/releases/download/v1.3.0/variant.hpp"
-- ${PROJECT_SOURCE_DIR}/include/variant.hpp
-- EXPECTED_MD5 "be0ce322cdd408e1b347b9f1d59ea67a")
--
- include_directories(include)
-
- set(SRC
diff --git a/pkgs/applications/networking/irc/weechat/default.nix b/pkgs/applications/networking/irc/weechat/default.nix
index eaf7410a317..a9de275559d 100644
--- a/pkgs/applications/networking/irc/weechat/default.nix
+++ b/pkgs/applications/networking/irc/weechat/default.nix
@@ -133,13 +133,13 @@ in if configure == null then weechat else
scripts = builtins.concatStringsSep ";" (lib.foldl (scripts: drv: scripts ++ mkScript drv)
[ ] (config.scripts or []));
- in "${scripts}\n${init}";
+ in "${scripts};${init}";
mkWeechat = bin: (writeScriptBin bin ''
#!${stdenv.shell}
export WEECHAT_EXTRA_LIBDIR=${pluginsDir}
${lib.concatMapStringsSep "\n" (p: lib.optionalString (p ? extraEnv) p.extraEnv) plugins}
- exec ${weechat}/bin/${bin} "$@" --run-command "${init}"
+ exec ${weechat}/bin/${bin} "$@" --run-command ${lib.escapeShellArg init}
'') // {
inherit (weechat) name meta;
unwrapped = weechat;
diff --git a/pkgs/applications/networking/irc/weechat/scripts/weechat-matrix-bridge/default.nix b/pkgs/applications/networking/irc/weechat/scripts/weechat-matrix-bridge/default.nix
index 1018e46ec62..d2960ae93a9 100644
--- a/pkgs/applications/networking/irc/weechat/scripts/weechat-matrix-bridge/default.nix
+++ b/pkgs/applications/networking/irc/weechat/scripts/weechat-matrix-bridge/default.nix
@@ -25,7 +25,7 @@ stdenv.mkDerivation {
--replace "__NIX_LIB_PATH__" "$out/lib/?.so"
'';
- passthru.scripts = [ "olm.lua" "matrix.lua" ];
+ passthru.scripts = [ "matrix.lua" ];
installPhase = ''
mkdir -p $out/{share,lib}
diff --git a/pkgs/applications/networking/mailreaders/afew/default.nix b/pkgs/applications/networking/mailreaders/afew/default.nix
index e2b3d073dd3..bdf39de0651 100644
--- a/pkgs/applications/networking/mailreaders/afew/default.nix
+++ b/pkgs/applications/networking/mailreaders/afew/default.nix
@@ -9,12 +9,22 @@ pythonPackages.buildPythonApplication rec {
sha256 = "0105glmlkpkjqbz350dxxasvlfx9dk0him9vwbl86andzi106ygz";
};
- buildInputs = with pythonPackages; [ setuptools_scm ];
+ nativeBuildInputs = with pythonPackages; [ sphinx setuptools_scm ];
propagatedBuildInputs = with pythonPackages; [
pythonPackages.notmuch chardet dkimpy
] ++ stdenv.lib.optional (!pythonPackages.isPy3k) subprocess32;
+ postBuild = ''
+ make -C docs man
+ '';
+
+ postInstall = ''
+ mandir="$out/share/man/man1"
+ mkdir -p "$mandir"
+ cp docs/build/man/* "$mandir"
+ '';
+
makeWrapperArgs = [
''--prefix PATH ':' "${notmuch}/bin"''
];
diff --git a/pkgs/applications/networking/mailreaders/inboxer/default.nix b/pkgs/applications/networking/mailreaders/inboxer/default.nix
index 390f68bd105..4edf61ceaae 100644
--- a/pkgs/applications/networking/mailreaders/inboxer/default.nix
+++ b/pkgs/applications/networking/mailreaders/inboxer/default.nix
@@ -4,7 +4,7 @@
stdenv.mkDerivation rec {
name = "inboxer-${version}";
- version = "1.1.2";
+ version = "1.1.4";
meta = with stdenv.lib; {
description = "Unofficial, free and open-source Google Inbox Desktop App";
@@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
src = fetchurl {
url = "https://github.com/denysdovhan/inboxer/releases/download/v${version}/inboxer_${version}_amd64.deb";
- sha256 = "100185j10dj044mg5p9xlq7fj7n7xki9qw5xn845dgq0dpj8rkrm";
+ sha256 = "1jhx7mghslk8s2h50g8avnspf2v2r8yj0i8hkhw3qy2sa91m3ck1";
};
unpackPhase = ''
diff --git a/pkgs/applications/networking/p2p/opentracker/default.nix b/pkgs/applications/networking/p2p/opentracker/default.nix
index abddc22c285..46c482818f8 100644
--- a/pkgs/applications/networking/p2p/opentracker/default.nix
+++ b/pkgs/applications/networking/p2p/opentracker/default.nix
@@ -1,20 +1,20 @@
{ stdenv, fetchgit, libowfat, zlib }:
stdenv.mkDerivation {
- name = "opentracker-2016-10-02";
+ name = "opentracker-2018-05-26";
src = fetchgit {
- url = "git://erdgeist.org/opentracker";
- rev = "0ebc0ed6a3e3b7acc9f9e338cc23cea5f4f22f61";
- sha256 = "0qi0a8fygjwgs3yacramfn53jdabfgrlzid7q597x9lr94anfpyl";
+ url = "https://erdgeist.org/gitweb/opentracker";
+ rev = "6411f1567f64248b0d145493c2e61004d2822623";
+ sha256 = "110nfb6n4clykwdzpk54iccsfjawq0krjfqhg114i1z0ri5dyl8j";
};
buildInputs = [ libowfat zlib ];
installPhase = ''
- mkdir -p $out/bin $out/share/doc
- cp opentracker $out/bin
- cp opentracker.conf.sample $out/share/doc
+ runHook preInstall
+ install -D opentracker $out/bin/opentracker
+ install -D opentracker.conf.sample $out/share/doc/opentracker.conf.sample
runHook postInstall
'';
diff --git a/pkgs/applications/networking/remote/remmina/default.nix b/pkgs/applications/networking/remote/remmina/default.nix
index 14ab36c78fd..fb138a1e8d4 100644
--- a/pkgs/applications/networking/remote/remmina/default.nix
+++ b/pkgs/applications/networking/remote/remmina/default.nix
@@ -10,7 +10,7 @@
}:
let
- version = "1.2.31.3";
+ version = "1.2.31.4";
desktopItem = makeDesktopItem {
name = "remmina";
@@ -29,7 +29,7 @@ in stdenv.mkDerivation {
owner = "Remmina";
repo = "Remmina";
rev = "v${version}";
- sha256 = "0lvang4587wz292c3k3s8n4icc25cia1phmij34ndrl1f9lg34dp";
+ sha256 = "1jx704f5zjns3nqy0ffgyfaxfxcxp83mfm5k539xfnqjn5g5h1qr";
};
nativeBuildInputs = [ pkgconfig ];
diff --git a/pkgs/applications/networking/sync/rclone/default.nix b/pkgs/applications/networking/sync/rclone/default.nix
index 54d612387ac..13e69427aa4 100644
--- a/pkgs/applications/networking/sync/rclone/default.nix
+++ b/pkgs/applications/networking/sync/rclone/default.nix
@@ -2,7 +2,7 @@
buildGoPackage rec {
name = "rclone-${version}";
- version = "1.43";
+ version = "1.43.1";
goPackagePath = "github.com/ncw/rclone";
@@ -10,7 +10,7 @@ buildGoPackage rec {
owner = "ncw";
repo = "rclone";
rev = "v${version}";
- sha256 = "1khg5jsrjmnblv8zg0zqs1n0hmjv05pjj94m9d7jbp9d936lxsxx";
+ sha256 = "0iz427gdm8cxx3kbjmhw7jsvi9j0ppb5aqcq4alwf72fvpvql3mx";
};
outputs = [ "bin" "out" "man" ];
diff --git a/pkgs/applications/networking/syncthing/default.nix b/pkgs/applications/networking/syncthing/default.nix
index 25d482fd9b0..b7bad13a30d 100644
--- a/pkgs/applications/networking/syncthing/default.nix
+++ b/pkgs/applications/networking/syncthing/default.nix
@@ -3,14 +3,14 @@
let
common = { stname, target, patches ? [], postInstall ? "" }:
stdenv.mkDerivation rec {
- version = "0.14.48";
+ version = "0.14.50";
name = "${stname}-${version}";
src = fetchFromGitHub {
owner = "syncthing";
repo = "syncthing";
rev = "v${version}";
- sha256 = "10jls0z3y081fq097xarplzv5sz076ibhawzm65bq695f6s5sdzw";
+ sha256 = "10lilw20mq1zshysb9zrszcpl4slyyxvnbxfqk04nhz0b1gmm9ri";
};
inherit patches;
diff --git a/pkgs/applications/networking/testssl/default.nix b/pkgs/applications/networking/testssl/default.nix
index 5a548d5ff65..cc0cffb6e3b 100644
--- a/pkgs/applications/networking/testssl/default.nix
+++ b/pkgs/applications/networking/testssl/default.nix
@@ -2,7 +2,7 @@
, dnsutils, coreutils, openssl, nettools, utillinux, procps }:
let
- version = "2.9.5-5";
+ version = "2.9.5-6";
in stdenv.mkDerivation rec {
name = "testssl.sh-${version}";
@@ -11,7 +11,7 @@ in stdenv.mkDerivation rec {
owner = "drwetter";
repo = "testssl.sh";
rev = "v${version}";
- sha256 = "0zgj9vhd8fv3a1cn8dxqmjd8qmgryc867gq7zbvbr41lkqc06a1r";
+ sha256 = "0wn7lxz0ibv59v0acbsk5z3rsmr65zr1q7n4kxva1cw5xzq9ya6k";
};
nativeBuildInputs = [ makeWrapper ];
diff --git a/pkgs/applications/networking/weather/meteo/default.nix b/pkgs/applications/networking/weather/meteo/default.nix
new file mode 100644
index 00000000000..6d431a436ad
--- /dev/null
+++ b/pkgs/applications/networking/weather/meteo/default.nix
@@ -0,0 +1,54 @@
+{ stdenv, fetchFromGitLab, vala, python3, pkgconfig, meson, ninja, granite, gtk3
+, gnome3, json-glib, libsoup, clutter, clutter-gtk, libchamplain, webkitgtk
+, libappindicator, desktop-file-utils, appstream, gobjectIntrospection, wrapGAppsHook }:
+
+stdenv.mkDerivation rec {
+ pname = "meteo";
+ version = "0.8.5";
+
+ name = "${pname}-${version}";
+
+ src = fetchFromGitLab {
+ owner = "bitseater";
+ repo = pname;
+ rev = version;
+ sha256 = "1mc2djhkg0nzcjmy87l1wqwni48vgpqh8s1flr90pipk12a1mh7n";
+ };
+
+ nativeBuildInputs = [
+ appstream
+ desktop-file-utils
+ gobjectIntrospection
+ meson
+ ninja
+ pkgconfig
+ python3
+ vala
+ wrapGAppsHook
+ ];
+
+ buildInputs = [
+ clutter
+ clutter-gtk
+ gnome3.geocode-glib
+ gtk3
+ json-glib
+ libappindicator
+ libchamplain
+ libsoup
+ webkitgtk
+ ];
+
+ postPatch = ''
+ chmod +x meson/post_install.py
+ patchShebangs meson/post_install.py
+ '';
+
+ meta = with stdenv.lib; {
+ description = "Know the forecast of the next hours & days";
+ homepage = https://gitlab.com/bitseater/meteo;
+ license = licenses.gpl3Plus;
+ maintainers = with maintainers; [ worldofpeace ];
+ platforms = platforms.linux;
+ };
+}
diff --git a/pkgs/applications/office/aesop/default.nix b/pkgs/applications/office/aesop/default.nix
new file mode 100644
index 00000000000..cf816a28122
--- /dev/null
+++ b/pkgs/applications/office/aesop/default.nix
@@ -0,0 +1,49 @@
+{ stdenv, fetchFromGitHub, vala, pkgconfig, meson, ninja, python3, granite, gtk3, gnome3
+, desktop-file-utils, json-glib, libsoup, poppler, gobjectIntrospection, wrapGAppsHook }:
+
+stdenv.mkDerivation rec {
+ pname = "aesop";
+ version = "1.0.5";
+
+ name = "${pname}-${version}";
+
+ src = fetchFromGitHub {
+ owner = "lainsce";
+ repo = pname;
+ rev = version;
+ sha256 = "17hjg4qcy8q9xl170yapbhn9vdsn3jf537jsggq51pp0fnhvsnqs";
+ };
+
+ nativeBuildInputs = [
+ desktop-file-utils
+ gobjectIntrospection
+ meson
+ ninja
+ pkgconfig
+ python3
+ vala
+ wrapGAppsHook
+ ];
+
+ buildInputs = [
+ gnome3.libgee
+ granite
+ gtk3
+ json-glib
+ libsoup
+ poppler
+ ];
+
+ postPatch = ''
+ chmod +x meson/post_install.py
+ patchShebangs meson/post_install.py
+ '';
+
+ meta = with stdenv.lib; {
+ description = "The simplest PDF viewer around";
+ homepage = https://github.com/lainsce/aesop;
+ license = licenses.gpl2Plus;
+ maintainers = with maintainers; [ worldofpeace ];
+ platforms = platforms.linux;
+ };
+}
diff --git a/pkgs/applications/office/bookworm/default.nix b/pkgs/applications/office/bookworm/default.nix
new file mode 100644
index 00000000000..45c794c82ea
--- /dev/null
+++ b/pkgs/applications/office/bookworm/default.nix
@@ -0,0 +1,53 @@
+{ stdenv, fetchFromGitHub, vala, pkgconfig, libxml2, cmake, ninja, gtk3, granite, gnome3
+, gobjectIntrospection, sqlite, poppler, poppler_utils, html2text, unzip, unar, wrapGAppsHook }:
+
+stdenv.mkDerivation rec {
+ pname = "bookworm";
+ version = "1.0.0";
+
+ name = "${pname}-${version}";
+
+ src = fetchFromGitHub {
+ owner = "babluboy";
+ repo = pname;
+ rev = version;
+ sha256 = "0nv1nxird0s0qfhh8fr82mkj4qimhklw1bwcjwmvjdsvsxxs9520";
+ };
+
+ nativeBuildInputs = [
+ cmake
+ gobjectIntrospection
+ libxml2
+ ninja
+ pkgconfig
+ vala
+ wrapGAppsHook
+ ];
+
+ buildInputs = with gnome3; [
+ glib
+ granite
+ gtk3
+ html2text
+ libgee
+ poppler
+ sqlite
+ webkitgtk
+ ];
+
+ preFixup = ''
+ gappsWrapperArgs+=(
+ --prefix PATH : "${stdenv.lib.makeBinPath [ unzip unar poppler_utils html2text ]}"
+ )
+ '';
+
+ meta = with stdenv.lib; {
+ description = "A simple, focused eBook reader";
+ longDescription = ''
+ Read the books you love without having to worry about different format complexities like epub, pdf, mobi, cbr, etc.
+ '';
+ homepage = https://babluboy.github.io/bookworm/;
+ license = licenses.gpl3Plus;
+ platforms = platforms.linux;
+ };
+ }
diff --git a/pkgs/applications/science/biology/hisat2/default.nix b/pkgs/applications/science/biology/hisat2/default.nix
new file mode 100644
index 00000000000..9ccf54a8113
--- /dev/null
+++ b/pkgs/applications/science/biology/hisat2/default.nix
@@ -0,0 +1,49 @@
+{stdenv, fetchurl, unzip, which, python}:
+
+stdenv.mkDerivation rec {
+ name = "hisat2-${version}";
+ version = "2.1.0";
+
+ src = fetchurl {
+ url = "ftp://ftp.ccb.jhu.edu/pub/infphilo/hisat2/downloads/hisat2-${version}-source.zip";
+ sha256 = "10g73sdf6vqqfhhd92hliw7bbpkb8v4pp5012r5l21zws7p7d8l9";
+ };
+
+ buildInputs = [ unzip which python ];
+
+ installPhase = ''
+ mkdir -p $out/bin
+ cp hisat2 \
+ hisat2-inspect-l \
+ hisat2-build-s \
+ hisat2-align-l \
+ hisat2-inspect \
+ hisat2-align-s \
+ hisat2-inspect-s \
+ hisat2-build-l \
+ hisat2-build \
+ extract_exons.py \
+ extract_splice_sites.py \
+ hisat2_extract_exons.py \
+ hisat2_extract_snps_haplotypes_UCSC.py \
+ hisat2_extract_snps_haplotypes_VCF.py \
+ hisat2_extract_splice_sites.py \
+ hisat2_simulate_reads.py \
+ hisatgenotype_build_genome.py \
+ hisatgenotype_extract_reads.py \
+ hisatgenotype_extract_vars.py \
+ hisatgenotype_hla_cyp.py \
+ hisatgenotype_locus.py \
+ hisatgenotype.py \
+ $out/bin
+ '';
+
+ meta = with stdenv.lib; {
+ description = "Graph based aligner";
+ license = licenses.gpl3;
+ homepage = https://ccb.jhu.edu/software/hisat2/index.shtml;
+ maintainers = with maintainers; [ jbedo ];
+ platforms = [ "x86_64-linux" "i686-linux" ];
+ };
+
+}
diff --git a/pkgs/applications/science/biology/picard-tools/default.nix b/pkgs/applications/science/biology/picard-tools/default.nix
index 0ddbdab4c1b..c141e6087bf 100644
--- a/pkgs/applications/science/biology/picard-tools/default.nix
+++ b/pkgs/applications/science/biology/picard-tools/default.nix
@@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
name = "picard-tools-${version}";
- version = "2.18.11";
+ version = "2.18.12";
src = fetchurl {
url = "https://github.com/broadinstitute/picard/releases/download/${version}/picard.jar";
- sha256 = "03wkyz3bjx3n8bwambhz9lr09271r1wxycmx4p7m2naqs4afxb89";
+ sha256 = "0r5w71fcji4j3xjdhip9jlvmqi66x52af8b7mfxp4nz6xxl9ilxm";
};
buildInputs = [ jre makeWrapper ];
diff --git a/pkgs/applications/science/biology/seaview/default.nix b/pkgs/applications/science/biology/seaview/default.nix
new file mode 100644
index 00000000000..17cf903ae49
--- /dev/null
+++ b/pkgs/applications/science/biology/seaview/default.nix
@@ -0,0 +1,41 @@
+{ stdenv, fetchurl, coreutils, fltk, libjpeg }:
+
+stdenv.mkDerivation rec {
+ version = "4.7";
+ name = "seaview-${version}";
+
+ src = fetchurl {
+ url = "ftp://pbil.univ-lyon1.fr/pub/mol_phylogeny/seaview/archive/seaview_${version}.tar.gz";
+ sha256 = "0fhyq7dcn0izhwcfin9ajsr7kmmsqm9f1np1rmhzg4digfwqb29n";
+ };
+
+ buildInputs = [ fltk libjpeg ];
+
+ patchPhase = "sed -i 's#PATH=/bin:/usr/bin rm#'${coreutils}/bin/rm'#' seaview.cxx";
+ installPhase = "mkdir -p $out/bin; cp seaview $out/bin";
+
+ meta = with stdenv.lib; {
+ description = "GUI for molecular phylogeny";
+ longDescription = ''
+ SeaView is a multiplatform, graphical user interface for multiple sequence alignment and molecular phylogeny.
+ - SeaView reads and writes various file formats (NEXUS, MSF, CLUSTAL, FASTA, PHYLIP, MASE, Newick) of DNA and protein sequences and of phylogenetic trees.
+ - SeaView drives programs muscle or Clustal Omega for multiple sequence alignment, and also allows to use any external alignment algorithm able to read and write FASTA-formatted files.
+ - Seaview drives the Gblocks program to select blocks of evolutionarily conserved sites.
+ - SeaView computes phylogenetic trees by
+ + parsimony, using PHYLIP's dnapars/protpars algorithm,
+ + distance, with NJ or BioNJ algorithms on a variety of evolutionary distances,
+ + maximum likelihood, driving program PhyML 3.1.
+ - Seaview can use the Transfer Bootstrap Expectation method to compute the bootstrap support of PhyML and distance trees.
+ - SeaView prints and draws phylogenetic trees on screen, SVG, PDF or PostScript files.
+ - SeaView allows to download sequences from EMBL/GenBank/UniProt using the Internet.
+
+ Seaview is published in:
+
+ Gouy M., Guindon S. & Gascuel O. (2010) SeaView version 4 : a multiplatform graphical user interface for sequence alignment and phylogenetic tree building. Molecular Biology and Evolution 27(2):221-224.
+ '';
+ homepage = http://doua.prabi.fr/software/seaview;
+ license = licenses.gpl3;
+ maintainers = [ maintainers.iimog ];
+ platforms = platforms.linux;
+ };
+}
diff --git a/pkgs/applications/science/biology/star/default.nix b/pkgs/applications/science/biology/star/default.nix
index f52df902db6..c552d9f9de3 100644
--- a/pkgs/applications/science/biology/star/default.nix
+++ b/pkgs/applications/science/biology/star/default.nix
@@ -2,13 +2,13 @@
stdenv.mkDerivation rec {
name = "star-${version}";
- version = "2.6.0c";
+ version = "2.6.1a";
src = fetchFromGitHub {
repo = "STAR";
owner = "alexdobin";
rev = version;
- sha256 = "04cj6jw8d9q6lk9c78wa4fky6jdlicf1d13plq7182h8vqiz8p59";
+ sha256 = "11zs32d96gpjldrylz3nr5r2qrshf0nmzh5nmcy4wrk7y5lz81xc";
};
sourceRoot = "source/source";
diff --git a/pkgs/applications/science/chemistry/quantum-espresso/default.nix b/pkgs/applications/science/chemistry/quantum-espresso/default.nix
new file mode 100644
index 00000000000..7a7f1b3596d
--- /dev/null
+++ b/pkgs/applications/science/chemistry/quantum-espresso/default.nix
@@ -0,0 +1,49 @@
+{ stdenv, fetchurl
+, gfortran, fftw, openblas
+, mpi ? null
+}:
+
+stdenv.mkDerivation rec {
+ version = "6.3";
+ name = "quantum-espresso-${version}";
+
+ src = fetchurl {
+ url = "https://gitlab.com/QEF/q-e/-/archive/qe-${version}/q-e-qe-${version}.tar.gz";
+ sha256 = "1738z3nhkzcrgnhnfg1r4lipbwvcrcprwhzjbjysnylmzbzwhrs0";
+ };
+
+ passthru = {
+ inherit mpi;
+ };
+
+ preConfigure = ''
+ patchShebangs configure
+ '';
+
+ # remove after 6.3 version:
+ # makefile needs to ignore install directory easier than applying patch
+ preInstall = ''
+ printf "\n.PHONY: install\n" >> Makefile
+ '';
+
+ buildInputs = [ fftw openblas gfortran ]
+ ++ (stdenv.lib.optionals (mpi != null) [ mpi ]);
+
+configureFlags = if (mpi != null) then [ "LD=${mpi}/bin/mpif90" ] else [ "LD=${gfortran}/bin/gfortran" ];
+
+ makeFlags = [ "all" ];
+
+ meta = with stdenv.lib; {
+ description = "Electronic-structure calculations and materials modeling at the nanoscale";
+ longDescription = ''
+ Quantum ESPRESSO is an integrated suite of Open-Source computer codes for
+ electronic-structure calculations and materials modeling at the
+ nanoscale. It is based on density-functional theory, plane waves, and
+ pseudopotentials.
+ '';
+ homepage = https://www.quantum-espresso.org/;
+ license = licenses.gpl2;
+ platforms = [ "x86_64-linux" ];
+ maintainers = [ maintainers.costrouc ];
+ };
+}
diff --git a/pkgs/applications/science/chemistry/siesta/default.nix b/pkgs/applications/science/chemistry/siesta/default.nix
new file mode 100644
index 00000000000..eb17a68b8aa
--- /dev/null
+++ b/pkgs/applications/science/chemistry/siesta/default.nix
@@ -0,0 +1,69 @@
+{ stdenv, fetchurl
+, gfortran, openblas
+, mpi ? null, scalapack
+}:
+
+stdenv.mkDerivation rec {
+ version = "4.1-b3";
+ name = "siesta-${version}";
+
+ src = fetchurl {
+ url = "https://launchpad.net/siesta/4.1/4.1-b3/+download/siesta-4.1-b3.tar.gz";
+ sha256 = "1450jsxj5aifa0b5fcg7mxxq242fvqnp4zxpgzgbkdp99vrp06gm";
+ };
+
+ passthru = {
+ inherit mpi;
+ };
+
+ buildInputs = [ openblas gfortran ]
+ ++ (stdenv.lib.optionals (mpi != null) [ mpi scalapack ]);
+
+ enableParallelBuilding = true;
+
+ # Must do manualy becuase siesta does not do the regular
+ # ./configure; make; make install
+ configurePhase = ''
+ cd Obj
+ sh ../Src/obj_setup.sh
+ cp gfortran.make arch.make
+ '';
+
+ preBuild = if (mpi != null) then ''
+ makeFlagsArray=(
+ CC="mpicc" FC="mpifort"
+ FPPFLAGS="-DMPI" MPI_INTERFACE="libmpi_f90.a" MPI_INCLUDE="."
+ COMP_LIBS="" LIBS="-lopenblas -lscalapack"
+ );
+ '' else ''
+ makeFlagsArray=(
+ COMP_LIBS="" LIBS="-lopenblas"
+ );
+ '';
+
+ installPhase = ''
+ mkdir -p $out/bin
+ cp -a siesta $out/bin
+ '';
+
+ meta = with stdenv.lib; {
+ description = "A first-principles materials simulation code using DFT";
+ longDescription = ''
+ SIESTA is both a method and its computer program
+ implementation, to perform efficient electronic structure
+ calculations and ab initio molecular dynamics simulations of
+ molecules and solids. SIESTA's efficiency stems from the use
+ of strictly localized basis sets and from the implementation
+ of linear-scaling algorithms which can be applied to suitable
+ systems. A very important feature of the code is that its
+ accuracy and cost can be tuned in a wide range, from quick
+ exploratory calculations to highly accurate simulations
+ matching the quality of other approaches, such as plane-wave
+ and all-electron methods.
+ '';
+ homepage = https://www.quantum-espresso.org/;
+ license = licenses.gpl2;
+ platforms = [ "x86_64-linux" ];
+ maintainers = [ maintainers.costrouc ];
+ };
+}
diff --git a/pkgs/applications/science/geometry/drgeo/default.nix b/pkgs/applications/science/geometry/drgeo/default.nix
index 8db1beedebb..e233b91bbc9 100644
--- a/pkgs/applications/science/geometry/drgeo/default.nix
+++ b/pkgs/applications/science/geometry/drgeo/default.nix
@@ -20,8 +20,10 @@ stdenv.mkDerivation rec {
cp drgeo.desktop.in drgeo.desktop
'';
- meta = {
+ meta = with stdenv.lib; {
description = "Interactive geometry program";
- platforms = stdenv.lib.platforms.linux;
+ homepage = https://sourceforge.net/projects/ofset;
+ license = licenses.gpl2;
+ platforms = platforms.linux;
};
}
diff --git a/pkgs/applications/science/logic/prooftree/default.nix b/pkgs/applications/science/logic/prooftree/default.nix
index 01dfc35f6e0..2d5fcfd2d26 100644
--- a/pkgs/applications/science/logic/prooftree/default.nix
+++ b/pkgs/applications/science/logic/prooftree/default.nix
@@ -15,7 +15,7 @@ stdenv.mkDerivation (rec {
dontAddPrefix = true;
configureFlags = [ "--prefix" "$(out)" ];
- meta = {
+ meta = with stdenv.lib; {
description = "A program for proof-tree visualization";
longDescription = ''
Prooftree is a program for proof-tree visualization during interactive
@@ -35,7 +35,8 @@ stdenv.mkDerivation (rec {
shift-click).
'';
homepage = http://askra.de/software/prooftree;
- platforms = stdenv.lib.platforms.unix;
- maintainers = [ stdenv.lib.maintainers.jwiegley ];
+ platforms = platforms.unix;
+ maintainers = [ maintainers.jwiegley ];
+ license = licenses.gpl3;
};
})
diff --git a/pkgs/applications/science/logic/tamarin-prover/default.nix b/pkgs/applications/science/logic/tamarin-prover/default.nix
index 4efc384ed22..9056eab71ea 100644
--- a/pkgs/applications/science/logic/tamarin-prover/default.nix
+++ b/pkgs/applications/science/logic/tamarin-prover/default.nix
@@ -31,7 +31,8 @@ let
'';
tamarin-prover-utils = mkDerivation (common "tamarin-prover-utils" (src + "/lib/utils") // {
- patchPhase = replaceSymlinks;
+ postPatch = replaceSymlinks;
+ patches = [ ./ghc-8.4-support-utils.patch ];
libraryHaskellDepends = with haskellPackages; [
base base64-bytestring binary blaze-builder bytestring containers
deepseq dlist fclabels mtl pretty safe SHA syb time transformers
@@ -39,7 +40,8 @@ let
});
tamarin-prover-term = mkDerivation (common "tamarin-prover-term" (src + "/lib/term") // {
- patchPhase = replaceSymlinks;
+ postPatch = replaceSymlinks;
+ patches = [ ./ghc-8.4-support-term.patch ];
libraryHaskellDepends = (with haskellPackages; [
attoparsec base binary bytestring containers deepseq dlist HUnit
mtl process safe
@@ -47,7 +49,8 @@ let
});
tamarin-prover-theory = mkDerivation (common "tamarin-prover-theory" (src + "/lib/theory") // {
- patchPhase = replaceSymlinks;
+ postPatch = replaceSymlinks;
+ patches = [ ./ghc-8.4-support-theory.patch ];
doHaddock = false; # broken
libraryHaskellDepends = (with haskellPackages; [
aeson aeson-pretty base binary bytestring containers deepseq dlist
diff --git a/pkgs/applications/science/logic/tamarin-prover/ghc-8.4-support-term.patch b/pkgs/applications/science/logic/tamarin-prover/ghc-8.4-support-term.patch
new file mode 100644
index 00000000000..f93919faf54
--- /dev/null
+++ b/pkgs/applications/science/logic/tamarin-prover/ghc-8.4-support-term.patch
@@ -0,0 +1,109 @@
+From a08f6e400772899b9b0fc16befc50391cd70696b Mon Sep 17 00:00:00 2001
+From: Felix Yan
+Date: Fri, 18 May 2018 16:24:41 +0800
+Subject: [PATCH] GHC 8.4 support
+
+---
+ src/Term/Maude/Signature.hs | 8 ++--
+ src/Term/Rewriting/Definitions.hs | 23 ++++++----
+ src/Term/Unification.hs | 4 +-
+ 11 files changed, 79 insertions(+), 48 deletions(-)
+
+diff --git a/src/Term/Maude/Signature.hs b/src/Term/Maude/Signature.hs
+index 98c25d9f..1a4ce82f 100644
+--- a/src/Term/Maude/Signature.hs
++++ b/src/Term/Maude/Signature.hs
+@@ -104,9 +104,9 @@ maudeSig msig@(MaudeSig {enableDH,enableBP,enableMSet,enableXor,enableDiff=_,stF
+ `S.union` dhReducibleFunSig `S.union` bpReducibleFunSig `S.union` xorReducibleFunSig
+
+ -- | A monoid instance to combine maude signatures.
+-instance Monoid MaudeSig where
+- (MaudeSig dh1 bp1 mset1 xor1 diff1 stFunSyms1 stRules1 _ _) `mappend`
+- (MaudeSig dh2 bp2 mset2 xor2 diff2 stFunSyms2 stRules2 _ _) =
++instance Semigroup MaudeSig where
++ MaudeSig dh1 bp1 mset1 xor1 diff1 stFunSyms1 stRules1 _ _ <>
++ MaudeSig dh2 bp2 mset2 xor2 diff2 stFunSyms2 stRules2 _ _ =
+ maudeSig (mempty {enableDH=dh1||dh2
+ ,enableBP=bp1||bp2
+ ,enableMSet=mset1||mset2
+@@ -114,6 +114,8 @@ instance Monoid MaudeSig where
+ ,enableDiff=diff1||diff2
+ ,stFunSyms=S.union stFunSyms1 stFunSyms2
+ ,stRules=S.union stRules1 stRules2})
++
++instance Monoid MaudeSig where
+ mempty = MaudeSig False False False False False S.empty S.empty S.empty S.empty
+
+ -- | Non-AC function symbols.
+diff --git a/src/Term/Rewriting/Definitions.hs b/src/Term/Rewriting/Definitions.hs
+index bd942b6a..18562e4e 100644
+--- a/src/Term/Rewriting/Definitions.hs
++++ b/src/Term/Rewriting/Definitions.hs
+@@ -44,10 +44,12 @@ evalEqual (Equal l r) = l == r
+ instance Functor Equal where
+ fmap f (Equal lhs rhs) = Equal (f lhs) (f rhs)
+
++instance Semigroup a => Semigroup (Equal a) where
++ (Equal l1 r1) <> (Equal l2 r2) =
++ Equal (l1 <> l2) (r1 <> r2)
++
+ instance Monoid a => Monoid (Equal a) where
+ mempty = Equal mempty mempty
+- (Equal l1 r1) `mappend` (Equal l2 r2) =
+- Equal (l1 `mappend` l2) (r1 `mappend` r2)
+
+ instance Foldable Equal where
+ foldMap f (Equal l r) = f l `mappend` f r
+@@ -104,14 +106,15 @@ instance Functor Match where
+ fmap _ NoMatch = NoMatch
+ fmap f (DelayedMatches ms) = DelayedMatches (fmap (f *** f) ms)
+
++instance Semigroup (Match a) where
++ NoMatch <> _ = NoMatch
++ _ <> NoMatch = NoMatch
++ DelayedMatches ms1 <> DelayedMatches ms2 =
++ DelayedMatches (ms1 <> ms2)
++
+ instance Monoid (Match a) where
+ mempty = DelayedMatches []
+
+- NoMatch `mappend` _ = NoMatch
+- _ `mappend` NoMatch = NoMatch
+- DelayedMatches ms1 `mappend` DelayedMatches ms2 =
+- DelayedMatches (ms1 `mappend` ms2)
+-
+
+ instance Foldable Match where
+ foldMap _ NoMatch = mempty
+@@ -136,10 +139,12 @@ data RRule a = RRule a a
+ instance Functor RRule where
+ fmap f (RRule lhs rhs) = RRule (f lhs) (f rhs)
+
++instance Monoid a => Semigroup (RRule a) where
++ (RRule l1 r1) <> (RRule l2 r2) =
++ RRule (l1 <> l2) (r1 <> r2)
++
+ instance Monoid a => Monoid (RRule a) where
+ mempty = RRule mempty mempty
+- (RRule l1 r1) `mappend` (RRule l2 r2) =
+- RRule (l1 `mappend` l2) (r1 `mappend` r2)
+
+ instance Foldable RRule where
+ foldMap f (RRule l r) = f l `mappend` f r
+diff --git a/src/Term/Unification.hs b/src/Term/Unification.hs
+index e1de0163..7ce6bb41 100644
+--- a/src/Term/Unification.hs
++++ b/src/Term/Unification.hs
+@@ -265,9 +265,11 @@ unifyRaw l0 r0 = do
+
+ data MatchFailure = NoMatcher | ACProblem
+
++instance Semigroup MatchFailure where
++ _ <> _ = NoMatcher
++
+ instance Monoid MatchFailure where
+ mempty = NoMatcher
+- mappend _ _ = NoMatcher
+
+ -- | Ensure that the computed substitution @sigma@ satisfies
+ -- @t ==_AC apply sigma p@ after the delayed equations are solved.
diff --git a/pkgs/applications/science/logic/tamarin-prover/ghc-8.4-support-theory.patch b/pkgs/applications/science/logic/tamarin-prover/ghc-8.4-support-theory.patch
new file mode 100644
index 00000000000..f7393e37f1b
--- /dev/null
+++ b/pkgs/applications/science/logic/tamarin-prover/ghc-8.4-support-theory.patch
@@ -0,0 +1,130 @@
+From a08f6e400772899b9b0fc16befc50391cd70696b Mon Sep 17 00:00:00 2001
+From: Felix Yan
+Date: Fri, 18 May 2018 16:24:41 +0800
+Subject: [PATCH] GHC 8.4 support
+
+---
+ src/Theory/Proof.hs | 43 +++++++++++--------
+ 11 files changed, 79 insertions(+), 48 deletions(-)
+
+diff --git a/src/Theory/Constraint/Solver/Reduction.hs b/src/Theory/Constraint/Solver/Reduction.hs
+index ddbc965a..6daadd0d 100644
+--- a/src/Theory/Constraint/Solver/Reduction.hs
++++ b/src/Theory/Constraint/Solver/Reduction.hs
+@@ -139,13 +139,14 @@ execReduction m ctxt se fs =
+ data ChangeIndicator = Unchanged | Changed
+ deriving( Eq, Ord, Show )
+
++instance Semigroup ChangeIndicator where
++ Changed <> _ = Changed
++ _ <> Changed = Changed
++ Unchanged <> Unchanged = Unchanged
++
+ instance Monoid ChangeIndicator where
+ mempty = Unchanged
+
+- Changed `mappend` _ = Changed
+- _ `mappend` Changed = Changed
+- Unchanged `mappend` Unchanged = Unchanged
+-
+ -- | Return 'True' iff there was a change.
+ wasChanged :: ChangeIndicator -> Bool
+ wasChanged Changed = True
+diff --git a/src/Theory/Constraint/System/Guarded.hs b/src/Theory/Constraint/System/Guarded.hs
+index f98fc7c2..2aac8ce2 100644
+--- a/src/Theory/Constraint/System/Guarded.hs
++++ b/src/Theory/Constraint/System/Guarded.hs
+@@ -435,7 +435,7 @@ gall ss atos gf = GGuarded All ss atos gf
+
+ -- | Local newtype to avoid orphan instance.
+ newtype ErrorDoc d = ErrorDoc { unErrorDoc :: d }
+- deriving( Monoid, NFData, Document, HighlightDocument )
++ deriving( Monoid, Semigroup, NFData, Document, HighlightDocument )
+
+ -- | @formulaToGuarded fm@ returns a guarded formula @gf@ that is
+ -- equivalent to @fm@ under the assumption that this is possible.
+diff --git a/src/Theory/Proof.hs b/src/Theory/Proof.hs
+index 74fb77b1..7971b9fc 100644
+--- a/src/Theory/Proof.hs
++++ b/src/Theory/Proof.hs
+@@ -388,17 +388,19 @@ data ProofStatus =
+ | TraceFound -- ^ There is an annotated solved step
+ deriving ( Show, Generic, NFData, Binary )
+
++instance Semigroup ProofStatus where
++ TraceFound <> _ = TraceFound
++ _ <> TraceFound = TraceFound
++ IncompleteProof <> _ = IncompleteProof
++ _ <> IncompleteProof = IncompleteProof
++ _ <> CompleteProof = CompleteProof
++ CompleteProof <> _ = CompleteProof
++ UndeterminedProof <> UndeterminedProof = UndeterminedProof
++
++
+ instance Monoid ProofStatus where
+ mempty = CompleteProof
+
+- mappend TraceFound _ = TraceFound
+- mappend _ TraceFound = TraceFound
+- mappend IncompleteProof _ = IncompleteProof
+- mappend _ IncompleteProof = IncompleteProof
+- mappend _ CompleteProof = CompleteProof
+- mappend CompleteProof _ = CompleteProof
+- mappend UndeterminedProof UndeterminedProof = UndeterminedProof
+-
+ -- | The status of a 'ProofStep'.
+ proofStepStatus :: ProofStep (Maybe a) -> ProofStatus
+ proofStepStatus (ProofStep _ Nothing ) = UndeterminedProof
+@@ -560,10 +562,12 @@ newtype Prover = Prover
+ -> Maybe IncrementalProof -- resulting proof
+ }
+
++instance Semigroup Prover where
++ p1 <> p2 = Prover $ \ctxt d se ->
++ runProver p1 ctxt d se >=> runProver p2 ctxt d se
++
+ instance Monoid Prover where
+ mempty = Prover $ \_ _ _ -> Just
+- p1 `mappend` p2 = Prover $ \ctxt d se ->
+- runProver p1 ctxt d se >=> runProver p2 ctxt d se
+
+ -- | Provers whose sequencing is handled via the 'Monoid' instance.
+ --
+@@ -579,10 +583,12 @@ newtype DiffProver = DiffProver
+ -> Maybe IncrementalDiffProof -- resulting proof
+ }
+
++instance Semigroup DiffProver where
++ p1 <> p2 = DiffProver $ \ctxt d se ->
++ runDiffProver p1 ctxt d se >=> runDiffProver p2 ctxt d se
++
+ instance Monoid DiffProver where
+ mempty = DiffProver $ \_ _ _ -> Just
+- p1 `mappend` p2 = DiffProver $ \ctxt d se ->
+- runDiffProver p1 ctxt d se >=> runDiffProver p2 ctxt d se
+
+ -- | Map the proof generated by the prover.
+ mapProverProof :: (IncrementalProof -> IncrementalProof) -> Prover -> Prover
+@@ -784,15 +790,16 @@ runAutoDiffProver (AutoProver heuristic bound cut) =
+ -- | The result of one pass of iterative deepening.
+ data IterDeepRes = NoSolution | MaybeNoSolution | Solution ProofPath
+
++instance Semigroup IterDeepRes where
++ x@(Solution _) <> _ = x
++ _ <> y@(Solution _) = y
++ MaybeNoSolution <> _ = MaybeNoSolution
++ _ <> MaybeNoSolution = MaybeNoSolution
++ NoSolution <> NoSolution = NoSolution
++
+ instance Monoid IterDeepRes where
+ mempty = NoSolution
+
+- x@(Solution _) `mappend` _ = x
+- _ `mappend` y@(Solution _) = y
+- MaybeNoSolution `mappend` _ = MaybeNoSolution
+- _ `mappend` MaybeNoSolution = MaybeNoSolution
+- NoSolution `mappend` NoSolution = NoSolution
+-
+ -- | @cutOnSolvedDFS prf@ removes all other cases if an attack is found. The
+ -- attack search is performed using a parallel DFS traversal with iterative
+ -- deepening.
diff --git a/pkgs/applications/science/logic/tamarin-prover/ghc-8.4-support-utils.patch b/pkgs/applications/science/logic/tamarin-prover/ghc-8.4-support-utils.patch
new file mode 100644
index 00000000000..d6cd6d73f99
--- /dev/null
+++ b/pkgs/applications/science/logic/tamarin-prover/ghc-8.4-support-utils.patch
@@ -0,0 +1,140 @@
+From a08f6e400772899b9b0fc16befc50391cd70696b Mon Sep 17 00:00:00 2001
+From: Felix Yan
+Date: Fri, 18 May 2018 16:24:41 +0800
+Subject: [PATCH] GHC 8.4 support
+
+---
+ src/Extension/Data/Bounded.hs | 10 ++++-
+ src/Extension/Data/Monoid.hs | 14 +++---
+ src/Logic/Connectives.hs | 4 +-
+ src/Text/PrettyPrint/Class.hs | 4 +-
+ src/Text/PrettyPrint/Html.hs | 6 ++-
+ 11 files changed, 79 insertions(+), 48 deletions(-)
+
+
+diff --git a/src/Extension/Data/Bounded.hs b/src/Extension/Data/Bounded.hs
+index 5f166006..f416a44c 100644
+--- a/src/Extension/Data/Bounded.hs
++++ b/src/Extension/Data/Bounded.hs
+@@ -11,19 +11,25 @@ module Extension.Data.Bounded (
+ ) where
+
+ -- import Data.Monoid
++import Data.Semigroup
+
+ -- | A newtype wrapper for a monoid of the maximum of a bounded type.
+ newtype BoundedMax a = BoundedMax {getBoundedMax :: a}
+ deriving( Eq, Ord, Show )
+
++instance (Ord a, Bounded a) => Semigroup (BoundedMax a) where
++ BoundedMax x <> BoundedMax y = BoundedMax (max x y)
++
+ instance (Ord a, Bounded a) => Monoid (BoundedMax a) where
+ mempty = BoundedMax minBound
+- (BoundedMax x) `mappend` (BoundedMax y) = BoundedMax (max x y)
++ mappend = (<>)
+
+ -- | A newtype wrapper for a monoid of the minimum of a bounded type.
+ newtype BoundedMin a = BoundedMin {getBoundedMin :: a}
+ deriving( Eq, Ord, Show )
+
++instance (Ord a, Bounded a) => Semigroup (BoundedMin a) where
++ BoundedMin x <> BoundedMin y = BoundedMin (min x y)
++
+ instance (Ord a, Bounded a) => Monoid (BoundedMin a) where
+ mempty = BoundedMin maxBound
+- (BoundedMin x) `mappend` (BoundedMin y) = BoundedMin (min x y)
+\ No newline at end of file
+diff --git a/src/Extension/Data/Monoid.hs b/src/Extension/Data/Monoid.hs
+index 83655c34..9ce2f91b 100644
+--- a/src/Extension/Data/Monoid.hs
++++ b/src/Extension/Data/Monoid.hs
+@@ -18,6 +18,7 @@ module Extension.Data.Monoid (
+ ) where
+
+ import Data.Monoid
++import Data.Semigroup
+
+ #if __GLASGOW_HASKELL__ < 704
+
+@@ -38,10 +39,13 @@ newtype MinMax a = MinMax { getMinMax :: Maybe (a, a) }
+ minMaxSingleton :: a -> MinMax a
+ minMaxSingleton x = MinMax (Just (x, x))
+
++instance Ord a => Semigroup (MinMax a) where
++ MinMax Nothing <> y = y
++ x <> MinMax Nothing = x
++ MinMax (Just (xMin, xMax)) <> MinMax (Just (yMin, yMax)) =
++ MinMax (Just (min xMin yMin, max xMax yMax))
++
++
+ instance Ord a => Monoid (MinMax a) where
+ mempty = MinMax Nothing
+-
+- MinMax Nothing `mappend` y = y
+- x `mappend` MinMax Nothing = x
+- MinMax (Just (xMin, xMax)) `mappend` MinMax (Just (yMin, yMax)) =
+- MinMax (Just (min xMin yMin, max xMax yMax))
++ mappend = (<>)
+diff --git a/src/Logic/Connectives.hs b/src/Logic/Connectives.hs
+index 2e441172..7206cc2c 100644
+--- a/src/Logic/Connectives.hs
++++ b/src/Logic/Connectives.hs
+@@ -23,12 +23,12 @@ import Control.DeepSeq
+
+ -- | A conjunction of atoms of type a.
+ newtype Conj a = Conj { getConj :: [a] }
+- deriving (Monoid, Foldable, Traversable, Eq, Ord, Show, Binary,
++ deriving (Monoid, Semigroup, Foldable, Traversable, Eq, Ord, Show, Binary,
+ Functor, Applicative, Monad, Alternative, MonadPlus, Typeable, Data, NFData)
+
+ -- | A disjunction of atoms of type a.
+ newtype Disj a = Disj { getDisj :: [a] }
+- deriving (Monoid, Foldable, Traversable, Eq, Ord, Show, Binary,
++ deriving (Monoid, Semigroup, Foldable, Traversable, Eq, Ord, Show, Binary,
+ Functor, Applicative, Monad, Alternative, MonadPlus, Typeable, Data, NFData)
+
+ instance MonadDisj Disj where
+diff --git a/src/Text/PrettyPrint/Class.hs b/src/Text/PrettyPrint/Class.hs
+index f5eb42fe..13be6515 100644
+--- a/src/Text/PrettyPrint/Class.hs
++++ b/src/Text/PrettyPrint/Class.hs
+@@ -187,9 +187,11 @@ instance Document Doc where
+ nest i (Doc d) = Doc $ P.nest i d
+ caseEmptyDoc yes no (Doc d) = if P.isEmpty d then yes else no
+
++instance Semigroup Doc where
++ Doc d1 <> Doc d2 = Doc $ (P.<>) d1 d2
++
+ instance Monoid Doc where
+ mempty = Doc $ P.empty
+- mappend (Doc d1) (Doc d2) = Doc $ (P.<>) d1 d2
+
+ ------------------------------------------------------------------------------
+ -- Additional combinators
+diff --git a/src/Text/PrettyPrint/Html.hs b/src/Text/PrettyPrint/Html.hs
+index 3de5e307..10103eb7 100644
+--- a/src/Text/PrettyPrint/Html.hs
++++ b/src/Text/PrettyPrint/Html.hs
+@@ -90,7 +90,7 @@ attribute (key,value) = " " ++ key ++ "=\"" ++ escapeHtmlEntities value ++ "\""
+
+ -- | A 'Document' transformer that adds proper HTML escaping.
+ newtype HtmlDoc d = HtmlDoc { getHtmlDoc :: d }
+- deriving( Monoid )
++ deriving( Monoid, Semigroup )
+
+ -- | Wrap a document such that HTML markup can be added without disturbing the
+ -- layout.
+@@ -182,9 +182,11 @@ getNoHtmlDoc = runIdentity . unNoHtmlDoc
+ instance NFData d => NFData (NoHtmlDoc d) where
+ rnf = rnf . getNoHtmlDoc
+
++instance Semigroup d => Semigroup (NoHtmlDoc d) where
++ (<>) = liftA2 (<>)
++
+ instance Monoid d => Monoid (NoHtmlDoc d) where
+ mempty = pure mempty
+- mappend = liftA2 mappend
+
+ instance Document d => Document (NoHtmlDoc d) where
+ char = pure . char
diff --git a/pkgs/applications/science/math/almonds/default.nix b/pkgs/applications/science/math/almonds/default.nix
index 96613f4e38a..b5d9632c551 100644
--- a/pkgs/applications/science/math/almonds/default.nix
+++ b/pkgs/applications/science/math/almonds/default.nix
@@ -20,8 +20,7 @@ with python3.pkgs; buildPythonApplication rec {
meta = with stdenv.lib; {
description = "Terminal Mandelbrot fractal viewer";
homepage = https://github.com/Tenchi2xh/Almonds;
- # No license has been specified
- license = licenses.unfree;
+ license = licenses.mit;
maintainers = with maintainers; [ infinisil ];
};
}
diff --git a/pkgs/applications/science/math/pynac/default.nix b/pkgs/applications/science/math/pynac/default.nix
index 1a059aeb167..9bbb695a331 100644
--- a/pkgs/applications/science/math/pynac/default.nix
+++ b/pkgs/applications/science/math/pynac/default.nix
@@ -41,6 +41,7 @@ stdenv.mkDerivation rec {
of the full GiNaC, and it is *only* meant to be used as a Python library.
'';
homepage = http://pynac.org;
+ license = licenses.gpl3;
maintainers = with maintainers; [ timokau ];
platforms = platforms.linux;
};
diff --git a/pkgs/applications/science/math/sage/default.nix b/pkgs/applications/science/math/sage/default.nix
index 08e3a752b8b..7e62f0cf75e 100644
--- a/pkgs/applications/science/math/sage/default.nix
+++ b/pkgs/applications/science/math/sage/default.nix
@@ -21,7 +21,7 @@ let
sagelib = self.callPackage ./sagelib.nix {
inherit flint ecl arb;
- inherit sage-src pynac singular;
+ inherit sage-src openblas-blas-pc openblas-cblas-pc openblas-lapack-pc pynac singular;
linbox = nixpkgs.linbox.override { withSage = true; };
};
@@ -41,13 +41,13 @@ let
};
sage-env = self.callPackage ./sage-env.nix {
- inherit sage-src python rWrapper ecl singular palp flint pynac pythonEnv;
+ inherit sage-src python rWrapper openblas-cblas-pc ecl singular palp flint pynac pythonEnv;
pkg-config = nixpkgs.pkgconfig; # not to confuse with pythonPackages.pkgconfig
};
sage-with-env = self.callPackage ./sage-with-env.nix {
inherit pythonEnv;
- inherit sage-src pynac singular;
+ inherit sage-src openblas-blas-pc openblas-cblas-pc openblas-lapack-pc pynac singular;
pkg-config = nixpkgs.pkgconfig; # not to confuse with pythonPackages.pkgconfig
three = nodePackages_8_x.three;
};
@@ -60,6 +60,10 @@ let
};
};
+ openblas-blas-pc = callPackage ./openblas-pc.nix { name = "blas"; };
+ openblas-cblas-pc = callPackage ./openblas-pc.nix { name = "cblas"; };
+ openblas-lapack-pc = callPackage ./openblas-pc.nix { name = "lapack"; };
+
sage-src = callPackage ./sage-src.nix {};
pythonRuntimeDeps = with python.pkgs; [
diff --git a/pkgs/applications/science/math/sage/openblas-pc.nix b/pkgs/applications/science/math/sage/openblas-pc.nix
new file mode 100644
index 00000000000..f4669a6557e
--- /dev/null
+++ b/pkgs/applications/science/math/sage/openblas-pc.nix
@@ -0,0 +1,17 @@
+{ openblasCompat
+, writeTextFile
+, name
+}:
+
+writeTextFile {
+ name = "openblas-${name}-pc-${openblasCompat.version}";
+ destination = "/lib/pkgconfig/${name}.pc";
+ text = ''
+ Name: ${name}
+ Version: ${openblasCompat.version}
+
+ Description: ${name} for SageMath, provided by the OpenBLAS package.
+ Cflags: -I${openblasCompat}/include
+ Libs: -L${openblasCompat}/lib -lopenblas
+ '';
+}
diff --git a/pkgs/applications/science/math/sage/sage-env.nix b/pkgs/applications/science/math/sage/sage-env.nix
index 74c2e0aa036..317eb6e16c4 100644
--- a/pkgs/applications/science/math/sage/sage-env.nix
+++ b/pkgs/applications/science/math/sage/sage-env.nix
@@ -37,7 +37,7 @@
, lcalc
, rubiks
, flintqs
-, openblasCompat
+, openblas-cblas-pc
, flint
, gmp
, mpfr
@@ -98,9 +98,9 @@ writeTextFile rec {
export PKG_CONFIG_PATH='${lib.concatStringsSep ":" (map (pkg: "${pkg}/lib/pkgconfig") [
# This is only needed in the src/sage/misc/cython.py test and I'm not sure if there's really a use-case
# for it outside of the tests. However since singular and openblas are runtime dependencies anyways
- # it doesn't really hurt to include.
+ # and openblas-cblas-pc is tiny, it doesn't really hurt to include.
singular
- openblasCompat
+ openblas-cblas-pc
])
}'
export SAGE_ROOT='${sage-src}'
diff --git a/pkgs/applications/science/math/sage/sage-with-env.nix b/pkgs/applications/science/math/sage/sage-with-env.nix
index 8ccf8b5a493..63b9772b823 100644
--- a/pkgs/applications/science/math/sage/sage-with-env.nix
+++ b/pkgs/applications/science/math/sage/sage-with-env.nix
@@ -4,6 +4,9 @@
, sage-env
, sage-src
, openblasCompat
+, openblas-blas-pc
+, openblas-cblas-pc
+, openblas-lapack-pc
, pkg-config
, three
, singular
@@ -29,6 +32,9 @@ let
makeWrapper
pkg-config
openblasCompat # lots of segfaults with regular (64 bit) openblas
+ openblas-blas-pc
+ openblas-cblas-pc
+ openblas-lapack-pc
singular
three
pynac
diff --git a/pkgs/applications/science/math/sage/sagelib.nix b/pkgs/applications/science/math/sage/sagelib.nix
index 948da515af1..d26f5dad724 100644
--- a/pkgs/applications/science/math/sage/sagelib.nix
+++ b/pkgs/applications/science/math/sage/sagelib.nix
@@ -3,6 +3,9 @@
, buildPythonPackage
, arb
, openblasCompat
+, openblas-blas-pc
+, openblas-cblas-pc
+, openblas-lapack-pc
, brial
, cliquer
, cypari2
@@ -58,7 +61,9 @@ buildPythonPackage rec {
nativeBuildInputs = [
iml
perl
- openblasCompat
+ openblas-blas-pc
+ openblas-cblas-pc
+ openblas-lapack-pc
jupyter_core
];
diff --git a/pkgs/applications/science/misc/root/default.nix b/pkgs/applications/science/misc/root/default.nix
index e966e798ae6..2ec1ded68a2 100644
--- a/pkgs/applications/science/misc/root/default.nix
+++ b/pkgs/applications/science/misc/root/default.nix
@@ -67,10 +67,11 @@ stdenv.mkDerivation rec {
setupHook = ./setup-hook.sh;
- meta = {
+ meta = with stdenv.lib; {
homepage = https://root.cern.ch/;
description = "A data analysis framework";
- platforms = stdenv.lib.platforms.unix;
- maintainers = with stdenv.lib.maintainers; [ veprbl ];
+ platforms = platforms.unix;
+ maintainers = [ maintainers.veprbl ];
+ license = licenses.lgpl21;
};
}
diff --git a/pkgs/applications/science/molecular-dynamics/gromacs/default.nix b/pkgs/applications/science/molecular-dynamics/gromacs/default.nix
index 295e726c679..1caa84a6933 100644
--- a/pkgs/applications/science/molecular-dynamics/gromacs/default.nix
+++ b/pkgs/applications/science/molecular-dynamics/gromacs/default.nix
@@ -8,11 +8,11 @@
stdenv.mkDerivation {
- name = "gromacs-2018.2";
+ name = "gromacs-2018.3";
src = fetchurl {
- url = "ftp://ftp.gromacs.org/pub/gromacs/gromacs-2018.2.tar.gz";
- sha256 = "0mvqsg2j4h529a0vvvgpa4cb3p8zan18zcdlmx1na2si1h9fipab";
+ url = "ftp://ftp.gromacs.org/pub/gromacs/gromacs-2018.3.tar.gz";
+ sha256 = "14d219987h98mv5xgn2846snmslwax8z3cgp5b2njacp4j9a88s4";
};
buildInputs = [cmake fftw]
diff --git a/pkgs/applications/version-management/bazaar/default.nix b/pkgs/applications/version-management/bazaar/default.nix
index fea6fb35830..097c1e86a89 100644
--- a/pkgs/applications/version-management/bazaar/default.nix
+++ b/pkgs/applications/version-management/bazaar/default.nix
@@ -27,9 +27,10 @@ python2Packages.buildPythonApplication rec {
--subst-var-by certPath /etc/ssl/certs/ca-certificates.crt
'';
- meta = {
+ meta = with stdenv.lib; {
homepage = http://bazaar-vcs.org/;
description = "A distributed version control system that Just Works";
- platforms = stdenv.lib.platforms.unix;
+ platforms = platforms.unix;
+ license = licenses.gpl2Plus;
};
}
diff --git a/pkgs/applications/version-management/bazaar/tools.nix b/pkgs/applications/version-management/bazaar/tools.nix
index 0ad3c6079ac..82c87f30b71 100644
--- a/pkgs/applications/version-management/bazaar/tools.nix
+++ b/pkgs/applications/version-management/bazaar/tools.nix
@@ -3,7 +3,7 @@
python2Packages.buildPythonApplication rec {
name = "bzr-tools-${version}";
version = "2.6.0";
-
+
src = fetchurl {
url = "http://launchpad.net/bzrtools/stable/${version}/+download/bzrtools-${version}.tar.gz";
sha256 = "0n3zzc6jf5866kfhmrnya1vdr2ja137a45qrzsz8vz6sc6xgn5wb";
@@ -11,9 +11,10 @@ python2Packages.buildPythonApplication rec {
doCheck = false;
- meta = {
+ meta = with stdenv.lib; {
description = "Bazaar plugins";
homepage = http://wiki.bazaar.canonical.com/BzrTools;
- platforms = stdenv.lib.platforms.unix;
+ platforms = platforms.unix;
+ license = licenses.gpl2;
};
}
diff --git a/pkgs/applications/version-management/cvs2svn/default.nix b/pkgs/applications/version-management/cvs2svn/default.nix
index 90a9f26045f..5dc0c48b0f7 100644
--- a/pkgs/applications/version-management/cvs2svn/default.nix
+++ b/pkgs/applications/version-management/cvs2svn/default.nix
@@ -23,10 +23,11 @@ stdenv.mkDerivation rec {
/* !!! maybe we should absolutise the program names in
$out/lib/python2.4/site-packages/cvs2svn_lib/config.py. */
- meta = {
+ meta = with stdenv.lib; {
description = "A tool to convert CVS repositories to Subversion repositories";
homepage = http://cvs2svn.tigris.org/;
- maintainers = [ lib.maintainers.makefu ];
- platforms = stdenv.lib.platforms.unix;
+ maintainers = [ maintainers.makefu ];
+ platforms = platforms.unix;
+ license = licenses.asl20;
};
}
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 3fb22790904..5bfd74344e8 100644
--- a/pkgs/applications/version-management/git-and-tools/cgit/default.nix
+++ b/pkgs/applications/version-management/git-and-tools/cgit/default.nix
@@ -1,6 +1,6 @@
{ stdenv, fetchurl, openssl, zlib, asciidoc, libxml2, libxslt
, docbook_xsl, pkgconfig, luajit
-, gzip, bzip2, xz
+, groff, gzip, bzip2, xz
, python, wrapPython, pygments, markdown
}:
@@ -32,6 +32,9 @@ stdenv.mkDerivation rec {
-e 's|"bzip2"|"${bzip2.bin}/bin/bzip2"|' \
-e 's|"xz"|"${xz.bin}/bin/xz"|' \
-i ui-snapshot.c
+
+ substituteInPlace filters/html-converters/man2html \
+ --replace 'groff' '${groff}/bin/groff'
'';
# Give cgit a git source tree and pass configuration parameters (as make
diff --git a/pkgs/applications/version-management/git-and-tools/git-imerge/default.nix b/pkgs/applications/version-management/git-and-tools/git-imerge/default.nix
index 49856552aa3..10e78622271 100644
--- a/pkgs/applications/version-management/git-and-tools/git-imerge/default.nix
+++ b/pkgs/applications/version-management/git-and-tools/git-imerge/default.nix
@@ -2,13 +2,13 @@
stdenv.mkDerivation rec {
name = "git-imerge-${version}";
- version = "1.0.0";
+ version = "1.1.0";
src = fetchFromGitHub {
owner = "mhagger";
repo = "git-imerge";
rev = "v${version}";
- sha256 = "1ylzxmbjfrzzxmcrbqzy1wv21npqj1r6cgl77a9n2zvsrz8zdb74";
+ sha256 = "0vi1w3f0yk4gqhxj2hzqafqq28rihyhyfnp8x7xzib96j2si14a4";
};
buildInputs = [ pythonPackages.python pythonPackages.wrapPython ];
diff --git a/pkgs/applications/version-management/git-and-tools/grv/default.nix b/pkgs/applications/version-management/git-and-tools/grv/default.nix
index cfb028004c7..3b4e3a45211 100644
--- a/pkgs/applications/version-management/git-and-tools/grv/default.nix
+++ b/pkgs/applications/version-management/git-and-tools/grv/default.nix
@@ -1,8 +1,8 @@
-{ stdenv, buildGoPackage, fetchFromGitHub, curl, libgit2_0_27, ncurses, pkgconfig, readline }:
+{ stdenv, buildGo19Package, fetchFromGitHub, curl, libgit2_0_27, ncurses, pkgconfig, readline }:
let
version = "0.2.0";
in
-buildGoPackage {
+buildGo19Package {
name = "grv-${version}";
buildInputs = [ ncurses readline curl libgit2_0_27 ];
diff --git a/pkgs/applications/version-management/git-and-tools/svn-all-fast-export/default.nix b/pkgs/applications/version-management/git-and-tools/svn-all-fast-export/default.nix
index 17fb74945dc..35c6d33d74d 100644
--- a/pkgs/applications/version-management/git-and-tools/svn-all-fast-export/default.nix
+++ b/pkgs/applications/version-management/git-and-tools/svn-all-fast-export/default.nix
@@ -1,7 +1,7 @@
{ stdenv, fetchFromGitHub, qmake, qtbase, qttools, subversion, apr }:
let
- version = "1.0.12";
+ version = "1.0.13";
in
stdenv.mkDerivation {
name = "svn-all-fast-export-${version}";
@@ -10,7 +10,7 @@ stdenv.mkDerivation {
owner = "svn-all-fast-export";
repo = "svn2git";
rev = version;
- sha256 = "158w2ynz16dlp992g8nfk7v2f5962z88b4xyv5dyjvbl4l1v7r0v";
+ sha256 = "0f1qj0c4cdq46mz54wcy17g7rq1fy2q0bq3sswhr7r5a2s433x4f";
};
nativeBuildInputs = [ qmake qttools ];
diff --git a/pkgs/applications/version-management/guitone/default.nix b/pkgs/applications/version-management/guitone/default.nix
index 88074a0862c..33d2eb89ad0 100644
--- a/pkgs/applications/version-management/guitone/default.nix
+++ b/pkgs/applications/version-management/guitone/default.nix
@@ -25,8 +25,9 @@ stdenv.mkDerivation rec {
meta = {
description = "Qt4 based GUI for monotone";
- homepage = http://guitone.thomaskeller.biz;
+ homepage = https://guitone.thomaskeller.biz;
downloadPage = https://code.monotone.ca/p/guitone/;
+ license = stdenv.lib.licenses.gpl3;
inherit (qt4.meta) platforms;
};
}
diff --git a/pkgs/applications/version-management/mercurial/default.nix b/pkgs/applications/version-management/mercurial/default.nix
index 73cf4d74e18..41809e83b45 100644
--- a/pkgs/applications/version-management/mercurial/default.nix
+++ b/pkgs/applications/version-management/mercurial/default.nix
@@ -4,7 +4,7 @@
let
# if you bump version, update pkgs.tortoisehg too or ping maintainer
- version = "4.7";
+ version = "4.7.1";
name = "mercurial-${version}";
inherit (python2Packages) docutils hg-git dulwich python;
in python2Packages.buildPythonApplication {
@@ -13,7 +13,7 @@ in python2Packages.buildPythonApplication {
src = fetchurl {
url = "https://mercurial-scm.org/release/${name}.tar.gz";
- sha256 = "17rl1lyvr3qa5x73xyiwnv09wwiwjd18f01gvispzyvpgx1v3309";
+ sha256 = "03217dk8jh2ckrqqhqyahw44f5j2aq3kv03ba5v2b11i3hy3h0w5";
};
inherit python; # pass it so that the same version can be used in hg2git
diff --git a/pkgs/applications/version-management/monotone/default.nix b/pkgs/applications/version-management/monotone/default.nix
index 4282f48654e..0606c58c09d 100644
--- a/pkgs/applications/version-management/monotone/default.nix
+++ b/pkgs/applications/version-management/monotone/default.nix
@@ -21,7 +21,7 @@ stdenv.mkDerivation rec {
patches = [ ./monotone-1.1-Adapt-to-changes-in-pcre-8.42.patch ];
nativeBuildInputs = [ pkgconfig ];
- buildInputs = [ boost zlib botan libidn lua pcre sqlite expect
+ buildInputs = [ boost zlib botan libidn lua pcre sqlite expect
openssl gmp bzip2 ];
postInstall = ''
@@ -33,9 +33,10 @@ stdenv.mkDerivation rec {
#doCheck = true; # some tests fail (and they take VERY long)
- meta = {
+ meta = with stdenv.lib; {
description = "A free distributed version control system";
- maintainers = [stdenv.lib.maintainers.raskin];
- platforms = stdenv.lib.platforms.unix;
+ maintainers = [ maintainers.raskin ];
+ platforms = platforms.unix;
+ license = licenses.gpl2;
};
}
diff --git a/pkgs/applications/version-management/tortoisehg/default.nix b/pkgs/applications/version-management/tortoisehg/default.nix
index 5a37857fa47..71369709b5d 100644
--- a/pkgs/applications/version-management/tortoisehg/default.nix
+++ b/pkgs/applications/version-management/tortoisehg/default.nix
@@ -2,11 +2,11 @@
python2Packages.buildPythonApplication rec {
name = "tortoisehg-${version}";
- version = "4.6.1";
+ version = "4.7";
src = fetchurl {
url = "https://bitbucket.org/tortoisehg/targz/downloads/${name}.tar.gz";
- sha256 = "1argpi5h0fv4ilahi52c98xgvsvz27lvqi41hzw1f81mhjgyhqik";
+ sha256 = "1s99dmz8izsyj5mpnqlx9dasw8ar2lr68r3m1wyafzbqlqmbjbqm";
};
pythonPath = with python2Packages; [ pyqt4 mercurial qscintilla iniparse ];
diff --git a/pkgs/applications/version-management/vcprompt/default.nix b/pkgs/applications/version-management/vcprompt/default.nix
index 4afb1b20e32..c2bf0a4183c 100644
--- a/pkgs/applications/version-management/vcprompt/default.nix
+++ b/pkgs/applications/version-management/vcprompt/default.nix
@@ -25,5 +25,6 @@ stdenv.mkDerivation rec {
homepage = http://hg.gerg.ca/vcprompt;
maintainers = with maintainers; [ cstrahan ];
platforms = with platforms; linux ++ darwin;
+ license = licenses.gpl2Plus;
};
}
diff --git a/pkgs/applications/video/kodi/commons.nix b/pkgs/applications/video/kodi/commons.nix
deleted file mode 100644
index eff9b787106..00000000000
--- a/pkgs/applications/video/kodi/commons.nix
+++ /dev/null
@@ -1,83 +0,0 @@
-{ stdenv, fetchFromGitHub
-, cmake, kodiPlain, libcec_platform, tinyxml }:
-
-rec {
-
- pluginDir = "/share/kodi/addons";
-
- kodi-platform = stdenv.mkDerivation rec {
- project = "kodi-platform";
- version = "17.1";
- name = "${project}-${version}";
-
- src = fetchFromGitHub {
- owner = "xbmc";
- repo = project;
- rev = "c8188d82678fec6b784597db69a68e74ff4986b5";
- sha256 = "1r3gs3c6zczmm66qcxh9mr306clwb3p7ykzb70r3jv5jqggiz199";
- };
-
- buildInputs = [ cmake kodiPlain libcec_platform tinyxml ];
-
- };
-
- mkKodiAPIPlugin = { plugin, namespace, version, src, meta, sourceDir ? null, ... }:
- stdenv.lib.makeOverridable stdenv.mkDerivation rec {
-
- inherit src meta sourceDir;
-
- name = "kodi-plugin-${plugin}-${version}";
-
- passthru = {
- kodiPlugin = pluginDir;
- namespace = namespace;
- };
-
- dontStrip = true;
-
- installPhase = ''
- ${if isNull sourceDir then "" else "cd $src/$sourceDir"}
- d=$out${pluginDir}/${namespace}
- mkdir -p $d
- sauce="."
- [ -d ${namespace} ] && sauce=${namespace}
- cp -R "$sauce/"* $d
- '';
-
- };
-
- mkKodiPlugin = mkKodiAPIPlugin;
-
- mkKodiABIPlugin = { plugin, namespace, version, src, meta
- , extraBuildInputs ? [], sourceDir ? null, ... }:
- stdenv.lib.makeOverridable stdenv.mkDerivation rec {
-
- inherit src meta sourceDir;
-
- name = "kodi-plugin-${plugin}-${version}";
-
- passthru = {
- kodiPlugin = pluginDir;
- namespace = namespace;
- };
-
- dontStrip = true;
-
- buildInputs = [ cmake kodiPlain kodi-platform libcec_platform ]
- ++ extraBuildInputs;
-
- # disables check ensuring install prefix is that of kodi
- cmakeFlags = [
- "-DOVERRIDE_PATHS=1"
- ];
-
- # kodi checks for plugin .so libs existance in the addon folder (share/...)
- # and the non-wrapped kodi lib/... folder before even trying to dlopen
- # them. Symlinking .so, as setting LD_LIBRARY_PATH is of no use
- installPhase = let n = namespace; in ''
- make install
- ln -s $out/lib/addons/${n}/${n}.so.${version} $out/${pluginDir}/${n}/${n}.so.${version}
- '';
-
- };
-}
diff --git a/pkgs/applications/video/kodi/default.nix b/pkgs/applications/video/kodi/default.nix
index 454665455c5..9272d3c8e26 100644
--- a/pkgs/applications/video/kodi/default.nix
+++ b/pkgs/applications/video/kodi/default.nix
@@ -1,5 +1,5 @@
{ stdenv, lib, fetchFromGitHub, autoconf, automake, libtool, makeWrapper
-, pkgconfig, cmake, gnumake, yasm, python2
+, pkgconfig, cmake, gnumake, yasm, python2Packages
, libgcrypt, libgpgerror, libunistring
, boost, avahi, lame, autoreconfHook
, gettext, pcre-cpp, yajl, fribidi, which
@@ -119,7 +119,7 @@ in stdenv.mkDerivation rec {
buildInputs = [
gnutls libidn libtasn1 nasm p11-kit
- libxml2 yasm python2
+ libxml2 yasm python2Packages.python
boost libmicrohttpd
gettext pcre-cpp yajl fribidi libva libdrm
openssl gperf tinyxml2 taglib libssh swig jre
@@ -187,7 +187,7 @@ in stdenv.mkDerivation rec {
postInstall = ''
for p in $(ls $out/bin/) ; do
wrapProgram $out/bin/$p \
- --prefix PATH ":" "${lib.makeBinPath [ python2 glxinfo xdpyinfo ]}" \
+ --prefix PATH ":" "${lib.makeBinPath [ python2Packages.python glxinfo xdpyinfo ]}" \
--prefix LD_LIBRARY_PATH ":" "${lib.makeLibraryPath
([ curl systemd libmad libvdpau libcec libcec_platform rtmpdump libass ] ++ lib.optional nfsSupport libnfs)}"
done
@@ -200,6 +200,10 @@ in stdenv.mkDerivation rec {
installCheckPhase = "$out/bin/kodi --version";
+ passthru = {
+ pythonPackages = python2Packages;
+ };
+
meta = with stdenv.lib; {
description = "Media center";
homepage = https://kodi.tv/;
diff --git a/pkgs/applications/video/kodi/plugins.nix b/pkgs/applications/video/kodi/plugins.nix
index 5a0583202e6..f2ceacdd799 100644
--- a/pkgs/applications/video/kodi/plugins.nix
+++ b/pkgs/applications/video/kodi/plugins.nix
@@ -1,9 +1,90 @@
{ stdenv, callPackage, fetchurl, fetchFromGitHub, unzip
+, cmake, kodiPlain, libcec_platform, tinyxml
, steam, libusb, pcre-cpp, jsoncpp, libhdhomerun, zlib }:
-with (callPackage ./commons.nix {});
+with stdenv.lib;
-rec {
+let self = rec {
+
+ pluginDir = "/share/kodi/addons";
+
+ kodi = kodiPlain;
+
+ # Convert derivation to a kodi module. Stolen from ../../../top-level/python-packages.nix
+ toKodiPlugin = drv: drv.overrideAttrs(oldAttrs: {
+ # Use passthru in order to prevent rebuilds when possible.
+ passthru = (oldAttrs.passthru or {})// {
+ kodiPluginFor = kodi;
+ requiredKodiPlugins = requiredKodiPlugins drv.propagatedBuildInputs;
+ };
+ });
+
+ # Check whether a derivation provides a Kodi plugin.
+ hasKodiPlugin = drv: drv ? kodiPluginFor && drv.kodiPluginFor == kodi;
+
+ # Get list of required Kodi plugins given a list of derivations.
+ requiredKodiPlugins = drvs: let
+ modules = filter hasKodiPlugin drvs;
+ in unique (modules ++ concatLists (catAttrs "requiredKodiPlugins" modules));
+
+ kodiWithPlugins = func: callPackage ./wrapper.nix {
+ inherit kodi;
+ plugins = requiredKodiPlugins (func self);
+ };
+
+ kodi-platform = stdenv.mkDerivation rec {
+ project = "kodi-platform";
+ version = "17.1";
+ name = "${project}-${version}";
+
+ src = fetchFromGitHub {
+ owner = "xbmc";
+ repo = project;
+ rev = "c8188d82678fec6b784597db69a68e74ff4986b5";
+ sha256 = "1r3gs3c6zczmm66qcxh9mr306clwb3p7ykzb70r3jv5jqggiz199";
+ };
+
+ buildInputs = [ cmake kodiPlain libcec_platform tinyxml ];
+ };
+
+ mkKodiPlugin = { plugin, namespace, version, sourceDir ? null, ... }@args:
+ toKodiPlugin (stdenv.mkDerivation (rec {
+ name = "kodi-plugin-${plugin}-${version}";
+
+ dontStrip = true;
+
+ installPhase = ''
+ ${if isNull sourceDir then "" else "cd $src/$sourceDir"}
+ d=$out${pluginDir}/${namespace}
+ mkdir -p $d
+ sauce="."
+ [ -d ${namespace} ] && sauce=${namespace}
+ cp -R "$sauce/"* $d
+ '';
+ } // args));
+
+ mkKodiABIPlugin = { plugin, namespace, version, extraBuildInputs ? [], ... }@args:
+ toKodiPlugin (stdenv.mkDerivation (rec {
+ name = "kodi-plugin-${plugin}-${version}";
+
+ dontStrip = true;
+
+ buildInputs = [ cmake kodiPlain kodi-platform libcec_platform ]
+ ++ extraBuildInputs;
+
+ # disables check ensuring install prefix is that of kodi
+ cmakeFlags = [
+ "-DOVERRIDE_PATHS=1"
+ ];
+
+ # kodi checks for plugin .so libs existance in the addon folder (share/...)
+ # and the non-wrapped kodi lib/... folder before even trying to dlopen
+ # them. Symlinking .so, as setting LD_LIBRARY_PATH is of no use
+ installPhase = let n = namespace; in ''
+ make install
+ ln -s $out/lib/addons/${n}/${n}.so.${version} $out${pluginDir}/${n}/${n}.so.${version}
+ '';
+ } // args));
advanced-launcher = mkKodiPlugin rec {
@@ -18,7 +99,7 @@ rec {
sha256 = "142vvgs37asq5m54xqhjzqvgmb0xlirvm0kz6lxaqynp0vvgrkx2";
};
- meta = with stdenv.lib; {
+ meta = {
homepage = https://forum.kodi.tv/showthread.php?tid=85724;
description = "A program launcher for Kodi";
longDescription = ''
@@ -48,7 +129,7 @@ rec {
sha256 = "1sv9z77jj6bam6llcnd9b3dgkbvhwad2m1v541rv3acrackms2z2";
};
- meta = with stdenv.lib; {
+ meta = {
homepage = https://forum.kodi.tv/showthread.php?tid=287826;
description = "A program launcher for Kodi";
longDescription = ''
@@ -75,7 +156,7 @@ rec {
sha256 = "0sbc0w0fwbp7rbmbgb6a1kglhnn5g85hijcbbvf5x6jdq9v3f1qb";
};
- meta = with stdenv.lib; {
+ meta = {
description = "Add support for different gaming controllers.";
platforms = platforms.all;
maintainers = with maintainers; [ edwtjo ];
@@ -99,7 +180,7 @@ rec {
// (mkController "ps")
// (mkController "snes");
- exodus = (mkKodiPlugin rec {
+ exodus = mkKodiPlugin rec {
plugin = "exodus";
namespace = "plugin.video.exodus";
@@ -110,13 +191,14 @@ rec {
sha256 = "1zyay7cinljxmpzngzlrr4pnk2a7z9wwfdcsk6a4p416iglyggdj";
};
- meta = with stdenv.lib; {
+ buildInputs = [ unzip ];
+
+ meta = {
description = "A streaming plugin for Kodi";
platforms = platforms.all;
maintainers = with maintainers; [ edwtjo ];
};
-
- }).override { buildInputs = [ unzip ]; };
+ };
hyper-launcher = let
pname = "hyper-launcher";
@@ -128,7 +210,7 @@ rec {
rev = "f958ba93fe85b9c9025b1745d89c2db2e7dd9bf6";
sha256 = "1dvff24fbas25k5kvca4ssks9l1g5rfa3hl8lqxczkaqi3pp41j5";
};
- meta = with stdenv.lib; {
+ meta = {
homepage = https://forum.kodi.tv/showthread.php?tid=258159;
description = "A ROM launcher for Kodi that uses HyperSpin assets.";
maintainers = with maintainers; [ edwtjo ];
@@ -159,7 +241,7 @@ rec {
sha256 = "18m61v8z9fbh4imvzhh4g9629r9df49g2yk9ycaczirg131dhfbh";
};
- meta = with stdenv.lib; {
+ meta = {
description = "Binary addon for raw joystick input.";
platforms = platforms.all;
maintainers = with maintainers; [ edwtjo ];
@@ -183,7 +265,7 @@ rec {
sha256 = "0klk1jpjc243ak306k94mag4b4s17w68v69yb8lzzydszqkaqa7x";
};
- meta = with stdenv.lib; {
+ meta = {
homepage = https://forum.kodi.tv/showthread.php?tid=67110;
description = "Watch content from SVT Play";
longDescription = ''
@@ -212,7 +294,7 @@ rec {
extraBuildInputs = [ libusb ];
- meta = with stdenv.lib; {
+ meta = {
description = "Binary addon for steam controller.";
platforms = platforms.all;
maintainers = with maintainers; [ edwtjo ];
@@ -220,7 +302,7 @@ rec {
};
- steam-launcher = (mkKodiPlugin rec {
+ steam-launcher = mkKodiPlugin rec {
plugin = "steam-launcher";
namespace = "script.steam.launcher";
@@ -233,7 +315,9 @@ rec {
sha256 = "001a7zs3a4jfzj8ylxv2klc33mipmqsd5aqax7q81fbgwdlndvbm";
};
- meta = with stdenv.lib; {
+ propagatedBuildInputs = [ steam ];
+
+ meta = {
homepage = https://forum.kodi.tv/showthread.php?tid=157499;
description = "Launch Steam in Big Picture Mode from Kodi";
longDescription = ''
@@ -245,8 +329,6 @@ rec {
'';
maintainers = with maintainers; [ edwtjo ];
};
- }).override {
- propagatedBuildinputs = [ steam ];
};
pdfreader = mkKodiPlugin rec {
@@ -262,7 +344,7 @@ rec {
sha256 = "1iv7d030z3xvlflvp4p5v3riqnwg9g0yvzxszy63v1a6x5kpjkqa";
};
- meta = with stdenv.lib; {
+ meta = {
homepage = https://forum.kodi.tv/showthread.php?tid=187421;
description = "A comic book reader";
maintainers = with maintainers; [ edwtjo ];
@@ -282,7 +364,7 @@ rec {
sha256 = "0pmlgqr4kd0gvckz77mj6v42kcx6lb23anm8jnf2fbn877snnijx";
};
- meta = with stdenv.lib; {
+ meta = {
homepage = https://github.com/kodi-pvr/pvr.hts;
description = "Kodi's Tvheadend HTSP client addon";
platforms = platforms.all;
@@ -304,7 +386,7 @@ rec {
sha256 = "0dvdv0vk2q12nj0i5h51iaypy3i7jfsxjyxwwpxfy82y8260ragy";
};
- meta = with stdenv.lib; {
+ meta = {
homepage = https://github.com/kodi-pvr/pvr.hdhomerun;
description = "Kodi's HDHomeRun PVR client addon";
platforms = platforms.all;
@@ -328,7 +410,7 @@ rec {
sha256 = "1f1im2gachrxnr3z96h5cg2c13vapgkvkdwvrbl4hxlnyp1a6jyz";
};
- meta = with stdenv.lib; {
+ meta = {
homepage = https://github.com/kodi-pvr/pvr.iptvsimple;
description = "Kodi's IPTV Simple client addon";
platforms = platforms.all;
@@ -352,7 +434,7 @@ rec {
sha256 = "1b3fm02annsq58pcfc985glrmh21rmqksdj3q8wn6gyza06jdf3v";
};
- meta = with stdenv.lib; {
+ meta = {
homepage = https://github.com/osmc/skin.osmc;
description = "The default skin for OSMC";
platforms = platforms.all;
@@ -360,4 +442,5 @@ rec {
license = licenses.cc-by-nc-sa-30;
};
};
-}
+
+}; in self
diff --git a/pkgs/applications/video/kodi/wrapper.nix b/pkgs/applications/video/kodi/wrapper.nix
index e6d3fbb090f..d0dc9274a10 100644
--- a/pkgs/applications/video/kodi/wrapper.nix
+++ b/pkgs/applications/video/kodi/wrapper.nix
@@ -1,54 +1,25 @@
-{ stdenv, lib, makeWrapper, kodi, plugins }:
+{ stdenv, lib, makeWrapper, buildEnv, kodi, plugins }:
-let
+buildEnv {
+ name = "kodi-with-plugins-${(builtins.parseDrvName kodi.name).version}";
- p = builtins.parseDrvName kodi.name;
-
-in
-
-stdenv.mkDerivation {
-
- name = "kodi-" + p.version;
- version = p.version;
+ paths = [ kodi ] ++ plugins;
+ pathsToLink = [ "/share" ];
buildInputs = [ makeWrapper ];
- buildCommand = ''
- mkdir -p $out/share/kodi/addons
- ${stdenv.lib.concatMapStrings
- (plugin: "ln -s ${plugin.out
- + plugin.kodiPlugin
- + "/" + plugin.namespace
- } $out/share/kodi/addons/.;") plugins}
- $(for plugin in ${kodi}/share/kodi/addons/*
+ postBuild = ''
+ mkdir $out/bin
+ for exe in kodi{,-standalone}
do
- $(ln -s $plugin/ $out/share/kodi/addons/.)
- done)
- $(for share in ${kodi}/share/kodi/*
- do
- $(ln -s $share $out/share/kodi/.)
- done)
- $(for passthrough in icons xsessions applications
- do
- ln -s ${kodi}/share/$passthrough $out/share/
- done)
- $(for exe in kodi{,-standalone}
- do
- makeWrapper ${kodi}/bin/$exe $out/bin/$exe \
- --prefix KODI_HOME : $out/share/kodi;
- done)
+ makeWrapper ${kodi}/bin/$exe $out/bin/$exe \
+ --prefix PYTHONPATH : ${kodi.pythonPackages.makePythonPath plugins} \
+ --prefix KODI_HOME : $out/share/kodi
+ done
'';
- preferLocalBuild = true;
-
- meta = with kodi.meta; {
- inherit license homepage;
- description = description
- + " (with plugins: "
- + lib.concatStrings (lib.intersperse ", " (map (x: ""+x.name) plugins))
- + ")";
-
- platforms = stdenv.lib.platforms.linux;
+ meta = kodi.meta // {
+ description = kodi.meta.description
+ + " (with plugins: ${lib.concatMapStringsSep ", " (x: x.name) plugins})";
};
-
}
diff --git a/pkgs/applications/video/tivodecode/default.nix b/pkgs/applications/video/tivodecode/default.nix
index b158bc92460..83ca41e201c 100644
--- a/pkgs/applications/video/tivodecode/default.nix
+++ b/pkgs/applications/video/tivodecode/default.nix
@@ -13,9 +13,10 @@ stdenv.mkDerivation {
sha256 = "1pww5r2iygscqn20a1cz9xbfh18p84a6a5ifg4h5nvyn9b63k23q";
};
- meta = {
+ meta = with stdenv.lib; {
description = "Converts a .TiVo file (produced by TiVoToGo) to a normal MPEG file";
homepage = http://tivodecode.sourceforge.net;
- platforms = stdenv.lib.platforms.unix;
+ platforms = platforms.unix;
+ license = licenses.bsd3;
};
}
diff --git a/pkgs/applications/video/xine-ui/default.nix b/pkgs/applications/video/xine-ui/default.nix
index 69fc68a69de..4dfc3fd052a 100644
--- a/pkgs/applications/video/xine-ui/default.nix
+++ b/pkgs/applications/video/xine-ui/default.nix
@@ -3,12 +3,12 @@
stdenv.mkDerivation rec {
name = "xine-ui-0.99.10";
-
+
src = fetchurl {
url = "mirror://sourceforge/xine/${name}.tar.xz";
sha256 = "0i3jzhiipfs5p1jbxviwh42zcfzag6iqc6yycaan0vrqm90an86a";
};
-
+
nativeBuildInputs = [ pkgconfig shared-mime-info ];
buildInputs =
@@ -20,14 +20,15 @@ stdenv.mkDerivation rec {
patchPhase = ''sed -e '/curl\/types\.h/d' -i src/xitk/download.c'';
configureFlags = [ "--with-readline=${readline.dev}" ];
-
+
LIRC_CFLAGS="-I${lirc}/include";
LIRC_LIBS="-L ${lirc}/lib -llirc_client";
#NIX_LDFLAGS = "-lXext -lgcc_s";
- meta = {
+ meta = with stdenv.lib; {
homepage = http://www.xine-project.org/;
description = "Xlib-based interface to Xine, a video player";
- platforms = stdenv.lib.platforms.linux;
+ platforms = platforms.linux;
+ license = licenses.gpl2;
};
}
diff --git a/pkgs/applications/virtualization/qemu/default.nix b/pkgs/applications/virtualization/qemu/default.nix
index bbb2a099666..596bc9dd9e0 100644
--- a/pkgs/applications/virtualization/qemu/default.nix
+++ b/pkgs/applications/virtualization/qemu/default.nix
@@ -84,10 +84,7 @@ stdenv.mkDerivation rec {
url = https://raw.githubusercontent.com/alpinelinux/aports/2bb133986e8fa90e2e76d53369f03861a87a74ef/main/qemu/musl-F_SHLCK-and-F_EXLCK.patch;
sha256 = "1gm67v41gw6apzgz7jr3zv9z80wvkv0jaxd2w4d16hmipa8bhs0k";
})
- (fetchpatch {
- url = https://raw.githubusercontent.com/alpinelinux/aports/61a7a1b77a868e3b940c0b25e6c2b2a6c32caf20/main/qemu/0006-linux-user-signal.c-define-__SIGRTMIN-MAX-for-non-GN.patch;
- sha256 = "1ar6r1vpmhnbs72v6mhgyahcjcf7b9b4xi7asx17sy68m171d2g6";
- })
+ ./sigrtminmax.patch
(fetchpatch {
url = https://raw.githubusercontent.com/alpinelinux/aports/2bb133986e8fa90e2e76d53369f03861a87a74ef/main/qemu/fix-sigevent-and-sigval_t.patch;
sha256 = "0wk0rrcqywhrw9hygy6ap0lfg314m9z1wr2hn8338r5gfcw75mav";
diff --git a/pkgs/applications/virtualization/qemu/sigrtminmax.patch b/pkgs/applications/virtualization/qemu/sigrtminmax.patch
new file mode 100644
index 00000000000..41050447ac6
--- /dev/null
+++ b/pkgs/applications/virtualization/qemu/sigrtminmax.patch
@@ -0,0 +1,30 @@
+From 2697fcc42546e814a2d2617671cb8398b15256fb Mon Sep 17 00:00:00 2001
+From: Will Dietz
+Date: Fri, 17 Aug 2018 00:22:35 -0500
+Subject: [PATCH] quick port __SIGRTMIN/__SIGRTMAX patch for qemu 3.0
+
+---
+ linux-user/signal.c | 7 +++++++
+ 1 file changed, 7 insertions(+)
+
+diff --git a/linux-user/signal.c b/linux-user/signal.c
+index 602b631b92..87f9240134 100644
+--- a/linux-user/signal.c
++++ b/linux-user/signal.c
+@@ -26,6 +26,13 @@
+ #include "trace.h"
+ #include "signal-common.h"
+
++#ifndef __SIGRTMIN
++#define __SIGRTMIN 32
++#endif
++#ifndef __SIGRTMAX
++#define __SIGRTMAX (NSIG-1)
++#endif
++
+ struct target_sigaltstack target_sigaltstack_used = {
+ .ss_sp = 0,
+ .ss_size = 0,
+--
+2.18.0
+
diff --git a/pkgs/applications/window-managers/fbpanel/default.nix b/pkgs/applications/window-managers/fbpanel/default.nix
index b521240b48f..0c13691a36a 100644
--- a/pkgs/applications/window-managers/fbpanel/default.nix
+++ b/pkgs/applications/window-managers/fbpanel/default.nix
@@ -20,6 +20,7 @@ stdenv.mkDerivation rec {
description = "A stand-alone panel";
maintainers = with maintainers; [ raskin ];
platforms = platforms.linux;
+ license = licenses.mit;
};
passthru = {
diff --git a/pkgs/applications/window-managers/xmonad/log-applet/default.nix b/pkgs/applications/window-managers/xmonad/log-applet/default.nix
index 96f742df310..57f00887103 100644
--- a/pkgs/applications/window-managers/xmonad/log-applet/default.nix
+++ b/pkgs/applications/window-managers/xmonad/log-applet/default.nix
@@ -1,5 +1,5 @@
{ stdenv, fetchFromGitHub, pkgconfig, autoreconfHook, glib, dbus-glib
-, desktopSupport, xlibs
+, desktopSupport, xorg
, gtk2
, gtk3, gnome3, mate
, libxfce4util, xfce4-panel
@@ -19,7 +19,7 @@ stdenv.mkDerivation rec {
sha256 = "042307grf4zvn61gnflhsj5xsjykrk9sjjsprprm4iij0qpybxcw";
};
- buildInputs = [ glib dbus-glib xlibs.xcbutilwm ]
+ buildInputs = [ glib dbus-glib xorg.xcbutilwm ]
++ stdenv.lib.optionals (desktopSupport == "gnomeflashback") [ gtk3 gnome3.gnome-panel ]
++ stdenv.lib.optionals (desktopSupport == "mate") [ gtk3 mate.mate-panel ]
++ stdenv.lib.optionals (desktopSupport == "xfce4") [ gtk2 libxfce4util xfce4-panel ]
diff --git a/pkgs/build-support/rust/build-rust-crate.nix b/pkgs/build-support/rust/build-rust-crate.nix
deleted file mode 100644
index 6605aa27b21..00000000000
--- a/pkgs/build-support/rust/build-rust-crate.nix
+++ /dev/null
@@ -1,461 +0,0 @@
-# Code for buildRustCrate, a Nix function that builds Rust code, just
-# like Cargo, but using Nix instead.
-#
-# This can be useful for deploying packages with NixOps, and to share
-# binary dependencies between projects.
-
-{ lib, stdenv, defaultCrateOverrides, fetchCrate, ncurses, rustc }:
-
-let makeDeps = dependencies:
- (lib.concatMapStringsSep " " (dep:
- let extern = lib.strings.replaceStrings ["-"] ["_"] dep.libName; in
- (if dep.crateType == "lib" then
- " --extern ${extern}=${dep.out}/lib/lib${extern}-${dep.metadata}.rlib"
- else
- " --extern ${extern}=${dep.out}/lib/lib${extern}-${dep.metadata}${stdenv.hostPlatform.extensions.sharedLibrary}")
- ) dependencies);
-
- # This doesn't appear to be officially documented anywhere yet.
- # See https://github.com/rust-lang-nursery/rust-forge/issues/101.
- target_os = if stdenv.hostPlatform.isDarwin
- then "macos"
- else stdenv.hostPlatform.parsed.kernel.name;
-
- echo_build_heading = colors: ''
- echo_build_heading() {
- start=""
- end=""
- if [[ "${colors}" == "always" ]]; then
- start="$(printf '\033[0;1;32m')" #set bold, and set green.
- end="$(printf '\033[0m')" #returns to "normal"
- fi
- if (( $# == 1 )); then
- echo "$start""Building $1""$end"
- else
- echo "$start""Building $1 ($2)""$end"
- fi
- }
- '';
- noisily = colors: verbose: ''
- noisily() {
- start=""
- end=""
- if [[ "${colors}" == "always" ]]; then
- start="$(printf '\033[0;1;32m')" #set bold, and set green.
- end="$(printf '\033[0m')" #returns to "normal"
- fi
- ${lib.optionalString verbose ''
- echo -n "$start"Running "$end"
- echo $@
- ''}
- $@
- }
- '';
-
- configureCrate =
- { crateName, crateVersion, crateAuthors, build, libName, crateFeatures, colors, libPath, release, buildDependencies, completeDeps, completeBuildDeps, verbose, workspace_member, extraLinkFlags }:
- let version_ = lib.splitString "-" crateVersion;
- versionPre = if lib.tail version_ == [] then "" else builtins.elemAt version_ 1;
- version = lib.splitString "." (lib.head version_);
- rustcOpts = (if release then "-C opt-level=3" else "-C debuginfo=2");
- buildDeps = makeDeps buildDependencies;
- authors = lib.concatStringsSep ":" crateAuthors;
- optLevel = if release then 3 else 0;
- completeDepsDir = lib.concatStringsSep " " completeDeps;
- completeBuildDepsDir = lib.concatStringsSep " " completeBuildDeps;
- in ''
- cd ${workspace_member}
- runHook preConfigure
- ${echo_build_heading colors}
- ${noisily colors verbose}
- symlink_dependency() {
- # $1 is the nix-store path of a dependency
- # $2 is the target path
- i=$1
- ln -s -f $i/lib/*.rlib $2 #*/
- ln -s -f $i/lib/*.so $i/lib/*.dylib $2 #*/
- if [ -e "$i/lib/link" ]; then
- cat $i/lib/link >> target/link
- cat $i/lib/link >> target/link.final
- fi
- if [ -e $i/env ]; then
- source $i/env
- fi
- }
-
- mkdir -p target/{deps,lib,build,buildDeps}
- chmod uga+w target -R
- echo ${extraLinkFlags} > target/link
- echo ${extraLinkFlags} > target/link.final
- for i in ${completeDepsDir}; do
- symlink_dependency $i target/deps
- done
- for i in ${completeBuildDepsDir}; do
- symlink_dependency $i target/buildDeps
- done
- if [[ -e target/link ]]; then
- sort -u target/link > target/link.sorted
- mv target/link.sorted target/link
- sort -u target/link.final > target/link.final.sorted
- mv target/link.final.sorted target/link.final
- tr '\n' ' ' < target/link > target/link_
- fi
- EXTRA_BUILD=""
- BUILD_OUT_DIR=""
- export CARGO_PKG_NAME=${crateName}
- export CARGO_PKG_VERSION=${crateVersion}
- export CARGO_PKG_AUTHORS="${authors}"
-
- export CARGO_CFG_TARGET_ARCH=${stdenv.hostPlatform.parsed.cpu.name}
- export CARGO_CFG_TARGET_OS=${target_os}
- export CARGO_CFG_TARGET_FAMILY="unix"
- export CARGO_CFG_UNIX=1
- export CARGO_CFG_TARGET_ENV="gnu"
- export CARGO_CFG_TARGET_ENDIAN=${if stdenv.hostPlatform.parsed.cpu.significantByte.name == "littleEndian" then "little" else "big"}
- export CARGO_CFG_TARGET_POINTER_WIDTH=${toString stdenv.hostPlatform.parsed.cpu.bits}
- export CARGO_CFG_TARGET_VENDOR=${stdenv.hostPlatform.parsed.vendor.name}
-
- export CARGO_MANIFEST_DIR="."
- export DEBUG="${toString (!release)}"
- export OPT_LEVEL="${toString optLevel}"
- export TARGET="${stdenv.hostPlatform.config}"
- export HOST="${stdenv.hostPlatform.config}"
- export PROFILE=${if release then "release" else "debug"}
- export OUT_DIR=$(pwd)/target/build/${crateName}.out
- export CARGO_PKG_VERSION_MAJOR=${builtins.elemAt version 0}
- export CARGO_PKG_VERSION_MINOR=${builtins.elemAt version 1}
- export CARGO_PKG_VERSION_PATCH=${builtins.elemAt version 2}
- if [[ -n "${versionPre}" ]]; then
- export CARGO_PKG_VERSION_PRE="${versionPre}"
- fi
-
- BUILD=""
- if [[ ! -z "${build}" ]] ; then
- BUILD=${build}
- elif [[ -e "build.rs" ]]; then
- BUILD="build.rs"
- fi
- if [[ ! -z "$BUILD" ]] ; then
- echo_build_heading "$BUILD" ${libName}
- mkdir -p target/build/${crateName}
- EXTRA_BUILD_FLAGS=""
- if [ -e target/link_ ]; then
- EXTRA_BUILD_FLAGS=$(cat target/link_)
- fi
- if [ -e target/link.build ]; then
- EXTRA_BUILD_FLAGS="$EXTRA_BUILD_FLAGS $(cat target/link.build)"
- fi
- noisily rustc --crate-name build_script_build $BUILD --crate-type bin ${rustcOpts} \
- ${crateFeatures} --out-dir target/build/${crateName} --emit=dep-info,link \
- -L dependency=target/buildDeps ${buildDeps} --cap-lints allow $EXTRA_BUILD_FLAGS --color ${colors}
-
- mkdir -p target/build/${crateName}.out
- export RUST_BACKTRACE=1
- BUILD_OUT_DIR="-L $OUT_DIR"
- mkdir -p $OUT_DIR
- target/build/${crateName}/build_script_build > target/build/${crateName}.opt
- set +e
- EXTRA_BUILD=$(sed -n "s/^cargo:rustc-flags=\(.*\)/\1/p" target/build/${crateName}.opt | tr '\n' ' ' | sort -u)
- EXTRA_FEATURES=$(sed -n "s/^cargo:rustc-cfg=\(.*\)/--cfg \1/p" target/build/${crateName}.opt | tr '\n' ' ')
- EXTRA_LINK=$(sed -n "s/^cargo:rustc-link-lib=\(.*\)/\1/p" target/build/${crateName}.opt | tr '\n' ' ' | sort -u)
- EXTRA_LINK_SEARCH=$(sed -n "s/^cargo:rustc-link-search=\(.*\)/\1/p" target/build/${crateName}.opt | tr '\n' ' ' | sort -u)
-
- for env in $(sed -n "s/^cargo:rustc-env=\(.*\)/\1/p" target/build/${crateName}.opt); do
- export $env
- done
-
- CRATENAME=$(echo ${crateName} | sed -e "s/\(.*\)-sys$/\U\1/")
- grep -P "^cargo:(?!(rustc-|warning=|rerun-if-changed=|rerun-if-env-changed))" target/build/${crateName}.opt \
- | sed -e "s/cargo:\([^=]*\)=\(.*\)/export DEP_$(echo $CRATENAME)_\U\1\E=\2/" > target/env
-
- set -e
- if [[ -n "$(ls target/build/${crateName}.out)" ]]; then
-
- if [[ -e "${libPath}" ]]; then
- cp -r target/build/${crateName}.out/* $(dirname ${libPath}) #*/
- else
- cp -r target/build/${crateName}.out/* src #*/
- fi
- fi
- fi
- runHook postConfigure
- '';
-
- buildCrate = { crateName,
- dependencies,
- crateFeatures, libName, release, libPath,
- crateType, metadata, crateBin, finalBins,
- extraRustcOpts, verbose, colors }:
-
- let deps = makeDeps dependencies;
- rustcOpts =
- lib.lists.foldl' (opts: opt: opts + " " + opt)
- (if release then "-C opt-level=3" else "-C debuginfo=2")
- (["-C codegen-units=1"] ++ extraRustcOpts);
- rustcMeta = "-C metadata=${metadata} -C extra-filename=-${metadata}";
- in ''
- runHook preBuild
- norm=""
- bold=""
- green=""
- boldgreen=""
- if [[ "${colors}" == "always" ]]; then
- norm="$(printf '\033[0m')" #returns to "normal"
- bold="$(printf '\033[0;1m')" #set bold
- green="$(printf '\033[0;32m')" #set green
- boldgreen="$(printf '\033[0;1;32m')" #set bold, and set green.
- fi
- ${echo_build_heading colors}
- ${noisily colors verbose}
-
- build_lib() {
- lib_src=$1
- echo_build_heading $lib_src ${libName}
-
- noisily rustc --crate-name $CRATE_NAME $lib_src --crate-type ${crateType} \
- ${rustcOpts} ${rustcMeta} ${crateFeatures} --out-dir target/lib \
- --emit=dep-info,link -L dependency=target/deps ${deps} --cap-lints allow \
- $BUILD_OUT_DIR $EXTRA_BUILD $EXTRA_FEATURES --color ${colors}
-
- EXTRA_LIB=" --extern $CRATE_NAME=target/lib/lib$CRATE_NAME-${metadata}.rlib"
- if [ -e target/deps/lib$CRATE_NAME-${metadata}${stdenv.hostPlatform.extensions.sharedLibrary} ]; then
- EXTRA_LIB="$EXTRA_LIB --extern $CRATE_NAME=target/lib/lib$CRATE_NAME-${metadata}${stdenv.hostPlatform.extensions.sharedLibrary}"
- fi
- }
-
- build_bin() {
- crate_name=$1
- crate_name_=$(echo $crate_name | sed -e "s/-/_/g")
- main_file=""
- if [[ ! -z $2 ]]; then
- main_file=$2
- fi
- echo_build_heading $@
- noisily rustc --crate-name $crate_name_ $main_file --crate-type bin ${rustcOpts}\
- ${crateFeatures} --out-dir target/bin --emit=dep-info,link -L dependency=target/deps \
- $LINK ${deps}$EXTRA_LIB --cap-lints allow \
- $BUILD_OUT_DIR $EXTRA_BUILD $EXTRA_FEATURES --color ${colors}
- if [ "$crate_name_" != "$crate_name" ]; then
- mv target/bin/$crate_name_ target/bin/$crate_name
- fi
- }
-
-
- EXTRA_LIB=""
- CRATE_NAME=$(echo ${libName} | sed -e "s/-/_/g")
-
- if [[ -e target/link_ ]]; then
- EXTRA_BUILD="$(cat target/link_) $EXTRA_BUILD"
- fi
-
- if [[ -e "${libPath}" ]]; then
- build_lib ${libPath}
- elif [[ -e src/lib.rs ]]; then
- build_lib src/lib.rs
- elif [[ -e src/${libName}.rs ]]; then
- build_lib src/${libName}.rs
- fi
-
- echo "$EXTRA_LINK_SEARCH" | while read i; do
- if [[ ! -z "$i" ]]; then
- for lib in $i; do
- echo "-L $lib" >> target/link
- L=$(echo $lib | sed -e "s#$(pwd)/target/build#$out/lib#")
- echo "-L $L" >> target/link.final
- done
- fi
- done
- echo "$EXTRA_LINK" | while read i; do
- if [[ ! -z "$i" ]]; then
- for lib in $i; do
- echo "-l $lib" >> target/link
- echo "-l $lib" >> target/link.final
- done
- fi
- done
-
- if [[ -e target/link ]]; then
- sort -u target/link.final > target/link.final.sorted
- mv target/link.final.sorted target/link.final
- sort -u target/link > target/link.sorted
- mv target/link.sorted target/link
-
- tr '\n' ' ' < target/link > target/link_
- LINK=$(cat target/link_)
- fi
-
- mkdir -p target/bin
- echo "${crateBin}" | sed -n 1'p' | tr ',' '\n' | while read BIN; do
- if [[ ! -z "$BIN" ]]; then
- build_bin $BIN
- fi
- done
- ${lib.optionalString (crateBin == "") ''
- if [[ -e src/main.rs ]]; then
- build_bin ${crateName} src/main.rs
- fi
- for i in src/bin/*.rs; do #*/
- build_bin "$(basename $i .rs)" "$i"
- done
- ''}
- # Remove object files to avoid "wrong ELF type"
- find target -type f -name "*.o" -print0 | xargs -0 rm -f
- '' + finalBins + ''
- runHook postBuild
- '';
-
- installCrate = crateName: metadata: ''
- runHook preInstall
- mkdir -p $out
- if [[ -s target/env ]]; then
- cp target/env $out/env
- fi
- if [[ -s target/link.final ]]; then
- mkdir -p $out/lib
- cp target/link.final $out/lib/link
- fi
- if [[ "$(ls -A target/lib)" ]]; then
- mkdir -p $out/lib
- cp target/lib/* $out/lib #*/
- for lib in $out/lib/*.so $out/lib/*.dylib; do #*/
- ln -s $lib $(echo $lib | sed -e "s/-${metadata}//")
- done
- fi
- if [[ "$(ls -A target/build)" ]]; then # */
- mkdir -p $out/lib
- cp -r target/build/* $out/lib # */
- fi
- if [[ "$(ls -A target/bin)" ]]; then
- mkdir -p $out/bin
- cp -P target/bin/* $out/bin # */
- fi
- runHook postInstall
- '';
-in
-
-crate_: lib.makeOverridable ({ rust, release, verbose, features, buildInputs, crateOverrides,
- dependencies, buildDependencies,
- extraRustcOpts,
- preUnpack, postUnpack, prePatch, patches, postPatch,
- preConfigure, postConfigure, preBuild, postBuild, preInstall, postInstall }:
-
-let crate = crate_ // (lib.attrByPath [ crate_.crateName ] (attr: {}) crateOverrides crate_);
- dependencies_ = dependencies;
- buildDependencies_ = buildDependencies;
- processedAttrs = [
- "src" "buildInputs" "crateBin" "crateLib" "libName" "libPath"
- "buildDependencies" "dependencies" "features"
- "crateName" "version" "build" "authors" "colors"
- ];
- extraDerivationAttrs = lib.filterAttrs (n: v: ! lib.elem n processedAttrs) crate;
- buildInputs_ = buildInputs;
-in
-stdenv.mkDerivation (rec {
-
- inherit (crate) crateName;
- inherit preUnpack postUnpack prePatch patches postPatch preConfigure postConfigure preBuild postBuild preInstall postInstall;
-
- src = if lib.hasAttr "src" crate then
- crate.src
- else
- fetchCrate { inherit (crate) crateName version sha256; };
- name = "rust_${crate.crateName}-${crate.version}";
- buildInputs = [ rust ncurses ] ++ (crate.buildInputs or []) ++ buildInputs_;
- dependencies =
- builtins.map
- (dep: dep.override { rust = rust; release = release; verbose = verbose; crateOverrides = crateOverrides; })
- dependencies_;
-
- buildDependencies =
- builtins.map
- (dep: dep.override { rust = rust; release = release; verbose = verbose; crateOverrides = crateOverrides; })
- buildDependencies_;
-
- completeDeps = lib.lists.unique (dependencies ++ lib.lists.concatMap (dep: dep.completeDeps) dependencies);
- completeBuildDeps = lib.lists.unique (
- buildDependencies
- ++ lib.lists.concatMap (dep: dep.completeBuildDeps ++ dep.completeDeps) buildDependencies
- );
-
- crateFeatures = if crate ? features then
- lib.concatMapStringsSep " " (f: "--cfg feature=\\\"${f}\\\"") (crate.features ++ features) #"
- else "";
-
- libName = if crate ? libName then crate.libName else crate.crateName;
- libPath = if crate ? libPath then crate.libPath else "";
-
- depsMetadata = builtins.foldl' (str: dep: str + dep.metadata) "" (dependencies ++ buildDependencies);
- metadata = builtins.substring 0 10 (builtins.hashString "sha256" (crateName + "-" + crateVersion + "___" + toString crateFeatures + "___" + depsMetadata ));
-
- crateBin = if crate ? crateBin then
- builtins.foldl' (bins: bin:
- let name =
- lib.strings.replaceStrings ["-"] ["_"]
- (if bin ? name then bin.name else crateName);
- path = if bin ? path then bin.path else "src/main.rs";
- in
- bins + (if bin == "" then "" else ",") + "${name} ${path}"
-
- ) "" crate.crateBin
- else "";
-
- finalBins = if crate ? crateBin then
- builtins.foldl' (bins: bin:
- let name = lib.strings.replaceStrings ["-"] ["_"]
- (if bin ? name then bin.name else crateName);
- new_name = if bin ? name then bin.name else crateName;
- in
- if name == new_name then bins else
- (bins + "mv target/bin/${name} target/bin/${new_name};")
-
- ) "" crate.crateBin
- else "";
-
- build = crate.build or "";
- workspace_member = crate.workspace_member or ".";
- crateVersion = crate.version;
- crateAuthors = if crate ? authors && lib.isList crate.authors then crate.authors else [];
- crateType =
- if lib.attrByPath ["procMacro"] false crate then "proc-macro" else
- if lib.attrByPath ["plugin"] false crate then "dylib" else
- (crate.type or "lib");
- colors = lib.attrByPath [ "colors" ] "always" crate;
- extraLinkFlags = builtins.concatStringsSep " " (crate.extraLinkFlags or []);
- configurePhase = configureCrate {
- inherit crateName buildDependencies completeDeps completeBuildDeps
- crateFeatures libName build workspace_member release libPath crateVersion
- extraLinkFlags
- crateAuthors verbose colors;
- };
- extraRustcOpts = if crate ? extraRustcOpts then crate.extraRustcOpts else [];
- buildPhase = buildCrate {
- inherit crateName dependencies
- crateFeatures libName release libPath crateType
- metadata crateBin finalBins verbose colors
- extraRustcOpts;
- };
- installPhase = installCrate crateName metadata;
-
-} // extraDerivationAttrs
-)) {
- rust = rustc;
- release = crate_.release or true;
- verbose = crate_.verbose or true;
- extraRustcOpts = [];
- features = [];
- buildInputs = [];
- crateOverrides = defaultCrateOverrides;
- preUnpack = crate_.preUnpack or "";
- postUnpack = crate_.postUnpack or "";
- prePatch = crate_.prePatch or "";
- patches = crate_.patches or [];
- postPatch = crate_.postPatch or "";
- preConfigure = crate_.preConfigure or "";
- postConfigure = crate_.postConfigure or "";
- preBuild = crate_.preBuild or "";
- postBuild = crate_.postBuild or "";
- preInstall = crate_.preInstall or "";
- postInstall = crate_.postInstall or "";
- dependencies = crate_.dependencies or [];
- buildDependencies = crate_.buildDependencies or [];
-}
diff --git a/pkgs/build-support/rust/build-rust-crate/build-crate.nix b/pkgs/build-support/rust/build-rust-crate/build-crate.nix
new file mode 100644
index 00000000000..f65118ba4a6
--- /dev/null
+++ b/pkgs/build-support/rust/build-rust-crate/build-crate.nix
@@ -0,0 +1,157 @@
+{ lib, stdenv, echo_build_heading, noisily, makeDeps }:
+{ crateName,
+ dependencies,
+ crateFeatures, libName, release, libPath,
+ crateType, metadata, crateBin,
+ extraRustcOpts, verbose, colors }:
+
+ let
+
+ deps = makeDeps dependencies;
+ rustcOpts =
+ lib.lists.foldl' (opts: opt: opts + " " + opt)
+ (if release then "-C opt-level=3" else "-C debuginfo=2")
+ (["-C codegen-units=1"] ++ extraRustcOpts);
+ rustcMeta = "-C metadata=${metadata} -C extra-filename=-${metadata}";
+ in ''
+ runHook preBuild
+ norm=""
+ bold=""
+ green=""
+ boldgreen=""
+ if [[ "${colors}" == "always" ]]; then
+ norm="$(printf '\033[0m')" #returns to "normal"
+ bold="$(printf '\033[0;1m')" #set bold
+ green="$(printf '\033[0;32m')" #set green
+ boldgreen="$(printf '\033[0;1;32m')" #set bold, and set green.
+ fi
+ ${echo_build_heading colors}
+ ${noisily colors verbose}
+
+ build_lib() {
+ lib_src=$1
+ echo_build_heading $lib_src ${libName}
+
+ noisily rustc --crate-name $CRATE_NAME $lib_src --crate-type ${crateType} \
+ ${rustcOpts} ${rustcMeta} ${crateFeatures} --out-dir target/lib \
+ --emit=dep-info,link -L dependency=target/deps ${deps} --cap-lints allow \
+ $BUILD_OUT_DIR $EXTRA_BUILD $EXTRA_FEATURES --color ${colors}
+
+ EXTRA_LIB=" --extern $CRATE_NAME=target/lib/lib$CRATE_NAME-${metadata}.rlib"
+ if [ -e target/deps/lib$CRATE_NAME-${metadata}${stdenv.hostPlatform.extensions.sharedLibrary} ]; then
+ EXTRA_LIB="$EXTRA_LIB --extern $CRATE_NAME=target/lib/lib$CRATE_NAME-${metadata}${stdenv.hostPlatform.extensions.sharedLibrary}"
+ fi
+ }
+
+ build_bin() {
+ crate_name=$1
+ crate_name_=$(echo $crate_name | sed -e "s/-/_/g")
+ main_file=""
+ if [[ ! -z $2 ]]; then
+ main_file=$2
+ fi
+ echo_build_heading $@
+ noisily rustc --crate-name $crate_name_ $main_file --crate-type bin ${rustcOpts}\
+ ${crateFeatures} --out-dir target/bin --emit=dep-info,link -L dependency=target/deps \
+ $LINK ${deps}$EXTRA_LIB --cap-lints allow \
+ $BUILD_OUT_DIR $EXTRA_BUILD $EXTRA_FEATURES --color ${colors}
+ if [ "$crate_name_" != "$crate_name" ]; then
+ mv target/bin/$crate_name_ target/bin/$crate_name
+ fi
+ }
+
+
+ EXTRA_LIB=""
+ CRATE_NAME=$(echo ${libName} | sed -e "s/-/_/g")
+
+ if [[ -e target/link_ ]]; then
+ EXTRA_BUILD="$(cat target/link_) $EXTRA_BUILD"
+ fi
+
+ if [[ -e "${libPath}" ]]; then
+ build_lib ${libPath}
+ elif [[ -e src/lib.rs ]]; then
+ build_lib src/lib.rs
+ elif [[ -e src/${libName}.rs ]]; then
+ build_lib src/${libName}.rs
+ fi
+
+ echo "$EXTRA_LINK_SEARCH" | while read i; do
+ if [[ ! -z "$i" ]]; then
+ for lib in $i; do
+ echo "-L $lib" >> target/link
+ L=$(echo $lib | sed -e "s#$(pwd)/target/build#$out/lib#")
+ echo "-L $L" >> target/link.final
+ done
+ fi
+ done
+ echo "$EXTRA_LINK" | while read i; do
+ if [[ ! -z "$i" ]]; then
+ for lib in $i; do
+ echo "-l $lib" >> target/link
+ echo "-l $lib" >> target/link.final
+ done
+ fi
+ done
+
+ if [[ -e target/link ]]; then
+ sort -u target/link.final > target/link.final.sorted
+ mv target/link.final.sorted target/link.final
+ sort -u target/link > target/link.sorted
+ mv target/link.sorted target/link
+
+ tr '\n' ' ' < target/link > target/link_
+ LINK=$(cat target/link_)
+ fi
+
+ mkdir -p target/bin
+ printf "%s\n" "${crateBin}" | head -n1 | tr -s ',' '\n' | while read -r BIN_NAME BIN_PATH; do
+ # filter empty entries / empty "lines"
+ if [[ -z "$BIN_NAME" ]]; then
+ continue
+ fi
+
+ if [[ -z "$BIN_PATH" ]]; then
+ # heuristic to "guess" the correct source file as found in cargo:
+ # https://github.com/rust-lang/cargo/blob/90fc9f620190d5fa3c80b0c8c65a1e1361e6b8ae/src/cargo/util/toml/targets.rs#L308-L325
+
+ # the first two cases are the "new" default IIRC
+ BIN_NAME_=$(echo $BIN_NAME | sed -e 's/-/_/g')
+ FILES=( "src/bin/$BIN_NAME.rs" "src/bin/$BIN_NAME/main.rs" "src/bin/$BIN_NAME_.rs" "src/bin/$BIN_NAME_/main.rs" "src/bin/main.rs" "src/main.rs" )
+
+ if ! [ -e "${libPath}" -o -e src/lib.rs -o -e "src/${libName}.rs" ]; then
+ # if this is not a library the following path is also valid
+ FILES=( "src/$BIN_NAME.rs" "src/$BIN_NAME_.rs" "''${FILES[@]}" )
+ fi
+
+ for file in "''${FILES[@]}";
+ do
+ echo "checking file $file"
+ # first file that exists wins
+ if [[ -e "$file" ]]; then
+ BIN_PATH="$file"
+ break
+ fi
+ done
+
+ if [[ -z "$BIN_PATH" ]]; then
+ echo "failed to find file for binary target: $BIN_NAME" >&2
+ exit 1
+ fi
+ fi
+ build_bin "$BIN_NAME" "$BIN_PATH"
+ done
+
+
+ ${lib.optionalString (crateBin == "") ''
+ if [[ -e src/main.rs ]]; then
+ build_bin ${crateName} src/main.rs
+ fi
+ for i in src/bin/*.rs; do #*/
+ build_bin "$(basename $i .rs)" "$i"
+ done
+ ''}
+ # Remove object files to avoid "wrong ELF type"
+ find target -type f -name "*.o" -print0 | xargs -0 rm -f
+ runHook postBuild
+ ''
diff --git a/pkgs/build-support/rust/build-rust-crate/configure-crate.nix b/pkgs/build-support/rust/build-rust-crate/configure-crate.nix
new file mode 100644
index 00000000000..37fef2abd77
--- /dev/null
+++ b/pkgs/build-support/rust/build-rust-crate/configure-crate.nix
@@ -0,0 +1,129 @@
+{ lib, stdenv, echo_build_heading, noisily, makeDeps }:
+{ build, buildDependencies, colors, completeBuildDeps, completeDeps, crateAuthors, crateFeatures, crateName, crateVersion, extraLinkFlags, libName, libPath, release, target_os, verbose, workspace_member }:
+let version_ = lib.splitString "-" crateVersion;
+ versionPre = if lib.tail version_ == [] then "" else builtins.elemAt version_ 1;
+ version = lib.splitString "." (lib.head version_);
+ rustcOpts = (if release then "-C opt-level=3" else "-C debuginfo=2");
+ buildDeps = makeDeps buildDependencies;
+ authors = lib.concatStringsSep ":" crateAuthors;
+ optLevel = if release then 3 else 0;
+ completeDepsDir = lib.concatStringsSep " " completeDeps;
+ completeBuildDepsDir = lib.concatStringsSep " " completeBuildDeps;
+in ''
+ cd ${workspace_member}
+ runHook preConfigure
+ ${echo_build_heading colors}
+ ${noisily colors verbose}
+ symlink_dependency() {
+ # $1 is the nix-store path of a dependency
+ # $2 is the target path
+ i=$1
+ ln -s -f $i/lib/*.rlib $2 #*/
+ ln -s -f $i/lib/*.so $i/lib/*.dylib $2 #*/
+ if [ -e "$i/lib/link" ]; then
+ cat $i/lib/link >> target/link
+ cat $i/lib/link >> target/link.final
+ fi
+ if [ -e $i/env ]; then
+ source $i/env
+ fi
+ }
+
+ mkdir -p target/{deps,lib,build,buildDeps}
+ chmod uga+w target -R
+ echo ${extraLinkFlags} > target/link
+ echo ${extraLinkFlags} > target/link.final
+ for i in ${completeDepsDir}; do
+ symlink_dependency $i target/deps
+ done
+ for i in ${completeBuildDepsDir}; do
+ symlink_dependency $i target/buildDeps
+ done
+ if [[ -e target/link ]]; then
+ sort -u target/link > target/link.sorted
+ mv target/link.sorted target/link
+ sort -u target/link.final > target/link.final.sorted
+ mv target/link.final.sorted target/link.final
+ tr '\n' ' ' < target/link > target/link_
+ fi
+ EXTRA_BUILD=""
+ BUILD_OUT_DIR=""
+ export CARGO_PKG_NAME=${crateName}
+ export CARGO_PKG_VERSION=${crateVersion}
+ export CARGO_PKG_AUTHORS="${authors}"
+
+ export CARGO_CFG_TARGET_ARCH=${stdenv.hostPlatform.parsed.cpu.name}
+ export CARGO_CFG_TARGET_OS=${target_os}
+ export CARGO_CFG_TARGET_FAMILY="unix"
+ export CARGO_CFG_UNIX=1
+ export CARGO_CFG_TARGET_ENV="gnu"
+ export CARGO_CFG_TARGET_ENDIAN=${if stdenv.hostPlatform.parsed.cpu.significantByte.name == "littleEndian" then "little" else "big"}
+ export CARGO_CFG_TARGET_POINTER_WIDTH=${toString stdenv.hostPlatform.parsed.cpu.bits}
+ export CARGO_CFG_TARGET_VENDOR=${stdenv.hostPlatform.parsed.vendor.name}
+
+ export CARGO_MANIFEST_DIR="."
+ export DEBUG="${toString (!release)}"
+ export OPT_LEVEL="${toString optLevel}"
+ export TARGET="${stdenv.hostPlatform.config}"
+ export HOST="${stdenv.hostPlatform.config}"
+ export PROFILE=${if release then "release" else "debug"}
+ export OUT_DIR=$(pwd)/target/build/${crateName}.out
+ export CARGO_PKG_VERSION_MAJOR=${builtins.elemAt version 0}
+ export CARGO_PKG_VERSION_MINOR=${builtins.elemAt version 1}
+ export CARGO_PKG_VERSION_PATCH=${builtins.elemAt version 2}
+ if [[ -n "${versionPre}" ]]; then
+ export CARGO_PKG_VERSION_PRE="${versionPre}"
+ fi
+
+ BUILD=""
+ if [[ ! -z "${build}" ]] ; then
+ BUILD=${build}
+ elif [[ -e "build.rs" ]]; then
+ BUILD="build.rs"
+ fi
+ if [[ ! -z "$BUILD" ]] ; then
+ echo_build_heading "$BUILD" ${libName}
+ mkdir -p target/build/${crateName}
+ EXTRA_BUILD_FLAGS=""
+ if [ -e target/link_ ]; then
+ EXTRA_BUILD_FLAGS=$(cat target/link_)
+ fi
+ if [ -e target/link.build ]; then
+ EXTRA_BUILD_FLAGS="$EXTRA_BUILD_FLAGS $(cat target/link.build)"
+ fi
+ noisily rustc --crate-name build_script_build $BUILD --crate-type bin ${rustcOpts} \
+ ${crateFeatures} --out-dir target/build/${crateName} --emit=dep-info,link \
+ -L dependency=target/buildDeps ${buildDeps} --cap-lints allow $EXTRA_BUILD_FLAGS --color ${colors}
+
+ mkdir -p target/build/${crateName}.out
+ export RUST_BACKTRACE=1
+ BUILD_OUT_DIR="-L $OUT_DIR"
+ mkdir -p $OUT_DIR
+ target/build/${crateName}/build_script_build > target/build/${crateName}.opt
+ set +e
+ EXTRA_BUILD=$(sed -n "s/^cargo:rustc-flags=\(.*\)/\1/p" target/build/${crateName}.opt | tr '\n' ' ' | sort -u)
+ EXTRA_FEATURES=$(sed -n "s/^cargo:rustc-cfg=\(.*\)/--cfg \1/p" target/build/${crateName}.opt | tr '\n' ' ')
+ EXTRA_LINK=$(sed -n "s/^cargo:rustc-link-lib=\(.*\)/\1/p" target/build/${crateName}.opt | tr '\n' ' ' | sort -u)
+ EXTRA_LINK_SEARCH=$(sed -n "s/^cargo:rustc-link-search=\(.*\)/\1/p" target/build/${crateName}.opt | tr '\n' ' ' | sort -u)
+
+ for env in $(sed -n "s/^cargo:rustc-env=\(.*\)/\1/p" target/build/${crateName}.opt); do
+ export $env
+ done
+
+ CRATENAME=$(echo ${crateName} | sed -e "s/\(.*\)-sys$/\U\1/")
+ grep -P "^cargo:(?!(rustc-|warning=|rerun-if-changed=|rerun-if-env-changed))" target/build/${crateName}.opt \
+ | sed -e "s/cargo:\([^=]*\)=\(.*\)/export DEP_$(echo $CRATENAME)_\U\1\E=\2/" > target/env
+
+ set -e
+ if [[ -n "$(ls target/build/${crateName}.out)" ]]; then
+
+ if [[ -e "${libPath}" ]]; then
+ cp -r target/build/${crateName}.out/* $(dirname ${libPath}) #*/
+ else
+ cp -r target/build/${crateName}.out/* src #*/
+ fi
+ fi
+ fi
+ runHook postConfigure
+''
+
diff --git a/pkgs/build-support/rust/build-rust-crate/default.nix b/pkgs/build-support/rust/build-rust-crate/default.nix
new file mode 100644
index 00000000000..a11cef9f1f4
--- /dev/null
+++ b/pkgs/build-support/rust/build-rust-crate/default.nix
@@ -0,0 +1,173 @@
+# Code for buildRustCrate, a Nix function that builds Rust code, just
+# like Cargo, but using Nix instead.
+#
+# This can be useful for deploying packages with NixOps, and to share
+# binary dependencies between projects.
+
+{ lib, stdenv, defaultCrateOverrides, fetchCrate, ncurses, rustc }:
+
+let
+ # This doesn't appear to be officially documented anywhere yet.
+ # See https://github.com/rust-lang-nursery/rust-forge/issues/101.
+ target_os = if stdenv.hostPlatform.isDarwin
+ then "macos"
+ else stdenv.hostPlatform.parsed.kernel.name;
+
+ makeDeps = dependencies:
+ (lib.concatMapStringsSep " " (dep:
+ let extern = lib.strings.replaceStrings ["-"] ["_"] dep.libName; in
+ (if dep.crateType == "lib" then
+ " --extern ${extern}=${dep.out}/lib/lib${extern}-${dep.metadata}.rlib"
+ else
+ " --extern ${extern}=${dep.out}/lib/lib${extern}-${dep.metadata}${stdenv.hostPlatform.extensions.sharedLibrary}")
+ ) dependencies);
+
+ echo_build_heading = colors: ''
+ echo_build_heading() {
+ start=""
+ end=""
+ if [[ "${colors}" == "always" ]]; then
+ start="$(printf '\033[0;1;32m')" #set bold, and set green.
+ end="$(printf '\033[0m')" #returns to "normal"
+ fi
+ if (( $# == 1 )); then
+ echo "$start""Building $1""$end"
+ else
+ echo "$start""Building $1 ($2)""$end"
+ fi
+ }
+ '';
+ noisily = colors: verbose: ''
+ noisily() {
+ start=""
+ end=""
+ if [[ "${colors}" == "always" ]]; then
+ start="$(printf '\033[0;1;32m')" #set bold, and set green.
+ end="$(printf '\033[0m')" #returns to "normal"
+ fi
+ ${lib.optionalString verbose ''
+ echo -n "$start"Running "$end"
+ echo $@
+ ''}
+ $@
+ }
+ '';
+
+ configureCrate = import ./configure-crate.nix { inherit lib stdenv echo_build_heading noisily makeDeps; };
+ buildCrate = import ./build-crate.nix { inherit lib stdenv echo_build_heading noisily makeDeps; };
+ installCrate = import ./install-crate.nix;
+
+ in
+
+crate_: lib.makeOverridable ({ rust, release, verbose, features, buildInputs, crateOverrides,
+ dependencies, buildDependencies,
+ extraRustcOpts,
+ preUnpack, postUnpack, prePatch, patches, postPatch,
+ preConfigure, postConfigure, preBuild, postBuild, preInstall, postInstall }:
+
+let crate = crate_ // (lib.attrByPath [ crate_.crateName ] (attr: {}) crateOverrides crate_);
+ dependencies_ = dependencies;
+ buildDependencies_ = buildDependencies;
+ processedAttrs = [
+ "src" "buildInputs" "crateBin" "crateLib" "libName" "libPath"
+ "buildDependencies" "dependencies" "features"
+ "crateName" "version" "build" "authors" "colors"
+ ];
+ extraDerivationAttrs = lib.filterAttrs (n: v: ! lib.elem n processedAttrs) crate;
+ buildInputs_ = buildInputs;
+in
+stdenv.mkDerivation (rec {
+
+ inherit (crate) crateName;
+ inherit preUnpack postUnpack prePatch patches postPatch preConfigure postConfigure preBuild postBuild preInstall postInstall;
+
+ src = if lib.hasAttr "src" crate then
+ crate.src
+ else
+ fetchCrate { inherit (crate) crateName version sha256; };
+ name = "rust_${crate.crateName}-${crate.version}";
+ buildInputs = [ rust ncurses ] ++ (crate.buildInputs or []) ++ buildInputs_;
+ dependencies =
+ builtins.map
+ (dep: dep.override { rust = rust; release = release; verbose = verbose; crateOverrides = crateOverrides; })
+ dependencies_;
+
+ buildDependencies =
+ builtins.map
+ (dep: dep.override { rust = rust; release = release; verbose = verbose; crateOverrides = crateOverrides; })
+ buildDependencies_;
+
+ completeDeps = lib.lists.unique (dependencies ++ lib.lists.concatMap (dep: dep.completeDeps) dependencies);
+ completeBuildDeps = lib.lists.unique (
+ buildDependencies
+ ++ lib.lists.concatMap (dep: dep.completeBuildDeps ++ dep.completeDeps) buildDependencies
+ );
+
+ crateFeatures = if crate ? features then
+ lib.concatMapStringsSep " " (f: "--cfg feature=\\\"${f}\\\"") (crate.features ++ features) #"
+ else "";
+
+ libName = if crate ? libName then crate.libName else crate.crateName;
+ libPath = if crate ? libPath then crate.libPath else "";
+
+ depsMetadata = builtins.foldl' (str: dep: str + dep.metadata) "" (dependencies ++ buildDependencies);
+ metadata = builtins.substring 0 10 (builtins.hashString "sha256" (crateName + "-" + crateVersion + "___" + toString crateFeatures + "___" + depsMetadata ));
+
+ crateBin = if crate ? crateBin then
+ builtins.foldl' (bins: bin: let
+ name = (if bin ? name then bin.name else crateName);
+ path = if bin ? path then bin.path else "";
+ in
+ bins + (if bin == "" then "" else ",") + "${name} ${path}"
+
+ ) "" crate.crateBin
+ else "";
+
+ build = crate.build or "";
+ workspace_member = crate.workspace_member or ".";
+ crateVersion = crate.version;
+ crateAuthors = if crate ? authors && lib.isList crate.authors then crate.authors else [];
+ crateType =
+ if lib.attrByPath ["procMacro"] false crate then "proc-macro" else
+ if lib.attrByPath ["plugin"] false crate then "dylib" else
+ (crate.type or "lib");
+ colors = lib.attrByPath [ "colors" ] "always" crate;
+ extraLinkFlags = builtins.concatStringsSep " " (crate.extraLinkFlags or []);
+ configurePhase = configureCrate {
+ inherit crateName buildDependencies completeDeps completeBuildDeps
+ crateFeatures libName build workspace_member release libPath crateVersion
+ extraLinkFlags
+ crateAuthors verbose colors target_os;
+ };
+ extraRustcOpts = if crate ? extraRustcOpts then crate.extraRustcOpts else [];
+ buildPhase = buildCrate {
+ inherit crateName dependencies
+ crateFeatures libName release libPath crateType
+ metadata crateBin verbose colors
+ extraRustcOpts;
+ };
+ installPhase = installCrate crateName metadata;
+
+} // extraDerivationAttrs
+)) {
+ rust = rustc;
+ release = crate_.release or true;
+ verbose = crate_.verbose or true;
+ extraRustcOpts = [];
+ features = [];
+ buildInputs = [];
+ crateOverrides = defaultCrateOverrides;
+ preUnpack = crate_.preUnpack or "";
+ postUnpack = crate_.postUnpack or "";
+ prePatch = crate_.prePatch or "";
+ patches = crate_.patches or [];
+ postPatch = crate_.postPatch or "";
+ preConfigure = crate_.preConfigure or "";
+ postConfigure = crate_.postConfigure or "";
+ preBuild = crate_.preBuild or "";
+ postBuild = crate_.postBuild or "";
+ preInstall = crate_.preInstall or "";
+ postInstall = crate_.postInstall or "";
+ dependencies = crate_.dependencies or [];
+ buildDependencies = crate_.buildDependencies or [];
+}
diff --git a/pkgs/build-support/rust/build-rust-crate/install-crate.nix b/pkgs/build-support/rust/build-rust-crate/install-crate.nix
new file mode 100644
index 00000000000..c41df34ca39
--- /dev/null
+++ b/pkgs/build-support/rust/build-rust-crate/install-crate.nix
@@ -0,0 +1,28 @@
+crateName: metadata:
+''
+ runHook preInstall
+ mkdir -p $out
+ if [[ -s target/env ]]; then
+ cp target/env $out/env
+ fi
+ if [[ -s target/link.final ]]; then
+ mkdir -p $out/lib
+ cp target/link.final $out/lib/link
+ fi
+ if [[ "$(ls -A target/lib)" ]]; then
+ mkdir -p $out/lib
+ cp target/lib/* $out/lib #*/
+ for lib in $out/lib/*.so $out/lib/*.dylib; do #*/
+ ln -s $lib $(echo $lib | sed -e "s/-${metadata}//")
+ done
+ fi
+ if [[ "$(ls -A target/build)" ]]; then # */
+ mkdir -p $out/lib
+ cp -r target/build/* $out/lib # */
+ fi
+ if [[ "$(ls -A target/bin)" ]]; then
+ mkdir -p $out/bin
+ cp -P target/bin/* $out/bin # */
+ fi
+ runHook postInstall
+''
diff --git a/pkgs/build-support/rust/build-rust-crate/test/brotli-crates.nix b/pkgs/build-support/rust/build-rust-crate/test/brotli-crates.nix
new file mode 100644
index 00000000000..068cc5a9884
--- /dev/null
+++ b/pkgs/build-support/rust/build-rust-crate/test/brotli-crates.nix
@@ -0,0 +1,95 @@
+{ lib, buildPlatform, buildRustCrate, fetchgit }:
+let kernel = buildPlatform.parsed.kernel.name;
+ abi = buildPlatform.parsed.abi.name;
+ include = includedFiles: src: builtins.filterSource (path: type:
+ lib.lists.any (f:
+ let p = toString (src + ("/" + f)); in
+ (path == p) || (type == "directory" && lib.strings.hasPrefix path p)
+ ) includedFiles
+ ) src;
+ updateFeatures = f: up: functions: builtins.deepSeq f (lib.lists.foldl' (features: fun: fun features) (lib.attrsets.recursiveUpdate f up) functions);
+ mapFeatures = features: map (fun: fun { features = features; });
+ mkFeatures = feat: lib.lists.foldl (features: featureName:
+ if feat.${featureName} or false then
+ [ featureName ] ++ features
+ else
+ features
+ ) [] (builtins.attrNames feat);
+in
+rec {
+ alloc_no_stdlib_1_3_0_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
+ crateName = "alloc-no-stdlib";
+ version = "1.3.0";
+ authors = [ "Daniel Reiter Horn " ];
+ sha256 = "1jcp27pzmqdszgp80y484g4kwbjbg7x8a589drcwbxg0i8xwkir9";
+ crateBin = [ { name = "example"; } ];
+ inherit dependencies buildDependencies features;
+ };
+ brotli_2_5_0_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
+ crateName = "brotli";
+ version = "2.5.0";
+ authors = [ "Daniel Reiter Horn " "The Brotli Authors" ];
+ sha256 = "1ynw4hkdwnp0kj30p86ls44ahv4s99258s019bqrq4mya8hlsb5b";
+ crateBin = [ { name = "brotli"; } ];
+ inherit dependencies buildDependencies features;
+ };
+ brotli_decompressor_1_3_1_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
+ crateName = "brotli-decompressor";
+ version = "1.3.1";
+ authors = [ "Daniel Reiter Horn " "The Brotli Authors" ];
+ sha256 = "022g69q1xzwdj0130qm3fa4qwpn4q1jx3lc8yz0v0v201p7bm8fb";
+ crateBin = [ { name = "brotli-decompressor"; } ];
+ inherit dependencies buildDependencies features;
+ };
+ alloc_no_stdlib_1_3_0 = { features?(alloc_no_stdlib_1_3_0_features {}) }: alloc_no_stdlib_1_3_0_ {
+ features = mkFeatures (features.alloc_no_stdlib_1_3_0 or {});
+ };
+ alloc_no_stdlib_1_3_0_features = f: updateFeatures f (rec {
+ alloc_no_stdlib_1_3_0.default = (f.alloc_no_stdlib_1_3_0.default or true);
+ }) [];
+ brotli_2_5_0 = { features?(brotli_2_5_0_features {}) }: brotli_2_5_0_ {
+ dependencies = mapFeatures features ([ alloc_no_stdlib_1_3_0 brotli_decompressor_1_3_1 ]);
+ features = mkFeatures (features.brotli_2_5_0 or {});
+ };
+ brotli_2_5_0_features = f: updateFeatures f (rec {
+ alloc_no_stdlib_1_3_0."no-stdlib" =
+ (f.alloc_no_stdlib_1_3_0."no-stdlib" or false) ||
+ (brotli_2_5_0."no-stdlib" or false) ||
+ (f.brotli_2_5_0."no-stdlib" or false);
+ alloc_no_stdlib_1_3_0.default = true;
+ brotli_2_5_0.default = (f.brotli_2_5_0.default or true);
+ brotli_decompressor_1_3_1."disable-timer" =
+ (f.brotli_decompressor_1_3_1."disable-timer" or false) ||
+ (brotli_2_5_0."disable-timer" or false) ||
+ (f.brotli_2_5_0."disable-timer" or false);
+ brotli_decompressor_1_3_1."no-stdlib" =
+ (f.brotli_decompressor_1_3_1."no-stdlib" or false) ||
+ (brotli_2_5_0."no-stdlib" or false) ||
+ (f.brotli_2_5_0."no-stdlib" or false);
+ brotli_decompressor_1_3_1.benchmark =
+ (f.brotli_decompressor_1_3_1.benchmark or false) ||
+ (brotli_2_5_0.benchmark or false) ||
+ (f.brotli_2_5_0.benchmark or false);
+ brotli_decompressor_1_3_1.default = true;
+ brotli_decompressor_1_3_1.seccomp =
+ (f.brotli_decompressor_1_3_1.seccomp or false) ||
+ (brotli_2_5_0.seccomp or false) ||
+ (f.brotli_2_5_0.seccomp or false);
+ }) [ alloc_no_stdlib_1_3_0_features brotli_decompressor_1_3_1_features ];
+ brotli_decompressor_1_3_1 = { features?(brotli_decompressor_1_3_1_features {}) }: brotli_decompressor_1_3_1_ {
+ dependencies = mapFeatures features ([ alloc_no_stdlib_1_3_0 ]);
+ features = mkFeatures (features.brotli_decompressor_1_3_1 or {});
+ };
+ brotli_decompressor_1_3_1_features = f: updateFeatures f (rec {
+ alloc_no_stdlib_1_3_0."no-stdlib" =
+ (f.alloc_no_stdlib_1_3_0."no-stdlib" or false) ||
+ (brotli_decompressor_1_3_1."no-stdlib" or false) ||
+ (f.brotli_decompressor_1_3_1."no-stdlib" or false);
+ alloc_no_stdlib_1_3_0.default = true;
+ alloc_no_stdlib_1_3_0.unsafe =
+ (f.alloc_no_stdlib_1_3_0.unsafe or false) ||
+ (brotli_decompressor_1_3_1.unsafe or false) ||
+ (f.brotli_decompressor_1_3_1.unsafe or false);
+ brotli_decompressor_1_3_1.default = (f.brotli_decompressor_1_3_1.default or true);
+ }) [ alloc_no_stdlib_1_3_0_features ];
+}
diff --git a/pkgs/build-support/rust/build-rust-crate/test/default.nix b/pkgs/build-support/rust/build-rust-crate/test/default.nix
new file mode 100644
index 00000000000..08f7238c1fd
--- /dev/null
+++ b/pkgs/build-support/rust/build-rust-crate/test/default.nix
@@ -0,0 +1,104 @@
+{ lib, stdenv, buildRustCrate, runCommand, writeTextFile, symlinkJoin, callPackage }:
+let
+ mkCrate = args: let
+ p = {
+ crateName = "nixtestcrate";
+ version = "0.1.0";
+ authors = [ "Test " ];
+ } // args;
+ in buildRustCrate p;
+
+ mkFile = destination: text: writeTextFile {
+ name = "src";
+ destination = "/${destination}";
+ inherit text;
+ };
+
+ mkBin = name: mkFile name ''
+ use std::env;
+ fn main() {
+ let name: String = env::args().nth(0).unwrap();
+ println!("executed {}", name);
+ }
+ '';
+
+ mkLib = name: mkFile name "pub fn test() -> i32 { return 23; }";
+
+ mkTest = crateArgs: let
+ crate = mkCrate crateArgs;
+ binaries = map (v: ''"${v.name}"'') (crateArgs.crateBin or []);
+ isLib = crateArgs ? libName || crateArgs ? libPath;
+ crateName = crateArgs.crateName or "nixtestcrate";
+ libName = crateArgs.libName or crateName;
+
+ libTestBinary = if !isLib then null else mkCrate {
+ crateName = "run-test-${crateName}";
+ dependencies = [ crate ];
+ src = mkFile "src/main.rs" ''
+ extern crate ${libName};
+ fn main() {
+ assert_eq!(${libName}::test(), 23);
+ }
+ '';
+ };
+
+ in runCommand "run-buildRustCrate-${crateName}-test" {
+ nativeBuildInputs = [ crate ];
+ } ''
+ ${lib.concatStringsSep "\n" binaries}
+ ${lib.optionalString isLib ''
+ test -e ${crate}/lib/*.rlib || exit 1
+ ${libTestBinary}/bin/run-test-${crateName}
+ ''}
+ touch $out
+ '';
+ in rec {
+
+ tests = let
+ cases = {
+ libPath = { libPath = "src/my_lib.rs"; src = mkLib "src/my_lib.rs"; };
+ srcLib = { src = mkLib "src/lib.rs"; };
+ customLibName = { libName = "test_lib"; src = mkLib "src/test_lib.rs"; };
+ customLibNameAndLibPath = { libName = "test_lib"; libPath = "src/best-lib.rs"; src = mkLib "src/best-lib.rs"; };
+ crateBinWithPath = { crateBin = [{ name = "test_binary1"; path = "src/foobar.rs"; }]; src = mkBin "src/foobar.rs"; };
+ crateBinNoPath1 = { crateBin = [{ name = "my-binary2"; }]; src = mkBin "src/my_binary2.rs"; };
+ crateBinNoPath2 = {
+ crateBin = [{ name = "my-binary3"; } { name = "my-binary4"; }];
+ src = symlinkJoin {
+ name = "buildRustCrateMultipleBinariesCase";
+ paths = [ (mkBin "src/bin/my_binary3.rs") (mkBin "src/bin/my_binary4.rs") ];
+ };
+ };
+ crateBinNoPath3 = { crateBin = [{ name = "my-binary5"; }]; src = mkBin "src/bin/main.rs"; };
+ crateBinNoPath4 = { crateBin = [{ name = "my-binary6"; }]; src = mkBin "src/main.rs";};
+ };
+ brotliCrates = (callPackage ./brotli-crates.nix {});
+ in lib.mapAttrs (key: value: mkTest (value // lib.optionalAttrs (!value?crateName) { crateName = key; })) cases // {
+ brotliTest = let
+ pkg = brotliCrates.brotli_2_5_0 {};
+ in runCommand "run-brotli-test-cmd" {
+ nativeBuildInputs = [ pkg ];
+ } ''
+ ${pkg}/bin/brotli -c ${pkg}/bin/brotli > /dev/null && touch $out
+ '';
+ allocNoStdLibTest = let
+ pkg = brotliCrates.alloc_no_stdlib_1_3_0 {};
+ in runCommand "run-alloc-no-stdlib-test-cmd" {
+ nativeBuildInputs = [ pkg ];
+ } ''
+ test -e ${pkg}/bin/example && touch $out
+ '';
+ brotliDecompressorTest = let
+ pkg = brotliCrates.brotli_decompressor_1_3_1 {};
+ in runCommand "run-brotli-decompressor-test-cmd" {
+ nativeBuildInputs = [ pkg ];
+ } ''
+ test -e ${pkg}/bin/brotli-decompressor && touch $out
+ '';
+ };
+ test = runCommand "run-buildRustCrate-tests" {
+ nativeBuildInputs = builtins.attrValues tests;
+ } "
+ touch $out
+ ";
+}
diff --git a/pkgs/build-support/vm/default.nix b/pkgs/build-support/vm/default.nix
index 67c67c88177..03b3fb1f9f2 100644
--- a/pkgs/build-support/vm/default.nix
+++ b/pkgs/build-support/vm/default.nix
@@ -990,8 +990,8 @@ rec {
name = "debian-9.4-stretch-i386";
fullName = "Debian 9.4 Stretch (i386)";
packagesList = fetchurl {
- url = mirror://debian/dists/stretch/main/binary-i386/Packages.xz;
- sha256 = "05z5ccg4ysbrgallhai53sh83i0364w7a3fdq84dpv1li059jf10";
+ url = https://web.archive.org/web/20180912163509/http://ftp.debian.org/debian/dists/stretch/main/binary-i386/Packages.xz;
+ sha256 = "0flvn8zn7vk04p10ndf3aq0mdr8k2ic01g51aq4lsllkv8lmwzyh";
};
urlPrefix = mirror://debian;
packages = commonDebianPackages;
@@ -1001,8 +1001,8 @@ rec {
name = "debian-9.4-stretch-amd64";
fullName = "Debian 9.4 Stretch (amd64)";
packagesList = fetchurl {
- url = mirror://debian/dists/stretch/main/binary-amd64/Packages.xz;
- sha256 = "19j0c54b1b9lbk9fv2c2aswdh0s2c3klf97zrlmsz4hs8wm9jylq";
+ url = https://web.archive.org/web/20180912163152/http://ftp.debian.org/debian/dists/stretch/main/binary-amd64/Packages.xz;
+ sha256 = "11vnn9bba2jabixvabfbw9zparl326c88xn99di7pbr5xsnl15jm";
};
urlPrefix = mirror://debian;
packages = commonDebianPackages;
diff --git a/pkgs/data/fonts/et-book/default.nix b/pkgs/data/fonts/et-book/default.nix
new file mode 100644
index 00000000000..58586ba7db6
--- /dev/null
+++ b/pkgs/data/fonts/et-book/default.nix
@@ -0,0 +1,22 @@
+{ stdenv, fetchFromGitHub }:
+
+fetchFromGitHub rec {
+ rev = "7e8f02dadcc23ba42b491b39e5bdf16e7b383031";
+ name = "et-book-${builtins.substring 0 6 rev}";
+ owner = "edwardtufte";
+ repo = "et-book";
+ sha256 = "1bfb1l8k7fzgk2l8cikiyfn5x9m0fiwrnsbc1483p8w3qp58s5n2";
+
+ postFetch = ''
+ tar -xzf $downloadedFile
+ mkdir -p $out/share/fonts/truetype
+ cp -t $out/share/fonts/truetype et-book-${rev}/source/4-ttf/*.ttf
+ '';
+
+ meta = with stdenv.lib; {
+ description = "The typeface used in Edward Tufte’s books.";
+ license = licenses.mit;
+ platforms = platforms.all;
+ maintainers = with maintainers; [ jethro ];
+ };
+}
diff --git a/pkgs/data/fonts/medio/default.nix b/pkgs/data/fonts/medio/default.nix
index 8b484b3b5ef..aa805b6f082 100644
--- a/pkgs/data/fonts/medio/default.nix
+++ b/pkgs/data/fonts/medio/default.nix
@@ -18,7 +18,7 @@ fetchzip rec {
'';
meta = with stdenv.lib; {
- homepage = "http://dotcolon.net/font/{pname}/";
+ homepage = "http://dotcolon.net/font/${pname}/";
description = "Serif font designed by Sora Sagano";
longDescription = ''
Medio is a serif font designed by Sora Sagano, based roughly
diff --git a/pkgs/data/fonts/pecita/default.nix b/pkgs/data/fonts/pecita/default.nix
index b57cf22569d..a90ff42a8e2 100644
--- a/pkgs/data/fonts/pecita/default.nix
+++ b/pkgs/data/fonts/pecita/default.nix
@@ -1,18 +1,24 @@
-{stdenv, fetchzip}:
+{ stdenv, fetchurl }:
let
+
version = "5.4";
-in fetchzip rec {
+
+in
+
+fetchurl rec {
name = "pecita-${version}";
- url = "http://archive.rycee.net/pecita/${name}.tar.xz";
+ url = "http://pecita.eu/b/Pecita.otf";
+
+ downloadToTemp = true;
postFetch = ''
- tar xJvf $downloadedFile --strip-components=1
mkdir -p $out/share/fonts/opentype
- cp -v Pecita.otf $out/share/fonts/opentype/Pecita.otf
+ cp -v $downloadedFile $out/share/fonts/opentype/Pecita.otf
'';
+ recursiveHash = true;
sha256 = "0pwm20f38lcbfkdqkpa2ydpc9kvmdg0ifc4h2dmipsnwbcb5rfwm";
meta = with stdenv.lib; {
diff --git a/pkgs/data/fonts/penna/default.nix b/pkgs/data/fonts/penna/default.nix
index 893553a62ce..b1244c47bf1 100644
--- a/pkgs/data/fonts/penna/default.nix
+++ b/pkgs/data/fonts/penna/default.nix
@@ -18,7 +18,7 @@ fetchzip rec {
'';
meta = with stdenv.lib; {
- homepage = "http://dotcolon.net/font/{pname}/";
+ homepage = "http://dotcolon.net/font/${pname}/";
description = "Geometric sans serif designed by Sora Sagano";
longDescription = ''
Penna is a geometric sans serif designed by Sora Sagano,
diff --git a/pkgs/data/fonts/route159/default.nix b/pkgs/data/fonts/route159/default.nix
index 7e2480a77dc..892078a1151 100644
--- a/pkgs/data/fonts/route159/default.nix
+++ b/pkgs/data/fonts/route159/default.nix
@@ -18,7 +18,7 @@ fetchzip rec {
'';
meta = with stdenv.lib; {
- homepage = "http://dotcolon.net/font/{pname}/";
+ homepage = "http://dotcolon.net/font/${pname}/";
description = "A weighted sans serif font";
platforms = platforms.all;
maintainers = with maintainers; [ leenaars ];
diff --git a/pkgs/data/fonts/seshat/default.nix b/pkgs/data/fonts/seshat/default.nix
index 36e4f2fa10f..6b22716f1eb 100644
--- a/pkgs/data/fonts/seshat/default.nix
+++ b/pkgs/data/fonts/seshat/default.nix
@@ -18,7 +18,7 @@ fetchzip rec {
'';
meta = with stdenv.lib; {
- homepage = "http://dotcolon.net/font/{pname}/";
+ homepage = "http://dotcolon.net/font/${pname}/";
description = "Roman body font designed for main text by Sora Sagano";
longDescription = ''
Seshat is a Roman body font designed for the main text. By
diff --git a/pkgs/data/icons/numix-icon-theme-circle/default.nix b/pkgs/data/icons/numix-icon-theme-circle/default.nix
index 5ac0998fb29..68b967e715d 100644
--- a/pkgs/data/icons/numix-icon-theme-circle/default.nix
+++ b/pkgs/data/icons/numix-icon-theme-circle/default.nix
@@ -29,7 +29,7 @@ stdenv.mkDerivation rec {
meta = with stdenv.lib; {
description = "Numix icon theme (circle version)";
- homepage = https://numixproject.org;
+ homepage = https://numixproject.github.io;
license = licenses.gpl3;
# darwin cannot deal with file names differing only in case
platforms = platforms.linux;
diff --git a/pkgs/data/icons/numix-icon-theme-square/default.nix b/pkgs/data/icons/numix-icon-theme-square/default.nix
index 875e1025927..ec6972c4cac 100644
--- a/pkgs/data/icons/numix-icon-theme-square/default.nix
+++ b/pkgs/data/icons/numix-icon-theme-square/default.nix
@@ -27,7 +27,7 @@ stdenv.mkDerivation rec {
meta = with stdenv.lib; {
description = "Numix icon theme (square version)";
- homepage = https://numixproject.org;
+ homepage = https://numixproject.github.io;
license = licenses.gpl3;
# darwin cannot deal with file names differing only in case
platforms = platforms.linux;
diff --git a/pkgs/data/icons/numix-icon-theme/default.nix b/pkgs/data/icons/numix-icon-theme/default.nix
index 35f624a00f5..9aaed97dc27 100644
--- a/pkgs/data/icons/numix-icon-theme/default.nix
+++ b/pkgs/data/icons/numix-icon-theme/default.nix
@@ -27,7 +27,7 @@ stdenv.mkDerivation rec {
meta = with stdenv.lib; {
description = "Numix icon theme";
- homepage = https://numixproject.org;
+ homepage = https://numixproject.github.io;
license = licenses.gpl3;
# darwin cannot deal with file names differing only in case
platforms = platforms.linux;
diff --git a/pkgs/data/icons/papirus-icon-theme/default.nix b/pkgs/data/icons/papirus-icon-theme/default.nix
index c0f4727f48f..1efd4145ce0 100644
--- a/pkgs/data/icons/papirus-icon-theme/default.nix
+++ b/pkgs/data/icons/papirus-icon-theme/default.nix
@@ -2,13 +2,13 @@
stdenv.mkDerivation rec {
name = "papirus-icon-theme-${version}";
- version = "20180401";
+ version = "20180816";
src = fetchFromGitHub {
owner = "PapirusDevelopmentTeam";
repo = "papirus-icon-theme";
rev = version;
- sha256 = "1cbzv3igc6j05h0mq2850fwfd8sxxwixzgmhh85mc1k326rvncil";
+ sha256 = "0rmf5hvp6711pyqdq5sdxkrjr21nbk6113r4a7d8735ynvm8znkk";
};
nativeBuildInputs = [ gtk3 ];
diff --git a/pkgs/data/misc/hackage/default.nix b/pkgs/data/misc/hackage/default.nix
index a2d04640d59..a72c94759fa 100644
--- a/pkgs/data/misc/hackage/default.nix
+++ b/pkgs/data/misc/hackage/default.nix
@@ -1,6 +1,6 @@
{ fetchurl }:
fetchurl {
- url = "https://github.com/commercialhaskell/all-cabal-hashes/archive/22cb611adaf63739fc7e3956d83d450154ec766b.tar.gz";
- sha256 = "0wxggabwz8qs2hmnr3k3iwy9rmvicx4a1n22l7f6krk1hym5bkpl";
+ url = "https://github.com/commercialhaskell/all-cabal-hashes/archive/e44c7d34b0e57883da9cc0e09b0b5de3b065fe98.tar.gz";
+ sha256 = "1manarsja8lsvs75zd3jnjhy5yb1576yv8ba0jqa4a1rszrkil1d";
}
diff --git a/pkgs/data/misc/osinfo-db/default.nix b/pkgs/data/misc/osinfo-db/default.nix
index 9919fb57f7c..93ee6d38c7c 100644
--- a/pkgs/data/misc/osinfo-db/default.nix
+++ b/pkgs/data/misc/osinfo-db/default.nix
@@ -1,11 +1,11 @@
{ stdenv, fetchurl, osinfo-db-tools, intltool, libxml2 }:
stdenv.mkDerivation rec {
- name = "osinfo-db-20180531";
+ name = "osinfo-db-20180903";
src = fetchurl {
url = "https://releases.pagure.org/libosinfo/${name}.tar.xz";
- sha256 = "0vw6hn7xdfj0q7wc3k9b0nvbghdp1b9dl63xz2v7frr55qv59m5x";
+ sha256 = "0xkxqyn2b03d4rd91f5rw3xar5vnv2n8l5pp8sm3hqm1wm5z5my9";
};
nativeBuildInputs = [ osinfo-db-tools intltool libxml2 ];
diff --git a/pkgs/desktops/deepin/dbus-factory/default.nix b/pkgs/desktops/deepin/dbus-factory/default.nix
new file mode 100644
index 00000000000..66d28cbcaf3
--- /dev/null
+++ b/pkgs/desktops/deepin/dbus-factory/default.nix
@@ -0,0 +1,30 @@
+{ stdenv, fetchFromGitHub, jq, libxml2, go-dbus-generator }:
+
+stdenv.mkDerivation rec {
+ name = "${pname}-${version}";
+ pname = "dbus-factory";
+ version = "3.1.17";
+
+ src = fetchFromGitHub {
+ owner = "linuxdeepin";
+ repo = pname;
+ rev = version;
+ sha256 = "1llq8wzgikgpzj7z36fyzk8kjych2h9nzi3x6zv53z0xc1xn4256";
+ };
+
+ nativeBuildInputs = [
+ jq
+ libxml2
+ go-dbus-generator
+ ];
+
+ makeFlags = [ "GOPATH=$(out)/share/gocode" ];
+
+ meta = with stdenv.lib; {
+ description = "Generates static DBus bindings for Golang and QML at build-time";
+ homepage = https://github.com/linuxdeepin/dbus-factory;
+ license = licenses.gpl3;
+ platforms = platforms.linux;
+ maintainers = with maintainers; [ romildo ];
+ };
+}
diff --git a/pkgs/desktops/deepin/dde-calendar/default.nix b/pkgs/desktops/deepin/dde-calendar/default.nix
new file mode 100644
index 00000000000..ad6b0f1912a
--- /dev/null
+++ b/pkgs/desktops/deepin/dde-calendar/default.nix
@@ -0,0 +1,44 @@
+{ stdenv, fetchFromGitHub, pkgconfig, qmake, qttools,
+ deepin-gettext-tools, dtkcore, dtkwidget
+}:
+
+stdenv.mkDerivation rec {
+ name = "${pname}-${version}";
+ pname = "dde-calendar";
+ version = "1.2.5";
+
+ src = fetchFromGitHub {
+ owner = "linuxdeepin";
+ repo = pname;
+ rev = version;
+ sha256 = "1a5zxpz7zncw6mrzv8zmn0j1vk0c8fq0m1xhmnwllffzybrhn4y7";
+ };
+
+ nativeBuildInputs = [
+ pkgconfig
+ qmake
+ qttools
+ deepin-gettext-tools
+ ];
+
+ buildInputs = [
+ dtkcore
+ dtkwidget
+ ];
+
+ postPatch = ''
+ patchShebangs .
+ sed -i translate_desktop.sh \
+ -e "s,/usr/bin/deepin-desktop-ts-convert,deepin-desktop-ts-convert,"
+ sed -i com.deepin.Calendar.service \
+ -e "s,/usr,$out,"
+ '';
+
+ meta = with stdenv.lib; {
+ description = "Calendar for Deepin Desktop Environment";
+ homepage = https://github.com/linuxdeepin/dde-calendar;
+ license = licenses.gpl3;
+ platforms = platforms.linux;
+ maintainers = with maintainers; [ romildo ];
+ };
+}
diff --git a/pkgs/desktops/deepin/deepin-image-viewer/default.nix b/pkgs/desktops/deepin/deepin-image-viewer/default.nix
new file mode 100644
index 00000000000..0ba2e306110
--- /dev/null
+++ b/pkgs/desktops/deepin/deepin-image-viewer/default.nix
@@ -0,0 +1,51 @@
+{ stdenv, fetchFromGitHub, pkgconfig, qmake, qttools, qtsvg,
+ qtx11extras, dtkcore, dtkwidget, qt5integration, freeimage, libraw,
+ libexif
+}:
+
+stdenv.mkDerivation rec {
+ name = "${pname}-${version}";
+ pname = "deepin-image-viewer";
+ version = "1.2.23";
+
+ src = fetchFromGitHub {
+ owner = "linuxdeepin";
+ repo = pname;
+ rev = version;
+ sha256 = "1n1b3j65in6v7q5bxgkiam8qy56kjn9prld3sjrbc2mqzff8sm3q";
+ };
+
+ nativeBuildInputs = [
+ pkgconfig
+ qmake
+ qttools
+ ];
+
+ buildInputs = [
+ qtsvg
+ qtx11extras
+ dtkcore
+ dtkwidget
+ qt5integration
+ freeimage
+ libraw
+ libexif
+ ];
+
+ postPatch = ''
+ patchShebangs .
+ sed -i qimage-plugins/freeimage/freeimage.pro \
+ qimage-plugins/libraw/libraw.pro \
+ -e "s,\$\$\[QT_INSTALL_PLUGINS\],$out/$qtPluginPrefix,"
+ sed -i viewer/com.deepin.ImageViewer.service \
+ -e "s,/usr,$out,"
+ '';
+
+ meta = with stdenv.lib; {
+ description = "Image Viewer for Deepin Desktop Environment";
+ homepage = https://github.com/linuxdeepin/deepin-image-viewer;
+ license = licenses.gpl3Plus;
+ platforms = platforms.linux;
+ maintainers = with maintainers; [ romildo ];
+ };
+}
diff --git a/pkgs/desktops/deepin/deepin-sound-theme/default.nix b/pkgs/desktops/deepin/deepin-sound-theme/default.nix
new file mode 100644
index 00000000000..f12419a615b
--- /dev/null
+++ b/pkgs/desktops/deepin/deepin-sound-theme/default.nix
@@ -0,0 +1,23 @@
+{ stdenv, fetchFromGitHub }:
+
+stdenv.mkDerivation rec {
+ name = "deepin-sound-theme-${version}";
+ version = "15.10.3";
+
+ src = fetchFromGitHub {
+ owner = "linuxdeepin";
+ repo = "deepin-sound-theme";
+ rev = version;
+ sha256 = "1sw4nrn7q7wk1hpicm05apyc0mihaw42iqm52wb8ib8gm1qiylr9";
+ };
+
+ makeFlags = [ "PREFIX=$(out)" ];
+
+ meta = with stdenv.lib; {
+ description = "Deepin sound theme";
+ homepage = https://github.com/linuxdeepin/deepin-sound-theme;
+ license = licenses.gpl3;
+ platforms = platforms.linux;
+ maintainers = [ maintainers.romildo ];
+ };
+}
diff --git a/pkgs/desktops/deepin/default.nix b/pkgs/desktops/deepin/default.nix
index c1438012ef5..f85d51b2072 100644
--- a/pkgs/desktops/deepin/default.nix
+++ b/pkgs/desktops/deepin/default.nix
@@ -3,19 +3,28 @@
let
packages = self: with self; {
+ dbus-factory = callPackage ./dbus-factory { };
+ dde-calendar = callPackage ./dde-calendar { };
dde-qt-dbus-factory = callPackage ./dde-qt-dbus-factory { };
deepin-gettext-tools = callPackage ./deepin-gettext-tools { };
deepin-gtk-theme = callPackage ./deepin-gtk-theme { };
deepin-icon-theme = callPackage ./deepin-icon-theme { };
+ deepin-image-viewer = callPackage ./deepin-image-viewer { };
deepin-menu = callPackage ./deepin-menu { };
deepin-mutter = callPackage ./deepin-mutter { };
deepin-shortcut-viewer = callPackage ./deepin-shortcut-viewer { };
+ deepin-sound-theme = callPackage ./deepin-sound-theme { };
deepin-terminal = callPackage ./deepin-terminal {
inherit (pkgs.gnome3) libgee vte;
wnck = pkgs.libwnck3;
};
dtkcore = callPackage ./dtkcore { };
+ dtkwm = callPackage ./dtkwm { };
dtkwidget = callPackage ./dtkwidget { };
+ go-dbus-factory = callPackage ./go-dbus-factory { };
+ go-dbus-generator = callPackage ./go-dbus-generator { };
+ go-gir-generator = callPackage ./go-gir-generator { };
+ go-lib = callPackage ./go-lib { };
qt5dxcb-plugin = callPackage ./qt5dxcb-plugin { };
qt5integration = callPackage ./qt5integration { };
diff --git a/pkgs/desktops/deepin/dtkwm/default.nix b/pkgs/desktops/deepin/dtkwm/default.nix
new file mode 100644
index 00000000000..46ed7bcc3be
--- /dev/null
+++ b/pkgs/desktops/deepin/dtkwm/default.nix
@@ -0,0 +1,39 @@
+{ stdenv, fetchFromGitHub, pkgconfig, qmake, qtx11extras, dtkcore }:
+
+stdenv.mkDerivation rec {
+ name = "${pname}-${version}";
+ pname = "dtkwm";
+ version = "2.0.9";
+
+ src = fetchFromGitHub {
+ owner = "linuxdeepin";
+ repo = pname;
+ rev = version;
+ sha256 = "0vkx6vlz83pgawhdwqkwpq3dy8whxmjdzfpgrvm2m6jmspfk9bab";
+ };
+
+ nativeBuildInputs = [
+ pkgconfig
+ qmake
+ ];
+
+ buildInputs = [
+ dtkcore
+ qtx11extras
+ ];
+
+ preConfigure = ''
+ qmakeFlags="$qmakeFlags \
+ QT_HOST_DATA=$out \
+ INCLUDE_INSTALL_DIR=$out/include \
+ LIB_INSTALL_DIR=$out/lib"
+ '';
+
+ meta = with stdenv.lib; {
+ description = "Deepin graphical user interface library";
+ homepage = https://github.com/linuxdeepin/dtkwm;
+ license = licenses.gpl3Plus;
+ platforms = platforms.linux;
+ maintainers = with maintainers; [ romildo ];
+ };
+}
diff --git a/pkgs/desktops/deepin/go-dbus-factory/default.nix b/pkgs/desktops/deepin/go-dbus-factory/default.nix
new file mode 100644
index 00000000000..a488bd7202c
--- /dev/null
+++ b/pkgs/desktops/deepin/go-dbus-factory/default.nix
@@ -0,0 +1,26 @@
+{ stdenv, fetchFromGitHub }:
+
+stdenv.mkDerivation rec {
+ name = "${pname}-${version}";
+ pname = "go-dbus-factory";
+ version = "0.0.7.1";
+
+ src = fetchFromGitHub {
+ owner = "linuxdeepin";
+ repo = pname;
+ rev = version;
+ sha256 = "0gj2xxv45gh7wr5ry3mcsi46kdsyq9nbd7znssn34kapiv40ixcx";
+ };
+
+ makeFlags = [
+ "PREFIX=$(out)"
+ ];
+
+ meta = with stdenv.lib; {
+ description = "GoLang DBus factory for the Deepin Desktop Environment";
+ homepage = https://github.com/linuxdeepin/go-dbus-factory;
+ license = licenses.gpl3;
+ platforms = platforms.linux;
+ maintainers = with maintainers; [ romildo ];
+ };
+}
diff --git a/pkgs/desktops/deepin/go-dbus-generator/default.nix b/pkgs/desktops/deepin/go-dbus-generator/default.nix
new file mode 100644
index 00000000000..2933c58f8d9
--- /dev/null
+++ b/pkgs/desktops/deepin/go-dbus-generator/default.nix
@@ -0,0 +1,33 @@
+{ stdenv, fetchFromGitHub, go, go-lib }:
+
+stdenv.mkDerivation rec {
+ name = "${pname}-${version}";
+ pname = "go-dbus-generator";
+ version = "0.6.6";
+
+ src = fetchFromGitHub {
+ owner = "linuxdeepin";
+ repo = pname;
+ rev = version;
+ sha256 = "17rzicqizyyrhjjf4rild7py1cyd07b2zdcd9nabvwn4gvj6lhfb";
+ };
+
+ nativeBuildInputs = [
+ go
+ go-lib
+ ];
+
+ makeFlags = [
+ "PREFIX=$(out)"
+ "GOPATH=$(GGOPATH):${go-lib}/share/gocode"
+ "HOME=$(TMP)"
+ ];
+
+ meta = with stdenv.lib; {
+ description = "Convert dbus interfaces to go-lang or qml wrapper code";
+ homepage = https://github.com/linuxdeepin/go-dbus-generator;
+ license = licenses.gpl3;
+ platforms = platforms.linux;
+ maintainers = with maintainers; [ romildo ];
+ };
+}
diff --git a/pkgs/desktops/deepin/go-gir-generator/default.nix b/pkgs/desktops/deepin/go-gir-generator/default.nix
new file mode 100644
index 00000000000..cc05f6f055b
--- /dev/null
+++ b/pkgs/desktops/deepin/go-gir-generator/default.nix
@@ -0,0 +1,37 @@
+{ stdenv, fetchFromGitHub, pkgconfig, go, gobjectIntrospection, libgudev }:
+
+stdenv.mkDerivation rec {
+ name = "${pname}-${version}";
+ pname = "go-gir-generator";
+ version = "1.0.4";
+
+ src = fetchFromGitHub {
+ owner = "linuxdeepin";
+ repo = pname;
+ rev = version;
+ sha256 = "0yi3lsgkxi8ghz2c7msf2df20jxkvzj8s47slvpzz4m57i82vgzl";
+ };
+
+ nativeBuildInputs = [
+ pkgconfig
+ go
+ ];
+
+ buildInputs = [
+ gobjectIntrospection
+ libgudev
+ ];
+
+ makeFlags = [
+ "PREFIX=$(out)"
+ "HOME=$(TMP)"
+ ];
+
+ meta = with stdenv.lib; {
+ description = "Generate static golang bindings for GObject";
+ homepage = https://github.com/linuxdeepin/go-gir-generator;
+ license = licenses.gpl3;
+ platforms = platforms.linux;
+ maintainers = with maintainers; [ romildo ];
+ };
+}
diff --git a/pkgs/desktops/deepin/go-lib/default.nix b/pkgs/desktops/deepin/go-lib/default.nix
new file mode 100644
index 00000000000..44de8889df2
--- /dev/null
+++ b/pkgs/desktops/deepin/go-lib/default.nix
@@ -0,0 +1,34 @@
+{ stdenv, fetchFromGitHub, glib, xorg, gdk_pixbuf, pulseaudio,
+ mobile-broadband-provider-info
+}:
+
+stdenv.mkDerivation rec {
+ name = "${pname}-${version}";
+ pname = "go-lib";
+ version = "1.2.16.1";
+
+ src = fetchFromGitHub {
+ owner = "linuxdeepin";
+ repo = pname;
+ rev = version;
+ sha256 = "0nl35dm0bdca38qhnzdpsv6b0vds9ccvm4c86rs42a7c6v655b1q";
+ };
+
+ buildInputs = [
+ glib
+ xorg.libX11
+ gdk_pixbuf
+ pulseaudio
+ mobile-broadband-provider-info
+ ];
+
+ makeFlags = [ "PREFIX=$(out)" ];
+
+ meta = with stdenv.lib; {
+ description = "Go bindings for Deepin Desktop Environment development";
+ homepage = https://github.com/linuxdeepin/go-lib;
+ license = licenses.gpl3;
+ platforms = platforms.linux;
+ maintainers = with maintainers; [ romildo ];
+ };
+}
diff --git a/pkgs/desktops/gnome-2/default.nix b/pkgs/desktops/gnome-2/default.nix
index c41183f4b24..f67dc13c854 100644
--- a/pkgs/desktops/gnome-2/default.nix
+++ b/pkgs/desktops/gnome-2/default.nix
@@ -35,8 +35,6 @@ let overridden = set // overrides; set = with overridden; {
GConf = callPackage ./platform/GConf { };
- gconfmm = callPackage ./platform/gconfmm { };
-
libgnomecanvas = callPackage ./platform/libgnomecanvas { };
libgnomecanvasmm = callPackage ./platform/libgnomecanvasmm { };
@@ -70,8 +68,6 @@ let overridden = set // overrides; set = with overridden; {
gtkglext = callPackage ./platform/gtkglext { };
- gtkglextmm = callPackage ./platform/gtkglextmm { };
-
#### DESKTOP
gvfs = gvfs.override { gnome = self; };
diff --git a/pkgs/desktops/gnome-2/platform/gconfmm/default.nix b/pkgs/desktops/gnome-2/platform/gconfmm/default.nix
deleted file mode 100644
index 356d4df9d1d..00000000000
--- a/pkgs/desktops/gnome-2/platform/gconfmm/default.nix
+++ /dev/null
@@ -1,23 +0,0 @@
-{ stdenv, fetchurl, pkgconfig, GConf, gtkmm, glibmm }:
-
-stdenv.mkDerivation rec {
- name = "gconfmm-${minVer}.3";
- minVer = "2.28";
-
- src = fetchurl {
- url = "mirror://gnome/sources/gconfmm/${minVer}/${name}.tar.bz2";
- sha256 = "a5e0092bb73371a3ca76b2ecae794778f3a9409056fee9b28ec1db072d8e6108";
- };
-
- nativeBuildInputs = [ pkgconfig ];
-
- propagatedBuildInputs = [ GConf gtkmm glibmm ];
-
- meta = {
- description = "C++ wrappers for GConf";
-
- license = stdenv.lib.licenses.lgpl2Plus;
-
- platforms = stdenv.lib.platforms.linux;
- };
-}
diff --git a/pkgs/desktops/gnome-2/platform/gtkglextmm/default.nix b/pkgs/desktops/gnome-2/platform/gtkglextmm/default.nix
deleted file mode 100644
index 63e33aa578e..00000000000
--- a/pkgs/desktops/gnome-2/platform/gtkglextmm/default.nix
+++ /dev/null
@@ -1,35 +0,0 @@
-{ stdenv, fetchurl, pkgconfig, gtkglext, gtkmm, gtk, libGLU_combined, gdk_pixbuf
-, pangox_compat, libXmu
-}:
-
-stdenv.mkDerivation rec {
- name = "gtkglextmm-${minVer}.0";
- minVer = "1.2";
-
- src = fetchurl {
- url = "mirror://gnome/sources/gtkglextmm/${minVer}/${name}.tar.bz2";
- sha256 = "6cd4bd2a240e5eb1e3a24c5a3ebbf7ed905b522b888439778043fdeb58771fea";
- };
-
- patches = [
- ./gdk.patch
-
- # From debian, fixes build with newer gtk "[...] by switching #includes
- # around so that the G_DISABLE_DEPRECATED trick in glibmm still works".
- # https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=707356
- ./fix_ftbfs_gtk_2_36.patch
- ];
-
- buildInputs = [ pangox_compat libXmu ];
-
- nativeBuildInputs = [pkgconfig];
-
- propagatedBuildInputs = [ gtkglext gtkmm gtk libGLU_combined gdk_pixbuf ];
-
- meta = {
- description = "C++ wrappers for GtkGLExt";
- license = stdenv.lib.licenses.lgpl2Plus;
- platforms = stdenv.lib.platforms.linux;
- broken = true;
- };
-}
diff --git a/pkgs/desktops/gnome-2/platform/gtkglextmm/fix_ftbfs_gtk_2_36.patch b/pkgs/desktops/gnome-2/platform/gtkglextmm/fix_ftbfs_gtk_2_36.patch
deleted file mode 100644
index 88e271e3eb7..00000000000
--- a/pkgs/desktops/gnome-2/platform/gtkglextmm/fix_ftbfs_gtk_2_36.patch
+++ /dev/null
@@ -1,121 +0,0 @@
-Index: gtkglextmm-1.2.0/gdkglext/gdkmm/gl/wrap_init.cc
-===================================================================
---- gtkglextmm-1.2.0.orig/gdkglext/gdkmm/gl/wrap_init.cc 2013-05-16 23:40:48.363207736 +0200
-+++ gtkglextmm-1.2.0/gdkglext/gdkmm/gl/wrap_init.cc 2013-05-16 23:42:40.193801834 +0200
-@@ -1,15 +1,8 @@
--
--#include
--
- // Disable the 'const' function attribute of the get_type() functions.
- // GCC would optimize them out because we don't use the return value.
- #undef G_GNUC_CONST
- #define G_GNUC_CONST /* empty */
-
--#include
--#include
--#include
--
- // #include the widget headers so that we can call the get_type() static methods:
-
- #include "tokens.h"
-@@ -19,6 +12,12 @@
- #include "pixmap.h"
- #include "window.h"
-
-+#include
-+
-+#include
-+#include
-+#include
-+
- extern "C"
- {
-
-Index: gtkglextmm-1.2.0/gdkglext/gdkmm/gl/query.cc
-===================================================================
---- gtkglextmm-1.2.0.orig/gdkglext/gdkmm/gl/query.cc 2013-05-16 23:40:48.363207736 +0200
-+++ gtkglextmm-1.2.0/gdkglext/gdkmm/gl/query.cc 2013-05-16 23:42:40.193801834 +0200
-@@ -17,10 +17,10 @@
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
- */
-
--#include
--
- #include "query.h"
-
-+#include
-+
- namespace Gdk
- {
- namespace GL
-Index: gtkglextmm-1.2.0/gdkglext/gdkmm/gl/pixmapext.cc
-===================================================================
---- gtkglextmm-1.2.0.orig/gdkglext/gdkmm/gl/pixmapext.cc 2013-05-16 23:40:48.363207736 +0200
-+++ gtkglextmm-1.2.0/gdkglext/gdkmm/gl/pixmapext.cc 2013-05-16 23:42:40.193801834 +0200
-@@ -17,11 +17,11 @@
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
- */
-
-+#include "pixmapext.h"
-+
- #include
- #include
-
--#include "pixmapext.h"
--
- namespace Gdk
- {
- namespace GL
-Index: gtkglextmm-1.2.0/gdkglext/gdkmm/gl/windowext.cc
-===================================================================
---- gtkglextmm-1.2.0.orig/gdkglext/gdkmm/gl/windowext.cc 2013-05-16 23:40:48.363207736 +0200
-+++ gtkglextmm-1.2.0/gdkglext/gdkmm/gl/windowext.cc 2013-05-16 23:42:40.193801834 +0200
-@@ -17,11 +17,11 @@
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
- */
-
-+#include "windowext.h"
-+
- #include
- #include
-
--#include "windowext.h"
--
- namespace Gdk
- {
- namespace GL
-Index: gtkglextmm-1.2.0/gdkglext/gdkmm/gl/font.cc
-===================================================================
---- gtkglextmm-1.2.0.orig/gdkglext/gdkmm/gl/font.cc 2004-05-18 08:01:49.000000000 +0200
-+++ gtkglextmm-1.2.0/gdkglext/gdkmm/gl/font.cc 2013-05-16 23:43:07.637456821 +0200
-@@ -17,10 +17,10 @@
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
- */
-
--#include
--
- #include "font.h"
-
-+#include
-+
- namespace Gdk
- {
- namespace GL
-Index: gtkglextmm-1.2.0/gdkglext/gdkmm/gl/init.cc
-===================================================================
---- gtkglextmm-1.2.0.orig/gdkglext/gdkmm/gl/init.cc 2003-02-27 10:49:24.000000000 +0100
-+++ gtkglextmm-1.2.0/gdkglext/gdkmm/gl/init.cc 2013-05-16 23:44:38.320316782 +0200
-@@ -19,11 +19,11 @@
-
- #include
-
--#include
--
- #include "wrap_init.h"
- #include "init.h"
-
-+#include
-+
- namespace Gdk
- {
- namespace GL
diff --git a/pkgs/desktops/gnome-2/platform/gtkglextmm/gdk.patch b/pkgs/desktops/gnome-2/platform/gtkglextmm/gdk.patch
deleted file mode 100644
index 8a39b521d63..00000000000
--- a/pkgs/desktops/gnome-2/platform/gtkglextmm/gdk.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-# fixes: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=621976
-# reference: http://www.mail-archive.com/pld-cvs-commit@lists.pld-linux.org/msg250570.html
---- gtkglextmm-1.2.0-orig/gtkglext/gtkmm/gl/widget.cc 2004-05-18 03:01:50.000000000 -0300
-+++ gtkglextmm-1.2.0/gtkglext/gtkmm/gl/widget.cc 2011-06-12 17:57:13.075541070 -0300
-@@ -17,9 +17,8 @@
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
- */
-
--#include
--
- #include "widget.h"
-+#include
-
- namespace Gtk
- {
\ No newline at end of file
diff --git a/pkgs/desktops/gnome-3/core/mutter/default.nix b/pkgs/desktops/gnome-3/core/mutter/default.nix
index 631107fe7a8..b05644366dc 100644
--- a/pkgs/desktops/gnome-3/core/mutter/default.nix
+++ b/pkgs/desktops/gnome-3/core/mutter/default.nix
@@ -19,7 +19,7 @@ stdenv.mkDerivation rec {
configureFlags = [
"--with-x"
"--disable-static"
- "--enable-remote-desktop"
+ # "--enable-remote-desktop"
"--enable-shape"
"--enable-sm"
"--enable-startup-notification"
diff --git a/pkgs/desktops/gnome-3/core/rygel/default.nix b/pkgs/desktops/gnome-3/core/rygel/default.nix
new file mode 100644
index 00000000000..ef088632897
--- /dev/null
+++ b/pkgs/desktops/gnome-3/core/rygel/default.nix
@@ -0,0 +1,54 @@
+{ stdenv, fetchurl, pkgconfig, vala, gettext, libxml2, gobjectIntrospection, gtk-doc, wrapGAppsHook, glib, gssdp, gupnp, gupnp-av, gupnp-dlna, gst_all_1, libgee, libsoup, gtk3, libmediaart, sqlite, systemd, tracker, shared-mime-info, gnome3 }:
+
+let
+ pname = "rygel";
+ version = "0.36.2";
+in stdenv.mkDerivation rec {
+ name = "${pname}-${version}";
+
+ # TODO: split out lib
+ outputs = [ "out" "dev" "devdoc" ];
+
+ src = fetchurl {
+ url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz";
+ sha256 = "0i12z6bzfzgcjidhxa2jsvpm4hqpab0s032z13jy2vbifrncfcnk";
+ };
+
+ nativeBuildInputs = [
+ pkgconfig vala gettext libxml2 gobjectIntrospection gtk-doc wrapGAppsHook
+ ];
+ buildInputs = [
+ glib gssdp gupnp gupnp-av gupnp-dlna libgee libsoup gtk3 libmediaart sqlite systemd tracker shared-mime-info
+ ] ++ (with gst_all_1; [
+ gstreamer gst-plugins-base gst-plugins-good gst-plugins-bad gst-plugins-ugly
+ ]);
+
+ configureFlags = [
+ "--with-systemduserunitdir=$(out)/lib/systemd/user"
+ "--enable-apidocs"
+ "--sysconfdir=/etc"
+ ];
+
+ installFlags = [
+ "sysconfdir=$(out)/etc"
+ ];
+
+ doCheck = true;
+
+ enableParallelBuilding = true;
+
+ passthru = {
+ updateScript = gnome3.updateScript {
+ packageName = pname;
+ attrPath = "gnome3.${pname}";
+ };
+ };
+
+ meta = with stdenv.lib; {
+ description = "A home media solution (UPnP AV MediaServer) that allows you to easily share audio, video and pictures to other devices";
+ homepage = https://wiki.gnome.org/Projects/Rygel;
+ license = licenses.lgpl21Plus;
+ maintainers = gnome3.maintainers;
+ platforms = platforms.linux;
+ };
+}
diff --git a/pkgs/desktops/gnome-3/default.nix b/pkgs/desktops/gnome-3/default.nix
index d90440d5f55..5112f8b496f 100644
--- a/pkgs/desktops/gnome-3/default.nix
+++ b/pkgs/desktops/gnome-3/default.nix
@@ -216,6 +216,8 @@ lib.makeScope pkgs.newScope (self: with self; {
rest = callPackage ./core/rest { };
+ rygel = callPackage ./core/rygel { };
+
simple-scan = callPackage ./core/simple-scan { };
sushi = callPackage ./core/sushi { };
diff --git a/pkgs/desktops/lxqt/optional/compton-conf/default.nix b/pkgs/desktops/lxqt/compton-conf/default.nix
similarity index 100%
rename from pkgs/desktops/lxqt/optional/compton-conf/default.nix
rename to pkgs/desktops/lxqt/compton-conf/default.nix
diff --git a/pkgs/desktops/lxqt/default.nix b/pkgs/desktops/lxqt/default.nix
index 015807ec684..62b8aaf25ab 100644
--- a/pkgs/desktops/lxqt/default.nix
+++ b/pkgs/desktops/lxqt/default.nix
@@ -7,44 +7,44 @@ let
# - https://github.com/lxqt/lxqt/wiki/Building-from-source
### BASE
- libqtxdg = callPackage ./base/libqtxdg { };
- lxqt-build-tools = callPackage ./base/lxqt-build-tools { };
- libsysstat = callPackage ./base/libsysstat { };
- liblxqt = callPackage ./base/liblxqt { };
+ libqtxdg = callPackage ./libqtxdg { };
+ lxqt-build-tools = callPackage ./lxqt-build-tools { };
+ libsysstat = callPackage ./libsysstat { };
+ liblxqt = callPackage ./liblxqt { };
### CORE 1
- libfm-qt = callPackage ./core/libfm-qt { };
- lxqt-about = callPackage ./core/lxqt-about { };
- lxqt-admin = callPackage ./core/lxqt-admin { };
- lxqt-config = callPackage ./core/lxqt-config { };
- lxqt-globalkeys = callPackage ./core/lxqt-globalkeys { };
- lxqt-l10n = callPackage ./core/lxqt-l10n { };
- lxqt-notificationd = callPackage ./core/lxqt-notificationd { };
- lxqt-openssh-askpass = callPackage ./core/lxqt-openssh-askpass { };
- lxqt-policykit = callPackage ./core/lxqt-policykit { };
- lxqt-powermanagement = callPackage ./core/lxqt-powermanagement { };
- lxqt-qtplugin = callPackage ./core/lxqt-qtplugin { };
- lxqt-session = callPackage ./core/lxqt-session { };
- lxqt-sudo = callPackage ./core/lxqt-sudo { };
- lxqt-themes = callPackage ./core/lxqt-themes { };
- pavucontrol-qt = libsForQt5.callPackage ./core/pavucontrol-qt { };
- qtermwidget = callPackage ./core/qtermwidget { };
+ libfm-qt = callPackage ./libfm-qt { };
+ lxqt-about = callPackage ./lxqt-about { };
+ lxqt-admin = callPackage ./lxqt-admin { };
+ lxqt-config = callPackage ./lxqt-config { };
+ lxqt-globalkeys = callPackage ./lxqt-globalkeys { };
+ lxqt-l10n = callPackage ./lxqt-l10n { };
+ lxqt-notificationd = callPackage ./lxqt-notificationd { };
+ lxqt-openssh-askpass = callPackage ./lxqt-openssh-askpass { };
+ lxqt-policykit = callPackage ./lxqt-policykit { };
+ lxqt-powermanagement = callPackage ./lxqt-powermanagement { };
+ lxqt-qtplugin = callPackage ./lxqt-qtplugin { };
+ lxqt-session = callPackage ./lxqt-session { };
+ lxqt-sudo = callPackage ./lxqt-sudo { };
+ lxqt-themes = callPackage ./lxqt-themes { };
+ pavucontrol-qt = libsForQt5.callPackage ./pavucontrol-qt { };
+ qtermwidget = callPackage ./qtermwidget { };
# for now keep version 0.7.1 because virt-manager-qt currently does not compile with qtermwidget-0.8.0
- qtermwidget_0_7_1 = callPackage ./core/qtermwidget/0.7.1.nix { };
+ qtermwidget_0_7_1 = callPackage ./qtermwidget/0.7.1.nix { };
### CORE 2
- lxqt-panel = callPackage ./core/lxqt-panel { };
- lxqt-runner = callPackage ./core/lxqt-runner { };
- pcmanfm-qt = callPackage ./core/pcmanfm-qt { };
+ lxqt-panel = callPackage ./lxqt-panel { };
+ lxqt-runner = callPackage ./lxqt-runner { };
+ pcmanfm-qt = callPackage ./pcmanfm-qt { };
### OPTIONAL
- qterminal = callPackage ./optional/qterminal { };
- compton-conf = pkgs.qt5.callPackage ./optional/compton-conf { };
- obconf-qt = callPackage ./optional/obconf-qt { };
- lximage-qt = callPackage ./optional/lximage-qt { };
- qps = callPackage ./optional/qps { };
- screengrab = callPackage ./optional/screengrab { };
- qlipper = callPackage ./optional/qlipper { };
+ qterminal = callPackage ./qterminal { };
+ compton-conf = pkgs.qt5.callPackage ./compton-conf { };
+ obconf-qt = callPackage ./obconf-qt { };
+ lximage-qt = callPackage ./lximage-qt { };
+ qps = callPackage ./qps { };
+ screengrab = callPackage ./screengrab { };
+ qlipper = callPackage ./qlipper { };
preRequisitePackages = [
pkgs.gvfs # virtual file systems support for PCManFM-QT
diff --git a/pkgs/desktops/lxqt/core/libfm-qt/default.nix b/pkgs/desktops/lxqt/libfm-qt/default.nix
similarity index 100%
rename from pkgs/desktops/lxqt/core/libfm-qt/default.nix
rename to pkgs/desktops/lxqt/libfm-qt/default.nix
diff --git a/pkgs/desktops/lxqt/base/liblxqt/default.nix b/pkgs/desktops/lxqt/liblxqt/default.nix
similarity index 100%
rename from pkgs/desktops/lxqt/base/liblxqt/default.nix
rename to pkgs/desktops/lxqt/liblxqt/default.nix
diff --git a/pkgs/desktops/lxqt/base/libqtxdg/default.nix b/pkgs/desktops/lxqt/libqtxdg/default.nix
similarity index 100%
rename from pkgs/desktops/lxqt/base/libqtxdg/default.nix
rename to pkgs/desktops/lxqt/libqtxdg/default.nix
diff --git a/pkgs/desktops/lxqt/base/libsysstat/default.nix b/pkgs/desktops/lxqt/libsysstat/default.nix
similarity index 100%
rename from pkgs/desktops/lxqt/base/libsysstat/default.nix
rename to pkgs/desktops/lxqt/libsysstat/default.nix
diff --git a/pkgs/desktops/lxqt/optional/lximage-qt/default.nix b/pkgs/desktops/lxqt/lximage-qt/default.nix
similarity index 100%
rename from pkgs/desktops/lxqt/optional/lximage-qt/default.nix
rename to pkgs/desktops/lxqt/lximage-qt/default.nix
diff --git a/pkgs/desktops/lxqt/core/lxqt-about/default.nix b/pkgs/desktops/lxqt/lxqt-about/default.nix
similarity index 100%
rename from pkgs/desktops/lxqt/core/lxqt-about/default.nix
rename to pkgs/desktops/lxqt/lxqt-about/default.nix
diff --git a/pkgs/desktops/lxqt/core/lxqt-admin/default.nix b/pkgs/desktops/lxqt/lxqt-admin/default.nix
similarity index 100%
rename from pkgs/desktops/lxqt/core/lxqt-admin/default.nix
rename to pkgs/desktops/lxqt/lxqt-admin/default.nix
diff --git a/pkgs/desktops/lxqt/base/lxqt-build-tools/default.nix b/pkgs/desktops/lxqt/lxqt-build-tools/default.nix
similarity index 100%
rename from pkgs/desktops/lxqt/base/lxqt-build-tools/default.nix
rename to pkgs/desktops/lxqt/lxqt-build-tools/default.nix
diff --git a/pkgs/desktops/lxqt/core/lxqt-config/default.nix b/pkgs/desktops/lxqt/lxqt-config/default.nix
similarity index 100%
rename from pkgs/desktops/lxqt/core/lxqt-config/default.nix
rename to pkgs/desktops/lxqt/lxqt-config/default.nix
diff --git a/pkgs/desktops/lxqt/core/lxqt-globalkeys/default.nix b/pkgs/desktops/lxqt/lxqt-globalkeys/default.nix
similarity index 100%
rename from pkgs/desktops/lxqt/core/lxqt-globalkeys/default.nix
rename to pkgs/desktops/lxqt/lxqt-globalkeys/default.nix
diff --git a/pkgs/desktops/lxqt/core/lxqt-l10n/default.nix b/pkgs/desktops/lxqt/lxqt-l10n/default.nix
similarity index 100%
rename from pkgs/desktops/lxqt/core/lxqt-l10n/default.nix
rename to pkgs/desktops/lxqt/lxqt-l10n/default.nix
diff --git a/pkgs/desktops/lxqt/core/lxqt-notificationd/default.nix b/pkgs/desktops/lxqt/lxqt-notificationd/default.nix
similarity index 100%
rename from pkgs/desktops/lxqt/core/lxqt-notificationd/default.nix
rename to pkgs/desktops/lxqt/lxqt-notificationd/default.nix
diff --git a/pkgs/desktops/lxqt/core/lxqt-openssh-askpass/default.nix b/pkgs/desktops/lxqt/lxqt-openssh-askpass/default.nix
similarity index 100%
rename from pkgs/desktops/lxqt/core/lxqt-openssh-askpass/default.nix
rename to pkgs/desktops/lxqt/lxqt-openssh-askpass/default.nix
diff --git a/pkgs/desktops/lxqt/core/lxqt-panel/default.nix b/pkgs/desktops/lxqt/lxqt-panel/default.nix
similarity index 100%
rename from pkgs/desktops/lxqt/core/lxqt-panel/default.nix
rename to pkgs/desktops/lxqt/lxqt-panel/default.nix
diff --git a/pkgs/desktops/lxqt/core/lxqt-policykit/default.nix b/pkgs/desktops/lxqt/lxqt-policykit/default.nix
similarity index 100%
rename from pkgs/desktops/lxqt/core/lxqt-policykit/default.nix
rename to pkgs/desktops/lxqt/lxqt-policykit/default.nix
diff --git a/pkgs/desktops/lxqt/core/lxqt-powermanagement/default.nix b/pkgs/desktops/lxqt/lxqt-powermanagement/default.nix
similarity index 100%
rename from pkgs/desktops/lxqt/core/lxqt-powermanagement/default.nix
rename to pkgs/desktops/lxqt/lxqt-powermanagement/default.nix
diff --git a/pkgs/desktops/lxqt/core/lxqt-qtplugin/default.nix b/pkgs/desktops/lxqt/lxqt-qtplugin/default.nix
similarity index 100%
rename from pkgs/desktops/lxqt/core/lxqt-qtplugin/default.nix
rename to pkgs/desktops/lxqt/lxqt-qtplugin/default.nix
diff --git a/pkgs/desktops/lxqt/core/lxqt-runner/default.nix b/pkgs/desktops/lxqt/lxqt-runner/default.nix
similarity index 100%
rename from pkgs/desktops/lxqt/core/lxqt-runner/default.nix
rename to pkgs/desktops/lxqt/lxqt-runner/default.nix
diff --git a/pkgs/desktops/lxqt/core/lxqt-session/default.nix b/pkgs/desktops/lxqt/lxqt-session/default.nix
similarity index 100%
rename from pkgs/desktops/lxqt/core/lxqt-session/default.nix
rename to pkgs/desktops/lxqt/lxqt-session/default.nix
diff --git a/pkgs/desktops/lxqt/core/lxqt-sudo/default.nix b/pkgs/desktops/lxqt/lxqt-sudo/default.nix
similarity index 100%
rename from pkgs/desktops/lxqt/core/lxqt-sudo/default.nix
rename to pkgs/desktops/lxqt/lxqt-sudo/default.nix
diff --git a/pkgs/desktops/lxqt/core/lxqt-themes/default.nix b/pkgs/desktops/lxqt/lxqt-themes/default.nix
similarity index 100%
rename from pkgs/desktops/lxqt/core/lxqt-themes/default.nix
rename to pkgs/desktops/lxqt/lxqt-themes/default.nix
diff --git a/pkgs/desktops/lxqt/optional/obconf-qt/default.nix b/pkgs/desktops/lxqt/obconf-qt/default.nix
similarity index 100%
rename from pkgs/desktops/lxqt/optional/obconf-qt/default.nix
rename to pkgs/desktops/lxqt/obconf-qt/default.nix
diff --git a/pkgs/desktops/lxqt/core/pavucontrol-qt/default.nix b/pkgs/desktops/lxqt/pavucontrol-qt/default.nix
similarity index 100%
rename from pkgs/desktops/lxqt/core/pavucontrol-qt/default.nix
rename to pkgs/desktops/lxqt/pavucontrol-qt/default.nix
diff --git a/pkgs/desktops/lxqt/core/pcmanfm-qt/default.nix b/pkgs/desktops/lxqt/pcmanfm-qt/default.nix
similarity index 100%
rename from pkgs/desktops/lxqt/core/pcmanfm-qt/default.nix
rename to pkgs/desktops/lxqt/pcmanfm-qt/default.nix
diff --git a/pkgs/desktops/lxqt/optional/qlipper/default.nix b/pkgs/desktops/lxqt/qlipper/default.nix
similarity index 100%
rename from pkgs/desktops/lxqt/optional/qlipper/default.nix
rename to pkgs/desktops/lxqt/qlipper/default.nix
diff --git a/pkgs/desktops/lxqt/optional/qps/default.nix b/pkgs/desktops/lxqt/qps/default.nix
similarity index 100%
rename from pkgs/desktops/lxqt/optional/qps/default.nix
rename to pkgs/desktops/lxqt/qps/default.nix
diff --git a/pkgs/desktops/lxqt/optional/qterminal/default.nix b/pkgs/desktops/lxqt/qterminal/default.nix
similarity index 100%
rename from pkgs/desktops/lxqt/optional/qterminal/default.nix
rename to pkgs/desktops/lxqt/qterminal/default.nix
diff --git a/pkgs/desktops/lxqt/core/qtermwidget/0.7.1.nix b/pkgs/desktops/lxqt/qtermwidget/0.7.1.nix
similarity index 100%
rename from pkgs/desktops/lxqt/core/qtermwidget/0.7.1.nix
rename to pkgs/desktops/lxqt/qtermwidget/0.7.1.nix
diff --git a/pkgs/desktops/lxqt/core/qtermwidget/default.nix b/pkgs/desktops/lxqt/qtermwidget/default.nix
similarity index 100%
rename from pkgs/desktops/lxqt/core/qtermwidget/default.nix
rename to pkgs/desktops/lxqt/qtermwidget/default.nix
diff --git a/pkgs/desktops/lxqt/optional/screengrab/default.nix b/pkgs/desktops/lxqt/screengrab/default.nix
similarity index 100%
rename from pkgs/desktops/lxqt/optional/screengrab/default.nix
rename to pkgs/desktops/lxqt/screengrab/default.nix
diff --git a/pkgs/desktops/mate/mate-session-manager/default.nix b/pkgs/desktops/mate/mate-session-manager/default.nix
index 47657375bba..38881e42576 100644
--- a/pkgs/desktops/mate/mate-session-manager/default.nix
+++ b/pkgs/desktops/mate/mate-session-manager/default.nix
@@ -5,11 +5,11 @@
stdenv.mkDerivation rec {
name = "mate-session-manager-${version}";
- version = "1.20.1";
+ version = "1.21.0";
src = fetchurl {
url = "http://pub.mate-desktop.org/releases/${mate.getRelease version}/${name}.tar.xz";
- sha256 = "0gdxa46ps0fxspri08kpp99vzx06faw6x30k6vbjg5m7x1xfq7i5";
+ sha256 = "1556kn4sk41x70m8cx200g4c9q3wndnhdxj4vp93sw262yqmk9mn";
};
nativeBuildInputs = [
diff --git a/pkgs/desktops/plasma-5/fetch.sh b/pkgs/desktops/plasma-5/fetch.sh
index acf769f02e3..fc1850b3c2a 100644
--- a/pkgs/desktops/plasma-5/fetch.sh
+++ b/pkgs/desktops/plasma-5/fetch.sh
@@ -1 +1 @@
-WGET_ARGS=( https://download.kde.org/stable/plasma/5.13.4/ -A '*.tar.xz' )
+WGET_ARGS=( https://download.kde.org/stable/plasma/5.13.5/ -A '*.tar.xz' )
diff --git a/pkgs/desktops/plasma-5/srcs.nix b/pkgs/desktops/plasma-5/srcs.nix
index 752493b1a70..a6c3cb66f6a 100644
--- a/pkgs/desktops/plasma-5/srcs.nix
+++ b/pkgs/desktops/plasma-5/srcs.nix
@@ -3,363 +3,363 @@
{
bluedevil = {
- version = "5.13.4";
+ version = "5.13.5";
src = fetchurl {
- url = "${mirror}/stable/plasma/5.13.4/bluedevil-5.13.4.tar.xz";
- sha256 = "1f7bjj3p5n8pvmqqgqz5xgjjhq1mjwknd36hrr5jn3klhbyahqkk";
- name = "bluedevil-5.13.4.tar.xz";
+ url = "${mirror}/stable/plasma/5.13.5/bluedevil-5.13.5.tar.xz";
+ sha256 = "0am708cb6jfccx1jfbriwc2jgwd4ajqllirc9i0bg4jz5ydxbjxg";
+ name = "bluedevil-5.13.5.tar.xz";
};
};
breeze = {
- version = "5.13.4";
+ version = "5.13.5";
src = fetchurl {
- url = "${mirror}/stable/plasma/5.13.4/breeze-5.13.4.tar.xz";
- sha256 = "1kxcd8zkk79mjh1j0lzw2nf0v0w2qc4zzb68nw61k1ca8v9mgq84";
- name = "breeze-5.13.4.tar.xz";
+ url = "${mirror}/stable/plasma/5.13.5/breeze-5.13.5.tar.xz";
+ sha256 = "09jkkfdmngvbp8i2y6irlv6yvrzpc86mw6apmqvphiaqsilyxaw0";
+ name = "breeze-5.13.5.tar.xz";
};
};
breeze-grub = {
- version = "5.13.4";
+ version = "5.13.5";
src = fetchurl {
- url = "${mirror}/stable/plasma/5.13.4/breeze-grub-5.13.4.tar.xz";
- sha256 = "1vxy24b2ndjkljw5ipwl8nl8nqckxr64sq6v4p690wib9j1nly09";
- name = "breeze-grub-5.13.4.tar.xz";
+ url = "${mirror}/stable/plasma/5.13.5/breeze-grub-5.13.5.tar.xz";
+ sha256 = "03hsq77gi75chgyq9pzh3ry6k6bi78pfm33zn8gx784k9fx7gvqr";
+ name = "breeze-grub-5.13.5.tar.xz";
};
};
breeze-gtk = {
- version = "5.13.4";
+ version = "5.13.5";
src = fetchurl {
- url = "${mirror}/stable/plasma/5.13.4/breeze-gtk-5.13.4.tar.xz";
- sha256 = "0sa0v9irimqhh17c1nykzkbhr6n3agam8y0idfr26xg7jblch3s0";
- name = "breeze-gtk-5.13.4.tar.xz";
+ url = "${mirror}/stable/plasma/5.13.5/breeze-gtk-5.13.5.tar.xz";
+ sha256 = "1knh0b27b81rnd87s31s2mawqcl1yzwjcakk5npzfm3nj23xakv3";
+ name = "breeze-gtk-5.13.5.tar.xz";
};
};
breeze-plymouth = {
- version = "5.13.4";
+ version = "5.13.5";
src = fetchurl {
- url = "${mirror}/stable/plasma/5.13.4/breeze-plymouth-5.13.4.tar.xz";
- sha256 = "1v02bh3xwcx5vixcp21a4wq04nn3wsgip5ycrgsb2bn013mspv20";
- name = "breeze-plymouth-5.13.4.tar.xz";
+ url = "${mirror}/stable/plasma/5.13.5/breeze-plymouth-5.13.5.tar.xz";
+ sha256 = "0xsjl602wsb5ak1xg19w8y0fv9404cwbj1rcrm0hgjv735m32c57";
+ name = "breeze-plymouth-5.13.5.tar.xz";
};
};
discover = {
- version = "5.13.4";
+ version = "5.13.5";
src = fetchurl {
- url = "${mirror}/stable/plasma/5.13.4/discover-5.13.4.tar.xz";
- sha256 = "1n7wd9w1r9a5ncgqc2s0aywivzqc3115wr93hrf1lqxpk0qskkyc";
- name = "discover-5.13.4.tar.xz";
+ url = "${mirror}/stable/plasma/5.13.5/discover-5.13.5.tar.xz";
+ sha256 = "1q3nc5lih95vs5masd8z897hvfvpwidiisj8bg62iq0cblsgwz6d";
+ name = "discover-5.13.5.tar.xz";
};
};
drkonqi = {
- version = "5.13.4";
+ version = "5.13.5";
src = fetchurl {
- url = "${mirror}/stable/plasma/5.13.4/drkonqi-5.13.4.tar.xz";
- sha256 = "1ddqisah98qd0hqg6pz5jk1pmisji2c6mj3i5w7df57zi7kpj4wz";
- name = "drkonqi-5.13.4.tar.xz";
+ url = "${mirror}/stable/plasma/5.13.5/drkonqi-5.13.5.tar.xz";
+ sha256 = "02kbmymzzhsf9slaf64xlp8sfv59gl7qf1g2ahcq58sqry5bqjnk";
+ name = "drkonqi-5.13.5.tar.xz";
};
};
kactivitymanagerd = {
- version = "5.13.4";
+ version = "5.13.5";
src = fetchurl {
- url = "${mirror}/stable/plasma/5.13.4/kactivitymanagerd-5.13.4.tar.xz";
- sha256 = "0iq5bxnszdndbvrqi8xm80d7i67xw0z45yq3qdsdlx80zzgb9g9d";
- name = "kactivitymanagerd-5.13.4.tar.xz";
+ url = "${mirror}/stable/plasma/5.13.5/kactivitymanagerd-5.13.5.tar.xz";
+ sha256 = "0zfvypxh748vsl270l8wn6inmp8shi2m051yy699qdqbyb039wjq";
+ name = "kactivitymanagerd-5.13.5.tar.xz";
};
};
kde-cli-tools = {
- version = "5.13.4";
+ version = "5.13.5";
src = fetchurl {
- url = "${mirror}/stable/plasma/5.13.4/kde-cli-tools-5.13.4.tar.xz";
- sha256 = "1dznj0jni4bm5z0hy644pcf7iavfd9yp8hfx87af3xhxxrifws37";
- name = "kde-cli-tools-5.13.4.tar.xz";
+ url = "${mirror}/stable/plasma/5.13.5/kde-cli-tools-5.13.5.tar.xz";
+ sha256 = "0p1az420p4ldinmxnkdwl69542ddm0r4f3wmdysfird7d68yw2hp";
+ name = "kde-cli-tools-5.13.5.tar.xz";
};
};
kdecoration = {
- version = "5.13.4";
+ version = "5.13.5";
src = fetchurl {
- url = "${mirror}/stable/plasma/5.13.4/kdecoration-5.13.4.tar.xz";
- sha256 = "1clf939g7qpnxxxw8iv3i4l9330dayzhg0cfrx6mffm2ywny67wd";
- name = "kdecoration-5.13.4.tar.xz";
+ url = "${mirror}/stable/plasma/5.13.5/kdecoration-5.13.5.tar.xz";
+ sha256 = "04p77fs5c9b4mbpcl4a2c1wc0i09g51b7c1v7n9fd4nfkm7z8sqs";
+ name = "kdecoration-5.13.5.tar.xz";
};
};
kde-gtk-config = {
- version = "5.13.4";
+ version = "5.13.5";
src = fetchurl {
- url = "${mirror}/stable/plasma/5.13.4/kde-gtk-config-5.13.4.tar.xz";
- sha256 = "03x5yvgk6kjy12qh3xblv90rsf8g5nsrc9573zd3rzz74pjql605";
- name = "kde-gtk-config-5.13.4.tar.xz";
+ url = "${mirror}/stable/plasma/5.13.5/kde-gtk-config-5.13.5.tar.xz";
+ sha256 = "06j64y7p5kxnrc3407hma0drh3sb8jvjp3mx6na6b86z4xxf1kj6";
+ name = "kde-gtk-config-5.13.5.tar.xz";
};
};
kdeplasma-addons = {
- version = "5.13.4";
+ version = "5.13.5";
src = fetchurl {
- url = "${mirror}/stable/plasma/5.13.4/kdeplasma-addons-5.13.4.tar.xz";
- sha256 = "1kgnmkykma14vinabal747hpvnrahccksgb68pxb4lxgylbcvy04";
- name = "kdeplasma-addons-5.13.4.tar.xz";
+ url = "${mirror}/stable/plasma/5.13.5/kdeplasma-addons-5.13.5.tar.xz";
+ sha256 = "1a4f61bbwhc2y0lnrglbq3sas16bxff0ga3im9d15nq5a5q637i1";
+ name = "kdeplasma-addons-5.13.5.tar.xz";
};
};
kgamma5 = {
- version = "5.13.4";
+ version = "5.13.5";
src = fetchurl {
- url = "${mirror}/stable/plasma/5.13.4/kgamma5-5.13.4.tar.xz";
- sha256 = "0hcnflk7zzpx00w6ifidrwxjmr99xrisfz2206fggal5j7y5w6yw";
- name = "kgamma5-5.13.4.tar.xz";
+ url = "${mirror}/stable/plasma/5.13.5/kgamma5-5.13.5.tar.xz";
+ sha256 = "08brmdi5y69iwhj7506q2l0bfm92c9l9ds9w4d1ipcgnbydrhfyn";
+ name = "kgamma5-5.13.5.tar.xz";
};
};
khotkeys = {
- version = "5.13.4";
+ version = "5.13.5";
src = fetchurl {
- url = "${mirror}/stable/plasma/5.13.4/khotkeys-5.13.4.tar.xz";
- sha256 = "1nq2afb06y3383gh3n5b1b4sbry5nicy3znid6p7b0jch1a0v73x";
- name = "khotkeys-5.13.4.tar.xz";
+ url = "${mirror}/stable/plasma/5.13.5/khotkeys-5.13.5.tar.xz";
+ sha256 = "16kp5ck6zfpnmnvspdnqklix54np3sxvj5ixs9saqf3gd5rk49mp";
+ name = "khotkeys-5.13.5.tar.xz";
};
};
kinfocenter = {
- version = "5.13.4";
+ version = "5.13.5";
src = fetchurl {
- url = "${mirror}/stable/plasma/5.13.4/kinfocenter-5.13.4.tar.xz";
- sha256 = "1vnch4ic1ppsrnp1w6rjcmn3c9ni91b3dgk0z91aw2x8c77cvji9";
- name = "kinfocenter-5.13.4.tar.xz";
+ url = "${mirror}/stable/plasma/5.13.5/kinfocenter-5.13.5.tar.xz";
+ sha256 = "15r9j33z3l31gip9q3fw015s4mxakgy5wqfs04w5p0aq8x9xkpzl";
+ name = "kinfocenter-5.13.5.tar.xz";
};
};
kmenuedit = {
- version = "5.13.4";
+ version = "5.13.5";
src = fetchurl {
- url = "${mirror}/stable/plasma/5.13.4/kmenuedit-5.13.4.tar.xz";
- sha256 = "0jyb4dc42dnpb6v4hkfb9m97yim767z0dc0i0hxqvznd87n5nk98";
- name = "kmenuedit-5.13.4.tar.xz";
+ url = "${mirror}/stable/plasma/5.13.5/kmenuedit-5.13.5.tar.xz";
+ sha256 = "0zha39cd3p5nmrbkhkbcavxns2n2wnb6chc5kcsk5km9wn4laxz0";
+ name = "kmenuedit-5.13.5.tar.xz";
};
};
kscreen = {
- version = "5.13.4";
+ version = "5.13.5";
src = fetchurl {
- url = "${mirror}/stable/plasma/5.13.4/kscreen-5.13.4.tar.xz";
- sha256 = "0labhlwdar6iibixal48bkk777hpyaibszv9mshlmhd7riaqrxs3";
- name = "kscreen-5.13.4.tar.xz";
+ url = "${mirror}/stable/plasma/5.13.5/kscreen-5.13.5.tar.xz";
+ sha256 = "0kf1cf88n46b4js7x9r504605v68wp5hwpwid6phvfqdyqrvbb77";
+ name = "kscreen-5.13.5.tar.xz";
};
};
kscreenlocker = {
- version = "5.13.4";
+ version = "5.13.5";
src = fetchurl {
- url = "${mirror}/stable/plasma/5.13.4/kscreenlocker-5.13.4.tar.xz";
- sha256 = "01b6y0wwclhni6ansg3avkml4qsq93rrg254ihy18bd1h05jxg4r";
- name = "kscreenlocker-5.13.4.tar.xz";
+ url = "${mirror}/stable/plasma/5.13.5/kscreenlocker-5.13.5.tar.xz";
+ sha256 = "171zjk9r333kbkb9pashw0rdmiwq11nzfin4wnmqzwp7rrclxs18";
+ name = "kscreenlocker-5.13.5.tar.xz";
};
};
ksshaskpass = {
- version = "5.13.4";
+ version = "5.13.5";
src = fetchurl {
- url = "${mirror}/stable/plasma/5.13.4/ksshaskpass-5.13.4.tar.xz";
- sha256 = "1f1567ac8qlgjgbqbksxqm969shydw3nizhn3ixvzr0n81lvab36";
- name = "ksshaskpass-5.13.4.tar.xz";
+ url = "${mirror}/stable/plasma/5.13.5/ksshaskpass-5.13.5.tar.xz";
+ sha256 = "1znhj8x8kag1jrw0j1kfvqgprdayrcfbmawz2jap1ik2bjq7dp81";
+ name = "ksshaskpass-5.13.5.tar.xz";
};
};
ksysguard = {
- version = "5.13.4";
+ version = "5.13.5";
src = fetchurl {
- url = "${mirror}/stable/plasma/5.13.4/ksysguard-5.13.4.tar.xz";
- sha256 = "1pg5687mlf5h4wb65my0v6scrj1zkxm5755wlq1jdasqr6zffdw0";
- name = "ksysguard-5.13.4.tar.xz";
+ url = "${mirror}/stable/plasma/5.13.5/ksysguard-5.13.5.tar.xz";
+ sha256 = "1qjqhqc23rbimz3qj8gr3dhp0griwgbiajhvjngh1jl55fb3q29j";
+ name = "ksysguard-5.13.5.tar.xz";
};
};
kwallet-pam = {
- version = "5.13.4";
+ version = "5.13.5";
src = fetchurl {
- url = "${mirror}/stable/plasma/5.13.4/kwallet-pam-5.13.4.tar.xz";
- sha256 = "0f9pg73710adr8p7m9qmync2lc86yl6hxmvr854lqzrp9mm2an0p";
- name = "kwallet-pam-5.13.4.tar.xz";
+ url = "${mirror}/stable/plasma/5.13.5/kwallet-pam-5.13.5.tar.xz";
+ sha256 = "145daahh8qjpbfcvjk2zyd6k3sr22npgnv3n23j9aim75qiwz1ac";
+ name = "kwallet-pam-5.13.5.tar.xz";
};
};
kwayland-integration = {
- version = "5.13.4";
+ version = "5.13.5";
src = fetchurl {
- url = "${mirror}/stable/plasma/5.13.4/kwayland-integration-5.13.4.tar.xz";
- sha256 = "0mhsidzpv5wg59d3v5z3a4n27fgfpdcr6y33zvib9k67isgx39h1";
- name = "kwayland-integration-5.13.4.tar.xz";
+ url = "${mirror}/stable/plasma/5.13.5/kwayland-integration-5.13.5.tar.xz";
+ sha256 = "1qhkrs8md36z5gndkm88pyv6mspqsdsdavjz8klfwfv1hii6qyds";
+ name = "kwayland-integration-5.13.5.tar.xz";
};
};
kwin = {
- version = "5.13.4";
+ version = "5.13.5";
src = fetchurl {
- url = "${mirror}/stable/plasma/5.13.4/kwin-5.13.4.tar.xz";
- sha256 = "1inh20xh80nv1vn0154jqsn6cn1xqfgjvvdvng6k2v330sd15dc6";
- name = "kwin-5.13.4.tar.xz";
+ url = "${mirror}/stable/plasma/5.13.5/kwin-5.13.5.tar.xz";
+ sha256 = "0ld1pclni1axrh7jww3gxlfwkbjsfbqb9z7gygj2ff3nmc6khgfm";
+ name = "kwin-5.13.5.tar.xz";
};
};
kwrited = {
- version = "5.13.4";
+ version = "5.13.5";
src = fetchurl {
- url = "${mirror}/stable/plasma/5.13.4/kwrited-5.13.4.tar.xz";
- sha256 = "1j9gl6d3j5mzydb4r9xmzxs313f2pj5phnh2n74nia672fn5kpqb";
- name = "kwrited-5.13.4.tar.xz";
+ url = "${mirror}/stable/plasma/5.13.5/kwrited-5.13.5.tar.xz";
+ sha256 = "150nhjk4vcigs2r2bxqk309g81lxpnkkv8l44hiyivcbmwvc3aya";
+ name = "kwrited-5.13.5.tar.xz";
};
};
libkscreen = {
- version = "5.13.4";
+ version = "5.13.5";
src = fetchurl {
- url = "${mirror}/stable/plasma/5.13.4/libkscreen-5.13.4.tar.xz";
- sha256 = "1azcpc3jm006s8zswv1w22gcajyvs800xc77l6das5jrl4ddk309";
- name = "libkscreen-5.13.4.tar.xz";
+ url = "${mirror}/stable/plasma/5.13.5/libkscreen-5.13.5.tar.xz";
+ sha256 = "04719va15i66qn1xqx318v6risxhp8bfcnhxh9mqm5h9qx5c6c4k";
+ name = "libkscreen-5.13.5.tar.xz";
};
};
libksysguard = {
- version = "5.13.4";
+ version = "5.13.5";
src = fetchurl {
- url = "${mirror}/stable/plasma/5.13.4/libksysguard-5.13.4.tar.xz";
- sha256 = "0k8q5bxk9zyv7c3nny1c399v8acqs618nw39q20pj2qdijl9ibvh";
- name = "libksysguard-5.13.4.tar.xz";
+ url = "${mirror}/stable/plasma/5.13.5/libksysguard-5.13.5.tar.xz";
+ sha256 = "0pccjjjzk8dxgmkj5vrq20nwb3qpf9isjd1zmg5nc127jld924x6";
+ name = "libksysguard-5.13.5.tar.xz";
};
};
milou = {
- version = "5.13.4";
+ version = "5.13.5";
src = fetchurl {
- url = "${mirror}/stable/plasma/5.13.4/milou-5.13.4.tar.xz";
- sha256 = "0rqwjb91a5x7piwdfh4xy8f2nhkfzdaja0ifpm7hrkysq6d9yzad";
- name = "milou-5.13.4.tar.xz";
+ url = "${mirror}/stable/plasma/5.13.5/milou-5.13.5.tar.xz";
+ sha256 = "0rhgj10l2iik1mgnv2bixxqjyc3pl731bs1bqz9gsa3wiazspwrv";
+ name = "milou-5.13.5.tar.xz";
};
};
oxygen = {
- version = "5.13.4";
+ version = "5.13.5";
src = fetchurl {
- url = "${mirror}/stable/plasma/5.13.4/oxygen-5.13.4.tar.xz";
- sha256 = "0035z94v4fbdl5jcaggv1vqjxk9z1marf4vs8zm7fkz6hhcn4vj2";
- name = "oxygen-5.13.4.tar.xz";
+ url = "${mirror}/stable/plasma/5.13.5/oxygen-5.13.5.tar.xz";
+ sha256 = "0wm2mngh0gb0lqvx8g82ml2sdv0kbkx14mpb8c6aw3hslcwma7yd";
+ name = "oxygen-5.13.5.tar.xz";
};
};
plasma-browser-integration = {
- version = "5.13.4";
+ version = "5.13.5";
src = fetchurl {
- url = "${mirror}/stable/plasma/5.13.4/plasma-browser-integration-5.13.4.tar.xz";
- sha256 = "19vqn3wbkfzsbf5rl61zaqgp10q83zxjmvvbn9325rp3dsv3i0jb";
- name = "plasma-browser-integration-5.13.4.tar.xz";
+ url = "${mirror}/stable/plasma/5.13.5/plasma-browser-integration-5.13.5.tar.xz";
+ sha256 = "0bhpbq4n29x8m0nmxlli5ljmgpw9da7sfbmf3j5c3wnxqja16sgy";
+ name = "plasma-browser-integration-5.13.5.tar.xz";
};
};
plasma-desktop = {
- version = "5.13.4";
+ version = "5.13.5";
src = fetchurl {
- url = "${mirror}/stable/plasma/5.13.4/plasma-desktop-5.13.4.tar.xz";
- sha256 = "1wmyms3bjka9kgjc6zp17j8w707lnmr2kxqzqznm78c16h34lfdx";
- name = "plasma-desktop-5.13.4.tar.xz";
+ url = "${mirror}/stable/plasma/5.13.5/plasma-desktop-5.13.5.tar.xz";
+ sha256 = "14isrq3n9lm1nzmyv8zdgq6pwnv2zmg4dwxyp7fvqjxfls8851vp";
+ name = "plasma-desktop-5.13.5.tar.xz";
};
};
plasma-integration = {
- version = "5.13.4";
+ version = "5.13.5";
src = fetchurl {
- url = "${mirror}/stable/plasma/5.13.4/plasma-integration-5.13.4.tar.xz";
- sha256 = "0p5wqj0jdvwq7blj7j1va00jlkqkwcxfkcj7gpnjmnsggp25mpsq";
- name = "plasma-integration-5.13.4.tar.xz";
+ url = "${mirror}/stable/plasma/5.13.5/plasma-integration-5.13.5.tar.xz";
+ sha256 = "0j57ra79p5lkj81d05hhb87mrxgyj6qikkpzcb0p2dr2x8cmkng2";
+ name = "plasma-integration-5.13.5.tar.xz";
};
};
plasma-nm = {
- version = "5.13.4";
+ version = "5.13.5";
src = fetchurl {
- url = "${mirror}/stable/plasma/5.13.4/plasma-nm-5.13.4.tar.xz";
- sha256 = "0qadmxzmw8a4r43ri2xxj4i884vraxlyxmwqkkn540x0aysyj4rq";
- name = "plasma-nm-5.13.4.tar.xz";
+ url = "${mirror}/stable/plasma/5.13.5/plasma-nm-5.13.5.tar.xz";
+ sha256 = "1z8f5iybgra72vhpiayiwpysvv2z8x2r5xal8rhgf7y24xcjwxmi";
+ name = "plasma-nm-5.13.5.tar.xz";
};
};
plasma-pa = {
- version = "5.13.4";
+ version = "5.13.5";
src = fetchurl {
- url = "${mirror}/stable/plasma/5.13.4/plasma-pa-5.13.4.tar.xz";
- sha256 = "1xqmp19dkggfzapns94jr0jz03aphdlz31iw888w2qj730zdx97k";
- name = "plasma-pa-5.13.4.tar.xz";
+ url = "${mirror}/stable/plasma/5.13.5/plasma-pa-5.13.5.tar.xz";
+ sha256 = "0p54x4zr3w009nn7g00qmxh7xil35x7b48d0l0flz5d7hvkk6nd8";
+ name = "plasma-pa-5.13.5.tar.xz";
};
};
plasma-sdk = {
- version = "5.13.4";
+ version = "5.13.5";
src = fetchurl {
- url = "${mirror}/stable/plasma/5.13.4/plasma-sdk-5.13.4.tar.xz";
- sha256 = "13ddin88ila3imkhn9bgaf1i0bbbmcb4xigk2cps74s8vl98jpfa";
- name = "plasma-sdk-5.13.4.tar.xz";
+ url = "${mirror}/stable/plasma/5.13.5/plasma-sdk-5.13.5.tar.xz";
+ sha256 = "1x8hq343xzwlcsdvf0jy0qgn64xw8l11lawhknbjrf90qq58axga";
+ name = "plasma-sdk-5.13.5.tar.xz";
};
};
plasma-tests = {
- version = "5.13.4";
+ version = "5.13.5";
src = fetchurl {
- url = "${mirror}/stable/plasma/5.13.4/plasma-tests-5.13.4.tar.xz";
- sha256 = "0fzqw3ix9sa3m492xjz46wsaqs7cgfpcprdx3z05ww4217k5d4sf";
- name = "plasma-tests-5.13.4.tar.xz";
+ url = "${mirror}/stable/plasma/5.13.5/plasma-tests-5.13.5.tar.xz";
+ sha256 = "00nm0d0c4zccbwnhy8sc1qb4sf7bs5vfky3n7lihwyng3syqwz3d";
+ name = "plasma-tests-5.13.5.tar.xz";
};
};
plasma-vault = {
- version = "5.13.4";
+ version = "5.13.5";
src = fetchurl {
- url = "${mirror}/stable/plasma/5.13.4/plasma-vault-5.13.4.tar.xz";
- sha256 = "1acpn49vb645a30xnxxf0rylihb7n838l0ky5169n6dq96swam4j";
- name = "plasma-vault-5.13.4.tar.xz";
+ url = "${mirror}/stable/plasma/5.13.5/plasma-vault-5.13.5.tar.xz";
+ sha256 = "1045zb58pmcyn0cznb81bmcpd4hkhxm6509rznrjykkhcfcrbf8z";
+ name = "plasma-vault-5.13.5.tar.xz";
};
};
plasma-workspace = {
- version = "5.13.4";
+ version = "5.13.5";
src = fetchurl {
- url = "${mirror}/stable/plasma/5.13.4/plasma-workspace-5.13.4.tar.xz";
- sha256 = "1kvl6pbhqw7llv8llq020qvbk7glynix8c4dsh3dfp170xpg3qnh";
- name = "plasma-workspace-5.13.4.tar.xz";
+ url = "${mirror}/stable/plasma/5.13.5/plasma-workspace-5.13.5.tar.xz";
+ sha256 = "1qcmw60lyp966rhvw9raaqrvxdv09pr8zc7x3fx1vpm9kphh3lv3";
+ name = "plasma-workspace-5.13.5.tar.xz";
};
};
plasma-workspace-wallpapers = {
- version = "5.13.4";
+ version = "5.13.5";
src = fetchurl {
- url = "${mirror}/stable/plasma/5.13.4/plasma-workspace-wallpapers-5.13.4.tar.xz";
- sha256 = "11z8isy01vbgzb5jkbslin30himy5072wwrb010jw9ls9j5dz1cm";
- name = "plasma-workspace-wallpapers-5.13.4.tar.xz";
+ url = "${mirror}/stable/plasma/5.13.5/plasma-workspace-wallpapers-5.13.5.tar.xz";
+ sha256 = "1wbnm6bzvgx2ssig4dk3plhrsjiw3lq1yhr2dfga6vvlyi6wg9mg";
+ name = "plasma-workspace-wallpapers-5.13.5.tar.xz";
};
};
plymouth-kcm = {
- version = "5.13.4";
+ version = "5.13.5";
src = fetchurl {
- url = "${mirror}/stable/plasma/5.13.4/plymouth-kcm-5.13.4.tar.xz";
- sha256 = "1f18ys2b80smd975a18qkhxb3ipr31wx8g0pmbfscqclc6kma506";
- name = "plymouth-kcm-5.13.4.tar.xz";
+ url = "${mirror}/stable/plasma/5.13.5/plymouth-kcm-5.13.5.tar.xz";
+ sha256 = "0flgr68rms40acgl2f4539mvp53m36ifignxix27raqmibaf38s1";
+ name = "plymouth-kcm-5.13.5.tar.xz";
};
};
polkit-kde-agent = {
- version = "1-5.13.4";
+ version = "1-5.13.5";
src = fetchurl {
- url = "${mirror}/stable/plasma/5.13.4/polkit-kde-agent-1-5.13.4.tar.xz";
- sha256 = "0wgj9pawwcgznqg7shp3zh65ag9cscnmamgr29x2lq9wwxqw2836";
- name = "polkit-kde-agent-1-5.13.4.tar.xz";
+ url = "${mirror}/stable/plasma/5.13.5/polkit-kde-agent-1-5.13.5.tar.xz";
+ sha256 = "00f05ii3www8knn2ycgkc6izc8ydb3vjy4f657k38hkzl2sjnhl6";
+ name = "polkit-kde-agent-1-5.13.5.tar.xz";
};
};
powerdevil = {
- version = "5.13.4";
+ version = "5.13.5";
src = fetchurl {
- url = "${mirror}/stable/plasma/5.13.4/powerdevil-5.13.4.tar.xz";
- sha256 = "10zhm5z0hwh75fmcp7cz5c35zcywm7an73x2dh4fyl42cczfb0zl";
- name = "powerdevil-5.13.4.tar.xz";
+ url = "${mirror}/stable/plasma/5.13.5/powerdevil-5.13.5.tar.xz";
+ sha256 = "1k7ilcvm5nvx6sd43j0djar9ay6ag84g4m8f420yf7q4yryp76yn";
+ name = "powerdevil-5.13.5.tar.xz";
};
};
sddm-kcm = {
- version = "5.13.4";
+ version = "5.13.5";
src = fetchurl {
- url = "${mirror}/stable/plasma/5.13.4/sddm-kcm-5.13.4.tar.xz";
- sha256 = "0g6alnlg8waxgf3cbzx838062qsdcfisxsw67zxykyp77spq00f0";
- name = "sddm-kcm-5.13.4.tar.xz";
+ url = "${mirror}/stable/plasma/5.13.5/sddm-kcm-5.13.5.tar.xz";
+ sha256 = "122g83ajh0xqylvmicrhgw0fm8bmzpw26v7fjckfk9if5zqzk8ch";
+ name = "sddm-kcm-5.13.5.tar.xz";
};
};
systemsettings = {
- version = "5.13.4";
+ version = "5.13.5";
src = fetchurl {
- url = "${mirror}/stable/plasma/5.13.4/systemsettings-5.13.4.tar.xz";
- sha256 = "1z6c6kaz0ib76qsiq5cj6ya4mrdgmv3xa71hnwd2fbmv45agk8q4";
- name = "systemsettings-5.13.4.tar.xz";
+ url = "${mirror}/stable/plasma/5.13.5/systemsettings-5.13.5.tar.xz";
+ sha256 = "14029a3mf2d6cw87lyffnwy88yvj0n3jmi0glr69zwi8lmz0cbsv";
+ name = "systemsettings-5.13.5.tar.xz";
};
};
user-manager = {
- version = "5.13.4";
+ version = "5.13.5";
src = fetchurl {
- url = "${mirror}/stable/plasma/5.13.4/user-manager-5.13.4.tar.xz";
- sha256 = "1s968hf7p9rrv3b0bq47s1387cbl6iq5313m34xfv5h7rqr2cw3m";
- name = "user-manager-5.13.4.tar.xz";
+ url = "${mirror}/stable/plasma/5.13.5/user-manager-5.13.5.tar.xz";
+ sha256 = "12550xvl084rab0y331r8dm3qwpcvm83k3j02gxrwrigv1vckas8";
+ name = "user-manager-5.13.5.tar.xz";
};
};
xdg-desktop-portal-kde = {
- version = "5.13.4";
+ version = "5.13.5";
src = fetchurl {
- url = "${mirror}/stable/plasma/5.13.4/xdg-desktop-portal-kde-5.13.4.tar.xz";
- sha256 = "02fv1v778rh512wcm2zqgn6q61459bjbcjj2xz63lp3iycl7avqi";
- name = "xdg-desktop-portal-kde-5.13.4.tar.xz";
+ url = "${mirror}/stable/plasma/5.13.5/xdg-desktop-portal-kde-5.13.5.tar.xz";
+ sha256 = "0i9pcbdxfh2cbv9ybk9i11l7vcm2ifx0zm3gkj3ry3bjxxbphn4f";
+ name = "xdg-desktop-portal-kde-5.13.5.tar.xz";
};
};
}
diff --git a/pkgs/development/compilers/boo/config.patch b/pkgs/development/compilers/boo/config.patch
deleted file mode 100644
index f6e0eee29b1..00000000000
--- a/pkgs/development/compilers/boo/config.patch
+++ /dev/null
@@ -1,45 +0,0 @@
-diff --git a/default.build b/default.build
-index e48fd9e..b0dee4f 100644
---- a/default.build
-+++ b/default.build
-@@ -23,14 +23,14 @@
-
-
-
--
-+
-
-
-
-
-
-
--
-+
-
-
-
-@@ -575,9 +575,9 @@
- key files for mime detection, etc
- -->
-
--
-+
-
--
-+
-
-
-
-@@ -707,9 +707,9 @@
- key files for mime detection, etc
- -->
-
--
-+
-
--
-+
-
-
-
diff --git a/pkgs/development/compilers/boo/default.nix b/pkgs/development/compilers/boo/default.nix
deleted file mode 100644
index ec5e08ffda4..00000000000
--- a/pkgs/development/compilers/boo/default.nix
+++ /dev/null
@@ -1,46 +0,0 @@
-{ stdenv, fetchFromGitHub, pkgconfig, mono, makeWrapper, nant
-, shared-mime-info, gtksourceview, gtk2 }:
-
-let
- release = "alpha";
-in stdenv.mkDerivation rec {
- name = "boo-${version}";
- version = "2013-10-21";
-
- src = fetchFromGitHub {
- owner = "boo-lang";
- repo = "boo";
-
- rev = "${release}";
- sha256 = "174abdwfpq8i3ijx6bwqll16lx7xwici374rgsbymyk8g8mla094";
- };
-
- nativeBuildInputs = [ pkgconfig ];
- buildInputs = [
- mono makeWrapper nant shared-mime-info gtksourceview
- gtk2
- ];
-
- patches = [ ./config.patch ];
-
- postPatch = ''
- sed -e 's|\$out|'$out'|' -i default.build
- '';
-
- buildPhase = ''
- nant -t:mono-4.5
- '';
-
- installPhase = ''
- nant install
- cp $out/lib/mono/boo/*.dll $out/lib/boo/
- '';
-
- dontStrip = true;
-
- meta = with stdenv.lib; {
- description = "The Boo Programming Language";
- platforms = platforms.linux;
- broken = true;
- };
-}
diff --git a/pkgs/development/compilers/clasp/default.nix b/pkgs/development/compilers/clasp/default.nix
index 6ff2028e3c1..2c260e110d6 100644
--- a/pkgs/development/compilers/clasp/default.nix
+++ b/pkgs/development/compilers/clasp/default.nix
@@ -70,5 +70,6 @@ stdenv.mkDerivation rec {
maintainers = [stdenv.lib.maintainers.raskin];
platforms = stdenv.lib.platforms.linux;
homepage = "https://github.com/drmeister/clasp";
+ broken = true; # 2018-09-08, no successful build since 2018-01-03
};
}
diff --git a/pkgs/development/compilers/ghc/8.4.3.nix b/pkgs/development/compilers/ghc/8.4.3.nix
index aa9fab18436..365f401119d 100644
--- a/pkgs/development/compilers/ghc/8.4.3.nix
+++ b/pkgs/development/compilers/ghc/8.4.3.nix
@@ -99,6 +99,10 @@ stdenv.mkDerivation (rec {
sha256 = "0plzsbfaq6vb1023lsarrjglwgr9chld4q3m99rcfzx0yx5mibp3";
extraPrefix = "utils/hsc2hs/";
stripLen = 1;
+ }) (fetchpatch rec { # https://phabricator.haskell.org/D5123
+ url = "http://tarballs.nixos.org/sha256/${sha256}";
+ name = "D5123.diff";
+ sha256 = "0nhqwdamf2y4gbwqxcgjxs0kqx23w9gv5kj0zv6450dq19rji82n";
})] ++ stdenv.lib.optional deterministicProfiling
(fetchpatch rec {
url = "http://tarballs.nixos.org/sha256/${sha256}";
diff --git a/pkgs/development/compilers/ghc/8.6.1.nix b/pkgs/development/compilers/ghc/8.6.1.nix
index 7fcb5296915..36ef9d0cc73 100644
--- a/pkgs/development/compilers/ghc/8.6.1.nix
+++ b/pkgs/development/compilers/ghc/8.6.1.nix
@@ -2,7 +2,7 @@
# build-tools
, bootPkgs, alex, happy, hscolour
-, autoconf, automake, coreutils, fetchurl, perl, python3, m4
+, autoconf, automake, coreutils, fetchurl, fetchpatch, perl, python3, m4
, libiconv ? null, ncurses
@@ -90,6 +90,12 @@ stdenv.mkDerivation (rec {
outputs = [ "out" "doc" ];
+ patches = [(fetchpatch rec { # https://phabricator.haskell.org/D5123
+ url = "http://tarballs.nixos.org/sha256/${sha256}";
+ name = "D5123.diff";
+ sha256 = "0nhqwdamf2y4gbwqxcgjxs0kqx23w9gv5kj0zv6450dq19rji82n";
+ })];
+
postPatch = "patchShebangs .";
# GHC is a bit confused on its cross terminology.
diff --git a/pkgs/development/coq-modules/QuickChick/default.nix b/pkgs/development/coq-modules/QuickChick/default.nix
index 35cf63af862..fc88a1c33ee 100644
--- a/pkgs/development/coq-modules/QuickChick/default.nix
+++ b/pkgs/development/coq-modules/QuickChick/default.nix
@@ -43,7 +43,7 @@ stdenv.mkDerivation rec {
'';
meta = with stdenv.lib; {
- homepage = git://github.com/QuickChick/QuickChick.git;
+ homepage = https://github.com/QuickChick/QuickChick;
description = "Randomized property-based testing plugin for Coq; a clone of Haskell QuickCheck";
maintainers = with maintainers; [ jwiegley ];
platforms = coq.meta.platforms;
diff --git a/pkgs/development/coq-modules/category-theory/default.nix b/pkgs/development/coq-modules/category-theory/default.nix
index 795c177bc80..c707fcdbd6b 100644
--- a/pkgs/development/coq-modules/category-theory/default.nix
+++ b/pkgs/development/coq-modules/category-theory/default.nix
@@ -36,7 +36,7 @@ stdenv.mkDerivation rec {
'';
meta = with stdenv.lib; {
- homepage = git://github.com/jwiegley/category-theory.git;
+ homepage = https://github.com/jwiegley/category-theory;
description = "A formalization of category theory in Coq for personal study and practical work";
maintainers = with maintainers; [ jwiegley ];
platforms = coq.meta.platforms;
diff --git a/pkgs/development/coq-modules/coq-haskell/default.nix b/pkgs/development/coq-modules/coq-haskell/default.nix
index a66e941a8c9..9d9a4cb5f1a 100644
--- a/pkgs/development/coq-modules/coq-haskell/default.nix
+++ b/pkgs/development/coq-modules/coq-haskell/default.nix
@@ -42,7 +42,7 @@ stdenv.mkDerivation rec {
'';
meta = with stdenv.lib; {
- homepage = git://github.com/jwiegley/coq-haskell.git;
+ homepage = https://github.com/jwiegley/coq-haskell;
description = "A library for formalizing Haskell types and functions in Coq";
maintainers = with maintainers; [ jwiegley ];
platforms = coq.meta.platforms;
diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix
index ef55272d6e9..2f89623ecde 100644
--- a/pkgs/development/haskell-modules/configuration-common.nix
+++ b/pkgs/development/haskell-modules/configuration-common.nix
@@ -1074,16 +1074,10 @@ self: super: {
haddock-library = doJailbreak (dontCheck super.haddock-library);
haddock-library_1_6_0 = doJailbreak (dontCheck super.haddock-library_1_6_0);
- # cabal2nix requires hpack >= 0.29.6 but the LTS has hpack-0.28.2.
- # Lets remove this once the LTS has upraded to 0.29.6.
- hpack = super.hpack_0_29_7;
-
- # The test suite does not know how to find the 'cabal2nix' binary.
- cabal2nix = overrideCabal super.cabal2nix (drv: {
- preCheck = ''
- export PATH="$PWD/dist/build/cabal2nix:$PATH"
- export HOME="$TMPDIR/home"
- '';
+ # The tool needs a newer hpack version than the one mandated by LTS-12.x.
+ cabal2nix = super.cabal2nix.overrideScope (self: super: {
+ hpack = self.hpack_0_31_0;
+ yaml = self.yaml_0_10_1_1;
});
# Break out of "aeson <1.3, temporary <1.3".
@@ -1130,4 +1124,12 @@ self: super: {
# https://github.com/snapframework/xmlhtml/pull/37
xmlhtml = doJailbreak super.xmlhtml;
+
+ # https://github.com/NixOS/nixpkgs/issues/46467
+ safe-money-aeson = super.safe-money-aeson.override { safe-money = self.safe-money_0_7; };
+ safe-money-store = super.safe-money-store.override { safe-money = self.safe-money_0_7; };
+ safe-money-cereal = super.safe-money-cereal.override { safe-money = self.safe-money_0_7; };
+ safe-money-serialise = super.safe-money-serialise.override { safe-money = self.safe-money_0_7; };
+ safe-money-xmlbf = super.safe-money-xmlbf.override { safe-money = self.safe-money_0_7; };
+
} // import ./configuration-tensorflow.nix {inherit pkgs haskellLib;} self super
diff --git a/pkgs/development/haskell-modules/configuration-ghc-7.10.x.nix b/pkgs/development/haskell-modules/configuration-ghc-7.10.x.nix
index 9bd45c9887f..5684d14cadd 100644
--- a/pkgs/development/haskell-modules/configuration-ghc-7.10.x.nix
+++ b/pkgs/development/haskell-modules/configuration-ghc-7.10.x.nix
@@ -40,7 +40,7 @@ self: super: {
mtl = self.mtl_2_2_2;
parsec = self.parsec_3_1_13_0;
parsec_3_1_13_0 = addBuildDepends super.parsec_3_1_13_0 [self.fail self.semigroups];
- stm = self.stm_2_4_5_0;
+ stm = self.stm_2_4_5_1;
text = self.text_1_2_3_0;
# Build jailbreak-cabal with the latest version of Cabal.
diff --git a/pkgs/development/haskell-modules/configuration-ghc-8.0.x.nix b/pkgs/development/haskell-modules/configuration-ghc-8.0.x.nix
index f475512a8da..eca2d111b54 100644
--- a/pkgs/development/haskell-modules/configuration-ghc-8.0.x.nix
+++ b/pkgs/development/haskell-modules/configuration-ghc-8.0.x.nix
@@ -39,7 +39,7 @@ self: super: {
# These are now core libraries in GHC 8.4.x.
mtl = self.mtl_2_2_2;
parsec = self.parsec_3_1_13_0;
- stm = self.stm_2_4_5_0;
+ stm = self.stm_2_4_5_1;
text = self.text_1_2_3_0;
# https://github.com/bmillwood/applicative-quoters/issues/6
diff --git a/pkgs/development/haskell-modules/configuration-ghc-8.2.x.nix b/pkgs/development/haskell-modules/configuration-ghc-8.2.x.nix
index f73172e02d3..5d499c803da 100644
--- a/pkgs/development/haskell-modules/configuration-ghc-8.2.x.nix
+++ b/pkgs/development/haskell-modules/configuration-ghc-8.2.x.nix
@@ -39,7 +39,7 @@ self: super: {
# These are now core libraries in GHC 8.4.x.
mtl = self.mtl_2_2_2;
parsec = self.parsec_3_1_13_0;
- stm = self.stm_2_4_5_0;
+ stm = self.stm_2_4_5_1;
text = self.text_1_2_3_0;
# Make sure we can still build Cabal 1.x.
diff --git a/pkgs/development/haskell-modules/configuration-ghcjs.nix b/pkgs/development/haskell-modules/configuration-ghcjs.nix
index c79406a9472..7e8bc1a1e8e 100644
--- a/pkgs/development/haskell-modules/configuration-ghcjs.nix
+++ b/pkgs/development/haskell-modules/configuration-ghcjs.nix
@@ -25,7 +25,7 @@ self: super:
# GHCJS does not ship with the same core packages as GHC.
# https://github.com/ghcjs/ghcjs/issues/676
- stm = self.stm_2_4_5_0;
+ stm = self.stm_2_4_5_1;
ghc-compact = self.ghc-compact_0_1_0_0;
network = addBuildTools super.network (pkgs.lib.optional pkgs.buildPlatform.isDarwin pkgs.buildPackages.darwin.libiconv);
diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml
index 4a26fcbffc1..467234b8a25 100644
--- a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml
+++ b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml
@@ -43,7 +43,7 @@ core-packages:
default-package-overrides:
# Newer versions require contravariant-1.5.*, which many builds refuse at the moment.
- base-compat-batteries ==0.10.1
- # LTS Haskell 12.7
+ # LTS Haskell 12.9
- abstract-deque ==0.3
- abstract-deque-tests ==0.3
- abstract-par ==0.3.3
@@ -63,7 +63,7 @@ default-package-overrides:
- aeson-compat ==0.3.8
- aeson-diff ==1.1.0.5
- aeson-extra ==0.4.1.1
- - aeson-generic-compat ==0.0.1.2
+ - aeson-generic-compat ==0.0.1.3
- aeson-iproute ==0.2
- aeson-picker ==0.1.0.4
- aeson-pretty ==0.8.7
@@ -81,7 +81,7 @@ default-package-overrides:
- Allure ==0.8.3.0
- almost-fix ==0.0.2
- alsa-core ==0.5.0.1
- - alsa-pcm ==0.6.1
+ - alsa-pcm ==0.6.1.1
- alsa-seq ==0.6.0.7
- alternative-vector ==0.0.0
- alternators ==1.0.0.0
@@ -183,7 +183,7 @@ default-package-overrides:
- api-field-json-th ==0.1.0.2
- appar ==0.1.4
- apply-refact ==0.5.0.0
- - apportionment ==0.0.0.2
+ - apportionment ==0.0.0.3
- approximate ==0.3.1
- app-settings ==0.2.0.11
- arithmoi ==0.7.0.0
@@ -241,7 +241,7 @@ default-package-overrides:
- bcrypt ==0.0.11
- beam-core ==0.7.2.2
- beam-migrate ==0.3.2.1
- - bench ==1.0.11
+ - bench ==1.0.12
- bencode ==0.6.0.0
- between ==0.11.0.0
- bhoogle ==0.1.3.5
@@ -306,7 +306,7 @@ default-package-overrides:
- brick ==0.37.2
- brittany ==0.11.0.0
- broadcast-chan ==0.1.1
- - bsb-http-chunked ==0.0.0.2
+ - bsb-http-chunked ==0.0.0.3
- bson ==0.3.2.6
- bson-lens ==0.1.1
- btrfs ==0.1.2.3
@@ -337,7 +337,7 @@ default-package-overrides:
- cachix ==0.1.1
- cachix-api ==0.1.0.1
- cairo ==0.13.5.0
- - calendar-recycling ==0.0
+ - calendar-recycling ==0.0.0.1
- call-stack ==0.1.0
- capataz ==0.2.0.0
- carray ==0.1.6.8
@@ -400,7 +400,7 @@ default-package-overrides:
- clr-marshal ==0.2.0.0
- clumpiness ==0.17.0.0
- ClustalParser ==1.2.3
- - cmark-gfm ==0.1.4
+ - cmark-gfm ==0.1.5
- cmdargs ==0.10.20
- code-builder ==0.1.3
- codec ==0.2.1
@@ -413,8 +413,8 @@ default-package-overrides:
- colorful-monoids ==0.2.1.2
- colorize-haskell ==1.0.1
- colour ==2.3.4
- - combinatorial ==0.1
- - comfort-graph ==0.0.3
+ - combinatorial ==0.1.0.1
+ - comfort-graph ==0.0.3.1
- commutative ==0.0.1.4
- comonad ==5.0.4
- compactmap ==0.1.4.2.1
@@ -426,7 +426,7 @@ default-package-overrides:
- composable-associations-aeson ==0.1.0.0
- composition ==1.0.2.1
- composition-extra ==2.0.0
- - composition-prelude ==1.5.0.8
+ - composition-prelude ==1.5.3.1
- compressed ==3.11
- concise ==0.1.0.1
- concurrency ==1.6.0.0
@@ -470,7 +470,7 @@ default-package-overrides:
- cpu ==0.1.2
- cpuinfo ==0.1.0.1
- cql ==4.0.1
- - cql-io ==1.0.1
+ - cql-io ==1.0.1.1
- credential-store ==0.1.2
- criterion ==1.4.1.0
- criterion-measurement ==0.1.1.0
@@ -497,9 +497,9 @@ default-package-overrides:
- crypto-random ==0.0.9
- crypto-random-api ==0.2.0
- crypt-sha512 ==0
- - csg ==0.1.0.4
+ - csg ==0.1.0.5
- csp ==1.4.0
- - css-syntax ==0.0.7
+ - css-syntax ==0.0.8
- css-text ==0.1.3.0
- csv ==0.1.2
- ctrie ==0.2
@@ -514,9 +514,9 @@ default-package-overrides:
- cyclotomic ==0.5.1
- czipwith ==1.0.1.0
- darcs ==2.14.1
- - data-accessor ==0.2.2.7
+ - data-accessor ==0.2.2.8
- data-accessor-mtl ==0.2.0.4
- - data-accessor-template ==0.2.1.15
+ - data-accessor-template ==0.2.1.16
- data-accessor-transformers ==0.2.1.7
- data-binary-ieee754 ==0.4.4
- data-bword ==0.1.0.1
@@ -553,7 +553,7 @@ default-package-overrides:
- dawg-ord ==0.5.1.0
- dbcleaner ==0.1.3
- dbus ==1.0.1
- - debian-build ==0.10.1.1
+ - debian-build ==0.10.1.2
- debug ==0.1.1
- debug-trace-var ==0.2.0
- Decimal ==0.5.1
@@ -569,9 +569,9 @@ default-package-overrides:
- detour-via-sci ==1.0.0
- df1 ==0.1.1
- dhall ==1.15.1
- - dhall-bash ==1.0.14
- - dhall-json ==1.2.2
- - dhall-text ==1.0.11
+ - dhall-bash ==1.0.15
+ - dhall-json ==1.2.3
+ - dhall-text ==1.0.12
- di ==1.0.1
- diagrams ==1.4
- diagrams-builder ==0.8.0.3
@@ -624,7 +624,7 @@ default-package-overrides:
- DRBG ==0.5.5
- drifter ==0.2.3
- drifter-postgresql ==0.2.1
- - dsp ==0.2.4
+ - dsp ==0.2.4.1
- dual-tree ==0.2.2
- dublincore-xml-conduit ==0.1.0.2
- dunai ==0.4.0.0
@@ -671,7 +671,7 @@ default-package-overrides:
- errors-ext ==0.4.2
- error-util ==0.0.1.2
- ersatz ==0.4.4
- - etc ==0.4.0.3
+ - etc ==0.4.1.0
- event ==0.1.4
- eventful-core ==0.2.0
- eventful-memory ==0.2.0
@@ -699,7 +699,7 @@ default-package-overrides:
- extensible-exceptions ==0.1.1.4
- extra ==1.6.9
- extractable-singleton ==0.0.1
- - extrapolate ==0.3.1
+ - extrapolate ==0.3.3
- facts ==0.0.1.0
- fail ==4.9.0.0
- farmhash ==0.1.0.5
@@ -726,8 +726,8 @@ default-package-overrides:
- fileplow ==0.1.0.0
- filter-logger ==0.6.0.0
- filtrable ==0.1.1.0
+ - Fin ==0.2.5.0
- fin ==0.0.1
- - Fin ==0.2.3.0
- FindBin ==0.0.5
- find-clumpiness ==0.2.3.1
- fingertree ==0.1.4.1
@@ -747,6 +747,7 @@ default-package-overrides:
- fmlist ==0.9.2
- fn ==0.3.0.2
- focus ==0.1.5.2
+ - foldable1 ==0.1.0.0
- fold-debounce ==0.2.0.7
- fold-debounce-conduit ==0.2.0.1
- foldl ==1.4.3
@@ -807,7 +808,7 @@ default-package-overrides:
- genvalidity-path ==0.3.0.2
- genvalidity-property ==0.2.1.0
- genvalidity-scientific ==0.2.0.1
- - genvalidity-text ==0.5.0.2
+ - genvalidity-text ==0.5.1.0
- genvalidity-time ==0.2.1.0
- genvalidity-unordered-containers ==0.2.0.3
- genvalidity-uuid ==0.1.0.2
@@ -860,7 +861,7 @@ default-package-overrides:
- gloss-rendering ==1.12.0.0
- GLURaw ==2.0.0.4
- GLUT ==2.7.0.14
- - gnuplot ==0.5.5.2
+ - gnuplot ==0.5.5.3
- goggles ==0.3.2
- google-oauth2-jwt ==0.3.0
- gpolyline ==0.1.0.1
@@ -890,7 +891,7 @@ default-package-overrides:
- hamtsolo ==1.0.3
- HandsomeSoup ==0.4.2
- handwriting ==0.1.0.3
- - hapistrano ==0.3.5.9
+ - hapistrano ==0.3.5.10
- happstack-server ==7.5.1.1
- happy ==1.19.9
- hasbolt ==0.1.3.0
@@ -944,7 +945,7 @@ default-package-overrides:
- hebrew-time ==0.1.1
- hedgehog ==0.6
- hedgehog-corpus ==0.1.0
- - hedis ==0.10.3
+ - hedis ==0.10.4
- here ==1.2.13
- heredoc ==0.2.0.0
- heterocephalus ==1.0.5.2
@@ -981,7 +982,7 @@ default-package-overrides:
- hopfli ==0.2.2.1
- hostname ==1.0
- hostname-validate ==1.0.0
- - hourglass ==0.2.11
+ - hourglass ==0.2.12
- hourglass-orphans ==0.1.0.0
- hp2pretty ==0.8.0.2
- hpack ==0.28.2
@@ -1001,7 +1002,7 @@ default-package-overrides:
- HSet ==0.0.1
- hset ==2.2.0
- hsexif ==0.6.1.5
- - hs-functors ==0.1.2.0
+ - hs-functors ==0.1.3.0
- hs-GeoIP ==0.3
- hsini ==0.5.1.2
- hsinstall ==1.6
@@ -1079,7 +1080,7 @@ default-package-overrides:
- hw-mquery ==0.1.0.1
- hworker ==0.1.0.1
- hw-parser ==0.0.0.3
- - hw-prim ==0.6.2.9
+ - hw-prim ==0.6.2.14
- hw-rankselect ==0.10.0.3
- hw-rankselect-base ==0.3.2.1
- hw-string-parse ==0.0.0.4
@@ -1131,7 +1132,7 @@ default-package-overrides:
- intern ==0.9.2
- interpolate ==0.2.0
- interpolatedstring-perl6 ==1.0.0
- - interpolation ==0.1.0.2
+ - interpolation ==0.1.0.3
- IntervalMap ==0.6.0.0
- intervals ==0.8.1
- intro ==0.3.2.0
@@ -1163,7 +1164,7 @@ default-package-overrides:
- iterable ==3.0
- ixset-typed ==0.4
- ix-shapable ==0.1.0
- - jack ==0.7.1.3
+ - jack ==0.7.1.4
- jmacro ==0.6.15
- jmacro-rpc ==0.3.3
- jmacro-rpc-snap ==0.3
@@ -1175,7 +1176,7 @@ default-package-overrides:
- json ==0.9.2
- json-feed ==1.0.3
- json-rpc-client ==0.2.5.0
- - json-rpc-generic ==0.2.1.4
+ - json-rpc-generic ==0.2.1.5
- json-rpc-server ==0.2.6.0
- json-schema ==0.7.4.2
- JuicyPixels ==3.2.9.5
@@ -1210,18 +1211,18 @@ default-package-overrides:
- language-haskell-extract ==0.2.4
- language-java ==0.2.9
- language-javascript ==0.6.0.11
- - language-puppet ==1.3.20
+ - language-puppet ==1.3.20.1
- lapack-carray ==0.0.2
- lapack-ffi ==0.0.2
- - lapack-ffi-tools ==0.1.0.1
+ - lapack-ffi-tools ==0.1.1
- large-hashable ==0.1.0.4
- largeword ==1.2.5
- - latex ==0.1.0.3
+ - latex ==0.1.0.4
- lattices ==1.7.1.1
- lawful ==0.1.0.0
- lazyio ==0.1.0.4
- lca ==0.3.1
- - leancheck ==0.7.1
+ - leancheck ==0.7.3
- leapseconds-announced ==2017.1.0.1
- learn-physics ==0.6.2
- lens ==4.16.1
@@ -1325,10 +1326,10 @@ default-package-overrides:
- microlens ==0.4.9.1
- microlens-aeson ==2.3.0
- microlens-contra ==0.1.0.1
- - microlens-ghc ==0.4.9
+ - microlens-ghc ==0.4.9.1
- microlens-mtl ==0.1.11.1
- microlens-platform ==0.3.10
- - microlens-th ==0.4.2.1
+ - microlens-th ==0.4.2.2
- microspec ==0.1.0.0
- microstache ==1.0.1.1
- midi ==0.2.2.2
@@ -1463,7 +1464,7 @@ default-package-overrides:
- nsis ==0.3.2
- numbers ==3000.2.0.2
- numeric-extras ==0.1
- - numeric-prelude ==0.4.3
+ - numeric-prelude ==0.4.3.1
- numhask ==0.2.3.1
- numhask-prelude ==0.1.0.1
- numhask-range ==0.2.3.1
@@ -1491,7 +1492,7 @@ default-package-overrides:
- oo-prototypes ==0.1.0.0
- OpenAL ==1.7.0.4
- open-browser ==0.2.1.0
- - openexr-write ==0.1.0.1
+ - openexr-write ==0.1.0.2
- OpenGL ==3.0.2.2
- OpenGLRaw ==3.3.1.0
- openpgp-asciiarmor ==0.1.1
@@ -1552,10 +1553,10 @@ default-package-overrides:
- persistent ==2.8.2
- persistent-iproute ==0.2.3
- persistent-mysql ==2.8.1
- - persistent-mysql-haskell ==0.4.1
+ - persistent-mysql-haskell ==0.4.2
- persistent-postgresql ==2.8.2.0
- persistent-refs ==0.4
- - persistent-sqlite ==2.8.1.2
+ - persistent-sqlite ==2.8.2
- persistent-template ==2.5.4
- pgp-wordlist ==0.1.0.2
- pg-transact ==0.1.0.1
@@ -1594,7 +1595,7 @@ default-package-overrides:
- poly-arity ==0.1.0
- polynomials-bernstein ==1.1.2
- polyparse ==1.12
- - pooled-io ==0.0.2.1
+ - pooled-io ==0.0.2.2
- portable-lines ==0.1
- postgresql-binary ==0.12.1.1
- postgresql-libpq ==0.9.4.1
@@ -1628,9 +1629,9 @@ default-package-overrides:
- primes ==0.2.1.0
- primitive ==0.6.3.0
- prim-uniq ==0.1.0.1
- - probability ==0.2.5.1
+ - probability ==0.2.5.2
- process-extras ==0.7.4
- - product-isomorphic ==0.0.3.2
+ - product-isomorphic ==0.0.3.3
- product-profunctors ==0.10.0.0
- profiterole ==0.1
- profunctors ==5.2.2
@@ -1643,14 +1644,14 @@ default-package-overrides:
- protobuf-simple ==0.1.0.5
- protocol-buffers ==2.4.11
- protocol-buffers-descriptor ==2.4.11
- - protocol-radius ==0.0.1.0
+ - protocol-radius ==0.0.1.1
- protocol-radius-test ==0.0.1.0
- proto-lens ==0.3.1.0
- - proto-lens-arbitrary ==0.1.2.1
- - proto-lens-combinators ==0.1.0.10
- - proto-lens-optparse ==0.1.1.1
+ - proto-lens-arbitrary ==0.1.2.2
+ - proto-lens-combinators ==0.1.0.11
+ - proto-lens-optparse ==0.1.1.2
- proto-lens-protobuf-types ==0.3.0.1
- - proto-lens-protoc ==0.3.1.0
+ - proto-lens-protoc ==0.3.1.2
- protolude ==0.2.2
- proxied ==0.3
- psql-helpers ==0.1.0.0
@@ -1743,7 +1744,7 @@ default-package-overrides:
- rest-stringmap ==0.2.0.7
- result ==0.2.6.0
- rethinkdb-client-driver ==0.0.25
- - retry ==0.7.6.3
+ - retry ==0.7.7.0
- rev-state ==0.1.2
- rfc5051 ==0.1.0.3
- rhine ==0.4.0.1
@@ -1776,8 +1777,8 @@ default-package-overrides:
- sandman ==0.2.0.1
- say ==0.1.0.1
- sbp ==2.3.17
- - scalendar ==1.2.0
- SCalendar ==1.1.0
+ - scalendar ==1.2.0
- scalpel ==0.5.1
- scalpel-core ==0.5.1
- scanner ==0.2
@@ -1826,7 +1827,7 @@ default-package-overrides:
- servant-lucid ==0.8.1
- servant-mock ==0.8.4
- servant-pandoc ==0.5.0.0
- - servant-ruby ==0.8.0.1
+ - servant-ruby ==0.8.0.2
- servant-server ==0.14.1
- servant-static-th ==0.2.2.0
- servant-streaming ==0.3.0.0
@@ -1845,7 +1846,7 @@ default-package-overrides:
- ses-html ==0.4.0.0
- set-cover ==0.0.9
- setenv ==0.1.1.3
- - setlocale ==1.0.0.6
+ - setlocale ==1.0.0.8
- sexp-grammar ==2.0.1
- SHA ==1.6.4.4
- shake ==0.16.4
@@ -1873,8 +1874,8 @@ default-package-overrides:
- siphash ==1.0.3
- size-based ==0.1.1.0
- skein ==1.0.9.4
- - skylighting ==0.7.2
- - skylighting-core ==0.7.2
+ - skylighting ==0.7.3
+ - skylighting-core ==0.7.3
- slack-web ==0.2.0.6
- slave-thread ==1.0.2
- smallcheck ==1.1.5
@@ -1898,7 +1899,7 @@ default-package-overrides:
- sparkle ==0.7.4
- sparse-linear-algebra ==0.3.1
- special-values ==0.1.0.0
- - speculate ==0.3.2
+ - speculate ==0.3.5
- speculation ==1.5.0.3
- speedy-slice ==0.3.0
- sphinx ==0.6.0.2
@@ -1994,7 +1995,7 @@ default-package-overrides:
- tao ==1.0.0
- tao-example ==1.0.0
- tar ==0.5.1.0
- - tar-conduit ==0.2.3.1
+ - tar-conduit ==0.2.5
- tardis ==0.4.1.0
- tasty ==1.1.0.3
- tasty-ant-xml ==1.1.4
@@ -2033,11 +2034,11 @@ default-package-overrides:
- texmath ==0.11.0.1
- text ==1.2.3.0
- text-binary ==0.2.1.1
- - text-builder ==0.5.3.1
+ - text-builder ==0.5.4.3
- text-conversions ==0.3.0
- text-icu ==0.7.0.1
- text-latin1 ==0.3.1
- - text-ldap ==0.1.1.12
+ - text-ldap ==0.1.1.13
- textlocal ==0.1.0.5
- text-manipulate ==0.2.0.1
- text-metrics ==0.3.0
@@ -2050,12 +2051,12 @@ default-package-overrides:
- tfp ==1.0.0.2
- tf-random ==0.5
- th-abstraction ==0.2.8.0
- - th-data-compat ==0.0.2.6
+ - th-data-compat ==0.0.2.7
- th-desugar ==1.8
- these ==0.7.4
- th-expand-syns ==0.4.4.0
- th-extras ==0.0.0.4
- - th-lift ==0.7.10
+ - th-lift ==0.7.11
- th-lift-instances ==0.1.11
- th-nowq ==0.1.0.2
- th-orphans ==0.13.6
@@ -2065,7 +2066,7 @@ default-package-overrides:
- threads ==0.5.1.6
- threads-extras ==0.1.0.2
- threepenny-gui ==0.8.2.4
- - th-reify-compat ==0.0.1.4
+ - th-reify-compat ==0.0.1.5
- th-reify-many ==0.1.8
- throttle-io-stream ==0.2.0.1
- through-text ==0.1.0.0
@@ -2078,7 +2079,7 @@ default-package-overrides:
- timeit ==2.0
- timelens ==0.2.0.2
- time-lens ==0.4.0.2
- - time-locale-compat ==0.1.1.4
+ - time-locale-compat ==0.1.1.5
- time-locale-vietnamese ==1.0.0.0
- time-parsers ==0.1.2.0
- timerep ==2.0.0.2
@@ -2155,10 +2156,10 @@ default-package-overrides:
- universe-reverse-instances ==1.0
- universum ==1.2.0
- unix-bytestring ==0.3.7.3
- - unix-compat ==0.5.0.1
+ - unix-compat ==0.5.1
- unix-time ==0.3.8
- - unliftio ==0.2.7.0
- - unliftio-core ==0.1.1.0
+ - unliftio ==0.2.7.1
+ - unliftio-core ==0.1.2.0
- unlit ==0.4.0.0
- unordered-containers ==0.2.9.0
- unordered-intmap ==0.1.1
@@ -2172,7 +2173,7 @@ default-package-overrides:
- users-test ==0.5.0.1
- utf8-light ==0.4.2
- utf8-string ==1.0.1.1
- - util ==0.1.10.1
+ - util ==0.1.11.0
- utility-ht ==0.0.14
- uuid ==1.3.13
- uuid-types ==1.0.3
@@ -2181,18 +2182,18 @@ default-package-overrides:
- validity-aeson ==0.2.0.2
- validity-bytestring ==0.3.0.2
- validity-containers ==0.3.1.0
- - validity-path ==0.3.0.1
- - validity-scientific ==0.2.0.1
- - validity-text ==0.3.0.1
- - validity-time ==0.2.0.1
- - validity-unordered-containers ==0.2.0.1
- - validity-uuid ==0.1.0.1
- - validity-vector ==0.2.0.1
+ - validity-path ==0.3.0.2
+ - validity-scientific ==0.2.0.2
+ - validity-text ==0.3.1.0
+ - validity-time ==0.2.0.2
+ - validity-unordered-containers ==0.2.0.2
+ - validity-uuid ==0.1.0.2
+ - validity-vector ==0.2.0.2
- valor ==0.1.0.0
- vault ==0.3.1.2
- vec ==0.1
- vector ==0.12.0.1
- - vector-algorithms ==0.7.0.1
+ - vector-algorithms ==0.7.0.4
- vector-binary-instances ==0.2.4
- vector-buffer ==0.4.1
- vector-builder ==0.3.6
@@ -2220,7 +2221,7 @@ default-package-overrides:
- wai-conduit ==3.0.0.4
- wai-cors ==0.2.6
- wai-eventsource ==3.0.0
- - wai-extra ==3.0.24.1
+ - wai-extra ==3.0.24.2
- wai-handler-launch ==3.0.2.4
- wai-logger ==2.3.2
- wai-middleware-caching ==0.1.0.2
@@ -2377,6 +2378,7 @@ extra-packages:
- Cabal == 1.18.* # required for cabal-install et al on old GHC versions
- Cabal == 1.20.* # required for cabal-install et al on old GHC versions
- Cabal == 1.24.* # required for jailbreak-cabal etc.
+ - Cabal == 2.2.* # required for jailbreak-cabal etc.
- colour < 2.3.4 # newer versions don't support GHC 7.10.x
- conduit >=1.1 && <1.3 # pre-lts-11.x versions neeed by git-annex 6.20180227
- conduit-extra >=1.1 && <1.3 # pre-lts-11.x versions neeed by git-annex 6.20180227
@@ -9059,7 +9061,6 @@ dont-distribute-packages:
termcolor: [ i686-linux, x86_64-linux, x86_64-darwin ]
terminal-text: [ i686-linux, x86_64-linux, x86_64-darwin ]
termination-combinators: [ i686-linux, x86_64-linux, x86_64-darwin ]
- termonad: [ i686-linux, x86_64-linux, x86_64-darwin ]
termplot: [ i686-linux, x86_64-linux, x86_64-darwin ]
terntup: [ i686-linux, x86_64-linux, x86_64-darwin ]
terrahs: [ i686-linux, x86_64-linux, x86_64-darwin ]
diff --git a/pkgs/development/haskell-modules/configuration-nix.nix b/pkgs/development/haskell-modules/configuration-nix.nix
index d363d2e87b6..d016bd6ce8d 100644
--- a/pkgs/development/haskell-modules/configuration-nix.nix
+++ b/pkgs/development/haskell-modules/configuration-nix.nix
@@ -314,9 +314,6 @@ self: super: builtins.intersectAttrs super {
# https://github.com/bos/pcap/issues/5
pcap = addExtraLibrary super.pcap pkgs.libpcap;
- # https://github.com/snoyberg/yaml/issues/106
- yaml = disableCabalFlag super.yaml "system-libyaml";
-
# The cabal files for these libraries do not list the required system dependencies.
miniball = overrideCabal super.miniball (drv: {
librarySystemDepends = [ pkgs.miniball ];
@@ -510,4 +507,8 @@ self: super: builtins.intersectAttrs super {
LDAP = dontCheck (overrideCabal super.LDAP (drv: {
librarySystemDepends = drv.librarySystemDepends or [] ++ [ pkgs.cyrus_sasl.dev ];
}));
+
+ # Doctests hang only when compiling with nix.
+ # https://github.com/cdepillabout/termonad/issues/15
+ termonad = dontCheck super.termonad;
}
diff --git a/pkgs/development/haskell-modules/generic-builder.nix b/pkgs/development/haskell-modules/generic-builder.nix
index 1b33954662d..cdbf119af8c 100644
--- a/pkgs/development/haskell-modules/generic-builder.nix
+++ b/pkgs/development/haskell-modules/generic-builder.nix
@@ -26,7 +26,7 @@ in
, editedCabalFile ? null
, enableLibraryProfiling ? true
, enableExecutableProfiling ? false
-, profilingDetail ? "all-functions"
+, profilingDetail ? "exported-functions"
# TODO enable shared libs for cross-compiling
, enableSharedExecutables ? false
, enableSharedLibraries ? (ghc.enableShared or false)
@@ -134,7 +134,7 @@ let
buildFlagsString = optionalString (buildFlags != []) (" " + concatStringsSep " " buildFlags);
defaultConfigureFlags = [
- "--verbose" "--prefix=$out" "--libdir=\\$prefix/lib/\\$compiler" "--libsubdir=\\$pkgid"
+ "--verbose" "--prefix=$out" "--libdir=\\$prefix/lib/\\$compiler" "--libsubdir=\\$abi/\\$libname"
(optionalString enableSeparateDataOutput "--datadir=$data/share/${ghc.name}")
(optionalString enableSeparateDocOutput "--docdir=${docdir "$doc"}")
"--with-gcc=$CC" # Clang won't work without that extra information.
diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix
index c1fb70ee2e6..003d9d259ac 100644
--- a/pkgs/development/haskell-modules/hackage-packages.nix
+++ b/pkgs/development/haskell-modules/hackage-packages.nix
@@ -2469,6 +2469,35 @@ self: {
hydraPlatforms = stdenv.lib.platforms.none;
}) {};
+ "Cabal_2_4_0_0" = callPackage
+ ({ mkDerivation, array, base, base-compat, base-orphans, binary
+ , bytestring, containers, deepseq, Diff, directory, filepath
+ , integer-logarithms, mtl, optparse-applicative, parsec, pretty
+ , process, QuickCheck, tagged, tar, tasty, tasty-golden
+ , tasty-hunit, tasty-quickcheck, temporary, text, time
+ , transformers, tree-diff, unix
+ }:
+ mkDerivation {
+ pname = "Cabal";
+ version = "2.4.0.0";
+ sha256 = "1zz0vadgr8vn2x7fzv4hcip1mcvxah50sx6zzrxhn9c1lw0l0cgl";
+ setupHaskellDepends = [ mtl parsec ];
+ libraryHaskellDepends = [
+ array base binary bytestring containers deepseq directory filepath
+ mtl parsec pretty process text time transformers unix
+ ];
+ testHaskellDepends = [
+ array base base-compat base-orphans bytestring containers deepseq
+ Diff directory filepath integer-logarithms optparse-applicative
+ pretty process QuickCheck tagged tar tasty tasty-golden tasty-hunit
+ tasty-quickcheck temporary text tree-diff
+ ];
+ doCheck = false;
+ description = "A framework for packaging Haskell software";
+ license = stdenv.lib.licenses.bsd3;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ }) {};
+
"Cabal-ide-backend" = callPackage
({ mkDerivation, array, base, binary, bytestring, Cabal, containers
, deepseq, directory, extensible-exceptions, filepath, HUnit
@@ -5391,17 +5420,6 @@ self: {
}) {};
"Fin" = callPackage
- ({ mkDerivation, base, natural-induction, peano }:
- mkDerivation {
- pname = "Fin";
- version = "0.2.3.0";
- sha256 = "1cjsp6i1ak2icjmg0xrprn2xminz35mxb4dj1nsvjvs2qqgjvl1g";
- libraryHaskellDepends = [ base natural-induction peano ];
- description = "Finite totally-ordered sets";
- license = stdenv.lib.licenses.bsd3;
- }) {};
-
- "Fin_0_2_5_0" = callPackage
({ mkDerivation, alg, base, foldable1, natural-induction, peano }:
mkDerivation {
pname = "Fin";
@@ -5412,7 +5430,6 @@ self: {
];
description = "Finite totally-ordered sets";
license = stdenv.lib.licenses.bsd3;
- hydraPlatforms = stdenv.lib.platforms.none;
}) {};
"Finance-Quote-Yahoo" = callPackage
@@ -5768,27 +5785,30 @@ self: {
}) {};
"Frames" = callPackage
- ({ mkDerivation, base, contravariant, criterion, deepseq, directory
- , discrimination, ghc-prim, hashable, hspec, htoml, HUnit, pipes
- , pipes-bytestring, pipes-group, pipes-parse, pipes-safe
- , pipes-text, pretty, primitive, readable, regex-applicative
- , template-haskell, temporary, text, transformers
- , unordered-containers, vector, vinyl
+ ({ mkDerivation, attoparsec, base, bytestring, containers
+ , contravariant, criterion, deepseq, directory, discrimination
+ , foldl, ghc-prim, hashable, hspec, htoml, HUnit, lens, pipes
+ , pipes-bytestring, pipes-group, pipes-parse, pipes-safe, pretty
+ , primitive, readable, regex-applicative, template-haskell
+ , temporary, text, transformers, unordered-containers, vector
+ , vector-th-unbox, vinyl
}:
mkDerivation {
pname = "Frames";
- version = "0.4.0";
- sha256 = "06yh8vl3s5543nxhndjd2wsbclka4in4nsbjqzbpcg9g8s8x3z20";
+ version = "0.5.0";
+ sha256 = "0dd2gqgxjhy23a9xhz62gzashjqmcv34gkcys4wz9l6y2fk1a5xl";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [
- base contravariant deepseq discrimination ghc-prim hashable pipes
- pipes-bytestring pipes-group pipes-parse pipes-safe pipes-text
- primitive readable template-haskell text transformers vector vinyl
+ base bytestring containers contravariant deepseq discrimination
+ ghc-prim hashable pipes pipes-bytestring pipes-group pipes-parse
+ pipes-safe primitive readable template-haskell text transformers
+ vector vector-th-unbox vinyl
];
testHaskellDepends = [
- base directory hspec htoml HUnit pipes pretty regex-applicative
- template-haskell temporary text unordered-containers vinyl
+ attoparsec base directory foldl hspec htoml HUnit lens pipes pretty
+ regex-applicative template-haskell temporary text
+ unordered-containers vinyl
];
benchmarkHaskellDepends = [ base criterion pipes transformers ];
description = "Data frames For working with tabular data files";
@@ -5804,8 +5824,8 @@ self: {
}:
mkDerivation {
pname = "Frames-beam";
- version = "0.1.0.1";
- sha256 = "12n3pyr88ihgkfwynhvjx3m9fr1fbznpkgx9ihf7mqar9d8wnywj";
+ version = "0.2.0.0";
+ sha256 = "1fzd41zwx5zmbysk49z2r9ga11z8c0vqqfvb4zgbcm3ivhkn48yi";
libraryHaskellDepends = [
base beam-core beam-migrate beam-postgres bytestring conduit Frames
generics-sop monad-control postgresql-simple process scientific
@@ -6083,8 +6103,8 @@ self: {
}:
mkDerivation {
pname = "GLUtil";
- version = "0.10.1";
- sha256 = "08qsa22xhw4cdhdzc8ixlwjazi9s0n48395g4vf5qwfap9r8rdq3";
+ version = "0.10.2";
+ sha256 = "05x733nk3dbla4y6p7b1nx4pv3b0wm6idhsm7p30z2f968k3hyv9";
libraryHaskellDepends = [
array base bytestring containers directory filepath hpp JuicyPixels
linear OpenGL OpenGLRaw transformers vector
@@ -9852,6 +9872,21 @@ self: {
license = stdenv.lib.licenses.publicDomain;
}) {inherit (pkgs) openssl;};
+ "HsOpenSSL_0_11_4_15" = callPackage
+ ({ mkDerivation, base, bytestring, Cabal, network, openssl, time }:
+ mkDerivation {
+ pname = "HsOpenSSL";
+ version = "0.11.4.15";
+ sha256 = "0idmak6d8mpbxphyq9hkxkmby2wnzhc1phywlgm0zw6q47pwxgff";
+ setupHaskellDepends = [ base Cabal ];
+ libraryHaskellDepends = [ base bytestring network time ];
+ librarySystemDepends = [ openssl ];
+ testHaskellDepends = [ base bytestring ];
+ description = "Partial OpenSSL binding for Haskell";
+ license = stdenv.lib.licenses.publicDomain;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ }) {inherit (pkgs) openssl;};
+
"HsOpenSSL-x509-system" = callPackage
({ mkDerivation, base, bytestring, HsOpenSSL, unix }:
mkDerivation {
@@ -10175,8 +10210,8 @@ self: {
}:
mkDerivation {
pname = "IPv6DB";
- version = "0.3.0";
- sha256 = "0dz0ar75nd04l1cbca7iz9laqv24mach7ajr4k5ibl2717kczkpa";
+ version = "0.3.1";
+ sha256 = "06240z3nbjkf0rgwhvajjw28lckgpsfz5nbzzdqyfzgyg2r4wdcn";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [
@@ -12838,8 +12873,10 @@ self: {
({ mkDerivation, base, containers, random }:
mkDerivation {
pname = "NameGenerator";
- version = "0.0.1";
- sha256 = "1zzc944xdfxlqld6fnn6fiqrd9rs2cdzqv5jc8jx7azbvspq6y9f";
+ version = "0.0.2";
+ sha256 = "1rnn3i9rvb9z7iqd0hx730gv3n5hc1gbsdqsa0hlq3qxffg3sr8x";
+ revision = "1";
+ editedCabalFile = "01ma6068mnwn9f7jpa5g8kkl7lyhl5wnpw9ad44zz9gki1mrw37i";
libraryHaskellDepends = [ base containers random ];
description = "A name generator written in Haskell";
license = stdenv.lib.licenses.gpl3;
@@ -14549,12 +14586,12 @@ self: {
}) {};
"Prelude" = callPackage
- ({ mkDerivation, base-noprelude }:
+ ({ mkDerivation, base }:
mkDerivation {
pname = "Prelude";
- version = "0.1.0.0";
- sha256 = "0wcacpbqphb635pblqzbv44fhjwdnv0l90zr5i6c8x7mymqpcixj";
- libraryHaskellDepends = [ base-noprelude ];
+ version = "0.1.0.1";
+ sha256 = "14p4jkhzdh618r7gvj6dd4w1zj4b032g4nx43bihnnaf2dqyppy6";
+ libraryHaskellDepends = [ base ];
description = "A Prelude module replacement";
license = stdenv.lib.licenses.bsd3;
}) {};
@@ -14936,6 +14973,24 @@ self: {
license = stdenv.lib.licenses.bsd3;
}) {};
+ "QuickCheck_2_12_2" = callPackage
+ ({ mkDerivation, base, containers, deepseq, erf, process, random
+ , template-haskell, tf-random, transformers
+ }:
+ mkDerivation {
+ pname = "QuickCheck";
+ version = "2.12.2";
+ sha256 = "0cqjxwjn0374baf3qs059jmj8qr147i2fqxn6cjhsn4wbzxnc48r";
+ libraryHaskellDepends = [
+ base containers deepseq erf random template-haskell tf-random
+ transformers
+ ];
+ testHaskellDepends = [ base deepseq process ];
+ description = "Automatic testing of Haskell programs";
+ license = stdenv.lib.licenses.bsd3;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ }) {};
+
"QuickCheck-GenT" = callPackage
({ mkDerivation, base, mtl, QuickCheck, random }:
mkDerivation {
@@ -14980,6 +15035,8 @@ self: {
pname = "QuickPlot";
version = "0.1.0.1";
sha256 = "1d9zllxl8vyjmb9m9kdgrv9v9hwnspyiqhjnb5ds5kmby6r4r1h2";
+ revision = "1";
+ editedCabalFile = "0ykvkbrf5mavrk9jdl5w01dldwi3x2dwg89hiin95vi8ay0r02gq";
isLibrary = true;
isExecutable = true;
enableSeparateDataOutput = true;
@@ -15711,8 +15768,8 @@ self: {
({ mkDerivation, base, Cabal, SDL, SDL_gfx }:
mkDerivation {
pname = "SDL-gfx";
- version = "0.6.2.0";
- sha256 = "1y49wzy71ns7gwczmwvrx8d026y5nabqzvh8ymxxcy3brhay0shr";
+ version = "0.7.0.0";
+ sha256 = "1pmhbgdp4f9nz9mpxckx0mrhphccqsfcwfpflxmph5gx4mxk4xb2";
enableSeparateDataOutput = true;
setupHaskellDepends = [ base Cabal ];
libraryHaskellDepends = [ base SDL ];
@@ -18072,10 +18129,10 @@ self: {
({ mkDerivation, base, base-orphans }:
mkDerivation {
pname = "TypeCompose";
- version = "0.9.12";
- sha256 = "1qikwd8cq7pywz5j86hwc21ak15a3w5jrhyzmsrr30izr4n2q61s";
- revision = "1";
- editedCabalFile = "0j27xdfim7a6a16v834n3jdp1j7bsr3yn19bnfwni3xsvrc732q3";
+ version = "0.9.13";
+ sha256 = "0cmlldr665mzi0jsb567pn6qbqxr6cyq9ky3mfh1sfls5yhwr5hc";
+ revision = "2";
+ editedCabalFile = "026h1zgp7fj8ccq8rpzcq0s4wdbw2v7fskcj73n40mfhv0gx26y0";
libraryHaskellDepends = [ base base-orphans ];
description = "Type composition classes & instances";
license = stdenv.lib.licenses.bsd3;
@@ -21738,17 +21795,6 @@ self: {
}) {};
"aeson-generic-compat" = callPackage
- ({ mkDerivation, aeson, base }:
- mkDerivation {
- pname = "aeson-generic-compat";
- version = "0.0.1.2";
- sha256 = "08h4r8ni7i9x0fqx5gizv6fpwrq84lv8m4c3w6g2hirs0iscw233";
- libraryHaskellDepends = [ aeson base ];
- description = "Compatible generic class names of Aeson";
- license = stdenv.lib.licenses.bsd3;
- }) {};
-
- "aeson-generic-compat_0_0_1_3" = callPackage
({ mkDerivation, aeson, base }:
mkDerivation {
pname = "aeson-generic-compat";
@@ -21757,7 +21803,6 @@ self: {
libraryHaskellDepends = [ aeson base ];
description = "Compatible generic class names of Aeson";
license = stdenv.lib.licenses.bsd3;
- hydraPlatforms = stdenv.lib.platforms.none;
}) {};
"aeson-injector" = callPackage
@@ -21768,8 +21813,8 @@ self: {
}:
mkDerivation {
pname = "aeson-injector";
- version = "1.1.0.0";
- sha256 = "1dkl7sgzi9hzc86a27wfch7p33sj1h8zh7xsah3fbqjbz4y8z9wf";
+ version = "1.1.1.0";
+ sha256 = "04hg0vdrfb7x6qxwcifsayc6z5vhc1l96ahvswg8q5wddc00ypzp";
libraryHaskellDepends = [
aeson base bifunctors deepseq hashable lens servant-docs swagger2
text unordered-containers
@@ -23042,20 +23087,17 @@ self: {
"algebraic-graphs" = callPackage
({ mkDerivation, array, base, base-compat, base-orphans, containers
- , criterion, deepseq, extra, QuickCheck
+ , deepseq, extra, mtl, QuickCheck
}:
mkDerivation {
pname = "algebraic-graphs";
- version = "0.1.1.1";
- sha256 = "0c8jrp0z3ibla7isbn1v5nhfka56hwq8h10r7h3vca53yzbafiw7";
+ version = "0.2";
+ sha256 = "0rfs58z60nn041ymi7lilc7dyijka30l4hhdznfaz9sfzx4f8yl8";
libraryHaskellDepends = [
- array base base-compat containers deepseq
+ array base base-compat containers deepseq mtl
];
testHaskellDepends = [
- base base-compat base-orphans containers extra QuickCheck
- ];
- benchmarkHaskellDepends = [
- base base-compat containers criterion
+ array base base-compat base-orphans containers extra QuickCheck
];
description = "A library for algebraic graph construction and transformation";
license = stdenv.lib.licenses.mit;
@@ -23385,8 +23427,8 @@ self: {
}:
mkDerivation {
pname = "alsa-pcm";
- version = "0.6.1";
- sha256 = "0pafjds9xrhzwv3xz9qcknm9f2plz3bvqqjlznss1alhgf7pcga5";
+ version = "0.6.1.1";
+ sha256 = "1mllr9nbm3qb837zgvd6mrpr6f8i272wflv0a45rrpsq50zgcj33";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [
@@ -26708,6 +26750,20 @@ self: {
license = stdenv.lib.licenses.bsd3;
}) {};
+ "ansi-terminal_0_8_1" = callPackage
+ ({ mkDerivation, base, colour }:
+ mkDerivation {
+ pname = "ansi-terminal";
+ version = "0.8.1";
+ sha256 = "1fm489l5mnlyb6bidq7vxz5asvhshmxz38f0lijgj0z7yyzqpwwy";
+ isLibrary = true;
+ isExecutable = true;
+ libraryHaskellDepends = [ base colour ];
+ description = "Simple ANSI terminal support, with Windows compatibility";
+ license = stdenv.lib.licenses.bsd3;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ }) {};
+
"ansi-terminal-game" = callPackage
({ mkDerivation, ansi-terminal, array, base, bytestring, cereal
, clock, hspec, linebreak, split, terminal-size, timers-tick
@@ -27168,15 +27224,15 @@ self: {
}) {};
"apecs" = callPackage
- ({ mkDerivation, async, base, containers, criterion, linear, mtl
- , QuickCheck, template-haskell, vector
+ ({ mkDerivation, base, containers, criterion, linear, mtl
+ , QuickCheck, stm, template-haskell, vector
}:
mkDerivation {
pname = "apecs";
- version = "0.4.1.1";
- sha256 = "0ybw09hpjfjm22bza74n57aarv6nhwf5zi27q7q7a6yf5jpa5ccg";
+ version = "0.5.0.0";
+ sha256 = "11ya44z5lk2vk0pwz1m8ygr0x6gkf7xhwiy0k28s5kd65vlpx6bw";
libraryHaskellDepends = [
- async base containers mtl template-haskell vector
+ base containers mtl stm template-haskell vector
];
testHaskellDepends = [
base containers criterion linear QuickCheck vector
@@ -27729,13 +27785,13 @@ self: {
}) {};
"appendmap" = callPackage
- ({ mkDerivation, base, containers, hspec }:
+ ({ mkDerivation, base, containers, hspec, QuickCheck }:
mkDerivation {
pname = "appendmap";
- version = "0.1.3";
- sha256 = "1jssrwbsk0z9y4ialw9ly7vc95jrc64dr1idycwz1spgvn03adp6";
+ version = "0.1.5";
+ sha256 = "03mr60hgb5593s9vhc5890xwd2pdyismfkvnvw5hxhq26wda5grd";
libraryHaskellDepends = [ base containers ];
- testHaskellDepends = [ base containers hspec ];
+ testHaskellDepends = [ base containers hspec QuickCheck ];
description = "Map with a Semigroup and Monoid instances delegating to Semigroup of the elements";
license = stdenv.lib.licenses.bsd3;
}) {};
@@ -27895,8 +27951,8 @@ self: {
({ mkDerivation, base, containers, utility-ht }:
mkDerivation {
pname = "apportionment";
- version = "0.0.0.2";
- sha256 = "0azqr4c1zz19rba2gg2w31w38jslvjxgi1qh58qx60fvzxj9ab9m";
+ version = "0.0.0.3";
+ sha256 = "062v4a1ip7zy20b03z1jajqy2ylx5fl74p7px54b1vajf6vx0wcg";
libraryHaskellDepends = [ base containers utility-ht ];
description = "Round a set of numbers while maintaining its sum";
license = stdenv.lib.licenses.bsd3;
@@ -28435,8 +28491,8 @@ self: {
pname = "arithmoi";
version = "0.7.0.0";
sha256 = "0303bqlbf8abixcq3x3px2ijj01c9hlqadkv8rhls6f64a8h8cwb";
- revision = "2";
- editedCabalFile = "1db2pcwip682f4zs1qnqzqqdswhqzbsxydy89m6zqm5ddlgrw5sq";
+ revision = "3";
+ editedCabalFile = "1s0jm2y0jhfrj7af80csckiizkfq5h0v4zb92mkwh1pkfi763fha";
configureFlags = [ "-f-llvm" ];
libraryHaskellDepends = [
array base containers exact-pi ghc-prim integer-gmp
@@ -28762,16 +28818,17 @@ self: {
"ascii" = callPackage
({ mkDerivation, base, blaze-builder, bytestring, case-insensitive
- , hashable, text
+ , hashable, semigroups, text
}:
mkDerivation {
pname = "ascii";
- version = "0.0.4.1";
- sha256 = "1xpw2n3gskndg74ilrq8zngawlvc3mbsji3nx2aprar96hdlpvpv";
+ version = "0.0.5.1";
+ sha256 = "06z63pr5g1wcsyii3pr8svz23cl9n4srspbkvby595pxfcbzkirn";
libraryHaskellDepends = [
- base blaze-builder bytestring case-insensitive hashable text
+ base blaze-builder bytestring case-insensitive hashable semigroups
+ text
];
- description = "Type-safe, bytestring-based ASCII values. (deprecated)";
+ description = "Type-safe, bytestring-based ASCII values";
license = stdenv.lib.licenses.bsd3;
hydraPlatforms = stdenv.lib.platforms.none;
}) {};
@@ -28845,8 +28902,8 @@ self: {
}:
mkDerivation {
pname = "ascii-string";
- version = "1.0.1";
- sha256 = "0br053njgnfqwgmk7zz0fayiyycqq3sw8kxjpb2s9wx17arnq5kz";
+ version = "1.0.1.3";
+ sha256 = "1m11ms0x5di5qbckh2n7vnqqh94wv9p6zzynglg4ngijqhn4qjls";
libraryHaskellDepends = [
base bytestring cereal deepseq deferred-folds foldl hashable
primitive primitive-extras
@@ -29367,6 +29424,8 @@ self: {
pname = "async";
version = "2.2.1";
sha256 = "09whscli1q5z7lzyq9rfk0bq1ydplh6pjmc6qv0x668k5818c2wg";
+ revision = "1";
+ editedCabalFile = "0lg8c3iixm7vjjq2nydkqswj78i4iyx2k83hgs12z829yj196y31";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [ base hashable stm ];
@@ -29808,8 +29867,8 @@ self: {
({ mkDerivation, base, stm }:
mkDerivation {
pname = "atomic-modify";
- version = "0.1.0.1";
- sha256 = "0kkfbm7jkarzj42ja7093i1j1h4klg362pfz1cvldvdhzjgs009r";
+ version = "0.1.0.2";
+ sha256 = "0j4zhr02bmkpar80vzxxj91qyz97wi7kia79q20a1y3sqbmx2sk5";
libraryHaskellDepends = [ base stm ];
description = "A typeclass for mutable references that have an atomic modify operation";
license = stdenv.lib.licenses.asl20;
@@ -29935,19 +29994,20 @@ self: {
"ats-format" = callPackage
({ mkDerivation, ansi-wl-pprint, base, Cabal, cli-setup, directory
- , file-embed, htoml-megaparsec, language-ats, optparse-applicative
- , process, text, unordered-containers
+ , file-embed, filepath, htoml-megaparsec, language-ats, megaparsec
+ , optparse-applicative, process, text, unordered-containers
}:
mkDerivation {
pname = "ats-format";
- version = "0.2.0.28";
- sha256 = "0s538j8v0n8sdfi9pbykk2avbi3vg35iw2c9h6vmiyy3zszflqc4";
+ version = "0.2.0.29";
+ sha256 = "02zk3qbg2h14wc5x7sizllgj39zprgx63j8rbf2lk9nd3yiqc4va";
isLibrary = false;
isExecutable = true;
- setupHaskellDepends = [ base Cabal cli-setup ];
+ setupHaskellDepends = [ base Cabal cli-setup filepath ];
executableHaskellDepends = [
ansi-wl-pprint base directory file-embed htoml-megaparsec
- language-ats optparse-applicative process text unordered-containers
+ language-ats megaparsec optparse-applicative process text
+ unordered-containers
];
description = "A source-code formatter for ATS";
license = stdenv.lib.licenses.bsd3;
@@ -29964,8 +30024,8 @@ self: {
}:
mkDerivation {
pname = "ats-pkg";
- version = "3.2.1.8";
- sha256 = "183gdyivl6kab2k3z0jm6dk0wh83qwz3zvai7ayfkq3rjc6lb8ms";
+ version = "3.2.2.0";
+ sha256 = "10xwgc7y324fgisqjkx2jk5bq226fj3ayl373m6m1nbnx2qax22w";
isLibrary = true;
isExecutable = true;
enableSeparateDataOutput = true;
@@ -30540,15 +30600,15 @@ self: {
}) {};
"aur" = callPackage
- ({ mkDerivation, aeson, base, http-client, http-client-tls, servant
- , servant-client, tasty, tasty-hunit, text
+ ({ mkDerivation, aeson, base, errors, http-client, http-client-tls
+ , servant, servant-client, tasty, tasty-hunit, text
}:
mkDerivation {
pname = "aur";
- version = "6.0.0.1";
- sha256 = "1ip97gnny26h5ayq7x0yx4afls3nhd1kfhqz3l3bsjq7fvkn8jx0";
+ version = "6.1.0";
+ sha256 = "1wgff9vbp8sxqa0hyd6ifkld6yly20qijm15dfk72wpcsia86jx6";
libraryHaskellDepends = [
- aeson base http-client servant servant-client text
+ aeson base errors http-client servant servant-client text
];
testHaskellDepends = [
base http-client http-client-tls tasty tasty-hunit
@@ -30575,6 +30635,52 @@ self: {
hydraPlatforms = stdenv.lib.platforms.none;
}) {};
+ "aura" = callPackage
+ ({ mkDerivation, aeson, aeson-pretty, algebraic-graphs, array
+ , async, aur, base, base-prelude, bytestring, compactable
+ , containers, directory, errors, filepath, freer-simple
+ , generic-lens, http-client, http-client-tls, http-types
+ , language-bash, megaparsec, microlens, microlens-ghc, mtl
+ , mwc-random, network-uri, non-empty-containers
+ , optparse-applicative, paths, pretty-simple, prettyprinter
+ , prettyprinter-ansi-terminal, semigroupoids, stm, tasty
+ , tasty-hunit, text, throttled, time, transformers, typed-process
+ , versions, witherable
+ }:
+ mkDerivation {
+ pname = "aura";
+ version = "2.0.0";
+ sha256 = "1k53r44kxy7p23nsjbx12mvn7nkl8j3h9fzy4v3dxyqkd4jz0996";
+ revision = "1";
+ editedCabalFile = "1z73n5fcrp23hms0l6r45p1knqqlng8g4gfb44a4raqj7da823zj";
+ isLibrary = true;
+ isExecutable = true;
+ libraryHaskellDepends = [
+ aeson aeson-pretty algebraic-graphs array async aur base
+ base-prelude bytestring compactable containers directory errors
+ filepath freer-simple generic-lens http-client http-types
+ language-bash megaparsec microlens microlens-ghc mtl mwc-random
+ network-uri non-empty-containers paths pretty-simple prettyprinter
+ prettyprinter-ansi-terminal semigroupoids stm text throttled time
+ transformers typed-process versions witherable
+ ];
+ executableHaskellDepends = [
+ base base-prelude bytestring containers errors freer-simple
+ http-client http-client-tls language-bash microlens
+ non-empty-containers optparse-applicative paths pretty-simple
+ prettyprinter prettyprinter-ansi-terminal text transformers
+ typed-process versions
+ ];
+ testHaskellDepends = [
+ base base-prelude bytestring containers errors freer-simple
+ http-client language-bash megaparsec microlens non-empty-containers
+ paths pretty-simple prettyprinter prettyprinter-ansi-terminal tasty
+ tasty-hunit text transformers typed-process versions
+ ];
+ description = "A secure package manager for Arch Linux and the AUR, written in Haskell";
+ license = stdenv.lib.licenses.gpl3;
+ }) {};
+
"authenticate" = callPackage
({ mkDerivation, aeson, attoparsec, base, blaze-builder, bytestring
, case-insensitive, conduit, containers, http-conduit, http-types
@@ -30710,6 +30816,21 @@ self: {
license = stdenv.lib.licenses.mit;
}) {};
+ "autoexporter_1_1_11" = callPackage
+ ({ mkDerivation, base, Cabal, directory, filepath }:
+ mkDerivation {
+ pname = "autoexporter";
+ version = "1.1.11";
+ sha256 = "17d1a2fns4b3gw8cggg9yq1fxvkyr859s3y22i9lviz6x7hd8dvn";
+ isLibrary = true;
+ isExecutable = true;
+ libraryHaskellDepends = [ base Cabal directory filepath ];
+ executableHaskellDepends = [ base Cabal directory filepath ];
+ description = "Automatically re-export modules";
+ license = stdenv.lib.licenses.mit;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ }) {};
+
"autom" = callPackage
({ mkDerivation, base, bytestring, colour, ghc-prim, gloss
, JuicyPixels, random, vector
@@ -31037,6 +31158,33 @@ self: {
license = stdenv.lib.licenses.bsd3;
}) {};
+ "avro_0_3_5_1" = callPackage
+ ({ mkDerivation, aeson, array, base, base16-bytestring, binary
+ , bytestring, containers, data-binary-ieee754, directory, entropy
+ , extra, fail, hashable, hspec, lens, lens-aeson, mtl, pure-zlib
+ , QuickCheck, scientific, semigroups, tagged, template-haskell
+ , text, transformers, unordered-containers, vector
+ }:
+ mkDerivation {
+ pname = "avro";
+ version = "0.3.5.1";
+ sha256 = "147w9a30z2vxjf8lsmf4vy0p9dvc8c3lla45b42sinr9916m61f8";
+ libraryHaskellDepends = [
+ aeson array base base16-bytestring binary bytestring containers
+ data-binary-ieee754 entropy fail hashable mtl pure-zlib scientific
+ semigroups tagged template-haskell text unordered-containers vector
+ ];
+ testHaskellDepends = [
+ aeson array base base16-bytestring binary bytestring containers
+ directory entropy extra fail hashable hspec lens lens-aeson mtl
+ pure-zlib QuickCheck scientific semigroups tagged template-haskell
+ text transformers unordered-containers vector
+ ];
+ description = "Avro serialization support for Haskell";
+ license = stdenv.lib.licenses.bsd3;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ }) {};
+
"avwx" = callPackage
({ mkDerivation, attoparsec, base, HTTP, lens, optparse-applicative
, parsers, pretty-show, text
@@ -32370,8 +32518,8 @@ self: {
}:
mkDerivation {
pname = "barbies";
- version = "0.1.3.1";
- sha256 = "0jddnjygqmcczhg2s1ifqgmbd1liqrkhnza4bmcplwmqkg4bkbr5";
+ version = "0.1.4.0";
+ sha256 = "03ndlns5kmk3v0n153m7r5v91f8pwzi8fazhanjv1paxadwscada";
libraryHaskellDepends = [ base bifunctors ];
testHaskellDepends = [ base QuickCheck tasty tasty-quickcheck ];
description = "Classes for working with types that can change clothes";
@@ -33145,8 +33293,8 @@ self: {
}:
mkDerivation {
pname = "battleship-combinatorics";
- version = "0.0.0.1";
- sha256 = "00zr3798y5h640rdhls4xkaqmj6n90qnxglq7bq8bvxl68a8ibxd";
+ version = "0.0.0.2";
+ sha256 = "1vja3z9xna06cyb3xlx2p7z4drbglbyahr8fs3337phynv2h0v0g";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [
@@ -33653,23 +33801,6 @@ self: {
}) {};
"bench" = callPackage
- ({ mkDerivation, base, criterion, optparse-applicative, process
- , silently, text, turtle
- }:
- mkDerivation {
- pname = "bench";
- version = "1.0.11";
- sha256 = "15rv999kajlmhvd1cajcn8vir3r950c1v2njyywpqaz6anm6ykm8";
- isLibrary = false;
- isExecutable = true;
- executableHaskellDepends = [
- base criterion optparse-applicative process silently text turtle
- ];
- description = "Command-line benchmark tool";
- license = stdenv.lib.licenses.bsd3;
- }) {};
-
- "bench_1_0_12" = callPackage
({ mkDerivation, base, criterion, optparse-applicative, process
, silently, text, turtle
}:
@@ -33684,7 +33815,6 @@ self: {
];
description = "Command-line benchmark tool";
license = stdenv.lib.licenses.bsd3;
- hydraPlatforms = stdenv.lib.platforms.none;
}) {};
"bench-graph" = callPackage
@@ -33897,22 +34027,24 @@ self: {
}) {};
"betris" = callPackage
- ({ mkDerivation, base, containers, lens, linear, random, stm
- , stm-chans, vty
+ ({ mkDerivation, base, containers, lens, linear
+ , optparse-applicative, random, stm, time-units, vty
}:
mkDerivation {
pname = "betris";
- version = "0.1.0.0";
- sha256 = "1qn326s4xydvvgmrhqi48cc2pl9b3mp7swc82qk59gj7cx4dx222";
+ version = "0.1.1.1";
+ sha256 = "0ggmy2rwwsgq54j29b2a5dkafalww0nrzz89j08wf3gsg90g9p9i";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [
- base containers lens linear random stm stm-chans vty
+ base containers lens linear optparse-applicative random stm
+ time-units vty
];
executableHaskellDepends = [
- base containers lens linear random stm stm-chans vty
+ base containers lens linear optparse-applicative random stm
+ time-units vty
];
- description = "Braille friendly vertical version of tetris";
+ description = "A horizontal version of tetris for braille users";
license = stdenv.lib.licenses.bsd3;
}) {};
@@ -35403,8 +35535,8 @@ self: {
({ mkDerivation, base, monetdb-mapi }:
mkDerivation {
pname = "bindings-monetdb-mapi";
- version = "0.1.0.0";
- sha256 = "12i1sn508m0vcm6d34l32h8x77ik63l64ix4vmn6c91jbhgakvv3";
+ version = "0.1.0.1";
+ sha256 = "0ghl73n679y5srg4b2jwy6xgnd4lbv7wad8k133k6c7k70zq89hl";
libraryHaskellDepends = [ base ];
libraryPkgconfigDepends = [ monetdb-mapi ];
description = "Low-level bindings for the MonetDB API (mapi)";
@@ -35700,8 +35832,8 @@ self: {
}:
mkDerivation {
pname = "bins";
- version = "0.1.1.0";
- sha256 = "067df9dpb7kvn7v9y2mw0y3zb4jmxas27yd3ybrb9h94f9j8p9jk";
+ version = "0.1.1.1";
+ sha256 = "1v585ppm5g424jn2bkq7ydsdd6bds7gak53288vn4vclnw2rswr8";
libraryHaskellDepends = [
base containers finite-typelits ghc-typelits-knownnat
ghc-typelits-natnormalise math-functions profunctors reflection
@@ -35819,8 +35951,8 @@ self: {
}:
mkDerivation {
pname = "biohazard";
- version = "1.0.3";
- sha256 = "19pk2c52w300jxcnrxlnvc6m8qr4jj19vwppdz37c9nppm6q2252";
+ version = "1.0.4";
+ sha256 = "1gj5xr0b9s2zifknm10bynkh0gvsi0gmw2sa3zcp1if17ixndv2c";
libraryHaskellDepends = [
async attoparsec base base-prelude bytestring containers exceptions
hashable primitive stm text transformers unix unordered-containers
@@ -37719,23 +37851,26 @@ self: {
"board-games" = callPackage
({ mkDerivation, array, base, cgi, containers, html, httpd-shed
- , network-uri, QuickCheck, random, transformers, utility-ht
+ , network-uri, non-empty, QuickCheck, random, transformers
+ , utility-ht
}:
mkDerivation {
pname = "board-games";
- version = "0.1.0.6";
- sha256 = "0qry0kacwaiwdcc2wxz08qimvzj9y0vmyc0cc5yq1lyx1sx6wghp";
+ version = "0.2";
+ sha256 = "1plgnwlpx0bw0wjwd0dxbh616vy37frclwir692x1fr2lq85y98c";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [
- array base cgi containers html random transformers utility-ht
+ array base cgi containers html non-empty random transformers
+ utility-ht
];
executableHaskellDepends = [
- array base cgi containers html httpd-shed network-uri random
- transformers utility-ht
+ array base cgi containers html httpd-shed network-uri non-empty
+ random transformers utility-ht
];
testHaskellDepends = [
- array base containers QuickCheck random transformers utility-ht
+ array base containers non-empty QuickCheck random transformers
+ utility-ht
];
description = "Three games for inclusion in a web server";
license = "GPL";
@@ -38071,8 +38206,8 @@ self: {
}:
mkDerivation {
pname = "boolector";
- version = "0.0.0.4";
- sha256 = "0f5yfkkgarwkbdkxkjj8fsd7fgq683qjxyv88wqk724dx6wv3yn7";
+ version = "0.0.0.5";
+ sha256 = "0wgz2x8jwv5zwh9g7jpvl1q6inyvhjlh4jf3983r3zxr3k2jmxq5";
libraryHaskellDepends = [
base containers directory mtl temporary
];
@@ -38568,8 +38703,8 @@ self: {
}:
mkDerivation {
pname = "brainheck";
- version = "0.1.0.9";
- sha256 = "0wmkkamgzassvc63wrk7bmm3ljq056zbxqbgs223454iswk35hc8";
+ version = "0.1.0.10";
+ sha256 = "10j3wncbdgxz2cb1v6sm6dr7z8jdh7xax8dwsj151sgxjw5n35xm";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [
@@ -38666,7 +38801,7 @@ self: {
license = stdenv.lib.licenses.bsd3;
}) {};
- "brick_0_40" = callPackage
+ "brick_0_41_1" = callPackage
({ mkDerivation, base, config-ini, containers, contravariant
, data-clist, deepseq, dlist, microlens, microlens-mtl
, microlens-th, QuickCheck, stm, template-haskell, text
@@ -38674,8 +38809,8 @@ self: {
}:
mkDerivation {
pname = "brick";
- version = "0.40";
- sha256 = "12bd0acbczcrr7mlpfrpjm9qq2ll2rbmgskpdw6lfaxz1iz75cad";
+ version = "0.41.1";
+ sha256 = "1sgxw18n3261gz0yfpig3p9vi84b2rlrsdkmvn5az26qrwrycqfd";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [
@@ -38979,12 +39114,22 @@ self: {
}) {};
"bsb-http-chunked" = callPackage
- ({ mkDerivation, base, bytestring, bytestring-builder }:
+ ({ mkDerivation, attoparsec, base, blaze-builder, bytestring
+ , bytestring-builder, deepseq, doctest, gauge, hedgehog, semigroups
+ , tasty, tasty-hedgehog, tasty-hunit
+ }:
mkDerivation {
pname = "bsb-http-chunked";
- version = "0.0.0.2";
- sha256 = "1x6m6xkrcw6jiaig1bb2wb5pqyw31x8xr9k9pxgq2g3ng44pbjr8";
+ version = "0.0.0.3";
+ sha256 = "181bmywrb6w3v4hljn6lxiqb0ql1imngsm4sma7i792y6m9p05j4";
libraryHaskellDepends = [ base bytestring bytestring-builder ];
+ testHaskellDepends = [
+ attoparsec base blaze-builder bytestring bytestring-builder doctest
+ hedgehog tasty tasty-hedgehog tasty-hunit
+ ];
+ benchmarkHaskellDepends = [
+ base blaze-builder bytestring deepseq gauge semigroups
+ ];
description = "Chunked HTTP transfer encoding for bytestring builders";
license = stdenv.lib.licenses.bsd3;
}) {};
@@ -39311,23 +39456,24 @@ self: {
"bugsnag-haskell" = callPackage
({ mkDerivation, aeson, aeson-qq, base, bytestring
- , case-insensitive, doctest, hspec, http-client, http-client-tls
- , http-conduit, http-types, iproute, network, parsec
- , template-haskell, text, th-lift-instances, time, ua-parser, wai
+ , case-insensitive, containers, doctest, Glob, hspec, http-client
+ , http-client-tls, http-conduit, http-types, iproute, network
+ , parsec, template-haskell, text, th-lift-instances, time
+ , ua-parser, unliftio, wai
}:
mkDerivation {
pname = "bugsnag-haskell";
- version = "0.0.1.3";
- sha256 = "07z2gw0p6cswzr22378z07jdyrww56mby3bfdlc7gxarxyfzsf9f";
+ version = "0.0.2.0";
+ sha256 = "0jkcfgs6ln3pcq5c0pz170wwphkx27ya2xj7li1avph5j5q42dxl";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [
- aeson base bytestring case-insensitive http-client http-client-tls
- http-conduit http-types iproute network parsec template-haskell
- text th-lift-instances time ua-parser wai
+ aeson base bytestring case-insensitive containers Glob http-client
+ http-client-tls http-conduit http-types iproute network parsec
+ template-haskell text th-lift-instances time ua-parser wai
];
testHaskellDepends = [
- aeson aeson-qq base doctest hspec text time
+ aeson aeson-qq base doctest hspec text time unliftio
];
description = "Bugsnag error reporter for Haskell";
license = stdenv.lib.licenses.mit;
@@ -40011,13 +40157,30 @@ self: {
license = stdenv.lib.licenses.mit;
}) {};
+ "bytestring-encoding" = callPackage
+ ({ mkDerivation, base, bytestring, QuickCheck, tasty, tasty-hunit
+ , tasty-quickcheck, tasty-th, text
+ }:
+ mkDerivation {
+ pname = "bytestring-encoding";
+ version = "0.1.0.0";
+ sha256 = "05pjx59xxpi27j3qfh2cwy9ibfdsc7g0zcsfkdhsj33yxpls363d";
+ libraryHaskellDepends = [ base bytestring text ];
+ testHaskellDepends = [
+ base bytestring QuickCheck tasty tasty-hunit tasty-quickcheck
+ tasty-th text
+ ];
+ description = "ByteString ↔ Text converter based on GHC.IO.Encoding";
+ license = stdenv.lib.licenses.bsd3;
+ }) {};
+
"bytestring-encodings" = callPackage
({ mkDerivation, base, bytestring, gauge, ghc-prim, hedgehog, text
}:
mkDerivation {
pname = "bytestring-encodings";
- version = "0.2.0.1";
- sha256 = "0qjqbffp4fa7a95mfsgzhibqblxrxl4qa8kb0yhyb8c1r47r5nn7";
+ version = "0.2.0.2";
+ sha256 = "1x239ihnxxmbfcpm9v79snpdafhammqdsm19pdlnrg02m0ia59pn";
libraryHaskellDepends = [ base bytestring ghc-prim ];
testHaskellDepends = [ base bytestring hedgehog ];
benchmarkHaskellDepends = [ base bytestring gauge text ];
@@ -40202,6 +40365,8 @@ self: {
pname = "bytestring-strict-builder";
version = "0.4.5.1";
sha256 = "17n6ll8k26312fgxbhws1yrswvy5dbsgyf57qksnj0akdssysy8q";
+ revision = "1";
+ editedCabalFile = "1snn8qb17maa76zji75i4yfz9x8ci16xp6zwg6kgwb33lf06imnd";
libraryHaskellDepends = [
base base-prelude bytestring semigroups
];
@@ -40795,8 +40960,8 @@ self: {
pname = "cabal-doctest";
version = "1.0.6";
sha256 = "0bgd4jdmzxq5y465r4sf4jv2ix73yvblnr4c9wyazazafddamjny";
- revision = "1";
- editedCabalFile = "1bk85avgc93yvcggwbk01fy8nvg6753wgmaanhkry0hz55h7mpld";
+ revision = "2";
+ editedCabalFile = "1kbiwqm4fxrsdpcqijdq98h8wzmxydcvxd03f1z8dliqzyqsbd60";
libraryHaskellDepends = [ base Cabal directory filepath ];
description = "A Setup.hs helper for doctests running";
license = stdenv.lib.licenses.bsd3;
@@ -41474,6 +41639,10 @@ self: {
base Cabal containers directory filepath language-nix lens pretty
process tasty tasty-golden
];
+ preCheck = ''
+ export PATH="$PWD/dist/build/cabal2nix:$PATH"
+ export HOME="$TMPDIR/home"
+ '';
description = "Convert Cabal files into Nix build instructions";
license = stdenv.lib.licenses.bsd3;
maintainers = with stdenv.lib.maintainers; [ peti ];
@@ -42112,8 +42281,8 @@ self: {
({ mkDerivation, base, containers, html, old-time, utility-ht }:
mkDerivation {
pname = "calendar-recycling";
- version = "0.0";
- sha256 = "0qvrxq3pgbbska0mqw9wk7wpsiln0i8rbdxnj4jfiv5vpp2n4gm3";
+ version = "0.0.0.1";
+ sha256 = "0afmnii65axpqk3x50wj1d17942m1kyhwka3bn78ylxy9z7rrlwc";
isLibrary = false;
isExecutable = true;
executableHaskellDepends = [
@@ -42459,8 +42628,8 @@ self: {
}:
mkDerivation {
pname = "capnp";
- version = "0.1.0.0";
- sha256 = "14my9py7vjvxq51cd7sys8bxzyvwm2196qwjp2027daqbh7975vl";
+ version = "0.2.0.0";
+ sha256 = "06frfg1dl2cxbksy07pp9njfdgmyamyywd9wn2izpgixpxhv6d7d";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [
@@ -43568,8 +43737,8 @@ self: {
}:
mkDerivation {
pname = "cayley-client";
- version = "0.4.6";
- sha256 = "1wyf6bz87b83lxcdbm84db7ziv3ggb3zbj4qd2cvfc7m4wr9a0v6";
+ version = "0.4.7";
+ sha256 = "13jrmlci29hdx0mxs4lzd9xdrdn9qga4891p49nhfpfiz4gch6xs";
libraryHaskellDepends = [
aeson attoparsec base binary bytestring exceptions http-client
http-conduit lens lens-aeson mtl text transformers
@@ -44839,26 +45008,26 @@ self: {
, directory, file-embed, filepath, github, hlint, hspec
, hspec-megaparsec, interpolatedstring-perl6, megaparsec
, monad-parallel, optparse-applicative, process, QuickCheck
- , quickcheck-text, range, temporary, text
+ , quickcheck-text, temporary, text
}:
mkDerivation {
pname = "checkmate";
- version = "0.3.2";
- sha256 = "1s79cpi5hzfb59705i6gdvicczvddsbikcwwqx22v3yfyakbbxww";
+ version = "0.4.0";
+ sha256 = "0l5d1wf9pbji0h8qsqhqliv3kvzc6xcryq5zvps375pk8r5l2lvb";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [
base containers diff-parse directory filepath github megaparsec
- monad-parallel range text
+ monad-parallel text
];
executableHaskellDepends = [
base diff-parse directory filepath megaparsec optparse-applicative
- process range text
+ process text
];
testHaskellDepends = [
base bytestring diff-parse directory file-embed filepath hlint
hspec hspec-megaparsec interpolatedstring-perl6 megaparsec
- QuickCheck quickcheck-text range temporary text
+ QuickCheck quickcheck-text temporary text
];
description = "Generate checklists relevant to a given patch";
license = stdenv.lib.licenses.agpl3;
@@ -47450,23 +47619,6 @@ self: {
}) {};
"cmark-gfm" = callPackage
- ({ mkDerivation, base, blaze-html, bytestring, cheapskate
- , criterion, discount, HUnit, markdown, sundown, text
- }:
- mkDerivation {
- pname = "cmark-gfm";
- version = "0.1.4";
- sha256 = "0jjcl7pfack8aksx34m1f80ll0y62ba1fyzdn77xbs2rvlvjzw0m";
- libraryHaskellDepends = [ base bytestring text ];
- testHaskellDepends = [ base HUnit text ];
- benchmarkHaskellDepends = [
- base blaze-html cheapskate criterion discount markdown sundown text
- ];
- description = "Fast, accurate GitHub Flavored Markdown parser and renderer";
- license = stdenv.lib.licenses.bsd3;
- }) {};
-
- "cmark-gfm_0_1_5" = callPackage
({ mkDerivation, base, blaze-html, bytestring, cheapskate
, criterion, discount, HUnit, markdown, sundown, text
}:
@@ -47481,7 +47633,6 @@ self: {
];
description = "Fast, accurate GitHub Flavored Markdown parser and renderer";
license = stdenv.lib.licenses.bsd3;
- hydraPlatforms = stdenv.lib.platforms.none;
}) {};
"cmark-highlight" = callPackage
@@ -48271,6 +48422,28 @@ self: {
hydraPlatforms = stdenv.lib.platforms.none;
}) {};
+ "collapse-duplication" = callPackage
+ ({ mkDerivation, base, bytestring, bytestring-show, cassava
+ , containers, hierarchical-clustering, lens, optparse-generic
+ , split
+ }:
+ mkDerivation {
+ pname = "collapse-duplication";
+ version = "0.4.0.1";
+ sha256 = "0azfyayvlw6vmgim98rsmgz5gx2dmwnbk9dwmm23781wdbm448a5";
+ isLibrary = true;
+ isExecutable = true;
+ libraryHaskellDepends = [
+ base bytestring bytestring-show cassava containers
+ hierarchical-clustering lens
+ ];
+ executableHaskellDepends = [
+ base bytestring cassava containers lens optparse-generic split
+ ];
+ description = "Collapse the duplication output into clones and return their frequencies";
+ license = stdenv.lib.licenses.gpl3;
+ }) {};
+
"collapse-util" = callPackage
({ mkDerivation, base }:
mkDerivation {
@@ -48770,10 +48943,8 @@ self: {
}:
mkDerivation {
pname = "combinatorial";
- version = "0.1";
- sha256 = "1a5l4iixjhvqca8dvwkx3zvlaimp6ggr3fcm7vk7r77rv6n6svh9";
- revision = "1";
- editedCabalFile = "1bqcg04w48dqk4n1n36j9ykajrmwqdd4qpcjjjfhzvm83z5ypsh7";
+ version = "0.1.0.1";
+ sha256 = "0w6vjs2pg2dffbq1dbs1dygnxk8nppzhkq3bgrg3ydfdzra7imn4";
libraryHaskellDepends = [
array base containers transformers utility-ht
];
@@ -48844,8 +49015,8 @@ self: {
}:
mkDerivation {
pname = "comfort-graph";
- version = "0.0.3";
- sha256 = "11s3ag5skk07vs4h6xl20hbmlrbxqcwrj54wfpz2fk73347prmmr";
+ version = "0.0.3.1";
+ sha256 = "0qmmz3z9dgjb41rj6g81ppxaj4jswqnnb8bqn2s1dd6hf6cih9n9";
libraryHaskellDepends = [
base containers QuickCheck semigroups transformers utility-ht
];
@@ -49025,6 +49196,8 @@ self: {
pname = "comonad-extras";
version = "4.0";
sha256 = "0irlx6rbp0cq5njxssm5a21mv7v5yccchfpn7h9hzr9fgyaxsr62";
+ revision = "1";
+ editedCabalFile = "1bmhdmncfbv80qgmykn67f4jkwbgags4ypaqibnzz849hpmibfj1";
libraryHaskellDepends = [
array base comonad containers distributive semigroupoids
transformers
@@ -49085,6 +49258,18 @@ self: {
license = stdenv.lib.licenses.bsd3;
}) {};
+ "compact-list" = callPackage
+ ({ mkDerivation, base, ghc-prim }:
+ mkDerivation {
+ pname = "compact-list";
+ version = "0.1.0";
+ sha256 = "0mg2s7mm908gy5j958abmiylfc05fs4y08dcjz4805ayi9cb1qqd";
+ libraryHaskellDepends = [ base ghc-prim ];
+ testHaskellDepends = [ base ];
+ description = "An append only list in a compact region";
+ license = stdenv.lib.licenses.bsd3;
+ }) {};
+
"compact-map" = callPackage
({ mkDerivation, array, base, binary, bytestring, containers }:
mkDerivation {
@@ -49628,19 +49813,19 @@ self: {
({ mkDerivation, base }:
mkDerivation {
pname = "composition-prelude";
- version = "1.5.0.8";
- sha256 = "1pgpjmb5pnnil98h6xrr9vmxxn8hgh20k9gjzm3jqzmx0l6dyspc";
+ version = "1.5.3.1";
+ sha256 = "0dq4znxr3qy2avmv68lzw4xrbfccap19ri2hxmlkl6r8p2850k7d";
libraryHaskellDepends = [ base ];
description = "Higher-order function combinators";
license = stdenv.lib.licenses.bsd3;
}) {};
- "composition-prelude_1_5_3_1" = callPackage
+ "composition-prelude_2_0_0_0" = callPackage
({ mkDerivation, base }:
mkDerivation {
pname = "composition-prelude";
- version = "1.5.3.1";
- sha256 = "0dq4znxr3qy2avmv68lzw4xrbfccap19ri2hxmlkl6r8p2850k7d";
+ version = "2.0.0.0";
+ sha256 = "0kz0jr5pfy6d1pm8sbxzrp0h7bnaljspggmzz382p6xp4npr6pg5";
libraryHaskellDepends = [ base ];
description = "Higher-order function combinators";
license = stdenv.lib.licenses.bsd3;
@@ -50067,6 +50252,28 @@ self: {
license = stdenv.lib.licenses.mit;
}) {};
+ "concurrency-benchmarks" = callPackage
+ ({ mkDerivation, async, base, bench-graph, bytestring, Chart
+ , Chart-diagrams, csv, deepseq, directory, gauge, getopt-generics
+ , mtl, random, split, streamly, text, transformers, typed-process
+ }:
+ mkDerivation {
+ pname = "concurrency-benchmarks";
+ version = "0.1.0";
+ sha256 = "1qsn726ic2v7mxm7f05n1vlpcvn0xwys2yj0vn243fsmw3075gzi";
+ isLibrary = false;
+ isExecutable = true;
+ executableHaskellDepends = [
+ base bench-graph bytestring Chart Chart-diagrams csv directory
+ getopt-generics split text transformers typed-process
+ ];
+ benchmarkHaskellDepends = [
+ async base deepseq gauge mtl random streamly transformers
+ ];
+ description = "Benchmarks to compare concurrency APIs";
+ license = stdenv.lib.licenses.mit;
+ }) {};
+
"concurrent-barrier" = callPackage
({ mkDerivation, base }:
mkDerivation {
@@ -50116,8 +50323,8 @@ self: {
}:
mkDerivation {
pname = "concurrent-dns-cache";
- version = "0.1.1";
- sha256 = "0q6mffxkdag9impmd69nfqvjhpmnb3wy88aqfnlb7q476g84yjkx";
+ version = "0.1.2";
+ sha256 = "1hczxqvlnp5nxcx3mdpv9cm7mv66823jhyw9pibfklpy94syiz5a";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [
@@ -50550,6 +50757,22 @@ self: {
license = stdenv.lib.licenses.mit;
}) {};
+ "conduit-concurrent-map" = callPackage
+ ({ mkDerivation, base, conduit, containers, hspec, HUnit, mtl
+ , resourcet, say, unliftio, unliftio-core, vector
+ }:
+ mkDerivation {
+ pname = "conduit-concurrent-map";
+ version = "0.1.1";
+ sha256 = "0rn7sry51xiz00hrs2vvqff18lnmmzyadrd858g1ixga76f44z2j";
+ libraryHaskellDepends = [
+ base conduit containers mtl resourcet unliftio unliftio-core vector
+ ];
+ testHaskellDepends = [ base conduit hspec HUnit say ];
+ description = "Concurrent, order-preserving mapping Conduit";
+ license = stdenv.lib.licenses.mit;
+ }) {};
+
"conduit-connection" = callPackage
({ mkDerivation, base, bytestring, conduit, connection, HUnit
, network, resourcet, test-framework, test-framework-hunit
@@ -51541,8 +51764,8 @@ self: {
({ mkDerivation, base, constraints, template-haskell }:
mkDerivation {
pname = "constraints-extras";
- version = "0.1.0.1";
- sha256 = "12m6z1va1idbqnl7syljgk8hy82vm0lymf262331jmhjb744awpz";
+ version = "0.2.0.0";
+ sha256 = "0id5xaij014vabzkbnl54h8km667vk1mz8dk27kdzfa5vg6pj8j8";
libraryHaskellDepends = [ base constraints template-haskell ];
description = "Utility package for constraints";
license = stdenv.lib.licenses.bsd3;
@@ -51639,8 +51862,8 @@ self: {
({ mkDerivation, base, containers, convert, lens, text, vector }:
mkDerivation {
pname = "container";
- version = "1.1.2";
- sha256 = "1i2zf7hn5pg0dmgq93w0i2v3vjsdryn6895za6mzfpdk7vyxsxsj";
+ version = "1.1.5";
+ sha256 = "1hh3ahw1vfmws1hyyl6blqyxaz4qcip0h0d80ia8pb6b1gfbvxsm";
libraryHaskellDepends = [
base containers convert lens text vector
];
@@ -51823,12 +52046,12 @@ self: {
}) {};
"contiguous" = callPackage
- ({ mkDerivation, base, primitive }:
+ ({ mkDerivation, base, deepseq, primitive }:
mkDerivation {
pname = "contiguous";
- version = "0.2.0.0";
- sha256 = "1cm6syjrql90m54hsinyknfjhspj47ikskq3fv408bl4sx3gk2kl";
- libraryHaskellDepends = [ base primitive ];
+ version = "0.3.0.0";
+ sha256 = "15v53w85f8bxnnrjsj46nfnjshf91b8sld76jcqffzj5nfjxkv28";
+ libraryHaskellDepends = [ base deepseq primitive ];
description = "Unified interface for primitive arrays";
license = stdenv.lib.licenses.bsd3;
hydraPlatforms = stdenv.lib.platforms.none;
@@ -51838,8 +52061,8 @@ self: {
({ mkDerivation, base, contiguous, primitive }:
mkDerivation {
pname = "contiguous-checked";
- version = "0.2.0.0";
- sha256 = "0cb7cankkmn8nb7v6fy4ykcglfd4sd5nc916lg1nyj7fjr5v7y4l";
+ version = "0.3.0.0";
+ sha256 = "144v6c9w0x9a43z1wpfgrq8k5h3d9nnrdxx87wcrkfcprcghdy7b";
libraryHaskellDepends = [ base contiguous primitive ];
license = stdenv.lib.licenses.bsd3;
hydraPlatforms = stdenv.lib.platforms.none;
@@ -53145,8 +53368,8 @@ self: {
({ mkDerivation, base, containers, parallel }:
mkDerivation {
pname = "cpsa";
- version = "3.6.0";
- sha256 = "1c2hhdny9nn10rgaray827fqc3wq02pv8pf853cy865dl6zdihpb";
+ version = "3.6.1";
+ sha256 = "04hvb1z483gh7mb5q1mvsiym8jg29512wnrfdssl8y9c90qhk2sp";
isLibrary = false;
isExecutable = true;
enableSeparateDataOutput = true;
@@ -53242,34 +53465,6 @@ self: {
}) {};
"cql-io" = callPackage
- ({ mkDerivation, async, auto-update, base, bytestring, containers
- , cql, cryptohash, data-default-class, Decimal, exceptions
- , hashable, HsOpenSSL, iproute, lens, monad-control, mtl
- , mwc-random, network, raw-strings-qq, retry, semigroups, stm
- , tasty, tasty-hunit, text, time, tinylog, transformers
- , transformers-base, unordered-containers, uuid, vector
- }:
- mkDerivation {
- pname = "cql-io";
- version = "1.0.1";
- sha256 = "06imd6cjfh7jnr8s0d2pqlg82w9h0s81xpyjir6hci61al6yfx5q";
- libraryHaskellDepends = [
- async auto-update base bytestring containers cql cryptohash
- data-default-class exceptions hashable HsOpenSSL iproute lens
- monad-control mtl mwc-random network retry semigroups stm text time
- tinylog transformers transformers-base unordered-containers uuid
- vector
- ];
- testHaskellDepends = [
- base containers cql Decimal iproute mtl raw-strings-qq tasty
- tasty-hunit text time tinylog uuid
- ];
- description = "Cassandra CQL client";
- license = stdenv.lib.licenses.mpl20;
- hydraPlatforms = stdenv.lib.platforms.none;
- }) {};
-
- "cql-io_1_0_1_1" = callPackage
({ mkDerivation, async, auto-update, base, bytestring, containers
, cql, cryptohash, data-default-class, Decimal, exceptions
, hashable, HsOpenSSL, iproute, lens, monad-control, mtl
@@ -53490,18 +53685,18 @@ self: {
}) {crack = null;};
"crackNum" = callPackage
- ({ mkDerivation, base, data-binary-ieee754, FloatingHex, ieee754 }:
+ ({ mkDerivation, base, FloatingHex, ieee754, reinterpret-cast }:
mkDerivation {
pname = "crackNum";
- version = "2.1";
- sha256 = "10z192nd9ik4ry0bjmkdpyvys75h3xz106588z8m1ix7caf1208a";
+ version = "2.2";
+ sha256 = "15327p12jql90j5z02nfzx5fivp7zsbznkg1i79iby59n3njfv40";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [
- base data-binary-ieee754 FloatingHex ieee754
+ base FloatingHex ieee754 reinterpret-cast
];
executableHaskellDepends = [
- base data-binary-ieee754 FloatingHex ieee754
+ base FloatingHex ieee754 reinterpret-cast
];
description = "Crack various integer, floating-point data formats";
license = stdenv.lib.licenses.bsd3;
@@ -54929,38 +55124,6 @@ self: {
}) {};
"csg" = callPackage
- ({ mkDerivation, attoparsec, base, bytestring, containers
- , criterion, doctest, doctest-driver-gen, gloss, gloss-raster
- , QuickCheck, simple-vec3, strict, system-filepath, tasty
- , tasty-hunit, tasty-quickcheck, transformers, turtle, vector
- }:
- mkDerivation {
- pname = "csg";
- version = "0.1.0.4";
- sha256 = "1dril9ayqng04s6jnh28r8by604kkygbjiblp2c4px0bqvz3g5cx";
- isLibrary = true;
- isExecutable = true;
- libraryHaskellDepends = [
- attoparsec base bytestring containers QuickCheck simple-vec3 strict
- transformers
- ];
- executableHaskellDepends = [
- base gloss gloss-raster QuickCheck simple-vec3 strict
- system-filepath turtle
- ];
- testHaskellDepends = [
- base bytestring doctest doctest-driver-gen simple-vec3 tasty
- tasty-hunit tasty-quickcheck
- ];
- benchmarkHaskellDepends = [
- base criterion simple-vec3 strict vector
- ];
- description = "Analytical CSG (Constructive Solid Geometry) library";
- license = stdenv.lib.licenses.bsd3;
- hydraPlatforms = stdenv.lib.platforms.none;
- }) {};
-
- "csg_0_1_0_5" = callPackage
({ mkDerivation, attoparsec, base, bytestring, containers
, criterion, doctest, doctest-driver-gen, gloss, gloss-raster
, QuickCheck, simple-vec3, strict, system-filepath, tasty
@@ -55144,24 +55307,6 @@ self: {
}) {};
"css-syntax" = callPackage
- ({ mkDerivation, attoparsec, base, bytestring, directory, hspec
- , scientific, text
- }:
- mkDerivation {
- pname = "css-syntax";
- version = "0.0.7";
- sha256 = "0r30rnwpmzvwbhj9di5rvbsigfn1w325c700hvjyw826x53ivz13";
- libraryHaskellDepends = [
- attoparsec base bytestring scientific text
- ];
- testHaskellDepends = [
- attoparsec base bytestring directory hspec scientific text
- ];
- description = "This package implments a parser for the CSS syntax";
- license = stdenv.lib.licenses.mit;
- }) {};
-
- "css-syntax_0_0_8" = callPackage
({ mkDerivation, attoparsec, base, bytestring, directory, hspec
, scientific, text
}:
@@ -55177,7 +55322,6 @@ self: {
];
description = "This package implments a parser for the CSS syntax";
license = stdenv.lib.licenses.mit;
- hydraPlatforms = stdenv.lib.platforms.none;
}) {};
"css-text" = callPackage
@@ -55514,6 +55658,30 @@ self: {
license = stdenv.lib.licenses.bsd3;
}) {};
+ "cue-sheet_2_0_0" = callPackage
+ ({ mkDerivation, base, bytestring, containers, data-default-class
+ , exceptions, hspec, hspec-discover, hspec-megaparsec, megaparsec
+ , mtl, QuickCheck, text
+ }:
+ mkDerivation {
+ pname = "cue-sheet";
+ version = "2.0.0";
+ sha256 = "1w6gmxwrqz7jlm7f0rccrik86w0syhjk5w5cvg29gi2yzj3grnql";
+ enableSeparateDataOutput = true;
+ libraryHaskellDepends = [
+ base bytestring containers data-default-class exceptions megaparsec
+ mtl QuickCheck text
+ ];
+ testHaskellDepends = [
+ base bytestring exceptions hspec hspec-megaparsec megaparsec
+ QuickCheck text
+ ];
+ testToolDepends = [ hspec-discover ];
+ description = "Support for construction, rendering, and parsing of CUE sheets";
+ license = stdenv.lib.licenses.bsd3;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ }) {};
+
"cufft" = callPackage
({ mkDerivation, base, c2hs, Cabal, cuda, directory, filepath
, template-haskell
@@ -56556,8 +56724,8 @@ self: {
({ mkDerivation, array, base, containers, transformers }:
mkDerivation {
pname = "data-accessor";
- version = "0.2.2.7";
- sha256 = "1vf2g1gac3rm32g97rl0fll51m88q7ry4m6khnl5j47qsmx24r9l";
+ version = "0.2.2.8";
+ sha256 = "1fq4gygxbz0bd0mzgvc1sl3m4gjnsv8nbgpnmdpa29zj5lb9agxc";
libraryHaskellDepends = [ array base containers transformers ];
description = "Utilities for accessing and manipulating fields of records";
license = stdenv.lib.licenses.bsd3;
@@ -56619,8 +56787,8 @@ self: {
}:
mkDerivation {
pname = "data-accessor-template";
- version = "0.2.1.15";
- sha256 = "0vxs6d6xv2lsxz81msgh5l91pvxma9gif69csi23nxq2xxapyaw0";
+ version = "0.2.1.16";
+ sha256 = "15gd6xlrq5ica514m5rdcz2dl8bibdmbsmnc98ddhx491c9g5rwk";
libraryHaskellDepends = [
base data-accessor template-haskell utility-ht
];
@@ -57338,8 +57506,8 @@ self: {
({ mkDerivation, base, doctest }:
mkDerivation {
pname = "data-forest";
- version = "0.1.0.6";
- sha256 = "11iisc82cgma5pp6apnjg112dd4cvqxclwf09zh9rh50lzkml9dk";
+ version = "0.1.0.7";
+ sha256 = "1q41cwinvv0ys260f1f7005403pvz1gbwn0d6cnwh8b7rlgp8f4j";
libraryHaskellDepends = [ base ];
testHaskellDepends = [ base doctest ];
description = "A simple multi-way tree data structure";
@@ -59320,24 +59488,6 @@ self: {
}) {};
"debian-build" = callPackage
- ({ mkDerivation, base, directory, filepath, process, split
- , transformers
- }:
- mkDerivation {
- pname = "debian-build";
- version = "0.10.1.1";
- sha256 = "0dv5fs0kp8qmrldly6cj0fkvab7infplii0ay23p1pbx6qjakrnk";
- isLibrary = true;
- isExecutable = true;
- libraryHaskellDepends = [
- base directory filepath process split transformers
- ];
- executableHaskellDepends = [ base filepath transformers ];
- description = "Debian package build sequence tools";
- license = stdenv.lib.licenses.bsd3;
- }) {};
-
- "debian-build_0_10_1_2" = callPackage
({ mkDerivation, base, directory, filepath, process, split
, transformers
}:
@@ -59353,7 +59503,6 @@ self: {
executableHaskellDepends = [ base filepath transformers ];
description = "Debian package build sequence tools";
license = stdenv.lib.licenses.bsd3;
- hydraPlatforms = stdenv.lib.platforms.none;
}) {};
"debug" = callPackage
@@ -59771,15 +59920,16 @@ self: {
}) {};
"deferred-folds" = callPackage
- ({ mkDerivation, base, bytestring, containers, foldl, primitive
- , transformers
+ ({ mkDerivation, base, bytestring, containers, foldl, hashable
+ , primitive, transformers, unordered-containers, vector
}:
mkDerivation {
pname = "deferred-folds";
- version = "0.6.12";
- sha256 = "1gvbm0dkmvjjz5wwg2a5p2ahyd2imz1g751sr8k536hnd377xzy8";
+ version = "0.9.7";
+ sha256 = "18kyf6li2n3gzsvvdqsf4vwb1l0la755m1dl7gddg2ysnb8kkqb0";
libraryHaskellDepends = [
- base bytestring containers foldl primitive transformers
+ base bytestring containers foldl hashable primitive transformers
+ unordered-containers vector
];
description = "Abstractions over deferred folds";
license = stdenv.lib.licenses.mit;
@@ -60623,8 +60773,8 @@ self: {
}:
mkDerivation {
pname = "descriptive";
- version = "0.9.4";
- sha256 = "0bxskc4q6jzpvifnhh6zl77xic0fbni8abf9lipfr1xzarbwcpkr";
+ version = "0.9.5";
+ sha256 = "0y5693zm2kvqjilybbmrcv1g6n6x2p6zjgi0k0axjw1sdhh1g237";
libraryHaskellDepends = [
aeson base bifunctors containers mtl scientific text transformers
vector
@@ -60808,14 +60958,14 @@ self: {
license = stdenv.lib.licenses.bsd3;
}) {};
- "df1_0_2" = callPackage
+ "df1_0_3" = callPackage
({ mkDerivation, attoparsec, base, bytestring, containers
, QuickCheck, tasty, tasty-quickcheck, text, time
}:
mkDerivation {
pname = "df1";
- version = "0.2";
- sha256 = "11sd9d6izb3jrxxr27h058lajjij1p5wfsgg0pshjziqc9l426zs";
+ version = "0.3";
+ sha256 = "1qiy2xxri3vdqhy78ccan7phrlfdkb2ndvrj8grlhbzycmai64i3";
libraryHaskellDepends = [
attoparsec base bytestring containers text time
];
@@ -60948,37 +61098,42 @@ self: {
license = stdenv.lib.licenses.bsd3;
}) {};
- "dhall_1_16_1" = callPackage
+ "dhall_1_17_0" = callPackage
({ mkDerivation, ansi-terminal, base, bytestring, case-insensitive
- , containers, contravariant, criterion, cryptonite, deepseq, Diff
- , directory, doctest, exceptions, filepath, haskeline, http-client
- , http-client-tls, insert-ordered-containers, lens-family-core
- , megaparsec, memory, mockery, mtl, optparse-applicative, parsers
- , prettyprinter, prettyprinter-ansi-terminal, repline, scientific
- , tasty, tasty-hunit, template-haskell, text, transformers
+ , cborg, containers, contravariant, criterion, cryptonite, deepseq
+ , Diff, directory, doctest, exceptions, filepath, hashable
+ , haskeline, http-client, http-client-tls
+ , insert-ordered-containers, lens-family-core, megaparsec, memory
+ , mockery, mtl, optparse-applicative, parsers, prettyprinter
+ , prettyprinter-ansi-terminal, QuickCheck, quickcheck-instances
+ , repline, scientific, serialise, tasty, tasty-hunit
+ , tasty-quickcheck, template-haskell, text, transformers
, unordered-containers, vector
}:
mkDerivation {
pname = "dhall";
- version = "1.16.1";
- sha256 = "1mf0x42f1gq8y6518hm1p8j8ca9dgh3nwbw2lfilddk1difrm9h2";
+ version = "1.17.0";
+ sha256 = "14a74zqsnv00hbv19lhmv78xzl36qnsznmncnzq7jji2aslgwad0";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [
- ansi-terminal base bytestring case-insensitive containers
+ ansi-terminal base bytestring case-insensitive cborg containers
contravariant cryptonite Diff directory exceptions filepath
- haskeline http-client http-client-tls insert-ordered-containers
- lens-family-core megaparsec memory mtl optparse-applicative parsers
- prettyprinter prettyprinter-ansi-terminal repline scientific
+ hashable haskeline http-client http-client-tls
+ insert-ordered-containers lens-family-core megaparsec memory mtl
+ optparse-applicative parsers prettyprinter
+ prettyprinter-ansi-terminal repline scientific serialise
template-haskell text transformers unordered-containers vector
];
executableHaskellDepends = [ base ];
testHaskellDepends = [
- base deepseq directory doctest filepath insert-ordered-containers
- mockery prettyprinter tasty tasty-hunit text vector
+ base containers deepseq directory doctest filepath hashable
+ insert-ordered-containers mockery prettyprinter QuickCheck
+ quickcheck-instances serialise tasty tasty-hunit tasty-quickcheck
+ text transformers vector
];
benchmarkHaskellDepends = [
- base containers criterion directory text
+ base bytestring containers criterion directory serialise text
];
description = "A configuration language guaranteed to terminate";
license = stdenv.lib.licenses.bsd3;
@@ -60992,10 +61147,8 @@ self: {
}:
mkDerivation {
pname = "dhall-bash";
- version = "1.0.14";
- sha256 = "1zxqlmnhq8lrwxiqz7hlqln7wf14mlz78s018yqy3hpzmy3aa84d";
- revision = "1";
- editedCabalFile = "1ih8w5q0gnys02hv7hnjxxapfqw4gqmd9xfxn7a05cg2gb30mapr";
+ version = "1.0.15";
+ sha256 = "15xgfglxy5bac93i83pp4pc78yfcwq6ys9vpak9kmklsbr08ynq4";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [
@@ -61029,15 +61182,13 @@ self: {
"dhall-json" = callPackage
({ mkDerivation, aeson, aeson-pretty, base, bytestring, dhall
- , insert-ordered-containers, optparse-applicative, text
- , unordered-containers, yaml
+ , insert-ordered-containers, optparse-applicative, tasty
+ , tasty-hunit, text, unordered-containers, yaml
}:
mkDerivation {
pname = "dhall-json";
- version = "1.2.2";
- sha256 = "13vap0x53c9i2cyggh3riq8fza46c2d9rqmbxmsjvsawxz2jfm9d";
- revision = "1";
- editedCabalFile = "0vkn5kivqjl640f4ifjgy3mgmlqhz8ir48n04lklr4mra7z95qw2";
+ version = "1.2.3";
+ sha256 = "1npw5x49jrijq6lby5ipnywqvbq67znmbsrfhnk0pi9pz4kixjw3";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [
@@ -61048,6 +61199,7 @@ self: {
aeson aeson-pretty base bytestring dhall optparse-applicative text
yaml
];
+ testHaskellDepends = [ aeson base dhall tasty tasty-hunit text ];
description = "Compile Dhall to JSON or YAML";
license = stdenv.lib.licenses.bsd3;
}) {};
@@ -61078,10 +61230,8 @@ self: {
}:
mkDerivation {
pname = "dhall-nix";
- version = "1.1.5";
- sha256 = "1j0b7w8ydhz5fq7jmajz35j8bw2xmr1v0pbl4yfkc2gv8djmiw6y";
- revision = "1";
- editedCabalFile = "1k9mb8fm5vxm7asqawvv103y63i81n84py42w7hh72rk3wp3xcnk";
+ version = "1.1.6";
+ sha256 = "0pchanzgcag6z7fywqm09xj29n0pfxd2ya2ky64aapykq038jxbs";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [
@@ -61099,10 +61249,8 @@ self: {
({ mkDerivation, base, dhall, optparse-applicative, text }:
mkDerivation {
pname = "dhall-text";
- version = "1.0.11";
- sha256 = "0zbsr5mchcm3713y6dbdj1vlak5rb6f13p6a8ah7f3kcihdpx0b1";
- revision = "1";
- editedCabalFile = "0lrp1aknia3y4cz87vh14ns3f273lbca09ssz138wlf3266ka613";
+ version = "1.0.12";
+ sha256 = "1k68s83cqlwgivliag9n2vhin385k08f8vd506dcbix5farv9dp6";
isLibrary = false;
isExecutable = true;
executableHaskellDepends = [
@@ -61177,14 +61325,14 @@ self: {
hydraPlatforms = stdenv.lib.platforms.none;
}) {};
- "di_1_1" = callPackage
+ "di_1_1_1" = callPackage
({ mkDerivation, base, containers, df1, di-core, di-df1, di-handle
, di-monad, exceptions
}:
mkDerivation {
pname = "di";
- version = "1.1";
- sha256 = "1akwhznnnwb9y4rbb4kys2vvwzdmpxdccrnrh65s5c1pw3w517n5";
+ version = "1.1.1";
+ sha256 = "0ibbhc0mnf4qwz90hgxnyd2vc6n86qqnyiahcr30lxknvqmbnskk";
libraryHaskellDepends = [
base containers df1 di-core di-df1 di-handle di-monad exceptions
];
@@ -61468,6 +61616,8 @@ self: {
pname = "diagrams-core";
version = "1.4.1.1";
sha256 = "10mnicfyvawy3jlpgf656fx2y4836x04p3z1lpgyyr1nkvwyk0m1";
+ revision = "1";
+ editedCabalFile = "0qf0b27lx8w16x85rr4zf3sf4qzkywyi04incv3667054v7y8m25";
libraryHaskellDepends = [
adjunctions base containers distributive dual-tree lens linear
monoid-extras mtl profunctors semigroups unordered-containers
@@ -62377,21 +62527,21 @@ self: {
}) {};
"digit" = callPackage
- ({ mkDerivation, ansi-wl-pprint, base, hedgehog, lens, papa, parsec
+ ({ mkDerivation, ansi-wl-pprint, base, hedgehog, lens, parsec
, parsers, pretty, scientific, semigroupoids, semigroups, tasty
, tasty-hedgehog, tasty-hspec, tasty-hunit, template-haskell, text
}:
mkDerivation {
pname = "digit";
- version = "0.6";
- sha256 = "13cm8xk3szfcyfdzp108rzwkvwwws34bpla2viyqcr0sivmzdck8";
+ version = "0.7";
+ sha256 = "0451nlmf2ggg1dy82qkdxqlg4lgnsvkrxl3qrcjr5dzmi2ghk3ql";
libraryHaskellDepends = [
- base lens papa parsers scientific semigroupoids semigroups
+ base lens parsers scientific semigroupoids semigroups
template-haskell
];
testHaskellDepends = [
- ansi-wl-pprint base hedgehog lens papa parsec parsers pretty tasty
- tasty-hedgehog tasty-hspec tasty-hunit text
+ ansi-wl-pprint base hedgehog lens parsec parsers pretty semigroups
+ tasty tasty-hedgehog tasty-hspec tasty-hunit text
];
description = "A data-type representing digits 0-9 and other combinations";
license = stdenv.lib.licenses.bsd3;
@@ -64271,6 +64421,18 @@ self: {
license = stdenv.lib.licenses.bsd3;
}) {};
+ "do-notation" = callPackage
+ ({ mkDerivation, base, indexed }:
+ mkDerivation {
+ pname = "do-notation";
+ version = "0.1.0.2";
+ sha256 = "1xbvphpwbzns4567zbk8baq0zd068dcprp59cjzhbplf9cypiwy9";
+ libraryHaskellDepends = [ base indexed ];
+ testHaskellDepends = [ base indexed ];
+ description = "Generalize do-notation to work on monads and indexed monads simultaneously";
+ license = stdenv.lib.licenses.bsd3;
+ }) {};
+
"doc-review" = callPackage
({ mkDerivation, base, base64-bytestring, binary, bytestring
, containers, directory, feed, filepath, haskell98, heist, hexpat
@@ -65558,8 +65720,8 @@ self: {
({ mkDerivation, array, base, containers, QuickCheck, random }:
mkDerivation {
pname = "dsp";
- version = "0.2.4";
- sha256 = "0bwvb2axzv19lmv61ifvpmp3kpyzn62vi87agkyyjaip3psxzr7y";
+ version = "0.2.4.1";
+ sha256 = "0b748v9v9i7kw2djnb9a89yjw0nhwhb5sfml3x6ajydjhx79a8ik";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [ array base containers random ];
@@ -66620,8 +66782,8 @@ self: {
}:
mkDerivation {
pname = "ec2-unikernel";
- version = "0.9.2";
- sha256 = "02nydjp2l686wx42a5dndhj3dxi5q73lx9628lhdan1alhim4j31";
+ version = "0.9.8";
+ sha256 = "137rq45d0d7ap77wlgiqp5sd2r0jwxkaw4mvxmj1lyi8yc52mxbg";
isLibrary = false;
isExecutable = true;
executableHaskellDepends = [
@@ -66880,8 +67042,8 @@ self: {
}:
mkDerivation {
pname = "edges";
- version = "0.11.0.1";
- sha256 = "12bs1wlfhhq5cqb0xan34jvdpx1asr3rb2d2yiafxqpngwvd7nh8";
+ version = "0.11.0.3";
+ sha256 = "02735ky371hvxxxkgal7lzg6v8cmq5s115j6qx459lwj8p42az77";
libraryHaskellDepends = [
base cereal cereal-data-dword cereal-vector contravariant
data-dword deepseq deferred-folds foldl hashable monad-par pointed
@@ -66915,8 +67077,8 @@ self: {
}:
mkDerivation {
pname = "edit";
- version = "1.0.0.0";
- sha256 = "0p93j90f40ckg5n9d8hnsbd5qsi00c28cpdrczgihk81hjgflnkd";
+ version = "1.0.1.0";
+ sha256 = "0114fcb1cpfrvn01vqq4wcharny0ri412a3gsy888g739k61a4gj";
libraryHaskellDepends = [
base comonad deepseq QuickCheck transformers
];
@@ -67333,6 +67495,8 @@ self: {
pname = "either";
version = "5.0.1";
sha256 = "064hjfld7dkzs78sy30k5qkiva3hx24rax6dvzz5ygr2c0zypdkc";
+ revision = "1";
+ editedCabalFile = "1kf0dy6nki64kkmjw8214jz3n086g1pghfm26f012b6qv0iakzca";
libraryHaskellDepends = [
base bifunctors mtl profunctors semigroupoids semigroups
];
@@ -67358,8 +67522,8 @@ self: {
({ mkDerivation, base, doctest }:
mkDerivation {
pname = "either-list-functions";
- version = "0.0.0.2";
- sha256 = "0m7fkf8r1i0z3zrfmnqsdzk0fc9mhanqmx7x6rjiisjiaf91yr8d";
+ version = "0.0.0.3";
+ sha256 = "1b01aj05dbx51hgyhmggh1zgcbwfvyijkxj7knqpbgpj7hymv00y";
libraryHaskellDepends = [ base ];
testHaskellDepends = [ base doctest ];
description = "Functions involving lists of Either";
@@ -68280,6 +68444,23 @@ self: {
license = stdenv.lib.licenses.bsd3;
}) {};
+ "email-validate_2_3_2_7" = callPackage
+ ({ mkDerivation, attoparsec, base, bytestring, doctest, hspec
+ , QuickCheck, template-haskell
+ }:
+ mkDerivation {
+ pname = "email-validate";
+ version = "2.3.2.7";
+ sha256 = "1qdl0g8nbngr6kz4xrgi06rn1zf1np55ipk3wwdrg9hpfaaazcs3";
+ libraryHaskellDepends = [
+ attoparsec base bytestring template-haskell
+ ];
+ testHaskellDepends = [ base bytestring doctest hspec QuickCheck ];
+ description = "Email address validation";
+ license = stdenv.lib.licenses.bsd3;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ }) {};
+
"email-validate-json" = callPackage
({ mkDerivation, aeson, base, email-validate, text }:
mkDerivation {
@@ -68668,8 +68849,8 @@ self: {
}:
mkDerivation {
pname = "engine-io-wai";
- version = "1.0.8";
- sha256 = "0mph6pg3j81kwwl73dn5hdbw3mndfxi2wqdgwb727znh058xh7zb";
+ version = "1.0.9";
+ sha256 = "1zdin34gfi2059n1wjfxs4i2kfc0r53f3wpwhjd0fbp0as56h94s";
libraryHaskellDepends = [
attoparsec base bytestring either engine-io http-types mtl text
transformers transformers-compat unordered-containers wai
@@ -69805,16 +69986,16 @@ self: {
}) {};
"etc" = callPackage
- ({ mkDerivation, aeson, base, hashable, rio, tasty, tasty-hunit
- , text, typed-process, unliftio
+ ({ mkDerivation, aeson, base, rio, tasty, tasty-hunit
+ , template-haskell, text, typed-process, unliftio
}:
mkDerivation {
pname = "etc";
- version = "0.4.0.3";
- sha256 = "0xnm5mvrd0409kcrxp6ls92z5fvq959pghf67pqmj4a84k1dwkw3";
+ version = "0.4.1.0";
+ sha256 = "1j17g8jij4y782vwpx7b52fv9nwv4v4mygk2hbq6vihzkbrdbd31";
enableSeparateDataOutput = true;
libraryHaskellDepends = [
- aeson base hashable rio text typed-process unliftio
+ aeson base rio template-haskell text typed-process unliftio
];
testHaskellDepends = [ aeson base rio tasty tasty-hunit ];
description = "Declarative configuration spec for Haskell projects";
@@ -70157,10 +70338,8 @@ self: {
}:
mkDerivation {
pname = "euler-tour-tree";
- version = "0.1.0.1";
- sha256 = "12fxs5992rlfg91xxh2sahm2vykcjcjc30iwzkfm894qrk4flbz4";
- revision = "1";
- editedCabalFile = "033v38mr81pr81gb5wksi7bgpm1wrvcgck893dk1ymq4w6ifa2m6";
+ version = "0.1.1.0";
+ sha256 = "166gbinlf0ay8y2clzjzf5b2x489hcr1gzj8w5qk341z01f8pckh";
libraryHaskellDepends = [
base containers fingertree mtl parser-combinators transformers
Unique
@@ -70631,6 +70810,43 @@ self: {
hydraPlatforms = stdenv.lib.platforms.none;
}) {};
+ "eventstore_1_1_6" = callPackage
+ ({ mkDerivation, aeson, array, async, base, bifunctors, bytestring
+ , cereal, clock, connection, containers, dns, dotnet-timespan
+ , ekg-core, exceptions, fast-logger, hashable, http-client
+ , interpolate, lifted-async, lifted-base, machines, monad-control
+ , monad-logger, mono-traversable, mtl, protobuf, random
+ , safe-exceptions, semigroups, stm, stm-chans, tasty, tasty-hspec
+ , tasty-hunit, text, time, transformers-base, unordered-containers
+ , uuid
+ }:
+ mkDerivation {
+ pname = "eventstore";
+ version = "1.1.6";
+ sha256 = "00bdkklwrabxvbr725hkdsc1a2fdr50gdwryn7spmsqxmqgzv96w";
+ revision = "1";
+ editedCabalFile = "1y1a7brw220bg4mfc80qhkcyzlm38qvs6pkr7p8xyk104b8k5qgx";
+ libraryHaskellDepends = [
+ aeson array base bifunctors bytestring cereal clock connection
+ containers dns dotnet-timespan ekg-core exceptions fast-logger
+ hashable http-client interpolate lifted-async lifted-base machines
+ monad-control monad-logger mono-traversable mtl protobuf random
+ safe-exceptions semigroups stm stm-chans text time
+ transformers-base unordered-containers uuid
+ ];
+ testHaskellDepends = [
+ aeson async base bytestring cereal connection containers
+ dotnet-timespan exceptions fast-logger hashable lifted-async
+ lifted-base monad-control mono-traversable protobuf safe-exceptions
+ semigroups stm stm-chans tasty tasty-hspec tasty-hunit text time
+ transformers-base unordered-containers uuid
+ ];
+ description = "EventStore TCP Client";
+ license = stdenv.lib.licenses.bsd3;
+ platforms = [ "x86_64-darwin" "x86_64-linux" ];
+ hydraPlatforms = stdenv.lib.platforms.none;
+ }) {};
+
"every" = callPackage
({ mkDerivation, async, base, stm }:
mkDerivation {
@@ -70875,8 +71091,8 @@ self: {
pname = "exceptions";
version = "0.10.0";
sha256 = "1ms9zansv0pwzwdjncvx4kf18lnkjy2p61hvjhvxmjx5bqp93p8y";
- revision = "1";
- editedCabalFile = "1ydvmhi9bj7b1md3wd4l2z2lccgyjgv3ha8milmy2l4lad9xh6xy";
+ revision = "2";
+ editedCabalFile = "0aiihbjfrlmxzw9q8idvr6mihhs7kbx9s3w1vj8x3pz27p0ncq7g";
libraryHaskellDepends = [
base mtl stm template-haskell transformers transformers-compat
];
@@ -71194,6 +71410,8 @@ self: {
pname = "exitcode";
version = "0.1.0.1";
sha256 = "1h4qv29g59dxwsb2i4qrnf2f96xsmzngc9rnrqfkh8nkkcr71br5";
+ revision = "1";
+ editedCabalFile = "0p2kmkgqbfcf5za5n210a6ra6758dkmkwvs516aj3y895na6j14z";
libraryHaskellDepends = [
base lens mmorph mtl semigroupoids semigroups transformers
];
@@ -71682,8 +71900,8 @@ self: {
}:
mkDerivation {
pname = "extensible-effects";
- version = "3.1.0.0";
- sha256 = "0p4vk4k6922ar853zb85jm4si7y1qdr1wkx4pwfd613a5ar23440";
+ version = "3.1.0.1";
+ sha256 = "1znqhcx5y4mpkbib18nma2c6bw4wxyxlxg3s8kafdalrx61rdhy3";
libraryHaskellDepends = [ base monad-control transformers-base ];
testHaskellDepends = [
base doctest HUnit monad-control QuickCheck silently test-framework
@@ -71842,8 +72060,8 @@ self: {
({ mkDerivation, base, leancheck, speculate, template-haskell }:
mkDerivation {
pname = "extrapolate";
- version = "0.3.1";
- sha256 = "1hz03mdascy4jvqhyrqqmb1py3pb03g4z3if05z2cbdxgbgsbbn4";
+ version = "0.3.3";
+ sha256 = "1mc14d9wcrvrd2fkzjxc5gvy7s33p875qj97bdaacdjv5hmg5zr2";
libraryHaskellDepends = [
base leancheck speculate template-haskell
];
@@ -71852,21 +72070,6 @@ self: {
license = stdenv.lib.licenses.bsd3;
}) {};
- "extrapolate_0_3_2" = callPackage
- ({ mkDerivation, base, leancheck, speculate, template-haskell }:
- mkDerivation {
- pname = "extrapolate";
- version = "0.3.2";
- sha256 = "1scfcjqz1q9pv37rvygbpdwx8j22469f5p2vf5ay68hd62d592gj";
- libraryHaskellDepends = [
- base leancheck speculate template-haskell
- ];
- testHaskellDepends = [ base leancheck speculate ];
- description = "generalize counter-examples of test properties";
- license = stdenv.lib.licenses.bsd3;
- hydraPlatforms = stdenv.lib.platforms.none;
- }) {};
-
"ez-couch" = callPackage
({ mkDerivation, aeson, attoparsec, attoparsec-conduit, base
, blaze-builder, bytestring, classy-prelude, classy-prelude-conduit
@@ -72228,8 +72431,8 @@ self: {
}:
mkDerivation {
pname = "fast-arithmetic";
- version = "0.6.0.9";
- sha256 = "1kpki7j8kz9xzzg8gl8l5g7wgq0v2s7r2lhr0mb4m67bkq61zmrs";
+ version = "0.6.1.1";
+ sha256 = "0adnngx0bqbrcsxkgpdfb60p4jhvx0b8ls37g94q6cx9s0n3cmb8";
libraryHaskellDepends = [ base composition-prelude gmpint ];
testHaskellDepends = [
arithmoi base combinat-compat hspec QuickCheck
@@ -73525,20 +73728,20 @@ self: {
}) {};
"fficxx" = callPackage
- ({ mkDerivation, base, bytestring, Cabal, containers, data-default
- , directory, either, errors, filepath, hashable, haskell-src-exts
- , lens, mtl, process, pureMD5, split, template, template-haskell
- , text, transformers, unordered-containers
+ ({ mkDerivation, aeson, aeson-pretty, base, bytestring, Cabal
+ , containers, data-default, directory, either, errors, filepath
+ , hashable, haskell-src-exts, lens, mtl, process, pureMD5, split
+ , template, template-haskell, text, transformers
+ , unordered-containers
}:
mkDerivation {
pname = "fficxx";
- version = "0.4.1";
- sha256 = "1s1yzvs1j4as4875509hzny1399zimpzyh9zh5g0ddg8dqg5lfi4";
- enableSeparateDataOutput = true;
+ version = "0.5";
+ sha256 = "16r7pbfxr1xf5jxwyk2qv50yishpk0mzndl88hv9bwpz7gbj55yy";
libraryHaskellDepends = [
- base bytestring Cabal containers data-default directory either
- errors filepath hashable haskell-src-exts lens mtl process pureMD5
- split template template-haskell text transformers
+ aeson aeson-pretty base bytestring Cabal containers data-default
+ directory either errors filepath hashable haskell-src-exts lens mtl
+ process pureMD5 split template template-haskell text transformers
unordered-containers
];
description = "automatic C++ binding generation";
@@ -73550,8 +73753,8 @@ self: {
({ mkDerivation, base, bytestring, template-haskell }:
mkDerivation {
pname = "fficxx-runtime";
- version = "0.3";
- sha256 = "18pzjhfqsr2f783xywmcfkz5isx31iqcyng4j5mbz92q2m166idb";
+ version = "0.5";
+ sha256 = "05ljkq3zv8nfx4xhvqql13qd81v46bnxnja8f8590yrf3zfqg87x";
libraryHaskellDepends = [ base bytestring template-haskell ];
description = "Runtime for fficxx-generated library";
license = stdenv.lib.licenses.bsd3;
@@ -73618,8 +73821,8 @@ self: {
({ mkDerivation, base, fftw }:
mkDerivation {
pname = "fftwRaw";
- version = "0.1.0.1";
- sha256 = "1ka58mkn30mrhma7l5cshilhaif4r2jqxqpm6rvmscrvnrjq3nyz";
+ version = "0.1.0.2";
+ sha256 = "1690x5vllqba39srbp7q3gl2rv30wq941sx4z89fh89axwgp9629";
libraryHaskellDepends = [ base ];
librarySystemDepends = [ fftw ];
description = "Low level bindings to FFTW";
@@ -74755,6 +74958,19 @@ self: {
license = stdenv.lib.licenses.bsd3;
}) {};
+ "fixed-vector_1_2_0_0" = callPackage
+ ({ mkDerivation, base, deepseq, doctest, filemanip, primitive }:
+ mkDerivation {
+ pname = "fixed-vector";
+ version = "1.2.0.0";
+ sha256 = "19846sgjlsv7qy9nm9l4p2wdms5kvx6y9wm5ffz1hw7h77qy8ryw";
+ libraryHaskellDepends = [ base deepseq primitive ];
+ testHaskellDepends = [ base doctest filemanip primitive ];
+ description = "Generic vectors with statically known size";
+ license = stdenv.lib.licenses.bsd3;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ }) {};
+
"fixed-vector-binary" = callPackage
({ mkDerivation, base, binary, fixed-vector, tasty
, tasty-quickcheck
@@ -75020,8 +75236,8 @@ self: {
}:
mkDerivation {
pname = "fizzbuzz-as-a-service";
- version = "0.1.0.2";
- sha256 = "0bskyv1zyk469bikh4rh6ad1i8d5ym9s89a88aw34cpphy0vq1zk";
+ version = "0.1.0.3";
+ sha256 = "0kzhbavi26qbph6pgna77fbnpfgrxi81h9v92177ycl980k4qdwv";
isLibrary = false;
isExecutable = true;
executableHaskellDepends = [
@@ -75306,44 +75522,33 @@ self: {
}) {};
"flight-igc" = callPackage
- ({ mkDerivation, base, cmdargs, directory, filemanip, filepath
- , hlint, mtl, parsec, raw-strings-qq, system-filepath, transformers
- }:
+ ({ mkDerivation, base, bytestring, parsec, utf8-string }:
mkDerivation {
pname = "flight-igc";
- version = "0.1.0";
- sha256 = "1cr25xhwmpzi0rg8znj1q7siy5skjm8q08ncgwvmd4h3mmdbb7xl";
- revision = "1";
- editedCabalFile = "0yaqp249gjqgch7w9d8y963afvjl43mhaywgni3x8ld14h55m7ia";
- isLibrary = true;
- isExecutable = true;
- libraryHaskellDepends = [ base parsec ];
- executableHaskellDepends = [
- base cmdargs directory filemanip filepath mtl raw-strings-qq
- system-filepath transformers
- ];
- testHaskellDepends = [ base hlint ];
+ version = "1.0.0";
+ sha256 = "17w40nfmdb4crg23fnqn663i4a60dx5714rcyaiqllm4r25n5qv9";
+ libraryHaskellDepends = [ base bytestring parsec utf8-string ];
description = "A parser for IGC files";
- license = stdenv.lib.licenses.bsd3;
+ license = stdenv.lib.licenses.mpl20;
hydraPlatforms = stdenv.lib.platforms.none;
}) {};
"flight-kml" = callPackage
- ({ mkDerivation, aeson, base, detour-via-sci, doctest, hlint, hxt
+ ({ mkDerivation, aeson, base, detour-via-sci, doctest, hxt
, hxt-xpath, parsec, path, raw-strings-qq, siggy-chardust
, smallcheck, split, tasty, tasty-hunit, tasty-quickcheck
, tasty-smallcheck, template-haskell, time
}:
mkDerivation {
pname = "flight-kml";
- version = "1.0.0";
- sha256 = "0h04f0hkcri1qjk9kfc4r0sg8wyf6hx6s4cjgzaqnmfak6sa9j9c";
+ version = "1.0.1";
+ sha256 = "1g70vm7qbxsx2azgb759xcpizq5c1ic2173w78jib0f7mpb8qc28";
libraryHaskellDepends = [
aeson base detour-via-sci hxt hxt-xpath parsec path siggy-chardust
split time
];
testHaskellDepends = [
- aeson base detour-via-sci doctest hlint hxt hxt-xpath parsec path
+ aeson base detour-via-sci doctest hxt hxt-xpath parsec path
raw-strings-qq siggy-chardust smallcheck split tasty tasty-hunit
tasty-quickcheck tasty-smallcheck template-haskell time
];
@@ -75486,6 +75691,19 @@ self: {
license = stdenv.lib.licenses.mit;
}) {};
+ "flow_1_0_15" = callPackage
+ ({ mkDerivation, base, doctest, QuickCheck, template-haskell }:
+ mkDerivation {
+ pname = "flow";
+ version = "1.0.15";
+ sha256 = "1i3rhjjl8w9xmvckz0qrlbg7jfdz6v5w5cgmhs8xqjys5ssmla2y";
+ libraryHaskellDepends = [ base ];
+ testHaskellDepends = [ base doctest QuickCheck template-haskell ];
+ description = "Write more understandable Haskell";
+ license = stdenv.lib.licenses.mit;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ }) {};
+
"flow-er" = callPackage
({ mkDerivation, base, doctest, flow, QuickCheck }:
mkDerivation {
@@ -76058,6 +76276,8 @@ self: {
pname = "foldl";
version = "1.4.3";
sha256 = "13n0ca3hw5jzqf6rxsdbhbwkn61a9zlm13f0f205s60j3sc72jzk";
+ revision = "1";
+ editedCabalFile = "043axkgbjwvzlh5il1cmrb36svri3v0zja00iym9p0vm9gldh81c";
libraryHaskellDepends = [
base bytestring comonad containers contravariant hashable
mwc-random primitive profunctors semigroupoids semigroups text
@@ -76068,6 +76288,27 @@ self: {
license = stdenv.lib.licenses.bsd3;
}) {};
+ "foldl_1_4_4" = callPackage
+ ({ mkDerivation, base, bytestring, comonad, containers
+ , contravariant, criterion, hashable, mwc-random, primitive
+ , profunctors, semigroupoids, semigroups, text, transformers
+ , unordered-containers, vector, vector-builder
+ }:
+ mkDerivation {
+ pname = "foldl";
+ version = "1.4.4";
+ sha256 = "0dy8dhpys2bq6pn0m6klsykk4mfxi6q8hr8gqbfcvqk6g4i5wyn7";
+ libraryHaskellDepends = [
+ base bytestring comonad containers contravariant hashable
+ mwc-random primitive profunctors semigroupoids semigroups text
+ transformers unordered-containers vector vector-builder
+ ];
+ benchmarkHaskellDepends = [ base criterion ];
+ description = "Composable, streaming, and efficient left folds";
+ license = stdenv.lib.licenses.bsd3;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ }) {};
+
"foldl-incremental" = callPackage
({ mkDerivation, base, bytestring, containers, criterion, deepseq
, foldl, histogram-fill, mwc-random, pipes, QuickCheck, tasty
@@ -80775,24 +81016,6 @@ self: {
}) {};
"genvalidity-text" = callPackage
- ({ mkDerivation, array, base, genvalidity, genvalidity-hspec, hspec
- , QuickCheck, text, validity, validity-text
- }:
- mkDerivation {
- pname = "genvalidity-text";
- version = "0.5.0.2";
- sha256 = "1d955278y5522a5aji1i662iynkjn7g88af9myvg6q5b4nig5cqx";
- libraryHaskellDepends = [
- array base genvalidity QuickCheck text validity validity-text
- ];
- testHaskellDepends = [
- base genvalidity genvalidity-hspec hspec QuickCheck text
- ];
- description = "GenValidity support for Text";
- license = stdenv.lib.licenses.mit;
- }) {};
-
- "genvalidity-text_0_5_1_0" = callPackage
({ mkDerivation, array, base, genvalidity, genvalidity-hspec, hspec
, QuickCheck, text, validity, validity-text
}:
@@ -80808,7 +81031,6 @@ self: {
];
description = "GenValidity support for Text";
license = stdenv.lib.licenses.mit;
- hydraPlatforms = stdenv.lib.platforms.none;
}) {};
"genvalidity-time" = callPackage
@@ -81023,20 +81245,21 @@ self: {
}) {};
"geojson" = callPackage
- ({ mkDerivation, aeson, base, bytestring, directory, doctest
- , filepath, hlint, lens, QuickCheck, semigroups, template-haskell
- , text, transformers, validation, vector
+ ({ mkDerivation, aeson, base, bytestring, hlint, lens, scientific
+ , semigroups, tasty, tasty-hspec, tasty-quickcheck, text
+ , transformers, validation, vector
}:
mkDerivation {
pname = "geojson";
- version = "1.3.1";
- sha256 = "0qcngx6dszpqrjsbfvqjgdn2qs3vyv112dwva5kbmwfpg5665xml";
+ version = "1.3.3";
+ sha256 = "17ra6kb2bgz9ydhqhgp00wmpd3dqxqgc89wifnn3qqk0rqwsqilz";
libraryHaskellDepends = [
- aeson base lens semigroups text transformers validation vector
+ aeson base lens scientific semigroups text transformers validation
+ vector
];
testHaskellDepends = [
- base bytestring directory doctest filepath hlint QuickCheck
- template-haskell
+ aeson base bytestring hlint tasty tasty-hspec tasty-quickcheck text
+ validation
];
description = "A thin GeoJSON Layer above the aeson library";
license = stdenv.lib.licenses.bsd3;
@@ -82372,6 +82595,33 @@ self: {
license = stdenv.lib.licenses.bsd3;
}) {};
+ "ghcid_0_7_1" = 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.1";
+ sha256 = "06n37dv51i2905v8nwwv1ilm0zlx6zblrkfic1mp491ws2sijdx7";
+ 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 {
@@ -82929,8 +83179,8 @@ self: {
}:
mkDerivation {
pname = "gi-gst";
- version = "1.0.15";
- sha256 = "09h4ilyg85d9b20chqf6fp6zqvxcclqn9i8s02bqw86cq7s19cq4";
+ version = "1.0.16";
+ sha256 = "0yygachni7ybb14sj8fqlb831154i1v4b7wn2z1qva6yx1h9gr3l";
setupHaskellDepends = [ base Cabal haskell-gi ];
libraryHaskellDepends = [
base bytestring containers gi-glib gi-gobject haskell-gi
@@ -83068,6 +83318,41 @@ self: {
license = stdenv.lib.licenses.lgpl21;
}) {gtk3 = pkgs.gnome3.gtk;};
+ "gi-gtk-declarative" = callPackage
+ ({ mkDerivation, base, gi-gobject, gi-gtk, haskell-gi
+ , haskell-gi-base, haskell-gi-overloading, mtl, text
+ , unordered-containers
+ }:
+ mkDerivation {
+ pname = "gi-gtk-declarative";
+ version = "0.1.0";
+ sha256 = "1yqvqbhlgbpq5s77fvqi8f644i059gg64xdkgwr4ka6zdz4fhiaf";
+ libraryHaskellDepends = [
+ base gi-gobject gi-gtk haskell-gi haskell-gi-base
+ haskell-gi-overloading mtl text unordered-containers
+ ];
+ description = "Declarative GTK+ programming in Haskell";
+ license = stdenv.lib.licenses.mpl20;
+ }) {};
+
+ "gi-gtk-declarative-app-simple" = callPackage
+ ({ mkDerivation, async, base, gi-gdk, gi-glib, gi-gobject, gi-gtk
+ , gi-gtk-declarative, haskell-gi, haskell-gi-base
+ , haskell-gi-overloading, pipes, pipes-concurrency, text
+ }:
+ mkDerivation {
+ pname = "gi-gtk-declarative-app-simple";
+ version = "0.1.0";
+ sha256 = "157xhfixlf545qzk9v4sav6817fdznxk0kwiin59xn9d3ldp71ak";
+ libraryHaskellDepends = [
+ async base gi-gdk gi-glib gi-gobject gi-gtk gi-gtk-declarative
+ haskell-gi haskell-gi-base haskell-gi-overloading pipes
+ pipes-concurrency text
+ ];
+ description = "Declarative GTK+ programming in Haskell in the style of [Pux](https://github.com/alexmingoia/purescript-pux).";
+ license = stdenv.lib.licenses.mpl20;
+ }) {};
+
"gi-gtk-hs" = callPackage
({ mkDerivation, base, base-compat, containers, gi-gdk
, gi-gdkpixbuf, gi-glib, gi-gobject, gi-gtk, haskell-gi-base, mtl
@@ -84472,23 +84757,20 @@ self: {
"gitlib-libgit2" = callPackage
({ mkDerivation, base, bytestring, conduit, conduit-combinators
, containers, directory, exceptions, fast-logger, filepath, gitlib
- , gitlib-test, hlibgit2, hspec, hspec-expectations, HUnit
- , lifted-async, lifted-base, mmorph, monad-control, monad-loops
- , mtl, resourcet, stm, stm-conduit, tagged, template-haskell, text
- , text-icu, time, transformers, transformers-base
+ , gitlib-test, hlibgit2, hspec, hspec-expectations, HUnit, mmorph
+ , monad-loops, mtl, resourcet, stm, stm-conduit, tagged
+ , template-haskell, text, text-icu, time, transformers
+ , transformers-base, unliftio, unliftio-core
}:
mkDerivation {
pname = "gitlib-libgit2";
- version = "3.1.1";
- sha256 = "1fv8r2w0fd9m7chrccmf5kw0pr2v0k2r2l0d782galdvq7mhca7w";
- revision = "1";
- editedCabalFile = "0v510c4sd6zwwf6mbc6gfv5sin91ckw4v6c844wrfksi9gdq3shm";
+ version = "3.1.2";
+ sha256 = "1nj9f2qmjxb5k9b23wfyz290pgb01hnzrswbamwb7am9bnkk250b";
libraryHaskellDepends = [
base bytestring conduit conduit-combinators containers directory
- exceptions fast-logger filepath gitlib hlibgit2 lifted-async
- lifted-base mmorph monad-control monad-loops mtl resourcet stm
- stm-conduit tagged template-haskell text text-icu time transformers
- transformers-base
+ exceptions fast-logger filepath gitlib hlibgit2 mmorph monad-loops
+ mtl resourcet stm stm-conduit tagged template-haskell text text-icu
+ time transformers transformers-base unliftio unliftio-core
];
testHaskellDepends = [
base exceptions gitlib gitlib-test hspec hspec-expectations HUnit
@@ -84544,17 +84826,17 @@ self: {
"gitlib-test" = callPackage
({ mkDerivation, base, bytestring, conduit, conduit-combinators
- , exceptions, gitlib, hspec, hspec-expectations, HUnit
- , monad-control, tagged, text, time, transformers
+ , exceptions, gitlib, hspec, hspec-expectations, HUnit, tagged
+ , text, time, transformers, unliftio-core
}:
mkDerivation {
pname = "gitlib-test";
- version = "3.1.0.3";
- sha256 = "07r970d6m15gri6xim71kl2vvml85jlb0vc51zb67gfsd6iby2py";
+ version = "3.1.1";
+ sha256 = "1h8kqqj298bb0bj7w4rw18jf3bz0h1rqdg8fngmp4p35c1k1kjzi";
libraryHaskellDepends = [
base bytestring conduit conduit-combinators exceptions gitlib hspec
- hspec-expectations HUnit monad-control tagged text time
- transformers
+ hspec-expectations HUnit tagged text time transformers
+ unliftio-core
];
description = "Test library for confirming gitlib backend compliance";
license = stdenv.lib.licenses.mit;
@@ -85053,6 +85335,8 @@ self: {
pname = "glirc";
version = "2.28";
sha256 = "17z3lhb7ngvp0678ry5zk0jl7pmjhzypk2l6x9mp43m427ick1nk";
+ revision = "1";
+ editedCabalFile = "142909apkky5z443qifchd2cm1dakw2zpbcfyxpvpi7crzhq0h1d";
isLibrary = true;
isExecutable = true;
setupHaskellDepends = [ base Cabal filepath ];
@@ -85076,8 +85360,8 @@ self: {
}:
mkDerivation {
pname = "gll";
- version = "0.4.0.11";
- sha256 = "0vxi750q11q1ggf0s2yyjpr47fmpfvmqm5mjdh6i4z6bf5vlhfd8";
+ version = "0.4.0.12";
+ sha256 = "1ls01s36ixik53c0fyr9sy3bhyh2kfn0yjkh3mp8izgw6l8aydwr";
libraryHaskellDepends = [
array base containers pretty random-strings regex-applicative text
time TypeCompose
@@ -85306,6 +85590,25 @@ self: {
license = stdenv.lib.licenses.mit;
}) {};
+ "gloss-export" = callPackage
+ ({ mkDerivation, base, GLFW-b, gloss, gloss-rendering, GLUT
+ , JuicyPixels, OpenGLRaw, vector
+ }:
+ mkDerivation {
+ pname = "gloss-export";
+ version = "0.1.0.0";
+ sha256 = "0m5k8zr90wqh6sjgn5c3mrpffwkq8g42qji8ss77l97a2hcv50dq";
+ isLibrary = true;
+ isExecutable = true;
+ libraryHaskellDepends = [
+ base GLFW-b gloss-rendering GLUT JuicyPixels OpenGLRaw vector
+ ];
+ executableHaskellDepends = [ base gloss ];
+ testHaskellDepends = [ base ];
+ description = "Export Gloss pictures to png, bmp, tga, tiff, gif and juicy-pixels-image";
+ license = stdenv.lib.licenses.mit;
+ }) {};
+
"gloss-game" = callPackage
({ mkDerivation, base, gloss, gloss-juicy }:
mkDerivation {
@@ -85322,8 +85625,10 @@ self: {
}:
mkDerivation {
pname = "gloss-juicy";
- version = "0.2.2";
- sha256 = "1w1y8aijdf4ba80rq5i2456xh1yyix4wcfagy102xsyvcldlggpv";
+ version = "0.2.3";
+ sha256 = "0px0i6fvicmsgvp7sl7g37y3163s1i2fm5xcq5b1ar9smwv25gq3";
+ revision = "1";
+ editedCabalFile = "09cbz0854v2dsmv24l40rmx4bq7ic436m4xingw93gvw4fawlfqc";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [
@@ -85731,8 +86036,8 @@ self: {
}:
mkDerivation {
pname = "gnuplot";
- version = "0.5.5.2";
- sha256 = "1mlppnc13ygjzmf6ldydys4wvy35yb3xjwwfgf9rbi7nfcqjr6mn";
+ version = "0.5.5.3";
+ sha256 = "0105ajc5szgrh091x5fxdcydc96rdh75gg2snyfr2y2rhf120x2g";
isLibrary = true;
isExecutable = true;
enableSeparateDataOutput = true;
@@ -88117,6 +88422,8 @@ self: {
pname = "grapefruit-frp";
version = "0.1.0.7";
sha256 = "132jd2dxj964paz6dcyb6sx25dkv271rl2fgw05c7zawrrfnrkxs";
+ revision = "1";
+ editedCabalFile = "14qhyvsf7r04fwm1jwl41gdijx0vrqz7lsqy50hmzpcwixr92013";
libraryHaskellDepends = [
arrows base containers fingertree semigroups TypeCompose
];
@@ -88145,6 +88452,8 @@ self: {
pname = "grapefruit-ui";
version = "0.1.0.7";
sha256 = "1r2wpn982z33s0p6fgdgslgv9ixanb2pysy71j20cfp1xzh13hdj";
+ revision = "1";
+ editedCabalFile = "0s61spgkw2h12g1wks5zxhrzpqqnmmxcw5kbirblyfl4p59pxpns";
libraryHaskellDepends = [
arrows base colour containers fraction grapefruit-frp
grapefruit-records
@@ -88163,6 +88472,8 @@ self: {
pname = "grapefruit-ui-gtk";
version = "0.1.0.7";
sha256 = "0ix6dilj3xv2cvihwq8cfykr8i1yq9w1bn86248r5bg5vhfn4g28";
+ revision = "1";
+ editedCabalFile = "0ahjd2sxh12hr8slz6vkc5gn2wr1h9dgq8q3kc9jq5xjzr66cgbk";
libraryHaskellDepends = [
base colour containers fraction glib grapefruit-frp
grapefruit-records grapefruit-ui gtk3 transformers
@@ -88862,8 +89173,8 @@ self: {
}:
mkDerivation {
pname = "greenclip";
- version = "3.1.1";
- sha256 = "1axh1q7kcvcnhn4rl704i4gcix5yn5v0sb3bdgjk4vgkd7fv8chw";
+ version = "3.2.0";
+ sha256 = "09ygvyrczxqsp2plwmwx021wmbq2vln9i4b5iaj0j26j7prykikq";
isLibrary = false;
isExecutable = true;
executableHaskellDepends = [
@@ -89000,6 +89311,28 @@ self: {
license = stdenv.lib.licenses.bsd3;
}) {};
+ "greskell-core_0_1_2_3" = callPackage
+ ({ mkDerivation, aeson, base, bytestring, containers, doctest
+ , doctest-discover, hashable, hspec, QuickCheck, scientific
+ , semigroups, text, unordered-containers, uuid, vector
+ }:
+ mkDerivation {
+ pname = "greskell-core";
+ version = "0.1.2.3";
+ sha256 = "026lipvhc4kjcmf1d604f6m71b3hrrkaafdvymmn1fsxa360dw0s";
+ libraryHaskellDepends = [
+ aeson base containers hashable scientific semigroups text
+ unordered-containers uuid vector
+ ];
+ testHaskellDepends = [
+ aeson base bytestring doctest doctest-discover hspec QuickCheck
+ text unordered-containers vector
+ ];
+ description = "Haskell binding for Gremlin graph query language - core data types and tools";
+ license = stdenv.lib.licenses.bsd3;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ }) {};
+
"greskell-websocket" = callPackage
({ mkDerivation, aeson, async, base, base64-bytestring, bytestring
, greskell-core, hashtables, hspec, safe-exceptions, stm, text
@@ -89211,8 +89544,8 @@ self: {
}:
mkDerivation {
pname = "groundhog";
- version = "0.8.0.1";
- sha256 = "0qrv2rpw1nqn28j6mcmwn0sjmfsfg5gj68sq5dcydh247q1acp5r";
+ version = "0.9.0";
+ sha256 = "09d0n91cd0bvmrik4ail2svbh7l8vp5va0344jzvy1g2ancy0yj0";
libraryHaskellDepends = [
aeson attoparsec base base64-bytestring blaze-builder bytestring
containers monad-control mtl resourcet safe-exceptions scientific
@@ -89273,8 +89606,8 @@ self: {
}:
mkDerivation {
pname = "groundhog-mysql";
- version = "0.8.0.1";
- sha256 = "0h4sckj7hrhlnrfa9639kr9id8rf11ragadsj9rxils1vn4cn35r";
+ version = "0.9.0";
+ sha256 = "0n3zcvb1qh5jdfrzgiamaf51fvkhgabsl07asy7wcdp0hb8rxdkq";
libraryHaskellDepends = [
base bytestring containers groundhog monad-control monad-logger
mysql mysql-simple resource-pool resourcet text time transformers
@@ -89292,8 +89625,8 @@ self: {
}:
mkDerivation {
pname = "groundhog-postgresql";
- version = "0.8.0.3";
- sha256 = "0iz21awiblzir01r6p77qnlvqsb8j87x5y11g1q2spnafzj4wlpl";
+ version = "0.9.0";
+ sha256 = "0r756ccnrwzwl6x9fkrvyws8l00sp9jjqlj5n42jkw7nwwx3i8gy";
libraryHaskellDepends = [
aeson attoparsec base blaze-builder bytestring containers groundhog
monad-control postgresql-libpq postgresql-simple resource-pool
@@ -89311,8 +89644,8 @@ self: {
}:
mkDerivation {
pname = "groundhog-sqlite";
- version = "0.8.0.1";
- sha256 = "1y6cfnyrrq61vv793crfb7yd21yn0gqmx7j7c9sg8665l34wq2jp";
+ version = "0.9.0";
+ sha256 = "06985myr96dc7f6hkkm9nihvvl2c19wdl1bn3nfvyj78yvz8ryxb";
libraryHaskellDepends = [
base bytestring containers direct-sqlite groundhog monad-control
resource-pool resourcet text transformers unordered-containers
@@ -89328,8 +89661,8 @@ self: {
}:
mkDerivation {
pname = "groundhog-th";
- version = "0.8.0.2";
- sha256 = "13rxdmnbmsivp608xclkvjnab0dzhzyqc8zjrpm7ml9d5yc8v596";
+ version = "0.9.0";
+ sha256 = "1wwfgyak5kdhnn6i07y114q063ryg9w3sngh0c2fh2addh5xrqay";
libraryHaskellDepends = [
aeson base bytestring containers groundhog template-haskell text
time unordered-containers yaml
@@ -89463,6 +89796,34 @@ self: {
hydraPlatforms = stdenv.lib.platforms.none;
}) {};
+ "grpc-api-etcd" = callPackage
+ ({ mkDerivation, base, proto-lens, proto-lens-protoc }:
+ mkDerivation {
+ pname = "grpc-api-etcd";
+ version = "0.1.0.1";
+ sha256 = "0sr9nsk207ap1psf4mypzjbpbppxwmbbcv6z07dxpv1dwzs6dnyf";
+ libraryHaskellDepends = [ base proto-lens proto-lens-protoc ];
+ description = "Generated messages and instances for etcd gRPC";
+ license = stdenv.lib.licenses.bsd3;
+ }) {};
+
+ "grpc-etcd-client" = callPackage
+ ({ mkDerivation, base, bytestring, data-default-class
+ , grpc-api-etcd, http2-client, http2-client-grpc, lens, network
+ , proto-lens, proto-lens-protoc
+ }:
+ mkDerivation {
+ pname = "grpc-etcd-client";
+ version = "0.1.1.2";
+ sha256 = "1xrdasrg0m3cxlb227wmnl9vbakqiikrm3wi07wbnmbg6n5agzkr";
+ libraryHaskellDepends = [
+ base bytestring data-default-class grpc-api-etcd http2-client
+ http2-client-grpc lens network proto-lens proto-lens-protoc
+ ];
+ description = "gRPC client for etcd";
+ license = stdenv.lib.licenses.bsd3;
+ }) {};
+
"gruff" = callPackage
({ mkDerivation, base, bytestring, containers, directory, filepath
, FTGL, gtk, gtkglext, mtl, old-locale, OpenGL, OpenGLRaw, parallel
@@ -89688,6 +90049,25 @@ self: {
license = stdenv.lib.licenses.lgpl21;
}) {gtk2 = pkgs.gnome2.gtk;};
+ "gtk_0_15_0" = callPackage
+ ({ mkDerivation, array, base, bytestring, Cabal, cairo, containers
+ , gio, glib, gtk2, gtk2hs-buildtools, mtl, pango, text
+ }:
+ mkDerivation {
+ pname = "gtk";
+ version = "0.15.0";
+ sha256 = "110lawhnd00acllfjhimcq59wxsrl2xs68mam6wmqfc43wan5f5k";
+ enableSeparateDataOutput = true;
+ setupHaskellDepends = [ base Cabal gtk2hs-buildtools ];
+ libraryHaskellDepends = [
+ array base bytestring cairo containers gio glib mtl pango text
+ ];
+ libraryPkgconfigDepends = [ gtk2 ];
+ description = "Binding to the Gtk+ graphical user interface library";
+ license = stdenv.lib.licenses.lgpl21;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ }) {gtk2 = pkgs.gnome2.gtk;};
+
"gtk-helpers" = callPackage
({ mkDerivation, array, base, gio, glib, gtk, mtl, process
, template-haskell
@@ -90021,6 +90401,27 @@ self: {
license = stdenv.lib.licenses.lgpl21;
}) {inherit (pkgs) gtk3;};
+ "gtk3_0_15_0" = callPackage
+ ({ mkDerivation, array, base, bytestring, Cabal, cairo, containers
+ , gio, glib, gtk2hs-buildtools, gtk3, mtl, pango, text
+ }:
+ mkDerivation {
+ pname = "gtk3";
+ version = "0.15.0";
+ sha256 = "1q6ysw00gjaaali18iz111zqzkjiblzg7cfg6ckvzf93mg0w6g0c";
+ isLibrary = true;
+ isExecutable = true;
+ enableSeparateDataOutput = true;
+ setupHaskellDepends = [ base Cabal gtk2hs-buildtools ];
+ libraryHaskellDepends = [
+ array base bytestring cairo containers gio glib mtl pango text
+ ];
+ libraryPkgconfigDepends = [ gtk3 ];
+ description = "Binding to the Gtk+ 3 graphical user interface library";
+ license = stdenv.lib.licenses.lgpl21;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ }) {inherit (pkgs) gtk3;};
+
"gtk3-mac-integration" = callPackage
({ mkDerivation, array, base, Cabal, containers, glib
, gtk-mac-integration-gtk3, gtk2hs-buildtools, gtk3, mtl
@@ -90274,8 +90675,8 @@ self: {
}:
mkDerivation {
pname = "h-gpgme";
- version = "0.5.0.0";
- sha256 = "0fvkj7cz7nfz52a2zccngb8gbs8p94whvgccvnxpwmkg90m45mfp";
+ version = "0.5.1.0";
+ sha256 = "0fdlfi068m23yizkfgsbzjvd1yxmrvmbndsbsvawljq98jc75sgl";
libraryHaskellDepends = [
base bindings-gpgme bytestring data-default email-validate time
transformers unix
@@ -92020,17 +92421,17 @@ self: {
}:
mkDerivation {
pname = "hadolint";
- version = "1.11.2";
- sha256 = "0xfhghpy0jmgmlyzc6plcg3nq26afbwp36bjjdc156rcwzsm9qyx";
+ version = "1.13.0";
+ sha256 = "1z5qaxslshd1adkhqcpx8m8fs8d3dw4vwbwvsqcpm7gis63qhbqg";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [
- aeson base bytestring containers language-docker megaparsec mtl
- ShellCheck split text void
+ aeson base bytestring containers directory filepath language-docker
+ megaparsec mtl ShellCheck split text void yaml
];
executableHaskellDepends = [
- base containers directory filepath gitrev language-docker
- megaparsec optparse-applicative text yaml
+ base containers gitrev language-docker megaparsec
+ optparse-applicative text
];
testHaskellDepends = [
aeson base bytestring hspec HUnit language-docker megaparsec
@@ -92649,8 +93050,8 @@ self: {
}:
mkDerivation {
pname = "hakyll-dir-list";
- version = "1.0.0.2";
- sha256 = "0irkfnwbzhchvjsfzndb6i3w76gnwik9fq3fhi3qg3jc7l0cgi76";
+ version = "1.0.0.4";
+ sha256 = "0n7cfamaan0yyrpdfqmjbbgv7cg172hp4zs16zf52l90xdq253h9";
libraryHaskellDepends = [
base containers data-default filepath hakyll
];
@@ -93396,34 +93797,6 @@ self: {
}) {};
"hapistrano" = callPackage
- ({ mkDerivation, aeson, async, base, directory, filepath
- , formatting, gitrev, hspec, mtl, optparse-applicative, path
- , path-io, process, stm, temporary, time, transformers, yaml
- }:
- mkDerivation {
- pname = "hapistrano";
- version = "0.3.5.9";
- sha256 = "1jyzjj9m6vj9rlpvadaxnfxxl8ynrn8jp9xzyp3kwkzyv6cdi1ha";
- revision = "2";
- editedCabalFile = "1gfs133dm21jwv48v4wlr1dbr993fz49b9lviaahkymlv1d3j8gd";
- isLibrary = true;
- isExecutable = true;
- enableSeparateDataOutput = true;
- libraryHaskellDepends = [
- base filepath formatting gitrev mtl path process time transformers
- ];
- executableHaskellDepends = [
- aeson async base formatting gitrev optparse-applicative path
- path-io stm yaml
- ];
- testHaskellDepends = [
- base directory filepath hspec mtl path path-io process temporary
- ];
- description = "A deployment library for Haskell applications";
- license = stdenv.lib.licenses.mit;
- }) {};
-
- "hapistrano_0_3_5_10" = callPackage
({ mkDerivation, aeson, async, base, directory, filepath
, formatting, gitrev, hspec, mtl, optparse-applicative, path
, path-io, process, stm, temporary, time, transformers, yaml
@@ -93447,7 +93820,6 @@ self: {
];
description = "A deployment library for Haskell applications";
license = stdenv.lib.licenses.mit;
- hydraPlatforms = stdenv.lib.platforms.none;
}) {};
"happindicator" = callPackage
@@ -95816,7 +96188,7 @@ self: {
description = "Haskell interface of the igraph library";
license = stdenv.lib.licenses.mit;
hydraPlatforms = stdenv.lib.platforms.none;
- }) {igraph = null;};
+ }) {inherit (pkgs) igraph;};
"haskell-import-graph" = callPackage
({ mkDerivation, base, classy-prelude, ghc, graphviz, process, text
@@ -95913,7 +96285,7 @@ self: {
license = stdenv.lib.licenses.mit;
}) {};
- "haskell-lsp_0_7_0_0" = callPackage
+ "haskell-lsp_0_8_0_0" = callPackage
({ mkDerivation, aeson, base, bytestring, containers, data-default
, directory, filepath, hashable, haskell-lsp-types, hslogger, hspec
, lens, mtl, network-uri, parsec, sorted-list, stm, text, time
@@ -95921,10 +96293,8 @@ self: {
}:
mkDerivation {
pname = "haskell-lsp";
- version = "0.7.0.0";
- sha256 = "1v67yj0ndd5wra2rnmdqcamivml82yn4lwhnm04nz6spsq2mqgkv";
- revision = "1";
- editedCabalFile = "1j33y61hwarfm5p54b682sd3rfhxf82lchr1jnnvv1h8xs56ryln";
+ version = "0.8.0.0";
+ sha256 = "04mihj4538pys6v4m3dwijfzcpsv52jizm416rnnwc88gr8q6wkk";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [
@@ -95983,15 +96353,15 @@ self: {
license = stdenv.lib.licenses.mit;
}) {};
- "haskell-lsp-types_0_7_0_0" = callPackage
+ "haskell-lsp-types_0_8_0_0" = callPackage
({ mkDerivation, aeson, base, bytestring, data-default, filepath
, hashable, lens, network-uri, scientific, text
, unordered-containers
}:
mkDerivation {
pname = "haskell-lsp-types";
- version = "0.7.0.0";
- sha256 = "1iisadmi3v3wshpwi5cbn2p8p4qr9rh5xnlbhjymzxhj9k09cmcb";
+ version = "0.8.0.0";
+ sha256 = "11dm7v9rvfig6m40m0np7cs5cfaawwpw67c445dz15vls5pri71n";
libraryHaskellDepends = [
aeson base bytestring data-default filepath hashable lens
network-uri scientific text unordered-containers
@@ -97751,31 +98121,30 @@ self: {
}) {};
"haskoin-core" = callPackage
- ({ mkDerivation, aeson, base, base16-bytestring, binary, byteable
- , bytestring, cereal, conduit, containers, cryptohash, deepseq
- , either, entropy, HUnit, largeword, mtl, murmur3, network, pbkdf
- , QuickCheck, safe, scientific, secp256k1, split
- , string-conversions, test-framework, test-framework-hunit
- , test-framework-quickcheck2, text, time, unordered-containers
- , vector
+ ({ mkDerivation, aeson, array, base, base16-bytestring, bytestring
+ , cereal, conduit, containers, cryptonite, deepseq, entropy
+ , hashable, hspec, hspec-discover, HUnit, memory, mtl, murmur3
+ , network, QuickCheck, safe, scientific, secp256k1-haskell, split
+ , string-conversions, text, time, transformers
+ , unordered-containers, vector
}:
mkDerivation {
pname = "haskoin-core";
- version = "0.4.2";
- sha256 = "0nyla9kqgyjahnpf3idi7kzyx8h7q92vk3jql1gl9iq8q9acwnzk";
+ version = "0.5.2";
+ sha256 = "1sjsni26m9f36v9zc3q6gkpv8d7bnwvn88s1v77d5z81jszfwq2b";
libraryHaskellDepends = [
- aeson base base16-bytestring byteable bytestring cereal conduit
- containers cryptohash deepseq either entropy largeword mtl murmur3
- network pbkdf QuickCheck secp256k1 split string-conversions text
- time vector
+ aeson array base base16-bytestring bytestring cereal conduit
+ containers cryptonite deepseq entropy hashable memory mtl murmur3
+ network QuickCheck scientific secp256k1-haskell split
+ string-conversions text time transformers unordered-containers
+ vector
];
testHaskellDepends = [
- aeson base binary bytestring cereal containers HUnit largeword mtl
- QuickCheck safe scientific secp256k1 split string-conversions
- test-framework test-framework-hunit test-framework-quickcheck2 text
- unordered-containers vector
+ aeson base bytestring cereal containers hspec HUnit mtl QuickCheck
+ safe split string-conversions text vector
];
- description = "Implementation of the core Bitcoin protocol features";
+ testToolDepends = [ hspec-discover ];
+ description = "Bitcoin & Bitcoin Cash library for Haskell";
license = stdenv.lib.licenses.publicDomain;
hydraPlatforms = stdenv.lib.platforms.none;
}) {};
@@ -97804,34 +98173,25 @@ self: {
}) {};
"haskoin-node" = callPackage
- ({ mkDerivation, aeson, async, base, bytestring, cereal
- , concurrent-extra, conduit, conduit-extra, containers
- , data-default, deepseq, either, esqueleto, exceptions
- , haskoin-core, HUnit, largeword, lifted-async, lifted-base
- , monad-control, monad-logger, mtl, network, persistent
- , persistent-sqlite, persistent-template, QuickCheck, random
- , resource-pool, resourcet, stm, stm-chans, stm-conduit
- , string-conversions, test-framework, test-framework-hunit
- , test-framework-quickcheck2, text, time
+ ({ mkDerivation, base, bytestring, cereal, conduit, conduit-extra
+ , hashable, haskoin-core, hspec, monad-logger, mtl, network, nqe
+ , random, resourcet, rocksdb-haskell, rocksdb-query
+ , string-conversions, time, unique, unliftio
}:
mkDerivation {
pname = "haskoin-node";
- version = "0.4.2";
- sha256 = "0khgdr5qql716d1klajs4y0mkyz0d9h3drahhv8062k64n7a989s";
+ version = "0.5.2";
+ sha256 = "1wrkah2sbinkc5yp2b6mj6z0aps1pl7j1hncygmsa5pvg8iifjih";
libraryHaskellDepends = [
- aeson async base bytestring cereal concurrent-extra conduit
- conduit-extra containers data-default deepseq either esqueleto
- exceptions haskoin-core largeword lifted-async lifted-base
- monad-control monad-logger mtl network persistent
- persistent-template random resource-pool stm stm-chans stm-conduit
- string-conversions text time
+ base bytestring cereal conduit conduit-extra hashable haskoin-core
+ monad-logger mtl network nqe random resourcet rocksdb-haskell
+ rocksdb-query string-conversions time unique unliftio
];
testHaskellDepends = [
- base haskoin-core HUnit monad-logger mtl persistent
- persistent-sqlite QuickCheck resourcet test-framework
- test-framework-hunit test-framework-quickcheck2
+ base bytestring cereal haskoin-core hspec monad-logger mtl network
+ nqe random rocksdb-haskell unliftio
];
- description = "Implementation of a Bitoin node";
+ description = "Haskoin Node P2P library for Bitcoin and Bitcoin Cash";
license = stdenv.lib.licenses.publicDomain;
hydraPlatforms = stdenv.lib.platforms.none;
}) {};
@@ -97880,6 +98240,37 @@ self: {
hydraPlatforms = stdenv.lib.platforms.none;
}) {};
+ "haskoin-store" = callPackage
+ ({ mkDerivation, aeson, base, bytestring, cereal, conduit
+ , containers, directory, filepath, haskoin-core, haskoin-node
+ , hspec, http-types, monad-logger, mtl, network, nqe
+ , optparse-applicative, random, rocksdb-haskell, rocksdb-query
+ , scotty, string-conversions, text, time, transformers, unliftio
+ }:
+ mkDerivation {
+ pname = "haskoin-store";
+ version = "0.1.3";
+ sha256 = "1xlvh0q6jx37p4rnq4qspwnnq7hpvaqi9ib1mlgkdxj7ypxk26fr";
+ isLibrary = true;
+ isExecutable = true;
+ libraryHaskellDepends = [
+ aeson base bytestring cereal conduit containers haskoin-core
+ haskoin-node monad-logger mtl network nqe random rocksdb-haskell
+ rocksdb-query string-conversions text time transformers unliftio
+ ];
+ executableHaskellDepends = [
+ aeson base bytestring conduit directory filepath haskoin-core
+ haskoin-node http-types monad-logger nqe optparse-applicative
+ rocksdb-haskell scotty string-conversions text unliftio
+ ];
+ testHaskellDepends = [
+ base haskoin-core haskoin-node hspec monad-logger nqe
+ rocksdb-haskell unliftio
+ ];
+ description = "Storage and index for Bitcoin and Bitcoin Cash";
+ license = stdenv.lib.licenses.publicDomain;
+ }) {};
+
"haskoin-util" = callPackage
({ mkDerivation, base, binary, bytestring, containers, either
, HUnit, mtl, QuickCheck, test-framework, test-framework-hunit
@@ -98292,8 +98683,8 @@ self: {
}:
mkDerivation {
pname = "hasmin";
- version = "1.0.2";
- sha256 = "13cblc4jcn88w00rsb72dqhiy18mfph388407vm3k6kbg5zxg1d9";
+ version = "1.0.2.1";
+ sha256 = "0dwamjpqwikl8qh5zcxhrm7x80k35zw29xh83yfnwnsa41incylb";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [
@@ -98349,6 +98740,8 @@ self: {
pname = "hasql";
version = "1.3.0.3";
sha256 = "01vl4p67yhcm8cmbmajgyd7ggj3p5f6350f8sky8kv3dn31wg6ji";
+ revision = "2";
+ editedCabalFile = "14063k0dald0i2cqk70kdja1df587vn8vrzgw3rb62nxwycr0r9b";
libraryHaskellDepends = [
attoparsec base base-prelude bytestring bytestring-strict-builder
contravariant contravariant-extras data-default-class dlist
@@ -99057,6 +99450,8 @@ self: {
pname = "haxl";
version = "2.0.1.0";
sha256 = "07s3jxqvdcla3qj8jjxd5088kp7h015i2q20kjhs4n73swa9h9fd";
+ revision = "1";
+ editedCabalFile = "04k5q5hvnbw1shrb8pqw3nwsylpb78fi802xzfq2gcmrnl6hy58p";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [
@@ -99964,6 +100359,8 @@ self: {
pname = "hdirect";
version = "0.21.0";
sha256 = "1v7yx9k0kib6527k49hf3s4jvdda7a0wgv09qhyjk6lyriyi3ny2";
+ revision = "1";
+ editedCabalFile = "19h5zsxl8knbvkbyv7z0an5hdibi2xslbva5cmck9h5wgc9m874n";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [ array base haskell98 pretty ];
@@ -100205,6 +100602,58 @@ self: {
license = stdenv.lib.licenses.bsd3;
}) {};
+ "heatitup" = callPackage
+ ({ mkDerivation, base, bytestring, bytestring-show, cassava, colour
+ , containers, diagrams-core, diagrams-html5, diagrams-lib
+ , diagrams-pgf, diagrams-rasterific, diagrams-svg, edit-distance
+ , fasta, lens, optparse-applicative, pipes, pipes-bytestring
+ , pipes-csv, safe, string-similarity, stringsearch, suffixtree
+ , vector
+ }:
+ mkDerivation {
+ pname = "heatitup";
+ version = "0.5.3.3";
+ sha256 = "1bqindh91i4ra67516nl0c5i98fgm9bwsjy7vv0qjzmfqk3bqp84";
+ isLibrary = true;
+ isExecutable = true;
+ libraryHaskellDepends = [
+ base bytestring bytestring-show cassava colour containers
+ diagrams-lib edit-distance fasta lens pipes pipes-bytestring
+ pipes-csv safe string-similarity stringsearch suffixtree vector
+ ];
+ executableHaskellDepends = [
+ base bytestring colour containers diagrams-core diagrams-html5
+ diagrams-lib diagrams-pgf diagrams-rasterific diagrams-svg fasta
+ lens optparse-applicative pipes pipes-bytestring pipes-csv safe
+ vector
+ ];
+ description = "Find and annotate ITDs";
+ license = stdenv.lib.licenses.gpl3;
+ }) {};
+
+ "heatitup-complete" = callPackage
+ ({ mkDerivation, base, bytestring, cassava, containers, fasta
+ , foldl, lens, optparse-applicative, pipes, pipes-text, safe, text
+ , text-show, turtle, vector
+ }:
+ mkDerivation {
+ pname = "heatitup-complete";
+ version = "0.5.3.3";
+ sha256 = "1djs5hni6s4mzs4fniamfz6k7590l34mgvd1d2kglmdpb5m22pcz";
+ isLibrary = true;
+ isExecutable = true;
+ libraryHaskellDepends = [
+ base bytestring cassava containers fasta foldl lens safe text
+ text-show turtle vector
+ ];
+ executableHaskellDepends = [
+ base bytestring cassava containers fasta foldl optparse-applicative
+ pipes pipes-text safe text turtle vector
+ ];
+ description = "Find and annotate ITDs with assembly or read pair joining";
+ license = stdenv.lib.licenses.gpl3;
+ }) {};
+
"heatshrink" = callPackage
({ mkDerivation, base, bytestring, c2hs, cereal, pcre-heavy, tasty
, tasty-golden, tasty-hunit, text
@@ -100452,31 +100901,6 @@ self: {
}) {};
"hedis" = callPackage
- ({ mkDerivation, async, base, bytestring, bytestring-lexing
- , deepseq, doctest, errors, HTTP, HUnit, mtl, network, network-uri
- , resource-pool, scanner, slave-thread, stm, test-framework
- , test-framework-hunit, text, time, tls, unordered-containers
- , vector
- }:
- mkDerivation {
- pname = "hedis";
- version = "0.10.3";
- sha256 = "0wapsg0amlmzayphchng67ih3ivp0mk3vgi8x1mzrkd1xrlgav3v";
- libraryHaskellDepends = [
- async base bytestring bytestring-lexing deepseq errors HTTP mtl
- network network-uri resource-pool scanner stm text time tls
- unordered-containers vector
- ];
- testHaskellDepends = [
- async base bytestring doctest HUnit mtl slave-thread stm
- test-framework test-framework-hunit text time
- ];
- benchmarkHaskellDepends = [ base mtl time ];
- description = "Client library for the Redis datastore: supports full command set, pipelining";
- license = stdenv.lib.licenses.bsd3;
- }) {};
-
- "hedis_0_10_4" = callPackage
({ mkDerivation, async, base, bytestring, bytestring-lexing
, deepseq, doctest, errors, HTTP, HUnit, mtl, network, network-uri
, resource-pool, scanner, slave-thread, stm, test-framework
@@ -100499,7 +100923,6 @@ self: {
benchmarkHaskellDepends = [ base mtl time ];
description = "Client library for the Redis datastore: supports full command set, pipelining";
license = stdenv.lib.licenses.bsd3;
- hydraPlatforms = stdenv.lib.platforms.none;
}) {};
"hedis-config" = callPackage
@@ -101631,6 +102054,19 @@ self: {
license = stdenv.lib.licenses.bsd3;
}) {};
+ "hexml_0_3_4" = callPackage
+ ({ mkDerivation, base, bytestring, extra }:
+ mkDerivation {
+ pname = "hexml";
+ version = "0.3.4";
+ sha256 = "0amy5gjk1sqj5dq8a8gp7d3z9wfhcflhxkssijnklnfn5s002x4k";
+ libraryHaskellDepends = [ base bytestring extra ];
+ testHaskellDepends = [ base bytestring ];
+ description = "XML subset DOM parser";
+ license = stdenv.lib.licenses.bsd3;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ }) {};
+
"hexml-lens" = callPackage
({ mkDerivation, base, bytestring, contravariant, doctest
, foundation, hexml, hspec, lens, profunctors, QuickCheck, text
@@ -101980,10 +102416,8 @@ self: {
}:
mkDerivation {
pname = "hformat";
- version = "0.3.3.0";
- sha256 = "0g9kjfssaksjj3cp0qiwk7v85yy3sb2ryhjnlrdznhm3mnkvp35j";
- revision = "1";
- editedCabalFile = "00924yrjyzy3v5l13f03v1qw45ra2600f98r9bgswjqrrn87m79i";
+ version = "0.3.3.1";
+ sha256 = "0wx7qlhdzd8rl2d351hvxzwlyz9yxza625fklp2p66x7khfxlbih";
libraryHaskellDepends = [
ansi-terminal base base-unicode-symbols text
];
@@ -102243,18 +102677,18 @@ self: {
({ mkDerivation, ansi-wl-pprint, base, binary, bytestring, Chart
, Chart-cairo, Chart-diagrams, colour, composition-prelude
, data-binary-ieee754, data-default, directory, filepath, hspec
- , lens, monad-loops
+ , lens, monad-loops, spherical
}:
mkDerivation {
pname = "hgis";
- version = "1.0.0.2";
- sha256 = "1z730c48pvi6ylb0pjzx2x9jnd03aadpmsx3psrlf2vp0bvm6ims";
+ version = "1.0.0.3";
+ sha256 = "00s87mna6lxr1q3275jg7ya17qhksr9bmfg2nw9mgadb05j6h2v8";
libraryHaskellDepends = [
ansi-wl-pprint base binary bytestring Chart Chart-cairo
Chart-diagrams colour composition-prelude data-binary-ieee754
- data-default directory filepath lens monad-loops
+ data-default directory filepath lens monad-loops spherical
];
- testHaskellDepends = [ base hspec ];
+ testHaskellDepends = [ base hspec spherical ];
doHaddock = false;
description = "Library and for GIS with Haskell";
license = stdenv.lib.licenses.bsd3;
@@ -106162,8 +106596,8 @@ self: {
pname = "hookup";
version = "0.2.2";
sha256 = "1q9w8j4g8j9ijfvwpng4i3k2b8pkf4ln27bcdaalnp9yyidmxlqf";
- revision = "1";
- editedCabalFile = "1ag338856kxlywgcizqij566iaqicv4jb3kmd017k7qflq8vmwb3";
+ revision = "2";
+ editedCabalFile = "12x7h7yg0x9gqv9yj2snp3k221yzyphm1l7aixkz1szxp1pndfgy";
libraryHaskellDepends = [
attoparsec base bytestring HsOpenSSL HsOpenSSL-x509-system network
];
@@ -106392,8 +106826,8 @@ self: {
}:
mkDerivation {
pname = "hoppy-generator";
- version = "0.5.1";
- sha256 = "1hnaxv3vg46a9iqszi3dfjj5kd3gqiagrxz28hi2wvvcpc8zpadn";
+ version = "0.5.2";
+ sha256 = "0ifk7ja1nynbgcf7q8v2dl4sn5ivif9rbd2d7pjp9lx43di9axfc";
libraryHaskellDepends = [
base containers directory filepath haskell-src mtl
];
@@ -106665,25 +107099,6 @@ self: {
}) {};
"hourglass" = callPackage
- ({ mkDerivation, base, bytestring, deepseq, gauge, mtl, old-locale
- , tasty, tasty-hunit, tasty-quickcheck, time
- }:
- mkDerivation {
- pname = "hourglass";
- version = "0.2.11";
- sha256 = "0lag9sgj7ndrbfmab6jhszlv413agg0zzaj5r9f2fmf07wqbp9hq";
- libraryHaskellDepends = [ base deepseq ];
- testHaskellDepends = [
- base deepseq mtl old-locale tasty tasty-hunit tasty-quickcheck time
- ];
- benchmarkHaskellDepends = [
- base bytestring deepseq gauge mtl old-locale time
- ];
- description = "simple performant time related library";
- license = stdenv.lib.licenses.bsd3;
- }) {};
-
- "hourglass_0_2_12" = callPackage
({ mkDerivation, base, bytestring, deepseq, gauge, mtl, old-locale
, tasty, tasty-hunit, tasty-quickcheck, time
}:
@@ -106700,7 +107115,6 @@ self: {
];
description = "simple performant time related library";
license = stdenv.lib.licenses.bsd3;
- hydraPlatforms = stdenv.lib.platforms.none;
}) {};
"hourglass-fuzzy-parsing" = callPackage
@@ -106909,18 +107323,18 @@ self: {
license = stdenv.lib.licenses.mit;
}) {};
- "hpack_0_29_7" = callPackage
+ "hpack_0_31_0" = callPackage
({ mkDerivation, aeson, base, bifunctors, bytestring, Cabal
, containers, cryptonite, deepseq, directory, filepath, Glob, hspec
- , http-client, http-client-tls, http-types, HUnit, infer-license
- , interpolate, mockery, pretty, QuickCheck, scientific
- , template-haskell, temporary, text, transformers
+ , hspec-discover, http-client, http-client-tls, http-types, HUnit
+ , infer-license, interpolate, mockery, pretty, QuickCheck
+ , scientific, template-haskell, temporary, text, transformers
, unordered-containers, vector, yaml
}:
mkDerivation {
pname = "hpack";
- version = "0.29.7";
- sha256 = "07a9dar92qmgxfkf783rlwpkl49f242ygd50wrc22g4xllgrm2y9";
+ version = "0.31.0";
+ sha256 = "0lh60zqjzbjq0hkdia97swz0g1r3ihj84fph9jq9936fpb7hm1n9";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [
@@ -106942,6 +107356,7 @@ self: {
QuickCheck scientific template-haskell temporary text transformers
unordered-containers vector yaml
];
+ testToolDepends = [ hspec-discover ];
description = "A modern format for Haskell packages";
license = stdenv.lib.licenses.mit;
hydraPlatforms = stdenv.lib.platforms.none;
@@ -107343,18 +107758,18 @@ self: {
}) {};
"hpp" = callPackage
- ({ mkDerivation, base, bytestring, bytestring-trie, directory
- , filepath, ghc-prim, time, transformers
+ ({ mkDerivation, base, bytestring, directory, filepath, ghc-prim
+ , time, transformers, unordered-containers
}:
mkDerivation {
pname = "hpp";
- version = "0.5.2";
- sha256 = "1r1sas1rcxcra4q3vjw3qmiv0xc4j263m7p93y6bwm1fvpxlkvcc";
+ version = "0.6.1";
+ sha256 = "1gv2gndbyrppl8qan680kl9kmwv6b5a5j5yrwifzh8rj73s47a6i";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [
- base bytestring bytestring-trie directory filepath ghc-prim time
- transformers
+ base bytestring directory filepath ghc-prim time transformers
+ unordered-containers
];
executableHaskellDepends = [ base directory filepath time ];
testHaskellDepends = [ base bytestring transformers ];
@@ -107726,8 +108141,8 @@ self: {
}:
mkDerivation {
pname = "hriemann";
- version = "0.3.3.0";
- sha256 = "0apji56rwh1did67z9z0bcy5r9k2m6rrfkiv18rp4mbd863skg25";
+ version = "0.3.3.1";
+ sha256 = "0a2pljkqjvx88cssq24yq8h06md864fvvr77ka0nnmk3znyddn9f";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [
@@ -108016,17 +108431,6 @@ self: {
}) {inherit (pkgs) fltk; fltk_images = null;};
"hs-functors" = callPackage
- ({ mkDerivation, base, transformers }:
- mkDerivation {
- pname = "hs-functors";
- version = "0.1.2.0";
- sha256 = "0jhhli0hhhmrh313nnydblyz68rhhmf4g6yrn35m8davj5cg1wd7";
- libraryHaskellDepends = [ base transformers ];
- description = "Functors from products of Haskell and its dual to Haskell";
- license = stdenv.lib.licenses.bsd3;
- }) {};
-
- "hs-functors_0_1_3_0" = callPackage
({ mkDerivation, base, transformers }:
mkDerivation {
pname = "hs-functors";
@@ -108035,7 +108439,6 @@ self: {
libraryHaskellDepends = [ base transformers ];
description = "Functors from products of Haskell and its dual to Haskell";
license = stdenv.lib.licenses.bsd3;
- hydraPlatforms = stdenv.lib.platforms.none;
}) {};
"hs-gchart" = callPackage
@@ -110336,6 +110739,22 @@ self: {
license = stdenv.lib.licenses.mit;
}) {};
+ "hspec_2_5_6" = callPackage
+ ({ mkDerivation, base, hspec-core, hspec-discover
+ , hspec-expectations, QuickCheck
+ }:
+ mkDerivation {
+ pname = "hspec";
+ version = "2.5.6";
+ sha256 = "0nfs2a0ymh8nw5v5v16qlbf3np8j1rv7nw3jwa9ib7mlqrmfp9ly";
+ libraryHaskellDepends = [
+ base hspec-core hspec-discover hspec-expectations QuickCheck
+ ];
+ description = "A Testing Framework for Haskell";
+ license = stdenv.lib.licenses.mit;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ }) {};
+
"hspec-attoparsec" = callPackage
({ mkDerivation, attoparsec, base, bytestring, hspec
, hspec-expectations, text
@@ -110388,6 +110807,8 @@ self: {
pname = "hspec-core";
version = "2.4.8";
sha256 = "02zr6n7mqdncvf1braf38zjdplaxrkg11x9k8717k4yg57585ji4";
+ revision = "1";
+ editedCabalFile = "05rfar3kl9nkh421jxx71p6dn3zykj61lj1hjhrj0z3s6m1ihn5q";
libraryHaskellDepends = [
ansi-terminal array base call-stack deepseq directory filepath
hspec-expectations HUnit QuickCheck quickcheck-io random setenv stm
@@ -110415,6 +110836,8 @@ self: {
pname = "hspec-core";
version = "2.5.5";
sha256 = "1vfrqlpn32s9wiykmkxbnrnd5p56yznw20pf8fwzw78ar4wpz55x";
+ revision = "1";
+ editedCabalFile = "1fifkdjhzrvwsx27qcsj0jam66sswjas5vfrzmb75z0xqyg5lpr7";
libraryHaskellDepends = [
ansi-terminal array base call-stack clock deepseq directory
filepath hspec-expectations HUnit QuickCheck quickcheck-io random
@@ -110431,6 +110854,34 @@ self: {
license = stdenv.lib.licenses.mit;
}) {};
+ "hspec-core_2_5_6" = callPackage
+ ({ mkDerivation, ansi-terminal, array, base, call-stack, clock
+ , deepseq, directory, filepath, hspec-expectations, hspec-meta
+ , HUnit, process, QuickCheck, quickcheck-io, random, setenv
+ , silently, stm, temporary, tf-random, transformers
+ }:
+ mkDerivation {
+ pname = "hspec-core";
+ version = "2.5.6";
+ sha256 = "0pj53qna5x742vnkdlhid7ginqv61awgw4csgb5ay2rd6br8q63g";
+ libraryHaskellDepends = [
+ ansi-terminal array base call-stack clock deepseq directory
+ filepath hspec-expectations HUnit QuickCheck quickcheck-io random
+ setenv stm tf-random transformers
+ ];
+ testHaskellDepends = [
+ ansi-terminal array base call-stack clock deepseq directory
+ filepath hspec-expectations hspec-meta HUnit process QuickCheck
+ quickcheck-io random setenv silently stm temporary tf-random
+ transformers
+ ];
+ testToolDepends = [ hspec-meta ];
+ testTarget = "--test-option=--skip --test-option='Test.Hspec.Core.Runner.hspecResult runs specs in parallel'";
+ description = "A Testing Framework for Haskell";
+ license = stdenv.lib.licenses.mit;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ }) {};
+
"hspec-dirstream" = callPackage
({ mkDerivation, base, dirstream, filepath, hspec, hspec-core
, pipes, pipes-safe, system-filepath, text
@@ -110486,6 +110937,26 @@ self: {
license = stdenv.lib.licenses.mit;
}) {};
+ "hspec-discover_2_5_6" = callPackage
+ ({ mkDerivation, base, directory, filepath, hspec-meta, QuickCheck
+ }:
+ mkDerivation {
+ pname = "hspec-discover";
+ version = "2.5.6";
+ sha256 = "0ilaq6l4gikpv6m82dyzfzhdq2d6x3h5jc7zlmw84jx43asqk5lc";
+ isLibrary = true;
+ isExecutable = true;
+ libraryHaskellDepends = [ base directory filepath ];
+ executableHaskellDepends = [ base directory filepath ];
+ testHaskellDepends = [
+ base directory filepath hspec-meta QuickCheck
+ ];
+ testToolDepends = [ hspec-meta ];
+ description = "Automatically discover and run Hspec tests";
+ license = stdenv.lib.licenses.mit;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ }) {};
+
"hspec-expectations" = callPackage
({ mkDerivation, base, call-stack, HUnit, nanospec }:
mkDerivation {
@@ -110662,6 +111133,18 @@ self: {
license = stdenv.lib.licenses.mit;
}) {};
+ "hspec-leancheck" = callPackage
+ ({ mkDerivation, base, hspec, hspec-core, HUnit, leancheck }:
+ mkDerivation {
+ pname = "hspec-leancheck";
+ version = "0.0.2";
+ sha256 = "1780xhwmbvkhca3l6rckbnr92f7i3icarwprdcfnrrdpk4yq9ml8";
+ libraryHaskellDepends = [ base hspec hspec-core HUnit leancheck ];
+ testHaskellDepends = [ base hspec leancheck ];
+ description = "LeanCheck support for the Hspec test framework";
+ license = stdenv.lib.licenses.bsd3;
+ }) {};
+
"hspec-megaparsec" = callPackage
({ mkDerivation, base, containers, hspec, hspec-expectations
, megaparsec
@@ -110678,14 +111161,14 @@ self: {
license = stdenv.lib.licenses.bsd3;
}) {};
- "hspec-megaparsec_1_1_0" = callPackage
+ "hspec-megaparsec_2_0_0" = callPackage
({ mkDerivation, base, containers, hspec, hspec-expectations
, megaparsec
}:
mkDerivation {
pname = "hspec-megaparsec";
- version = "1.1.0";
- sha256 = "1929fnpys1j7nja1c3limyl6f259gky9dpf98xyyx0pi663qdmf1";
+ version = "2.0.0";
+ sha256 = "0c4vb0c2y8yar0jjhh24wkkp1g7pbg2wc8h8nw3avfznbil6zyd8";
libraryHaskellDepends = [
base containers hspec-expectations megaparsec
];
@@ -110720,6 +111203,35 @@ self: {
license = stdenv.lib.licenses.mit;
}) {};
+ "hspec-meta_2_5_6" = callPackage
+ ({ mkDerivation, ansi-terminal, array, base, call-stack, clock
+ , deepseq, directory, filepath, hspec-expectations, HUnit
+ , QuickCheck, quickcheck-io, random, setenv, stm, time
+ , transformers
+ }:
+ mkDerivation {
+ pname = "hspec-meta";
+ version = "2.5.6";
+ sha256 = "196dyacvh7liq49ccwd5q0dw6n74igrvhk35zm95i3y8m44ky3a4";
+ revision = "1";
+ editedCabalFile = "0c7dq1vvk09fj6nljwwshgpkszg725hrpgnq9l2aka230sig9vz4";
+ isLibrary = true;
+ isExecutable = true;
+ libraryHaskellDepends = [
+ ansi-terminal array base call-stack clock deepseq directory
+ filepath hspec-expectations HUnit QuickCheck quickcheck-io random
+ setenv stm time transformers
+ ];
+ executableHaskellDepends = [
+ ansi-terminal array base call-stack clock deepseq directory
+ filepath hspec-expectations HUnit QuickCheck quickcheck-io random
+ setenv stm time transformers
+ ];
+ description = "A version of Hspec which is used to test Hspec itself";
+ license = stdenv.lib.licenses.mit;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ }) {};
+
"hspec-monad-control" = callPackage
({ mkDerivation, base, hspec-core, monad-control, transformers
, transformers-base
@@ -111975,8 +112487,8 @@ self: {
}:
mkDerivation {
pname = "htirage";
- version = "1.20170804";
- sha256 = "04rjp4gzi2dfzp9vpmwrvlwdj0mwx7s1myvl85jzlf5ikic1898p";
+ version = "2.1.0.20180829";
+ sha256 = "1r0p1xsc7gg9d089z7d60qdfcaxahrzd9z951mr7jrqdi7b2fi3f";
libraryHaskellDepends = [ base ];
testHaskellDepends = [
base containers QuickCheck tasty tasty-quickcheck text transformers
@@ -112322,20 +112834,20 @@ self: {
"htoml-megaparsec" = callPackage
({ mkDerivation, aeson, base, bytestring, composition-prelude
- , containers, criterion, deepseq, file-embed, hspec, megaparsec
- , mtl, tasty, tasty-hspec, tasty-hunit, text, time
- , unordered-containers, vector
+ , containers, criterion, deepseq, file-embed, megaparsec, mtl
+ , tasty, tasty-hspec, tasty-hunit, text, time, unordered-containers
+ , vector
}:
mkDerivation {
pname = "htoml-megaparsec";
- version = "2.0.0.2";
- sha256 = "1z0p35l2rjclxkmbvwg6fcfx50ibfd6v7gia5wbnkbgh3cwyp19d";
+ version = "2.1.0.2";
+ sha256 = "0m5v4f6djwr6sr9sndfal4gwxl0ryq2cg661ka8br7v1ww2d70yl";
libraryHaskellDepends = [
base composition-prelude containers deepseq megaparsec mtl text
time unordered-containers vector
];
testHaskellDepends = [
- aeson base bytestring containers file-embed hspec megaparsec tasty
+ aeson base bytestring containers file-embed megaparsec tasty
tasty-hspec tasty-hunit text time unordered-containers vector
];
benchmarkHaskellDepends = [ base criterion text ];
@@ -112457,6 +112969,8 @@ self: {
pname = "http-api-data";
version = "0.3.8.1";
sha256 = "1cq6459b8wz6nvkvpi89dg189n5q2xdq4rdq435hf150555vmskf";
+ revision = "1";
+ editedCabalFile = "1843bapm2rdkl4941rycryircpqpp7mbal7vgmlikf11f8ws7y7x";
setupHaskellDepends = [ base Cabal cabal-doctest ];
libraryHaskellDepends = [
attoparsec attoparsec-iso8601 base bytestring containers hashable
@@ -113037,8 +113551,8 @@ self: {
}:
mkDerivation {
pname = "http-monad";
- version = "0.1.1.2";
- sha256 = "0s2ajy2iwi7k5zrs6asp5ncyy06jnphp4ncc130cg2kpnf32yyfz";
+ version = "0.1.1.3";
+ sha256 = "0hch3qjs5axf4grrvgfmd208ar0pviywkrgdmh26564aqrfpr2y1";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [
@@ -113407,17 +113921,18 @@ self: {
}) {};
"http2-client-grpc" = callPackage
- ({ mkDerivation, base, binary, bytestring, data-default-class
- , http2, http2-client, http2-grpc-types, proto-lens
- , proto-lens-protoc, text, zlib
+ ({ mkDerivation, async, base, binary, bytestring, case-insensitive
+ , data-default-class, http2, http2-client, http2-grpc-types, lens
+ , proto-lens, proto-lens-protoc, text, tls
}:
mkDerivation {
pname = "http2-client-grpc";
- version = "0.2.0.0";
- sha256 = "1bg4p6fy09mbi5r355vvrbmc0al7mcwbr3mx2lpkjkzm9cg53x2z";
+ version = "0.5.0.3";
+ sha256 = "19vzrln75y64gkmzxcasmzxp8qsccg9jpr0z5k9s8w0g5vnfmp9x";
libraryHaskellDepends = [
- base binary bytestring data-default-class http2 http2-client
- http2-grpc-types proto-lens proto-lens-protoc text zlib
+ async base binary bytestring case-insensitive data-default-class
+ http2 http2-client http2-grpc-types lens proto-lens
+ proto-lens-protoc text tls
];
testHaskellDepends = [ base ];
description = "Implement gRPC-over-HTTP2 clients";
@@ -113426,12 +113941,18 @@ self: {
}) {};
"http2-grpc-types" = callPackage
- ({ mkDerivation, base, binary, bytestring, proto-lens, zlib }:
+ ({ mkDerivation, base, binary, bytestring, case-insensitive
+ , proto-lens, zlib
+ }:
mkDerivation {
pname = "http2-grpc-types";
- version = "0.1.0.0";
- sha256 = "0qj9bffznw8fawalj6hlvx8r0sj9smgks88wdqjq5ran02b6i2dl";
- libraryHaskellDepends = [ base binary bytestring proto-lens zlib ];
+ version = "0.3.0.0";
+ sha256 = "0r3gfc8alm535hqmyy39hd7nhpp3dmba52l4wf38bj7j3ckggpy5";
+ revision = "1";
+ editedCabalFile = "10gmgp63ll7zv8sbcw2klc0xi4qaiakbgsv46a5gv1pdgwh78w8b";
+ libraryHaskellDepends = [
+ base binary bytestring case-insensitive proto-lens zlib
+ ];
description = "Types for gRPC over HTTP2 common for client and servers";
license = stdenv.lib.licenses.bsd3;
}) {};
@@ -114637,8 +115158,8 @@ self: {
}:
mkDerivation {
pname = "hw-prim";
- version = "0.6.2.9";
- sha256 = "1c2ykdxvrg0i1wbjgfc0mank5z7466crqcs5hdyddjc833xhmv2d";
+ version = "0.6.2.14";
+ sha256 = "18x7gxvn8p55j5iva4ag31kmdzcvlq76a56shsnh821xw3aw6ala";
libraryHaskellDepends = [
base bytestring mmap semigroups transformers vector
];
@@ -114653,15 +115174,15 @@ self: {
license = stdenv.lib.licenses.bsd3;
}) {};
- "hw-prim_0_6_2_13" = callPackage
+ "hw-prim_0_6_2_15" = callPackage
({ mkDerivation, base, bytestring, criterion, directory, exceptions
, hedgehog, hspec, hw-hspec-hedgehog, mmap, QuickCheck, semigroups
, transformers, vector
}:
mkDerivation {
pname = "hw-prim";
- version = "0.6.2.13";
- sha256 = "0cvg99v9c86fzf76i4z3lilss0qgs1i91v1hsk2n22a79rmhpvnb";
+ version = "0.6.2.15";
+ sha256 = "10ab0fmygcgwm748m6grpfdzfxixsns2mbxhxhj3plmcbkfxxbyc";
libraryHaskellDepends = [
base bytestring mmap semigroups transformers vector
];
@@ -114795,8 +115316,8 @@ self: {
}:
mkDerivation {
pname = "hw-simd";
- version = "0.1.1.1";
- sha256 = "1mcingwc7z6ybsn32c3g66r4j9sfwpm4jkqvwh8cbbbd97lhalmq";
+ version = "0.1.1.2";
+ sha256 = "0jcd6clhcqdmkcvhvf68xldgmx4n1wp333438ypbwk2mwp1q559l";
libraryHaskellDepends = [
base bits-extra bytestring deepseq hw-bits hw-prim hw-rankselect
hw-rankselect-base vector
@@ -116829,7 +117350,7 @@ self: {
description = "Bindings to the igraph C library";
license = stdenv.lib.licenses.bsd3;
hydraPlatforms = stdenv.lib.platforms.none;
- }) {igraph = null;};
+ }) {inherit (pkgs) igraph;};
"igrf" = callPackage
({ mkDerivation, ad, base, polynomial }:
@@ -118355,6 +118876,31 @@ self: {
license = stdenv.lib.licenses.bsd3;
}) {};
+ "influxdb_1_6_0_9" = callPackage
+ ({ mkDerivation, aeson, attoparsec, base, bytestring, Cabal
+ , cabal-doctest, clock, containers, doctest, foldl, http-client
+ , http-types, lens, network, optional-args, QuickCheck, scientific
+ , tagged, template-haskell, text, time, unordered-containers
+ , vector
+ }:
+ mkDerivation {
+ pname = "influxdb";
+ version = "1.6.0.9";
+ sha256 = "0xs2bbqgaj6zmk6wrfm21q516qa2x7qfcvfazkkvyv49vvk9i7is";
+ isLibrary = true;
+ isExecutable = true;
+ setupHaskellDepends = [ base Cabal cabal-doctest ];
+ libraryHaskellDepends = [
+ aeson attoparsec base bytestring clock containers foldl http-client
+ http-types lens network optional-args scientific tagged text time
+ unordered-containers vector
+ ];
+ testHaskellDepends = [ base doctest QuickCheck template-haskell ];
+ description = "Haskell client library for InfluxDB";
+ license = stdenv.lib.licenses.bsd3;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ }) {};
+
"informative" = callPackage
({ mkDerivation, base, containers, csv, highlighting-kate
, http-conduit, monad-logger, pandoc, persistent
@@ -118998,6 +119544,25 @@ self: {
license = stdenv.lib.licenses.mit;
}) {};
+ "integer-logarithms_1_0_2_2" = callPackage
+ ({ mkDerivation, array, base, ghc-prim, integer-gmp, QuickCheck
+ , smallcheck, tasty, tasty-hunit, tasty-quickcheck
+ , tasty-smallcheck
+ }:
+ mkDerivation {
+ pname = "integer-logarithms";
+ version = "1.0.2.2";
+ sha256 = "1hvzbrh8fm1g9fbavdym52pr5n9f2bnfx1parkfizwqlbj6n51ms";
+ libraryHaskellDepends = [ array base ghc-prim integer-gmp ];
+ testHaskellDepends = [
+ base QuickCheck smallcheck tasty tasty-hunit tasty-quickcheck
+ tasty-smallcheck
+ ];
+ description = "Integer logarithms";
+ license = stdenv.lib.licenses.mit;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ }) {};
+
"integer-pure" = callPackage
({ mkDerivation }:
mkDerivation {
@@ -119309,8 +119874,8 @@ self: {
({ mkDerivation, array, base, containers, QuickCheck, utility-ht }:
mkDerivation {
pname = "interpolation";
- version = "0.1.0.2";
- sha256 = "1qjh0jx6xx1x80diay8q18basfwkrsm9x0yrqd27ig2mi9drp0qq";
+ version = "0.1.0.3";
+ sha256 = "0j9hdzi59lqq92773f8h17awrm9ghr45k876qc7krq87pgbr95z2";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [ base utility-ht ];
@@ -119461,6 +120026,29 @@ self: {
license = stdenv.lib.licenses.mit;
}) {};
+ "intro_0_5_1_0" = callPackage
+ ({ mkDerivation, base, bytestring, containers, deepseq, dlist
+ , extra, hashable, lens, mtl, QuickCheck, safe, text, transformers
+ , unordered-containers, writer-cps-mtl
+ }:
+ mkDerivation {
+ pname = "intro";
+ version = "0.5.1.0";
+ sha256 = "0gsj5l0vgvpbdw2vwlr9r869jwc08lqbypp24g33dlnd338pjxzs";
+ libraryHaskellDepends = [
+ base bytestring containers deepseq dlist extra hashable mtl safe
+ text transformers unordered-containers writer-cps-mtl
+ ];
+ testHaskellDepends = [
+ base bytestring containers deepseq dlist extra hashable lens mtl
+ QuickCheck safe text transformers unordered-containers
+ writer-cps-mtl
+ ];
+ description = "Safe and minimal prelude";
+ license = stdenv.lib.licenses.mit;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ }) {};
+
"intro-prelude" = callPackage
({ mkDerivation, intro }:
mkDerivation {
@@ -121389,8 +121977,8 @@ self: {
}:
mkDerivation {
pname = "jack";
- version = "0.7.1.3";
- sha256 = "1n0znnk3q8vic47k1vlv6mdqghrklagcwalvz1arsdfvpy74ig4c";
+ version = "0.7.1.4";
+ sha256 = "018lsa5mgl7vb0hrd4jswa40d6w7alfq082brax8p832zf0v5bj2";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [
@@ -121534,6 +122122,18 @@ self: {
hydraPlatforms = stdenv.lib.platforms.none;
}) {};
+ "japanese-calendar" = callPackage
+ ({ mkDerivation, base, hspec, QuickCheck, time }:
+ mkDerivation {
+ pname = "japanese-calendar";
+ version = "0.1.0.0";
+ sha256 = "0i9699xammqi5q5rjn7cyzv41alm1c9hnq9njhf6mnxf0d08ch2y";
+ libraryHaskellDepends = [ base time ];
+ testHaskellDepends = [ base hspec QuickCheck time ];
+ description = "Data type of Japanese Calendar (Wareki)";
+ license = stdenv.lib.licenses.bsd3;
+ }) {};
+
"japanese-holidays" = callPackage
({ mkDerivation, base, doctest, hspec, QuickCheck
, quickcheck-instances, time
@@ -122114,8 +122714,8 @@ self: {
({ mkDerivation, base, haskeline, hspec, HUnit }:
mkDerivation {
pname = "jord";
- version = "0.4.0.0";
- sha256 = "0sa19hr49l71dlvm1wpkw6901zzws12higd4xksk8b81cwrgp8l2";
+ version = "0.4.2.0";
+ sha256 = "0nhkxd8vbygybihm1c20bhn8cfylj94l5jr9f7phkp1667lqxdgc";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [ base ];
@@ -122936,26 +123536,6 @@ self: {
}) {};
"json-rpc-generic" = callPackage
- ({ mkDerivation, aeson, aeson-generic-compat, base, containers
- , dlist, QuickCheck, quickcheck-simple, scientific, text
- , transformers, unordered-containers, vector
- }:
- mkDerivation {
- pname = "json-rpc-generic";
- version = "0.2.1.4";
- sha256 = "0zibbxc5fqm9mazfdjbi6angyh5rlcccfd260k667w8lcxc6h7kl";
- libraryHaskellDepends = [
- aeson aeson-generic-compat base containers dlist scientific text
- transformers unordered-containers vector
- ];
- testHaskellDepends = [
- aeson base QuickCheck quickcheck-simple text
- ];
- description = "Generic encoder and decode for JSON-RPC";
- license = stdenv.lib.licenses.bsd3;
- }) {};
-
- "json-rpc-generic_0_2_1_5" = callPackage
({ mkDerivation, aeson, aeson-generic-compat, base, containers
, dlist, QuickCheck, quickcheck-simple, scientific, text
, transformers, unordered-containers, vector
@@ -122973,7 +123553,6 @@ self: {
];
description = "Generic encoder and decode for JSON-RPC";
license = stdenv.lib.licenses.bsd3;
- hydraPlatforms = stdenv.lib.platforms.none;
}) {};
"json-rpc-server" = callPackage
@@ -123768,6 +124347,17 @@ self: {
license = stdenv.lib.licenses.bsd3;
}) {};
+ "kafka" = callPackage
+ ({ mkDerivation }:
+ mkDerivation {
+ pname = "kafka";
+ version = "0.0.0.0";
+ sha256 = "07x6dsc4d4f3vksi21fxd1vix9wqsydrl17f2xq8858m2ay0j28j";
+ doHaddock = false;
+ description = "TBA";
+ license = stdenv.lib.licenses.bsd3;
+ }) {};
+
"kafka-client" = callPackage
({ mkDerivation, base, bytestring, cereal, digest, dlist, hspec
, hspec-discover, network, QuickCheck, snappy, time, zlib
@@ -124320,21 +124910,26 @@ self: {
}:
mkDerivation {
pname = "katydid";
- version = "0.3.1.0";
- sha256 = "0h7w54z9318m85qdd9whlmg3vnkv69gbl8nxc8iz35pw2cbw51r2";
+ version = "0.4.0.2";
+ sha256 = "0gg94j983q6bga015h2wiia2a0miy0s70rsxa46g3k0czpkzgyyg";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [
base bytestring containers deepseq either extra hxt ilist json mtl
parsec regex-tdfa text transformers
];
- executableHaskellDepends = [ base mtl ];
+ executableHaskellDepends = [
+ base bytestring containers deepseq either extra hxt ilist json mtl
+ parsec regex-tdfa text transformers
+ ];
testHaskellDepends = [
- base containers directory filepath HUnit hxt ilist json mtl parsec
- primes tasty tasty-hunit text
+ base bytestring containers deepseq directory either extra filepath
+ HUnit hxt ilist json mtl parsec primes regex-tdfa tasty tasty-hunit
+ text transformers
];
benchmarkHaskellDepends = [
- base criterion deepseq directory filepath hxt mtl text
+ base bytestring containers criterion deepseq directory either extra
+ filepath hxt ilist json mtl parsec regex-tdfa text transformers
];
description = "A haskell implementation of Katydid";
license = stdenv.lib.licenses.bsd3;
@@ -124416,16 +125011,17 @@ self: {
}:
mkDerivation {
pname = "kazura-queue";
- version = "0.1.0.2";
- sha256 = "0yywvl9pdy78851cmby6z7f9ivinp83qxfxfmfn68qzavx5m9l0f";
- libraryHaskellDepends = [
- async atomic-primops base containers primitive
- ];
+ version = "0.1.0.4";
+ sha256 = "0zi3b6d97ql3ixml238r50lpmp8aghz2mbc5yi94fyp9xvq42m2y";
+ libraryHaskellDepends = [ atomic-primops base primitive ];
testHaskellDepends = [
- async base containers deepseq doctest exceptions free hspec
- hspec-expectations HUnit mtl QuickCheck transformers
+ async atomic-primops base containers deepseq doctest exceptions
+ free hspec hspec-expectations HUnit mtl primitive QuickCheck
+ transformers
+ ];
+ benchmarkHaskellDepends = [
+ atomic-primops base criterion primitive stm
];
- benchmarkHaskellDepends = [ async base containers criterion stm ];
description = "Fast concurrent queues much inspired by unagi-chan";
license = stdenv.lib.licenses.bsd3;
}) {};
@@ -125921,6 +126517,21 @@ self: {
hydraPlatforms = stdenv.lib.platforms.none;
}) {};
+ "lambda-calculus-interpreter" = callPackage
+ ({ mkDerivation, base, tasty, tasty-hunit }:
+ mkDerivation {
+ pname = "lambda-calculus-interpreter";
+ version = "0.1.0.3";
+ sha256 = "0ccvqblggpng130l7i857nh7vdr7yfxv8s8r17bd05ckclp21k0f";
+ isLibrary = true;
+ isExecutable = true;
+ libraryHaskellDepends = [ base ];
+ executableHaskellDepends = [ base ];
+ testHaskellDepends = [ base tasty tasty-hunit ];
+ description = "Lambda Calculus interpreter";
+ license = stdenv.lib.licenses.bsd3;
+ }) {};
+
"lambda-canvas" = callPackage
({ mkDerivation, base, GLUT, mtl, OpenGL, time }:
mkDerivation {
@@ -126680,8 +127291,8 @@ self: {
}:
mkDerivation {
pname = "language-bash";
- version = "0.7.1";
- sha256 = "1p8ikx9iq9ssvm8b99hly7pqqw09588xjkgf5397kg5xpv8ga4gp";
+ version = "0.8.0";
+ sha256 = "16lkqy1skc82cyxsh313184dbm31hrsi3w1729ci8lw8dybmz6ax";
libraryHaskellDepends = [ base parsec pretty transformers ];
testHaskellDepends = [
base parsec process QuickCheck tasty tasty-expected-failure
@@ -127022,10 +127633,10 @@ self: {
}:
mkDerivation {
pname = "language-glsl";
- version = "0.2.1";
- sha256 = "08hrl9s8640a61npdshjrw5q3j3b2gvms846cf832j0n19mi24h0";
+ version = "0.3.0";
+ sha256 = "0hdg67ainlqpjjghg3qin6fg4p783m0zmjqh4rd5gyizwiplxkp1";
revision = "1";
- editedCabalFile = "1dlax6dfjc8ca0p5an3k1f29b078hgb44aj48njf97shvl9hqf5v";
+ editedCabalFile = "10ac9pk4jy75k03j1ns4b5136l4kw8krr2d2nw2fdmpm5jzyghc5";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [ base parsec prettyclass ];
@@ -127430,8 +128041,8 @@ self: {
}:
mkDerivation {
pname = "language-puppet";
- version = "1.3.20";
- sha256 = "074k9lk7wqspbn193qa78f1nabv0s27dza9qh7qzni4v95zz5k4r";
+ version = "1.3.20.1";
+ sha256 = "0gak1v8p6fnrac7br2gvz3wg8mymm82gyv4wbdcp5rkj7ncm19vs";
isLibrary = true;
isExecutable = true;
enableSeparateDataOutput = true;
@@ -127461,22 +128072,22 @@ self: {
hydraPlatforms = stdenv.lib.platforms.none;
}) {};
- "language-puppet_1_3_20_1" = callPackage
+ "language-puppet_1_4_0" = callPackage
({ mkDerivation, aeson, ansi-wl-pprint, attoparsec, base
, base16-bytestring, bytestring, case-insensitive, containers
, cryptonite, directory, exceptions, filecache, filepath
, formatting, Glob, hashable, hruby, hslogger, hspec
, hspec-megaparsec, http-api-data, http-client, lens, lens-aeson
, megaparsec, memory, mtl, operational, optparse-applicative
- , parallel-io, parsec, pcre-utils, process, protolude, random
- , regex-pcre-builtin, scientific, servant, servant-client, split
- , stm, strict-base-types, temporary, text, time, transformers, unix
- , unordered-containers, vector, yaml
+ , parallel-io, parsec, parser-combinators, pcre-utils, process
+ , protolude, random, regex-pcre-builtin, scientific, servant
+ , servant-client, split, stm, strict-base-types, temporary, text
+ , time, transformers, unix, unordered-containers, vector, yaml
}:
mkDerivation {
pname = "language-puppet";
- version = "1.3.20.1";
- sha256 = "0gak1v8p6fnrac7br2gvz3wg8mymm82gyv4wbdcp5rkj7ncm19vs";
+ version = "1.4.0";
+ sha256 = "169kzd6csar170j0zqzisa82jxs5xfang17ys6aa4m1jx0nbh4mz";
isLibrary = true;
isExecutable = true;
enableSeparateDataOutput = true;
@@ -127485,10 +128096,10 @@ self: {
case-insensitive containers cryptonite directory exceptions
filecache filepath formatting hashable hruby hslogger hspec
http-api-data http-client lens lens-aeson megaparsec memory mtl
- operational parsec pcre-utils process protolude random
- regex-pcre-builtin scientific servant servant-client split stm
- strict-base-types text time transformers unix unordered-containers
- vector yaml
+ operational parsec parser-combinators pcre-utils process protolude
+ random regex-pcre-builtin scientific servant servant-client split
+ stm strict-base-types text time transformers unix
+ unordered-containers vector yaml
];
executableHaskellDepends = [
aeson ansi-wl-pprint base bytestring containers Glob hslogger
@@ -127798,8 +128409,8 @@ self: {
}:
mkDerivation {
pname = "lapack-ffi-tools";
- version = "0.1.0.1";
- sha256 = "0cddhc6hm72sjkj3i5f38z3bf4m0cy44jnbgv2v5ck5x0h55173w";
+ version = "0.1.1";
+ sha256 = "1y3h69mkbjidl146y1w0symk8rgpir5gb5914ymmg83nsyyl16vk";
isLibrary = false;
isExecutable = true;
enableSeparateDataOutput = true;
@@ -127912,8 +128523,8 @@ self: {
({ mkDerivation, base, containers, utility-ht }:
mkDerivation {
pname = "latex";
- version = "0.1.0.3";
- sha256 = "1linwqab6z2s91vdxr874vk7rg7gv1ckabsxwmlr80gnhdfgyhmp";
+ version = "0.1.0.4";
+ sha256 = "10m0l0wlrkkl474sdmi7cl6w6kqyqzcp05h7jdacxhzbxyf8nahw";
libraryHaskellDepends = [ base containers utility-ht ];
description = "Parse, format and process LaTeX files";
license = stdenv.lib.licenses.bsd3;
@@ -128529,20 +129140,20 @@ self: {
({ mkDerivation, base, template-haskell }:
mkDerivation {
pname = "leancheck";
- version = "0.7.1";
- sha256 = "184z6n86jg5vmd5f02qzg62hm14snrk5d9knsf72gayyj4fla1kh";
+ version = "0.7.3";
+ sha256 = "0lvyf82qsiprvhk40870c6pz13z9fv2qml1cvvw3ryc7y8xh89v9";
libraryHaskellDepends = [ base template-haskell ];
testHaskellDepends = [ base ];
- description = "Cholesterol-free property-based testing";
+ description = "Enumerative property-based testing";
license = stdenv.lib.licenses.bsd3;
}) {};
- "leancheck_0_7_3" = callPackage
+ "leancheck_0_7_4" = callPackage
({ mkDerivation, base, template-haskell }:
mkDerivation {
pname = "leancheck";
- version = "0.7.3";
- sha256 = "0lvyf82qsiprvhk40870c6pz13z9fv2qml1cvvw3ryc7y8xh89v9";
+ version = "0.7.4";
+ sha256 = "1lbr0b3k4fk0xlmqh5v4cidayzi9ijkr1i6ykzg2gd0xmjl9b4bq";
libraryHaskellDepends = [ base template-haskell ];
testHaskellDepends = [ base ];
description = "Enumerative property-based testing";
@@ -128616,6 +129227,27 @@ self: {
license = stdenv.lib.licenses.bsd3;
}) {};
+ "learn-physics_0_6_3" = callPackage
+ ({ mkDerivation, base, gloss, gnuplot, hmatrix, not-gloss
+ , spatial-math, vector-space
+ }:
+ mkDerivation {
+ pname = "learn-physics";
+ version = "0.6.3";
+ sha256 = "0nhc53l963fsviw3yqz7yxwbjwxsrp8s4jckffbg6hl8npakhirh";
+ isLibrary = true;
+ isExecutable = true;
+ libraryHaskellDepends = [
+ base gloss gnuplot hmatrix not-gloss spatial-math vector-space
+ ];
+ executableHaskellDepends = [
+ base gloss gnuplot not-gloss spatial-math
+ ];
+ description = "Haskell code for learning physics";
+ license = stdenv.lib.licenses.bsd3;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ }) {};
+
"learn-physics-examples" = callPackage
({ mkDerivation, base, gloss, gnuplot, learn-physics, not-gloss
, spatial-math
@@ -129063,11 +129695,25 @@ self: {
pname = "lens-labels";
version = "0.2.0.1";
sha256 = "1nn0qp0xl65wc5axy68jlmif1k97af8v5r09sf02fw3iww7ym7wj";
+ revision = "1";
+ editedCabalFile = "0iyh7msip83dzj9gj5f18zchvjinhx40dmdb52vza0x1763qkilv";
libraryHaskellDepends = [ base ghc-prim profunctors tagged ];
description = "Integration of lenses with OverloadedLabels";
license = stdenv.lib.licenses.bsd3;
}) {};
+ "lens-labels_0_3_0_0" = callPackage
+ ({ mkDerivation, base, ghc-prim, profunctors, tagged }:
+ mkDerivation {
+ pname = "lens-labels";
+ version = "0.3.0.0";
+ sha256 = "1kpbn9lsaxvw86w3r121rymrxcyihci7njpcw3f2663pb01v39rn";
+ libraryHaskellDepends = [ base ghc-prim profunctors tagged ];
+ description = "Integration of lenses with OverloadedLabels";
+ license = stdenv.lib.licenses.bsd3;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ }) {};
+
"lens-misc" = callPackage
({ mkDerivation, base, lens, tagged, template-haskell }:
mkDerivation {
@@ -129114,8 +129760,8 @@ self: {
pname = "lens-properties";
version = "4.11.1";
sha256 = "1caciyn75na3f25q9qxjl7ibjam22xlhl5k2pqfiak10lxsmnz2g";
- revision = "1";
- editedCabalFile = "1b9db7dbfq46q63y6w1471nffj77rb363rk4b1l3l23g15cq6a5i";
+ revision = "2";
+ editedCabalFile = "1b14fcncz2yby0d4jhx2h0ma6nx0fd1z7hrg1va4h7zn06m99482";
libraryHaskellDepends = [ base lens QuickCheck transformers ];
description = "QuickCheck properties for lens";
license = stdenv.lib.licenses.bsd3;
@@ -129574,8 +130220,8 @@ self: {
}:
mkDerivation {
pname = "lhs2tex";
- version = "1.20";
- sha256 = "0fmhvxi1a839h3i6s2aqckh64bc0qyp4hbzc3wp85zr5gmzix1df";
+ version = "1.21";
+ sha256 = "17yfqvsrd2p39fxfmzfvnliwbmkfx5kxmdk0fw5rx9v17acjmnc7";
isLibrary = false;
isExecutable = true;
setupHaskellDepends = [
@@ -130928,22 +131574,22 @@ self: {
"linear-code" = callPackage
({ mkDerivation, base, containers, data-default
, ghc-typelits-knownnat, ghc-typelits-natnormalise, HaskellForMaths
- , matrix, QuickCheck, random, random-shuffle, smallcheck, tasty
- , tasty-hunit, tasty-quickcheck, tasty-smallcheck
+ , matrix-static, QuickCheck, random, random-shuffle, smallcheck
+ , tasty, tasty-hunit, tasty-quickcheck, tasty-smallcheck
}:
mkDerivation {
pname = "linear-code";
- version = "0.1.1";
- sha256 = "0dyz7j6y6ayxd2367pkrln78zr2hx1bygswsy840hjf4xhm30a1b";
+ version = "0.2.0";
+ sha256 = "14d4gmpqx9x9acaldml7hf64fbpdrncn5akgid1scnqv1jzc9197";
libraryHaskellDepends = [
base containers data-default ghc-typelits-knownnat
- ghc-typelits-natnormalise HaskellForMaths matrix random
+ ghc-typelits-natnormalise HaskellForMaths matrix-static random
random-shuffle
];
testHaskellDepends = [
base containers data-default ghc-typelits-knownnat
- ghc-typelits-natnormalise HaskellForMaths matrix QuickCheck random
- random-shuffle smallcheck tasty tasty-hunit tasty-quickcheck
+ ghc-typelits-natnormalise HaskellForMaths matrix-static QuickCheck
+ random random-shuffle smallcheck tasty tasty-hunit tasty-quickcheck
tasty-smallcheck
];
description = "A simple library for linear codes (coding theory, error correction)";
@@ -131910,10 +132556,10 @@ self: {
({ mkDerivation, base }:
mkDerivation {
pname = "list-zip-def";
- version = "0.1.0.1";
- sha256 = "07fasgp9vagsqaaikrn38hxf7dbpfrjcrp97dn72pss7adz7yi6h";
+ version = "0.1.0.2";
+ sha256 = "15123r7a52qb6dcxy1bxid8llykx439srqripmvji3rizwlqaa89";
libraryHaskellDepends = [ base ];
- description = "Provides zips where the combining doesn't stop premature, but instead uses default values";
+ description = "Provides zips with default values";
license = stdenv.lib.licenses.publicDomain;
hydraPlatforms = stdenv.lib.platforms.none;
}) {};
@@ -131971,26 +132617,35 @@ self: {
}) {};
"liszt" = callPackage
- ({ mkDerivation, base, binary, bytestring, containers, deepseq
- , directory, exceptions, filepath, fsnotify, network, reflection
- , scientific, sendfile, stm, stm-delay, text, transformers
- , unordered-containers, winery
+ ({ mkDerivation, base, binary, bytestring, cereal, containers, cpu
+ , deepseq, directory, exceptions, filepath, fsnotify, gauge
+ , network, reflection, scientific, sendfile, stm, stm-delay, text
+ , transformers, unordered-containers, vector, vector-th-unbox
+ , winery
}:
mkDerivation {
pname = "liszt";
- version = "0.1";
- sha256 = "0ffqpplasb6d0kbj6n50811a5qawaghv9s9vfszm6z2dw27zkjwd";
+ version = "0.2";
+ sha256 = "1dy7c1l64ylgyxsi5ivxdc4kikaja4yhakx2z5i1sdk7kc7gkr51";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [
- base binary bytestring containers deepseq directory exceptions
- filepath fsnotify network reflection scientific sendfile stm
- stm-delay text transformers unordered-containers winery
+ base binary bytestring cereal containers cpu deepseq directory
+ exceptions filepath fsnotify network reflection scientific sendfile
+ stm stm-delay text transformers unordered-containers vector
+ vector-th-unbox winery
];
executableHaskellDepends = [
- base binary bytestring containers deepseq directory exceptions
- filepath fsnotify network reflection scientific sendfile stm
- stm-delay text transformers unordered-containers winery
+ base binary bytestring cereal containers cpu deepseq directory
+ exceptions filepath fsnotify network reflection scientific sendfile
+ stm stm-delay text transformers unordered-containers vector
+ vector-th-unbox winery
+ ];
+ benchmarkHaskellDepends = [
+ base binary bytestring cereal containers cpu deepseq directory
+ exceptions filepath fsnotify gauge network reflection scientific
+ sendfile stm stm-delay text transformers unordered-containers
+ vector vector-th-unbox winery
];
description = "Append only key-list database";
license = stdenv.lib.licenses.bsd3;
@@ -132275,8 +132930,8 @@ self: {
}:
mkDerivation {
pname = "llvm-ffi-tools";
- version = "0.0";
- sha256 = "18lfa6fzpcxp6j95wbi5axm58ipzwn98rx3d1c54zdkjhzrl507x";
+ version = "0.0.0.1";
+ sha256 = "0nicgcdlywb8w5fr7hi5hgayv9phwslp5s47p2c30kavj7c3f3zk";
isLibrary = false;
isExecutable = true;
executableHaskellDepends = [
@@ -132509,8 +133164,8 @@ self: {
}:
mkDerivation {
pname = "llvm-tf";
- version = "3.1.1";
- sha256 = "0mhlz1jv81rl353qp0vbm39qz15yms9n0xlb0s27jj88yf66zks1";
+ version = "3.1.1.1";
+ sha256 = "1rqszg06r8md7cgw2zgf30yvri4isndj608r9l8grqfnyi4lfjay";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [
@@ -133433,6 +134088,18 @@ self: {
license = stdenv.lib.licenses.bsd3;
}) {};
+ "loglevel" = callPackage
+ ({ mkDerivation, base, deepseq, text }:
+ mkDerivation {
+ pname = "loglevel";
+ version = "0.1.0.0";
+ sha256 = "12hck2fb7xdk905428yd1a8dnm1hw1apkhw6fr7zqyxzhfqqm1yz";
+ libraryHaskellDepends = [ base deepseq text ];
+ testHaskellDepends = [ base text ];
+ description = "Log Level Datatype";
+ license = stdenv.lib.licenses.mit;
+ }) {};
+
"logplex-parse" = callPackage
({ mkDerivation, base, hspec, iso8601-time, parsec, text, time }:
mkDerivation {
@@ -134037,8 +134704,8 @@ self: {
pname = "lrucaching";
version = "0.3.3";
sha256 = "192a2zap1bmxa2y48n48rmngf18fr8k0az4a230hziv3g795yzma";
- revision = "3";
- editedCabalFile = "0y7j6m0n1xi40c7dmabi9lk6mjic9h49xx60rq9xc4xap90hjfqb";
+ revision = "4";
+ editedCabalFile = "11zfnngp3blx8c3sgy5cva1g9bp69wqz7ys23gdm905i7sjjs6a9";
libraryHaskellDepends = [
base base-compat deepseq hashable psqueues vector
];
@@ -134095,8 +134762,8 @@ self: {
}:
mkDerivation {
pname = "lsp-test";
- version = "0.2.1.0";
- sha256 = "1nd3nn5lyn9cwviijzfhqybj38zg10nf7ypb76ifaax91vj2hrkw";
+ version = "0.4.0.0";
+ sha256 = "0kiddzb7lwwdf96jz4ghvjnwr2hf9jiv8vjjlxwm76k3ab4wx09c";
libraryHaskellDepends = [
aeson aeson-pretty ansi-terminal base bytestring conduit
conduit-parse containers data-default Diff directory filepath
@@ -135136,8 +135803,8 @@ self: {
}:
mkDerivation {
pname = "madlang";
- version = "4.0.2.12";
- sha256 = "0g3nciqjfqkhi6j5kcyp4zwrzbik3v9qrj0jpl374g4r1sw3piq9";
+ version = "4.0.2.13";
+ sha256 = "10a7q64dm9vw2a3qzvixlg0632l5h8j6xj9ga3w430fxch618f26";
isLibrary = true;
isExecutable = true;
setupHaskellDepends = [ base Cabal cli-setup ];
@@ -135998,18 +136665,18 @@ self: {
"mandrill" = callPackage
({ mkDerivation, aeson, base, base64-bytestring, blaze-html
, bytestring, containers, email-validate, http-client
- , http-client-tls, http-types, lens, mtl, old-locale, QuickCheck
- , raw-strings-qq, tasty, tasty-hunit, tasty-quickcheck, text, time
- , unordered-containers
+ , http-client-tls, http-types, microlens-th, mtl, old-locale
+ , QuickCheck, raw-strings-qq, tasty, tasty-hunit, tasty-quickcheck
+ , text, time, unordered-containers
}:
mkDerivation {
pname = "mandrill";
- version = "0.5.3.4";
- sha256 = "0gaz5drb8wvlr12ynwag4rcgmsyzd713j0qgpv9ydy3jlk65nrf7";
+ version = "0.5.3.5";
+ sha256 = "0yh7r3wrzpzm3iv0zvs6nzf36hwv0y7xlsz6cy3dlnyrr5jbsb1i";
libraryHaskellDepends = [
aeson base base64-bytestring blaze-html bytestring containers
- email-validate http-client http-client-tls http-types lens mtl
- old-locale QuickCheck text time unordered-containers
+ email-validate http-client http-client-tls http-types microlens-th
+ mtl old-locale QuickCheck text time unordered-containers
];
testHaskellDepends = [
aeson base bytestring QuickCheck raw-strings-qq tasty tasty-hunit
@@ -136662,6 +137329,28 @@ self: {
license = stdenv.lib.licenses.bsd3;
}) {};
+ "massiv_0_2_1_0" = callPackage
+ ({ mkDerivation, base, bytestring, data-default, data-default-class
+ , deepseq, ghc-prim, hspec, primitive, QuickCheck, safe-exceptions
+ , vector
+ }:
+ mkDerivation {
+ pname = "massiv";
+ version = "0.2.1.0";
+ sha256 = "0x5qf5hp6ncrjc28xcjd2v4w33wpyy69whmgvvp163y0q3v1n3q7";
+ libraryHaskellDepends = [
+ base bytestring data-default-class deepseq ghc-prim primitive
+ vector
+ ];
+ testHaskellDepends = [
+ base bytestring data-default deepseq hspec QuickCheck
+ safe-exceptions vector
+ ];
+ description = "Massiv (Массив) is an Array Library";
+ license = stdenv.lib.licenses.bsd3;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ }) {};
+
"massiv-io" = callPackage
({ mkDerivation, base, bytestring, data-default, deepseq, directory
, filepath, JuicyPixels, massiv, netpbm, process, vector
@@ -136765,15 +137454,15 @@ self: {
license = stdenv.lib.licenses.bsd3;
}) {};
- "math-functions_0_3_0_1" = callPackage
+ "math-functions_0_3_0_2" = callPackage
({ mkDerivation, base, data-default-class, deepseq, erf, HUnit
, primitive, QuickCheck, test-framework, test-framework-hunit
, test-framework-quickcheck2, vector, vector-th-unbox
}:
mkDerivation {
pname = "math-functions";
- version = "0.3.0.1";
- sha256 = "1nrslskbgsy9yx0kzc5a0jdahch218qd16343j001pdxkygq21b2";
+ version = "0.3.0.2";
+ sha256 = "094kf3261b3m07r6gyf63s0pnhw5v0z1q5pzfskl4y8fdjvsp4kb";
libraryHaskellDepends = [
base data-default-class deepseq primitive vector vector-th-unbox
];
@@ -136783,7 +137472,7 @@ self: {
vector vector-th-unbox
];
description = "Collection of tools for numeric computations";
- license = stdenv.lib.licenses.bsd3;
+ license = stdenv.lib.licenses.bsd2;
hydraPlatforms = stdenv.lib.platforms.none;
}) {};
@@ -137032,6 +137721,27 @@ self: {
license = stdenv.lib.licenses.bsd3;
}) {};
+ "matrix-static" = callPackage
+ ({ mkDerivation, base, deepseq, ghc-typelits-knownnat
+ , ghc-typelits-natnormalise, matrix, semigroups, tasty, tasty-hunit
+ , vector
+ }:
+ mkDerivation {
+ pname = "matrix-static";
+ version = "0.1";
+ sha256 = "0l4p0ahlpgf39wjwrvr6ibxpj5b6kmyn2li6yjbddi0af137ii4q";
+ libraryHaskellDepends = [
+ base deepseq ghc-typelits-knownnat ghc-typelits-natnormalise matrix
+ semigroups vector
+ ];
+ testHaskellDepends = [
+ base deepseq ghc-typelits-knownnat ghc-typelits-natnormalise matrix
+ semigroups tasty tasty-hunit vector
+ ];
+ description = "Wrapper around matrix that adds matrix sizes to the type-level";
+ license = stdenv.lib.licenses.bsd3;
+ }) {};
+
"matsuri" = callPackage
({ mkDerivation, base, ConfigFile, containers, directory, MissingH
, mtl, network, old-locale, split, time, vty, vty-ui, XMPP
@@ -137885,8 +138595,8 @@ self: {
pname = "megaparsec";
version = "6.5.0";
sha256 = "12iggy7qpf8x93jm64zf0g215xwy779bqyfyjk2bhmxqqr1yzgdy";
- revision = "3";
- editedCabalFile = "137ap53bgvnc0bdhkyv84290i3fzngryijsv33h7fb0q9k6dmb6h";
+ revision = "4";
+ editedCabalFile = "0ij3asi5vwlhbgwsy6nhli9a0qb7926mg809fsgyl1rnhs9fvpx1";
libraryHaskellDepends = [
base bytestring case-insensitive containers deepseq mtl
parser-combinators scientific text transformers
@@ -137901,6 +138611,33 @@ self: {
license = stdenv.lib.licenses.bsd2;
}) {};
+ "megaparsec_7_0_0" = callPackage
+ ({ mkDerivation, base, bytestring, case-insensitive, containers
+ , criterion, deepseq, hspec, hspec-expectations, mtl
+ , parser-combinators, QuickCheck, scientific, text, transformers
+ , weigh
+ }:
+ mkDerivation {
+ pname = "megaparsec";
+ version = "7.0.0";
+ sha256 = "101kri8w4wf30xs9fnp938il13hxhy6gnnl4m1f0ws4d8q6qgmmz";
+ libraryHaskellDepends = [
+ base bytestring case-insensitive containers deepseq mtl
+ parser-combinators scientific text transformers
+ ];
+ testHaskellDepends = [
+ base bytestring case-insensitive containers hspec
+ hspec-expectations mtl parser-combinators QuickCheck scientific
+ text transformers
+ ];
+ benchmarkHaskellDepends = [
+ base containers criterion deepseq text weigh
+ ];
+ description = "Monadic parser combinators";
+ license = stdenv.lib.licenses.bsd2;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ }) {};
+
"meldable-heap" = callPackage
({ mkDerivation, base }:
mkDerivation {
@@ -138917,21 +139654,6 @@ self: {
}) {};
"microlens-ghc" = callPackage
- ({ mkDerivation, array, base, bytestring, containers, microlens
- , transformers
- }:
- mkDerivation {
- pname = "microlens-ghc";
- version = "0.4.9";
- sha256 = "0wdwra9s7gllw0i7sf7d371h6d5qwlk6jrvhdm8hafj4fxagafma";
- libraryHaskellDepends = [
- array base bytestring containers microlens transformers
- ];
- description = "microlens + array, bytestring, containers, transformers";
- license = stdenv.lib.licenses.bsd3;
- }) {};
-
- "microlens-ghc_0_4_9_1" = callPackage
({ mkDerivation, array, base, bytestring, containers, microlens
, transformers
}:
@@ -138944,7 +139666,6 @@ self: {
];
description = "microlens + array, bytestring, containers, transformers";
license = stdenv.lib.licenses.bsd3;
- hydraPlatforms = stdenv.lib.platforms.none;
}) {};
"microlens-mtl" = callPackage
@@ -138979,23 +139700,6 @@ self: {
}) {};
"microlens-th" = callPackage
- ({ mkDerivation, base, containers, microlens, template-haskell
- , th-abstraction, transformers
- }:
- mkDerivation {
- pname = "microlens-th";
- version = "0.4.2.1";
- sha256 = "0hpwwk50a826s87ad0k6liw40qp6av0hmdhnsdfhhk5mka710mzc";
- libraryHaskellDepends = [
- base containers microlens template-haskell th-abstraction
- transformers
- ];
- testHaskellDepends = [ base microlens ];
- description = "Automatic generation of record lenses for microlens";
- license = stdenv.lib.licenses.bsd3;
- }) {};
-
- "microlens-th_0_4_2_2" = callPackage
({ mkDerivation, base, containers, microlens, template-haskell
, th-abstraction, transformers
}:
@@ -139010,7 +139714,6 @@ self: {
testHaskellDepends = [ base microlens ];
description = "Automatic generation of record lenses for microlens";
license = stdenv.lib.licenses.bsd3;
- hydraPlatforms = stdenv.lib.platforms.none;
}) {};
"micrologger" = callPackage
@@ -139055,18 +139758,20 @@ self: {
pname = "microspec";
version = "0.1.0.0";
sha256 = "0hykarba8ccwkslh8cfsxbriw043f8pa4jyhr3hqc5yqfijibr71";
+ revision = "1";
+ editedCabalFile = "0cnfj3v6fzck57bgrsnmgz8a9azvz04pm3hv17fg12xzchmp07cq";
libraryHaskellDepends = [ base QuickCheck ];
description = "Tiny QuickCheck test library with minimal dependencies";
license = stdenv.lib.licenses.bsd3;
}) {};
- "microspec_0_2_0_0" = callPackage
- ({ mkDerivation, base, QuickCheck }:
+ "microspec_0_2_0_1" = callPackage
+ ({ mkDerivation, base, QuickCheck, time }:
mkDerivation {
pname = "microspec";
- version = "0.2.0.0";
- sha256 = "0nz9achmckza9n6hx7ix7yyh9fhhfjnbszzjssz4mnghcmm8l0wv";
- libraryHaskellDepends = [ base QuickCheck ];
+ version = "0.2.0.1";
+ sha256 = "1ygkxsj7rm42f245qip8893lm189immmd5ajimp5d1pkzfkw4dnp";
+ libraryHaskellDepends = [ base QuickCheck time ];
description = "Tiny QuickCheck test library with minimal dependencies";
license = stdenv.lib.licenses.bsd3;
hydraPlatforms = stdenv.lib.platforms.none;
@@ -139192,8 +139897,8 @@ self: {
}:
mkDerivation {
pname = "midi-music-box";
- version = "0.0.0.4";
- sha256 = "0l8nv3bfbncjbh80dav7qps5aqd20g88sx00xhqr6j9m66znfg1p";
+ version = "0.0.0.5";
+ sha256 = "1zgskam31akqi58wvjxqfgag937fczskyvzanivvxd7p6gvj5l0g";
isLibrary = false;
isExecutable = true;
executableHaskellDepends = [
@@ -139957,6 +140662,26 @@ self: {
license = stdenv.lib.licenses.bsd3;
}) {};
+ "miso_0_21_2_0" = callPackage
+ ({ mkDerivation, aeson, base, bytestring, containers, http-api-data
+ , http-types, lucid, network-uri, servant, servant-lucid, text
+ , transformers, vector
+ }:
+ mkDerivation {
+ pname = "miso";
+ version = "0.21.2.0";
+ sha256 = "061bjvxcs6psh8hj947p4jm9ki9ngrwvn23szvk8i3x4xd87jbfm";
+ isLibrary = true;
+ isExecutable = true;
+ libraryHaskellDepends = [
+ aeson base bytestring containers http-api-data http-types lucid
+ network-uri servant servant-lucid text transformers vector
+ ];
+ description = "A tasty Haskell front-end framework";
+ license = stdenv.lib.licenses.bsd3;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ }) {};
+
"missing-foreign" = callPackage
({ mkDerivation, base }:
mkDerivation {
@@ -140400,6 +141125,33 @@ self: {
license = stdenv.lib.licenses.bsd3;
}) {};
+ "modern-uri_0_3_0_0" = callPackage
+ ({ mkDerivation, base, bytestring, containers, contravariant
+ , criterion, deepseq, exceptions, hspec, hspec-discover
+ , hspec-megaparsec, megaparsec, mtl, profunctors, QuickCheck
+ , reflection, tagged, template-haskell, text, weigh
+ }:
+ mkDerivation {
+ pname = "modern-uri";
+ version = "0.3.0.0";
+ sha256 = "059p1lzfk7bwshlgy0sgms651003992jgxv2lr7r714sy5brfwb4";
+ libraryHaskellDepends = [
+ base bytestring containers contravariant deepseq exceptions
+ megaparsec mtl profunctors QuickCheck reflection tagged
+ template-haskell text
+ ];
+ testHaskellDepends = [
+ base bytestring hspec hspec-megaparsec megaparsec QuickCheck text
+ ];
+ testToolDepends = [ hspec-discover ];
+ benchmarkHaskellDepends = [
+ base bytestring criterion deepseq megaparsec text weigh
+ ];
+ description = "Modern library for working with URIs";
+ license = stdenv.lib.licenses.bsd3;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ }) {};
+
"modify-fasta" = callPackage
({ mkDerivation, base, containers, fasta, mtl, optparse-applicative
, pipes, pipes-text, regex-tdfa, regex-tdfa-text, semigroups, split
@@ -140602,8 +141354,8 @@ self: {
}:
mkDerivation {
pname = "mohws";
- version = "0.2.1.5";
- sha256 = "1xkkkb1ili45icvlmz2r5i42qf1fib01ywqywgq4n53cyx1ncqa9";
+ version = "0.2.1.6";
+ sha256 = "0rnb6nq99bav0z5dxzc4xkb2ai6ifm5v2ijd76sgzbs2032v6wqs";
isLibrary = true;
isExecutable = true;
enableSeparateDataOutput = true;
@@ -141221,15 +141973,15 @@ self: {
license = stdenv.lib.licenses.bsd3;
}) {};
- "monad-memo_0_5_0" = callPackage
+ "monad-memo_0_5_1" = callPackage
({ mkDerivation, array, base, containers, criterion, primitive
, QuickCheck, random, test-framework, test-framework-quickcheck2
, transformers, vector
}:
mkDerivation {
pname = "monad-memo";
- version = "0.5.0";
- sha256 = "1ax1myhgnpy7gyb7pxn98424mda317zvji47bdwj2h58rpldqhjm";
+ version = "0.5.1";
+ sha256 = "1zsvp0g2kzjf5zkv1js65jfc1p3yrkr95csp2ljpqx857qy4lnn6";
libraryHaskellDepends = [
array base containers primitive transformers vector
];
@@ -141966,6 +142718,8 @@ self: {
pname = "monadplus";
version = "1.4.2";
sha256 = "15b5320wdpmdp5slpphnc1x4rhjch3igw245dp2jxbqyvchdavin";
+ revision = "1";
+ editedCabalFile = "11v5zdsb9mp1rxvgcrxcr2xnc610xi16krwa9r4i5d6njmphfbdp";
libraryHaskellDepends = [ base ];
description = "Haskell98 partial maps and filters over MonadPlus";
license = stdenv.lib.licenses.bsd3;
@@ -142053,8 +142807,8 @@ self: {
({ mkDerivation, base, bindings-monetdb-mapi }:
mkDerivation {
pname = "monetdb-mapi";
- version = "0.1.0.0";
- sha256 = "0v7709zvx2q07zymdk2hi4nwaby4a5i02qgs97l5f9s4nwwb5qmr";
+ version = "0.1.0.1";
+ sha256 = "1r035w349js424x0864xghvs79v4wsf9br4rwqpfqkyz2hxsqhx0";
libraryHaskellDepends = [ base bindings-monetdb-mapi ];
description = "Mid-level bindings for the MonetDB API (mapi)";
license = stdenv.lib.licenses.bsd3;
@@ -143613,8 +144367,8 @@ self: {
({ mkDerivation, base, doctest }:
mkDerivation {
pname = "multi-instance";
- version = "0.0.0.2";
- sha256 = "11r7wy143zy9drjrz7l57bdsbaj2fd3sjwbiz7pcmcdr1bxxga63";
+ version = "0.0.0.3";
+ sha256 = "197jrq0r7va89z2hzhna0v4xmrranq1lgv4ncmbzlzliis6j7m22";
libraryHaskellDepends = [ base ];
testHaskellDepends = [ base doctest ];
description = "Typeclasses augmented with a phantom type parameter";
@@ -144627,8 +145381,8 @@ self: {
({ mkDerivation, base, safe-exceptions }:
mkDerivation {
pname = "mvar-lock";
- version = "0.1.0.1";
- sha256 = "0kdf7811kxwfj032d8g18za0nn9jlssh7dpvvr8kzjk01b77804r";
+ version = "0.1.0.2";
+ sha256 = "09diqzb4vp7bcg6v16fgjb70mi68i8srnyxf6qga58va6avbc4wg";
libraryHaskellDepends = [ base safe-exceptions ];
description = "A trivial lock based on MVar";
license = stdenv.lib.licenses.asl20;
@@ -146841,16 +147595,14 @@ self: {
license = stdenv.lib.licenses.bsd3;
}) {};
- "network_2_7_0_2" = callPackage
+ "network_2_8_0_0" = callPackage
({ mkDerivation, base, bytestring, directory, doctest, hspec, HUnit
, unix
}:
mkDerivation {
pname = "network";
- version = "2.7.0.2";
- sha256 = "1fsdcwz7w1g1gznr62a6za8jc2g8cq5asrcq2vc14x9plf31s2vf";
- revision = "2";
- editedCabalFile = "04h5wq6116brd2r3182g65crrbidn43wi43qz1n99gl042ydgf3w";
+ version = "2.8.0.0";
+ sha256 = "00skcish0xmm67ax999nv1nll9rm3gqmn92099iczd73nxl55468";
libraryHaskellDepends = [ base bytestring unix ];
testHaskellDepends = [
base bytestring directory doctest hspec HUnit
@@ -146938,8 +147690,8 @@ self: {
}:
mkDerivation {
pname = "network-api-support";
- version = "0.3.3";
- sha256 = "1dp9fp907sc1r0mshby18vlbkji9bggikbycjbdlb6mzg7mjmiav";
+ version = "0.3.4";
+ sha256 = "0zzb5jxb6zxwq88qwldzy7qy5b4arz4vnn82ilcz2214w21bhzlp";
libraryHaskellDepends = [
aeson attoparsec base bytestring case-insensitive http-client
http-client-tls http-types text time tls
@@ -148091,6 +148843,27 @@ self: {
hydraPlatforms = stdenv.lib.platforms.none;
}) {nfc = null;};
+ "ngram" = callPackage
+ ({ mkDerivation, base, bytestring, cereal, cereal-text, containers
+ , optparse-generic, text, zlib
+ }:
+ mkDerivation {
+ pname = "ngram";
+ version = "0.1.0.0";
+ sha256 = "0qk5wgkr69jd9gdy524nsx6r9ss328ynq65k6wn5k7pjkmnfym26";
+ isLibrary = true;
+ isExecutable = true;
+ libraryHaskellDepends = [
+ base cereal cereal-text containers text
+ ];
+ executableHaskellDepends = [
+ base bytestring cereal cereal-text containers optparse-generic text
+ zlib
+ ];
+ description = "Ngram models for compressing and classifying text";
+ license = stdenv.lib.licenses.bsd3;
+ }) {};
+
"ngrams-loader" = callPackage
({ mkDerivation, attoparsec, base, machines, mtl, parseargs
, resourcet, sqlite-simple, text
@@ -148864,12 +149637,12 @@ self: {
}) {};
"non-empty-containers" = callPackage
- ({ mkDerivation, base, containers }:
+ ({ mkDerivation, base, containers, semigroupoids }:
mkDerivation {
pname = "non-empty-containers";
- version = "0.1.1.0";
- sha256 = "1m4js4z27x43bkccbaqnlrmknfdiwqgdvvkfad7r4kgwdmil3mnc";
- libraryHaskellDepends = [ base containers ];
+ version = "0.1.2.0";
+ sha256 = "0lqyz0xn34byx8f71klj21ficjpy6c049x3fngs7x765vam2dmii";
+ libraryHaskellDepends = [ base containers semigroupoids ];
license = stdenv.lib.licenses.bsd3;
}) {};
@@ -149231,6 +150004,18 @@ self: {
license = stdenv.lib.licenses.bsd3;
}) {};
+ "nowdoc" = callPackage
+ ({ mkDerivation, base, bytestring, template-haskell }:
+ mkDerivation {
+ pname = "nowdoc";
+ version = "0.1.1.0";
+ sha256 = "0s2j7z9zyb3y3k5hviqjnb3l2z9mvxll5m9nsvq566hn5h5lkzjg";
+ libraryHaskellDepends = [ base bytestring template-haskell ];
+ testHaskellDepends = [ base bytestring template-haskell ];
+ description = "Here document without variable expansion like PHP Nowdoc";
+ license = stdenv.lib.licenses.bsd3;
+ }) {};
+
"np-extras" = callPackage
({ mkDerivation, base, containers, numeric-prelude, primes }:
mkDerivation {
@@ -149281,14 +150066,15 @@ self: {
"nqe" = callPackage
({ mkDerivation, base, bytestring, conduit, conduit-extra
- , containers, exceptions, hspec, stm, stm-conduit, text, unliftio
+ , containers, exceptions, hspec, mtl, stm, stm-conduit, text
+ , unliftio
}:
mkDerivation {
pname = "nqe";
- version = "0.3.0.0";
- sha256 = "1ggss61zym8ramf3yavmsgn013nlcv40kp6r2v1ax7ccdqyzjh98";
+ version = "0.4.1";
+ sha256 = "1x6ila806i1b1smiby47c1sfj3m09xlxcqpg3ywdibh31znbhhqj";
libraryHaskellDepends = [
- base bytestring conduit conduit-extra containers stm unliftio
+ base conduit containers mtl stm unliftio
];
testHaskellDepends = [
base bytestring conduit conduit-extra exceptions hspec stm
@@ -149406,6 +150192,17 @@ self: {
hydraPlatforms = stdenv.lib.platforms.none;
}) {};
+ "ntype" = callPackage
+ ({ mkDerivation, base }:
+ mkDerivation {
+ pname = "ntype";
+ version = "0.1.0.0";
+ sha256 = "0raz6azyj7a3fygpmylhz38b75zy57xdrginbhj2d6vwzxhkmscd";
+ libraryHaskellDepends = [ base ];
+ description = "N-ary sum/product types";
+ license = stdenv.lib.licenses.bsd3;
+ }) {};
+
"null-canvas" = callPackage
({ mkDerivation, aeson, base, containers, filepath, scotty, split
, stm, text, transformers, wai-extra, warp
@@ -149632,8 +150429,8 @@ self: {
}:
mkDerivation {
pname = "numeric-prelude";
- version = "0.4.3";
- sha256 = "0bc937gblm8rz68fr3q2ms19hqjwi20wkmn1k1c0b675c2kgky5q";
+ version = "0.4.3.1";
+ sha256 = "0531yjw1rzbv3snv1lc955350frgf8526slsxbx3ias71krbdr69";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [
@@ -150334,8 +151131,8 @@ self: {
}:
mkDerivation {
pname = "ochintin-daicho";
- version = "0.3.1.1";
- sha256 = "06xdr5763xipzpl83190p8ha1rm9akqa49dh0588ibbhk2zbk0ln";
+ version = "0.3.4.2";
+ sha256 = "0k7k4rj3356n9d8waw5sjiq97w9wbrhq3bwqr0hr3zh2h5imy5sy";
libraryHaskellDepends = [
base bookkeeping mono-traversable text transaction
];
@@ -151390,23 +152187,6 @@ self: {
}) {};
"openexr-write" = callPackage
- ({ mkDerivation, base, binary, bytestring, data-binary-ieee754
- , deepseq, directory, hspec, split, vector, vector-split, zlib
- }:
- mkDerivation {
- pname = "openexr-write";
- version = "0.1.0.1";
- sha256 = "0f45jgj08fmrj30f167xldapm5lqma4yy95y9mjx6appb7cg5qvd";
- libraryHaskellDepends = [
- base binary bytestring data-binary-ieee754 deepseq split vector
- vector-split zlib
- ];
- testHaskellDepends = [ base bytestring directory hspec vector ];
- description = "Library for writing images in OpenEXR HDR file format";
- license = stdenv.lib.licenses.gpl3;
- }) {};
-
- "openexr-write_0_1_0_2" = callPackage
({ mkDerivation, base, binary, bytestring, data-binary-ieee754
, deepseq, directory, hspec, split, vector, vector-split, zlib
}:
@@ -151421,7 +152201,6 @@ self: {
testHaskellDepends = [ base bytestring directory hspec vector ];
description = "Library for writing images in OpenEXR HDR file format";
license = stdenv.lib.licenses.publicDomain;
- hydraPlatforms = stdenv.lib.platforms.none;
}) {};
"openflow" = callPackage
@@ -151901,14 +152680,16 @@ self: {
"opentok" = callPackage
({ mkDerivation, aeson, aeson-casing, aeson-compat, base
, base-compat, base64-string, bytestring, containers, convertible
- , either, hscolour, http-client, http-client-tls, http-conduit
- , http-types, iproute, jose, lens, monad-time, SHA, strings, text
- , time, transformers, unordered-containers, utf8-string, uuid
+ , either, hscolour, hspec, http-client, http-client-tls
+ , http-conduit, http-types, iproute, jose, lens, monad-time
+ , QuickCheck, quickcheck-instances, SHA, split, strings, tasty
+ , tasty-hspec, tasty-quickcheck, text, time, transformers
+ , unordered-containers, utf8-string, uuid
}:
mkDerivation {
pname = "opentok";
- version = "0.0.4";
- sha256 = "1wzl7ra1y3998kp54j9hpnv58kzk1ysx9qivi4fsg0psyvhqf17j";
+ version = "0.0.5";
+ sha256 = "1jcqsa9p1794hgf5ywq605i4rb85dm5qpvznn4n3s4y8d409k6wq";
libraryHaskellDepends = [
aeson aeson-casing aeson-compat base base-compat base64-string
bytestring containers convertible either hscolour http-client
@@ -151916,6 +152697,14 @@ self: {
monad-time SHA strings text time transformers unordered-containers
utf8-string uuid
];
+ testHaskellDepends = [
+ aeson aeson-casing aeson-compat base base-compat base64-string
+ bytestring containers convertible either hspec http-client
+ http-client-tls http-conduit http-types iproute jose lens
+ monad-time QuickCheck quickcheck-instances SHA split strings tasty
+ tasty-hspec tasty-quickcheck text time transformers
+ unordered-containers utf8-string uuid
+ ];
description = "An OpenTok SDK for Haskell";
license = stdenv.lib.licenses.mit;
}) {};
@@ -152094,8 +152883,8 @@ self: {
}:
mkDerivation {
pname = "optima";
- version = "0.3.0.1";
- sha256 = "10xacn6myg486hk3i4a586xnwsjqjd1r29pyw1plgmb7yjp75z85";
+ version = "0.3.0.2";
+ sha256 = "116h7rdv7g2h5bjxr883s15hg9l194q3nkyn045w2ygapk4xsimg";
libraryHaskellDepends = [
attoparsec attoparsec-data base optparse-applicative text
text-builder
@@ -153531,6 +154320,8 @@ self: {
pname = "pandoc-citeproc";
version = "0.14.3.1";
sha256 = "0yj6rckwsc9vig40cm15ry0j3d01xpk04qma9n4byhal6v4b5h22";
+ revision = "1";
+ editedCabalFile = "1lqz432ij7yp6l412vcfk400nmxzbix6qckgmir46k1jm4glyqwk";
isLibrary = true;
isExecutable = true;
enableSeparateDataOutput = true;
@@ -154090,6 +154881,8 @@ self: {
pname = "papa-bifunctors-export";
version = "0.3.1";
sha256 = "070br6i23pdhha9kakfw4sq8rslyrjsf1n0iikm60ca5ldbl8vn0";
+ revision = "1";
+ editedCabalFile = "1d5jvb35as6kb9nmv99gv38v7rzl7c9mdg3ypwzmdqg0646m9k7m";
libraryHaskellDepends = [ base bifunctors ];
description = "export useful functions from `bifunctors`";
license = stdenv.lib.licenses.bsd3;
@@ -154713,6 +155506,29 @@ self: {
hydraPlatforms = stdenv.lib.platforms.none;
}) {};
+ "paripari" = callPackage
+ ({ mkDerivation, base, bytestring, parser-combinators, random
+ , tasty, tasty-hunit, text
+ }:
+ mkDerivation {
+ pname = "paripari";
+ version = "0.2.1.0";
+ sha256 = "002sr369102k2wwzy3adav52vvz7d0yyy07lqzqf8b7fw6ffjcy2";
+ isLibrary = true;
+ isExecutable = true;
+ libraryHaskellDepends = [
+ base bytestring parser-combinators text
+ ];
+ executableHaskellDepends = [
+ base bytestring parser-combinators text
+ ];
+ testHaskellDepends = [
+ base bytestring parser-combinators random tasty tasty-hunit text
+ ];
+ description = "Parser combinators with fast-path and slower fallback for error reporting";
+ license = stdenv.lib.licenses.mit;
+ }) {};
+
"parport" = callPackage
({ mkDerivation, array, base }:
mkDerivation {
@@ -155452,21 +156268,22 @@ self: {
"patat" = callPackage
({ mkDerivation, aeson, ansi-terminal, ansi-wl-pprint, base
- , bytestring, containers, directory, filepath, mtl, network
- , network-uri, optparse-applicative, pandoc, skylighting
- , terminal-size, text, time, unordered-containers, yaml
+ , base64-bytestring, bytestring, colour, containers, directory
+ , filepath, mtl, network, network-uri, optparse-applicative, pandoc
+ , process, skylighting, terminal-size, text, time
+ , unordered-containers, yaml
}:
mkDerivation {
pname = "patat";
- version = "0.7.2.0";
- sha256 = "1kn739dywchvvvcp972yyxg7r4n81s3qbrni684ag7493nck12iw";
+ version = "0.8.0.0";
+ sha256 = "1xbddlc73b0sgd02vxkbhra04wz77q0dn1937k6aq5l1vx663i81";
isLibrary = false;
isExecutable = true;
executableHaskellDepends = [
- aeson ansi-terminal ansi-wl-pprint base bytestring containers
- directory filepath mtl network network-uri optparse-applicative
- pandoc skylighting terminal-size text time unordered-containers
- yaml
+ aeson ansi-terminal ansi-wl-pprint base base64-bytestring
+ bytestring colour containers directory filepath mtl network
+ network-uri optparse-applicative pandoc process skylighting
+ terminal-size text time unordered-containers yaml
];
description = "Terminal-based presentations using Pandoc";
license = stdenv.lib.licenses.gpl2;
@@ -157284,31 +158101,6 @@ self: {
}) {};
"persistent-mysql-haskell" = callPackage
- ({ mkDerivation, aeson, base, bytestring, conduit, containers
- , io-streams, monad-logger, mysql-haskell, network, persistent
- , persistent-template, resource-pool, resourcet, text, time, tls
- , transformers, unliftio-core
- }:
- mkDerivation {
- pname = "persistent-mysql-haskell";
- version = "0.4.1";
- sha256 = "1wp8va21l03i0wlchlmzik7npvrm4gma4wly0p9rljdwizhgh291";
- isLibrary = true;
- isExecutable = true;
- libraryHaskellDepends = [
- aeson base bytestring conduit containers io-streams monad-logger
- mysql-haskell network persistent resource-pool resourcet text time
- tls transformers unliftio-core
- ];
- executableHaskellDepends = [
- base monad-logger persistent persistent-template transformers
- ];
- description = "A pure haskell backend for the persistent library using MySQL database server";
- license = stdenv.lib.licenses.mit;
- hydraPlatforms = stdenv.lib.platforms.none;
- }) {};
-
- "persistent-mysql-haskell_0_4_2" = callPackage
({ mkDerivation, aeson, base, bytestring, conduit, containers
, io-streams, monad-logger, mysql-haskell, network, persistent
, persistent-template, resource-pool, resourcet, text, time, tls
@@ -157506,34 +158298,6 @@ self: {
}) {inherit (pkgs) sqlite;};
"persistent-sqlite" = callPackage
- ({ mkDerivation, aeson, base, bytestring, conduit, containers
- , hspec, microlens-th, monad-logger, old-locale, persistent
- , persistent-template, resource-pool, resourcet, sqlite, temporary
- , text, time, transformers, unliftio-core, unordered-containers
- }:
- mkDerivation {
- pname = "persistent-sqlite";
- version = "2.8.1.2";
- sha256 = "035dz64h35s7ry39yd57ybqcllkwkfj0wj9ngh6gcw03hgrmfw9g";
- configureFlags = [ "-fsystemlib" ];
- isLibrary = true;
- isExecutable = true;
- libraryHaskellDepends = [
- aeson base bytestring conduit containers microlens-th monad-logger
- old-locale persistent resource-pool resourcet text time
- transformers unliftio-core unordered-containers
- ];
- librarySystemDepends = [ sqlite ];
- testHaskellDepends = [
- base hspec persistent persistent-template temporary text time
- transformers
- ];
- description = "Backend for the persistent library using sqlite3";
- license = stdenv.lib.licenses.mit;
- maintainers = with stdenv.lib.maintainers; [ psibi ];
- }) {inherit (pkgs) sqlite;};
-
- "persistent-sqlite_2_8_2" = callPackage
({ mkDerivation, aeson, base, bytestring, conduit, containers
, hspec, microlens-th, monad-logger, old-locale, persistent
, persistent-template, resource-pool, resourcet, sqlite, temporary
@@ -157558,7 +158322,6 @@ self: {
];
description = "Backend for the persistent library using sqlite3";
license = stdenv.lib.licenses.mit;
- hydraPlatforms = stdenv.lib.platforms.none;
maintainers = with stdenv.lib.maintainers; [ psibi ];
}) {inherit (pkgs) sqlite;};
@@ -161245,8 +162008,8 @@ self: {
}:
mkDerivation {
pname = "pomaps";
- version = "0.0.1.0";
- sha256 = "1vvvpqr3gnps425mv00scmab0hc8h93ylsiw07vm8cpafwkfxii8";
+ version = "0.0.2.0";
+ sha256 = "08mlj61archpiqq8375gi5ha9mpxgpnsfpsx3kqja92dgj0aq5q6";
libraryHaskellDepends = [
base containers deepseq ghc-prim lattices
];
@@ -161460,8 +162223,8 @@ self: {
}:
mkDerivation {
pname = "pooled-io";
- version = "0.0.2.1";
- sha256 = "1l7rgwlkhgxxh9y3ag341zifdjabhmwd6k9hg83rqnnmfs45lh3x";
+ version = "0.0.2.2";
+ sha256 = "1g8zppj2s1wfzg5rpdgz15m44ihxhmrx16jx12n4821cdhsm2nrs";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [
@@ -162386,15 +163149,15 @@ self: {
, hspec-wai, hspec-wai-json, HTTP, http-types
, insert-ordered-containers, interpolatedstring-perl6, jose, lens
, lens-aeson, monad-control, network-uri, optparse-applicative
- , parsec, process, protolude, Ranged-sets, regex-tdfa, retry, safe
+ , parsec, process, protolude, Ranged-sets, regex-tdfa, retry
, scientific, swagger2, text, time, transformers-base, unix
, unordered-containers, vector, wai, wai-cors, wai-extra
, wai-middleware-static, warp
}:
mkDerivation {
pname = "postgrest";
- version = "0.5.0.0";
- sha256 = "1sixscxpx6dl7hj87yk6zz4a8rg4qwlcchqrxxg1m0gjhln0aqx3";
+ version = "5.1.0";
+ sha256 = "1x6jipc8ixv9wic5l0nlsirm3baddmrhphrr3snil1by5kz208g6";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [
@@ -162403,7 +163166,7 @@ self: {
contravariant-extras cookie either gitrev hasql hasql-pool
hasql-transaction heredoc HTTP http-types insert-ordered-containers
interpolatedstring-perl6 jose lens lens-aeson network-uri
- optparse-applicative parsec protolude Ranged-sets regex-tdfa safe
+ optparse-applicative parsec protolude Ranged-sets regex-tdfa
scientific swagger2 text time unordered-containers vector wai
wai-cors wai-extra wai-middleware-static
];
@@ -162485,8 +163248,8 @@ self: {
}:
mkDerivation {
pname = "postmark";
- version = "0.2.3";
- sha256 = "140z6r01byld665471dbk5zdqaf6lrcxwqp0wvbs5fbpjq37mfmp";
+ version = "0.2.6";
+ sha256 = "0x8nvxhw6wwq9w9dl16gvh6j6la224s2ldakx694518amqd4avrx";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [
@@ -162551,8 +163314,8 @@ self: {
({ mkDerivation, potoki-core }:
mkDerivation {
pname = "potoki";
- version = "2.0.6";
- sha256 = "1gjjs03kpvq544pada5a1r9vjv3dwiqkkgp7hb6ync41mpwvhssl";
+ version = "2.0.15";
+ sha256 = "09220lqyl4rd7al03349r6wbp8hd85rjfbr6kq1swzn3yja2zhsz";
libraryHaskellDepends = [ potoki-core ];
description = "Simple streaming in IO";
license = stdenv.lib.licenses.mit;
@@ -162583,25 +163346,26 @@ self: {
}) {};
"potoki-core" = callPackage
- ({ mkDerivation, acquire, attoparsec, base, bytestring, directory
- , foldl, hashable, ilist, primitive, profunctors, ptr, QuickCheck
- , quickcheck-instances, random, rerebase, scanner, stm, tasty
- , tasty-hunit, tasty-quickcheck, text, transformers
- , unordered-containers, vector
+ ({ mkDerivation, acquire, attoparsec, base, bytestring, criterion
+ , directory, foldl, hashable, ilist, primitive, profunctors, ptr
+ , QuickCheck, quickcheck-instances, random, rerebase, scanner
+ , split, stm, tasty, tasty-hunit, tasty-quickcheck, text, time
+ , transformers, unordered-containers, vector
}:
mkDerivation {
pname = "potoki-core";
- version = "2.2.8.2";
- sha256 = "11d75dm2y1fw5kzbkf5vx55b0xa2sn1picbykfl6zypqbqmpa86g";
+ version = "2.2.16";
+ sha256 = "0xjrbv087qyqqd3h3lam2jgrikp5lvsb716ndmqv0i1s4qlzxa6d";
libraryHaskellDepends = [
acquire attoparsec base bytestring directory foldl hashable
- primitive profunctors ptr scanner stm text transformers
+ primitive profunctors ptr scanner stm text time transformers
unordered-containers vector
];
testHaskellDepends = [
acquire attoparsec foldl ilist QuickCheck quickcheck-instances
- random rerebase tasty tasty-hunit tasty-quickcheck
+ random rerebase split tasty tasty-hunit tasty-quickcheck
];
+ benchmarkHaskellDepends = [ criterion rerebase ];
description = "Low-level components of \"potoki\"";
license = stdenv.lib.licenses.mit;
hydraPlatforms = stdenv.lib.platforms.none;
@@ -163938,24 +164702,27 @@ self: {
}) {};
"primitive-containers" = callPackage
- ({ mkDerivation, base, containers, contiguous, gauge, ghc-prim
- , primitive, primitive-sort, QuickCheck, quickcheck-classes, random
- , tasty, tasty-quickcheck
+ ({ mkDerivation, aeson, base, containers, contiguous, deepseq
+ , gauge, ghc-prim, hashable, HUnit, primitive, primitive-sort
+ , quantification, QuickCheck, quickcheck-classes, random, tasty
+ , tasty-hunit, tasty-quickcheck, text, unordered-containers, vector
}:
mkDerivation {
pname = "primitive-containers";
- version = "0.2.0";
- sha256 = "11q0dvlsdabmsjsr0gznr8ndx1fyvbvv8jxfszj6na8jhrz7x84b";
+ version = "0.3.0";
+ sha256 = "0yk7gqngdkm3s3pmmzbvrjd52hiqjn0gg2j60iw7wnaalagcap6x";
libraryHaskellDepends = [
- base contiguous primitive primitive-sort
+ aeson base contiguous deepseq hashable primitive primitive-sort
+ quantification text unordered-containers vector
];
testHaskellDepends = [
- base containers primitive QuickCheck quickcheck-classes tasty
- tasty-quickcheck
+ aeson base containers HUnit primitive quantification QuickCheck
+ quickcheck-classes tasty tasty-hunit tasty-quickcheck text
];
benchmarkHaskellDepends = [
base containers gauge ghc-prim primitive random
];
+ description = "containers backed by arrays";
license = stdenv.lib.licenses.bsd3;
hydraPlatforms = stdenv.lib.platforms.none;
}) {};
@@ -163968,8 +164735,8 @@ self: {
}:
mkDerivation {
pname = "primitive-extras";
- version = "0.6.7";
- sha256 = "0kh2cccy1pmvvsrl9sjvcar4l1i3igk9vf8lxxxlwypj43nm32ny";
+ version = "0.7.0.2";
+ sha256 = "01xjis2y8gpa1f45g3nf9lminy3yhbsb10fzhk23z5n8205jh77d";
libraryHaskellDepends = [
base bytestring cereal deferred-folds focus foldl list-t primitive
profunctors vector
@@ -164032,8 +164799,8 @@ self: {
pname = "primitive-sort";
version = "0.1.0.0";
sha256 = "147y4y8v00yggfgyf70kzd3pd9r6jvgxkzjsy3xpbp6mjdnzrbm3";
- revision = "1";
- editedCabalFile = "0b148bc30nbfrmdx1k7d4ky6k129w8vy146di90v9q12rvsdaz8w";
+ revision = "2";
+ editedCabalFile = "1yn5nwdw5jmzg603ln626gz2ifjn8fssgzq17g4nyriscqfg1aki";
libraryHaskellDepends = [ base contiguous ghc-prim primitive ];
testHaskellDepends = [
base containers doctest HUnit primitive QuickCheck smallcheck tasty
@@ -164273,8 +165040,8 @@ self: {
}:
mkDerivation {
pname = "probability";
- version = "0.2.5.1";
- sha256 = "0bgdyx562x91a3s79p293pz4qimwd2k35mfxap23ia6x6a5prrnk";
+ version = "0.2.5.2";
+ sha256 = "059l9by2zxb92dd2vshxx9f3sm1kazc2i2ll168hfsya9rrqqaqg";
enableSeparateDataOutput = true;
libraryHaskellDepends = [
base containers random transformers utility-ht
@@ -164637,18 +165404,6 @@ self: {
}) {};
"product-isomorphic" = callPackage
- ({ mkDerivation, base, template-haskell, th-data-compat }:
- mkDerivation {
- pname = "product-isomorphic";
- version = "0.0.3.2";
- sha256 = "1yqpfdbdq0zh69mbpgns8faj0ajc9a8wgp3c8sgn373py2as9jxl";
- libraryHaskellDepends = [ base template-haskell th-data-compat ];
- testHaskellDepends = [ base template-haskell ];
- description = "Weaken applicative functor on products";
- license = stdenv.lib.licenses.bsd3;
- }) {};
-
- "product-isomorphic_0_0_3_3" = callPackage
({ mkDerivation, base, template-haskell, th-data-compat }:
mkDerivation {
pname = "product-isomorphic";
@@ -164658,7 +165413,6 @@ self: {
testHaskellDepends = [ base template-haskell ];
description = "Weaken applicative functor on products";
license = stdenv.lib.licenses.bsd3;
- hydraPlatforms = stdenv.lib.platforms.none;
}) {};
"product-profunctors" = callPackage
@@ -165470,22 +166224,26 @@ self: {
license = stdenv.lib.licenses.bsd3;
}) {};
- "proto-lens-arbitrary" = callPackage
- ({ mkDerivation, base, bytestring, containers, lens-family
- , proto-lens, QuickCheck, text
+ "proto-lens_0_4_0_0" = callPackage
+ ({ mkDerivation, attoparsec, base, bytestring, containers, deepseq
+ , lens-family, lens-labels, parsec, pretty, text, transformers
+ , void
}:
mkDerivation {
- pname = "proto-lens-arbitrary";
- version = "0.1.2.1";
- sha256 = "08qwn60pih64lk6xnqwzx3q1qja46pvaw6539r1m4kbw3wyh2kl2";
+ pname = "proto-lens";
+ version = "0.4.0.0";
+ sha256 = "1yj86mnjc3509ad9g19fr9fdkblwfyilb5ydv1isn6xs7llq3c3r";
+ enableSeparateDataOutput = true;
libraryHaskellDepends = [
- base bytestring containers lens-family proto-lens QuickCheck text
+ attoparsec base bytestring containers deepseq lens-family
+ lens-labels parsec pretty text transformers void
];
- description = "Arbitrary instances for proto-lens";
+ description = "A lens-based implementation of protocol buffers in Haskell";
license = stdenv.lib.licenses.bsd3;
+ hydraPlatforms = stdenv.lib.platforms.none;
}) {};
- "proto-lens-arbitrary_0_1_2_2" = callPackage
+ "proto-lens-arbitrary" = callPackage
({ mkDerivation, base, bytestring, containers, lens-family
, proto-lens, QuickCheck, text
}:
@@ -165498,6 +166256,21 @@ self: {
];
description = "Arbitrary instances for proto-lens";
license = stdenv.lib.licenses.bsd3;
+ }) {};
+
+ "proto-lens-arbitrary_0_1_2_3" = callPackage
+ ({ mkDerivation, base, bytestring, containers, lens-family
+ , proto-lens, QuickCheck, text
+ }:
+ mkDerivation {
+ pname = "proto-lens-arbitrary";
+ version = "0.1.2.3";
+ sha256 = "0ljr6iyqrdlfay0yd2j6q2wm5k79wnn4ay4kbmzmw2fdy0p73gyn";
+ libraryHaskellDepends = [
+ base bytestring containers lens-family proto-lens QuickCheck text
+ ];
+ description = "Arbitrary instances for proto-lens";
+ license = stdenv.lib.licenses.bsd3;
hydraPlatforms = stdenv.lib.platforms.none;
}) {};
@@ -165508,8 +166281,8 @@ self: {
}:
mkDerivation {
pname = "proto-lens-combinators";
- version = "0.1.0.10";
- sha256 = "0yv6wrg3wsp6617mw02n3d9gmlb9nyvfabffrznpvlaywwk8cnir";
+ version = "0.1.0.11";
+ sha256 = "1i2rbvhdvglqg6b4iwr5a0pk7iq78nap491bqg77y4dwd45ipcpb";
setupHaskellDepends = [ base Cabal proto-lens-protoc ];
libraryHaskellDepends = [
base data-default-class lens-family proto-lens-protoc transformers
@@ -165523,22 +166296,22 @@ self: {
hydraPlatforms = stdenv.lib.platforms.none;
}) {};
- "proto-lens-combinators_0_1_0_11" = callPackage
- ({ mkDerivation, base, Cabal, data-default-class, HUnit
- , lens-family, lens-family-core, proto-lens, proto-lens-protoc
- , test-framework, test-framework-hunit, transformers
+ "proto-lens-combinators_0_4" = callPackage
+ ({ mkDerivation, base, Cabal, HUnit, lens-family, lens-family-core
+ , proto-lens, proto-lens-runtime, proto-lens-setup, test-framework
+ , test-framework-hunit, transformers
}:
mkDerivation {
pname = "proto-lens-combinators";
- version = "0.1.0.11";
- sha256 = "1i2rbvhdvglqg6b4iwr5a0pk7iq78nap491bqg77y4dwd45ipcpb";
- setupHaskellDepends = [ base Cabal proto-lens-protoc ];
+ version = "0.4";
+ sha256 = "1fc98ynjx0b9x4v56pzkf3h9y46a583aw3lf7l9ij4ck87y83q6b";
+ setupHaskellDepends = [ base Cabal proto-lens-setup ];
libraryHaskellDepends = [
- base data-default-class lens-family proto-lens-protoc transformers
+ base lens-family proto-lens transformers
];
testHaskellDepends = [
base HUnit lens-family lens-family-core proto-lens
- proto-lens-protoc test-framework test-framework-hunit
+ proto-lens-runtime test-framework test-framework-hunit
];
description = "Utilities functions to proto-lens";
license = stdenv.lib.licenses.bsd3;
@@ -165566,8 +166339,8 @@ self: {
({ mkDerivation, base, optparse-applicative, proto-lens, text }:
mkDerivation {
pname = "proto-lens-optparse";
- version = "0.1.1.1";
- sha256 = "1zi6kv6af39bbbcf2v7d1l2fc2f3m6r1i2yvv4ddm6w0i7vhd1qw";
+ version = "0.1.1.2";
+ sha256 = "1hagdb7m3wqv6w8m0aaf8cfsj4lryqighj2ah5qpmi8hspy1mg55";
libraryHaskellDepends = [
base optparse-applicative proto-lens text
];
@@ -165575,12 +166348,12 @@ self: {
license = stdenv.lib.licenses.bsd3;
}) {};
- "proto-lens-optparse_0_1_1_2" = callPackage
+ "proto-lens-optparse_0_1_1_3" = callPackage
({ mkDerivation, base, optparse-applicative, proto-lens, text }:
mkDerivation {
pname = "proto-lens-optparse";
- version = "0.1.1.2";
- sha256 = "1hagdb7m3wqv6w8m0aaf8cfsj4lryqighj2ah5qpmi8hspy1mg55";
+ version = "0.1.1.3";
+ sha256 = "0dciwsc1qa9iisym5702a0kjwfiikqgfijdzpf21q2aiffagkacd";
libraryHaskellDepends = [
base optparse-applicative proto-lens text
];
@@ -165624,17 +166397,17 @@ self: {
license = stdenv.lib.licenses.bsd3;
}) {inherit (pkgs) protobuf;};
- "proto-lens-protobuf-types_0_3_0_2" = callPackage
+ "proto-lens-protobuf-types_0_4_0_0" = callPackage
({ mkDerivation, base, Cabal, lens-labels, proto-lens
- , proto-lens-protoc, protobuf, text
+ , proto-lens-runtime, proto-lens-setup, protobuf, text
}:
mkDerivation {
pname = "proto-lens-protobuf-types";
- version = "0.3.0.2";
- sha256 = "0vslpjrhvkyz10g4fg1fbfkqggg7x0jd3vp68419aflgk293pgsx";
- setupHaskellDepends = [ base Cabal proto-lens-protoc ];
+ version = "0.4.0.0";
+ sha256 = "1h2ss8nn569g97cvq3lflgcc6sz3k9y3gx0ini69d1lrkccd8jmg";
+ setupHaskellDepends = [ base Cabal proto-lens-setup ];
libraryHaskellDepends = [
- base lens-labels proto-lens proto-lens-protoc text
+ base lens-labels proto-lens proto-lens-runtime text
];
libraryToolDepends = [ protobuf ];
description = "Basic protocol buffer message types";
@@ -165670,32 +166443,6 @@ self: {
}) {inherit (pkgs) protobuf;};
"proto-lens-protoc" = callPackage
- ({ mkDerivation, base, bytestring, Cabal, containers
- , data-default-class, deepseq, directory, filepath
- , haskell-src-exts, lens-family, lens-labels, pretty, process
- , proto-lens, protobuf, text
- }:
- mkDerivation {
- pname = "proto-lens-protoc";
- version = "0.3.1.0";
- sha256 = "0hihwynqlxhbc7280v7syag0p5php4gdvchbpzvwl54hvcjakgvx";
- isLibrary = true;
- isExecutable = true;
- libraryHaskellDepends = [
- base bytestring Cabal containers data-default-class deepseq
- directory filepath haskell-src-exts lens-family lens-labels pretty
- process proto-lens text
- ];
- libraryToolDepends = [ protobuf ];
- executableHaskellDepends = [
- base bytestring containers data-default-class deepseq filepath
- haskell-src-exts lens-family proto-lens text
- ];
- description = "Protocol buffer compiler for the proto-lens library";
- license = stdenv.lib.licenses.bsd3;
- }) {inherit (pkgs) protobuf;};
-
- "proto-lens-protoc_0_3_1_2" = callPackage
({ mkDerivation, base, bytestring, Cabal, containers
, data-default-class, deepseq, directory, filepath
, haskell-src-exts, lens-family, lens-labels, pretty, process
@@ -165719,9 +166466,63 @@ self: {
];
description = "Protocol buffer compiler for the proto-lens library";
license = stdenv.lib.licenses.bsd3;
+ }) {inherit (pkgs) protobuf;};
+
+ "proto-lens-protoc_0_4_0_0" = callPackage
+ ({ mkDerivation, base, bytestring, containers, filepath
+ , haskell-src-exts, lens-family, pretty, proto-lens, protobuf, text
+ }:
+ mkDerivation {
+ pname = "proto-lens-protoc";
+ version = "0.4.0.0";
+ sha256 = "1w22278jjcyj9z4lwpkxws9v97maqrwacmd5d0pl8d2byh8jqry8";
+ isLibrary = true;
+ isExecutable = true;
+ libraryHaskellDepends = [
+ base containers filepath haskell-src-exts lens-family pretty
+ proto-lens text
+ ];
+ libraryToolDepends = [ protobuf ];
+ executableHaskellDepends = [
+ base bytestring containers lens-family proto-lens text
+ ];
+ description = "Protocol buffer compiler for the proto-lens library";
+ license = stdenv.lib.licenses.bsd3;
hydraPlatforms = stdenv.lib.platforms.none;
}) {inherit (pkgs) protobuf;};
+ "proto-lens-runtime" = callPackage
+ ({ mkDerivation, base, bytestring, containers, deepseq, filepath
+ , lens-family, lens-labels, proto-lens, text
+ }:
+ mkDerivation {
+ pname = "proto-lens-runtime";
+ version = "0.4.0.1";
+ sha256 = "0kyd2y4jhzb0isclk5gw98c4n49kjnl27rlywmajmbfwf2d6w4yc";
+ libraryHaskellDepends = [
+ base bytestring containers deepseq filepath lens-family lens-labels
+ proto-lens text
+ ];
+ doHaddock = false;
+ license = stdenv.lib.licenses.bsd3;
+ }) {};
+
+ "proto-lens-setup" = callPackage
+ ({ mkDerivation, base, bytestring, Cabal, containers, deepseq
+ , directory, filepath, process, proto-lens-protoc, temporary, text
+ }:
+ mkDerivation {
+ pname = "proto-lens-setup";
+ version = "0.4.0.0";
+ sha256 = "0j0a2jq9axq8v4h918lnrvjg0zyb0gvr5v3x9c6lajv8fb8bxmlf";
+ libraryHaskellDepends = [
+ base bytestring Cabal containers deepseq directory filepath process
+ proto-lens-protoc temporary text
+ ];
+ description = "Cabal support for codegen with proto-lens";
+ license = stdenv.lib.licenses.bsd3;
+ }) {};
+
"protobuf" = callPackage
({ mkDerivation, base, base-orphans, bytestring, cereal, containers
, data-binary-ieee754, deepseq, hex, HUnit, mtl, QuickCheck, tagged
@@ -165792,6 +166593,32 @@ self: {
license = stdenv.lib.licenses.mit;
}) {};
+ "protobuf-simple_0_1_1_0" = callPackage
+ ({ mkDerivation, base, binary, bytestring, containers
+ , data-binary-ieee754, directory, filepath, hspec, mtl, parsec
+ , QuickCheck, quickcheck-instances, split, text
+ }:
+ mkDerivation {
+ pname = "protobuf-simple";
+ version = "0.1.1.0";
+ sha256 = "1i6dmf9nppjk2xd2s91bmbnb9r915h5ypq5923jpralry2ax6ach";
+ isLibrary = true;
+ isExecutable = true;
+ libraryHaskellDepends = [
+ base binary bytestring containers data-binary-ieee754 mtl text
+ ];
+ executableHaskellDepends = [
+ base containers directory filepath mtl parsec split text
+ ];
+ testHaskellDepends = [
+ base binary bytestring containers data-binary-ieee754 filepath
+ hspec parsec QuickCheck quickcheck-instances split text
+ ];
+ description = "Simple Protocol Buffers library (proto2)";
+ license = stdenv.lib.licenses.mit;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ }) {};
+
"protocol-buffers" = callPackage
({ mkDerivation, array, base, binary, bytestring, containers
, directory, filepath, mtl, parsec, syb, utf8-string
@@ -165857,22 +166684,6 @@ self: {
}) {};
"protocol-radius" = callPackage
- ({ mkDerivation, base, bytestring, cereal, containers, cryptonite
- , dlist, memory, template-haskell, text, transformers
- }:
- mkDerivation {
- pname = "protocol-radius";
- version = "0.0.1.0";
- sha256 = "1ygn7kd6rdmgb4hy4iby0l9m1hm6w0linhjipgv7vczd8b0mw35f";
- libraryHaskellDepends = [
- base bytestring cereal containers cryptonite dlist memory
- template-haskell text transformers
- ];
- description = "parser and printer for radius protocol packet";
- license = stdenv.lib.licenses.bsd3;
- }) {};
-
- "protocol-radius_0_0_1_1" = callPackage
({ mkDerivation, base, bytestring, cereal, containers, cryptonite
, dlist, memory, template-haskell, text, transformers
}:
@@ -165886,7 +166697,6 @@ self: {
];
description = "parser and printer for radius protocol packet";
license = stdenv.lib.licenses.bsd3;
- hydraPlatforms = stdenv.lib.platforms.none;
}) {};
"protocol-radius-test" = callPackage
@@ -166774,23 +167584,27 @@ self: {
}) {};
"purescript-iso" = callPackage
- ({ mkDerivation, aeson, async, attoparsec-uri, base, bytestring
- , containers, monad-control, mtl, QuickCheck, quickcheck-instances
- , stm, strict, tasty, tasty-quickcheck, text, time, utf8-string
- , uuid, zeromq4-haskell, zeromq4-simple
+ ({ mkDerivation, aeson, aeson-attoparsec, aeson-diff, async
+ , attoparsec, attoparsec-uri, base, bytestring, containers, deepseq
+ , emailaddress, monad-control, mtl, QuickCheck
+ , quickcheck-instances, scientific, stm, strict, tasty
+ , tasty-quickcheck, text, time, utf8-string, uuid, zeromq4-haskell
+ , zeromq4-simple
}:
mkDerivation {
pname = "purescript-iso";
- version = "0.0.1.2";
- sha256 = "0mlrj4q40d71r61lc5h9a7wfycmj1kgn6appaqbffrdjz64hmrfh";
+ version = "0.0.3";
+ sha256 = "15y761jk2r95gdkv85p7ij9npf3a6dlsyidf8y8djzk3m7j8ya2g";
libraryHaskellDepends = [
- aeson async attoparsec-uri base bytestring containers monad-control
- mtl QuickCheck quickcheck-instances stm strict text time
+ aeson aeson-attoparsec aeson-diff async attoparsec attoparsec-uri
+ base bytestring containers deepseq emailaddress monad-control mtl
+ QuickCheck quickcheck-instances scientific stm strict text time
utf8-string uuid zeromq4-haskell zeromq4-simple
];
testHaskellDepends = [
- aeson async attoparsec-uri base bytestring containers monad-control
- mtl QuickCheck quickcheck-instances stm strict tasty
+ aeson aeson-attoparsec aeson-diff async attoparsec attoparsec-uri
+ base bytestring containers deepseq emailaddress monad-control mtl
+ QuickCheck quickcheck-instances scientific stm strict tasty
tasty-quickcheck text time utf8-string uuid zeromq4-haskell
zeromq4-simple
];
@@ -167557,8 +168371,8 @@ self: {
}:
mkDerivation {
pname = "qtah-cpp-qt5";
- version = "0.5.0";
- sha256 = "14349jf69wvbcp18xi5jb0281qhrz38pw68qw91hwfr8vmqdx8h7";
+ version = "0.5.1";
+ sha256 = "1pwqc5i6viyk3ik8vh2zd9k25vj9y1r9mmikxwzjhv6jwc8sb5pb";
setupHaskellDepends = [ base Cabal directory filepath process ];
libraryHaskellDepends = [ base process qtah-generator ];
librarySystemDepends = [ qtbase ];
@@ -167615,8 +168429,8 @@ self: {
}:
mkDerivation {
pname = "qtah-qt5";
- version = "0.5.0";
- sha256 = "0c4z56siw1kkqiyzmbpjk6jkzmcxqv6ji52rnivlavlyw3b4s2a3";
+ version = "0.5.1";
+ sha256 = "082mz3j3bk7hlagwdw0y399r8jid2wf6xzsdd2wnc4n6z6w6p8gx";
setupHaskellDepends = [ base Cabal directory filepath ];
libraryHaskellDepends = [
base binary bytestring hoppy-runtime qtah-cpp-qt5 qtah-generator
@@ -167648,8 +168462,8 @@ self: {
}:
mkDerivation {
pname = "quadratic-irrational";
- version = "0.0.5";
- sha256 = "1z9a1q8px4sx7fq9i1lwfx98kz0nv8zhkz5vsfn31krvd4xvkndz";
+ version = "0.0.6";
+ sha256 = "02hdxi9kjp7dccmb7ix3a0yqr7fvl2vpc588ibxq6gjd5v3716r0";
libraryHaskellDepends = [
arithmoi base containers mtl transformers
];
@@ -167700,15 +168514,15 @@ self: {
}) {};
"quantification" = callPackage
- ({ mkDerivation, aeson, base, containers, ghc-prim, hashable
- , path-pieces, text, unordered-containers, vector
+ ({ mkDerivation, aeson, base, binary, containers, ghc-prim
+ , hashable, path-pieces, text, unordered-containers, vector
}:
mkDerivation {
pname = "quantification";
- version = "0.4";
- sha256 = "0bsdfmzaaxq2mf6bbbphg2dy8q6lhc7n3mfcy20fp4la0cj49aj2";
+ version = "0.5.0";
+ sha256 = "0ls8rhy0idrgj9dnd5ajjfi55bhz4qsyncj3ghw3nyrbr0q7j0bk";
libraryHaskellDepends = [
- aeson base containers ghc-prim hashable path-pieces text
+ aeson base binary containers ghc-prim hashable path-pieces text
unordered-containers vector
];
description = "Rage against the quantification";
@@ -168091,6 +168905,8 @@ self: {
pname = "quickcheck-classes";
version = "0.4.14.1";
sha256 = "0qk7nx855lrb9z1nkc74dshsij6p704rmggx0f9akwcpscsvhiim";
+ revision = "1";
+ editedCabalFile = "1jsqd19gwd5hizqlabk0haly9slri4m7bhj32vqvi0lk4mync94l";
libraryHaskellDepends = [
aeson base bifunctors containers primitive QuickCheck semigroupoids
semigroups semirings tagged transformers
@@ -168125,8 +168941,8 @@ self: {
pname = "quickcheck-instances";
version = "0.3.18";
sha256 = "1bh1pzz5fdcqvzdcirqxna6fnjms02min5md716299g5niz46w55";
- revision = "1";
- editedCabalFile = "1sngfq3v71bvgjsl8cj5kh65m3fziwy8dkvwjzs0kxfrzr87faly";
+ revision = "2";
+ editedCabalFile = "02mhzd7dkhmbd8ljm114j7ixp1lcllblz3zfkz0i7n976rac86w7";
libraryHaskellDepends = [
array base base-compat bytestring case-insensitive containers
hashable old-time QuickCheck scientific tagged text time
@@ -168140,6 +168956,30 @@ self: {
license = stdenv.lib.licenses.bsd3;
}) {};
+ "quickcheck-instances_0_3_19" = callPackage
+ ({ mkDerivation, array, base, base-compat, bytestring
+ , case-insensitive, containers, hashable, old-time, QuickCheck
+ , scientific, tagged, text, time, transformers, transformers-compat
+ , unordered-containers, uuid-types, vector
+ }:
+ mkDerivation {
+ pname = "quickcheck-instances";
+ version = "0.3.19";
+ sha256 = "0mls8095ylk5pq2j787ary5lyn4as64414silq3zn4sky3zsx92p";
+ libraryHaskellDepends = [
+ array base base-compat bytestring case-insensitive containers
+ hashable old-time QuickCheck scientific tagged text time
+ transformers transformers-compat unordered-containers uuid-types
+ vector
+ ];
+ testHaskellDepends = [
+ base containers QuickCheck tagged uuid-types
+ ];
+ description = "Common quickcheck instances";
+ license = stdenv.lib.licenses.bsd3;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ }) {};
+
"quickcheck-io" = callPackage
({ mkDerivation, base, HUnit, QuickCheck }:
mkDerivation {
@@ -168302,31 +169142,30 @@ self: {
}) {};
"quickcheck-state-machine" = callPackage
- ({ mkDerivation, ansi-wl-pprint, async, base, bytestring
- , containers, directory, exceptions, filelock, filepath
- , http-client, lifted-async, lifted-base, matrix, monad-control
- , monad-logger, mtl, network, persistent, persistent-postgresql
- , persistent-template, pretty-show, process, QuickCheck
- , quickcheck-instances, random, resourcet, servant, servant-client
- , servant-server, split, stm, strict, string-conversions, tasty
- , tasty-quickcheck, text, tree-diff, vector, wai, warp
+ ({ mkDerivation, ansi-wl-pprint, base, bytestring, containers
+ , directory, doctest, exceptions, filelock, filepath, http-client
+ , lifted-async, matrix, monad-control, monad-logger, mtl, network
+ , persistent, persistent-postgresql, persistent-template
+ , pretty-show, process, QuickCheck, quickcheck-instances, random
+ , resourcet, servant, servant-client, servant-server, split, stm
+ , strict, string-conversions, tasty, tasty-hunit, tasty-quickcheck
+ , text, tree-diff, vector, wai, warp
}:
mkDerivation {
pname = "quickcheck-state-machine";
- version = "0.4.0";
- sha256 = "1dzkqpl873hj2by15hlkf61x6a7fjzkhl6h4cwhg9krj2bh2lv5q";
+ version = "0.4.2";
+ sha256 = "1sa243hysdnlv8326jnbnmmlkbxhxmbhfssya5qx925x56qhd2d3";
libraryHaskellDepends = [
- ansi-wl-pprint async base containers exceptions lifted-async
- lifted-base matrix monad-control mtl pretty-show QuickCheck random
- split stm tree-diff vector
+ ansi-wl-pprint base containers exceptions lifted-async matrix
+ monad-control mtl pretty-show QuickCheck split stm tree-diff vector
];
testHaskellDepends = [
- base bytestring directory filelock filepath http-client
+ base bytestring directory doctest filelock filepath http-client
lifted-async matrix monad-control monad-logger mtl network
persistent persistent-postgresql persistent-template process
QuickCheck quickcheck-instances random resourcet servant
- servant-client servant-server strict string-conversions tasty
- tasty-quickcheck text tree-diff vector wai warp
+ servant-client servant-server stm strict string-conversions tasty
+ tasty-hunit tasty-quickcheck text tree-diff vector wai warp
];
description = "Test monadic programs using state machine based models";
license = stdenv.lib.licenses.bsd3;
@@ -168412,10 +169251,8 @@ self: {
({ mkDerivation, base, QuickCheck, template-haskell }:
mkDerivation {
pname = "quickcheck-with-counterexamples";
- version = "1.0";
- sha256 = "0pny7whz16mdmh51jpa7p9f8pa7jpcqqjks797wnj8848ia7ax87";
- revision = "3";
- editedCabalFile = "0wz7iwpgxx977y46xis4imrhds1i341fv6mpwydr1mzhzazifvz8";
+ version = "1.1";
+ sha256 = "13vnr98g9cds2jbg76z528lji5mfcxghwjj4sry0011wlrwrx1fd";
libraryHaskellDepends = [ base QuickCheck template-haskell ];
description = "Get counterexamples from QuickCheck as Haskell values";
license = stdenv.lib.licenses.bsd3;
@@ -169639,14 +170476,14 @@ self: {
}:
mkDerivation {
pname = "range";
- version = "0.1.2.0";
- sha256 = "028bigaq4vk5ykzf04f5hi3g37gxzzp6q24bjcb3gjfzcgy7z6ab";
+ version = "0.2.1.1";
+ sha256 = "13gfhzplk2ji1d8x4944lv4dy4qg69wjvdwkica407nm10j0lxmc";
libraryHaskellDepends = [ base free parsec ];
testHaskellDepends = [
base Cabal free QuickCheck random test-framework
test-framework-quickcheck2
];
- description = "This has a bunch of code for specifying and managing ranges in your code";
+ description = "An efficient and versatile range library";
license = stdenv.lib.licenses.mit;
hydraPlatforms = stdenv.lib.platforms.none;
}) {};
@@ -170142,6 +170979,37 @@ self: {
license = stdenv.lib.licenses.mit;
}) {};
+ "rattletrap_6_0_1" = callPackage
+ ({ mkDerivation, aeson, aeson-pretty, base, binary, binary-bits
+ , bytestring, containers, filepath, http-client, http-client-tls
+ , HUnit, template-haskell, temporary, text, transformers
+ }:
+ mkDerivation {
+ pname = "rattletrap";
+ version = "6.0.1";
+ sha256 = "1chpivz9iprnj5p3kbqsgpviqg5d3dx41596ki1dydm1wmpn3bcj";
+ isLibrary = true;
+ isExecutable = true;
+ libraryHaskellDepends = [
+ aeson aeson-pretty base binary binary-bits bytestring containers
+ filepath http-client http-client-tls template-haskell text
+ transformers
+ ];
+ executableHaskellDepends = [
+ aeson aeson-pretty base binary binary-bits bytestring containers
+ filepath http-client http-client-tls template-haskell text
+ transformers
+ ];
+ testHaskellDepends = [
+ aeson aeson-pretty base binary binary-bits bytestring containers
+ filepath http-client http-client-tls HUnit template-haskell
+ temporary text transformers
+ ];
+ description = "Parse and generate Rocket League replays";
+ license = stdenv.lib.licenses.mit;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ }) {};
+
"raven-haskell" = callPackage
({ mkDerivation, aeson, base, bytestring, hspec, http-conduit, mtl
, network, random, resourcet, text, time, unordered-containers
@@ -170416,19 +171284,20 @@ self: {
"rdf4h" = callPackage
({ mkDerivation, attoparsec, base, binary, bytestring, containers
, criterion, deepseq, directory, filepath, hashable, hgal, HTTP
- , HUnit, hxt, mtl, network-uri, parsec, parsers, QuickCheck, safe
- , tasty, tasty-hunit, tasty-quickcheck, text, unordered-containers
+ , http-conduit, HUnit, hxt, lifted-base, mtl, network-uri, parsec
+ , parsers, QuickCheck, safe, tasty, tasty-hunit, tasty-quickcheck
+ , text, unordered-containers
}:
mkDerivation {
pname = "rdf4h";
- version = "3.1.0";
- sha256 = "1hsa96a11mi8zlhfp9mhg4m13r4iwyhp9rhsgmpcq4g06ff1d6n8";
+ version = "3.1.1";
+ sha256 = "0r93mra0r8xdqi062xpsv5svzcinq31k4jjbjay53an6zd1qg9n4";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [
attoparsec base binary bytestring containers deepseq filepath
- hashable hgal HTTP hxt mtl network-uri parsec parsers text
- unordered-containers
+ hashable hgal HTTP http-conduit hxt lifted-base mtl network-uri
+ parsec parsers text unordered-containers
];
executableHaskellDepends = [ base containers text ];
testHaskellDepends = [
@@ -170620,8 +171489,8 @@ self: {
}:
mkDerivation {
pname = "reactive-balsa";
- version = "0.4";
- sha256 = "0cmk386wjs6i7bnmawz0kcpm4sx5xa2ms9xhjisg83xhmacvqg7h";
+ version = "0.4.0.1";
+ sha256 = "1fhn7bxfrwaa5xb2ckfy2v4aw5cdzclayprjr40zg09s77qxclc1";
libraryHaskellDepends = [
alsa-core alsa-seq base containers data-accessor
data-accessor-transformers event-list extensible-exceptions midi
@@ -170677,8 +171546,8 @@ self: {
}:
mkDerivation {
pname = "reactive-banana-bunch";
- version = "1.0";
- sha256 = "11lfbf5gn8friwgkmm3vl3b3hqfxm1vww0a3aq9949irvrplajzn";
+ version = "1.0.0.1";
+ sha256 = "1k4l1zk7jm26iyaa2srillrq8qnwnqkwhpy6shdw6mg4nfby706c";
libraryHaskellDepends = [
base non-empty reactive-banana transformers utility-ht
];
@@ -170829,8 +171698,8 @@ self: {
}:
mkDerivation {
pname = "reactive-jack";
- version = "0.4.1";
- sha256 = "124fpfv486dm8cpgfdnrmckkk8y6ia4nwzapvnfghkslizzlbfab";
+ version = "0.4.1.1";
+ sha256 = "0kcb4sjj8499i5igl1fv8bjbz5d2zvs5nbqijfaw9pcg5zx7a0rr";
libraryHaskellDepends = [
base containers data-accessor event-list explicit-exception
extensible-exceptions jack midi non-negative random
@@ -170850,8 +171719,8 @@ self: {
}:
mkDerivation {
pname = "reactive-midyim";
- version = "0.4.1";
- sha256 = "1dx07c4d4sw7a797d1ap9ja48lhx37hbizhajgcf1qpilxgd4lvv";
+ version = "0.4.1.1";
+ sha256 = "1hsa7d79mf7r36grl9i41x84kg3s9j5gj2fy40mb1mhvr221pi9v";
libraryHaskellDepends = [
base containers data-accessor data-accessor-transformers event-list
midi non-negative random reactive-banana-bunch semigroups
@@ -171207,6 +172076,20 @@ self: {
license = stdenv.lib.licenses.bsd3;
}) {};
+ "record-dot-preprocessor_0_1_4" = callPackage
+ ({ mkDerivation, base, extra, filepath }:
+ mkDerivation {
+ pname = "record-dot-preprocessor";
+ version = "0.1.4";
+ sha256 = "1mj39kdnf3978cc51hh1fnnr0ax3gnqw4fan0f099b7li5y2xlwx";
+ isLibrary = false;
+ isExecutable = true;
+ executableHaskellDepends = [ base extra filepath ];
+ description = "Preprocessor to allow record.field syntax";
+ license = stdenv.lib.licenses.bsd3;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ }) {};
+
"record-encode" = callPackage
({ mkDerivation, base, generics-sop, hspec, QuickCheck, vector }:
mkDerivation {
@@ -171307,8 +172190,8 @@ self: {
}:
mkDerivation {
pname = "records-sop";
- version = "0.1.0.0";
- sha256 = "0ipxs13mlkhndbssa218fiajj2c26l5q5dl8n0p3h1qk6gjyfqa1";
+ version = "0.1.0.1";
+ sha256 = "1832cgh1ry1slj10ff2qpxr6ibbvii7z1hvvdcwhyj55c31zrhlc";
libraryHaskellDepends = [ base deepseq generics-sop ghc-prim ];
testHaskellDepends = [
base deepseq generics-sop hspec should-not-typecheck
@@ -171339,8 +172222,8 @@ self: {
({ mkDerivation, base, composition-prelude }:
mkDerivation {
pname = "recursion";
- version = "1.2.0.1";
- sha256 = "1j36fyyfml7i0dxxfammaaqmg6yg1whdar1ffsvpkjg4b8lkxlr4";
+ version = "1.2.1.1";
+ sha256 = "0dh50664y470281gjiwkmdz8abiwgqin9r1ymznldwm37c3jljv5";
libraryHaskellDepends = [ base composition-prelude ];
description = "A recursion schemes library for GHC";
license = stdenv.lib.licenses.bsd3;
@@ -171505,8 +172388,8 @@ self: {
}:
mkDerivation {
pname = "redis-io";
- version = "0.7.0";
- sha256 = "06g630jrb0zxbai4n251plprafn5s9nywd3hgg14vz999wccns0z";
+ version = "1.0.0";
+ sha256 = "119qga77xv0kq6cppgz6ry3f1ql4slswqwqg7qyiyg639sli9nfp";
libraryHaskellDepends = [
attoparsec auto-update base bytestring containers exceptions
iproute monad-control mtl network operational redis-resp
@@ -171543,8 +172426,8 @@ self: {
}:
mkDerivation {
pname = "redis-resp";
- version = "0.4.0";
- sha256 = "0clj5b6lbkdc64arb9z4qhbiqkx7mifja8ns7xxc619yhj9dbh4b";
+ version = "1.0.0";
+ sha256 = "12w00zjf901xi6wwb0g6wzbxkbh1iyyd7glxijx9sajv6jgd5365";
libraryHaskellDepends = [
attoparsec base bytestring bytestring-conversion containers dlist
double-conversion operational semigroups split transformers
@@ -173332,7 +174215,7 @@ self: {
license = stdenv.lib.licenses.mit;
}) {};
- "relude_0_2_0" = callPackage
+ "relude_0_3_0" = callPackage
({ mkDerivation, base, bytestring, containers, deepseq, doctest
, gauge, ghc-prim, Glob, hashable, hedgehog, mtl, stm, tasty
, tasty-hedgehog, text, transformers, unordered-containers
@@ -173340,10 +174223,8 @@ self: {
}:
mkDerivation {
pname = "relude";
- version = "0.2.0";
- sha256 = "097kiflrwvkb3mxpkydh6a6x84azv4xla9nlm5qscacl4kn5z3q5";
- revision = "1";
- editedCabalFile = "10zqh8j0k7q6l5ag009c432has7zpwbi57drr12dpyqa1ldrk6h0";
+ version = "0.3.0";
+ sha256 = "10cbgz1xzw67q3y9fw8px7wwxblv5qym51qpdljmjz4ilpy0k35j";
libraryHaskellDepends = [
base bytestring containers deepseq ghc-prim hashable mtl stm text
transformers unordered-containers utf8-string
@@ -175022,8 +175903,8 @@ self: {
}:
mkDerivation {
pname = "retry";
- version = "0.7.6.3";
- sha256 = "19h3y5j2wim32cail0pix11vjhfbj3xiivlw2kyz1iqv4fxx8mby";
+ version = "0.7.7.0";
+ sha256 = "0v6irf01xykhv0mwr1k5i08jn77irqbz8h116j8p435d11xc5jrw";
libraryHaskellDepends = [
base data-default-class exceptions ghc-prim random transformers
];
@@ -176180,6 +177061,24 @@ self: {
license = stdenv.lib.licenses.bsd3;
}) {inherit (pkgs) rocksdb;};
+ "rocksdb-query" = callPackage
+ ({ mkDerivation, base, bytestring, cereal, conduit, hspec
+ , resourcet, rocksdb-haskell, unliftio
+ }:
+ mkDerivation {
+ pname = "rocksdb-query";
+ version = "0.1.1";
+ sha256 = "17sgac07f6vc1ffp8ynlrjn1n0ww0dsdr43jha10d1n5564a2lyw";
+ libraryHaskellDepends = [
+ base bytestring cereal conduit resourcet rocksdb-haskell unliftio
+ ];
+ testHaskellDepends = [
+ base cereal hspec rocksdb-haskell unliftio
+ ];
+ description = "RocksDB database querying library for Haskell";
+ license = stdenv.lib.licenses.publicDomain;
+ }) {};
+
"roguestar" = callPackage
({ mkDerivation, base, bytestring, directory, filepath, old-time
, process
@@ -176759,6 +177658,22 @@ self: {
hydraPlatforms = stdenv.lib.platforms.none;
}) {};
+ "row" = callPackage
+ ({ mkDerivation, base, base-unicode-symbols, criterion, smallcheck
+ , tasty, tasty-smallcheck, util
+ }:
+ mkDerivation {
+ pname = "row";
+ version = "0.0.0.0";
+ sha256 = "16iy0b0aqvpn1dnw96h8vp4354774c0lp7fq4qibqwd8bv99mmps";
+ libraryHaskellDepends = [ base base-unicode-symbols util ];
+ testHaskellDepends = [ base smallcheck tasty tasty-smallcheck ];
+ benchmarkHaskellDepends = [ base criterion ];
+ doHaddock = false;
+ description = "Row types";
+ license = stdenv.lib.licenses.bsd3;
+ }) {};
+
"row-types" = callPackage
({ mkDerivation, base, constraints, criterion, deepseq, hashable
, text, unordered-containers
@@ -178110,6 +179025,27 @@ self: {
license = stdenv.lib.licenses.bsd3;
}) {};
+ "salak" = callPackage
+ ({ mkDerivation, aeson, aeson-pretty, base, bytestring, directory
+ , filepath, hspec, QuickCheck, scientific, text
+ , unordered-containers, vector, yaml
+ }:
+ mkDerivation {
+ pname = "salak";
+ version = "0.1.4";
+ sha256 = "17zlgk85yp6ihfppf0simrvc70sk2a3jkjzxzzsgibyxmsm2jmxr";
+ libraryHaskellDepends = [
+ aeson base directory filepath scientific text unordered-containers
+ vector yaml
+ ];
+ testHaskellDepends = [
+ aeson aeson-pretty base bytestring directory filepath hspec
+ QuickCheck scientific text unordered-containers vector yaml
+ ];
+ description = "Configuration Loader";
+ license = stdenv.lib.licenses.bsd3;
+ }) {};
+
"saltine" = callPackage
({ mkDerivation, base, bytestring, libsodium, profunctors
, QuickCheck, semigroups, test-framework
@@ -179545,6 +180481,8 @@ self: {
pname = "scotty";
version = "0.11.2";
sha256 = "18lxgnj05p4hk7pp4a84biz2dn387a5vxwzyh1kslns1bra6zn0x";
+ revision = "1";
+ editedCabalFile = "1h4fk7q8x7cvlqq4bbmdh465s6a8955bgchm121fvk08x7rm3yz3";
libraryHaskellDepends = [
aeson base blaze-builder bytestring case-insensitive
data-default-class exceptions fail http-types monad-control mtl
@@ -180453,27 +181391,50 @@ self: {
}) {};
"secp256k1" = callPackage
- ({ mkDerivation, base, base16-bytestring, bytestring, Cabal, cereal
- , cryptohash, entropy, HUnit, mtl, QuickCheck, string-conversions
- , test-framework, test-framework-hunit, test-framework-quickcheck2
+ ({ mkDerivation, base, base16-bytestring, bytestring, cereal
+ , cryptohash, entropy, hspec, hspec-discover, HUnit, mtl
+ , QuickCheck, secp256k1, string-conversions
}:
mkDerivation {
pname = "secp256k1";
- version = "0.5.3";
- sha256 = "1fb9n7r64h35822zsa0w2jb214gdfg85ib20ni3caszc1k8rsmck";
- setupHaskellDepends = [ base Cabal ];
+ version = "1.1.2";
+ sha256 = "0nm8xx9cfn5gj2rqhcmikdkl3grj88xs4wikjbrlazvpyj4rc0q2";
libraryHaskellDepends = [
- base base16-bytestring bytestring cereal entropy mtl QuickCheck
- string-conversions
+ base base16-bytestring bytestring cereal cryptohash entropy hspec
+ HUnit mtl QuickCheck string-conversions
];
+ librarySystemDepends = [ secp256k1 ];
testHaskellDepends = [
- base base16-bytestring bytestring cereal cryptohash entropy HUnit
- mtl QuickCheck string-conversions test-framework
- test-framework-hunit test-framework-quickcheck2
+ base base16-bytestring bytestring cereal cryptohash entropy hspec
+ HUnit mtl QuickCheck string-conversions
];
+ testToolDepends = [ hspec-discover ];
description = "Bindings for secp256k1 library from Bitcoin Core";
license = stdenv.lib.licenses.publicDomain;
- }) {};
+ }) {inherit (pkgs) secp256k1;};
+
+ "secp256k1-haskell" = callPackage
+ ({ mkDerivation, base, base16-bytestring, bytestring, cereal
+ , entropy, hspec, hspec-discover, HUnit, mtl, QuickCheck, secp256k1
+ , string-conversions
+ }:
+ mkDerivation {
+ pname = "secp256k1-haskell";
+ version = "0.1.2";
+ sha256 = "1kap1jjhqqmp8f067z9z8dw39gswn37bkj5j3byyvv4cn077ihva";
+ libraryHaskellDepends = [
+ base base16-bytestring bytestring cereal entropy QuickCheck
+ string-conversions
+ ];
+ librarySystemDepends = [ secp256k1 ];
+ testHaskellDepends = [
+ base base16-bytestring bytestring cereal entropy hspec HUnit mtl
+ QuickCheck string-conversions
+ ];
+ testToolDepends = [ hspec-discover ];
+ description = "Bindings for secp256k1 library from Bitcoin Core";
+ license = stdenv.lib.licenses.publicDomain;
+ }) {inherit (pkgs) secp256k1;};
"secret-santa" = callPackage
({ mkDerivation, base, containers, diagrams-cairo, diagrams-lib
@@ -180602,14 +181563,14 @@ self: {
license = stdenv.lib.licenses.mit;
}) {};
- "selda_0_3_2_0" = callPackage
+ "selda_0_3_3_1" = callPackage
({ mkDerivation, base, bytestring, exceptions, hashable, mtl
, psqueues, text, time, unordered-containers
}:
mkDerivation {
pname = "selda";
- version = "0.3.2.0";
- sha256 = "1ngvh7w4s0w57qaizzxin641x9v4v2rm03lnkfcxklq93l3khgp6";
+ version = "0.3.3.1";
+ sha256 = "1rxwyls59mpmvb5f2l47ak5cnzmws847kgmn8fwbxb69h6a87bwr";
libraryHaskellDepends = [
base bytestring exceptions hashable mtl psqueues text time
unordered-containers
@@ -181180,8 +182141,8 @@ self: {
}:
mkDerivation {
pname = "sensu-run";
- version = "0.6.0";
- sha256 = "1hzi5bkzc3wl031jhpr7j639zxijb33sdwg7zrb5xqdrpmfhg1zm";
+ version = "0.6.0.2";
+ sha256 = "1lxz3cr04f4bqlm4jph66ckab494vqlaf6jc67dbmmwia6if2fpw";
isLibrary = false;
isExecutable = true;
executableHaskellDepends = [
@@ -182257,8 +183218,8 @@ self: {
pname = "servant-dhall";
version = "0.1.0.1";
sha256 = "1yriifnflvh4f0vv2mrfv6qw0cv35isrq03q4h43g096ml2wl3ll";
- revision = "1";
- editedCabalFile = "0p8ygb5l79zzawnmy992wnicxv2cbbr0860063mbchmjwjf39x33";
+ revision = "2";
+ editedCabalFile = "1zdvk0cx8s1n107yx95vdv0xziwjmr1d6kypr36f1cqdvdh02jir";
libraryHaskellDepends = [
base base-compat bytestring dhall http-media megaparsec
prettyprinter servant text
@@ -182547,6 +183508,32 @@ self: {
hydraPlatforms = stdenv.lib.platforms.none;
}) {};
+ "servant-hmac-auth" = callPackage
+ ({ mkDerivation, aeson, base, base64-bytestring, binary, bytestring
+ , case-insensitive, containers, cryptonite, http-client, http-types
+ , markdown-unlit, memory, mtl, servant, servant-client
+ , servant-client-core, servant-server, transformers, wai, warp
+ }:
+ mkDerivation {
+ pname = "servant-hmac-auth";
+ version = "0.0.0";
+ sha256 = "08873pwmn2wzhl2r87gx6db3f2j8848g4xq2i4gnwqj23s7sfy0z";
+ isLibrary = true;
+ isExecutable = true;
+ libraryHaskellDepends = [
+ base base64-bytestring binary bytestring case-insensitive
+ containers cryptonite http-client http-types memory mtl servant
+ servant-client servant-client-core servant-server transformers wai
+ ];
+ executableHaskellDepends = [
+ aeson base http-client servant servant-client servant-server warp
+ ];
+ executableToolDepends = [ markdown-unlit ];
+ testHaskellDepends = [ base ];
+ description = "Servant authentication with HMAC";
+ license = stdenv.lib.licenses.mit;
+ }) {};
+
"servant-iCalendar" = callPackage
({ mkDerivation, base, data-default, http-media, iCalendar, servant
}:
@@ -182983,24 +183970,26 @@ self: {
"servant-rawm" = callPackage
({ mkDerivation, base, bytestring, doctest, filepath, Glob
, hspec-wai, http-client, http-media, http-types, lens, resourcet
- , servant, servant-client, servant-docs, servant-server, tasty
- , tasty-hspec, tasty-hunit, transformers, wai, wai-app-static, warp
+ , servant, servant-client, servant-client-core, servant-docs
+ , servant-server, tasty, tasty-hspec, tasty-hunit, text
+ , transformers, wai, wai-app-static, warp
}:
mkDerivation {
pname = "servant-rawm";
- version = "0.2.0.2";
- sha256 = "0nkwi6jxwx8hwsf7fazvr9xffjsy99y4pb3ikw27f8ag8dx8frm2";
+ version = "0.3.0.0";
+ sha256 = "09va9glqkyarxsq9296br55ka8j5jd5nlb833hndpf4ib10yxzp9";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [
base bytestring filepath http-client http-media http-types lens
- resourcet servant-client servant-docs servant-server wai
- wai-app-static
+ resourcet servant-client servant-client-core servant-docs
+ servant-server wai wai-app-static
];
testHaskellDepends = [
base bytestring doctest Glob hspec-wai http-client http-media
- http-types servant servant-client servant-server tasty tasty-hspec
- tasty-hunit transformers wai warp
+ http-types servant servant-client servant-client-core
+ servant-server tasty tasty-hspec tasty-hunit text transformers wai
+ warp
];
description = "Embed a raw 'Application' in a Servant API";
license = stdenv.lib.licenses.bsd3;
@@ -183041,20 +184030,6 @@ self: {
}) {};
"servant-ruby" = callPackage
- ({ mkDerivation, base, casing, doctest, QuickCheck, servant-foreign
- , text
- }:
- mkDerivation {
- pname = "servant-ruby";
- version = "0.8.0.1";
- sha256 = "07pdz6zdax415virbx30cjbiywlzfwzsaq9426l14zwmgf7pw155";
- libraryHaskellDepends = [ base casing servant-foreign text ];
- testHaskellDepends = [ base doctest QuickCheck ];
- description = "Generate a Ruby client from a Servant API with Net::HTTP";
- license = stdenv.lib.licenses.bsd3;
- }) {};
-
- "servant-ruby_0_8_0_2" = callPackage
({ mkDerivation, base, casing, doctest, QuickCheck, servant-foreign
, text
}:
@@ -183066,7 +184041,6 @@ self: {
testHaskellDepends = [ base doctest QuickCheck ];
description = "Generate a Ruby client from a Servant API with Net::HTTP";
license = stdenv.lib.licenses.bsd3;
- hydraPlatforms = stdenv.lib.platforms.none;
}) {};
"servant-scotty" = callPackage
@@ -183976,6 +184950,8 @@ self: {
pname = "set-cover";
version = "0.0.9";
sha256 = "1qbk5y2pg6jlclszd2nras5240r0ahapsibykkcqrxhgq0hgvsxg";
+ revision = "1";
+ editedCabalFile = "0mcg15645maj1ymfrgs9ghi8n3hwwd72441zxcg9gn1w3pq7zsaw";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [
@@ -184076,17 +185052,6 @@ self: {
}) {};
"setlocale" = callPackage
- ({ mkDerivation, base }:
- mkDerivation {
- pname = "setlocale";
- version = "1.0.0.6";
- sha256 = "1rl8qb8vzv8fdbczy2dxwgn4cb68lfrjdxf2w8nn9wy1acqzcyjq";
- libraryHaskellDepends = [ base ];
- description = "Haskell bindings to setlocale";
- license = stdenv.lib.licenses.bsd3;
- }) {};
-
- "setlocale_1_0_0_8" = callPackage
({ mkDerivation, base }:
mkDerivation {
pname = "setlocale";
@@ -184095,7 +185060,6 @@ self: {
libraryHaskellDepends = [ base ];
description = "Haskell bindings to setlocale";
license = stdenv.lib.licenses.bsd3;
- hydraPlatforms = stdenv.lib.platforms.none;
}) {};
"setoid" = callPackage
@@ -184557,8 +185521,8 @@ self: {
}:
mkDerivation {
pname = "shake-ats";
- version = "1.9.0.3";
- sha256 = "1c1vphg9vv4lizcsg681wxq5dmvg5fkhp6x15738j7sfbd0k87ja";
+ version = "1.9.0.5";
+ sha256 = "1j417h6nkwkjgprcaf59lilv6d151qhc8ibzd0jimkx08pv414rz";
libraryHaskellDepends = [
base binary dependency directory hs2ats language-ats microlens
shake shake-c shake-cabal shake-ext text
@@ -184580,14 +185544,15 @@ self: {
}) {};
"shake-cabal" = callPackage
- ({ mkDerivation, base, Cabal, composition-prelude, directory, shake
+ ({ mkDerivation, base, Cabal, composition-prelude, directory
+ , filepath, shake
}:
mkDerivation {
pname = "shake-cabal";
- version = "0.1.0.4";
- sha256 = "1in3f31pm253vzcds66pa2ddjl983l2w8j3vj52rykg2dynl625q";
+ version = "0.1.0.5";
+ sha256 = "1h8a3c3fwg2jz1p6k5253hjfaqbwwwdygrj2hdsgwn6laq75kd6s";
libraryHaskellDepends = [
- base Cabal composition-prelude directory shake
+ base Cabal composition-prelude directory filepath shake
];
description = "Shake library for use with cabal";
license = stdenv.lib.licenses.bsd3;
@@ -184821,6 +185786,32 @@ self: {
maintainers = with stdenv.lib.maintainers; [ psibi ];
}) {};
+ "shakespeare_2_0_17" = callPackage
+ ({ mkDerivation, aeson, base, blaze-html, blaze-markup, bytestring
+ , containers, directory, exceptions, ghc-prim, hspec, HUnit, parsec
+ , process, scientific, template-haskell, text, time, transformers
+ , unordered-containers, vector
+ }:
+ mkDerivation {
+ pname = "shakespeare";
+ version = "2.0.17";
+ sha256 = "1j6habv4glf8bvxiil9f59b553lfsi7mr7i30r63sy3g85qi09jg";
+ libraryHaskellDepends = [
+ aeson base blaze-html blaze-markup bytestring containers directory
+ exceptions ghc-prim parsec process scientific template-haskell text
+ time transformers unordered-containers vector
+ ];
+ testHaskellDepends = [
+ aeson base blaze-html blaze-markup bytestring containers directory
+ exceptions ghc-prim hspec HUnit parsec process template-haskell
+ text time transformers
+ ];
+ description = "A toolkit for making compile-time interpolated templates";
+ license = stdenv.lib.licenses.mit;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ maintainers = with stdenv.lib.maintainers; [ psibi ];
+ }) {};
+
"shakespeare-babel" = callPackage
({ mkDerivation, base, classy-prelude, data-default, directory
, process, shakespeare, template-haskell
@@ -185308,6 +186299,8 @@ self: {
pname = "shelly";
version = "1.8.1";
sha256 = "023fbvbqs5gdwm30j5517gbdcc7fvz0md70dgwgpypkskj3i926y";
+ revision = "1";
+ editedCabalFile = "0crf0m077wky76f5nav2p9q4fa5q4yhv5l4bq9hd073dzdaywhz0";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [
@@ -186308,10 +187301,8 @@ self: {
}:
mkDerivation {
pname = "simple-log";
- version = "0.9.6";
- sha256 = "0cbzc5ib63x2m4xz88ks6xfg99c2plp2y6y7bzx3i3rrhd3y1pjn";
- revision = "1";
- editedCabalFile = "0qifmlqxd2pwh5rm7pzfwn6nq09yvjs7nfg8si4b3q7xlgal2sbx";
+ version = "0.9.7";
+ sha256 = "018rzapbmkkfhqzwdv2vgj4wbqi4wn2bgml0kd3khq3p06mhpnc5";
libraryHaskellDepends = [
async base base-unicode-symbols containers data-default deepseq
directory exceptions filepath hformat microlens microlens-platform
@@ -186352,8 +187343,8 @@ self: {
}:
mkDerivation {
pname = "simple-logging";
- version = "0.2.0.3";
- sha256 = "12ayxv1j2zzql01gka1p8m7pixjh6f87r5hamz3ydcyzn4vrl5j1";
+ version = "0.2.0.4";
+ sha256 = "13f6562rhk5bb5b2rmn0zsw2pil6qis463kx9d684j2m0qnqifdm";
libraryHaskellDepends = [
aeson base bytestring directory exceptions filepath hscolour
iso8601-time lens mtl simple-effects string-conv text time uuid
@@ -187550,8 +188541,8 @@ self: {
}:
mkDerivation {
pname = "skylighting";
- version = "0.7.2";
- sha256 = "1rh3z1a7a4clvksdw1qlpmhxqkfahwypi70k91whgfamzsqpxdch";
+ version = "0.7.3";
+ sha256 = "1pwawhfl2w9d06sv44lxa5hvh4lz9d5l0n8j7zjm08jibl30fc8g";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [
@@ -187574,10 +188565,8 @@ self: {
}:
mkDerivation {
pname = "skylighting-core";
- version = "0.7.2";
- sha256 = "066fwmwsd7xcvwlinfk2izlzq0xp8697i6lnbgsbl71jdybyackq";
- revision = "1";
- editedCabalFile = "0qjmk3i9kjnd3195fhphjgqvsgbw6blfjl40mdyiblw1piyvc6yw";
+ version = "0.7.3";
+ sha256 = "0qk2g86b0avd24q7hbkdjj0l2r5ma7kbzf3cj4sjwmh7wmx0ss7c";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [
@@ -187827,8 +188816,8 @@ self: {
}:
mkDerivation {
pname = "slick";
- version = "0.1.0.2";
- sha256 = "1s5ya5h253h599m3hkcilq7fya9ghgz4b5mlk8v1ywpdm1jab3dm";
+ version = "0.1.1.0";
+ sha256 = "0gqc9z8w9m1dvsnv7g1rsi367akkzp95w96lvx20sdg1gnzbx5rc";
libraryHaskellDepends = [
aeson base binary bytestring containers lens lens-aeson mustache
pandoc shake text time
@@ -190415,12 +191404,15 @@ self: {
}) {};
"solve" = callPackage
- ({ mkDerivation, base, containers }:
+ ({ mkDerivation, base, containers, filepath }:
mkDerivation {
pname = "solve";
- version = "1.0";
- sha256 = "06sk2imqgzk9zjr10ignigs04avnjjxfsi2qkk7vqfslhcfzgqnq";
- libraryHaskellDepends = [ base containers ];
+ version = "1.1";
+ sha256 = "045bj6wskglwg0j0jk0jsqkp4m809g2fy350bi6m84smg64rr3y4";
+ isLibrary = true;
+ isExecutable = true;
+ libraryHaskellDepends = [ base containers filepath ];
+ executableHaskellDepends = [ base containers filepath ];
description = "Solving simple games";
license = stdenv.lib.licenses.mit;
}) {};
@@ -190674,6 +191666,24 @@ self: {
license = "GPL";
}) {};
+ "sox_0_2_3_1" = callPackage
+ ({ mkDerivation, base, containers, explicit-exception
+ , extensible-exceptions, process, sample-frame, semigroups
+ , transformers, unix, utility-ht
+ }:
+ mkDerivation {
+ pname = "sox";
+ version = "0.2.3.1";
+ sha256 = "0idab4rsqj4zjm7dlzbf38rzpvkp1z9psrkl4lrp2qp1s53sp9kh";
+ libraryHaskellDepends = [
+ base containers explicit-exception extensible-exceptions process
+ sample-frame semigroups transformers unix utility-ht
+ ];
+ description = "Play, write, read, convert audio signals using Sox";
+ license = "GPL";
+ hydraPlatforms = stdenv.lib.platforms.none;
+ }) {};
+
"soxlib" = callPackage
({ mkDerivation, base, bytestring, containers, explicit-exception
, extensible-exceptions, sample-frame, sox, storablevector
@@ -190694,6 +191704,27 @@ self: {
license = stdenv.lib.licenses.bsd3;
}) {inherit (pkgs) sox;};
+ "soxlib_0_0_3_1" = callPackage
+ ({ mkDerivation, base, bytestring, explicit-exception
+ , extensible-exceptions, sample-frame, sox, storablevector
+ , transformers, utility-ht
+ }:
+ mkDerivation {
+ pname = "soxlib";
+ version = "0.0.3.1";
+ sha256 = "0f7ci58yls5rhq1vy1q1imlsgkbvadv8646fvvymg0jq2mjwgsfd";
+ isLibrary = true;
+ isExecutable = true;
+ libraryHaskellDepends = [
+ base bytestring explicit-exception extensible-exceptions
+ sample-frame storablevector transformers utility-ht
+ ];
+ libraryPkgconfigDepends = [ sox ];
+ description = "Write, read, convert audio signals using libsox";
+ license = stdenv.lib.licenses.bsd3;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ }) {inherit (pkgs) sox;};
+
"soyuz" = callPackage
({ mkDerivation, base, bytestring, cereal, cmdargs, containers
, pretty, QuickCheck, trifecta, uniplate, vector
@@ -190867,23 +191898,24 @@ self: {
, attoparsec-uri, base, bytestring, deepseq, exceptions
, extractable-singleton, hashable, http-client, http-client-tls
, http-types, list-t, monad-control, monad-control-aligned, mtl
- , nested-routes, path, path-extra, pred-trie, stm, strict, text
- , tmapchan, tmapmvar, transformers, unordered-containers, urlpath
- , uuid, wai, wai-middleware-content-type, wai-transformers
- , websockets, websockets-simple, wuss
+ , nested-routes, path, path-extra, pred-trie, purescript-iso, stm
+ , strict, text, tmapchan, tmapmvar, transformers
+ , unordered-containers, urlpath, uuid, wai
+ , wai-middleware-content-type, wai-transformers, websockets
+ , websockets-simple, wuss
}:
mkDerivation {
pname = "sparrow";
- version = "0.0.2.1";
- sha256 = "1j20536pjp4m26l8zvsaf8wv0vvj0fkwid1nkljl6zkggaqq5b8f";
+ version = "0.0.2.2";
+ sha256 = "0y1s22nfy234jgvvkxc77x0gcrlqb1g5vqni6vdwls6ww9n1jwba";
libraryHaskellDepends = [
aeson aeson-attoparsec async attoparsec attoparsec-uri base
bytestring deepseq exceptions extractable-singleton hashable
http-client http-client-tls http-types list-t monad-control
monad-control-aligned mtl nested-routes path path-extra pred-trie
- stm strict text tmapchan tmapmvar transformers unordered-containers
- urlpath uuid wai wai-middleware-content-type wai-transformers
- websockets websockets-simple wuss
+ purescript-iso stm strict text tmapchan tmapmvar transformers
+ unordered-containers urlpath uuid wai wai-middleware-content-type
+ wai-transformers websockets websockets-simple wuss
];
description = "Unified streaming dependency management for web apps";
license = stdenv.lib.licenses.bsd3;
@@ -191182,8 +192214,8 @@ self: {
({ mkDerivation, base, cmdargs, containers, leancheck }:
mkDerivation {
pname = "speculate";
- version = "0.3.2";
- sha256 = "0cf8121hfmyj1jrklf2i1bp2q4517627vgaz1flf363n93jnckfk";
+ version = "0.3.5";
+ sha256 = "0i7a6mq0f46iihq7kd3a1780pqqhmmdi706c42y4dmmj32nb4v3h";
libraryHaskellDepends = [ base cmdargs containers leancheck ];
testHaskellDepends = [ base leancheck ];
benchmarkHaskellDepends = [ base leancheck ];
@@ -191191,20 +192223,6 @@ self: {
license = stdenv.lib.licenses.bsd3;
}) {};
- "speculate_0_3_4" = callPackage
- ({ mkDerivation, base, cmdargs, containers, leancheck }:
- mkDerivation {
- pname = "speculate";
- version = "0.3.4";
- sha256 = "10b6ka8rws62byxi4whncs77hl2jcx6pr3gibbh804v07dnl2dnv";
- libraryHaskellDepends = [ base cmdargs containers leancheck ];
- testHaskellDepends = [ base leancheck ];
- benchmarkHaskellDepends = [ base leancheck ];
- description = "discovery of properties about Haskell functions";
- license = stdenv.lib.licenses.bsd3;
- hydraPlatforms = stdenv.lib.platforms.none;
- }) {};
-
"speculation" = callPackage
({ mkDerivation, base, ghc-prim, stm, transformers }:
mkDerivation {
@@ -191298,6 +192316,17 @@ self: {
hydraPlatforms = stdenv.lib.platforms.none;
}) {};
+ "spherical" = callPackage
+ ({ mkDerivation, base, composition-prelude }:
+ mkDerivation {
+ pname = "spherical";
+ version = "0.1.2.1";
+ sha256 = "0c6c5pf39dd9zpk8g3kcbg6hagsjvxcmqxmfk1imv5fmd2g8cv8p";
+ libraryHaskellDepends = [ base composition-prelude ];
+ description = "Geometry on a sphere";
+ license = stdenv.lib.licenses.bsd3;
+ }) {};
+
"sphero" = callPackage
({ mkDerivation, base, bytestring, cereal, containers, mtl
, simple-bluetooth
@@ -191728,6 +192757,23 @@ self: {
license = stdenv.lib.licenses.bsd3;
}) {};
+ "spreadsheet_0_1_3_8" = callPackage
+ ({ mkDerivation, base, explicit-exception, transformers, utility-ht
+ }:
+ mkDerivation {
+ pname = "spreadsheet";
+ version = "0.1.3.8";
+ sha256 = "0rd7qi6wy17fcz1a6pfqjxl3z816r8p6gyvz4zq85kgkjpkicrv4";
+ isLibrary = true;
+ isExecutable = true;
+ libraryHaskellDepends = [
+ base explicit-exception transformers utility-ht
+ ];
+ description = "Read and write spreadsheets from and to CSV files in a lazy way";
+ license = stdenv.lib.licenses.bsd3;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ }) {};
+
"sprinkles" = callPackage
({ mkDerivation, aeson, aeson-pretty, array, base, bytestring
, Cabal, case-insensitive, cereal, classy-prelude, containers, curl
@@ -192170,6 +193216,40 @@ self: {
hydraPlatforms = stdenv.lib.platforms.none;
}) {};
+ "squeal-postgresql_0_4_0_0" = callPackage
+ ({ mkDerivation, aeson, base, binary-parser, bytestring
+ , bytestring-strict-builder, deepseq, doctest, generics-sop, hspec
+ , lifted-base, mmorph, monad-control, mtl, network-ip
+ , postgresql-binary, postgresql-libpq, records-sop, resource-pool
+ , scientific, text, time, transformers, transformers-base
+ , uuid-types, vector
+ }:
+ mkDerivation {
+ pname = "squeal-postgresql";
+ version = "0.4.0.0";
+ sha256 = "10z1rq6jz8g6sv52bh9hjmjsw0pml9m4l04gzi19zxnwa597xk2b";
+ isLibrary = true;
+ isExecutable = true;
+ libraryHaskellDepends = [
+ aeson base binary-parser bytestring bytestring-strict-builder
+ deepseq generics-sop lifted-base mmorph monad-control mtl
+ network-ip postgresql-binary postgresql-libpq records-sop
+ resource-pool scientific text time transformers transformers-base
+ uuid-types vector
+ ];
+ executableHaskellDepends = [
+ base bytestring generics-sop mtl text transformers
+ transformers-base vector
+ ];
+ testHaskellDepends = [
+ base bytestring doctest generics-sop hspec text transformers
+ transformers-base vector
+ ];
+ description = "Squeal PostgreSQL Library";
+ license = stdenv.lib.licenses.bsd3;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ }) {};
+
"squeeze" = callPackage
({ mkDerivation, base, Cabal, data-default, directory, extra
, factory, filepath, mtl, QuickCheck, random, toolshed
@@ -192592,6 +193672,34 @@ self: {
license = stdenv.lib.licenses.bsd3;
}) {};
+ "stache_2_0_0" = callPackage
+ ({ mkDerivation, aeson, base, bytestring, containers, criterion
+ , deepseq, directory, file-embed, filepath, hspec, hspec-discover
+ , hspec-megaparsec, megaparsec, mtl, template-haskell, text
+ , unordered-containers, vector, yaml
+ }:
+ mkDerivation {
+ pname = "stache";
+ version = "2.0.0";
+ sha256 = "11j8rvl9dqda73hwd4p7rwmf36w6xc86ls53v9ip6ag2052j1cll";
+ enableSeparateDataOutput = true;
+ libraryHaskellDepends = [
+ aeson base bytestring containers deepseq directory filepath
+ megaparsec mtl template-haskell text unordered-containers vector
+ ];
+ testHaskellDepends = [
+ aeson base bytestring containers file-embed hspec hspec-megaparsec
+ megaparsec template-haskell text yaml
+ ];
+ testToolDepends = [ hspec-discover ];
+ benchmarkHaskellDepends = [
+ aeson base criterion deepseq megaparsec text
+ ];
+ description = "Mustache templates for Haskell";
+ license = stdenv.lib.licenses.bsd3;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ }) {};
+
"stack" = callPackage
({ mkDerivation, aeson, annotated-wl-pprint, ansi-terminal, async
, attoparsec, base, base64-bytestring, bindings-uname, bytestring
@@ -192615,8 +193723,8 @@ self: {
pname = "stack";
version = "1.7.1";
sha256 = "17rjc9fz1hn56jz4bnhhm50h5x71r69jizlw6dx7kfvm57hg5i0r";
- revision = "9";
- editedCabalFile = "12gbrnhmci2kpz42x7nwfzcq3syp0z2l14fjcakw8bhjmgd9wp34";
+ revision = "10";
+ editedCabalFile = "1985lm9m6pm9mi4h4m2nrn9v2rnnfh14slcnqgyxy6k934xqvg35";
isLibrary = true;
isExecutable = true;
setupHaskellDepends = [ base Cabal filepath ];
@@ -192893,8 +194001,8 @@ self: {
}:
mkDerivation {
pname = "stack2nix";
- version = "0.2";
- sha256 = "103cimrwr8j0b1zjpw195mjkfrgcgkicrpygcc5y82nyrl1cc74f";
+ version = "0.2.1";
+ sha256 = "0rwl6fzxv2ly20mn0pgv63r0ik4zpjigbkc4771ni7zazkxvx1gy";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [
@@ -194134,12 +195242,12 @@ self: {
hydraPlatforms = stdenv.lib.platforms.none;
}) {};
- "stm_2_4_5_0" = callPackage
+ "stm_2_4_5_1" = callPackage
({ mkDerivation, array, base }:
mkDerivation {
pname = "stm";
- version = "2.4.5.0";
- sha256 = "19sr11a0hqikhvf561b38phz6k3zg9s157a0f5ffvghk7wcdpmri";
+ version = "2.4.5.1";
+ sha256 = "1x53lg07j6d42vnmmk2f9sfqx2v4hxjk3hm11fccjdi70s0c5w3c";
libraryHaskellDepends = [ array base ];
description = "Software Transactional Memory";
license = stdenv.lib.licenses.bsd3;
@@ -194238,15 +195346,15 @@ self: {
hydraPlatforms = stdenv.lib.platforms.none;
}) {};
- "stm-containers_1_0_1_1" = callPackage
+ "stm-containers_1_1_0_2" = callPackage
({ mkDerivation, base, deferred-folds, focus, foldl, free, hashable
, HTF, list-t, QuickCheck, quickcheck-text, rerebase, stm-hamt
, transformers
}:
mkDerivation {
pname = "stm-containers";
- version = "1.0.1.1";
- sha256 = "16yds93abv9nmrbd5dcwbvmrq2ag0hdprs01khvnn9qg0nqs3lfn";
+ version = "1.1.0.2";
+ sha256 = "1yhivblfxycr2vk09gwg904n6fqkzn5g5rvg3whm40fnabdfa9av";
libraryHaskellDepends = [
base deferred-folds focus hashable list-t stm-hamt transformers
];
@@ -194309,8 +195417,8 @@ self: {
}:
mkDerivation {
pname = "stm-hamt";
- version = "1.1.2.1";
- sha256 = "1xbd1kcmiq1qah8hc3bkzf9wlhwrnf2qlh8rah8dyln0dcwapi6q";
+ version = "1.2.0.2";
+ sha256 = "17ywv40vxclkg2lgl52r3j30r1n0jcvahamcfnr3n5a1lh86149w";
libraryHaskellDepends = [
base deferred-folds focus hashable list-t primitive
primitive-extras transformers
@@ -195050,6 +196158,8 @@ self: {
pname = "streaming";
version = "0.2.1.0";
sha256 = "0xah2cn12dxqc54wa5yxx0g0b9n0xy0czc0c32awql63qhw5w7g1";
+ revision = "2";
+ editedCabalFile = "124nccw28cwzjzl82anbwk7phcyfzlz8yx6wyl4baymzdikvbpgq";
libraryHaskellDepends = [
base containers ghc-prim mmorph mtl semigroups transformers
transformers-base
@@ -195482,6 +196592,8 @@ self: {
pname = "streaming-with";
version = "0.2.2.1";
sha256 = "005krn43z92x1v8w8pgfx489h3livkklgrr7s2i2wijgsz55xp09";
+ revision = "1";
+ editedCabalFile = "0z1jy02hc4k1xv0bd4981cblnm4pr022hakrj6zmi4zds74m9wzm";
libraryHaskellDepends = [
base exceptions managed streaming-bytestring temporary transformers
];
@@ -195512,28 +196624,28 @@ self: {
license = stdenv.lib.licenses.bsd3;
}) {};
- "streamly_0_4_1" = callPackage
- ({ mkDerivation, atomic-primops, base, containers, deepseq
+ "streamly_0_5_0" = callPackage
+ ({ mkDerivation, atomic-primops, base, clock, containers, deepseq
, exceptions, gauge, ghc-prim, heaps, hspec, lockfree-queue
, monad-control, mtl, QuickCheck, random, transformers
, transformers-base
}:
mkDerivation {
pname = "streamly";
- version = "0.4.1";
- sha256 = "0xxkb8vdnbyq5l590wh3ig68xw4ny44aymx4k816cbif2da5w7zy";
+ version = "0.5.0";
+ sha256 = "1kzgrwnr2w6w4yjmx4qm325d0hf4wy21gb7a1cv0db4jkha3672s";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [
- atomic-primops base containers exceptions ghc-prim heaps
+ atomic-primops base clock containers exceptions ghc-prim heaps
lockfree-queue monad-control mtl transformers transformers-base
];
testHaskellDepends = [
base containers exceptions hspec mtl QuickCheck random transformers
];
benchmarkHaskellDepends = [
- atomic-primops base containers deepseq exceptions gauge ghc-prim
- heaps lockfree-queue monad-control mtl random transformers
+ atomic-primops base clock containers deepseq exceptions gauge
+ ghc-prim heaps lockfree-queue monad-control mtl random transformers
transformers-base
];
description = "Beautiful Streaming, Concurrent and Reactive Composition";
@@ -196877,6 +197989,33 @@ self: {
license = stdenv.lib.licenses.mpl20;
}) {};
+ "summoner_1_1_0_1" = callPackage
+ ({ mkDerivation, aeson, ansi-terminal, base-noprelude, bytestring
+ , directory, filepath, generic-deriving, gitrev, hedgehog
+ , neat-interpolation, optparse-applicative, process, relude, tasty
+ , tasty-discover, tasty-hedgehog, text, time, tomland
+ }:
+ mkDerivation {
+ pname = "summoner";
+ version = "1.1.0.1";
+ sha256 = "0l9v85d9s5n6lz9k2k44pxx8yqqmrxnvz9q0pi5rhvwq53c50x83";
+ isLibrary = true;
+ isExecutable = true;
+ libraryHaskellDepends = [
+ aeson ansi-terminal base-noprelude bytestring directory filepath
+ generic-deriving gitrev neat-interpolation optparse-applicative
+ process relude text time tomland
+ ];
+ executableHaskellDepends = [ base-noprelude relude ];
+ testHaskellDepends = [
+ base-noprelude hedgehog relude tasty tasty-hedgehog tomland
+ ];
+ testToolDepends = [ tasty-discover ];
+ description = "Tool for creating completely configured production Haskell projects";
+ license = stdenv.lib.licenses.mpl20;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ }) {};
+
"sump" = callPackage
({ mkDerivation, base, bytestring, data-default, lens, serialport
, transformers, vector
@@ -197956,8 +199095,8 @@ self: {
}:
mkDerivation {
pname = "symantic";
- version = "6.3.1.20180213";
- sha256 = "16bbby4lcyna842gvf95ss8fvsp5kgzpn996yxzv3jjhxg00ls5d";
+ version = "6.3.2.20180208";
+ sha256 = "1a6ifwhrn35wfx0lf2gbq203rb882p7hl0yji7rwfrvxrp4ax518";
libraryHaskellDepends = [
base containers mono-traversable symantic-document symantic-grammar
text transformers
@@ -197966,13 +199105,33 @@ self: {
license = stdenv.lib.licenses.gpl3;
}) {};
+ "symantic-cli" = callPackage
+ ({ mkDerivation, base, containers, megaparsec, symantic-document
+ , text, transformers
+ }:
+ mkDerivation {
+ pname = "symantic-cli";
+ version = "0.0.0.20180410";
+ sha256 = "0025rgjjz198sh6gb8zzy7283pnb6vza3q3d7x5xl27c77mpivpx";
+ libraryHaskellDepends = [
+ base containers megaparsec symantic-document text transformers
+ ];
+ description = "Library for Command Line Interface (CLI)";
+ license = stdenv.lib.licenses.gpl3;
+ }) {};
+
"symantic-document" = callPackage
- ({ mkDerivation, ansi-terminal, base, text }:
+ ({ mkDerivation, ansi-terminal, base, containers, tasty
+ , tasty-hunit, text, transformers
+ }:
mkDerivation {
pname = "symantic-document";
- version = "0.0.0.20180213";
- sha256 = "0f3rr8117cr78nkcw7kpddcpisbmvsyw03ym7cq6ms0z8zqynwpm";
- libraryHaskellDepends = [ ansi-terminal base text ];
+ version = "0.1.2.20180831";
+ sha256 = "1vlxgn9gdd03azqf2csxjiyqsplg68wv3qr6d08zj5dvqskz27by";
+ libraryHaskellDepends = [ ansi-terminal base text transformers ];
+ testHaskellDepends = [
+ base containers tasty tasty-hunit text transformers
+ ];
description = "Document symantics";
license = stdenv.lib.licenses.gpl3;
}) {};
@@ -197983,8 +199142,8 @@ self: {
}:
mkDerivation {
pname = "symantic-grammar";
- version = "0.3.0.20180213";
- sha256 = "0kqy27c4ix16v7n7zqhc57alrg1n1xksdf7ijsbvpjs4597vpwih";
+ version = "0.3.1.20180831";
+ sha256 = "0n2x5sb5gv9lkhfmq9yfjxfk6q19h71xqbskkg7ar8nglz0jhldp";
libraryHaskellDepends = [ base text ];
testHaskellDepends = [
base megaparsec tasty tasty-hunit text transformers
@@ -198000,8 +199159,8 @@ self: {
}:
mkDerivation {
pname = "symantic-lib";
- version = "0.0.3.20180213";
- sha256 = "17y4rmw9l4j3j9g2i60las3q6y7rlklzr48xr8arkhi0i5zi1qw2";
+ version = "0.0.4.20180831";
+ sha256 = "1agqlz7drckjm8a2swvqiryy7y6kdahq8d24rwkbzn3nw1bnyvk1";
libraryHaskellDepends = [
base containers mono-traversable symantic symantic-grammar text
transformers
@@ -198449,8 +199608,8 @@ self: {
}:
mkDerivation {
pname = "synthesizer-core";
- version = "0.8.2";
- sha256 = "0r8lik2gmaxn1ay0wyjvq2r51jb8vy99hypvrnhbc6hsjybdh8aa";
+ version = "0.8.2.1";
+ sha256 = "1sdvqabxlgiqqb3kppxwyvmkmvcqrmrzicbmcmy6mr5c4npjxffj";
libraryHaskellDepends = [
array base binary bytestring containers deepseq event-list
explicit-exception filepath non-empty non-negative numeric-prelude
@@ -198497,8 +199656,8 @@ self: {
}:
mkDerivation {
pname = "synthesizer-filter";
- version = "0.4.1";
- sha256 = "1gbyb50lj5k69vn316lzb27jx5l2p8jn90b4k6zlqb050sp9c26s";
+ version = "0.4.1.1";
+ sha256 = "0130y7v7r6fhclyg4fg4jj07x1lvn8cvh40w43m2j3sdcmzaa25a";
libraryHaskellDepends = [
base containers numeric-prelude numeric-quest synthesizer-core
transformers utility-ht
@@ -198564,8 +199723,8 @@ self: {
}:
mkDerivation {
pname = "synthesizer-midi";
- version = "0.6.1";
- sha256 = "02z6sywk047vn2is9fq9nr4agdy9xis9ydbl15pmrb0vlmvpx3qr";
+ version = "0.6.1.1";
+ sha256 = "1f57i0lz8wy9kz6qkpbrpywlf0lxwq44yqgzc9kgrb4gy97p0cm5";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [
@@ -198719,6 +199878,26 @@ self: {
license = stdenv.lib.licenses.mit;
}) {};
+ "system-fileio_0_3_16_4" = callPackage
+ ({ mkDerivation, base, bytestring, chell, system-filepath
+ , temporary, text, time, transformers, unix
+ }:
+ mkDerivation {
+ pname = "system-fileio";
+ version = "0.3.16.4";
+ sha256 = "1iy6g1f35gzyj12g9mdiw4zf75mmxpv1l8cyaldgyscsl648pr9l";
+ libraryHaskellDepends = [
+ base bytestring system-filepath text time unix
+ ];
+ testHaskellDepends = [
+ base bytestring chell system-filepath temporary text time
+ transformers unix
+ ];
+ description = "Consistent filesystem interaction across GHC versions (deprecated)";
+ license = stdenv.lib.licenses.mit;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ }) {};
+
"system-filepath" = callPackage
({ mkDerivation, base, bytestring, Cabal, chell, chell-quickcheck
, deepseq, QuickCheck, text
@@ -199344,6 +200523,32 @@ self: {
license = "GPL";
}) {};
+ "tagchup_0_4_1_1" = callPackage
+ ({ mkDerivation, base, bytestring, containers, data-accessor
+ , explicit-exception, non-empty, old-time, transformers, utility-ht
+ , xml-basic
+ }:
+ mkDerivation {
+ pname = "tagchup";
+ version = "0.4.1.1";
+ sha256 = "127ffhggdcbapizddhzwy538h3znppvr28mh9y2lv9ihbwcfxd75";
+ isLibrary = true;
+ isExecutable = true;
+ enableSeparateDataOutput = true;
+ libraryHaskellDepends = [
+ base bytestring containers data-accessor explicit-exception
+ non-empty transformers utility-ht xml-basic
+ ];
+ testHaskellDepends = [ base xml-basic ];
+ benchmarkHaskellDepends = [
+ base bytestring containers data-accessor explicit-exception
+ old-time transformers utility-ht xml-basic
+ ];
+ description = "alternative package for processing of tag soups";
+ license = "GPL";
+ hydraPlatforms = stdenv.lib.platforms.none;
+ }) {};
+
"tagged" = callPackage
({ mkDerivation, base, deepseq, template-haskell, transformers
, transformers-compat
@@ -200001,8 +201206,8 @@ self: {
}:
mkDerivation {
pname = "tar-conduit";
- version = "0.2.3.1";
- sha256 = "0z108pzvh4r87dykapxl36bhby4jhkya53dy2pglb891m54wswpc";
+ version = "0.2.5";
+ sha256 = "0gnklkw9qv496m8nxm1mlfddyiw8c5lsj5pcshxv7c6rv9n3vva3";
libraryHaskellDepends = [
base bytestring conduit conduit-combinators directory filepath
safe-exceptions text unix
@@ -200019,6 +201224,32 @@ self: {
license = stdenv.lib.licenses.mit;
}) {};
+ "tar-conduit_0_3_0" = callPackage
+ ({ mkDerivation, base, bytestring, conduit, conduit-combinators
+ , conduit-extra, containers, criterion, deepseq, directory
+ , filepath, hspec, QuickCheck, safe-exceptions, text, unix, weigh
+ }:
+ mkDerivation {
+ pname = "tar-conduit";
+ version = "0.3.0";
+ sha256 = "0g35wiqn0bi31sqnzknq90iy265c7lw15rkyrzc6c2vp6nl86j08";
+ libraryHaskellDepends = [
+ base bytestring conduit conduit-combinators directory filepath
+ safe-exceptions text unix
+ ];
+ testHaskellDepends = [
+ base bytestring conduit conduit-combinators conduit-extra
+ containers deepseq directory filepath hspec QuickCheck weigh
+ ];
+ benchmarkHaskellDepends = [
+ base bytestring conduit conduit-combinators containers criterion
+ deepseq directory filepath hspec
+ ];
+ description = "Extract and create tar files using conduit for streaming";
+ license = stdenv.lib.licenses.mit;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ }) {};
+
"tardis" = callPackage
({ mkDerivation, base, mmorph, mtl }:
mkDerivation {
@@ -200373,8 +201604,8 @@ self: {
pname = "tasty-hspec";
version = "1.1.5";
sha256 = "0m0ip2l4rg4pnrvk3mjxkbq2l683psv1x3v9l4rglk2k3pvxq36v";
- revision = "1";
- editedCabalFile = "0zgbcrahzfg37bnni6fj0qb0fpbk5rdha589mh960d5sbq58pljf";
+ revision = "2";
+ editedCabalFile = "0rya3dnhrci40nsf3fd5jdzn875n3awpy2xzb99jfl9i2cs3krc2";
libraryHaskellDepends = [
base hspec hspec-core QuickCheck tasty tasty-quickcheck
tasty-smallcheck
@@ -200508,6 +201739,18 @@ self: {
hydraPlatforms = stdenv.lib.platforms.none;
}) {};
+ "tasty-leancheck" = callPackage
+ ({ mkDerivation, base, leancheck, tasty }:
+ mkDerivation {
+ pname = "tasty-leancheck";
+ version = "0.0.1";
+ sha256 = "06nki1l05hh5r0q2lkn4rmj0cl8hz7r7zc71r64fx2k9z65n5497";
+ libraryHaskellDepends = [ base leancheck tasty ];
+ testHaskellDepends = [ base leancheck tasty ];
+ description = "LeanCheck support for the Tasty test framework";
+ license = stdenv.lib.licenses.bsd3;
+ }) {};
+
"tasty-lens" = callPackage
({ mkDerivation, base, lens, smallcheck, smallcheck-lens, tasty
, tasty-smallcheck
@@ -200659,8 +201902,8 @@ self: {
({ mkDerivation, base, tasty, tasty-hunit }:
mkDerivation {
pname = "tasty-travis";
- version = "0.2.0.1";
- sha256 = "05k9zddmhbcs2xf9n6ln3591cscxix7pakc42j4arw4iwrfiqp17";
+ version = "0.2.0.2";
+ sha256 = "0g1qwmr11rgpvm964367mskgrjzbi34lbxzf9c0knx5ij9565gfg";
libraryHaskellDepends = [ base tasty ];
testHaskellDepends = [ base tasty tasty-hunit ];
description = "Fancy Travis CI output for tasty tests";
@@ -201566,7 +202809,6 @@ self: {
];
description = "TensorFlow bindings";
license = stdenv.lib.licenses.asl20;
- hydraPlatforms = stdenv.lib.platforms.none;
}) {inherit (pkgs) libtensorflow;};
"tensorflow-core-ops" = callPackage
@@ -201587,7 +202829,6 @@ self: {
];
description = "Haskell wrappers for Core Tensorflow Ops";
license = stdenv.lib.licenses.asl20;
- hydraPlatforms = stdenv.lib.platforms.none;
}) {};
"tensorflow-logging" = callPackage
@@ -201616,7 +202857,6 @@ self: {
];
description = "TensorBoard related functionality";
license = stdenv.lib.licenses.asl20;
- hydraPlatforms = stdenv.lib.platforms.none;
}) {};
"tensorflow-mnist" = callPackage
@@ -201669,7 +202909,6 @@ self: {
];
description = "Code generation for TensorFlow operations";
license = stdenv.lib.licenses.asl20;
- hydraPlatforms = stdenv.lib.platforms.none;
}) {};
"tensorflow-ops" = callPackage
@@ -201699,7 +202938,6 @@ self: {
];
description = "Friendly layer around TensorFlow bindings";
license = stdenv.lib.licenses.asl20;
- hydraPlatforms = stdenv.lib.platforms.none;
}) {};
"tensorflow-proto" = callPackage
@@ -201717,7 +202955,6 @@ self: {
libraryToolDepends = [ protobuf ];
description = "TensorFlow protocol buffers";
license = stdenv.lib.licenses.asl20;
- hydraPlatforms = stdenv.lib.platforms.none;
}) {inherit (pkgs) protobuf;};
"tensorflow-records" = callPackage
@@ -201953,7 +203190,6 @@ self: {
];
description = "Terminal emulator configurable in Haskell";
license = stdenv.lib.licenses.bsd3;
- hydraPlatforms = stdenv.lib.platforms.none;
}) {gtk3 = pkgs.gnome3.gtk;};
"termplot" = callPackage
@@ -202121,6 +203357,18 @@ self: {
license = stdenv.lib.licenses.bsd3;
}) {};
+ "test-framework-leancheck" = callPackage
+ ({ mkDerivation, base, leancheck, test-framework }:
+ mkDerivation {
+ pname = "test-framework-leancheck";
+ version = "0.0.1";
+ sha256 = "0bwzc0vq28cmy5r966jxhacijd2hkna4magd9aw5wz34dcp4qv13";
+ libraryHaskellDepends = [ base leancheck test-framework ];
+ testHaskellDepends = [ base leancheck test-framework ];
+ description = "LeanCheck support for test-framework";
+ license = stdenv.lib.licenses.bsd3;
+ }) {};
+
"test-framework-program" = callPackage
({ mkDerivation, base, directory, process, test-framework }:
mkDerivation {
@@ -202165,6 +203413,22 @@ self: {
license = stdenv.lib.licenses.bsd3;
}) {};
+ "test-framework-quickcheck2_0_3_0_5" = callPackage
+ ({ mkDerivation, base, extensible-exceptions, QuickCheck, random
+ , test-framework
+ }:
+ mkDerivation {
+ pname = "test-framework-quickcheck2";
+ version = "0.3.0.5";
+ sha256 = "0ngf9vvby4nrdf1i7dxf5m9jn0g2pkq32w48xdr92n9hxka7ixn9";
+ libraryHaskellDepends = [
+ base extensible-exceptions QuickCheck random test-framework
+ ];
+ description = "QuickCheck-2 support for the test-framework package";
+ license = stdenv.lib.licenses.bsd3;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ }) {};
+
"test-framework-sandbox" = callPackage
({ mkDerivation, ansi-terminal, base, HUnit, lifted-base, mtl
, temporary, test-framework, test-sandbox, test-sandbox-hunit
@@ -202651,6 +203915,29 @@ self: {
license = stdenv.lib.licenses.gpl2;
}) {};
+ "texmath_0_11_1" = callPackage
+ ({ mkDerivation, base, bytestring, containers, directory, filepath
+ , mtl, pandoc-types, parsec, process, split, syb, temporary, text
+ , utf8-string, xml
+ }:
+ mkDerivation {
+ pname = "texmath";
+ version = "0.11.1";
+ sha256 = "169jp9y6azpkkcbx0h03kbjg7f58wsk7bs18dn3h9m3sia6bnw99";
+ isLibrary = true;
+ isExecutable = true;
+ libraryHaskellDepends = [
+ base containers mtl pandoc-types parsec syb xml
+ ];
+ testHaskellDepends = [
+ base bytestring directory filepath process split temporary text
+ utf8-string xml
+ ];
+ description = "Conversion between formats used to represent mathematics";
+ license = stdenv.lib.licenses.gpl2;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ }) {};
+
"texrunner" = callPackage
({ mkDerivation, attoparsec, base, bytestring, directory, filepath
, HUnit, io-streams, lens, mtl, process, semigroups, temporary
@@ -202745,8 +204032,8 @@ self: {
}:
mkDerivation {
pname = "text-builder";
- version = "0.5.3.1";
- sha256 = "04vqh30m4vi9d4b4g311fb861qijbmf9zmn9ldsrdb1rrgjk2y9q";
+ version = "0.5.4.3";
+ sha256 = "1xcyi3bw44anzah5c4c0wm18vnyqsr3q7ww2kp2psk41ql6gan2h";
libraryHaskellDepends = [
base base-prelude bytestring semigroups text
];
@@ -202760,17 +204047,19 @@ self: {
hydraPlatforms = stdenv.lib.platforms.none;
}) {};
- "text-builder_0_5_4_1" = callPackage
+ "text-builder_0_6_3" = callPackage
({ mkDerivation, base, base-prelude, bytestring, criterion
- , QuickCheck, quickcheck-instances, rerebase, semigroups, tasty
- , tasty-hunit, tasty-quickcheck, text
+ , deferred-folds, QuickCheck, quickcheck-instances, rerebase
+ , semigroups, tasty, tasty-hunit, tasty-quickcheck, text
+ , transformers
}:
mkDerivation {
pname = "text-builder";
- version = "0.5.4.1";
- sha256 = "1ipmfnjbkp2qllqdahdf9jwbks6vhalaw65clv9izbhp7d20gjai";
+ version = "0.6.3";
+ sha256 = "00i0p155sfii0pl3300xa4af57nhhcz690qr0drwby34xqjy2c1z";
libraryHaskellDepends = [
- base base-prelude bytestring semigroups text
+ base base-prelude bytestring deferred-folds semigroups text
+ transformers
];
testHaskellDepends = [
QuickCheck quickcheck-instances rerebase tasty tasty-hunit
@@ -202891,6 +204180,8 @@ self: {
pname = "text-generic-pretty";
version = "1.2.1";
sha256 = "1isj8wccd0yrgpmlggd2zykb8d9r77blngsqlbwmqs9gxbyk3wyg";
+ revision = "1";
+ editedCabalFile = "1m512nd5w4z6f12qy10bpjqfmpwkm5wg0kdrvvzc45s4dxmzwbxz";
libraryHaskellDepends = [
base containers ghc-prim groom ixset-typed protolude QuickCheck
string-conversions text time unordered-containers wl-pprint-text
@@ -202999,27 +204290,6 @@ self: {
}) {};
"text-ldap" = callPackage
- ({ mkDerivation, attoparsec, base, bytestring, containers, dlist
- , memory, QuickCheck, quickcheck-simple, random, transformers
- }:
- mkDerivation {
- pname = "text-ldap";
- version = "0.1.1.12";
- sha256 = "1kfp77nm8mvzi6h44334djr88z2w6syrwrvrqy2jfb65d0p9crbx";
- isLibrary = true;
- isExecutable = true;
- libraryHaskellDepends = [
- attoparsec base bytestring containers dlist memory transformers
- ];
- executableHaskellDepends = [ base bytestring ];
- testHaskellDepends = [
- base bytestring QuickCheck quickcheck-simple random
- ];
- description = "Parser and Printer for LDAP text data stream";
- license = stdenv.lib.licenses.bsd3;
- }) {};
-
- "text-ldap_0_1_1_13" = callPackage
({ mkDerivation, attoparsec, base, bytestring, containers, dlist
, memory, QuickCheck, quickcheck-simple, random, transformers
}:
@@ -203038,7 +204308,6 @@ self: {
];
description = "Parser and Printer for LDAP text data stream";
license = stdenv.lib.licenses.bsd3;
- hydraPlatforms = stdenv.lib.platforms.none;
}) {};
"text-lens" = callPackage
@@ -203286,8 +204555,8 @@ self: {
}:
mkDerivation {
pname = "text-replace";
- version = "0.0.0.2";
- sha256 = "1qd3i8sj6z0vgb2yn345wh16w0lvmqdvywrkpcdsmbc00j8cwkjq";
+ version = "0.0.0.3";
+ sha256 = "0dj024y7qmkmv31n5h6li6wna3gpayr5gmyl6jiiiprdvild2i1n";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [ base containers ];
@@ -203333,6 +204602,8 @@ self: {
pname = "text-show";
version = "3.7.4";
sha256 = "068yp74k4ybhvycivnr7x238dl1qdnkjdzf25pcz127294rn9yry";
+ revision = "1";
+ editedCabalFile = "0002han9bgcc8m64a3k5wgfmzlma4j3qxqd7m2illyza19hijsj9";
libraryHaskellDepends = [
array base base-compat-batteries bifunctors bytestring
bytestring-builder containers contravariant generic-deriving
@@ -203365,8 +204636,8 @@ self: {
pname = "text-show-instances";
version = "3.6.5";
sha256 = "0hljqh31m3199w8ppcihggcya8cj4zmrav5z6fvcn6xn2hzz1cql";
- revision = "1";
- editedCabalFile = "12k3hmn36w2mffhxjb5bx1g1gh3y0y4fync9hvk4gklh1w6dbs0a";
+ revision = "2";
+ editedCabalFile = "1lqvwm9ciazk13jabyr81rl4hsmwksjmks7ckxrdgz3jk201yr6i";
libraryHaskellDepends = [
base base-compat-batteries bifunctors binary containers directory
ghc-boot-th haskeline hoopl hpc old-locale old-time pretty random
@@ -203800,17 +205071,6 @@ self: {
}) {};
"th-data-compat" = callPackage
- ({ mkDerivation, base, template-haskell }:
- mkDerivation {
- pname = "th-data-compat";
- version = "0.0.2.6";
- sha256 = "1gbqrrpib065yw53063i7ydvm9ghwja30zc6s13mr2pp1l5a4bs2";
- libraryHaskellDepends = [ base template-haskell ];
- description = "Compatibility for data definition template of TH";
- license = stdenv.lib.licenses.bsd3;
- }) {};
-
- "th-data-compat_0_0_2_7" = callPackage
({ mkDerivation, base, template-haskell }:
mkDerivation {
pname = "th-data-compat";
@@ -203819,7 +205079,6 @@ self: {
libraryHaskellDepends = [ base template-haskell ];
description = "Compatibility for data definition template of TH";
license = stdenv.lib.licenses.bsd3;
- hydraPlatforms = stdenv.lib.platforms.none;
}) {};
"th-desugar" = callPackage
@@ -203996,21 +205255,6 @@ self: {
}) {};
"th-lift" = callPackage
- ({ mkDerivation, base, ghc-prim, template-haskell, th-abstraction
- }:
- mkDerivation {
- pname = "th-lift";
- version = "0.7.10";
- sha256 = "13c89mr9g4jwrmqxx882ygr1lkvj1chw29p80qv2f3g5wnhlgkmr";
- libraryHaskellDepends = [
- base ghc-prim template-haskell th-abstraction
- ];
- testHaskellDepends = [ base ghc-prim template-haskell ];
- description = "Derive Template Haskell's Lift class for datatypes";
- license = stdenv.lib.licenses.bsd3;
- }) {};
-
- "th-lift_0_7_11" = callPackage
({ mkDerivation, base, ghc-prim, template-haskell, th-abstraction
}:
mkDerivation {
@@ -204023,7 +205267,6 @@ self: {
testHaskellDepends = [ base ghc-prim template-haskell ];
description = "Derive Template Haskell's Lift class for datatypes";
license = stdenv.lib.licenses.bsd3;
- hydraPlatforms = stdenv.lib.platforms.none;
}) {};
"th-lift-instances" = callPackage
@@ -204128,17 +205371,6 @@ self: {
}) {};
"th-reify-compat" = callPackage
- ({ mkDerivation, base, template-haskell }:
- mkDerivation {
- pname = "th-reify-compat";
- version = "0.0.1.4";
- sha256 = "08lal845ixcw62skw2rsi98y9v3dgj7bq4ygmlxm6k3lfgd9v7q8";
- libraryHaskellDepends = [ base template-haskell ];
- description = "Compatibility for the result type of TH reify";
- license = stdenv.lib.licenses.bsd3;
- }) {};
-
- "th-reify-compat_0_0_1_5" = callPackage
({ mkDerivation, base, template-haskell }:
mkDerivation {
pname = "th-reify-compat";
@@ -204147,7 +205379,6 @@ self: {
libraryHaskellDepends = [ base template-haskell ];
description = "Compatibility for the result type of TH reify";
license = stdenv.lib.licenses.bsd3;
- hydraPlatforms = stdenv.lib.platforms.none;
}) {};
"th-reify-many" = callPackage
@@ -204962,8 +206193,8 @@ self: {
pname = "tibetan-utils";
version = "0.1.1.5";
sha256 = "09bqix2a2js98rhp748qx2i0vnxya3c6zvpjizbbnf5fwpspy01q";
- revision = "1";
- editedCabalFile = "0wmfv4dxjhjwsnkc8n7jfhbkvc7zwgcmkj7pvabmhcjzn5ch0dck";
+ revision = "2";
+ editedCabalFile = "17zyhdxwnq85kr60bnxirmyvw3b1679j5mhm3i30ri65896pjdwf";
libraryHaskellDepends = [
base composition-prelude either megaparsec text text-show
];
@@ -204974,6 +206205,25 @@ self: {
license = stdenv.lib.licenses.bsd3;
}) {};
+ "tibetan-utils_0_1_1_9" = callPackage
+ ({ mkDerivation, base, composition-prelude, either, hspec
+ , hspec-megaparsec, megaparsec, text, text-show
+ }:
+ mkDerivation {
+ pname = "tibetan-utils";
+ version = "0.1.1.9";
+ sha256 = "04xpncn9nnc51mzyvw1naydk47acbpkzpxipq1fgvvgclzda2gn8";
+ libraryHaskellDepends = [
+ base composition-prelude either megaparsec text text-show
+ ];
+ testHaskellDepends = [
+ base hspec hspec-megaparsec megaparsec text
+ ];
+ description = "Parse and display tibetan numerals";
+ license = stdenv.lib.licenses.bsd3;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ }) {};
+
"tic-tac-toe" = callPackage
({ mkDerivation, base, glade, gtk, haskell98 }:
mkDerivation {
@@ -205364,17 +206614,6 @@ self: {
}) {};
"time-locale-compat" = callPackage
- ({ mkDerivation, base, old-locale, time }:
- mkDerivation {
- pname = "time-locale-compat";
- version = "0.1.1.4";
- sha256 = "0qmyxf8nz0q6brvplc4s2wsb1bbpq7kb65b69m503g9bgranblgj";
- libraryHaskellDepends = [ base old-locale time ];
- description = "Compatibile module for time-format locale";
- license = stdenv.lib.licenses.bsd3;
- }) {};
-
- "time-locale-compat_0_1_1_5" = callPackage
({ mkDerivation, base, old-locale, time }:
mkDerivation {
pname = "time-locale-compat";
@@ -205383,7 +206622,6 @@ self: {
libraryHaskellDepends = [ base old-locale time ];
description = "Compatibile module for time-format locale";
license = stdenv.lib.licenses.bsd3;
- hydraPlatforms = stdenv.lib.platforms.none;
}) {};
"time-locale-vietnamese" = callPackage
@@ -206870,8 +208108,8 @@ self: {
}:
mkDerivation {
pname = "tomlcheck";
- version = "0.1.0.29";
- sha256 = "1blq3yjzd39fjpavjl5k3567algdl424l0al0rvr25xd239kvwzg";
+ version = "0.1.0.36";
+ sha256 = "16a15449pfdlan93ynrv3gh42vjlv95160nr1lwvqh91m7fvpnc3";
isLibrary = false;
isExecutable = true;
executableHaskellDepends = [
@@ -207017,8 +208255,8 @@ self: {
({ mkDerivation, base, containers }:
mkDerivation {
pname = "total-map";
- version = "0.0.6";
- sha256 = "11dgcl7ab7akkfnmprnmphj4kazh3x3k09lz7m5glyg39kw8pzrj";
+ version = "0.0.7";
+ sha256 = "0chcnvsn3bzjmmp2bq6kxli1c73d477i49jbvnmqwz56an84ink1";
libraryHaskellDepends = [ base containers ];
description = "Finitely represented /total/ maps";
license = stdenv.lib.licenses.bsd3;
@@ -209220,8 +210458,8 @@ self: {
}:
mkDerivation {
pname = "tweet-hs";
- version = "1.0.1.41";
- sha256 = "1ybrsnppy7lnj5z2f8m38cd6ix89j6dlvgc2icl7lj3w14g6cfxm";
+ version = "1.0.1.42";
+ sha256 = "1jf3w8cw9nmg6b2wxs5agxxi1igfsykj857cjkqjsfr04z060v37";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [
@@ -211691,6 +212929,21 @@ self: {
license = stdenv.lib.licenses.bsd3;
}) {};
+ "unicode_0_0_1_1" = callPackage
+ ({ mkDerivation, base, containers, semigroups, utility-ht }:
+ mkDerivation {
+ pname = "unicode";
+ version = "0.0.1.1";
+ sha256 = "1hgqnplpgaw0pwz0lfr59vmljcf4l5b4ynrhdcic94g18lpsmnvg";
+ isLibrary = true;
+ isExecutable = true;
+ libraryHaskellDepends = [ base containers semigroups ];
+ testHaskellDepends = [ base containers utility-ht ];
+ description = "Construct and transform unicode characters";
+ license = stdenv.lib.licenses.bsd3;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ }) {};
+
"unicode-names" = callPackage
({ mkDerivation, array, base, containers, unicode-properties }:
mkDerivation {
@@ -211858,13 +213111,17 @@ self: {
}) {inherit (pkgs) openssl;};
"uniform-pair" = callPackage
- ({ mkDerivation, base, deepseq, prelude-extras }:
+ ({ mkDerivation, adjunctions, base, deepseq, distributive
+ , prelude-extras
+ }:
mkDerivation {
pname = "uniform-pair";
- version = "0.1.13";
- sha256 = "17dz0car02w2x5m23hlqlgjnpl86darc8vvr4axpsc9xim4sf7nk";
+ version = "0.1.15";
+ sha256 = "087wwdhkma76akzjzi053by43xv18c2a4q1babdsxapzjqpnr19k";
enableSeparateDataOutput = true;
- libraryHaskellDepends = [ base deepseq prelude-extras ];
+ libraryHaskellDepends = [
+ adjunctions base deepseq distributive prelude-extras
+ ];
description = "Uniform pairs with class instances";
license = stdenv.lib.licenses.bsd3;
}) {};
@@ -211944,6 +213201,8 @@ self: {
pname = "uniprot-kb";
version = "0.1.2.0";
sha256 = "0hh6fnnmr6i4mgli07hgaagswdipa0p3ckr3jzzfcw4y5x98036l";
+ revision = "1";
+ editedCabalFile = "0kvw9mzgjz6m1sslywn09n4axkjnwqpi4c5p00p9c81mr9fpbild";
libraryHaskellDepends = [ attoparsec base text ];
testHaskellDepends = [
attoparsec base hspec neat-interpolation QuickCheck text
@@ -212002,8 +213261,8 @@ self: {
}:
mkDerivation {
pname = "unique-logic-tf";
- version = "0.5";
- sha256 = "05v9ky3lrh4yzjsfgxa2sz44l7dlsvi5iv4h9rnsj2sd3hj2xcsa";
+ version = "0.5.0.1";
+ sha256 = "1v37bv5bjpkm5085sg4rf7ssbigsivib6fdxjhxyd36zhh08pdjy";
libraryHaskellDepends = [
base containers data-ref semigroups transformers utility-ht
];
@@ -212210,6 +213469,22 @@ self: {
hydraPlatforms = stdenv.lib.platforms.none;
}) {};
+ "universal" = callPackage
+ ({ mkDerivation, base, base-unicode-symbols, criterion, smallcheck
+ , tasty, tasty-smallcheck, util
+ }:
+ mkDerivation {
+ pname = "universal";
+ version = "0.0.0.0";
+ sha256 = "0qcv0xi65l782yvn25an0qiavn942szs16j8p328i2pc6ggfymb2";
+ libraryHaskellDepends = [ base base-unicode-symbols util ];
+ testHaskellDepends = [ base smallcheck tasty tasty-smallcheck ];
+ benchmarkHaskellDepends = [ base criterion ];
+ doHaddock = false;
+ description = "Universal";
+ license = stdenv.lib.licenses.bsd3;
+ }) {};
+
"universal-binary" = callPackage
({ mkDerivation, base, binary, bytestring }:
mkDerivation {
@@ -212415,19 +213690,6 @@ self: {
}) {};
"unix-compat" = callPackage
- ({ mkDerivation, base, unix }:
- mkDerivation {
- pname = "unix-compat";
- version = "0.5.0.1";
- sha256 = "1gdf3h2knbymkivm784vq51mbcyj5y91r480awyxj5cw8gh9kwn2";
- revision = "1";
- editedCabalFile = "0yrdy4dz0zskgpw7c4wgkwskgayqxvch37axwka5z4g5gmic4mnn";
- libraryHaskellDepends = [ base unix ];
- description = "Portable POSIX-compatibility layer";
- license = stdenv.lib.licenses.bsd3;
- }) {};
-
- "unix-compat_0_5_1" = callPackage
({ mkDerivation, base, unix }:
mkDerivation {
pname = "unix-compat";
@@ -212436,7 +213698,6 @@ self: {
libraryHaskellDepends = [ base unix ];
description = "Portable POSIX-compatibility layer";
license = stdenv.lib.licenses.bsd3;
- hydraPlatforms = stdenv.lib.platforms.none;
}) {};
"unix-fcntl" = callPackage
@@ -212587,8 +213848,8 @@ self: {
}:
mkDerivation {
pname = "unliftio";
- version = "0.2.7.0";
- sha256 = "0qql93lq5w7qghl454cc3s1i8v1jb4h08n82fqkw0kli4g3g9njs";
+ version = "0.2.7.1";
+ sha256 = "1rif0r52qw2g8kxnbxpcdsmy925py47f8gspfvkbp16nrpxk7k63";
libraryHaskellDepends = [
async base deepseq directory filepath process stm time transformers
unix unliftio-core
@@ -212601,14 +213862,33 @@ self: {
license = stdenv.lib.licenses.mit;
}) {};
+ "unliftio_0_2_8_0" = callPackage
+ ({ mkDerivation, async, base, deepseq, directory, filepath, hspec
+ , process, stm, time, transformers, unix, unliftio-core
+ }:
+ mkDerivation {
+ pname = "unliftio";
+ version = "0.2.8.0";
+ sha256 = "04i03j1ffa3babh0i79zzvxk7xnm4v8ci0mpfzc4dm7m65cwk1h5";
+ libraryHaskellDepends = [
+ async base deepseq directory filepath process stm time transformers
+ unix unliftio-core
+ ];
+ testHaskellDepends = [
+ async base deepseq directory filepath hspec process stm time
+ transformers unix unliftio-core
+ ];
+ description = "The MonadUnliftIO typeclass for unlifting monads to IO (batteries included)";
+ license = stdenv.lib.licenses.mit;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ }) {};
+
"unliftio-core" = callPackage
({ mkDerivation, base, transformers }:
mkDerivation {
pname = "unliftio-core";
- version = "0.1.1.0";
- sha256 = "1193fplsjm1lcr05xwvkj1rsyzx74i755f6kw3ikmxbsv0bv0l3m";
- revision = "1";
- editedCabalFile = "16bjwcsaghqqmyi69rq65dn3ydifyfaabq3ns37apdm00mwqbcj2";
+ version = "0.1.2.0";
+ sha256 = "0y3siyx3drkw7igs380a87h8qfbbgcyxxlcnshp698hcc4yqphr4";
libraryHaskellDepends = [ base transformers ];
description = "The MonadUnliftIO typeclass for unlifting monads to IO";
license = stdenv.lib.licenses.mit;
@@ -212958,8 +214238,8 @@ self: {
}:
mkDerivation {
pname = "unused";
- version = "0.8.0.0";
- sha256 = "1bs87ii03dydrcyx70drmbd1nrb5z1xj5bzrrqgbq2fzhh7rmb1n";
+ version = "0.9.0.0";
+ sha256 = "1qxz70a9gry1d4a2bgixssq29hkdvck3s0yccbjgksiy98rk463y";
isLibrary = true;
isExecutable = true;
enableSeparateDataOutput = true;
@@ -213039,6 +214319,16 @@ self: {
license = "unknown";
}) {};
+ "update-monad" = callPackage
+ ({ mkDerivation, base, mtl }:
+ mkDerivation {
+ pname = "update-monad";
+ version = "0.1.0.0";
+ sha256 = "0l6gbfw0rmhkk2iq3wd2zzyld2nvjmbrlg7rqqv962cahs5mydns";
+ libraryHaskellDepends = [ base mtl ];
+ license = stdenv.lib.licenses.bsd3;
+ }) {};
+
"update-nix-fetchgit" = callPackage
({ mkDerivation, aeson, ansi-wl-pprint, async, base, bytestring
, data-fix, errors, hnix, process, text, time, transformers
@@ -213826,17 +215116,6 @@ self: {
}) {};
"util" = callPackage
- ({ mkDerivation, base }:
- mkDerivation {
- pname = "util";
- version = "0.1.10.1";
- sha256 = "1z3k6x6ap1hjp53w9dnqx8d7pwpbgsabj3dlxcdg5pvr6m3ns184";
- libraryHaskellDepends = [ base ];
- description = "Utilities";
- license = stdenv.lib.licenses.bsd3;
- }) {};
-
- "util_0_1_11_0" = callPackage
({ mkDerivation, base }:
mkDerivation {
pname = "util";
@@ -213845,7 +215124,6 @@ self: {
libraryHaskellDepends = [ base ];
description = "Utilities";
license = stdenv.lib.licenses.bsd3;
- hydraPlatforms = stdenv.lib.platforms.none;
}) {};
"util-exception" = callPackage
@@ -213886,6 +215164,37 @@ self: {
license = stdenv.lib.licenses.bsd3;
}) {};
+ "util-primitive-control" = callPackage
+ ({ mkDerivation, base, control, primitive, smallcheck, tasty
+ , tasty-smallcheck, util
+ }:
+ mkDerivation {
+ pname = "util-primitive-control";
+ version = "0.1.0.0";
+ sha256 = "104p69sw8jyc2dvarv7573cks3p6fvk5d61qhp9y47nylp4q8iqx";
+ libraryHaskellDepends = [ base control primitive util ];
+ testHaskellDepends = [ base smallcheck tasty tasty-smallcheck ];
+ doHaddock = false;
+ description = "Utilities for stateful primitive types and types based on them";
+ license = stdenv.lib.licenses.bsd3;
+ }) {};
+
+ "util-universe" = callPackage
+ ({ mkDerivation, base, smallcheck, tasty, tasty-smallcheck
+ , universe-base, universe-instances-base
+ }:
+ mkDerivation {
+ pname = "util-universe";
+ version = "0.1.0.0";
+ sha256 = "1jpi5ic14knr3g8qmz6ls430ll4m9wi5ag1ngmlz46h1zlw53l8y";
+ libraryHaskellDepends = [
+ base universe-base universe-instances-base
+ ];
+ testHaskellDepends = [ base smallcheck tasty tasty-smallcheck ];
+ description = "Utilities for universal types";
+ license = stdenv.lib.licenses.bsd3;
+ }) {};
+
"utility-ht" = callPackage
({ mkDerivation, base, QuickCheck }:
mkDerivation {
@@ -214432,12 +215741,18 @@ self: {
}) {};
"validated-literals" = callPackage
- ({ mkDerivation, base, bytestring, template-haskell }:
+ ({ mkDerivation, base, bytestring, deepseq, tasty, tasty-hunit
+ , tasty-travis, template-haskell
+ }:
mkDerivation {
pname = "validated-literals";
- version = "0.2.0";
- sha256 = "0wd4dyv2gfmcxqbhmcil884bdcw8a1qw441280j7rrqy6fp442q2";
- libraryHaskellDepends = [ base bytestring template-haskell ];
+ version = "0.2.0.1";
+ sha256 = "0gvqsmyhcjf1l5a6vkhr7ffnw81l01y0dp05lzkmy8n177412pr4";
+ libraryHaskellDepends = [ base template-haskell ];
+ testHaskellDepends = [
+ base bytestring deepseq tasty tasty-hunit tasty-travis
+ template-haskell
+ ];
description = "Compile-time checking for partial smart-constructors";
license = stdenv.lib.licenses.bsd3;
hydraPlatforms = stdenv.lib.platforms.none;
@@ -214575,22 +215890,6 @@ self: {
}) {};
"validity-path" = callPackage
- ({ mkDerivation, base, filepath, genvalidity-hspec, hspec, path
- , validity
- }:
- mkDerivation {
- pname = "validity-path";
- version = "0.3.0.1";
- sha256 = "1mfd062p9wh63qnz4a06rj7179lyllfc97g60cmpnjspmcdgy1ky";
- libraryHaskellDepends = [ base filepath path validity ];
- testHaskellDepends = [
- base filepath genvalidity-hspec hspec path validity
- ];
- description = "Validity instances for Path";
- license = stdenv.lib.licenses.mit;
- }) {};
-
- "validity-path_0_3_0_2" = callPackage
({ mkDerivation, base, filepath, genvalidity-hspec, hspec, path
, validity
}:
@@ -214604,7 +215903,6 @@ self: {
];
description = "Validity instances for Path";
license = stdenv.lib.licenses.mit;
- hydraPlatforms = stdenv.lib.platforms.none;
}) {};
"validity-primitive" = callPackage
@@ -214619,17 +215917,6 @@ self: {
}) {};
"validity-scientific" = callPackage
- ({ mkDerivation, base, scientific, validity }:
- mkDerivation {
- pname = "validity-scientific";
- version = "0.2.0.1";
- sha256 = "1iphzdh9vqa51im1mx3sg7gpqczm39bcdc6li84lssyflg20kraw";
- libraryHaskellDepends = [ base scientific validity ];
- description = "Validity instances for scientific";
- license = stdenv.lib.licenses.mit;
- }) {};
-
- "validity-scientific_0_2_0_2" = callPackage
({ mkDerivation, base, scientific, validity }:
mkDerivation {
pname = "validity-scientific";
@@ -214638,21 +215925,9 @@ self: {
libraryHaskellDepends = [ base scientific validity ];
description = "Validity instances for scientific";
license = stdenv.lib.licenses.mit;
- hydraPlatforms = stdenv.lib.platforms.none;
}) {};
"validity-text" = callPackage
- ({ mkDerivation, base, bytestring, text, validity }:
- mkDerivation {
- pname = "validity-text";
- version = "0.3.0.1";
- sha256 = "0ccy6b21lxgqp9q2cmddip1r0axwh6ny4c2vrw1a16712yrhrcdf";
- libraryHaskellDepends = [ base bytestring text validity ];
- description = "Validity instances for text";
- license = stdenv.lib.licenses.mit;
- }) {};
-
- "validity-text_0_3_1_0" = callPackage
({ mkDerivation, base, bytestring, text, validity }:
mkDerivation {
pname = "validity-text";
@@ -214661,21 +215936,9 @@ self: {
libraryHaskellDepends = [ base bytestring text validity ];
description = "Validity instances for text";
license = stdenv.lib.licenses.mit;
- hydraPlatforms = stdenv.lib.platforms.none;
}) {};
"validity-time" = callPackage
- ({ mkDerivation, base, time, validity }:
- mkDerivation {
- pname = "validity-time";
- version = "0.2.0.1";
- sha256 = "1m8wsm97s7cwax183qsbmr8p010k9czigwlqbqr6qha3bk83n4bf";
- libraryHaskellDepends = [ base time validity ];
- description = "Validity instances for time";
- license = stdenv.lib.licenses.mit;
- }) {};
-
- "validity-time_0_2_0_2" = callPackage
({ mkDerivation, base, time, validity }:
mkDerivation {
pname = "validity-time";
@@ -214684,23 +215947,9 @@ self: {
libraryHaskellDepends = [ base time validity ];
description = "Validity instances for time";
license = stdenv.lib.licenses.mit;
- hydraPlatforms = stdenv.lib.platforms.none;
}) {};
"validity-unordered-containers" = callPackage
- ({ mkDerivation, base, hashable, unordered-containers, validity }:
- mkDerivation {
- pname = "validity-unordered-containers";
- version = "0.2.0.1";
- sha256 = "11pwrd1jbxdffw1lqq6zxgpgzvxrg4y01wnrn5bzwksiqzach742";
- libraryHaskellDepends = [
- base hashable unordered-containers validity
- ];
- description = "Validity instances for unordered-containers";
- license = stdenv.lib.licenses.mit;
- }) {};
-
- "validity-unordered-containers_0_2_0_2" = callPackage
({ mkDerivation, base, hashable, unordered-containers, validity }:
mkDerivation {
pname = "validity-unordered-containers";
@@ -214711,21 +215960,9 @@ self: {
];
description = "Validity instances for unordered-containers";
license = stdenv.lib.licenses.mit;
- hydraPlatforms = stdenv.lib.platforms.none;
}) {};
"validity-uuid" = callPackage
- ({ mkDerivation, base, uuid, validity }:
- mkDerivation {
- pname = "validity-uuid";
- version = "0.1.0.1";
- sha256 = "15lk4hig0j6xhz1b7m2hwpvyfwhlrvncgwb1830lpmgvvg18qb9n";
- libraryHaskellDepends = [ base uuid validity ];
- description = "Validity instances for uuid";
- license = stdenv.lib.licenses.mit;
- }) {};
-
- "validity-uuid_0_1_0_2" = callPackage
({ mkDerivation, base, uuid, validity }:
mkDerivation {
pname = "validity-uuid";
@@ -214734,21 +215971,9 @@ self: {
libraryHaskellDepends = [ base uuid validity ];
description = "Validity instances for uuid";
license = stdenv.lib.licenses.mit;
- hydraPlatforms = stdenv.lib.platforms.none;
}) {};
"validity-vector" = callPackage
- ({ mkDerivation, base, hashable, validity, vector }:
- mkDerivation {
- pname = "validity-vector";
- version = "0.2.0.1";
- sha256 = "0ljihk6qdb52c44hf39wigf3b0f0xs1z7adgxg4fqfxq8zq2a3k4";
- libraryHaskellDepends = [ base hashable validity vector ];
- description = "Validity instances for vector";
- license = stdenv.lib.licenses.mit;
- }) {};
-
- "validity-vector_0_2_0_2" = callPackage
({ mkDerivation, base, hashable, validity, vector }:
mkDerivation {
pname = "validity-vector";
@@ -214757,7 +215982,6 @@ self: {
libraryHaskellDepends = [ base hashable validity vector ];
description = "Validity instances for vector";
license = stdenv.lib.licenses.mit;
- hydraPlatforms = stdenv.lib.platforms.none;
}) {};
"valor" = callPackage
@@ -215270,26 +216494,6 @@ self: {
}) {};
"vector-algorithms" = callPackage
- ({ mkDerivation, base, bytestring, containers, primitive
- , QuickCheck, vector
- }:
- mkDerivation {
- pname = "vector-algorithms";
- version = "0.7.0.1";
- sha256 = "0w4hf598lpxfg58rnimcqxrbnpqq2jmpjx82qa5md3q6r90hlipd";
- revision = "2";
- editedCabalFile = "186nxwg02m16v68gi186f0z99cafp4g87flhfccnzlrvshlfb83m";
- isLibrary = true;
- isExecutable = true;
- libraryHaskellDepends = [ base bytestring primitive vector ];
- testHaskellDepends = [
- base bytestring containers QuickCheck vector
- ];
- description = "Efficient algorithms for vector arrays";
- license = stdenv.lib.licenses.bsd3;
- }) {};
-
- "vector-algorithms_0_7_0_4" = callPackage
({ mkDerivation, base, bytestring, containers, primitive
, QuickCheck, vector
}:
@@ -215305,7 +216509,6 @@ self: {
];
description = "Efficient algorithms for vector arrays";
license = stdenv.lib.licenses.bsd3;
- hydraPlatforms = stdenv.lib.platforms.none;
}) {};
"vector-binary" = callPackage
@@ -215580,11 +216783,25 @@ self: {
pname = "vector-space";
version = "0.13";
sha256 = "05yn93vnhzhpp2i6qb4b3dasvmpk71rab6vhssqvpb3qhdvxb482";
+ revision = "1";
+ editedCabalFile = "0iakf0srv3lpkyjvivj7w5swv2ybwas0kx59igkq2b7bwp0y82wn";
libraryHaskellDepends = [ base Boolean MemoTrie NumInstances ];
description = "Vector & affine spaces, linear maps, and derivatives";
license = stdenv.lib.licenses.bsd3;
}) {};
+ "vector-space_0_14" = callPackage
+ ({ mkDerivation, base, Boolean, MemoTrie, NumInstances }:
+ mkDerivation {
+ pname = "vector-space";
+ version = "0.14";
+ sha256 = "1kfziqdnsjr540y8iajpfmdkarhmjnc5xm897bswjhrpgyh2k6h3";
+ libraryHaskellDepends = [ base Boolean MemoTrie NumInstances ];
+ description = "Vector & affine spaces, linear maps, and derivatives";
+ license = stdenv.lib.licenses.bsd3;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ }) {};
+
"vector-space-map" = callPackage
({ mkDerivation, base, containers, doctest, vector-space }:
mkDerivation {
@@ -216013,6 +217230,25 @@ self: {
license = stdenv.lib.licenses.bsd3;
}) {};
+ "viewprof_0_0_0_23" = callPackage
+ ({ mkDerivation, base, brick, containers, directory, ghc-prof, lens
+ , scientific, text, vector, vector-algorithms, vty
+ }:
+ mkDerivation {
+ pname = "viewprof";
+ version = "0.0.0.23";
+ sha256 = "0nxivlnzvnhsk9gn2d7x240n7803fy14pb5knjkxvsw0h0pj8kc6";
+ isLibrary = false;
+ isExecutable = true;
+ executableHaskellDepends = [
+ base brick containers directory ghc-prof lens scientific text
+ vector vector-algorithms vty
+ ];
+ description = "Text-based interactive GHC .prof viewer";
+ license = stdenv.lib.licenses.bsd3;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ }) {};
+
"views" = callPackage
({ mkDerivation, base, mtl }:
mkDerivation {
@@ -216164,18 +217400,20 @@ self: {
license = stdenv.lib.licenses.mit;
}) {};
- "vinyl_0_9_3" = callPackage
- ({ mkDerivation, array, base, criterion, doctest, ghc-prim, hspec
- , lens, linear, microlens, mwc-random, primitive
- , should-not-typecheck, singletons, tagged, vector
+ "vinyl_0_10_0" = callPackage
+ ({ mkDerivation, aeson, array, base, criterion, doctest, ghc-prim
+ , hspec, lens, lens-aeson, linear, microlens, mtl, mwc-random
+ , primitive, should-not-typecheck, singletons, tagged, text
+ , unordered-containers, vector
}:
mkDerivation {
pname = "vinyl";
- version = "0.9.3";
- sha256 = "1sxkkmnq7vl5bmpljs3riaqb2kqpx1kkkllqiz4zawmhw6wmw1nj";
+ version = "0.10.0";
+ sha256 = "1d1lm9mi9gkcaw0lczbmbn81c3kc5yji3jbp2rjabiwhyi61mj4m";
libraryHaskellDepends = [ array base ghc-prim ];
testHaskellDepends = [
- base doctest hspec lens microlens should-not-typecheck singletons
+ aeson base doctest hspec lens lens-aeson microlens mtl
+ should-not-typecheck singletons text unordered-containers vector
];
benchmarkHaskellDepends = [
base criterion linear microlens mwc-random primitive tagged vector
@@ -216192,8 +217430,8 @@ self: {
}:
mkDerivation {
pname = "vinyl-gl";
- version = "0.3.3";
- sha256 = "09nd2v7550ivgjfby3kd27rf4b5b5ih8l7nx6v5h7r9s42vadb0r";
+ version = "0.3.4";
+ sha256 = "1r4vpilk8l0fm1v5n5lz27l57ciglbr82g5wsj3g4j7rghr14jpf";
libraryHaskellDepends = [
base containers GLUtil linear OpenGL tagged transformers vector
vinyl
@@ -216513,8 +217751,8 @@ self: {
}:
mkDerivation {
pname = "voicebase";
- version = "0.1.1.1";
- sha256 = "1nc2cmfmdalggb7f9xw4xrhms31cky478wxxkq50as6bryl3k3q3";
+ version = "0.1.1.2";
+ sha256 = "1kw988gbx9vvrfybz3k1qxm3hyqxrfi0dyy5iwmq191y7x2scbj6";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [
@@ -216681,7 +217919,7 @@ self: {
license = stdenv.lib.licenses.bsd3;
}) {};
- "vty_5_23_1" = callPackage
+ "vty_5_24" = callPackage
({ mkDerivation, base, blaze-builder, bytestring, Cabal, containers
, deepseq, directory, filepath, hashable, HUnit, microlens
, microlens-mtl, microlens-th, mtl, parallel, parsec, QuickCheck
@@ -216692,8 +217930,8 @@ self: {
}:
mkDerivation {
pname = "vty";
- version = "5.23.1";
- sha256 = "1cd328prv1pddza87a2kfh93l101jg1afs5s951yhr9z93mgd7d9";
+ version = "5.24";
+ sha256 = "177yj12cgvmiq62z7kdkqbhmr98awyi3njp1xsbdr3p81k5arwrw";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [
@@ -217101,36 +218339,6 @@ self: {
}) {};
"wai-extra" = callPackage
- ({ mkDerivation, aeson, ansi-terminal, base, base64-bytestring
- , bytestring, case-insensitive, containers, cookie
- , data-default-class, deepseq, directory, fast-logger, hspec
- , http-types, HUnit, iproute, lifted-base, network, old-locale
- , resourcet, streaming-commons, stringsearch, text, time
- , transformers, unix, unix-compat, vault, void, wai, wai-logger
- , word8, zlib
- }:
- mkDerivation {
- pname = "wai-extra";
- version = "3.0.24.1";
- sha256 = "0bb6837cgq4p9sn3mkaf6p9kf57k0mvkdjcc1vsnj87nvphls604";
- isLibrary = true;
- isExecutable = true;
- libraryHaskellDepends = [
- aeson ansi-terminal base base64-bytestring bytestring
- case-insensitive containers cookie data-default-class deepseq
- directory fast-logger http-types iproute lifted-base network
- old-locale resourcet streaming-commons stringsearch text time
- transformers unix unix-compat vault void wai wai-logger word8 zlib
- ];
- testHaskellDepends = [
- base bytestring case-insensitive cookie fast-logger hspec
- http-types HUnit resourcet text time transformers wai zlib
- ];
- description = "Provides some basic WAI handlers and middleware";
- license = stdenv.lib.licenses.mit;
- }) {};
-
- "wai-extra_3_0_24_2" = callPackage
({ mkDerivation, aeson, ansi-terminal, base, base64-bytestring
, bytestring, case-insensitive, containers, cookie
, data-default-class, deepseq, directory, fast-logger, hspec
@@ -217158,7 +218366,6 @@ self: {
];
description = "Provides some basic WAI handlers and middleware";
license = stdenv.lib.licenses.mit;
- hydraPlatforms = stdenv.lib.platforms.none;
}) {};
"wai-frontend-monadcgi" = callPackage
@@ -218664,6 +219871,41 @@ self: {
license = stdenv.lib.licenses.mit;
}) {};
+ "warp_3_2_25" = callPackage
+ ({ mkDerivation, array, async, auto-update, base, bsb-http-chunked
+ , bytestring, case-insensitive, containers, directory, doctest
+ , gauge, ghc-prim, hashable, hspec, http-client, http-date
+ , http-types, http2, HUnit, iproute, lifted-base, network, process
+ , QuickCheck, silently, simple-sendfile, stm, streaming-commons
+ , text, time, transformers, unix, unix-compat, vault, wai, word8
+ }:
+ mkDerivation {
+ pname = "warp";
+ version = "3.2.25";
+ sha256 = "0rl59bs99c3wwwyc1ibq0v11mkc7pxpy28r9hdlmjsqmdwn8y2vy";
+ libraryHaskellDepends = [
+ array async auto-update base bsb-http-chunked bytestring
+ case-insensitive containers ghc-prim hashable http-date http-types
+ http2 iproute network simple-sendfile stm streaming-commons text
+ unix unix-compat vault wai word8
+ ];
+ testHaskellDepends = [
+ array async auto-update base bsb-http-chunked bytestring
+ case-insensitive containers directory doctest ghc-prim hashable
+ hspec http-client http-date http-types http2 HUnit iproute
+ lifted-base network process QuickCheck silently simple-sendfile stm
+ streaming-commons text time transformers unix unix-compat vault wai
+ word8
+ ];
+ benchmarkHaskellDepends = [
+ auto-update base bytestring containers gauge hashable http-date
+ http-types network unix unix-compat
+ ];
+ description = "A fast, light-weight web server for WAI applications";
+ license = stdenv.lib.licenses.mit;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ }) {};
+
"warp-dynamic" = callPackage
({ mkDerivation, base, data-default, dyre, http-types, wai, warp }:
mkDerivation {
@@ -218681,6 +219923,22 @@ self: {
hydraPlatforms = stdenv.lib.platforms.none;
}) {};
+ "warp-grpc" = callPackage
+ ({ mkDerivation, async, base, binary, bytestring, case-insensitive
+ , http-types, http2-grpc-types, proto-lens, wai, warp, warp-tls
+ }:
+ mkDerivation {
+ pname = "warp-grpc";
+ version = "0.1.0.3";
+ sha256 = "1x40jskp4c2dj4w3pfrw4f3ys9c64nlas2068s7zl05qayw21srf";
+ libraryHaskellDepends = [
+ async base binary bytestring case-insensitive http-types
+ http2-grpc-types proto-lens wai warp warp-tls
+ ];
+ description = "A minimal gRPC server on top of Warp";
+ license = stdenv.lib.licenses.bsd3;
+ }) {};
+
"warp-static" = callPackage
({ mkDerivation, base, bytestring, cmdargs, containers, directory
, mime-types, text, wai-app-static, wai-extra, warp
@@ -220434,8 +221692,8 @@ self: {
({ mkDerivation, aeson, base, bytestring, utf8-string }:
mkDerivation {
pname = "wilton-ffi";
- version = "0.2.0.0";
- sha256 = "1n2cgf0cnpr7f9rgf2369qnz3mm1qvylpzncc7s42vcrrq4x3wj7";
+ version = "0.3.0.2";
+ sha256 = "1qnsdj9676ifg9z67qdzblsszrzvhihwaww4s03jpy2324q42qhk";
libraryHaskellDepends = [ aeson base bytestring utf8-string ];
description = "Haskell modules support for Wilton JavaScript runtime";
license = stdenv.lib.licenses.mit;
@@ -220504,35 +221762,35 @@ self: {
({ mkDerivation, aeson, base, binary, bytestring, cassava
, containers, cpu, deepseq, directory, gauge, hashable, megaparsec
, mtl, prettyprinter, prettyprinter-ansi-terminal, QuickCheck
- , scientific, serialise, text, transformers, unordered-containers
- , vector
+ , scientific, semigroups, serialise, text, time, transformers
+ , unordered-containers, vector
}:
mkDerivation {
pname = "winery";
- version = "0.2.1";
- sha256 = "09j7s44j5v6754g1v10yvmb7l9azn2p738x3c4p1iv6qlwghilbj";
+ version = "0.3.1";
+ sha256 = "1f63fgw7ky6kd0dk41rhqjxgvi33pa5ffrv0vk2i7dr88bmc1wgy";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [
aeson base bytestring containers cpu hashable megaparsec mtl
- prettyprinter prettyprinter-ansi-terminal scientific text
- transformers unordered-containers vector
+ prettyprinter prettyprinter-ansi-terminal scientific semigroups
+ text time transformers unordered-containers vector
];
executableHaskellDepends = [
aeson base bytestring containers cpu hashable megaparsec mtl
- prettyprinter prettyprinter-ansi-terminal scientific text
- transformers unordered-containers vector
+ prettyprinter prettyprinter-ansi-terminal scientific semigroups
+ text time transformers unordered-containers vector
];
testHaskellDepends = [
aeson base bytestring containers cpu hashable megaparsec mtl
prettyprinter prettyprinter-ansi-terminal QuickCheck scientific
- text transformers unordered-containers vector
+ semigroups text time transformers unordered-containers vector
];
benchmarkHaskellDepends = [
aeson base binary bytestring cassava containers cpu deepseq
directory gauge hashable megaparsec mtl prettyprinter
- prettyprinter-ansi-terminal scientific serialise text transformers
- unordered-containers vector
+ prettyprinter-ansi-terminal scientific semigroups serialise text
+ time transformers unordered-containers vector
];
description = "Sustainable serialisation library";
license = stdenv.lib.licenses.bsd3;
@@ -222926,6 +224184,23 @@ self: {
license = stdenv.lib.licenses.bsd3;
}) {};
+ "xml-basic_0_1_3_1" = callPackage
+ ({ mkDerivation, base, containers, data-accessor
+ , explicit-exception, semigroups, utility-ht
+ }:
+ mkDerivation {
+ pname = "xml-basic";
+ version = "0.1.3.1";
+ sha256 = "1qm3g00zavdal1f1yj2jrg7lb6b845fbf63b4pym5p49wkw3yx4d";
+ libraryHaskellDepends = [
+ base containers data-accessor explicit-exception semigroups
+ utility-ht
+ ];
+ description = "Basics for XML/HTML representation and processing";
+ license = stdenv.lib.licenses.bsd3;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ }) {};
+
"xml-catalog" = callPackage
({ mkDerivation, base, bytestring, conduit, containers, text
, transformers, uri-conduit, xml-conduit
@@ -223885,16 +225160,12 @@ self: {
}) {};
"xmonad-spotify" = callPackage
- ({ mkDerivation, base, containers, dbus, X11, xmonad
- , xmonad-contrib
- }:
+ ({ mkDerivation, base, containers, dbus, X11 }:
mkDerivation {
pname = "xmonad-spotify";
- version = "0.1.0.0";
- sha256 = "1sl26ffaklasgyns8iz4jwm4736vfkflcv3gayn9bvb1kfr6g7rm";
- libraryHaskellDepends = [
- base containers dbus X11 xmonad xmonad-contrib
- ];
+ version = "0.1.0.1";
+ sha256 = "11j2kd3l8yh3fn7smcggmi8jv66x80df52vwa7kmxchbsxf5qrpi";
+ libraryHaskellDepends = [ base containers dbus X11 ];
description = "Bind media keys to work with Spotify";
license = stdenv.lib.licenses.bsd3;
}) {};
@@ -223938,14 +225209,14 @@ self: {
"xmonad-volume" = callPackage
({ mkDerivation, alsa-mixer, base, composition-prelude, containers
- , X11, xmonad
+ , X11
}:
mkDerivation {
pname = "xmonad-volume";
- version = "0.1.0.0";
- sha256 = "0n517ddbjpy6ylg3d1amz7asgc6sww2yy0bxasp0xsd40jc77cfx";
+ version = "0.1.0.1";
+ sha256 = "0lv1009d8w2xyx98c6g65z4mxp31jz79lqayvdw26a02kq63cild";
libraryHaskellDepends = [
- alsa-mixer base composition-prelude containers X11 xmonad
+ alsa-mixer base composition-prelude containers X11
];
description = "XMonad volume controls";
license = stdenv.lib.licenses.bsd3;
@@ -224625,15 +225896,15 @@ self: {
"yaml" = callPackage
({ mkDerivation, aeson, attoparsec, base, base-compat, bytestring
- , conduit, containers, directory, filepath, hspec, HUnit, libyaml
- , mockery, resourcet, scientific, semigroups, template-haskell
- , temporary, text, transformers, unordered-containers, vector
+ , conduit, containers, directory, filepath, hspec, HUnit, mockery
+ , resourcet, scientific, semigroups, template-haskell, temporary
+ , text, transformers, unordered-containers, vector
}:
mkDerivation {
pname = "yaml";
version = "0.8.32";
sha256 = "0cbsyh4ilvjzq1q7pxls43k6pdqxg1l85xzibcwpbvmlvrizh86w";
- configureFlags = [ "-fsystem-libyaml" ];
+ configureFlags = [ "-f-system-libyaml" ];
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [
@@ -224641,7 +225912,6 @@ self: {
filepath resourcet scientific semigroups template-haskell text
transformers unordered-containers vector
];
- librarySystemDepends = [ libyaml ];
testHaskellDepends = [
aeson attoparsec base base-compat bytestring conduit containers
directory filepath hspec HUnit mockery resourcet scientific
@@ -224650,32 +225920,32 @@ self: {
];
description = "Support for parsing and rendering YAML documents";
license = stdenv.lib.licenses.bsd3;
- }) {inherit (pkgs) libyaml;};
+ }) {};
- "yaml_0_10_0" = callPackage
+ "yaml_0_10_1_1" = callPackage
({ mkDerivation, aeson, attoparsec, base, base-compat, bytestring
, conduit, containers, directory, filepath, hspec, HUnit, libyaml
- , mockery, mtl, raw-strings-qq, resourcet, scientific, semigroups
+ , mockery, mtl, raw-strings-qq, resourcet, scientific
, template-haskell, temporary, text, transformers
, unordered-containers, vector
}:
mkDerivation {
pname = "yaml";
- version = "0.10.0";
- sha256 = "0kyfzcp3hlb44rpf28ipz0m5cpanj91hlhvr9kidvg71826s9xcm";
+ version = "0.10.1.1";
+ sha256 = "1rbmflr1yfcg147v544laq9vybn4kidjlc7v96ddaamx8sg32192";
configureFlags = [ "-fsystem-libyaml" ];
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [
aeson attoparsec base bytestring conduit containers directory
- filepath mtl resourcet scientific semigroups template-haskell text
+ filepath mtl resourcet scientific template-haskell text
transformers unordered-containers vector
];
librarySystemDepends = [ libyaml ];
testHaskellDepends = [
aeson attoparsec base base-compat bytestring conduit containers
directory filepath hspec HUnit mockery mtl raw-strings-qq resourcet
- scientific semigroups template-haskell temporary text transformers
+ scientific template-haskell temporary text transformers
unordered-containers vector
];
description = "Support for parsing and rendering YAML documents";
@@ -227399,6 +228669,22 @@ self: {
hydraPlatforms = stdenv.lib.platforms.none;
}) {};
+ "yggdrasil" = callPackage
+ ({ mkDerivation, base, cryptonite, hspec, memory, mtl, QuickCheck
+ , transformers
+ }:
+ mkDerivation {
+ pname = "yggdrasil";
+ version = "0.1.0.0";
+ sha256 = "1w1nlas5fb7zmd0kvzb68ihylpsg7pf084vd1xk60l6n60cc9m4j";
+ libraryHaskellDepends = [
+ base cryptonite memory mtl transformers
+ ];
+ testHaskellDepends = [ base cryptonite hspec QuickCheck ];
+ description = "Executable specifications of composable cryptographic protocols";
+ license = stdenv.lib.licenses.agpl3;
+ }) {};
+
"yhccore" = callPackage
({ mkDerivation, base, containers, mtl, pretty, uniplate }:
mkDerivation {
diff --git a/pkgs/development/haskell-modules/make-package-set.nix b/pkgs/development/haskell-modules/make-package-set.nix
index 608fb3625b2..b33b29e82ef 100644
--- a/pkgs/development/haskell-modules/make-package-set.nix
+++ b/pkgs/development/haskell-modules/make-package-set.nix
@@ -177,19 +177,22 @@ in package-set { inherit pkgs stdenv callPackage; } self // {
callHackage = name: version: callPackageKeepDeriver (self.hackage2nix name version);
# Creates a Haskell package from a source package by calling cabal2nix on the source.
- callCabal2nix = name: src: args: let
- filter = path: type:
- pkgs.lib.hasSuffix "${name}.cabal" path ||
- baseNameOf path == "package.yaml";
- expr = self.haskellSrc2nix {
- inherit name;
- src = if pkgs.lib.canCleanSource src
- then pkgs.lib.cleanSourceWith { inherit src filter; }
- else src;
- };
- in overrideCabal (callPackageKeepDeriver expr args) (orig: {
- inherit src;
- });
+ callCabal2nixWithOptions = name: src: extraCabal2nixOptions: args:
+ let
+ filter = path: type:
+ pkgs.lib.hasSuffix "${name}.cabal" path ||
+ baseNameOf path == "package.yaml";
+ expr = self.haskellSrc2nix {
+ inherit name extraCabal2nixOptions;
+ src = if pkgs.lib.canCleanSource src
+ then pkgs.lib.cleanSourceWith { inherit src filter; }
+ else src;
+ };
+ in overrideCabal (callPackageKeepDeriver expr args) (orig: {
+ inherit src;
+ });
+
+ callCabal2nix = name: src: args: self.callCabal2nixWithOptions name src "" args;
# : { root : Path
# , source-overrides : Defaulted (Either Path VersionNumber)
diff --git a/pkgs/development/interpreters/joker/default.nix b/pkgs/development/interpreters/joker/default.nix
index 5b8ae7e9ecc..1342d6c34d2 100644
--- a/pkgs/development/interpreters/joker/default.nix
+++ b/pkgs/development/interpreters/joker/default.nix
@@ -2,7 +2,7 @@
buildGoPackage rec {
name = "joker-${version}";
- version = "0.9.5";
+ version = "0.9.7";
goPackagePath = "github.com/candid82/joker";
@@ -10,7 +10,7 @@ buildGoPackage rec {
rev = "v${version}";
owner = "candid82";
repo = "joker";
- sha256 = "1sgxz0z6p92k1rhs5095l952a2db5w9yb2jy6cgglxw2arihxxb7";
+ sha256 = "0fl04xdpqmr5xpd4pvj72gdy3v1fr9z6h3ja7dmkama8fw2x4diz";
};
preBuild = "go generate ./...";
diff --git a/pkgs/development/interpreters/racket/default.nix b/pkgs/development/interpreters/racket/default.nix
index e8b6cc93c2c..1f2a28cb8fb 100644
--- a/pkgs/development/interpreters/racket/default.nix
+++ b/pkgs/development/interpreters/racket/default.nix
@@ -36,7 +36,7 @@ in
stdenv.mkDerivation rec {
name = "racket-${version}";
- version = "7.0";
+ version = "7.0"; # always change at once with ./minimal.nix
src = (stdenv.lib.makeOverridable ({ name, sha256 }:
fetchurl rec {
diff --git a/pkgs/development/interpreters/spidermonkey/52.nix b/pkgs/development/interpreters/spidermonkey/52.nix
index ecbb1abb40c..7c6844fdec0 100644
--- a/pkgs/development/interpreters/spidermonkey/52.nix
+++ b/pkgs/development/interpreters/spidermonkey/52.nix
@@ -45,7 +45,7 @@ in stdenv.mkDerivation rec {
"--with-intl-api"
"--enable-readline"
"--enable-shared-js"
- ];
+ ] ++ stdenv.lib.optional stdenv.hostPlatform.isMusl "--disable-jemalloc";
enableParallelBuilding = true;
diff --git a/pkgs/development/libraries/appstream-glib/default.nix b/pkgs/development/libraries/appstream-glib/default.nix
index 48dfe9ad894..39b3d6aba6b 100644
--- a/pkgs/development/libraries/appstream-glib/default.nix
+++ b/pkgs/development/libraries/appstream-glib/default.nix
@@ -4,7 +4,7 @@
, libuuid, json-glib, meson, gperf, ninja
}:
stdenv.mkDerivation rec {
- name = "appstream-glib-0.7.10";
+ name = "appstream-glib-0.7.12";
outputs = [ "out" "dev" "man" "installedTests" ];
outputBin = "dev";
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
owner = "hughsie";
repo = "appstream-glib";
rev = stdenv.lib.replaceStrings ["." "-"] ["_" "_"] name;
- sha256 = "1m4gww09id7hwzh4hri1y3hp7p0mdrf6fk9f924r2w66hlsdil0d";
+ sha256 = "0kqhm3j0nmf9pp9mpykzs2hg3nr6126ibrq1ap21hpasnq4rzlax";
};
nativeBuildInputs = [
diff --git a/pkgs/development/libraries/asio/generic.nix b/pkgs/development/libraries/asio/generic.nix
index 58dd4f61423..72305cb633f 100644
--- a/pkgs/development/libraries/asio/generic.nix
+++ b/pkgs/development/libraries/asio/generic.nix
@@ -20,6 +20,7 @@ stdenv.mkDerivation {
homepage = http://asio.sourceforge.net/;
description = "Cross-platform C++ library for network and low-level I/O programming";
license = licenses.boost;
+ broken = stdenv.isDarwin; # test when updating to >=1.12.1
platforms = platforms.unix;
};
}
diff --git a/pkgs/development/libraries/bullet/default.nix b/pkgs/development/libraries/bullet/default.nix
index 4d94faa9566..fca5e8d70a3 100644
--- a/pkgs/development/libraries/bullet/default.nix
+++ b/pkgs/development/libraries/bullet/default.nix
@@ -1,4 +1,6 @@
-{ stdenv, fetchFromGitHub, cmake, libGLU_combined, freeglut, darwin }:
+{ stdenv, fetchFromGitHub, cmake, libGLU_combined, freeglut
+, Cocoa, OpenGL
+}:
stdenv.mkDerivation rec {
name = "bullet-${version}";
@@ -11,10 +13,9 @@ stdenv.mkDerivation rec {
sha256 = "1msp7w3563vb43w70myjmqsdb97kna54dcfa7yvi9l3bvamb92w3";
};
- buildInputs = [ cmake ] ++
- (if stdenv.isDarwin
- then with darwin.apple_sdk.frameworks; [ Cocoa OpenGL ]
- else [libGLU_combined freeglut]);
+ nativeBuildInputs = [ cmake ];
+ buildInputs = stdenv.lib.optionals stdenv.isLinux [ libGLU_combined freeglut ]
+ ++ stdenv.lib.optionals stdenv.isDarwin [ Cocoa OpenGL ];
patches = [ ./gwen-narrowing.patch ];
@@ -28,25 +29,26 @@ stdenv.mkDerivation rec {
"-DBUILD_CPU_DEMOS=OFF"
"-DINSTALL_EXTRA_LIBS=ON"
] ++ stdenv.lib.optionals stdenv.isDarwin [
- "-DMACOSX_DEPLOYMENT_TARGET=\"10.9\""
"-DOPENGL_FOUND=true"
- "-DOPENGL_LIBRARIES=${darwin.apple_sdk.frameworks.OpenGL}/Library/Frameworks/OpenGL.framework"
- "-DOPENGL_INCLUDE_DIR=${darwin.apple_sdk.frameworks.OpenGL}/Library/Frameworks/OpenGL.framework"
- "-DOPENGL_gl_LIBRARY=${darwin.apple_sdk.frameworks.OpenGL}/Library/Frameworks/OpenGL.framework"
- "-DCOCOA_LIBRARY=${darwin.apple_sdk.frameworks.Cocoa}/Library/Frameworks/Cocoa.framework"
+ "-DOPENGL_LIBRARIES=${OpenGL}/Library/Frameworks/OpenGL.framework"
+ "-DOPENGL_INCLUDE_DIR=${OpenGL}/Library/Frameworks/OpenGL.framework"
+ "-DOPENGL_gl_LIBRARY=${OpenGL}/Library/Frameworks/OpenGL.framework"
+ "-DCOCOA_LIBRARY=${Cocoa}/Library/Frameworks/Cocoa.framework"
+ "-DBUILD_BULLET2_DEMOS=OFF"
+ "-DBUILD_UNIT_TESTS=OFF"
];
enableParallelBuilding = true;
- meta = {
+ meta = with stdenv.lib; {
description = "A professional free 3D Game Multiphysics Library";
longDescription = ''
Bullet 3D Game Multiphysics Library provides state of the art collision
detection, soft body and rigid body dynamics.
'';
homepage = http://bulletphysics.org;
- license = stdenv.lib.licenses.zlib;
- maintainers = with stdenv.lib.maintainers; [ aforemny ];
- platforms = with stdenv.lib.platforms; unix;
+ license = licenses.zlib;
+ maintainers = with maintainers; [ aforemny ];
+ platforms = platforms.unix;
};
}
diff --git a/pkgs/development/libraries/ceres-solver/default.nix b/pkgs/development/libraries/ceres-solver/default.nix
index 432e49c4354..043b9e263d8 100644
--- a/pkgs/development/libraries/ceres-solver/default.nix
+++ b/pkgs/development/libraries/ceres-solver/default.nix
@@ -2,7 +2,7 @@
, eigen
, fetchurl
, cmake
-, google-gflags ? null
+, google-gflags
, glog
, runTests ? false
}:
@@ -21,7 +21,13 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ cmake ];
buildInputs = [ eigen glog ]
- ++ stdenv.lib.optional (google-gflags != null) google-gflags;
+ ++ stdenv.lib.optional runTests google-gflags;
+
+ # The Basel BUILD file conflicts with the cmake build directory on
+ # case-insensitive filesystems, eg. darwin.
+ preConfigure = ''
+ rm BUILD
+ '';
doCheck = runTests;
diff --git a/pkgs/development/libraries/csfml/default.nix b/pkgs/development/libraries/csfml/default.nix
index 8f66b65e49a..6ec18b9514d 100644
--- a/pkgs/development/libraries/csfml/default.nix
+++ b/pkgs/development/libraries/csfml/default.nix
@@ -25,7 +25,6 @@ stdenv.mkDerivation {
'';
license = licenses.zlib;
maintainers = [ maintainers.jpdoyle ];
-
- platforms = platforms.linux ++ platforms.darwin;
+ platforms = platforms.linux;
};
}
diff --git a/pkgs/development/libraries/elf-header/default.nix b/pkgs/development/libraries/elf-header/default.nix
new file mode 100644
index 00000000000..48e5b73d9e7
--- /dev/null
+++ b/pkgs/development/libraries/elf-header/default.nix
@@ -0,0 +1,43 @@
+{ stdenvNoCC, lib, glibc, musl }:
+
+let
+ libc =
+ if stdenvNoCC.targetPlatform.isMusl
+ then musl
+ else glibc;
+ headerPath =
+ if stdenvNoCC.targetPlatform.isMusl
+ then "musl-${libc.version}/include/elf.h"
+ else "glibc-${libc.version}/elf/elf.h";
+in
+
+stdenvNoCC.mkDerivation {
+ name = "elf-header";
+ inherit (libc) version;
+
+ src = null;
+
+ unpackPhase = "true";
+
+ dontBuild = true;
+
+ installPhase = ''
+ mkdir -p "$out/include";
+ tar -xf \
+ ${lib.escapeShellArg libc.src} \
+ ${lib.escapeShellArg headerPath} \
+ --to-stdout \
+ | sed -e '/features\.h/d' \
+ > "$out/include/elf.h"
+ '';
+
+ meta = libc.meta // {
+ description = "The datastructures of ELF according to the target platform's libc";
+ longDescription = ''
+ The Executable and Linkable Format (ELF, formerly named Extensible Linking
+ Format), is usually defined in a header like this.
+ '';
+ platforms = lib.platforms.all;
+ maintainers = [ lib.maintainers.ericson2314 ];
+ };
+}
diff --git a/pkgs/development/libraries/flatpak/default.nix b/pkgs/development/libraries/flatpak/default.nix
index 6591b13834e..c8cd420f6e7 100644
--- a/pkgs/development/libraries/flatpak/default.nix
+++ b/pkgs/development/libraries/flatpak/default.nix
@@ -1,27 +1,32 @@
{ stdenv, fetchurl, autoreconfHook, docbook_xml_dtd_412, docbook_xml_dtd_42, docbook_xml_dtd_43, docbook_xsl, which, libxml2
-, gobjectIntrospection, gtk-doc, intltool, libxslt, pkgconfig, xmlto, appstream-glib, substituteAll, glibcLocales, yacc
+, gobjectIntrospection, gtk-doc, intltool, libxslt, pkgconfig, xmlto, appstream-glib, substituteAll, glibcLocales, yacc, xdg-dbus-proxy, p11-kit
, bubblewrap, bzip2, dbus, glib, gpgme, json-glib, libarchive, libcap, libseccomp, coreutils, python2, hicolor-icon-theme
, libsoup, lzma, ostree, polkit, python3, systemd, xorg, valgrind, glib-networking, makeWrapper, gnome3 }:
let
- version = "0.99.3";
+ version = "1.0.2";
desktop_schemas = gnome3.gsettings-desktop-schemas;
in stdenv.mkDerivation rec {
name = "flatpak-${version}";
+ # TODO: split out lib once we figure out what to do with triggerdir
outputs = [ "out" "man" "doc" "installedTests" ];
src = fetchurl {
url = "https://github.com/flatpak/flatpak/releases/download/${version}/${name}.tar.xz";
- sha256 = "0wd6ix1qyz8wmjkfrmr6j99gwywqs7ak1ilsn1ljp72g2z449ayk";
+ sha256 = "0d0nnymb4p3njc24j0p6f74x7cdfi7jac714gxzzz5y5lrd651gn";
};
patches = [
(substituteAll {
src = ./fix-test-paths.patch;
- inherit coreutils python2 glibcLocales;
+ inherit coreutils glibcLocales;
hicolorIconTheme = hicolor-icon-theme;
})
+ (substituteAll {
+ src = ./fix-paths.patch;
+ p11 = p11-kit;
+ })
# patch taken from gtk_doc
./respect-xml-catalog-files-var.patch
./use-flatpak-from-path.patch
@@ -30,7 +35,7 @@ in stdenv.mkDerivation rec {
nativeBuildInputs = [
autoreconfHook libxml2 docbook_xml_dtd_412 docbook_xml_dtd_42 docbook_xml_dtd_43 docbook_xsl which gobjectIntrospection
gtk-doc intltool libxslt pkgconfig xmlto appstream-glib yacc makeWrapper
- ] ++ stdenv.lib.optionals doCheck checkInputs;
+ ];
buildInputs = [
bubblewrap bzip2 dbus glib gpgme json-glib libarchive libcap libseccomp
@@ -45,6 +50,7 @@ in stdenv.mkDerivation rec {
configureFlags = [
"--with-system-bubblewrap=${bubblewrap}/bin/bwrap"
+ "--with-system-dbus-proxy=${xdg-dbus-proxy}/bin/xdg-dbus-proxy"
"--localstatedir=/var"
"--enable-installed-tests"
];
diff --git a/pkgs/development/libraries/flatpak/fix-paths.patch b/pkgs/development/libraries/flatpak/fix-paths.patch
new file mode 100644
index 00000000000..49fcaa2b3f9
--- /dev/null
+++ b/pkgs/development/libraries/flatpak/fix-paths.patch
@@ -0,0 +1,20 @@
+--- a/session-helper/flatpak-session-helper.c
++++ b/session-helper/flatpak-session-helper.c
+@@ -624,7 +624,7 @@
+ g_auto(GStrv) stdout_lines = NULL;
+ int i;
+ char *p11_argv[] = {
+- "p11-kit", "server",
++ "@p11@/bin/p11-kit", "server",
+ /* We explicitly request --sh here, because we then fail on earlier versions that doesn't support
+ * this flag. This is good, because those earlier versions did not properly daemonize and caused
+ * the spawn_sync to hang forever, waiting for the pipe to close.
+@@ -770,7 +770,7 @@
+ exit (1);
+ }
+
+- if (g_find_program_in_path ("p11-kit"))
++ if (TRUE)
+ start_p11_kit_server (flatpak_dir);
+ else
+ g_debug ("p11-kit not found");
diff --git a/pkgs/development/libraries/flatpak/fix-test-paths.patch b/pkgs/development/libraries/flatpak/fix-test-paths.patch
index 3f4bc56721e..d00e4fa7f89 100644
--- a/pkgs/development/libraries/flatpak/fix-test-paths.patch
+++ b/pkgs/development/libraries/flatpak/fix-test-paths.patch
@@ -1,6 +1,6 @@
--- a/tests/libtest.sh
+++ b/tests/libtest.sh
-@@ -315,7 +315,7 @@
+@@ -296,7 +296,7 @@
# running installed-tests: assume we know what we're doing
:
elif ! "$FLATPAK_BWRAP" --unshare-ipc --unshare-net --unshare-pid \
@@ -9,16 +9,7 @@
sed -e 's/^/# /' < bwrap-result
echo "1..0 # SKIP Cannot run bwrap"
exit 0
-@@ -323,7 +323,7 @@
- }
-
- skip_without_python2 () {
-- if ! test -f /usr/bin/python2 || ! /usr/bin/python2 -c "import sys; sys.exit(0 if sys.version_info >= (2, 7) else 1)" ; then
-+ if ! test -f @python2@/bin/python2 || ! @python2@/bin/python2 -c "import sys; sys.exit(0 if sys.version_info >= (2, 7) else 1)" ; then
- echo "1..0 # SKIP this test requires /usr/bin/python2 (2.7) support"
- exit 0
- fi
-@@ -335,12 +335,12 @@
+@@ -309,12 +309,12 @@
export DBUS_SESSION_BUS_ADDRESS="$(cat dbus-session-bus-address)"
DBUS_SESSION_BUS_PID="$(cat dbus-session-bus-pid)"
@@ -43,7 +34,7 @@
mkdir -p ${DIR}/usr/bin
mkdir -p ${DIR}/usr/lib
ln -s ../lib ${DIR}/usr/lib64
-@@ -35,73 +36,27 @@
+@@ -35,48 +36,27 @@
else
cp `which ldconfig` ${DIR}/usr/bin
fi
@@ -73,31 +64,6 @@
for i in $@; do
- I=`which $i`
- add_bin $I
-- if test $i == python2; then
-- mkdir -p ${DIR}/usr/lib/python2.7/lib-dynload
-- # This is a hardcoded minimal set of modules we need in the current tests.
-- # Pretty hacky stuff. Add modules as needed.
-- PYDIR=/usr/lib/python2.7
-- if test -d /usr/lib64/python2.7; then PYDIR=/usr/lib64/python2.7; fi
-- for py in site os stat posixpath genericpath warnings \
-- linecache types UserDict abc _abcoll \
-- _weakrefset copy_reg traceback sysconfig \
-- re sre_compile sre_parse sre_constants \
-- _sysconfigdata ; do
-- cp ${PYDIR}/$py.py ${DIR}/usr/lib/python2.7
-- done
-- # These might not exist, depending how Python was configured; and the
-- # part after ${so} might be "module" or ".x86_64-linux-gnu" or
-- # something else
-- for so in _locale strop ; do
-- cp ${PYDIR}/lib-dynload/${so}*.so ${DIR}/usr/lib/python2.7/lib-dynload || :
-- done
-- for plat in $( cd ${PYDIR} && echo plat-* ); do
-- test -e ${PYDIR}/${plat} || continue
-- mkdir -p ${DIR}/usr/lib/python2.7/${plat}
-- cp ${PYDIR}/${plat}/*.py ${DIR}/usr/lib/python2.7/${plat}/
-- done
-- fi
-done
-for i in `cat $BINS`; do
- echo Adding binary $i 1>&2
diff --git a/pkgs/development/libraries/flatpak/use-flatpak-from-path.patch b/pkgs/development/libraries/flatpak/use-flatpak-from-path.patch
index e855902a930..408198bda5c 100644
--- a/pkgs/development/libraries/flatpak/use-flatpak-from-path.patch
+++ b/pkgs/development/libraries/flatpak/use-flatpak-from-path.patch
@@ -1,6 +1,6 @@
--- a/common/flatpak-dir.c
+++ b/common/flatpak-dir.c
-@@ -5467,7 +5467,7 @@ export_desktop_file (const char *app,
+@@ -5758,7 +5758,7 @@ export_desktop_file (const char *app,
new_exec = g_string_new ("");
g_string_append_printf (new_exec,
@@ -9,7 +9,7 @@
escaped_branch,
escaped_arch);
-@@ -6644,8 +6644,8 @@ flatpak_dir_deploy (FlatpakDir *self,
+@@ -6935,8 +6935,8 @@ flatpak_dir_deploy (FlatpakDir *self,
error))
return FALSE;
diff --git a/pkgs/development/libraries/geis/default.nix b/pkgs/development/libraries/geis/default.nix
index 56d8cd21f84..fa3aa77cd3a 100644
--- a/pkgs/development/libraries/geis/default.nix
+++ b/pkgs/development/libraries/geis/default.nix
@@ -29,7 +29,9 @@ stdenv.mkDerivation rec {
sha256 = "1svhbjibm448ybq6gnjjzj0ak42srhihssafj0w402aj71lgaq4a";
};
- NIX_CFLAGS_COMPILE = "-Wno-format -Wno-misleading-indentation -Wno-error";
+ NIX_CFLAGS_COMPILE = [ "-Wno-error=misleading-indentation" "-Wno-error=pointer-compare" ];
+
+ hardeningDisable = [ "format" ];
pythonPath = with python3Packages;
[ pygobject3 ];
diff --git a/pkgs/development/libraries/glibc/common.nix b/pkgs/development/libraries/glibc/common.nix
index 1eecfa90279..a7a4c2fbacd 100644
--- a/pkgs/development/libraries/glibc/common.nix
+++ b/pkgs/development/libraries/glibc/common.nix
@@ -110,18 +110,13 @@ stdenv.mkDerivation ({
"--enable-obsolete-rpc"
"--sysconfdir=/etc"
"--enable-stackguard-randomization"
- (if withLinuxHeaders
- then "--with-headers=${linuxHeaders}/include"
- else "--without-headers")
- (if profilingLibraries
- then "--enable-profile"
- else "--disable-profile")
+ (lib.withFeatureAs withLinuxHeaders "headers" "${linuxHeaders}/include")
+ (lib.enableFeature profilingLibraries "profile")
] ++ lib.optionals withLinuxHeaders [
"--enable-kernel=3.2.0" # can't get below with glibc >= 2.26
] ++ lib.optionals (stdenv.hostPlatform != stdenv.buildPlatform) [
- (if stdenv.hostPlatform.platform.gcc.float or (stdenv.hostPlatform.parsed.abi.float or "hard") == "soft"
- then "--without-fp"
- else "--with-fp")
+ (lib.flip lib.withFeature "fp"
+ (stdenv.hostPlatform.platform.gcc.float or (stdenv.hostPlatform.parsed.abi.float or "hard") == "soft"))
"--with-__thread"
] ++ lib.optionals (stdenv.hostPlatform == stdenv.buildPlatform && stdenv.hostPlatform.isAarch32) [
"--host=arm-linux-gnueabi"
@@ -144,6 +139,8 @@ stdenv.mkDerivation ({
# prevent a retained dependency on the bootstrap tools in the stdenv-linux
# bootstrap.
BASH_SHELL = "/bin/sh";
+
+ passthru = { inherit version; };
}
// (removeAttrs args [ "withLinuxHeaders" "withGd" ]) //
diff --git a/pkgs/development/libraries/glibc/default.nix b/pkgs/development/libraries/glibc/default.nix
index ea443ce9a24..c74c27598ee 100644
--- a/pkgs/development/libraries/glibc/default.nix
+++ b/pkgs/development/libraries/glibc/default.nix
@@ -5,8 +5,6 @@
, withGd ? false
}:
-assert stdenv.cc.isGNU;
-
callPackage ./common.nix { inherit stdenv; } {
name = "glibc" + stdenv.lib.optionalString withGd "-gd";
@@ -96,7 +94,8 @@ callPackage ./common.nix { inherit stdenv; } {
mv $bin/bin/getconf_ $bin/bin/getconf
'';
- separateDebugInfo = true;
+ # Hack to get around eval issue.
+ separateDebugInfo = !stdenv.isDarwin;
meta.description = "The GNU C Library";
}
diff --git a/pkgs/development/libraries/gssdp/default.nix b/pkgs/development/libraries/gssdp/default.nix
index d48ba9082af..0d77018eee5 100644
--- a/pkgs/development/libraries/gssdp/default.nix
+++ b/pkgs/development/libraries/gssdp/default.nix
@@ -1,22 +1,30 @@
-{ stdenv, fetchurl, pkgconfig, libsoup, glib }:
+{ stdenv, fetchurl, pkgconfig, gobjectIntrospection, vala, gtk-doc, docbook_xsl, docbook_xml_dtd_412, libsoup, gtk3, glib }:
stdenv.mkDerivation rec {
name = "gssdp-${version}";
version = "1.0.2";
+ outputs = [ "out" "bin" "dev" "devdoc" ];
+
src = fetchurl {
- url = "mirror://gnome/sources/gssdp/1.0/${name}.tar.xz";
+ url = "mirror://gnome/sources/gssdp/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz";
sha256 = "1p1m2m3ndzr2whipqw4vfb6s6ia0g7rnzzc4pnq8b8g1qw4prqd1";
};
- nativeBuildInputs = [ pkgconfig ];
- buildInputs = [ libsoup ];
+ nativeBuildInputs = [ pkgconfig gobjectIntrospection vala gtk-doc docbook_xsl docbook_xml_dtd_412 ];
+ buildInputs = [ libsoup gtk3 ];
propagatedBuildInputs = [ glib ];
+ configureFlags = [
+ "--enable-gtk-doc"
+ ];
+
+ doCheck = true;
+
meta = with stdenv.lib; {
description = "GObject-based API for handling resource discovery and announcement over SSDP";
homepage = http://www.gupnp.org/;
- license = licenses.lgpl2;
+ license = licenses.lgpl2Plus;
platforms = platforms.all;
};
}
diff --git a/pkgs/development/libraries/gupnp-av/default.nix b/pkgs/development/libraries/gupnp-av/default.nix
index 9b61f4b648e..7491da7c3e2 100644
--- a/pkgs/development/libraries/gupnp-av/default.nix
+++ b/pkgs/development/libraries/gupnp-av/default.nix
@@ -1,22 +1,29 @@
-{ stdenv, fetchurl, pkgconfig, gupnp, glib, libxml2 }:
+{ stdenv, fetchurl, pkgconfig, gobjectIntrospection, vala, gtk-doc, docbook_xsl, docbook_xml_dtd_412, gupnp, glib, libxml2 }:
stdenv.mkDerivation rec {
name = "gupnp-av-${version}";
- majorVersion = "0.12";
- version = "${majorVersion}.10";
+ version = "0.12.10";
+
+ outputs = [ "out" "dev" "devdoc" ];
src = fetchurl {
- url = "mirror://gnome/sources/gupnp-av/${majorVersion}/${name}.tar.xz";
+ url = "mirror://gnome/sources/gupnp-av/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz";
sha256 = "0nmq6wlbfsssanv3jgv2z0nhfkv8vzfr3gq5qa8svryvvn2fyf40";
};
-
- nativeBuildInputs = [ pkgconfig ];
+
+ nativeBuildInputs = [ pkgconfig gobjectIntrospection vala gtk-doc docbook_xsl docbook_xml_dtd_412 ];
buildInputs = [ gupnp glib libxml2 ];
- meta = {
+ configureFlags = [
+ "--enable-gtk-doc"
+ ];
+
+ doCheck = true;
+
+ meta = with stdenv.lib; {
homepage = http://gupnp.org/;
description = "A collection of helpers for building AV (audio/video) applications using GUPnP";
- license = stdenv.lib.licenses.gpl2;
- platforms = stdenv.lib.platforms.linux;
+ license = licenses.lgpl2Plus;
+ platforms = platforms.linux;
};
}
diff --git a/pkgs/development/libraries/gupnp-dlna/default.nix b/pkgs/development/libraries/gupnp-dlna/default.nix
index 75818f75692..aba95889b69 100644
--- a/pkgs/development/libraries/gupnp-dlna/default.nix
+++ b/pkgs/development/libraries/gupnp-dlna/default.nix
@@ -1,22 +1,34 @@
-{ stdenv, fetchurl, pkgconfig, gobjectIntrospection, gupnp, gst-plugins-base }:
+{ stdenv, fetchurl, pkgconfig, gobjectIntrospection, vala, gtk-doc, docbook_xsl, docbook_xml_dtd_412, gupnp, gst_all_1 }:
stdenv.mkDerivation rec {
name = "gupnp-dlna-${version}";
- majorVersion = "0.10";
- version = "${majorVersion}.5";
+ version = "0.10.5";
+
+ outputs = [ "out" "dev" "devdoc" ];
src = fetchurl {
- url = "mirror://gnome/sources/gupnp-dlna/${majorVersion}/${name}.tar.xz";
+ url = "mirror://gnome/sources/gupnp-dlna/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz";
sha256 = "0spzd2saax7w776p5laixdam6d7smyynr9qszhbmq7f14y13cghj";
};
- nativeBuildInputs = [ pkgconfig gobjectIntrospection ];
- buildInputs = [ gupnp gst-plugins-base ];
+ nativeBuildInputs = [ pkgconfig gobjectIntrospection vala gtk-doc docbook_xsl docbook_xml_dtd_412 ];
+ buildInputs = [ gupnp gst_all_1.gst-plugins-base ];
- meta = {
+ configureFlags = [
+ "--enable-gtk-doc"
+ ];
+
+ doCheck = true;
+
+ postPatch = ''
+ chmod +x tests/test-discoverer.sh.in
+ patchShebangs tests/test-discoverer.sh.in
+ '';
+
+ meta = with stdenv.lib; {
homepage = https://wiki.gnome.org/Projects/GUPnP/;
description = "Library to ease DLNA-related bits for applications using GUPnP";
- license = stdenv.lib.licenses.gpl2;
- platforms = stdenv.lib.platforms.linux;
+ license = licenses.lgpl2Plus;
+ platforms = platforms.linux;
};
}
diff --git a/pkgs/development/libraries/gupnp-igd/default.nix b/pkgs/development/libraries/gupnp-igd/default.nix
index 182905e9546..50107959786 100644
--- a/pkgs/development/libraries/gupnp-igd/default.nix
+++ b/pkgs/development/libraries/gupnp-igd/default.nix
@@ -1,22 +1,29 @@
-{ stdenv, fetchurl, pkgconfig, glib, gupnp }:
-
+{ stdenv, fetchurl, pkgconfig, gettext, gobjectIntrospection, gtk-doc, docbook_xsl, docbook_xml_dtd_412, glib, gupnp }:
+
stdenv.mkDerivation rec {
name = "gupnp-igd-${version}";
- majorVersion = "0.2";
- version = "${majorVersion}.4";
+ version = "0.2.5";
+
+ outputs = [ "out" "dev" "devdoc" ];
src = fetchurl {
- url = "mirror://gnome/sources/gupnp-igd/${majorVersion}/${name}.tar.xz";
- sha256 = "38c4a6d7718d17eac17df95a3a8c337677eda77e58978129ad3182d769c38e44";
+ url = "mirror://gnome/sources/gupnp-igd/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz";
+ sha256 = "081v1vhkbz3wayv49xfiskvrmvnpx93k25am2wnarg5cifiiljlb";
};
- nativeBuildInputs = [ pkgconfig ];
+ nativeBuildInputs = [ pkgconfig gettext gobjectIntrospection gtk-doc docbook_xsl docbook_xml_dtd_412 ];
propagatedBuildInputs = [ glib gupnp ];
- meta = {
+ configureFlags = [
+ "--enable-gtk-doc"
+ ];
+
+ doCheck = true;
+
+ meta = with stdenv.lib; {
+ description = "Library to handle UPnP IGD port mapping";
homepage = http://www.gupnp.org/;
- license = stdenv.lib.licenses.lgpl21;
- platforms = stdenv.lib.platforms.linux;
+ license = licenses.lgpl21;
+ platforms = platforms.linux;
};
}
-
diff --git a/pkgs/development/libraries/gupnp/default.nix b/pkgs/development/libraries/gupnp/default.nix
index 963b93ef691..45adf46ff36 100644
--- a/pkgs/development/libraries/gupnp/default.nix
+++ b/pkgs/development/libraries/gupnp/default.nix
@@ -1,28 +1,39 @@
-{ stdenv, fetchurl, pkgconfig, glib, gssdp, libsoup, libxml2, libuuid }:
-
+{ stdenv, fetchurl, pkgconfig, gobjectIntrospection, vala, gtk-doc, docbook_xsl, docbook_xml_dtd_412, docbook_xml_dtd_44, glib, gssdp, libsoup, libxml2, libuuid }:
+
stdenv.mkDerivation rec {
name = "gupnp-${version}";
- majorVersion = "1.0";
- version = "${majorVersion}.2";
+ version = "1.0.3";
+
+ outputs = [ "out" "dev" "devdoc" ];
src = fetchurl {
- url = "mirror://gnome/sources/gupnp/${majorVersion}/gupnp-${version}.tar.xz";
- sha256 = "043nqxlj030a3wvd6x4c9z8fjarjjjsl2pjarl0nn70ig6kzswsi";
+ url = "mirror://gnome/sources/gupnp/${stdenv.lib.versions.majorMinor version}/gupnp-${version}.tar.xz";
+ sha256 = "1fyb6yn75vf2y1b8nbc1df572swzr74yiwy3v3g5xn36wlp1cjvr";
};
- nativeBuildInputs = [ pkgconfig ];
+ patches = [
+ # Nix’s pkg-config ignores Requires.private
+ # https://github.com/NixOS/nixpkgs/commit/1e6622f4d5d500d6e701bd81dd4a22977d10637d
+ # We are essentialy reverting the following patch for now
+ # https://bugzilla.gnome.org/show_bug.cgi?id=685477
+ # at least until Requires.internal or something is implemented
+ # https://gitlab.freedesktop.org/pkg-config/pkg-config/issues/7
+ ./fix-requires.patch
+ ];
+
+ nativeBuildInputs = [ pkgconfig gobjectIntrospection vala gtk-doc docbook_xsl docbook_xml_dtd_412 docbook_xml_dtd_44 ];
propagatedBuildInputs = [ glib gssdp libsoup libxml2 libuuid ];
- postInstall = ''
- ln -sv ${libsoup.dev}/include/libsoup-2*/libsoup $out/include
- ln -sv ${libxml2.dev}/include/*/libxml $out/include
- ln -sv ${gssdp}/include/*/libgssdp $out/include
- '';
+ configureFlags = [
+ "--enable-gtk-doc"
+ ];
- meta = {
+ doCheck = true;
+
+ meta = with stdenv.lib; {
homepage = http://www.gupnp.org/;
description = "An implementation of the UPnP specification";
- license = stdenv.lib.licenses.gpl2;
- platforms = stdenv.lib.platforms.linux;
+ license = licenses.lgpl2Plus;
+ platforms = platforms.linux;
};
}
diff --git a/pkgs/development/libraries/gupnp/fix-requires.patch b/pkgs/development/libraries/gupnp/fix-requires.patch
new file mode 100644
index 00000000000..4538fc55460
--- /dev/null
+++ b/pkgs/development/libraries/gupnp/fix-requires.patch
@@ -0,0 +1,9 @@
+--- a/gupnp-1.0.pc.in
++++ b/gupnp-1.0.pc.in
+@@ -8,4 +8,5 @@
+ Version: @VERSION@
+ Libs: -L${libdir} -lgupnp-1.0
+ Cflags: -I${includedir}/gupnp-1.0
+-Requires.private: gssdp-1.0 libxml-2.0 libsoup-2.4 @UUID_LIBS@
++Requires: glib-2.0 gobject-2.0 gssdp-1.0 libxml-2.0 libsoup-2.4
++Requires.private: @UUID_LIBS@
diff --git a/pkgs/development/libraries/kde-frameworks/default.nix b/pkgs/development/libraries/kde-frameworks/default.nix
index ea8f30f0bba..62ae433ff71 100644
--- a/pkgs/development/libraries/kde-frameworks/default.nix
+++ b/pkgs/development/libraries/kde-frameworks/default.nix
@@ -145,6 +145,7 @@ let
kpackage = callPackage ./kpackage {};
kpty = callPackage ./kpty.nix {};
kunitconversion = callPackage ./kunitconversion.nix {};
+ syndication = callPackage ./syndication.nix {};
# TIER 3
baloo = callPackage ./baloo.nix {};
diff --git a/pkgs/development/libraries/kde-frameworks/fetch.sh b/pkgs/development/libraries/kde-frameworks/fetch.sh
index 48f009f8d3e..1292d9cc7b3 100644
--- a/pkgs/development/libraries/kde-frameworks/fetch.sh
+++ b/pkgs/development/libraries/kde-frameworks/fetch.sh
@@ -1 +1 @@
-WGET_ARGS=( https://download.kde.org/stable/frameworks/5.49/ -A '*.tar.xz' )
+WGET_ARGS=( https://download.kde.org/stable/frameworks/5.50/ -A '*.tar.xz' )
diff --git a/pkgs/development/libraries/kde-frameworks/srcs.nix b/pkgs/development/libraries/kde-frameworks/srcs.nix
index 4f866974b61..278de2d2a1f 100644
--- a/pkgs/development/libraries/kde-frameworks/srcs.nix
+++ b/pkgs/development/libraries/kde-frameworks/srcs.nix
@@ -3,627 +3,635 @@
{
attica = {
- version = "5.49.0";
+ version = "5.50.0";
src = fetchurl {
- url = "${mirror}/stable/frameworks/5.49/attica-5.49.0.tar.xz";
- sha256 = "1iqclahs9yzyjnkzbzr8hl9j6q8m2djdm6mix92xwrakgirnl3gn";
- name = "attica-5.49.0.tar.xz";
+ url = "${mirror}/stable/frameworks/5.50/attica-5.50.0.tar.xz";
+ sha256 = "0iyaxh92qsh25dl3y18235x9c39jvxgzvfmz96vs5rjkyjnnh88w";
+ name = "attica-5.50.0.tar.xz";
};
};
baloo = {
- version = "5.49.0";
+ version = "5.50.0";
src = fetchurl {
- url = "${mirror}/stable/frameworks/5.49/baloo-5.49.0.tar.xz";
- sha256 = "0xj12v0k58sr3snxyj4vx7dqhinrvk6qm0ikymscqgbmw9ijwxph";
- name = "baloo-5.49.0.tar.xz";
+ url = "${mirror}/stable/frameworks/5.50/baloo-5.50.0.tar.xz";
+ sha256 = "07n90b2mz1d0anknwf271dp2w9hn2kdb0903zqsqnhmix1jqpfy6";
+ name = "baloo-5.50.0.tar.xz";
};
};
bluez-qt = {
- version = "5.49.0";
+ version = "5.50.0";
src = fetchurl {
- url = "${mirror}/stable/frameworks/5.49/bluez-qt-5.49.0.tar.xz";
- sha256 = "0mgnq7w52ksr8b7ys2f1m3irnviy011bsaggh489fjy0xlzk5ard";
- name = "bluez-qt-5.49.0.tar.xz";
+ url = "${mirror}/stable/frameworks/5.50/bluez-qt-5.50.0.tar.xz";
+ sha256 = "028rdw97c042c1xcb2gwa6n4fcpn0wx4ilgh5j584afps6rg2k3b";
+ name = "bluez-qt-5.50.0.tar.xz";
};
};
breeze-icons = {
- version = "5.49.0";
+ version = "5.50.0";
src = fetchurl {
- url = "${mirror}/stable/frameworks/5.49/breeze-icons-5.49.0.tar.xz";
- sha256 = "178620hhqlv6dl8qal2bmiw55s8b3p4h16q8cgkmq5q5i59nzcph";
- name = "breeze-icons-5.49.0.tar.xz";
+ url = "${mirror}/stable/frameworks/5.50/breeze-icons-5.50.0.tar.xz";
+ sha256 = "1zhlylry01w3x72q8ipjgijkicjp3wyv9p183awvg3znkblghhgw";
+ name = "breeze-icons-5.50.0.tar.xz";
};
};
extra-cmake-modules = {
- version = "5.49.0";
+ version = "5.50.0";
src = fetchurl {
- url = "${mirror}/stable/frameworks/5.49/extra-cmake-modules-5.49.0.tar.xz";
- sha256 = "07pdgjyrxniacqcfvrzw8ij3kasx5pkbq38k6491qbhzfm8vi7y0";
- name = "extra-cmake-modules-5.49.0.tar.xz";
+ url = "${mirror}/stable/frameworks/5.50/extra-cmake-modules-5.50.0.tar.xz";
+ sha256 = "1284gv6l1cck0y6phc9xphs1bl4ayk5a0nwzykhc8ncnkjqb0cyx";
+ name = "extra-cmake-modules-5.50.0.tar.xz";
};
};
frameworkintegration = {
- version = "5.49.0";
+ version = "5.50.0";
src = fetchurl {
- url = "${mirror}/stable/frameworks/5.49/frameworkintegration-5.49.0.tar.xz";
- sha256 = "1ni4jrny630zf3zwmqbm8z7dqgiar58992lylfv7kspdg5crcgfx";
- name = "frameworkintegration-5.49.0.tar.xz";
+ url = "${mirror}/stable/frameworks/5.50/frameworkintegration-5.50.0.tar.xz";
+ sha256 = "14nq6v5xnznc7c7zdfvals4998cmlgdw4i7pz9hfbs35v0pswd03";
+ name = "frameworkintegration-5.50.0.tar.xz";
};
};
kactivities = {
- version = "5.49.0";
+ version = "5.50.0";
src = fetchurl {
- url = "${mirror}/stable/frameworks/5.49/kactivities-5.49.0.tar.xz";
- sha256 = "117f3zrdbs0pa10wn7vy691n02m01h6x4pm8m1q3f4pjm0k4kqim";
- name = "kactivities-5.49.0.tar.xz";
+ url = "${mirror}/stable/frameworks/5.50/kactivities-5.50.0.tar.xz";
+ sha256 = "0jbri8whf91skxc0zg72bx0m7aym8ka801ncp9kxbjdcj1mbz451";
+ name = "kactivities-5.50.0.tar.xz";
};
};
kactivities-stats = {
- version = "5.49.0";
+ version = "5.50.0";
src = fetchurl {
- url = "${mirror}/stable/frameworks/5.49/kactivities-stats-5.49.0.tar.xz";
- sha256 = "129z2m5330j0l1nw8g3qjib60xmx54c6d2g9vnp4w8z0agnihs5f";
- name = "kactivities-stats-5.49.0.tar.xz";
+ url = "${mirror}/stable/frameworks/5.50/kactivities-stats-5.50.0.tar.xz";
+ sha256 = "0h6dl0522sl7glzk4rz7qj5642il2nr2jwmknbwv3ljhxba9qdrs";
+ name = "kactivities-stats-5.50.0.tar.xz";
};
};
kapidox = {
- version = "5.49.0";
+ version = "5.50.0";
src = fetchurl {
- url = "${mirror}/stable/frameworks/5.49/kapidox-5.49.0.tar.xz";
- sha256 = "09jph3hvasqx1ia0l7is9brc08nxvh9qmg8564nh5cmqaxdwj559";
- name = "kapidox-5.49.0.tar.xz";
+ url = "${mirror}/stable/frameworks/5.50/kapidox-5.50.0.tar.xz";
+ sha256 = "11hp0qpndy9s8g6x95s8lk7abkp1yvqraa1cdvvsdhn71izmsmqz";
+ name = "kapidox-5.50.0.tar.xz";
};
};
karchive = {
- version = "5.49.0";
+ version = "5.50.0";
src = fetchurl {
- url = "${mirror}/stable/frameworks/5.49/karchive-5.49.0.tar.xz";
- sha256 = "1p1gwqda2bsjdysp4ggwdsldbasyfl075xn3wchqyakdv2bdzmn0";
- name = "karchive-5.49.0.tar.xz";
+ url = "${mirror}/stable/frameworks/5.50/karchive-5.50.0.tar.xz";
+ sha256 = "1jh1cyvdg680swyq2nmcpk4cfqmy67v49jl76nm1b5399zcs282l";
+ name = "karchive-5.50.0.tar.xz";
};
};
kauth = {
- version = "5.49.0";
+ version = "5.50.0";
src = fetchurl {
- url = "${mirror}/stable/frameworks/5.49/kauth-5.49.0.tar.xz";
- sha256 = "0qg3zwg3kfx2snmvsw4ixr0qds7bd7992dxggvi9dcny7dm9q0n8";
- name = "kauth-5.49.0.tar.xz";
+ url = "${mirror}/stable/frameworks/5.50/kauth-5.50.0.tar.xz";
+ sha256 = "15pk78a76897y4rym5ln1l5zm3n64rprl7k5bwkp4qzhwy7gzv7p";
+ name = "kauth-5.50.0.tar.xz";
};
};
kbookmarks = {
- version = "5.49.0";
+ version = "5.50.0";
src = fetchurl {
- url = "${mirror}/stable/frameworks/5.49/kbookmarks-5.49.0.tar.xz";
- sha256 = "0clmfdcc1fc98q3vbfjf8x140a6df88ixhz0mny3dpv1wcr5cz53";
- name = "kbookmarks-5.49.0.tar.xz";
+ url = "${mirror}/stable/frameworks/5.50/kbookmarks-5.50.0.tar.xz";
+ sha256 = "1lvsarcwjkmx14bni9akxrrr11zsvr9fv47ahw97kj9p3wdb1sy9";
+ name = "kbookmarks-5.50.0.tar.xz";
};
};
kcmutils = {
- version = "5.49.0";
+ version = "5.50.0";
src = fetchurl {
- url = "${mirror}/stable/frameworks/5.49/kcmutils-5.49.0.tar.xz";
- sha256 = "0xv899p9f0hj6hd089mhn910qn66bihzpaa11ikrhbimckw8g19q";
- name = "kcmutils-5.49.0.tar.xz";
+ url = "${mirror}/stable/frameworks/5.50/kcmutils-5.50.0.tar.xz";
+ sha256 = "1q9z8p20fn6k8yrhy0nq77yg4ra5vnpq6hq9mr7jkjqni9b0h3np";
+ name = "kcmutils-5.50.0.tar.xz";
};
};
kcodecs = {
- version = "5.49.0";
+ version = "5.50.0";
src = fetchurl {
- url = "${mirror}/stable/frameworks/5.49/kcodecs-5.49.0.tar.xz";
- sha256 = "07va63gsfjrc5ha9rdli923cwyzxpb3v8xgf1zfhw75cfkgda3nz";
- name = "kcodecs-5.49.0.tar.xz";
+ url = "${mirror}/stable/frameworks/5.50/kcodecs-5.50.0.tar.xz";
+ sha256 = "13gh7vys0xxpfqzjbxwr65p6d6jgcg0wr9ir1xqbkc368kay4n7b";
+ name = "kcodecs-5.50.0.tar.xz";
};
};
kcompletion = {
- version = "5.49.0";
+ version = "5.50.0";
src = fetchurl {
- url = "${mirror}/stable/frameworks/5.49/kcompletion-5.49.0.tar.xz";
- sha256 = "16br6wnqzndk8v41im23h2ww4hypi2i1qfg6m9c49mpxflgmspbi";
- name = "kcompletion-5.49.0.tar.xz";
+ url = "${mirror}/stable/frameworks/5.50/kcompletion-5.50.0.tar.xz";
+ sha256 = "1n0frkk2phf6a0rcrsf011jb2f66sisjy9lmmiy1czy533y3iraz";
+ name = "kcompletion-5.50.0.tar.xz";
};
};
kconfig = {
- version = "5.49.0";
+ version = "5.50.0";
src = fetchurl {
- url = "${mirror}/stable/frameworks/5.49/kconfig-5.49.0.tar.xz";
- sha256 = "0cb3crnlr8hr5npq3ykfxqd4yckmkykzrrizfs89ryhmznc2ngsf";
- name = "kconfig-5.49.0.tar.xz";
+ url = "${mirror}/stable/frameworks/5.50/kconfig-5.50.0.tar.xz";
+ sha256 = "0jb4lq3k8lyjksgj728hgf0h81v6fxy1kyp17sv0cjrs6n3z8ry8";
+ name = "kconfig-5.50.0.tar.xz";
};
};
kconfigwidgets = {
- version = "5.49.0";
+ version = "5.50.0";
src = fetchurl {
- url = "${mirror}/stable/frameworks/5.49/kconfigwidgets-5.49.0.tar.xz";
- sha256 = "1nqcrqr67m3kvq2r83x45zcdghk12bas9fp0s43s68imrhy5xikz";
- name = "kconfigwidgets-5.49.0.tar.xz";
+ url = "${mirror}/stable/frameworks/5.50/kconfigwidgets-5.50.0.tar.xz";
+ sha256 = "102al35g2c6v091zm086lvhbym0j0f81zpn6wsk5wr0xc569lagj";
+ name = "kconfigwidgets-5.50.0.tar.xz";
};
};
kcoreaddons = {
- version = "5.49.0";
+ version = "5.50.0";
src = fetchurl {
- url = "${mirror}/stable/frameworks/5.49/kcoreaddons-5.49.0.tar.xz";
- sha256 = "00s22jvbwav20cidnp8v9fgc6pqbp4wnqkb2spv18mjhg4pv3bqj";
- name = "kcoreaddons-5.49.0.tar.xz";
+ url = "${mirror}/stable/frameworks/5.50/kcoreaddons-5.50.0.tar.xz";
+ sha256 = "1b7m4an322hk89n1svy3345106kphhn0ha7q21k5b3bwphszrx28";
+ name = "kcoreaddons-5.50.0.tar.xz";
};
};
kcrash = {
- version = "5.49.0";
+ version = "5.50.0";
src = fetchurl {
- url = "${mirror}/stable/frameworks/5.49/kcrash-5.49.0.tar.xz";
- sha256 = "0xmr9rrl0xahpnq1rw4bbar1nbr21x2bk4hhv79la6dsg9ha25b3";
- name = "kcrash-5.49.0.tar.xz";
+ url = "${mirror}/stable/frameworks/5.50/kcrash-5.50.0.tar.xz";
+ sha256 = "00n2ynhp1dbp75wkx9wm4mlyf5q3cbrk7k563mdihw88mzmmyvl4";
+ name = "kcrash-5.50.0.tar.xz";
};
};
kdbusaddons = {
- version = "5.49.0";
+ version = "5.50.0";
src = fetchurl {
- url = "${mirror}/stable/frameworks/5.49/kdbusaddons-5.49.0.tar.xz";
- sha256 = "1fnmrrffp3kfwyjfzqkzlizflpyqgzbjljb51ppmdypcq8wy9ibh";
- name = "kdbusaddons-5.49.0.tar.xz";
+ url = "${mirror}/stable/frameworks/5.50/kdbusaddons-5.50.0.tar.xz";
+ sha256 = "0ijvg4j97j4fv063phg086s9db6nj5gfgic5gcqg99h9hznbqkym";
+ name = "kdbusaddons-5.50.0.tar.xz";
};
};
kdeclarative = {
- version = "5.49.0";
+ version = "5.50.0";
src = fetchurl {
- url = "${mirror}/stable/frameworks/5.49/kdeclarative-5.49.0.tar.xz";
- sha256 = "0kgawb8wfx4snk2ckwxj0hmpgcvq3k1zpsxqdawi4cmsy4bxzfs9";
- name = "kdeclarative-5.49.0.tar.xz";
+ url = "${mirror}/stable/frameworks/5.50/kdeclarative-5.50.0.tar.xz";
+ sha256 = "1fwfzvadqh4rfyklygs17mkikh5m0m4flka91wbhw6jg6w7bvc4c";
+ name = "kdeclarative-5.50.0.tar.xz";
};
};
kded = {
- version = "5.49.0";
+ version = "5.50.0";
src = fetchurl {
- url = "${mirror}/stable/frameworks/5.49/kded-5.49.0.tar.xz";
- sha256 = "1l6hs3spbs3618jwg3n7r3hrrkqxmmd43f0km8849x4641p72zyc";
- name = "kded-5.49.0.tar.xz";
+ url = "${mirror}/stable/frameworks/5.50/kded-5.50.0.tar.xz";
+ sha256 = "1hfh2l40s2mz4qh2wirfa8lnixvvl6y0agh3l5ii0jw93wvyci01";
+ name = "kded-5.50.0.tar.xz";
};
};
kdelibs4support = {
- version = "5.49.0";
+ version = "5.50.0";
src = fetchurl {
- url = "${mirror}/stable/frameworks/5.49/portingAids/kdelibs4support-5.49.0.tar.xz";
- sha256 = "1cz70c77l66lbw4fbgmfbq1fldybqxsiay2pg9risgqp3ra8wahi";
- name = "kdelibs4support-5.49.0.tar.xz";
+ url = "${mirror}/stable/frameworks/5.50/portingAids/kdelibs4support-5.50.0.tar.xz";
+ sha256 = "12ilp1cnpfhd8f4zsnwwq428cip43yq3xj0px91ndfrgq8chg05l";
+ name = "kdelibs4support-5.50.0.tar.xz";
};
};
kdesignerplugin = {
- version = "5.49.0";
+ version = "5.50.0";
src = fetchurl {
- url = "${mirror}/stable/frameworks/5.49/kdesignerplugin-5.49.0.tar.xz";
- sha256 = "0hj4ng0i22rvw4kl0irhqhww3kvn4c0pncn38w1j5vim4gxv0xcd";
- name = "kdesignerplugin-5.49.0.tar.xz";
+ url = "${mirror}/stable/frameworks/5.50/kdesignerplugin-5.50.0.tar.xz";
+ sha256 = "00dhhars7ab7zjsz992yswcns5zijzyy84fpym2hg1avxinm31x5";
+ name = "kdesignerplugin-5.50.0.tar.xz";
};
};
kdesu = {
- version = "5.49.0";
+ version = "5.50.0";
src = fetchurl {
- url = "${mirror}/stable/frameworks/5.49/kdesu-5.49.0.tar.xz";
- sha256 = "1gwvby51qqbkrs2vjpnplxr6m6xa5ddfdjs1iygh8kpqsh8a765k";
- name = "kdesu-5.49.0.tar.xz";
+ url = "${mirror}/stable/frameworks/5.50/kdesu-5.50.0.tar.xz";
+ sha256 = "095vddhhlc8kyhrmygccvhzbhl6bkscnfrx3vf96anm68zyk4g3f";
+ name = "kdesu-5.50.0.tar.xz";
};
};
kdewebkit = {
- version = "5.49.0";
+ version = "5.50.0";
src = fetchurl {
- url = "${mirror}/stable/frameworks/5.49/kdewebkit-5.49.0.tar.xz";
- sha256 = "05idyw94ayjh7qdia9pnjmx29r5lsch421kv8h5ivr7ixcbrgk6n";
- name = "kdewebkit-5.49.0.tar.xz";
+ url = "${mirror}/stable/frameworks/5.50/kdewebkit-5.50.0.tar.xz";
+ sha256 = "0p5h58mcwyjkrbyq66360blx001j4997dk7z85a3hf64hhv7k10h";
+ name = "kdewebkit-5.50.0.tar.xz";
};
};
kdnssd = {
- version = "5.49.0";
+ version = "5.50.0";
src = fetchurl {
- url = "${mirror}/stable/frameworks/5.49/kdnssd-5.49.0.tar.xz";
- sha256 = "1n61id2x1iianshg8g6fw389mqihz4h8sj9hnng7cdg4csh72ffr";
- name = "kdnssd-5.49.0.tar.xz";
+ url = "${mirror}/stable/frameworks/5.50/kdnssd-5.50.0.tar.xz";
+ sha256 = "05d2y205mvdbgmmm0h4agbg4xf48x1xc2lgfvjnpgx8ilb5136pi";
+ name = "kdnssd-5.50.0.tar.xz";
};
};
kdoctools = {
- version = "5.49.0";
+ version = "5.50.0";
src = fetchurl {
- url = "${mirror}/stable/frameworks/5.49/kdoctools-5.49.0.tar.xz";
- sha256 = "1dmpk453s71ls0q8hgpqqd5dcr7zlimf5wykizcy2wn7p77gzsgl";
- name = "kdoctools-5.49.0.tar.xz";
+ url = "${mirror}/stable/frameworks/5.50/kdoctools-5.50.0.tar.xz";
+ sha256 = "1zgjf7ib8qlgjkkhkgd3b679b672cgsbiqsshbp0f1hn25ig4dqy";
+ name = "kdoctools-5.50.0.tar.xz";
};
};
kemoticons = {
- version = "5.49.0";
+ version = "5.50.0";
src = fetchurl {
- url = "${mirror}/stable/frameworks/5.49/kemoticons-5.49.0.tar.xz";
- sha256 = "0mz9hkhnprjbrfq54mqcvj8w87h025785m1bas80brsqzvni5krn";
- name = "kemoticons-5.49.0.tar.xz";
+ url = "${mirror}/stable/frameworks/5.50/kemoticons-5.50.0.tar.xz";
+ sha256 = "194rhxwf7h3mmb990l0p6l6lrf181c0scikj4h2ngmnjklgvajsg";
+ name = "kemoticons-5.50.0.tar.xz";
};
};
kfilemetadata = {
- version = "5.49.0";
+ version = "5.50.0";
src = fetchurl {
- url = "${mirror}/stable/frameworks/5.49/kfilemetadata-5.49.0.tar.xz";
- sha256 = "045k1mgn8kg0qfsr5sl1499nzhzmbcvrqc205pmq6sh4r14nvk80";
- name = "kfilemetadata-5.49.0.tar.xz";
+ url = "${mirror}/stable/frameworks/5.50/kfilemetadata-5.50.0.tar.xz";
+ sha256 = "063148xbnrgplzfgqdiwyzdj2rix97xln1x72kn3qprxzc5y257l";
+ name = "kfilemetadata-5.50.0.tar.xz";
};
};
kglobalaccel = {
- version = "5.49.0";
+ version = "5.50.0";
src = fetchurl {
- url = "${mirror}/stable/frameworks/5.49/kglobalaccel-5.49.0.tar.xz";
- sha256 = "1fk7wazfwr7smqiym3phm5yvw6cmiczag52y1vad8fgb3izd6zhl";
- name = "kglobalaccel-5.49.0.tar.xz";
+ url = "${mirror}/stable/frameworks/5.50/kglobalaccel-5.50.0.tar.xz";
+ sha256 = "1dwp9h7lf1lagwhm2yd2wx130s1kacjinw95f4sznxdw943vp1b3";
+ name = "kglobalaccel-5.50.0.tar.xz";
};
};
kguiaddons = {
- version = "5.49.0";
+ version = "5.50.0";
src = fetchurl {
- url = "${mirror}/stable/frameworks/5.49/kguiaddons-5.49.0.tar.xz";
- sha256 = "1zkjd3l5pyvvilcc9lbdgqaxnpvh586yf0cndl90h3x89hy1d4xk";
- name = "kguiaddons-5.49.0.tar.xz";
+ url = "${mirror}/stable/frameworks/5.50/kguiaddons-5.50.0.tar.xz";
+ sha256 = "1apz11issmj8c8zw4l88grl38m6nhgwpxb1j9h9v6khjvkwxr987";
+ name = "kguiaddons-5.50.0.tar.xz";
};
};
kholidays = {
- version = "5.49.0";
+ version = "5.50.0";
src = fetchurl {
- url = "${mirror}/stable/frameworks/5.49/kholidays-5.49.0.tar.xz";
- sha256 = "0yc4i4qsk3w1v0andw737ps1ad70696q140k0ycfhk6qmv1wvsdp";
- name = "kholidays-5.49.0.tar.xz";
+ url = "${mirror}/stable/frameworks/5.50/kholidays-5.50.0.tar.xz";
+ sha256 = "0zjkmsjq4m7d2gmsa0m613ny92xcb3w9zbkbsvnh8ci7ghiscz1j";
+ name = "kholidays-5.50.0.tar.xz";
};
};
khtml = {
- version = "5.49.0";
+ version = "5.50.0";
src = fetchurl {
- url = "${mirror}/stable/frameworks/5.49/portingAids/khtml-5.49.0.tar.xz";
- sha256 = "0k9m2pgq64grmgc6ywpzfnn65h8wfkkiwjbmz2mwbf2yi9c1ky64";
- name = "khtml-5.49.0.tar.xz";
+ url = "${mirror}/stable/frameworks/5.50/portingAids/khtml-5.50.0.tar.xz";
+ sha256 = "1r1qz3pyqifrzinjz83rhb5fgw5si8xmac7jkmn8w82j2kb41bxa";
+ name = "khtml-5.50.0.tar.xz";
};
};
ki18n = {
- version = "5.49.0";
+ version = "5.50.0";
src = fetchurl {
- url = "${mirror}/stable/frameworks/5.49/ki18n-5.49.0.tar.xz";
- sha256 = "1i4rdrxann45zl6fkmfd1b96q52g0mpc5x19fx9h80crapkm8jjz";
- name = "ki18n-5.49.0.tar.xz";
+ url = "${mirror}/stable/frameworks/5.50/ki18n-5.50.0.tar.xz";
+ sha256 = "1y6baizaynphbsfc2b93dh2nah23jh8a3rcbqn7whrdln0f31z19";
+ name = "ki18n-5.50.0.tar.xz";
};
};
kiconthemes = {
- version = "5.49.0";
+ version = "5.50.0";
src = fetchurl {
- url = "${mirror}/stable/frameworks/5.49/kiconthemes-5.49.0.tar.xz";
- sha256 = "1f7pk6smi2f0mm7jkrw5ymmkhd9gi8vnmppyblp1v3pvmy571c2m";
- name = "kiconthemes-5.49.0.tar.xz";
+ url = "${mirror}/stable/frameworks/5.50/kiconthemes-5.50.0.tar.xz";
+ sha256 = "0ip0py0lx3rhjg6wzhdxrbzckmq4n1pnfbzm996wqka6aa4dwzry";
+ name = "kiconthemes-5.50.0.tar.xz";
};
};
kidletime = {
- version = "5.49.0";
+ version = "5.50.0";
src = fetchurl {
- url = "${mirror}/stable/frameworks/5.49/kidletime-5.49.0.tar.xz";
- sha256 = "1fd02anlmaa0hnnp5q1s9973m3asy56qppwq1va1g6ga3csv3wrv";
- name = "kidletime-5.49.0.tar.xz";
+ url = "${mirror}/stable/frameworks/5.50/kidletime-5.50.0.tar.xz";
+ sha256 = "1kqghslwvis72h1sw6r4vrwsz0mwqzf5shj6m5mxqk6jv9wbfni1";
+ name = "kidletime-5.50.0.tar.xz";
};
};
kimageformats = {
- version = "5.49.0";
+ version = "5.50.0";
src = fetchurl {
- url = "${mirror}/stable/frameworks/5.49/kimageformats-5.49.0.tar.xz";
- sha256 = "1q7019gbk59fwampna1ayjvw016c0q79hmldpaqh3xa9sh082wy4";
- name = "kimageformats-5.49.0.tar.xz";
+ url = "${mirror}/stable/frameworks/5.50/kimageformats-5.50.0.tar.xz";
+ sha256 = "0kndxzkcjm9syb6k7zzw2jxdfm1gw6gasq78issypxwc1zci5nvb";
+ name = "kimageformats-5.50.0.tar.xz";
};
};
kinit = {
- version = "5.49.0";
+ version = "5.50.0";
src = fetchurl {
- url = "${mirror}/stable/frameworks/5.49/kinit-5.49.0.tar.xz";
- sha256 = "1rq9b59gdgcpvwd694l8h55sqahpdaky0n7ag5psjlfn5myf1d95";
- name = "kinit-5.49.0.tar.xz";
+ url = "${mirror}/stable/frameworks/5.50/kinit-5.50.0.tar.xz";
+ sha256 = "1lgalvd81skdncdhd0pwng0vvy54f5wi2wwpqcil22y3860jfb4i";
+ name = "kinit-5.50.0.tar.xz";
};
};
kio = {
- version = "5.49.0";
+ version = "5.50.0";
src = fetchurl {
- url = "${mirror}/stable/frameworks/5.49/kio-5.49.0.tar.xz";
- sha256 = "0rrsg3g1b204cdp58vxd5dig1ggwyvk1382p1c86vn6w8qbrq27k";
- name = "kio-5.49.0.tar.xz";
+ url = "${mirror}/stable/frameworks/5.50/kio-5.50.0.tar.xz";
+ sha256 = "1bnjal43rpsbabwq756xswj1cbhbrqxgjpjccjgxqml7csa3yhh1";
+ name = "kio-5.50.0.tar.xz";
};
};
kirigami2 = {
- version = "5.49.0";
+ version = "5.50.0";
src = fetchurl {
- url = "${mirror}/stable/frameworks/5.49/kirigami2-5.49.0.tar.xz";
- sha256 = "1wan9h7kvjzvyzfjfjd512lxiac5prhs493xjqwxgags6kxwglaz";
- name = "kirigami2-5.49.0.tar.xz";
+ url = "${mirror}/stable/frameworks/5.50/kirigami2-5.50.0.tar.xz";
+ sha256 = "0jc4xrs0il5b7s7hzi4ff7jn30r8kgg4fzqxrhwqix9rcxn3nrxl";
+ name = "kirigami2-5.50.0.tar.xz";
};
};
kitemmodels = {
- version = "5.49.0";
+ version = "5.50.0";
src = fetchurl {
- url = "${mirror}/stable/frameworks/5.49/kitemmodels-5.49.0.tar.xz";
- sha256 = "1frha301540js45mrxiw034m9b2rwsa56xphkqn6cm4jmn48qdjg";
- name = "kitemmodels-5.49.0.tar.xz";
+ url = "${mirror}/stable/frameworks/5.50/kitemmodels-5.50.0.tar.xz";
+ sha256 = "1c4yfqibizrm0zw9kijgkx4pq0r9f12nrw2dnw90g8q7s0pg7q36";
+ name = "kitemmodels-5.50.0.tar.xz";
};
};
kitemviews = {
- version = "5.49.0";
+ version = "5.50.0";
src = fetchurl {
- url = "${mirror}/stable/frameworks/5.49/kitemviews-5.49.0.tar.xz";
- sha256 = "1aj605q2p72w4rb9i0f2xb93bn5xfjq9sl5i4h6rqflcvvy7qpdp";
- name = "kitemviews-5.49.0.tar.xz";
+ url = "${mirror}/stable/frameworks/5.50/kitemviews-5.50.0.tar.xz";
+ sha256 = "0wghvj5f1xkm9rf6rg50m399z25m1rfvd67ixr0lqwnhag1r32n8";
+ name = "kitemviews-5.50.0.tar.xz";
};
};
kjobwidgets = {
- version = "5.49.0";
+ version = "5.50.0";
src = fetchurl {
- url = "${mirror}/stable/frameworks/5.49/kjobwidgets-5.49.0.tar.xz";
- sha256 = "04i5cvbxii7n0jr3ai1dh44miqbdkxb6an5w8s7qvkv0xmkml35g";
- name = "kjobwidgets-5.49.0.tar.xz";
+ url = "${mirror}/stable/frameworks/5.50/kjobwidgets-5.50.0.tar.xz";
+ sha256 = "0jc7hiid2b2bpj0xw2clrzkplnqi7x1lhh5za2c37dlynndy609q";
+ name = "kjobwidgets-5.50.0.tar.xz";
};
};
kjs = {
- version = "5.49.0";
+ version = "5.50.0";
src = fetchurl {
- url = "${mirror}/stable/frameworks/5.49/portingAids/kjs-5.49.0.tar.xz";
- sha256 = "057ikyi4wffjvxdyk08hmj7h8vmbwbcxv98apmjzgsd611zvx5p0";
- name = "kjs-5.49.0.tar.xz";
+ url = "${mirror}/stable/frameworks/5.50/portingAids/kjs-5.50.0.tar.xz";
+ sha256 = "1jfdcg725mwcfigqhp2srshvj7vhzxb3yhpwij8c0gwmzm0h1lxv";
+ name = "kjs-5.50.0.tar.xz";
};
};
kjsembed = {
- version = "5.49.0";
+ version = "5.50.0";
src = fetchurl {
- url = "${mirror}/stable/frameworks/5.49/portingAids/kjsembed-5.49.0.tar.xz";
- sha256 = "0qddjkfm6f0f5dynqvi3l23mgyfdbk4xzg967sj3a2qlq423ah0m";
- name = "kjsembed-5.49.0.tar.xz";
+ url = "${mirror}/stable/frameworks/5.50/portingAids/kjsembed-5.50.0.tar.xz";
+ sha256 = "1iacz8x0idlswg0lwiv2i1k2qklhkk6ih6nhkajq4dy6ajnpbn7a";
+ name = "kjsembed-5.50.0.tar.xz";
};
};
kmediaplayer = {
- version = "5.49.0";
+ version = "5.50.0";
src = fetchurl {
- url = "${mirror}/stable/frameworks/5.49/portingAids/kmediaplayer-5.49.0.tar.xz";
- sha256 = "0hbx48ivj4i96yagd9n9vd22ycsljrvijm6nfms4x7z7jr49flrx";
- name = "kmediaplayer-5.49.0.tar.xz";
+ url = "${mirror}/stable/frameworks/5.50/portingAids/kmediaplayer-5.50.0.tar.xz";
+ sha256 = "0wz8ln45wkslh5c7dq8dijj19xr1xqxi5svv58a3hr5vbcyw3sjm";
+ name = "kmediaplayer-5.50.0.tar.xz";
};
};
knewstuff = {
- version = "5.49.0";
+ version = "5.50.0";
src = fetchurl {
- url = "${mirror}/stable/frameworks/5.49/knewstuff-5.49.0.tar.xz";
- sha256 = "1vhcl2z9rcqg8390l1cwn3yyi1n17pn6mn8fsplp25qhzimb8bmk";
- name = "knewstuff-5.49.0.tar.xz";
+ url = "${mirror}/stable/frameworks/5.50/knewstuff-5.50.0.tar.xz";
+ sha256 = "1imh0hl056hpmrvdlmb68v0wclx3isr6l8sdqrzh3snmjm3jdwhd";
+ name = "knewstuff-5.50.0.tar.xz";
};
};
knotifications = {
- version = "5.49.0";
+ version = "5.50.0";
src = fetchurl {
- url = "${mirror}/stable/frameworks/5.49/knotifications-5.49.0.tar.xz";
- sha256 = "10481j2irlqhqd16xi412xbglnyjl0ndanlv9s0d3fxirs95zdd9";
- name = "knotifications-5.49.0.tar.xz";
+ url = "${mirror}/stable/frameworks/5.50/knotifications-5.50.0.tar.xz";
+ sha256 = "0xj62kbrlq4ib7kibwrmsbf84nv6klbh3v7rb34alacvvaf5lljs";
+ name = "knotifications-5.50.0.tar.xz";
};
};
knotifyconfig = {
- version = "5.49.0";
+ version = "5.50.0";
src = fetchurl {
- url = "${mirror}/stable/frameworks/5.49/knotifyconfig-5.49.0.tar.xz";
- sha256 = "09v4aq5x98sqg2awhw0n0y0rnjkr77kbf51xij0fiykd4llp9lfa";
- name = "knotifyconfig-5.49.0.tar.xz";
+ url = "${mirror}/stable/frameworks/5.50/knotifyconfig-5.50.0.tar.xz";
+ sha256 = "01l4wn9khdd28rbi2qbpaqrgjp6achg6wbpaixwph2y2g9zgixdz";
+ name = "knotifyconfig-5.50.0.tar.xz";
};
};
kpackage = {
- version = "5.49.0";
+ version = "5.50.0";
src = fetchurl {
- url = "${mirror}/stable/frameworks/5.49/kpackage-5.49.0.tar.xz";
- sha256 = "1xbfjwxb4gff8gg0hs5m9s0jcnzqk27rs2jr71g5ckhvs5psnkcd";
- name = "kpackage-5.49.0.tar.xz";
+ url = "${mirror}/stable/frameworks/5.50/kpackage-5.50.0.tar.xz";
+ sha256 = "0bx1hzjl5m9893s97mlhrrshagfkng36rxa0bwm7y8sbh4rnnj8p";
+ name = "kpackage-5.50.0.tar.xz";
};
};
kparts = {
- version = "5.49.0";
+ version = "5.50.0";
src = fetchurl {
- url = "${mirror}/stable/frameworks/5.49/kparts-5.49.0.tar.xz";
- sha256 = "0zdz0byj0gsbgb007y8x37w8yf1gkw6dsp2s9bbdc4w6h9ipdj2k";
- name = "kparts-5.49.0.tar.xz";
+ url = "${mirror}/stable/frameworks/5.50/kparts-5.50.0.tar.xz";
+ sha256 = "1zwa0pyy0sa3j0yrdggl33gx3a48zvz68nl8r7b7ak445iwmx821";
+ name = "kparts-5.50.0.tar.xz";
};
};
kpeople = {
- version = "5.49.0";
+ version = "5.50.0";
src = fetchurl {
- url = "${mirror}/stable/frameworks/5.49/kpeople-5.49.0.tar.xz";
- sha256 = "0i5pd1d2jphsvpc3dpdw28dsdal1qrnnrx3k6qx4wax3f8ph5khv";
- name = "kpeople-5.49.0.tar.xz";
+ url = "${mirror}/stable/frameworks/5.50/kpeople-5.50.0.tar.xz";
+ sha256 = "0vc81g2i5wznfav4nh5c8cp31aridiwg9ksg0gaa2q41882w560b";
+ name = "kpeople-5.50.0.tar.xz";
};
};
kplotting = {
- version = "5.49.0";
+ version = "5.50.0";
src = fetchurl {
- url = "${mirror}/stable/frameworks/5.49/kplotting-5.49.0.tar.xz";
- sha256 = "13fzqqkyxs4ja6n5yb9lc5jx4qpsmrbsiihnwrgj3lhpzhlr91n0";
- name = "kplotting-5.49.0.tar.xz";
+ url = "${mirror}/stable/frameworks/5.50/kplotting-5.50.0.tar.xz";
+ sha256 = "18xw8q426sapim7532f0syb5nwf0vhx9h6xp52lyljj98l88vydw";
+ name = "kplotting-5.50.0.tar.xz";
};
};
kpty = {
- version = "5.49.0";
+ version = "5.50.0";
src = fetchurl {
- url = "${mirror}/stable/frameworks/5.49/kpty-5.49.0.tar.xz";
- sha256 = "1pnj07079l6gkz6171fcvljh0dcdy9s77p1q0l9nnkknjbr102pg";
- name = "kpty-5.49.0.tar.xz";
+ url = "${mirror}/stable/frameworks/5.50/kpty-5.50.0.tar.xz";
+ sha256 = "0slk8nwh94p8xp3q91wmda2v3ipmsvd4fpdsdfz4w2j0kh6nd6w5";
+ name = "kpty-5.50.0.tar.xz";
};
};
kross = {
- version = "5.49.0";
+ version = "5.50.0";
src = fetchurl {
- url = "${mirror}/stable/frameworks/5.49/portingAids/kross-5.49.0.tar.xz";
- sha256 = "194zcf499fkwk3wcs3kc3l0fi9h8gn5yqh6gxrgiyn6iyy9a4qdz";
- name = "kross-5.49.0.tar.xz";
+ url = "${mirror}/stable/frameworks/5.50/portingAids/kross-5.50.0.tar.xz";
+ sha256 = "1g0i34z4rhrsnq41plavq880r3c17fki69vs3wjvzmybfn0klha2";
+ name = "kross-5.50.0.tar.xz";
};
};
krunner = {
- version = "5.49.0";
+ version = "5.50.0";
src = fetchurl {
- url = "${mirror}/stable/frameworks/5.49/krunner-5.49.0.tar.xz";
- sha256 = "02l5gch9hpag1q5ixnb541g7m9lx25pbggldpa8zykp63apyca19";
- name = "krunner-5.49.0.tar.xz";
+ url = "${mirror}/stable/frameworks/5.50/krunner-5.50.0.tar.xz";
+ sha256 = "03igg111n7c6ys0xm075hlr8k0g599pwgha7wi02k8dbbc2q20g8";
+ name = "krunner-5.50.0.tar.xz";
};
};
kservice = {
- version = "5.49.0";
+ version = "5.50.0";
src = fetchurl {
- url = "${mirror}/stable/frameworks/5.49/kservice-5.49.0.tar.xz";
- sha256 = "1wwb6c6m8f3b16p47adkc05rrlszvvym7ckks5xp08s58pk1dm8z";
- name = "kservice-5.49.0.tar.xz";
+ url = "${mirror}/stable/frameworks/5.50/kservice-5.50.0.tar.xz";
+ sha256 = "0y0yk1gr7nd0svk4vkbyy1igy2klmwmsv8wwx1bvfkkg3yshz199";
+ name = "kservice-5.50.0.tar.xz";
};
};
ktexteditor = {
- version = "5.49.0";
+ version = "5.50.0";
src = fetchurl {
- url = "${mirror}/stable/frameworks/5.49/ktexteditor-5.49.0.tar.xz";
- sha256 = "14iss8svx49vav0h2kg8vhv8g5hg4ky30s7049csfwz7xhp7jmcj";
- name = "ktexteditor-5.49.0.tar.xz";
+ url = "${mirror}/stable/frameworks/5.50/ktexteditor-5.50.0.tar.xz";
+ sha256 = "00h75yy17npwzhz572k1784h2gw5gynhl9gxbj0i9zbis1nfi1m2";
+ name = "ktexteditor-5.50.0.tar.xz";
};
};
ktextwidgets = {
- version = "5.49.0";
+ version = "5.50.0";
src = fetchurl {
- url = "${mirror}/stable/frameworks/5.49/ktextwidgets-5.49.0.tar.xz";
- sha256 = "14gclshmpwmfwkp2hzlnf823pjjmknd9q0gdclsh3yy268c2rsw1";
- name = "ktextwidgets-5.49.0.tar.xz";
+ url = "${mirror}/stable/frameworks/5.50/ktextwidgets-5.50.0.tar.xz";
+ sha256 = "18z108si2cr38np3wcd7hkjjqhs661j2xv0zf8837mm9di4bgjiz";
+ name = "ktextwidgets-5.50.0.tar.xz";
};
};
kunitconversion = {
- version = "5.49.0";
+ version = "5.50.0";
src = fetchurl {
- url = "${mirror}/stable/frameworks/5.49/kunitconversion-5.49.0.tar.xz";
- sha256 = "11jnqz218rga3f4ppf1d927c7qhh2qpghwjpsrnrxdkz5nrvnf79";
- name = "kunitconversion-5.49.0.tar.xz";
+ url = "${mirror}/stable/frameworks/5.50/kunitconversion-5.50.0.tar.xz";
+ sha256 = "0f37ap98rzc575vjf1hhh51bbjvgn00g9mdnp9x3lmi5l6npvwj4";
+ name = "kunitconversion-5.50.0.tar.xz";
};
};
kwallet = {
- version = "5.49.0";
+ version = "5.50.0";
src = fetchurl {
- url = "${mirror}/stable/frameworks/5.49/kwallet-5.49.0.tar.xz";
- sha256 = "13bmks9jb3yhp6clv25qkqkrvbhfyk9z16laxsv79jdd82lxgn1z";
- name = "kwallet-5.49.0.tar.xz";
+ url = "${mirror}/stable/frameworks/5.50/kwallet-5.50.0.tar.xz";
+ sha256 = "14hlcly6x9ybczxg63nwsgv7kah1sx0haxlyllma4rwmh8a85ji5";
+ name = "kwallet-5.50.0.tar.xz";
};
};
kwayland = {
- version = "5.49.0";
+ version = "5.50.0";
src = fetchurl {
- url = "${mirror}/stable/frameworks/5.49/kwayland-5.49.0.tar.xz";
- sha256 = "0d95l2i3j1xxkc15n57w4rhf3di02zna4zzn4gap9qdhfxlfbqi6";
- name = "kwayland-5.49.0.tar.xz";
+ url = "${mirror}/stable/frameworks/5.50/kwayland-5.50.0.tar.xz";
+ sha256 = "021pqsv59svj6j4g6alcgrsdi5bybx8i1skpf1v5nf5fc6f17bqb";
+ name = "kwayland-5.50.0.tar.xz";
};
};
kwidgetsaddons = {
- version = "5.49.0";
+ version = "5.50.0";
src = fetchurl {
- url = "${mirror}/stable/frameworks/5.49/kwidgetsaddons-5.49.0.tar.xz";
- sha256 = "1frgqz9njbc81pfy6gl6p0hyh1977lg31ynrx5wy7lg7fwaxwl92";
- name = "kwidgetsaddons-5.49.0.tar.xz";
+ url = "${mirror}/stable/frameworks/5.50/kwidgetsaddons-5.50.0.tar.xz";
+ sha256 = "0yvd1b15vjk03jdwpyd97z1wn892amp3jkx3s7ff8nc8ax7fyc4m";
+ name = "kwidgetsaddons-5.50.0.tar.xz";
};
};
kwindowsystem = {
- version = "5.49.0";
+ version = "5.50.0";
src = fetchurl {
- url = "${mirror}/stable/frameworks/5.49/kwindowsystem-5.49.0.tar.xz";
- sha256 = "175rzwrjndhawyy4x11lbihdr1r9gwxmxjpbz4x06hlz4g50wffp";
- name = "kwindowsystem-5.49.0.tar.xz";
+ url = "${mirror}/stable/frameworks/5.50/kwindowsystem-5.50.0.tar.xz";
+ sha256 = "0gmk7hp4z7ly6hm0z479hv5vqlmzfr4c9p6r572agzbpc8m682v9";
+ name = "kwindowsystem-5.50.0.tar.xz";
};
};
kxmlgui = {
- version = "5.49.0";
+ version = "5.50.0";
src = fetchurl {
- url = "${mirror}/stable/frameworks/5.49/kxmlgui-5.49.0.tar.xz";
- sha256 = "0wsgs5ya3wnc5cryi1r9i30sq8dnnhh15p02skdjlhwjfvdhxmfa";
- name = "kxmlgui-5.49.0.tar.xz";
+ url = "${mirror}/stable/frameworks/5.50/kxmlgui-5.50.0.tar.xz";
+ sha256 = "1ga81jd0ad5jkb9wdh5hwzzq9axw6pcy4jz1vlc9s2xywyaq931l";
+ name = "kxmlgui-5.50.0.tar.xz";
};
};
kxmlrpcclient = {
- version = "5.49.0";
+ version = "5.50.0";
src = fetchurl {
- url = "${mirror}/stable/frameworks/5.49/kxmlrpcclient-5.49.0.tar.xz";
- sha256 = "0l4jnvn7s77jkvd2z44mz24mfzcw499plms79j21pjryc88drh06";
- name = "kxmlrpcclient-5.49.0.tar.xz";
+ url = "${mirror}/stable/frameworks/5.50/kxmlrpcclient-5.50.0.tar.xz";
+ sha256 = "03xqxb08kbzs1m0sxpgq8lzf4809kkhl7yc17svq7y00xgq3h36r";
+ name = "kxmlrpcclient-5.50.0.tar.xz";
};
};
modemmanager-qt = {
- version = "5.49.0";
+ version = "5.50.0";
src = fetchurl {
- url = "${mirror}/stable/frameworks/5.49/modemmanager-qt-5.49.0.tar.xz";
- sha256 = "1wf3v552vbr4kh2d770zn3yn0q3bqjqbfrvnf813mnld7961m7p2";
- name = "modemmanager-qt-5.49.0.tar.xz";
+ url = "${mirror}/stable/frameworks/5.50/modemmanager-qt-5.50.0.tar.xz";
+ sha256 = "1w7im3ihcpqvjiw7rj7iakxpyhzlaams0r900kh0mv4zfdyl9szs";
+ name = "modemmanager-qt-5.50.0.tar.xz";
};
};
networkmanager-qt = {
- version = "5.49.0";
+ version = "5.50.0";
src = fetchurl {
- url = "${mirror}/stable/frameworks/5.49/networkmanager-qt-5.49.0.tar.xz";
- sha256 = "16pnd52m9srcb2ml3vc3kd9k1yak5rq09yci39qp7z5jbdy7jk2z";
- name = "networkmanager-qt-5.49.0.tar.xz";
+ url = "${mirror}/stable/frameworks/5.50/networkmanager-qt-5.50.0.tar.xz";
+ sha256 = "168bzsvsh3i1w3840nickg7rv0hncaiiv6sc1sycg4n6v7773dzl";
+ name = "networkmanager-qt-5.50.0.tar.xz";
};
};
oxygen-icons5 = {
- version = "5.49.0";
+ version = "5.50.0";
src = fetchurl {
- url = "${mirror}/stable/frameworks/5.49/oxygen-icons5-5.49.0.tar.xz";
- sha256 = "0llx06sr36cd6vgkgm3jw6k4cv1cfx3r6x6lmb477wpahis0n75g";
- name = "oxygen-icons5-5.49.0.tar.xz";
+ url = "${mirror}/stable/frameworks/5.50/oxygen-icons5-5.50.0.tar.xz";
+ sha256 = "1ajx9y4wqzi55dmz360j7ha987m3wzs2zbnrm49lipgd55c8n3nc";
+ name = "oxygen-icons5-5.50.0.tar.xz";
};
};
plasma-framework = {
- version = "5.49.0";
+ version = "5.50.0";
src = fetchurl {
- url = "${mirror}/stable/frameworks/5.49/plasma-framework-5.49.0.tar.xz";
- sha256 = "1yrccbkdpnfbgn7fzpmzzxm5c7fhkv1vqygq1f96r30fia0cj5jv";
- name = "plasma-framework-5.49.0.tar.xz";
+ url = "${mirror}/stable/frameworks/5.50/plasma-framework-5.50.0.tar.xz";
+ sha256 = "01p0friqdhzjkssd655rdsfxp2hdqaf34ypqzx7xwnw3wj1971r8";
+ name = "plasma-framework-5.50.0.tar.xz";
};
};
prison = {
- version = "5.49.0";
+ version = "5.50.0";
src = fetchurl {
- url = "${mirror}/stable/frameworks/5.49/prison-5.49.0.tar.xz";
- sha256 = "0dppz9x6k84sl0aiyjlh3xigqgda64r8mij3bzxcdkv2wbc4ld9d";
- name = "prison-5.49.0.tar.xz";
+ url = "${mirror}/stable/frameworks/5.50/prison-5.50.0.tar.xz";
+ sha256 = "1v62dq44li0wwrgiiwad2hjj2vzcypa3i9qp0gwc8kkzg162b62d";
+ name = "prison-5.50.0.tar.xz";
};
};
purpose = {
- version = "5.49.0";
+ version = "5.50.0";
src = fetchurl {
- url = "${mirror}/stable/frameworks/5.49/purpose-5.49.0.tar.xz";
- sha256 = "014izz6vvk3vqw7s2qy33dqfflyylk8vqr9srkf391f6yfld9ygz";
- name = "purpose-5.49.0.tar.xz";
+ url = "${mirror}/stable/frameworks/5.50/purpose-5.50.0.tar.xz";
+ sha256 = "11m5391mjf4r89frvvdq9jlkylp67h87x0g3mx00yfc004bsyi6f";
+ name = "purpose-5.50.0.tar.xz";
};
};
qqc2-desktop-style = {
- version = "5.49.0";
+ version = "5.50.0";
src = fetchurl {
- url = "${mirror}/stable/frameworks/5.49/qqc2-desktop-style-5.49.0.tar.xz";
- sha256 = "1vbms7b8x1y7yh8im8dv1q3wwl3j2x4r47yqg86f28grw2r2n2zj";
- name = "qqc2-desktop-style-5.49.0.tar.xz";
+ url = "${mirror}/stable/frameworks/5.50/qqc2-desktop-style-5.50.0.tar.xz";
+ sha256 = "0ml88m6hb1llzl7kaykkny7v717grvzh8jnlwdyla2lv4rvvz7d8";
+ name = "qqc2-desktop-style-5.50.0.tar.xz";
};
};
solid = {
- version = "5.49.0";
+ version = "5.50.0";
src = fetchurl {
- url = "${mirror}/stable/frameworks/5.49/solid-5.49.0.tar.xz";
- sha256 = "1p7rdmf2f8520xc7zp7wxlcizyyjfxwq5mf95qsfpwc4dl0c43gp";
- name = "solid-5.49.0.tar.xz";
+ url = "${mirror}/stable/frameworks/5.50/solid-5.50.0.tar.xz";
+ sha256 = "1y8sclp8lqf4hkqvbm1mmklrjvkxpvz3bb8qqbi5xhd5p9vf6z0h";
+ name = "solid-5.50.0.tar.xz";
};
};
sonnet = {
- version = "5.49.0";
+ version = "5.50.0";
src = fetchurl {
- url = "${mirror}/stable/frameworks/5.49/sonnet-5.49.0.tar.xz";
- sha256 = "0m5pmka1hwjsg3c3qvx087z3fjrfw0ayk7ylgjls5iwd39kkl1b3";
- name = "sonnet-5.49.0.tar.xz";
+ url = "${mirror}/stable/frameworks/5.50/sonnet-5.50.0.tar.xz";
+ sha256 = "13ddp5l9vnyqg05xadc4d1j0xfl8ain4qprq3iw82ygrchyrzm0d";
+ name = "sonnet-5.50.0.tar.xz";
+ };
+ };
+ syndication = {
+ version = "5.50.0";
+ src = fetchurl {
+ url = "${mirror}/stable/frameworks/5.50/syndication-5.50.0.tar.xz";
+ sha256 = "1i73blq2fdzvzfg1p6715fv5m40yd6vcvnbg1pfmbr3696qy4mb3";
+ name = "syndication-5.50.0.tar.xz";
};
};
syntax-highlighting = {
- version = "5.49.0";
+ version = "5.50.0";
src = fetchurl {
- url = "${mirror}/stable/frameworks/5.49/syntax-highlighting-5.49.0.tar.xz";
- sha256 = "17rkgzkfiz5dv0xr67na7ikqszgwjnf2gc11b2h47qdsr7pgx95v";
- name = "syntax-highlighting-5.49.0.tar.xz";
+ url = "${mirror}/stable/frameworks/5.50/syntax-highlighting-5.50.0.tar.xz";
+ sha256 = "10iw8fhqgvsn4jgf81d9xy8aac07acn45rysnvj9wpm3cmxqxmd4";
+ name = "syntax-highlighting-5.50.0.tar.xz";
};
};
threadweaver = {
- version = "5.49.0";
+ version = "5.50.0";
src = fetchurl {
- url = "${mirror}/stable/frameworks/5.49/threadweaver-5.49.0.tar.xz";
- sha256 = "099bs429p71dzrqy25z61rvn48w3b73p7yag4q69jnxcpj0qcyz7";
- name = "threadweaver-5.49.0.tar.xz";
+ url = "${mirror}/stable/frameworks/5.50/threadweaver-5.50.0.tar.xz";
+ sha256 = "11j82nq5pr7rk94bnfzanpj3b41dqjl9cgk2b3h326y7bphcrkyf";
+ name = "threadweaver-5.50.0.tar.xz";
};
};
}
diff --git a/pkgs/development/libraries/kde-frameworks/syndication.nix b/pkgs/development/libraries/kde-frameworks/syndication.nix
new file mode 100644
index 00000000000..71ee520995c
--- /dev/null
+++ b/pkgs/development/libraries/kde-frameworks/syndication.nix
@@ -0,0 +1,13 @@
+{ mkDerivation, lib
+, extra-cmake-modules
+, kcodecs
+}:
+
+mkDerivation {
+ name = "syndication";
+ meta = {
+ maintainers = [ lib.maintainers.bkchr ];
+ };
+ nativeBuildInputs = [ extra-cmake-modules ];
+ buildInputs = [ kcodecs ];
+}
diff --git a/pkgs/development/libraries/kmsxx/default.nix b/pkgs/development/libraries/kmsxx/default.nix
index 8be8eb71357..d270e2f0678 100644
--- a/pkgs/development/libraries/kmsxx/default.nix
+++ b/pkgs/development/libraries/kmsxx/default.nix
@@ -2,15 +2,15 @@
stdenv.mkDerivation rec {
pname = "kmsxx";
- version = "2017-10-10";
+ version = "2018-09-10";
name = pname + "-" + version;
src = fetchFromGitHub {
owner = "tomba";
repo = "kmsxx";
fetchSubmodules = true;
- rev = "f32b82c17cd357ae1c8ed2636266113955293feb";
- sha256 = "14panqdqq83wh6wym5afdiyrr78mb12ga63pgrppj27kgv398yjj";
+ rev = "524176c33ee2b79f78d454fa621e0d32e7e72488";
+ sha256 = "0wyg0zv207h5a78cwmbg6fi8gr8blbbkwngjq8hayfbg45ww0jy8";
};
enableParallelBuilding = true;
diff --git a/pkgs/development/libraries/libiio/default.nix b/pkgs/development/libraries/libiio/default.nix
new file mode 100644
index 00000000000..defb17bcd88
--- /dev/null
+++ b/pkgs/development/libraries/libiio/default.nix
@@ -0,0 +1,29 @@
+{ stdenv, fetchFromGitHub
+, cmake, flex, bison
+, libxml2
+}:
+
+stdenv.mkDerivation rec {
+ name = "libiio-${version}";
+ version = "0.15";
+
+ src = fetchFromGitHub {
+ owner = "analogdevicesinc";
+ repo = "libiio";
+ rev = "refs/tags/v${version}";
+ sha256 = "05sbvvjka03qi080ad6g2y6gfwqp3n3zv7dpv237dym0zjyxqfa7";
+ };
+
+ outputs = [ "out" "lib" "dev" ];
+
+ nativeBuildInputs = [ cmake flex bison ];
+ buildInputs = [ libxml2 ];
+
+ meta = with stdenv.lib; {
+ description = "API for interfacing with the Linux Industrial I/O Subsystem";
+ homepage = https://github.com/analogdevicesinc/libiio;
+ license = licenses.lgpl21;
+ platforms = platforms.linux;
+ maintainers = with maintainers; [ thoughtpolice ];
+ };
+}
diff --git a/pkgs/development/libraries/libmediainfo/default.nix b/pkgs/development/libraries/libmediainfo/default.nix
index 3ba513f9078..c4f41663c84 100644
--- a/pkgs/development/libraries/libmediainfo/default.nix
+++ b/pkgs/development/libraries/libmediainfo/default.nix
@@ -1,11 +1,11 @@
{ stdenv, fetchurl, autoreconfHook, pkgconfig, libzen, zlib }:
stdenv.mkDerivation rec {
- version = "18.05";
+ version = "18.08";
name = "libmediainfo-${version}";
src = fetchurl {
url = "https://mediaarea.net/download/source/libmediainfo/${version}/libmediainfo_${version}.tar.xz";
- sha256 = "08ajrmbvqn2cvfq3jjdh64lma77kx4di5vg632c6bmbir89rcxbn";
+ sha256 = "0h9fkfkil9y5xjxa7q4gxxihkn9kv9hak6ral2isvks5x3sy0ca8";
};
nativeBuildInputs = [ autoreconfHook pkgconfig ];
diff --git a/pkgs/development/libraries/libndtypes/default.nix b/pkgs/development/libraries/libndtypes/default.nix
index 685518efbd2..925154e1d45 100644
--- a/pkgs/development/libraries/libndtypes/default.nix
+++ b/pkgs/development/libraries/libndtypes/default.nix
@@ -14,7 +14,9 @@ stdenv.mkDerivation rec {
sha256 = "0dpvv13mrid8l5zkjlz18qvirz3nr0v98agx9bcvkqbiahlfgjli";
};
- makeFlags = [ "CONFIGURE_LDFLAGS='-shared'" ];
+ # Override linker with cc (symlink to either gcc or clang)
+ # Library expects to use cc for linking
+ configureFlags = [ "LD=${stdenv.cc.targetPrefix}cc" ];
meta = {
description = "Dynamic types for data description and in-memory computations";
@@ -22,4 +24,4 @@ stdenv.mkDerivation rec {
license = lib.licenses.bsdOriginal;
maintainers = with lib.maintainers; [ costrouc ];
};
-}
\ No newline at end of file
+}
diff --git a/pkgs/development/libraries/libuv/default.nix b/pkgs/development/libraries/libuv/default.nix
index a0ace84bc67..50b43c4e043 100644
--- a/pkgs/development/libraries/libuv/default.nix
+++ b/pkgs/development/libraries/libuv/default.nix
@@ -41,6 +41,10 @@ stdenv.mkDerivation rec {
"multiple_listen" "delayed_accept"
"shutdown_close_tcp" "shutdown_eof" "shutdown_twice" "callback_stack"
"tty_pty"
+ ] ++ stdenv.lib.optionals stdenv.isAarch32 [
+ # I observe this test failing with some regularity on ARMv7:
+ # https://github.com/libuv/libuv/issues/1871
+ "shutdown_close_pipe"
];
tdRegexp = lib.concatStringsSep "\\|" toDisable;
in lib.optionalString doCheck ''
diff --git a/pkgs/development/libraries/libx86emu/default.nix b/pkgs/development/libraries/libx86emu/default.nix
index b0730452db8..591a3e451ab 100644
--- a/pkgs/development/libraries/libx86emu/default.nix
+++ b/pkgs/development/libraries/libx86emu/default.nix
@@ -2,13 +2,13 @@
stdenv.mkDerivation rec {
name = "libx86emu-${version}";
- version = "2.0";
+ version = "2.1";
src = fetchFromGitHub {
owner = "wfeldt";
repo = "libx86emu";
rev = version;
- sha256 = "12rlkwnl5zgmmpm6n6cqnkyhkji4jw1d27y8x1krvlpi1z4bjidx";
+ sha256 = "16k16xcw2w2c69sn04jfdy9fd7cxs463d2rwb948xchyvfla958j";
};
nativeBuildInputs = [ perl ];
diff --git a/pkgs/development/libraries/libxnd/default.nix b/pkgs/development/libraries/libxnd/default.nix
index c99c3f42bfc..6b9375c7381 100644
--- a/pkgs/development/libraries/libxnd/default.nix
+++ b/pkgs/development/libraries/libxnd/default.nix
@@ -17,10 +17,9 @@ stdenv.mkDerivation rec {
buildInputs = [ libndtypes ];
- configureFlags = [ "XND_INCLUDE='-I${libndtypes}/include'"
- "XND_LINK='-L${libndtypes}/lib'" ];
-
- makeFlags = [ "CONFIGURE_LDFLAGS='-shared'" ];
+ # Override linker with cc (symlink to either gcc or clang)
+ # Library expects to use cc for linking
+ configureFlags = [ "LD=${stdenv.cc.targetPrefix}cc" ];
meta = {
description = "General container that maps a wide range of Python values directly to memory";
diff --git a/pkgs/development/libraries/log4cplus/default.nix b/pkgs/development/libraries/log4cplus/default.nix
index 3fdad73d9fa..7a390021d1f 100644
--- a/pkgs/development/libraries/log4cplus/default.nix
+++ b/pkgs/development/libraries/log4cplus/default.nix
@@ -1,14 +1,14 @@
{ stdenv, fetchurl }:
let
- name = "log4cplus-1.2.0";
+ name = "log4cplus-2.0.2";
in
stdenv.mkDerivation {
inherit name;
src = fetchurl {
url = "mirror://sourceforge/log4cplus/${name}.tar.bz2";
- sha256 = "1fb3g9l12sps3mv4xjiql2kcvj439mww3skz735y7113cnlcf338";
+ sha256 = "0y9yy32lhgrcss8i2gcc9incdy55rcrr16dx051gkia1vdzfkay4";
};
meta = {
diff --git a/pkgs/development/libraries/mono-addins/default.nix b/pkgs/development/libraries/mono-addins/default.nix
index e68661b44ec..780f68e7d48 100644
--- a/pkgs/development/libraries/mono-addins/default.nix
+++ b/pkgs/development/libraries/mono-addins/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, autoreconfHook, pkgconfig, mono, gtk-sharp-2_0 }:
+{ stdenv, fetchFromGitHub, autoreconfHook, pkgconfig, mono48, gtk-sharp-2_0 }:
stdenv.mkDerivation rec {
name = "mono-addins-${version}";
@@ -13,7 +13,9 @@ stdenv.mkDerivation rec {
};
nativeBuildInputs = [ pkgconfig autoreconfHook ];
- buildInputs = [ mono gtk-sharp-2_0 ];
+
+ # Use msbuild when https://github.com/NixOS/nixpkgs/pull/43680 is merged
+ buildInputs = [ mono48 gtk-sharp-2_0 ];
dontStrip = true;
diff --git a/pkgs/development/libraries/mtxclient/default.nix b/pkgs/development/libraries/mtxclient/default.nix
new file mode 100644
index 00000000000..465a7057635
--- /dev/null
+++ b/pkgs/development/libraries/mtxclient/default.nix
@@ -0,0 +1,31 @@
+{ stdenv, fetchFromGitHub, cmake, pkgconfig
+, boost, openssl, zlib, libsodium, olm, gtest, spdlog, nlohmann_json }:
+
+stdenv.mkDerivation rec {
+ name = "mtxclient-${version}";
+ version = "0.1.0";
+
+ src = fetchFromGitHub {
+ owner = "mujx";
+ repo = "mtxclient";
+ rev = "v${version}";
+ sha256 = "0i58y45diysayjzy5ick15356972z67dfxm0w41ay88nm42x1imp";
+ };
+
+ postPatch = ''
+ ln -s ${nlohmann_json}/include/nlohmann/json.hpp include/json.hpp
+ '';
+
+ cmakeFlags = [ "-DBUILD_LIB_TESTS=OFF" "-DBUILD_LIB_EXAMPLES=OFF" ];
+
+ nativeBuildInputs = [ cmake pkgconfig ];
+ buildInputs = [ boost openssl zlib libsodium olm ];
+
+ meta = with stdenv.lib; {
+ description = "Client API library for Matrix, built on top of Boost.Asio";
+ homepage = https://github.com/mujx/mtxclient;
+ license = licenses.mit;
+ maintainers = with maintainers; [ fpletz ];
+ platforms = platforms.unix;
+ };
+}
diff --git a/pkgs/development/libraries/openbsm/default.nix b/pkgs/development/libraries/openbsm/default.nix
index a9559c6abfb..13666542528 100644
--- a/pkgs/development/libraries/openbsm/default.nix
+++ b/pkgs/development/libraries/openbsm/default.nix
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
sha256 = "0b98359hd8mm585sh145ss828pg2y8vgz38lqrb7nypapiyqdnd1";
};
- patches = [ ./bsm-add-audit_token_to_pid.patch ];
+ patches = lib.optional stdenv.isDarwin [ ./bsm-add-audit_token_to_pid.patch ];
meta = {
homepage = http://www.openbsm.org/;
diff --git a/pkgs/development/libraries/openssl/default.nix b/pkgs/development/libraries/openssl/default.nix
index de13f963b67..87751188a03 100644
--- a/pkgs/development/libraries/openssl/default.nix
+++ b/pkgs/development/libraries/openssl/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, buildPackages, perl
+{ stdenv, fetchurl, buildPackages, perl, coreutils
, withCryptodev ? false, cryptodevHeaders
, enableSSL2 ? false
, static ? false
@@ -31,6 +31,8 @@ let
substituteInPlace "$a" \
--replace /bin/rm rm
done
+ '' + optionalString (versionAtLeast version "1.1.1") ''
+ substituteInPlace config --replace '/usr/bin/env' '${coreutils}/bin/env'
'' + optionalString (versionAtLeast version "1.1.0" && stdenv.hostPlatform.isMusl) ''
substituteInPlace crypto/async/arch/async_posix.h \
--replace '!defined(__ANDROID__) && !defined(__OpenBSD__)' \
@@ -125,9 +127,9 @@ in {
sha256 = "003xh9f898i56344vpvpxxxzmikivxig4xwlm7vbi7m8n43qxaah";
};
- openssl_1_1_0 = common {
- version = "1.1.0i";
- sha256 = "16fgaf113p6s5ixw227sycvihh3zx6f6rf0hvjjhxk68m12cigzb";
+ openssl_1_1 = common {
+ version = "1.1.1";
+ sha256 = "0gbab2fjgms1kx5xjvqx8bxhr98k4r8l2fa8vw7kvh491xd8fdi8";
};
}
diff --git a/pkgs/development/libraries/physics/cernlib/default.nix b/pkgs/development/libraries/physics/cernlib/default.nix
index f837d807219..92d2ab96232 100644
--- a/pkgs/development/libraries/physics/cernlib/default.nix
+++ b/pkgs/development/libraries/physics/cernlib/default.nix
@@ -56,6 +56,7 @@ stdenv.mkDerivation rec {
meta = {
homepage = http://cernlib.web.cern.ch;
description = "Legacy collection of libraries and modules for data analysis in high energy physics";
+ broken = stdenv.isDarwin;
platforms = stdenv.lib.platforms.unix;
maintainers = with stdenv.lib.maintainers; [ veprbl ];
license = stdenv.lib.licenses.gpl2;
diff --git a/pkgs/development/libraries/physics/geant4/default.nix b/pkgs/development/libraries/physics/geant4/default.nix
index 87af069c18a..7123858b8ed 100644
--- a/pkgs/development/libraries/physics/geant4/default.nix
+++ b/pkgs/development/libraries/physics/geant4/default.nix
@@ -1,128 +1,101 @@
-{ enableMultiThreading ? false
+{ enableMultiThreading ? true
, enableG3toG4 ? false
, enableInventor ? false
, enableGDML ? false
, enableQT ? false
, enableXM ? false
-, enableOpenGLX11 ? false
+, enableOpenGLX11 ? true
, enableRaytracerX11 ? false
# Standard build environment with cmake.
, stdenv, fetchurl, cmake
# Optional system packages, otherwise internal GEANT4 packages are used.
-, clhep ? null
-, expat ? null
-, zlib ? null
+, clhep ? null # not packaged currently
+, expat
+, zlib
# For enableGDML.
-, xercesc ? null
+, xercesc
# For enableQT.
-, qt ? null # qt4SDK or qt5SDK
+, qtbase
# For enableXM.
-, motif ? null # motif or lesstif
+, motif
# For enableInventor
, coin3d
, soxt
-, libXpm ? null
+, libXpm
# For enableQT, enableXM, enableOpenGLX11, enableRaytracerX11.
-, libGLU_combined ? null
-, xlibsWrapper ? null
-, libXmu ? null
+, libGLU_combined
+, xlibsWrapper
+, libXmu
}:
-# G4persistency library with support for GDML
-assert enableGDML -> xercesc != null;
+stdenv.mkDerivation rec {
+ version = "10.4.1";
+ name = "geant4-${version}";
-# If enableQT, Qt4/5 User Interface and Visualization drivers.
-assert enableQT -> qt != null;
-
-# Motif User Interface and Visualisation drivers.
-assert enableXM -> motif != null;
-
-# OpenGL/X11 User Interface and Visualisation drivers.
-assert enableQT || enableXM || enableOpenGLX11 || enableRaytracerX11 -> libGLU_combined != null;
-assert enableQT || enableXM || enableOpenGLX11 || enableRaytracerX11 -> xlibsWrapper != null;
-assert enableQT || enableXM || enableOpenGLX11 || enableRaytracerX11 -> libXmu != null;
-assert enableInventor -> libXpm != null;
-
-let
- buildGeant4 =
- { version, src, multiThreadingCapable ? false }:
-
- stdenv.mkDerivation rec {
- inherit version src;
- name = "geant4-${version}";
-
- multiThreadingFlag = if multiThreadingCapable then "-DGEANT4_BUILD_MULTITHREADED=${if enableMultiThreading then "ON" else "OFF"}" else "";
-
- cmakeFlags = ''
- ${multiThreadingFlag}
- -DGEANT4_INSTALL_DATA=OFF
- -DGEANT4_USE_GDML=${if enableGDML then "ON" else "OFF"}
- -DGEANT4_USE_G3TOG4=${if enableG3toG4 then "ON" else "OFF"}
- -DGEANT4_USE_QT=${if enableQT then "ON" else "OFF"}
- -DGEANT4_USE_XM=${if enableXM then "ON" else "OFF"}
- -DGEANT4_USE_OPENGL_X11=${if enableOpenGLX11 then "ON" else "OFF"}
- -DGEANT4_USE_INVENTOR=${if enableInventor then "ON" else "OFF"}
- -DGEANT4_USE_RAYTRACER_X11=${if enableRaytracerX11 then "ON" else "OFF"}
- -DGEANT4_USE_SYSTEM_CLHEP=${if clhep != null then "ON" else "OFF"}
- -DGEANT4_USE_SYSTEM_EXPAT=${if expat != null then "ON" else "OFF"}
- -DGEANT4_USE_SYSTEM_ZLIB=${if zlib != null then "ON" else "OFF"}
- -DINVENTOR_INCLUDE_DIR=${coin3d}/include
- -DINVENTOR_LIBRARY_RELEASE=${coin3d}/lib/libCoin.so
- '';
-
- enableParallelBuilding = true;
- buildInputs = [ cmake clhep expat zlib xercesc qt motif libGLU_combined xlibsWrapper libXmu libXpm coin3d soxt ];
- propagatedBuildInputs = [ clhep expat zlib xercesc qt motif libGLU_combined xlibsWrapper libXmu libXpm coin3d soxt ];
-
- postFixup = ''
- # Don't try to export invalid environment variables.
- sed -i 's/export G4\([A-Z]*\)DATA/#export G4\1DATA/' "$out"/bin/geant4.sh
- '';
-
- setupHook = ./geant4-hook.sh;
-
- passthru = {
- data = import ./datasets.nix { inherit stdenv fetchurl; };
- };
-
- # Set the myriad of envars required by Geant4 if we use a nix-shell.
- shellHook = ''
- source $out/nix-support/setup-hook
- '';
-
- meta = with stdenv.lib; {
- description = "A toolkit for the simulation of the passage of particles through matter";
- longDescription = ''
- Geant4 is a toolkit for the simulation of the passage of particles through matter.
- Its areas of application include high energy, nuclear and accelerator physics, as well as studies in medical and space science.
- The two main reference papers for Geant4 are published in Nuclear Instruments and Methods in Physics Research A 506 (2003) 250-303, and IEEE Transactions on Nuclear Science 53 No. 1 (2006) 270-278.
- '';
- homepage = http://www.geant4.org;
- license = licenses.g4sl;
- maintainers = with maintainers; [ tmplt ];
- platforms = platforms.all;
- };
- };
-
- fetchGeant4 = import ./fetch.nix {
- inherit stdenv fetchurl;
+ src = fetchurl{
+ url = "http://cern.ch/geant4-data/releases/geant4.10.04.p01.tar.gz";
+ sha256 = "a3eb13e4f1217737b842d3869dc5b1fb978f761113e74bd4eaf6017307d234dd";
};
-in {
- v10_0_2 = buildGeant4 {
- inherit (fetchGeant4.v10_0_2) version src;
- multiThreadingCapable = true;
+ cmakeFlags = [
+ "-DGEANT4_INSTALL_DATA=OFF"
+ "-DGEANT4_USE_GDML=${if enableGDML then "ON" else "OFF"}"
+ "-DGEANT4_USE_G3TOG4=${if enableG3toG4 then "ON" else "OFF"}"
+ "-DGEANT4_USE_QT=${if enableQT then "ON" else "OFF"}"
+ "-DGEANT4_USE_XM=${if enableXM then "ON" else "OFF"}"
+ "-DGEANT4_USE_OPENGL_X11=${if enableOpenGLX11 then "ON" else "OFF"}"
+ "-DGEANT4_USE_INVENTOR=${if enableInventor then "ON" else "OFF"}"
+ "-DGEANT4_USE_RAYTRACER_X11=${if enableRaytracerX11 then "ON" else "OFF"}"
+ "-DGEANT4_USE_SYSTEM_CLHEP=${if clhep != null then "ON" else "OFF"}"
+ "-DGEANT4_USE_SYSTEM_EXPAT=${if expat != null then "ON" else "OFF"}"
+ "-DGEANT4_USE_SYSTEM_ZLIB=${if zlib != null then "ON" else "OFF"}"
+ "-DGEANT4_BUILD_MULTITHREADED=${if enableMultiThreading then "ON" else "OFF"}"
+ ] ++ stdenv.lib.optionals enableInventor [
+ "-DINVENTOR_INCLUDE_DIR=${coin3d}/include"
+ "-DINVENTOR_LIBRARY_RELEASE=${coin3d}/lib/libCoin.so"
+ ];
+
+ enableParallelBuilding = true;
+ nativeBuildInputs = [ cmake ];
+ buildInputs = [ clhep expat zlib libGLU_combined xlibsWrapper libXmu ]
+ ++ stdenv.lib.optionals enableGDML [ xercesc ]
+ ++ stdenv.lib.optionals enableXM [ motif ]
+ ++ stdenv.lib.optionals enableQT [ qtbase ]
+ ++ stdenv.lib.optionals enableInventor [ libXpm coin3d soxt ];
+
+ postFixup = ''
+ # Don't try to export invalid environment variables.
+ sed -i 's/export G4\([A-Z]*\)DATA/#export G4\1DATA/' "$out"/bin/geant4.sh
+ '';
+
+ setupHook = ./geant4-hook.sh;
+
+ passthru = {
+ data = import ./datasets.nix { inherit stdenv fetchurl; };
};
- v10_4_1 = buildGeant4 {
- inherit (fetchGeant4.v10_4_1) version src;
- multiThreadingCapable = true;
+ # Set the myriad of envars required by Geant4 if we use a nix-shell.
+ shellHook = ''
+ source $out/nix-support/setup-hook
+ '';
+
+ meta = with stdenv.lib; {
+ description = "A toolkit for the simulation of the passage of particles through matter";
+ longDescription = ''
+ Geant4 is a toolkit for the simulation of the passage of particles through matter.
+ Its areas of application include high energy, nuclear and accelerator physics, as well as studies in medical and space science.
+ The two main reference papers for Geant4 are published in Nuclear Instruments and Methods in Physics Research A 506 (2003) 250-303, and IEEE Transactions on Nuclear Science 53 No. 1 (2006) 270-278.
+ '';
+ homepage = http://www.geant4.org;
+ license = licenses.g4sl;
+ maintainers = with maintainers; [ tmplt ];
+ platforms = platforms.linux;
};
}
diff --git a/pkgs/development/libraries/physics/geant4/fetch.nix b/pkgs/development/libraries/physics/geant4/fetch.nix
deleted file mode 100644
index 5d539b480d7..00000000000
--- a/pkgs/development/libraries/physics/geant4/fetch.nix
+++ /dev/null
@@ -1,29 +0,0 @@
-{ stdenv, fetchurl }:
-
-let
- fetch = { version, src ? builtins.getAttr stdenv.hostPlatform.system sources, sources ? null }:
- {
- inherit version src;
- };
-
-in {
- v10_0_2 = fetch {
- version = "10.0.2";
-
- src = fetchurl{
- url = "http://geant4.cern.ch/support/source/geant4.10.00.p02.tar.gz";
- sha256 = "9d615200901f1a5760970e8f5970625ea146253e4f7c5ad9df2a9cf84549e848";
- };
- };
-
- v10_4_1 = fetch {
- version = "10.4.1";
-
- src = fetchurl{
- url = "http://cern.ch/geant4-data/releases/geant4.10.04.p01.tar.gz";
- sha256 = "a3eb13e4f1217737b842d3869dc5b1fb978f761113e74bd4eaf6017307d234dd";
- };
- };
-
-}
-
diff --git a/pkgs/development/libraries/physics/geant4/g4py/configure.patch b/pkgs/development/libraries/physics/geant4/g4py/configure.patch
deleted file mode 100644
index 886618abd34..00000000000
--- a/pkgs/development/libraries/physics/geant4/g4py/configure.patch
+++ /dev/null
@@ -1,12 +0,0 @@
---- environments/g4py/configure 2014-03-17 22:47:05.000000000 +1100
-+++ environments/g4py/configure 2014-09-01 15:33:46.523637686 +1000
-@@ -4,9 +4,6 @@
- # ======================================================================
- export LANG=C
-
--PATH=/bin:/usr/bin
--export PATH
--
- # ======================================================================
- # testing the echo features
- # ======================================================================
diff --git a/pkgs/development/libraries/physics/geant4/g4py/default.nix b/pkgs/development/libraries/physics/geant4/g4py/default.nix
index ee332171158..551d61af3ad 100644
--- a/pkgs/development/libraries/physics/geant4/g4py/default.nix
+++ b/pkgs/development/libraries/physics/geant4/g4py/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl
+{ stdenv, fetchurl, cmake, xercesc
# The target version of Geant4
, geant4
@@ -9,66 +9,55 @@
}:
let
- buildG4py =
- { version, src, geant4}:
+ # g4py does not support MT and will fail to build against MT geant
+ geant4_nomt = geant4.override { enableMultiThreading = false; };
+ boost_python = boost.override { enablePython = true; inherit python; };
+in
- stdenv.mkDerivation rec {
- inherit version src geant4;
- name = "g4py-${version}";
+stdenv.mkDerivation rec {
+ inherit (geant4_nomt) version src;
+ name = "g4py-${version}";
- # ./configure overwrites $PATH, which clobbers everything.
- patches = [ ./configure.patch ];
- patchFlags = "-p0";
+ sourceRoot = "geant4.10.04.p01/environments/g4py";
- configurePhase = ''
- export PYTHONPATH=$PYTHONPATH:${geant4}/lib64:$prefix
+ nativeBuildInputs = [ cmake ];
+ buildInputs = [ geant4_nomt xercesc boost_python python ];
- source ${geant4}/share/Geant4-*/geant4make/geant4make.sh
- cd environments/g4py
+ GEANT4_INSTALL = geant4_nomt;
- ./configure linux64 --prefix=$prefix \
- --with-g4install-dir=${geant4} \
- --with-python-incdir=${python}/include/python${python.majorVersion} \
- --with-python-libdir=${python}/lib \
- --with-boost-incdir=${boost.dev}/include \
- --with-boost-libdir=${boost.out}/lib
- '';
+ preConfigure = ''
+ # Fix for boost 1.67+
+ substituteInPlace CMakeLists.txt \
+ --replace "find_package(Boost)" "find_package(Boost 1.40 REQUIRED COMPONENTS python${builtins.replaceStrings ["."] [""] python.majorVersion})"
+ for f in `find . -name CMakeLists.txt`; do
+ substituteInPlace "$f" \
+ --replace "boost_python" "\''${Boost_LIBRARIES}"
+ done
+ '';
- enableParallelBuilding = true;
- buildInputs = [ geant4 boost python ];
+ enableParallelBuilding = true;
- setupHook = ./setup-hook.sh;
+ setupHook = ./setup-hook.sh;
- # Make sure we set PYTHONPATH
- shellHook = ''
- source $out/nix-support/setup-hook
- '';
+ # Make sure we set PYTHONPATH
+ shellHook = ''
+ source $out/nix-support/setup-hook
+ '';
- meta = {
- description = "Python bindings and utilities for Geant4";
- longDescription = ''
- Geant4 is a toolkit for the simulation of the passage of particles
- through matter. Its areas of application include high energy,
- nuclear and accelerator physics, as well as studies in medical and
- space science. The two main reference papers for Geant4 are
- published in Nuclear Instruments and Methods in Physics Research A
- 506 (2003) 250-303, and IEEE Transactions on Nuclear Science 53 No. 1
- (2006) 270-278.
- '';
- homepage = http://www.geant4.org;
- license = stdenv.lib.licenses.g4sl;
- maintainers = [ ];
- platforms = stdenv.lib.platforms.all;
- };
- };
-
- fetchGeant4 = import ../fetch.nix {
- inherit stdenv fetchurl;
- };
-
-in {
- v10_0_2 = buildG4py {
- inherit (fetchGeant4.v10_0_2) version src;
- geant4 = geant4.v10_0_2;
+ meta = {
+ description = "Python bindings and utilities for Geant4";
+ longDescription = ''
+ Geant4 is a toolkit for the simulation of the passage of particles
+ through matter. Its areas of application include high energy,
+ nuclear and accelerator physics, as well as studies in medical and
+ space science. The two main reference papers for Geant4 are
+ published in Nuclear Instruments and Methods in Physics Research A
+ 506 (2003) 250-303, and IEEE Transactions on Nuclear Science 53 No. 1
+ (2006) 270-278.
+ '';
+ homepage = http://www.geant4.org;
+ license = stdenv.lib.licenses.g4sl;
+ maintainers = [ ];
+ platforms = stdenv.lib.platforms.all;
};
}
diff --git a/pkgs/development/libraries/pipewire/default.nix b/pkgs/development/libraries/pipewire/default.nix
index e87ed8e48a9..96b5239b7db 100644
--- a/pkgs/development/libraries/pipewire/default.nix
+++ b/pkgs/development/libraries/pipewire/default.nix
@@ -1,10 +1,10 @@
{ stdenv, fetchFromGitHub, meson, ninja, pkgconfig, doxygen, graphviz, valgrind
-, glib, dbus, gst_all_1, v4l_utils, alsaLib, ffmpeg, libjack2, udev, libva, xorg
+, glib, dbus, gst_all_1, libv4l, alsaLib, ffmpeg, libjack2, udev, libva, xorg
, sbc, SDL2, makeFontsConf, freefont_ttf
}:
let
- version = "0.1.9";
+ version = "0.2.3";
fontsConf = makeFontsConf {
fontDirectories = [ freefont_ttf ];
@@ -16,22 +16,22 @@ in stdenv.mkDerivation rec {
owner = "PipeWire";
repo = "pipewire";
rev = version;
- sha256 = "0r9mgwbggnnijhdz49fnv0qdka364xn1h8yml2jakyqpfrm3i2nm";
+ sha256 = "1y04brfi5bv4y0hdyqzrcbayr674njf6a5hiwjfv2yi6lazkqv1k";
};
- outputs = [ "out" "dev" "doc" ];
+ outputs = [ "out" "lib" "dev" "doc" ];
nativeBuildInputs = [
meson ninja pkgconfig doxygen graphviz valgrind
];
buildInputs = [
- glib dbus gst_all_1.gst-plugins-base gst_all_1.gstreamer v4l_utils
+ glib dbus gst_all_1.gst-plugins-base gst_all_1.gstreamer libv4l
alsaLib ffmpeg libjack2 udev libva xorg.libX11 sbc SDL2
];
mesonFlags = [
- "-Denable_docs=true"
- "-Denable_gstreamer=true"
+ "-Ddocs=true"
+ "-Dgstreamer=true"
];
PKG_CONFIG_SYSTEMD_SYSTEMDUSERUNITDIR = "${placeholder "out"}/lib/systemd/user";
diff --git a/pkgs/development/libraries/qt-5/5.11/default.nix b/pkgs/development/libraries/qt-5/5.11/default.nix
index 2a706fc7b6e..d65fe9d219c 100644
--- a/pkgs/development/libraries/qt-5/5.11/default.nix
+++ b/pkgs/development/libraries/qt-5/5.11/default.nix
@@ -34,7 +34,18 @@ let
qtCompatVersion = "5.11";
mirror = "http://download.qt.io";
- srcs = import ./srcs.nix { inherit fetchurl; inherit mirror; };
+ srcs = import ./srcs.nix { inherit fetchurl; inherit mirror; } // {
+ # Community port of the now unmaintained upstream qtwebkit.
+ qtwebkit = {
+ src = fetchFromGitHub {
+ owner = "annulen";
+ repo = "webkit";
+ rev = "4ce8ebc4094512b9916bfa5984065e95ac97c9d8";
+ sha256 = "05h1xnxzbf7sp3plw5dndsvpf6iigh0bi4vlj4svx0hkf1giakjf";
+ };
+ version = "5.212-alpha-01-26-2018";
+ };
+ };
patches = {
qtbase = [
@@ -102,15 +113,7 @@ let
qtwayland = callPackage ../modules/qtwayland.nix {};
qtwebchannel = callPackage ../modules/qtwebchannel.nix {};
qtwebengine = callPackage ../modules/qtwebengine.nix {};
- qtwebkit = callPackage ../modules/qtwebkit.nix {
- src = fetchFromGitHub {
- owner = "annulen";
- repo = "webkit";
- rev = "4ce8ebc4094512b9916bfa5984065e95ac97c9d8";
- sha256 = "05h1xnxzbf7sp3plw5dndsvpf6iigh0bi4vlj4svx0hkf1giakjf";
- };
- version = "5.212-alpha-01-26-2018";
- };
+ qtwebkit = callPackage ../modules/qtwebkit.nix {};
qtwebsockets = callPackage ../modules/qtwebsockets.nix {};
qtx11extras = callPackage ../modules/qtx11extras.nix {};
qtxmlpatterns = callPackage ../modules/qtxmlpatterns.nix {};
diff --git a/pkgs/development/libraries/qt-5/modules/qtwebengine.nix b/pkgs/development/libraries/qt-5/modules/qtwebengine.nix
index aae15c62d73..ad54a49e50b 100644
--- a/pkgs/development/libraries/qt-5/modules/qtwebengine.nix
+++ b/pkgs/development/libraries/qt-5/modules/qtwebengine.nix
@@ -189,6 +189,7 @@ EOF
description = "A web engine based on the Chromium web browser";
maintainers = with maintainers; [ matthewbauer ];
platforms = platforms.unix;
+ broken = qt56; # 2018-09-13, no successful build since 2018-04-25
};
}
diff --git a/pkgs/development/libraries/qt-5/modules/qtwebkit.nix b/pkgs/development/libraries/qt-5/modules/qtwebkit.nix
index 833433fabec..970ee2e5c80 100644
--- a/pkgs/development/libraries/qt-5/modules/qtwebkit.nix
+++ b/pkgs/development/libraries/qt-5/modules/qtwebkit.nix
@@ -5,8 +5,6 @@
, bison2, flex, gdb, gperf, perl, pkgconfig, python2, ruby
, darwin
, flashplayerFix ? false
-, src ? null
-, version ? null
}:
let
@@ -35,9 +33,6 @@ qtModule {
cmakeFlags = optionals (lib.versionAtLeast qtbase.version "5.11.0") [ "-DPORT=Qt" ];
- inherit src;
- inherit version;
-
__impureHostDeps = optionals (stdenv.isDarwin) [
"/usr/lib/libicucore.dylib"
];
diff --git a/pkgs/development/libraries/qt-5/qtModule.nix b/pkgs/development/libraries/qt-5/qtModule.nix
index e18564aaabe..84a9d30918b 100644
--- a/pkgs/development/libraries/qt-5/qtModule.nix
+++ b/pkgs/development/libraries/qt-5/qtModule.nix
@@ -8,7 +8,7 @@ args:
let
inherit (args) name;
- version = if (args.version or null) == null then srcs."${name}".version else args.version;
+ version = args.version or srcs."${name}".version;
src = args.src or srcs."${name}".src;
in
diff --git a/pkgs/development/libraries/science/benchmark/papi/default.nix b/pkgs/development/libraries/science/benchmark/papi/default.nix
new file mode 100644
index 00000000000..f727728943b
--- /dev/null
+++ b/pkgs/development/libraries/science/benchmark/papi/default.nix
@@ -0,0 +1,30 @@
+{ stdenv
+, fetchurl
+}:
+
+stdenv.mkDerivation rec {
+ version = "5.6.0";
+ name = "papi-${version}";
+
+ src = fetchurl {
+ url = "https://bitbucket.org/icl/papi/get/papi-5-6-0-t.tar.gz";
+ sha256 = "13mngf9kl0y2wfxqvkad0smdaag7k8fvw82b4312gx62nwhc1i6r";
+ };
+
+ buildInputs = [ stdenv ];
+
+ preConfigure = ''
+ cd src
+ '';
+
+ doCheck = true;
+ checkTarget = "test";
+
+ meta = with stdenv.lib; {
+ homepage = https://icl.utk.edu/papi/;
+ description = "PAPI provides the tool designer and application engineer with a consistent interface and methodology for use of the performance counter hardware found in most major microprocessors";
+ license = licenses.bsdOriginal;
+ platforms = platforms.linux;
+ maintainers = [ maintainers.costrouc ];
+ };
+}
diff --git a/pkgs/development/libraries/science/math/atlas/default.nix b/pkgs/development/libraries/science/math/atlas/default.nix
index 8b740bdb6f6..fb90ed754da 100644
--- a/pkgs/development/libraries/science/math/atlas/default.nix
+++ b/pkgs/development/libraries/science/math/atlas/default.nix
@@ -110,6 +110,7 @@ stdenv.mkDerivation {
homepage = http://math-atlas.sourceforge.net/;
description = "Automatically Tuned Linear Algebra Software (ATLAS)";
license = stdenv.lib.licenses.bsd3;
+ broken = stdenv.isDarwin; # test when updating to >=3.10.3
platforms = stdenv.lib.platforms.unix;
longDescription = ''
diff --git a/pkgs/development/libraries/science/math/parmetis/default.nix b/pkgs/development/libraries/science/math/parmetis/default.nix
new file mode 100644
index 00000000000..ca35ce2f413
--- /dev/null
+++ b/pkgs/development/libraries/science/math/parmetis/default.nix
@@ -0,0 +1,33 @@
+{ stdenv
+, fetchurl
+, cmake
+, mpi
+}:
+
+stdenv.mkDerivation rec {
+ name = "parmetis-${version}";
+ version = "4.0.3";
+
+ src = fetchurl {
+ url = "http://glaros.dtc.umn.edu/gkhome/fetch/sw/parmetis/parmetis-${version}.tar.gz";
+ sha256 = "0pvfpvb36djvqlcc3lq7si0c5xpb2cqndjg8wvzg35ygnwqs5ngj";
+ };
+
+ buildInputs = [ cmake mpi ];
+
+ # metis and GKlib are packaged with distribution
+ # AUR https://aur.archlinux.org/packages/parmetis/ has reported that
+ # it easier to build with the included packages as opposed to using the metis
+ # package. Compilation time is short.
+ configurePhase = ''
+ make config metis_path=$PWD/metis gklib_path=$PWD/metis/GKlib prefix=$out
+ '';
+
+ meta = with stdenv.lib; {
+ description = "ParMETIS is an MPI-based parallel library that implements a variety of algorithms for partitioning unstructured graphs, meshes, and for computing fill-reducing orderings of sparse matrices";
+ homepage = http://glaros.dtc.umn.edu/gkhome/metis/parmetis/overview;
+ platforms = platforms.all;
+ license = licenses.unfree;
+ maintainers = [ maintainers.costrouc ];
+ };
+}
diff --git a/pkgs/development/libraries/science/math/scalapack/default.nix b/pkgs/development/libraries/science/math/scalapack/default.nix
new file mode 100644
index 00000000000..83e177c66c1
--- /dev/null
+++ b/pkgs/development/libraries/science/math/scalapack/default.nix
@@ -0,0 +1,29 @@
+{ stdenv
+, fetchurl
+, gfortran
+, cmake
+, blas
+, liblapack
+, mpi
+}:
+
+stdenv.mkDerivation rec {
+ name = "scalapack-${version}";
+ version = "2.0.2";
+
+ src = fetchurl {
+ url = "http://www.netlib.org/scalapack/scalapack-${version}.tgz";
+ sha256 = "0p1r61ss1fq0bs8ynnx7xq4wwsdvs32ljvwjnx6yxr8gd6pawx0c";
+ };
+
+ buildInputs = [ cmake mpi liblapack blas gfortran ];
+
+ meta = with stdenv.lib; {
+ homepage = http://www.netlib.org/scalapack/;
+ description = "Library of high-performance linear algebra routines for parallel distributed memory machines";
+ license = licenses.bsdOriginal;
+ platforms = platforms.all;
+ maintainers = [ maintainers.costrouc ];
+ };
+
+}
diff --git a/pkgs/development/libraries/science/math/scs/default.nix b/pkgs/development/libraries/science/math/scs/default.nix
index 0539083e823..f9d1a84b1f0 100644
--- a/pkgs/development/libraries/science/math/scs/default.nix
+++ b/pkgs/development/libraries/science/math/scs/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, blas, liblapack, gfortran }:
+{ stdenv, fetchFromGitHub, blas, liblapack, gfortran, fixDarwinDylibNames }:
stdenv.mkDerivation rec {
name = "scs-${version}";
@@ -11,24 +11,30 @@ stdenv.mkDerivation rec {
sha256 = "17lbcmcsniqlyzgbzmjipfd0rrk25a8hzh7l5wl2wp1iwsd8c3a9";
};
- buildInputs = [ blas liblapack gfortran.cc.lib ];
-
# Actually link and add libgfortran to the rpath
- patchPhase = ''
- sed -i 's/#-lgfortran/-lgfortran/' scs.mk
+ postPatch = ''
+ substituteInPlace scs.mk \
+ --replace "#-lgfortran" "-lgfortran" \
+ --replace "gcc" "cc"
'';
+ nativeBuildInputs = stdenv.lib.optional stdenv.isDarwin fixDarwinDylibNames;
+
+ buildInputs = [ blas liblapack gfortran.cc.lib ];
+
doCheck = true;
- # Test demo requires passing any int as $1; 42 chosen arbitrarily
- checkPhase = ''
- ./out/demo_socp_indirect 42
+ # Test demo requires passing data and seed; numbers chosen arbitrarily.
+ postCheck = ''
+ ./out/demo_socp_indirect 42 0.42 0.42 42
'';
installPhase = ''
+ runHook preInstall
mkdir -p $out/lib
cp -r include $out/
- cp out/*.a out/*.so $out/lib/
+ cp out/*.a out/*.so out/*.dylib $out/lib/
+ runHook postInstall
'';
meta = with stdenv.lib; {
diff --git a/pkgs/development/libraries/spdlog/default.nix b/pkgs/development/libraries/spdlog/default.nix
index 1c9e67f8767..a96cd455f55 100644
--- a/pkgs/development/libraries/spdlog/default.nix
+++ b/pkgs/development/libraries/spdlog/default.nix
@@ -1,32 +1,46 @@
{ stdenv, fetchFromGitHub, cmake }:
-stdenv.mkDerivation rec {
- name = "spdlog-${version}";
- version = "0.14.0";
+let
+ generic = { version, sha256 }:
+ stdenv.mkDerivation {
+ name = "spdlog-${version}";
+ inherit version;
- src = fetchFromGitHub {
- owner = "gabime";
- repo = "spdlog";
- rev = "v${version}";
+ src = fetchFromGitHub {
+ owner = "gabime";
+ repo = "spdlog";
+ rev = "v${version}";
+ inherit sha256;
+ };
+
+ nativeBuildInputs = [ cmake ];
+
+ # cmakeFlags = [ "-DSPDLOG_BUILD_EXAMPLES=ON" ];
+
+ outputs = [ "out" "doc" ];
+
+ postInstall = ''
+ mkdir -p $out/share/doc/spdlog
+ cp -rv ../example $out/share/doc/spdlog
+ '';
+
+ meta = with stdenv.lib; {
+ description = "Very fast, header only, C++ logging library.";
+ homepage = https://github.com/gabime/spdlog;
+ license = licenses.mit;
+ maintainers = with maintainers; [ obadz ];
+ platforms = platforms.all;
+ };
+ };
+in
+{
+ spdlog_1 = generic {
+ version = "1.1.0";
+ sha256 = "0yckz5w02v8193jhxihk9v4i8f6jafyg2a33amql0iclhk17da8f";
+ };
+
+ spdlog_0 = generic {
+ version = "0.14.0";
sha256 = "13730429gwlabi432ilpnja3sfvy0nn2719vnhhmii34xcdyc57q";
};
-
- nativeBuildInputs = [ cmake ];
-
- # cmakeFlags = [ "-DSPDLOG_BUILD_EXAMPLES=ON" ];
-
- outputs = [ "out" "doc" ];
-
- postInstall = ''
- mkdir -p $out/share/doc/spdlog
- cp -rv ../example $out/share/doc/spdlog
- '';
-
- meta = with stdenv.lib; {
- description = "Very fast, header only, C++ logging library.";
- homepage = https://github.com/gabime/spdlog;
- license = licenses.mit;
- maintainers = with maintainers; [ obadz ];
- platforms = platforms.all;
- };
}
diff --git a/pkgs/development/libraries/webkitgtk/2.4.nix b/pkgs/development/libraries/webkitgtk/2.4.nix
index 1a17ae53313..7b62de69123 100644
--- a/pkgs/development/libraries/webkitgtk/2.4.nix
+++ b/pkgs/development/libraries/webkitgtk/2.4.nix
@@ -1,5 +1,5 @@
{ stdenv, fetchurl, fetchpatch, perl, python, ruby, bison, gperf, flex
-, pkgconfig, which, gettext, gobjectIntrospection
+, pkgconfig, which, gettext, gobjectIntrospection, pruneLibtoolFiles
, gtk2, gtk3, wayland, libwebp, enchant, sqlite
, libxml2, libsoup, libsecret, libxslt, harfbuzz, xorg
, gst-plugins-base, libobjc
@@ -77,13 +77,16 @@ stdenv.mkDerivation rec {
"--disable-credential-storage"
];
- NIX_CFLAGS_COMPILE = "-DU_NOEXCEPT=";
+ NIX_CFLAGS_COMPILE = [
+ "-DU_NOEXCEPT="
+ "-Wno-expansion-to-defined"
+ ];
dontAddDisableDepTrack = true;
nativeBuildInputs = [
perl python ruby bison gperf flex
- pkgconfig which gettext gobjectIntrospection
+ pkgconfig which gettext gobjectIntrospection pruneLibtoolFiles
];
buildInputs = [
diff --git a/pkgs/development/libraries/wolfssl/default.nix b/pkgs/development/libraries/wolfssl/default.nix
index 2b69f6283d6..30291a18022 100644
--- a/pkgs/development/libraries/wolfssl/default.nix
+++ b/pkgs/development/libraries/wolfssl/default.nix
@@ -11,6 +11,8 @@ stdenv.mkDerivation rec {
sha256 = "00mpq1z8j37a873dbk9knb835m3qlwqnd1rslirqkc44hpz1i64j";
};
+ configureFlags = [ "--enable-all" ];
+
outputs = [ "out" "dev" "doc" "lib" ];
nativeBuildInputs = [ autoreconfHook ];
diff --git a/pkgs/development/libraries/xdg-dbus-proxy/default.nix b/pkgs/development/libraries/xdg-dbus-proxy/default.nix
new file mode 100644
index 00000000000..247b8ee45d0
--- /dev/null
+++ b/pkgs/development/libraries/xdg-dbus-proxy/default.nix
@@ -0,0 +1,24 @@
+{ stdenv, fetchurl, pkgconfig, glib }:
+
+let
+ version = "0.1.0";
+in stdenv.mkDerivation rec {
+ name = "xdg-dbus-proxy-${version}";
+
+ src = fetchurl {
+ url = "https://github.com/flatpak/xdg-dbus-proxy/releases/download/${version}/${name}.tar.xz";
+ sha256 = "055wli36lvdannp6qqwbvd78353n61wn9kp8y3dchh39wq7x7vwy";
+ };
+
+ nativeBuildInputs = [ pkgconfig ];
+
+ buildInputs = [ glib ];
+
+ meta = with stdenv.lib; {
+ description = "DBus proxy for Flatpak and others";
+ homepage = https://flatpak.org/;
+ license = licenses.lgpl21Plus;
+ maintainers = with maintainers; [ jtojnar ];
+ platforms = platforms.linux;
+ };
+}
diff --git a/pkgs/development/libraries/xdg-desktop-portal-gtk/default.nix b/pkgs/development/libraries/xdg-desktop-portal-gtk/default.nix
index e6f23a8a270..f81461b2ac8 100644
--- a/pkgs/development/libraries/xdg-desktop-portal-gtk/default.nix
+++ b/pkgs/development/libraries/xdg-desktop-portal-gtk/default.nix
@@ -1,7 +1,7 @@
{ stdenv, fetchFromGitHub, autoreconfHook, pkgconfig, libxml2, xdg-desktop-portal, gtk3, glib }:
let
- version = "0.99";
+ version = "1.0.2";
in stdenv.mkDerivation rec {
name = "xdg-desktop-portal-gtk-${version}";
@@ -9,7 +9,7 @@ in stdenv.mkDerivation rec {
owner = "flatpak";
repo = "xdg-desktop-portal-gtk";
rev = version;
- sha256 = "0jnmrl55gpvz06hy0832kcby4y84f0a1hiali6qy1lcmyqhm3v59";
+ sha256 = "06dzh3vzq5nw3r89kb1qi3r2z8wjh9zmzc0hfnva4vnx7mwgm7ax";
};
nativeBuildInputs = [ autoreconfHook pkgconfig libxml2 xdg-desktop-portal ];
diff --git a/pkgs/development/libraries/xdg-desktop-portal/default.nix b/pkgs/development/libraries/xdg-desktop-portal/default.nix
index 9651f642a01..171ef68cf56 100644
--- a/pkgs/development/libraries/xdg-desktop-portal/default.nix
+++ b/pkgs/development/libraries/xdg-desktop-portal/default.nix
@@ -1,7 +1,7 @@
{ stdenv, fetchFromGitHub, autoreconfHook, pkgconfig, libxml2, glib, pipewire, fuse }:
let
- version = "0.99";
+ version = "1.0.2";
in stdenv.mkDerivation rec {
name = "xdg-desktop-portal-${version}";
@@ -11,7 +11,7 @@ in stdenv.mkDerivation rec {
owner = "flatpak";
repo = "xdg-desktop-portal";
rev = version;
- sha256 = "05garhdxylphrizyaqnz4sfpp28fd00v877q7cf1gyhpk1sr8i83";
+ sha256 = "1vl0150gz20x106di9yfa6l3zjw0nd2lr44rkq2147n2a254p79p";
};
patches = [
diff --git a/pkgs/development/lisp-modules/lisp-packages.nix b/pkgs/development/lisp-modules/lisp-packages.nix
index f208b47234c..5769ee94a1b 100644
--- a/pkgs/development/lisp-modules/lisp-packages.nix
+++ b/pkgs/development/lisp-modules/lisp-packages.nix
@@ -24,8 +24,8 @@ let lispPackages = rec {
quicklispdist = pkgs.fetchurl {
# Will usually be replaced with a fresh version anyway, but needs to be
# a valid distinfo.txt
- url = "http://beta.quicklisp.org/dist/quicklisp/2018-04-30/distinfo.txt";
- sha256 = "0zpabwgvsmy90yca25sfixi6waixqdchllayyvcsdl3jaibbz4rq";
+ url = "http://beta.quicklisp.org/dist/quicklisp/2018-08-31/distinfo.txt";
+ sha256 = "1im4p6vcxkp5hrim28cdf5isyw8a1v9aqsz2xfsfp3z3qd49dixd";
};
buildPhase = '' true; '';
postInstall = ''
diff --git a/pkgs/development/lisp-modules/openssl-lib-marked.nix b/pkgs/development/lisp-modules/openssl-lib-marked.nix
new file mode 100644
index 00000000000..e2c632b8eba
--- /dev/null
+++ b/pkgs/development/lisp-modules/openssl-lib-marked.nix
@@ -0,0 +1,18 @@
+with import ../../../default.nix {};
+runCommand "openssl-lib-marked" {} ''
+ mkdir -p "$out/lib"
+ for lib in ssl crypto; do
+ version="${(builtins.parseDrvName openssl.name).version}"
+ ln -s "${lib.getLib openssl}/lib/lib$lib.so" "$out/lib/lib$lib.so.$version"
+ version="$(echo "$version" | sed -re 's/[a-z]+$//')"
+ while test -n "$version"; do
+ ln -sfT "${lib.getLib openssl}/lib/lib$lib.so" "$out/lib/lib$lib.so.$version"
+ nextversion="''${version%.*}"
+ if test "$version" = "$nextversion"; then
+ version=
+ else
+ version="$nextversion"
+ fi
+ done
+ done
+''
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/alexandria.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/alexandria.nix
index 22aa818f875..9b9486e9758 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/alexandria.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/alexandria.nix
@@ -1,4 +1,4 @@
-{ fetchurl, ... }:
+args @ { fetchurl, ... }:
rec {
baseName = ''alexandria'';
version = ''20170830-git'';
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/array-utils.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/array-utils.nix
index c90a9e09192..9daab46784d 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/array-utils.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/array-utils.nix
@@ -1,15 +1,15 @@
-{ fetchurl, ... }:
+args @ { fetchurl, ... }:
rec {
baseName = ''array-utils'';
- version = ''20180131-git'';
+ version = ''20180831-git'';
description = ''A few utilities for working with arrays.'';
deps = [ ];
src = fetchurl {
- url = ''http://beta.quicklisp.org/archive/array-utils/2018-01-31/array-utils-20180131-git.tgz'';
- sha256 = ''01vjb146lb1dp77xcpinq4r1jv2fvl3gzj50x9i04b5mhfaqpkd0'';
+ url = ''http://beta.quicklisp.org/archive/array-utils/2018-08-31/array-utils-20180831-git.tgz'';
+ sha256 = ''1m3ciz73psy3gln5f2q1c6igfmhxjjq97bqbjsvmyj2l9f6m6bl7'';
};
packageName = "array-utils";
@@ -18,8 +18,8 @@ rec {
overrides = x: x;
}
/* (SYSTEM array-utils DESCRIPTION A few utilities for working with arrays.
- SHA256 01vjb146lb1dp77xcpinq4r1jv2fvl3gzj50x9i04b5mhfaqpkd0 URL
- http://beta.quicklisp.org/archive/array-utils/2018-01-31/array-utils-20180131-git.tgz
- MD5 339670a03dd7d865cd045a6556d705c6 NAME array-utils FILENAME array-utils
- DEPS NIL DEPENDENCIES NIL VERSION 20180131-git SIBLINGS (array-utils-test)
+ SHA256 1m3ciz73psy3gln5f2q1c6igfmhxjjq97bqbjsvmyj2l9f6m6bl7 URL
+ http://beta.quicklisp.org/archive/array-utils/2018-08-31/array-utils-20180831-git.tgz
+ MD5 fa07e8fac5263d4fed7acb3d53e5855a NAME array-utils FILENAME array-utils
+ DEPS NIL DEPENDENCIES NIL VERSION 20180831-git SIBLINGS (array-utils-test)
PARASITES NIL) */
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/asdf-system-connections.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/asdf-system-connections.nix
index 4612e6175b9..65df45d95a5 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/asdf-system-connections.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/asdf-system-connections.nix
@@ -1,4 +1,4 @@
-{ fetchurl, ... }:
+args @ { fetchurl, ... }:
rec {
baseName = ''asdf-system-connections'';
version = ''20170124-git'';
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/bordeaux-threads.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/bordeaux-threads.nix
index f0fc5d4d0c0..c5305587a02 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/bordeaux-threads.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/bordeaux-threads.nix
@@ -1,7 +1,7 @@
args @ { fetchurl, ... }:
rec {
baseName = ''bordeaux-threads'';
- version = ''v0.8.5'';
+ version = ''v0.8.6'';
parasites = [ "bordeaux-threads/test" ];
@@ -10,8 +10,8 @@ rec {
deps = [ args."alexandria" args."fiveam" ];
src = fetchurl {
- url = ''http://beta.quicklisp.org/archive/bordeaux-threads/2016-03-18/bordeaux-threads-v0.8.5.tgz'';
- sha256 = ''09q1xd3fca6ln6mh45cx24xzkrcnvhgl5nn9g2jv0rwj1m2xvbpd'';
+ url = ''http://beta.quicklisp.org/archive/bordeaux-threads/2018-07-11/bordeaux-threads-v0.8.6.tgz'';
+ sha256 = ''1q3b9dbyz02g6iav5rvzml7c8r0iad9j5kipgwkxj0b8qijjzr1y'';
};
packageName = "bordeaux-threads";
@@ -21,10 +21,10 @@ rec {
}
/* (SYSTEM bordeaux-threads DESCRIPTION
Bordeaux Threads makes writing portable multi-threaded apps simple. SHA256
- 09q1xd3fca6ln6mh45cx24xzkrcnvhgl5nn9g2jv0rwj1m2xvbpd URL
- http://beta.quicklisp.org/archive/bordeaux-threads/2016-03-18/bordeaux-threads-v0.8.5.tgz
- MD5 67e363a363e164b6f61a047957b8554e NAME bordeaux-threads FILENAME
+ 1q3b9dbyz02g6iav5rvzml7c8r0iad9j5kipgwkxj0b8qijjzr1y URL
+ http://beta.quicklisp.org/archive/bordeaux-threads/2018-07-11/bordeaux-threads-v0.8.6.tgz
+ MD5 f959d3902694b1fe6de450a854040f86 NAME bordeaux-threads FILENAME
bordeaux-threads DEPS
((NAME alexandria FILENAME alexandria) (NAME fiveam FILENAME fiveam))
- DEPENDENCIES (alexandria fiveam) VERSION v0.8.5 SIBLINGS NIL PARASITES
+ DEPENDENCIES (alexandria fiveam) VERSION v0.8.6 SIBLINGS NIL PARASITES
(bordeaux-threads/test)) */
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/buildnode-xhtml.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/buildnode-xhtml.nix
index 6dbff1d6e56..ec4e31013f9 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/buildnode-xhtml.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/buildnode-xhtml.nix
@@ -5,7 +5,7 @@ rec {
description = ''Tool for building up an xml dom of an excel spreadsheet nicely.'';
- deps = [ args."alexandria" args."babel" args."buildnode" args."cl-interpol" args."cl-ppcre" args."cl-unicode" args."closer-mop" args."closure-common" args."closure-html" args."collectors" args."cxml" args."cxml-dom" args."cxml-klacks" args."cxml-test" args."cxml-xml" args."flexi-streams" args."iterate" args."puri" args."split-sequence" args."swank" args."symbol-munger" args."trivial-features" args."trivial-gray-streams" ];
+ deps = [ args."alexandria" args."babel" args."buildnode" args."cl-interpol" args."cl-ppcre" args."cl-unicode" args."closer-mop" args."closure-common" args."closure-html" args."collectors" args."cxml" args."cxml-dom" args."cxml-klacks" args."cxml-test" args."cxml-xml" args."flexi-streams" args."iterate" args."named-readtables" args."puri" args."split-sequence" args."swank" args."symbol-munger" args."trivial-features" args."trivial-gray-streams" ];
src = fetchurl {
url = ''http://beta.quicklisp.org/archive/buildnode/2017-04-03/buildnode-20170403-git.tgz'';
@@ -34,16 +34,17 @@ rec {
(NAME cxml-dom FILENAME cxml-dom) (NAME cxml-klacks FILENAME cxml-klacks)
(NAME cxml-test FILENAME cxml-test) (NAME cxml-xml FILENAME cxml-xml)
(NAME flexi-streams FILENAME flexi-streams)
- (NAME iterate FILENAME iterate) (NAME puri FILENAME puri)
- (NAME split-sequence FILENAME split-sequence) (NAME swank FILENAME swank)
- (NAME symbol-munger FILENAME symbol-munger)
+ (NAME iterate FILENAME iterate)
+ (NAME named-readtables FILENAME named-readtables)
+ (NAME puri FILENAME puri) (NAME split-sequence FILENAME split-sequence)
+ (NAME swank FILENAME swank) (NAME symbol-munger FILENAME symbol-munger)
(NAME trivial-features FILENAME trivial-features)
(NAME trivial-gray-streams FILENAME trivial-gray-streams))
DEPENDENCIES
(alexandria babel buildnode cl-interpol cl-ppcre cl-unicode closer-mop
closure-common closure-html collectors cxml cxml-dom cxml-klacks cxml-test
- cxml-xml flexi-streams iterate puri split-sequence swank symbol-munger
- trivial-features trivial-gray-streams)
+ cxml-xml flexi-streams iterate named-readtables puri split-sequence swank
+ symbol-munger trivial-features trivial-gray-streams)
VERSION buildnode-20170403-git SIBLINGS
(buildnode-excel buildnode-html5 buildnode-kml buildnode-xul buildnode)
PARASITES NIL) */
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/buildnode.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/buildnode.nix
index ecc1634bfce..86bdb36c8d2 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/buildnode.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/buildnode.nix
@@ -7,7 +7,7 @@ rec {
description = ''Tool for building up an xml dom nicely.'';
- deps = [ args."alexandria" args."babel" args."buildnode-xhtml" args."cl-interpol" args."cl-ppcre" args."cl-unicode" args."closer-mop" args."closure-common" args."closure-html" args."collectors" args."cxml" args."cxml-dom" args."cxml-klacks" args."cxml-test" args."cxml-xml" args."flexi-streams" args."iterate" args."lisp-unit2" args."puri" args."split-sequence" args."swank" args."symbol-munger" args."trivial-features" args."trivial-gray-streams" ];
+ deps = [ args."alexandria" args."babel" args."buildnode-xhtml" args."cl-interpol" args."cl-ppcre" args."cl-unicode" args."closer-mop" args."closure-common" args."closure-html" args."collectors" args."cxml" args."cxml-dom" args."cxml-klacks" args."cxml-test" args."cxml-xml" args."flexi-streams" args."iterate" args."lisp-unit2" args."named-readtables" args."puri" args."split-sequence" args."swank" args."symbol-munger" args."trivial-features" args."trivial-gray-streams" ];
src = fetchurl {
url = ''http://beta.quicklisp.org/archive/buildnode/2017-04-03/buildnode-20170403-git.tgz'';
@@ -35,6 +35,7 @@ rec {
(NAME cxml-test FILENAME cxml-test) (NAME cxml-xml FILENAME cxml-xml)
(NAME flexi-streams FILENAME flexi-streams)
(NAME iterate FILENAME iterate) (NAME lisp-unit2 FILENAME lisp-unit2)
+ (NAME named-readtables FILENAME named-readtables)
(NAME puri FILENAME puri) (NAME split-sequence FILENAME split-sequence)
(NAME swank FILENAME swank) (NAME symbol-munger FILENAME symbol-munger)
(NAME trivial-features FILENAME trivial-features)
@@ -42,8 +43,9 @@ rec {
DEPENDENCIES
(alexandria babel buildnode-xhtml cl-interpol cl-ppcre cl-unicode
closer-mop closure-common closure-html collectors cxml cxml-dom
- cxml-klacks cxml-test cxml-xml flexi-streams iterate lisp-unit2 puri
- split-sequence swank symbol-munger trivial-features trivial-gray-streams)
+ cxml-klacks cxml-test cxml-xml flexi-streams iterate lisp-unit2
+ named-readtables puri split-sequence swank symbol-munger trivial-features
+ trivial-gray-streams)
VERSION 20170403-git SIBLINGS
(buildnode-excel buildnode-html5 buildnode-kml buildnode-xhtml
buildnode-xul)
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/caveman.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/caveman.nix
index 02e6e2bf604..f3e64cb965e 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/caveman.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/caveman.nix
@@ -1,15 +1,15 @@
args @ { fetchurl, ... }:
rec {
baseName = ''caveman'';
- version = ''20171019-git'';
+ version = ''20180831-git'';
description = ''Web Application Framework for Common Lisp'';
- deps = [ args."alexandria" args."anaphora" args."babel" args."babel-streams" args."bordeaux-threads" args."cffi" args."cffi-grovel" args."cffi-toolchain" args."chipz" args."chunga" args."circular-streams" args."cl_plus_ssl" args."cl-annot" args."cl-ansi-text" args."cl-base64" args."cl-colors" args."cl-cookie" args."cl-emb" args."cl-fad" args."cl-ppcre" args."cl-project" args."cl-reexport" args."cl-syntax" args."cl-syntax-annot" args."cl-utilities" args."clack" args."clack-test" args."clack-v1-compat" args."dexador" args."do-urlencode" args."fast-http" args."fast-io" args."flexi-streams" args."http-body" args."ironclad" args."jonathan" args."lack" args."lack-component" args."lack-middleware-backtrace" args."lack-util" args."let-plus" args."local-time" args."map-set" args."marshal" args."myway" args."named-readtables" args."nibbles" args."proc-parse" args."prove" args."quri" args."smart-buffer" args."split-sequence" args."static-vectors" args."trivial-backtrace" args."trivial-features" args."trivial-garbage" args."trivial-gray-streams" args."trivial-mimes" args."trivial-types" args."usocket" args."xsubseq" ];
+ deps = [ args."alexandria" args."anaphora" args."babel" args."babel-streams" args."bordeaux-threads" args."cffi" args."cffi-grovel" args."cffi-toolchain" args."chipz" args."chunga" args."circular-streams" args."cl_plus_ssl" args."cl-annot" args."cl-ansi-text" args."cl-base64" args."cl-colors" args."cl-cookie" args."cl-emb" args."cl-fad" args."cl-ppcre" args."cl-project" args."cl-reexport" args."cl-syntax" args."cl-syntax-annot" args."cl-utilities" args."clack" args."clack-handler-hunchentoot" args."clack-socket" args."clack-test" args."clack-v1-compat" args."dexador" args."do-urlencode" args."fast-http" args."fast-io" args."flexi-streams" args."http-body" args."hunchentoot" args."ironclad" args."jonathan" args."lack" args."lack-component" args."lack-middleware-backtrace" args."lack-util" args."let-plus" args."local-time" args."map-set" args."marshal" args."md5" args."myway" args."named-readtables" args."nibbles" args."proc-parse" args."prove" args."quri" args."rfc2388" args."smart-buffer" args."split-sequence" args."static-vectors" args."trivial-backtrace" args."trivial-features" args."trivial-garbage" args."trivial-gray-streams" args."trivial-mimes" args."trivial-types" args."usocket" args."xsubseq" ];
src = fetchurl {
- url = ''http://beta.quicklisp.org/archive/caveman/2017-10-19/caveman-20171019-git.tgz'';
- sha256 = ''0yjhjhjnq7l6z4fj9l470hgsa609adm216fss5xsf43pljv2h5ra'';
+ url = ''http://beta.quicklisp.org/archive/caveman/2018-08-31/caveman-20180831-git.tgz'';
+ sha256 = ''0c4qkvmjqdkm14cgdpsqcl1h5ixb92l6l08nkd4may2kpfh2xq0s'';
};
packageName = "caveman";
@@ -18,9 +18,9 @@ rec {
overrides = x: x;
}
/* (SYSTEM caveman DESCRIPTION Web Application Framework for Common Lisp SHA256
- 0yjhjhjnq7l6z4fj9l470hgsa609adm216fss5xsf43pljv2h5ra URL
- http://beta.quicklisp.org/archive/caveman/2017-10-19/caveman-20171019-git.tgz
- MD5 41318d26a0825e504042fa693959feaf NAME caveman FILENAME caveman DEPS
+ 0c4qkvmjqdkm14cgdpsqcl1h5ixb92l6l08nkd4may2kpfh2xq0s URL
+ http://beta.quicklisp.org/archive/caveman/2018-08-31/caveman-20180831-git.tgz
+ MD5 b417563f04b2619172127a6abeed786a NAME caveman FILENAME caveman DEPS
((NAME alexandria FILENAME alexandria) (NAME anaphora FILENAME anaphora)
(NAME babel FILENAME babel) (NAME babel-streams FILENAME babel-streams)
(NAME bordeaux-threads FILENAME bordeaux-threads)
@@ -38,22 +38,26 @@ rec {
(NAME cl-syntax FILENAME cl-syntax)
(NAME cl-syntax-annot FILENAME cl-syntax-annot)
(NAME cl-utilities FILENAME cl-utilities) (NAME clack FILENAME clack)
+ (NAME clack-handler-hunchentoot FILENAME clack-handler-hunchentoot)
+ (NAME clack-socket FILENAME clack-socket)
(NAME clack-test FILENAME clack-test)
(NAME clack-v1-compat FILENAME clack-v1-compat)
(NAME dexador FILENAME dexador) (NAME do-urlencode FILENAME do-urlencode)
(NAME fast-http FILENAME fast-http) (NAME fast-io FILENAME fast-io)
(NAME flexi-streams FILENAME flexi-streams)
- (NAME http-body FILENAME http-body) (NAME ironclad FILENAME ironclad)
+ (NAME http-body FILENAME http-body)
+ (NAME hunchentoot FILENAME hunchentoot) (NAME ironclad FILENAME ironclad)
(NAME jonathan FILENAME jonathan) (NAME lack FILENAME lack)
(NAME lack-component FILENAME lack-component)
(NAME lack-middleware-backtrace FILENAME lack-middleware-backtrace)
(NAME lack-util FILENAME lack-util) (NAME let-plus FILENAME let-plus)
(NAME local-time FILENAME local-time) (NAME map-set FILENAME map-set)
- (NAME marshal FILENAME marshal) (NAME myway FILENAME myway)
+ (NAME marshal FILENAME marshal) (NAME md5 FILENAME md5)
+ (NAME myway FILENAME myway)
(NAME named-readtables FILENAME named-readtables)
(NAME nibbles FILENAME nibbles) (NAME proc-parse FILENAME proc-parse)
(NAME prove FILENAME prove) (NAME quri FILENAME quri)
- (NAME smart-buffer FILENAME smart-buffer)
+ (NAME rfc2388 FILENAME rfc2388) (NAME smart-buffer FILENAME smart-buffer)
(NAME split-sequence FILENAME split-sequence)
(NAME static-vectors FILENAME static-vectors)
(NAME trivial-backtrace FILENAME trivial-backtrace)
@@ -67,14 +71,15 @@ rec {
(alexandria anaphora babel babel-streams bordeaux-threads cffi cffi-grovel
cffi-toolchain chipz chunga circular-streams cl+ssl cl-annot cl-ansi-text
cl-base64 cl-colors cl-cookie cl-emb cl-fad cl-ppcre cl-project
- cl-reexport cl-syntax cl-syntax-annot cl-utilities clack clack-test
- clack-v1-compat dexador do-urlencode fast-http fast-io flexi-streams
- http-body ironclad jonathan lack lack-component lack-middleware-backtrace
- lack-util let-plus local-time map-set marshal myway named-readtables
- nibbles proc-parse prove quri smart-buffer split-sequence static-vectors
+ cl-reexport cl-syntax cl-syntax-annot cl-utilities clack
+ clack-handler-hunchentoot clack-socket clack-test clack-v1-compat dexador
+ do-urlencode fast-http fast-io flexi-streams http-body hunchentoot
+ ironclad jonathan lack lack-component lack-middleware-backtrace lack-util
+ let-plus local-time map-set marshal md5 myway named-readtables nibbles
+ proc-parse prove quri rfc2388 smart-buffer split-sequence static-vectors
trivial-backtrace trivial-features trivial-garbage trivial-gray-streams
trivial-mimes trivial-types usocket xsubseq)
- VERSION 20171019-git SIBLINGS
+ VERSION 20180831-git SIBLINGS
(caveman-middleware-dbimanager caveman-test caveman2-db caveman2-test
caveman2)
PARASITES NIL) */
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/chipz.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/chipz.nix
index c8f34e0fa17..a9808173b62 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/chipz.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/chipz.nix
@@ -1,4 +1,4 @@
-{ fetchurl, ... }:
+args @ { fetchurl, ... }:
rec {
baseName = ''chipz'';
version = ''20180328-git'';
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-aa.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-aa.nix
index a420c22054f..531d429df24 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-aa.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-aa.nix
@@ -1,4 +1,4 @@
-{ fetchurl, ... }:
+args @ { fetchurl, ... }:
rec {
baseName = ''cl-aa'';
version = ''cl-vectors-20180228-git'';
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-anonfun.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-anonfun.nix
index 42a7bd59585..a413743eb8d 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-anonfun.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-anonfun.nix
@@ -1,4 +1,4 @@
-{ fetchurl, ... }:
+args @ { fetchurl, ... }:
rec {
baseName = ''cl-anonfun'';
version = ''20111203-git'';
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-async-repl.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-async-repl.nix
index d72a9c69ac0..377c8c2209b 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-async-repl.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-async-repl.nix
@@ -1,15 +1,15 @@
args @ { fetchurl, ... }:
rec {
baseName = ''cl-async-repl'';
- version = ''cl-async-20171130-git'';
+ version = ''cl-async-20180711-git'';
description = ''REPL integration for CL-ASYNC.'';
deps = [ args."alexandria" args."babel" args."bordeaux-threads" args."cffi" args."cffi-grovel" args."cffi-toolchain" args."cl-async" args."cl-async-base" args."cl-async-util" args."cl-libuv" args."cl-ppcre" args."fast-io" args."static-vectors" args."trivial-features" args."trivial-gray-streams" args."vom" ];
src = fetchurl {
- url = ''http://beta.quicklisp.org/archive/cl-async/2017-11-30/cl-async-20171130-git.tgz'';
- sha256 = ''0z3bxnzknb9dbisn9d0z1nw6qpswf8cn97v3mfrfq48q9hz11nvm'';
+ url = ''http://beta.quicklisp.org/archive/cl-async/2018-07-11/cl-async-20180711-git.tgz'';
+ sha256 = ''1fy7qd72n1x0h44l67rwln1mxdj1hnc1xp98zc702zywxm99qabz'';
};
packageName = "cl-async-repl";
@@ -18,9 +18,9 @@ rec {
overrides = x: x;
}
/* (SYSTEM cl-async-repl DESCRIPTION REPL integration for CL-ASYNC. SHA256
- 0z3bxnzknb9dbisn9d0z1nw6qpswf8cn97v3mfrfq48q9hz11nvm URL
- http://beta.quicklisp.org/archive/cl-async/2017-11-30/cl-async-20171130-git.tgz
- MD5 4e54a593f8c7f02a2c7f7e0e07247c05 NAME cl-async-repl FILENAME
+ 1fy7qd72n1x0h44l67rwln1mxdj1hnc1xp98zc702zywxm99qabz URL
+ http://beta.quicklisp.org/archive/cl-async/2018-07-11/cl-async-20180711-git.tgz
+ MD5 7347a187dde464b996f9c4abd8176d2c NAME cl-async-repl FILENAME
cl-async-repl DEPS
((NAME alexandria FILENAME alexandria) (NAME babel FILENAME babel)
(NAME bordeaux-threads FILENAME bordeaux-threads)
@@ -39,5 +39,5 @@ rec {
(alexandria babel bordeaux-threads cffi cffi-grovel cffi-toolchain cl-async
cl-async-base cl-async-util cl-libuv cl-ppcre fast-io static-vectors
trivial-features trivial-gray-streams vom)
- VERSION cl-async-20171130-git SIBLINGS
+ VERSION cl-async-20180711-git SIBLINGS
(cl-async-ssl cl-async-test cl-async) PARASITES NIL) */
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-async-ssl.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-async-ssl.nix
index f7392b880d1..2129c7f83f7 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-async-ssl.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-async-ssl.nix
@@ -1,15 +1,15 @@
args @ { fetchurl, ... }:
rec {
baseName = ''cl-async-ssl'';
- version = ''cl-async-20171130-git'';
+ version = ''cl-async-20180711-git'';
description = ''SSL Wrapper around cl-async socket implementation.'';
deps = [ args."alexandria" args."babel" args."bordeaux-threads" args."cffi" args."cffi-grovel" args."cffi-toolchain" args."cl-async" args."cl-async-base" args."cl-async-util" args."cl-libuv" args."cl-ppcre" args."fast-io" args."static-vectors" args."trivial-features" args."trivial-gray-streams" args."vom" ];
src = fetchurl {
- url = ''http://beta.quicklisp.org/archive/cl-async/2017-11-30/cl-async-20171130-git.tgz'';
- sha256 = ''0z3bxnzknb9dbisn9d0z1nw6qpswf8cn97v3mfrfq48q9hz11nvm'';
+ url = ''http://beta.quicklisp.org/archive/cl-async/2018-07-11/cl-async-20180711-git.tgz'';
+ sha256 = ''1fy7qd72n1x0h44l67rwln1mxdj1hnc1xp98zc702zywxm99qabz'';
};
packageName = "cl-async-ssl";
@@ -19,9 +19,9 @@ rec {
}
/* (SYSTEM cl-async-ssl DESCRIPTION
SSL Wrapper around cl-async socket implementation. SHA256
- 0z3bxnzknb9dbisn9d0z1nw6qpswf8cn97v3mfrfq48q9hz11nvm URL
- http://beta.quicklisp.org/archive/cl-async/2017-11-30/cl-async-20171130-git.tgz
- MD5 4e54a593f8c7f02a2c7f7e0e07247c05 NAME cl-async-ssl FILENAME
+ 1fy7qd72n1x0h44l67rwln1mxdj1hnc1xp98zc702zywxm99qabz URL
+ http://beta.quicklisp.org/archive/cl-async/2018-07-11/cl-async-20180711-git.tgz
+ MD5 7347a187dde464b996f9c4abd8176d2c NAME cl-async-ssl FILENAME
cl-async-ssl DEPS
((NAME alexandria FILENAME alexandria) (NAME babel FILENAME babel)
(NAME bordeaux-threads FILENAME bordeaux-threads)
@@ -40,5 +40,5 @@ rec {
(alexandria babel bordeaux-threads cffi cffi-grovel cffi-toolchain cl-async
cl-async-base cl-async-util cl-libuv cl-ppcre fast-io static-vectors
trivial-features trivial-gray-streams vom)
- VERSION cl-async-20171130-git SIBLINGS
+ VERSION cl-async-20180711-git SIBLINGS
(cl-async-repl cl-async-test cl-async) PARASITES NIL) */
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-async.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-async.nix
index 90638ed56f1..e5a2a0bc7fd 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-async.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-async.nix
@@ -1,7 +1,7 @@
args @ { fetchurl, ... }:
rec {
baseName = ''cl-async'';
- version = ''20171130-git'';
+ version = ''20180711-git'';
parasites = [ "cl-async-base" "cl-async-util" ];
@@ -10,8 +10,8 @@ rec {
deps = [ args."alexandria" args."babel" args."bordeaux-threads" args."cffi" args."cffi-grovel" args."cffi-toolchain" args."cl-libuv" args."cl-ppcre" args."fast-io" args."static-vectors" args."trivial-features" args."trivial-gray-streams" args."uiop" args."vom" ];
src = fetchurl {
- url = ''http://beta.quicklisp.org/archive/cl-async/2017-11-30/cl-async-20171130-git.tgz'';
- sha256 = ''0z3bxnzknb9dbisn9d0z1nw6qpswf8cn97v3mfrfq48q9hz11nvm'';
+ url = ''http://beta.quicklisp.org/archive/cl-async/2018-07-11/cl-async-20180711-git.tgz'';
+ sha256 = ''1fy7qd72n1x0h44l67rwln1mxdj1hnc1xp98zc702zywxm99qabz'';
};
packageName = "cl-async";
@@ -20,9 +20,9 @@ rec {
overrides = x: x;
}
/* (SYSTEM cl-async DESCRIPTION Asynchronous operations for Common Lisp. SHA256
- 0z3bxnzknb9dbisn9d0z1nw6qpswf8cn97v3mfrfq48q9hz11nvm URL
- http://beta.quicklisp.org/archive/cl-async/2017-11-30/cl-async-20171130-git.tgz
- MD5 4e54a593f8c7f02a2c7f7e0e07247c05 NAME cl-async FILENAME cl-async DEPS
+ 1fy7qd72n1x0h44l67rwln1mxdj1hnc1xp98zc702zywxm99qabz URL
+ http://beta.quicklisp.org/archive/cl-async/2018-07-11/cl-async-20180711-git.tgz
+ MD5 7347a187dde464b996f9c4abd8176d2c NAME cl-async FILENAME cl-async DEPS
((NAME alexandria FILENAME alexandria) (NAME babel FILENAME babel)
(NAME bordeaux-threads FILENAME bordeaux-threads)
(NAME cffi FILENAME cffi) (NAME cffi-grovel FILENAME cffi-grovel)
@@ -37,5 +37,5 @@ rec {
(alexandria babel bordeaux-threads cffi cffi-grovel cffi-toolchain cl-libuv
cl-ppcre fast-io static-vectors trivial-features trivial-gray-streams uiop
vom)
- VERSION 20171130-git SIBLINGS (cl-async-repl cl-async-ssl cl-async-test)
+ VERSION 20180711-git SIBLINGS (cl-async-repl cl-async-ssl cl-async-test)
PARASITES (cl-async-base cl-async-util)) */
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-csv.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-csv.nix
index b0fe8888dcf..56ccab7b5cd 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-csv.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-csv.nix
@@ -1,17 +1,17 @@
args @ { fetchurl, ... }:
rec {
baseName = ''cl-csv'';
- version = ''20180228-git'';
+ version = ''20180831-git'';
parasites = [ "cl-csv/speed-test" "cl-csv/test" ];
description = ''Facilities for reading and writing CSV format files'';
- deps = [ args."alexandria" args."cl-interpol" args."cl-ppcre" args."cl-unicode" args."flexi-streams" args."iterate" args."lisp-unit2" ];
+ deps = [ args."alexandria" args."cl-interpol" args."cl-ppcre" args."cl-unicode" args."flexi-streams" args."iterate" args."lisp-unit2" args."named-readtables" ];
src = fetchurl {
- url = ''http://beta.quicklisp.org/archive/cl-csv/2018-02-28/cl-csv-20180228-git.tgz'';
- sha256 = ''1xfdiyxj793inrlfqi1yi9sf6p29mg9h7qqhnjk94masmx5zq93r'';
+ url = ''http://beta.quicklisp.org/archive/cl-csv/2018-08-31/cl-csv-20180831-git.tgz'';
+ sha256 = ''0cy2pnzm3c6hmimp0kl5nz03rw6nzgy37i1ifpg9grmd3wipm9fd'';
};
packageName = "cl-csv";
@@ -21,16 +21,17 @@ rec {
}
/* (SYSTEM cl-csv DESCRIPTION
Facilities for reading and writing CSV format files SHA256
- 1xfdiyxj793inrlfqi1yi9sf6p29mg9h7qqhnjk94masmx5zq93r URL
- http://beta.quicklisp.org/archive/cl-csv/2018-02-28/cl-csv-20180228-git.tgz
- MD5 be174a4d7cc2ea24418df63757daed94 NAME cl-csv FILENAME cl-csv DEPS
+ 0cy2pnzm3c6hmimp0kl5nz03rw6nzgy37i1ifpg9grmd3wipm9fd URL
+ http://beta.quicklisp.org/archive/cl-csv/2018-08-31/cl-csv-20180831-git.tgz
+ MD5 4bd0ef366dea9d48c4581ed73a208cf3 NAME cl-csv FILENAME cl-csv DEPS
((NAME alexandria FILENAME alexandria)
(NAME cl-interpol FILENAME cl-interpol) (NAME cl-ppcre FILENAME cl-ppcre)
(NAME cl-unicode FILENAME cl-unicode)
(NAME flexi-streams FILENAME flexi-streams)
- (NAME iterate FILENAME iterate) (NAME lisp-unit2 FILENAME lisp-unit2))
+ (NAME iterate FILENAME iterate) (NAME lisp-unit2 FILENAME lisp-unit2)
+ (NAME named-readtables FILENAME named-readtables))
DEPENDENCIES
(alexandria cl-interpol cl-ppcre cl-unicode flexi-streams iterate
- lisp-unit2)
- VERSION 20180228-git SIBLINGS (cl-csv-clsql cl-csv-data-table) PARASITES
+ lisp-unit2 named-readtables)
+ VERSION 20180831-git SIBLINGS (cl-csv-clsql cl-csv-data-table) PARASITES
(cl-csv/speed-test cl-csv/test)) */
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-dbi.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-dbi.nix
index 995ef9bc745..40c1ac7d6a9 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-dbi.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-dbi.nix
@@ -1,15 +1,15 @@
args @ { fetchurl, ... }:
rec {
baseName = ''cl-dbi'';
- version = ''20180430-git'';
+ version = ''20180831-git'';
description = '''';
deps = [ args."alexandria" args."bordeaux-threads" args."cl-annot" args."cl-syntax" args."cl-syntax-annot" args."closer-mop" args."dbi" args."named-readtables" args."split-sequence" args."trivial-types" ];
src = fetchurl {
- url = ''http://beta.quicklisp.org/archive/cl-dbi/2018-04-30/cl-dbi-20180430-git.tgz'';
- sha256 = ''0bjkba9z93h2sf9n40dvmw1p6nq2p3d5zw9w3zw9k1crn7a601sv'';
+ url = ''http://beta.quicklisp.org/archive/cl-dbi/2018-08-31/cl-dbi-20180831-git.tgz'';
+ sha256 = ''19cpzdzjjzm0if77dycsk8lj91ihwr51mbjmf3fx0wqwr8k5y0g9'';
};
packageName = "cl-dbi";
@@ -18,9 +18,9 @@ rec {
overrides = x: x;
}
/* (SYSTEM cl-dbi DESCRIPTION NIL SHA256
- 0bjkba9z93h2sf9n40dvmw1p6nq2p3d5zw9w3zw9k1crn7a601sv URL
- http://beta.quicklisp.org/archive/cl-dbi/2018-04-30/cl-dbi-20180430-git.tgz
- MD5 1bc845e8738c4987342cb0f56200ba50 NAME cl-dbi FILENAME cl-dbi DEPS
+ 19cpzdzjjzm0if77dycsk8lj91ihwr51mbjmf3fx0wqwr8k5y0g9 URL
+ http://beta.quicklisp.org/archive/cl-dbi/2018-08-31/cl-dbi-20180831-git.tgz
+ MD5 2fc95bff95d3cd25e3afeb003ee009d2 NAME cl-dbi FILENAME cl-dbi DEPS
((NAME alexandria FILENAME alexandria)
(NAME bordeaux-threads FILENAME bordeaux-threads)
(NAME cl-annot FILENAME cl-annot) (NAME cl-syntax FILENAME cl-syntax)
@@ -32,5 +32,5 @@ rec {
DEPENDENCIES
(alexandria bordeaux-threads cl-annot cl-syntax cl-syntax-annot closer-mop
dbi named-readtables split-sequence trivial-types)
- VERSION 20180430-git SIBLINGS
+ VERSION 20180831-git SIBLINGS
(dbd-mysql dbd-postgres dbd-sqlite3 dbi-test dbi) PARASITES NIL) */
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-html-parse.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-html-parse.nix
index 0321572e72a..61a35f2b58c 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-html-parse.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-html-parse.nix
@@ -1,4 +1,4 @@
-{ fetchurl, ... }:
+args @ { fetchurl, ... }:
rec {
baseName = ''cl-html-parse'';
version = ''20161031-git'';
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-interpol.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-interpol.nix
index d4ce8531291..1f58be6c09e 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-interpol.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-interpol.nix
@@ -1,17 +1,17 @@
args @ { fetchurl, ... }:
rec {
baseName = ''cl-interpol'';
- version = ''20171227-git'';
+ version = ''20180711-git'';
parasites = [ "cl-interpol-test" ];
description = '''';
- deps = [ args."cl-ppcre" args."cl-unicode" args."flexi-streams" ];
+ deps = [ args."cl-ppcre" args."cl-unicode" args."flexi-streams" args."named-readtables" ];
src = fetchurl {
- url = ''http://beta.quicklisp.org/archive/cl-interpol/2017-12-27/cl-interpol-20171227-git.tgz'';
- sha256 = ''1m4vxw8hskgqi0mnkm7qknwbnri2m69ab7qyd4kbpm2igsi02kzy'';
+ url = ''http://beta.quicklisp.org/archive/cl-interpol/2018-07-11/cl-interpol-20180711-git.tgz'';
+ sha256 = ''1s88m5kci9y9h3ycvqm0xjzbkbd8zhm9rxp2a674hmgrjfqras0r'';
};
packageName = "cl-interpol";
@@ -20,11 +20,12 @@ rec {
overrides = x: x;
}
/* (SYSTEM cl-interpol DESCRIPTION NIL SHA256
- 1m4vxw8hskgqi0mnkm7qknwbnri2m69ab7qyd4kbpm2igsi02kzy URL
- http://beta.quicklisp.org/archive/cl-interpol/2017-12-27/cl-interpol-20171227-git.tgz
- MD5 e9d2f0238bb8f7a0c5b1ef1e6ef390ae NAME cl-interpol FILENAME cl-interpol
+ 1s88m5kci9y9h3ycvqm0xjzbkbd8zhm9rxp2a674hmgrjfqras0r URL
+ http://beta.quicklisp.org/archive/cl-interpol/2018-07-11/cl-interpol-20180711-git.tgz
+ MD5 b2d6893ef703c5b6e5736fa33ba0794e NAME cl-interpol FILENAME cl-interpol
DEPS
((NAME cl-ppcre FILENAME cl-ppcre) (NAME cl-unicode FILENAME cl-unicode)
- (NAME flexi-streams FILENAME flexi-streams))
- DEPENDENCIES (cl-ppcre cl-unicode flexi-streams) VERSION 20171227-git
- SIBLINGS NIL PARASITES (cl-interpol-test)) */
+ (NAME flexi-streams FILENAME flexi-streams)
+ (NAME named-readtables FILENAME named-readtables))
+ DEPENDENCIES (cl-ppcre cl-unicode flexi-streams named-readtables) VERSION
+ 20180711-git SIBLINGS NIL PARASITES (cl-interpol-test)) */
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-l10n-cldr.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-l10n-cldr.nix
index 825fea4eb90..dfabda0428f 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-l10n-cldr.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-l10n-cldr.nix
@@ -1,4 +1,4 @@
-{ fetchurl, ... }:
+args @ { fetchurl, ... }:
rec {
baseName = ''cl-l10n-cldr'';
version = ''20120909-darcs'';
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-libuv.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-libuv.nix
index 1aced09d34f..c950fa292a8 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-libuv.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-libuv.nix
@@ -1,15 +1,15 @@
args @ { fetchurl, ... }:
rec {
baseName = ''cl-libuv'';
- version = ''20180328-git'';
+ version = ''20180831-git'';
description = ''Low-level libuv bindings for Common Lisp.'';
deps = [ args."alexandria" args."babel" args."cffi" args."cffi-grovel" args."cffi-toolchain" args."trivial-features" ];
src = fetchurl {
- url = ''http://beta.quicklisp.org/archive/cl-libuv/2018-03-28/cl-libuv-20180328-git.tgz'';
- sha256 = ''1pq0fsrhv6aa3fpq1ppwid8nmxaa3fs3dk4iq1bl28prpzzkkg0p'';
+ url = ''http://beta.quicklisp.org/archive/cl-libuv/2018-08-31/cl-libuv-20180831-git.tgz'';
+ sha256 = ''1dxay9vw0wmlmwjq5xcs622n4m7g9ivfr46z1igdrkfqvmdz411f'';
};
packageName = "cl-libuv";
@@ -18,13 +18,13 @@ rec {
overrides = x: x;
}
/* (SYSTEM cl-libuv DESCRIPTION Low-level libuv bindings for Common Lisp.
- SHA256 1pq0fsrhv6aa3fpq1ppwid8nmxaa3fs3dk4iq1bl28prpzzkkg0p URL
- http://beta.quicklisp.org/archive/cl-libuv/2018-03-28/cl-libuv-20180328-git.tgz
- MD5 c50f2cca0bd8d25db35b4ec176242858 NAME cl-libuv FILENAME cl-libuv DEPS
+ SHA256 1dxay9vw0wmlmwjq5xcs622n4m7g9ivfr46z1igdrkfqvmdz411f URL
+ http://beta.quicklisp.org/archive/cl-libuv/2018-08-31/cl-libuv-20180831-git.tgz
+ MD5 d755a060faac0d50a4500ae1628401ce NAME cl-libuv FILENAME cl-libuv DEPS
((NAME alexandria FILENAME alexandria) (NAME babel FILENAME babel)
(NAME cffi FILENAME cffi) (NAME cffi-grovel FILENAME cffi-grovel)
(NAME cffi-toolchain FILENAME cffi-toolchain)
(NAME trivial-features FILENAME trivial-features))
DEPENDENCIES
(alexandria babel cffi cffi-grovel cffi-toolchain trivial-features) VERSION
- 20180328-git SIBLINGS NIL PARASITES NIL) */
+ 20180831-git SIBLINGS NIL PARASITES NIL) */
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-markup.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-markup.nix
index 67468edbb6c..8967b0970c5 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-markup.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-markup.nix
@@ -1,4 +1,4 @@
-{ fetchurl, ... }:
+args @ { fetchurl, ... }:
rec {
baseName = ''cl-markup'';
version = ''20131003-git'';
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-paths.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-paths.nix
index f546e4711ac..e8034b11c23 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-paths.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-paths.nix
@@ -1,4 +1,4 @@
-{ fetchurl, ... }:
+args @ { fetchurl, ... }:
rec {
baseName = ''cl-paths'';
version = ''cl-vectors-20180228-git'';
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-postgres.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-postgres.nix
index 60e38a7de72..a0443cb5af0 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-postgres.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-postgres.nix
@@ -1,17 +1,17 @@
args @ { fetchurl, ... }:
rec {
baseName = ''cl-postgres'';
- version = ''postmodern-20180430-git'';
+ version = ''postmodern-20180831-git'';
- parasites = [ "cl-postgres/simple-date-tests" "cl-postgres/tests" ];
+ parasites = [ "cl-postgres/tests" ];
description = ''Low-level client library for PostgreSQL'';
- deps = [ args."fiveam" args."md5" args."simple-date_slash_postgres-glue" args."split-sequence" args."usocket" ];
+ deps = [ args."fiveam" args."md5" args."split-sequence" args."usocket" ];
src = fetchurl {
- url = ''http://beta.quicklisp.org/archive/postmodern/2018-04-30/postmodern-20180430-git.tgz'';
- sha256 = ''0b6w8f5ihbk036v1fclyskns615xhnib9q3cjn0ql6r6sk3nca7f'';
+ url = ''http://beta.quicklisp.org/archive/postmodern/2018-08-31/postmodern-20180831-git.tgz'';
+ sha256 = ''062xhy6aadzgmwpz8h0n7884yv5m4nwqmxrc75m3c60k1lmccpwx'';
};
packageName = "cl-postgres";
@@ -20,14 +20,13 @@ rec {
overrides = x: x;
}
/* (SYSTEM cl-postgres DESCRIPTION Low-level client library for PostgreSQL
- SHA256 0b6w8f5ihbk036v1fclyskns615xhnib9q3cjn0ql6r6sk3nca7f URL
- http://beta.quicklisp.org/archive/postmodern/2018-04-30/postmodern-20180430-git.tgz
- MD5 9ca2a4ccf4ea7dbcd14d69cb355a8214 NAME cl-postgres FILENAME cl-postgres
+ SHA256 062xhy6aadzgmwpz8h0n7884yv5m4nwqmxrc75m3c60k1lmccpwx URL
+ http://beta.quicklisp.org/archive/postmodern/2018-08-31/postmodern-20180831-git.tgz
+ MD5 78c3e998cff7305db5e4b4e90b9bbee6 NAME cl-postgres FILENAME cl-postgres
DEPS
((NAME fiveam FILENAME fiveam) (NAME md5 FILENAME md5)
- (NAME simple-date/postgres-glue FILENAME simple-date_slash_postgres-glue)
(NAME split-sequence FILENAME split-sequence)
(NAME usocket FILENAME usocket))
- DEPENDENCIES (fiveam md5 simple-date/postgres-glue split-sequence usocket)
- VERSION postmodern-20180430-git SIBLINGS (postmodern s-sql simple-date)
- PARASITES (cl-postgres/simple-date-tests cl-postgres/tests)) */
+ DEPENDENCIES (fiveam md5 split-sequence usocket) VERSION
+ postmodern-20180831-git SIBLINGS (postmodern s-sql simple-date) PARASITES
+ (cl-postgres/tests)) */
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-ppcre-unicode.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-ppcre-unicode.nix
index 7853d5a279a..e65c0a03ddc 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-ppcre-unicode.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-ppcre-unicode.nix
@@ -1,7 +1,7 @@
args @ { fetchurl, ... }:
rec {
baseName = ''cl-ppcre-unicode'';
- version = ''cl-ppcre-20171227-git'';
+ version = ''cl-ppcre-20180831-git'';
parasites = [ "cl-ppcre-unicode-test" ];
@@ -10,8 +10,8 @@ rec {
deps = [ args."cl-ppcre" args."cl-ppcre-test" args."cl-unicode" args."flexi-streams" ];
src = fetchurl {
- url = ''http://beta.quicklisp.org/archive/cl-ppcre/2017-12-27/cl-ppcre-20171227-git.tgz'';
- sha256 = ''0vdic9kxjslplafh6d00m7mab38hw09ps2sxxbg3adciwvspvmw4'';
+ url = ''http://beta.quicklisp.org/archive/cl-ppcre/2018-08-31/cl-ppcre-20180831-git.tgz'';
+ sha256 = ''03x6hg2wzjwx9znqpzs9mmbrz81380ac6jkyblnsafbzr3d0rgyb'';
};
packageName = "cl-ppcre-unicode";
@@ -21,13 +21,13 @@ rec {
}
/* (SYSTEM cl-ppcre-unicode DESCRIPTION
Perl-compatible regular expression library (Unicode) SHA256
- 0vdic9kxjslplafh6d00m7mab38hw09ps2sxxbg3adciwvspvmw4 URL
- http://beta.quicklisp.org/archive/cl-ppcre/2017-12-27/cl-ppcre-20171227-git.tgz
- MD5 9d8ce62ef1a71a5e1e144a31be698d8c NAME cl-ppcre-unicode FILENAME
+ 03x6hg2wzjwx9znqpzs9mmbrz81380ac6jkyblnsafbzr3d0rgyb URL
+ http://beta.quicklisp.org/archive/cl-ppcre/2018-08-31/cl-ppcre-20180831-git.tgz
+ MD5 021ef17563de8e5d5f5942629972785d NAME cl-ppcre-unicode FILENAME
cl-ppcre-unicode DEPS
((NAME cl-ppcre FILENAME cl-ppcre)
(NAME cl-ppcre-test FILENAME cl-ppcre-test)
(NAME cl-unicode FILENAME cl-unicode)
(NAME flexi-streams FILENAME flexi-streams))
DEPENDENCIES (cl-ppcre cl-ppcre-test cl-unicode flexi-streams) VERSION
- cl-ppcre-20171227-git SIBLINGS (cl-ppcre) PARASITES (cl-ppcre-unicode-test)) */
+ cl-ppcre-20180831-git SIBLINGS (cl-ppcre) PARASITES (cl-ppcre-unicode-test)) */
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-ppcre.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-ppcre.nix
index cbdf3a47146..3f56cf3dfae 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-ppcre.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-ppcre.nix
@@ -1,7 +1,7 @@
args @ { fetchurl, ... }:
rec {
baseName = ''cl-ppcre'';
- version = ''20171227-git'';
+ version = ''20180831-git'';
parasites = [ "cl-ppcre-test" ];
@@ -10,8 +10,8 @@ rec {
deps = [ args."flexi-streams" ];
src = fetchurl {
- url = ''http://beta.quicklisp.org/archive/cl-ppcre/2017-12-27/cl-ppcre-20171227-git.tgz'';
- sha256 = ''0vdic9kxjslplafh6d00m7mab38hw09ps2sxxbg3adciwvspvmw4'';
+ url = ''http://beta.quicklisp.org/archive/cl-ppcre/2018-08-31/cl-ppcre-20180831-git.tgz'';
+ sha256 = ''03x6hg2wzjwx9znqpzs9mmbrz81380ac6jkyblnsafbzr3d0rgyb'';
};
packageName = "cl-ppcre";
@@ -20,8 +20,8 @@ rec {
overrides = x: x;
}
/* (SYSTEM cl-ppcre DESCRIPTION Perl-compatible regular expression library
- SHA256 0vdic9kxjslplafh6d00m7mab38hw09ps2sxxbg3adciwvspvmw4 URL
- http://beta.quicklisp.org/archive/cl-ppcre/2017-12-27/cl-ppcre-20171227-git.tgz
- MD5 9d8ce62ef1a71a5e1e144a31be698d8c NAME cl-ppcre FILENAME cl-ppcre DEPS
+ SHA256 03x6hg2wzjwx9znqpzs9mmbrz81380ac6jkyblnsafbzr3d0rgyb URL
+ http://beta.quicklisp.org/archive/cl-ppcre/2018-08-31/cl-ppcre-20180831-git.tgz
+ MD5 021ef17563de8e5d5f5942629972785d NAME cl-ppcre FILENAME cl-ppcre DEPS
((NAME flexi-streams FILENAME flexi-streams)) DEPENDENCIES (flexi-streams)
- VERSION 20171227-git SIBLINGS (cl-ppcre-unicode) PARASITES (cl-ppcre-test)) */
+ VERSION 20180831-git SIBLINGS (cl-ppcre-unicode) PARASITES (cl-ppcre-test)) */
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-project.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-project.nix
index 658ffdb51b8..15fd56107c8 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-project.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-project.nix
@@ -1,15 +1,15 @@
args @ { fetchurl, ... }:
rec {
baseName = ''cl-project'';
- version = ''20171019-git'';
+ version = ''20180831-git'';
description = ''Generate a skeleton for modern project'';
deps = [ args."alexandria" args."anaphora" args."bordeaux-threads" args."cl-ansi-text" args."cl-colors" args."cl-emb" args."cl-fad" args."cl-ppcre" args."let-plus" args."local-time" args."prove" args."uiop" ];
src = fetchurl {
- url = ''http://beta.quicklisp.org/archive/cl-project/2017-10-19/cl-project-20171019-git.tgz'';
- sha256 = ''1phgpik46dvqxnd49kccy4fh653659qd86hv7km50m07nzm8fn7q'';
+ url = ''http://beta.quicklisp.org/archive/cl-project/2018-08-31/cl-project-20180831-git.tgz'';
+ sha256 = ''0iifc03sj982bjakvy0k3m6zsidc3k1ds6xaq36wzgzgw7x6lm0s'';
};
packageName = "cl-project";
@@ -18,9 +18,9 @@ rec {
overrides = x: x;
}
/* (SYSTEM cl-project DESCRIPTION Generate a skeleton for modern project SHA256
- 1phgpik46dvqxnd49kccy4fh653659qd86hv7km50m07nzm8fn7q URL
- http://beta.quicklisp.org/archive/cl-project/2017-10-19/cl-project-20171019-git.tgz
- MD5 9dbfd7f9b0a83ca608031ebf32185a0f NAME cl-project FILENAME cl-project
+ 0iifc03sj982bjakvy0k3m6zsidc3k1ds6xaq36wzgzgw7x6lm0s URL
+ http://beta.quicklisp.org/archive/cl-project/2018-08-31/cl-project-20180831-git.tgz
+ MD5 11fbcc0f4f5c6d7b921eb83ab5f3ee1b NAME cl-project FILENAME cl-project
DEPS
((NAME alexandria FILENAME alexandria) (NAME anaphora FILENAME anaphora)
(NAME bordeaux-threads FILENAME bordeaux-threads)
@@ -32,4 +32,4 @@ rec {
DEPENDENCIES
(alexandria anaphora bordeaux-threads cl-ansi-text cl-colors cl-emb cl-fad
cl-ppcre let-plus local-time prove uiop)
- VERSION 20171019-git SIBLINGS (cl-project-test) PARASITES NIL) */
+ VERSION 20180831-git SIBLINGS (cl-project-test) PARASITES NIL) */
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-unification.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-unification.nix
index 4434e711d9d..6d284b7b012 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-unification.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-unification.nix
@@ -1,4 +1,4 @@
-{ fetchurl, ... }:
+args @ { fetchurl, ... }:
rec {
baseName = ''cl-unification'';
version = ''20171227-git'';
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-utilities.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-utilities.nix
index 1b78d0d2898..750da99d5d6 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-utilities.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-utilities.nix
@@ -1,4 +1,4 @@
-{ fetchurl, ... }:
+args @ { fetchurl, ... }:
rec {
baseName = ''cl-utilities'';
version = ''1.2.4'';
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl_plus_ssl.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl_plus_ssl.nix
index a757b3d4a8a..af0e917425a 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl_plus_ssl.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl_plus_ssl.nix
@@ -1,7 +1,7 @@
args @ { fetchurl, ... }:
rec {
baseName = ''cl_plus_ssl'';
- version = ''cl+ssl-20180328-git'';
+ version = ''cl+ssl-20180831-git'';
parasites = [ "openssl-1.1.0" ];
@@ -10,8 +10,8 @@ rec {
deps = [ args."alexandria" args."babel" args."bordeaux-threads" args."cffi" args."flexi-streams" args."trivial-features" args."trivial-garbage" args."trivial-gray-streams" args."uiop" ];
src = fetchurl {
- url = ''http://beta.quicklisp.org/archive/cl+ssl/2018-03-28/cl+ssl-20180328-git.tgz'';
- sha256 = ''095rn0dl0izjambjry4n4j72l9abijhlvs47h44a2mcgjc9alj62'';
+ url = ''http://beta.quicklisp.org/archive/cl+ssl/2018-08-31/cl+ssl-20180831-git.tgz'';
+ sha256 = ''1b35wz228kgcp9hc30mi38d004q2ixbv1b3krwycclnk4m65bl2r'';
};
packageName = "cl+ssl";
@@ -20,9 +20,9 @@ rec {
overrides = x: x;
}
/* (SYSTEM cl+ssl DESCRIPTION Common Lisp interface to OpenSSL. SHA256
- 095rn0dl0izjambjry4n4j72l9abijhlvs47h44a2mcgjc9alj62 URL
- http://beta.quicklisp.org/archive/cl+ssl/2018-03-28/cl+ssl-20180328-git.tgz
- MD5 ec6f921505ba7bb8e35878b3ae9eea29 NAME cl+ssl FILENAME cl_plus_ssl DEPS
+ 1b35wz228kgcp9hc30mi38d004q2ixbv1b3krwycclnk4m65bl2r URL
+ http://beta.quicklisp.org/archive/cl+ssl/2018-08-31/cl+ssl-20180831-git.tgz
+ MD5 56cd0b42cd9f7b8645db330ebc98600c NAME cl+ssl FILENAME cl_plus_ssl DEPS
((NAME alexandria FILENAME alexandria) (NAME babel FILENAME babel)
(NAME bordeaux-threads FILENAME bordeaux-threads)
(NAME cffi FILENAME cffi) (NAME flexi-streams FILENAME flexi-streams)
@@ -33,5 +33,5 @@ rec {
DEPENDENCIES
(alexandria babel bordeaux-threads cffi flexi-streams trivial-features
trivial-garbage trivial-gray-streams uiop)
- VERSION cl+ssl-20180328-git SIBLINGS (cl+ssl.test) PARASITES
+ VERSION cl+ssl-20180831-git SIBLINGS (cl+ssl.test) PARASITES
(openssl-1.1.0)) */
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/clack-handler-hunchentoot.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/clack-handler-hunchentoot.nix
new file mode 100644
index 00000000000..252f9794e76
--- /dev/null
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/clack-handler-hunchentoot.nix
@@ -0,0 +1,54 @@
+args @ { fetchurl, ... }:
+rec {
+ baseName = ''clack-handler-hunchentoot'';
+ version = ''clack-20180831-git'';
+
+ description = ''Clack handler for Hunchentoot.'';
+
+ deps = [ args."alexandria" args."babel" args."bordeaux-threads" args."cffi" args."chunga" args."cl_plus_ssl" args."cl-base64" args."cl-fad" args."cl-ppcre" args."clack-socket" args."flexi-streams" args."hunchentoot" args."md5" args."rfc2388" args."split-sequence" args."trivial-backtrace" args."trivial-features" args."trivial-garbage" args."trivial-gray-streams" args."usocket" ];
+
+ src = fetchurl {
+ url = ''http://beta.quicklisp.org/archive/clack/2018-08-31/clack-20180831-git.tgz'';
+ sha256 = ''0pfpm3l7l47j0mmwimy7c61ym8lg5m1dkzmz394snyywzcx54647'';
+ };
+
+ packageName = "clack-handler-hunchentoot";
+
+ asdFilesToKeep = ["clack-handler-hunchentoot.asd"];
+ overrides = x: x;
+}
+/* (SYSTEM clack-handler-hunchentoot DESCRIPTION Clack handler for Hunchentoot.
+ SHA256 0pfpm3l7l47j0mmwimy7c61ym8lg5m1dkzmz394snyywzcx54647 URL
+ http://beta.quicklisp.org/archive/clack/2018-08-31/clack-20180831-git.tgz
+ MD5 5042ece3b0a8b07cb4b318fbc250b4fe NAME clack-handler-hunchentoot
+ FILENAME clack-handler-hunchentoot DEPS
+ ((NAME alexandria FILENAME alexandria) (NAME babel FILENAME babel)
+ (NAME bordeaux-threads FILENAME bordeaux-threads)
+ (NAME cffi FILENAME cffi) (NAME chunga FILENAME chunga)
+ (NAME cl+ssl FILENAME cl_plus_ssl) (NAME cl-base64 FILENAME cl-base64)
+ (NAME cl-fad FILENAME cl-fad) (NAME cl-ppcre FILENAME cl-ppcre)
+ (NAME clack-socket FILENAME clack-socket)
+ (NAME flexi-streams FILENAME flexi-streams)
+ (NAME hunchentoot FILENAME hunchentoot) (NAME md5 FILENAME md5)
+ (NAME rfc2388 FILENAME rfc2388)
+ (NAME split-sequence FILENAME split-sequence)
+ (NAME trivial-backtrace FILENAME trivial-backtrace)
+ (NAME trivial-features FILENAME trivial-features)
+ (NAME trivial-garbage FILENAME trivial-garbage)
+ (NAME trivial-gray-streams FILENAME trivial-gray-streams)
+ (NAME usocket FILENAME usocket))
+ DEPENDENCIES
+ (alexandria babel bordeaux-threads cffi chunga cl+ssl cl-base64 cl-fad
+ cl-ppcre clack-socket flexi-streams hunchentoot md5 rfc2388 split-sequence
+ trivial-backtrace trivial-features trivial-garbage trivial-gray-streams
+ usocket)
+ VERSION clack-20180831-git SIBLINGS
+ (clack-handler-fcgi clack-handler-toot clack-handler-wookie clack-socket
+ clack-test clack-v1-compat clack t-clack-handler-fcgi
+ t-clack-handler-hunchentoot t-clack-handler-toot t-clack-handler-wookie
+ t-clack-v1-compat clack-middleware-auth-basic clack-middleware-clsql
+ clack-middleware-csrf clack-middleware-dbi clack-middleware-oauth
+ clack-middleware-postmodern clack-middleware-rucksack
+ clack-session-store-dbi t-clack-middleware-auth-basic
+ t-clack-middleware-csrf)
+ PARASITES NIL) */
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/clack-socket.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/clack-socket.nix
index a4a66ecfa64..d5163cabe04 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/clack-socket.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/clack-socket.nix
@@ -1,15 +1,15 @@
-{ fetchurl, ... }:
+args @ { fetchurl, ... }:
rec {
baseName = ''clack-socket'';
- version = ''clack-20180328-git'';
+ version = ''clack-20180831-git'';
description = '''';
deps = [ ];
src = fetchurl {
- url = ''http://beta.quicklisp.org/archive/clack/2018-03-28/clack-20180328-git.tgz'';
- sha256 = ''1appp17m7b5laxwgnidf9kral1476nl394mm10xzi1c0i18rssai'';
+ url = ''http://beta.quicklisp.org/archive/clack/2018-08-31/clack-20180831-git.tgz'';
+ sha256 = ''0pfpm3l7l47j0mmwimy7c61ym8lg5m1dkzmz394snyywzcx54647'';
};
packageName = "clack-socket";
@@ -18,10 +18,10 @@ rec {
overrides = x: x;
}
/* (SYSTEM clack-socket DESCRIPTION NIL SHA256
- 1appp17m7b5laxwgnidf9kral1476nl394mm10xzi1c0i18rssai URL
- http://beta.quicklisp.org/archive/clack/2018-03-28/clack-20180328-git.tgz
- MD5 5cf75a5d908efcd779438dc13f917d57 NAME clack-socket FILENAME
- clack-socket DEPS NIL DEPENDENCIES NIL VERSION clack-20180328-git SIBLINGS
+ 0pfpm3l7l47j0mmwimy7c61ym8lg5m1dkzmz394snyywzcx54647 URL
+ http://beta.quicklisp.org/archive/clack/2018-08-31/clack-20180831-git.tgz
+ MD5 5042ece3b0a8b07cb4b318fbc250b4fe NAME clack-socket FILENAME
+ clack-socket DEPS NIL DEPENDENCIES NIL VERSION clack-20180831-git SIBLINGS
(clack-handler-fcgi clack-handler-hunchentoot clack-handler-toot
clack-handler-wookie clack-test clack-v1-compat clack t-clack-handler-fcgi
t-clack-handler-hunchentoot t-clack-handler-toot t-clack-handler-wookie
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/clack-test.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/clack-test.nix
index be88069fd5d..1d081fbef58 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/clack-test.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/clack-test.nix
@@ -1,15 +1,15 @@
args @ { fetchurl, ... }:
rec {
baseName = ''clack-test'';
- version = ''clack-20180328-git'';
+ version = ''clack-20180831-git'';
description = ''Testing Clack Applications.'';
- deps = [ args."alexandria" args."anaphora" args."babel" args."bordeaux-threads" args."cffi" args."cffi-grovel" args."cffi-toolchain" args."chipz" args."chunga" args."cl_plus_ssl" args."cl-annot" args."cl-ansi-text" args."cl-base64" args."cl-colors" args."cl-cookie" args."cl-fad" args."cl-ppcre" args."cl-reexport" args."cl-syntax" args."cl-syntax-annot" args."cl-utilities" args."clack" args."dexador" args."fast-http" args."fast-io" args."flexi-streams" args."http-body" args."ironclad" args."jonathan" args."lack" args."lack-component" args."lack-middleware-backtrace" args."lack-util" args."let-plus" args."local-time" args."named-readtables" args."nibbles" args."proc-parse" args."prove" args."quri" args."smart-buffer" args."split-sequence" args."static-vectors" args."trivial-features" args."trivial-garbage" args."trivial-gray-streams" args."trivial-mimes" args."trivial-types" args."usocket" args."xsubseq" ];
+ deps = [ args."alexandria" args."anaphora" args."babel" args."bordeaux-threads" args."cffi" args."cffi-grovel" args."cffi-toolchain" args."chipz" args."chunga" args."cl_plus_ssl" args."cl-annot" args."cl-ansi-text" args."cl-base64" args."cl-colors" args."cl-cookie" args."cl-fad" args."cl-ppcre" args."cl-reexport" args."cl-syntax" args."cl-syntax-annot" args."cl-utilities" args."clack" args."clack-handler-hunchentoot" args."clack-socket" args."dexador" args."fast-http" args."fast-io" args."flexi-streams" args."http-body" args."hunchentoot" args."ironclad" args."jonathan" args."lack" args."lack-component" args."lack-middleware-backtrace" args."lack-util" args."let-plus" args."local-time" args."md5" args."named-readtables" args."nibbles" args."proc-parse" args."prove" args."quri" args."rfc2388" args."smart-buffer" args."split-sequence" args."static-vectors" args."trivial-backtrace" args."trivial-features" args."trivial-garbage" args."trivial-gray-streams" args."trivial-mimes" args."trivial-types" args."usocket" args."xsubseq" ];
src = fetchurl {
- url = ''http://beta.quicklisp.org/archive/clack/2018-03-28/clack-20180328-git.tgz'';
- sha256 = ''1appp17m7b5laxwgnidf9kral1476nl394mm10xzi1c0i18rssai'';
+ url = ''http://beta.quicklisp.org/archive/clack/2018-08-31/clack-20180831-git.tgz'';
+ sha256 = ''0pfpm3l7l47j0mmwimy7c61ym8lg5m1dkzmz394snyywzcx54647'';
};
packageName = "clack-test";
@@ -18,9 +18,9 @@ rec {
overrides = x: x;
}
/* (SYSTEM clack-test DESCRIPTION Testing Clack Applications. SHA256
- 1appp17m7b5laxwgnidf9kral1476nl394mm10xzi1c0i18rssai URL
- http://beta.quicklisp.org/archive/clack/2018-03-28/clack-20180328-git.tgz
- MD5 5cf75a5d908efcd779438dc13f917d57 NAME clack-test FILENAME clack-test
+ 0pfpm3l7l47j0mmwimy7c61ym8lg5m1dkzmz394snyywzcx54647 URL
+ http://beta.quicklisp.org/archive/clack/2018-08-31/clack-20180831-git.tgz
+ MD5 5042ece3b0a8b07cb4b318fbc250b4fe NAME clack-test FILENAME clack-test
DEPS
((NAME alexandria FILENAME alexandria) (NAME anaphora FILENAME anaphora)
(NAME babel FILENAME babel)
@@ -36,21 +36,24 @@ rec {
(NAME cl-syntax FILENAME cl-syntax)
(NAME cl-syntax-annot FILENAME cl-syntax-annot)
(NAME cl-utilities FILENAME cl-utilities) (NAME clack FILENAME clack)
- (NAME dexador FILENAME dexador) (NAME fast-http FILENAME fast-http)
- (NAME fast-io FILENAME fast-io)
+ (NAME clack-handler-hunchentoot FILENAME clack-handler-hunchentoot)
+ (NAME clack-socket FILENAME clack-socket) (NAME dexador FILENAME dexador)
+ (NAME fast-http FILENAME fast-http) (NAME fast-io FILENAME fast-io)
(NAME flexi-streams FILENAME flexi-streams)
- (NAME http-body FILENAME http-body) (NAME ironclad FILENAME ironclad)
+ (NAME http-body FILENAME http-body)
+ (NAME hunchentoot FILENAME hunchentoot) (NAME ironclad FILENAME ironclad)
(NAME jonathan FILENAME jonathan) (NAME lack FILENAME lack)
(NAME lack-component FILENAME lack-component)
(NAME lack-middleware-backtrace FILENAME lack-middleware-backtrace)
(NAME lack-util FILENAME lack-util) (NAME let-plus FILENAME let-plus)
- (NAME local-time FILENAME local-time)
+ (NAME local-time FILENAME local-time) (NAME md5 FILENAME md5)
(NAME named-readtables FILENAME named-readtables)
(NAME nibbles FILENAME nibbles) (NAME proc-parse FILENAME proc-parse)
(NAME prove FILENAME prove) (NAME quri FILENAME quri)
- (NAME smart-buffer FILENAME smart-buffer)
+ (NAME rfc2388 FILENAME rfc2388) (NAME smart-buffer FILENAME smart-buffer)
(NAME split-sequence FILENAME split-sequence)
(NAME static-vectors FILENAME static-vectors)
+ (NAME trivial-backtrace FILENAME trivial-backtrace)
(NAME trivial-features FILENAME trivial-features)
(NAME trivial-garbage FILENAME trivial-garbage)
(NAME trivial-gray-streams FILENAME trivial-gray-streams)
@@ -61,12 +64,14 @@ rec {
(alexandria anaphora babel bordeaux-threads cffi cffi-grovel cffi-toolchain
chipz chunga cl+ssl cl-annot cl-ansi-text cl-base64 cl-colors cl-cookie
cl-fad cl-ppcre cl-reexport cl-syntax cl-syntax-annot cl-utilities clack
- dexador fast-http fast-io flexi-streams http-body ironclad jonathan lack
- lack-component lack-middleware-backtrace lack-util let-plus local-time
- named-readtables nibbles proc-parse prove quri smart-buffer split-sequence
- static-vectors trivial-features trivial-garbage trivial-gray-streams
- trivial-mimes trivial-types usocket xsubseq)
- VERSION clack-20180328-git SIBLINGS
+ clack-handler-hunchentoot clack-socket dexador fast-http fast-io
+ flexi-streams http-body hunchentoot ironclad jonathan lack lack-component
+ lack-middleware-backtrace lack-util let-plus local-time md5
+ named-readtables nibbles proc-parse prove quri rfc2388 smart-buffer
+ split-sequence static-vectors trivial-backtrace trivial-features
+ trivial-garbage trivial-gray-streams trivial-mimes trivial-types usocket
+ xsubseq)
+ VERSION clack-20180831-git SIBLINGS
(clack-handler-fcgi clack-handler-hunchentoot clack-handler-toot
clack-handler-wookie clack-socket clack-v1-compat clack
t-clack-handler-fcgi t-clack-handler-hunchentoot t-clack-handler-toot
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/clack-v1-compat.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/clack-v1-compat.nix
index b810de3fd1c..8b2e2c70453 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/clack-v1-compat.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/clack-v1-compat.nix
@@ -1,15 +1,15 @@
args @ { fetchurl, ... }:
rec {
baseName = ''clack-v1-compat'';
- version = ''clack-20180328-git'';
+ version = ''clack-20180831-git'';
description = '''';
- deps = [ args."alexandria" args."anaphora" args."babel" args."bordeaux-threads" args."cffi" args."cffi-grovel" args."cffi-toolchain" args."chipz" args."chunga" args."circular-streams" args."cl_plus_ssl" args."cl-annot" args."cl-ansi-text" args."cl-base64" args."cl-colors" args."cl-cookie" args."cl-fad" args."cl-ppcre" args."cl-reexport" args."cl-syntax" args."cl-syntax-annot" args."cl-utilities" args."clack" args."clack-test" args."dexador" args."fast-http" args."fast-io" args."flexi-streams" args."http-body" args."ironclad" args."jonathan" args."lack" args."lack-component" args."lack-middleware-backtrace" args."lack-util" args."let-plus" args."local-time" args."marshal" args."named-readtables" args."nibbles" args."proc-parse" args."prove" args."quri" args."smart-buffer" args."split-sequence" args."static-vectors" args."trivial-backtrace" args."trivial-features" args."trivial-garbage" args."trivial-gray-streams" args."trivial-mimes" args."trivial-types" args."uiop" args."usocket" args."xsubseq" ];
+ deps = [ args."alexandria" args."anaphora" args."babel" args."bordeaux-threads" args."cffi" args."cffi-grovel" args."cffi-toolchain" args."chipz" args."chunga" args."circular-streams" args."cl_plus_ssl" args."cl-annot" args."cl-ansi-text" args."cl-base64" args."cl-colors" args."cl-cookie" args."cl-fad" args."cl-ppcre" args."cl-reexport" args."cl-syntax" args."cl-syntax-annot" args."cl-utilities" args."clack" args."clack-handler-hunchentoot" args."clack-socket" args."clack-test" args."dexador" args."fast-http" args."fast-io" args."flexi-streams" args."http-body" args."hunchentoot" args."ironclad" args."jonathan" args."lack" args."lack-component" args."lack-middleware-backtrace" args."lack-util" args."let-plus" args."local-time" args."marshal" args."md5" args."named-readtables" args."nibbles" args."proc-parse" args."prove" args."quri" args."rfc2388" args."smart-buffer" args."split-sequence" args."static-vectors" args."trivial-backtrace" args."trivial-features" args."trivial-garbage" args."trivial-gray-streams" args."trivial-mimes" args."trivial-types" args."uiop" args."usocket" args."xsubseq" ];
src = fetchurl {
- url = ''http://beta.quicklisp.org/archive/clack/2018-03-28/clack-20180328-git.tgz'';
- sha256 = ''1appp17m7b5laxwgnidf9kral1476nl394mm10xzi1c0i18rssai'';
+ url = ''http://beta.quicklisp.org/archive/clack/2018-08-31/clack-20180831-git.tgz'';
+ sha256 = ''0pfpm3l7l47j0mmwimy7c61ym8lg5m1dkzmz394snyywzcx54647'';
};
packageName = "clack-v1-compat";
@@ -18,9 +18,9 @@ rec {
overrides = x: x;
}
/* (SYSTEM clack-v1-compat DESCRIPTION NIL SHA256
- 1appp17m7b5laxwgnidf9kral1476nl394mm10xzi1c0i18rssai URL
- http://beta.quicklisp.org/archive/clack/2018-03-28/clack-20180328-git.tgz
- MD5 5cf75a5d908efcd779438dc13f917d57 NAME clack-v1-compat FILENAME
+ 0pfpm3l7l47j0mmwimy7c61ym8lg5m1dkzmz394snyywzcx54647 URL
+ http://beta.quicklisp.org/archive/clack/2018-08-31/clack-20180831-git.tgz
+ MD5 5042ece3b0a8b07cb4b318fbc250b4fe NAME clack-v1-compat FILENAME
clack-v1-compat DEPS
((NAME alexandria FILENAME alexandria) (NAME anaphora FILENAME anaphora)
(NAME babel FILENAME babel)
@@ -37,19 +37,22 @@ rec {
(NAME cl-syntax FILENAME cl-syntax)
(NAME cl-syntax-annot FILENAME cl-syntax-annot)
(NAME cl-utilities FILENAME cl-utilities) (NAME clack FILENAME clack)
+ (NAME clack-handler-hunchentoot FILENAME clack-handler-hunchentoot)
+ (NAME clack-socket FILENAME clack-socket)
(NAME clack-test FILENAME clack-test) (NAME dexador FILENAME dexador)
(NAME fast-http FILENAME fast-http) (NAME fast-io FILENAME fast-io)
(NAME flexi-streams FILENAME flexi-streams)
- (NAME http-body FILENAME http-body) (NAME ironclad FILENAME ironclad)
+ (NAME http-body FILENAME http-body)
+ (NAME hunchentoot FILENAME hunchentoot) (NAME ironclad FILENAME ironclad)
(NAME jonathan FILENAME jonathan) (NAME lack FILENAME lack)
(NAME lack-component FILENAME lack-component)
(NAME lack-middleware-backtrace FILENAME lack-middleware-backtrace)
(NAME lack-util FILENAME lack-util) (NAME let-plus FILENAME let-plus)
(NAME local-time FILENAME local-time) (NAME marshal FILENAME marshal)
- (NAME named-readtables FILENAME named-readtables)
+ (NAME md5 FILENAME md5) (NAME named-readtables FILENAME named-readtables)
(NAME nibbles FILENAME nibbles) (NAME proc-parse FILENAME proc-parse)
(NAME prove FILENAME prove) (NAME quri FILENAME quri)
- (NAME smart-buffer FILENAME smart-buffer)
+ (NAME rfc2388 FILENAME rfc2388) (NAME smart-buffer FILENAME smart-buffer)
(NAME split-sequence FILENAME split-sequence)
(NAME static-vectors FILENAME static-vectors)
(NAME trivial-backtrace FILENAME trivial-backtrace)
@@ -63,13 +66,14 @@ rec {
(alexandria anaphora babel bordeaux-threads cffi cffi-grovel cffi-toolchain
chipz chunga circular-streams cl+ssl cl-annot cl-ansi-text cl-base64
cl-colors cl-cookie cl-fad cl-ppcre cl-reexport cl-syntax cl-syntax-annot
- cl-utilities clack clack-test dexador fast-http fast-io flexi-streams
- http-body ironclad jonathan lack lack-component lack-middleware-backtrace
- lack-util let-plus local-time marshal named-readtables nibbles proc-parse
- prove quri smart-buffer split-sequence static-vectors trivial-backtrace
+ cl-utilities clack clack-handler-hunchentoot clack-socket clack-test
+ dexador fast-http fast-io flexi-streams http-body hunchentoot ironclad
+ jonathan lack lack-component lack-middleware-backtrace lack-util let-plus
+ local-time marshal md5 named-readtables nibbles proc-parse prove quri
+ rfc2388 smart-buffer split-sequence static-vectors trivial-backtrace
trivial-features trivial-garbage trivial-gray-streams trivial-mimes
trivial-types uiop usocket xsubseq)
- VERSION clack-20180328-git SIBLINGS
+ VERSION clack-20180831-git SIBLINGS
(clack-handler-fcgi clack-handler-hunchentoot clack-handler-toot
clack-handler-wookie clack-socket clack-test clack t-clack-handler-fcgi
t-clack-handler-hunchentoot t-clack-handler-toot t-clack-handler-wookie
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/clack.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/clack.nix
index 08e5ff71cc5..0b2828d06df 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/clack.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/clack.nix
@@ -1,15 +1,15 @@
args @ { fetchurl, ... }:
rec {
baseName = ''clack'';
- version = ''20180328-git'';
+ version = ''20180831-git'';
description = ''Web application environment for Common Lisp'';
deps = [ args."alexandria" args."bordeaux-threads" args."ironclad" args."lack" args."lack-component" args."lack-middleware-backtrace" args."lack-util" args."nibbles" args."uiop" ];
src = fetchurl {
- url = ''http://beta.quicklisp.org/archive/clack/2018-03-28/clack-20180328-git.tgz'';
- sha256 = ''1appp17m7b5laxwgnidf9kral1476nl394mm10xzi1c0i18rssai'';
+ url = ''http://beta.quicklisp.org/archive/clack/2018-08-31/clack-20180831-git.tgz'';
+ sha256 = ''0pfpm3l7l47j0mmwimy7c61ym8lg5m1dkzmz394snyywzcx54647'';
};
packageName = "clack";
@@ -18,9 +18,9 @@ rec {
overrides = x: x;
}
/* (SYSTEM clack DESCRIPTION Web application environment for Common Lisp SHA256
- 1appp17m7b5laxwgnidf9kral1476nl394mm10xzi1c0i18rssai URL
- http://beta.quicklisp.org/archive/clack/2018-03-28/clack-20180328-git.tgz
- MD5 5cf75a5d908efcd779438dc13f917d57 NAME clack FILENAME clack DEPS
+ 0pfpm3l7l47j0mmwimy7c61ym8lg5m1dkzmz394snyywzcx54647 URL
+ http://beta.quicklisp.org/archive/clack/2018-08-31/clack-20180831-git.tgz
+ MD5 5042ece3b0a8b07cb4b318fbc250b4fe NAME clack FILENAME clack DEPS
((NAME alexandria FILENAME alexandria)
(NAME bordeaux-threads FILENAME bordeaux-threads)
(NAME ironclad FILENAME ironclad) (NAME lack FILENAME lack)
@@ -31,7 +31,7 @@ rec {
DEPENDENCIES
(alexandria bordeaux-threads ironclad lack lack-component
lack-middleware-backtrace lack-util nibbles uiop)
- VERSION 20180328-git SIBLINGS
+ VERSION 20180831-git SIBLINGS
(clack-handler-fcgi clack-handler-hunchentoot clack-handler-toot
clack-handler-wookie clack-socket clack-test clack-v1-compat
t-clack-handler-fcgi t-clack-handler-hunchentoot t-clack-handler-toot
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/closer-mop.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/closer-mop.nix
index ec7599f2bd3..a13537d7e90 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/closer-mop.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/closer-mop.nix
@@ -1,15 +1,15 @@
-{ fetchurl, ... }:
+args @ { fetchurl, ... }:
rec {
baseName = ''closer-mop'';
- version = ''20180430-git'';
+ version = ''20180831-git'';
description = ''Closer to MOP is a compatibility layer that rectifies many of the absent or incorrect CLOS MOP features across a broad range of Common Lisp implementations.'';
deps = [ ];
src = fetchurl {
- url = ''http://beta.quicklisp.org/archive/closer-mop/2018-04-30/closer-mop-20180430-git.tgz'';
- sha256 = ''1bbvjkqjw17dgzy6spqqpdlarcxd0rchki769r43g5p5sghxlb6v'';
+ url = ''http://beta.quicklisp.org/archive/closer-mop/2018-08-31/closer-mop-20180831-git.tgz'';
+ sha256 = ''01lzgh6rgbmfyfspiligkq44z56h2xgg55hxixnrgycbaipzgkbg'';
};
packageName = "closer-mop";
@@ -19,7 +19,7 @@ rec {
}
/* (SYSTEM closer-mop DESCRIPTION
Closer to MOP is a compatibility layer that rectifies many of the absent or incorrect CLOS MOP features across a broad range of Common Lisp implementations.
- SHA256 1bbvjkqjw17dgzy6spqqpdlarcxd0rchki769r43g5p5sghxlb6v URL
- http://beta.quicklisp.org/archive/closer-mop/2018-04-30/closer-mop-20180430-git.tgz
- MD5 7578c66d4d468a21de9c5cf065b8615f NAME closer-mop FILENAME closer-mop
- DEPS NIL DEPENDENCIES NIL VERSION 20180430-git SIBLINGS NIL PARASITES NIL) */
+ SHA256 01lzgh6rgbmfyfspiligkq44z56h2xgg55hxixnrgycbaipzgkbg URL
+ http://beta.quicklisp.org/archive/closer-mop/2018-08-31/closer-mop-20180831-git.tgz
+ MD5 968426b07f9792f95fe3c9b83d68d756 NAME closer-mop FILENAME closer-mop
+ DEPS NIL DEPENDENCIES NIL VERSION 20180831-git SIBLINGS NIL PARASITES NIL) */
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/closure-html.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/closure-html.nix
index 29c90369244..f55ccecadc6 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/closure-html.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/closure-html.nix
@@ -1,15 +1,15 @@
args @ { fetchurl, ... }:
rec {
baseName = ''closure-html'';
- version = ''20140826-git'';
+ version = ''20180711-git'';
description = '''';
deps = [ args."alexandria" args."babel" args."closure-common" args."flexi-streams" args."trivial-features" args."trivial-gray-streams" ];
src = fetchurl {
- url = ''http://beta.quicklisp.org/archive/closure-html/2014-08-26/closure-html-20140826-git.tgz'';
- sha256 = ''1m07iv9r5ykj52fszwhwai5wv39mczk3m4zzh24gjhsprv35x8qb'';
+ url = ''http://beta.quicklisp.org/archive/closure-html/2018-07-11/closure-html-20180711-git.tgz'';
+ sha256 = ''0ljcrz1wix77h1ywp0bixm3pb5ncmr1vdiwh8m1qzkygwpfjr8aq'';
};
packageName = "closure-html";
@@ -18,9 +18,9 @@ rec {
overrides = x: x;
}
/* (SYSTEM closure-html DESCRIPTION NIL SHA256
- 1m07iv9r5ykj52fszwhwai5wv39mczk3m4zzh24gjhsprv35x8qb URL
- http://beta.quicklisp.org/archive/closure-html/2014-08-26/closure-html-20140826-git.tgz
- MD5 3f8d8a4fd54f915ca6cc5fdf29239d98 NAME closure-html FILENAME
+ 0ljcrz1wix77h1ywp0bixm3pb5ncmr1vdiwh8m1qzkygwpfjr8aq URL
+ http://beta.quicklisp.org/archive/closure-html/2018-07-11/closure-html-20180711-git.tgz
+ MD5 461dc8caa65385da5f2d1cd8dd4f965f NAME closure-html FILENAME
closure-html DEPS
((NAME alexandria FILENAME alexandria) (NAME babel FILENAME babel)
(NAME closure-common FILENAME closure-common)
@@ -30,4 +30,4 @@ rec {
DEPENDENCIES
(alexandria babel closure-common flexi-streams trivial-features
trivial-gray-streams)
- VERSION 20140826-git SIBLINGS NIL PARASITES NIL) */
+ VERSION 20180711-git SIBLINGS NIL PARASITES NIL) */
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/clss.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/clss.nix
index 76f50463a6a..3f6d6ae32ac 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/clss.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/clss.nix
@@ -1,15 +1,15 @@
args @ { fetchurl, ... }:
rec {
baseName = ''clss'';
- version = ''20180131-git'';
+ version = ''20180831-git'';
description = ''A DOM tree searching engine based on CSS selectors.'';
deps = [ args."array-utils" args."documentation-utils" args."plump" args."trivial-indent" ];
src = fetchurl {
- url = ''http://beta.quicklisp.org/archive/clss/2018-01-31/clss-20180131-git.tgz'';
- sha256 = ''0d4sblafhm5syjkv89h45i98dykpznb0ga3q9a2cxlvl98yklg8r'';
+ url = ''http://beta.quicklisp.org/archive/clss/2018-08-31/clss-20180831-git.tgz'';
+ sha256 = ''18jm89i9353khrp9q92bnqllkypcsmyd43jvdr6gl0n50fmzs5jd'';
};
packageName = "clss";
@@ -18,11 +18,11 @@ rec {
overrides = x: x;
}
/* (SYSTEM clss DESCRIPTION A DOM tree searching engine based on CSS selectors.
- SHA256 0d4sblafhm5syjkv89h45i98dykpznb0ga3q9a2cxlvl98yklg8r URL
- http://beta.quicklisp.org/archive/clss/2018-01-31/clss-20180131-git.tgz MD5
- 138244b7871d8ea832832aa9cc5867e6 NAME clss FILENAME clss DEPS
+ SHA256 18jm89i9353khrp9q92bnqllkypcsmyd43jvdr6gl0n50fmzs5jd URL
+ http://beta.quicklisp.org/archive/clss/2018-08-31/clss-20180831-git.tgz MD5
+ 39b69790115d6c4fe4709f5a45b5d4a4 NAME clss FILENAME clss DEPS
((NAME array-utils FILENAME array-utils)
(NAME documentation-utils FILENAME documentation-utils)
(NAME plump FILENAME plump) (NAME trivial-indent FILENAME trivial-indent))
DEPENDENCIES (array-utils documentation-utils plump trivial-indent) VERSION
- 20180131-git SIBLINGS NIL PARASITES NIL) */
+ 20180831-git SIBLINGS NIL PARASITES NIL) */
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/clx.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/clx.nix
index bd2b0ff19bd..685e8128368 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/clx.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/clx.nix
@@ -1,7 +1,7 @@
args @ { fetchurl, ... }:
rec {
baseName = ''clx'';
- version = ''20180430-git'';
+ version = ''20180711-git'';
parasites = [ "clx/test" ];
@@ -10,8 +10,8 @@ rec {
deps = [ args."fiasco" ];
src = fetchurl {
- url = ''http://beta.quicklisp.org/archive/clx/2018-04-30/clx-20180430-git.tgz'';
- sha256 = ''18ghhirnx0js7q1samwyah990nmgqbas7b1y0wy0fqynaznaz9x3'';
+ url = ''http://beta.quicklisp.org/archive/clx/2018-07-11/clx-20180711-git.tgz'';
+ sha256 = ''0vpavllapc0j6j7iwxpxzgl8n5krvrwhmd5k2k0f3pr6sgl1y29h'';
};
packageName = "clx";
@@ -21,8 +21,8 @@ rec {
}
/* (SYSTEM clx DESCRIPTION
An implementation of the X Window System protocol in Lisp. SHA256
- 18ghhirnx0js7q1samwyah990nmgqbas7b1y0wy0fqynaznaz9x3 URL
- http://beta.quicklisp.org/archive/clx/2018-04-30/clx-20180430-git.tgz MD5
- bf9c1d6b1b2856ddbd4bf2fa75bbc309 NAME clx FILENAME clx DEPS
- ((NAME fiasco FILENAME fiasco)) DEPENDENCIES (fiasco) VERSION 20180430-git
+ 0vpavllapc0j6j7iwxpxzgl8n5krvrwhmd5k2k0f3pr6sgl1y29h URL
+ http://beta.quicklisp.org/archive/clx/2018-07-11/clx-20180711-git.tgz MD5
+ 27d5e904d2b7e4cdf4e8492839d15bad NAME clx FILENAME clx DEPS
+ ((NAME fiasco FILENAME fiasco)) DEPENDENCIES (fiasco) VERSION 20180711-git
SIBLINGS NIL PARASITES (clx/test)) */
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/command-line-arguments.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/command-line-arguments.nix
index 1ae6fa0f4ec..e1fb5965852 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/command-line-arguments.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/command-line-arguments.nix
@@ -1,4 +1,4 @@
-{ fetchurl, ... }:
+args @ { fetchurl, ... }:
rec {
baseName = ''command-line-arguments'';
version = ''20151218-git'';
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/css-lite.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/css-lite.nix
index bb5ab940638..f4941aa80cd 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/css-lite.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/css-lite.nix
@@ -1,4 +1,4 @@
-{ fetchurl, ... }:
+args @ { fetchurl, ... }:
rec {
baseName = ''css-lite'';
version = ''20120407-git'';
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/css-selectors-simple-tree.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/css-selectors-simple-tree.nix
index ba523ae837d..c83b2993968 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/css-selectors-simple-tree.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/css-selectors-simple-tree.nix
@@ -5,7 +5,7 @@ rec {
description = ''An implementation of css selectors that interacts with cl-html5-parser's simple-tree'';
- deps = [ args."alexandria" args."babel" args."buildnode" args."cl-html5-parser" args."cl-interpol" args."cl-ppcre" args."cl-unicode" args."closer-mop" args."closure-common" args."closure-html" args."collectors" args."css-selectors" args."cxml" args."cxml-dom" args."cxml-klacks" args."cxml-test" args."cxml-xml" args."flexi-streams" args."iterate" args."puri" args."split-sequence" args."string-case" args."swank" args."symbol-munger" args."trivial-features" args."trivial-gray-streams" args."yacc" ];
+ deps = [ args."alexandria" args."babel" args."buildnode" args."cl-html5-parser" args."cl-interpol" args."cl-ppcre" args."cl-unicode" args."closer-mop" args."closure-common" args."closure-html" args."collectors" args."css-selectors" args."cxml" args."cxml-dom" args."cxml-klacks" args."cxml-test" args."cxml-xml" args."flexi-streams" args."iterate" args."named-readtables" args."puri" args."split-sequence" args."string-case" args."swank" args."symbol-munger" args."trivial-features" args."trivial-gray-streams" args."yacc" ];
src = fetchurl {
url = ''http://beta.quicklisp.org/archive/css-selectors/2016-06-28/css-selectors-20160628-git.tgz'';
@@ -36,8 +36,9 @@ rec {
(NAME cxml-dom FILENAME cxml-dom) (NAME cxml-klacks FILENAME cxml-klacks)
(NAME cxml-test FILENAME cxml-test) (NAME cxml-xml FILENAME cxml-xml)
(NAME flexi-streams FILENAME flexi-streams)
- (NAME iterate FILENAME iterate) (NAME puri FILENAME puri)
- (NAME split-sequence FILENAME split-sequence)
+ (NAME iterate FILENAME iterate)
+ (NAME named-readtables FILENAME named-readtables)
+ (NAME puri FILENAME puri) (NAME split-sequence FILENAME split-sequence)
(NAME string-case FILENAME string-case) (NAME swank FILENAME swank)
(NAME symbol-munger FILENAME symbol-munger)
(NAME trivial-features FILENAME trivial-features)
@@ -46,8 +47,8 @@ rec {
DEPENDENCIES
(alexandria babel buildnode cl-html5-parser cl-interpol cl-ppcre cl-unicode
closer-mop closure-common closure-html collectors css-selectors cxml
- cxml-dom cxml-klacks cxml-test cxml-xml flexi-streams iterate puri
- split-sequence string-case swank symbol-munger trivial-features
- trivial-gray-streams yacc)
+ cxml-dom cxml-klacks cxml-test cxml-xml flexi-streams iterate
+ named-readtables puri split-sequence string-case swank symbol-munger
+ trivial-features trivial-gray-streams yacc)
VERSION css-selectors-20160628-git SIBLINGS
(css-selectors-stp css-selectors) PARASITES NIL) */
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/css-selectors-stp.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/css-selectors-stp.nix
index fbe06a179fd..69ada2ce80a 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/css-selectors-stp.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/css-selectors-stp.nix
@@ -5,7 +5,7 @@ rec {
description = ''An implementation of css selectors that interacts with cxml-stp'';
- deps = [ args."alexandria" args."babel" args."buildnode" args."cl-interpol" args."cl-ppcre" args."cl-unicode" args."closer-mop" args."closure-common" args."closure-html" args."collectors" args."css-selectors" args."cxml" args."cxml-dom" args."cxml-klacks" args."cxml-stp" args."cxml-test" args."cxml-xml" args."flexi-streams" args."iterate" args."parse-number" args."puri" args."split-sequence" args."swank" args."symbol-munger" args."trivial-features" args."trivial-gray-streams" args."xpath" args."yacc" ];
+ deps = [ args."alexandria" args."babel" args."buildnode" args."cl-interpol" args."cl-ppcre" args."cl-unicode" args."closer-mop" args."closure-common" args."closure-html" args."collectors" args."css-selectors" args."cxml" args."cxml-dom" args."cxml-klacks" args."cxml-stp" args."cxml-test" args."cxml-xml" args."flexi-streams" args."iterate" args."named-readtables" args."parse-number" args."puri" args."split-sequence" args."swank" args."symbol-munger" args."trivial-features" args."trivial-gray-streams" args."xpath" args."yacc" ];
src = fetchurl {
url = ''http://beta.quicklisp.org/archive/css-selectors/2016-06-28/css-selectors-20160628-git.tgz'';
@@ -36,17 +36,19 @@ rec {
(NAME cxml-stp FILENAME cxml-stp) (NAME cxml-test FILENAME cxml-test)
(NAME cxml-xml FILENAME cxml-xml)
(NAME flexi-streams FILENAME flexi-streams)
- (NAME iterate FILENAME iterate) (NAME parse-number FILENAME parse-number)
- (NAME puri FILENAME puri) (NAME split-sequence FILENAME split-sequence)
- (NAME swank FILENAME swank) (NAME symbol-munger FILENAME symbol-munger)
+ (NAME iterate FILENAME iterate)
+ (NAME named-readtables FILENAME named-readtables)
+ (NAME parse-number FILENAME parse-number) (NAME puri FILENAME puri)
+ (NAME split-sequence FILENAME split-sequence) (NAME swank FILENAME swank)
+ (NAME symbol-munger FILENAME symbol-munger)
(NAME trivial-features FILENAME trivial-features)
(NAME trivial-gray-streams FILENAME trivial-gray-streams)
(NAME xpath FILENAME xpath) (NAME yacc FILENAME yacc))
DEPENDENCIES
(alexandria babel buildnode cl-interpol cl-ppcre cl-unicode closer-mop
closure-common closure-html collectors css-selectors cxml cxml-dom
- cxml-klacks cxml-stp cxml-test cxml-xml flexi-streams iterate parse-number
- puri split-sequence swank symbol-munger trivial-features
- trivial-gray-streams xpath yacc)
+ cxml-klacks cxml-stp cxml-test cxml-xml flexi-streams iterate
+ named-readtables parse-number puri split-sequence swank symbol-munger
+ trivial-features trivial-gray-streams xpath yacc)
VERSION css-selectors-20160628-git SIBLINGS
(css-selectors-simple-tree css-selectors) PARASITES NIL) */
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/css-selectors.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/css-selectors.nix
index 2ad018e5549..3316f59447d 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/css-selectors.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/css-selectors.nix
@@ -7,7 +7,7 @@ rec {
description = ''An implementation of css selectors'';
- deps = [ args."alexandria" args."babel" args."buildnode" args."buildnode-xhtml" args."cl-interpol" args."cl-ppcre" args."cl-unicode" args."closer-mop" args."closure-common" args."closure-html" args."collectors" args."cxml" args."cxml-dom" args."cxml-klacks" args."cxml-test" args."cxml-xml" args."flexi-streams" args."iterate" args."lisp-unit2" args."puri" args."split-sequence" args."swank" args."symbol-munger" args."trivial-features" args."trivial-gray-streams" args."yacc" ];
+ deps = [ args."alexandria" args."babel" args."buildnode" args."buildnode-xhtml" args."cl-interpol" args."cl-ppcre" args."cl-unicode" args."closer-mop" args."closure-common" args."closure-html" args."collectors" args."cxml" args."cxml-dom" args."cxml-klacks" args."cxml-test" args."cxml-xml" args."flexi-streams" args."iterate" args."lisp-unit2" args."named-readtables" args."puri" args."split-sequence" args."swank" args."symbol-munger" args."trivial-features" args."trivial-gray-streams" args."yacc" ];
src = fetchurl {
url = ''http://beta.quicklisp.org/archive/css-selectors/2016-06-28/css-selectors-20160628-git.tgz'';
@@ -37,6 +37,7 @@ rec {
(NAME cxml-test FILENAME cxml-test) (NAME cxml-xml FILENAME cxml-xml)
(NAME flexi-streams FILENAME flexi-streams)
(NAME iterate FILENAME iterate) (NAME lisp-unit2 FILENAME lisp-unit2)
+ (NAME named-readtables FILENAME named-readtables)
(NAME puri FILENAME puri) (NAME split-sequence FILENAME split-sequence)
(NAME swank FILENAME swank) (NAME symbol-munger FILENAME symbol-munger)
(NAME trivial-features FILENAME trivial-features)
@@ -45,8 +46,8 @@ rec {
DEPENDENCIES
(alexandria babel buildnode buildnode-xhtml cl-interpol cl-ppcre cl-unicode
closer-mop closure-common closure-html collectors cxml cxml-dom
- cxml-klacks cxml-test cxml-xml flexi-streams iterate lisp-unit2 puri
- split-sequence swank symbol-munger trivial-features trivial-gray-streams
- yacc)
+ cxml-klacks cxml-test cxml-xml flexi-streams iterate lisp-unit2
+ named-readtables puri split-sequence swank symbol-munger trivial-features
+ trivial-gray-streams yacc)
VERSION 20160628-git SIBLINGS (css-selectors-simple-tree css-selectors-stp)
PARASITES (css-selectors-test)) */
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/dbd-mysql.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/dbd-mysql.nix
index 6dfa61634f2..218107e95d6 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/dbd-mysql.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/dbd-mysql.nix
@@ -1,15 +1,15 @@
args @ { fetchurl, ... }:
rec {
baseName = ''dbd-mysql'';
- version = ''cl-dbi-20180430-git'';
+ version = ''cl-dbi-20180831-git'';
description = ''Database driver for MySQL.'';
deps = [ args."alexandria" args."babel" args."bordeaux-threads" args."cffi" args."cl-annot" args."cl-mysql" args."cl-syntax" args."cl-syntax-annot" args."closer-mop" args."dbi" args."named-readtables" args."split-sequence" args."trivial-features" args."trivial-types" ];
src = fetchurl {
- url = ''http://beta.quicklisp.org/archive/cl-dbi/2018-04-30/cl-dbi-20180430-git.tgz'';
- sha256 = ''0bjkba9z93h2sf9n40dvmw1p6nq2p3d5zw9w3zw9k1crn7a601sv'';
+ url = ''http://beta.quicklisp.org/archive/cl-dbi/2018-08-31/cl-dbi-20180831-git.tgz'';
+ sha256 = ''19cpzdzjjzm0if77dycsk8lj91ihwr51mbjmf3fx0wqwr8k5y0g9'';
};
packageName = "dbd-mysql";
@@ -18,9 +18,9 @@ rec {
overrides = x: x;
}
/* (SYSTEM dbd-mysql DESCRIPTION Database driver for MySQL. SHA256
- 0bjkba9z93h2sf9n40dvmw1p6nq2p3d5zw9w3zw9k1crn7a601sv URL
- http://beta.quicklisp.org/archive/cl-dbi/2018-04-30/cl-dbi-20180430-git.tgz
- MD5 1bc845e8738c4987342cb0f56200ba50 NAME dbd-mysql FILENAME dbd-mysql DEPS
+ 19cpzdzjjzm0if77dycsk8lj91ihwr51mbjmf3fx0wqwr8k5y0g9 URL
+ http://beta.quicklisp.org/archive/cl-dbi/2018-08-31/cl-dbi-20180831-git.tgz
+ MD5 2fc95bff95d3cd25e3afeb003ee009d2 NAME dbd-mysql FILENAME dbd-mysql DEPS
((NAME alexandria FILENAME alexandria) (NAME babel FILENAME babel)
(NAME bordeaux-threads FILENAME bordeaux-threads)
(NAME cffi FILENAME cffi) (NAME cl-annot FILENAME cl-annot)
@@ -35,5 +35,5 @@ rec {
(alexandria babel bordeaux-threads cffi cl-annot cl-mysql cl-syntax
cl-syntax-annot closer-mop dbi named-readtables split-sequence
trivial-features trivial-types)
- VERSION cl-dbi-20180430-git SIBLINGS
+ VERSION cl-dbi-20180831-git SIBLINGS
(cl-dbi dbd-postgres dbd-sqlite3 dbi-test dbi) PARASITES NIL) */
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/dbd-postgres.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/dbd-postgres.nix
index bb9558fda51..9387806255a 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/dbd-postgres.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/dbd-postgres.nix
@@ -1,15 +1,15 @@
args @ { fetchurl, ... }:
rec {
baseName = ''dbd-postgres'';
- version = ''cl-dbi-20180430-git'';
+ version = ''cl-dbi-20180831-git'';
description = ''Database driver for PostgreSQL.'';
deps = [ args."alexandria" args."bordeaux-threads" args."cl-annot" args."cl-postgres" args."cl-syntax" args."cl-syntax-annot" args."closer-mop" args."dbi" args."md5" args."named-readtables" args."split-sequence" args."trivial-garbage" args."trivial-types" args."usocket" ];
src = fetchurl {
- url = ''http://beta.quicklisp.org/archive/cl-dbi/2018-04-30/cl-dbi-20180430-git.tgz'';
- sha256 = ''0bjkba9z93h2sf9n40dvmw1p6nq2p3d5zw9w3zw9k1crn7a601sv'';
+ url = ''http://beta.quicklisp.org/archive/cl-dbi/2018-08-31/cl-dbi-20180831-git.tgz'';
+ sha256 = ''19cpzdzjjzm0if77dycsk8lj91ihwr51mbjmf3fx0wqwr8k5y0g9'';
};
packageName = "dbd-postgres";
@@ -18,9 +18,9 @@ rec {
overrides = x: x;
}
/* (SYSTEM dbd-postgres DESCRIPTION Database driver for PostgreSQL. SHA256
- 0bjkba9z93h2sf9n40dvmw1p6nq2p3d5zw9w3zw9k1crn7a601sv URL
- http://beta.quicklisp.org/archive/cl-dbi/2018-04-30/cl-dbi-20180430-git.tgz
- MD5 1bc845e8738c4987342cb0f56200ba50 NAME dbd-postgres FILENAME
+ 19cpzdzjjzm0if77dycsk8lj91ihwr51mbjmf3fx0wqwr8k5y0g9 URL
+ http://beta.quicklisp.org/archive/cl-dbi/2018-08-31/cl-dbi-20180831-git.tgz
+ MD5 2fc95bff95d3cd25e3afeb003ee009d2 NAME dbd-postgres FILENAME
dbd-postgres DEPS
((NAME alexandria FILENAME alexandria)
(NAME bordeaux-threads FILENAME bordeaux-threads)
@@ -37,5 +37,5 @@ rec {
(alexandria bordeaux-threads cl-annot cl-postgres cl-syntax cl-syntax-annot
closer-mop dbi md5 named-readtables split-sequence trivial-garbage
trivial-types usocket)
- VERSION cl-dbi-20180430-git SIBLINGS
+ VERSION cl-dbi-20180831-git SIBLINGS
(cl-dbi dbd-mysql dbd-sqlite3 dbi-test dbi) PARASITES NIL) */
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/dbd-sqlite3.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/dbd-sqlite3.nix
index 6e8e85e72ab..808914068a3 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/dbd-sqlite3.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/dbd-sqlite3.nix
@@ -1,15 +1,15 @@
args @ { fetchurl, ... }:
rec {
baseName = ''dbd-sqlite3'';
- version = ''cl-dbi-20180430-git'';
+ version = ''cl-dbi-20180831-git'';
description = ''Database driver for SQLite3.'';
deps = [ args."alexandria" args."babel" args."bordeaux-threads" args."cffi" args."cl-annot" args."cl-syntax" args."cl-syntax-annot" args."closer-mop" args."dbi" args."iterate" args."named-readtables" args."split-sequence" args."sqlite" args."trivial-features" args."trivial-types" args."uiop" ];
src = fetchurl {
- url = ''http://beta.quicklisp.org/archive/cl-dbi/2018-04-30/cl-dbi-20180430-git.tgz'';
- sha256 = ''0bjkba9z93h2sf9n40dvmw1p6nq2p3d5zw9w3zw9k1crn7a601sv'';
+ url = ''http://beta.quicklisp.org/archive/cl-dbi/2018-08-31/cl-dbi-20180831-git.tgz'';
+ sha256 = ''19cpzdzjjzm0if77dycsk8lj91ihwr51mbjmf3fx0wqwr8k5y0g9'';
};
packageName = "dbd-sqlite3";
@@ -18,9 +18,9 @@ rec {
overrides = x: x;
}
/* (SYSTEM dbd-sqlite3 DESCRIPTION Database driver for SQLite3. SHA256
- 0bjkba9z93h2sf9n40dvmw1p6nq2p3d5zw9w3zw9k1crn7a601sv URL
- http://beta.quicklisp.org/archive/cl-dbi/2018-04-30/cl-dbi-20180430-git.tgz
- MD5 1bc845e8738c4987342cb0f56200ba50 NAME dbd-sqlite3 FILENAME dbd-sqlite3
+ 19cpzdzjjzm0if77dycsk8lj91ihwr51mbjmf3fx0wqwr8k5y0g9 URL
+ http://beta.quicklisp.org/archive/cl-dbi/2018-08-31/cl-dbi-20180831-git.tgz
+ MD5 2fc95bff95d3cd25e3afeb003ee009d2 NAME dbd-sqlite3 FILENAME dbd-sqlite3
DEPS
((NAME alexandria FILENAME alexandria) (NAME babel FILENAME babel)
(NAME bordeaux-threads FILENAME bordeaux-threads)
@@ -38,5 +38,5 @@ rec {
(alexandria babel bordeaux-threads cffi cl-annot cl-syntax cl-syntax-annot
closer-mop dbi iterate named-readtables split-sequence sqlite
trivial-features trivial-types uiop)
- VERSION cl-dbi-20180430-git SIBLINGS
+ VERSION cl-dbi-20180831-git SIBLINGS
(cl-dbi dbd-mysql dbd-postgres dbi-test dbi) PARASITES NIL) */
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/dbi.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/dbi.nix
index e75961dd9ac..2de381f44b8 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/dbi.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/dbi.nix
@@ -1,15 +1,15 @@
args @ { fetchurl, ... }:
rec {
baseName = ''dbi'';
- version = ''cl-20180430-git'';
+ version = ''cl-20180831-git'';
description = ''Database independent interface for Common Lisp'';
deps = [ args."alexandria" args."bordeaux-threads" args."cl-annot" args."cl-syntax" args."cl-syntax-annot" args."closer-mop" args."named-readtables" args."split-sequence" args."trivial-types" ];
src = fetchurl {
- url = ''http://beta.quicklisp.org/archive/cl-dbi/2018-04-30/cl-dbi-20180430-git.tgz'';
- sha256 = ''0bjkba9z93h2sf9n40dvmw1p6nq2p3d5zw9w3zw9k1crn7a601sv'';
+ url = ''http://beta.quicklisp.org/archive/cl-dbi/2018-08-31/cl-dbi-20180831-git.tgz'';
+ sha256 = ''19cpzdzjjzm0if77dycsk8lj91ihwr51mbjmf3fx0wqwr8k5y0g9'';
};
packageName = "dbi";
@@ -18,9 +18,9 @@ rec {
overrides = x: x;
}
/* (SYSTEM dbi DESCRIPTION Database independent interface for Common Lisp
- SHA256 0bjkba9z93h2sf9n40dvmw1p6nq2p3d5zw9w3zw9k1crn7a601sv URL
- http://beta.quicklisp.org/archive/cl-dbi/2018-04-30/cl-dbi-20180430-git.tgz
- MD5 1bc845e8738c4987342cb0f56200ba50 NAME dbi FILENAME dbi DEPS
+ SHA256 19cpzdzjjzm0if77dycsk8lj91ihwr51mbjmf3fx0wqwr8k5y0g9 URL
+ http://beta.quicklisp.org/archive/cl-dbi/2018-08-31/cl-dbi-20180831-git.tgz
+ MD5 2fc95bff95d3cd25e3afeb003ee009d2 NAME dbi FILENAME dbi DEPS
((NAME alexandria FILENAME alexandria)
(NAME bordeaux-threads FILENAME bordeaux-threads)
(NAME cl-annot FILENAME cl-annot) (NAME cl-syntax FILENAME cl-syntax)
@@ -32,5 +32,5 @@ rec {
DEPENDENCIES
(alexandria bordeaux-threads cl-annot cl-syntax cl-syntax-annot closer-mop
named-readtables split-sequence trivial-types)
- VERSION cl-20180430-git SIBLINGS
+ VERSION cl-20180831-git SIBLINGS
(cl-dbi dbd-mysql dbd-postgres dbd-sqlite3 dbi-test) PARASITES NIL) */
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/dexador.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/dexador.nix
index d3111b18b22..2e392928f49 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/dexador.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/dexador.nix
@@ -1,15 +1,15 @@
args @ { fetchurl, ... }:
rec {
baseName = ''dexador'';
- version = ''20180328-git'';
+ version = ''20180831-git'';
description = ''Yet another HTTP client for Common Lisp'';
deps = [ args."alexandria" args."babel" args."bordeaux-threads" args."cffi" args."cffi-grovel" args."cffi-toolchain" args."chipz" args."chunga" args."cl_plus_ssl" args."cl-base64" args."cl-cookie" args."cl-fad" args."cl-ppcre" args."cl-reexport" args."cl-utilities" args."fast-http" args."fast-io" args."flexi-streams" args."local-time" args."proc-parse" args."quri" args."smart-buffer" args."split-sequence" args."static-vectors" args."trivial-features" args."trivial-garbage" args."trivial-gray-streams" args."trivial-mimes" args."usocket" args."xsubseq" ];
src = fetchurl {
- url = ''http://beta.quicklisp.org/archive/dexador/2018-03-28/dexador-20180328-git.tgz'';
- sha256 = ''13kqm1knm13rskgqyvabj284nxi68f8h3grq54snly0imw6s0ikb'';
+ url = ''http://beta.quicklisp.org/archive/dexador/2018-08-31/dexador-20180831-git.tgz'';
+ sha256 = ''1isc4srz2ijg92lpws79ik8vgn9l2pzx4w3aqgri7n3pzfvfn6bs'';
};
packageName = "dexador";
@@ -18,9 +18,9 @@ rec {
overrides = x: x;
}
/* (SYSTEM dexador DESCRIPTION Yet another HTTP client for Common Lisp SHA256
- 13kqm1knm13rskgqyvabj284nxi68f8h3grq54snly0imw6s0ikb URL
- http://beta.quicklisp.org/archive/dexador/2018-03-28/dexador-20180328-git.tgz
- MD5 27eaa0c3c15e6e12e5d6046d62e4394f NAME dexador FILENAME dexador DEPS
+ 1isc4srz2ijg92lpws79ik8vgn9l2pzx4w3aqgri7n3pzfvfn6bs URL
+ http://beta.quicklisp.org/archive/dexador/2018-08-31/dexador-20180831-git.tgz
+ MD5 f2859026d90e63e79e8e4728168fab13 NAME dexador FILENAME dexador DEPS
((NAME alexandria FILENAME alexandria) (NAME babel FILENAME babel)
(NAME bordeaux-threads FILENAME bordeaux-threads)
(NAME cffi FILENAME cffi) (NAME cffi-grovel FILENAME cffi-grovel)
@@ -48,4 +48,4 @@ rec {
fast-http fast-io flexi-streams local-time proc-parse quri smart-buffer
split-sequence static-vectors trivial-features trivial-garbage
trivial-gray-streams trivial-mimes usocket xsubseq)
- VERSION 20180328-git SIBLINGS (dexador-test) PARASITES NIL) */
+ VERSION 20180831-git SIBLINGS (dexador-test) PARASITES NIL) */
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/documentation-utils.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/documentation-utils.nix
index 7ee5f91a158..541f1c6a169 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/documentation-utils.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/documentation-utils.nix
@@ -1,15 +1,15 @@
args @ { fetchurl, ... }:
rec {
baseName = ''documentation-utils'';
- version = ''20180228-git'';
+ version = ''20180831-git'';
description = ''A few simple tools to help you with documenting your library.'';
deps = [ args."trivial-indent" ];
src = fetchurl {
- url = ''http://beta.quicklisp.org/archive/documentation-utils/2018-02-28/documentation-utils-20180228-git.tgz'';
- sha256 = ''0jwbsm5qk2pg6fpzf9ny3gp780k5lqjgb5p6gv45s9h7x247pb2w'';
+ url = ''http://beta.quicklisp.org/archive/documentation-utils/2018-08-31/documentation-utils-20180831-git.tgz'';
+ sha256 = ''0g26hgppynrfdkpaplb77xzrsmsdzmlnqgl8336l08zmg80x90n5'';
};
packageName = "documentation-utils";
@@ -19,9 +19,9 @@ rec {
}
/* (SYSTEM documentation-utils DESCRIPTION
A few simple tools to help you with documenting your library. SHA256
- 0jwbsm5qk2pg6fpzf9ny3gp780k5lqjgb5p6gv45s9h7x247pb2w URL
- http://beta.quicklisp.org/archive/documentation-utils/2018-02-28/documentation-utils-20180228-git.tgz
- MD5 b0c823120a376e0474433d151df52548 NAME documentation-utils FILENAME
+ 0g26hgppynrfdkpaplb77xzrsmsdzmlnqgl8336l08zmg80x90n5 URL
+ http://beta.quicklisp.org/archive/documentation-utils/2018-08-31/documentation-utils-20180831-git.tgz
+ MD5 e0f58ffe20602cada3413b4eeec909ef NAME documentation-utils FILENAME
documentation-utils DEPS ((NAME trivial-indent FILENAME trivial-indent))
- DEPENDENCIES (trivial-indent) VERSION 20180228-git SIBLINGS NIL PARASITES
- NIL) */
+ DEPENDENCIES (trivial-indent) VERSION 20180831-git SIBLINGS
+ (multilang-documentation-utils) PARASITES NIL) */
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/fast-http.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/fast-http.nix
index 99792023bdd..82c8603d4a4 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/fast-http.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/fast-http.nix
@@ -1,15 +1,15 @@
args @ { fetchurl, ... }:
rec {
baseName = ''fast-http'';
- version = ''20180131-git'';
+ version = ''20180831-git'';
description = ''A fast HTTP protocol parser in Common Lisp'';
deps = [ args."alexandria" args."babel" args."cl-utilities" args."flexi-streams" args."proc-parse" args."smart-buffer" args."trivial-features" args."trivial-gray-streams" args."xsubseq" ];
src = fetchurl {
- url = ''http://beta.quicklisp.org/archive/fast-http/2018-01-31/fast-http-20180131-git.tgz'';
- sha256 = ''057wg23a1pfdr3522nzjpclxdrmx3azbnw57nkvdjmfp6fyb3rpg'';
+ url = ''http://beta.quicklisp.org/archive/fast-http/2018-08-31/fast-http-20180831-git.tgz'';
+ sha256 = ''1827ra8nkjh5ghg2hn96w3zs8n1lvqzbf8wmzrcs8yky3l0m4qrm'';
};
packageName = "fast-http";
@@ -18,9 +18,9 @@ rec {
overrides = x: x;
}
/* (SYSTEM fast-http DESCRIPTION A fast HTTP protocol parser in Common Lisp
- SHA256 057wg23a1pfdr3522nzjpclxdrmx3azbnw57nkvdjmfp6fyb3rpg URL
- http://beta.quicklisp.org/archive/fast-http/2018-01-31/fast-http-20180131-git.tgz
- MD5 0722e935fb644d57d44e8604e41e689e NAME fast-http FILENAME fast-http DEPS
+ SHA256 1827ra8nkjh5ghg2hn96w3zs8n1lvqzbf8wmzrcs8yky3l0m4qrm URL
+ http://beta.quicklisp.org/archive/fast-http/2018-08-31/fast-http-20180831-git.tgz
+ MD5 d5e839f204b2dd78a390336572d1ee65 NAME fast-http FILENAME fast-http DEPS
((NAME alexandria FILENAME alexandria) (NAME babel FILENAME babel)
(NAME cl-utilities FILENAME cl-utilities)
(NAME flexi-streams FILENAME flexi-streams)
@@ -32,4 +32,4 @@ rec {
DEPENDENCIES
(alexandria babel cl-utilities flexi-streams proc-parse smart-buffer
trivial-features trivial-gray-streams xsubseq)
- VERSION 20180131-git SIBLINGS (fast-http-test) PARASITES NIL) */
+ VERSION 20180831-git SIBLINGS (fast-http-test) PARASITES NIL) */
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/flexi-streams.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/flexi-streams.nix
index 7b37e5709e8..08b6d35a1fb 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/flexi-streams.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/flexi-streams.nix
@@ -1,7 +1,7 @@
args @ { fetchurl, ... }:
rec {
baseName = ''flexi-streams'';
- version = ''20180328-git'';
+ version = ''20180711-git'';
parasites = [ "flexi-streams-test" ];
@@ -10,8 +10,8 @@ rec {
deps = [ args."trivial-gray-streams" ];
src = fetchurl {
- url = ''http://beta.quicklisp.org/archive/flexi-streams/2018-03-28/flexi-streams-20180328-git.tgz'';
- sha256 = ''0hdmzihii3wv6769dfkkw15avpgifizdd7lxdlgjk7h0h8v7yw11'';
+ url = ''http://beta.quicklisp.org/archive/flexi-streams/2018-07-11/flexi-streams-20180711-git.tgz'';
+ sha256 = ''1g7a5fbl84zx3139kvvgwq6d8bnbpbvq9mr5yj4jzfa6pjfjwgz2'';
};
packageName = "flexi-streams";
@@ -20,10 +20,10 @@ rec {
overrides = x: x;
}
/* (SYSTEM flexi-streams DESCRIPTION Flexible bivalent streams for Common Lisp
- SHA256 0hdmzihii3wv6769dfkkw15avpgifizdd7lxdlgjk7h0h8v7yw11 URL
- http://beta.quicklisp.org/archive/flexi-streams/2018-03-28/flexi-streams-20180328-git.tgz
- MD5 af40ae10a0aab65eccfe161a32e1033b NAME flexi-streams FILENAME
+ SHA256 1g7a5fbl84zx3139kvvgwq6d8bnbpbvq9mr5yj4jzfa6pjfjwgz2 URL
+ http://beta.quicklisp.org/archive/flexi-streams/2018-07-11/flexi-streams-20180711-git.tgz
+ MD5 1e5bc255540dcbd71f9cba56573cfb4c NAME flexi-streams FILENAME
flexi-streams DEPS
((NAME trivial-gray-streams FILENAME trivial-gray-streams)) DEPENDENCIES
- (trivial-gray-streams) VERSION 20180328-git SIBLINGS NIL PARASITES
+ (trivial-gray-streams) VERSION 20180711-git SIBLINGS NIL PARASITES
(flexi-streams-test)) */
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/form-fiddle.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/form-fiddle.nix
index 2aa5c074925..4a23cbf51ee 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/form-fiddle.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/form-fiddle.nix
@@ -1,15 +1,15 @@
args @ { fetchurl, ... }:
rec {
baseName = ''form-fiddle'';
- version = ''20180131-git'';
+ version = ''20180831-git'';
description = ''A collection of utilities to destructure lambda forms.'';
deps = [ args."documentation-utils" args."trivial-indent" ];
src = fetchurl {
- url = ''http://beta.quicklisp.org/archive/form-fiddle/2018-01-31/form-fiddle-20180131-git.tgz'';
- sha256 = ''1i7rzn4ilr46wpkd2i10q875bxy8b54v7rvqzcq752hilx15hiff'';
+ url = ''http://beta.quicklisp.org/archive/form-fiddle/2018-08-31/form-fiddle-20180831-git.tgz'';
+ sha256 = ''013n10rzqbfvdlz37pdmj4y7qv3fzv7q2hxv8aw7kcirg5gl7mkj'';
};
packageName = "form-fiddle";
@@ -19,11 +19,11 @@ rec {
}
/* (SYSTEM form-fiddle DESCRIPTION
A collection of utilities to destructure lambda forms. SHA256
- 1i7rzn4ilr46wpkd2i10q875bxy8b54v7rvqzcq752hilx15hiff URL
- http://beta.quicklisp.org/archive/form-fiddle/2018-01-31/form-fiddle-20180131-git.tgz
- MD5 a0cc2ea1af29889e4991f7fefac366dd NAME form-fiddle FILENAME form-fiddle
+ 013n10rzqbfvdlz37pdmj4y7qv3fzv7q2hxv8aw7kcirg5gl7mkj URL
+ http://beta.quicklisp.org/archive/form-fiddle/2018-08-31/form-fiddle-20180831-git.tgz
+ MD5 1e9ae81423ed3c5f2e07c26f93b45956 NAME form-fiddle FILENAME form-fiddle
DEPS
((NAME documentation-utils FILENAME documentation-utils)
(NAME trivial-indent FILENAME trivial-indent))
- DEPENDENCIES (documentation-utils trivial-indent) VERSION 20180131-git
+ DEPENDENCIES (documentation-utils trivial-indent) VERSION 20180831-git
SIBLINGS NIL PARASITES NIL) */
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/ironclad.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/ironclad.nix
index 8061f3844e0..3d259fc5b6c 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/ironclad.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/ironclad.nix
@@ -1,7 +1,7 @@
args @ { fetchurl, ... }:
rec {
baseName = ''ironclad'';
- version = ''v0.39'';
+ version = ''v0.42'';
parasites = [ "ironclad/tests" ];
@@ -10,8 +10,8 @@ rec {
deps = [ args."nibbles" args."rt" ];
src = fetchurl {
- url = ''http://beta.quicklisp.org/archive/ironclad/2018-04-30/ironclad-v0.39.tgz'';
- sha256 = ''0nqm6bnxiiv78c33zlr5n53wdkpcfxh1xrx7af6122n29ggzj3h8'';
+ url = ''http://beta.quicklisp.org/archive/ironclad/2018-08-31/ironclad-v0.42.tgz'';
+ sha256 = ''1rrw0mhvja407ycryw56wwm45cpf3dc73h965smy75ddha4xn7zr'';
};
packageName = "ironclad";
@@ -21,9 +21,9 @@ rec {
}
/* (SYSTEM ironclad DESCRIPTION
A cryptographic toolkit written in pure Common Lisp SHA256
- 0nqm6bnxiiv78c33zlr5n53wdkpcfxh1xrx7af6122n29ggzj3h8 URL
- http://beta.quicklisp.org/archive/ironclad/2018-04-30/ironclad-v0.39.tgz
- MD5 f4abb18cbbe173c569d8ed99800d9f9e NAME ironclad FILENAME ironclad DEPS
+ 1rrw0mhvja407ycryw56wwm45cpf3dc73h965smy75ddha4xn7zr URL
+ http://beta.quicklisp.org/archive/ironclad/2018-08-31/ironclad-v0.42.tgz
+ MD5 18f2dbc9dbff97de9ea44af5344485b5 NAME ironclad FILENAME ironclad DEPS
((NAME nibbles FILENAME nibbles) (NAME rt FILENAME rt)) DEPENDENCIES
- (nibbles rt) VERSION v0.39 SIBLINGS (ironclad-text) PARASITES
+ (nibbles rt) VERSION v0.42 SIBLINGS (ironclad-text) PARASITES
(ironclad/tests)) */
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/iterate.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/iterate.nix
index f85b128652d..f276ec72736 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/iterate.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/iterate.nix
@@ -1,4 +1,4 @@
-{ fetchurl, ... }:
+args @ { fetchurl, ... }:
rec {
baseName = ''iterate'';
version = ''20180228-git'';
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/kmrcl.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/kmrcl.nix
index 62a3ae2bb7d..e5cbad3e9e8 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/kmrcl.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/kmrcl.nix
@@ -1,4 +1,4 @@
-{ fetchurl, ... }:
+args @ { fetchurl, ... }:
rec {
baseName = ''kmrcl'';
version = ''20150923-git'';
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/lack-component.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/lack-component.nix
index 79f2d38ef10..94edb06e6ae 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/lack-component.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/lack-component.nix
@@ -1,15 +1,15 @@
-{ fetchurl, ... }:
+args @ { fetchurl, ... }:
rec {
baseName = ''lack-component'';
- version = ''lack-20180430-git'';
+ version = ''lack-20180831-git'';
description = '''';
deps = [ ];
src = fetchurl {
- url = ''http://beta.quicklisp.org/archive/lack/2018-04-30/lack-20180430-git.tgz'';
- sha256 = ''07f0nn1y8ghzg6s9rnmazaq3n7hr91mczdci5l3v4ncs79272h5v'';
+ url = ''http://beta.quicklisp.org/archive/lack/2018-08-31/lack-20180831-git.tgz'';
+ sha256 = ''0x4b3v5qvrik5c8nn4kpxygv78srqb306jcypkhpyc65ig81gr9n'';
};
packageName = "lack-component";
@@ -18,10 +18,10 @@ rec {
overrides = x: x;
}
/* (SYSTEM lack-component DESCRIPTION NIL SHA256
- 07f0nn1y8ghzg6s9rnmazaq3n7hr91mczdci5l3v4ncs79272h5v URL
- http://beta.quicklisp.org/archive/lack/2018-04-30/lack-20180430-git.tgz MD5
- b9a0c08d54538679a8dd141022e8abb1 NAME lack-component FILENAME
- lack-component DEPS NIL DEPENDENCIES NIL VERSION lack-20180430-git SIBLINGS
+ 0x4b3v5qvrik5c8nn4kpxygv78srqb306jcypkhpyc65ig81gr9n URL
+ http://beta.quicklisp.org/archive/lack/2018-08-31/lack-20180831-git.tgz MD5
+ fd57a7185997a1a5f37bbd9d6899118d NAME lack-component FILENAME
+ lack-component DEPS NIL DEPENDENCIES NIL VERSION lack-20180831-git SIBLINGS
(lack-middleware-accesslog lack-middleware-auth-basic
lack-middleware-backtrace lack-middleware-csrf lack-middleware-mount
lack-middleware-session lack-middleware-static lack-request lack-response
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/lack-middleware-backtrace.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/lack-middleware-backtrace.nix
index c0acbc2f01f..a98028e0c06 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/lack-middleware-backtrace.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/lack-middleware-backtrace.nix
@@ -1,15 +1,15 @@
args @ { fetchurl, ... }:
rec {
baseName = ''lack-middleware-backtrace'';
- version = ''lack-20180430-git'';
+ version = ''lack-20180831-git'';
description = '''';
deps = [ args."uiop" ];
src = fetchurl {
- url = ''http://beta.quicklisp.org/archive/lack/2018-04-30/lack-20180430-git.tgz'';
- sha256 = ''07f0nn1y8ghzg6s9rnmazaq3n7hr91mczdci5l3v4ncs79272h5v'';
+ url = ''http://beta.quicklisp.org/archive/lack/2018-08-31/lack-20180831-git.tgz'';
+ sha256 = ''0x4b3v5qvrik5c8nn4kpxygv78srqb306jcypkhpyc65ig81gr9n'';
};
packageName = "lack-middleware-backtrace";
@@ -18,11 +18,11 @@ rec {
overrides = x: x;
}
/* (SYSTEM lack-middleware-backtrace DESCRIPTION NIL SHA256
- 07f0nn1y8ghzg6s9rnmazaq3n7hr91mczdci5l3v4ncs79272h5v URL
- http://beta.quicklisp.org/archive/lack/2018-04-30/lack-20180430-git.tgz MD5
- b9a0c08d54538679a8dd141022e8abb1 NAME lack-middleware-backtrace FILENAME
+ 0x4b3v5qvrik5c8nn4kpxygv78srqb306jcypkhpyc65ig81gr9n URL
+ http://beta.quicklisp.org/archive/lack/2018-08-31/lack-20180831-git.tgz MD5
+ fd57a7185997a1a5f37bbd9d6899118d NAME lack-middleware-backtrace FILENAME
lack-middleware-backtrace DEPS ((NAME uiop FILENAME uiop)) DEPENDENCIES
- (uiop) VERSION lack-20180430-git SIBLINGS
+ (uiop) VERSION lack-20180831-git SIBLINGS
(lack-component lack-middleware-accesslog lack-middleware-auth-basic
lack-middleware-csrf lack-middleware-mount lack-middleware-session
lack-middleware-static lack-request lack-response lack-session-store-dbi
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/lack-util.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/lack-util.nix
index 29fcd359f6b..3478ac8488b 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/lack-util.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/lack-util.nix
@@ -1,15 +1,15 @@
args @ { fetchurl, ... }:
rec {
baseName = ''lack-util'';
- version = ''lack-20180430-git'';
+ version = ''lack-20180831-git'';
description = '''';
deps = [ args."ironclad" args."nibbles" ];
src = fetchurl {
- url = ''http://beta.quicklisp.org/archive/lack/2018-04-30/lack-20180430-git.tgz'';
- sha256 = ''07f0nn1y8ghzg6s9rnmazaq3n7hr91mczdci5l3v4ncs79272h5v'';
+ url = ''http://beta.quicklisp.org/archive/lack/2018-08-31/lack-20180831-git.tgz'';
+ sha256 = ''0x4b3v5qvrik5c8nn4kpxygv78srqb306jcypkhpyc65ig81gr9n'';
};
packageName = "lack-util";
@@ -18,11 +18,11 @@ rec {
overrides = x: x;
}
/* (SYSTEM lack-util DESCRIPTION NIL SHA256
- 07f0nn1y8ghzg6s9rnmazaq3n7hr91mczdci5l3v4ncs79272h5v URL
- http://beta.quicklisp.org/archive/lack/2018-04-30/lack-20180430-git.tgz MD5
- b9a0c08d54538679a8dd141022e8abb1 NAME lack-util FILENAME lack-util DEPS
+ 0x4b3v5qvrik5c8nn4kpxygv78srqb306jcypkhpyc65ig81gr9n URL
+ http://beta.quicklisp.org/archive/lack/2018-08-31/lack-20180831-git.tgz MD5
+ fd57a7185997a1a5f37bbd9d6899118d NAME lack-util FILENAME lack-util DEPS
((NAME ironclad FILENAME ironclad) (NAME nibbles FILENAME nibbles))
- DEPENDENCIES (ironclad nibbles) VERSION lack-20180430-git SIBLINGS
+ DEPENDENCIES (ironclad nibbles) VERSION lack-20180831-git SIBLINGS
(lack-component lack-middleware-accesslog lack-middleware-auth-basic
lack-middleware-backtrace lack-middleware-csrf lack-middleware-mount
lack-middleware-session lack-middleware-static lack-request lack-response
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/lack.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/lack.nix
index 9260b06dd83..fdcda10a275 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/lack.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/lack.nix
@@ -1,15 +1,15 @@
args @ { fetchurl, ... }:
rec {
baseName = ''lack'';
- version = ''20180430-git'';
+ version = ''20180831-git'';
description = ''A minimal Clack'';
deps = [ args."ironclad" args."lack-component" args."lack-util" args."nibbles" ];
src = fetchurl {
- url = ''http://beta.quicklisp.org/archive/lack/2018-04-30/lack-20180430-git.tgz'';
- sha256 = ''07f0nn1y8ghzg6s9rnmazaq3n7hr91mczdci5l3v4ncs79272h5v'';
+ url = ''http://beta.quicklisp.org/archive/lack/2018-08-31/lack-20180831-git.tgz'';
+ sha256 = ''0x4b3v5qvrik5c8nn4kpxygv78srqb306jcypkhpyc65ig81gr9n'';
};
packageName = "lack";
@@ -18,14 +18,14 @@ rec {
overrides = x: x;
}
/* (SYSTEM lack DESCRIPTION A minimal Clack SHA256
- 07f0nn1y8ghzg6s9rnmazaq3n7hr91mczdci5l3v4ncs79272h5v URL
- http://beta.quicklisp.org/archive/lack/2018-04-30/lack-20180430-git.tgz MD5
- b9a0c08d54538679a8dd141022e8abb1 NAME lack FILENAME lack DEPS
+ 0x4b3v5qvrik5c8nn4kpxygv78srqb306jcypkhpyc65ig81gr9n URL
+ http://beta.quicklisp.org/archive/lack/2018-08-31/lack-20180831-git.tgz MD5
+ fd57a7185997a1a5f37bbd9d6899118d NAME lack FILENAME lack DEPS
((NAME ironclad FILENAME ironclad)
(NAME lack-component FILENAME lack-component)
(NAME lack-util FILENAME lack-util) (NAME nibbles FILENAME nibbles))
DEPENDENCIES (ironclad lack-component lack-util nibbles) VERSION
- 20180430-git SIBLINGS
+ 20180831-git SIBLINGS
(lack-component lack-middleware-accesslog lack-middleware-auth-basic
lack-middleware-backtrace lack-middleware-csrf lack-middleware-mount
lack-middleware-session lack-middleware-static lack-request lack-response
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/lift.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/lift.nix
index b44c0c8a987..a3ddc2fd953 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/lift.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/lift.nix
@@ -1,4 +1,4 @@
-{ fetchurl, ... }:
+args @ { fetchurl, ... }:
rec {
baseName = ''lift'';
version = ''20151031-git'';
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/lisp-unit2.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/lisp-unit2.nix
index 62197234305..8d21f88cbf8 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/lisp-unit2.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/lisp-unit2.nix
@@ -7,7 +7,7 @@ rec {
description = ''Common Lisp library that supports unit testing.'';
- deps = [ args."alexandria" args."cl-interpol" args."cl-ppcre" args."cl-unicode" args."flexi-streams" args."iterate" args."symbol-munger" ];
+ deps = [ args."alexandria" args."cl-interpol" args."cl-ppcre" args."cl-unicode" args."flexi-streams" args."iterate" args."named-readtables" args."symbol-munger" ];
src = fetchurl {
url = ''http://beta.quicklisp.org/archive/lisp-unit2/2018-01-31/lisp-unit2-20180131-git.tgz'';
@@ -30,8 +30,9 @@ rec {
(NAME cl-unicode FILENAME cl-unicode)
(NAME flexi-streams FILENAME flexi-streams)
(NAME iterate FILENAME iterate)
+ (NAME named-readtables FILENAME named-readtables)
(NAME symbol-munger FILENAME symbol-munger))
DEPENDENCIES
(alexandria cl-interpol cl-ppcre cl-unicode flexi-streams iterate
- symbol-munger)
+ named-readtables symbol-munger)
VERSION 20180131-git SIBLINGS NIL PARASITES (lisp-unit2-test)) */
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/lquery.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/lquery.nix
index 1ca094d139d..ad335774cbb 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/lquery.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/lquery.nix
@@ -1,15 +1,15 @@
args @ { fetchurl, ... }:
rec {
baseName = ''lquery'';
- version = ''20180131-git'';
+ version = ''20180831-git'';
description = ''A library to allow jQuery-like HTML/DOM manipulation.'';
deps = [ args."array-utils" args."clss" args."documentation-utils" args."form-fiddle" args."plump" args."trivial-indent" ];
src = fetchurl {
- url = ''http://beta.quicklisp.org/archive/lquery/2018-01-31/lquery-20180131-git.tgz'';
- sha256 = ''1v5mmdx7a1ngydkcs3c5anmqrl0jxc52b8jisc2f0b5k0j1kgmm9'';
+ url = ''http://beta.quicklisp.org/archive/lquery/2018-08-31/lquery-20180831-git.tgz'';
+ sha256 = ''1nb2hvcw043qlqxch7lky67k0r9gxjwaggkm8hfznlijbkgbfy2v'';
};
packageName = "lquery";
@@ -19,13 +19,13 @@ rec {
}
/* (SYSTEM lquery DESCRIPTION
A library to allow jQuery-like HTML/DOM manipulation. SHA256
- 1v5mmdx7a1ngydkcs3c5anmqrl0jxc52b8jisc2f0b5k0j1kgmm9 URL
- http://beta.quicklisp.org/archive/lquery/2018-01-31/lquery-20180131-git.tgz
- MD5 07e92aad32c4d12c4699956b57dbc9b8 NAME lquery FILENAME lquery DEPS
+ 1nb2hvcw043qlqxch7lky67k0r9gxjwaggkm8hfznlijbkgbfy2v URL
+ http://beta.quicklisp.org/archive/lquery/2018-08-31/lquery-20180831-git.tgz
+ MD5 d0d3efa47f151afeb754c4bc0c059acf NAME lquery FILENAME lquery DEPS
((NAME array-utils FILENAME array-utils) (NAME clss FILENAME clss)
(NAME documentation-utils FILENAME documentation-utils)
(NAME form-fiddle FILENAME form-fiddle) (NAME plump FILENAME plump)
(NAME trivial-indent FILENAME trivial-indent))
DEPENDENCIES
(array-utils clss documentation-utils form-fiddle plump trivial-indent)
- VERSION 20180131-git SIBLINGS (lquery-test) PARASITES NIL) */
+ VERSION 20180831-git SIBLINGS (lquery-test) PARASITES NIL) */
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/map-set.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/map-set.nix
index 006361ed80c..db25e6ae534 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/map-set.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/map-set.nix
@@ -1,4 +1,4 @@
-{ fetchurl, ... }:
+args @ { fetchurl, ... }:
rec {
baseName = ''map-set'';
version = ''20160628-hg'';
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/marshal.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/marshal.nix
index c34d79f3d13..4f6842606b4 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/marshal.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/marshal.nix
@@ -1,4 +1,4 @@
-{ fetchurl, ... }:
+args @ { fetchurl, ... }:
rec {
baseName = ''marshal'';
version = ''cl-20180328-git'';
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/md5.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/md5.nix
index c65d95d9ef7..953dd0a58a4 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/md5.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/md5.nix
@@ -1,4 +1,4 @@
-{ fetchurl, ... }:
+args @ { fetchurl, ... }:
rec {
baseName = ''md5'';
version = ''20180228-git'';
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/metabang-bind.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/metabang-bind.nix
index 5647b9a9270..d72e0839d1e 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/metabang-bind.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/metabang-bind.nix
@@ -1,4 +1,4 @@
-{ fetchurl, ... }:
+args @ { fetchurl, ... }:
rec {
baseName = ''metabang-bind'';
version = ''20171130-git'';
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/misc-extensions.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/misc-extensions.nix
index 3c289fefa9a..6334804c4f7 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/misc-extensions.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/misc-extensions.nix
@@ -1,4 +1,4 @@
-{ fetchurl, ... }:
+args @ { fetchurl, ... }:
rec {
baseName = ''misc-extensions'';
version = ''20150608-git'';
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/mt19937.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/mt19937.nix
index 29460307e69..a8cfc070bf9 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/mt19937.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/mt19937.nix
@@ -1,4 +1,4 @@
-{ fetchurl, ... }:
+args @ { fetchurl, ... }:
rec {
baseName = ''mt19937'';
version = ''1.1.1'';
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/named-readtables.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/named-readtables.nix
index e1d6a1477a7..82d06b1c93b 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/named-readtables.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/named-readtables.nix
@@ -1,4 +1,4 @@
-{ fetchurl, ... }:
+args @ { fetchurl, ... }:
rec {
baseName = ''named-readtables'';
version = ''20180131-git'';
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/net_dot_didierverna_dot_asdf-flv.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/net_dot_didierverna_dot_asdf-flv.nix
index 67636d3f6cf..4e7c84566a0 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/net_dot_didierverna_dot_asdf-flv.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/net_dot_didierverna_dot_asdf-flv.nix
@@ -1,4 +1,4 @@
-{ fetchurl, ... }:
+args @ { fetchurl, ... }:
rec {
baseName = ''net_dot_didierverna_dot_asdf-flv'';
version = ''asdf-flv-version-2.1'';
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/nibbles.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/nibbles.nix
index d706bc5bad1..ea6adac9e9f 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/nibbles.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/nibbles.nix
@@ -1,7 +1,7 @@
args @ { fetchurl, ... }:
rec {
baseName = ''nibbles'';
- version = ''20180430-git'';
+ version = ''20180831-git'';
parasites = [ "nibbles/tests" ];
@@ -10,8 +10,8 @@ rec {
deps = [ args."rt" ];
src = fetchurl {
- url = ''http://beta.quicklisp.org/archive/nibbles/2018-04-30/nibbles-20180430-git.tgz'';
- sha256 = ''1z79x7w0qp66vdxq7lac1jkc56brmpy0x0wmm9flf91d8y9lh34g'';
+ url = ''http://beta.quicklisp.org/archive/nibbles/2018-08-31/nibbles-20180831-git.tgz'';
+ sha256 = ''0z25f2z54pnz1s35prqvnl42bv0xqh50y94bds1jwfv0wvfq27la'';
};
packageName = "nibbles";
@@ -21,8 +21,8 @@ rec {
}
/* (SYSTEM nibbles DESCRIPTION
A library for accessing octet-addressed blocks of data in big- and little-endian orders
- SHA256 1z79x7w0qp66vdxq7lac1jkc56brmpy0x0wmm9flf91d8y9lh34g URL
- http://beta.quicklisp.org/archive/nibbles/2018-04-30/nibbles-20180430-git.tgz
- MD5 8d8d1cc72ce11253d01854219ea20a06 NAME nibbles FILENAME nibbles DEPS
- ((NAME rt FILENAME rt)) DEPENDENCIES (rt) VERSION 20180430-git SIBLINGS NIL
+ SHA256 0z25f2z54pnz1s35prqvnl42bv0xqh50y94bds1jwfv0wvfq27la URL
+ http://beta.quicklisp.org/archive/nibbles/2018-08-31/nibbles-20180831-git.tgz
+ MD5 4badf1f066a59c3c270d40be1116ecd5 NAME nibbles FILENAME nibbles DEPS
+ ((NAME rt FILENAME rt)) DEPENDENCIES (rt) VERSION 20180831-git SIBLINGS NIL
PARASITES (nibbles/tests)) */
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/parse-number.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/parse-number.nix
index 5c1f90220eb..e636df0805e 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/parse-number.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/parse-number.nix
@@ -1,4 +1,4 @@
-{ fetchurl, ... }:
+args @ { fetchurl, ... }:
rec {
baseName = ''parse-number'';
version = ''v1.7'';
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/plump.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/plump.nix
index 2bde901ad43..0a1591d7c42 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/plump.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/plump.nix
@@ -1,15 +1,15 @@
args @ { fetchurl, ... }:
rec {
baseName = ''plump'';
- version = ''20180228-git'';
+ version = ''20180831-git'';
description = ''An XML / XHTML / HTML parser that aims to be as lenient as possible.'';
deps = [ args."array-utils" args."documentation-utils" args."trivial-indent" ];
src = fetchurl {
- url = ''http://beta.quicklisp.org/archive/plump/2018-02-28/plump-20180228-git.tgz'';
- sha256 = ''0q8carmnrh1qdhdag9w5iikdlga8g7jn824bjypzx0iwyqn1ap01'';
+ url = ''http://beta.quicklisp.org/archive/plump/2018-08-31/plump-20180831-git.tgz'';
+ sha256 = ''0pa4z9yjm68lpw1hdidicrwj7dfvf2jk110rnqq6p8ahxc117zbf'';
};
packageName = "plump";
@@ -19,11 +19,11 @@ rec {
}
/* (SYSTEM plump DESCRIPTION
An XML / XHTML / HTML parser that aims to be as lenient as possible. SHA256
- 0q8carmnrh1qdhdag9w5iikdlga8g7jn824bjypzx0iwyqn1ap01 URL
- http://beta.quicklisp.org/archive/plump/2018-02-28/plump-20180228-git.tgz
- MD5 f210bc3fae00bac3140d939cbb2fd1de NAME plump FILENAME plump DEPS
+ 0pa4z9yjm68lpw1hdidicrwj7dfvf2jk110rnqq6p8ahxc117zbf URL
+ http://beta.quicklisp.org/archive/plump/2018-08-31/plump-20180831-git.tgz
+ MD5 5a899a19906fd22fb0cb1c65eb584891 NAME plump FILENAME plump DEPS
((NAME array-utils FILENAME array-utils)
(NAME documentation-utils FILENAME documentation-utils)
(NAME trivial-indent FILENAME trivial-indent))
DEPENDENCIES (array-utils documentation-utils trivial-indent) VERSION
- 20180228-git SIBLINGS (plump-dom plump-lexer plump-parser) PARASITES NIL) */
+ 20180831-git SIBLINGS (plump-dom plump-lexer plump-parser) PARASITES NIL) */
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/ptester.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/ptester.nix
index c90b252313b..ffa2e595c26 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/ptester.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/ptester.nix
@@ -1,4 +1,4 @@
-{ fetchurl, ... }:
+args @ { fetchurl, ... }:
rec {
baseName = ''ptester'';
version = ''20160929-git'';
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/rfc2388.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/rfc2388.nix
index 41ead034791..25d535176a6 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/rfc2388.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/rfc2388.nix
@@ -1,15 +1,15 @@
-{ fetchurl, ... }:
+args @ { fetchurl, ... }:
rec {
baseName = ''rfc2388'';
- version = ''20130720-git'';
+ version = ''20180831-git'';
description = ''Implementation of RFC 2388'';
deps = [ ];
src = fetchurl {
- url = ''http://beta.quicklisp.org/archive/rfc2388/2013-07-20/rfc2388-20130720-git.tgz'';
- sha256 = ''1ky99cr4bgfyh0pfpl5f6fsmq1qdbgi4b8v0cfs4y73f78p1f8b6'';
+ url = ''http://beta.quicklisp.org/archive/rfc2388/2018-08-31/rfc2388-20180831-git.tgz'';
+ sha256 = ''1r7vvrlq2wl213bm2aknkf34ynpl8y4nbkfir79srrdsl1337z33'';
};
packageName = "rfc2388";
@@ -18,7 +18,7 @@ rec {
overrides = x: x;
}
/* (SYSTEM rfc2388 DESCRIPTION Implementation of RFC 2388 SHA256
- 1ky99cr4bgfyh0pfpl5f6fsmq1qdbgi4b8v0cfs4y73f78p1f8b6 URL
- http://beta.quicklisp.org/archive/rfc2388/2013-07-20/rfc2388-20130720-git.tgz
- MD5 10a8bfea588196b1147d5dc7bf759bb1 NAME rfc2388 FILENAME rfc2388 DEPS NIL
- DEPENDENCIES NIL VERSION 20130720-git SIBLINGS NIL PARASITES NIL) */
+ 1r7vvrlq2wl213bm2aknkf34ynpl8y4nbkfir79srrdsl1337z33 URL
+ http://beta.quicklisp.org/archive/rfc2388/2018-08-31/rfc2388-20180831-git.tgz
+ MD5 f57e3c588e5e08210516260e67d69226 NAME rfc2388 FILENAME rfc2388 DEPS NIL
+ DEPENDENCIES NIL VERSION 20180831-git SIBLINGS NIL PARASITES NIL) */
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/rt.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/rt.nix
index 8ed7c1a4499..d5be4be7daf 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/rt.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/rt.nix
@@ -1,4 +1,4 @@
-{ fetchurl, ... }:
+args @ { fetchurl, ... }:
rec {
baseName = ''rt'';
version = ''20101006-git'';
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/salza2.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/salza2.nix
index d55f7700092..9056cfbdcca 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/salza2.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/salza2.nix
@@ -1,4 +1,4 @@
-{ fetchurl, ... }:
+args @ { fetchurl, ... }:
rec {
baseName = ''salza2'';
version = ''2.0.9'';
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/simple-date.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/simple-date.nix
index 07b1498f2e3..b1e89b3eef8 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/simple-date.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/simple-date.nix
@@ -1,17 +1,17 @@
args @ { fetchurl, ... }:
rec {
baseName = ''simple-date'';
- version = ''postmodern-20180430-git'';
+ version = ''postmodern-20180831-git'';
- parasites = [ "simple-date/postgres-glue" "simple-date/tests" ];
+ parasites = [ "simple-date/postgres-glue" ];
description = '''';
- deps = [ args."cl-postgres" args."fiveam" args."md5" args."usocket" ];
+ deps = [ args."cl-postgres" args."md5" args."usocket" ];
src = fetchurl {
- url = ''http://beta.quicklisp.org/archive/postmodern/2018-04-30/postmodern-20180430-git.tgz'';
- sha256 = ''0b6w8f5ihbk036v1fclyskns615xhnib9q3cjn0ql6r6sk3nca7f'';
+ url = ''http://beta.quicklisp.org/archive/postmodern/2018-08-31/postmodern-20180831-git.tgz'';
+ sha256 = ''062xhy6aadzgmwpz8h0n7884yv5m4nwqmxrc75m3c60k1lmccpwx'';
};
packageName = "simple-date";
@@ -20,12 +20,12 @@ rec {
overrides = x: x;
}
/* (SYSTEM simple-date DESCRIPTION NIL SHA256
- 0b6w8f5ihbk036v1fclyskns615xhnib9q3cjn0ql6r6sk3nca7f URL
- http://beta.quicklisp.org/archive/postmodern/2018-04-30/postmodern-20180430-git.tgz
- MD5 9ca2a4ccf4ea7dbcd14d69cb355a8214 NAME simple-date FILENAME simple-date
+ 062xhy6aadzgmwpz8h0n7884yv5m4nwqmxrc75m3c60k1lmccpwx URL
+ http://beta.quicklisp.org/archive/postmodern/2018-08-31/postmodern-20180831-git.tgz
+ MD5 78c3e998cff7305db5e4b4e90b9bbee6 NAME simple-date FILENAME simple-date
DEPS
- ((NAME cl-postgres FILENAME cl-postgres) (NAME fiveam FILENAME fiveam)
- (NAME md5 FILENAME md5) (NAME usocket FILENAME usocket))
- DEPENDENCIES (cl-postgres fiveam md5 usocket) VERSION
- postmodern-20180430-git SIBLINGS (cl-postgres postmodern s-sql) PARASITES
- (simple-date/postgres-glue simple-date/tests)) */
+ ((NAME cl-postgres FILENAME cl-postgres) (NAME md5 FILENAME md5)
+ (NAME usocket FILENAME usocket))
+ DEPENDENCIES (cl-postgres md5 usocket) VERSION postmodern-20180831-git
+ SIBLINGS (cl-postgres postmodern s-sql) PARASITES
+ (simple-date/postgres-glue)) */
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/string-case.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/string-case.nix
index 9cc6338c8b8..17a56c09b7e 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/string-case.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/string-case.nix
@@ -1,15 +1,15 @@
-{ fetchurl, ... }:
+args @ { fetchurl, ... }:
rec {
baseName = ''string-case'';
- version = ''20151218-git'';
+ version = ''20180711-git'';
description = ''string-case is a macro that generates specialised decision trees to dispatch on string equality'';
deps = [ ];
src = fetchurl {
- url = ''http://beta.quicklisp.org/archive/string-case/2015-12-18/string-case-20151218-git.tgz'';
- sha256 = ''0l7bcysm1hwxaxxbld9fs0hj30739wf2ys3n6fhfdy9m5rz1cfbw'';
+ url = ''http://beta.quicklisp.org/archive/string-case/2018-07-11/string-case-20180711-git.tgz'';
+ sha256 = ''1n36ign4bv0idw14zyayn6i0n3iaff9yw92kpjh3qmdcq3asv90z'';
};
packageName = "string-case";
@@ -19,7 +19,7 @@ rec {
}
/* (SYSTEM string-case DESCRIPTION
string-case is a macro that generates specialised decision trees to dispatch on string equality
- SHA256 0l7bcysm1hwxaxxbld9fs0hj30739wf2ys3n6fhfdy9m5rz1cfbw URL
- http://beta.quicklisp.org/archive/string-case/2015-12-18/string-case-20151218-git.tgz
- MD5 fb747ba1276f0173f875876425b1acc3 NAME string-case FILENAME string-case
- DEPS NIL DEPENDENCIES NIL VERSION 20151218-git SIBLINGS NIL PARASITES NIL) */
+ SHA256 1n36ign4bv0idw14zyayn6i0n3iaff9yw92kpjh3qmdcq3asv90z URL
+ http://beta.quicklisp.org/archive/string-case/2018-07-11/string-case-20180711-git.tgz
+ MD5 145c4e13f1e90a070b0a95ca979a9680 NAME string-case FILENAME string-case
+ DEPS NIL DEPENDENCIES NIL VERSION 20180711-git SIBLINGS NIL PARASITES NIL) */
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/stumpwm.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/stumpwm.nix
index 883e648a2f6..bb39c74c962 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/stumpwm.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/stumpwm.nix
@@ -1,15 +1,15 @@
args @ { fetchurl, ... }:
rec {
baseName = ''stumpwm'';
- version = ''20180430-git'';
+ version = ''20180831-git'';
description = ''A tiling, keyboard driven window manager'';
deps = [ args."alexandria" args."cl-ppcre" args."clx" ];
src = fetchurl {
- url = ''http://beta.quicklisp.org/archive/stumpwm/2018-04-30/stumpwm-20180430-git.tgz'';
- sha256 = ''0ayw562iya02j8rzdnzpxn5yxwaapr2jqnm83m16h4595gv1jr6m'';
+ url = ''http://beta.quicklisp.org/archive/stumpwm/2018-08-31/stumpwm-20180831-git.tgz'';
+ sha256 = ''1zis6aqdr18vd78wl9jpv2fmbzn37zvhb6gj44dpfydl67hjc89w'';
};
packageName = "stumpwm";
@@ -18,10 +18,10 @@ rec {
overrides = x: x;
}
/* (SYSTEM stumpwm DESCRIPTION A tiling, keyboard driven window manager SHA256
- 0ayw562iya02j8rzdnzpxn5yxwaapr2jqnm83m16h4595gv1jr6m URL
- http://beta.quicklisp.org/archive/stumpwm/2018-04-30/stumpwm-20180430-git.tgz
- MD5 40e1be3872e6a87a6f9e03f8ede5e48e NAME stumpwm FILENAME stumpwm DEPS
+ 1zis6aqdr18vd78wl9jpv2fmbzn37zvhb6gj44dpfydl67hjc89w URL
+ http://beta.quicklisp.org/archive/stumpwm/2018-08-31/stumpwm-20180831-git.tgz
+ MD5 a523654c5f7ffdfe6c6c4f37e9499851 NAME stumpwm FILENAME stumpwm DEPS
((NAME alexandria FILENAME alexandria) (NAME cl-ppcre FILENAME cl-ppcre)
(NAME clx FILENAME clx))
- DEPENDENCIES (alexandria cl-ppcre clx) VERSION 20180430-git SIBLINGS NIL
- PARASITES NIL) */
+ DEPENDENCIES (alexandria cl-ppcre clx) VERSION 20180831-git SIBLINGS
+ (stumpwm-tests) PARASITES NIL) */
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/swank.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/swank.nix
index 6819e4b2571..9734118526c 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/swank.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/swank.nix
@@ -1,15 +1,15 @@
-{ fetchurl, ... }:
+args @ { fetchurl, ... }:
rec {
baseName = ''swank'';
- version = ''slime-v2.20'';
+ version = ''slime-v2.22'';
description = '''';
deps = [ ];
src = fetchurl {
- url = ''http://beta.quicklisp.org/archive/slime/2017-08-30/slime-v2.20.tgz'';
- sha256 = ''0rl2ymqxcfkbvwkd8zfhyaaz8v2a927gmv9c43ganxnq6y473c26'';
+ url = ''http://beta.quicklisp.org/archive/slime/2018-08-31/slime-v2.22.tgz'';
+ sha256 = ''0ql0bjijypghi884085idq542yms2gk4rq1035j3vznkqrlnaqbk'';
};
packageName = "swank";
@@ -18,7 +18,7 @@ rec {
overrides = x: x;
}
/* (SYSTEM swank DESCRIPTION NIL SHA256
- 0rl2ymqxcfkbvwkd8zfhyaaz8v2a927gmv9c43ganxnq6y473c26 URL
- http://beta.quicklisp.org/archive/slime/2017-08-30/slime-v2.20.tgz MD5
- 115188047b753ce1864586e114ecb46c NAME swank FILENAME swank DEPS NIL
- DEPENDENCIES NIL VERSION slime-v2.20 SIBLINGS NIL PARASITES NIL) */
+ 0ql0bjijypghi884085idq542yms2gk4rq1035j3vznkqrlnaqbk URL
+ http://beta.quicklisp.org/archive/slime/2018-08-31/slime-v2.22.tgz MD5
+ edf090905d4f3a54ef62f8c13972bba5 NAME swank FILENAME swank DEPS NIL
+ DEPENDENCIES NIL VERSION slime-v2.22 SIBLINGS NIL PARASITES NIL) */
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivial-backtrace.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivial-backtrace.nix
index a772694b983..9a4afce3280 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivial-backtrace.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivial-backtrace.nix
@@ -1,4 +1,4 @@
-{ fetchurl, ... }:
+args @ { fetchurl, ... }:
rec {
baseName = ''trivial-backtrace'';
version = ''20160531-git'';
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivial-features.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivial-features.nix
index 5efc5766955..1a562c2288b 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivial-features.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivial-features.nix
@@ -1,4 +1,4 @@
-{ fetchurl, ... }:
+args @ { fetchurl, ... }:
rec {
baseName = ''trivial-features'';
version = ''20161204-git'';
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivial-gray-streams.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivial-gray-streams.nix
index 9a285fea2f1..edb01bd2fc5 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivial-gray-streams.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivial-gray-streams.nix
@@ -1,15 +1,15 @@
-{ fetchurl, ... }:
+args @ { fetchurl, ... }:
rec {
baseName = ''trivial-gray-streams'';
- version = ''20180328-git'';
+ version = ''20180831-git'';
description = ''Compatibility layer for Gray Streams (see http://www.cliki.net/Gray%20streams).'';
deps = [ ];
src = fetchurl {
- url = ''http://beta.quicklisp.org/archive/trivial-gray-streams/2018-03-28/trivial-gray-streams-20180328-git.tgz'';
- sha256 = ''01z5mp71005vgpvazhs3gqgqr2ym8mm4n5pw2y7bfjiygcl8b06f'';
+ url = ''http://beta.quicklisp.org/archive/trivial-gray-streams/2018-08-31/trivial-gray-streams-20180831-git.tgz'';
+ sha256 = ''0mh9w8inqxb6lpq787grnf72qlcrjd0a7qs6psjyfs6iazs14170'';
};
packageName = "trivial-gray-streams";
@@ -19,8 +19,8 @@ rec {
}
/* (SYSTEM trivial-gray-streams DESCRIPTION
Compatibility layer for Gray Streams (see http://www.cliki.net/Gray%20streams).
- SHA256 01z5mp71005vgpvazhs3gqgqr2ym8mm4n5pw2y7bfjiygcl8b06f URL
- http://beta.quicklisp.org/archive/trivial-gray-streams/2018-03-28/trivial-gray-streams-20180328-git.tgz
- MD5 9f831cbb7a4efe93eaa8fa2acee4b01b NAME trivial-gray-streams FILENAME
- trivial-gray-streams DEPS NIL DEPENDENCIES NIL VERSION 20180328-git
+ SHA256 0mh9w8inqxb6lpq787grnf72qlcrjd0a7qs6psjyfs6iazs14170 URL
+ http://beta.quicklisp.org/archive/trivial-gray-streams/2018-08-31/trivial-gray-streams-20180831-git.tgz
+ MD5 070733919aa016a508b2ecb443e37c80 NAME trivial-gray-streams FILENAME
+ trivial-gray-streams DEPS NIL DEPENDENCIES NIL VERSION 20180831-git
SIBLINGS (trivial-gray-streams-test) PARASITES NIL) */
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivial-indent.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivial-indent.nix
index e044f097701..4214779af32 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivial-indent.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivial-indent.nix
@@ -1,15 +1,15 @@
-{ fetchurl, ... }:
+args @ { fetchurl, ... }:
rec {
baseName = ''trivial-indent'';
- version = ''20180131-git'';
+ version = ''20180831-git'';
description = ''A very simple library to allow indentation hints for SWANK.'';
deps = [ ];
src = fetchurl {
- url = ''http://beta.quicklisp.org/archive/trivial-indent/2018-01-31/trivial-indent-20180131-git.tgz'';
- sha256 = ''1y6m9nrhj923zj95824w7vsciqhv9cq7sq5x519x2ik0jfcaqp8w'';
+ url = ''http://beta.quicklisp.org/archive/trivial-indent/2018-08-31/trivial-indent-20180831-git.tgz'';
+ sha256 = ''017ydjyp9v1bqfhg6yq73q7lf2ds3g7s8i9ng9n7iv2k9ffxm65m'';
};
packageName = "trivial-indent";
@@ -19,8 +19,8 @@ rec {
}
/* (SYSTEM trivial-indent DESCRIPTION
A very simple library to allow indentation hints for SWANK. SHA256
- 1y6m9nrhj923zj95824w7vsciqhv9cq7sq5x519x2ik0jfcaqp8w URL
- http://beta.quicklisp.org/archive/trivial-indent/2018-01-31/trivial-indent-20180131-git.tgz
- MD5 a915258466d07465da1f71476bf59d12 NAME trivial-indent FILENAME
- trivial-indent DEPS NIL DEPENDENCIES NIL VERSION 20180131-git SIBLINGS NIL
+ 017ydjyp9v1bqfhg6yq73q7lf2ds3g7s8i9ng9n7iv2k9ffxm65m URL
+ http://beta.quicklisp.org/archive/trivial-indent/2018-08-31/trivial-indent-20180831-git.tgz
+ MD5 0cc411500f5aa677cd771d45f4cd21b8 NAME trivial-indent FILENAME
+ trivial-indent DEPS NIL DEPENDENCIES NIL VERSION 20180831-git SIBLINGS NIL
PARASITES NIL) */
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivial-mimes.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivial-mimes.nix
index 6946141f112..f06c0d7ebf5 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivial-mimes.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivial-mimes.nix
@@ -1,15 +1,15 @@
-{ fetchurl, ... }:
+args @ { fetchurl, ... }:
rec {
baseName = ''trivial-mimes'';
- version = ''20180131-git'';
+ version = ''20180831-git'';
description = ''Tiny library to detect mime types in files.'';
deps = [ ];
src = fetchurl {
- url = ''http://beta.quicklisp.org/archive/trivial-mimes/2018-01-31/trivial-mimes-20180131-git.tgz'';
- sha256 = ''0wmnfiphrzr5br4mzds7lny36rqrdxv707r4frzygx7j0llrvs1b'';
+ url = ''http://beta.quicklisp.org/archive/trivial-mimes/2018-08-31/trivial-mimes-20180831-git.tgz'';
+ sha256 = ''0nkf6ifjvh4fvmf7spmqmz64yh2l1f25gxq1r8s0z0vnrmpsggqr'';
};
packageName = "trivial-mimes";
@@ -19,8 +19,8 @@ rec {
}
/* (SYSTEM trivial-mimes DESCRIPTION
Tiny library to detect mime types in files. SHA256
- 0wmnfiphrzr5br4mzds7lny36rqrdxv707r4frzygx7j0llrvs1b URL
- http://beta.quicklisp.org/archive/trivial-mimes/2018-01-31/trivial-mimes-20180131-git.tgz
- MD5 9c91e72a8ee2455f9c5cbba1f7d2fcef NAME trivial-mimes FILENAME
- trivial-mimes DEPS NIL DEPENDENCIES NIL VERSION 20180131-git SIBLINGS NIL
+ 0nkf6ifjvh4fvmf7spmqmz64yh2l1f25gxq1r8s0z0vnrmpsggqr URL
+ http://beta.quicklisp.org/archive/trivial-mimes/2018-08-31/trivial-mimes-20180831-git.tgz
+ MD5 503680e90278947d888bcbe3338c74e3 NAME trivial-mimes FILENAME
+ trivial-mimes DEPS NIL DEPENDENCIES NIL VERSION 20180831-git SIBLINGS NIL
PARASITES NIL) */
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivial-types.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivial-types.nix
index 1af66736f30..8cc04c2c64a 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivial-types.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivial-types.nix
@@ -1,4 +1,4 @@
-{ fetchurl, ... }:
+args @ { fetchurl, ... }:
rec {
baseName = ''trivial-types'';
version = ''20120407-git'';
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivial-utf-8.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivial-utf-8.nix
index 753f21dbcb9..c925382d81d 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivial-utf-8.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivial-utf-8.nix
@@ -1,4 +1,4 @@
-{ fetchurl, ... }:
+args @ { fetchurl, ... }:
rec {
baseName = ''trivial-utf-8'';
version = ''20111001-darcs'';
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/uffi.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/uffi.nix
index 0ac190993d8..1986f7c88f7 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/uffi.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/uffi.nix
@@ -1,4 +1,4 @@
-{ fetchurl, ... }:
+args @ { fetchurl, ... }:
rec {
baseName = ''uffi'';
version = ''20180228-git'';
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/uiop.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/uiop.nix
index afb8b388568..fdaa07109b4 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/uiop.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/uiop.nix
@@ -1,15 +1,15 @@
-{ fetchurl, ... }:
+args @ { fetchurl, ... }:
rec {
baseName = ''uiop'';
- version = ''3.3.1'';
+ version = ''3.3.2'';
description = '''';
deps = [ ];
src = fetchurl {
- url = ''http://beta.quicklisp.org/archive/uiop/2017-12-27/uiop-3.3.1.tgz'';
- sha256 = ''0w9va40dr6l7fss9f7qlv7mp9f86sdjv5g2lz621a6wzi4911ghc'';
+ url = ''http://beta.quicklisp.org/archive/uiop/2018-07-11/uiop-3.3.2.tgz'';
+ sha256 = ''1q13a7dzc9vpd0w7c4xw03ijmlnyhjw2p76h0v8m7dyb23s7p9y5'';
};
packageName = "uiop";
@@ -18,7 +18,7 @@ rec {
overrides = x: x;
}
/* (SYSTEM uiop DESCRIPTION NIL SHA256
- 0w9va40dr6l7fss9f7qlv7mp9f86sdjv5g2lz621a6wzi4911ghc URL
- http://beta.quicklisp.org/archive/uiop/2017-12-27/uiop-3.3.1.tgz MD5
- 7a90377c4fc96676d5fa5197d9e9ec11 NAME uiop FILENAME uiop DEPS NIL
- DEPENDENCIES NIL VERSION 3.3.1 SIBLINGS (asdf-driver) PARASITES NIL) */
+ 1q13a7dzc9vpd0w7c4xw03ijmlnyhjw2p76h0v8m7dyb23s7p9y5 URL
+ http://beta.quicklisp.org/archive/uiop/2018-07-11/uiop-3.3.2.tgz MD5
+ 8d7b7b4065873107147678c6ef72e5ee NAME uiop FILENAME uiop DEPS NIL
+ DEPENDENCIES NIL VERSION 3.3.2 SIBLINGS (asdf-driver) PARASITES NIL) */
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/unit-test.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/unit-test.nix
index 3a4b05e0526..6c456496732 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/unit-test.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/unit-test.nix
@@ -1,4 +1,4 @@
-{ fetchurl, ... }:
+args @ { fetchurl, ... }:
rec {
baseName = ''unit-test'';
version = ''20120520-git'';
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/usocket.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/usocket.nix
index b4b4f4543a1..6d02b976470 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/usocket.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/usocket.nix
@@ -1,15 +1,15 @@
args @ { fetchurl, ... }:
rec {
baseName = ''usocket'';
- version = ''0.7.0.1'';
+ version = ''0.7.1'';
description = ''Universal socket library for Common Lisp'';
deps = [ args."split-sequence" ];
src = fetchurl {
- url = ''http://beta.quicklisp.org/archive/usocket/2016-10-31/usocket-0.7.0.1.tgz'';
- sha256 = ''1mpcfawbzd72cd841bb0hmgx4kinnvcnazc7vym83gv5iy6lwif2'';
+ url = ''http://beta.quicklisp.org/archive/usocket/2018-08-31/usocket-0.7.1.tgz'';
+ sha256 = ''18w2f835lgiznv6rm1v7yq94dg5qjcmbj91kpvfjw81pk4i7i7lw'';
};
packageName = "usocket";
@@ -18,9 +18,9 @@ rec {
overrides = x: x;
}
/* (SYSTEM usocket DESCRIPTION Universal socket library for Common Lisp SHA256
- 1mpcfawbzd72cd841bb0hmgx4kinnvcnazc7vym83gv5iy6lwif2 URL
- http://beta.quicklisp.org/archive/usocket/2016-10-31/usocket-0.7.0.1.tgz
- MD5 1dcb027187679211f9d277ce99ca2a5a NAME usocket FILENAME usocket DEPS
+ 18w2f835lgiznv6rm1v7yq94dg5qjcmbj91kpvfjw81pk4i7i7lw URL
+ http://beta.quicklisp.org/archive/usocket/2018-08-31/usocket-0.7.1.tgz MD5
+ fb48ff59f0d71bfc9c2939aacdb123a0 NAME usocket FILENAME usocket DEPS
((NAME split-sequence FILENAME split-sequence)) DEPENDENCIES
- (split-sequence) VERSION 0.7.0.1 SIBLINGS (usocket-server usocket-test)
+ (split-sequence) VERSION 0.7.1 SIBLINGS (usocket-server usocket-test)
PARASITES NIL) */
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/vom.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/vom.nix
index 11b9351c03a..6a4751f799e 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/vom.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/vom.nix
@@ -1,4 +1,4 @@
-{ fetchurl, ... }:
+args @ { fetchurl, ... }:
rec {
baseName = ''vom'';
version = ''20160825-git'';
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/woo.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/woo.nix
index cc5c23faf86..4a36b656353 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/woo.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/woo.nix
@@ -1,15 +1,15 @@
args @ { fetchurl, ... }:
rec {
baseName = ''woo'';
- version = ''20170830-git'';
+ version = ''20180831-git'';
description = ''An asynchronous HTTP server written in Common Lisp'';
deps = [ args."alexandria" args."babel" args."bordeaux-threads" args."cffi" args."cffi-grovel" args."cffi-toolchain" args."cl-utilities" args."clack-socket" args."fast-http" args."fast-io" args."flexi-streams" args."lev" args."proc-parse" args."quri" args."smart-buffer" args."split-sequence" args."static-vectors" args."swap-bytes" args."trivial-features" args."trivial-gray-streams" args."trivial-utf-8" args."uiop" args."vom" args."xsubseq" ];
src = fetchurl {
- url = ''http://beta.quicklisp.org/archive/woo/2017-08-30/woo-20170830-git.tgz'';
- sha256 = ''130hgfp08gchn0fkfablpf18hsdi1k4hrc3iny5c8m1phjlknchv'';
+ url = ''http://beta.quicklisp.org/archive/woo/2018-08-31/woo-20180831-git.tgz'';
+ sha256 = ''142f3d9bv2zd0l9p1pavf05c2wi4jiz521wji9zyysspmibys3z8'';
};
packageName = "woo";
@@ -18,9 +18,9 @@ rec {
overrides = x: x;
}
/* (SYSTEM woo DESCRIPTION An asynchronous HTTP server written in Common Lisp
- SHA256 130hgfp08gchn0fkfablpf18hsdi1k4hrc3iny5c8m1phjlknchv URL
- http://beta.quicklisp.org/archive/woo/2017-08-30/woo-20170830-git.tgz MD5
- 3f506a771b3d8f2c7fc97b049dcfdedf NAME woo FILENAME woo DEPS
+ SHA256 142f3d9bv2zd0l9p1pavf05c2wi4jiz521wji9zyysspmibys3z8 URL
+ http://beta.quicklisp.org/archive/woo/2018-08-31/woo-20180831-git.tgz MD5
+ 93dfbc504ebd4fa7ed5f444fcc5444e7 NAME woo FILENAME woo DEPS
((NAME alexandria FILENAME alexandria) (NAME babel FILENAME babel)
(NAME bordeaux-threads FILENAME bordeaux-threads)
(NAME cffi FILENAME cffi) (NAME cffi-grovel FILENAME cffi-grovel)
@@ -43,4 +43,4 @@ rec {
cl-utilities clack-socket fast-http fast-io flexi-streams lev proc-parse
quri smart-buffer split-sequence static-vectors swap-bytes
trivial-features trivial-gray-streams trivial-utf-8 uiop vom xsubseq)
- VERSION 20170830-git SIBLINGS (clack-handler-woo woo-test) PARASITES NIL) */
+ VERSION 20180831-git SIBLINGS (clack-handler-woo woo-test) PARASITES NIL) */
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/wookie.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/wookie.nix
index 8c4afa9697d..6db21bf9005 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/wookie.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/wookie.nix
@@ -1,15 +1,15 @@
args @ { fetchurl, ... }:
rec {
baseName = ''wookie'';
- version = ''20180228-git'';
+ version = ''20180831-git'';
description = ''An evented webserver for Common Lisp.'';
deps = [ args."alexandria" args."babel" args."babel-streams" args."blackbird" args."bordeaux-threads" args."cffi" args."cffi-grovel" args."cffi-toolchain" args."chunga" args."cl-async" args."cl-async-base" args."cl-async-ssl" args."cl-async-util" args."cl-fad" args."cl-libuv" args."cl-ppcre" args."cl-utilities" args."do-urlencode" args."fast-http" args."fast-io" args."flexi-streams" args."proc-parse" args."quri" args."smart-buffer" args."split-sequence" args."static-vectors" args."trivial-features" args."trivial-gray-streams" args."vom" args."xsubseq" ];
src = fetchurl {
- url = ''http://beta.quicklisp.org/archive/wookie/2018-02-28/wookie-20180228-git.tgz'';
- sha256 = ''1w6qkz6l7lq9v7zzq2c9q2bx73vs9m9svlhh2058csjqqbv383kq'';
+ url = ''http://beta.quicklisp.org/archive/wookie/2018-08-31/wookie-20180831-git.tgz'';
+ sha256 = ''1hy6hdfhdfnyd00q3v7ryjqvq7x8j22yy4l52p24jj0n19mx3pjx'';
};
packageName = "wookie";
@@ -18,9 +18,9 @@ rec {
overrides = x: x;
}
/* (SYSTEM wookie DESCRIPTION An evented webserver for Common Lisp. SHA256
- 1w6qkz6l7lq9v7zzq2c9q2bx73vs9m9svlhh2058csjqqbv383kq URL
- http://beta.quicklisp.org/archive/wookie/2018-02-28/wookie-20180228-git.tgz
- MD5 7cd3d634686e532f2c6e2f5f2d4e1dae NAME wookie FILENAME wookie DEPS
+ 1hy6hdfhdfnyd00q3v7ryjqvq7x8j22yy4l52p24jj0n19mx3pjx URL
+ http://beta.quicklisp.org/archive/wookie/2018-08-31/wookie-20180831-git.tgz
+ MD5 c825760241580a95c68b1ac6f428e07e NAME wookie FILENAME wookie DEPS
((NAME alexandria FILENAME alexandria) (NAME babel FILENAME babel)
(NAME babel-streams FILENAME babel-streams)
(NAME blackbird FILENAME blackbird)
@@ -49,4 +49,4 @@ rec {
cl-fad cl-libuv cl-ppcre cl-utilities do-urlencode fast-http fast-io
flexi-streams proc-parse quri smart-buffer split-sequence static-vectors
trivial-features trivial-gray-streams vom xsubseq)
- VERSION 20180228-git SIBLINGS NIL PARASITES NIL) */
+ VERSION 20180831-git SIBLINGS NIL PARASITES NIL) */
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/xsubseq.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/xsubseq.nix
index c70c3f2e1e1..b9ab71744c3 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/xsubseq.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/xsubseq.nix
@@ -1,4 +1,4 @@
-{ fetchurl, ... }:
+args @ { fetchurl, ... }:
rec {
baseName = ''xsubseq'';
version = ''20170830-git'';
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/yacc.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/yacc.nix
index 733185e2b26..c7031f4aa3f 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/yacc.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/yacc.nix
@@ -1,4 +1,4 @@
-{ fetchurl, ... }:
+args @ { fetchurl, ... }:
rec {
baseName = ''yacc'';
version = ''cl-20101006-darcs'';
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/zpb-ttf.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/zpb-ttf.nix
index 090aa670ad9..74e5d7e97e9 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/zpb-ttf.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/zpb-ttf.nix
@@ -1,4 +1,4 @@
-{ fetchurl, ... }:
+args @ { fetchurl, ... }:
rec {
baseName = ''zpb-ttf'';
version = ''1.0.3'';
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-overrides.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-overrides.nix
index 91493d7431e..face797fe2a 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-overrides.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-overrides.nix
@@ -48,7 +48,7 @@ in
cl_plus_ssl = addNativeLibs [pkgs.openssl];
cl-colors = skipBuildPhase;
cl-libuv = addNativeLibs [pkgs.libuv];
- cl-async-ssl = addNativeLibs [pkgs.openssl];
+ cl-async-ssl = addNativeLibs [pkgs.openssl (import ./openssl-lib-marked.nix)];
cl-async-test = addNativeLibs [pkgs.openssl];
clsql = x: {
propagatedBuildInputs = with pkgs; [mysql.connector-c postgresql sqlite zlib];
@@ -143,7 +143,8 @@ $out/lib/common-lisp/query-fs"
fiveam md5 usocket
];
parasites = [
- "simple-date/tests"
+ # Needs pomo? Wants to do queries unconditionally?
+ # "simple-date/tests"
];
};
cl-postgres = x: {
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix.nix b/pkgs/development/lisp-modules/quicklisp-to-nix.nix
index 71d974d9711..8a126d4fd98 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix.nix
@@ -6,9 +6,6 @@ let quicklisp-to-nix-packages = rec {
buildLispPackage = callPackage ./define-package.nix;
qlOverrides = callPackage ./quicklisp-to-nix-overrides.nix {};
- "simple-date_slash_postgres-glue" = quicklisp-to-nix-packages."simple-date";
-
-
"unit-test" = buildLispPackage
((f: x: (x // (f x)))
(qlOverrides."unit-test" or (x: {}))
@@ -17,14 +14,6 @@ let quicklisp-to-nix-packages = rec {
}));
- "clack-socket" = buildLispPackage
- ((f: x: (x // (f x)))
- (qlOverrides."clack-socket" or (x: {}))
- (import ./quicklisp-to-nix-output/clack-socket.nix {
- inherit fetchurl;
- }));
-
-
"stefil" = buildLispPackage
((f: x: (x // (f x)))
(qlOverrides."stefil" or (x: {}))
@@ -106,14 +95,6 @@ let quicklisp-to-nix-packages = rec {
}));
- "rfc2388" = buildLispPackage
- ((f: x: (x // (f x)))
- (qlOverrides."rfc2388" or (x: {}))
- (import ./quicklisp-to-nix-output/rfc2388.nix {
- inherit fetchurl;
- }));
-
-
"net_dot_didierverna_dot_asdf-flv" = buildLispPackage
((f: x: (x // (f x)))
(qlOverrides."net_dot_didierverna_dot_asdf-flv" or (x: {}))
@@ -142,7 +123,6 @@ let quicklisp-to-nix-packages = rec {
inherit fetchurl;
"fiveam" = quicklisp-to-nix-packages."fiveam";
"md5" = quicklisp-to-nix-packages."md5";
- "simple-date_slash_postgres-glue" = quicklisp-to-nix-packages."simple-date_slash_postgres-glue";
"split-sequence" = quicklisp-to-nix-packages."split-sequence";
"usocket" = quicklisp-to-nix-packages."usocket";
}));
@@ -255,6 +235,7 @@ let quicklisp-to-nix-packages = rec {
"cxml-xml" = quicklisp-to-nix-packages."cxml-xml";
"flexi-streams" = quicklisp-to-nix-packages."flexi-streams";
"iterate" = quicklisp-to-nix-packages."iterate";
+ "named-readtables" = quicklisp-to-nix-packages."named-readtables";
"puri" = quicklisp-to-nix-packages."puri";
"split-sequence" = quicklisp-to-nix-packages."split-sequence";
"swank" = quicklisp-to-nix-packages."swank";
@@ -287,6 +268,7 @@ let quicklisp-to-nix-packages = rec {
"flexi-streams" = quicklisp-to-nix-packages."flexi-streams";
"iterate" = quicklisp-to-nix-packages."iterate";
"lisp-unit2" = quicklisp-to-nix-packages."lisp-unit2";
+ "named-readtables" = quicklisp-to-nix-packages."named-readtables";
"puri" = quicklisp-to-nix-packages."puri";
"split-sequence" = quicklisp-to-nix-packages."split-sequence";
"swank" = quicklisp-to-nix-packages."swank";
@@ -364,14 +346,6 @@ let quicklisp-to-nix-packages = rec {
}));
- "md5" = buildLispPackage
- ((f: x: (x // (f x)))
- (qlOverrides."md5" or (x: {}))
- (import ./quicklisp-to-nix-output/md5.nix {
- inherit fetchurl;
- }));
-
-
"clsql-uffi" = buildLispPackage
((f: x: (x // (f x)))
(qlOverrides."clsql-uffi" or (x: {}))
@@ -498,6 +472,7 @@ let quicklisp-to-nix-packages = rec {
"cl-unicode" = quicklisp-to-nix-packages."cl-unicode";
"flexi-streams" = quicklisp-to-nix-packages."flexi-streams";
"iterate" = quicklisp-to-nix-packages."iterate";
+ "named-readtables" = quicklisp-to-nix-packages."named-readtables";
"symbol-munger" = quicklisp-to-nix-packages."symbol-munger";
}));
@@ -510,6 +485,7 @@ let quicklisp-to-nix-packages = rec {
"cl-ppcre" = quicklisp-to-nix-packages."cl-ppcre";
"cl-unicode" = quicklisp-to-nix-packages."cl-unicode";
"flexi-streams" = quicklisp-to-nix-packages."flexi-streams";
+ "named-readtables" = quicklisp-to-nix-packages."named-readtables";
}));
@@ -565,6 +541,14 @@ let quicklisp-to-nix-packages = rec {
}));
+ "rfc2388" = buildLispPackage
+ ((f: x: (x // (f x)))
+ (qlOverrides."rfc2388" or (x: {}))
+ (import ./quicklisp-to-nix-output/rfc2388.nix {
+ inherit fetchurl;
+ }));
+
+
"named-readtables" = buildLispPackage
((f: x: (x // (f x)))
(qlOverrides."named-readtables" or (x: {}))
@@ -589,6 +573,14 @@ let quicklisp-to-nix-packages = rec {
}));
+ "md5" = buildLispPackage
+ ((f: x: (x // (f x)))
+ (qlOverrides."md5" or (x: {}))
+ (import ./quicklisp-to-nix-output/md5.nix {
+ inherit fetchurl;
+ }));
+
+
"map-set" = buildLispPackage
((f: x: (x // (f x)))
(qlOverrides."map-set" or (x: {}))
@@ -688,11 +680,14 @@ let quicklisp-to-nix-packages = rec {
"cl-syntax-annot" = quicklisp-to-nix-packages."cl-syntax-annot";
"cl-utilities" = quicklisp-to-nix-packages."cl-utilities";
"clack" = quicklisp-to-nix-packages."clack";
+ "clack-handler-hunchentoot" = quicklisp-to-nix-packages."clack-handler-hunchentoot";
+ "clack-socket" = quicklisp-to-nix-packages."clack-socket";
"dexador" = quicklisp-to-nix-packages."dexador";
"fast-http" = quicklisp-to-nix-packages."fast-http";
"fast-io" = quicklisp-to-nix-packages."fast-io";
"flexi-streams" = quicklisp-to-nix-packages."flexi-streams";
"http-body" = quicklisp-to-nix-packages."http-body";
+ "hunchentoot" = quicklisp-to-nix-packages."hunchentoot";
"ironclad" = quicklisp-to-nix-packages."ironclad";
"jonathan" = quicklisp-to-nix-packages."jonathan";
"lack" = quicklisp-to-nix-packages."lack";
@@ -701,14 +696,17 @@ let quicklisp-to-nix-packages = rec {
"lack-util" = quicklisp-to-nix-packages."lack-util";
"let-plus" = quicklisp-to-nix-packages."let-plus";
"local-time" = quicklisp-to-nix-packages."local-time";
+ "md5" = quicklisp-to-nix-packages."md5";
"named-readtables" = quicklisp-to-nix-packages."named-readtables";
"nibbles" = quicklisp-to-nix-packages."nibbles";
"proc-parse" = quicklisp-to-nix-packages."proc-parse";
"prove" = quicklisp-to-nix-packages."prove";
"quri" = quicklisp-to-nix-packages."quri";
+ "rfc2388" = quicklisp-to-nix-packages."rfc2388";
"smart-buffer" = quicklisp-to-nix-packages."smart-buffer";
"split-sequence" = quicklisp-to-nix-packages."split-sequence";
"static-vectors" = quicklisp-to-nix-packages."static-vectors";
+ "trivial-backtrace" = quicklisp-to-nix-packages."trivial-backtrace";
"trivial-features" = quicklisp-to-nix-packages."trivial-features";
"trivial-garbage" = quicklisp-to-nix-packages."trivial-garbage";
"trivial-gray-streams" = quicklisp-to-nix-packages."trivial-gray-streams";
@@ -719,6 +717,42 @@ let quicklisp-to-nix-packages = rec {
}));
+ "clack-socket" = buildLispPackage
+ ((f: x: (x // (f x)))
+ (qlOverrides."clack-socket" or (x: {}))
+ (import ./quicklisp-to-nix-output/clack-socket.nix {
+ inherit fetchurl;
+ }));
+
+
+ "clack-handler-hunchentoot" = buildLispPackage
+ ((f: x: (x // (f x)))
+ (qlOverrides."clack-handler-hunchentoot" or (x: {}))
+ (import ./quicklisp-to-nix-output/clack-handler-hunchentoot.nix {
+ inherit fetchurl;
+ "alexandria" = quicklisp-to-nix-packages."alexandria";
+ "babel" = quicklisp-to-nix-packages."babel";
+ "bordeaux-threads" = quicklisp-to-nix-packages."bordeaux-threads";
+ "cffi" = quicklisp-to-nix-packages."cffi";
+ "chunga" = quicklisp-to-nix-packages."chunga";
+ "cl_plus_ssl" = quicklisp-to-nix-packages."cl_plus_ssl";
+ "cl-base64" = quicklisp-to-nix-packages."cl-base64";
+ "cl-fad" = quicklisp-to-nix-packages."cl-fad";
+ "cl-ppcre" = quicklisp-to-nix-packages."cl-ppcre";
+ "clack-socket" = quicklisp-to-nix-packages."clack-socket";
+ "flexi-streams" = quicklisp-to-nix-packages."flexi-streams";
+ "hunchentoot" = quicklisp-to-nix-packages."hunchentoot";
+ "md5" = quicklisp-to-nix-packages."md5";
+ "rfc2388" = quicklisp-to-nix-packages."rfc2388";
+ "split-sequence" = quicklisp-to-nix-packages."split-sequence";
+ "trivial-backtrace" = quicklisp-to-nix-packages."trivial-backtrace";
+ "trivial-features" = quicklisp-to-nix-packages."trivial-features";
+ "trivial-garbage" = quicklisp-to-nix-packages."trivial-garbage";
+ "trivial-gray-streams" = quicklisp-to-nix-packages."trivial-gray-streams";
+ "usocket" = quicklisp-to-nix-packages."usocket";
+ }));
+
+
"cl-syntax" = buildLispPackage
((f: x: (x // (f x)))
(qlOverrides."cl-syntax" or (x: {}))
@@ -1056,7 +1090,6 @@ let quicklisp-to-nix-packages = rec {
(import ./quicklisp-to-nix-output/simple-date.nix {
inherit fetchurl;
"cl-postgres" = quicklisp-to-nix-packages."cl-postgres";
- "fiveam" = quicklisp-to-nix-packages."fiveam";
"md5" = quicklisp-to-nix-packages."md5";
"usocket" = quicklisp-to-nix-packages."usocket";
}));
@@ -1692,6 +1725,7 @@ let quicklisp-to-nix-packages = rec {
"cxml-xml" = quicklisp-to-nix-packages."cxml-xml";
"flexi-streams" = quicklisp-to-nix-packages."flexi-streams";
"iterate" = quicklisp-to-nix-packages."iterate";
+ "named-readtables" = quicklisp-to-nix-packages."named-readtables";
"parse-number" = quicklisp-to-nix-packages."parse-number";
"puri" = quicklisp-to-nix-packages."puri";
"split-sequence" = quicklisp-to-nix-packages."split-sequence";
@@ -1728,6 +1762,7 @@ let quicklisp-to-nix-packages = rec {
"cxml-xml" = quicklisp-to-nix-packages."cxml-xml";
"flexi-streams" = quicklisp-to-nix-packages."flexi-streams";
"iterate" = quicklisp-to-nix-packages."iterate";
+ "named-readtables" = quicklisp-to-nix-packages."named-readtables";
"puri" = quicklisp-to-nix-packages."puri";
"split-sequence" = quicklisp-to-nix-packages."split-sequence";
"string-case" = quicklisp-to-nix-packages."string-case";
@@ -1763,6 +1798,7 @@ let quicklisp-to-nix-packages = rec {
"flexi-streams" = quicklisp-to-nix-packages."flexi-streams";
"iterate" = quicklisp-to-nix-packages."iterate";
"lisp-unit2" = quicklisp-to-nix-packages."lisp-unit2";
+ "named-readtables" = quicklisp-to-nix-packages."named-readtables";
"puri" = quicklisp-to-nix-packages."puri";
"split-sequence" = quicklisp-to-nix-packages."split-sequence";
"swank" = quicklisp-to-nix-packages."swank";
@@ -2254,6 +2290,7 @@ let quicklisp-to-nix-packages = rec {
"flexi-streams" = quicklisp-to-nix-packages."flexi-streams";
"iterate" = quicklisp-to-nix-packages."iterate";
"lisp-unit2" = quicklisp-to-nix-packages."lisp-unit2";
+ "named-readtables" = quicklisp-to-nix-packages."named-readtables";
}));
@@ -2420,12 +2457,15 @@ let quicklisp-to-nix-packages = rec {
"cl-syntax-annot" = quicklisp-to-nix-packages."cl-syntax-annot";
"cl-utilities" = quicklisp-to-nix-packages."cl-utilities";
"clack" = quicklisp-to-nix-packages."clack";
+ "clack-handler-hunchentoot" = quicklisp-to-nix-packages."clack-handler-hunchentoot";
+ "clack-socket" = quicklisp-to-nix-packages."clack-socket";
"clack-test" = quicklisp-to-nix-packages."clack-test";
"dexador" = quicklisp-to-nix-packages."dexador";
"fast-http" = quicklisp-to-nix-packages."fast-http";
"fast-io" = quicklisp-to-nix-packages."fast-io";
"flexi-streams" = quicklisp-to-nix-packages."flexi-streams";
"http-body" = quicklisp-to-nix-packages."http-body";
+ "hunchentoot" = quicklisp-to-nix-packages."hunchentoot";
"ironclad" = quicklisp-to-nix-packages."ironclad";
"jonathan" = quicklisp-to-nix-packages."jonathan";
"lack" = quicklisp-to-nix-packages."lack";
@@ -2435,11 +2475,13 @@ let quicklisp-to-nix-packages = rec {
"let-plus" = quicklisp-to-nix-packages."let-plus";
"local-time" = quicklisp-to-nix-packages."local-time";
"marshal" = quicklisp-to-nix-packages."marshal";
+ "md5" = quicklisp-to-nix-packages."md5";
"named-readtables" = quicklisp-to-nix-packages."named-readtables";
"nibbles" = quicklisp-to-nix-packages."nibbles";
"proc-parse" = quicklisp-to-nix-packages."proc-parse";
"prove" = quicklisp-to-nix-packages."prove";
"quri" = quicklisp-to-nix-packages."quri";
+ "rfc2388" = quicklisp-to-nix-packages."rfc2388";
"smart-buffer" = quicklisp-to-nix-packages."smart-buffer";
"split-sequence" = quicklisp-to-nix-packages."split-sequence";
"static-vectors" = quicklisp-to-nix-packages."static-vectors";
@@ -2555,6 +2597,8 @@ let quicklisp-to-nix-packages = rec {
"cl-syntax-annot" = quicklisp-to-nix-packages."cl-syntax-annot";
"cl-utilities" = quicklisp-to-nix-packages."cl-utilities";
"clack" = quicklisp-to-nix-packages."clack";
+ "clack-handler-hunchentoot" = quicklisp-to-nix-packages."clack-handler-hunchentoot";
+ "clack-socket" = quicklisp-to-nix-packages."clack-socket";
"clack-test" = quicklisp-to-nix-packages."clack-test";
"clack-v1-compat" = quicklisp-to-nix-packages."clack-v1-compat";
"dexador" = quicklisp-to-nix-packages."dexador";
@@ -2563,6 +2607,7 @@ let quicklisp-to-nix-packages = rec {
"fast-io" = quicklisp-to-nix-packages."fast-io";
"flexi-streams" = quicklisp-to-nix-packages."flexi-streams";
"http-body" = quicklisp-to-nix-packages."http-body";
+ "hunchentoot" = quicklisp-to-nix-packages."hunchentoot";
"ironclad" = quicklisp-to-nix-packages."ironclad";
"jonathan" = quicklisp-to-nix-packages."jonathan";
"lack" = quicklisp-to-nix-packages."lack";
@@ -2573,12 +2618,14 @@ let quicklisp-to-nix-packages = rec {
"local-time" = quicklisp-to-nix-packages."local-time";
"map-set" = quicklisp-to-nix-packages."map-set";
"marshal" = quicklisp-to-nix-packages."marshal";
+ "md5" = quicklisp-to-nix-packages."md5";
"myway" = quicklisp-to-nix-packages."myway";
"named-readtables" = quicklisp-to-nix-packages."named-readtables";
"nibbles" = quicklisp-to-nix-packages."nibbles";
"proc-parse" = quicklisp-to-nix-packages."proc-parse";
"prove" = quicklisp-to-nix-packages."prove";
"quri" = quicklisp-to-nix-packages."quri";
+ "rfc2388" = quicklisp-to-nix-packages."rfc2388";
"smart-buffer" = quicklisp-to-nix-packages."smart-buffer";
"split-sequence" = quicklisp-to-nix-packages."split-sequence";
"static-vectors" = quicklisp-to-nix-packages."static-vectors";
diff --git a/pkgs/development/lisp-modules/shell.nix b/pkgs/development/lisp-modules/shell.nix
index 9eba1e15b79..b3d50b2fb07 100644
--- a/pkgs/development/lisp-modules/shell.nix
+++ b/pkgs/development/lisp-modules/shell.nix
@@ -1,5 +1,6 @@
with import ../../../default.nix {};
let
+openssl_lib_marked = import ./openssl-lib-marked.nix;
self = rec {
name = "ql-to-nix";
env = buildEnv { name = name; paths = buildInputs; };
@@ -10,6 +11,6 @@ self = rec {
lispPackages.quicklisp-to-nix lispPackages.quicklisp-to-nix-system-info
];
CPATH = "${libfixposix}/include";
- LD_LIBRARY_PATH = "${openssl.out}/lib:${fuse}/lib:${libuv}/lib:${libev}/lib:${mysql.connector-c}/lib:${mysql.connector-c}/lib/mysql:${postgresql.lib}/lib:${sqlite.out}/lib:${libfixposix}/lib:${freetds}/lib";
+ LD_LIBRARY_PATH = "${openssl.out}/lib:${fuse}/lib:${libuv}/lib:${libev}/lib:${mysql.connector-c}/lib:${mysql.connector-c}/lib/mysql:${postgresql.lib}/lib:${sqlite.out}/lib:${libfixposix}/lib:${freetds}/lib:${openssl_lib_marked}/lib";
};
in stdenv.mkDerivation self
diff --git a/pkgs/development/mobile/androidenv/androidndk.nix b/pkgs/development/mobile/androidenv/androidndk.nix
index b79741fca23..dc693accbf4 100644
--- a/pkgs/development/mobile/androidenv/androidndk.nix
+++ b/pkgs/development/mobile/androidenv/androidndk.nix
@@ -1,96 +1,110 @@
{ stdenv, fetchurl, zlib, ncurses5, unzip, lib, makeWrapper
, coreutils, file, findutils, gawk, gnugrep, gnused, jdk, which
-, platformTools, python3, libcxx, version, sha256
+, platformTools, python3, libcxx, version, sha256, bash, runCommand
, fullNDK ? false # set to true if you want other parts of the NDK
# that is not used by Nixpkgs like sources,
# examples, docs, or LLVM toolchains
}:
-stdenv.mkDerivation rec {
- name = "android-ndk-r${version}";
- inherit version;
+let
+ makeStandaloneToolchain = api: arch: let
+ full_ndk = (ndk true);
+ in runCommand "makeStandaloneToolchain-${version}" {} ''
+ ${full_ndk}/libexec/${full_ndk.name}/build/tools/make_standalone_toolchain.py --api ${toString api} --arch ${arch} --install-dir $out
+ '';
+ ndk = fullNDK: stdenv.mkDerivation rec {
+ name = "android-ndk-r${version}";
+ inherit version;
- src = if stdenv.hostPlatform.system == "x86_64-linux" then fetchurl {
+ src = if stdenv.hostPlatform.system == "x86_64-linux" then fetchurl {
url = "https://dl.google.com/android/repository/${name}-linux-x86_64.zip";
inherit sha256;
} else throw "platform ${stdenv.hostPlatform.system} not supported!";
- phases = "buildPhase";
+ phases = "buildPhase";
- nativeBuildInputs = [ unzip makeWrapper file ];
+ nativeBuildInputs = [ unzip makeWrapper file ];
- buildCommand = let
- bin_path = "$out/bin";
- pkg_path = "$out/libexec/${name}";
- sed_script_1 =
- "'s|^PROGDIR=`dirname $0`" +
- "|PROGDIR=`dirname $(readlink -f $(which $0))`|'";
- runtime_paths = (lib.makeBinPath [
- coreutils file findutils
- gawk gnugrep gnused
- jdk python3 which
- ]) + ":${platformTools}/platform-tools";
- in ''
- mkdir -pv $out/libexec
- cd $out/libexec
- unzip -qq $src
+ buildCommand = let
+ bin_path = "$out/bin";
+ pkg_path = "$out/libexec/${name}";
+ sed_script_1 =
+ "'s|^PROGDIR=`dirname $0`" +
+ "|PROGDIR=`dirname $(readlink -f $(which $0))`|'";
+ runtime_paths = (lib.makeBinPath [
+ coreutils file findutils
+ gawk gnugrep gnused
+ jdk python3 which
+ ]) + ":${platformTools}/platform-tools";
+ in ''
+ mkdir -pv $out/libexec
+ cd $out/libexec
+ unzip -qq $src
- patchShebangs ${pkg_path}
+ # so that it doesn't fail because of read-only permissions set
+ cd -
+ ${if (version == "10e") then
+ ''
+ patch -p1 \
+ --no-backup-if-mismatch \
+ -d $out/libexec/${name} < ${ ./make-standalone-toolchain_r10e.patch }
+ ''
+ else
+ ''
+ patch -p1 \
+ --no-backup-if-mismatch \
+ -d $out/libexec/${name} < ${ ./. + "/make_standalone_toolchain.py_" + "${version}" + ".patch" }
- # so that it doesn't fail because of read-only permissions set
- cd -
- ${if (version == "10e") then
- ''
- patch -p1 \
- --no-backup-if-mismatch \
- -d $out/libexec/${name} < ${ ./make-standalone-toolchain_r10e.patch }
- ''
- else
- ''
- patch -p1 \
- --no-backup-if-mismatch \
- -d $out/libexec/${name} < ${ ./. + "/make_standalone_toolchain.py_${version}.patch" }
- wrapProgram ${pkg_path}/build/tools/make_standalone_toolchain.py --prefix PATH : "${runtime_paths}"
- ''
- }
- cd ${pkg_path}
+ sed -i 's,#!/usr/bin/env python,#!${python3}/bin/python,g' ${pkg_path}/build/tools/make_standalone_toolchain.py
+ sed -i 's,#!/bin/bash,#!${bash}/bin/bash,g' ${pkg_path}/build/tools/make_standalone_toolchain.py
+ wrapProgram ${pkg_path}/build/tools/make_standalone_toolchain.py --prefix PATH : "${runtime_paths}"
+ ''
+ }
- '' + lib.optionalString (!fullNDK) ''
- # Steps to reduce output size
- rm -rf docs sources tests
- # We only support cross compiling with gcc for now
- rm -rf toolchains/*-clang* toolchains/llvm*
- '' +
+ patchShebangs ${pkg_path}
- ''
- find ${pkg_path}/toolchains \( \
- \( -type f -a -name "*.so*" \) -o \
- \( -type f -a -perm -0100 \) \
- \) -exec patchelf --set-interpreter ${stdenv.cc.libc.out}/lib/ld-*so.? \
- --set-rpath ${stdenv.lib.makeLibraryPath [ libcxx zlib ncurses5 ]} {} \;
- # fix ineffective PROGDIR / MYNDKDIR determination
- for i in ndk-build ${lib.optionalString (version == "10e") "ndk-gdb ndk-gdb-py"}
- do
- sed -i -e ${sed_script_1} $i
- done
+ cd ${pkg_path}
- # wrap
- for i in ndk-build ${lib.optionalString (version == "10e") "ndk-gdb ndk-gdb-py ndk-which"}
- do
- wrapProgram "$(pwd)/$i" --prefix PATH : "${runtime_paths}"
- done
- # make some executables available in PATH
- mkdir -pv ${bin_path}
- for i in \
- ndk-build ${lib.optionalString (version == "10e") "ndk-depends ndk-gdb ndk-gdb-py ndk-gdb.py ndk-stack ndk-which"}
- do
- ln -sf ${pkg_path}/$i ${bin_path}/$i
- done
- '';
+ '' + lib.optionalString (!fullNDK) ''
+ # Steps to reduce output size
+ rm -rf docs sources tests
+ # We only support cross compiling with gcc for now
+ rm -rf toolchains/*-clang* toolchains/llvm*
+ '' +
- meta = {
- platforms = stdenv.lib.platforms.linux;
- hydraPlatforms = [];
- license = stdenv.lib.licenses.asl20;
+ ''
+ find ${pkg_path}/toolchains \( \
+ \( -type f -a -name "*.so*" \) -o \
+ \( -type f -a -perm -0100 \) \
+ \) -exec patchelf --set-interpreter ${stdenv.cc.libc.out}/lib/ld-*so.? \
+ --set-rpath ${stdenv.lib.makeLibraryPath [ libcxx zlib ncurses5 ]} {} \;
+ # fix ineffective PROGDIR / MYNDKDIR determination
+ for i in ndk-build ${lib.optionalString (version == "10e") "ndk-gdb ndk-gdb-py"}
+ do
+ sed -i -e ${sed_script_1} $i
+ done
+
+ # wrap
+ for i in ndk-build ${lib.optionalString (version == "10e") "ndk-gdb ndk-gdb-py ndk-which"}
+ do
+ wrapProgram "$(pwd)/$i" --prefix PATH : "${runtime_paths}"
+ done
+ # make some executables available in PATH
+ mkdir -pv ${bin_path}
+ for i in \
+ ndk-build ${lib.optionalString (version == "10e") "ndk-depends ndk-gdb ndk-gdb-py ndk-gdb.py ndk-stack ndk-which"}
+ do
+ ln -sf ${pkg_path}/$i ${bin_path}/$i
+ done
+ '';
+
+ meta = {
+ platforms = stdenv.lib.platforms.linux;
+ hydraPlatforms = [];
+ license = stdenv.lib.licenses.asl20;
+ };
};
-}
+ passthru = {
+ inherit makeStandaloneToolchain;
+ };
+in lib.extendDerivation true passthru (ndk fullNDK)
diff --git a/pkgs/development/node-packages/node-packages-v8.json b/pkgs/development/node-packages/node-packages-v8.json
index 6ac941eb7c4..38d5008ad8c 100644
--- a/pkgs/development/node-packages/node-packages-v8.json
+++ b/pkgs/development/node-packages/node-packages-v8.json
@@ -30,6 +30,7 @@
, "fetch-bower"
, "forever"
, "git-run"
+, "git-ssb"
, "git-standup"
, "graphql-cli"
, "grunt-cli"
@@ -95,6 +96,7 @@
, "react-tools"
, "react-native-cli"
, "s3http"
+, "scuttlebot"
, "semver"
, "serve"
, "shout"
diff --git a/pkgs/development/node-packages/node-packages-v8.nix b/pkgs/development/node-packages/node-packages-v8.nix
index 0e6970dbea1..3efef820a9b 100644
--- a/pkgs/development/node-packages/node-packages-v8.nix
+++ b/pkgs/development/node-packages/node-packages-v8.nix
@@ -31,6 +31,15 @@ let
sha512 = "QAZIFrfVRkjvMkUHIQKZXZ3La0V5t12w5PWrhihYEabHwzIZV/txQd/kSYHgYPXC4s5OURxsXZop9f0BzI2QIQ==";
};
};
+ "@babel/code-frame-7.0.0" = {
+ name = "_at_babel_slash_code-frame";
+ packageName = "@babel/code-frame";
+ version = "7.0.0";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.0.0.tgz";
+ sha512 = "OfC2uemaknXr87bdLUkWog7nYuliM9Ij5HUcajsVcMCpQrcLmtxRbVFTIqmcSkSeYRBFBRxs2FiUqFJDLdiebA==";
+ };
+ };
"@babel/generator-7.0.0-beta.38" = {
name = "_at_babel_slash_generator";
packageName = "@babel/generator";
@@ -40,6 +49,15 @@ let
sha512 = "aOHQPhsEyaB6p2n+AK981+onHoc+Ork9rcAQVSUJR33wUkGiWRpu6/C685knRyIZVsKeSdG5Q4xMiYeFUhuLzA==";
};
};
+ "@babel/highlight-7.0.0" = {
+ name = "_at_babel_slash_highlight";
+ packageName = "@babel/highlight";
+ version = "7.0.0";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/@babel/highlight/-/highlight-7.0.0.tgz";
+ sha512 = "UFMC4ZeFC48Tpvj7C8UgLvtkaUuovQX+5xNWrsIoMG8o2z+XFKjKaN9iVmS84dPwVN00W4wPmqvYoZF3EGAsfw==";
+ };
+ };
"@babel/runtime-7.0.0" = {
name = "_at_babel_slash_runtime";
packageName = "@babel/runtime";
@@ -193,13 +211,13 @@ let
sha512 = "CNVsCrMge/jq6DCT5buNZ8PACY9RTvPJbCNoIcndfkJOCsNxOx9dnc5qw4pHZdHi8GS6l3qlgkuFKp33iD8J2Q==";
};
};
- "@lerna/add-3.1.4" = {
+ "@lerna/add-3.2.0" = {
name = "_at_lerna_slash_add";
packageName = "@lerna/add";
- version = "3.1.4";
+ version = "3.2.0";
src = fetchurl {
- url = "https://registry.npmjs.org/@lerna/add/-/add-3.1.4.tgz";
- sha512 = "jC4k1EkniPA003Fj8NQkRjdue29BJRRPfbnTqPCmhjmwQKy2dj71256o28eBYoWcouUivA0voz+r+H9sLMqbfA==";
+ url = "https://registry.npmjs.org/@lerna/add/-/add-3.2.0.tgz";
+ sha512 = "qGA7agAWcKlrXZR3FwFJXTr26Q2rqjOVMNhtm8uyawImqfdKp4WJXuGdioiWOSW20jMvzLIFhWZh5lCh0UyMBw==";
};
};
"@lerna/batch-packages-3.1.2" = {
@@ -211,22 +229,22 @@ let
sha512 = "HAkpptrYeUVlBYbLScXgeCgk6BsNVXxDd53HVWgzzTWpXV4MHpbpeKrByyt7viXlNhW0w73jJbipb/QlFsHIhQ==";
};
};
- "@lerna/bootstrap-3.1.4" = {
+ "@lerna/bootstrap-3.2.0" = {
name = "_at_lerna_slash_bootstrap";
packageName = "@lerna/bootstrap";
- version = "3.1.4";
+ version = "3.2.0";
src = fetchurl {
- url = "https://registry.npmjs.org/@lerna/bootstrap/-/bootstrap-3.1.4.tgz";
- sha512 = "GN3/ll73hXQzsFEKW1d6xgMKf6t4kxTXDGhiMF1uc8DdbrK1arA1MMWhXrjMYJAaMldMzNnGeE3Kb1MxKxXWPw==";
+ url = "https://registry.npmjs.org/@lerna/bootstrap/-/bootstrap-3.2.0.tgz";
+ sha512 = "xh6dPpdzsAEWF7lqASaym5AThkmP3ArR7Q+P/tiPWCT+OT7QT5QI2IQAz1aAYEBQL3ACzpE6kq+VOGi0m+9bxw==";
};
};
- "@lerna/changed-3.1.3" = {
+ "@lerna/changed-3.2.0" = {
name = "_at_lerna_slash_changed";
packageName = "@lerna/changed";
- version = "3.1.3";
+ version = "3.2.0";
src = fetchurl {
- url = "https://registry.npmjs.org/@lerna/changed/-/changed-3.1.3.tgz";
- sha512 = "6KyyAl/qcxFeKOfuTDJlgh3aNOf6KQDxckEitmOFRi9scIZd7Igj/V9DQSvKoMORGk8wBwbpeLNJ9TN9xbm4qw==";
+ url = "https://registry.npmjs.org/@lerna/changed/-/changed-3.2.0.tgz";
+ sha512 = "R+vGzzXPN5s5lJT0v1zSTLw43O2ek2yekqCqvw7p9UFqgqYSbxUsyWXMdhku/mOIFWTc6DzrsOi+U7CX3TXmHg==";
};
};
"@lerna/check-working-tree-3.1.0" = {
@@ -256,13 +274,13 @@ let
sha512 = "XVdcIOjhudXlk5pTXjrpsnNLqeVi2rBu2oWzPH2GHrxWGBZBW8thGIFhQf09da/RbRT3uzBWXpUv+sbL2vbX3g==";
};
};
- "@lerna/cli-3.1.4" = {
+ "@lerna/cli-3.2.0" = {
name = "_at_lerna_slash_cli";
packageName = "@lerna/cli";
- version = "3.1.4";
+ version = "3.2.0";
src = fetchurl {
- url = "https://registry.npmjs.org/@lerna/cli/-/cli-3.1.4.tgz";
- sha512 = "e63YpwIgXU87gGDpqxr2mQnkxwIIt03FtgWlAId7uySVwTLT7j5u0yMbFR1CVkWvUSBY76JSCsX5u/Z1CfJUpQ==";
+ url = "https://registry.npmjs.org/@lerna/cli/-/cli-3.2.0.tgz";
+ sha512 = "JdbLyTxHqxUlrkI+Ke+ltXbtyA+MPu9zR6kg/n8Fl6uaez/2fZWtReXzYi8MgLxfUFa7+1OHWJv4eAMZlByJ+Q==";
};
};
"@lerna/collect-updates-3.1.0" = {
@@ -463,13 +481,13 @@ let
sha512 = "e0sspVUfzEKhqsRIxzWqZ/uMBHzZSzOa4HCeORErEZu+dmDoI145XYhqvCVn7EvbAb407FV2H9GVeoP0JeG8GQ==";
};
};
- "@lerna/npm-publish-3.0.6" = {
+ "@lerna/npm-publish-3.2.0" = {
name = "_at_lerna_slash_npm-publish";
packageName = "@lerna/npm-publish";
- version = "3.0.6";
+ version = "3.2.0";
src = fetchurl {
- url = "https://registry.npmjs.org/@lerna/npm-publish/-/npm-publish-3.0.6.tgz";
- sha512 = "PlvKr958TowEOOe2yNtmUi/Ot42TS/edlmA7rj+XtDUR51AN3RB9G6b25TElyrnDksj1ayb3mOF7I2uf1gbyOw==";
+ url = "https://registry.npmjs.org/@lerna/npm-publish/-/npm-publish-3.2.0.tgz";
+ sha512 = "x13EGrjZk9w8gCQAE44aKbeO1xhLizLJ4tKjzZmQqKEaUCugF4UU8ZRGshPMRFBdsHTEWh05dkKx2oPMoaf0dw==";
};
};
"@lerna/npm-run-script-3.0.0" = {
@@ -526,13 +544,13 @@ let
sha512 = "EzvNexDTh//GlpOz68zRo16NdOIqWqiiXMs9tIxpELQubH+kUGKvBSiBrZ2Zyrfd8pQhIf+8qARtkCG+G7wzQQ==";
};
};
- "@lerna/publish-3.1.3" = {
+ "@lerna/publish-3.2.1" = {
name = "_at_lerna_slash_publish";
packageName = "@lerna/publish";
- version = "3.1.3";
+ version = "3.2.1";
src = fetchurl {
- url = "https://registry.npmjs.org/@lerna/publish/-/publish-3.1.3.tgz";
- sha512 = "vlHs1ll3HEbTVgO0hVFo9dMKixV9XO3T7OBCK835j8fw4TL/0y+YjmNjH5Y5Uyh02hZxcy/iosZNyGccu/fG3w==";
+ url = "https://registry.npmjs.org/@lerna/publish/-/publish-3.2.1.tgz";
+ sha512 = "SnSBstK/G9qLt5rS56pihNacgsu3UgxXiCexWb57GGEp2eDguQ7rFzxVs4JMQQWmVG97EMJQxfFV54tW2sqtIw==";
};
};
"@lerna/resolve-symlink-3.0.0" = {
@@ -562,13 +580,13 @@ let
sha512 = "O26WdR+sQFSG2Fpc67nw+m8oVq3R+H6jsscKuB6VJafU+V4/hPURSbuFZIcmnD9MLmzAIhlQiCf0Fy6s/1MPPA==";
};
};
- "@lerna/run-lifecycle-3.0.0" = {
+ "@lerna/run-lifecycle-3.2.0" = {
name = "_at_lerna_slash_run-lifecycle";
packageName = "@lerna/run-lifecycle";
- version = "3.0.0";
+ version = "3.2.0";
src = fetchurl {
- url = "https://registry.npmjs.org/@lerna/run-lifecycle/-/run-lifecycle-3.0.0.tgz";
- sha512 = "kfq6eC5mCreTk7GusZyvF0/BfU9FDEt8JaUgzNKLrK1Sj6z2RO8uSpFsUlj+7OuV4wo0I+rdTdJOAFoW8C0GZw==";
+ url = "https://registry.npmjs.org/@lerna/run-lifecycle/-/run-lifecycle-3.2.0.tgz";
+ sha512 = "kGGdHJRyeZF+VTtal1DBptg6qwIsOLg3pKtmRm1rCMNN7j4kgrA9L07ZoRar8LjQXvfuheB1LSKHd5d04pr4Tg==";
};
};
"@lerna/run-parallel-batches-3.0.0" = {
@@ -607,13 +625,13 @@ let
sha512 = "5wjkd2PszV0kWvH+EOKZJWlHEqCTTKrWsvfHnHhcUaKBe/NagPZFWs+0xlsDPZ3DJt5FNfbAPAnEBQ05zLirFA==";
};
};
- "@lerna/version-3.1.3" = {
+ "@lerna/version-3.2.0" = {
name = "_at_lerna_slash_version";
packageName = "@lerna/version";
- version = "3.1.3";
+ version = "3.2.0";
src = fetchurl {
- url = "https://registry.npmjs.org/@lerna/version/-/version-3.1.3.tgz";
- sha512 = "cKJc0FbSEJWdVLBpWgK1tM4nzwpVJ4IC3ESzEvTWYB0fIU/SAcf+m8x7d/kl8XtlybsKGegdMEgBWvzooaDQ9A==";
+ url = "https://registry.npmjs.org/@lerna/version/-/version-3.2.0.tgz";
+ sha512 = "1AVDMpeecSMiG1cacduE+f2KO0mC7F/9MvWsHtp+rjkpficMcsVme7IMtycuvu/F07wY4Xr9ioFKYTwTcybbIA==";
};
};
"@lerna/write-log-file-3.0.0" = {
@@ -967,31 +985,31 @@ let
sha512 = "TeiJ7uvv/92ugSqZ0v9l0eNXzutlki0aK+R1K5bfA5SYUil46ITlxLW4iNTCf55P4L5weCmaOdtxGeGWvudwPg==";
};
};
- "@types/node-10.9.2" = {
+ "@types/node-10.9.4" = {
name = "_at_types_slash_node";
packageName = "@types/node";
- version = "10.9.2";
+ version = "10.9.4";
src = fetchurl {
- url = "https://registry.npmjs.org/@types/node/-/node-10.9.2.tgz";
- sha512 = "pwZnkVyCGJ3LsQ0/3flQK5lCFao4esIzwUVzzk5NvL9vnkEyDhNf4fhHzUMHvyr56gNZywWTS2MR0euabMSz4A==";
+ url = "https://registry.npmjs.org/@types/node/-/node-10.9.4.tgz";
+ sha512 = "fCHV45gS+m3hH17zgkgADUSi2RR1Vht6wOZ0jyHP8rjiQra9f+mIcgwPQHllmDocYOstIEbKlxbFDYlgrTPYqw==";
};
};
- "@types/node-6.0.116" = {
+ "@types/node-6.0.117" = {
name = "_at_types_slash_node";
packageName = "@types/node";
- version = "6.0.116";
+ version = "6.0.117";
src = fetchurl {
- url = "https://registry.npmjs.org/@types/node/-/node-6.0.116.tgz";
- sha512 = "vToa8YEeulfyYg1gSOeHjvvIRqrokng62VMSj2hoZrwZNcYrp2h3AWo6KeBVuymIklQUaY5zgVJvVsC4KiiLkQ==";
+ url = "https://registry.npmjs.org/@types/node/-/node-6.0.117.tgz";
+ sha512 = "sihk0SnN8PpiS5ihu5xJQ5ddnURNq4P+XPmW+nORlKkHy21CoZO/IVHK/Wq/l3G8fFW06Fkltgnqx229uPlnRg==";
};
};
- "@types/node-8.10.28" = {
+ "@types/node-8.10.29" = {
name = "_at_types_slash_node";
packageName = "@types/node";
- version = "8.10.28";
+ version = "8.10.29";
src = fetchurl {
- url = "https://registry.npmjs.org/@types/node/-/node-8.10.28.tgz";
- sha512 = "iHsAzDg3OLH7JP+wipniUULHoDSWLgEDYOvsar6/mpAkTJd9/n23Ap8ikruMlvRTqMv/LXrflH9v/AfiEqaBGg==";
+ url = "https://registry.npmjs.org/@types/node/-/node-8.10.29.tgz";
+ sha512 = "zbteaWZ2mdduacm0byELwtRyhYE40aK+pAanQk415gr1eRuu67x7QGOLmn8jz5zI8LDK7d0WI/oT6r5Trz4rzQ==";
};
};
"@types/range-parser-1.2.2" = {
@@ -1543,6 +1561,15 @@ let
sha1 = "29e18e632e60e4e221d5810247852a63d7b2e410";
};
};
+ "abstract-leveldown-4.0.3" = {
+ name = "abstract-leveldown";
+ packageName = "abstract-leveldown";
+ version = "4.0.3";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/abstract-leveldown/-/abstract-leveldown-4.0.3.tgz";
+ sha512 = "qsIHFQy0u17JqSY+3ZUT+ykqxYY17yOfvAsLkFkw8kSQqi05d1jyj0bCuSX6sjYlXuY9cKpgUt5EudQdP4aXyA==";
+ };
+ };
"abstract-random-access-1.1.2" = {
name = "abstract-random-access";
packageName = "abstract-random-access";
@@ -1732,13 +1759,13 @@ let
sha1 = "f291be701a2efc567a63fc7aa6afcded31430be1";
};
};
- "addons-linter-1.2.6" = {
+ "addons-linter-1.3.1" = {
name = "addons-linter";
packageName = "addons-linter";
- version = "1.2.6";
+ version = "1.3.1";
src = fetchurl {
- url = "https://registry.npmjs.org/addons-linter/-/addons-linter-1.2.6.tgz";
- sha512 = "8WjSUoleic9x3gS8SZF0kIvffrX7WkiRPF8Xs8CZi7Yu/Xq0qX9LOYG2Q66t9ThmTeMItt/24FxirqqdyFLGgw==";
+ url = "https://registry.npmjs.org/addons-linter/-/addons-linter-1.3.1.tgz";
+ sha512 = "Oaj8q8hXWwGhrzlMTM7LUxj5ZUxi8k8/pg0V/NlA3usgClngl7jXW4GRlobdoOao8KEnW95y/WNNMeoTbxYe4w==";
};
};
"addr-to-ip-port-1.5.1" = {
@@ -1957,6 +1984,15 @@ let
sha1 = "0cd90a561093f35d0a99256c22b7069433fad117";
};
};
+ "aligned-block-file-1.1.3" = {
+ name = "aligned-block-file";
+ packageName = "aligned-block-file";
+ version = "1.1.3";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/aligned-block-file/-/aligned-block-file-1.1.3.tgz";
+ sha512 = "ai/S+nZ9XMjC0ReZfq94OLGCICVBJyhNiKWmF1J+/GVZZaXtYV805plMi9obaWjfNl/QljB+VOsT+wQ7R858xA==";
+ };
+ };
"almond-0.3.3" = {
name = "almond";
packageName = "almond";
@@ -2236,13 +2272,13 @@ let
sha512 = "gVWKYyXF0SlpMyZ/i//AthzyPjjmAVYciEjwepLqMzIf0+7bzIwekpHDuzME8jf4XQepXcNNY571+BRyYHysmg==";
};
};
- "apollo-cache-control-0.2.2" = {
+ "apollo-cache-control-0.2.3" = {
name = "apollo-cache-control";
packageName = "apollo-cache-control";
- version = "0.2.2";
+ version = "0.2.3";
src = fetchurl {
- url = "https://registry.npmjs.org/apollo-cache-control/-/apollo-cache-control-0.2.2.tgz";
- sha512 = "N5A1hO6nHZBCR+OCV58IlE7k6hZrFJZTf/Ab2WD8wduLSa0qLLRlCp3rXvD05+jpWa6sdKw03whW2omJ+SyT+w==";
+ url = "https://registry.npmjs.org/apollo-cache-control/-/apollo-cache-control-0.2.3.tgz";
+ sha512 = "W/SJouLRv1VqVd79yeMbDNrv77zJ+8vKbZW2aDjbzMUEyA1nODdJhsrxqlxlh+naK5L4i12DEEG/YhfQjnzM2w==";
};
};
"apollo-cache-inmemory-1.2.9" = {
@@ -2272,22 +2308,22 @@ let
sha512 = "jlxz/b5iinRWfh48hXdmMtrjTPn/rDok0Z3b7icvkiaD6I30w4sq9B+JDkFbLnkldzsFLV2BZtBDa/dkZhx8Ng==";
};
};
- "apollo-datasource-0.1.2" = {
+ "apollo-datasource-0.1.3" = {
name = "apollo-datasource";
packageName = "apollo-datasource";
- version = "0.1.2";
+ version = "0.1.3";
src = fetchurl {
- url = "https://registry.npmjs.org/apollo-datasource/-/apollo-datasource-0.1.2.tgz";
- sha512 = "AbUxS7Qkz9+T+g19zKRJiA+tBVGVVunzXwd4ftDSYGx1VrF5LJJO7Gc57bk719gWIZneZ02HsVCEZd6NxFF8RQ==";
+ url = "https://registry.npmjs.org/apollo-datasource/-/apollo-datasource-0.1.3.tgz";
+ sha512 = "yEGEe5Cjzqqu5ml1VV3O8+C+thzdknZri9Ny0P3daTGNO+45J3vBOMcmaANeeI2+OOeWxdqUNa5aPOx/35kniw==";
};
};
- "apollo-engine-reporting-0.0.2" = {
+ "apollo-engine-reporting-0.0.3" = {
name = "apollo-engine-reporting";
packageName = "apollo-engine-reporting";
- version = "0.0.2";
+ version = "0.0.3";
src = fetchurl {
- url = "https://registry.npmjs.org/apollo-engine-reporting/-/apollo-engine-reporting-0.0.2.tgz";
- sha512 = "Fe/1oxC8rUXRrBTMUiqs5PSb6hnMOJHuttJMhs83u5POfplc4QrKJZtEEU4Ui8mxeJGaGNWbWf+D4q645xdQLA==";
+ url = "https://registry.npmjs.org/apollo-engine-reporting/-/apollo-engine-reporting-0.0.3.tgz";
+ sha512 = "zkgPDB5w5/v450xOqqcV0/lJuaD1vk0cCeS7pAvaaTPGBGUVpSbZaGcsHUhmh1AJOL0it81u/i/6WVwWS3TJXQ==";
};
};
"apollo-engine-reporting-protobuf-0.0.1" = {
@@ -2380,22 +2416,22 @@ let
sha512 = "jBRnsTgXN0m8yVpumoelaUq9mXR7YpJ3EE+y/alI7zgXY+0qFDqksRApU8dEfg3q6qUnO7rFxRhdG5eyc0+1ig==";
};
};
- "apollo-server-core-2.0.4" = {
+ "apollo-server-core-2.0.5" = {
name = "apollo-server-core";
packageName = "apollo-server-core";
- version = "2.0.4";
+ version = "2.0.5";
src = fetchurl {
- url = "https://registry.npmjs.org/apollo-server-core/-/apollo-server-core-2.0.4.tgz";
- sha512 = "6kNaQYZfX2GvAT1g9ih0rodfRl4hPL1jXb7b+FvQ1foFR5Yyb3oqL2DOcP65gQi/7pGhyNRUAncPU18Vo3u9rQ==";
+ url = "https://registry.npmjs.org/apollo-server-core/-/apollo-server-core-2.0.5.tgz";
+ sha512 = "bGeutygUhajJoc1hcuVWbZfHMn6eh0XBZK8evrnZkzG9zwuPSiJRdEu/sXPIeJ2iX7HbhOpHuMVImbhkPq+Haw==";
};
};
- "apollo-server-env-2.0.2" = {
+ "apollo-server-env-2.0.3" = {
name = "apollo-server-env";
packageName = "apollo-server-env";
- version = "2.0.2";
+ version = "2.0.3";
src = fetchurl {
- url = "https://registry.npmjs.org/apollo-server-env/-/apollo-server-env-2.0.2.tgz";
- sha512 = "LsSh2TSF1Sh+TnKxCv2To+UNTnoPpBGCXn6fPsmiNqVaBaSagfZEU/aaSu3ftMlmfXr4vXAfYNUDMKEi+7E6Bg==";
+ url = "https://registry.npmjs.org/apollo-server-env/-/apollo-server-env-2.0.3.tgz";
+ sha512 = "uIfKFH8n8xKO0eLb9Fa79+s2DdMuVethgznvW6SrOYq5VzgkIIobqKEuZPKa5wObw9CkCyju/+Sr7b7WWMFxUQ==";
};
};
"apollo-server-errors-2.0.2" = {
@@ -2407,22 +2443,22 @@ let
sha512 = "zyWDqAVDCkj9espVsoUpZr9PwDznM8UW6fBfhV+i1br//s2AQb07N6ektZ9pRIEvkhykDZW+8tQbDwAO0vUROg==";
};
};
- "apollo-server-express-2.0.4" = {
+ "apollo-server-express-2.0.5" = {
name = "apollo-server-express";
packageName = "apollo-server-express";
- version = "2.0.4";
+ version = "2.0.5";
src = fetchurl {
- url = "https://registry.npmjs.org/apollo-server-express/-/apollo-server-express-2.0.4.tgz";
- sha512 = "9mxcFpnTgQTmrsvVRRofEY7N1bJYholjv99IfN8puu5lhNqj8ZbOPZYrw+zd+Yh4rZSonwx76ZzTRzM00Yllfw==";
+ url = "https://registry.npmjs.org/apollo-server-express/-/apollo-server-express-2.0.5.tgz";
+ sha512 = "0Bun2wVflgMMhp9+LKz7tuJXIGmnNbWjvNHwxOtLfz3L6tmG+1Y+dLYBPLA7h1bzwYsACFP+glNTYn6/ErL/tA==";
};
};
- "apollo-tracing-0.2.2" = {
+ "apollo-tracing-0.2.3" = {
name = "apollo-tracing";
packageName = "apollo-tracing";
- version = "0.2.2";
+ version = "0.2.3";
src = fetchurl {
- url = "https://registry.npmjs.org/apollo-tracing/-/apollo-tracing-0.2.2.tgz";
- sha512 = "zrpLRvaAqtzGufc1GfV+691xQtzq5elfBydg/7wzuaFszlMH66hkLas5Dw36drUX21CbCljOuGYvYzqSiKykuQ==";
+ url = "https://registry.npmjs.org/apollo-tracing/-/apollo-tracing-0.2.3.tgz";
+ sha512 = "N3CwLGSiTms4BqEz1IpjaJWLNdWiEmdfowU2+vPvvCQj8SN/HuAwK9BxRnr6BH8PD3i5Gzq7tFiMB0D0sN1+LA==";
};
};
"apollo-upload-client-8.1.0" = {
@@ -2452,6 +2488,15 @@ let
sha1 = "7e5dd327747078d877286fbb624b1e8f4d2b396b";
};
};
+ "append-batch-0.0.1" = {
+ name = "append-batch";
+ packageName = "append-batch";
+ version = "0.0.1";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/append-batch/-/append-batch-0.0.1.tgz";
+ sha1 = "9224858e556997ccc07f11f1ee9a128532aa0d25";
+ };
+ };
"append-buffer-1.0.2" = {
name = "append-buffer";
packageName = "append-buffer";
@@ -2493,7 +2538,7 @@ let
packageName = "applicationinsights";
version = "0.16.0";
src = fetchurl {
- url = "https://registry.npmjs.org/applicationinsights/-/applicationinsights-0.16.0.tgz";
+ url = "http://registry.npmjs.org/applicationinsights/-/applicationinsights-0.16.0.tgz";
sha1 = "e02dafb10cf573c19b429793c87797d6404f0ee3";
};
};
@@ -3163,6 +3208,24 @@ let
sha512 = "FadV8UDcyZDjzb6eV7MCJj0bfrNjwKw7/X0QHPFCbYP6T20FXgZCYXpJKlQC8RxEQP1E6Xs8pNHdh3bcrZAuAw==";
};
};
+ "async-single-1.0.5" = {
+ name = "async-single";
+ packageName = "async-single";
+ version = "1.0.5";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/async-single/-/async-single-1.0.5.tgz";
+ sha1 = "125dd09de95d3ea30a378adbed021092179b03c9";
+ };
+ };
+ "async-write-2.1.0" = {
+ name = "async-write";
+ packageName = "async-write";
+ version = "2.1.0";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/async-write/-/async-write-2.1.0.tgz";
+ sha1 = "1e762817d849ce44bfac07925a42036787061b15";
+ };
+ };
"asynckit-0.4.0" = {
name = "asynckit";
packageName = "asynckit";
@@ -3172,6 +3235,15 @@ let
sha1 = "c79ed97f7f34cb8f2ba1bc9790bcc366474b4b79";
};
};
+ "asyncmemo-1.0.0" = {
+ name = "asyncmemo";
+ packageName = "asyncmemo";
+ version = "1.0.0";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/asyncmemo/-/asyncmemo-1.0.0.tgz";
+ sha1 = "ef249dc869d6c07e7dfd4a22c8a18850bb39d7f1";
+ };
+ };
"atob-2.1.2" = {
name = "atob";
packageName = "atob";
@@ -3190,6 +3262,33 @@ let
sha1 = "d16901d10ccec59516c197b9ccd8930689b813b4";
};
};
+ "atomic-file-0.0.1" = {
+ name = "atomic-file";
+ packageName = "atomic-file";
+ version = "0.0.1";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/atomic-file/-/atomic-file-0.0.1.tgz";
+ sha1 = "6c36658f6c4ece33fba3877731e7c25fc82999bb";
+ };
+ };
+ "atomic-file-1.1.5" = {
+ name = "atomic-file";
+ packageName = "atomic-file";
+ version = "1.1.5";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/atomic-file/-/atomic-file-1.1.5.tgz";
+ sha512 = "TG+5YFiaKQ6CZiSQsosGMJ/IJzwMZ4V/rSdEXlD6+DwKyv8OyeUcprq34kp4yuS6bfQYXhxBC2Vm8PWo+iKBGQ==";
+ };
+ };
+ "attach-ware-1.1.1" = {
+ name = "attach-ware";
+ packageName = "attach-ware";
+ version = "1.1.1";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/attach-ware/-/attach-ware-1.1.1.tgz";
+ sha1 = "28f51393dd8bb8bdaad972342519bf09621a35a3";
+ };
+ };
"auto-bind-1.2.1" = {
name = "auto-bind";
packageName = "auto-bind";
@@ -3204,17 +3303,17 @@ let
packageName = "aws-sdk";
version = "1.18.0";
src = fetchurl {
- url = "https://registry.npmjs.org/aws-sdk/-/aws-sdk-1.18.0.tgz";
+ url = "http://registry.npmjs.org/aws-sdk/-/aws-sdk-1.18.0.tgz";
sha1 = "00f35b2d27ac91b1f0d3ef2084c98cf1d1f0adc3";
};
};
- "aws-sdk-2.303.0" = {
+ "aws-sdk-2.307.0" = {
name = "aws-sdk";
packageName = "aws-sdk";
- version = "2.303.0";
+ version = "2.307.0";
src = fetchurl {
- url = "https://registry.npmjs.org/aws-sdk/-/aws-sdk-2.303.0.tgz";
- sha512 = "3AMEO/+aKNKvnIg1StF30Itbhs1SdUrUirCqlggS4bhLLOvyJVTrY+tJwASnPGsye4ffD6Qw8LRnaCytvDKkoQ==";
+ url = "https://registry.npmjs.org/aws-sdk/-/aws-sdk-2.307.0.tgz";
+ sha512 = "+RTDZvmn2tlyCUCUQvbj7XN3ZtSiqoSuxvQQCqXlrGxUvGbQ9wO4I3zcKQRlSsp1OGBgr5+jgBVjzEPLPGlxOg==";
};
};
"aws-sign-0.2.1" = {
@@ -3384,7 +3483,7 @@ let
packageName = "azure-arm-network";
version = "5.3.0";
src = fetchurl {
- url = "https://registry.npmjs.org/azure-arm-network/-/azure-arm-network-5.3.0.tgz";
+ url = "http://registry.npmjs.org/azure-arm-network/-/azure-arm-network-5.3.0.tgz";
sha512 = "juitxBWofPBZ+kcmLB8OjW5qPD6+/Ncdq86WjDTIUcH+cyb/GWktdDymv6adbOyz4xZ9/wbThFL7AHgq8cHBig==";
};
};
@@ -3447,7 +3546,7 @@ let
packageName = "azure-arm-website";
version = "0.11.5";
src = fetchurl {
- url = "https://registry.npmjs.org/azure-arm-website/-/azure-arm-website-0.11.5.tgz";
+ url = "http://registry.npmjs.org/azure-arm-website/-/azure-arm-website-0.11.5.tgz";
sha1 = "51942423e1238ec19e551926353a8e9f73bc534a";
};
};
@@ -3672,7 +3771,7 @@ let
packageName = "babel-plugin-syntax-jsx";
version = "6.18.0";
src = fetchurl {
- url = "https://registry.npmjs.org/babel-plugin-syntax-jsx/-/babel-plugin-syntax-jsx-6.18.0.tgz";
+ url = "http://registry.npmjs.org/babel-plugin-syntax-jsx/-/babel-plugin-syntax-jsx-6.18.0.tgz";
sha1 = "0af32a9a6e13ca7a3fd5069e62d7b0f58d0d8946";
};
};
@@ -3681,7 +3780,7 @@ let
packageName = "babel-plugin-syntax-object-rest-spread";
version = "6.13.0";
src = fetchurl {
- url = "https://registry.npmjs.org/babel-plugin-syntax-object-rest-spread/-/babel-plugin-syntax-object-rest-spread-6.13.0.tgz";
+ url = "http://registry.npmjs.org/babel-plugin-syntax-object-rest-spread/-/babel-plugin-syntax-object-rest-spread-6.13.0.tgz";
sha1 = "fd6536f2bce13836ffa3a5458c4903a597bb3bf5";
};
};
@@ -3717,7 +3816,7 @@ let
packageName = "babel-polyfill";
version = "6.16.0";
src = fetchurl {
- url = "https://registry.npmjs.org/babel-polyfill/-/babel-polyfill-6.16.0.tgz";
+ url = "http://registry.npmjs.org/babel-polyfill/-/babel-polyfill-6.16.0.tgz";
sha1 = "2d45021df87e26a374b6d4d1a9c65964d17f2422";
};
};
@@ -3829,6 +3928,15 @@ let
sha1 = "f616eda9d3e4b66b8ca7fca79f695722c5f8e26f";
};
};
+ "bail-1.0.3" = {
+ name = "bail";
+ packageName = "bail";
+ version = "1.0.3";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/bail/-/bail-1.0.3.tgz";
+ sha512 = "1X8CnjFVQ+a+KW36uBNMTU5s8+v5FzeqrP7hTG5aTb4aPreSbZJlhwPon9VKMuEVgV++JM+SQrALY3kr7eswdg==";
+ };
+ };
"balanced-match-1.0.0" = {
name = "balanced-match";
packageName = "balanced-match";
@@ -3928,6 +4036,15 @@ let
sha1 = "199fd661702a0e7b7dcae6e0698bb089c52f6d78";
};
};
+ "base64-url-2.2.0" = {
+ name = "base64-url";
+ packageName = "base64-url";
+ version = "2.2.0";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/base64-url/-/base64-url-2.2.0.tgz";
+ sha512 = "Y4qHHAE+rWjmAFPQmHPiiD+hWwM/XvuFLlP6kVxlwZJK7rjiE2uIQR9tZ37iEr1E6iCj9799yxMAmiXzITb3lQ==";
+ };
+ };
"base64id-0.1.0" = {
name = "base64id";
packageName = "base64id";
@@ -3946,6 +4063,15 @@ let
sha1 = "47688cb99bb6804f0e06d3e763b1c32e57d8e6b6";
};
};
+ "bash-color-0.0.4" = {
+ name = "bash-color";
+ packageName = "bash-color";
+ version = "0.0.4";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/bash-color/-/bash-color-0.0.4.tgz";
+ sha1 = "e9be8ce33540cada4881768c59bd63865736e913";
+ };
+ };
"basic-auth-1.0.4" = {
name = "basic-auth";
packageName = "basic-auth";
@@ -4108,13 +4234,13 @@ let
sha1 = "159a49b9a9714c1fb102f2e0ed1906fab6a450f4";
};
};
- "big-integer-1.6.34" = {
+ "big-integer-1.6.35" = {
name = "big-integer";
packageName = "big-integer";
- version = "1.6.34";
+ version = "1.6.35";
src = fetchurl {
- url = "https://registry.npmjs.org/big-integer/-/big-integer-1.6.34.tgz";
- sha512 = "+w6B0Uo0ZvTSzDkXjoBCTNK0oe+aVL+yPi7kwGZm8hd8+Nj1AFPoxoq1Bl/mEu/G/ivOkUc1LRqVR0XeWFUzuA==";
+ url = "https://registry.npmjs.org/big-integer/-/big-integer-1.6.35.tgz";
+ sha512 = "jqLsX6dzmPHOhApAUyGwrpzqn3DXpdTqbOM6baPys7A423ys7IsTpcucDVGP0PmzxGsPYbW3xVOJ4SxAzI0vqQ==";
};
};
"big.js-3.2.0" = {
@@ -4248,7 +4374,7 @@ let
packageName = "bittorrent-dht";
version = "6.4.2";
src = fetchurl {
- url = "https://registry.npmjs.org/bittorrent-dht/-/bittorrent-dht-6.4.2.tgz";
+ url = "http://registry.npmjs.org/bittorrent-dht/-/bittorrent-dht-6.4.2.tgz";
sha1 = "8b40f8cee6bea87f2b34fd2ae0bd367a8b1247a6";
};
};
@@ -4261,13 +4387,13 @@ let
sha512 = "fvb6M58Ceiv/S94nu6zeaiMoJvUYOeIqRbgaClm+kJTzCAqJPtAR/31pXNYB5iEReOoKqQB5zY33gY0W6ZRWQQ==";
};
};
- "bittorrent-dht-8.4.0" = {
+ "bittorrent-dht-9.0.0" = {
name = "bittorrent-dht";
packageName = "bittorrent-dht";
- version = "8.4.0";
+ version = "9.0.0";
src = fetchurl {
- url = "https://registry.npmjs.org/bittorrent-dht/-/bittorrent-dht-8.4.0.tgz";
- sha512 = "FRe/+MYBePev7Yb+BXSclkVuDxb/w+gUbao6nVHYQRaKO7aXE+ARRlL3phqm6Rdhw5CRVoLMbLd49nxmCuUhUQ==";
+ url = "https://registry.npmjs.org/bittorrent-dht/-/bittorrent-dht-9.0.0.tgz";
+ sha512 = "X5ax4G/PLtEPfqOUjqDZ2nmPENndWRMK4sT2jcQ4sXor904zhR40r4KqTyTvWYAljh5/hPPqM9DCUUtqWzRXoQ==";
};
};
"bittorrent-peerid-1.3.0" = {
@@ -4360,6 +4486,15 @@ let
sha512 = "oFIHvXhlz/DUgF0kq5B1CqxIDjIJwh9iDeUUGQUcvgiGz7Wdw03McEO7CfLBy7QKGdsydcMCgO9jFNBAFCtFcA==";
};
};
+ "blake2s-1.0.1" = {
+ name = "blake2s";
+ packageName = "blake2s";
+ version = "1.0.1";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/blake2s/-/blake2s-1.0.1.tgz";
+ sha1 = "1598822a320ece6aa401ba982954f82f61b0cd7b";
+ };
+ };
"blob-0.0.2" = {
name = "blob";
packageName = "blob";
@@ -4410,7 +4545,7 @@ let
packageName = "bluebird";
version = "2.9.34";
src = fetchurl {
- url = "https://registry.npmjs.org/bluebird/-/bluebird-2.9.34.tgz";
+ url = "http://registry.npmjs.org/bluebird/-/bluebird-2.9.34.tgz";
sha1 = "2f7b4ec80216328a9fddebdf69c8d4942feff7d8";
};
};
@@ -4419,17 +4554,17 @@ let
packageName = "bluebird";
version = "2.9.9";
src = fetchurl {
- url = "https://registry.npmjs.org/bluebird/-/bluebird-2.9.9.tgz";
+ url = "http://registry.npmjs.org/bluebird/-/bluebird-2.9.9.tgz";
sha1 = "61a26904d43d7f6b19dff7ed917dbc92452ad6d3";
};
};
- "bluebird-3.5.1" = {
+ "bluebird-3.5.2" = {
name = "bluebird";
packageName = "bluebird";
- version = "3.5.1";
+ version = "3.5.2";
src = fetchurl {
- url = "https://registry.npmjs.org/bluebird/-/bluebird-3.5.1.tgz";
- sha512 = "MKiLiV+I1AA596t9w1sQJ8jkiSr5+ZKi0WKrYGUn6d1Fx+Ij4tIj+m2WMQSGczs5jZVxV339chE8iwk6F64wjA==";
+ url = "https://registry.npmjs.org/bluebird/-/bluebird-3.5.2.tgz";
+ sha512 = "dhHTWMI7kMx5whMQntl7Vr9C6BvV10lFXDAasnqnrMYhXVCzzk6IO9Fo2L75jXHT07WrOngL1WDXOp+yYS91Yg==";
};
};
"blueimp-md5-2.10.0" = {
@@ -4684,6 +4819,15 @@ let
sha512 = "aNdbnj9P8PjdXU4ybaWLK2IF3jc/EoDYbC7AazW6to3TRsfXxscC9UXOB5iDiEQrkyIbWp2SLQda4+QAa7nc3w==";
};
};
+ "broadcast-stream-0.2.2" = {
+ name = "broadcast-stream";
+ packageName = "broadcast-stream";
+ version = "0.2.2";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/broadcast-stream/-/broadcast-stream-0.2.2.tgz";
+ sha1 = "79e7bb14a9abba77f72ac9258220242a8fd3919d";
+ };
+ };
"broadway-0.3.6" = {
name = "broadway";
packageName = "broadway";
@@ -4878,7 +5022,7 @@ let
packageName = "buffer";
version = "3.6.0";
src = fetchurl {
- url = "https://registry.npmjs.org/buffer/-/buffer-3.6.0.tgz";
+ url = "http://registry.npmjs.org/buffer/-/buffer-3.6.0.tgz";
sha1 = "a72c936f77b96bf52f5f7e7b467180628551defb";
};
};
@@ -4887,17 +5031,17 @@ let
packageName = "buffer";
version = "4.9.1";
src = fetchurl {
- url = "https://registry.npmjs.org/buffer/-/buffer-4.9.1.tgz";
+ url = "http://registry.npmjs.org/buffer/-/buffer-4.9.1.tgz";
sha1 = "6d1bb601b07a4efced97094132093027c95bc298";
};
};
- "buffer-5.2.0" = {
+ "buffer-5.2.1" = {
name = "buffer";
packageName = "buffer";
- version = "5.2.0";
+ version = "5.2.1";
src = fetchurl {
- url = "https://registry.npmjs.org/buffer/-/buffer-5.2.0.tgz";
- sha512 = "nUJyfChH7PMJy75eRDCCKtszSEFokUNXC1hNVSe+o+VdcgvDPLs20k3v8UXI8ruRYAJiYtyRea8mYyqPxoHWDw==";
+ url = "https://registry.npmjs.org/buffer/-/buffer-5.2.1.tgz";
+ sha512 = "c+Ko0loDaFfuPWiL02ls9Xd3GO3cPVmUobQ6t3rXNUk304u6hGq+8N/kFi+QEIKhzK3uwolVhLzszmfLmMLnqg==";
};
};
"buffer-alloc-1.2.0" = {
@@ -5476,13 +5620,13 @@ let
sha1 = "a2aa5fb1af688758259c32c141426d78923b9b77";
};
};
- "capture-stack-trace-1.0.0" = {
+ "capture-stack-trace-1.0.1" = {
name = "capture-stack-trace";
packageName = "capture-stack-trace";
- version = "1.0.0";
+ version = "1.0.1";
src = fetchurl {
- url = "https://registry.npmjs.org/capture-stack-trace/-/capture-stack-trace-1.0.0.tgz";
- sha1 = "4a6fa07399c26bba47f0b2496b4d0fb408c5550d";
+ url = "https://registry.npmjs.org/capture-stack-trace/-/capture-stack-trace-1.0.1.tgz";
+ sha512 = "mYQLZnx5Qt1JgB1WEiMCf2647plpGeQ2NMR/5L0HNZzGQo4fuSPnK+wjfPnKZV0aiJDgzmWqqkV/g7JD+DW0qw==";
};
};
"caseless-0.11.0" = {
@@ -5539,6 +5683,15 @@ let
sha512 = "Cg8/ZSBEa8ZVY9HspcGUYaK63d/bN7rqS3CYCzEGUxuYv6UlmcjzDUz2fCFFHyTvUW5Pk0I+3hkA3iXlIj6guA==";
};
};
+ "ccount-1.0.3" = {
+ name = "ccount";
+ packageName = "ccount";
+ version = "1.0.3";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/ccount/-/ccount-1.0.3.tgz";
+ sha512 = "Jt9tIBkRc9POUof7QA/VwWd+58fKkEEfI+/t1/eOlxKM7ZhrczNzMFefge7Ai+39y1pR/pP6cI19guHy3FSLmw==";
+ };
+ };
"center-align-0.1.3" = {
name = "center-align";
packageName = "center-align";
@@ -5580,7 +5733,7 @@ let
packageName = "chalk";
version = "0.4.0";
src = fetchurl {
- url = "https://registry.npmjs.org/chalk/-/chalk-0.4.0.tgz";
+ url = "http://registry.npmjs.org/chalk/-/chalk-0.4.0.tgz";
sha1 = "5199a3ddcd0c1efe23bc08c1b027b06176e0c64f";
};
};
@@ -5589,7 +5742,7 @@ let
packageName = "chalk";
version = "0.5.1";
src = fetchurl {
- url = "https://registry.npmjs.org/chalk/-/chalk-0.5.1.tgz";
+ url = "http://registry.npmjs.org/chalk/-/chalk-0.5.1.tgz";
sha1 = "663b3a648b68b55d04690d49167aa837858f2174";
};
};
@@ -5598,7 +5751,7 @@ let
packageName = "chalk";
version = "1.0.0";
src = fetchurl {
- url = "https://registry.npmjs.org/chalk/-/chalk-1.0.0.tgz";
+ url = "http://registry.npmjs.org/chalk/-/chalk-1.0.0.tgz";
sha1 = "b3cf4ed0ff5397c99c75b8f679db2f52831f96dc";
};
};
@@ -5607,7 +5760,7 @@ let
packageName = "chalk";
version = "1.1.3";
src = fetchurl {
- url = "https://registry.npmjs.org/chalk/-/chalk-1.1.3.tgz";
+ url = "http://registry.npmjs.org/chalk/-/chalk-1.1.3.tgz";
sha1 = "a8115c55e4a702fe4d150abd3872822a7e09fc98";
};
};
@@ -5625,7 +5778,7 @@ let
packageName = "chalk";
version = "2.3.1";
src = fetchurl {
- url = "https://registry.npmjs.org/chalk/-/chalk-2.3.1.tgz";
+ url = "http://registry.npmjs.org/chalk/-/chalk-2.3.1.tgz";
sha512 = "QUU4ofkDoMIVO7hcx1iPTISs88wsO8jA92RQIm4JAwZvFGGAV2hSAA1NX7oVj2Ej2Q6NDTcRDjPTFrMCRZoJ6g==";
};
};
@@ -5656,6 +5809,33 @@ let
sha512 = "Mww+SLF6MZ0U6kdg11algyKd5BARbyM4TbFBepwowYSR5ClfQGCGtxNXgykpN0uF/bstWeaGDT4JWaDh8zWAHA==";
};
};
+ "character-entities-1.2.2" = {
+ name = "character-entities";
+ packageName = "character-entities";
+ version = "1.2.2";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/character-entities/-/character-entities-1.2.2.tgz";
+ sha512 = "sMoHX6/nBiy3KKfC78dnEalnpn0Az0oSNvqUWYTtYrhRI5iUIYsROU48G+E+kMFQzqXaJ8kHJZ85n7y6/PHgwQ==";
+ };
+ };
+ "character-entities-html4-1.1.2" = {
+ name = "character-entities-html4";
+ packageName = "character-entities-html4";
+ version = "1.1.2";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/character-entities-html4/-/character-entities-html4-1.1.2.tgz";
+ sha512 = "sIrXwyna2+5b0eB9W149izTPJk/KkJTg6mEzDGibwBUkyH1SbDa+nf515Ppdi3MaH35lW0JFJDWeq9Luzes1Iw==";
+ };
+ };
+ "character-entities-legacy-1.1.2" = {
+ name = "character-entities-legacy";
+ packageName = "character-entities-legacy";
+ version = "1.1.2";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/character-entities-legacy/-/character-entities-legacy-1.1.2.tgz";
+ sha512 = "9NB2VbXtXYWdXzqrvAHykE/f0QJxzaKIpZ5QzNZrrgQ7Iyxr2vnfS8fCBNVW9nUEZE0lo57nxKRqnzY/dKrwlA==";
+ };
+ };
"character-parser-1.2.1" = {
name = "character-parser";
packageName = "character-parser";
@@ -5674,6 +5854,15 @@ let
sha1 = "c7ce28f36d4bcd9744e5ffc2c5fcde1c73261fc0";
};
};
+ "character-reference-invalid-1.1.2" = {
+ name = "character-reference-invalid";
+ packageName = "character-reference-invalid";
+ version = "1.1.2";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/character-reference-invalid/-/character-reference-invalid-1.1.2.tgz";
+ sha512 = "7I/xceXfKyUJmSAn/jw8ve/9DyOP7XxufNYLI9Px7CmsKgEUaZLUTax6nZxGQtaoiZCjpu6cHPj20xC/vqRReQ==";
+ };
+ };
"chardet-0.4.2" = {
name = "chardet";
packageName = "chardet";
@@ -5683,13 +5872,13 @@ let
sha1 = "b5473b33dc97c424e5d98dc87d55d4d8a29c8bf2";
};
};
- "chardet-0.5.0" = {
+ "chardet-0.7.0" = {
name = "chardet";
packageName = "chardet";
- version = "0.5.0";
+ version = "0.7.0";
src = fetchurl {
- url = "https://registry.npmjs.org/chardet/-/chardet-0.5.0.tgz";
- sha512 = "9ZTaoBaePSCFvNlNGrsyI8ZVACP2svUtq0DkM7t4K2ClAa96sqOIRjAzDTc8zXzFt1cZR46rRzLTiHFSJ+Qw0g==";
+ url = "https://registry.npmjs.org/chardet/-/chardet-0.7.0.tgz";
+ sha512 = "mT8iDcrh03qDGRRmoA2hmBJnxpllMR+0/0qlzjqZES6NdiWDcZkCNAk4rPFZ9Q85r27unkiNNg8ZOiwZXBHwcA==";
};
};
"charenc-0.0.2" = {
@@ -5701,6 +5890,15 @@ let
sha1 = "c0a1d2f3a7092e03774bfa83f14c0fc5790a8667";
};
};
+ "charwise-3.0.1" = {
+ name = "charwise";
+ packageName = "charwise";
+ version = "3.0.1";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/charwise/-/charwise-3.0.1.tgz";
+ sha512 = "RcdumNsM6fJZ5HHbYunqj2bpurVRGsXour3OR+SlLEHFhG6ALm54i6Osnh+OvO7kEoSBzwExpblYFH8zKQiEPw==";
+ };
+ };
"check-error-1.0.2" = {
name = "check-error";
packageName = "check-error";
@@ -5746,6 +5944,24 @@ let
sha1 = "4b9f53a81b27e4d5dac31c0ffd0cfa03cc6830db";
};
};
+ "chloride-2.2.10" = {
+ name = "chloride";
+ packageName = "chloride";
+ version = "2.2.10";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/chloride/-/chloride-2.2.10.tgz";
+ sha512 = "CbU1ISGiB2JBV6PDXx7hkl8D94d2TPD1BANUMFbr8rZYKJi8De2d3Hu2XDIOLAhXf+8yhoFOdjtLG6fxz3QByQ==";
+ };
+ };
+ "chloride-test-1.2.2" = {
+ name = "chloride-test";
+ packageName = "chloride-test";
+ version = "1.2.2";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/chloride-test/-/chloride-test-1.2.2.tgz";
+ sha1 = "178686a85e9278045112e96e8c791793f9a10aea";
+ };
+ };
"chmodr-1.0.2" = {
name = "chmodr";
packageName = "chmodr";
@@ -5953,15 +6169,6 @@ let
sha1 = "9e821501ae979986c46b1d66d2d432db2fd4ae31";
};
};
- "cli-0.6.6" = {
- name = "cli";
- packageName = "cli";
- version = "0.6.6";
- src = fetchurl {
- url = "https://registry.npmjs.org/cli/-/cli-0.6.6.tgz";
- sha1 = "02ad44a380abf27adac5e6f0cdd7b043d74c53e3";
- };
- };
"cli-1.0.1" = {
name = "cli";
packageName = "cli";
@@ -6412,6 +6619,15 @@ let
sha1 = "6355d32cf1b04cdff6b484e5e711782b2f0c39be";
};
};
+ "collapse-white-space-1.0.4" = {
+ name = "collapse-white-space";
+ packageName = "collapse-white-space";
+ version = "1.0.4";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/collapse-white-space/-/collapse-white-space-1.0.4.tgz";
+ sha512 = "YfQ1tAUZm561vpYD+5eyWN8+UsceQbSrqqlc/6zDY2gtAE+uZLSdkkovhnGpmCThsvKBFakq4EdY/FF93E8XIw==";
+ };
+ };
"collection-visit-1.0.0" = {
name = "collection-visit";
packageName = "collection-visit";
@@ -7177,6 +7393,15 @@ let
sha1 = "75b91fa9f16663e51f98e863af995b9164068c1a";
};
};
+ "cont-1.0.3" = {
+ name = "cont";
+ packageName = "cont";
+ version = "1.0.3";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/cont/-/cont-1.0.3.tgz";
+ sha1 = "6874f1e935fca99d048caeaaad9a0aeb020bcce0";
+ };
+ };
"content-disposition-0.5.0" = {
name = "content-disposition";
packageName = "content-disposition";
@@ -7223,6 +7448,60 @@ let
sha1 = "0e790b3abfef90f6ecb77ae8585db9099caf7578";
};
};
+ "continuable-1.1.8" = {
+ name = "continuable";
+ packageName = "continuable";
+ version = "1.1.8";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/continuable/-/continuable-1.1.8.tgz";
+ sha1 = "dc877b474160870ae3bcde87336268ebe50597d5";
+ };
+ };
+ "continuable-1.2.0" = {
+ name = "continuable";
+ packageName = "continuable";
+ version = "1.2.0";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/continuable/-/continuable-1.2.0.tgz";
+ sha1 = "08277468d41136200074ccf87294308d169f25b6";
+ };
+ };
+ "continuable-hash-0.1.4" = {
+ name = "continuable-hash";
+ packageName = "continuable-hash";
+ version = "0.1.4";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/continuable-hash/-/continuable-hash-0.1.4.tgz";
+ sha1 = "81c74d41771d8c92783e1e00e5f11b34d6dfc78c";
+ };
+ };
+ "continuable-list-0.1.6" = {
+ name = "continuable-list";
+ packageName = "continuable-list";
+ version = "0.1.6";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/continuable-list/-/continuable-list-0.1.6.tgz";
+ sha1 = "87cf06ec580716e10dff95fb0b84c5f0e8acac5f";
+ };
+ };
+ "continuable-para-1.2.0" = {
+ name = "continuable-para";
+ packageName = "continuable-para";
+ version = "1.2.0";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/continuable-para/-/continuable-para-1.2.0.tgz";
+ sha1 = "445510f649459dd0fc35c872015146122731c583";
+ };
+ };
+ "continuable-series-1.2.0" = {
+ name = "continuable-series";
+ packageName = "continuable-series";
+ version = "1.2.0";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/continuable-series/-/continuable-series-1.2.0.tgz";
+ sha1 = "3243397ae93a71d655b3026834a51590b958b9e8";
+ };
+ };
"conventional-changelog-angular-1.6.6" = {
name = "conventional-changelog-angular";
packageName = "conventional-changelog-angular";
@@ -7718,13 +7997,13 @@ let
sha512 = "MJG9liiZ+ogc4TzUwuvbER1JRdgvUFSB5+VR/g5h82fGaIRWMWddtKBHi7/sVhfjQZ6SehlyhvQYrcYkaUIpLg==";
};
};
- "create-torrent-3.32.1" = {
+ "create-torrent-3.33.0" = {
name = "create-torrent";
packageName = "create-torrent";
- version = "3.32.1";
+ version = "3.33.0";
src = fetchurl {
- url = "https://registry.npmjs.org/create-torrent/-/create-torrent-3.32.1.tgz";
- sha512 = "8spZUeFyVc+2mGnWBRTuLOhuHmHrmUomFWf7QvxztCEvTpn5SIrvF8F+HKdkzBPM9B7v/2w+f/65jqLWBXSndg==";
+ url = "https://registry.npmjs.org/create-torrent/-/create-torrent-3.33.0.tgz";
+ sha512 = "KMd0KuvwVUg1grlRd5skG9ZkSbBYDDkAjDUMLnvxdRn0rL7ph3IwoOk7I8u1yLX4HYjGiLVlWYO55YWNNPjJFA==";
};
};
"cron-1.3.0" = {
@@ -8006,13 +8285,13 @@ let
sha1 = "a6602dff7e04a8306dc0db9a551e92e8b5662ad8";
};
};
- "csslint-0.10.0" = {
+ "csslint-1.0.5" = {
name = "csslint";
packageName = "csslint";
- version = "0.10.0";
+ version = "1.0.5";
src = fetchurl {
- url = "https://registry.npmjs.org/csslint/-/csslint-0.10.0.tgz";
- sha1 = "3a6a04e7565c8e9d19beb49767c7ec96e8365805";
+ url = "https://registry.npmjs.org/csslint/-/csslint-1.0.5.tgz";
+ sha1 = "19cc3eda322160fd3f7232af1cb2a360e898a2e9";
};
};
"csso-3.5.1" = {
@@ -8798,6 +9077,15 @@ let
sha1 = "2cef1f111e1c57870d8bbb8af2650e587cd2f5b4";
};
};
+ "deferred-leveldown-3.0.0" = {
+ name = "deferred-leveldown";
+ packageName = "deferred-leveldown";
+ version = "3.0.0";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/deferred-leveldown/-/deferred-leveldown-3.0.0.tgz";
+ sha512 = "ajbXqRPMXRlcdyt0TuWqknOJkp1JgQjGB7xOl2V+ebol7/U11E9h3/nCZAtN1M7djmAJEIhypCUc1tIWxdQAuQ==";
+ };
+ };
"define-properties-1.1.3" = {
name = "define-properties";
packageName = "define-properties";
@@ -9014,6 +9302,15 @@ let
sha1 = "978857442c44749e4206613e37946205826abd80";
};
};
+ "detab-1.0.2" = {
+ name = "detab";
+ packageName = "detab";
+ version = "1.0.2";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/detab/-/detab-1.0.2.tgz";
+ sha1 = "01bc2a4abe7bc7cc67c3039808edbae47049a0ee";
+ };
+ };
"detect-file-1.0.0" = {
name = "detect-file";
packageName = "detect-file";
@@ -9221,13 +9518,13 @@ let
sha1 = "57ddacb47324ae5f58d2cc0da886db4ce9eeb718";
};
};
- "dispensary-0.21.0" = {
+ "dispensary-0.22.0" = {
name = "dispensary";
packageName = "dispensary";
- version = "0.21.0";
+ version = "0.22.0";
src = fetchurl {
- url = "https://registry.npmjs.org/dispensary/-/dispensary-0.21.0.tgz";
- sha512 = "p7qK1sLukrOGYVVcea63lN9CSiE8wO61cweOjtG6MnKoeC9uKHRIO1iJuE5izcX0BeimhkqrQwEMrFWC1yOyAw==";
+ url = "https://registry.npmjs.org/dispensary/-/dispensary-0.22.0.tgz";
+ sha512 = "iwpIOQ4T+fJ55PAPE4G7b8MubUN8dGyZa78VrD6A+XqSnqs844npoGvpwSEETnn064JaaS4gqLcgAfTGR4p2+g==";
};
};
"diveSync-0.3.0" = {
@@ -9716,13 +10013,22 @@ let
sha1 = "1c595000f04a8897dfb85000892a0f4c33af86c3";
};
};
- "ecstatic-3.2.1" = {
+ "ecstatic-3.3.0" = {
name = "ecstatic";
packageName = "ecstatic";
- version = "3.2.1";
+ version = "3.3.0";
src = fetchurl {
- url = "https://registry.npmjs.org/ecstatic/-/ecstatic-3.2.1.tgz";
- sha512 = "BAdHx9LOCG1fwxY8MIydUBskl8UUQrYeC3WE14FA1DPlBzqoG1aOgEkypcSpmiiel8RAj8gW1s40RrclfrpGUg==";
+ url = "https://registry.npmjs.org/ecstatic/-/ecstatic-3.3.0.tgz";
+ sha512 = "EblWYTd+wPIAMQ0U4oYJZ7QBypT9ZUIwpqli0bKDjeIIQnXDBK2dXtZ9yzRCOlkW1HkO8gn7/FxLK1yPIW17pw==";
+ };
+ };
+ "ed2curve-0.1.4" = {
+ name = "ed2curve";
+ packageName = "ed2curve";
+ version = "0.1.4";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/ed2curve/-/ed2curve-0.1.4.tgz";
+ sha1 = "94a44248bb87da35db0eff7af0aa576168117f59";
};
};
"editions-1.3.4" = {
@@ -9734,13 +10040,13 @@ let
sha512 = "gzao+mxnYDzIysXKMQi/+M1mjy/rjestjg6OPoYTtI+3Izp23oiGZitsl9lPDPiTGXbcSIk1iJWhliSaglxnUg==";
};
};
- "editions-2.0.1" = {
+ "editions-2.0.2" = {
name = "editions";
packageName = "editions";
- version = "2.0.1";
+ version = "2.0.2";
src = fetchurl {
- url = "https://registry.npmjs.org/editions/-/editions-2.0.1.tgz";
- sha512 = "GNBqG7eF4lxz/jPGM1A/oazdRW9D86OMeggfvCXuA9kcxBJ8fcWO1O8q73pepQlwR8+KecxrgGduwdNeZJ0R9Q==";
+ url = "https://registry.npmjs.org/editions/-/editions-2.0.2.tgz";
+ sha512 = "0B8aSTWUu9+JW99zHoeogavCi+lkE5l35FK0OKe0pCobixJYoeof3ZujtqYzSsU2MskhRadY5V9oWUuyG4aJ3A==";
};
};
"editor-1.0.0" = {
@@ -9861,6 +10167,15 @@ let
sha256 = "0eae744826723877457f7a7ac7f31d68a5a060673b3a883f6a8e325bf48f313d";
};
};
+ "emoji-named-characters-1.0.2" = {
+ name = "emoji-named-characters";
+ packageName = "emoji-named-characters";
+ version = "1.0.2";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/emoji-named-characters/-/emoji-named-characters-1.0.2.tgz";
+ sha1 = "cdeb36d0e66002c4b9d7bf1dfbc3a199fb7d409b";
+ };
+ };
"emoji-regex-6.1.1" = {
name = "emoji-regex";
packageName = "emoji-regex";
@@ -9870,6 +10185,15 @@ let
sha1 = "c6cd0ec1b0642e2a3c67a1137efc5e796da4f88e";
};
};
+ "emoji-server-1.0.0" = {
+ name = "emoji-server";
+ packageName = "emoji-server";
+ version = "1.0.0";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/emoji-server/-/emoji-server-1.0.0.tgz";
+ sha1 = "d063cfee9af118cc5aeefbc2e9b3dd5085815c63";
+ };
+ };
"emojis-list-2.1.0" = {
name = "emojis-list";
packageName = "emojis-list";
@@ -9906,6 +10230,15 @@ let
sha1 = "538b66f3ee62cd1ab51ec323829d1f9480c74beb";
};
};
+ "encoding-down-4.0.1" = {
+ name = "encoding-down";
+ packageName = "encoding-down";
+ version = "4.0.1";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/encoding-down/-/encoding-down-4.0.1.tgz";
+ sha512 = "AlSE+ugBIpLL0i9if2SlnOZ4oWj/XvBb8tw2Ie/pFB73vdYs5O/6plRyqIgjbZbz8onaL20AAuMP87LWbP56IQ==";
+ };
+ };
"end-of-stream-0.1.5" = {
name = "end-of-stream";
packageName = "end-of-stream";
@@ -10113,6 +10446,15 @@ let
sha512 = "yqKl+qfQ849zLua/aRGIs4TzNah6ypvdX6KPmK9LPP54Ea+Hqx2gFzSBmGhka8HvWcmCmffGIshG4INSh0ku6g==";
};
};
+ "epidemic-broadcast-trees-6.3.4" = {
+ name = "epidemic-broadcast-trees";
+ packageName = "epidemic-broadcast-trees";
+ version = "6.3.4";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/epidemic-broadcast-trees/-/epidemic-broadcast-trees-6.3.4.tgz";
+ sha512 = "ucs3AI3ebPCDFGw8B0SUBwzcY2WqKrbJeqYeeX9KF+XvsO7GFEe0L+1hXPfJcEScfGPByXJNACkYwUFnNaOueQ==";
+ };
+ };
"err-code-1.1.2" = {
name = "err-code";
packageName = "err-code";
@@ -10437,13 +10779,13 @@ let
sha512 = "D5nG2rErquLUstgUaxJlWB5+gu+U/3VDY0fk/Iuq8y9CUFy/7Y6oF4N2cR1tV8knzQvciIbfqfohd359xTLIKQ==";
};
};
- "eslint-5.4.0" = {
+ "eslint-5.5.0" = {
name = "eslint";
packageName = "eslint";
- version = "5.4.0";
+ version = "5.5.0";
src = fetchurl {
- url = "https://registry.npmjs.org/eslint/-/eslint-5.4.0.tgz";
- sha512 = "UIpL91XGex3qtL6qwyCQJar2j3osKxK9e3ano3OcGEIRM4oWIpCkDg9x95AXEC2wMs7PnxzOkPZ2gq+tsMS9yg==";
+ url = "https://registry.npmjs.org/eslint/-/eslint-5.5.0.tgz";
+ sha512 = "m+az4vYehIJgl1Z0gb25KnFXeqQRdNreYsei1jdvkd9bB+UNQD3fsuiC2AWSQ56P+/t++kFSINZXFbfai+krOw==";
};
};
"eslint-plugin-no-unsafe-innerhtml-1.0.16" = {
@@ -10694,7 +11036,7 @@ let
packageName = "eventemitter2";
version = "0.4.14";
src = fetchurl {
- url = "https://registry.npmjs.org/eventemitter2/-/eventemitter2-0.4.14.tgz";
+ url = "http://registry.npmjs.org/eventemitter2/-/eventemitter2-0.4.14.tgz";
sha1 = "8f61b75cde012b2e9eb284d4545583b5643b61ab";
};
};
@@ -10950,6 +11292,15 @@ let
sha1 = "97e801aa052df02454de46b02bf621642cdc8502";
};
};
+ "explain-error-1.0.4" = {
+ name = "explain-error";
+ packageName = "explain-error";
+ version = "1.0.4";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/explain-error/-/explain-error-1.0.4.tgz";
+ sha1 = "a793d3ac0cad4c6ab571e9968fbbab6cb2532929";
+ };
+ };
"express-2.5.11" = {
name = "express";
packageName = "express";
@@ -11157,12 +11508,21 @@ let
sha1 = "26a71aaf073b39fb2127172746131c2704028db8";
};
};
+ "extend.js-0.0.2" = {
+ name = "extend.js";
+ packageName = "extend.js";
+ version = "0.0.2";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/extend.js/-/extend.js-0.0.2.tgz";
+ sha1 = "0f9c7a81a1f208b703eb0c3131fe5716ac6ecd15";
+ };
+ };
"external-editor-1.1.1" = {
name = "external-editor";
packageName = "external-editor";
version = "1.1.1";
src = fetchurl {
- url = "https://registry.npmjs.org/external-editor/-/external-editor-1.1.1.tgz";
+ url = "http://registry.npmjs.org/external-editor/-/external-editor-1.1.1.tgz";
sha1 = "12d7b0db850f7ff7e7081baf4005700060c4600b";
};
};
@@ -11171,17 +11531,17 @@ let
packageName = "external-editor";
version = "2.2.0";
src = fetchurl {
- url = "https://registry.npmjs.org/external-editor/-/external-editor-2.2.0.tgz";
+ url = "http://registry.npmjs.org/external-editor/-/external-editor-2.2.0.tgz";
sha512 = "bSn6gvGxKt+b7+6TKEv1ZycHleA7aHhRHyAqJyp5pbUFuYYNIzpZnQDk7AsYckyWdEnTeAnay0aCy2aV6iTk9A==";
};
};
- "external-editor-3.0.1" = {
+ "external-editor-3.0.3" = {
name = "external-editor";
packageName = "external-editor";
- version = "3.0.1";
+ version = "3.0.3";
src = fetchurl {
- url = "https://registry.npmjs.org/external-editor/-/external-editor-3.0.1.tgz";
- sha512 = "e1neqvSt5pSwQcFnYc6yfGuJD2Q4336cdbHs5VeUO0zTkqPbrHMyw2q1r47fpfLWbvIG8H8A6YO3sck7upTV6Q==";
+ url = "https://registry.npmjs.org/external-editor/-/external-editor-3.0.3.tgz";
+ sha512 = "bn71H9+qWoOQKyZDo25mOMVpSmXROAsTJVVVYzrrtol3d4y+AsKjf4Iwl2Q+IuT0kFSQ1qo166UuIwqYq7mGnA==";
};
};
"extglob-0.3.2" = {
@@ -11346,6 +11706,15 @@ let
sha512 = "KaJUt+M9t1qaIteSvjc6P3RbMdXsNhK61GRftR6SNxqmhthcd9MGIi4T+o0jD8LUSpSnSKXE20nLtJ3fOHxQig==";
};
};
+ "fast-future-1.0.2" = {
+ name = "fast-future";
+ packageName = "fast-future";
+ version = "1.0.2";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/fast-future/-/fast-future-1.0.2.tgz";
+ sha1 = "8435a9aaa02d79248d17d704e76259301d99280a";
+ };
+ };
"fast-glob-2.2.2" = {
name = "fast-glob";
packageName = "fast-glob";
@@ -11369,17 +11738,17 @@ let
packageName = "fast-json-patch";
version = "0.5.6";
src = fetchurl {
- url = "https://registry.npmjs.org/fast-json-patch/-/fast-json-patch-0.5.6.tgz";
+ url = "http://registry.npmjs.org/fast-json-patch/-/fast-json-patch-0.5.6.tgz";
sha1 = "66e4028e381eaa002edeb280d10238f3a46c3402";
};
};
- "fast-json-patch-2.0.6" = {
+ "fast-json-patch-2.0.7" = {
name = "fast-json-patch";
packageName = "fast-json-patch";
- version = "2.0.6";
+ version = "2.0.7";
src = fetchurl {
- url = "https://registry.npmjs.org/fast-json-patch/-/fast-json-patch-2.0.6.tgz";
- sha1 = "86fff8f8662391aa819722864d632e603e6ee605";
+ url = "https://registry.npmjs.org/fast-json-patch/-/fast-json-patch-2.0.7.tgz";
+ sha512 = "DQeoEyPYxdTtfmB3yDlxkLyKTdbJ6ABfFGcMynDqjvGhPYLto/pZyb/dG2Nyd/n9CArjEWN9ZST++AFmgzgbGw==";
};
};
"fast-json-stable-stringify-2.0.0" = {
@@ -11823,13 +12192,13 @@ let
sha1 = "b37dc844b76a2f5e7081e884f7c0ae344f153476";
};
};
- "firefox-profile-1.1.0" = {
+ "firefox-profile-1.2.0" = {
name = "firefox-profile";
packageName = "firefox-profile";
- version = "1.1.0";
+ version = "1.2.0";
src = fetchurl {
- url = "https://registry.npmjs.org/firefox-profile/-/firefox-profile-1.1.0.tgz";
- sha512 = "wUIE4QeAjwoHvFbomWmXgKyYtV4/oZxDcJG4znxtGGa/0BhKkd3HzeOf3tAsMWPq1ExARZxCRRiNw1BL3FuPqA==";
+ url = "https://registry.npmjs.org/firefox-profile/-/firefox-profile-1.2.0.tgz";
+ sha512 = "TTEFfPOkyaz4EWx/5ZDQC1mJAe3a+JgVcchpIfD4Tvx1UspwlTJRJxOYA35x/z2iJcxaF6aW2rdh6oj6qwgd2g==";
};
};
"first-chunk-stream-1.0.0" = {
@@ -11949,6 +12318,88 @@ let
sha512 = "T0iqfhC40jrs3aDjYOKgzIQjjhsH2Fa6LnXB6naPv0ymW3DeYMUFa89y9aLKMpi1P9nl2vEimK7blx4tVnUWBg==";
};
};
+ "flumecodec-0.0.0" = {
+ name = "flumecodec";
+ packageName = "flumecodec";
+ version = "0.0.0";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/flumecodec/-/flumecodec-0.0.0.tgz";
+ sha1 = "36ce06abe2e0e01c44dd69f2a165305a2320649b";
+ };
+ };
+ "flumecodec-0.0.1" = {
+ name = "flumecodec";
+ packageName = "flumecodec";
+ version = "0.0.1";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/flumecodec/-/flumecodec-0.0.1.tgz";
+ sha1 = "ae049a714386bb83e342657a82924b70364a90d6";
+ };
+ };
+ "flumedb-0.4.9" = {
+ name = "flumedb";
+ packageName = "flumedb";
+ version = "0.4.9";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/flumedb/-/flumedb-0.4.9.tgz";
+ sha512 = "z932cCXHteJXKcwoev8/RfJ9tQ10FeRCZ6Jh55UnxN/ayZraYZvNYObl8ujbho7xQZB1CDt2WTHCN5gEYGBqGw==";
+ };
+ };
+ "flumelog-offset-3.3.1" = {
+ name = "flumelog-offset";
+ packageName = "flumelog-offset";
+ version = "3.3.1";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/flumelog-offset/-/flumelog-offset-3.3.1.tgz";
+ sha512 = "4yYdr8tTL0qOkKqhxAxvNnIwDBaBcLEsJWbyc2wU4Ycaewts9xxcBaxNbORp2KBbTwFaqZAV13HVpfZcO1X/AA==";
+ };
+ };
+ "flumeview-hashtable-1.0.4" = {
+ name = "flumeview-hashtable";
+ packageName = "flumeview-hashtable";
+ version = "1.0.4";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/flumeview-hashtable/-/flumeview-hashtable-1.0.4.tgz";
+ sha512 = "4L52hBelX7dYVAQQ9uPjksqxOCxLwI4NsfEG/+sTM423axT2Poq5cnfdvGm3HzmNowzwDIKtdy429r6PbfKEIw==";
+ };
+ };
+ "flumeview-level-3.0.5" = {
+ name = "flumeview-level";
+ packageName = "flumeview-level";
+ version = "3.0.5";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/flumeview-level/-/flumeview-level-3.0.5.tgz";
+ sha512 = "LKW+YdJGemOo7TnUwpFHq4cBBiYAIKtWk+G2CK7zrxbCIiAHemBRudohBOUKuSUZZ0CReR5fJ73peBHW02VerA==";
+ };
+ };
+ "flumeview-query-6.3.0" = {
+ name = "flumeview-query";
+ packageName = "flumeview-query";
+ version = "6.3.0";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/flumeview-query/-/flumeview-query-6.3.0.tgz";
+ sha512 = "8QBannTFLICARmflhHpXNeR5hh6IzIyJz4XhKTofzmxq/hXEn1un7aF6P6dRQkOwthENDTbSB07eWKqwnYDKtw==";
+ };
+ };
+ "flumeview-query-git://github.com/mmckegg/flumeview-query#map" = {
+ name = "flumeview-query";
+ packageName = "flumeview-query";
+ version = "6.2.0";
+ src = fetchgit {
+ url = "git://github.com/mmckegg/flumeview-query";
+ rev = "59afdf210dbd8bdf53aeea7dcfaaec1c77e7d733";
+ sha256 = "e6f1f768a0911a52c7a4d7f1ee0d60531d174fe30a96879a030a019ff3cb069f";
+ };
+ };
+ "flumeview-reduce-1.3.13" = {
+ name = "flumeview-reduce";
+ packageName = "flumeview-reduce";
+ version = "1.3.13";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/flumeview-reduce/-/flumeview-reduce-1.3.13.tgz";
+ sha512 = "QN/07+ia3uXpfy8/xWjLI2XGIG67Aiwp9VaOTIqYt6NHP6OfdGfl8nGRPkJRHlkfFbzEouRvJcQBFohWEXMdNQ==";
+ };
+ };
"flush-write-stream-1.0.3" = {
name = "flush-write-stream";
packageName = "flush-write-stream";
@@ -12606,13 +13057,13 @@ let
sha1 = "336a98f81510f9ae0af2a494e17468a116a9dc04";
};
};
- "generate-function-2.2.0" = {
+ "generate-function-2.3.1" = {
name = "generate-function";
packageName = "generate-function";
- version = "2.2.0";
+ version = "2.3.1";
src = fetchurl {
- url = "https://registry.npmjs.org/generate-function/-/generate-function-2.2.0.tgz";
- sha512 = "EYWRyUEUdNSsmfMZ2udk1AaxEmJQBaCNgfh+FJo0lcUvP42nyR/Xe30kCyxZs7e6t47bpZw0HftWF+KFjD/Lzg==";
+ url = "https://registry.npmjs.org/generate-function/-/generate-function-2.3.1.tgz";
+ sha512 = "eeB5GfMNeevm/GRYq20ShmsaGcmI81kIX2K9XQx5miC8KdHaC6Jm0qQ8ZNeGOi7wYB8OsdxKs+Y2oVuTFuVwKQ==";
};
};
"generate-object-property-1.2.0" = {
@@ -12768,13 +13219,13 @@ let
sha1 = "dc15ca1c672387ca76bd37ac0a395ba2042a2c28";
};
};
- "getmac-1.4.5" = {
+ "getmac-1.4.6" = {
name = "getmac";
packageName = "getmac";
- version = "1.4.5";
+ version = "1.4.6";
src = fetchurl {
- url = "https://registry.npmjs.org/getmac/-/getmac-1.4.5.tgz";
- sha512 = "Y4Zu6i3zXAnH+Q2zSdnV8SSmyu3BisdfQhsH8YLsC/7vTxgNTTT/JzHWmU3tZEim8hvaCtZLaE5E95wo8P4oGQ==";
+ url = "https://registry.npmjs.org/getmac/-/getmac-1.4.6.tgz";
+ sha512 = "3JPwiIr4P6Sgr6y6SVXX0+l2mrB6pyf4Cdyua7rvEV7SveWQkAp11vrkNym8wvRxzLrBenKRcwe93asdghuwWg==";
};
};
"getpass-0.1.6" = {
@@ -12822,6 +13273,15 @@ let
sha1 = "6d33f7ed63db0d0e118131503bab3aca47d54664";
};
};
+ "git-packidx-parser-1.0.0" = {
+ name = "git-packidx-parser";
+ packageName = "git-packidx-parser";
+ version = "1.0.0";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/git-packidx-parser/-/git-packidx-parser-1.0.0.tgz";
+ sha1 = "c57d1145eec16465ab9bfbdf575262b1691624d6";
+ };
+ };
"git-raw-commits-1.3.6" = {
name = "git-raw-commits";
packageName = "git-raw-commits";
@@ -12840,6 +13300,15 @@ let
sha1 = "5282659dae2107145a11126112ad3216ec5fa65f";
};
};
+ "git-remote-ssb-2.0.4" = {
+ name = "git-remote-ssb";
+ packageName = "git-remote-ssb";
+ version = "2.0.4";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/git-remote-ssb/-/git-remote-ssb-2.0.4.tgz";
+ sha1 = "7f51b804924d6c603fc142e3302998d4e0b4d906";
+ };
+ };
"git-rev-sync-1.9.1" = {
name = "git-rev-sync";
packageName = "git-rev-sync";
@@ -12858,6 +13327,15 @@ let
sha512 = "2jHlJnln4D/ECk9FxGEBh3k44wgYdWjWDtMmJPaecjoRmxKo3Y1Lh8GMYuOPu04CHw86NTAODchYjC5pnpMQig==";
};
};
+ "git-ssb-web-2.8.0" = {
+ name = "git-ssb-web";
+ packageName = "git-ssb-web";
+ version = "2.8.0";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/git-ssb-web/-/git-ssb-web-2.8.0.tgz";
+ sha512 = "8mqO63M60lCiNR+6ROvXuX4VI6pVAru4wMn3uUfxq0xmpNwrZYC4Rkrt5rSGUPumJ43ZUJyeMXXq60v03PUY/g==";
+ };
+ };
"gitconfiglocal-1.0.0" = {
name = "gitconfiglocal";
packageName = "gitconfiglocal";
@@ -13156,6 +13634,15 @@ let
sha512 = "S0nG3CLEQiY/ILxqtztTWH/3iRRdyBLw6KMDxnKMchrtbj2OFmehVh0WUCfW3DUrIgx/qFrJPICrq4Z4sTR9UQ==";
};
};
+ "globby-4.1.0" = {
+ name = "globby";
+ packageName = "globby";
+ version = "4.1.0";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/globby/-/globby-4.1.0.tgz";
+ sha1 = "080f54549ec1b82a6c60e631fc82e1211dbe95f8";
+ };
+ };
"globby-5.0.0" = {
name = "globby";
packageName = "globby";
@@ -13206,7 +13693,7 @@ let
packageName = "got";
version = "1.2.2";
src = fetchurl {
- url = "https://registry.npmjs.org/got/-/got-1.2.2.tgz";
+ url = "http://registry.npmjs.org/got/-/got-1.2.2.tgz";
sha1 = "d9430ba32f6a30218243884418767340aafc0400";
};
};
@@ -13215,7 +13702,7 @@ let
packageName = "got";
version = "3.3.1";
src = fetchurl {
- url = "https://registry.npmjs.org/got/-/got-3.3.1.tgz";
+ url = "http://registry.npmjs.org/got/-/got-3.3.1.tgz";
sha1 = "e5d0ed4af55fc3eef4d56007769d98192bcb2eca";
};
};
@@ -13224,7 +13711,7 @@ let
packageName = "got";
version = "6.7.1";
src = fetchurl {
- url = "https://registry.npmjs.org/got/-/got-6.7.1.tgz";
+ url = "http://registry.npmjs.org/got/-/got-6.7.1.tgz";
sha1 = "240cd05785a9a18e561dc1b44b41c763ef1e8db0";
};
};
@@ -13332,7 +13819,7 @@ let
packageName = "graphql";
version = "0.13.2";
src = fetchurl {
- url = "https://registry.npmjs.org/graphql/-/graphql-0.13.2.tgz";
+ url = "http://registry.npmjs.org/graphql/-/graphql-0.13.2.tgz";
sha512 = "QZ5BL8ZO/B20VA8APauGBg3GyEgZ19eduvpLWoq5x7gMmWnHoy8rlQWPLmWgFvo1yNgjSEFMesmS4R6pPr7xog==";
};
};
@@ -13408,13 +13895,13 @@ let
sha512 = "Mlj/VYshHbwDrVHgNyNAl2cBU7+Rh503S43UYXcBtR9Am2KNvmPPPccXEeP6yist0yY2WM0WTwL8JoIGrWeFOw==";
};
};
- "graphql-extensions-0.1.2" = {
+ "graphql-extensions-0.1.3" = {
name = "graphql-extensions";
packageName = "graphql-extensions";
- version = "0.1.2";
+ version = "0.1.3";
src = fetchurl {
- url = "https://registry.npmjs.org/graphql-extensions/-/graphql-extensions-0.1.2.tgz";
- sha512 = "A81kfGtOKG0/1sDQGm23u60bkTuk9VDof0SrQrz7yNpPLY48JF11b8+4LNlYfEBVvceDbLAs1KRfyLQskJjJSg==";
+ url = "https://registry.npmjs.org/graphql-extensions/-/graphql-extensions-0.1.3.tgz";
+ sha512 = "q+d1bTR7GW4qRiZP17SXN0TZo+k/I1FEKYd6H4JMbxzpY8mqTLbg8MzrLu7LxafF+mPEJwRfipcEcA375k3eXA==";
};
};
"graphql-import-0.4.5" = {
@@ -13507,6 +13994,15 @@ let
sha1 = "d2c177e2f1b17d87f81072cd05311c0754baa420";
};
};
+ "graphreduce-3.0.4" = {
+ name = "graphreduce";
+ packageName = "graphreduce";
+ version = "3.0.4";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/graphreduce/-/graphreduce-3.0.4.tgz";
+ sha1 = "bf442d0a878e83901e5ef3e652d23ffb5b831ed7";
+ };
+ };
"gray-matter-2.1.1" = {
name = "gray-matter";
packageName = "gray-matter";
@@ -13849,6 +14345,15 @@ let
sha1 = "6414c82913697da51590397dafb12f22967811ce";
};
};
+ "has-network-0.0.1" = {
+ name = "has-network";
+ packageName = "has-network";
+ version = "0.0.1";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/has-network/-/has-network-0.0.1.tgz";
+ sha1 = "3eea7b44caa9601797124be8ba89d228c4101499";
+ };
+ };
"has-symbol-support-x-1.4.2" = {
name = "has-symbol-support-x";
packageName = "has-symbol-support-x";
@@ -13975,6 +14480,15 @@ let
sha1 = "8b5341c3496124b0724ac8555fbb8ca363ebbb73";
};
};
+ "hashlru-2.2.1" = {
+ name = "hashlru";
+ packageName = "hashlru";
+ version = "2.2.1";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/hashlru/-/hashlru-2.2.1.tgz";
+ sha1 = "10f2099a0d7c05a40f2beaf5c1d39cf2f7dabf36";
+ };
+ };
"hashring-3.2.0" = {
name = "hashring";
packageName = "hashring";
@@ -14020,6 +14534,15 @@ let
sha512 = "miowhl2+U7Qle4vdLqDdPt9m09K6yZhkLDTWGoUiUzrQCn+mHHSmfJgAyGaLRZbPmTqfFFjRV1QWCW0VWUJBbQ==";
};
};
+ "he-0.5.0" = {
+ name = "he";
+ packageName = "he";
+ version = "0.5.0";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/he/-/he-0.5.0.tgz";
+ sha1 = "2c05ffaef90b68e860f3fd2b54ef580989277ee2";
+ };
+ };
"he-1.1.1" = {
name = "he";
packageName = "he";
@@ -14074,6 +14597,15 @@ let
sha1 = "b8a9c5493212a9392f0222b649c9611497ebfb88";
};
};
+ "highlight.js-9.12.0" = {
+ name = "highlight.js";
+ packageName = "highlight.js";
+ version = "9.12.0";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/highlight.js/-/highlight.js-9.12.0.tgz";
+ sha1 = "e6d9dbe57cbefe60751f02af336195870c90c01e";
+ };
+ };
"hiredis-0.4.1" = {
name = "hiredis";
packageName = "hiredis";
@@ -14164,6 +14696,15 @@ let
sha1 = "0f591b1b344bdcb3df59773f62fbbaf85bf4028b";
};
};
+ "hoox-0.0.1" = {
+ name = "hoox";
+ packageName = "hoox";
+ version = "0.0.1";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/hoox/-/hoox-0.0.1.tgz";
+ sha1 = "08a74d9272a9cc83ae8e6bbe0303f0ee76432094";
+ };
+ };
"hosted-git-info-2.7.1" = {
name = "hosted-git-info";
packageName = "hosted-git-info";
@@ -14785,6 +15326,15 @@ let
sha1 = "9218b9b2b928a238b13dc4fb6b6d576f231453ea";
};
};
+ "increment-buffer-1.0.1" = {
+ name = "increment-buffer";
+ packageName = "increment-buffer";
+ version = "1.0.1";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/increment-buffer/-/increment-buffer-1.0.1.tgz";
+ sha1 = "65076d75189d808b39ad13ab5b958e05216f9e0d";
+ };
+ };
"indent-string-2.1.0" = {
name = "indent-string";
packageName = "indent-string";
@@ -15046,6 +15596,15 @@ let
sha512 = "vtI2YXBRZBkU6DlfHfd0GtZENfiEiTacAXUd0ZY6HA+X7aPznpFfPmzSC+tHKXAkz9KDSdI4AYfwAMXR5t+isg==";
};
};
+ "int53-0.2.4" = {
+ name = "int53";
+ packageName = "int53";
+ version = "0.2.4";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/int53/-/int53-0.2.4.tgz";
+ sha1 = "5ed8d7aad6c5c6567cae69aa7ffc4a109ee80f86";
+ };
+ };
"int64-buffer-0.1.10" = {
name = "int64-buffer";
packageName = "int64-buffer";
@@ -15109,6 +15668,24 @@ let
sha1 = "104a8e4aaca6d3d8cd157a8ef8bfab2d7a3ffdb6";
};
};
+ "invert-kv-2.0.0" = {
+ name = "invert-kv";
+ packageName = "invert-kv";
+ version = "2.0.0";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/invert-kv/-/invert-kv-2.0.0.tgz";
+ sha512 = "wPVv/y/QQ/Uiirj/vh3oP+1Ww+AWehmi1g5fFWGPF6IpCBCDVrhgHRMvrLfdYcwDh3QJbGXDW4JAuzxElLSqKA==";
+ };
+ };
+ "ip-0.3.3" = {
+ name = "ip";
+ packageName = "ip";
+ version = "0.3.3";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/ip/-/ip-0.3.3.tgz";
+ sha1 = "8ee8309e92f0b040d287f72efaca1a21702d3fb4";
+ };
+ };
"ip-1.1.5" = {
name = "ip";
packageName = "ip";
@@ -15181,6 +15758,15 @@ let
sha1 = "5bf4125fb6ec0f3929a89647b26e653232942b79";
};
};
+ "irregular-plurals-1.4.0" = {
+ name = "irregular-plurals";
+ packageName = "irregular-plurals";
+ version = "1.4.0";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/irregular-plurals/-/irregular-plurals-1.4.0.tgz";
+ sha1 = "2ca9b033651111855412f16be5d77c62a458a766";
+ };
+ };
"is-3.2.1" = {
name = "is";
packageName = "is";
@@ -15235,6 +15821,24 @@ let
sha512 = "m5hnHTkcVsPfqx3AKlyttIPb7J+XykHvJP2B9bZDjlhLIoEq4XoK64Vg7boZlVWYK6LUY94dYPEE7Lh0ZkZKcQ==";
};
};
+ "is-alphabetical-1.0.2" = {
+ name = "is-alphabetical";
+ packageName = "is-alphabetical";
+ version = "1.0.2";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/is-alphabetical/-/is-alphabetical-1.0.2.tgz";
+ sha512 = "V0xN4BYezDHcBSKb1QHUFMlR4as/XEuCZBzMJUU4n7+Cbt33SmUnSol+pnXFvLxSHNq2CemUXNdaXV6Flg7+xg==";
+ };
+ };
+ "is-alphanumerical-1.0.2" = {
+ name = "is-alphanumerical";
+ packageName = "is-alphanumerical";
+ version = "1.0.2";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/is-alphanumerical/-/is-alphanumerical-1.0.2.tgz";
+ sha512 = "pyfU/0kHdISIgslFfZN9nfY1Gk3MquQgUm1mJTjdkEPpkAKNWuBTSqFwewOpR7N351VkErCiyV71zX7mlQQqsg==";
+ };
+ };
"is-arguments-1.0.2" = {
name = "is-arguments";
packageName = "is-arguments";
@@ -15343,6 +15947,15 @@ let
sha1 = "9aa20eb6aeebbff77fbd33e74ca01b33581d3a16";
};
};
+ "is-decimal-1.0.2" = {
+ name = "is-decimal";
+ packageName = "is-decimal";
+ version = "1.0.2";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/is-decimal/-/is-decimal-1.0.2.tgz";
+ sha512 = "TRzl7mOCchnhchN+f3ICUCzYvL9ul7R+TYOsZ8xia++knyZAJfv/uA1FvQXsAnYIl1T3B2X5E/J7Wb1QXiIBXg==";
+ };
+ };
"is-descriptor-0.1.6" = {
name = "is-descriptor";
packageName = "is-descriptor";
@@ -15388,6 +16001,15 @@ let
sha1 = "a6a2f32ffd2dfb04f5ca25ecd0f6b83cf798a1e1";
};
};
+ "is-electron-2.1.0" = {
+ name = "is-electron";
+ packageName = "is-electron";
+ version = "2.1.0";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/is-electron/-/is-electron-2.1.0.tgz";
+ sha512 = "dkg5xT383+M6zIbbXW/z7n2nz4SFUi2OSyhntnFYkRdtV+HVEfdjEK+5AWisfYgkpe3WYjTIuh7toaKmSfFVWw==";
+ };
+ };
"is-equal-shallow-0.1.3" = {
name = "is-equal-shallow";
packageName = "is-equal-shallow";
@@ -15514,6 +16136,15 @@ let
sha1 = "9521c76845cc2610a85203ddf080a958c2ffabc0";
};
};
+ "is-hexadecimal-1.0.2" = {
+ name = "is-hexadecimal";
+ packageName = "is-hexadecimal";
+ version = "1.0.2";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/is-hexadecimal/-/is-hexadecimal-1.0.2.tgz";
+ sha512 = "but/G3sapV3MNyqiDBLrOi4x8uCIw0RY3o/Vb5GT0sMFHrVV7731wFSVy41T5FO1og7G0gXLJh0MkgPRouko/A==";
+ };
+ };
"is-installed-globally-0.1.0" = {
name = "is-installed-globally";
packageName = "is-installed-globally";
@@ -15955,6 +16586,15 @@ let
sha1 = "4b0da1442104d1b336340e80797e865cf39f7d72";
};
};
+ "is-valid-domain-0.0.5" = {
+ name = "is-valid-domain";
+ packageName = "is-valid-domain";
+ version = "0.0.5";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/is-valid-domain/-/is-valid-domain-0.0.5.tgz";
+ sha1 = "48e70319fcb43009236e96b37f9843889ce7b513";
+ };
+ };
"is-valid-glob-1.0.0" = {
name = "is-valid-glob";
packageName = "is-valid-glob";
@@ -16423,13 +17063,22 @@ let
sha1 = "e421a2a8e20d6b0819df28908f782526b96dd1fe";
};
};
- "jshint-2.8.0" = {
+ "jshint-2.9.6" = {
name = "jshint";
packageName = "jshint";
- version = "2.8.0";
+ version = "2.9.6";
src = fetchurl {
- url = "https://registry.npmjs.org/jshint/-/jshint-2.8.0.tgz";
- sha1 = "1d09a3bd913c4cadfa81bf18d582bd85bffe0d44";
+ url = "https://registry.npmjs.org/jshint/-/jshint-2.9.6.tgz";
+ sha512 = "KO9SIAKTlJQOM4lE64GQUtGBRpTOuvbrRrSZw3AhUxMNG266nX9hK2cKA4SBhXOj0irJGyNyGSLT62HGOVDEOA==";
+ };
+ };
+ "json-buffer-2.0.11" = {
+ name = "json-buffer";
+ packageName = "json-buffer";
+ version = "2.0.11";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/json-buffer/-/json-buffer-2.0.11.tgz";
+ sha1 = "3e441fda3098be8d1e3171ad591bc62a33e2d55f";
};
};
"json-buffer-3.0.0" = {
@@ -16905,7 +17554,7 @@ let
packageName = "k-bucket";
version = "0.6.0";
src = fetchurl {
- url = "https://registry.npmjs.org/k-bucket/-/k-bucket-0.6.0.tgz";
+ url = "http://registry.npmjs.org/k-bucket/-/k-bucket-0.6.0.tgz";
sha1 = "afc532545f69d466293e887b00d5fc73377c3abb";
};
};
@@ -16914,7 +17563,7 @@ let
packageName = "k-bucket";
version = "2.0.1";
src = fetchurl {
- url = "https://registry.npmjs.org/k-bucket/-/k-bucket-2.0.1.tgz";
+ url = "http://registry.npmjs.org/k-bucket/-/k-bucket-2.0.1.tgz";
sha1 = "58cccb244f563326ba893bf5c06a35f644846daa";
};
};
@@ -16936,6 +17585,15 @@ let
sha512 = "YvDpmY3waI999h1zZoW1rJ04fZrgZ+5PAlVmvwDHT6YO/Q1AOhdel07xsKy9eAvJjQ9xZV1wz3rXKqEfaWvlcQ==";
};
};
+ "k-bucket-5.0.0" = {
+ name = "k-bucket";
+ packageName = "k-bucket";
+ version = "5.0.0";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/k-bucket/-/k-bucket-5.0.0.tgz";
+ sha512 = "r/q+wV/Kde62/tk+rqyttEJn6h0jR7x+incdMVSYTqK73zVxVrzJa70kJL49cIKen8XjIgUZKSvk8ktnrQbK4w==";
+ };
+ };
"k-rpc-3.7.0" = {
name = "k-rpc";
packageName = "k-rpc";
@@ -17189,6 +17847,24 @@ let
sha512 = "++ulra2RtdutmJhZZFohhF+kbccz2XdFTf23857x8X1M9Jfm54ZKY4kXPJKgPdMz6eTH1MBXWXh17RvGWxLNrw==";
};
};
+ "kvgraph-0.1.0" = {
+ name = "kvgraph";
+ packageName = "kvgraph";
+ version = "0.1.0";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/kvgraph/-/kvgraph-0.1.0.tgz";
+ sha1 = "068eed75b8d9bae75c1219da41eea0e433cd748c";
+ };
+ };
+ "kvset-1.0.0" = {
+ name = "kvset";
+ packageName = "kvset";
+ version = "1.0.0";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/kvset/-/kvset-1.0.0.tgz";
+ sha1 = "24f68db8ecb155498c9ecb56aef40ae24509872f";
+ };
+ };
"labeled-stream-splicer-2.0.1" = {
name = "labeled-stream-splicer";
packageName = "labeled-stream-splicer";
@@ -17279,6 +17955,15 @@ let
sha1 = "308accafa0bc483a3867b4b6f2b9506251d1b835";
};
};
+ "lcid-2.0.0" = {
+ name = "lcid";
+ packageName = "lcid";
+ version = "2.0.0";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/lcid/-/lcid-2.0.0.tgz";
+ sha512 = "avPEb8P8EGnwXKClwsNUgryVjllcRqtMYa49NTsbQagYuT1DcXnl1915oxWjoyGrXR6zH/Y0Zc96xWsPcoDKeA==";
+ };
+ };
"lead-1.0.0" = {
name = "lead";
packageName = "lead";
@@ -17333,6 +18018,51 @@ let
sha1 = "e1a3f4cad65fc02e25070a47d63d7b527361c1cf";
};
};
+ "level-3.0.2" = {
+ name = "level";
+ packageName = "level";
+ version = "3.0.2";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/level/-/level-3.0.2.tgz";
+ sha512 = "2qYbbiptPsPWGUI+AgB1gTNXqIjPpALRqrQyNx1zWYNZxhhuzEj/IE4Unu9weEBnsUEocfYe56xOGlAceb8/Fg==";
+ };
+ };
+ "level-codec-6.2.0" = {
+ name = "level-codec";
+ packageName = "level-codec";
+ version = "6.2.0";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/level-codec/-/level-codec-6.2.0.tgz";
+ sha1 = "a4b5244bb6a4c2f723d68a1d64e980c53627d9d4";
+ };
+ };
+ "level-codec-8.0.0" = {
+ name = "level-codec";
+ packageName = "level-codec";
+ version = "8.0.0";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/level-codec/-/level-codec-8.0.0.tgz";
+ sha512 = "gNZlo1HRHz0BWxzGCyNf7xntAs2HKOPvvRBWtXsoDvEX4vMYnSTBS6ZnxoaiX7nhxSBPpegRa8CQ/hnfGBKk3Q==";
+ };
+ };
+ "level-errors-1.1.2" = {
+ name = "level-errors";
+ packageName = "level-errors";
+ version = "1.1.2";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/level-errors/-/level-errors-1.1.2.tgz";
+ sha512 = "Sw/IJwWbPKF5Ai4Wz60B52yj0zYeqzObLh8k1Tk88jVmD51cJSKWSYpRyhVIvFzZdvsPqlH5wfhp/yxdsaQH4w==";
+ };
+ };
+ "level-iterator-stream-2.0.3" = {
+ name = "level-iterator-stream";
+ packageName = "level-iterator-stream";
+ version = "2.0.3";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/level-iterator-stream/-/level-iterator-stream-2.0.3.tgz";
+ sha512 = "I6Heg70nfF+e5Y3/qfthJFexhRw/Gi3bIymCoXAlijZdAcLaPuWSJs3KXyTYf23ID6g0o2QF62Yh+grOXY3Rig==";
+ };
+ };
"level-packager-0.18.0" = {
name = "level-packager";
packageName = "level-packager";
@@ -17342,6 +18072,15 @@ let
sha1 = "c076b087646f1d7dedcc3442f58800dd0a0b45f5";
};
};
+ "level-packager-2.1.1" = {
+ name = "level-packager";
+ packageName = "level-packager";
+ version = "2.1.1";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/level-packager/-/level-packager-2.1.1.tgz";
+ sha512 = "6l3G6dVkmdvHwOJrEA9d9hL6SSFrzwjQoLP8HsvohOgfY/8Z9LyTKNCM5Gc84wtsUWCuIHu6r+S6WrCtTWUJCw==";
+ };
+ };
"level-post-1.0.7" = {
name = "level-post";
packageName = "level-post";
@@ -17369,6 +18108,15 @@ let
sha1 = "a1bb751c95263ff60f41bde0f973ff8c1e98bbe9";
};
};
+ "leveldown-3.0.2" = {
+ name = "leveldown";
+ packageName = "leveldown";
+ version = "3.0.2";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/leveldown/-/leveldown-3.0.2.tgz";
+ sha512 = "+ANRScj1npQQzv6e4DYAKRjVQZZ+ahMoubKrNP68nIq+l9bYgb+WiXF+14oTcQTg2f7qE9WHGW7rBG9nGSsA+A==";
+ };
+ };
"levelup-0.18.6" = {
name = "levelup";
packageName = "levelup";
@@ -17387,6 +18135,15 @@ let
sha1 = "f3a6a7205272c4b5f35e412ff004a03a0aedf50b";
};
};
+ "levelup-2.0.2" = {
+ name = "levelup";
+ packageName = "levelup";
+ version = "2.0.2";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/levelup/-/levelup-2.0.2.tgz";
+ sha512 = "us+nTLUyd/eLnclYYddOCdAVw1hnymGx/9p4Jr5ThohStsjLqMVmbYiz6/SYFZEPXNF+AKQSvh6fA2e2KZpC8w==";
+ };
+ };
"leven-1.0.2" = {
name = "leven";
packageName = "leven";
@@ -17459,6 +18216,24 @@ let
sha1 = "e80ad2ef5c081ac677f66515d107537fdc0f5c64";
};
};
+ "libsodium-0.7.3" = {
+ name = "libsodium";
+ packageName = "libsodium";
+ version = "0.7.3";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/libsodium/-/libsodium-0.7.3.tgz";
+ sha512 = "ld+deUNqSsZYbAobUs63UyduPq8ICp/Ul/5lbvBIYpuSNWpPRU0PIxbW+xXipVZtuopR6fIz9e0tTnNuPMNeqw==";
+ };
+ };
+ "libsodium-wrappers-0.7.3" = {
+ name = "libsodium-wrappers";
+ packageName = "libsodium-wrappers";
+ version = "0.7.3";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/libsodium-wrappers/-/libsodium-wrappers-0.7.3.tgz";
+ sha512 = "dw5Jh6TZ5qc5rQVZe3JrSO/J05CE+DmAPnqD7Q2glBUE969xZ6o3fchnUxyPlp6ss3x0MFxmdJntveFN+XTg1g==";
+ };
+ };
"lie-3.1.1" = {
name = "lie";
packageName = "lie";
@@ -17626,7 +18401,7 @@ let
packageName = "lodash";
version = "1.0.2";
src = fetchurl {
- url = "https://registry.npmjs.org/lodash/-/lodash-1.0.2.tgz";
+ url = "http://registry.npmjs.org/lodash/-/lodash-1.0.2.tgz";
sha1 = "8f57560c83b59fc270bd3d561b690043430e2551";
};
};
@@ -17635,7 +18410,7 @@ let
packageName = "lodash";
version = "2.4.2";
src = fetchurl {
- url = "https://registry.npmjs.org/lodash/-/lodash-2.4.2.tgz";
+ url = "http://registry.npmjs.org/lodash/-/lodash-2.4.2.tgz";
sha1 = "fadd834b9683073da179b3eae6d9c0d15053f73e";
};
};
@@ -17644,7 +18419,7 @@ let
packageName = "lodash";
version = "3.1.0";
src = fetchurl {
- url = "https://registry.npmjs.org/lodash/-/lodash-3.1.0.tgz";
+ url = "http://registry.npmjs.org/lodash/-/lodash-3.1.0.tgz";
sha1 = "d41b8b33530cb3be088853208ad30092d2c27961";
};
};
@@ -17653,25 +18428,16 @@ let
packageName = "lodash";
version = "3.10.1";
src = fetchurl {
- url = "https://registry.npmjs.org/lodash/-/lodash-3.10.1.tgz";
+ url = "http://registry.npmjs.org/lodash/-/lodash-3.10.1.tgz";
sha1 = "5bf45e8e49ba4189e17d482789dfd15bd140b7b6";
};
};
- "lodash-3.7.0" = {
- name = "lodash";
- packageName = "lodash";
- version = "3.7.0";
- src = fetchurl {
- url = "https://registry.npmjs.org/lodash/-/lodash-3.7.0.tgz";
- sha1 = "3678bd8ab995057c07ade836ed2ef087da811d45";
- };
- };
"lodash-4.13.1" = {
name = "lodash";
packageName = "lodash";
version = "4.13.1";
src = fetchurl {
- url = "https://registry.npmjs.org/lodash/-/lodash-4.13.1.tgz";
+ url = "http://registry.npmjs.org/lodash/-/lodash-4.13.1.tgz";
sha1 = "83e4b10913f48496d4d16fec4a560af2ee744b68";
};
};
@@ -17680,7 +18446,7 @@ let
packageName = "lodash";
version = "4.14.2";
src = fetchurl {
- url = "https://registry.npmjs.org/lodash/-/lodash-4.14.2.tgz";
+ url = "http://registry.npmjs.org/lodash/-/lodash-4.14.2.tgz";
sha1 = "bbccce6373a400fbfd0a8c67ca42f6d1ef416432";
};
};
@@ -17707,7 +18473,7 @@ let
packageName = "lodash";
version = "4.2.1";
src = fetchurl {
- url = "https://registry.npmjs.org/lodash/-/lodash-4.2.1.tgz";
+ url = "http://registry.npmjs.org/lodash/-/lodash-4.2.1.tgz";
sha1 = "171fdcfbbc30d689c544cd18c0529f56de6c1aa9";
};
};
@@ -18647,6 +19413,15 @@ let
sha1 = "a3a17bbf62eeb6240f491846e97c1c4e2a5e1e21";
};
};
+ "log-symbols-1.0.2" = {
+ name = "log-symbols";
+ packageName = "log-symbols";
+ version = "1.0.2";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/log-symbols/-/log-symbols-1.0.2.tgz";
+ sha1 = "376ff7b58ea3086a0f09facc74617eca501e1a18";
+ };
+ };
"log-symbols-2.2.0" = {
name = "log-symbols";
packageName = "log-symbols";
@@ -18737,6 +19512,15 @@ let
sha1 = "30a0b2da38f73770e8294a0d22e6625ed77d0097";
};
};
+ "longest-streak-1.0.0" = {
+ name = "longest-streak";
+ packageName = "longest-streak";
+ version = "1.0.0";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/longest-streak/-/longest-streak-1.0.0.tgz";
+ sha1 = "d06597c4d4c31b52ccb1f5d8f8fe7148eafd6965";
+ };
+ };
"longjohn-0.2.12" = {
name = "longjohn";
packageName = "longjohn";
@@ -18764,6 +19548,15 @@ let
sha1 = "2efa54c3b1cbaba9b94aee2e5914b0be57fbb749";
};
};
+ "looper-4.0.0" = {
+ name = "looper";
+ packageName = "looper";
+ version = "4.0.0";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/looper/-/looper-4.0.0.tgz";
+ sha1 = "7706aded59a99edca06e6b54bb86c8ec19c95155";
+ };
+ };
"loose-envify-1.4.0" = {
name = "loose-envify";
packageName = "loose-envify";
@@ -18782,6 +19575,15 @@ let
sha512 = "r4w0WrhIHV1lOTVGbTg4Toqwso5x6C8pM7Q/Nto2vy4c7yUSdTYVYlj16uHVX3MT1StpSELDv8yrqGx41MBsDA==";
};
};
+ "lossy-store-1.2.3" = {
+ name = "lossy-store";
+ packageName = "lossy-store";
+ version = "1.2.3";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/lossy-store/-/lossy-store-1.2.3.tgz";
+ sha1 = "562e2a9203d8661f60e8712de407fbdadf275dc9";
+ };
+ };
"loud-rejection-1.6.0" = {
name = "loud-rejection";
packageName = "loud-rejection";
@@ -18917,6 +19719,15 @@ let
sha1 = "2738bd9f0d3cf4f84490c5736c48699ac632cda3";
};
};
+ "lrucache-1.0.3" = {
+ name = "lrucache";
+ packageName = "lrucache";
+ version = "1.0.3";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/lrucache/-/lrucache-1.0.3.tgz";
+ sha1 = "3b1ded0d1ba82e188b9bdaba9eee6486f864a434";
+ };
+ };
"lstream-0.0.4" = {
name = "lstream";
packageName = "lstream";
@@ -18944,6 +19755,15 @@ let
sha1 = "10851a06d9964b971178441c23c9e52698eece34";
};
};
+ "ltgt-2.2.1" = {
+ name = "ltgt";
+ packageName = "ltgt";
+ version = "2.2.1";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/ltgt/-/ltgt-2.2.1.tgz";
+ sha1 = "f35ca91c493f7b73da0e07495304f17b31f87ee5";
+ };
+ };
"lunr-0.7.2" = {
name = "lunr";
packageName = "lunr";
@@ -18976,7 +19796,7 @@ let
packageName = "magnet-uri";
version = "2.0.1";
src = fetchurl {
- url = "https://registry.npmjs.org/magnet-uri/-/magnet-uri-2.0.1.tgz";
+ url = "http://registry.npmjs.org/magnet-uri/-/magnet-uri-2.0.1.tgz";
sha1 = "d331d3dfcd3836565ade0fc3ca315e39217bb209";
};
};
@@ -18985,17 +19805,17 @@ let
packageName = "magnet-uri";
version = "4.2.3";
src = fetchurl {
- url = "https://registry.npmjs.org/magnet-uri/-/magnet-uri-4.2.3.tgz";
+ url = "http://registry.npmjs.org/magnet-uri/-/magnet-uri-4.2.3.tgz";
sha1 = "79cc6d65a00bb5b7ef5c25ae60ebbb5d9a7681a8";
};
};
- "magnet-uri-5.2.3" = {
+ "magnet-uri-5.2.4" = {
name = "magnet-uri";
packageName = "magnet-uri";
- version = "5.2.3";
+ version = "5.2.4";
src = fetchurl {
- url = "https://registry.npmjs.org/magnet-uri/-/magnet-uri-5.2.3.tgz";
- sha512 = "INWVwcpWfZTVM+Yb4EXVBpm0FTd8Q98Fn5x7nuHv1hkFDRELgdIM+eJ3zYLbNTFpFPYtHs6B+sx8exs29IYwgA==";
+ url = "https://registry.npmjs.org/magnet-uri/-/magnet-uri-5.2.4.tgz";
+ sha512 = "VYaJMxhr8B9BrCiNINUsuhaEe40YnG+AQBwcqUKO66lSVaI9I3A1iH/6EmEwRI8OYUg5Gt+4lLE7achg676lrg==";
};
};
"mailcomposer-2.1.0" = {
@@ -19034,13 +19854,13 @@ let
sha512 = "2w31R7SJtieJJnQtGc7RVL2StM2vGYVfqUOvUDxH6bC6aJTxPxTF0GnIgCyu7tjockiUWAYQRbxa7vKn34s5sQ==";
};
};
- "make-error-1.3.4" = {
+ "make-error-1.3.5" = {
name = "make-error";
packageName = "make-error";
- version = "1.3.4";
+ version = "1.3.5";
src = fetchurl {
- url = "https://registry.npmjs.org/make-error/-/make-error-1.3.4.tgz";
- sha512 = "0Dab5btKVPhibSalc9QGXb559ED7G7iLjFXBaj9Wq8O3vorueR5K5jaE3hkG6ZQINyhA/JgG6Qk4qdFQjsYV6g==";
+ url = "https://registry.npmjs.org/make-error/-/make-error-1.3.5.tgz";
+ sha512 = "c3sIjNUow0+8swNwVpqoH4YCShKNFkMaw6oH1mNS2haDZQqkeZFlHS3dhoeEbKKmJB4vXpJucU6oH75aDYeE9g==";
};
};
"make-error-cause-1.2.2" = {
@@ -19088,6 +19908,33 @@ let
sha1 = "c32abd0bd6525d9b051645bb4f26ac5dc98a0dbf";
};
};
+ "map-filter-reduce-2.2.1" = {
+ name = "map-filter-reduce";
+ packageName = "map-filter-reduce";
+ version = "2.2.1";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/map-filter-reduce/-/map-filter-reduce-2.2.1.tgz";
+ sha1 = "632b127c3ae5d6ad9e21cfdd9691b63b8944fcd2";
+ };
+ };
+ "map-filter-reduce-3.1.0" = {
+ name = "map-filter-reduce";
+ packageName = "map-filter-reduce";
+ version = "3.1.0";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/map-filter-reduce/-/map-filter-reduce-3.1.0.tgz";
+ sha512 = "os2GlG1lEWRSAvAb9iqfapQ0I1GRXSA+alSjQl0DB7XxNyDx2/VOVAEVhK7EMsqwDDCWNTBSstoo1roc7U5H0w==";
+ };
+ };
+ "map-merge-1.1.0" = {
+ name = "map-merge";
+ packageName = "map-merge";
+ version = "1.1.0";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/map-merge/-/map-merge-1.1.0.tgz";
+ sha1 = "6a6fc58c95d8aab46c2bdde44d515b6ee06fce34";
+ };
+ };
"map-obj-1.0.1" = {
name = "map-obj";
packageName = "map-obj";
@@ -19169,6 +20016,15 @@ let
sha512 = "7pxkHuvqTOu3iwVGmDPeYjQg+AIS9VQxzyLP9JCg9lBjgPAJXGEkChK6A2iFuj3tS0GV3HG2u5AMNhcQqwxpJw==";
};
};
+ "markdown-table-0.4.0" = {
+ name = "markdown-table";
+ packageName = "markdown-table";
+ version = "0.4.0";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/markdown-table/-/markdown-table-0.4.0.tgz";
+ sha1 = "890c2c1b3bfe83fb00e4129b8e4cfe645270f9d1";
+ };
+ };
"marked-0.3.19" = {
name = "marked";
packageName = "marked";
@@ -19214,6 +20070,15 @@ let
sha1 = "e9bdbde94a20a5ac18b04340fc5764d5b09d901d";
};
};
+ "mdmanifest-1.0.8" = {
+ name = "mdmanifest";
+ packageName = "mdmanifest";
+ version = "1.0.8";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/mdmanifest/-/mdmanifest-1.0.8.tgz";
+ sha1 = "c04891883c28c83602e1d06b05a11037e359b4c8";
+ };
+ };
"mdn-data-1.1.4" = {
name = "mdn-data";
packageName = "mdn-data";
@@ -19304,6 +20169,15 @@ let
sha1 = "5edd52b485ca1d900fe64895505399a0dfa45f76";
};
};
+ "mem-3.0.1" = {
+ name = "mem";
+ packageName = "mem";
+ version = "3.0.1";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/mem/-/mem-3.0.1.tgz";
+ sha512 = "QKs47bslvOE0NbXOqG6lMxn6Bk0Iuw0vfrIeLykmQle2LkCw1p48dZDdzE+D88b/xqRJcZGcMNeDvSVma+NuIQ==";
+ };
+ };
"mem-fs-1.1.3" = {
name = "mem-fs";
packageName = "mem-fs";
@@ -19795,7 +20669,7 @@ let
packageName = "minimist";
version = "0.0.10";
src = fetchurl {
- url = "https://registry.npmjs.org/minimist/-/minimist-0.0.10.tgz";
+ url = "http://registry.npmjs.org/minimist/-/minimist-0.0.10.tgz";
sha1 = "de3f98543dbf96082be48ad1a0c7cda836301dcf";
};
};
@@ -19804,7 +20678,7 @@ let
packageName = "minimist";
version = "0.0.8";
src = fetchurl {
- url = "https://registry.npmjs.org/minimist/-/minimist-0.0.8.tgz";
+ url = "http://registry.npmjs.org/minimist/-/minimist-0.0.8.tgz";
sha1 = "857fcabfc3397d2625b8228262e86aa7a011b05d";
};
};
@@ -19813,7 +20687,7 @@ let
packageName = "minimist";
version = "0.1.0";
src = fetchurl {
- url = "https://registry.npmjs.org/minimist/-/minimist-0.1.0.tgz";
+ url = "http://registry.npmjs.org/minimist/-/minimist-0.1.0.tgz";
sha1 = "99df657a52574c21c9057497df742790b2b4c0de";
};
};
@@ -19822,7 +20696,7 @@ let
packageName = "minimist";
version = "0.2.0";
src = fetchurl {
- url = "https://registry.npmjs.org/minimist/-/minimist-0.2.0.tgz";
+ url = "http://registry.npmjs.org/minimist/-/minimist-0.2.0.tgz";
sha1 = "4dffe525dae2b864c66c2e23c6271d7afdecefce";
};
};
@@ -19831,7 +20705,7 @@ let
packageName = "minimist";
version = "1.2.0";
src = fetchurl {
- url = "https://registry.npmjs.org/minimist/-/minimist-1.2.0.tgz";
+ url = "http://registry.npmjs.org/minimist/-/minimist-1.2.0.tgz";
sha1 = "a35008b20f41383eec1fb914f4cd5df79a264284";
};
};
@@ -19912,7 +20786,7 @@ let
packageName = "mkdirp";
version = "0.3.0";
src = fetchurl {
- url = "https://registry.npmjs.org/mkdirp/-/mkdirp-0.3.0.tgz";
+ url = "http://registry.npmjs.org/mkdirp/-/mkdirp-0.3.0.tgz";
sha1 = "1bbf5ab1ba827af23575143490426455f481fe1e";
};
};
@@ -19921,7 +20795,7 @@ let
packageName = "mkdirp";
version = "0.3.5";
src = fetchurl {
- url = "https://registry.npmjs.org/mkdirp/-/mkdirp-0.3.5.tgz";
+ url = "http://registry.npmjs.org/mkdirp/-/mkdirp-0.3.5.tgz";
sha1 = "de3e5f8961c88c787ee1368df849ac4413eca8d7";
};
};
@@ -19930,7 +20804,7 @@ let
packageName = "mkdirp";
version = "0.5.0";
src = fetchurl {
- url = "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.0.tgz";
+ url = "http://registry.npmjs.org/mkdirp/-/mkdirp-0.5.0.tgz";
sha1 = "1d73076a6df986cd9344e15e71fcc05a4c9abf12";
};
};
@@ -19939,7 +20813,7 @@ let
packageName = "mkdirp";
version = "0.5.1";
src = fetchurl {
- url = "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.1.tgz";
+ url = "http://registry.npmjs.org/mkdirp/-/mkdirp-0.5.1.tgz";
sha1 = "30057438eac6cf7f8c4767f38648d6697d75c903";
};
};
@@ -19975,7 +20849,7 @@ let
packageName = "mocha";
version = "2.5.3";
src = fetchurl {
- url = "https://registry.npmjs.org/mocha/-/mocha-2.5.3.tgz";
+ url = "http://registry.npmjs.org/mocha/-/mocha-2.5.3.tgz";
sha1 = "161be5bdeb496771eb9b35745050b622b5aefc58";
};
};
@@ -20029,7 +20903,7 @@ let
packageName = "moment";
version = "2.1.0";
src = fetchurl {
- url = "https://registry.npmjs.org/moment/-/moment-2.1.0.tgz";
+ url = "http://registry.npmjs.org/moment/-/moment-2.1.0.tgz";
sha1 = "1fd7b1134029a953c6ea371dbaee37598ac03567";
};
};
@@ -20056,7 +20930,7 @@ let
packageName = "moment";
version = "2.7.0";
src = fetchurl {
- url = "https://registry.npmjs.org/moment/-/moment-2.7.0.tgz";
+ url = "http://registry.npmjs.org/moment/-/moment-2.7.0.tgz";
sha1 = "359a19ec634cda3c706c8709adda54c0329aaec4";
};
};
@@ -20083,7 +20957,7 @@ let
packageName = "mongoose";
version = "3.6.7";
src = fetchurl {
- url = "https://registry.npmjs.org/mongoose/-/mongoose-3.6.7.tgz";
+ url = "http://registry.npmjs.org/mongoose/-/mongoose-3.6.7.tgz";
sha1 = "aa6c9f4dfb740c7721dbe734fbb97714e5ab0ebc";
};
};
@@ -20096,6 +20970,15 @@ let
sha1 = "3bac3f3924a845d147784fc6558dee900b0151e2";
};
};
+ "monotonic-timestamp-0.0.9" = {
+ name = "monotonic-timestamp";
+ packageName = "monotonic-timestamp";
+ version = "0.0.9";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/monotonic-timestamp/-/monotonic-timestamp-0.0.9.tgz";
+ sha1 = "5ba5adc7aac85e1d7ce77be847161ed246b39603";
+ };
+ };
"mooremachine-2.2.1" = {
name = "mooremachine";
packageName = "mooremachine";
@@ -20110,7 +20993,7 @@ let
packageName = "morgan";
version = "1.6.1";
src = fetchurl {
- url = "https://registry.npmjs.org/morgan/-/morgan-1.6.1.tgz";
+ url = "http://registry.npmjs.org/morgan/-/morgan-1.6.1.tgz";
sha1 = "5fd818398c6819cba28a7cd6664f292fe1c0bbf2";
};
};
@@ -20155,7 +21038,7 @@ let
packageName = "mpath";
version = "0.1.1";
src = fetchurl {
- url = "https://registry.npmjs.org/mpath/-/mpath-0.1.1.tgz";
+ url = "http://registry.npmjs.org/mpath/-/mpath-0.1.1.tgz";
sha1 = "23da852b7c232ee097f4759d29c0ee9cd22d5e46";
};
};
@@ -20164,7 +21047,7 @@ let
packageName = "mpath";
version = "0.2.1";
src = fetchurl {
- url = "https://registry.npmjs.org/mpath/-/mpath-0.2.1.tgz";
+ url = "http://registry.npmjs.org/mpath/-/mpath-0.2.1.tgz";
sha1 = "3a4e829359801de96309c27a6b2e102e89f9e96e";
};
};
@@ -20339,6 +21222,24 @@ let
sha1 = "6462f1b204109ccc644601650110a828443d66e2";
};
};
+ "multiblob-1.13.0" = {
+ name = "multiblob";
+ packageName = "multiblob";
+ version = "1.13.0";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/multiblob/-/multiblob-1.13.0.tgz";
+ sha1 = "e284d5e4a944e724bee2e3896cb3007f069a41bb";
+ };
+ };
+ "multiblob-http-0.4.2" = {
+ name = "multiblob-http";
+ packageName = "multiblob-http";
+ version = "0.4.2";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/multiblob-http/-/multiblob-http-0.4.2.tgz";
+ sha512 = "hVaXryaqJ3vvKjRNcOCEadzgO99nR+haxlptswr3vRvgavbK/Y/I7/Nat12WIQno2/A8+nkbE+ZcrsN3UDbtQw==";
+ };
+ };
"multicast-dns-4.0.1" = {
name = "multicast-dns";
packageName = "multicast-dns";
@@ -20429,6 +21330,15 @@ let
sha1 = "2a8f2ddf70eed564dff2d57f1e1a137d9f05078b";
};
};
+ "multiserver-1.13.3" = {
+ name = "multiserver";
+ packageName = "multiserver";
+ version = "1.13.3";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/multiserver/-/multiserver-1.13.3.tgz";
+ sha512 = "9x0bO59YVcfT1jNIBcqz1SUI+mPxQWjjPOTzmLew/VS17yot3JOXLloK6g1+ky+uj+AHqRhKfm1zUFMKhlfqWg==";
+ };
+ };
"multistream-2.1.1" = {
name = "multistream";
packageName = "multistream";
@@ -20528,6 +21438,33 @@ let
sha512 = "oprzxd2zhfrJqEuB98qc1dRMMonClBQ57UPDjnbcrah4orEMTq1jq3+AcdFe5ePzdbJXI7zmdhfftIdMnhYFoQ==";
};
};
+ "muxrpc-6.4.1" = {
+ name = "muxrpc";
+ packageName = "muxrpc";
+ version = "6.4.1";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/muxrpc/-/muxrpc-6.4.1.tgz";
+ sha512 = "r8+tucKMmQiYd8NWGQqAA5r+SlYuU30D/WbYo7E/PztG/jmizQJY5NfmLIJ+GWo+dEC6kIxkr0eY+U0uZexTNg==";
+ };
+ };
+ "muxrpc-validation-2.0.1" = {
+ name = "muxrpc-validation";
+ packageName = "muxrpc-validation";
+ version = "2.0.1";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/muxrpc-validation/-/muxrpc-validation-2.0.1.tgz";
+ sha1 = "cd650d172025fe9d064230aab38ca6328dd16f2f";
+ };
+ };
+ "muxrpcli-1.1.0" = {
+ name = "muxrpcli";
+ packageName = "muxrpcli";
+ version = "1.1.0";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/muxrpcli/-/muxrpcli-1.1.0.tgz";
+ sha1 = "4ae9ba986ab825c4a5c12fcb71c6daa81eab5158";
+ };
+ };
"mv-2.1.1" = {
name = "mv";
packageName = "mv";
@@ -20627,13 +21564,13 @@ let
sha512 = "4/uzl+LkMGoVv/9eMzH2QFvefmlJErT0KR7EmuYbmht2QvxSEqTjhFFOZ/KHE6chH58fKL3njrOcEwbYV0h9Yw==";
};
};
- "nanoid-1.2.1" = {
+ "nanoid-1.2.2" = {
name = "nanoid";
packageName = "nanoid";
- version = "1.2.1";
+ version = "1.2.2";
src = fetchurl {
- url = "https://registry.npmjs.org/nanoid/-/nanoid-1.2.1.tgz";
- sha512 = "S1QSG+TQtsqr2/ujHZcNT0OxygffUaUT755qTc/SPKfQ0VJBlOO6qb1425UYoHXPvCZ3pWgMVCuy1t7+AoCxnQ==";
+ url = "https://registry.npmjs.org/nanoid/-/nanoid-1.2.2.tgz";
+ sha512 = "o4eK+NomkjYEn6cN9rImXMz1st/LdRP+tricKyoH834ikDwp/M/PJlYWTd7E7/OhvObzLJpuuVvwjg+jDpD4hA==";
};
};
"nanolru-1.0.0" = {
@@ -21114,7 +22051,7 @@ let
packageName = "node-fetch";
version = "2.1.2";
src = fetchurl {
- url = "https://registry.npmjs.org/node-fetch/-/node-fetch-2.1.2.tgz";
+ url = "http://registry.npmjs.org/node-fetch/-/node-fetch-2.1.2.tgz";
sha1 = "ab884e8e7e57e38a944753cec706f788d1768bb5";
};
};
@@ -21217,6 +22154,15 @@ let
sha1 = "4fc4effbb02f241fb5082bd4fbab398e4aecb64d";
};
};
+ "node-polyglot-1.0.0" = {
+ name = "node-polyglot";
+ packageName = "node-polyglot";
+ version = "1.0.0";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/node-polyglot/-/node-polyglot-1.0.0.tgz";
+ sha1 = "25b4d1d9d8eb02b48271c96000c4e6d366eef689";
+ };
+ };
"node-pre-gyp-0.6.39" = {
name = "node-pre-gyp";
packageName = "node-pre-gyp";
@@ -21415,13 +22361,13 @@ let
sha1 = "586db8101db30cb4438eb546737a41aad0cf13d5";
};
};
- "nodemon-1.18.3" = {
+ "nodemon-1.18.4" = {
name = "nodemon";
packageName = "nodemon";
- version = "1.18.3";
+ version = "1.18.4";
src = fetchurl {
- url = "https://registry.npmjs.org/nodemon/-/nodemon-1.18.3.tgz";
- sha512 = "XdVfAjGlDKU2nqoGgycxTndkJ5fdwvWJ/tlMGk2vHxMZBrSPVh86OM6z7viAv8BBJWjMgeuYQBofzr6LUoi+7g==";
+ url = "https://registry.npmjs.org/nodemon/-/nodemon-1.18.4.tgz";
+ sha512 = "hyK6vl65IPnky/ee+D3IWvVGgJa/m3No2/Xc/3wanS6Ce1MWjCzH6NnhPJ/vZM+6JFym16jtHx51lmCMB9HDtg==";
};
};
"nodesecurity-npm-utils-6.0.0" = {
@@ -21442,6 +22388,15 @@ let
sha1 = "2151f722472ba79e50a76fc125bb8c8f2e4dc2a7";
};
};
+ "non-private-ip-1.4.4" = {
+ name = "non-private-ip";
+ packageName = "non-private-ip";
+ version = "1.4.4";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/non-private-ip/-/non-private-ip-1.4.4.tgz";
+ sha512 = "K9nTVFOGUOYutaG8ywiKpCdVu458RFxSgSJ0rribUxtf5iLM9B2+raFJgkID3p5op0+twmoQqFaPnu9KYz6qzg==";
+ };
+ };
"noop-logger-0.1.1" = {
name = "noop-logger";
packageName = "noop-logger";
@@ -21532,6 +22487,15 @@ let
sha512 = "6eZs5Ls3WtCisHWp9S2GUy8dqkpGi4BVSz3GaqiE6ezub0512ESztXUwUB6C6IKbQkY2Pnb/mD4WYojCRwcwLA==";
};
};
+ "normalize-uri-1.1.1" = {
+ name = "normalize-uri";
+ packageName = "normalize-uri";
+ version = "1.1.1";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/normalize-uri/-/normalize-uri-1.1.1.tgz";
+ sha512 = "bui9/kzRGymbkxJsZEBZgDHK2WJWGOHzR0pCr404EpkpVFTkCOYaRwQTlehUE+7oI70mWNENncCWqUxT/icfHw==";
+ };
+ };
"normalize-url-2.0.1" = {
name = "normalize-url";
packageName = "normalize-url";
@@ -21555,7 +22519,7 @@ let
packageName = "npm";
version = "3.10.10";
src = fetchurl {
- url = "https://registry.npmjs.org/npm/-/npm-3.10.10.tgz";
+ url = "http://registry.npmjs.org/npm/-/npm-3.10.10.tgz";
sha1 = "5b1d577e4c8869d6c8603bc89e9cd1637303e46e";
};
};
@@ -21649,6 +22613,15 @@ let
sha512 = "q9zLP8cTr8xKPmMZN3naxp1k/NxVFsjxN6uWuO1tiw9gxg7wZWQ/b5UTfzD0ANw2q1lQxdLKTeCCksq+bPSgbQ==";
};
};
+ "npm-prefix-1.2.0" = {
+ name = "npm-prefix";
+ packageName = "npm-prefix";
+ version = "1.2.0";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/npm-prefix/-/npm-prefix-1.2.0.tgz";
+ sha1 = "e619455f7074ba54cc66d6d0d37dd9f1be6bcbc0";
+ };
+ };
"npm-registry-client-0.2.27" = {
name = "npm-registry-client";
packageName = "npm-registry-client";
@@ -21807,7 +22780,7 @@ let
packageName = "numeral";
version = "1.5.6";
src = fetchurl {
- url = "https://registry.npmjs.org/numeral/-/numeral-1.5.6.tgz";
+ url = "http://registry.npmjs.org/numeral/-/numeral-1.5.6.tgz";
sha1 = "3831db968451b9cf6aff9bf95925f1ef8e37b33f";
};
};
@@ -21947,6 +22920,15 @@ let
sha512 = "05KzQ70lSeGSrZJQXE5wNDiTkBJDlUT/myi6RX9dVIvz7a7Qh4oH93BQdiPMn27nldYvVQCKMUaM83AfizZlsQ==";
};
};
+ "object-inspect-1.6.0" = {
+ name = "object-inspect";
+ packageName = "object-inspect";
+ version = "1.6.0";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/object-inspect/-/object-inspect-1.6.0.tgz";
+ sha512 = "GJzfBZ6DgDAmnuaM3104jR4s1Myxr3Y3zfIyN4z3UdqN69oSRacNK8UhnobDdC+7J2AHCjGwxQubNJfE70SXXQ==";
+ };
+ };
"object-keys-1.0.12" = {
name = "object-keys";
packageName = "object-keys";
@@ -22046,12 +23028,48 @@ let
sha1 = "e524da09b4f66ff05df457546ec72ac99f13069a";
};
};
+ "observ-0.2.0" = {
+ name = "observ";
+ packageName = "observ";
+ version = "0.2.0";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/observ/-/observ-0.2.0.tgz";
+ sha1 = "0bc39b3e29faa5f9e6caa5906cb8392df400aa68";
+ };
+ };
+ "observ-debounce-1.1.1" = {
+ name = "observ-debounce";
+ packageName = "observ-debounce";
+ version = "1.1.1";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/observ-debounce/-/observ-debounce-1.1.1.tgz";
+ sha1 = "304e97c85adda70ecd7f08da450678ef90f0b707";
+ };
+ };
+ "obv-0.0.0" = {
+ name = "obv";
+ packageName = "obv";
+ version = "0.0.0";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/obv/-/obv-0.0.0.tgz";
+ sha1 = "edeab8468f91d4193362ed7f91d0b96dd39a79c1";
+ };
+ };
+ "obv-0.0.1" = {
+ name = "obv";
+ packageName = "obv";
+ version = "0.0.1";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/obv/-/obv-0.0.1.tgz";
+ sha1 = "cb236106341536f0dac4815e06708221cad7fb5e";
+ };
+ };
"octicons-3.5.0" = {
name = "octicons";
packageName = "octicons";
version = "3.5.0";
src = fetchurl {
- url = "https://registry.npmjs.org/octicons/-/octicons-3.5.0.tgz";
+ url = "http://registry.npmjs.org/octicons/-/octicons-3.5.0.tgz";
sha1 = "f7ff5935674d8b114f6d80c454bfaa01797a4e30";
};
};
@@ -22064,6 +23082,15 @@ let
sha1 = "68c1b3c57ced778b4e67d8637d2559b2c1b3ec26";
};
};
+ "on-change-network-0.0.2" = {
+ name = "on-change-network";
+ packageName = "on-change-network";
+ version = "0.0.2";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/on-change-network/-/on-change-network-0.0.2.tgz";
+ sha1 = "d977249477f91726949d80e82346dab6ef45216b";
+ };
+ };
"on-finished-2.2.1" = {
name = "on-finished";
packageName = "on-finished";
@@ -22091,6 +23118,15 @@ let
sha1 = "928f5d0f470d49342651ea6794b0857c100693f7";
};
};
+ "on-wakeup-1.0.1" = {
+ name = "on-wakeup";
+ packageName = "on-wakeup";
+ version = "1.0.1";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/on-wakeup/-/on-wakeup-1.0.1.tgz";
+ sha1 = "00d79d987dde7c8117bee74bb4903f6f6dafa52b";
+ };
+ };
"once-1.1.1" = {
name = "once";
packageName = "once";
@@ -22163,13 +23199,13 @@ let
sha1 = "067428230fd67443b2794b22bba528b6867962d4";
};
};
- "ono-4.0.6" = {
+ "ono-4.0.7" = {
name = "ono";
packageName = "ono";
- version = "4.0.6";
+ version = "4.0.7";
src = fetchurl {
- url = "https://registry.npmjs.org/ono/-/ono-4.0.6.tgz";
- sha512 = "fJc3tfcgNzIEpDmZIyPRZkYrhoSoexXNnEN4I0QyVQ9l7NMw3sBFeG26/UpCdSXyAOr4wqr9+/ym/769sZakSw==";
+ url = "https://registry.npmjs.org/ono/-/ono-4.0.7.tgz";
+ sha512 = "FJiGEETwfSVyOwVTwQZD7XN69FRekvgtlobtvPwtilc7PxIHg3gKUykdNP7E9mC/VTF2cxqKZxUZfNKA3MuQLA==";
};
};
"open-0.0.2" = {
@@ -22190,6 +23226,15 @@ let
sha1 = "42c3e18ec95466b6bf0dc42f3a2945c3f0cad8fc";
};
};
+ "opencollective-postinstall-2.0.0" = {
+ name = "opencollective-postinstall";
+ packageName = "opencollective-postinstall";
+ version = "2.0.0";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/opencollective-postinstall/-/opencollective-postinstall-2.0.0.tgz";
+ sha512 = "XAe80GycLe2yRGnJsUtt+EO5lk06XYRQt4kJJe53O2kJHPZJOZ+XMF/b47HW96e6LhfKVpwnXVr/s56jhV98jg==";
+ };
+ };
"opener-1.4.2" = {
name = "opener";
packageName = "opener";
@@ -22393,7 +23438,7 @@ let
packageName = "os-locale";
version = "1.4.0";
src = fetchurl {
- url = "https://registry.npmjs.org/os-locale/-/os-locale-1.4.0.tgz";
+ url = "http://registry.npmjs.org/os-locale/-/os-locale-1.4.0.tgz";
sha1 = "20f9f17ae29ed345e8bde583b13d2009803c14d9";
};
};
@@ -22406,6 +23451,15 @@ let
sha512 = "3sslG3zJbEYcaC4YVAvDorjGxc7tv6KVATnLPZONiljsUncvihe9BQoVCEs0RZ1kmf4Hk9OBqlZfJZWI4GanKA==";
};
};
+ "os-locale-3.0.0" = {
+ name = "os-locale";
+ packageName = "os-locale";
+ version = "3.0.0";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/os-locale/-/os-locale-3.0.0.tgz";
+ sha512 = "4mi6ZXIp4OtcV/Bwzl9p9Cvae7KJv/czGIm/HK0iaXCuRh7BMpy4l4o4CLjN+atsRQpCW9Rs4FdhfnK0zaR1Jg==";
+ };
+ };
"os-name-1.0.3" = {
name = "os-name";
packageName = "os-name";
@@ -22568,6 +23622,15 @@ let
sha1 = "bf98fe575705658a9e1351befb85ae4c1f07bdca";
};
};
+ "p-pipe-1.2.0" = {
+ name = "p-pipe";
+ packageName = "p-pipe";
+ version = "1.2.0";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/p-pipe/-/p-pipe-1.2.0.tgz";
+ sha1 = "4b1a11399a11520a67790ee5a0c1d5881d6befe9";
+ };
+ };
"p-reduce-1.0.0" = {
name = "p-reduce";
packageName = "p-reduce";
@@ -22685,6 +23748,24 @@ let
sha1 = "5860587a944873a6b7e6d26e8e51ffb22315bf17";
};
};
+ "packet-stream-2.0.4" = {
+ name = "packet-stream";
+ packageName = "packet-stream";
+ version = "2.0.4";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/packet-stream/-/packet-stream-2.0.4.tgz";
+ sha512 = "7+oxHdMMs6VhLvvbrDUc8QNuelE9fPKLDdToXBIKLPKOlnoBeMim+/35edp+AnFTLzk3xcogVvQ/jrZyyGsEiw==";
+ };
+ };
+ "packet-stream-codec-1.1.2" = {
+ name = "packet-stream-codec";
+ packageName = "packet-stream-codec";
+ version = "1.1.2";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/packet-stream-codec/-/packet-stream-codec-1.1.2.tgz";
+ sha1 = "79b302fc144cdfbb4ab6feba7040e6a5d99c79c7";
+ };
+ };
"pacote-9.1.0" = {
name = "pacote";
packageName = "pacote";
@@ -22766,6 +23847,15 @@ let
sha512 = "KPx7flKXg775zZpnp9SxJlz00gTd4BmJ2yJufSc44gMCRrRQ7NSzAcSJQfifuOLgW6bEi+ftrALtsgALeB2Adw==";
};
};
+ "parse-entities-1.1.2" = {
+ name = "parse-entities";
+ packageName = "parse-entities";
+ version = "1.1.2";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/parse-entities/-/parse-entities-1.1.2.tgz";
+ sha512 = "5N9lmQ7tmxfXf+hO3X6KRG6w7uYO/HL9fHalSySTdyn63C3WNvTM/1R8tn1u1larNcEbo3Slcy2bsVDQqvEpUg==";
+ };
+ };
"parse-filepath-1.0.2" = {
name = "parse-filepath";
packageName = "parse-filepath";
@@ -22964,15 +24054,6 @@ let
sha1 = "d5208a3738e46766e291ba2ea173684921a8b89d";
};
};
- "parserlib-0.2.5" = {
- name = "parserlib";
- packageName = "parserlib";
- version = "0.2.5";
- src = fetchurl {
- url = "https://registry.npmjs.org/parserlib/-/parserlib-0.2.5.tgz";
- sha1 = "85907dd8605aa06abb3dd295d50bb2b8fa4dd117";
- };
- };
"parserlib-1.1.1" = {
name = "parserlib";
packageName = "parserlib";
@@ -23225,13 +24306,13 @@ let
sha1 = "411cadb574c5a140d3a4b1910d40d80cc9f40b40";
};
};
- "path-loader-1.0.7" = {
+ "path-loader-1.0.8" = {
name = "path-loader";
packageName = "path-loader";
- version = "1.0.7";
+ version = "1.0.8";
src = fetchurl {
- url = "https://registry.npmjs.org/path-loader/-/path-loader-1.0.7.tgz";
- sha512 = "FIorK5Wwz8LzyklCCsPnHI2ieelYbnnGvEtBC4DxW8MkdzBbGKKhxoDH1pDPnQN5ll+gT7t77fac/VD7Vi1kFA==";
+ url = "https://registry.npmjs.org/path-loader/-/path-loader-1.0.8.tgz";
+ sha512 = "/JQCrTcrteaPB8IHefEAQbmBQReKj51A+yTyc745TBbO4FOySw+/l3Rh0zyad0Nrd87TMROlmFANQwCRsuvN4w==";
};
};
"path-parse-1.0.6" = {
@@ -23523,22 +24604,13 @@ let
sha1 = "2135d6dfa7a358c069ac9b178776288228450ffa";
};
};
- "pino-4.17.6" = {
+ "pino-5.0.4" = {
name = "pino";
packageName = "pino";
- version = "4.17.6";
+ version = "5.0.4";
src = fetchurl {
- url = "https://registry.npmjs.org/pino/-/pino-4.17.6.tgz";
- sha512 = "LFDwmhyWLBnmwO/2UFbWu1jEGVDzaPupaVdx0XcZ3tIAx1EDEBauzxXf2S0UcFK7oe+X9MApjH0hx9U1XMgfCA==";
- };
- };
- "pino-5.0.0-rc.4" = {
- name = "pino";
- packageName = "pino";
- version = "5.0.0-rc.4";
- src = fetchurl {
- url = "https://registry.npmjs.org/pino/-/pino-5.0.0-rc.4.tgz";
- sha512 = "n5aJmABDjzZbwrB0AEbUeugz1Rh55c9T62yVGv6YL1vP1GuqpjIcLgwZIM1SI8E4Nfmcoo46SSmPgSSA9mPdog==";
+ url = "https://registry.npmjs.org/pino/-/pino-5.0.4.tgz";
+ sha512 = "w7UohXesFggN77UyTnt0A7FqkEiq6TbeXgTvY7g1wFGXoGbxmF780uFm8oQKaWlFi7vnzDRkBnYHNaaHFUKEoQ==";
};
};
"pino-std-serializers-2.2.1" = {
@@ -23676,6 +24748,15 @@ let
sha512 = "L1zP0dk7vGweZME2i+EeakvUNqSrdiI3F91TwEoYiGrAfUXmVv6fJIq4g82PAXxNsWOp0J7ZqQy/3Szz0ajTxA==";
};
};
+ "plur-2.1.2" = {
+ name = "plur";
+ packageName = "plur";
+ version = "2.1.2";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/plur/-/plur-2.1.2.tgz";
+ sha1 = "7482452c1a0f508e3e344eaec312c91c29dc655a";
+ };
+ };
"pluralize-1.2.1" = {
name = "pluralize";
packageName = "pluralize";
@@ -23811,6 +24892,15 @@ let
sha1 = "d9ae0ca85330e03962d93292f95a8b44c2ebf505";
};
};
+ "prebuild-install-4.0.0" = {
+ name = "prebuild-install";
+ packageName = "prebuild-install";
+ version = "4.0.0";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/prebuild-install/-/prebuild-install-4.0.0.tgz";
+ sha512 = "7tayxeYboJX0RbVzdnKyGl2vhQRWr6qfClEXDhOkXjuaOKCw2q8aiuFhONRYVsG/czia7KhpykIlI2S2VaPunA==";
+ };
+ };
"precond-0.2.3" = {
name = "precond";
packageName = "precond";
@@ -23906,7 +24996,7 @@ let
packageName = "printf";
version = "0.2.5";
src = fetchurl {
- url = "https://registry.npmjs.org/printf/-/printf-0.2.5.tgz";
+ url = "http://registry.npmjs.org/printf/-/printf-0.2.5.tgz";
sha1 = "c438ca2ca33e3927671db4ab69c0e52f936a4f0f";
};
};
@@ -23946,6 +25036,15 @@ let
sha512 = "VvivMrbvd2nKkiG38qjULzlc+4Vx4wm/whI9pQD35YrARNnhxeiRktSOhSukRLFNlzg6Br/cJPet5J/u19r/mg==";
};
};
+ "private-box-0.2.1" = {
+ name = "private-box";
+ packageName = "private-box";
+ version = "0.2.1";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/private-box/-/private-box-0.2.1.tgz";
+ sha1 = "1df061afca5b3039c7feaadd0daf0f56f07e3ec0";
+ };
+ };
"probe-image-size-4.0.0" = {
name = "probe-image-size";
packageName = "probe-image-size";
@@ -24450,6 +25549,60 @@ let
sha1 = "c00d5c5128bac5806bec15d2b7e7cdabe42531f3";
};
};
+ "pull-abortable-4.0.0" = {
+ name = "pull-abortable";
+ packageName = "pull-abortable";
+ version = "4.0.0";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/pull-abortable/-/pull-abortable-4.0.0.tgz";
+ sha1 = "7017a984c3b834de77bac38c10b776f22dfc1843";
+ };
+ };
+ "pull-abortable-4.1.1" = {
+ name = "pull-abortable";
+ packageName = "pull-abortable";
+ version = "4.1.1";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/pull-abortable/-/pull-abortable-4.1.1.tgz";
+ sha1 = "b3ad5aefb4116b25916d26db89393ac98d0dcea1";
+ };
+ };
+ "pull-block-filter-1.0.0" = {
+ name = "pull-block-filter";
+ packageName = "pull-block-filter";
+ version = "1.0.0";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/pull-block-filter/-/pull-block-filter-1.0.0.tgz";
+ sha1 = "cf4ef3bbb91ec8b97e1ed31889a6691271e603a7";
+ };
+ };
+ "pull-box-stream-1.0.13" = {
+ name = "pull-box-stream";
+ packageName = "pull-box-stream";
+ version = "1.0.13";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/pull-box-stream/-/pull-box-stream-1.0.13.tgz";
+ sha1 = "c3e240398eab3f5951b2ed1078c5988bf7a0a2b9";
+ };
+ };
+ "pull-buffered-0.3.4" = {
+ name = "pull-buffered";
+ packageName = "pull-buffered";
+ version = "0.3.4";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/pull-buffered/-/pull-buffered-0.3.4.tgz";
+ sha512 = "rs5MtSaB1LQfXyer2uderwS4ypsTdmh9VC4wZC0WZsIBKqHiy7tFqNZ0QP1ln544N+yQGXEBRbwYn59iO6Ub9w==";
+ };
+ };
+ "pull-cache-0.0.0" = {
+ name = "pull-cache";
+ packageName = "pull-cache";
+ version = "0.0.0";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/pull-cache/-/pull-cache-0.0.0.tgz";
+ sha1 = "f9b81fa689ecf2a2d8f10f78ace63bd58980e7bb";
+ };
+ };
"pull-cat-1.1.11" = {
name = "pull-cat";
packageName = "pull-cat";
@@ -24459,6 +25612,42 @@ let
sha1 = "b642dd1255da376a706b6db4fa962f5fdb74c31b";
};
};
+ "pull-cont-0.0.0" = {
+ name = "pull-cont";
+ packageName = "pull-cont";
+ version = "0.0.0";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/pull-cont/-/pull-cont-0.0.0.tgz";
+ sha1 = "3fac48b81ac97b75ba01332088b0ce7af8c1be0e";
+ };
+ };
+ "pull-cont-0.1.1" = {
+ name = "pull-cont";
+ packageName = "pull-cont";
+ version = "0.1.1";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/pull-cont/-/pull-cont-0.1.1.tgz";
+ sha1 = "df1d580e271757ba9acbaeba20de2421d660d618";
+ };
+ };
+ "pull-core-1.1.0" = {
+ name = "pull-core";
+ packageName = "pull-core";
+ version = "1.1.0";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/pull-core/-/pull-core-1.1.0.tgz";
+ sha1 = "3d8127d6dac1475705c9800961f59d66c8046c8a";
+ };
+ };
+ "pull-cursor-3.0.0" = {
+ name = "pull-cursor";
+ packageName = "pull-cursor";
+ version = "3.0.0";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/pull-cursor/-/pull-cursor-3.0.0.tgz";
+ sha512 = "95lZVSF2eSEdOmUtlOBaD9p5YOvlYeCr5FBv2ySqcj/4rpaXI6d8OH+zPHHjKAf58R8QXJRZuyfHkcCX8TZbAg==";
+ };
+ };
"pull-defer-0.2.3" = {
name = "pull-defer";
packageName = "pull-defer";
@@ -24468,6 +25657,159 @@ let
sha512 = "/An3KE7mVjZCqNhZsr22k1Tx8MACnUnHZZNPSJ0S62td8JtYr/AiRG42Vz7Syu31SoTLUzVIe61jtT/pNdjVYA==";
};
};
+ "pull-file-0.5.0" = {
+ name = "pull-file";
+ packageName = "pull-file";
+ version = "0.5.0";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/pull-file/-/pull-file-0.5.0.tgz";
+ sha1 = "b3ca405306e082f9d4528288933badb2b656365b";
+ };
+ };
+ "pull-file-1.1.0" = {
+ name = "pull-file";
+ packageName = "pull-file";
+ version = "1.1.0";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/pull-file/-/pull-file-1.1.0.tgz";
+ sha1 = "1dd987605d6357a0d23c1e4b826f7915a215129c";
+ };
+ };
+ "pull-flatmap-0.0.1" = {
+ name = "pull-flatmap";
+ packageName = "pull-flatmap";
+ version = "0.0.1";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/pull-flatmap/-/pull-flatmap-0.0.1.tgz";
+ sha1 = "13d494453e8f6d478e7bbfade6f8fe0197fa6bb7";
+ };
+ };
+ "pull-fs-1.1.6" = {
+ name = "pull-fs";
+ packageName = "pull-fs";
+ version = "1.1.6";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/pull-fs/-/pull-fs-1.1.6.tgz";
+ sha1 = "f184f6a7728bb4d95641376bead69f6f66df47cd";
+ };
+ };
+ "pull-git-pack-1.0.2" = {
+ name = "pull-git-pack";
+ packageName = "pull-git-pack";
+ version = "1.0.2";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/pull-git-pack/-/pull-git-pack-1.0.2.tgz";
+ sha512 = "WZzAAs9ap+QBHliP3E7sCn9kRfMNbdtFVOU0wRRtbY8x6+SUGeCpIkeYUcl9K/KgkL+2XZeyKXzPZ688IyfMbQ==";
+ };
+ };
+ "pull-git-pack-concat-0.2.1" = {
+ name = "pull-git-pack-concat";
+ packageName = "pull-git-pack-concat";
+ version = "0.2.1";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/pull-git-pack-concat/-/pull-git-pack-concat-0.2.1.tgz";
+ sha1 = "b7c8334c3a4961fc5b595a34d1d4224da6082d55";
+ };
+ };
+ "pull-git-packidx-parser-1.0.0" = {
+ name = "pull-git-packidx-parser";
+ packageName = "pull-git-packidx-parser";
+ version = "1.0.0";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/pull-git-packidx-parser/-/pull-git-packidx-parser-1.0.0.tgz";
+ sha1 = "2d8bf0afe4824897ee03840bfe4f5a86afecca21";
+ };
+ };
+ "pull-git-remote-helper-2.0.0" = {
+ name = "pull-git-remote-helper";
+ packageName = "pull-git-remote-helper";
+ version = "2.0.0";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/pull-git-remote-helper/-/pull-git-remote-helper-2.0.0.tgz";
+ sha1 = "7285269ca0968466e3812431ddc2ac357df141be";
+ };
+ };
+ "pull-git-repo-1.2.1" = {
+ name = "pull-git-repo";
+ packageName = "pull-git-repo";
+ version = "1.2.1";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/pull-git-repo/-/pull-git-repo-1.2.1.tgz";
+ sha512 = "nHOicXiFryxuO9J+EhYY0cFC4n4mvsDabj6ts6BYgRbWAbp/gQUa+Hzfy05uey+HLz7XaR7N8XC+xGBgsYCmsg==";
+ };
+ };
+ "pull-glob-1.0.7" = {
+ name = "pull-glob";
+ packageName = "pull-glob";
+ version = "1.0.7";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/pull-glob/-/pull-glob-1.0.7.tgz";
+ sha1 = "eef915dde644bddbea8dd2e0106d544aacbcd5c2";
+ };
+ };
+ "pull-goodbye-0.0.2" = {
+ name = "pull-goodbye";
+ packageName = "pull-goodbye";
+ version = "0.0.2";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/pull-goodbye/-/pull-goodbye-0.0.2.tgz";
+ sha1 = "8d8357db55e22a710dfff0f16a8c90b45efe4171";
+ };
+ };
+ "pull-handshake-1.1.4" = {
+ name = "pull-handshake";
+ packageName = "pull-handshake";
+ version = "1.1.4";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/pull-handshake/-/pull-handshake-1.1.4.tgz";
+ sha1 = "6000a0fd018884cdfd737254f8cc60ab2a637791";
+ };
+ };
+ "pull-hash-1.0.0" = {
+ name = "pull-hash";
+ packageName = "pull-hash";
+ version = "1.0.0";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/pull-hash/-/pull-hash-1.0.0.tgz";
+ sha1 = "fcad4d2507bf2c2b3231f653dc9bfb2db4f0d88c";
+ };
+ };
+ "pull-hyperscript-0.2.2" = {
+ name = "pull-hyperscript";
+ packageName = "pull-hyperscript";
+ version = "0.2.2";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/pull-hyperscript/-/pull-hyperscript-0.2.2.tgz";
+ sha1 = "ca4a65833631854f575a4e2985568c9901f56383";
+ };
+ };
+ "pull-identify-filetype-1.1.0" = {
+ name = "pull-identify-filetype";
+ packageName = "pull-identify-filetype";
+ version = "1.1.0";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/pull-identify-filetype/-/pull-identify-filetype-1.1.0.tgz";
+ sha1 = "5f99af15e8846d48ecf625edc248ec2cf57f6b0d";
+ };
+ };
+ "pull-inactivity-2.1.2" = {
+ name = "pull-inactivity";
+ packageName = "pull-inactivity";
+ version = "2.1.2";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/pull-inactivity/-/pull-inactivity-2.1.2.tgz";
+ sha1 = "37a3d6ebbfac292cd435f5e481e5074c8c1fad75";
+ };
+ };
+ "pull-kvdiff-0.0.0" = {
+ name = "pull-kvdiff";
+ packageName = "pull-kvdiff";
+ version = "0.0.0";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/pull-kvdiff/-/pull-kvdiff-0.0.0.tgz";
+ sha1 = "9b6627d0e332d98288e47d471602161f41ff1353";
+ };
+ };
"pull-level-2.0.4" = {
name = "pull-level";
packageName = "pull-level";
@@ -24486,6 +25828,78 @@ let
sha1 = "a4ecee01e330155e9124bbbcf4761f21b38f51f5";
};
};
+ "pull-looper-1.0.0" = {
+ name = "pull-looper";
+ packageName = "pull-looper";
+ version = "1.0.0";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/pull-looper/-/pull-looper-1.0.0.tgz";
+ sha512 = "djlD60A6NGe5goLdP5pgbqzMEiWmk1bInuAzBp0QOH4vDrVwh05YDz6UP8+pOXveKEk8wHVP+rB2jBrK31QMPA==";
+ };
+ };
+ "pull-many-1.0.8" = {
+ name = "pull-many";
+ packageName = "pull-many";
+ version = "1.0.8";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/pull-many/-/pull-many-1.0.8.tgz";
+ sha1 = "3dadd9b6d156c545721bda8d0003dd8eaa06293e";
+ };
+ };
+ "pull-next-1.0.1" = {
+ name = "pull-next";
+ packageName = "pull-next";
+ version = "1.0.1";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/pull-next/-/pull-next-1.0.1.tgz";
+ sha1 = "03f4d7d19872fc1114161e88db6ecf4c65e61e56";
+ };
+ };
+ "pull-notify-0.1.1" = {
+ name = "pull-notify";
+ packageName = "pull-notify";
+ version = "0.1.1";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/pull-notify/-/pull-notify-0.1.1.tgz";
+ sha1 = "6f86ff95d270b89c3ebf255b6031b7032dc99cca";
+ };
+ };
+ "pull-paginate-1.0.0" = {
+ name = "pull-paginate";
+ packageName = "pull-paginate";
+ version = "1.0.0";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/pull-paginate/-/pull-paginate-1.0.0.tgz";
+ sha1 = "63ad58efa1066bc701aa581a98a3c41e6aec7fc2";
+ };
+ };
+ "pull-pair-1.1.0" = {
+ name = "pull-pair";
+ packageName = "pull-pair";
+ version = "1.1.0";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/pull-pair/-/pull-pair-1.1.0.tgz";
+ sha1 = "7ee427263fdf4da825397ac0a05e1ab4b74bd76d";
+ };
+ };
+ "pull-paramap-1.2.2" = {
+ name = "pull-paramap";
+ packageName = "pull-paramap";
+ version = "1.2.2";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/pull-paramap/-/pull-paramap-1.2.2.tgz";
+ sha1 = "51a4193ce9c8d7215d95adad45e2bcdb8493b23a";
+ };
+ };
+ "pull-ping-2.0.2" = {
+ name = "pull-ping";
+ packageName = "pull-ping";
+ version = "2.0.2";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/pull-ping/-/pull-ping-2.0.2.tgz";
+ sha1 = "7bc4a340167dad88f682a196c63485735c7a0894";
+ };
+ };
"pull-pushable-2.2.0" = {
name = "pull-pushable";
packageName = "pull-pushable";
@@ -24495,6 +25909,69 @@ let
sha1 = "5f2f3aed47ad86919f01b12a2e99d6f1bd776581";
};
};
+ "pull-rate-1.0.2" = {
+ name = "pull-rate";
+ packageName = "pull-rate";
+ version = "1.0.2";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/pull-rate/-/pull-rate-1.0.2.tgz";
+ sha1 = "17b231ad5f359f675826670172b0e590c8964e8d";
+ };
+ };
+ "pull-reader-1.3.1" = {
+ name = "pull-reader";
+ packageName = "pull-reader";
+ version = "1.3.1";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/pull-reader/-/pull-reader-1.3.1.tgz";
+ sha512 = "CBkejkE5nX50SiSEzu0Qoz4POTJMS/mw8G6aj3h3M/RJoKgggLxyF0IyTZ0mmpXFlXRcLmLmIEW4xeYn7AeDYw==";
+ };
+ };
+ "pull-sink-through-0.0.0" = {
+ name = "pull-sink-through";
+ packageName = "pull-sink-through";
+ version = "0.0.0";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/pull-sink-through/-/pull-sink-through-0.0.0.tgz";
+ sha1 = "d3c0492f3a80b4ed204af67c4b4f935680fc5b1f";
+ };
+ };
+ "pull-skip-footer-0.1.0" = {
+ name = "pull-skip-footer";
+ packageName = "pull-skip-footer";
+ version = "0.1.0";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/pull-skip-footer/-/pull-skip-footer-0.1.0.tgz";
+ sha1 = "95d0c60ce6ea9c8bab8ca0b16e1f518352ed4e4f";
+ };
+ };
+ "pull-stream-2.27.0" = {
+ name = "pull-stream";
+ packageName = "pull-stream";
+ version = "2.27.0";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/pull-stream/-/pull-stream-2.27.0.tgz";
+ sha1 = "fdf0eb910cdc4041d65956c00bee30dbbd00a068";
+ };
+ };
+ "pull-stream-2.28.4" = {
+ name = "pull-stream";
+ packageName = "pull-stream";
+ version = "2.28.4";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/pull-stream/-/pull-stream-2.28.4.tgz";
+ sha1 = "7ea97413c1619c20bc3bdf9e10e91347b03253e4";
+ };
+ };
+ "pull-stream-3.5.0" = {
+ name = "pull-stream";
+ packageName = "pull-stream";
+ version = "3.5.0";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/pull-stream/-/pull-stream-3.5.0.tgz";
+ sha1 = "1ee5b6f76fd3b3a49a5afb6ded5c0320acb3cfc7";
+ };
+ };
"pull-stream-3.6.9" = {
name = "pull-stream";
packageName = "pull-stream";
@@ -24504,6 +25981,51 @@ let
sha512 = "hJn4POeBrkttshdNl0AoSCVjMVSuBwuHocMerUdoZ2+oIUzrWHFTwJMlbHND7OiKLVgvz6TFj8ZUVywUMXccbw==";
};
};
+ "pull-stream-to-stream-1.3.4" = {
+ name = "pull-stream-to-stream";
+ packageName = "pull-stream-to-stream";
+ version = "1.3.4";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/pull-stream-to-stream/-/pull-stream-to-stream-1.3.4.tgz";
+ sha1 = "3f81d8216bd18d2bfd1a198190471180e2738399";
+ };
+ };
+ "pull-stringify-1.2.2" = {
+ name = "pull-stringify";
+ packageName = "pull-stringify";
+ version = "1.2.2";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/pull-stringify/-/pull-stringify-1.2.2.tgz";
+ sha1 = "5a1c34e0075faf2f2f6d46004e36dccd33bd7c7c";
+ };
+ };
+ "pull-through-1.0.18" = {
+ name = "pull-through";
+ packageName = "pull-through";
+ version = "1.0.18";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/pull-through/-/pull-through-1.0.18.tgz";
+ sha1 = "8dd62314263e59cf5096eafbb127a2b6ef310735";
+ };
+ };
+ "pull-traverse-1.0.3" = {
+ name = "pull-traverse";
+ packageName = "pull-traverse";
+ version = "1.0.3";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/pull-traverse/-/pull-traverse-1.0.3.tgz";
+ sha1 = "74fb5d7be7fa6bd7a78e97933e199b7945866938";
+ };
+ };
+ "pull-utf8-decoder-1.0.2" = {
+ name = "pull-utf8-decoder";
+ packageName = "pull-utf8-decoder";
+ version = "1.0.2";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/pull-utf8-decoder/-/pull-utf8-decoder-1.0.2.tgz";
+ sha1 = "a7afa2384d1e6415a5d602054126cc8de3bcbce7";
+ };
+ };
"pull-window-2.1.4" = {
name = "pull-window";
packageName = "pull-window";
@@ -24513,6 +26035,33 @@ let
sha1 = "fc3b86feebd1920c7ae297691e23f705f88552f0";
};
};
+ "pull-write-1.1.4" = {
+ name = "pull-write";
+ packageName = "pull-write";
+ version = "1.1.4";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/pull-write/-/pull-write-1.1.4.tgz";
+ sha1 = "dddea31493b48f6768b84a281d01eb3b531fe0b8";
+ };
+ };
+ "pull-write-file-0.2.4" = {
+ name = "pull-write-file";
+ packageName = "pull-write-file";
+ version = "0.2.4";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/pull-write-file/-/pull-write-file-0.2.4.tgz";
+ sha1 = "437344aeb2189f65e678ed1af37f0f760a5453ef";
+ };
+ };
+ "pull-ws-3.3.1" = {
+ name = "pull-ws";
+ packageName = "pull-ws";
+ version = "3.3.1";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/pull-ws/-/pull-ws-3.3.1.tgz";
+ sha512 = "kJodbLQT+oKjcRIQO+vQNw6xWBuEo7Kxp51VMOvb6cvPvHYA+aNLzm+NmkB/5dZwbuTRYGMal9QPvH52tzM1ZA==";
+ };
+ };
"pump-0.3.5" = {
name = "pump";
packageName = "pump";
@@ -24585,6 +26134,24 @@ let
sha512 = "XRsRjdf+j5ml+y/6GKHPZbrF/8p2Yga0JPtdqTIY2Xe5ohJPD9saDJJLPvp9+NSBprVvevdXZybnj2cv8OEd0A==";
};
};
+ "push-stream-10.0.3" = {
+ name = "push-stream";
+ packageName = "push-stream";
+ version = "10.0.3";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/push-stream/-/push-stream-10.0.3.tgz";
+ sha1 = "13d6aef4b506c65bbc3aa62409a8da6ce147ef87";
+ };
+ };
+ "push-stream-to-pull-stream-1.0.3" = {
+ name = "push-stream-to-pull-stream";
+ packageName = "push-stream-to-pull-stream";
+ version = "1.0.3";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/push-stream-to-pull-stream/-/push-stream-to-pull-stream-1.0.3.tgz";
+ sha512 = "pdE/OKi/jnp9DqGgNRzLY0oVHffn/8TXJmBPzv+ikdvpkeA0J//l5d7TZk1yWwZj9P0JcOIEVDOuHzhXaeBlmw==";
+ };
+ };
"q-1.0.1" = {
name = "q";
packageName = "q";
@@ -24828,15 +26395,6 @@ let
sha1 = "9ec61f79049875707d69414596fd907a4d711e73";
};
};
- "quick-format-unescaped-1.1.2" = {
- name = "quick-format-unescaped";
- packageName = "quick-format-unescaped";
- version = "1.1.2";
- src = fetchurl {
- url = "https://registry.npmjs.org/quick-format-unescaped/-/quick-format-unescaped-1.1.2.tgz";
- sha1 = "0ca581de3174becef25ac3c2e8956342381db698";
- };
- };
"quick-format-unescaped-3.0.0" = {
name = "quick-format-unescaped";
packageName = "quick-format-unescaped";
@@ -25071,6 +26629,15 @@ let
sha1 = "ce24a2029ad94c3a40d09604a87227027d7210d3";
};
};
+ "rc-0.5.5" = {
+ name = "rc";
+ packageName = "rc";
+ version = "0.5.5";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/rc/-/rc-0.5.5.tgz";
+ sha1 = "541cc3300f464b6dfe6432d756f0f2dd3e9eb199";
+ };
+ };
"rc-1.2.8" = {
name = "rc";
packageName = "rc";
@@ -25557,6 +27124,15 @@ let
sha1 = "120903040588ec7a4a399c6547fd01d0e3d2dc63";
};
};
+ "relative-url-1.0.2" = {
+ name = "relative-url";
+ packageName = "relative-url";
+ version = "1.0.2";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/relative-url/-/relative-url-1.0.2.tgz";
+ sha1 = "d21c52a72d6061018bcee9f9c9fc106bf7d65287";
+ };
+ };
"relaxed-json-1.0.1" = {
name = "relaxed-json";
packageName = "relaxed-json";
@@ -25566,6 +27142,24 @@ let
sha1 = "7c8d4aa2f095704cd020e32e8099bcae103f0bd4";
};
};
+ "remark-3.2.3" = {
+ name = "remark";
+ packageName = "remark";
+ version = "3.2.3";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/remark/-/remark-3.2.3.tgz";
+ sha1 = "802a38c3aa98c9e1e3ea015eeba211d27cb65e1f";
+ };
+ };
+ "remark-html-2.0.2" = {
+ name = "remark-html";
+ packageName = "remark-html";
+ version = "2.0.2";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/remark-html/-/remark-html-2.0.2.tgz";
+ sha1 = "592a347bdd3d5881f4f080c98b5b152fb1407a92";
+ };
+ };
"remove-array-items-1.0.0" = {
name = "remove-array-items";
packageName = "remove-array-items";
@@ -25593,6 +27187,15 @@ let
sha1 = "05f1a593f16e42e1fb90ebf59de8e569525f9523";
};
};
+ "remove-markdown-0.1.0" = {
+ name = "remove-markdown";
+ packageName = "remove-markdown";
+ version = "0.1.0";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/remove-markdown/-/remove-markdown-0.1.0.tgz";
+ sha1 = "cf8b66e9e6fcb4acc9721048adeee7a357698ba9";
+ };
+ };
"remove-trailing-separator-1.1.0" = {
name = "remove-trailing-separator";
packageName = "remove-trailing-separator";
@@ -25697,7 +27300,7 @@ let
packageName = "request";
version = "2.16.6";
src = fetchurl {
- url = "https://registry.npmjs.org/request/-/request-2.16.6.tgz";
+ url = "http://registry.npmjs.org/request/-/request-2.16.6.tgz";
sha1 = "872fe445ae72de266b37879d6ad7dc948fa01cad";
};
};
@@ -25706,7 +27309,7 @@ let
packageName = "request";
version = "2.67.0";
src = fetchurl {
- url = "https://registry.npmjs.org/request/-/request-2.67.0.tgz";
+ url = "http://registry.npmjs.org/request/-/request-2.67.0.tgz";
sha1 = "8af74780e2bf11ea0ae9aa965c11f11afd272742";
};
};
@@ -25715,7 +27318,7 @@ let
packageName = "request";
version = "2.74.0";
src = fetchurl {
- url = "https://registry.npmjs.org/request/-/request-2.74.0.tgz";
+ url = "http://registry.npmjs.org/request/-/request-2.74.0.tgz";
sha1 = "7693ca768bbb0ea5c8ce08c084a45efa05b892ab";
};
};
@@ -25724,7 +27327,7 @@ let
packageName = "request";
version = "2.79.0";
src = fetchurl {
- url = "https://registry.npmjs.org/request/-/request-2.79.0.tgz";
+ url = "http://registry.npmjs.org/request/-/request-2.79.0.tgz";
sha1 = "4dfe5bf6be8b8cdc37fcf93e04b65577722710de";
};
};
@@ -25769,7 +27372,7 @@ let
packageName = "request";
version = "2.9.203";
src = fetchurl {
- url = "https://registry.npmjs.org/request/-/request-2.9.203.tgz";
+ url = "http://registry.npmjs.org/request/-/request-2.9.203.tgz";
sha1 = "6c1711a5407fb94a114219563e44145bcbf4723a";
};
};
@@ -25890,6 +27493,15 @@ let
sha1 = "203114d82ad2c5ed9e8e0411b3932875e889e97b";
};
};
+ "resolve-1.7.1" = {
+ name = "resolve";
+ packageName = "resolve";
+ version = "1.7.1";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/resolve/-/resolve-1.7.1.tgz";
+ sha512 = "c7rwLofp8g1U+h1KNyHL/jicrKg1Ek4q+Lr33AL65uZTinUZHe30D5HlyN5V9NW0JX1D5dXQ4jqW5l7Sy/kGfw==";
+ };
+ };
"resolve-1.8.1" = {
name = "resolve";
packageName = "resolve";
@@ -26129,7 +27741,7 @@ let
packageName = "rimraf";
version = "2.1.4";
src = fetchurl {
- url = "https://registry.npmjs.org/rimraf/-/rimraf-2.1.4.tgz";
+ url = "http://registry.npmjs.org/rimraf/-/rimraf-2.1.4.tgz";
sha1 = "5a6eb62eeda068f51ede50f29b3e5cd22f3d9bb2";
};
};
@@ -26138,7 +27750,7 @@ let
packageName = "rimraf";
version = "2.2.8";
src = fetchurl {
- url = "https://registry.npmjs.org/rimraf/-/rimraf-2.2.8.tgz";
+ url = "http://registry.npmjs.org/rimraf/-/rimraf-2.2.8.tgz";
sha1 = "e439be2aaee327321952730f99a8929e4fc50582";
};
};
@@ -26147,7 +27759,7 @@ let
packageName = "rimraf";
version = "2.4.4";
src = fetchurl {
- url = "https://registry.npmjs.org/rimraf/-/rimraf-2.4.4.tgz";
+ url = "http://registry.npmjs.org/rimraf/-/rimraf-2.4.4.tgz";
sha1 = "b528ce2ebe0e6d89fb03b265de11d61da0dbcf82";
};
};
@@ -26156,7 +27768,7 @@ let
packageName = "rimraf";
version = "2.4.5";
src = fetchurl {
- url = "https://registry.npmjs.org/rimraf/-/rimraf-2.4.5.tgz";
+ url = "http://registry.npmjs.org/rimraf/-/rimraf-2.4.5.tgz";
sha1 = "ee710ce5d93a8fdb856fb5ea8ff0e2d75934b2da";
};
};
@@ -26340,22 +27952,22 @@ let
sha1 = "753b87a89a11c95467c4ac1626c4efc4e05c67be";
};
};
- "rxjs-5.5.11" = {
+ "rxjs-5.5.12" = {
name = "rxjs";
packageName = "rxjs";
- version = "5.5.11";
+ version = "5.5.12";
src = fetchurl {
- url = "https://registry.npmjs.org/rxjs/-/rxjs-5.5.11.tgz";
- sha512 = "3bjO7UwWfA2CV7lmwYMBzj4fQ6Cq+ftHc2MvUe+WMS7wcdJ1LosDWmdjPQanYp2dBRj572p7PeU81JUxHKOcBA==";
+ url = "https://registry.npmjs.org/rxjs/-/rxjs-5.5.12.tgz";
+ sha512 = "xx2itnL5sBbqeeiVgNPVuQQ1nC8Jp2WfNJhXWHmElW9YmrpS9UVnNzhP3EH3HFqexO5Tlp8GhYY+WEcqcVMvGw==";
};
};
- "rxjs-6.2.2" = {
+ "rxjs-6.3.1" = {
name = "rxjs";
packageName = "rxjs";
- version = "6.2.2";
+ version = "6.3.1";
src = fetchurl {
- url = "https://registry.npmjs.org/rxjs/-/rxjs-6.2.2.tgz";
- sha512 = "0MI8+mkKAXZUF9vMrEoPnaoHkfzBPP4IGwUYRJhIRJF6/w3uByO1e91bEHn8zd43RdkTMKiooYKmwz7RH6zfOQ==";
+ url = "https://registry.npmjs.org/rxjs/-/rxjs-6.3.1.tgz";
+ sha512 = "hRVfb1Mcf8rLXq1AZEjYpzBnQbO7Duveu1APXkWRTvqzhmkoQ40Pl2F9Btacx+gJCOqsMiugCGG4I2HPQgJRtA==";
};
};
"safe-buffer-5.0.1" = {
@@ -26520,6 +28132,24 @@ let
sha512 = "MuCAyrGZcTLfQoH2XoBlQ8C6bzwN88XT/0slOGz0pn8+gIP85BOAfYa44ZXQUTOwRwPU0QvgU+V+OSajl/59Xg==";
};
};
+ "secret-handshake-1.1.13" = {
+ name = "secret-handshake";
+ packageName = "secret-handshake";
+ version = "1.1.13";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/secret-handshake/-/secret-handshake-1.1.13.tgz";
+ sha512 = "jDpA1kPJGg+jEUOZGvqksQFGPWIx0aA96HpjU+AqIBKIKzmvZeOq0Lfl/XqVC5jviWTVZZM2B8+NqYR38Blz8A==";
+ };
+ };
+ "secret-stack-4.1.0" = {
+ name = "secret-stack";
+ packageName = "secret-stack";
+ version = "4.1.0";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/secret-stack/-/secret-stack-4.1.0.tgz";
+ sha512 = "tCxjylkvEvUqxlWSVALtPMGKGyed225oDf7zoxCOsvj5SaVolUzOaixS07IK74mjcq7D1TvEJ4kofcaTMhQq1w==";
+ };
+ };
"secure-keys-1.0.0" = {
name = "secure-keys";
packageName = "secure-keys";
@@ -26529,6 +28159,15 @@ let
sha1 = "f0c82d98a3b139a8776a8808050b824431087fca";
};
};
+ "secure-scuttlebutt-18.2.0" = {
+ name = "secure-scuttlebutt";
+ packageName = "secure-scuttlebutt";
+ version = "18.2.0";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/secure-scuttlebutt/-/secure-scuttlebutt-18.2.0.tgz";
+ sha512 = "rBK6P3A4MsZI4lrzaf/dbJJDIxuJXO6y3GUeNngb5IJlcagCNJ+zNZcd19rDURfU8tMgOyw+rEwGIs2ExLQTdg==";
+ };
+ };
"seek-bzip-1.0.5" = {
name = "seek-bzip";
packageName = "seek-bzip";
@@ -26781,6 +28420,15 @@ let
sha1 = "33279100c35c38519ca5e435245186c512fe0fdc";
};
};
+ "separator-escape-0.0.0" = {
+ name = "separator-escape";
+ packageName = "separator-escape";
+ version = "0.0.0";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/separator-escape/-/separator-escape-0.0.0.tgz";
+ sha1 = "e433676932020454e3c14870c517ea1de56c2fa4";
+ };
+ };
"sequence-2.2.1" = {
name = "sequence";
packageName = "sequence";
@@ -26988,6 +28636,15 @@ let
sha512 = "QMEp5B7cftE7APOjk5Y6xgrbWu+WkLVQwk8JNjZ8nKRciZaByEW6MubieAiToS7+dwvrjGhH8jRXz3MVd0AYqQ==";
};
};
+ "sha.js-2.4.5" = {
+ name = "sha.js";
+ packageName = "sha.js";
+ version = "2.4.5";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/sha.js/-/sha.js-2.4.5.tgz";
+ sha1 = "27d171efcc82a118b99639ff581660242b506e7c";
+ };
+ };
"shallow-clone-0.1.2" = {
name = "shallow-clone";
packageName = "shallow-clone";
@@ -27078,6 +28735,15 @@ let
sha512 = "pRXeNrCA2Wd9itwhvLp5LZQvPJ0wU6bcjaTMywHHGX5XWhVN2nzSu7WV0q+oUY7mGK3mgSkDDzP3MgjqdyIgbQ==";
};
};
+ "shellsubstitute-1.2.0" = {
+ name = "shellsubstitute";
+ packageName = "shellsubstitute";
+ version = "1.2.0";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/shellsubstitute/-/shellsubstitute-1.2.0.tgz";
+ sha1 = "e4f702a50c518b0f6fe98451890d705af29b6b70";
+ };
+ };
"shellwords-0.1.1" = {
name = "shellwords";
packageName = "shellwords";
@@ -27888,6 +29554,33 @@ let
sha512 = "Kezx6/VBguXOsEe5oU3lXYyKMi4+gva72TwJ7pQY5JfqUx2nMk7NXA6z/mpNqIlfQjWYVfeuNvQjexiTaTn6Nw==";
};
};
+ "sodium-browserify-1.2.4" = {
+ name = "sodium-browserify";
+ packageName = "sodium-browserify";
+ version = "1.2.4";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/sodium-browserify/-/sodium-browserify-1.2.4.tgz";
+ sha512 = "IYcxKje/uf/c3a7VhZYJLlUxWMcktfbD4AjqHjUD1/VWKjj0Oq5wNbX8wjJOWVO9UhUMqJQiOn2xFbzKWBmy5w==";
+ };
+ };
+ "sodium-browserify-tweetnacl-0.2.3" = {
+ name = "sodium-browserify-tweetnacl";
+ packageName = "sodium-browserify-tweetnacl";
+ version = "0.2.3";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/sodium-browserify-tweetnacl/-/sodium-browserify-tweetnacl-0.2.3.tgz";
+ sha1 = "b5537ffcbb9f74ebc443b8b6a211b291e8fcbc8e";
+ };
+ };
+ "sodium-chloride-1.1.0" = {
+ name = "sodium-chloride";
+ packageName = "sodium-chloride";
+ version = "1.1.0";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/sodium-chloride/-/sodium-chloride-1.1.0.tgz";
+ sha1 = "247a234b88867f6dff51332b605f193a65bf6839";
+ };
+ };
"sodium-javascript-0.5.5" = {
name = "sodium-javascript";
packageName = "sodium-javascript";
@@ -27915,13 +29608,13 @@ let
sha512 = "csdVyakzHJRyCevY4aZC2Eacda8paf+4nmRGF2N7KxCLKY2Ajn72JsExaQlJQ2BiXJncp44p3T+b80cU+2TTsg==";
};
};
- "sonic-boom-0.5.0" = {
+ "sonic-boom-0.6.1" = {
name = "sonic-boom";
packageName = "sonic-boom";
- version = "0.5.0";
+ version = "0.6.1";
src = fetchurl {
- url = "https://registry.npmjs.org/sonic-boom/-/sonic-boom-0.5.0.tgz";
- sha512 = "IqUrLNxgsUQGVyMLW8w8vELMa1BZIQ/uBjBuxLK0jg7HqWwedCgmBLqvgMFGihhXCoQ8w5m2vcnMs47C4KYxuQ==";
+ url = "https://registry.npmjs.org/sonic-boom/-/sonic-boom-0.6.1.tgz";
+ sha512 = "3qx6XXDeG+hPNa+jla1H6BMBLcjLl8L8NRERLVeIf/EuPqoqmq4K8owG29Xu7OypT/7/YT/0uKW6YitsKA+nLQ==";
};
};
"sorcery-0.10.0" = {
@@ -28275,6 +29968,15 @@ let
sha512 = "mTyOoPbrivtXnwnIxZRFYRrPNtEFKlpB2fvjSnCQUiAA6qAZzqwna5envK4uk6OIeP17CsdF3rSBGYVBsU0Tkg==";
};
};
+ "split-buffer-1.0.0" = {
+ name = "split-buffer";
+ packageName = "split-buffer";
+ version = "1.0.0";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/split-buffer/-/split-buffer-1.0.0.tgz";
+ sha1 = "b7e8e0ab51345158b72c1f6dbef2406d51f1d027";
+ };
+ };
"split-string-3.1.0" = {
name = "split-string";
packageName = "split-string";
@@ -28347,6 +30049,195 @@ let
sha1 = "c2b5047c2c297b693d3bab518765e4b7c24d8173";
};
};
+ "ssb-avatar-0.2.0" = {
+ name = "ssb-avatar";
+ packageName = "ssb-avatar";
+ version = "0.2.0";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/ssb-avatar/-/ssb-avatar-0.2.0.tgz";
+ sha1 = "06cd70795ee58d1462d100a45c660df3179d3b39";
+ };
+ };
+ "ssb-blobs-1.1.5" = {
+ name = "ssb-blobs";
+ packageName = "ssb-blobs";
+ version = "1.1.5";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/ssb-blobs/-/ssb-blobs-1.1.5.tgz";
+ sha512 = "DeeInkFU8oN1mYlPVrqrm9tupf6wze4HuowK7N2vv/O+UeSLuYPU1p4HrxSqdAPvUabr0OtvbFA6z1T4nw+9fw==";
+ };
+ };
+ "ssb-client-4.6.0" = {
+ name = "ssb-client";
+ packageName = "ssb-client";
+ version = "4.6.0";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/ssb-client/-/ssb-client-4.6.0.tgz";
+ sha512 = "LyH5Y/U7xvafmAuG1puyhNv4G3Ew9xC67dYgRX0wwbUf5iT422WB1Cvat9qGFAu3/BQbdctXtdEQPxaAn0+hYA==";
+ };
+ };
+ "ssb-config-2.2.0" = {
+ name = "ssb-config";
+ packageName = "ssb-config";
+ version = "2.2.0";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/ssb-config/-/ssb-config-2.2.0.tgz";
+ sha1 = "41cad038a8575af4062d3fd57d3b167be85b03bc";
+ };
+ };
+ "ssb-ebt-5.2.2" = {
+ name = "ssb-ebt";
+ packageName = "ssb-ebt";
+ version = "5.2.2";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/ssb-ebt/-/ssb-ebt-5.2.2.tgz";
+ sha512 = "De3dUnmgs/8aYl2fmi/MtJljR9qw1mUmpdM4qeCf+4uniqlNNhfn1Ux+M5A8XYVuI+TD4GkgmIDeZH6miey2kw==";
+ };
+ };
+ "ssb-friends-2.4.0" = {
+ name = "ssb-friends";
+ packageName = "ssb-friends";
+ version = "2.4.0";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/ssb-friends/-/ssb-friends-2.4.0.tgz";
+ sha1 = "0d40cd96a12f2339c9064a8ad1d5a713e91c57ae";
+ };
+ };
+ "ssb-git-0.5.0" = {
+ name = "ssb-git";
+ packageName = "ssb-git";
+ version = "0.5.0";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/ssb-git/-/ssb-git-0.5.0.tgz";
+ sha1 = "5f4f712e42a23b895b128d61bc70dfb3bd5b40b4";
+ };
+ };
+ "ssb-git-repo-2.8.3" = {
+ name = "ssb-git-repo";
+ packageName = "ssb-git-repo";
+ version = "2.8.3";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/ssb-git-repo/-/ssb-git-repo-2.8.3.tgz";
+ sha512 = "7GVq5Ael/get+3Ot5exLdRWU8psSQNv/SkyO0KUhjoc4VfTdz8XuN1K195LKiyL/7u31A50KmkG9U9twb+1rGQ==";
+ };
+ };
+ "ssb-issues-1.0.0" = {
+ name = "ssb-issues";
+ packageName = "ssb-issues";
+ version = "1.0.0";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/ssb-issues/-/ssb-issues-1.0.0.tgz";
+ sha1 = "9e857d170dff152c53a273eb9004a0a914a106e5";
+ };
+ };
+ "ssb-keys-7.0.16" = {
+ name = "ssb-keys";
+ packageName = "ssb-keys";
+ version = "7.0.16";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/ssb-keys/-/ssb-keys-7.0.16.tgz";
+ sha512 = "EhLkRzgF7YaRc47L8YZb+TcxEXZy9DPWCF+vCt5nSNm8Oj+Pz8pBVSOlrLKZVbcAKFjIJhqY32oTjknu3E1KVQ==";
+ };
+ };
+ "ssb-links-3.0.3" = {
+ name = "ssb-links";
+ packageName = "ssb-links";
+ version = "3.0.3";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/ssb-links/-/ssb-links-3.0.3.tgz";
+ sha512 = "x09ShIMjwvdZI7aDZm8kc1v5YCGZa9ulCOoxrf/RYJ98s5gbTfO9CBCzeMBAeQ5kRwSuKjiOxJHdeEBkj4Y6hw==";
+ };
+ };
+ "ssb-marked-0.5.4" = {
+ name = "ssb-marked";
+ packageName = "ssb-marked";
+ version = "0.5.4";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/ssb-marked/-/ssb-marked-0.5.4.tgz";
+ sha1 = "e2f0a17854d968a41e707dee6161c783f907330f";
+ };
+ };
+ "ssb-marked-0.6.0" = {
+ name = "ssb-marked";
+ packageName = "ssb-marked";
+ version = "0.6.0";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/ssb-marked/-/ssb-marked-0.6.0.tgz";
+ sha1 = "8171472058673e4e76ec187c40c88c1e484bc544";
+ };
+ };
+ "ssb-mentions-0.1.2" = {
+ name = "ssb-mentions";
+ packageName = "ssb-mentions";
+ version = "0.1.2";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/ssb-mentions/-/ssb-mentions-0.1.2.tgz";
+ sha1 = "d0442708e3af5e245a7af9c1abd8f89ab03c80c0";
+ };
+ };
+ "ssb-msg-schemas-6.3.0" = {
+ name = "ssb-msg-schemas";
+ packageName = "ssb-msg-schemas";
+ version = "6.3.0";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/ssb-msg-schemas/-/ssb-msg-schemas-6.3.0.tgz";
+ sha1 = "23c12443d4e5a0c4817743638ee0ca93ce6ddc85";
+ };
+ };
+ "ssb-msgs-5.2.0" = {
+ name = "ssb-msgs";
+ packageName = "ssb-msgs";
+ version = "5.2.0";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/ssb-msgs/-/ssb-msgs-5.2.0.tgz";
+ sha1 = "c681da5cd70c574c922dca4f03c521538135c243";
+ };
+ };
+ "ssb-pull-requests-1.0.0" = {
+ name = "ssb-pull-requests";
+ packageName = "ssb-pull-requests";
+ version = "1.0.0";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/ssb-pull-requests/-/ssb-pull-requests-1.0.0.tgz";
+ sha1 = "dfd30cd50eecd8546bd4aa7f06e7c8f501c08118";
+ };
+ };
+ "ssb-query-2.2.1" = {
+ name = "ssb-query";
+ packageName = "ssb-query";
+ version = "2.2.1";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/ssb-query/-/ssb-query-2.2.1.tgz";
+ sha512 = "eAbTVPHYLJ/Cp8jO7uFFXY7L3RhYKlGIhTEM1xjbz3p4/Dysl6DPyWTz7JF+lXhz5AznfjzZNfZjMnX3GJtIbA==";
+ };
+ };
+ "ssb-ref-2.11.2" = {
+ name = "ssb-ref";
+ packageName = "ssb-ref";
+ version = "2.11.2";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/ssb-ref/-/ssb-ref-2.11.2.tgz";
+ sha512 = "40A+o3iNAgr/sMH4V6/f3l2dhzUb5ZhTwZdrlKFu1ti+uZrKNUkH/E8j5NIZpj2rDq0PDXkACSVJgPGwltfQRA==";
+ };
+ };
+ "ssb-validate-3.0.10" = {
+ name = "ssb-validate";
+ packageName = "ssb-validate";
+ version = "3.0.10";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/ssb-validate/-/ssb-validate-3.0.10.tgz";
+ sha512 = "9wJE1i+4vW/F/TYQQl15BVoiZb9kaqIRBhl2I/TXyhjngfx/yBzXFAuiXhaiDfqJ3YnUXzY4JMUSx0gIvpePnQ==";
+ };
+ };
+ "ssb-ws-2.1.1" = {
+ name = "ssb-ws";
+ packageName = "ssb-ws";
+ version = "2.1.1";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/ssb-ws/-/ssb-ws-2.1.1.tgz";
+ sha512 = "1fK/jXI6lKZadRJDr49t+6yMmWynp6PFrADs3Whmy8IslnYGl83ujhlpRIBvCn1EuVHjV7yLsIiJ8a0X2Kg0DQ==";
+ };
+ };
"ssh-config-1.1.3" = {
name = "ssh-config";
packageName = "ssh-config";
@@ -28437,6 +30328,15 @@ let
sha512 = "ji9qxRnOVfcuLDySj9qzhGSEFVobyt1kIOSkj1qZzYLzq7Tos/oUUWvotUPQLlrsidqsK6tBH89Bc9kL5zHA6w==";
};
};
+ "stack-0.1.0" = {
+ name = "stack";
+ packageName = "stack";
+ version = "0.1.0";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/stack/-/stack-0.1.0.tgz";
+ sha1 = "e923598a9be51e617682cb21cf1b2818a449ada2";
+ };
+ };
"stack-trace-0.0.10" = {
name = "stack-trace";
packageName = "stack-trace";
@@ -28464,6 +30364,15 @@ let
sha1 = "60809c39cbff55337226fd5e0b520f341f1fb5c6";
};
};
+ "statistics-3.3.0" = {
+ name = "statistics";
+ packageName = "statistics";
+ version = "3.3.0";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/statistics/-/statistics-3.3.0.tgz";
+ sha1 = "ec7b4750ff03ab24a64dd9b357a78316bead78aa";
+ };
+ };
"statsd-parser-0.0.4" = {
name = "statsd-parser";
packageName = "statsd-parser";
@@ -28896,6 +30805,15 @@ let
sha1 = "5bcfad39f4649bb2d031292e19bcf0b510d4b242";
};
};
+ "string.prototype.trim-1.1.2" = {
+ name = "string.prototype.trim";
+ packageName = "string.prototype.trim";
+ version = "1.1.2";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/string.prototype.trim/-/string.prototype.trim-1.1.2.tgz";
+ sha1 = "d04de2c89e137f4d7d206f086b5ed2fae6be8cea";
+ };
+ };
"string2compact-1.3.0" = {
name = "string2compact";
packageName = "string2compact";
@@ -28932,6 +30850,15 @@ let
sha512 = "n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==";
};
};
+ "stringify-entities-1.3.2" = {
+ name = "stringify-entities";
+ packageName = "stringify-entities";
+ version = "1.3.2";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/stringify-entities/-/stringify-entities-1.3.2.tgz";
+ sha512 = "nrBAQClJAPN2p+uGCVJRPIPakKeKWZ9GtBCmormE7pWOSlHat7+x5A8gx85M7HM5Dt0BP3pP5RhVW77WdbJJ3A==";
+ };
+ };
"stringstream-0.0.6" = {
name = "stringstream";
packageName = "stringstream";
@@ -29189,7 +31116,7 @@ let
packageName = "superagent";
version = "0.21.0";
src = fetchurl {
- url = "https://registry.npmjs.org/superagent/-/superagent-0.21.0.tgz";
+ url = "http://registry.npmjs.org/superagent/-/superagent-0.21.0.tgz";
sha1 = "fb15027984751ee7152200e6cd21cd6e19a5de87";
};
};
@@ -29198,7 +31125,7 @@ let
packageName = "superagent";
version = "1.8.5";
src = fetchurl {
- url = "https://registry.npmjs.org/superagent/-/superagent-1.8.5.tgz";
+ url = "http://registry.npmjs.org/superagent/-/superagent-1.8.5.tgz";
sha1 = "1c0ddc3af30e80eb84ebc05cb2122da8fe940b55";
};
};
@@ -29500,6 +31427,15 @@ let
sha1 = "2e7ce0a31df09f8d6851664a71842e0ca5057af7";
};
};
+ "tape-4.9.1" = {
+ name = "tape";
+ packageName = "tape";
+ version = "4.9.1";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/tape/-/tape-4.9.1.tgz";
+ sha512 = "6fKIXknLpoe/Jp4rzHKFPpJUHDHDqn8jus99IfPnHIjyz78HYlefTGD3b5EkbQzuLfaEvmfPK3IolLgq2xT3kw==";
+ };
+ };
"tar-0.1.17" = {
name = "tar";
packageName = "tar";
@@ -30085,6 +32021,15 @@ let
sha1 = "fc92adaba072647bc0b67d6b03664aa195093af6";
};
};
+ "to-vfile-1.0.0" = {
+ name = "to-vfile";
+ packageName = "to-vfile";
+ version = "1.0.0";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/to-vfile/-/to-vfile-1.0.0.tgz";
+ sha1 = "88defecd43adb2ef598625f0e3d59f7f342941ba";
+ };
+ };
"toidentifier-1.0.0" = {
name = "toidentifier";
packageName = "toidentifier";
@@ -30135,17 +32080,17 @@ let
packageName = "torrent-discovery";
version = "5.4.0";
src = fetchurl {
- url = "https://registry.npmjs.org/torrent-discovery/-/torrent-discovery-5.4.0.tgz";
+ url = "http://registry.npmjs.org/torrent-discovery/-/torrent-discovery-5.4.0.tgz";
sha1 = "2d17d82cf669ada7f9dfe75db4b31f7034b71e29";
};
};
- "torrent-discovery-9.0.2" = {
+ "torrent-discovery-9.1.1" = {
name = "torrent-discovery";
packageName = "torrent-discovery";
- version = "9.0.2";
+ version = "9.1.1";
src = fetchurl {
- url = "https://registry.npmjs.org/torrent-discovery/-/torrent-discovery-9.0.2.tgz";
- sha512 = "UpkOyi/QUXRAwts8vSsFu/jRQ1mwGkaqv2OxLTJGr4DJKCiXpLHZ1+A4rxabcOWinM9RiqmS5mAjDuFfPHiJvw==";
+ url = "https://registry.npmjs.org/torrent-discovery/-/torrent-discovery-9.1.1.tgz";
+ sha512 = "3mHf+bxVCVLrlkPJdAoMbPMY1hpTZVeWw5hNc2pPFm+HCc2DS0HgVFTBTSWtB8vQPWA1hSEZpqJ+3QfdXxDE1g==";
};
};
"torrent-piece-1.1.2" = {
@@ -30328,6 +32273,15 @@ let
sha1 = "5858547f6b290757ee95cccc666fb50084c460dd";
};
};
+ "trim-lines-1.1.1" = {
+ name = "trim-lines";
+ packageName = "trim-lines";
+ version = "1.1.1";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/trim-lines/-/trim-lines-1.1.1.tgz";
+ sha512 = "X+eloHbgJGxczUk1WSjIvn7aC9oN3jVE3rQfRVKcgpavi3jxtCn0VVKtjOBj64Yop96UYn/ujJRpTbCdAF1vyg==";
+ };
+ };
"trim-newlines-1.0.0" = {
name = "trim-newlines";
packageName = "trim-newlines";
@@ -30373,6 +32327,15 @@ let
sha1 = "cb2e1203067e0c8de1f614094b9fe45704ea6003";
};
};
+ "trim-trailing-lines-1.1.1" = {
+ name = "trim-trailing-lines";
+ packageName = "trim-trailing-lines";
+ version = "1.1.1";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/trim-trailing-lines/-/trim-trailing-lines-1.1.1.tgz";
+ sha512 = "bWLv9BbWbbd7mlqqs2oQYnLD/U/ZqeJeJwbO0FG2zA1aTq+HTvxfHNKFa/HGCVyJpDiioUYaBhfiT6rgk+l4mg==";
+ };
+ };
"truncate-2.0.1" = {
name = "truncate";
packageName = "truncate";
@@ -30490,6 +32453,15 @@ let
sha1 = "5ae68177f192d4456269d108afa93ff8743f4f64";
};
};
+ "tweetnacl-auth-0.3.1" = {
+ name = "tweetnacl-auth";
+ packageName = "tweetnacl-auth";
+ version = "0.3.1";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/tweetnacl-auth/-/tweetnacl-auth-0.3.1.tgz";
+ sha1 = "b75bc2df15649bb84e8b9aa3c0669c6c4bce0d25";
+ };
+ };
"twig-1.12.0" = {
name = "twig";
packageName = "twig";
@@ -30576,7 +32548,7 @@ let
packageName = "typescript";
version = "2.7.2";
src = fetchurl {
- url = "https://registry.npmjs.org/typescript/-/typescript-2.7.2.tgz";
+ url = "http://registry.npmjs.org/typescript/-/typescript-2.7.2.tgz";
sha512 = "p5TCYZDAO0m4G344hD+wx/LATebLWZNkkh2asWUFqSsD2OrDNhbAHuSjobrmsUmdzjJjEeZVU9g1h3O6vpstnw==";
};
};
@@ -30657,7 +32629,7 @@ let
packageName = "uglify-js";
version = "1.2.5";
src = fetchurl {
- url = "https://registry.npmjs.org/uglify-js/-/uglify-js-1.2.5.tgz";
+ url = "http://registry.npmjs.org/uglify-js/-/uglify-js-1.2.5.tgz";
sha1 = "b542c2c76f78efb34b200b20177634330ff702b6";
};
};
@@ -30666,7 +32638,7 @@ let
packageName = "uglify-js";
version = "2.2.5";
src = fetchurl {
- url = "https://registry.npmjs.org/uglify-js/-/uglify-js-2.2.5.tgz";
+ url = "http://registry.npmjs.org/uglify-js/-/uglify-js-2.2.5.tgz";
sha1 = "a6e02a70d839792b9780488b7b8b184c095c99c7";
};
};
@@ -30675,7 +32647,7 @@ let
packageName = "uglify-js";
version = "2.3.6";
src = fetchurl {
- url = "https://registry.npmjs.org/uglify-js/-/uglify-js-2.3.6.tgz";
+ url = "http://registry.npmjs.org/uglify-js/-/uglify-js-2.3.6.tgz";
sha1 = "fa0984770b428b7a9b2a8058f46355d14fef211a";
};
};
@@ -30697,6 +32669,15 @@ let
sha512 = "WatYTD84gP/867bELqI2F/2xC9PQBETn/L+7RGq9MQOA/7yFBNvY1UwXqvtILeE6n0ITwBXxp34M0/o70dzj6A==";
};
};
+ "uglify-js-3.4.9" = {
+ name = "uglify-js";
+ packageName = "uglify-js";
+ version = "3.4.9";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/uglify-js/-/uglify-js-3.4.9.tgz";
+ sha512 = "8CJsbKOtEbnJsTyv6LE6m6ZKniqMiFWmm9sRbopbkGs3gMPPfd3Fh8iIA4Ykv5MgaTbqHr4BaoGLJLZNhsrW1Q==";
+ };
+ };
"uglify-to-browserify-1.0.2" = {
name = "uglify-to-browserify";
packageName = "uglify-to-browserify";
@@ -30778,6 +32759,15 @@ let
sha1 = "483126e11774df2f71b8b639dcd799c376162b82";
};
};
+ "uint48be-1.0.2" = {
+ name = "uint48be";
+ packageName = "uint48be";
+ version = "1.0.2";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/uint48be/-/uint48be-1.0.2.tgz";
+ sha512 = "jNn1eEi81BLiZfJkjbiAKPDMj7iFrturKazqpBu0aJYLr6evgkn+9rgkX/gUwPBj5j2Ri5oUelsqC/S1zmpWBA==";
+ };
+ };
"uint64be-2.0.2" = {
name = "uint64be";
packageName = "uint64be";
@@ -30949,6 +32939,15 @@ let
sha1 = "8cdd8fbac4e2d2ea1e7e2e8097c42f442280f85b";
};
};
+ "unherit-1.1.1" = {
+ name = "unherit";
+ packageName = "unherit";
+ version = "1.1.1";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/unherit/-/unherit-1.1.1.tgz";
+ sha512 = "+XZuV691Cn4zHsK0vkKYwBEwB74T3IZIcxrgn2E4rKwTfFyI1zCh7X7grwh9Re08fdPlarIdyWgI8aVB3F5A5g==";
+ };
+ };
"unicode-5.2.0-0.7.5" = {
name = "unicode-5.2.0";
packageName = "unicode-5.2.0";
@@ -30967,6 +32966,15 @@ let
sha1 = "dbbd5b54ba30f287e2a8d5a249da6c0cef369459";
};
};
+ "unified-2.1.4" = {
+ name = "unified";
+ packageName = "unified";
+ version = "2.1.4";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/unified/-/unified-2.1.4.tgz";
+ sha1 = "14bc6cd40d98ffff75b405506bad873ecbbac3ba";
+ };
+ };
"union-value-1.0.0" = {
name = "union-value";
packageName = "union-value";
@@ -31030,6 +33038,33 @@ let
sha1 = "9e1057cca851abb93398f8b33ae187b99caec11a";
};
};
+ "unist-util-is-2.1.2" = {
+ name = "unist-util-is";
+ packageName = "unist-util-is";
+ version = "2.1.2";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/unist-util-is/-/unist-util-is-2.1.2.tgz";
+ sha512 = "YkXBK/H9raAmG7KXck+UUpnKiNmUdB+aBGrknfQ4EreE1banuzrKABx3jP6Z5Z3fMSPMQQmeXBlKpCbMwBkxVw==";
+ };
+ };
+ "unist-util-visit-1.4.0" = {
+ name = "unist-util-visit";
+ packageName = "unist-util-visit";
+ version = "1.4.0";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/unist-util-visit/-/unist-util-visit-1.4.0.tgz";
+ sha512 = "FiGu34ziNsZA3ZUteZxSFaczIjGmksfSgdKqBfOejrrfzyUy5b7YrlzT1Bcvi+djkYDituJDy2XB7tGTeBieKw==";
+ };
+ };
+ "unist-util-visit-parents-2.0.1" = {
+ name = "unist-util-visit-parents";
+ packageName = "unist-util-visit-parents";
+ version = "2.0.1";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/unist-util-visit-parents/-/unist-util-visit-parents-2.0.1.tgz";
+ sha512 = "6B0UTiMfdWql4cQ03gDTCSns+64Zkfo2OCbK31Ov0uMizEz+CJeAp0cgZVb5Fhmcd7Bct2iRNywejT0orpbqUA==";
+ };
+ };
"universalify-0.1.2" = {
name = "universalify";
packageName = "universalify";
@@ -31381,13 +33416,13 @@ let
sha1 = "cf593ef4f2d175875e8bb658ea92e18a4fd06d8e";
};
};
- "ut_metadata-3.2.2" = {
+ "ut_metadata-3.3.0" = {
name = "ut_metadata";
packageName = "ut_metadata";
- version = "3.2.2";
+ version = "3.3.0";
src = fetchurl {
- url = "https://registry.npmjs.org/ut_metadata/-/ut_metadata-3.2.2.tgz";
- sha512 = "PltK6kZ85DMscFl1gwyvOyja6UGROdyLI1ufWCTLsYnLfBaMyhtOEcbtgEgOwYEz8QuchR49qgHXTdJ2H05VHA==";
+ url = "https://registry.npmjs.org/ut_metadata/-/ut_metadata-3.3.0.tgz";
+ sha512 = "IK+ke9yL6a4oPLz/3oSW9TW7m9Wr4RG+5kW5aS2YulzEU1QDGAtago/NnOlno91fo3fSO7mnsqzn3NXNXdv8nA==";
};
};
"ut_pex-1.2.1" = {
@@ -31678,13 +33713,13 @@ let
sha1 = "5fa912d81eb7d0c74afc140de7317f0ca7df437e";
};
};
- "validator-10.7.0" = {
+ "validator-10.7.1" = {
name = "validator";
packageName = "validator";
- version = "10.7.0";
+ version = "10.7.1";
src = fetchurl {
- url = "https://registry.npmjs.org/validator/-/validator-10.7.0.tgz";
- sha512 = "7Z4kif6HeMLroCQZvh8lwCtmPOqBTkTkt5ibXtJR8sOkzWdjW+YIJOZUpPFlfq59zYvnpSPVd4UX5QYnSCLWgA==";
+ url = "https://registry.npmjs.org/validator/-/validator-10.7.1.tgz";
+ sha512 = "tbB5JrTczfeHKLw3PnFRzGFlF1xUAwSgXEDb66EuX1ffCirspYpDEZo3Vc9j38gPdL4JKrDc5UPFfgYiw1IWRQ==";
};
};
"validator-5.2.0" = {
@@ -31692,7 +33727,7 @@ let
packageName = "validator";
version = "5.2.0";
src = fetchurl {
- url = "https://registry.npmjs.org/validator/-/validator-5.2.0.tgz";
+ url = "http://registry.npmjs.org/validator/-/validator-5.2.0.tgz";
sha1 = "e66fb3ec352348c1f7232512328738d8d66a9689";
};
};
@@ -31701,7 +33736,7 @@ let
packageName = "validator";
version = "9.4.1";
src = fetchurl {
- url = "https://registry.npmjs.org/validator/-/validator-9.4.1.tgz";
+ url = "http://registry.npmjs.org/validator/-/validator-9.4.1.tgz";
sha512 = "YV5KjzvRmSyJ1ee/Dm5UED0G+1L4GZnLN3w6/T+zZm8scVua4sOhYKWTUrKa0H/tMiJyO9QLHMPN+9mB/aMunA==";
};
};
@@ -31840,6 +33875,51 @@ let
sha1 = "7d13b27b1facc2e2da90405eb5ea6e5bdd252ea5";
};
};
+ "vfile-1.4.0" = {
+ name = "vfile";
+ packageName = "vfile";
+ version = "1.4.0";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/vfile/-/vfile-1.4.0.tgz";
+ sha1 = "c0fd6fa484f8debdb771f68c31ed75d88da97fe7";
+ };
+ };
+ "vfile-find-down-1.0.0" = {
+ name = "vfile-find-down";
+ packageName = "vfile-find-down";
+ version = "1.0.0";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/vfile-find-down/-/vfile-find-down-1.0.0.tgz";
+ sha1 = "84a4d66d03513f6140a84e0776ef0848d4f0ad95";
+ };
+ };
+ "vfile-find-up-1.0.0" = {
+ name = "vfile-find-up";
+ packageName = "vfile-find-up";
+ version = "1.0.0";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/vfile-find-up/-/vfile-find-up-1.0.0.tgz";
+ sha1 = "5604da6fe453b34350637984eb5fe4909e280390";
+ };
+ };
+ "vfile-reporter-1.5.0" = {
+ name = "vfile-reporter";
+ packageName = "vfile-reporter";
+ version = "1.5.0";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/vfile-reporter/-/vfile-reporter-1.5.0.tgz";
+ sha1 = "21a7009bfe55e24df8ff432aa5bf6f6efa74e418";
+ };
+ };
+ "vfile-sort-1.0.0" = {
+ name = "vfile-sort";
+ packageName = "vfile-sort";
+ version = "1.0.0";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/vfile-sort/-/vfile-sort-1.0.0.tgz";
+ sha1 = "17ee491ba43e8951bb22913fcff32a7dc4d234d4";
+ };
+ };
"vhost-3.0.2" = {
name = "vhost";
packageName = "vhost";
@@ -31939,13 +34019,13 @@ let
sha1 = "ab6549d61d172c2b1b87be5c508d239c8ef87705";
};
};
- "vlc-command-1.1.1" = {
+ "vlc-command-1.1.2" = {
name = "vlc-command";
packageName = "vlc-command";
- version = "1.1.1";
+ version = "1.1.2";
src = fetchurl {
- url = "https://registry.npmjs.org/vlc-command/-/vlc-command-1.1.1.tgz";
- sha1 = "349b85def831f980cd6eec560b1990fd989eaf92";
+ url = "https://registry.npmjs.org/vlc-command/-/vlc-command-1.1.2.tgz";
+ sha512 = "KZ15RTHz96OEiQDA8oNFn1edYDWyKJIWI4gF74Am9woZo5XmVYryk5RYXSwOMvsaAgL5ejICEGCl0suQyDBu+Q==";
};
};
"vm-browserify-0.0.4" = {
@@ -32191,13 +34271,13 @@ let
sha512 = "YQ+BmxuTgd6UXZW3+ICGfyqRyHXVlD5GtQr5+qjiNW7bF0cqrzX500HVXPBOvgXb5YnzDd+h0zqyv61KUD7+Sg==";
};
};
- "webpack-sources-1.1.0" = {
+ "webpack-sources-1.2.0" = {
name = "webpack-sources";
packageName = "webpack-sources";
- version = "1.1.0";
+ version = "1.2.0";
src = fetchurl {
- url = "https://registry.npmjs.org/webpack-sources/-/webpack-sources-1.1.0.tgz";
- sha512 = "aqYp18kPphgoO5c/+NaUvEeACtZjMESmDChuD3NBciVpah3XpMEU9VAAtIaB1BsfJWWTSdv8Vv1m3T0aRk2dUw==";
+ url = "https://registry.npmjs.org/webpack-sources/-/webpack-sources-1.2.0.tgz";
+ sha512 = "9BZwxR85dNsjWz3blyxdOhTgtnQvv3OEs5xofI0wPYTwu5kaWxS08UuD1oI7WLBLpRO+ylf0ofnXLXWmGb2WMw==";
};
};
"websocket-driver-0.7.0" = {
@@ -32227,13 +34307,13 @@ let
sha512 = "lchLOk435iDWs0jNuL+hiU14i3ERSrMA0IKSiJh7z6X/i4XNsutBZrtqu2CPOZuA4G/zabiqVAos0vW+S7GEVw==";
};
};
- "webtorrent-0.102.2" = {
+ "webtorrent-0.102.4" = {
name = "webtorrent";
packageName = "webtorrent";
- version = "0.102.2";
+ version = "0.102.4";
src = fetchurl {
- url = "https://registry.npmjs.org/webtorrent/-/webtorrent-0.102.2.tgz";
- sha512 = "9+thCKf9zfs9OTMkNqSp3whqKlYd4f/VkBCsx+HkD5dh9O5oWf2lxfAMq1P411WiSY0PqBS77jxjQilYeYYskw==";
+ url = "https://registry.npmjs.org/webtorrent/-/webtorrent-0.102.4.tgz";
+ sha512 = "Oa7NatbPlESqf5ETwgVUOXAbUjiZr7XNFbHhd88BRm+4vN9u3JgeIbF9Gnuxb5s26cHxPYpGJRVTtBsc6Z6w9Q==";
};
};
"whatwg-fetch-2.0.4" = {
@@ -32335,6 +34415,15 @@ let
sha1 = "d9ef07dce77b9902b8a3a8fa4b31c3e3f7e6e87a";
};
};
+ "which-pm-runs-1.0.0" = {
+ name = "which-pm-runs";
+ packageName = "which-pm-runs";
+ version = "1.0.0";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/which-pm-runs/-/which-pm-runs-1.0.0.tgz";
+ sha1 = "670b3afbc552e0b55df6b7780ca74615f23ad1cb";
+ };
+ };
"wide-align-1.1.3" = {
name = "wide-align";
packageName = "wide-align";
@@ -32506,6 +34595,15 @@ let
sha1 = "fa4daa92daf32c4ea94ed453c81f04686b575dfe";
};
};
+ "word-wrap-1.2.3" = {
+ name = "word-wrap";
+ packageName = "word-wrap";
+ version = "1.2.3";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/word-wrap/-/word-wrap-1.2.3.tgz";
+ sha512 = "Hz/mrNwitNRh/HUAtM/VT/5VH+ygD6DV7mYKZAtHOrbs8U7lvPS6xf7EJKMF0uW1KJCl0H701g3ZGus+muE5vQ==";
+ };
+ };
"wordwrap-0.0.2" = {
name = "wordwrap";
packageName = "wordwrap";
@@ -32547,7 +34645,7 @@ let
packageName = "wrap-ansi";
version = "2.1.0";
src = fetchurl {
- url = "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-2.1.0.tgz";
+ url = "http://registry.npmjs.org/wrap-ansi/-/wrap-ansi-2.1.0.tgz";
sha1 = "d8fc3d284dd05794fe84973caecdd1cf824fdd85";
};
};
@@ -32758,13 +34856,13 @@ let
sha512 = "4nlO/14t3BNUZRXIXfXe+3N6w3s1KoxcJUUURctd64BLRe67E4gRwp4PjywtDY72fXpZ1y6Ch0VZQRY/gMPzzQ==";
};
};
- "xml-1.0.0" = {
+ "xml-1.0.1" = {
name = "xml";
packageName = "xml";
- version = "1.0.0";
+ version = "1.0.1";
src = fetchurl {
- url = "https://registry.npmjs.org/xml/-/xml-1.0.0.tgz";
- sha1 = "de3ee912477be2f250b60f612f34a8c4da616efe";
+ url = "https://registry.npmjs.org/xml/-/xml-1.0.1.tgz";
+ sha1 = "78ba72020029c5bc87b8a81a3cfcd74b4a2fc1e5";
};
};
"xml-name-validator-2.0.1" = {
@@ -33353,13 +35451,13 @@ let
sha1 = "03726561bc268f2e5444f54c665b7fd4a8c029e2";
};
};
- "zero-fill-2.2.3" = {
- name = "zero-fill";
- packageName = "zero-fill";
- version = "2.2.3";
+ "zerr-1.0.4" = {
+ name = "zerr";
+ packageName = "zerr";
+ version = "1.0.4";
src = fetchurl {
- url = "https://registry.npmjs.org/zero-fill/-/zero-fill-2.2.3.tgz";
- sha1 = "a3def06ba5e39ae644850bb4ca2ad4112b4855e9";
+ url = "https://registry.npmjs.org/zerr/-/zerr-1.0.4.tgz";
+ sha1 = "62814dd799eff8361f2a228f41f705c5e19de4c9";
};
};
"zip-dir-1.0.2" = {
@@ -33654,7 +35752,7 @@ in
sha512 = "9OBihy+L53g9ALssKTY/vTWEiz8mGEJ1asWiCdfPdQ1Uf++tewiNrN7Fq2Eb6ZYtvK0BYvPZlh3bHguKmKO3yA==";
};
dependencies = [
- sources."@types/node-8.10.28"
+ sources."@types/node-8.10.29"
sources."JSV-4.0.2"
sources."adal-node-0.1.28"
sources."ajv-5.5.2"
@@ -33854,7 +35952,7 @@ in
sources."from-0.1.7"
sources."fs.realpath-1.0.0"
sources."galaxy-0.1.12"
- sources."generate-function-2.2.0"
+ sources."generate-function-2.3.1"
sources."generate-object-property-1.2.0"
(sources."getpass-0.1.7" // {
dependencies = [
@@ -34259,7 +36357,7 @@ in
sources."browserify-rsa-4.0.1"
sources."browserify-sign-4.0.4"
sources."browserify-zlib-0.2.0"
- sources."buffer-5.2.0"
+ sources."buffer-5.2.1"
sources."buffer-from-1.1.1"
sources."buffer-xor-1.0.3"
sources."builtin-status-codes-3.0.0"
@@ -34546,7 +36644,7 @@ in
sources."long-2.4.0"
sources."loud-rejection-1.6.0"
sources."lru-2.0.1"
- sources."magnet-uri-5.2.3"
+ sources."magnet-uri-5.2.4"
sources."map-obj-1.0.1"
(sources."mdns-js-1.0.1" // {
dependencies = [
@@ -34925,7 +37023,7 @@ in
sources."balanced-match-1.0.0"
sources."base64-js-1.2.0"
sources."bcrypt-pbkdf-1.0.2"
- sources."big-integer-1.6.34"
+ sources."big-integer-1.6.35"
sources."block-stream-0.0.9"
sources."bn.js-4.11.8"
sources."body-parser-1.18.2"
@@ -34952,7 +37050,7 @@ in
sources."browserify-sign-4.0.4"
sources."browserify-transform-tools-1.7.0"
sources."browserify-zlib-0.1.4"
- sources."buffer-5.2.0"
+ sources."buffer-5.2.1"
sources."buffer-from-1.1.1"
sources."buffer-xor-1.0.3"
sources."builtin-modules-1.1.1"
@@ -35083,7 +37181,7 @@ in
sources."fs.realpath-1.0.0"
sources."fstream-1.0.11"
sources."function-bind-1.1.1"
- sources."generate-function-2.2.0"
+ sources."generate-function-2.3.1"
sources."generate-object-property-1.2.0"
sources."get-assigned-identifiers-1.2.0"
(sources."getpass-0.1.7" // {
@@ -35439,7 +37537,7 @@ in
sources."@cycle/run-3.4.0"
sources."@cycle/time-0.10.1"
sources."@types/cookiejar-2.1.0"
- sources."@types/node-10.9.2"
+ sources."@types/node-10.9.4"
sources."@types/superagent-3.8.2"
sources."ansi-escapes-3.1.0"
sources."ansi-regex-2.1.1"
@@ -35787,7 +37885,7 @@ in
sources."bytes-3.0.0"
sources."call-me-maybe-1.0.1"
sources."camelcase-4.1.0"
- sources."capture-stack-trace-1.0.0"
+ sources."capture-stack-trace-1.0.1"
sources."caseless-0.12.0"
sources."chalk-2.4.1"
sources."ci-info-1.4.0"
@@ -36522,7 +38620,7 @@ in
sources."assert-plus-1.0.0"
sources."async-2.6.1"
sources."asynckit-0.4.0"
- sources."aws-sdk-2.303.0"
+ sources."aws-sdk-2.307.0"
sources."aws-sign2-0.7.0"
sources."aws4-1.8.0"
sources."base64-js-1.3.0"
@@ -36624,10 +38722,10 @@ in
elm-test = nodeEnv.buildNodePackage {
name = "elm-test";
packageName = "elm-test";
- version = "0.18.12";
+ version = "0.18.13-beta";
src = fetchurl {
- url = "https://registry.npmjs.org/elm-test/-/elm-test-0.18.12.tgz";
- sha512 = "5n1uNviCRxXIx5ciaFuzJd3fshcyicbYvTwyGh/L5t05bfBeq/3FZ5a3mLTz+zRZhp18dul2Oz8WoZmcn8PHcg==";
+ url = "https://registry.npmjs.org/elm-test/-/elm-test-0.18.13-beta.tgz";
+ sha512 = "bD2euTGjq4GFHqG2AWOrXXYidqYgz/NU3RVZB3d0qvDwZ8GItlv2ReCtU4D2RuqY40+sCTUT4Tiq2gpV13GThg==";
};
dependencies = [
sources."ansi-regex-2.1.1"
@@ -36696,7 +38794,7 @@ in
sources."fs.realpath-1.0.0"
sources."fsevents-1.1.2"
sources."fstream-1.0.11"
- sources."generate-function-2.2.0"
+ sources."generate-function-2.3.1"
sources."generate-object-property-1.2.0"
(sources."getpass-0.1.7" // {
dependencies = [
@@ -37083,40 +39181,31 @@ in
eslint = nodeEnv.buildNodePackage {
name = "eslint";
packageName = "eslint";
- version = "5.4.0";
+ version = "5.5.0";
src = fetchurl {
- url = "https://registry.npmjs.org/eslint/-/eslint-5.4.0.tgz";
- sha512 = "UIpL91XGex3qtL6qwyCQJar2j3osKxK9e3ano3OcGEIRM4oWIpCkDg9x95AXEC2wMs7PnxzOkPZ2gq+tsMS9yg==";
+ url = "https://registry.npmjs.org/eslint/-/eslint-5.5.0.tgz";
+ sha512 = "m+az4vYehIJgl1Z0gb25KnFXeqQRdNreYsei1jdvkd9bB+UNQD3fsuiC2AWSQ56P+/t++kFSINZXFbfai+krOw==";
};
dependencies = [
+ sources."@babel/code-frame-7.0.0"
+ sources."@babel/highlight-7.0.0"
sources."acorn-5.7.2"
sources."acorn-jsx-4.1.1"
sources."ajv-6.5.3"
sources."ajv-keywords-3.2.0"
sources."ansi-escapes-3.1.0"
- sources."ansi-regex-2.1.1"
- sources."ansi-styles-2.2.1"
+ sources."ansi-regex-3.0.0"
+ sources."ansi-styles-3.2.1"
sources."argparse-1.0.10"
sources."array-union-1.0.2"
sources."array-uniq-1.0.3"
sources."arrify-1.0.1"
- (sources."babel-code-frame-6.26.0" // {
- dependencies = [
- sources."chalk-1.1.3"
- sources."strip-ansi-3.0.1"
- ];
- })
sources."balanced-match-1.0.0"
sources."brace-expansion-1.1.11"
sources."caller-path-0.1.0"
sources."callsites-0.2.0"
- (sources."chalk-2.4.1" // {
- dependencies = [
- sources."ansi-styles-3.2.1"
- sources."supports-color-5.5.0"
- ];
- })
- sources."chardet-0.4.2"
+ sources."chalk-2.4.1"
+ sources."chardet-0.7.0"
sources."circular-json-0.3.3"
sources."cli-cursor-2.1.0"
sources."cli-width-2.2.0"
@@ -37138,7 +39227,7 @@ in
sources."esrecurse-4.2.1"
sources."estraverse-4.2.0"
sources."esutils-2.0.2"
- sources."external-editor-2.2.0"
+ sources."external-editor-3.0.3"
sources."fast-deep-equal-2.0.1"
sources."fast-json-stable-stringify-2.0.0"
sources."fast-levenshtein-2.0.6"
@@ -37151,14 +39240,13 @@ in
sources."globals-11.7.0"
sources."globby-5.0.0"
sources."graceful-fs-4.1.11"
- sources."has-ansi-2.0.0"
sources."has-flag-3.0.0"
sources."iconv-lite-0.4.24"
sources."ignore-4.0.6"
sources."imurmurhash-0.1.4"
sources."inflight-1.0.6"
sources."inherits-2.0.3"
- sources."inquirer-5.2.0"
+ sources."inquirer-6.2.0"
sources."is-fullwidth-code-point-2.0.0"
sources."is-path-cwd-1.0.0"
sources."is-path-in-cwd-1.0.1"
@@ -37166,7 +39254,7 @@ in
sources."is-promise-2.1.0"
sources."is-resolvable-1.1.0"
sources."isexe-2.0.0"
- sources."js-tokens-3.0.2"
+ sources."js-tokens-4.0.0"
sources."js-yaml-3.12.0"
sources."json-schema-traverse-0.4.1"
sources."json-stable-stringify-without-jsonify-1.0.1"
@@ -37201,7 +39289,7 @@ in
sources."restore-cursor-2.0.0"
sources."rimraf-2.6.2"
sources."run-async-2.3.0"
- sources."rxjs-5.5.11"
+ sources."rxjs-6.3.1"
sources."safer-buffer-2.1.2"
sources."semver-5.5.1"
sources."shebang-command-1.2.0"
@@ -37210,18 +39298,14 @@ in
sources."slice-ansi-1.0.0"
sources."sprintf-js-1.0.3"
sources."string-width-2.1.1"
- (sources."strip-ansi-4.0.0" // {
- dependencies = [
- sources."ansi-regex-3.0.0"
- ];
- })
+ sources."strip-ansi-4.0.0"
sources."strip-json-comments-2.0.1"
- sources."supports-color-2.0.0"
- sources."symbol-observable-1.0.1"
+ sources."supports-color-5.5.0"
sources."table-4.0.3"
sources."text-table-0.2.0"
sources."through-2.3.8"
sources."tmp-0.0.33"
+ sources."tslib-1.9.3"
sources."type-check-0.3.2"
sources."uri-js-4.2.2"
sources."which-1.3.1"
@@ -37247,34 +39331,25 @@ in
sha512 = "NjFiFcKPEjDlleLlngMyVcD6oLu6L8BctLJ3saPZfC4yLD+AJteII5E8meGqTislKxiVMMWHWXed61siXz3mCA==";
};
dependencies = [
+ sources."@babel/code-frame-7.0.0"
+ sources."@babel/highlight-7.0.0"
sources."acorn-5.7.2"
sources."acorn-jsx-4.1.1"
sources."ajv-6.5.3"
sources."ajv-keywords-3.2.0"
sources."ansi-escapes-3.1.0"
- sources."ansi-regex-2.1.1"
- sources."ansi-styles-2.2.1"
+ sources."ansi-regex-3.0.0"
+ sources."ansi-styles-3.2.1"
sources."argparse-1.0.10"
sources."array-union-1.0.2"
sources."array-uniq-1.0.3"
sources."arrify-1.0.1"
- (sources."babel-code-frame-6.26.0" // {
- dependencies = [
- sources."chalk-1.1.3"
- sources."strip-ansi-3.0.1"
- sources."supports-color-2.0.0"
- ];
- })
sources."balanced-match-1.0.0"
sources."brace-expansion-1.1.11"
sources."caller-path-0.1.0"
sources."callsites-0.2.0"
- (sources."chalk-2.4.1" // {
- dependencies = [
- sources."ansi-styles-3.2.1"
- ];
- })
- sources."chardet-0.4.2"
+ sources."chalk-2.4.1"
+ sources."chardet-0.7.0"
sources."circular-json-0.3.3"
sources."cli-cursor-2.1.0"
sources."cli-width-2.2.0"
@@ -37287,7 +39362,7 @@ in
sources."del-2.2.2"
sources."doctrine-2.1.0"
sources."escape-string-regexp-1.0.5"
- sources."eslint-5.4.0"
+ sources."eslint-5.5.0"
sources."eslint-scope-4.0.0"
sources."eslint-utils-1.3.1"
sources."eslint-visitor-keys-1.0.0"
@@ -37297,7 +39372,7 @@ in
sources."esrecurse-4.2.1"
sources."estraverse-4.2.0"
sources."esutils-2.0.2"
- sources."external-editor-2.2.0"
+ sources."external-editor-3.0.3"
sources."fast-deep-equal-2.0.1"
sources."fast-json-stable-stringify-2.0.0"
sources."fast-levenshtein-2.0.6"
@@ -37310,14 +39385,13 @@ in
sources."globals-11.7.0"
sources."globby-5.0.0"
sources."graceful-fs-4.1.11"
- sources."has-ansi-2.0.0"
sources."has-flag-3.0.0"
sources."iconv-lite-0.4.24"
sources."ignore-4.0.6"
sources."imurmurhash-0.1.4"
sources."inflight-1.0.6"
sources."inherits-2.0.3"
- sources."inquirer-5.2.0"
+ sources."inquirer-6.2.0"
sources."is-fullwidth-code-point-2.0.0"
sources."is-path-cwd-1.0.0"
sources."is-path-in-cwd-1.0.1"
@@ -37325,7 +39399,7 @@ in
sources."is-promise-2.1.0"
sources."is-resolvable-1.1.0"
sources."isexe-2.0.0"
- sources."js-tokens-3.0.2"
+ sources."js-tokens-4.0.0"
sources."js-yaml-3.12.0"
sources."json-schema-traverse-0.4.1"
sources."json-stable-stringify-without-jsonify-1.0.1"
@@ -37363,7 +39437,7 @@ in
sources."restore-cursor-2.0.0"
sources."rimraf-2.6.2"
sources."run-async-2.3.0"
- sources."rxjs-5.5.11"
+ sources."rxjs-6.3.1"
sources."safer-buffer-2.1.2"
sources."semver-5.5.1"
sources."shebang-command-1.2.0"
@@ -37372,18 +39446,14 @@ in
sources."slice-ansi-1.0.0"
sources."sprintf-js-1.0.3"
sources."string-width-2.1.1"
- (sources."strip-ansi-4.0.0" // {
- dependencies = [
- sources."ansi-regex-3.0.0"
- ];
- })
+ sources."strip-ansi-4.0.0"
sources."strip-json-comments-2.0.1"
sources."supports-color-5.5.0"
- sources."symbol-observable-1.0.1"
sources."table-4.0.3"
sources."text-table-0.2.0"
sources."through-2.3.8"
sources."tmp-0.0.33"
+ sources."tslib-1.9.3"
sources."type-check-0.3.2"
sources."uri-js-4.2.2"
sources."which-1.3.1"
@@ -37403,10 +39473,10 @@ in
emojione = nodeEnv.buildNodePackage {
name = "emojione";
packageName = "emojione";
- version = "3.1.7";
+ version = "4.0.0";
src = fetchurl {
- url = "https://registry.npmjs.org/emojione/-/emojione-3.1.7.tgz";
- sha1 = "2d3c725c696f179c9dde3acb655c621ee9429b1e";
+ url = "https://registry.npmjs.org/emojione/-/emojione-4.0.0.tgz";
+ sha512 = "ATFSRHrK838NoTUE96j9rpmS1R4a/qpK1maQURGdFtarpWloEttjjIBBWbSFqsUxC0Vot6P2WXmSlotvZoegxw==";
};
buildInputs = globalBuildInputs;
meta = {
@@ -37817,6 +39887,181 @@ in
production = true;
bypassCache = true;
};
+ git-ssb = nodeEnv.buildNodePackage {
+ name = "git-ssb";
+ packageName = "git-ssb";
+ version = "2.3.6";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/git-ssb/-/git-ssb-2.3.6.tgz";
+ sha512 = "xH6KEeJaUJDB8FAov4OdYxb4GuMOTcKdJ+xW5SUGLEuXfBLgyS0zUeeYVIUS8qvM3gf7w+W35WRwwK4d0InqxQ==";
+ };
+ dependencies = [
+ sources."asyncmemo-1.0.0"
+ sources."chloride-2.2.10"
+ sources."chloride-test-1.2.2"
+ sources."deep-equal-1.0.1"
+ sources."deep-extend-0.4.2"
+ sources."diff-3.5.0"
+ sources."ed2curve-0.1.4"
+ sources."emoji-named-characters-1.0.2"
+ sources."explain-error-1.0.4"
+ sources."generate-function-2.3.1"
+ sources."generate-object-property-1.2.0"
+ sources."git-packidx-parser-1.0.0"
+ sources."git-remote-ssb-2.0.4"
+ sources."git-ssb-web-2.8.0"
+ sources."hashlru-2.2.1"
+ sources."highlight.js-9.12.0"
+ sources."increment-buffer-1.0.1"
+ sources."inherits-2.0.3"
+ sources."ini-1.3.5"
+ sources."ip-1.1.5"
+ sources."is-electron-2.1.0"
+ sources."is-my-ip-valid-1.0.0"
+ sources."is-my-json-valid-2.19.0"
+ sources."is-property-1.0.2"
+ sources."is-valid-domain-0.0.5"
+ sources."json-buffer-2.0.11"
+ sources."jsonpointer-4.0.1"
+ sources."kvgraph-0.1.0"
+ sources."kvset-1.0.0"
+ sources."libsodium-0.7.3"
+ sources."libsodium-wrappers-0.7.3"
+ sources."looper-4.0.0"
+ sources."lrucache-1.0.3"
+ sources."mime-db-1.36.0"
+ sources."mime-types-2.1.20"
+ sources."minimist-1.2.0"
+ (sources."mkdirp-0.5.1" // {
+ dependencies = [
+ sources."minimist-0.0.8"
+ ];
+ })
+ sources."moment-2.22.2"
+ sources."multicb-1.2.2"
+ sources."multiserver-1.13.3"
+ sources."muxrpc-6.4.1"
+ sources."nan-2.11.0"
+ sources."node-gyp-build-3.4.0"
+ sources."node-polyglot-1.0.0"
+ sources."non-private-ip-1.4.4"
+ sources."options-0.0.6"
+ sources."os-homedir-1.0.2"
+ sources."packet-stream-2.0.4"
+ sources."packet-stream-codec-1.1.2"
+ sources."pako-1.0.6"
+ sources."private-box-0.2.1"
+ sources."progress-1.1.8"
+ sources."pull-block-filter-1.0.0"
+ sources."pull-box-stream-1.0.13"
+ sources."pull-buffered-0.3.4"
+ sources."pull-cache-0.0.0"
+ sources."pull-cat-1.1.11"
+ sources."pull-core-1.1.0"
+ sources."pull-git-pack-1.0.2"
+ (sources."pull-git-pack-concat-0.2.1" // {
+ dependencies = [
+ sources."looper-3.0.0"
+ ];
+ })
+ sources."pull-git-packidx-parser-1.0.0"
+ sources."pull-git-remote-helper-2.0.0"
+ sources."pull-git-repo-1.2.1"
+ (sources."pull-goodbye-0.0.2" // {
+ dependencies = [
+ sources."pull-stream-3.5.0"
+ ];
+ })
+ sources."pull-handshake-1.1.4"
+ sources."pull-hash-1.0.0"
+ sources."pull-hyperscript-0.2.2"
+ (sources."pull-identify-filetype-1.1.0" // {
+ dependencies = [
+ sources."pull-stream-2.28.4"
+ ];
+ })
+ sources."pull-kvdiff-0.0.0"
+ sources."pull-looper-1.0.0"
+ sources."pull-many-1.0.8"
+ sources."pull-paginate-1.0.0"
+ sources."pull-pair-1.1.0"
+ sources."pull-paramap-1.2.2"
+ sources."pull-pushable-2.2.0"
+ sources."pull-reader-1.3.1"
+ sources."pull-skip-footer-0.1.0"
+ sources."pull-stream-3.6.9"
+ (sources."pull-through-1.0.18" // {
+ dependencies = [
+ sources."looper-3.0.0"
+ ];
+ })
+ sources."pull-ws-3.3.1"
+ (sources."rc-1.2.8" // {
+ dependencies = [
+ sources."deep-extend-0.6.0"
+ ];
+ })
+ sources."relative-url-1.0.2"
+ sources."remove-markdown-0.1.0"
+ sources."safe-buffer-5.1.2"
+ sources."secret-handshake-1.1.13"
+ sources."semver-5.5.1"
+ sources."separator-escape-0.0.0"
+ sources."sha.js-2.4.5"
+ sources."smart-buffer-4.0.1"
+ sources."socks-2.2.1"
+ sources."sodium-browserify-1.2.4"
+ (sources."sodium-browserify-tweetnacl-0.2.3" // {
+ dependencies = [
+ sources."sha.js-2.4.11"
+ ];
+ })
+ sources."sodium-chloride-1.1.0"
+ sources."sodium-native-2.2.1"
+ sources."split-buffer-1.0.0"
+ sources."ssb-avatar-0.2.0"
+ sources."ssb-client-4.6.0"
+ sources."ssb-config-2.2.0"
+ sources."ssb-git-0.5.0"
+ sources."ssb-git-repo-2.8.3"
+ sources."ssb-issues-1.0.0"
+ sources."ssb-keys-7.0.16"
+ sources."ssb-marked-0.6.0"
+ (sources."ssb-mentions-0.1.2" // {
+ dependencies = [
+ sources."ssb-marked-0.5.4"
+ ];
+ })
+ (sources."ssb-msg-schemas-6.3.0" // {
+ dependencies = [
+ sources."pull-stream-2.27.0"
+ ];
+ })
+ sources."ssb-msgs-5.2.0"
+ sources."ssb-pull-requests-1.0.0"
+ sources."ssb-ref-2.11.2"
+ (sources."stream-to-pull-stream-1.7.2" // {
+ dependencies = [
+ sources."looper-3.0.0"
+ ];
+ })
+ sources."strip-json-comments-2.0.1"
+ sources."through-2.2.7"
+ sources."tweetnacl-0.14.5"
+ sources."tweetnacl-auth-0.3.1"
+ sources."ultron-1.0.2"
+ sources."ws-1.1.5"
+ sources."xtend-4.0.1"
+ ];
+ buildInputs = globalBuildInputs;
+ meta = {
+ description = "git hosting on secure-scuttlebutt (ssb)";
+ homepage = https://git-ssb.celehner.com/%25n92DiQh7ietE%2BR%2BX%2FI403LQoyf2DtR3WQfCkDKlheQU%3D.sha256;
+ license = "Fair";
+ };
+ production = true;
+ bypassCache = true;
+ };
git-standup = nodeEnv.buildNodePackage {
name = "git-standup";
packageName = "git-standup";
@@ -37885,7 +40130,7 @@ in
sources."babel-runtime-6.26.0"
sources."balanced-match-1.0.0"
sources."bcrypt-pbkdf-1.0.2"
- sources."bluebird-3.5.1"
+ sources."bluebird-3.5.2"
(sources."body-parser-1.18.2" // {
dependencies = [
sources."iconv-lite-0.4.19"
@@ -37900,7 +40145,7 @@ in
sources."call-me-maybe-1.0.1"
sources."camel-case-3.0.0"
sources."camelcase-4.1.0"
- sources."capture-stack-trace-1.0.0"
+ sources."capture-stack-trace-1.0.1"
sources."caseless-0.12.0"
sources."chalk-2.4.1"
sources."change-case-3.0.2"
@@ -38203,7 +40448,7 @@ in
sources."on-finished-2.3.0"
sources."once-1.4.0"
sources."onetime-2.0.1"
- sources."ono-4.0.6"
+ sources."ono-4.0.7"
sources."open-0.0.5"
sources."opn-5.3.0"
sources."ora-1.4.0"
@@ -38285,7 +40530,7 @@ in
sources."restore-cursor-2.0.0"
sources."rimraf-2.6.2"
sources."run-async-2.3.0"
- sources."rxjs-5.5.11"
+ sources."rxjs-5.5.12"
sources."safe-buffer-5.1.1"
sources."safer-buffer-2.1.2"
sources."scuid-1.1.0"
@@ -38357,7 +40602,7 @@ in
sources."utils-merge-1.0.1"
sources."uuid-3.3.2"
sources."validate-npm-package-license-3.0.4"
- sources."validator-10.7.0"
+ sources."validator-10.7.1"
sources."vary-1.1.2"
sources."verror-1.10.0"
sources."wcwidth-1.0.1"
@@ -39173,28 +41418,46 @@ in
htmlhint = nodeEnv.buildNodePackage {
name = "htmlhint";
packageName = "htmlhint";
- version = "0.9.13";
+ version = "0.10.0";
src = fetchurl {
- url = "https://registry.npmjs.org/htmlhint/-/htmlhint-0.9.13.tgz";
- sha1 = "08163cb1e6aa505048ebb0b41063a7ca07dc6c88";
+ url = "https://registry.npmjs.org/htmlhint/-/htmlhint-0.10.0.tgz";
+ sha512 = "g/bNE3G7D8N1pgfGeL8FTgv4lhA04cWiCTofi8F20f4s+tkcIAL/j2FsD8iVlRCzVpNDYbXCmYtGmQzQe0FKGw==";
};
dependencies = [
- sources."async-1.4.2"
+ sources."ajv-5.5.2"
+ sources."asn1-0.2.4"
+ sources."assert-plus-1.0.0"
+ sources."async-2.6.1"
+ sources."asynckit-0.4.0"
+ sources."aws-sign2-0.7.0"
+ sources."aws4-1.8.0"
sources."balanced-match-1.0.0"
+ sources."bcrypt-pbkdf-1.0.2"
sources."brace-expansion-1.1.11"
- (sources."cli-0.6.6" // {
+ sources."buffer-from-1.1.1"
+ sources."caseless-0.12.0"
+ sources."cli-1.0.1"
+ sources."clone-2.1.2"
+ sources."co-4.6.0"
+ sources."colors-1.3.2"
+ sources."combined-stream-1.0.6"
+ sources."commander-2.17.1"
+ sources."concat-map-0.0.1"
+ (sources."concat-stream-1.6.2" // {
dependencies = [
- sources."glob-3.2.11"
- sources."minimatch-0.3.0"
+ sources."isarray-1.0.0"
+ sources."readable-stream-2.3.6"
+ sources."string_decoder-1.1.1"
];
})
- sources."colors-1.0.3"
- sources."commander-2.6.0"
- sources."concat-map-0.0.1"
sources."console-browserify-1.1.0"
sources."core-util-is-1.0.2"
- sources."csslint-0.10.0"
+ sources."csslint-1.0.5"
+ sources."cycle-1.0.3"
+ sources."dashdash-1.14.1"
sources."date-now-0.1.4"
+ sources."debug-2.6.9"
+ sources."delayed-stream-1.0.0"
(sources."dom-serializer-0.1.0" // {
dependencies = [
sources."domelementtype-1.1.3"
@@ -39204,42 +41467,114 @@ in
sources."domelementtype-1.3.0"
sources."domhandler-2.3.0"
sources."domutils-1.5.1"
+ sources."ecc-jsbn-0.1.2"
sources."entities-1.0.0"
+ sources."es6-promise-4.2.4"
sources."exit-0.1.2"
- sources."glob-5.0.15"
+ sources."extend-3.0.2"
+ sources."extract-zip-1.6.7"
+ sources."extsprintf-1.3.0"
+ sources."eyes-0.1.8"
+ sources."fast-deep-equal-1.1.0"
+ sources."fast-json-stable-stringify-2.0.0"
+ sources."fd-slicer-1.0.1"
+ sources."forever-agent-0.6.1"
+ sources."form-data-2.3.2"
+ sources."fs-extra-1.0.0"
+ sources."fs.realpath-1.0.0"
+ sources."getpass-0.1.7"
+ sources."glob-7.1.3"
sources."glob-base-0.3.0"
sources."glob-parent-2.0.0"
+ sources."graceful-fs-4.1.11"
+ sources."har-schema-2.0.0"
+ sources."har-validator-5.1.0"
+ sources."hasha-2.2.0"
sources."htmlparser2-3.8.3"
+ sources."http-signature-1.2.0"
sources."inflight-1.0.6"
sources."inherits-2.0.3"
sources."is-dotfile-1.0.3"
sources."is-extglob-1.0.0"
sources."is-glob-2.0.1"
+ sources."is-stream-1.1.0"
+ sources."is-typedarray-1.0.0"
sources."isarray-0.0.1"
- (sources."jshint-2.8.0" // {
+ sources."isexe-2.0.0"
+ sources."isstream-0.1.2"
+ sources."jsbn-0.1.1"
+ (sources."jshint-2.9.6" // {
dependencies = [
- sources."minimatch-2.0.10"
+ sources."strip-json-comments-1.0.4"
];
})
- sources."lodash-3.7.0"
- sources."lru-cache-2.7.3"
+ sources."json-schema-0.2.3"
+ sources."json-schema-traverse-0.3.1"
+ sources."json-stringify-safe-5.0.1"
+ sources."jsonfile-2.4.0"
+ sources."jsprim-1.4.1"
+ sources."kew-0.7.0"
+ sources."klaw-1.3.1"
+ sources."lodash-4.17.10"
+ sources."mime-db-1.36.0"
+ sources."mime-types-2.1.20"
sources."minimatch-3.0.4"
+ sources."minimist-0.0.8"
+ sources."mkdirp-0.5.1"
+ sources."ms-2.0.0"
+ sources."oauth-sign-0.9.0"
sources."once-1.4.0"
sources."parse-glob-3.0.4"
- sources."parserlib-0.2.5"
+ sources."parserlib-1.1.1"
sources."path-is-absolute-1.0.1"
+ sources."path-parse-1.0.6"
+ sources."pend-1.2.0"
+ sources."performance-now-2.1.0"
+ sources."phantom-4.0.12"
+ sources."phantomjs-prebuilt-2.1.16"
+ sources."pinkie-2.0.4"
+ sources."pinkie-promise-2.0.1"
+ sources."process-nextick-args-2.0.0"
+ sources."progress-1.1.8"
+ sources."psl-1.1.29"
+ sources."punycode-1.4.1"
+ sources."qs-6.5.2"
sources."readable-stream-1.1.14"
+ sources."request-2.88.0"
+ sources."request-progress-2.0.1"
+ sources."safe-buffer-5.1.2"
+ sources."safer-buffer-2.1.2"
sources."shelljs-0.3.0"
- sources."sigmund-1.0.1"
+ sources."split-1.0.1"
+ sources."sshpk-1.14.2"
+ sources."stack-trace-0.0.10"
sources."string_decoder-0.10.31"
- sources."strip-json-comments-1.0.4"
+ sources."strip-json-comments-2.0.1"
+ sources."throttleit-1.0.0"
+ sources."through-2.3.8"
+ sources."tough-cookie-2.4.3"
+ sources."tunnel-agent-0.6.0"
+ sources."tweetnacl-0.14.5"
+ sources."typedarray-0.0.6"
+ sources."unicode-5.2.0-0.7.5"
+ sources."util-deprecate-1.0.2"
+ sources."uuid-3.3.2"
+ sources."verror-1.10.0"
+ sources."which-1.3.1"
+ (sources."winston-2.4.4" // {
+ dependencies = [
+ sources."async-1.0.0"
+ sources."colors-1.0.3"
+ ];
+ })
sources."wrappy-1.0.2"
- sources."xml-1.0.0"
+ sources."xml-1.0.1"
+ sources."yauzl-2.4.1"
];
buildInputs = globalBuildInputs;
meta = {
- description = "A Static Code Analysis Tool for HTML";
- homepage = "https://github.com/yaniswang/HTMLHint#readme";
+ description = "The Static Code Analysis Tool for your HTML";
+ homepage = "https://github.com/thedaviddias/HTMLHint#readme";
license = "MIT";
};
production = true;
@@ -39263,7 +41598,7 @@ in
sources."param-case-2.1.1"
sources."relateurl-0.2.7"
sources."source-map-0.6.1"
- sources."uglify-js-3.4.8"
+ sources."uglify-js-3.4.9"
sources."upper-case-1.1.3"
];
buildInputs = globalBuildInputs;
@@ -39298,7 +41633,7 @@ in
sources."@types/minimatch-3.0.3"
sources."@types/minimist-1.2.0"
sources."@types/ncp-2.0.1"
- sources."@types/node-6.0.116"
+ sources."@types/node-6.0.117"
sources."@types/rimraf-2.0.2"
sources."@types/rx-4.1.1"
sources."@types/rx-core-4.0.3"
@@ -39332,9 +41667,9 @@ in
sources."brace-expansion-1.1.11"
sources."bytes-3.0.0"
sources."camelcase-4.1.0"
- sources."capture-stack-trace-1.0.0"
+ sources."capture-stack-trace-1.0.1"
sources."chalk-2.4.1"
- sources."chardet-0.5.0"
+ sources."chardet-0.7.0"
sources."chownr-1.0.1"
sources."ci-info-1.4.0"
sources."cli-boxes-1.0.0"
@@ -39373,7 +41708,7 @@ in
sources."esutils-2.0.2"
sources."execa-0.7.0"
sources."extend-3.0.2"
- sources."external-editor-3.0.1"
+ sources."external-editor-3.0.3"
sources."fast-levenshtein-2.0.6"
sources."figures-2.0.0"
sources."file-uri-to-path-1.0.0"
@@ -39504,7 +41839,7 @@ in
sources."rimraf-2.6.2"
sources."rsvp-3.6.2"
sources."run-async-2.3.0"
- sources."rxjs-6.2.2"
+ sources."rxjs-6.3.1"
sources."safe-buffer-5.1.2"
sources."safer-buffer-2.1.2"
sources."sax-1.1.4"
@@ -39812,7 +42147,7 @@ in
sources."deep-equal-1.0.1"
sources."error-7.0.2"
sources."escape-string-regexp-1.0.5"
- sources."fast-json-patch-2.0.6"
+ sources."fast-json-patch-2.0.7"
sources."fs.realpath-1.0.0"
sources."get-func-name-2.0.0"
sources."glob-7.1.3"
@@ -39841,7 +42176,7 @@ in
sources."opentracing-0.14.3"
sources."path-is-absolute-1.0.1"
sources."pathval-1.1.0"
- sources."rxjs-5.5.11"
+ sources."rxjs-5.5.12"
sources."semaphore-async-await-1.5.1"
sources."string-similarity-1.2.1"
sources."string-template-0.2.1"
@@ -39901,7 +42236,7 @@ in
};
dependencies = [
sources."babylon-7.0.0-beta.19"
- sources."bluebird-3.5.1"
+ sources."bluebird-3.5.2"
sources."catharsis-0.8.9"
sources."escape-string-regexp-1.0.5"
sources."graceful-fs-4.1.11"
@@ -40199,10 +42534,10 @@ in
json-refs = nodeEnv.buildNodePackage {
name = "json-refs";
packageName = "json-refs";
- version = "3.0.9";
+ version = "3.0.10";
src = fetchurl {
- url = "https://registry.npmjs.org/json-refs/-/json-refs-3.0.9.tgz";
- sha512 = "7N8yDNktol+fIQBQmCoaHwAxvga102kgil/awf8TrGHIhQh2o788inzS6QygfY0B++Z7v5NCAAmCddU+qJf6hA==";
+ url = "https://registry.npmjs.org/json-refs/-/json-refs-3.0.10.tgz";
+ sha512 = "hTBuXx9RKpyhNhCEh7AUm0Emngxf9f1caw4BzH9CQSPlTqxSJG/X5W0di8AHSeePu+ZqSYjlXLU6u2+Q/6wFmw==";
};
dependencies = [
sources."argparse-1.0.10"
@@ -40229,7 +42564,7 @@ in
sources."mime-types-2.1.20"
sources."ms-2.0.0"
sources."native-promise-only-0.8.1"
- sources."path-loader-1.0.7"
+ sources."path-loader-1.0.8"
sources."process-nextick-args-2.0.0"
sources."punycode-2.1.1"
sources."qs-6.5.2"
@@ -40281,7 +42616,7 @@ in
sources."boxen-1.3.0"
sources."bytes-3.0.0"
sources."camelcase-4.1.0"
- sources."capture-stack-trace-1.0.0"
+ sources."capture-stack-trace-1.0.1"
sources."caseless-0.12.0"
sources."chalk-2.4.1"
sources."ci-info-1.4.0"
@@ -40417,7 +42752,7 @@ in
sources."minimist-1.2.0"
sources."morgan-1.9.0"
sources."ms-2.0.0"
- sources."nanoid-1.2.1"
+ sources."nanoid-1.2.2"
sources."negotiator-0.6.1"
sources."npm-run-path-2.0.2"
sources."number-is-nan-1.0.1"
@@ -40577,7 +42912,7 @@ in
sources."better-assert-1.0.2"
sources."binary-extensions-1.11.0"
sources."blob-0.0.4"
- sources."bluebird-3.5.1"
+ sources."bluebird-3.5.2"
sources."body-parser-1.18.3"
sources."brace-expansion-1.1.11"
(sources."braces-2.3.2" // {
@@ -41471,20 +43806,20 @@ in
lerna = nodeEnv.buildNodePackage {
name = "lerna";
packageName = "lerna";
- version = "3.1.4";
+ version = "3.2.1";
src = fetchurl {
- url = "https://registry.npmjs.org/lerna/-/lerna-3.1.4.tgz";
- sha512 = "DetcjFPZmClvHbTOUX3ynBEfzWPLIRhwnoCMw57iNV1lWyW3ERLj6B2Iz6XtWOwW6E+fBrmK5tYV9t0OXuSF6A==";
+ url = "https://registry.npmjs.org/lerna/-/lerna-3.2.1.tgz";
+ sha512 = "nHa/TgRLOHlBm+NfeW62ffVO7hY7wJxnu6IJmZA3lrSmRlqrXZk2BPvnq0FSaCinVYjW0w0XeSNZdRKR//HAwQ==";
};
dependencies = [
- sources."@lerna/add-3.1.4"
+ sources."@lerna/add-3.2.0"
sources."@lerna/batch-packages-3.1.2"
- sources."@lerna/bootstrap-3.1.4"
- sources."@lerna/changed-3.1.3"
+ sources."@lerna/bootstrap-3.2.0"
+ sources."@lerna/changed-3.2.0"
sources."@lerna/check-working-tree-3.1.0"
sources."@lerna/child-process-3.0.0"
sources."@lerna/clean-3.1.3"
- sources."@lerna/cli-3.1.4"
+ sources."@lerna/cli-3.2.0"
sources."@lerna/collect-updates-3.1.0"
sources."@lerna/command-3.1.3"
sources."@lerna/conventional-commits-3.0.2"
@@ -41507,23 +43842,23 @@ in
sources."@lerna/npm-conf-3.0.0"
sources."@lerna/npm-dist-tag-3.0.0"
sources."@lerna/npm-install-3.0.0"
- sources."@lerna/npm-publish-3.0.6"
+ sources."@lerna/npm-publish-3.2.0"
sources."@lerna/npm-run-script-3.0.0"
sources."@lerna/output-3.0.0"
sources."@lerna/package-3.0.0"
sources."@lerna/package-graph-3.1.2"
sources."@lerna/project-3.0.0"
sources."@lerna/prompt-3.0.0"
- sources."@lerna/publish-3.1.3"
+ sources."@lerna/publish-3.2.1"
sources."@lerna/resolve-symlink-3.0.0"
sources."@lerna/rimraf-dir-3.0.0"
sources."@lerna/run-3.1.3"
- sources."@lerna/run-lifecycle-3.0.0"
+ sources."@lerna/run-lifecycle-3.2.0"
sources."@lerna/run-parallel-batches-3.0.0"
sources."@lerna/symlink-binary-3.1.4"
sources."@lerna/symlink-dependencies-3.1.4"
sources."@lerna/validation-error-3.0.0"
- sources."@lerna/version-3.1.3"
+ sources."@lerna/version-3.2.0"
sources."@lerna/write-log-file-3.0.0"
sources."@mrmlnc/readdir-enhanced-2.2.1"
sources."@nodelib/fs.stat-1.1.1"
@@ -41571,7 +43906,7 @@ in
})
sources."bcrypt-pbkdf-1.0.2"
sources."block-stream-0.0.9"
- sources."bluebird-3.5.1"
+ sources."bluebird-3.5.2"
sources."brace-expansion-1.1.11"
(sources."braces-2.3.2" // {
dependencies = [
@@ -41613,9 +43948,10 @@ in
})
sources."cli-cursor-2.1.0"
sources."cli-width-2.2.0"
- (sources."cliui-2.1.0" // {
+ (sources."cliui-4.1.0" // {
dependencies = [
- sources."wordwrap-0.0.2"
+ sources."ansi-regex-3.0.0"
+ sources."strip-ansi-4.0.0"
];
})
sources."clone-1.0.4"
@@ -41665,9 +44001,10 @@ in
sources."dateformat-3.0.3"
sources."debug-2.6.9"
sources."debuglog-1.0.1"
- sources."decamelize-1.2.0"
+ sources."decamelize-2.0.0"
(sources."decamelize-keys-1.1.0" // {
dependencies = [
+ sources."decamelize-1.2.0"
sources."map-obj-1.0.1"
];
})
@@ -41739,7 +44076,7 @@ in
sources."extend-shallow-2.0.1"
];
})
- sources."find-up-2.1.0"
+ sources."find-up-3.0.0"
sources."flush-write-stream-1.0.3"
sources."for-in-1.0.2"
sources."forever-agent-0.6.1"
@@ -41763,6 +44100,7 @@ in
dependencies = [
sources."camelcase-2.1.1"
sources."camelcase-keys-2.1.0"
+ sources."decamelize-1.2.0"
sources."indent-string-2.1.0"
sources."map-obj-1.0.1"
sources."meow-3.7.0"
@@ -41883,7 +44221,7 @@ in
sources."lazy-cache-1.0.4"
sources."lcid-1.0.0"
sources."load-json-file-4.0.0"
- sources."locate-path-2.0.0"
+ sources."locate-path-3.0.0"
sources."lodash-4.17.10"
sources."lodash._reinterpolate-3.0.0"
sources."lodash.sortby-4.7.0"
@@ -41900,7 +44238,12 @@ in
sources."mem-1.1.0"
(sources."meow-4.0.1" // {
dependencies = [
+ sources."find-up-2.1.0"
+ sources."locate-path-2.0.0"
sources."minimist-1.2.0"
+ sources."p-limit-1.3.0"
+ sources."p-locate-2.0.0"
+ sources."p-try-1.0.0"
sources."read-pkg-up-3.0.0"
];
})
@@ -41989,12 +44332,13 @@ in
sources."os-tmpdir-1.0.2"
sources."osenv-0.1.5"
sources."p-finally-1.0.0"
- sources."p-limit-1.3.0"
- sources."p-locate-2.0.0"
+ sources."p-limit-2.0.0"
+ sources."p-locate-3.0.0"
sources."p-map-1.2.0"
sources."p-map-series-1.0.0"
+ sources."p-pipe-1.2.0"
sources."p-reduce-1.0.0"
- sources."p-try-1.0.0"
+ sources."p-try-2.0.0"
sources."p-waterfall-1.0.0"
sources."pacote-9.1.0"
sources."parallel-transform-1.1.0"
@@ -42010,7 +44354,15 @@ in
sources."pify-3.0.0"
sources."pinkie-2.0.4"
sources."pinkie-promise-2.0.1"
- sources."pkg-dir-2.0.0"
+ (sources."pkg-dir-2.0.0" // {
+ dependencies = [
+ sources."find-up-2.1.0"
+ sources."locate-path-2.0.0"
+ sources."p-limit-1.3.0"
+ sources."p-locate-2.0.0"
+ sources."p-try-1.0.0"
+ ];
+ })
sources."posix-character-classes-0.1.1"
sources."process-nextick-args-2.0.0"
sources."promise-inflight-1.0.1"
@@ -42071,7 +44423,7 @@ in
sources."rimraf-2.6.2"
sources."run-async-2.3.0"
sources."run-queue-1.0.3"
- sources."rxjs-5.5.11"
+ sources."rxjs-5.5.12"
sources."safe-buffer-5.1.2"
sources."safe-regex-1.1.0"
sources."safer-buffer-2.1.2"
@@ -42197,6 +44549,9 @@ in
(sources."uglify-js-2.8.29" // {
dependencies = [
sources."camelcase-1.2.1"
+ sources."cliui-2.1.0"
+ sources."decamelize-1.2.0"
+ sources."wordwrap-0.0.2"
sources."yargs-3.10.0"
];
})
@@ -42251,19 +44606,7 @@ in
sources."xtend-4.0.1"
sources."y18n-4.0.0"
sources."yallist-2.1.2"
- (sources."yargs-12.0.1" // {
- dependencies = [
- sources."ansi-regex-3.0.0"
- sources."cliui-4.1.0"
- sources."decamelize-2.0.0"
- sources."find-up-3.0.0"
- sources."locate-path-3.0.0"
- sources."p-limit-2.0.0"
- sources."p-locate-3.0.0"
- sources."p-try-2.0.0"
- sources."strip-ansi-4.0.0"
- ];
- })
+ sources."yargs-12.0.1"
sources."yargs-parser-10.1.0"
];
buildInputs = globalBuildInputs;
@@ -43317,7 +45660,7 @@ in
sources."longest-1.0.1"
sources."lru-cache-2.7.3"
sources."lru-queue-0.1.0"
- sources."make-error-1.3.4"
+ sources."make-error-1.3.5"
sources."make-error-cause-1.2.2"
sources."make-iterator-1.0.1"
sources."map-cache-0.2.2"
@@ -43529,7 +45872,7 @@ in
sources."tunnel-agent-0.6.0"
sources."tweetnacl-0.14.5"
sources."typescript-2.7.2"
- (sources."uglify-js-3.4.8" // {
+ (sources."uglify-js-3.4.9" // {
dependencies = [
sources."source-map-0.6.1"
];
@@ -43674,7 +46017,7 @@ in
sources."mime-types-2.1.20"
sources."ms-2.0.0"
sources."native-promise-only-0.8.1"
- sources."path-loader-1.0.7"
+ sources."path-loader-1.0.8"
sources."process-nextick-args-2.0.0"
sources."punycode-2.1.1"
sources."qs-6.5.2"
@@ -44029,7 +46372,7 @@ in
sources."base64-js-0.0.8"
sources."bcrypt-pbkdf-1.0.2"
sources."biased-opener-0.2.8"
- sources."big-integer-1.6.34"
+ sources."big-integer-1.6.35"
sources."block-stream-0.0.9"
sources."body-parser-1.18.2"
sources."boom-2.10.1"
@@ -44389,10 +46732,10 @@ in
nodemon = nodeEnv.buildNodePackage {
name = "nodemon";
packageName = "nodemon";
- version = "1.18.3";
+ version = "1.18.4";
src = fetchurl {
- url = "https://registry.npmjs.org/nodemon/-/nodemon-1.18.3.tgz";
- sha512 = "XdVfAjGlDKU2nqoGgycxTndkJ5fdwvWJ/tlMGk2vHxMZBrSPVh86OM6z7viAv8BBJWjMgeuYQBofzr6LUoi+7g==";
+ url = "https://registry.npmjs.org/nodemon/-/nodemon-1.18.4.tgz";
+ sha512 = "hyK6vl65IPnky/ee+D3IWvVGgJa/m3No2/Xc/3wanS6Ce1MWjCzH6NnhPJ/vZM+6JFym16jtHx51lmCMB9HDtg==";
};
dependencies = [
sources."abbrev-1.1.1"
@@ -44424,7 +46767,7 @@ in
})
sources."cache-base-1.0.1"
sources."camelcase-4.1.0"
- sources."capture-stack-trace-1.0.0"
+ sources."capture-stack-trace-1.0.1"
sources."chalk-2.4.1"
sources."chokidar-2.0.4"
sources."ci-info-1.4.0"
@@ -45279,10 +47622,10 @@ in
npm = nodeEnv.buildNodePackage {
name = "npm";
packageName = "npm";
- version = "6.4.0";
+ version = "6.4.1";
src = fetchurl {
- url = "https://registry.npmjs.org/npm/-/npm-6.4.0.tgz";
- sha512 = "k0VteQaxRuI1mREBxCtLUksesD2ZmX5gxjXNEjTmTrxQ3SHW22InkCKyX4NzoeGAYtgmDg5MuE7rcXYod7xgug==";
+ url = "https://registry.npmjs.org/npm/-/npm-6.4.1.tgz";
+ sha512 = "mXJL1NTVU136PtuopXCUQaNWuHlXCTp4McwlSW8S9/Aj8OEPAlSBgo8og7kJ01MjCDrkmqFQTvN5tTEhBMhXQg==";
};
buildInputs = globalBuildInputs;
meta = {
@@ -45470,7 +47813,7 @@ in
sources."ansi-regex-2.1.1"
sources."ansi-styles-2.2.1"
sources."argparse-1.0.10"
- sources."bluebird-3.5.1"
+ sources."bluebird-3.5.2"
(sources."boxen-1.3.0" // {
dependencies = [
sources."ansi-styles-3.2.1"
@@ -45479,7 +47822,7 @@ in
];
})
sources."camelcase-4.1.0"
- sources."capture-stack-trace-1.0.0"
+ sources."capture-stack-trace-1.0.1"
sources."chalk-1.1.3"
sources."ci-info-1.4.0"
sources."cint-8.2.1"
@@ -45822,7 +48165,7 @@ in
sources."string_decoder-1.1.1"
];
})
- sources."bluebird-3.5.1"
+ sources."bluebird-3.5.2"
(sources."body-parser-1.18.3" // {
dependencies = [
sources."content-type-1.0.4"
@@ -46154,7 +48497,7 @@ in
sources."balanced-match-1.0.0"
sources."base64-js-0.0.8"
sources."bencode-2.0.0"
- sources."big-integer-1.6.34"
+ sources."big-integer-1.6.35"
sources."bitfield-0.1.0"
(sources."bittorrent-dht-6.4.2" // {
dependencies = [
@@ -46272,7 +48615,7 @@ in
sources."lodash-3.10.1"
sources."loud-rejection-1.6.0"
sources."lru-2.0.1"
- sources."magnet-uri-5.2.3"
+ sources."magnet-uri-5.2.4"
sources."map-obj-1.0.1"
sources."meow-3.7.0"
sources."mime-2.3.1"
@@ -46354,7 +48697,7 @@ in
sources."run-parallel-1.1.9"
sources."run-series-1.1.8"
sources."rusha-0.8.13"
- sources."rxjs-5.5.11"
+ sources."rxjs-5.5.12"
sources."safe-buffer-5.1.2"
sources."safer-buffer-2.1.2"
sources."semver-5.5.1"
@@ -46476,7 +48819,7 @@ in
})
sources."boom-0.3.8"
sources."brace-expansion-1.1.11"
- sources."buffer-5.2.0"
+ sources."buffer-5.2.1"
sources."buffer-alloc-1.2.0"
sources."buffer-alloc-unsafe-1.1.0"
sources."buffer-crc32-0.2.13"
@@ -46883,7 +49226,7 @@ in
sources."form-data-1.0.1"
sources."fs-extra-0.26.7"
sources."fs.realpath-1.0.0"
- sources."generate-function-2.2.0"
+ sources."generate-function-2.3.1"
sources."generate-object-property-1.2.0"
(sources."getpass-0.1.7" // {
dependencies = [
@@ -46979,10 +49322,10 @@ in
pnpm = nodeEnv.buildNodePackage {
name = "pnpm";
packageName = "pnpm";
- version = "2.13.6";
+ version = "2.15.0";
src = fetchurl {
- url = "https://registry.npmjs.org/pnpm/-/pnpm-2.13.6.tgz";
- sha512 = "X8zmtUzmEIa/QMg0t0eeq6hSd7kmL5Zvneqpj3Tcbyn2g/FEFTPb9kaghR+DW1WdViOE51eo4ECLK7uY9oogkA==";
+ url = "https://registry.npmjs.org/pnpm/-/pnpm-2.15.0.tgz";
+ sha512 = "bMS1ShnuwRtg1SRrauo9gYFXn4CxO+tyYNRe40DsY4cDpycbLs3Lr54ulQrFZtE4Yn6m3keu3sft7f36eg0gbw==";
};
buildInputs = globalBuildInputs;
meta = {
@@ -48047,6 +50390,583 @@ in
production = true;
bypassCache = true;
};
+ scuttlebot = nodeEnv.buildNodePackage {
+ name = "scuttlebot";
+ packageName = "scuttlebot";
+ version = "11.4.2";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/scuttlebot/-/scuttlebot-11.4.2.tgz";
+ sha512 = "JbOKdMFCyoALwpiK5FM8qikpFvEqCdRycbFGiOdhhQT0VrTWCO1PXDFuDAHnCBTDYvjjO88M9njq2BOXVypvAg==";
+ };
+ dependencies = [
+ sources."abstract-leveldown-4.0.3"
+ (sources."aligned-block-file-1.1.3" // {
+ dependencies = [
+ sources."obv-0.0.0"
+ ];
+ })
+ sources."ansi-escapes-1.4.0"
+ sources."ansi-regex-2.1.1"
+ sources."ansi-styles-2.2.1"
+ sources."anymatch-1.3.2"
+ sources."append-batch-0.0.1"
+ sources."aproba-1.2.0"
+ sources."are-we-there-yet-1.1.5"
+ sources."arr-diff-2.0.0"
+ sources."arr-flatten-1.1.0"
+ sources."array-union-1.0.2"
+ sources."array-uniq-1.0.3"
+ sources."array-unique-0.2.1"
+ sources."arrify-1.0.1"
+ sources."async-each-1.0.1"
+ sources."async-single-1.0.5"
+ sources."async-write-2.1.0"
+ sources."atomic-file-0.0.1"
+ sources."attach-ware-1.1.1"
+ sources."bail-1.0.3"
+ sources."balanced-match-1.0.0"
+ sources."base64-url-2.2.0"
+ sources."bash-color-0.0.4"
+ sources."binary-extensions-1.11.0"
+ sources."binary-search-1.3.4"
+ sources."bindings-1.3.0"
+ sources."bl-1.2.2"
+ sources."blake2s-1.0.1"
+ sources."brace-expansion-1.1.11"
+ sources."braces-1.8.5"
+ sources."broadcast-stream-0.2.2"
+ sources."buffer-alloc-1.2.0"
+ sources."buffer-alloc-unsafe-1.1.0"
+ sources."buffer-fill-1.0.0"
+ sources."buffer-from-1.1.1"
+ sources."bytewise-1.1.0"
+ sources."bytewise-core-1.2.3"
+ sources."camelcase-2.1.1"
+ sources."ccount-1.0.3"
+ sources."chalk-1.1.3"
+ sources."character-entities-1.2.2"
+ sources."character-entities-html4-1.1.2"
+ sources."character-entities-legacy-1.1.2"
+ sources."character-reference-invalid-1.1.2"
+ sources."charwise-3.0.1"
+ sources."chloride-2.2.10"
+ sources."chloride-test-1.2.2"
+ sources."chokidar-1.7.0"
+ sources."chownr-1.0.1"
+ sources."cli-cursor-1.0.2"
+ sources."co-3.1.0"
+ sources."code-point-at-1.1.0"
+ sources."collapse-white-space-1.0.4"
+ sources."commander-2.17.1"
+ sources."concat-map-0.0.1"
+ sources."concat-stream-1.6.2"
+ sources."console-control-strings-1.1.0"
+ sources."cont-1.0.3"
+ sources."continuable-1.2.0"
+ (sources."continuable-hash-0.1.4" // {
+ dependencies = [
+ sources."continuable-1.1.8"
+ ];
+ })
+ (sources."continuable-list-0.1.6" // {
+ dependencies = [
+ sources."continuable-1.1.8"
+ ];
+ })
+ sources."continuable-para-1.2.0"
+ sources."continuable-series-1.2.0"
+ sources."core-util-is-1.0.2"
+ sources."cross-spawn-5.1.0"
+ sources."debug-2.6.9"
+ sources."decompress-response-3.3.0"
+ sources."deep-equal-1.0.1"
+ sources."deep-extend-0.6.0"
+ sources."deferred-leveldown-3.0.0"
+ sources."define-properties-1.1.3"
+ sources."defined-1.0.0"
+ sources."delegates-1.0.0"
+ sources."detab-1.0.2"
+ sources."detect-libc-1.0.3"
+ sources."ed2curve-0.1.4"
+ sources."elegant-spinner-1.0.1"
+ sources."emoji-named-characters-1.0.2"
+ sources."emoji-server-1.0.0"
+ (sources."encoding-down-4.0.1" // {
+ dependencies = [
+ sources."level-codec-8.0.0"
+ ];
+ })
+ sources."end-of-stream-1.4.1"
+ sources."epidemic-broadcast-trees-6.3.4"
+ sources."errno-0.1.7"
+ sources."es-abstract-1.12.0"
+ sources."es-to-primitive-1.1.1"
+ sources."escape-string-regexp-1.0.5"
+ sources."exit-hook-1.1.1"
+ sources."expand-brackets-0.1.5"
+ sources."expand-range-1.8.2"
+ sources."expand-template-1.1.1"
+ sources."explain-error-1.0.4"
+ sources."extend-3.0.2"
+ sources."extend.js-0.0.2"
+ sources."extglob-0.3.2"
+ sources."fast-future-1.0.2"
+ sources."filename-regex-2.0.1"
+ sources."fill-range-2.2.4"
+ sources."flumecodec-0.0.1"
+ sources."flumedb-0.4.9"
+ (sources."flumelog-offset-3.3.1" // {
+ dependencies = [
+ sources."looper-4.0.0"
+ ];
+ })
+ (sources."flumeview-hashtable-1.0.4" // {
+ dependencies = [
+ sources."atomic-file-1.1.5"
+ ];
+ })
+ (sources."flumeview-level-3.0.5" // {
+ dependencies = [
+ sources."obv-0.0.0"
+ ];
+ })
+ (sources."flumeview-query-6.3.0" // {
+ dependencies = [
+ sources."map-filter-reduce-3.1.0"
+ ];
+ })
+ (sources."flumeview-reduce-1.3.13" // {
+ dependencies = [
+ sources."atomic-file-1.1.5"
+ sources."flumecodec-0.0.0"
+ sources."obv-0.0.0"
+ ];
+ })
+ sources."for-each-0.3.3"
+ sources."for-in-1.0.2"
+ sources."for-own-0.1.5"
+ sources."fs-constants-1.0.0"
+ sources."fs.realpath-1.0.0"
+ sources."fsevents-1.2.4"
+ sources."function-bind-1.1.1"
+ sources."gauge-2.7.4"
+ sources."github-from-package-0.0.0"
+ sources."glob-6.0.4"
+ sources."glob-base-0.3.0"
+ sources."glob-parent-2.0.0"
+ sources."globby-4.1.0"
+ sources."graceful-fs-4.1.11"
+ sources."graphreduce-3.0.4"
+ sources."has-1.0.3"
+ sources."has-ansi-2.0.0"
+ sources."has-network-0.0.1"
+ sources."has-unicode-2.0.1"
+ sources."hashlru-2.2.1"
+ sources."he-0.5.0"
+ sources."hoox-0.0.1"
+ sources."increment-buffer-1.0.1"
+ sources."inflight-1.0.6"
+ sources."inherits-2.0.3"
+ sources."ini-1.3.5"
+ sources."int53-0.2.4"
+ sources."ip-0.3.3"
+ sources."irregular-plurals-1.4.0"
+ sources."is-alphabetical-1.0.2"
+ sources."is-alphanumerical-1.0.2"
+ sources."is-binary-path-1.0.1"
+ sources."is-buffer-1.1.6"
+ sources."is-callable-1.1.4"
+ sources."is-date-object-1.0.1"
+ sources."is-decimal-1.0.2"
+ sources."is-dotfile-1.0.3"
+ sources."is-electron-2.1.0"
+ sources."is-equal-shallow-0.1.3"
+ sources."is-extendable-0.1.1"
+ sources."is-extglob-1.0.0"
+ sources."is-fullwidth-code-point-1.0.0"
+ sources."is-glob-2.0.1"
+ sources."is-hexadecimal-1.0.2"
+ sources."is-number-2.1.0"
+ sources."is-posix-bracket-0.1.1"
+ sources."is-primitive-2.0.0"
+ sources."is-regex-1.0.4"
+ sources."is-symbol-1.0.1"
+ sources."is-valid-domain-0.0.5"
+ sources."isarray-1.0.0"
+ sources."isexe-2.0.0"
+ sources."isobject-2.1.0"
+ sources."json-buffer-2.0.11"
+ sources."kind-of-3.2.2"
+ sources."level-3.0.2"
+ sources."level-codec-6.2.0"
+ sources."level-errors-1.1.2"
+ sources."level-iterator-stream-2.0.3"
+ sources."level-packager-2.1.1"
+ sources."level-post-1.0.7"
+ (sources."level-sublevel-6.6.5" // {
+ dependencies = [
+ (sources."abstract-leveldown-0.12.4" // {
+ dependencies = [
+ sources."xtend-3.0.0"
+ ];
+ })
+ sources."bl-0.8.2"
+ sources."deferred-leveldown-0.2.0"
+ sources."isarray-0.0.1"
+ (sources."levelup-0.19.1" // {
+ dependencies = [
+ sources."xtend-3.0.0"
+ ];
+ })
+ sources."ltgt-2.1.3"
+ sources."prr-0.0.0"
+ sources."readable-stream-1.0.34"
+ sources."semver-5.1.1"
+ sources."string_decoder-0.10.31"
+ ];
+ })
+ (sources."leveldown-3.0.2" // {
+ dependencies = [
+ sources."nan-2.10.0"
+ ];
+ })
+ sources."levelup-2.0.2"
+ sources."libsodium-0.7.3"
+ sources."libsodium-wrappers-0.7.3"
+ sources."log-symbols-1.0.2"
+ sources."log-update-1.0.2"
+ sources."longest-streak-1.0.0"
+ sources."looper-3.0.0"
+ sources."lossy-store-1.2.3"
+ sources."lru-cache-4.1.3"
+ sources."ltgt-2.2.1"
+ sources."map-filter-reduce-2.2.1"
+ sources."map-merge-1.1.0"
+ sources."markdown-table-0.4.0"
+ sources."math-random-1.0.1"
+ sources."mdmanifest-1.0.8"
+ sources."micromatch-2.3.11"
+ sources."mimic-response-1.0.1"
+ sources."minimatch-3.0.4"
+ sources."minimist-1.2.0"
+ (sources."mkdirp-0.5.1" // {
+ dependencies = [
+ sources."minimist-0.0.8"
+ ];
+ })
+ sources."monotonic-timestamp-0.0.9"
+ sources."ms-2.0.0"
+ (sources."multiblob-1.13.0" // {
+ dependencies = [
+ sources."deep-extend-0.2.11"
+ sources."minimist-0.0.10"
+ sources."pull-file-0.5.0"
+ sources."rc-0.5.5"
+ sources."rimraf-2.2.8"
+ sources."strip-json-comments-0.1.3"
+ ];
+ })
+ sources."multiblob-http-0.4.2"
+ sources."multicb-1.2.2"
+ sources."multiserver-1.13.3"
+ sources."muxrpc-6.4.1"
+ (sources."muxrpc-validation-2.0.1" // {
+ dependencies = [
+ sources."pull-stream-2.28.4"
+ ];
+ })
+ (sources."muxrpcli-1.1.0" // {
+ dependencies = [
+ sources."pull-stream-2.28.4"
+ ];
+ })
+ (sources."mv-2.1.1" // {
+ dependencies = [
+ sources."rimraf-2.4.5"
+ ];
+ })
+ sources."nan-2.11.0"
+ sources."ncp-2.0.0"
+ sources."node-abi-2.4.3"
+ sources."node-gyp-build-3.4.0"
+ (sources."non-private-ip-1.4.4" // {
+ dependencies = [
+ sources."ip-1.1.5"
+ ];
+ })
+ sources."noop-logger-0.1.1"
+ sources."normalize-path-2.1.1"
+ sources."normalize-uri-1.1.1"
+ sources."npm-prefix-1.2.0"
+ sources."npmlog-4.1.2"
+ sources."number-is-nan-1.0.1"
+ sources."object-assign-4.1.1"
+ sources."object-inspect-1.6.0"
+ sources."object-keys-1.0.12"
+ sources."object.omit-2.0.1"
+ sources."observ-0.2.0"
+ sources."observ-debounce-1.1.1"
+ sources."obv-0.0.1"
+ sources."on-change-network-0.0.2"
+ sources."on-wakeup-1.0.1"
+ sources."once-1.4.0"
+ sources."onetime-1.1.0"
+ sources."opencollective-postinstall-2.0.0"
+ sources."options-0.0.6"
+ sources."os-homedir-1.0.2"
+ sources."os-tmpdir-1.0.2"
+ sources."osenv-0.1.5"
+ sources."packet-stream-2.0.4"
+ sources."packet-stream-codec-1.1.2"
+ sources."parse-entities-1.1.2"
+ sources."parse-glob-3.0.4"
+ sources."path-is-absolute-1.0.1"
+ sources."path-parse-1.0.6"
+ sources."pify-2.3.0"
+ sources."pinkie-2.0.4"
+ sources."pinkie-promise-2.0.1"
+ sources."plur-2.1.2"
+ sources."prebuild-install-4.0.0"
+ sources."preserve-0.2.0"
+ sources."private-box-0.2.1"
+ sources."process-nextick-args-2.0.0"
+ sources."prr-1.0.1"
+ sources."pseudomap-1.0.2"
+ sources."pull-abortable-4.1.1"
+ sources."pull-box-stream-1.0.13"
+ sources."pull-cat-1.1.11"
+ sources."pull-cont-0.0.0"
+ sources."pull-core-1.1.0"
+ (sources."pull-cursor-3.0.0" // {
+ dependencies = [
+ sources."looper-4.0.0"
+ ];
+ })
+ sources."pull-defer-0.2.3"
+ sources."pull-file-1.1.0"
+ sources."pull-flatmap-0.0.1"
+ (sources."pull-fs-1.1.6" // {
+ dependencies = [
+ sources."pull-file-0.5.0"
+ ];
+ })
+ sources."pull-glob-1.0.7"
+ (sources."pull-goodbye-0.0.2" // {
+ dependencies = [
+ sources."pull-stream-3.5.0"
+ ];
+ })
+ sources."pull-handshake-1.1.4"
+ sources."pull-hash-1.0.0"
+ (sources."pull-inactivity-2.1.2" // {
+ dependencies = [
+ sources."pull-abortable-4.0.0"
+ ];
+ })
+ sources."pull-level-2.0.4"
+ sources."pull-live-1.0.1"
+ (sources."pull-looper-1.0.0" // {
+ dependencies = [
+ sources."looper-4.0.0"
+ ];
+ })
+ sources."pull-many-1.0.8"
+ sources."pull-next-1.0.1"
+ sources."pull-notify-0.1.1"
+ sources."pull-pair-1.1.0"
+ (sources."pull-paramap-1.2.2" // {
+ dependencies = [
+ sources."looper-4.0.0"
+ ];
+ })
+ sources."pull-ping-2.0.2"
+ sources."pull-pushable-2.2.0"
+ sources."pull-rate-1.0.2"
+ sources."pull-reader-1.3.1"
+ sources."pull-sink-through-0.0.0"
+ sources."pull-stream-3.6.9"
+ sources."pull-stream-to-stream-1.3.4"
+ sources."pull-stringify-1.2.2"
+ sources."pull-through-1.0.18"
+ sources."pull-traverse-1.0.3"
+ sources."pull-utf8-decoder-1.0.2"
+ (sources."pull-window-2.1.4" // {
+ dependencies = [
+ sources."looper-2.0.0"
+ ];
+ })
+ (sources."pull-write-1.1.4" // {
+ dependencies = [
+ sources."looper-4.0.0"
+ ];
+ })
+ sources."pull-write-file-0.2.4"
+ sources."pull-ws-3.3.1"
+ sources."pump-2.0.1"
+ sources."push-stream-10.0.3"
+ sources."push-stream-to-pull-stream-1.0.3"
+ (sources."randomatic-3.1.0" // {
+ dependencies = [
+ sources."is-number-4.0.0"
+ sources."kind-of-6.0.2"
+ ];
+ })
+ sources."rc-1.2.8"
+ sources."readable-stream-2.3.6"
+ sources."readdirp-2.1.0"
+ sources."regex-cache-0.4.4"
+ sources."relative-url-1.0.2"
+ sources."remark-3.2.3"
+ sources."remark-html-2.0.2"
+ sources."remove-trailing-separator-1.1.0"
+ sources."repeat-element-1.1.3"
+ sources."repeat-string-1.6.1"
+ sources."resolve-1.7.1"
+ sources."restore-cursor-1.0.1"
+ sources."resumer-0.0.0"
+ (sources."rimraf-2.6.2" // {
+ dependencies = [
+ sources."glob-7.1.3"
+ ];
+ })
+ sources."safe-buffer-5.1.2"
+ sources."secret-handshake-1.1.13"
+ (sources."secret-stack-4.1.0" // {
+ dependencies = [
+ sources."ip-1.1.5"
+ ];
+ })
+ (sources."secure-scuttlebutt-18.2.0" // {
+ dependencies = [
+ sources."deep-equal-0.2.2"
+ ];
+ })
+ sources."semver-5.5.1"
+ sources."separator-escape-0.0.0"
+ sources."set-blocking-2.0.0"
+ sources."set-immediate-shim-1.0.1"
+ sources."sha.js-2.4.5"
+ sources."shebang-command-1.2.0"
+ sources."shebang-regex-1.0.0"
+ sources."shellsubstitute-1.2.0"
+ sources."signal-exit-3.0.2"
+ sources."simple-concat-1.0.0"
+ sources."simple-get-2.8.1"
+ sources."smart-buffer-4.0.1"
+ (sources."socks-2.2.1" // {
+ dependencies = [
+ sources."ip-1.1.5"
+ ];
+ })
+ sources."sodium-browserify-1.2.4"
+ (sources."sodium-browserify-tweetnacl-0.2.3" // {
+ dependencies = [
+ sources."sha.js-2.4.11"
+ ];
+ })
+ sources."sodium-chloride-1.1.0"
+ sources."sodium-native-2.2.1"
+ sources."split-buffer-1.0.0"
+ sources."ssb-blobs-1.1.5"
+ sources."ssb-client-4.6.0"
+ (sources."ssb-config-2.2.0" // {
+ dependencies = [
+ sources."deep-extend-0.4.2"
+ ];
+ })
+ sources."ssb-ebt-5.2.2"
+ (sources."ssb-friends-2.4.0" // {
+ dependencies = [
+ sources."pull-cont-0.1.1"
+ ];
+ })
+ sources."ssb-keys-7.0.16"
+ sources."ssb-links-3.0.3"
+ sources."ssb-msgs-5.2.0"
+ (sources."ssb-query-2.2.1" // {
+ dependencies = [
+ sources."flumeview-query-git://github.com/mmckegg/flumeview-query#map"
+ sources."map-filter-reduce-3.1.0"
+ ];
+ })
+ (sources."ssb-ref-2.11.2" // {
+ dependencies = [
+ sources."ip-1.1.5"
+ ];
+ })
+ sources."ssb-validate-3.0.10"
+ sources."ssb-ws-2.1.1"
+ sources."stack-0.1.0"
+ sources."statistics-3.3.0"
+ sources."stream-to-pull-stream-1.7.2"
+ sources."string-width-1.0.2"
+ sources."string.prototype.trim-1.1.2"
+ sources."string_decoder-1.1.1"
+ sources."stringify-entities-1.3.2"
+ sources."strip-ansi-3.0.1"
+ sources."strip-json-comments-2.0.1"
+ sources."supports-color-2.0.0"
+ (sources."tape-4.9.1" // {
+ dependencies = [
+ sources."glob-7.1.3"
+ ];
+ })
+ (sources."tar-fs-1.16.3" // {
+ dependencies = [
+ sources."pump-1.0.3"
+ ];
+ })
+ sources."tar-stream-1.6.1"
+ sources."text-table-0.2.0"
+ sources."through-2.3.8"
+ sources."to-buffer-1.1.1"
+ sources."to-vfile-1.0.0"
+ sources."trim-0.0.1"
+ sources."trim-lines-1.1.1"
+ sources."trim-trailing-lines-1.1.1"
+ sources."tunnel-agent-0.6.0"
+ sources."tweetnacl-0.14.5"
+ sources."tweetnacl-auth-0.3.1"
+ sources."typedarray-0.0.6"
+ sources."typewise-1.0.3"
+ sources."typewise-core-1.2.0"
+ sources."typewiselite-1.0.0"
+ sources."uint48be-1.0.2"
+ sources."ultron-1.0.2"
+ sources."unherit-1.1.1"
+ sources."unified-2.1.4"
+ sources."unist-util-is-2.1.2"
+ sources."unist-util-visit-1.4.0"
+ sources."unist-util-visit-parents-2.0.1"
+ sources."untildify-2.1.0"
+ sources."user-home-2.0.0"
+ sources."util-deprecate-1.0.2"
+ sources."vfile-1.4.0"
+ sources."vfile-find-down-1.0.0"
+ sources."vfile-find-up-1.0.0"
+ sources."vfile-reporter-1.5.0"
+ sources."vfile-sort-1.0.0"
+ sources."ware-1.3.0"
+ sources."which-1.3.1"
+ sources."which-pm-runs-1.0.0"
+ sources."wide-align-1.1.3"
+ sources."word-wrap-1.2.3"
+ sources."wrap-fn-0.1.5"
+ sources."wrappy-1.0.2"
+ sources."ws-1.1.5"
+ sources."xtend-4.0.1"
+ sources."yallist-2.1.2"
+ sources."zerr-1.0.4"
+ ];
+ buildInputs = globalBuildInputs;
+ meta = {
+ description = "network protocol layer for secure-scuttlebutt";
+ homepage = https://github.com/ssbc/scuttlebot;
+ license = "MIT";
+ };
+ production = true;
+ bypassCache = true;
+ };
semver = nodeEnv.buildNodePackage {
name = "semver";
packageName = "semver";
@@ -49148,7 +52068,7 @@ in
sources."bytes-1.0.0"
sources."cache-base-1.0.1"
sources."camelcase-4.1.0"
- sources."capture-stack-trace-1.0.0"
+ sources."capture-stack-trace-1.0.1"
sources."center-align-0.1.3"
sources."chalk-1.1.3"
sources."charenc-0.0.2"
@@ -49444,7 +52364,7 @@ in
sources."nan-2.11.0"
sources."nanomatch-1.2.13"
sources."native-promise-only-0.8.1"
- (sources."nodemon-1.18.3" // {
+ (sources."nodemon-1.18.4" // {
dependencies = [
sources."debug-3.1.0"
sources."supports-color-5.5.0"
@@ -49482,7 +52402,7 @@ in
sources."path-is-absolute-1.0.1"
sources."path-is-inside-1.0.2"
sources."path-key-2.0.1"
- (sources."path-loader-1.0.7" // {
+ (sources."path-loader-1.0.8" // {
dependencies = [
sources."debug-3.1.0"
sources."qs-6.5.2"
@@ -49701,7 +52621,7 @@ in
sources."util-deprecate-1.0.2"
sources."utils-merge-1.0.1"
sources."valid-url-1.0.9"
- sources."validator-10.7.0"
+ sources."validator-10.7.1"
sources."which-1.3.1"
sources."widest-line-2.0.0"
sources."window-size-0.1.0"
@@ -49776,10 +52696,10 @@ in
three = nodeEnv.buildNodePackage {
name = "three";
packageName = "three";
- version = "0.95.0";
+ version = "0.96.0";
src = fetchurl {
- url = "https://registry.npmjs.org/three/-/three-0.95.0.tgz";
- sha512 = "vy6jMYs7CDwn47CejYHNi+++OdQue7xGIBhbLfekQ/G6MDxKRm0QB0/xWScz46/JvQAvF6pJAS5Q907l0i5iQA==";
+ url = "https://registry.npmjs.org/three/-/three-0.96.0.tgz";
+ sha512 = "tS+A5kelQgBblElc/E1G5zR3m6wNjbqmrf6OAjijuNJM7yoYQjOktPoa+Lglx73OTiTOJ3+Ff+pgWdOFt7cOhQ==";
};
buildInputs = globalBuildInputs;
meta = {
@@ -49897,7 +52817,7 @@ in
sources."tough-cookie-2.3.4"
sources."tunnel-agent-0.6.0"
sources."tweetnacl-0.14.5"
- sources."uglify-js-3.4.8"
+ sources."uglify-js-3.4.9"
sources."universalify-0.1.2"
sources."uuid-3.3.2"
sources."verror-1.10.0"
@@ -50105,10 +53025,10 @@ in
typescript = nodeEnv.buildNodePackage {
name = "typescript";
packageName = "typescript";
- version = "3.0.1";
+ version = "3.0.3";
src = fetchurl {
- url = "https://registry.npmjs.org/typescript/-/typescript-3.0.1.tgz";
- sha512 = "zQIMOmC+372pC/CCVLqnQ0zSBiY7HHodU7mpQdjiZddek4GMj31I3dUJ7gAs9o65X7mnRma6OokOkc6f9jjfBg==";
+ url = "https://registry.npmjs.org/typescript/-/typescript-3.0.3.tgz";
+ sha512 = "kk80vLW9iGtjMnIv11qyxLqZm20UklzuR2tL0QAnDIygIUIemcZMxlMWudl9OOt76H3ntVzcTiddQ1/pAAJMYg==";
};
buildInputs = globalBuildInputs;
meta = {
@@ -50139,7 +53059,7 @@ in
sources."array-uniq-1.0.3"
sources."asynckit-0.4.0"
sources."balanced-match-1.0.0"
- sources."bluebird-3.5.1"
+ sources."bluebird-3.5.2"
(sources."boxen-1.3.0" // {
dependencies = [
sources."ansi-styles-3.2.1"
@@ -50150,7 +53070,7 @@ in
sources."brace-expansion-1.1.11"
sources."buffer-from-1.1.1"
sources."camelcase-4.1.0"
- sources."capture-stack-trace-1.0.0"
+ sources."capture-stack-trace-1.0.1"
sources."chalk-1.1.3"
sources."ci-info-1.4.0"
sources."cli-boxes-1.0.0"
@@ -50229,7 +53149,7 @@ in
sources."lowercase-keys-1.0.1"
sources."lru-cache-4.1.3"
sources."make-dir-1.3.0"
- sources."make-error-1.3.4"
+ sources."make-error-1.3.5"
sources."make-error-cause-1.2.2"
sources."mime-db-1.36.0"
sources."mime-types-2.1.20"
@@ -50339,10 +53259,10 @@ in
uglify-js = nodeEnv.buildNodePackage {
name = "uglify-js";
packageName = "uglify-js";
- version = "3.4.8";
+ version = "3.4.9";
src = fetchurl {
- url = "https://registry.npmjs.org/uglify-js/-/uglify-js-3.4.8.tgz";
- sha512 = "WatYTD84gP/867bELqI2F/2xC9PQBETn/L+7RGq9MQOA/7yFBNvY1UwXqvtILeE6n0ITwBXxp34M0/o70dzj6A==";
+ url = "https://registry.npmjs.org/uglify-js/-/uglify-js-3.4.9.tgz";
+ sha512 = "8CJsbKOtEbnJsTyv6LE6m6ZKniqMiFWmm9sRbopbkGs3gMPPfd3Fh8iIA4Ykv5MgaTbqHr4BaoGLJLZNhsrW1Q==";
};
dependencies = [
sources."commander-2.17.1"
@@ -50395,7 +53315,7 @@ in
sources."bcrypt-pbkdf-1.0.2"
sources."better-assert-1.0.2"
sources."blob-0.0.4"
- sources."bluebird-3.5.1"
+ sources."bluebird-3.5.2"
sources."blueimp-md5-2.10.0"
sources."body-parser-1.18.3"
sources."brace-expansion-1.1.11"
@@ -50463,7 +53383,7 @@ in
];
})
sources."ecc-jsbn-0.1.2"
- sources."editions-2.0.1"
+ sources."editions-2.0.2"
sources."ee-first-1.1.1"
sources."encodeurl-1.0.2"
(sources."engine.io-3.2.0" // {
@@ -50532,7 +53452,7 @@ in
sources."gauge-2.7.4"
sources."get-caller-file-1.0.3"
sources."get-stream-3.0.0"
- sources."getmac-1.4.5"
+ sources."getmac-1.4.6"
sources."getpass-0.1.7"
sources."glob-7.1.3"
sources."graceful-fs-4.1.11"
@@ -50845,7 +53765,7 @@ in
sources."base64-js-0.0.8"
sources."bcrypt-pbkdf-1.0.2"
sources."bl-1.2.2"
- sources."bluebird-3.5.1"
+ sources."bluebird-3.5.2"
sources."brace-expansion-1.1.11"
sources."buffer-3.6.0"
sources."buffer-alloc-1.2.0"
@@ -50854,12 +53774,12 @@ in
sources."buffer-fill-1.0.0"
sources."builtins-1.0.3"
sources."camelcase-1.2.1"
- sources."capture-stack-trace-1.0.0"
+ sources."capture-stack-trace-1.0.1"
sources."caseless-0.12.0"
sources."caw-2.0.1"
sources."center-align-0.1.3"
sources."chalk-2.4.1"
- sources."chardet-0.5.0"
+ sources."chardet-0.7.0"
sources."cli-cursor-2.1.0"
sources."cli-spinners-1.3.1"
sources."cli-width-2.2.0"
@@ -50910,7 +53830,7 @@ in
sources."esprima-4.0.1"
sources."extend-3.0.2"
sources."extend-shallow-2.0.1"
- sources."external-editor-3.0.1"
+ sources."external-editor-3.0.3"
sources."extsprintf-1.3.0"
sources."fast-deep-equal-1.1.0"
sources."fast-json-stable-stringify-2.0.0"
@@ -51041,7 +53961,7 @@ in
sources."right-align-0.1.3"
sources."rimraf-2.6.2"
sources."run-async-2.3.0"
- sources."rxjs-6.2.2"
+ sources."rxjs-6.3.1"
sources."safe-buffer-5.1.2"
sources."safer-buffer-2.1.2"
(sources."seek-bzip-1.0.5" // {
@@ -51149,7 +54069,7 @@ in
sources."@types/graphql-0.12.6"
sources."@types/long-4.0.0"
sources."@types/mime-2.0.0"
- sources."@types/node-10.9.2"
+ sources."@types/node-10.9.4"
sources."@types/range-parser-1.2.2"
sources."@types/serve-static-1.13.2"
sources."@types/ws-5.1.2"
@@ -51170,11 +54090,11 @@ in
sources."ansi-styles-3.2.1"
sources."anymatch-2.0.0"
sources."apollo-cache-1.1.16"
- sources."apollo-cache-control-0.2.2"
+ sources."apollo-cache-control-0.2.3"
sources."apollo-cache-inmemory-1.2.9"
sources."apollo-client-2.4.1"
- sources."apollo-datasource-0.1.2"
- sources."apollo-engine-reporting-0.0.2"
+ sources."apollo-datasource-0.1.3"
+ sources."apollo-engine-reporting-0.0.3"
sources."apollo-engine-reporting-protobuf-0.0.1"
sources."apollo-link-1.2.2"
sources."apollo-link-context-1.0.8"
@@ -51185,11 +54105,11 @@ in
sources."apollo-link-state-0.4.1"
sources."apollo-link-ws-1.0.8"
sources."apollo-server-caching-0.1.2"
- sources."apollo-server-core-2.0.4"
- sources."apollo-server-env-2.0.2"
+ sources."apollo-server-core-2.0.5"
+ sources."apollo-server-env-2.0.3"
sources."apollo-server-errors-2.0.2"
- sources."apollo-server-express-2.0.4"
- sources."apollo-tracing-0.2.2"
+ sources."apollo-server-express-2.0.5"
+ sources."apollo-tracing-0.2.3"
sources."apollo-upload-client-8.1.0"
sources."apollo-utilities-1.0.20"
sources."argparse-1.0.10"
@@ -51256,11 +54176,11 @@ in
sources."cache-base-1.0.1"
sources."call-me-maybe-1.0.1"
sources."camelcase-4.1.0"
- sources."capture-stack-trace-1.0.0"
+ sources."capture-stack-trace-1.0.1"
sources."caseless-0.12.0"
sources."caw-2.0.1"
sources."chalk-2.4.1"
- sources."chardet-0.5.0"
+ sources."chardet-0.7.0"
sources."chokidar-2.0.4"
sources."ci-info-1.4.0"
(sources."class-utils-0.3.6" // {
@@ -51410,7 +54330,11 @@ in
sources."express-history-api-fallback-2.2.1"
sources."extend-3.0.2"
sources."extend-shallow-2.0.1"
- sources."external-editor-3.0.1"
+ (sources."external-editor-3.0.3" // {
+ dependencies = [
+ sources."iconv-lite-0.4.24"
+ ];
+ })
(sources."extglob-2.0.4" // {
dependencies = [
sources."define-property-1.0.0"
@@ -51472,7 +54396,7 @@ in
sources."graceful-readlink-1.0.1"
sources."graphql-0.13.2"
sources."graphql-anywhere-4.1.18"
- sources."graphql-extensions-0.1.2"
+ sources."graphql-extensions-0.1.3"
sources."graphql-subscriptions-0.5.8"
sources."graphql-tag-2.9.2"
sources."graphql-tools-3.1.1"
@@ -51608,7 +54532,7 @@ in
sources."ms-2.0.0"
sources."mute-stream-0.0.7"
sources."nan-2.11.0"
- sources."nanoid-1.2.1"
+ sources."nanoid-1.2.2"
(sources."nanomatch-1.2.13" // {
dependencies = [
sources."extend-shallow-3.0.2"
@@ -51620,7 +54544,7 @@ in
sources."node-fetch-2.2.0"
sources."node-ipc-9.1.1"
sources."node-notifier-5.2.1"
- sources."nodemon-1.18.3"
+ sources."nodemon-1.18.4"
sources."nopt-1.0.10"
sources."normalize-path-2.1.1"
sources."npm-conf-1.1.3"
@@ -51731,7 +54655,7 @@ in
sources."retry-0.10.1"
sources."rimraf-2.6.2"
sources."run-async-2.3.0"
- sources."rxjs-6.2.2"
+ sources."rxjs-6.3.1"
sources."safe-buffer-5.1.1"
sources."safe-regex-1.1.0"
sources."safer-buffer-2.1.2"
@@ -52000,7 +54924,7 @@ in
sources."form-data-1.0.1"
sources."fs-extra-0.26.7"
sources."fs.realpath-1.0.0"
- sources."generate-function-2.2.0"
+ sources."generate-function-2.3.1"
sources."generate-object-property-1.2.0"
(sources."getpass-0.1.7" // {
dependencies = [
@@ -52167,7 +55091,7 @@ in
sources."base64-js-1.3.0"
sources."big.js-3.2.0"
sources."binary-extensions-1.11.0"
- sources."bluebird-3.5.1"
+ sources."bluebird-3.5.2"
sources."bn.js-4.11.8"
sources."brace-expansion-1.1.11"
(sources."braces-2.3.2" // {
@@ -52550,7 +55474,7 @@ in
sources."util-deprecate-1.0.2"
sources."vm-browserify-0.0.4"
sources."watchpack-1.6.0"
- (sources."webpack-sources-1.1.0" // {
+ (sources."webpack-sources-1.2.0" // {
dependencies = [
sources."source-map-0.6.1"
];
@@ -52587,7 +55511,7 @@ in
sources."bencode-2.0.0"
sources."binary-search-1.3.4"
sources."bitfield-2.0.0"
- (sources."bittorrent-dht-8.4.0" // {
+ (sources."bittorrent-dht-9.0.0" // {
dependencies = [
sources."debug-3.1.0"
];
@@ -52596,6 +55520,7 @@ in
(sources."bittorrent-protocol-3.0.1" // {
dependencies = [
sources."debug-3.1.0"
+ sources."readable-stream-2.3.6"
];
})
(sources."bittorrent-tracker-9.10.1" // {
@@ -52605,7 +55530,11 @@ in
];
})
sources."blob-to-buffer-1.2.8"
- sources."block-stream2-1.1.0"
+ (sources."block-stream2-1.1.0" // {
+ dependencies = [
+ sources."readable-stream-2.3.6"
+ ];
+ })
sources."bn.js-4.11.8"
sources."brace-expansion-1.1.11"
sources."browserify-package-json-1.0.1"
@@ -52625,15 +55554,23 @@ in
sources."mime-1.6.0"
];
})
- sources."chunk-store-stream-3.0.1"
+ (sources."chunk-store-stream-3.0.1" // {
+ dependencies = [
+ sources."readable-stream-2.3.6"
+ ];
+ })
sources."clivas-0.2.0"
sources."closest-to-2.0.0"
sources."colour-0.7.1"
sources."compact2string-1.4.0"
sources."concat-map-0.0.1"
- sources."concat-stream-1.6.2"
+ (sources."concat-stream-1.6.2" // {
+ dependencies = [
+ sources."readable-stream-2.3.6"
+ ];
+ })
sources."core-util-is-1.0.2"
- sources."create-torrent-3.32.1"
+ sources."create-torrent-3.33.0"
sources."debug-2.6.9"
sources."decompress-response-3.3.0"
sources."defined-1.0.0"
@@ -52644,7 +55581,7 @@ in
})
sources."dns-packet-1.3.1"
sources."dns-txt-2.0.2"
- (sources."ecstatic-3.2.1" // {
+ (sources."ecstatic-3.3.0" // {
dependencies = [
sources."mime-1.6.0"
];
@@ -52652,7 +55589,11 @@ in
sources."elementtree-0.1.7"
sources."end-of-stream-1.4.1"
sources."executable-4.1.1"
- sources."filestream-4.1.3"
+ (sources."filestream-4.1.3" // {
+ dependencies = [
+ sources."readable-stream-2.3.6"
+ ];
+ })
sources."flatten-1.0.2"
(sources."fs-chunk-store-1.7.0" // {
dependencies = [
@@ -52675,8 +55616,12 @@ in
sources."is-typedarray-1.0.0"
sources."isarray-1.0.0"
sources."junk-2.1.0"
- sources."k-bucket-4.0.1"
- sources."k-rpc-5.0.0"
+ sources."k-bucket-5.0.0"
+ (sources."k-rpc-5.0.0" // {
+ dependencies = [
+ sources."k-bucket-4.0.1"
+ ];
+ })
sources."k-rpc-socket-1.8.0"
sources."last-one-wins-1.0.4"
(sources."load-ip-set-2.1.0" // {
@@ -52686,10 +55631,14 @@ in
})
sources."long-2.4.0"
sources."lru-3.1.0"
- sources."magnet-uri-5.2.3"
+ sources."magnet-uri-5.2.4"
sources."mdns-js-0.5.0"
sources."mdns-js-packet-0.2.0"
- sources."mediasource-2.2.2"
+ (sources."mediasource-2.2.2" // {
+ dependencies = [
+ sources."readable-stream-2.3.6"
+ ];
+ })
sources."memory-chunk-store-1.3.0"
sources."mime-2.3.1"
sources."mimic-response-1.0.1"
@@ -52702,14 +55651,22 @@ in
})
sources."moment-2.22.2"
sources."mp4-box-encoding-1.3.0"
- sources."mp4-stream-2.0.3"
+ (sources."mp4-stream-2.0.3" // {
+ dependencies = [
+ sources."readable-stream-2.3.6"
+ ];
+ })
sources."ms-2.0.0"
(sources."multicast-dns-6.2.3" // {
dependencies = [
sources."thunky-1.0.2"
];
})
- sources."multistream-2.1.1"
+ (sources."multistream-2.1.1" // {
+ dependencies = [
+ sources."readable-stream-2.3.6"
+ ];
+ })
sources."netmask-1.0.6"
sources."network-address-1.1.2"
sources."next-event-1.0.0"
@@ -52744,8 +55701,12 @@ in
sources."random-iterate-1.0.1"
sources."randombytes-2.0.6"
sources."range-parser-1.2.0"
- sources."range-slice-stream-1.2.0"
- sources."readable-stream-2.3.6"
+ (sources."range-slice-stream-1.2.0" // {
+ dependencies = [
+ sources."readable-stream-2.3.6"
+ ];
+ })
+ sources."readable-stream-3.0.2"
sources."record-cache-1.1.0"
(sources."render-media-3.1.3" // {
dependencies = [
@@ -52765,12 +55726,14 @@ in
(sources."simple-peer-9.1.2" // {
dependencies = [
sources."debug-3.1.0"
+ sources."readable-stream-2.3.6"
];
})
sources."simple-sha1-2.1.1"
(sources."simple-websocket-7.2.0" // {
dependencies = [
sources."debug-3.1.0"
+ sources."readable-stream-2.3.6"
];
})
sources."speedometer-1.1.0"
@@ -52784,7 +55747,7 @@ in
sources."through-2.3.8"
sources."thunky-0.1.0"
sources."to-arraybuffer-1.0.1"
- (sources."torrent-discovery-9.0.2" // {
+ (sources."torrent-discovery-9.1.1" // {
dependencies = [
sources."debug-3.1.0"
];
@@ -52798,7 +55761,7 @@ in
sources."upnp-device-client-1.0.2"
sources."upnp-mediarenderer-client-1.2.4"
sources."url-join-2.0.5"
- (sources."ut_metadata-3.2.2" // {
+ (sources."ut_metadata-3.3.0" // {
dependencies = [
sources."debug-3.1.0"
];
@@ -52807,11 +55770,10 @@ in
sources."utf-8-validate-5.0.1"
sources."util-deprecate-1.0.2"
sources."videostream-2.5.1"
- sources."vlc-command-1.1.1"
- (sources."webtorrent-0.102.2" // {
+ sources."vlc-command-1.1.2"
+ (sources."webtorrent-0.102.4" // {
dependencies = [
sources."debug-3.1.0"
- sources."readable-stream-3.0.2"
sources."simple-get-3.0.3"
];
})
@@ -52822,7 +55784,6 @@ in
sources."xmlbuilder-9.0.7"
sources."xmldom-0.1.27"
sources."xtend-4.0.1"
- sources."zero-fill-2.2.3"
];
buildInputs = globalBuildInputs;
meta = {
@@ -52836,27 +55797,35 @@ in
web-ext = nodeEnv.buildNodePackage {
name = "web-ext";
packageName = "web-ext";
- version = "2.8.0";
+ version = "2.9.1";
src = fetchurl {
- url = "https://registry.npmjs.org/web-ext/-/web-ext-2.8.0.tgz";
- sha512 = "3JuPYU3yrefysm3pvGwRP5k9plRMPUeLo5KLp2TSnE9g4t7x6SeIWZEWWG3jwVeFsPQuIj3sAuVHEDO5ai9mCw==";
+ url = "https://registry.npmjs.org/web-ext/-/web-ext-2.9.1.tgz";
+ sha512 = "sK5ebAiUNJFG+KfFjjvWks9ihecy0TdVCrrnSW/tZ15QFO6u4LCIQKCuBr7FyGMjC+IOGJFB7pS1ZbyPNJ72GQ==";
};
dependencies = [
sources."@cliqz-oss/firefox-client-0.3.1"
sources."@cliqz-oss/node-firefox-connect-1.2.1"
- sources."@types/node-10.9.2"
+ sources."@types/node-10.9.4"
sources."JSONSelect-0.2.1"
sources."abbrev-1.1.1"
sources."acorn-5.7.2"
- sources."acorn-jsx-4.1.1"
+ (sources."acorn-jsx-3.0.1" // {
+ dependencies = [
+ sources."acorn-3.3.0"
+ ];
+ })
sources."adbkit-2.11.0"
sources."adbkit-logcat-1.1.0"
sources."adbkit-monkey-1.0.1"
- (sources."addons-linter-1.2.6" // {
+ (sources."addons-linter-1.3.1" // {
dependencies = [
sources."source-map-0.6.1"
sources."source-map-support-0.5.6"
- sources."yargs-12.0.1"
+ (sources."yargs-12.0.1" // {
+ dependencies = [
+ sources."os-locale-2.1.0"
+ ];
+ })
];
})
sources."adm-zip-0.4.11"
@@ -52945,7 +55914,7 @@ in
sources."extend-shallow-2.0.1"
];
})
- sources."buffer-5.2.0"
+ sources."buffer-5.2.1"
sources."buffer-alloc-1.2.0"
sources."buffer-alloc-unsafe-1.1.0"
sources."buffer-crc32-0.2.13"
@@ -52959,7 +55928,7 @@ in
sources."caller-path-0.1.0"
sources."callsites-0.2.0"
sources."camelcase-4.1.0"
- sources."capture-stack-trace-1.0.0"
+ sources."capture-stack-trace-1.0.1"
sources."caseless-0.12.0"
(sources."chalk-2.4.0" // {
dependencies = [
@@ -53021,7 +55990,7 @@ in
sources."crc-3.8.0"
sources."crc32-stream-2.0.0"
sources."create-error-class-3.0.2"
- sources."cross-spawn-6.0.5"
+ sources."cross-spawn-5.1.0"
sources."crx-parser-0.1.2"
sources."crypto-random-string-1.0.0"
sources."css-select-1.2.0"
@@ -53050,15 +56019,12 @@ in
sources."delayed-stream-1.0.0"
sources."depd-1.1.2"
sources."detect-indent-4.0.0"
- (sources."dispensary-0.21.0" // {
+ (sources."dispensary-0.22.0" // {
dependencies = [
- sources."ansi-styles-3.2.1"
sources."async-2.6.1"
- sources."chalk-2.4.1"
- sources."pino-4.17.6"
+ sources."os-locale-2.1.0"
sources."source-map-0.6.1"
sources."source-map-support-0.5.9"
- sources."supports-color-5.5.0"
sources."yargs-12.0.1"
];
})
@@ -53106,6 +56072,7 @@ in
(sources."eslint-5.0.1" // {
dependencies = [
sources."ansi-regex-3.0.0"
+ sources."cross-spawn-6.0.5"
sources."debug-3.1.0"
sources."globals-11.7.0"
sources."strip-ansi-4.0.0"
@@ -53113,8 +56080,6 @@ in
})
(sources."eslint-plugin-no-unsafe-innerhtml-1.0.16" // {
dependencies = [
- sources."acorn-3.3.0"
- sources."acorn-jsx-3.0.1"
sources."ajv-4.11.8"
sources."ajv-keywords-1.5.1"
sources."ansi-escapes-1.4.0"
@@ -53144,7 +56109,11 @@ in
})
sources."eslint-scope-4.0.0"
sources."eslint-visitor-keys-1.0.0"
- sources."espree-4.0.0"
+ (sources."espree-4.0.0" // {
+ dependencies = [
+ sources."acorn-jsx-4.1.1"
+ ];
+ })
sources."esprima-3.1.3"
sources."esquery-1.0.1"
sources."esrecurse-4.2.1"
@@ -53152,11 +56121,7 @@ in
sources."esutils-2.0.2"
sources."event-emitter-0.3.5"
sources."event-to-promise-0.8.0"
- (sources."execa-0.7.0" // {
- dependencies = [
- sources."cross-spawn-5.1.0"
- ];
- })
+ sources."execa-0.7.0"
sources."exit-hook-1.1.1"
(sources."expand-brackets-2.1.4" // {
dependencies = [
@@ -53192,11 +56157,11 @@ in
sources."extsprintf-1.3.0"
sources."fast-deep-equal-2.0.1"
sources."fast-json-parse-1.0.3"
- sources."fast-json-patch-2.0.6"
+ sources."fast-json-patch-2.0.7"
sources."fast-json-stable-stringify-2.0.0"
sources."fast-levenshtein-2.0.6"
sources."fast-redact-1.1.14"
- sources."fast-safe-stringify-1.2.3"
+ sources."fast-safe-stringify-2.0.6"
sources."fd-slicer-1.1.0"
sources."figures-2.0.0"
sources."file-entry-cache-2.0.0"
@@ -53207,7 +56172,7 @@ in
];
})
sources."find-up-3.0.0"
- (sources."firefox-profile-1.1.0" // {
+ (sources."firefox-profile-1.2.0" // {
dependencies = [
sources."async-2.5.0"
sources."fs-extra-4.0.3"
@@ -53242,7 +56207,7 @@ in
sources."which-1.2.4"
];
})
- sources."generate-function-2.2.0"
+ sources."generate-function-2.3.1"
sources."generate-object-property-1.2.0"
sources."get-caller-file-1.0.3"
sources."get-stream-3.0.0"
@@ -53270,7 +56235,7 @@ in
sources."graphlib-2.1.5"
sources."growly-1.3.0"
sources."har-schema-2.0.0"
- (sources."har-validator-5.0.3" // {
+ (sources."har-validator-5.1.0" // {
dependencies = [
sources."ajv-5.5.2"
sources."fast-deep-equal-1.1.0"
@@ -53539,7 +56504,7 @@ in
sources."npm-run-path-2.0.2"
sources."nth-check-1.0.1"
sources."number-is-nan-1.0.1"
- sources."oauth-sign-0.8.2"
+ sources."oauth-sign-0.9.0"
sources."object-assign-4.1.1"
(sources."object-copy-0.1.0" // {
dependencies = [
@@ -53561,11 +56526,20 @@ in
sources."opn-5.3.0"
sources."optionator-0.8.2"
sources."os-homedir-1.0.2"
- sources."os-locale-2.1.0"
+ (sources."os-locale-3.0.0" // {
+ dependencies = [
+ sources."cross-spawn-6.0.5"
+ sources."execa-0.10.0"
+ sources."invert-kv-2.0.0"
+ sources."lcid-2.0.0"
+ sources."mem-3.0.1"
+ ];
+ })
sources."os-name-2.0.1"
sources."os-shim-0.1.3"
sources."os-tmpdir-1.0.2"
sources."p-finally-1.0.0"
+ sources."p-is-promise-1.1.0"
sources."p-limit-2.0.0"
sources."p-locate-3.0.0"
sources."p-try-2.0.0"
@@ -53593,12 +56567,7 @@ in
sources."pify-2.3.0"
sources."pinkie-2.0.4"
sources."pinkie-promise-2.0.1"
- (sources."pino-5.0.0-rc.4" // {
- dependencies = [
- sources."fast-safe-stringify-2.0.6"
- sources."quick-format-unescaped-3.0.0"
- ];
- })
+ sources."pino-5.0.4"
sources."pino-std-serializers-2.2.1"
sources."pluralize-7.0.0"
sources."po2json-0.4.5"
@@ -53626,10 +56595,11 @@ in
})
sources."proxy-from-env-1.0.0"
sources."pseudomap-1.0.2"
+ sources."psl-1.1.29"
sources."pump-3.0.0"
sources."punycode-2.1.1"
sources."qs-6.5.2"
- sources."quick-format-unescaped-1.1.2"
+ sources."quick-format-unescaped-3.0.0"
(sources."raw-body-2.3.3" // {
dependencies = [
sources."iconv-lite-0.4.23"
@@ -53667,7 +56637,7 @@ in
sources."repeat-element-1.1.3"
sources."repeat-string-1.6.1"
sources."repeating-2.0.1"
- sources."request-2.87.0"
+ sources."request-2.88.0"
sources."require-directory-2.1.1"
sources."require-main-filename-1.0.1"
sources."require-uncached-1.0.3"
@@ -53680,7 +56650,7 @@ in
sources."run-async-2.3.0"
sources."rx-lite-3.1.2"
sources."rx-lite-aggregates-4.0.8"
- sources."rxjs-5.5.11"
+ sources."rxjs-5.5.12"
sources."safe-buffer-5.1.2"
sources."safe-json-stringify-1.2.0"
sources."safe-regex-1.1.0"
@@ -53710,11 +56680,19 @@ in
sources."shellwords-0.1.1"
(sources."sign-addon-0.3.1" // {
dependencies = [
+ sources."ajv-5.5.2"
sources."babel-polyfill-6.16.0"
sources."es6-error-4.0.0"
+ sources."fast-deep-equal-1.1.0"
+ sources."har-validator-5.0.3"
+ sources."json-schema-traverse-0.3.1"
sources."mz-2.5.0"
+ sources."oauth-sign-0.8.2"
+ sources."punycode-1.4.1"
sources."regenerator-runtime-0.9.6"
+ sources."request-2.87.0"
sources."source-map-support-0.4.6"
+ sources."tough-cookie-2.3.4"
];
})
sources."signal-exit-3.0.2"
@@ -53824,7 +56802,7 @@ in
})
sources."socks-1.1.10"
sources."socks-proxy-agent-3.0.1"
- sources."sonic-boom-0.5.0"
+ sources."sonic-boom-0.6.1"
sources."source-map-0.5.7"
sources."source-map-resolve-0.5.2"
(sources."source-map-support-0.5.3" // {
@@ -53840,7 +56818,6 @@ in
sources."spdx-license-ids-3.0.0"
sources."split-0.3.3"
sources."split-string-3.1.0"
- sources."split2-2.2.0"
sources."sprintf-js-1.0.3"
sources."sshpk-1.14.2"
(sources."static-extend-0.1.2" // {
@@ -53896,7 +56873,6 @@ in
sources."thenify-3.3.0"
sources."thenify-all-1.6.0"
sources."through-2.3.8"
- sources."through2-2.0.3"
sources."thunkify-2.1.2"
sources."timed-out-4.0.1"
sources."tmp-0.0.33"
@@ -53907,7 +56883,7 @@ in
sources."to-regex-range-2.1.1"
sources."toml-2.3.3"
sources."tosource-1.0.0"
- (sources."tough-cookie-2.3.4" // {
+ (sources."tough-cookie-2.4.3" // {
dependencies = [
sources."punycode-1.4.1"
];
@@ -54118,10 +57094,10 @@ in
sources."call-me-maybe-1.0.1"
sources."camelcase-2.1.1"
sources."camelcase-keys-2.1.0"
- sources."capture-stack-trace-1.0.0"
+ sources."capture-stack-trace-1.0.1"
sources."caseless-0.12.0"
sources."chalk-2.4.1"
- sources."chardet-0.5.0"
+ sources."chardet-0.7.0"
sources."ci-info-1.4.0"
(sources."class-utils-0.3.6" // {
dependencies = [
@@ -54227,7 +57203,7 @@ in
sources."is-extendable-1.0.1"
];
})
- sources."external-editor-3.0.1"
+ sources."external-editor-3.0.3"
(sources."extglob-2.0.4" // {
dependencies = [
sources."define-property-1.0.0"
@@ -54309,7 +57285,7 @@ in
sources."chardet-0.4.2"
sources."external-editor-2.2.0"
sources."inquirer-5.2.0"
- sources."rxjs-5.5.11"
+ sources."rxjs-5.5.12"
];
})
sources."into-stream-3.1.0"
@@ -54547,7 +57523,7 @@ in
sources."root-check-1.0.0"
sources."run-async-2.3.0"
sources."rx-4.1.0"
- sources."rxjs-6.2.2"
+ sources."rxjs-6.3.1"
sources."safe-buffer-5.1.2"
sources."safe-regex-1.1.0"
sources."safer-buffer-2.1.2"
diff --git a/pkgs/development/python-modules/Flask-PyMongo/default.nix b/pkgs/development/python-modules/Flask-PyMongo/default.nix
index 862fd84c492..7c37bdaddd5 100644
--- a/pkgs/development/python-modules/Flask-PyMongo/default.nix
+++ b/pkgs/development/python-modules/Flask-PyMongo/default.nix
@@ -2,6 +2,7 @@
, fetchPypi
, flask
, pymongo
+, vcversioner
, lib
, pytest
}:
@@ -18,17 +19,17 @@ buildPythonPackage rec {
checkInputs = [ pytest ];
checkPhase = ''
- py.test tests
+ py.test
'';
# Tests seem to hang
doCheck = false;
- propagatedBuildInputs = [ flask pymongo ];
+ propagatedBuildInputs = [ flask pymongo vcversioner ];
meta = {
homepage = "http://flask-pymongo.readthedocs.org/";
description = "PyMongo support for Flask applications";
license = lib.licenses.bsd2;
};
-}
\ No newline at end of file
+}
diff --git a/pkgs/development/python-modules/backports-shutil-which/default.nix b/pkgs/development/python-modules/backports-shutil-which/default.nix
new file mode 100644
index 00000000000..9900f86567e
--- /dev/null
+++ b/pkgs/development/python-modules/backports-shutil-which/default.nix
@@ -0,0 +1,24 @@
+{ stdenv, fetchPypi, fetchFromGitHub, buildPythonPackage, pytest }:
+
+buildPythonPackage rec {
+ pname = "backports.shutil_which";
+ version = "3.5.1";
+
+ src = fetchPypi {
+ inherit pname version;
+ sha256 = "16sa3adkf71862cb9pk747pw80a2f1v5m915ijb4fgj309xrlhyx";
+ };
+
+ checkInputs = [ pytest ];
+
+ checkPhase = ''
+ py.test test
+ '';
+
+ meta = with stdenv.lib; {
+ description = "Backport of shutil.which from Python 3.3";
+ homepage = https://github.com/minrk/backports.shutil_which;
+ license = licenses.psfl;
+ maintainers = with maintainers; [ jluttine ];
+ };
+}
diff --git a/pkgs/development/python-modules/btrees/default.nix b/pkgs/development/python-modules/btrees/default.nix
index c96d305a7f6..665d5347bba 100644
--- a/pkgs/development/python-modules/btrees/default.nix
+++ b/pkgs/development/python-modules/btrees/default.nix
@@ -15,6 +15,12 @@ buildPythonPackage rec {
propagatedBuildInputs = [ persistent zope_interface ];
checkInputs = [ zope_testrunner ];
+ # disable a failing test that looks broken
+ postPatch = ''
+ substituteInPlace BTrees/tests/common.py \
+ --replace "testShortRepr" "no_testShortRepr"
+ '';
+
src = fetchPypi {
inherit pname version;
sha256 = "dcc096c3cf92efd6b9365951f89118fd30bc209c9af83bf050a28151a9992786";
diff --git a/pkgs/development/python-modules/confluent-kafka/default.nix b/pkgs/development/python-modules/confluent-kafka/default.nix
index 0638ea3a36d..a0183e4595c 100644
--- a/pkgs/development/python-modules/confluent-kafka/default.nix
+++ b/pkgs/development/python-modules/confluent-kafka/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, buildPythonPackage, fetchPypi, isPy3k, rdkafka, requests, avro3k, avro}:
+{ stdenv, buildPythonPackage, fetchPypi, isPy3k, rdkafka, requests, avro3k, avro, futures}:
buildPythonPackage rec {
version = "0.11.5";
@@ -9,7 +9,7 @@ buildPythonPackage rec {
sha256 = "bfb5807bfb5effd74f2cfe65e4e3e8564a9e72b25e099f655d8ad0d362a63b9f";
};
- buildInputs = [ rdkafka requests ] ++ (if isPy3k then [ avro3k ] else [ avro ]) ;
+ buildInputs = [ rdkafka requests ] ++ (if isPy3k then [ avro3k ] else [ avro futures ]) ;
# Tests fail for python3 under this pypi release
doCheck = if isPy3k then false else true;
diff --git a/pkgs/development/python-modules/construct/default.nix b/pkgs/development/python-modules/construct/default.nix
index 680f6e02cd0..f8e739f0bc7 100644
--- a/pkgs/development/python-modules/construct/default.nix
+++ b/pkgs/development/python-modules/construct/default.nix
@@ -1,23 +1,26 @@
-{ stdenv, buildPythonPackage, fetchFromGitHub, six, pytest }:
+{ stdenv, buildPythonPackage, fetchFromGitHub
+, six, pytest, arrow
+}:
buildPythonPackage rec {
- pname = "construct";
- version = "2.8.16";
- name = pname + "-" + version;
+ pname = "construct";
+ version = "2.9.45";
src = fetchFromGitHub {
- owner = "construct";
- repo = "construct";
- rev = "v${version}";
- sha256 = "0lzz1dy419n254qccch7yx4nkpwd0fsyjhnsnaf6ysgwzqxxv63j";
+ owner = pname;
+ repo = pname;
+ rev = "v${version}";
+ sha256 = "0ig66xrzswpkhhmw123p2nvr15a9lxz54a1fmycfdh09327c1d3y";
};
propagatedBuildInputs = [ six ];
- checkInputs = [ pytest ];
+ checkInputs = [ pytest arrow ];
+ # TODO: figure out missing dependencies
+ doCheck = false;
checkPhase = ''
- py.test -k 'not test_numpy' tests
+ py.test -k 'not test_numpy and not test_gallery' tests
'';
meta = with stdenv.lib; {
diff --git a/pkgs/development/python-modules/cozy/default.nix b/pkgs/development/python-modules/cozy/default.nix
index 0feca2773b3..7515891456e 100644
--- a/pkgs/development/python-modules/cozy/default.nix
+++ b/pkgs/development/python-modules/cozy/default.nix
@@ -1,4 +1,4 @@
-{ buildPythonPackage, fetchFromGitHub, lib,
+{ buildPythonPackage, isPy3k, fetchFromGitHub, lib,
z3, ply, python-igraph, oset, ordered-set, dictionaries }:
buildPythonPackage {
@@ -29,6 +29,8 @@ buildPythonPackage {
$out/bin/cozy --help
'';
+ disabled = !isPy3k;
+
meta = {
description = "The collection synthesizer";
homepage = https://cozy.uwplse.org/;
diff --git a/pkgs/development/python-modules/daphne/default.nix b/pkgs/development/python-modules/daphne/default.nix
index 7ead1cacfa6..258fc746e4b 100644
--- a/pkgs/development/python-modules/daphne/default.nix
+++ b/pkgs/development/python-modules/daphne/default.nix
@@ -4,7 +4,7 @@
}:
buildPythonPackage rec {
pname = "daphne";
- version = "2.1.0";
+ version = "2.2.2";
disabled = !isPy3k;
@@ -12,7 +12,7 @@ buildPythonPackage rec {
owner = "django";
repo = pname;
rev = version;
- sha256 = "1lbpn0l796ar77amqy8dap30zxmsn6as8y2lbmp4lk8m9awscwi8";
+ sha256 = "1pr3b7zxjp2jx31lpiy1hfyprpmyiv2kd18n8x6kh6gd5nr0dgp8";
};
nativeBuildInputs = [ pytestrunner ];
@@ -21,9 +21,10 @@ buildPythonPackage rec {
checkInputs = [ hypothesis pytest pytest-asyncio ];
+ doCheck = !stdenv.isDarwin; # most tests fail on darwin
+
checkPhase = ''
- # Other tests fail, seems to be due to filesystem access
- py.test -k "test_cli or test_utils"
+ py.test
'';
meta = with stdenv.lib; {
diff --git a/pkgs/development/python-modules/distributed/default.nix b/pkgs/development/python-modules/distributed/default.nix
new file mode 100644
index 00000000000..987b64439a5
--- /dev/null
+++ b/pkgs/development/python-modules/distributed/default.nix
@@ -0,0 +1,62 @@
+{ lib
+, buildPythonPackage
+, fetchFromGitHub
+, pytest
+, pytest-repeat
+, pytest-faulthandler
+, pytest-timeout
+, mock
+, joblib
+, click
+, cloudpickle
+, dask
+, msgpack
+, psutil
+, six
+, sortedcontainers
+, tblib
+, toolz
+, tornado
+, zict
+, pyyaml
+, pythonOlder
+, futures
+, singledispatch
+}:
+
+buildPythonPackage rec {
+ pname = "distributed";
+ version = "1.22.1";
+
+ # get full repository need conftest.py to run tests
+ src = fetchFromGitHub {
+ owner = "dask";
+ repo = pname;
+ rev = version;
+ sha256 = "0xvx55rhbhlyys3kjndihwq6y6260qzy9mr3miclh5qddaiw2d5z";
+ };
+
+ checkInputs = [ pytest pytest-repeat pytest-faulthandler pytest-timeout mock joblib ];
+ propagatedBuildInputs = [
+ click cloudpickle dask msgpack psutil six
+ sortedcontainers tblib toolz tornado zict pyyaml
+ ] ++ lib.optional (pythonOlder "3.2") [ futures ]
+ ++ lib.optional (pythonOlder "3.4") [ singledispatch ];
+
+ # tests take about 10-15 minutes
+ # ignore 5 cli tests out of 1000 total tests that fail due to subprocesses
+ # these tests are not critical to the library (only the cli)
+ checkPhase = ''
+ py.test distributed -m "not avoid-travis" -r s --timeout-method=thread --timeout=0 --durations=20 --ignore="distributed/cli/tests"
+ '';
+
+ # when tested random tests would fail and not repeatably
+ doCheck = false;
+
+ meta = {
+ description = "Distributed computation in Python.";
+ homepage = http://distributed.readthedocs.io/en/latest/;
+ license = lib.licenses.bsd3;
+ maintainers = with lib.maintainers; [ teh costrouc ];
+ };
+}
diff --git a/pkgs/development/python-modules/django-raster/default.nix b/pkgs/development/python-modules/django-raster/default.nix
index 19ef783fe75..39634b8d293 100644
--- a/pkgs/development/python-modules/django-raster/default.nix
+++ b/pkgs/development/python-modules/django-raster/default.nix
@@ -1,11 +1,13 @@
-{ stdenv, buildPythonPackage, fetchPypi,
+{ stdenv, buildPythonPackage, fetchPypi, isPy3k,
numpy, django_colorful, pillow, psycopg2,
- pyparsing, django, celery
+ pyparsing, django_2_1, celery, boto3
}:
buildPythonPackage rec {
version = "0.6";
pname = "django-raster";
+ disabled = !isPy3k;
+
src = fetchPypi {
inherit pname version;
sha256 = "9a0f8e71ebeeeb5380c6ca68e027e9de335f43bc15e89dd22e7a470c4eb7aeb8";
@@ -15,7 +17,7 @@ buildPythonPackage rec {
doCheck = false;
propagatedBuildInputs = [ numpy django_colorful pillow psycopg2
- pyparsing django celery ];
+ pyparsing django_2_1 celery boto3 ];
meta = with stdenv.lib; {
description = "Basic raster data integration for Django";
diff --git a/pkgs/development/python-modules/eth-hash/default.nix b/pkgs/development/python-modules/eth-hash/default.nix
new file mode 100644
index 00000000000..ce5fce1b1cb
--- /dev/null
+++ b/pkgs/development/python-modules/eth-hash/default.nix
@@ -0,0 +1,45 @@
+{ lib, fetchPypi, buildPythonPackage, pythonOlder, pytest, pysha3, pycrypto,
+ pycryptodome }:
+
+buildPythonPackage rec {
+ pname = "eth-hash";
+ version = "0.2.0";
+
+ src = fetchPypi {
+ inherit pname version;
+ sha256 = "0xpiz0wrxxj11ki9yapvsibl25qnki90bl3d39nqascg14nw17a9";
+ };
+
+ checkInputs = [ pytest ];
+
+ propagatedBuildInputs = [ pysha3 pycrypto pycryptodome ];
+
+ # setuptools-markdown uses pypandoc which is broken at the moment
+ preConfigure = ''
+ substituteInPlace setup.py --replace \'setuptools-markdown\' ""
+ '';
+
+ # Run tests separately because we don't want to run tests on tests/backends/
+ # but only on its selected subdirectories. Also, the directories under
+ # tests/backends/ must be run separately because they have identically named
+ # test files so pytest would raise errors because of that.
+ #
+ # Also, tests in tests/core/test_import.py are broken so just ignore them:
+ # https://github.com/ethereum/eth-hash/issues/25
+ # There is a pull request to fix the tests:
+ # https://github.com/ethereum/eth-hash/pull/26
+ checkPhase = ''
+ pytest tests/backends/pycryptodome/
+ pytest tests/backends/pysha3/
+ # pytest tests/core/
+ '';
+
+ disabled = pythonOlder "3.5";
+
+ meta = {
+ description = "The Ethereum hashing function keccak256";
+ homepage = https://github.com/ethereum/eth-hash;
+ license = lib.licenses.mit;
+ maintainers = with lib.maintainers; [ jluttine ];
+ };
+}
diff --git a/pkgs/development/python-modules/eth-typing/default.nix b/pkgs/development/python-modules/eth-typing/default.nix
new file mode 100644
index 00000000000..070923c8385
--- /dev/null
+++ b/pkgs/development/python-modules/eth-typing/default.nix
@@ -0,0 +1,35 @@
+{ lib, fetchFromGitHub, buildPythonPackage, pythonOlder, pytest }:
+
+buildPythonPackage rec {
+ pname = "eth-typing";
+ version = "1.3.0";
+
+ # Tests are missing from the PyPI source tarball so let's use GitHub
+ # https://github.com/ethereum/eth-typing/issues/8
+ src = fetchFromGitHub {
+ owner = "ethereum";
+ repo = pname;
+ rev = "v${version}";
+ sha256 = "0703z7vlsfa3dvgcq22f9rzmj0svyp2a8wc7h73d0aac28ydhpv9";
+ };
+
+ # setuptools-markdown uses pypandoc which is broken at the moment
+ preConfigure = ''
+ substituteInPlace setup.py --replace \'setuptools-markdown\' ""
+ '';
+
+ disabled = pythonOlder "3.5";
+
+ checkInputs = [ pytest ];
+
+ checkPhase = ''
+ pytest .
+ '';
+
+ meta = {
+ description = "Common type annotations for Ethereum Python packages";
+ homepage = https://github.com/ethereum/eth-typing;
+ license = lib.licenses.mit;
+ maintainers = with lib.maintainers; [ jluttine ];
+ };
+}
diff --git a/pkgs/development/python-modules/eth-utils/default.nix b/pkgs/development/python-modules/eth-utils/default.nix
new file mode 100644
index 00000000000..cae3f34f0c9
--- /dev/null
+++ b/pkgs/development/python-modules/eth-utils/default.nix
@@ -0,0 +1,35 @@
+{ lib, fetchFromGitHub, buildPythonPackage, pytest, eth-hash, eth-typing,
+ cytoolz, hypothesis }:
+
+buildPythonPackage rec {
+ pname = "eth-utils";
+ version = "1.2.1";
+
+ # Tests are missing from the PyPI source tarball so let's use GitHub
+ # https://github.com/ethereum/eth-utils/issues/130
+ src = fetchFromGitHub {
+ owner = "ethereum";
+ repo = pname;
+ rev = "v${version}";
+ sha256 = "0g8f5vdjh7qd8kgsqqd9qkm6m79rx3w9yp0rf9vpdsv3xfzrkh1w";
+ };
+
+ checkInputs = [ pytest hypothesis ];
+ propagatedBuildInputs = [ eth-hash eth-typing cytoolz ];
+
+ # setuptools-markdown uses pypandoc which is broken at the moment
+ preConfigure = ''
+ substituteInPlace setup.py --replace \'setuptools-markdown\' ""
+ '';
+
+ checkPhase = ''
+ pytest .
+ '';
+
+ meta = {
+ description = "Common utility functions for codebases which interact with ethereum";
+ homepage = https://github.com/ethereum/eth-utils;
+ license = lib.licenses.mit;
+ maintainers = with lib.maintainers; [ jluttine ];
+ };
+}
diff --git a/pkgs/development/python-modules/eve/default.nix b/pkgs/development/python-modules/eve/default.nix
index b8daa5304c7..b145f1b2e2b 100644
--- a/pkgs/development/python-modules/eve/default.nix
+++ b/pkgs/development/python-modules/eve/default.nix
@@ -1,5 +1,5 @@
-{ stdenv, buildPythonPackage, fetchPypi, flask, jinja2, itsdangerous, events
-, markupsafe, pymongo, flask-pymongo, werkzeug, simplejson, cerberus }:
+{ stdenv, buildPythonPackage, fetchPypi, flask, events
+, pymongo, simplejson, cerberus }:
buildPythonPackage rec {
pname = "Eve";
@@ -13,14 +13,9 @@ buildPythonPackage rec {
propagatedBuildInputs = [
cerberus
events
- flask-pymongo
flask
- itsdangerous
- jinja2
- markupsafe
pymongo
simplejson
- werkzeug
];
# tests call a running mongodb instance
diff --git a/pkgs/development/python-modules/fiona/default.nix b/pkgs/development/python-modules/fiona/default.nix
index e6d347b440d..0e6ab256d0d 100644
--- a/pkgs/development/python-modules/fiona/default.nix
+++ b/pkgs/development/python-modules/fiona/default.nix
@@ -12,6 +12,8 @@ buildPythonPackage rec {
sha256 = "a156129f0904cb7eb24aa0745b6075da54f2c31db168ed3bcac8a4bd716d77b2";
};
+ CXXFLAGS = stdenv.lib.optionalString stdenv.cc.isClang "-std=c++11";
+
buildInputs = [
gdal
];
diff --git a/pkgs/development/python-modules/flask-ldap-login/default.nix b/pkgs/development/python-modules/flask-ldap-login/default.nix
index b95e694a232..99b57dac816 100644
--- a/pkgs/development/python-modules/flask-ldap-login/default.nix
+++ b/pkgs/development/python-modules/flask-ldap-login/default.nix
@@ -1,16 +1,27 @@
-{ stdenv, buildPythonPackage, fetchPypi
+{ stdenv, buildPythonPackage, isPy3k, fetchFromGitHub, fetchpatch
, flask, flask_wtf, flask_testing, ldap
, mock, nose }:
buildPythonPackage rec {
pname = "flask-ldap-login";
- version = "0.3.0";
+ version = "0.3.4";
+ disabled = isPy3k;
- src = fetchPypi {
- inherit pname version;
- sha256 = "085rik7q8xrp5g95346p6jcp9m2yr8kamwb2kbiw4q0b0fpnnlgq";
+ src = fetchFromGitHub {
+ owner = "ContinuumIO";
+ repo = "flask-ldap-login";
+ rev = version;
+ sha256 = "1l6zahqhwn5g9fmhlvjv80288b5h2fk5mssp7amdkw5ysk570wzp";
};
+ patches = [
+ # Fix flask_wtf>=0.9.0 incompatibility. See https://github.com/ContinuumIO/flask-ldap-login/issues/41
+ (fetchpatch {
+ url = https://github.com/ContinuumIO/flask-ldap-login/commit/ed08c03c818dc63b97b01e2e7c56862eaa6daa43.patch;
+ sha256 = "19pkhbldk8jq6m10kdylvjf1c8m84fvvj04v5qda4cjyks15aq48";
+ })
+ ];
+
checkInputs = [ nose mock flask_testing ];
propagatedBuildInputs = [ flask flask_wtf ldap ];
diff --git a/pkgs/development/python-modules/joblib/default.nix b/pkgs/development/python-modules/joblib/default.nix
index 7164fd1197b..d96752ba05f 100644
--- a/pkgs/development/python-modules/joblib/default.nix
+++ b/pkgs/development/python-modules/joblib/default.nix
@@ -1,29 +1,36 @@
{ lib
, buildPythonPackage
-, fetchPypi
+, fetchFromGitHub
, sphinx
, numpydoc
, pytest
+, python-lz4
}:
buildPythonPackage rec {
pname = "joblib";
- version = "0.12.3";
- src = fetchPypi {
- inherit pname version;
- sha256 = "333b9bf16ff015d6b56bf80b9831afdd243443cb84c7ff7b6e342f117e354c42";
+ version = "0.12.4";
+
+ # get full repository inorder to run tests
+ src = fetchFromGitHub {
+ owner = "joblib";
+ repo = pname;
+ rev = version;
+ sha256 = "06zszgp7wpa4jr554wkk6kkigp4k9n5ad5h08i6w9qih963rlimb";
};
checkInputs = [ sphinx numpydoc pytest ];
+ propagatedBuildInputs = [ python-lz4 ];
checkPhase = ''
- py.test -k 'not test_disk_used and not test_nested_parallel_warnings' joblib/test
+ py.test joblib
'';
meta = {
description = "Lightweight pipelining: using Python functions as pipeline jobs";
homepage = https://pythonhosted.org/joblib/;
license = lib.licenses.bsd3;
+ maintainers = with lib.maintainers; [ costrouc ];
};
}
diff --git a/pkgs/development/python-modules/ledgerblue/default.nix b/pkgs/development/python-modules/ledgerblue/default.nix
index 4f6c2a96c56..d324afcc647 100644
--- a/pkgs/development/python-modules/ledgerblue/default.nix
+++ b/pkgs/development/python-modules/ledgerblue/default.nix
@@ -1,5 +1,5 @@
{ stdenv, fetchPypi, buildPythonPackage, hidapi
-, pycrypto, pillow, protobuf, future, ecpy
+, pycrypto, pillow, protobuf, future, ecpy, python-u2flib-host, pycryptodomex
}:
buildPythonPackage rec {
@@ -11,7 +11,12 @@ buildPythonPackage rec {
sha256 = "3969b3c375c0f3fb60ff1645621ebf2f39fb697a53851620705f27ed7b283097";
};
- buildInputs = [ hidapi pycrypto pillow protobuf future ecpy ];
+ propagatedBuildInputs = [
+ hidapi pycrypto pillow protobuf future ecpy python-u2flib-host pycryptodomex
+ ];
+
+ # No tests
+ doCheck = false;
meta = with stdenv.lib; {
description = "Python library to communicate with Ledger Blue/Nano S";
diff --git a/pkgs/development/python-modules/libagent/default.nix b/pkgs/development/python-modules/libagent/default.nix
index 950a0dd5ba6..f70d538bb8d 100644
--- a/pkgs/development/python-modules/libagent/default.nix
+++ b/pkgs/development/python-modules/libagent/default.nix
@@ -1,6 +1,6 @@
-{ stdenv, fetchPypi, buildPythonPackage, ed25519, ecdsa
-, semver, keepkey, trezor, mnemonic, ledgerblue, unidecode, mock, pytest
-}:
+{ stdenv, fetchPypi, buildPythonPackage, ed25519, ecdsa , semver, mnemonic,
+ unidecode, mock, pytest , backports-shutil-which, ConfigArgParse,
+ pythondaemon, pymsgbox }:
buildPythonPackage rec {
pname = "libagent";
@@ -11,12 +11,8 @@ buildPythonPackage rec {
sha256 = "55af1ad2a6c95aef1fc5588c2002c9e54edbb14e248776b64d00628235ceda3e";
};
- buildInputs = [
- ed25519 ecdsa semver keepkey
- trezor mnemonic ledgerblue
- ];
-
- propagatedBuildInputs = [ unidecode ];
+ propagatedBuildInputs = [ unidecode backports-shutil-which ConfigArgParse
+ pythondaemon pymsgbox ecdsa ed25519 mnemonic semver ];
checkInputs = [ mock pytest ];
diff --git a/pkgs/development/python-modules/libusb1/default.nix b/pkgs/development/python-modules/libusb1/default.nix
index 245ea90038e..8a9b5da68ef 100644
--- a/pkgs/development/python-modules/libusb1/default.nix
+++ b/pkgs/development/python-modules/libusb1/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, lib, buildPythonPackage, fetchPypi, python, libusb1 }:
+{ stdenv, lib, buildPythonPackage, fetchPypi, python, libusb1, pytest }:
buildPythonPackage rec {
pname = "libusb1";
@@ -9,7 +9,7 @@ buildPythonPackage rec {
sha256 = "a49917a2262cf7134396f6720c8be011f14aabfc5cdc53f880cc672c0f39d271";
};
- postPatch = lib.optionalString stdenv.isLinux ''
+ postPatch = ''
substituteInPlace usb1/libusb1.py --replace \
"ctypes.util.find_library(base_name)" \
"'${libusb1}/lib/libusb-1.0${stdenv.hostPlatform.extensions.sharedLibrary}'"
@@ -17,8 +17,12 @@ buildPythonPackage rec {
buildInputs = [ libusb1 ];
+ checkInputs = [ pytest ];
+
checkPhase = ''
- ${python.interpreter} -m usb1.testUSB1
+ # USBPollerThread is unreliable. Let's not test it.
+ # See: https://github.com/vpelletier/python-libusb1/issues/16
+ py.test -k 'not testUSBPollerThreadExit' usb1/testUSB1.py
'';
meta = with stdenv.lib; {
diff --git a/pkgs/development/python-modules/mahotas/default.nix b/pkgs/development/python-modules/mahotas/default.nix
new file mode 100644
index 00000000000..a7e92e0b5b8
--- /dev/null
+++ b/pkgs/development/python-modules/mahotas/default.nix
@@ -0,0 +1,33 @@
+{ buildPythonPackage, fetchFromGitHub, nose, pillow, scipy, numpy, imread, stdenv }:
+
+buildPythonPackage rec {
+ pname = "mahotas";
+ version = "1.4.2";
+
+ src = fetchFromGitHub {
+ owner = "luispedro";
+ repo = "mahotas";
+ rev = "v${version}";
+ sha256 = "1d2hciag5sxw00qj7qz7lbna477ifzmpgl0cv3xqzjkhkn5m4d7r";
+ };
+
+ # remove this as soon as https://github.com/luispedro/mahotas/issues/97 is fixed
+ patches = [ ./disable-impure-tests.patch ];
+
+ propagatedBuildInputs = [ numpy imread pillow scipy ];
+ checkInputs = [ nose ];
+
+ checkPhase= ''
+ python setup.py test
+ '';
+
+ disabled = stdenv.isi686; # Failing tests
+
+ meta = with stdenv.lib; {
+ description = "Computer vision package based on numpy";
+ homepage = http://mahotas.readthedocs.io/;
+ maintainers = with maintainers; [ luispedro ];
+ license = licenses.mit;
+ platforms = platforms.linux;
+ };
+}
diff --git a/pkgs/development/python-modules/mahotas/disable-impure-tests.patch b/pkgs/development/python-modules/mahotas/disable-impure-tests.patch
new file mode 100644
index 00000000000..a61503f9522
--- /dev/null
+++ b/pkgs/development/python-modules/mahotas/disable-impure-tests.patch
@@ -0,0 +1,34 @@
+diff --git a/mahotas/tests/test_colors.py b/mahotas/tests/test_colors.py
+index 8a8183b..0d34c9f 100644
+--- a/mahotas/tests/test_colors.py
++++ b/mahotas/tests/test_colors.py
+@@ -2,7 +2,9 @@ import mahotas
+ import numpy as np
+ from mahotas.tests.utils import luispedro_jpg
+ from mahotas.colors import rgb2xyz, rgb2lab, xyz2rgb, rgb2grey, rgb2sepia
++from nose.tools import nottest
+
++@nottest
+ def test_colors():
+ f = luispedro_jpg()
+ lab = rgb2lab(f)
+diff --git a/mahotas/tests/test_features_shape.py b/mahotas/tests/test_features_shape.py
+index 462f467..2381793 100644
+--- a/mahotas/tests/test_features_shape.py
++++ b/mahotas/tests/test_features_shape.py
+@@ -2,6 +2,7 @@ import mahotas.features.shape
+ import numpy as np
+ import mahotas as mh
+ from mahotas.features.shape import roundness, eccentricity
++from nose.tools import nottest
+
+ def test_eccentricity():
+ D = mh.disk(32, 2)
+@@ -29,6 +30,7 @@ def test_zeros():
+ I[8:4:12] = 1
+ assert eccentricity(I) == 0
+
++@nottest
+ def test_ellipse_axes():
+ Y,X = np.mgrid[:1024,:1024]
+ Y = Y/1024.
diff --git a/pkgs/development/python-modules/markerlib/default.nix b/pkgs/development/python-modules/markerlib/default.nix
new file mode 100644
index 00000000000..640b11a6f28
--- /dev/null
+++ b/pkgs/development/python-modules/markerlib/default.nix
@@ -0,0 +1,30 @@
+{ stdenv
+, buildPythonPackage
+, fetchPypi
+, setuptools
+, nose
+}:
+
+buildPythonPackage rec {
+ version = "0.6.0";
+ pname = "markerlib";
+
+ src = fetchPypi {
+ inherit pname version;
+ sha256 = "2fdb3939441f5bf4f090b1979a34f84a11d33eed6c0e3995de88ae5c06b6e3ae";
+ };
+
+ buildInputs = [ setuptools ];
+ checkInputs = [ nose ];
+
+ checkPhase = ''
+ nosetests
+ '';
+
+ meta = with stdenv.lib; {
+ homepage = https://bitbucket.org/dholth/markerlib/;
+ description = "A compiler for PEP 345 environment markers";
+ license = licenses.mit;
+ maintainers = [ maintainers.costrouc ];
+ };
+}
diff --git a/pkgs/development/python-modules/nilearn/default.nix b/pkgs/development/python-modules/nilearn/default.nix
index 93871d9a9a7..bf8ae217705 100644
--- a/pkgs/development/python-modules/nilearn/default.nix
+++ b/pkgs/development/python-modules/nilearn/default.nix
@@ -11,9 +11,13 @@ buildPythonPackage rec {
sha256 = "5049363eb6da2e7c35589477dfc79bf69929ca66de2d7ed2e9dc07acf78636f4";
};
- checkPhase = "nosetests --exclude with_expand_user nilearn/tests";
+ # disable some failing tests
+ checkPhase = ''
+ nosetests nilearn/tests \
+ -e test_cache_mixin_with_expand_user -e test_clean_confounds -e test_detrend
+ '';
- buildInputs = [ nose ];
+ checkInputs = [ nose ];
propagatedBuildInputs = [
matplotlib
diff --git a/pkgs/development/python-modules/persistent/default.nix b/pkgs/development/python-modules/persistent/default.nix
index 542a68728af..721385f3ed6 100644
--- a/pkgs/development/python-modules/persistent/default.nix
+++ b/pkgs/development/python-modules/persistent/default.nix
@@ -1,12 +1,14 @@
{ buildPythonPackage
, fetchPypi
, zope_interface
+, sphinx, manuel
}:
buildPythonPackage rec {
pname = "persistent";
version = "4.4.2";
+ nativeBuildInputs = [ sphinx manuel ];
propagatedBuildInputs = [ zope_interface ];
src = fetchPypi {
diff --git a/pkgs/development/python-modules/pycaption/default.nix b/pkgs/development/python-modules/pycaption/default.nix
index d4ed6088409..468011e2a80 100644
--- a/pkgs/development/python-modules/pycaption/default.nix
+++ b/pkgs/development/python-modules/pycaption/default.nix
@@ -17,7 +17,7 @@ buildPythonPackage rec {
prePatch = ''
substituteInPlace setup.py \
--replace 'beautifulsoup4>=4.2.1,<4.5.0' \
- 'beautifulsoup4>=4.2.1,<=4.6.0'
+ 'beautifulsoup4>=4.2.1,<=4.6.3'
'';
# don't require enum34 on python >= 3.4
diff --git a/pkgs/development/python-modules/pydub/default.nix b/pkgs/development/python-modules/pydub/default.nix
index 28a76da4bd9..0770c78b674 100644
--- a/pkgs/development/python-modules/pydub/default.nix
+++ b/pkgs/development/python-modules/pydub/default.nix
@@ -1,19 +1,29 @@
-{ stdenv, buildPythonPackage, fetchPypi, scipy, ffmpeg-full }:
+{ stdenv, buildPythonPackage, fetchFromGitHub, scipy, ffmpeg-full }:
buildPythonPackage rec {
pname = "pydub";
version = "0.22.1";
- src = fetchPypi {
- inherit pname version;
- sha256 = "20beff39e9959a3b2cb4392802aecb9b2417837fff635d2b00b5ef5f5326d313";
+ # pypi version doesn't include required data files for tests
+ src = fetchFromGitHub {
+ owner = "jiaaro";
+ repo = pname;
+ rev = "v${version}";
+ sha256 = "0xqyvzgdfy01p98wnvsrf6iwdfq91ad377r6j12r8svm13ygx5bv";
};
- patches = [
- ./pyaudioop-python3.patch
- ];
+
+ # disable a test that fails on aarch64 due to rounding errors
+ postPatch = stdenv.lib.optionalString stdenv.isAarch64 ''
+ substituteInPlace test/test.py \
+ --replace "test_overlay_with_gain_change" "notest_overlay_with_gain_change"
+ '';
checkInputs = [ scipy ffmpeg-full ];
+ checkPhase = ''
+ python test/test.py
+ '';
+
meta = with stdenv.lib; {
description = "Manipulate audio with a simple and easy high level interface.";
homepage = "http://pydub.com/";
diff --git a/pkgs/development/python-modules/pydub/pyaudioop-python3.patch b/pkgs/development/python-modules/pydub/pyaudioop-python3.patch
deleted file mode 100644
index 58c56db5b8a..00000000000
--- a/pkgs/development/python-modules/pydub/pyaudioop-python3.patch
+++ /dev/null
@@ -1,46 +0,0 @@
-diff --git i/pydub/pyaudioop.py w/pydub/pyaudioop.py
-index 8f8f017..aa6bb8c 100644
---- i/pydub/pyaudioop.py
-+++ w/pydub/pyaudioop.py
-@@ -1,4 +1,4 @@
--import __builtin__
-+import builtins
- import math
- import struct
- from fractions import gcd
-@@ -79,7 +79,7 @@ def _get_minval(size, signed=True):
- def _get_clipfn(size, signed=True):
- maxval = _get_maxval(size, signed)
- minval = _get_minval(size, signed)
-- return lambda val: __builtin__.max(min(val, maxval), minval)
-+ return lambda val: builtins.max(min(val, maxval), minval)
-
-
- def _overflow(val, size, signed=True):
-@@ -109,7 +109,7 @@ def max(cp, size):
- if len(cp) == 0:
- return 0
-
-- return __builtin__.max(abs(sample) for sample in _get_samples(cp, size))
-+ return builtins.max(abs(sample) for sample in _get_samples(cp, size))
-
-
- def minmax(cp, size):
-@@ -117,8 +117,8 @@ def minmax(cp, size):
-
- max_sample, min_sample = 0, 0
- for sample in _get_samples(cp, size):
-- max_sample = __builtin__.max(sample, max_sample)
-- min_sample = __builtin__.min(sample, min_sample)
-+ max_sample = builtins.max(sample, max_sample)
-+ min_sample = builtins.min(sample, min_sample)
-
- return min_sample, max_sample
-
-@@ -542,4 +542,4 @@ def lin2adpcm(cp, size, state):
-
-
- def adpcm2lin(cp, size, state):
-- raise NotImplementedError()
-\ No newline at end of file
-+ raise NotImplementedError()
diff --git a/pkgs/development/python-modules/pyfakefs/default.nix b/pkgs/development/python-modules/pyfakefs/default.nix
index cfb575c7675..64d547ce97e 100644
--- a/pkgs/development/python-modules/pyfakefs/default.nix
+++ b/pkgs/development/python-modules/pyfakefs/default.nix
@@ -1,7 +1,7 @@
{ stdenv, buildPythonPackage, fetchFromGitHub, python, pytest, glibcLocales }:
buildPythonPackage rec {
- version = "3.4.1";
+ version = "3.4.3";
pname = "pyfakefs";
# no tests in PyPI tarball
@@ -10,22 +10,30 @@ buildPythonPackage rec {
owner = "jmcgeheeiv";
repo = pname;
rev = "v${version}";
- sha256 = "0i8kq7sl8bczr927hllgfhsmirjqjh89c9184kcqmprc13ac4kxy";
+ sha256 = "0rhbkcb5h2x8kmyxivr5jr1db2xvmpjdbsfjxl142qhfb29hr2hp";
};
postPatch = ''
# test doesn't work in sandbox
- substituteInPlace tests/fake_filesystem_test.py \
+ substituteInPlace pyfakefs/tests/fake_filesystem_test.py \
--replace "test_expand_root" "notest_expand_root"
- substituteInPlace tests/fake_os_test.py \
- --replace "test_append_mode" "notest_append_mode"
- '';
+ substituteInPlace pyfakefs/tests/fake_os_test.py \
+ --replace "test_path_links_not_resolved" "notest_path_links_not_resolved" \
+ --replace "test_append_mode_tell_linux_windows" "notest_append_mode_tell_linux_windows"
+ substituteInPlace pyfakefs/tests/fake_filesystem_unittest_test.py \
+ --replace "test_copy_real_file" "notest_copy_real_file"
+ '' + (stdenv.lib.optionalString stdenv.isDarwin ''
+ # this test fails on darwin due to case-insensitive file system
+ substituteInPlace pyfakefs/tests/fake_os_test.py \
+ --replace "test_rename_dir_to_existing_dir" "notest_rename_dir_to_existing_dir"
+ '');
checkInputs = [ pytest glibcLocales ];
checkPhase = ''
- LC_ALL=en_US.UTF-8 ${python.interpreter} -m tests.all_tests
- py.test tests/pytest_plugin_test.py
+ export LC_ALL=en_US.UTF-8
+ ${python.interpreter} -m pyfakefs.tests.all_tests
+ ${python.interpreter} -m pytest pyfakefs/tests/pytest_plugin_test.py
'';
meta = with stdenv.lib; {
diff --git a/pkgs/development/python-modules/pykeepass/default.nix b/pkgs/development/python-modules/pykeepass/default.nix
new file mode 100644
index 00000000000..68c35ed0df1
--- /dev/null
+++ b/pkgs/development/python-modules/pykeepass/default.nix
@@ -0,0 +1,26 @@
+{ lib, fetchPypi, buildPythonPackage
+, lxml, pycryptodome, construct
+, argon2_cffi, dateutil, enum34
+}:
+
+buildPythonPackage rec {
+ pname = "pykeepass";
+ version = "3.0.2";
+
+ src = fetchPypi {
+ inherit pname version;
+ sha256 = "1kfnh42nimsbdpwpny2c9df82b2n4fb5fagh54ck06f3x483vd90";
+ };
+
+ propagatedBuildInputs = [
+ lxml pycryptodome construct
+ argon2_cffi dateutil enum34
+ ];
+
+ meta = {
+ homepage = https://github.com/pschmitt/pykeepass;
+ description = "Python library to interact with keepass databases (supports KDBX3 and KDBX4)";
+ license = lib.licenses.gpl3;
+ };
+
+}
diff --git a/pkgs/development/python-modules/pymsgbox/default.nix b/pkgs/development/python-modules/pymsgbox/default.nix
new file mode 100644
index 00000000000..38cc411f54d
--- /dev/null
+++ b/pkgs/development/python-modules/pymsgbox/default.nix
@@ -0,0 +1,24 @@
+{ stdenv, fetchPypi, buildPythonPackage, tkinter }:
+
+buildPythonPackage rec {
+ pname = "PyMsgBox";
+ version = "1.0.6";
+
+ src = fetchPypi {
+ inherit pname version;
+ sha256 = "0kmd00w7p6maiyqpqqb2j8m6v2gh9c0h5i198pa02bc1c1m1321q";
+ extension = "zip";
+ };
+
+ propagatedBuildInputs = [ tkinter ];
+
+ # Finding tests fails
+ doCheck = false;
+
+ meta = with stdenv.lib; {
+ description = "A simple, cross-platform, pure Python module for JavaScript-like message boxes";
+ homepage = https://github.com/asweigart/PyMsgBox;
+ license = licenses.bsd3;
+ maintainers = with maintainers; [ jluttine ];
+ };
+}
diff --git a/pkgs/development/python-modules/pyowm/default.nix b/pkgs/development/python-modules/pyowm/default.nix
index 58a8dee155a..c853965469a 100644
--- a/pkgs/development/python-modules/pyowm/default.nix
+++ b/pkgs/development/python-modules/pyowm/default.nix
@@ -1,4 +1,4 @@
-{ lib, buildPythonPackage, fetchPypi, requests }:
+{ lib, buildPythonPackage, fetchPypi, requests, geojson }:
buildPythonPackage rec {
pname = "pyowm";
@@ -9,11 +9,13 @@ buildPythonPackage rec {
sha256 = "ed175873823a2fedb48e453505c974ca39f3f75006ef1af54fdbcf72e6796849";
};
- propagatedBuildInputs = [ requests ];
+ propagatedBuildInputs = [ requests geojson ];
# This may actually break the package.
postPatch = ''
- substituteInPlace setup.py --replace "requests>=2.18.2,<2.19" "requests"
+ substituteInPlace setup.py \
+ --replace "requests>=2.18.2,<2.19" "requests" \
+ --replace "geojson>=2.3.0,<2.4" "geojson<2.5,>=2.3.0"
'';
# No tests in archive
diff --git a/pkgs/development/python-modules/pyreadability/default.nix b/pkgs/development/python-modules/pyreadability/default.nix
new file mode 100644
index 00000000000..a95074b906e
--- /dev/null
+++ b/pkgs/development/python-modules/pyreadability/default.nix
@@ -0,0 +1,26 @@
+{ lib, fetchPypi, buildPythonPackage
+, requests, chardet, cssselect, lxml
+, pytest
+}:
+
+buildPythonPackage rec {
+ pname = "PyReadability";
+ version = "0.4.0";
+
+ src = fetchPypi {
+ inherit pname version;
+ sha256 = "1k6fq416pdmjcdqh6gdxl0y0k8kj1zlpzwp5574xsvsha18p2zpn";
+ };
+
+ propagatedBuildInputs = [ requests chardet cssselect lxml ];
+
+ # ModuleNotFoundError: No module named 'tests'
+ doCheck = false;
+
+ meta = {
+ homepage = https://github.com/hyperlinkapp/python-readability;
+ description = "fast python port of arc90's readability tool, updated to match latest readability.js!";
+ license = lib.licenses.asl20;
+ };
+
+}
diff --git a/pkgs/development/python-modules/pyslurm/default.nix b/pkgs/development/python-modules/pyslurm/default.nix
index 24704bd8f30..f004ab1054d 100644
--- a/pkgs/development/python-modules/pyslurm/default.nix
+++ b/pkgs/development/python-modules/pyslurm/default.nix
@@ -2,13 +2,13 @@
buildPythonPackage rec {
pname = "pyslurm";
- version = "20180811";
+ version = "20180908";
src = fetchFromGitHub {
repo = "pyslurm";
owner = "PySlurm";
- rev = "2d4f0553de971309b7e465d4d64528b8a5fafb05";
- sha256 = "1cy57gyvvmzx0c8fx4h6p8dgan0ay6pdivdf24k1xiancjnw20xr";
+ rev = "50dc113e99d82e70e84fc2e812333733708be4ed";
+ sha256 = "1j2i4rvhmk2ihhcvsjdlqlxqb5a05jg8k9bqkv3zrvdj71yn4z9k";
};
buildInputs = [ cython slurm ];
diff --git a/pkgs/development/python-modules/pytest-faulthandler/default.nix b/pkgs/development/python-modules/pytest-faulthandler/default.nix
new file mode 100644
index 00000000000..852de1fd49c
--- /dev/null
+++ b/pkgs/development/python-modules/pytest-faulthandler/default.nix
@@ -0,0 +1,34 @@
+{ lib
+, buildPythonPackage
+, fetchPypi
+, setuptools_scm
+, pytest
+, pytest-mock
+, pythonOlder
+, faulthandler
+}:
+
+buildPythonPackage rec {
+ pname = "pytest-faulthandler";
+ version = "1.5.0";
+
+ src = fetchPypi {
+ inherit pname version;
+ sha256 = "bf8634c3fd6309ef786ec03b913a5366163fdb094ebcfdebc35626400d790e0d";
+ };
+
+ buildInputs = [ setuptools_scm pytest ];
+ checkInputs = [ pytest-mock ];
+ propagatedBuildInputs = lib.optional (pythonOlder "3.0") faulthandler;
+
+ checkPhase = ''
+ py.test
+ '';
+
+ meta = {
+ description = "Py.test plugin that activates the fault handler module for tests";
+ homepage = https://github.com/pytest-dev/pytest-faulthandler;
+ license = lib.licenses.mit;
+ maintainers = with lib.maintainers; [ costrouc ];
+ };
+}
diff --git a/pkgs/development/python-modules/pytest-flakes/default.nix b/pkgs/development/python-modules/pytest-flakes/default.nix
index f8823b966da..52cfed14150 100644
--- a/pkgs/development/python-modules/pytest-flakes/default.nix
+++ b/pkgs/development/python-modules/pytest-flakes/default.nix
@@ -1,5 +1,5 @@
{ stdenv, buildPythonPackage, fetchPypi
-, pytestpep8, pytest, pyflakes, pytestcache }:
+, pytestpep8, pytest, pyflakes }:
buildPythonPackage rec {
pname = "pytest-flakes";
@@ -11,10 +11,11 @@ buildPythonPackage rec {
};
buildInputs = [ pytestpep8 pytest ];
- propagatedBuildInputs = [ pyflakes pytestcache ];
+ propagatedBuildInputs = [ pyflakes ];
+ # disable one test case that looks broken
checkPhase = ''
- py.test test_flakes.py
+ py.test test_flakes.py -k 'not test_syntax_error'
'';
meta = with stdenv.lib; {
diff --git a/pkgs/development/python-modules/pytest-repeat/default.nix b/pkgs/development/python-modules/pytest-repeat/default.nix
new file mode 100644
index 00000000000..eca14c8289a
--- /dev/null
+++ b/pkgs/development/python-modules/pytest-repeat/default.nix
@@ -0,0 +1,29 @@
+{ lib
+, buildPythonPackage
+, fetchPypi
+, setuptools_scm
+, pytest
+}:
+
+buildPythonPackage rec {
+ pname = "pytest-repeat";
+ version = "0.6.0";
+
+ src = fetchPypi {
+ inherit pname version;
+ sha256 = "84aba2fcca5dc2f32ae626a01708f469f17b3384ec3d1f507698077f274909d6";
+ };
+
+ buildInputs = [ setuptools_scm pytest ];
+
+ checkPhase = ''
+ py.test
+ '';
+
+ meta = {
+ description = "Pytest plugin for repeating tests";
+ homepage = https://github.com/pytest-dev/pytest-repeat;
+ maintainers = with lib.maintainers; [ costrouc ];
+ license = lib.licenses.mpl20;
+ };
+}
diff --git a/pkgs/development/python-modules/pytest-rerunfailures/default.nix b/pkgs/development/python-modules/pytest-rerunfailures/default.nix
index 5931afa37e2..d71cc420d59 100644
--- a/pkgs/development/python-modules/pytest-rerunfailures/default.nix
+++ b/pkgs/development/python-modules/pytest-rerunfailures/default.nix
@@ -9,10 +9,13 @@ buildPythonPackage rec {
sha256 = "be6bf93ed618c8899aeb6721c24f8009c769879a3b4931e05650f3c173ec17c5";
};
- checkInputs = [ pytest mock ];
+ checkInputs = [ mock ];
+ propagatedBuildInputs = [ pytest ];
+
+ # disable tests that fail with pytest 3.7.4
checkPhase = ''
- py.test
+ py.test test_pytest_rerunfailures.py -k 'not test_reruns_with_delay'
'';
meta = with stdenv.lib; {
diff --git a/pkgs/development/python-modules/pytest-timeout/default.nix b/pkgs/development/python-modules/pytest-timeout/default.nix
index 8c697b8b2ec..6b9522460ba 100644
--- a/pkgs/development/python-modules/pytest-timeout/default.nix
+++ b/pkgs/development/python-modules/pytest-timeout/default.nix
@@ -1,5 +1,6 @@
{ buildPythonPackage
, fetchPypi
+, fetchpatch
, lib
, pexpect
, pytest
@@ -13,7 +14,7 @@ buildPythonPackage rec {
inherit pname version;
sha256 = "1117fc0536e1638862917efbdc0895e6b62fa61e6cf4f39bb655686af7af9627";
};
- buildInputs = [ pytest ];
+
checkInputs = [ pytest pexpect ];
checkPhase = ''pytest -ra'';
@@ -21,6 +22,6 @@ buildPythonPackage rec {
description = "py.test plugin to abort hanging tests";
homepage = https://bitbucket.org/pytest-dev/pytest-timeout/;
license = licenses.mit;
- maintainers = with maintainers; [ makefu ];
+ maintainers = with maintainers; [ makefu costrouc ];
};
}
diff --git a/pkgs/development/python-modules/python-jsonrpc-server/default.nix b/pkgs/development/python-modules/python-jsonrpc-server/default.nix
new file mode 100644
index 00000000000..508f18e6da0
--- /dev/null
+++ b/pkgs/development/python-modules/python-jsonrpc-server/default.nix
@@ -0,0 +1,34 @@
+{ stdenv, buildPythonPackage, fetchFromGitHub, pythonOlder
+, pytest, mock, pytestcov, coverage
+, future, futures
+}:
+
+buildPythonPackage rec {
+ pname = "python-jsonrpc-server";
+ version = "0.0.1";
+
+ src = fetchFromGitHub {
+ owner = "palantir";
+ repo = "python-jsonrpc-server";
+ rev = version;
+ sha256 = "0p5dj1hxx3yz8vjk59dcp3h6ci1hrjkbzf9lr3vviy0xw327409k";
+ };
+
+ checkInputs = [
+ pytest mock pytestcov coverage
+ ];
+
+ checkPhase = ''
+ pytest
+ '';
+
+ propagatedBuildInputs = [ future ]
+ ++ stdenv.lib.optional (pythonOlder "3.2") futures;
+
+ meta = with stdenv.lib; {
+ homepage = https://github.com/palantir/python-jsonrpc-server;
+ description = "A Python 2 and 3 asynchronous JSON RPC server";
+ license = licenses.mit;
+ maintainers = [ maintainers.mic92 ];
+ };
+}
diff --git a/pkgs/development/python-modules/python-language-server/default.nix b/pkgs/development/python-modules/python-language-server/default.nix
index 800c9eba2ab..56c00fa11a9 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
+, configparser, futures, future, jedi, pluggy, python-jsonrpc-server
, pytest, mock, pytestcov, coverage
, # Allow building a limited set of providers, e.g. ["pycodestyle"].
providers ? ["*"]
@@ -20,13 +20,13 @@ in
buildPythonPackage rec {
pname = "python-language-server";
- version = "0.19.0";
+ version = "0.21.2";
src = fetchFromGitHub {
owner = "palantir";
repo = "python-language-server";
rev = version;
- sha256 = "0glnhnjmsnnh1vs73n9dglknfkhcgp03nkjbpz0phh1jlqrkrwm6";
+ sha256 = "11fvrpv1kymj2fzh8fhys4qk1xc64j1rbdrz252awyab7b3509i7";
};
# The tests require all the providers, disable otherwise.
@@ -43,7 +43,7 @@ buildPythonPackage rec {
HOME=$TEMPDIR pytest
'';
- propagatedBuildInputs = [ jedi pluggy future ]
+ propagatedBuildInputs = [ jedi pluggy future python-jsonrpc-server ]
++ stdenv.lib.optional (withProvider "autopep8") autopep8
++ stdenv.lib.optional (withProvider "mccabe") mccabe
++ stdenv.lib.optional (withProvider "pycodestyle") pycodestyle
diff --git a/pkgs/development/python-modules/python-lz4/default.nix b/pkgs/development/python-modules/python-lz4/default.nix
new file mode 100644
index 00000000000..a0fe6666d84
--- /dev/null
+++ b/pkgs/development/python-modules/python-lz4/default.nix
@@ -0,0 +1,40 @@
+{ lib
+, buildPythonPackage
+, fetchFromGitHub
+, pytestrunner
+, pytest
+, psutil
+, setuptools_scm
+, pkgconfig
+, isPy3k
+, future
+}:
+
+buildPythonPackage rec {
+ pname = "python-lz4";
+ version = "2.1.0";
+
+ # get full repository inorder to run tests
+ src = fetchFromGitHub {
+ owner = pname;
+ repo = pname;
+ rev = "v${version}";
+ sha256 = "1vjfplj37jcw1mf8l810dv76dx0raia3ylgyfy7sfsb3g17brjq6";
+ };
+
+ buildInputs = [ setuptools_scm pkgconfig pytestrunner ];
+ checkInputs = [ pytest psutil ];
+ propagatedBuildInputs = lib.optionals (!isPy3k) [ future ];
+
+ # give a hint to setuptools_scm on package version
+ preBuild = ''
+ export SETUPTOOLS_SCM_PRETEND_VERSION="v${version}"
+ '';
+
+ meta = {
+ description = "LZ4 Bindings for Python";
+ homepage = https://github.com/python-lz4/python-lz4;
+ license = lib.licenses.bsd0;
+ maintainers = with lib.maintainers; [ costrouc ];
+ };
+}
diff --git a/pkgs/development/python-modules/python-u2flib-host/default.nix b/pkgs/development/python-modules/python-u2flib-host/default.nix
new file mode 100644
index 00000000000..38785d81313
--- /dev/null
+++ b/pkgs/development/python-modules/python-u2flib-host/default.nix
@@ -0,0 +1,23 @@
+{ stdenv, fetchPypi, buildPythonPackage, requests, hidapi }:
+
+buildPythonPackage rec {
+ pname = "python-u2flib-host";
+ version = "3.0.3";
+
+ src = fetchPypi {
+ inherit pname version;
+ sha256 = "02pwafd5kyjpc310ys0pgnd0adff1laz18naxxwsfrllqafqnrxb";
+ };
+
+ propagatedBuildInputs = [ requests hidapi ];
+
+ # Tests fail: "ValueError: underlying buffer has been detached"
+ doCheck = false;
+
+ meta = with stdenv.lib; {
+ description = "Python based U2F host library";
+ homepage = https://github.com/Yubico/python-u2flib-host;
+ license = licenses.bsd2;
+ maintainers = with maintainers; [ jluttine ];
+ };
+}
diff --git a/pkgs/development/python-modules/readme_renderer/default.nix b/pkgs/development/python-modules/readme_renderer/default.nix
index 4690dcc89bc..d6c333ce36d 100644
--- a/pkgs/development/python-modules/readme_renderer/default.nix
+++ b/pkgs/development/python-modules/readme_renderer/default.nix
@@ -27,7 +27,8 @@ buildPythonPackage rec {
];
checkPhase = ''
- py.test
+ # disable one failing test case
+ py.test -k "not test_invalid_link"
'';
meta = {
diff --git a/pkgs/development/python-modules/requests-file/default.nix b/pkgs/development/python-modules/requests-file/default.nix
new file mode 100644
index 00000000000..fac22217651
--- /dev/null
+++ b/pkgs/development/python-modules/requests-file/default.nix
@@ -0,0 +1,20 @@
+{ lib, fetchPypi, buildPythonPackage, requests, six }:
+
+buildPythonPackage rec {
+ pname = "requests-file";
+ version = "1.4.3";
+
+ src = fetchPypi {
+ inherit pname version;
+ sha256 = "1yp2jaxg3v86pia0q512dg3hz6s9y5vzdivsgrba1kds05ial14g";
+ };
+
+ propagatedBuildInputs = [ requests six ];
+
+ meta = {
+ homepage = https://github.com/dashea/requests-file;
+ description = "Transport adapter for fetching file:// URLs with the requests python library";
+ license = lib.licenses.asl20;
+ };
+
+}
diff --git a/pkgs/development/python-modules/restview/default.nix b/pkgs/development/python-modules/restview/default.nix
index e8a8b9dd637..a6b22220da3 100644
--- a/pkgs/development/python-modules/restview/default.nix
+++ b/pkgs/development/python-modules/restview/default.nix
@@ -1,6 +1,7 @@
{ lib
, buildPythonPackage
, fetchPypi
+, fetchpatch
, docutils
, readme_renderer
, pygments
@@ -19,6 +20,15 @@ buildPythonPackage rec {
propagatedBuildInputs = [ docutils readme_renderer pygments ];
checkInputs = [ mock ];
+ patches = [
+ # fix tests after readme_renderer update
+ # TODO remove on next update
+ (fetchpatch {
+ url = "https://github.com/mgedmin/restview/commit/541743ded13ae55dea4c437046984a5f13d06e8b.patch";
+ sha256 = "031b1dlqx346bz7afpc011lslnq771lnxb6iy1l2285pph534bci";
+ })
+ ];
+
postPatch = ''
# dict order breaking tests
sed -i 's@@...@' src/restview/tests.py
diff --git a/pkgs/development/python-modules/rlp/default.nix b/pkgs/development/python-modules/rlp/default.nix
index 77ada95b301..150234a3dd2 100644
--- a/pkgs/development/python-modules/rlp/default.nix
+++ b/pkgs/development/python-modules/rlp/default.nix
@@ -1,4 +1,4 @@
-{ lib, fetchPypi, buildPythonPackage, pytest }:
+{ lib, fetchPypi, buildPythonPackage, pytest, hypothesis, eth-utils }:
buildPythonPackage rec {
pname = "rlp";
@@ -9,8 +9,18 @@ buildPythonPackage rec {
sha256 = "040fb5172fa23d27953a886c40cac989fc031d0629db934b5a9edcd2fb28df1e";
};
- checkInputs = [ pytest ];
- propagatedBuildInputs = [ ];
+ checkInputs = [ pytest hypothesis ];
+ propagatedBuildInputs = [ eth-utils ];
+
+ # setuptools-markdown uses pypandoc which is broken at the moment
+ preConfigure = ''
+ substituteInPlace setup.py --replace \'setuptools-markdown\' ""
+ substituteInPlace setup.py --replace "long_description_markdown_filename='README.md'," ""
+ '';
+
+ checkPhase = ''
+ pytest .
+ '';
meta = {
description = "A package for encoding and decoding data in and from Recursive Length Prefix notation";
diff --git a/pkgs/development/python-modules/sniffio/default.nix b/pkgs/development/python-modules/sniffio/default.nix
new file mode 100644
index 00000000000..9893bc5828a
--- /dev/null
+++ b/pkgs/development/python-modules/sniffio/default.nix
@@ -0,0 +1,30 @@
+{ buildPythonPackage, lib, fetchPypi, glibcLocales, isPy3k, contextvars
+, pythonOlder
+}:
+
+buildPythonPackage rec {
+ pname = "sniffio";
+ version = "1.0.0";
+
+ src = fetchPypi {
+ inherit pname version;
+ sha256 = "1dzb0nx3m1hpjgsv6s6w5ac2jcmywcz6gqnfkw8rwz1vkr1836rf";
+ };
+
+ # breaks with the following error:
+ # > TypeError: 'encoding' is an invalid keyword argument for this function
+ disabled = !isPy3k;
+
+ buildInputs = [ glibcLocales ];
+
+ propagatedBuildInputs = lib.optionals (pythonOlder "3.7") [ contextvars ];
+
+ # no tests distributed with PyPI
+ doCheck = false;
+
+ meta = with lib; {
+ homepage = https://github.com/python-trio/sniffio;
+ license = licenses.asl20;
+ description = "Sniff out which async library your code is running under";
+ };
+}
diff --git a/pkgs/development/python-modules/tifffile/default.nix b/pkgs/development/python-modules/tifffile/default.nix
index 159051b9a6a..3910ddf0725 100644
--- a/pkgs/development/python-modules/tifffile/default.nix
+++ b/pkgs/development/python-modules/tifffile/default.nix
@@ -1,5 +1,5 @@
{ lib, stdenv, fetchPypi, buildPythonPackage, isPy27, pythonOlder
-, numpy, nose, enum34, futures }:
+, numpy, nose, enum34, futures, pathlib }:
buildPythonPackage rec {
pname = "tifffile";
@@ -16,7 +16,7 @@ buildPythonPackage rec {
'';
propagatedBuildInputs = [ numpy ]
- ++ lib.optional isPy27 futures
+ ++ lib.optional isPy27 [ futures pathlib ]
++ lib.optional (pythonOlder "3.0") enum34;
meta = with stdenv.lib; {
diff --git a/pkgs/development/python-modules/tldextract/default.nix b/pkgs/development/python-modules/tldextract/default.nix
new file mode 100644
index 00000000000..4e494244d31
--- /dev/null
+++ b/pkgs/development/python-modules/tldextract/default.nix
@@ -0,0 +1,24 @@
+{ lib, fetchPypi, buildPythonPackage
+, requests, requests-file, idna, pytest
+, responses
+}:
+
+buildPythonPackage rec {
+ pname = "tldextract";
+ version = "2.2.0";
+
+ src = fetchPypi {
+ inherit pname version;
+ sha256 = "1d5s8v6kpsgazyahflhji1cfdcf89rv7l7z55v774bhzvcjp2y99";
+ };
+
+ propagatedBuildInputs = [ requests requests-file idna ];
+ checkInputs = [ pytest responses ];
+
+ meta = {
+ homepage = https://github.com/john-kurkowski/tldextract;
+ description = "Accurately separate the TLD from the registered domain and subdomains of a URL, using the Public Suffix List.";
+ license = lib.licenses.bsd3;
+ };
+
+}
diff --git a/pkgs/development/python-modules/tornado/default.nix b/pkgs/development/python-modules/tornado/default.nix
index 6d86404e192..d446d377e66 100644
--- a/pkgs/development/python-modules/tornado/default.nix
+++ b/pkgs/development/python-modules/tornado/default.nix
@@ -8,12 +8,25 @@
, singledispatch
, pythonOlder
, futures
+, version ? "5.1"
}:
+let
+ versionMap = {
+ "4.5.3" = {
+ sha256 = "02jzd23l4r6fswmwxaica9ldlyc2p6q8dk6dyff7j58fmdzf853d";
+ };
+ "5.1" = {
+ sha256 = "4f66a2172cb947387193ca4c2c3e19131f1c70fa8be470ddbbd9317fd0801582";
+ };
+ };
+in
+
+with versionMap.${version};
+
buildPythonPackage rec {
pname = "tornado";
- version = "5.1";
-
+ inherit version;
propagatedBuildInputs = [ backports_abc certifi singledispatch ]
++ lib.optional (pythonOlder "3.5") backports_ssl_match_hostname
@@ -26,8 +39,7 @@ buildPythonPackage rec {
'';
src = fetchPypi {
- inherit pname version;
- sha256 = "4f66a2172cb947387193ca4c2c3e19131f1c70fa8be470ddbbd9317fd0801582";
+ inherit pname sha256 version;
};
meta = {
diff --git a/pkgs/development/python-modules/trio/default.nix b/pkgs/development/python-modules/trio/default.nix
index 4924fa527c6..89addb377dc 100644
--- a/pkgs/development/python-modules/trio/default.nix
+++ b/pkgs/development/python-modules/trio/default.nix
@@ -8,6 +8,7 @@
, pytest
, pyopenssl
, trustme
+, sniffio
}:
buildPythonPackage rec {
@@ -31,6 +32,7 @@ buildPythonPackage rec {
async_generator
idna
outcome
+ sniffio
] ++ lib.optionals (pythonOlder "3.7") [ contextvars ];
meta = {
diff --git a/pkgs/development/python-modules/urlgrabber/default.nix b/pkgs/development/python-modules/urlgrabber/default.nix
index f399f4d426e..528846d7238 100644
--- a/pkgs/development/python-modules/urlgrabber/default.nix
+++ b/pkgs/development/python-modules/urlgrabber/default.nix
@@ -15,7 +15,7 @@ buildPythonPackage rec {
propagatedBuildInputs = [ pycurl ];
meta = with stdenv.lib; {
- homepage = "urlgrabber.baseurl.org";
+ homepage = http://urlgrabber.baseurl.org;
license = licenses.lgpl2Plus;
description = "Python module for downloading files";
maintainers = with maintainers; [ qknight ];
diff --git a/pkgs/development/python-modules/us/default.nix b/pkgs/development/python-modules/us/default.nix
index eb001410ce5..53b5bc9ad16 100644
--- a/pkgs/development/python-modules/us/default.nix
+++ b/pkgs/development/python-modules/us/default.nix
@@ -15,6 +15,13 @@ buildPythonPackage rec {
sha256 = "1niglalkp7pinibzbxjdz9mxx9qmwkrh8884dag3kr72cfkrpp09";
};
+ # Upstream requires jellyfish==0.5.6 but we have 0.6.1
+ postPatch = ''
+ substituteInPlace setup.py --replace "jellyfish==" "jellyfish>="
+ '';
+
+ doCheck = false; # pypi version doesn't include tests
+
meta = {
description = "A package for easily working with US and state metadata";
longDescription = ''
diff --git a/pkgs/development/python-modules/wordfreq/default.nix b/pkgs/development/python-modules/wordfreq/default.nix
index 9de1fd5b392..d672cb8bae9 100644
--- a/pkgs/development/python-modules/wordfreq/default.nix
+++ b/pkgs/development/python-modules/wordfreq/default.nix
@@ -6,27 +6,28 @@
, msgpack
, mecab-python3
, jieba
-, nose
+, pytest
, pythonOlder
, fetchFromGitHub
}:
buildPythonPackage rec {
pname = "wordfreq";
- version = "2.0";
+ version = "2.2.0";
src = fetchFromGitHub {
owner = "LuminosoInsight";
repo = "wordfreq";
- rev = "e3a1b470d9f8e0d82e9f179ffc41abba434b823b";
- sha256 = "1wjkhhj7nxfnrghwvmvwc672s30lp4b7yr98gxdxgqcq6wdshxwv";
+ # upstream don't tag by version
+ rev = "bc12599010c8181a725ec97d0b3990758a48da36";
+ sha256 = "195794vkzq5wsq3mg1dgfhlnz2f7vi1xajlifq6wkg4lzwyq262m";
};
- checkInputs = [ nose ];
+ checkInputs = [ pytest ];
checkPhase = ''
# These languages require additional dictionaries
- nosetests -e test_japanese -e test_korean -e test_languages
+ pytest tests -k 'not test_japanese and not test_korean and not test_languages and not test_french_and_related'
'';
propagatedBuildInputs = [ regex langcodes ftfy msgpack mecab-python3 jieba ];
diff --git a/pkgs/development/python-modules/zodb/default.nix b/pkgs/development/python-modules/zodb/default.nix
index c23f332638d..848da5b2171 100644
--- a/pkgs/development/python-modules/zodb/default.nix
+++ b/pkgs/development/python-modules/zodb/default.nix
@@ -4,7 +4,6 @@
, zope_testrunner
, transaction
, six
-, wheel
, zope_interface
, zodbpickle
, zconfig
@@ -24,15 +23,16 @@ buildPythonPackage rec {
};
patches = [
- ./ZODB-5.3.0-fix-tests.patch
+ ./ZODB-5.3.0-fix-tests.patch # still needeed with 5.4.0
+ # Upstream patch to fix tests with persistent 4.4,
+ # cannot fetchpatch because only one hunk of the upstream commit applies.
+ # TODO remove on next release
+ ./fix-tests-with-persistent-4.4.patch
];
propagatedBuildInputs = [
- manuel
transaction
- zope_testrunner
six
- wheel
zope_interface
zodbpickle
zconfig
@@ -41,6 +41,11 @@ buildPythonPackage rec {
BTrees
];
+ checkInputs = [
+ manuel
+ zope_testrunner
+ ];
+
meta = with stdenv.lib; {
description = "Zope Object Database: object database and persistence";
homepage = https://pypi.python.org/pypi/ZODB;
diff --git a/pkgs/development/python-modules/zodb/fix-tests-with-persistent-4.4.patch b/pkgs/development/python-modules/zodb/fix-tests-with-persistent-4.4.patch
new file mode 100644
index 00000000000..57946dd2986
--- /dev/null
+++ b/pkgs/development/python-modules/zodb/fix-tests-with-persistent-4.4.patch
@@ -0,0 +1,26 @@
+From 2d0ae7199501795617a82a32bafe19b4b5ae89c3 Mon Sep 17 00:00:00 2001
+From: Jason Madden
+Date: Wed, 22 Aug 2018 10:43:19 -0500
+Subject: [PATCH] Fix tests with, and depend on, persistent 4.4.
+
+Fixes #213.
+---
+ src/ZODB/tests/util.py | 5 +++++
+ 3 files changed, 9 insertions(+), 3 deletions(-)
+
+diff --git a/src/ZODB/tests/util.py b/src/ZODB/tests/util.py
+index 4ffde92c1..e9bf547fa 100644
+--- a/src/ZODB/tests/util.py
++++ b/src/ZODB/tests/util.py
+@@ -37,6 +37,11 @@
+ r"\1"),
+ (re.compile('b(".*?")'),
+ r"\1"),
++ # Persistent 4.4 changes the repr of persistent subclasses,
++ # and it is slightly different with the C extension and
++ # pure-Python module
++ (re.compile('ZODB.tests.testcrossdatabasereferences.'),
++ ''),
+ # Python 3 adds module name to exceptions.
+ (re.compile("ZODB.interfaces.BlobError"),
+ r"BlobError"),
diff --git a/pkgs/development/r-modules/default.nix b/pkgs/development/r-modules/default.nix
index 9bbab76d4a2..a2c586c06a9 100644
--- a/pkgs/development/r-modules/default.nix
+++ b/pkgs/development/r-modules/default.nix
@@ -906,6 +906,14 @@ let
TCLLIBPATH = "${pkgs.bwidget}/lib/bwidget${pkgs.bwidget.version}";
});
+ RPostgres = old.RPostgres.overrideDerivation (attrs: {
+ preConfigure = ''
+ export INCLUDE_DIR=${pkgs.postgresql}/include
+ export LIB_DIR=${pkgs.postgresql.lib}/lib
+ patchShebangs configure
+ '';
+ });
+
OpenMx = old.OpenMx.overrideDerivation (attrs: {
preConfigure = ''
patchShebangs configure
diff --git a/pkgs/development/tools/ammonite/default.nix b/pkgs/development/tools/ammonite/default.nix
index f139e296d35..0e98d63fdd3 100644
--- a/pkgs/development/tools/ammonite/default.nix
+++ b/pkgs/development/tools/ammonite/default.nix
@@ -5,12 +5,12 @@
with stdenv.lib;
stdenv.mkDerivation rec {
name = "ammonite-${version}";
- version = "1.1.2";
+ version = "1.2.0";
scalaVersion = "2.12";
src = fetchurl {
url = "https://github.com/lihaoyi/Ammonite/releases/download/${version}/${scalaVersion}-${version}";
- sha256 = "1balr7ya7xlyq32jwb0w9c4klnw13mdn2c5azkwngq5cp29yrfrc";
+ sha256 = "08kh4j9jsg3c3ks9q5f01i13d1ak701vjviy5wb3y6xsajg62nfj";
};
propagatedBuildInputs = [ jre ] ;
diff --git a/pkgs/development/tools/analysis/pmd/default.nix b/pkgs/development/tools/analysis/pmd/default.nix
index 78dd5778962..187b2d7b03f 100644
--- a/pkgs/development/tools/analysis/pmd/default.nix
+++ b/pkgs/development/tools/analysis/pmd/default.nix
@@ -2,13 +2,13 @@
stdenv.mkDerivation rec {
name = "pmd-${version}";
- version = "6.5.0";
+ version = "6.7.0";
buildInputs = [ unzip ];
src = fetchurl {
url = "mirror://sourceforge/pmd/pmd-bin-${version}.zip";
- sha256 = "10jdgps1ikx75ljp2gi76ff7payg28pmiy5y3vp17gg47mv991aw";
+ sha256 = "0bnbr8zq28dgvwka563g5lbya5jhmjrahnbwagcs4afpsrm7zj6c";
};
installPhase = ''
diff --git a/pkgs/development/tools/build-managers/bazel/default.nix b/pkgs/development/tools/build-managers/bazel/default.nix
index 6a25aef8b36..ff9cc3eb45a 100644
--- a/pkgs/development/tools/build-managers/bazel/default.nix
+++ b/pkgs/development/tools/build-managers/bazel/default.nix
@@ -1,11 +1,13 @@
{ stdenv, lib, fetchurl, fetchpatch, runCommand, makeWrapper
, jdk, zip, unzip, bash, writeCBin, coreutils
, which, python, perl, gnused, gnugrep, findutils
+# Apple dependencies
+, cctools, clang, libcxx, CoreFoundation, CoreServices, Foundation
+# Allow to independently override the jdks used to build and run respectively
+, buildJdk ? jdk, runJdk ? jdk
# Always assume all markers valid (don't redownload dependencies).
# Also, don't clean up environment variables.
, enableNixHacks ? false
-# Apple dependencies
-, cctools, clang, libcxx, CoreFoundation, CoreServices, Foundation
}:
let
@@ -26,7 +28,7 @@ let
in
stdenv.mkDerivation rec {
- version = "0.16.0";
+ version = "0.16.1";
meta = with lib; {
homepage = "https://github.com/bazelbuild/bazel/";
@@ -40,7 +42,7 @@ stdenv.mkDerivation rec {
src = fetchurl {
url = "https://github.com/bazelbuild/bazel/releases/download/${version}/bazel-${version}-dist.zip";
- sha256 = "1ca9pncnj6v4r1kvgxys7607wpz4d2ic6g0i7lpsc2zg2qwmjc67";
+ sha256 = "0v5kcz8q9vzf4cpmlx8k2gg0dsr8mj0jmx9a44pwb0kc6na6pih9";
};
sourceRoot = ".";
@@ -152,7 +154,7 @@ stdenv.mkDerivation rec {
+ genericPatches;
buildInputs = [
- jdk
+ buildJdk
];
nativeBuildInputs = [
@@ -190,7 +192,7 @@ stdenv.mkDerivation rec {
installPhase = ''
mkdir -p $out/bin
mv output/bazel $out/bin
- wrapProgram "$out/bin/bazel" --set JAVA_HOME "${jdk}"
+ wrapProgram "$out/bin/bazel" --set JAVA_HOME "${runJdk}"
mkdir -p $out/share/bash-completion/completions $out/share/zsh/site-functions
mv output/bazel-complete.bash $out/share/bash-completion/completions/bazel
cp scripts/zsh_completion/_bazel $out/share/zsh/site-functions/
diff --git a/pkgs/development/tools/build-managers/gn/default.nix b/pkgs/development/tools/build-managers/gn/default.nix
index 399486c4d90..06af89dac7a 100644
--- a/pkgs/development/tools/build-managers/gn/default.nix
+++ b/pkgs/development/tools/build-managers/gn/default.nix
@@ -1,107 +1,26 @@
-{ stdenv, lib, fetchgit, fetchzip, fetchpatch
-, libevent, ninja, python, darwin }:
+{ stdenv, lib, fetchgit, fetchzip, fetchpatch, darwin
+, git, ninja, python }:
-let
- depsGit = {
- "tools/gn" = fetchgit {
- url = "https://chromium.googlesource.com/chromium/src/tools/gn";
- rev = "0fa417a0d2d8484e9a5a636e3301da322f586601";
- sha256 = "0pigcl14yc4aak6q1ghfjxdz2ah4fg4m2r5y3asw2rz6mpr5y9z0";
- };
- "base" = fetchgit {
- url = "https://chromium.googlesource.com/chromium/src/base";
- rev = "ab1d7c3b92ce9c9bc756bdefb8338360d1a33a1e";
- sha256 = "15wis6qg9ka62k6v1vamg0bp3v5vkpapg485jsn4bbfcaqp6di0f";
- };
- "build" = fetchgit {
- url = "https://chromium.googlesource.com/chromium/src/build";
- rev = "8d44c08a4c9997695db8098198bdd5026bc7a6f9";
- sha256 = "19sajgf55xfmvnwvy2ss7g6pyljp751cfsws30w415m6m00lmpxl";
- };
- "config" = fetchgit {
- url = "https://chromium.googlesource.com/chromium/src/build/config";
- rev = "14116c0cdcb9e28995ca8bb384a12e5c9dbd1dbb";
- sha256 = "04nif0lm4wcy05b7xhal023874s4r0iq067q57cgwdm72i2gml40";
- };
- "testing/gtest" = fetchgit {
- url = "https://chromium.googlesource.com/chromium/testing/gtest";
- rev = "585ec31ea716f08233a815e680fc0d4699843938";
- sha256 = "0csn1cza66851nmxxiw42smsm3422mx67vcyykwn0a71lcjng6rc";
- };
- "third_party/apple_apsl" = fetchzip {
- url = "https://chromium.googlesource.com/chromium/src/third_party/+archive/8e6ccb8c74db6dfa15dd21401ace3ac96c054cf7/apple_apsl.tar.gz";
- sha256 = "1vgcg741lwz84kdy0qc5wn9dxx3j9zh6a9d185fpygdsipwikqv8";
- stripRoot = false;
- };
- "buildtools/third_party/libc++/trunk" = fetchgit {
- url = "https://chromium.googlesource.com/chromium/llvm-project/libcxx";
- rev = "ece1de8658d749e19c12cacd4458cc330eca94e3";
- sha256 = "1nlyvfkzhchwv9b18bh82jcamqv3acj26ah9ajs31f2dql05amhg";
- };
- "buildtools/third_party/libc++abi/trunk" = fetchgit {
- url = "https://chromium.googlesource.com/chromium/llvm-project/libcxxabi";
- rev = "52c7a3760aef1df328a9bc957f686410872f0dc0";
- sha256 = "1aam539j01381q27b7xhij18pz3h0lhw08hglvqq4hgvlqx5cn2s";
- };
+stdenv.mkDerivation rec {
+ name = "gn-${version}";
+ version = "20180830";
+
+ src = fetchgit {
+ url = "https://gn.googlesource.com/gn";
+ rev = "106b823805adcc043b2bfe5bc21d58f160a28a7b";
+ leaveDotGit = true; # gen.py uses "git describe" to generate last_commit_position.h
+ deepClone = true;
+ sha256 = "1276jwk3424i78zp21f6hp7idvg6r8qxp8sdfaw8ilkmp7ss19c8";
};
-in stdenv.mkDerivation rec {
- name = "gn-${version}";
- version = "20180423";
- sourceRoot = ".";
-
- unpackPhase = ''
- ${lib.concatStringsSep "\n" (
- lib.mapAttrsToList (n: v: ''
- mkdir -p $sourceRoot/${n}
- if [ -d ${v} ]; then
- cp -r ${v}/* $sourceRoot/${n}
- else
- mkdir -p $sourceRoot/${n}
- pushd $sourceRoot/${n}
- unpackFile ${v}
- popd
- fi
- '') depsGit)}
-
- chmod u+w -R $sourceRoot
- '';
-
- patches = [
- (fetchpatch {
- url = "https://raw.githubusercontent.com/Eloston/ungoogled-chromium/3375fbc7b865dafe1230431a1e3f9bffd27ec184/resources/patches/ungoogled-chromium/macos/fix-gn-bootstrap.patch";
- sha256 = "1h8jgxznm7zrxlzb4wcfx4zx4lyvfrmpd0r7cd7h0s23wn8ibb3a";
- })
- ];
-
postPatch = ''
- # Disable libevent bootstrapping (we will provide it).
- sed -i -e '/static_libraries.*libevent/,/^ *\]\?[})]$/d' \
- tools/gn/bootstrap/bootstrap.py
-
# FIXME Needed with old Apple SDKs
substituteInPlace base/mac/foundation_util.mm \
--replace "NSArray*" "NSArray*"
- substituteInPlace base/mac/sdk_forward_declarations.h \
- --replace "NSDictionary*" "NSDictionary*" \
- --replace "NSArray*" "NSArray*" \
- --replace "typedef NSString* VNImageOption NS_STRING_ENUM" "typedef NSString* VNImageOption"
-
- # Patch shebangs (for sandbox build)
- patchShebangs build
'';
- # FIXME again this shouldn't be necessary but I can't figure out a better way
- NIX_CFLAGS_COMPILE = "-DMAC_OS_X_VERSION_MAX_ALLOWED=MAC_OS_X_VERSION_10_10 -DMAC_OS_X_VERSION_MIN_REQUIRED=MAC_OS_X_VERSION_10_10";
-
- NIX_LDFLAGS = "-levent";
-
- nativeBuildInputs = [ ninja python ];
- buildInputs = [ libevent ]
-
- # FIXME These dependencies shouldn't be needed but can't find a way
- # around it. Chromium pulls this in while bootstrapping GN.
- ++ lib.optionals stdenv.isDarwin (with darwin; with apple_sdk.frameworks; [
+ nativeBuildInputs = [ ninja python git ];
+ buildInputs = lib.optionals stdenv.isDarwin (with darwin; with apple_sdk.frameworks; [
libobjc
cctools
@@ -109,25 +28,20 @@ in stdenv.mkDerivation rec {
ApplicationServices
Foundation
AppKit
- ImageCaptureCore
- CoreBluetooth
- IOBluetooth
- CoreWLAN
- Quartz
- Cocoa
]);
buildPhase = ''
- python tools/gn/bootstrap/bootstrap.py -s
+ python build/gen.py --no-sysroot
+ ninja -j $NIX_BUILD_CORES -C out gn
'';
installPhase = ''
- install -vD out/Release/gn "$out/bin/gn"
+ install -vD out/gn "$out/bin/gn"
'';
meta = with lib; {
description = "A meta-build system that generates NinjaBuild files";
- homepage = https://chromium.googlesource.com/chromium/src/tools/gn;
+ homepage = https://gn.googlesource.com/gn;
license = licenses.bsd3;
platforms = platforms.unix;
maintainers = with maintainers; [ stesie matthewbauer ];
diff --git a/pkgs/development/tools/build-managers/nant/default.nix b/pkgs/development/tools/build-managers/nant/default.nix
deleted file mode 100644
index c394d87e09e..00000000000
--- a/pkgs/development/tools/build-managers/nant/default.nix
+++ /dev/null
@@ -1,71 +0,0 @@
-{ stdenv, fetchFromGitHub, pkgconfig, mono, makeWrapper
-, targetVersion ? "4.5" }:
-
-let
- version = "2015-11-15";
-
- src = fetchFromGitHub {
- owner = "nant";
- repo = "nant";
- rev = "19bec6eca205af145e3c176669bbd57e1712be2a";
- sha256 = "11l5y76csn686p8i3kww9s0sxy659ny9l64krlqg3y2nxaz0fk6l";
- };
-
- nant-bootstrapped = stdenv.mkDerivation {
- name = "nant-bootstrapped-${version}";
- inherit src;
-
- nativeBuildInputs = [ pkgconfig ];
- buildInputs = [ mono makeWrapper ];
-
- buildFlags = "bootstrap";
-
- dontStrip = true;
-
- installPhase = ''
- mkdir -p $out/lib/nant-bootstrap
- cp -r bootstrap/* $out/lib/nant-bootstrap
-
- mkdir -p $out/bin
- makeWrapper "${mono}/bin/mono" $out/bin/nant \
- --add-flags "$out/lib/nant-bootstrap/NAnt.exe"
- '';
- };
-
-in stdenv.mkDerivation {
- name = "nant-${version}";
- inherit src;
-
- nativeBuildInputs = [ pkgconfig ];
- buildInputs = [ mono makeWrapper nant-bootstrapped ];
-
- dontStrip = true;
-
- buildPhase = ''
- nant -t:mono-${targetVersion}
- '';
-
- installPhase = ''
- mkdir -p $out/lib/nant
- cp -r build/mono-${targetVersion}.unix/nant-debug/bin/* $out/lib/nant/
-
- mkdir -p $out/bin
- makeWrapper "${mono}/bin/mono" $out/bin/nant \
- --add-flags "$out/lib/nant/NAnt.exe"
- '';
-
- meta = with stdenv.lib; {
- homepage = http://nant.sourceforge.net;
- description = "NAnt is a free .NET build tool";
-
- longDescription = ''
- NAnt is a free .NET build tool. In theory it is kind of like make without
- make's wrinkles. In practice it's a lot like Ant.
- '';
-
- license = licenses.gpl2Plus;
- maintainers = with maintainers; [ zohl ];
- platforms = platforms.linux;
- };
-}
-
diff --git a/pkgs/development/tools/build-managers/pants/default.nix b/pkgs/development/tools/build-managers/pants/default.nix
index 1ad52f327e1..02bf9c23cba 100644
--- a/pkgs/development/tools/build-managers/pants/default.nix
+++ b/pkgs/development/tools/build-managers/pants/default.nix
@@ -17,6 +17,7 @@ in buildPythonApplication rec {
prePatch = ''
sed -E -i "s/'([[:alnum:].-]+)[=><][[:digit:]=><.,]*'/'\\1'/g" setup.py
+ substituteInPlace setup.py --replace "requests[security]<2.19,>=2.5.0" "requests[security]<2.20,>=2.5.0"
'';
# Unnecessary, and causes some really weird behavior around .class files, which
diff --git a/pkgs/development/tools/build-managers/sbt/default.nix b/pkgs/development/tools/build-managers/sbt/default.nix
index b5751a19455..bbbbbf462ec 100644
--- a/pkgs/development/tools/build-managers/sbt/default.nix
+++ b/pkgs/development/tools/build-managers/sbt/default.nix
@@ -2,7 +2,7 @@
stdenv.mkDerivation rec {
name = "sbt-${version}";
- version = "1.2.1";
+ version = "1.2.3";
src = fetchurl {
urls = [
@@ -10,7 +10,7 @@ stdenv.mkDerivation rec {
"https://github.com/sbt/sbt/releases/download/v${version}/sbt-${version}.tgz"
"https://cocl.us/sbt-${version}.tgz"
];
- sha256 = "1pyp98svh5x8b6yp5vfl0jhz8aysjm0dqvqf7znyb3l7knfqk726";
+ sha256 = "1szyp9hgrvr3r5rhr98cn5mkhca1mr0qfs6cd8fiihm6hzjzn0nm";
};
patchPhase = ''
diff --git a/pkgs/development/tools/cargo-web/default.nix b/pkgs/development/tools/cargo-web/default.nix
index 06d6697ef96..e350e475f73 100644
--- a/pkgs/development/tools/cargo-web/default.nix
+++ b/pkgs/development/tools/cargo-web/default.nix
@@ -1,4 +1,6 @@
-{ stdenv, fetchFromGitHub, openssl, pkgconfig, rustPlatform }:
+{ stdenv, fetchFromGitHub, openssl, pkgconfig, rustPlatform
+, CoreServices, Security
+}:
rustPlatform.buildRustPackage rec {
name = "cargo-web-${version}";
@@ -14,12 +16,14 @@ rustPlatform.buildRustPackage rec {
cargoSha256 = "157av9zkirr00w9v11mh7yp8w36sy7rw6i80i5jmi0mgrdvcg5si";
nativeBuildInputs = [ openssl pkgconfig ];
+ buildInputs = stdenv.lib.optionals stdenv.isDarwin [ CoreServices Security ];
meta = with stdenv.lib; {
description = "A Cargo subcommand for the client-side Web";
homepage = https://github.com/koute/cargo-web;
license = with licenses; [asl20 /* or */ mit];
maintainers = [ maintainers.kevincox ];
+ broken = stdenv.isDarwin; # test with CoreFoundation 10.11
platforms = platforms.all;
};
}
diff --git a/pkgs/development/tools/castxml/default.nix b/pkgs/development/tools/castxml/default.nix
index 603b155ee4f..aea94633bae 100644
--- a/pkgs/development/tools/castxml/default.nix
+++ b/pkgs/development/tools/castxml/default.nix
@@ -17,6 +17,11 @@ stdenv.mkDerivation rec {
sha256 = "1hjh8ihjyp1m2jb5yypp5c45bpbz8k004f4p1cjw4gc7pxhjacdj";
};
+ cmakeFlags = [
+ "-DCLANG_RESOURCE_DIR=${llvmPackages.clang-unwrapped}"
+ "-DSPHINX_MAN=${if withMan then "ON" else "OFF"}"
+ ];
+
buildInputs = [
cmake
llvmPackages.clang-unwrapped
@@ -25,11 +30,6 @@ stdenv.mkDerivation rec {
propagatedbuildInputs = [ llvmPackages.libclang ];
- preConfigure = ''
- cmakeFlagsArray+=(
- ${if withMan then "-DSPHINX_MAN=ON" else ""}
- )'';
-
# 97% tests passed, 96 tests failed out of 2866
# mostly because it checks command line and nix append -isystem and all
doCheck=false;
diff --git a/pkgs/development/tools/continuous-integration/jenkins/default.nix b/pkgs/development/tools/continuous-integration/jenkins/default.nix
index c6fcaa0a44a..a6a6e9a1105 100644
--- a/pkgs/development/tools/continuous-integration/jenkins/default.nix
+++ b/pkgs/development/tools/continuous-integration/jenkins/default.nix
@@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
name = "jenkins-${version}";
- version = "2.121.2";
+ version = "2.138.1";
src = fetchurl {
url = "http://mirrors.jenkins.io/war-stable/${version}/jenkins.war";
- sha256 = "00ln31ahhsihnxba2hldrjxdpyxl7xw731493a24cqlkdq89s3ys";
+ sha256 = "09svkqii9lv1br0al6wjn1l0fsqf6s7fdrfc0awmfsg8fmjlpf7c";
};
buildCommand = ''
diff --git a/pkgs/development/tools/dep2nix/default.nix b/pkgs/development/tools/dep2nix/default.nix
index 6367f6be298..e7033c44dd4 100644
--- a/pkgs/development/tools/dep2nix/default.nix
+++ b/pkgs/development/tools/dep2nix/default.nix
@@ -1,9 +1,9 @@
{ stdenv, fetchFromGitHub, buildGoPackage
-, makeWrapper, nix-prefetch-git }:
+, makeWrapper, nix-prefetch-scripts }:
buildGoPackage rec {
name = "dep2nix-${version}";
- version = "0.0.1";
+ version = "0.0.2";
goPackagePath = "github.com/nixcloud/dep2nix";
@@ -11,7 +11,7 @@ buildGoPackage rec {
owner = "nixcloud";
repo = "dep2nix";
rev = version;
- sha256 = "05b06wgcy88fb5ccqwq3mfhrhcblr1akpxgsf44kgbdwf5nzz87g";
+ sha256 = "17csgnd6imr1l0gpirsvr5qg7z0mpzxj211p2nwqilrvbp8zj7vg";
};
nativeBuildInputs = [
@@ -20,7 +20,7 @@ buildGoPackage rec {
postFixup = ''
wrapProgram $bin/bin/dep2nix \
- --prefix PATH : ${nix-prefetch-git}/bin
+ --prefix PATH : ${nix-prefetch-scripts}/bin
'';
goDeps = ./deps.nix;
diff --git a/pkgs/development/tools/flatpak-builder/default.nix b/pkgs/development/tools/flatpak-builder/default.nix
index 33f9ade4681..d2052bc0e8e 100644
--- a/pkgs/development/tools/flatpak-builder/default.nix
+++ b/pkgs/development/tools/flatpak-builder/default.nix
@@ -29,6 +29,7 @@
, libcap
, libdwarf
, libsoup
+, libyaml
, ostree
, patch
, rpm
@@ -72,6 +73,7 @@ in stdenv.mkDerivation rec {
libdwarf
libsoup
libxml2
+ libyaml
ostree
];
diff --git a/pkgs/development/tools/govendor/default.nix b/pkgs/development/tools/govendor/default.nix
new file mode 100644
index 00000000000..2030c8ba444
--- /dev/null
+++ b/pkgs/development/tools/govendor/default.nix
@@ -0,0 +1,22 @@
+{ stdenv, buildGoPackage, fetchFromGitHub }:
+
+buildGoPackage rec {
+ name = "govendor-${version}";
+ version = "1.0.9";
+
+ goPackagePath = "github.com/kardianos/govendor";
+
+ src = fetchFromGitHub {
+ owner = "kardianos";
+ repo = "govendor";
+ rev = "v${version}";
+ sha256 = "0g02cd25chyijg0rzab4xr627pkvk5k33mscd6r0gf1v5xvadcfq";
+ };
+
+ meta = with stdenv.lib; {
+ homepage = "https://github.com/kardianos/govendor";
+ description = "Go vendor tool that works with the standard vendor file";
+ license = licenses.bsd3;
+ maintainers = with maintainers; [ zimbatm ];
+ };
+}
diff --git a/pkgs/development/tools/haskell/leksah/default.nix b/pkgs/development/tools/haskell/leksah/default.nix
index f1c754ddff9..ec2fb334a3b 100644
--- a/pkgs/development/tools/haskell/leksah/default.nix
+++ b/pkgs/development/tools/haskell/leksah/default.nix
@@ -14,4 +14,8 @@ in stdenv.mkDerivation {
--prefix PATH : "${leksahEnv}/bin" \
--prefix XDG_DATA_DIRS : "$GSETTINGS_SCHEMAS_PATH"
'';
+
+ meta = {
+ broken = true; # 2018-09-13, no successful hydra build since 2017-08-19
+ };
}
diff --git a/pkgs/development/tools/haskell/vaultenv/default.nix b/pkgs/development/tools/haskell/vaultenv/default.nix
index b607cc5604c..6bf5e9be7bf 100644
--- a/pkgs/development/tools/haskell/vaultenv/default.nix
+++ b/pkgs/development/tools/haskell/vaultenv/default.nix
@@ -1,28 +1,35 @@
-{ mkDerivation, fetchzip, async, base, bytestring, hpack, http-conduit
-, lens, lens-aeson, optparse-applicative, retry, stdenv, text, unix
-, unordered-containers, utf8-string
+{ mkDerivation, async, base, bytestring, connection, containers
+, directory, hpack, hspec, hspec-discover, hspec-expectations
+, http-client, http-conduit, lens, lens-aeson, megaparsec, mtl
+, optparse-applicative, parser-combinators, retry, stdenv, text
+, unix, unordered-containers, utf8-string, fetchzip
}:
-
mkDerivation rec {
pname = "vaultenv";
- version = "0.5.3";
+ version = "0.8.0";
src = fetchzip {
url = "https://github.com/channable/vaultenv/archive/v${version}.tar.gz";
- sha256 = "1kxq2pp8l8xf7xwjyd9cwyi7z192013s6psq5fk8jrkkhrk8z3li";
+ sha256 = "04hrwyy7gsybdwljrks4ym3pshqk1i43f8wpirjx7b0dfjgsd2l5";
};
buildTools = [ hpack ];
- preConfigure = "hpack .";
isLibrary = false;
isExecutable = true;
executableHaskellDepends = [
- async base bytestring http-conduit lens lens-aeson
- optparse-applicative retry text unix unordered-containers
- utf8-string
+ async base bytestring connection containers http-client
+ http-conduit lens lens-aeson megaparsec mtl optparse-applicative
+ parser-combinators retry text unix unordered-containers utf8-string
];
- homepage = "https://github.com/channable/vaultenv";
+ testHaskellDepends = [
+ async base bytestring connection containers directory hspec
+ hspec-discover hspec-expectations http-client http-conduit lens
+ lens-aeson megaparsec mtl optparse-applicative parser-combinators
+ retry text unix unordered-containers utf8-string
+ ];
+ preConfigure = "hpack";
+ homepage = "https://github.com/channable/vaultenv#readme";
description = "Runs processes with secrets from HashiCorp Vault";
license = stdenv.lib.licenses.bsd3;
maintainers = with stdenv.lib.maintainers; [ lnl7 ];
diff --git a/pkgs/development/tools/hcloud/default.nix b/pkgs/development/tools/hcloud/default.nix
index 877080508d4..b3fa6f852f7 100644
--- a/pkgs/development/tools/hcloud/default.nix
+++ b/pkgs/development/tools/hcloud/default.nix
@@ -14,6 +14,19 @@ buildGoPackage rec {
buildFlagsArray = [ "-ldflags=" "-w -X github.com/hetznercloud/cli/cli.Version=${version}" ];
+ postInstall = ''
+ mkdir -p \
+ $bin/etc/bash_completion.d \
+ $bin/share/zsh/vendor-completions
+
+ # Add bash completions
+ $bin/bin/hcloud completion bash > "$bin/etc/bash_completion.d/hcloud"
+
+ # Add zsh completions
+ echo "#compdef hcloud" > "$bin/share/zsh/vendor-completions/_hcloud"
+ $bin/bin/hcloud completion zsh >> "$bin/share/zsh/vendor-completions/_hcloud"
+ '';
+
meta = {
description = "A command-line interface for Hetzner Cloud, a provider for cloud virtual private servers";
homepage = https://github.com/hetznercloud/cli;
diff --git a/pkgs/development/tools/jbake/default.nix b/pkgs/development/tools/jbake/default.nix
index 152cddc101d..9c3094fb4fe 100644
--- a/pkgs/development/tools/jbake/default.nix
+++ b/pkgs/development/tools/jbake/default.nix
@@ -11,6 +11,8 @@ stdenv.mkDerivation rec {
buildInputs = [ makeWrapper jre ];
+ postPatch = "patchShebangs .";
+
installPhase = ''
mkdir -p $out
cp -vr * $out
diff --git a/pkgs/development/tools/misc/kconfig-frontends/default.nix b/pkgs/development/tools/misc/kconfig-frontends/default.nix
index d1415569ca3..bceb15f1165 100644
--- a/pkgs/development/tools/misc/kconfig-frontends/default.nix
+++ b/pkgs/development/tools/misc/kconfig-frontends/default.nix
@@ -1,24 +1,26 @@
-{ stdenv, fetchurl, pkgconfig, bison, flex, gperf, ncurses }:
+{ stdenv, fetchurl, pkgconfig, bison, flex, gperf, ncurses, pythonPackages }:
stdenv.mkDerivation rec {
basename = "kconfig-frontends";
- version = "3.12.0.0";
+ version = "4.11.0.1";
name = "${basename}-${version}";
src = fetchurl {
- sha256 = "01zlph9bq2xzznlpmfpn0zrmhf2iqw02yh1q7g7adgkl5jk1a9pa";
+ sha256 = "1xircdw3k7aaz29snf96q2fby1cs48bidz5l1kkj0a5gbivw31i3";
url = "http://ymorin.is-a-geek.org/download/${basename}/${name}.tar.xz";
};
nativeBuildInputs = [ pkgconfig ];
- buildInputs = [ bison flex gperf ncurses ];
-
- hardeningDisable = [ "format" ];
+ buildInputs = [ bison flex gperf ncurses pythonPackages.python pythonPackages.wrapPython ];
configureFlags = [
"--enable-frontends=conf,mconf,nconf"
];
+ postInstall = ''
+ wrapPythonPrograms
+ '';
+
meta = with stdenv.lib; {
description = "Out of Linux tree packaging of the kconfig infrastructure";
longDescription = ''
diff --git a/pkgs/development/tools/misc/lttng-ust/default.nix b/pkgs/development/tools/misc/lttng-ust/default.nix
index b708ce490d2..039e5b1ec54 100644
--- a/pkgs/development/tools/misc/lttng-ust/default.nix
+++ b/pkgs/development/tools/misc/lttng-ust/default.nix
@@ -13,11 +13,11 @@
stdenv.mkDerivation rec {
name = "lttng-ust-${version}";
- version = "2.10.1";
+ version = "2.10.2";
src = fetchurl {
url = "https://lttng.org/files/lttng-ust/${name}.tar.bz2";
- sha256 = "17gfi1dn6bgg59qn4ihf8hag96lalx0g7dym2ccpzdz7f45krk07";
+ sha256 = "0if0hrs32r98sp85c8c63zpgy5xjw6cx8wrs65xq227b0jwj5jn4";
};
buildInputs = [ python ];
diff --git a/pkgs/development/tools/pyre/default.nix b/pkgs/development/tools/pyre/default.nix
index 1d7f8025bb0..b51f6344c9b 100644
--- a/pkgs/development/tools/pyre/default.nix
+++ b/pkgs/development/tools/pyre/default.nix
@@ -1,24 +1,30 @@
-{ stdenv, fetchFromGitHub, ocamlPackages, makeWrapper, writeScript }:
+{ stdenv, fetchFromGitHub, ocamlPackages, makeWrapper, writeScript
+, jbuilder, python3, rsync, fetchpatch }:
let
# Manually set version - the setup script requires
# hg and git + keeping the .git directory around.
- version = "0.0.10";
+ pyre-version = "0.0.11";
versionFile = writeScript "version.ml" ''
cat > "./version.ml" < Makefile
+ cp Makefile.template Makefile
+ sed "s/%VERSION%/external/" dune.in > dune
cp ${versionFile} ./scripts/generate-version-number.sh
mkdir $(pwd)/build
export OCAMLFIND_DESTDIR=$(pwd)/build
export OCAMLPATH=$OCAMLPATH:$(pwd)/build
+
make release
'';
@@ -60,7 +70,7 @@ in stdenv.mkDerivation {
# Improvement for a future version.
installPhase = ''
mkdir -p $out/bin
- cp _build/all/main.native $out/bin/pyre.bin
+ cp ./_build/default/main.exe $out/bin/pyre.bin
'';
meta = with stdenv.lib; {
@@ -70,4 +80,54 @@ in stdenv.mkDerivation {
platforms = with platforms; linux;
maintainers = with maintainers; [ teh ];
};
+};
+typeshed = stdenv.mkDerivation {
+ name = "typeshed";
+ # typeshed doesn't have versions, it seems to be synchronized with
+ # mypy relases. I'm assigning a random version here (same as pyre).
+ version = pyre-version;
+ src = fetchFromGitHub {
+ owner = "python";
+ repo = "typeshed";
+ rev = "a08c6ea";
+ sha256 = "0wy8yh43vhyyc4g7iqnmlj66kz5in02y5qc0c4jdckhpa3mchaqk";
+ };
+ phases = [ "unpackPhase" "installPhase" ];
+ installPhase = "cp -r $src $out";
+};
+in python3.pkgs.buildPythonApplication rec {
+ pname = "pyre-check";
+ version = pyre-version;
+ src = fetchFromGitHub {
+ owner = "facebook";
+ repo = "pyre-check";
+ rev = "v${pyre-version}";
+ sha256 = "0ig7bx2kfn2kbxw74wysh5365yp5gyby42l9l29iclrzdghgk32l";
+ };
+ patches = [
+ (fetchpatch {
+ url = "https://github.com/facebook/pyre-check/commit/b473d2ed9fc11e7c1cd0c7b8c42f521e5cdc2003.patch";
+ sha256 = "05xvyp7j4n6z92bxf64rxfq5pvaadxgx1c8c5qziy75vdz72lkcy";
+ })
+ ./pyre-bdist-wheel.patch
+ ];
+
+ # The build-pypi-package script does some funky stuff with build
+ # directories - easier to patch it a bit than to replace it
+ # completely though:
+ postPatch = ''
+ mkdir ./build
+ substituteInPlace scripts/build-pypi-package.sh \
+ --replace 'NIX_BINARY_FILE' '${pyre-bin}/bin/pyre.bin' \
+ --replace 'BUILD_ROOT="$(mktemp -d)"' "BUILD_ROOT=$(pwd)/build"
+ '';
+
+ buildInputs = [ pyre-bin rsync ];
+ propagatedBuildInputs = with python3.pkgs; [ docutils typeshed ];
+ buildPhase = ''
+ bash scripts/build-pypi-package.sh --version ${pyre-version} --bundle-typeshed ${typeshed}
+ cp -r build/dist dist
+ '';
+
+ doCheck = false; # can't open file 'nix_run_setup':
}
diff --git a/pkgs/development/tools/pyre/pyre-bdist-wheel.patch b/pkgs/development/tools/pyre/pyre-bdist-wheel.patch
new file mode 100644
index 00000000000..1b6fea024e0
--- /dev/null
+++ b/pkgs/development/tools/pyre/pyre-bdist-wheel.patch
@@ -0,0 +1,43 @@
+diff --git a/scripts/build-pypi-package.sh b/scripts/build-pypi-package.sh
+index 1035591..bb8cbae 100755
+--- a/scripts/build-pypi-package.sh
++++ b/scripts/build-pypi-package.sh
+@@ -98,7 +98,7 @@ rsync -avm --filter='- tests/' --filter='+ */' --filter='-! *.py' "${SCRIPTS_DIR
+ sed -i -e "/__version__/s/= \".*\"/= \"${PACKAGE_VERSION}\"/" "${BUILD_ROOT}/${MODULE_NAME}/version.py"
+
+ # Copy binary files.
+-BINARY_FILE="${SCRIPTS_DIRECTORY}/../_build/default/main.exe"
++BINARY_FILE="NIX_BINARY_FILE"
+ if [[ ! -f "${BINARY_FILE}" ]]; then
+ echo "The binary file ${BINARY_FILE} does not exist."
+ echo "Have you run 'make' in the toplevel directory?"
+@@ -146,7 +146,7 @@ def find_typeshed_files(base):
+ result.append((target, files))
+ return result
+
+-with open('README.md') as f:
++with open('README.md', encoding='utf8') as f:
+ long_description = f.read()
+
+ setup(
+@@ -205,20 +205,3 @@ fi
+
+ # Build.
+ python3 setup.py bdist_wheel
+-
+-# Move artifact outside the build directory.
+-mkdir -p "${SCRIPTS_DIRECTORY}/dist"
+-files_count="$(find "${BUILD_ROOT}/dist/" -type f | wc -l | tr -d ' ')"
+-[[ "${files_count}" == '1' ]] || \
+- die "${files_count} files created in ${BUILD_ROOT}/dist, but only one was expected"
+-source_file="$(find "${BUILD_ROOT}/dist/" -type f)"
+-destination="$(basename "${source_file}")"
+-destination="${destination/%-any.whl/-${WHEEL_DISTRIBUTION_PLATFORM}.whl}"
+-mv "${source_file}" "${SCRIPTS_DIRECTORY}/dist/${destination}"
+-
+-# Cleanup.
+-cd "${SCRIPTS_DIRECTORY}"
+-rm -rf "${BUILD_ROOT}"
+-
+-printf '\nAll done. Build artifact available at:\n %s\n' "${SCRIPTS_DIRECTORY}/dist/${destination}"
+-exit 0
diff --git a/pkgs/development/tools/ydiff/default.nix b/pkgs/development/tools/ydiff/default.nix
new file mode 100644
index 00000000000..c2f72138db5
--- /dev/null
+++ b/pkgs/development/tools/ydiff/default.nix
@@ -0,0 +1,45 @@
+{ stdenv, lib, pythonPackages, python3Packages, less, patchutils, git
+, subversion, coreutils, which }:
+
+with pythonPackages;
+
+buildPythonApplication rec {
+ pname = "ydiff";
+ version = "1.1";
+
+ src = fetchPypi {
+ inherit pname version;
+ sha256 = "0mxcl17sx1d4vaw22ammnnn3y19mm7r6ljbarcjzi519klz26bnf";
+ };
+
+ patchPhase = ''
+ substituteInPlace tests/test_ydiff.py \
+ --replace /bin/rm ${coreutils}/bin/rm \
+ --replace /bin/sh ${stdenv.shell}
+ substituteInPlace Makefile \
+ --replace "pep8 --ignore" "# pep8 --ignore" \
+ --replace "python3 \`which coverage\`" "${python3Packages.coverage}/bin/coverage3" \
+ --replace /bin/sh ${stdenv.shell} \
+ --replace tests/regression.sh "${stdenv.shell} tests/regression.sh"
+ patchShebangs tests/*.sh
+ '';
+
+ buildInputs = [ docutils pygments ];
+ propagatedBuildInputs = [ less patchutils ];
+ checkInputs = [ coverage coreutils git subversion which ];
+
+ checkTarget = if isPy3k then "test3" else "test";
+
+ meta = {
+ homepage = https://github.com/ymattw/ydiff;
+ description = "View colored, incremental diff in workspace or from stdin";
+ longDescription = ''
+ Term based tool to view colored, incremental diff in a version
+ controlled workspace (supports Git, Mercurial, Perforce and Svn
+ so far) or from stdin, with side by side (similar to diff -y)
+ and auto pager support.
+ '';
+ license = lib.licenses.bsd3;
+ maintainers = with lib.maintainers; [ leenaars ];
+ };
+}
diff --git a/pkgs/development/web/nodejs/nodejs.nix b/pkgs/development/web/nodejs/nodejs.nix
index b2ee7528814..ea764ef22e6 100644
--- a/pkgs/development/web/nodejs/nodejs.nix
+++ b/pkgs/development/web/nodejs/nodejs.nix
@@ -42,7 +42,7 @@ in
name = "${baseName}-${version}";
src = fetchurl {
- url = "http://nodejs.org/dist/v${version}/node-v${version}.tar.xz";
+ url = "https://nodejs.org/dist/v${version}/node-v${version}.tar.xz";
inherit sha256;
};
diff --git a/pkgs/development/web/nodejs/v6.nix b/pkgs/development/web/nodejs/v6.nix
index 2e94923441f..7250613e862 100644
--- a/pkgs/development/web/nodejs/v6.nix
+++ b/pkgs/development/web/nodejs/v6.nix
@@ -5,6 +5,6 @@ let
in
buildNodejs {
inherit enableNpm;
- version = "6.14.3";
- sha256 = "1jbrfk875aimm65wni059rrydmhp4z0hrxskq3ci6jvykxr8gwg3";
+ version = "6.14.4";
+ sha256 = "03zc6jhid6jyi871zlcrkjqffmrpxh01z2xfsl3xp2vzg2czqjws";
}
diff --git a/pkgs/games/arx-libertatis/default.nix b/pkgs/games/arx-libertatis/default.nix
index e000f743173..1ac5ce5007d 100644
--- a/pkgs/games/arx-libertatis/default.nix
+++ b/pkgs/games/arx-libertatis/default.nix
@@ -4,13 +4,13 @@
stdenv.mkDerivation rec {
name = "arx-libertatis-${version}";
- version = "2017-10-30";
+ version = "2018-08-26";
src = fetchFromGitHub {
owner = "arx";
repo = "ArxLibertatis";
- rev = "e5ea4e8f0f7e86102cfc9113c53daeb0bdee6dd3";
- sha256 = "11z0ndhk802jr3w3z5gfqw064g98v99xin883q1qd36jw96s27p5";
+ rev = "7b551739cc22fa25dae83bcc1a2b784ddecc729c";
+ sha256 = "1ybv3p74rywn0ajdbw7pyk7pd7py1db9h6x2pav2d28ndkkj4z8n";
};
buildInputs = [
diff --git a/pkgs/games/btanks/default.nix b/pkgs/games/btanks/default.nix
index 8379e1aa7bb..d606662323f 100644
--- a/pkgs/games/btanks/default.nix
+++ b/pkgs/games/btanks/default.nix
@@ -32,5 +32,6 @@ stdenv.mkDerivation rec {
homepage = https://sourceforge.net/projects/btanks/;
description = "Fast 2d tank arcade game";
license = stdenv.lib.licenses.gpl2Plus;
+ broken = true; # 2018-09-13, no successful build since 2018-03-16
};
}
diff --git a/pkgs/games/chessx/default.nix b/pkgs/games/chessx/default.nix
index c8d23fcc9de..e4ec4dffa1d 100644
--- a/pkgs/games/chessx/default.nix
+++ b/pkgs/games/chessx/default.nix
@@ -1,30 +1,41 @@
-{ stdenv, pkgconfig, zlib, qtbase, qtsvg, qttools, qtmultimedia, qmake, fetchurl }:
+{ stdenv, pkgconfig, zlib, qtbase, qtsvg, qttools, qtmultimedia, qmake, fetchurl, makeWrapper
+, lib
+}:
+
stdenv.mkDerivation rec {
name = "chessx-${version}";
version = "1.4.6";
+
src = fetchurl {
url = "mirror://sourceforge/chessx/chessx-${version}.tgz";
sha256 = "1vb838byzmnyglm9mq3khh3kddb9g4g111cybxjzalxxlc81k5dd";
};
+
buildInputs = [
- qtbase
- qtsvg
- qttools
- qtmultimedia
- zlib
+ qtbase
+ qtsvg
+ qttools
+ qtmultimedia
+ zlib
];
- nativeBuildInputs = [ pkgconfig qmake ];
+
+ nativeBuildInputs = [ pkgconfig qmake makeWrapper ];
# RCC: Error in 'resources.qrc': Cannot find file 'i18n/chessx_da.qm'
enableParallelBuilding = false;
installPhase = ''
- runHook preInstall
- mkdir -p "$out/bin"
- mkdir -p "$out/share/applications"
- cp -pr release/chessx "$out/bin"
- cp -pr unix/chessx.desktop "$out/share/applications"
- runHook postInstall
+ runHook preInstall
+
+ mkdir -p "$out/bin"
+ mkdir -p "$out/share/applications"
+ cp -pr release/chessx "$out/bin"
+ cp -pr unix/chessx.desktop "$out/share/applications"
+
+ wrapProgram $out/bin/chessx \
+ --prefix QT_PLUGIN_PATH : ${qtbase}/lib/qt-5.${lib.versions.minor qtbase.version}/plugins
+
+ runHook postInstall
'';
meta = with stdenv.lib; {
@@ -32,5 +43,6 @@ stdenv.mkDerivation rec {
description = "ChessX allows you to browse and analyse chess games";
license = licenses.gpl2;
maintainers = [maintainers.luispedro];
+ platforms = platforms.linux;
};
}
diff --git a/pkgs/games/dwarf-fortress/default.nix b/pkgs/games/dwarf-fortress/default.nix
index aa4ff210812..88a6d72bc48 100644
--- a/pkgs/games/dwarf-fortress/default.nix
+++ b/pkgs/games/dwarf-fortress/default.nix
@@ -5,67 +5,112 @@
# This directory menaces with spikes of Nix code. It is terrifying.
#
# If this is your first time here, you should probably install the dwarf-fortress-full package,
-# for instance with `environment.systempackages = [ pkgs.dwarf-fortress.dwarf-fortress-full ];`.
+# for instance with:
+#
+# environment.systemPackages = [ pkgs.dwarf-fortress-packages.dwarf-fortress-full ];
#
# You can adjust its settings by using override, or compile your own package by
-# using the other packages here. Take a look at lazy-pack.nix to get an idea of
-# how.
+# using the other packages here.
+#
+# For example, you can enable the FPS indicator, disable the intro, pick a
+# theme other than phoebus (the default for dwarf-fortress-full), _and_ use
+# an older version with something like:
+#
+# environment.systemPackages = [
+# (pkgs.dwarf-fortress-packages.dwarf-fortress-full.override {
+# dfVersion = "0.44.11";
+# theme = "cla";
+# enableIntro = false;
+# enableFPS = true;
+# })
+# ]
+#
+# Take a look at lazy-pack.nix to see all the other options.
#
# You will find the configuration files in ~/.local/share/df_linux/data/init. If
# you un-symlink them and edit, then the scripts will avoid overwriting your
# changes on later launches, but consider extending the wrapper with your
# desired options instead.
-#
-# Although both dfhack and dwarf therapist are included in the lazy pack, you
-# can only use one at a time. DFHack does have therapist-like features, so this
-# may or may not be a problem.
+
+with lib;
let
callPackage = pkgs.newScope self;
+ # The latest Dwarf Fortress version. Maintainers: when a new version comes
+ # out, ensure that (unfuck|dfhack|twbt) are all up to date before changing
+ # this.
+ latestVersion = "0.44.12";
+
+ # Converts a version to a package name.
+ versionToName = version: "dwarf-fortress_${lib.replaceStrings ["."] ["_"] version}";
+
+ # A map of names to each Dwarf Fortress package we know about.
df-games = lib.listToAttrs (map (dfVersion: {
- name = "dwarf-fortress_${lib.replaceStrings ["."] ["_"] dfVersion}";
- value = callPackage ./wrapper {
- inherit (self) themes;
- dwarf-fortress = callPackage ./game.nix { inherit dfVersion; };
- };
+ name = versionToName dfVersion;
+ value =
+ let
+ # I can't believe this syntax works. Spikes of Nix code indeed...
+ dwarf-fortress = callPackage ./game.nix {
+ inherit dfVersion;
+ inherit dwarf-fortress-unfuck;
+ };
+
+ # unfuck is linux-only right now, we will only use it there.
+ dwarf-fortress-unfuck = if stdenv.isLinux then callPackage ./unfuck.nix { inherit dfVersion; }
+ else null;
+
+ twbt = callPackage ./twbt { inherit dfVersion; };
+
+ dfhack = callPackage ./dfhack {
+ inherit (pkgs.perlPackages) XMLLibXML XMLLibXSLT;
+ inherit dfVersion twbt;
+ stdenv = gccStdenv;
+ };
+
+ dwarf-therapist = callPackage ./dwarf-therapist/wrapper.nix {
+ inherit dwarf-fortress;
+ dwarf-therapist = pkgs.qt5.callPackage ./dwarf-therapist {
+ texlive = pkgs.texlive.combine {
+ inherit (pkgs.texlive) scheme-basic float caption wrapfig adjmulticol sidecap preprint enumitem;
+ };
+ };
+ };
+ in
+ callPackage ./wrapper {
+ inherit (self) themes;
+
+ dwarf-fortress = dwarf-fortress;
+ dwarf-fortress-unfuck = dwarf-fortress-unfuck;
+ twbt = twbt;
+ dfhack = dfhack;
+ dwarf-therapist = dwarf-therapist;
+ };
}) (lib.attrNames self.df-hashes));
self = rec {
df-hashes = builtins.fromJSON (builtins.readFile ./game.json);
- dwarf-fortress = df-games.dwarf-fortress_0_44_12;
- dwarf-fortress-full = callPackage ./lazy-pack.nix { };
+ # Aliases for the latest Dwarf Fortress and the selected Therapist install
+ dwarf-fortress = getAttr (versionToName latestVersion) df-games;
+ dwarf-therapist = dwarf-fortress.dwarf-therapist;
+ dwarf-fortress-original = dwarf-fortress.dwarf-fortress;
- dfhack = callPackage ./dfhack {
- inherit (pkgs.perlPackages) XMLLibXML XMLLibXSLT;
- stdenv = gccStdenv;
+ dwarf-fortress-full = callPackage ./lazy-pack.nix {
+ inherit df-games versionToName latestVersion;
};
-
+
soundSense = callPackage ./soundsense.nix { };
- # unfuck is linux-only right now, we will only use it there.
- dwarf-fortress-unfuck = if stdenv.isLinux then callPackage ./unfuck.nix { }
- else null;
-
- dwarf-therapist = callPackage ./dwarf-therapist/wrapper.nix {
- inherit (dwarf-fortress) dwarf-fortress;
- dwarf-therapist = pkgs.qt5.callPackage ./dwarf-therapist {
- texlive = pkgs.texlive.combine {
- inherit (pkgs.texlive) scheme-basic float caption wrapfig adjmulticol sidecap preprint enumitem;
- };
- };
- };
-
legends-browser = callPackage ./legends-browser {};
- twbt = callPackage ./twbt {};
- themes = recurseIntoAttrs (callPackage ./themes { });
+ themes = recurseIntoAttrs (callPackage ./themes {
+ stdenv = stdenvNoCC;
+ });
- # aliases
+ # Theme aliases
phoebus-theme = themes.phoebus;
cla-theme = themes.cla;
- dwarf-fortress-original = dwarf-fortress.dwarf-fortress;
};
in self // df-games
diff --git a/pkgs/games/dwarf-fortress/dfhack/default.nix b/pkgs/games/dwarf-fortress/dfhack/default.nix
index 4a8c84cf92d..d65bdab8491 100644
--- a/pkgs/games/dwarf-fortress/dfhack/default.nix
+++ b/pkgs/games/dwarf-fortress/dfhack/default.nix
@@ -3,14 +3,62 @@
, enableStoneSense ? false, allegro5, libGLU_combined
, enableTWBT ? true, twbt
, SDL
+, dfVersion
}:
+with lib;
+
let
- dfVersion = "0.44.12";
- version = "${dfVersion}-r1";
+ dfhack-releases = {
+ "0.43.05" = {
+ dfHackRelease = "0.43.05-r3.1";
+ sha256 = "1ds366i0qcfbn62w9qv98lsqcrm38npzgvcr35hf6ihqa6nc6xrl";
+ xmlRev = "860a9041a75305609643d465123a4b598140dd7f";
+ prerelease = false;
+ };
+ "0.44.05" = {
+ dfHackRelease = "0.44.05-r2";
+ sha256 = "1cwifdhi48a976xc472nf6q2k0ibwqffil5a4llcymcxdbgxdcc9";
+ xmlRev = "2794f8a6d7405d4858bac486a0bb17b94740c142";
+ prerelease = false;
+ };
+ "0.44.09" = {
+ dfHackRelease = "0.44.09-r1";
+ sha256 = "1nkfaa43pisbyik5inj5q2hja2vza5lwidg5z02jyh136jm64hwk";
+ xmlRev = "3c0bf63674d5430deadaf7befaec42f0ec1e8bc5";
+ prerelease = false;
+ };
+ "0.44.10" = {
+ dfHackRelease = "0.44.10-r2";
+ sha256 = "19bxsghxzw3bilhr8sm4axz7p7z8lrvbdsd1vdjf5zbg04rs866i";
+ xmlRev = "321bd48b10c4c3f694cc801a7dee6be392c09b7b";
+ prerelease = false;
+ };
+ "0.44.11" = {
+ dfHackRelease = "0.44.11-beta2.1";
+ sha256 = "1jgwcqg9m1ybv3szgnklp6zfpiw5mswla464dlj2gfi5v82zqbv2";
+ xmlRev = "f27ebae6aa8fb12c46217adec5a812cd49a905c8";
+ prerelease = true;
+ };
+ "0.44.12" = {
+ dfHackRelease = "0.44.12-r1";
+ sha256 = "0j03lq6j6w378z6cvm7jspxc7hhrqm8jaszlq0mzfvap0k13fgyy";
+ xmlRev = "23500e4e9bd1885365d0a2ef1746c321c1dd5094";
+ prerelease = false;
+ };
+ };
+
+ release = if hasAttr dfVersion dfhack-releases
+ then getAttr dfVersion dfhack-releases
+ else throw "[DFHack] Unsupported Dwarf Fortress version: ${dfVersion}";
+
+ version = release.dfHackRelease;
+
+ warning = if release.prerelease then builtins.trace "[DFHack] Version ${version} is a prerelease. Careful!"
+ else null;
# revision of library/xml submodule
- xmlRev = "23500e4e9bd1885365d0a2ef1746c321c1dd5094";
+ xmlRev = release.xmlRev;
arch =
if stdenv.hostPlatform.system == "x86_64-linux" then "64"
@@ -21,6 +69,10 @@ let
#! ${stdenv.shell}
if [ "$*" = "describe --tags --long" ]; then
echo "${version}-unknown"
+ elif [ "$*" = "describe --tags --abbrev=8 --long" ]; then
+ echo "${version}-unknown"
+ elif [ "$*" = "describe --tags --abbrev=8 --exact-match" ]; then
+ echo "${version}"
elif [ "$*" = "rev-parse HEAD" ]; then
if [ "$(dirname "$(pwd)")" = "xml" ]; then
echo "${xmlRev}"
@@ -41,8 +93,8 @@ let
src = fetchFromGitHub {
owner = "DFHack";
repo = "dfhack";
- sha256 = "0j03lq6j6w378z6cvm7jspxc7hhrqm8jaszlq0mzfvap0k13fgyy";
- rev = version;
+ rev = release.dfHackRelease;
+ sha256 = release.sha256;
fetchSubmodules = true;
};
diff --git a/pkgs/games/dwarf-fortress/dwarf-therapist/dwarf-therapist.in b/pkgs/games/dwarf-fortress/dwarf-therapist/dwarf-therapist.in
new file mode 100644
index 00000000000..77936c430e2
--- /dev/null
+++ b/pkgs/games/dwarf-fortress/dwarf-therapist/dwarf-therapist.in
@@ -0,0 +1,26 @@
+#!@stdenv_shell@ -e
+
+[ -z "$DT_DIR" ] && DT_DIR="${XDG_DATA_HOME:-$HOME/.local/share}/dwarftherapist"
+
+install_dir="@install@"
+therapist_dir="@therapist@"
+
+cat <&2
+Using $DT_DIR as Dwarf Therapist overlay directory.
+EOF
+
+update_path() {
+ local path="$1"
+
+ mkdir -p "$DT_DIR/$(dirname "$path")"
+ if [ ! -e "$DT_DIR/$path" ] || [ -L "$DT_DIR/$path" ]; then
+ rm -f "$DT_DIR/$path"
+ ln -s "$install_dir/share/dwarftherapist/$path" "$DT_DIR/$path"
+ fi
+}
+
+cd "$install_dir/share/dwarftherapist"
+update_path memory_layouts
+
+QT_QPA_PLATFORM_PLUGIN_PATH="@qt_plugin_path@" \
+ exec "$therapist_dir/bin/dwarftherapist" "$@"
diff --git a/pkgs/games/dwarf-fortress/dwarf-therapist/wrapper.nix b/pkgs/games/dwarf-fortress/dwarf-therapist/wrapper.nix
index 322a21ec3ad..071ab2af0c5 100644
--- a/pkgs/games/dwarf-fortress/dwarf-therapist/wrapper.nix
+++ b/pkgs/games/dwarf-fortress/dwarf-therapist/wrapper.nix
@@ -1,12 +1,16 @@
-{ stdenv, symlinkJoin, dwarf-therapist, dwarf-fortress, makeWrapper }:
+{ pkgs, stdenv, symlinkJoin, lib, dwarf-therapist, dwarf-fortress, makeWrapper }:
let
platformSlug = if stdenv.targetPlatform.is32bit then
"linux32" else "linux64";
inifile = "linux/v0.${dwarf-fortress.baseVersion}.${dwarf-fortress.patchVersion}_${platformSlug}.ini";
-in symlinkJoin {
+in
+
+stdenv.mkDerivation rec {
name = "dwarf-therapist-${dwarf-therapist.version}";
+
+ wrapper = ./dwarf-therapist.in;
paths = [ dwarf-therapist ];
@@ -14,20 +18,33 @@ in symlinkJoin {
passthru = { inherit dwarf-fortress dwarf-therapist; };
- postBuild = ''
- # DwarfTherapist assumes it's run in $out/share/dwarftherapist and
- # therefore uses many relative paths.
- wrapProgram $out/bin/dwarftherapist \
- --run "cd $out/share/dwarftherapist"
+ buildCommand = ''
+ mkdir -p $out/bin
ln -s $out/bin/dwarftherapist $out/bin/DwarfTherapist
+ substitute $wrapper $out/bin/dwarftherapist \
+ --subst-var-by stdenv_shell ${stdenv.shell} \
+ --subst-var-by install $out \
+ --subst-var-by therapist ${dwarf-therapist} \
+ --subst-var-by qt_plugin_path "${pkgs.qt5.qtbase}/lib/qt-${pkgs.qt5.qtbase.qtCompatVersion}/plugins/platforms"
+ chmod 755 $out/bin/dwarftherapist
+
+ # Fix up memory layouts
rm -rf $out/share/dwarftherapist/memory_layouts/linux
mkdir -p $out/share/dwarftherapist/memory_layouts/linux
- origmd5=$(cat "${dwarf-fortress}/hash.md5.orig" | cut -c1-8)
- patchedmd5=$(cat "${dwarf-fortress}/hash.md5" | cut -c1-8)
- substitute \
- ${dwarf-therapist}/share/dwarftherapist/memory_layouts/${inifile} \
- $out/share/dwarftherapist/memory_layouts/${inifile} \
- --replace "$origmd5" "$patchedmd5"
+ orig_md5=$(cat "${dwarf-fortress}/hash.md5.orig" | cut -c1-8)
+ patched_md5=$(cat "${dwarf-fortress}/hash.md5" | cut -c1-8)
+ input_file="${dwarf-therapist}/share/dwarftherapist/memory_layouts/${inifile}"
+ output_file="$out/share/dwarftherapist/memory_layouts/${inifile}"
+
+ echo "[Dwarf Therapist Wrapper] Fixing Dwarf Fortress MD5 prefix:"
+ echo " Input: $input_file"
+ echo " Search: $orig_md5"
+ echo " Output: $output_file"
+ echo " Replace: $patched_md5"
+
+ substitute "$input_file" "$output_file" --replace "$orig_md5" "$patched_md5"
'';
+
+ preferLocalBuild = true;
}
diff --git a/pkgs/games/dwarf-fortress/game.nix b/pkgs/games/dwarf-fortress/game.nix
index 2547bb83f3f..b5c80a0a56d 100644
--- a/pkgs/games/dwarf-fortress/game.nix
+++ b/pkgs/games/dwarf-fortress/game.nix
@@ -42,9 +42,6 @@ let
in
-assert dwarf-fortress-unfuck != null ->
- dwarf-fortress-unfuck.dfVersion == dfVersion;
-
stdenv.mkDerivation {
name = "dwarf-fortress-${dfVersion}";
diff --git a/pkgs/games/dwarf-fortress/lazy-pack.nix b/pkgs/games/dwarf-fortress/lazy-pack.nix
index 3e0d3dcc6d7..3a81dcc9c93 100644
--- a/pkgs/games/dwarf-fortress/lazy-pack.nix
+++ b/pkgs/games/dwarf-fortress/lazy-pack.nix
@@ -1,13 +1,14 @@
-{ stdenvNoCC, lib, buildEnv
-, dwarf-fortress, themes
+{ stdenvNoCC, lib, buildEnv, callPackage
+, df-games, themes, latestVersion, versionToName
+, dfVersion ? latestVersion
# This package should, at any given time, provide an opinionated "optimal"
# DF experience. It's the equivalent of the Lazy Newbie Pack, that is, and
- # should contain every utility available.
+ # should contain every utility available unless you disable them.
, enableDFHack ? stdenvNoCC.isLinux
, enableTWBT ? enableDFHack
, enableSoundSense ? true
-, enableStoneSense ? false # StoneSense is currently broken.
-, enableDwarfTherapist ? true, dwarf-therapist
+, enableStoneSense ? true
+, enableDwarfTherapist ? true
, enableLegendsBrowser ? true, legends-browser
, theme ? themes.phoebus
# General config options:
@@ -16,6 +17,15 @@
, enableFPS ? false
}:
+with lib;
+
+let
+ dfGame = versionToName dfVersion;
+ dwarf-fortress = if hasAttr dfGame df-games
+ then getAttr dfGame df-games
+ else throw "Unknown Dwarf Fortress version: ${dfVersion}";
+ dwarf-therapist = dwarf-fortress.dwarf-therapist;
+in
buildEnv {
name = "dwarf-fortress-full";
paths = [
@@ -28,7 +38,7 @@ buildEnv {
meta = with stdenvNoCC.lib; {
description = "An opinionated wrapper for Dwarf Fortress";
- maintainers = with maintainers; [ Baughn ];
+ maintainers = with maintainers; [ Baughn numinit ];
license = licenses.mit;
platforms = platforms.all;
homepage = https://github.com/NixOS/nixpkgs/;
diff --git a/pkgs/games/dwarf-fortress/themes/default.nix b/pkgs/games/dwarf-fortress/themes/default.nix
index 0b8eb23a7b9..feb4782d7c3 100644
--- a/pkgs/games/dwarf-fortress/themes/default.nix
+++ b/pkgs/games/dwarf-fortress/themes/default.nix
@@ -1,4 +1,4 @@
-{lib, fetchFromGitHub}:
+{lib, fetchFromGitHub, ...}:
with builtins;
diff --git a/pkgs/games/dwarf-fortress/twbt/default.nix b/pkgs/games/dwarf-fortress/twbt/default.nix
index d90812f5d05..7c80c101246 100644
--- a/pkgs/games/dwarf-fortress/twbt/default.nix
+++ b/pkgs/games/dwarf-fortress/twbt/default.nix
@@ -1,14 +1,59 @@
-{ stdenvNoCC, fetchurl, unzip }:
+{ stdenvNoCC, lib, fetchurl, unzip
+, dfVersion
+}:
+with lib;
+
+let
+ twbt-releases = {
+ "0.43.05" = {
+ twbtRelease = "6.22";
+ sha256 = "0di5d38f6jj9smsz0wjcs1zav4zba6hrk8cbn59kwpb1wamsh5c7";
+ prerelease = false;
+ };
+ "0.44.05" = {
+ twbtRelease = "6.35";
+ sha256 = "0qjkgl7dsqzsd7pdq8a5bihhi1wplfkv1id7sj6dp3swjpsfxp8g";
+ prerelease = false;
+ };
+ "0.44.09" = {
+ twbtRelease = "6.41";
+ sha256 = "0nsq15z05pbhqjvw2xqs1a9b1n2ma0aalhc3vh3mi4cd4k7lxh44";
+ prerelease = false;
+ };
+ "0.44.10" = {
+ twbtRelease = "6.49";
+ sha256 = "1qjkc7k33qhxj2g18njzasccjqsis5y8zrw5vl90h4rs3i8ld9xz";
+ prerelease = false;
+ };
+ "0.44.11" = {
+ twbtRelease = "6.51";
+ sha256 = "1yclqmarjd97ch054h425a12r8a5ailmflsd7b39cg4qhdr1nii5";
+ prerelease = true;
+ };
+ "0.44.12" = {
+ twbtRelease = "6.54";
+ sha256 = "10gfd6vv0vk4v1r5hjbz7vf1zqys06dsad695gysc7fbcik2dakh";
+ prerelease = false;
+ };
+ };
+
+ release = if hasAttr dfVersion twbt-releases
+ then getAttr dfVersion twbt-releases
+ else throw "[TWBT] Unsupported Dwarf Fortress version: ${dfVersion}";
+
+ warning = if release.prerelease then builtins.trace "[TWBT] Version ${version} is a prerelease. Careful!"
+ else null;
+
+in
stdenvNoCC.mkDerivation rec {
name = "twbt-${version}";
- version = "6.54";
- dfVersion = "0.44.12";
+ version = release.twbtRelease;
src = fetchurl {
url = "https://github.com/mifki/df-twbt/releases/download/v${version}/twbt-${version}-linux.zip";
- sha256 = "10gfd6vv0vk4v1r5hjbz7vf1zqys06dsad695gysc7fbcik2dakh";
+ sha256 = release.sha256;
};
sourceRoot = ".";
@@ -24,10 +69,9 @@ stdenvNoCC.mkDerivation rec {
cp -a *.png $art/data/art/
'';
-
meta = with stdenvNoCC.lib; {
description = "A plugin for Dwarf Fortress / DFHack that improves various aspects the game interface.";
- maintainers = with maintainers; [ Baughn ];
+ maintainers = with maintainers; [ Baughn numinit ];
license = licenses.mit;
platforms = platforms.linux;
homepage = https://github.com/mifki/df-twbt;
diff --git a/pkgs/games/dwarf-fortress/unfuck.nix b/pkgs/games/dwarf-fortress/unfuck.nix
index 0c5a81a52f0..c4d01b3ff39 100644
--- a/pkgs/games/dwarf-fortress/unfuck.nix
+++ b/pkgs/games/dwarf-fortress/unfuck.nix
@@ -1,18 +1,52 @@
-{ stdenv, fetchFromGitHub, cmake
+{ stdenv, lib, fetchFromGitHub, cmake
, libGL, libSM, SDL, SDL_image, SDL_ttf, glew, openalSoft
, ncurses, glib, gtk2, libsndfile, zlib
+, dfVersion
}:
-let dfVersion = "0.44.12"; in
+with lib;
+
+let
+ unfuck-releases = {
+ "0.43.05" = {
+ unfuckRelease = "0.43.05";
+ sha256 = "173dyrbxlzqvjf1j3n7vpns4gfjkpyvk9z16430xnmd5m6nda8p2";
+ };
+ "0.44.05" = {
+ unfuckRelease = "0.44.05";
+ sha256 = "00yj4l4gazxg4i6fj9rwri6vm17i6bviy2mpkx0z5c0mvsr7s14b";
+ };
+ "0.44.09" = {
+ unfuckRelease = "0.44.09";
+ sha256 = "138p0v8z2x47f0fk9k6g75ikw5wb3vxldwv5ggbkf4hhvlw6lvzm";
+ };
+ "0.44.10" = {
+ unfuckRelease = "0.44.10";
+ sha256 = "0vb19qx2ibc79j4bgbk9lskb883qfb0815zw1dfz9k7rqwal8mzj";
+ };
+ "0.44.11" = {
+ unfuckRelease = "0.44.11.1";
+ sha256 = "1kszkb1d1vll8p04ja41nangsaxb5lv4p3xh2jhmsmipfixw7nvz";
+ };
+ "0.44.12" = {
+ unfuckRelease = "0.44.12";
+ sha256 = "1kszkb1d1vll8p04ja41nangsaxb5lv4p3xh2jhmsmipfixw7nvz";
+ };
+ };
+
+ release = if hasAttr dfVersion unfuck-releases
+ then getAttr dfVersion unfuck-releases
+ else throw "[unfuck] Unknown Dwarf Fortress version: ${dfVersion}";
+in
stdenv.mkDerivation {
- name = "dwarf_fortress_unfuck-${dfVersion}";
+ name = "dwarf_fortress_unfuck-${release.unfuckRelease}";
src = fetchFromGitHub {
owner = "svenstaro";
repo = "dwarf_fortress_unfuck";
- rev = dfVersion;
- sha256 = "1kszkb1d1vll8p04ja41nangsaxb5lv4p3xh2jhmsmipfixw7nvz";
+ rev = release.unfuckRelease;
+ sha256 = release.sha256;
};
cmakeFlags = [
@@ -20,23 +54,12 @@ stdenv.mkDerivation {
"-DGTK2_GDKCONFIG_INCLUDE_DIR=${gtk2.out}/lib/gtk-2.0/include"
];
- makeFlags = [
- ''CFLAGS="-fkeep-inline-functions"''
- ''CXXFLAGS="-fkeep-inline-functions"''
- ];
-
nativeBuildInputs = [ cmake ];
buildInputs = [
libSM SDL SDL_image SDL_ttf glew openalSoft
ncurses gtk2 libsndfile zlib libGL
];
- postPatch = ''
- substituteInPlace CMakeLists.txt --replace \
- 'set(CMAKE_BUILD_TYPE Release)' \
- 'set(CMAKE_BUILD_TYPE Debug)'
- '';
-
# Don't strip unused symbols; dfhack hooks into some of them.
dontStrip = true;
@@ -56,6 +79,6 @@ stdenv.mkDerivation {
homepage = https://github.com/svenstaro/dwarf_fortress_unfuck;
license = licenses.free;
platforms = platforms.linux;
- maintainers = with maintainers; [ abbradar ];
+ maintainers = with maintainers; [ abbradar numinit ];
};
}
diff --git a/pkgs/games/dwarf-fortress/wrapper/default.nix b/pkgs/games/dwarf-fortress/wrapper/default.nix
index 6efe004fa9e..8d9f06ffe14 100644
--- a/pkgs/games/dwarf-fortress/wrapper/default.nix
+++ b/pkgs/games/dwarf-fortress/wrapper/default.nix
@@ -1,4 +1,6 @@
-{ stdenv, lib, buildEnv, dwarf-fortress, substituteAll
+{ stdenv, lib, buildEnv, substituteAll
+, dwarf-fortress, dwarf-fortress-unfuck
+, dwarf-therapist
, enableDFHack ? false, dfhack
, enableSoundSense ? false, soundSense, jdk
, enableStoneSense ? false
@@ -36,18 +38,29 @@ let
paths = themePkg ++ pkgs;
pathsToLink = [ "/" "/hack" "/hack/scripts" ];
- ignoreCollisions = true;
postBuild = ''
# De-symlink init.txt
cp $out/data/init/init.txt init.txt
- rm $out/data/init/init.txt
+ rm -f $out/data/init/init.txt
mv init.txt $out/data/init/init.txt
'' + lib.optionalString enableDFHack ''
+ # De-symlink symbols.xml
rm $out/hack/symbols.xml
- substitute ${dfhack_}/hack/symbols.xml $out/hack/symbols.xml \
- --replace $(cat ${dwarf-fortress}/hash.md5.orig) \
- $(cat ${dwarf-fortress}/hash.md5)
+
+ # Patch the MD5
+ orig_md5=$(cat "${dwarf-fortress}/hash.md5.orig")
+ patched_md5=$(cat "${dwarf-fortress}/hash.md5")
+ input_file="${dfhack_}/hack/symbols.xml"
+ output_file="$out/hack/symbols.xml"
+
+ echo "[DFHack Wrapper] Fixing Dwarf Fortress MD5:"
+ echo " Input: $input_file"
+ echo " Search: $orig_md5"
+ echo " Output: $output_file"
+ echo " Replace: $patched_md5"
+
+ substitute "$input_file" "$output_file" --replace "$orig_md5" "$patched_md5"
'' + lib.optionalString enableTWBT ''
substituteInPlace $out/data/init/init.txt \
--replace '[PRINT_MODE:2D]' '[PRINT_MODE:TWBT]'
@@ -57,14 +70,14 @@ let
--replace '[TRUETYPE:YES]' '[TRUETYPE:${unBool enableTruetype}]' \
--replace '[FPS:NO]' '[FPS:${unBool enableFPS}]'
'';
+
+ ignoreCollisions = true;
};
in
stdenv.mkDerivation rec {
name = "dwarf-fortress-${dwarf-fortress.dfVersion}";
- compatible = lib.all (x: assert (x.dfVersion == dwarf-fortress.dfVersion); true) pkgs;
-
dfInit = substituteAll {
name = "dwarf-fortress-init";
src = ./dwarf-fortress-init.in;
@@ -77,7 +90,7 @@ stdenv.mkDerivation rec {
runDFHack = ./dfhack.in;
runSoundSense = ./soundSense.in;
- passthru = { inherit dwarf-fortress; };
+ passthru = { inherit dwarf-fortress dwarf-therapist; };
buildCommand = ''
mkdir -p $out/bin
diff --git a/pkgs/games/openrct2/default.nix b/pkgs/games/openrct2/default.nix
index e5783ec5396..e41caa3db97 100644
--- a/pkgs/games/openrct2/default.nix
+++ b/pkgs/games/openrct2/default.nix
@@ -5,20 +5,20 @@
let
name = "openrct2-${version}";
- version = "0.2.0";
+ version = "0.2.1";
openrct2-src = fetchFromGitHub {
owner = "OpenRCT2";
repo = "OpenRCT2";
rev = "v${version}";
- sha256 = "1nmz8war8b49iicpc70gk7zlqizrvvwpidqm70lfpa0p68m7m3px";
+ sha256 = "0dl1f0gvq0ifaii66c7bwp8k822krcdn9l44prnyds6smrdmd3dq";
};
objects-src = fetchFromGitHub {
owner = "OpenRCT2";
repo = "objects";
- rev = "v1.0.2";
- sha256 = "1gl37fmhhrfgd6gilw0n7hfdq80a9b31bi5r0xhxg7d579jccb04";
+ rev = "v1.0.6";
+ sha256 = "1yhyafsk2lyasgj1r7h2n4k7vp5q792aj86ggpbmd6bcp4kk6hbm";
};
title-sequences-src = fetchFromGitHub {
diff --git a/pkgs/games/quakespasm/vulkan.nix b/pkgs/games/quakespasm/vulkan.nix
index 2cf09e2ec93..6f69c646950 100644
--- a/pkgs/games/quakespasm/vulkan.nix
+++ b/pkgs/games/quakespasm/vulkan.nix
@@ -1,4 +1,5 @@
-{ stdenv, SDL2, fetchFromGitHub, makeWrapper, gzip, libvorbis, libmad, vulkan-loader }:
+{ stdenv, SDL2, fetchFromGitHub, makeWrapper, gzip, libvorbis, libmad, vulkan-headers, vulkan-loader }:
+
stdenv.mkDerivation rec {
name = "vkquake-${version}";
majorVersion = "1.00";
@@ -13,8 +14,12 @@ stdenv.mkDerivation rec {
sourceRoot = "source/Quake";
+ nativeBuildInputs = [
+ makeWrapper vulkan-headers
+ ];
+
buildInputs = [
- makeWrapper gzip SDL2 libvorbis libmad vulkan-loader.dev
+ gzip SDL2 libvorbis libmad vulkan-loader
];
buildFlags = [ "DO_USERDIRS=1" ];
diff --git a/pkgs/games/steam/default.nix b/pkgs/games/steam/default.nix
index e8a911bebd5..5aab54b8322 100644
--- a/pkgs/games/steam/default.nix
+++ b/pkgs/games/steam/default.nix
@@ -19,6 +19,7 @@ let
then pkgs.pkgsi686Linux.steamPackages.steam-runtime-wrapped
else null;
};
+ steamcmd = callPackage ./steamcmd.nix { };
};
in self
diff --git a/pkgs/games/steam/steamcmd.nix b/pkgs/games/steam/steamcmd.nix
new file mode 100644
index 00000000000..6a2c7fe01b4
--- /dev/null
+++ b/pkgs/games/steam/steamcmd.nix
@@ -0,0 +1,46 @@
+{ stdenv, fetchurl, steam-run, bash
+, steamRoot ? "~/.local/share/Steam"
+}:
+
+stdenv.mkDerivation rec {
+ name = "steamcmd-${version}";
+ version = "20180104"; # According to steamcmd_linux.tar.gz mtime
+
+ src = fetchurl {
+ url = https://steamcdn-a.akamaihd.net/client/installer/steamcmd_linux.tar.gz;
+ sha256 = "0z0y0zqvhydmfc9y9vg5am0vz7m3gbj4l2dwlrfz936hpx301gyf";
+ };
+
+ # The source tarball does not have a single top-level directory.
+ preUnpack = ''
+ mkdir $name
+ cd $name
+ sourceRoot=.
+ '';
+
+ buildInputs = [ bash steam-run ];
+
+ dontBuild = true;
+
+ installPhase = ''
+ mkdir -p $out/share/steamcmd/linux32
+ install -Dm755 steamcmd.sh $out/share/steamcmd/steamcmd.sh
+ install -Dm755 linux32/* $out/share/steamcmd/linux32
+
+ mkdir -p $out/bin
+ substitute ${./steamcmd.sh} $out/bin/steamcmd \
+ --subst-var shell \
+ --subst-var out \
+ --subst-var-by steamRoot "${steamRoot}" \
+ --subst-var-by steamRun ${steam-run}
+ chmod 0755 $out/bin/steamcmd
+ '';
+
+ meta = with stdenv.lib; {
+ description = "Steam command-line tools";
+ homepage = "https://developer.valvesoftware.com/wiki/SteamCMD";
+ platforms = platforms.linux;
+ license = licenses.unfreeRedistributable;
+ maintainers = with maintainers; [ tadfisher ];
+ };
+}
diff --git a/pkgs/games/steam/steamcmd.sh b/pkgs/games/steam/steamcmd.sh
new file mode 100644
index 00000000000..e092a4fedbe
--- /dev/null
+++ b/pkgs/games/steam/steamcmd.sh
@@ -0,0 +1,24 @@
+#!@bash@/bin/bash -e
+
+# Always run steamcmd in the user's Steam root.
+STEAMROOT=@steamRoot@
+
+# Create a facsimile Steam root if it doesn't exist.
+if [ ! -e "$STEAMROOT" ]; then
+ mkdir -p "$STEAMROOT"/{appcache,config,logs,Steamapps/common}
+ mkdir -p ~/.steam
+ ln -sf "$STEAMROOT" ~/.steam/root
+ ln -sf "$STEAMROOT" ~/.steam/steam
+fi
+
+# Copy the system steamcmd install to the Steam root. If we don't do
+# this, steamcmd assumes the path to `steamcmd` is the Steam root.
+# Note that symlinks don't work here.
+if [ ! -e "$STEAMROOT/steamcmd.sh" ]; then
+ mkdir -p "$STEAMROOT/linux32"
+ # steamcmd.sh will replace these on first use
+ cp @out@/share/steamcmd/steamcmd.sh "$STEAMROOT/."
+ cp @out@/share/steamcmd/linux32/* "$STEAMROOT/linux32/."
+fi
+
+@steamRun@/bin/steam-run "$STEAMROOT/steamcmd.sh" "$@"
diff --git a/pkgs/misc/calaos/installer/default.nix b/pkgs/misc/calaos/installer/default.nix
index 36c8825d27a..618bc6d8505 100644
--- a/pkgs/misc/calaos/installer/default.nix
+++ b/pkgs/misc/calaos/installer/default.nix
@@ -16,7 +16,10 @@ stdenv.mkDerivation rec {
qmakeFlags = [ "REVISION=${version}" ];
- installPhase = ''
+ installPhase = if stdenv.isDarwin then ''
+ mkdir -p $out/Applications
+ cp -a calaos_installer.app $out/Applications
+ '' else ''
mkdir -p $out/bin
cp -a calaos_installer $out/bin
'';
diff --git a/pkgs/misc/cups/drivers/brlaser/default.nix b/pkgs/misc/cups/drivers/brlaser/default.nix
index 1786a4996a3..46c38892bf8 100644
--- a/pkgs/misc/cups/drivers/brlaser/default.nix
+++ b/pkgs/misc/cups/drivers/brlaser/default.nix
@@ -1,7 +1,6 @@
{ stdenv, fetchFromGitHub, cmake, zlib, cups }:
stdenv.mkDerivation rec {
-
name = "brlaser-${version}";
version = "4";
@@ -12,11 +11,10 @@ stdenv.mkDerivation rec {
sha256 = "1yy4mpf68c82h245srh2sd1yip29w6kx14gxk4hxkv496gf55lw5";
};
- buildInputs = [ cmake zlib cups ];
+ nativeBuildInputs = [ cmake ];
+ buildInputs = [ zlib cups ];
- preConfigure = ''
- cmakeFlags="$cmakeFlags -DCUPS_SERVER_BIN=$out/lib/cups/ -DCUPS_DATA_DIR=$out/share/cups/"
- '';
+ cmakeFlags = [ "-DCUPS_SERVER_BIN=$out/lib/cups" "-DCUPS_DATA_DIR=$out/share/cups" ];
meta = with stdenv.lib; {
description = "A CUPS driver for Brother laser printers";
@@ -37,7 +35,7 @@ stdenv.mkDerivation rec {
'';
homepage = https://github.com/pdewacht/brlaser;
license = licenses.gpl2;
- platforms = platforms.unix;
+ platforms = platforms.linux;
maintainers = with maintainers; [ StijnDW ];
};
}
diff --git a/pkgs/misc/drivers/sc-controller/default.nix b/pkgs/misc/drivers/sc-controller/default.nix
index f1c4ff09157..9de0ba27778 100644
--- a/pkgs/misc/drivers/sc-controller/default.nix
+++ b/pkgs/misc/drivers/sc-controller/default.nix
@@ -2,7 +2,7 @@
, gtk3, gobjectIntrospection, libappindicator-gtk3, librsvg
, evdev, pygobject3, pylibacl, pytest, bluez
, linuxHeaders
-, libX11, libXext, libXfixes, libusb1, libudev
+, libX11, libXext, libXfixes, libusb1, udev
}:
buildPythonApplication rec {
@@ -34,7 +34,7 @@ buildPythonApplication rec {
substituteInPlace scc/device_monitor.py --replace "find_library('bluetooth')" "'libbluetooth.so.3'"
'';
- LD_LIBRARY_PATH = lib.makeLibraryPath [ libX11 libXext libXfixes libusb1 libudev bluez ];
+ LD_LIBRARY_PATH = lib.makeLibraryPath [ libX11 libXext libXfixes libusb1 udev bluez ];
preFixup = ''
gappsWrapperArgs+=(--prefix LD_LIBRARY_PATH : "$LD_LIBRARY_PATH")
diff --git a/pkgs/misc/emulators/yabause/0001-Fixes-for-Qt-5.11-upgrade.patch b/pkgs/misc/emulators/yabause/0001-Fixes-for-Qt-5.11-upgrade.patch
new file mode 100644
index 00000000000..43539ef4ca5
--- /dev/null
+++ b/pkgs/misc/emulators/yabause/0001-Fixes-for-Qt-5.11-upgrade.patch
@@ -0,0 +1,67 @@
+From 3140afd6fb7dad7a25296526a71b005fb9eae048 Mon Sep 17 00:00:00 2001
+From: Samuel Dionne-Riel
+Date: Sat, 8 Sep 2018 00:44:08 -0400
+Subject: [PATCH] Fixes for Qt 5.11 upgrade
+
+---
+ src/qt/ui/UICheatRaw.cpp | 2 --
+ src/qt/ui/UICheatRaw.h | 2 +-
+ src/qt/ui/UICheats.cpp | 2 ++
+ src/qt/ui/UIHexInput.h | 2 ++
+ 4 files changed, 5 insertions(+), 3 deletions(-)
+
+diff --git a/src/qt/ui/UICheatRaw.cpp b/src/qt/ui/UICheatRaw.cpp
+index 4ad82d77..3f78486b 100755
+--- a/src/qt/ui/UICheatRaw.cpp
++++ b/src/qt/ui/UICheatRaw.cpp
+@@ -20,8 +20,6 @@
+ #include "UIHexInput.h"
+ #include "../QtYabause.h"
+
+-#include
+-
+ UICheatRaw::UICheatRaw( QWidget* p )
+ : QDialog( p )
+ {
+diff --git a/src/qt/ui/UICheatRaw.h b/src/qt/ui/UICheatRaw.h
+index d97b429d..20318c67 100755
+--- a/src/qt/ui/UICheatRaw.h
++++ b/src/qt/ui/UICheatRaw.h
+@@ -21,7 +21,7 @@
+
+ #include "ui_UICheatRaw.h"
+
+-class QButtonGroup;
++#include
+
+ class UICheatRaw : public QDialog, public Ui::UICheatRaw
+ {
+diff --git a/src/qt/ui/UICheats.cpp b/src/qt/ui/UICheats.cpp
+index c6027972..44d341c3 100755
+--- a/src/qt/ui/UICheats.cpp
++++ b/src/qt/ui/UICheats.cpp
+@@ -21,6 +21,8 @@
+ #include "UICheatRaw.h"
+ #include "../CommonDialogs.h"
+
++#include
++
+ UICheats::UICheats( QWidget* p )
+ : QDialog( p )
+ {
+diff --git a/src/qt/ui/UIHexInput.h b/src/qt/ui/UIHexInput.h
+index f333b016..4bd8aed4 100644
+--- a/src/qt/ui/UIHexInput.h
++++ b/src/qt/ui/UIHexInput.h
+@@ -22,6 +22,8 @@
+ #include "ui_UIHexInput.h"
+ #include "../QtYabause.h"
+
++#include
++
+ class HexValidator : public QValidator
+ {
+ Q_OBJECT
+--
+2.16.4
+
diff --git a/pkgs/misc/emulators/yabause/default.nix b/pkgs/misc/emulators/yabause/default.nix
index e7237fd4454..a2d462fd990 100644
--- a/pkgs/misc/emulators/yabause/default.nix
+++ b/pkgs/misc/emulators/yabause/default.nix
@@ -1,21 +1,24 @@
-{ stdenv, fetchurl, cmake, pkgconfig, qtbase, libGLU_combined
+{ stdenv, fetchurl, cmake, pkgconfig, qtbase, qt5, libGLU_combined
, freeglut ? null, openal ? null, SDL2 ? null }:
stdenv.mkDerivation rec {
name = "yabause-${version}";
- # 0.9.15 only works with OpenGL 3.2 or later:
- # https://github.com/Yabause/yabause/issues/349
- version = "0.9.14";
+ version = "0.9.15";
src = fetchurl {
url = "https://download.tuxfamily.org/yabause/releases/${version}/${name}.tar.gz";
- sha256 = "0nkpvnr599g0i2mf19sjvw5m0rrvixdgz2snav4qwvzgfc435rkm";
+ sha256 = "1cn2rjjb7d9pkr4g5bqz55vd4pzyb7hg94cfmixjkzzkw0zw8d23";
};
nativeBuildInputs = [ cmake pkgconfig ];
- buildInputs = [ qtbase libGLU_combined freeglut openal SDL2 ];
+ buildInputs = [ qtbase qt5.qtmultimedia libGLU_combined freeglut openal SDL2 ];
- patches = [ ./emu-compatibility.com.patch ./linkage-rwx-linux-elf.patch ];
+ patches = [
+ ./linkage-rwx-linux-elf.patch
+ # Fixes derived from
+ # https://github.com/Yabause/yabause/commit/06a816c032c6f7fd79ced6e594dd4b33571a0e73
+ ./0001-Fixes-for-Qt-5.11-upgrade.patch
+ ];
cmakeFlags = [
"-DYAB_NETWORK=ON"
diff --git a/pkgs/misc/emulators/yabause/emu-compatibility.com.patch b/pkgs/misc/emulators/yabause/emu-compatibility.com.patch
deleted file mode 100644
index 5f13d2ee183..00000000000
--- a/pkgs/misc/emulators/yabause/emu-compatibility.com.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- a/src/qt/ui/UIYabause.ui 2017-09-28 13:23:04.636014753 +0000
-+++ b/src/qt/ui/UIYabause.ui 2017-09-28 13:23:21.945763537 +0000
-@@ -230,7 +230,6 @@
-
- &Help
-
--
-
-
-