diff --git a/doc/cross-compilation.xml b/doc/cross-compilation.xml
index c7187d86d1b3..3b90596bcc2c 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/functions.xml b/doc/functions.xml
index ec188e234543..6e3189aebdc3 100644
--- a/doc/functions.xml
+++ b/doc/functions.xml
@@ -628,6 +628,48 @@ merge:"diff3"
pkgs.cacert to contents.
+
+
+ Impurely Defining a Docker Layer's Creation Date
+
+ By default buildImage will use a static
+ date of one second past the UNIX Epoch. This allows
+ buildImage to produce binary reproducible
+ images. When listing images with docker list
+ images, the newly created images will be listed like
+ this:
+
+
+
+ You can break binary reproducibility but have a sorted,
+ meaningful CREATED column by setting
+ created to now.
+
+
+
+ and now the Docker CLI will display a reasonable date and
+ sort the images as expected:
+
+ however, the produced images will not be binary reproducible.
+
+
diff --git a/doc/languages-frameworks/rust.section.md b/doc/languages-frameworks/rust.section.md
index 6588281878a0..4549bbd1686b 100644
--- a/doc/languages-frameworks/rust.section.md
+++ b/doc/languages-frameworks/rust.section.md
@@ -64,9 +64,6 @@ When the `Cargo.lock`, provided by upstream, is not in sync with the
added in `cargoPatches` will also be prepended to the patches in `patches` at
build-time.
-To install crates with nix there is also an experimental project called
-[nixcrates](https://github.com/fractalide/nixcrates).
-
## Compiling Rust crates using Nix instead of Cargo
### Simple operation
diff --git a/doc/languages-frameworks/vim.section.md b/doc/languages-frameworks/vim.section.md
index 1d6a4fe8da8d..26aa9c25f06f 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.
diff --git a/doc/package-notes.xml b/doc/package-notes.xml
index 7b8657fb4a13..354b17e739e1 100644
--- a/doc/package-notes.xml
+++ b/doc/package-notes.xml
@@ -671,6 +671,8 @@ overrides = self: super: rec {
plugins = with availablePlugins; [ python perl ];
}
}
+ If the configure function returns an attrset without the plugins
+ attribute, availablePlugins will be used automatically.
@@ -704,6 +706,55 @@ overrides = self: super: rec {
}; }
+
+ WeeChat allows to set defaults on startup using the --run-command.
+ The configure method can be used to pass commands to the program:
+weechat.override {
+ configure = { availablePlugins, ... }: {
+ init = ''
+ /set foo bar
+ /server add freenode chat.freenode.org
+ '';
+ };
+}
+ Further values can be added to the list of commands when running
+ weechat --run-command "your-commands".
+
+
+ Additionally it's possible to specify scripts to be loaded when starting weechat.
+ These will be loaded before the commands from init:
+weechat.override {
+ configure = { availablePlugins, ... }: {
+ scripts = with pkgs.weechatScripts; [
+ weechat-xmpp weechat-matrix-bridge wee-slack
+ ];
+ init = ''
+ /set plugins.var.python.jabber.key "val"
+ '':
+ };
+}
+
+
+ In nixpkgs there's a subpackage which contains derivations for
+ WeeChat scripts. Such derivations expect a passthru.scripts attribute
+ which contains a list of all scripts inside the store path. Furthermore all scripts
+ have to live in $out/share. An exemplary derivation looks like this:
+{ stdenv, fetchurl }:
+
+stdenv.mkDerivation {
+ name = "exemplary-weechat-script";
+ src = fetchurl {
+ url = "https://scripts.tld/your-scripts.tar.gz";
+ sha256 = "...";
+ };
+ passthru.scripts = [ "foo.py" "bar.lua" ];
+ installPhase = ''
+ mkdir $out/share
+ cp foo.py $out/share
+ cp bar.lua $out/share
+ '';
+}
+
Citrix Receiver
diff --git a/lib/licenses.nix b/lib/licenses.nix
index c442d74c857c..9e551acbe26b 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/lib/minver.nix b/lib/minver.nix
index fee6b65a2447..2147820c0e49 100644
--- a/lib/minver.nix
+++ b/lib/minver.nix
@@ -1,2 +1,2 @@
# Expose the minimum required version for evaluating Nixpkgs
-"2.0"
+"1.11"
diff --git a/lib/trivial.nix b/lib/trivial.nix
index b75e81eb7352..e702b8cdcc9f 100644
--- a/lib/trivial.nix
+++ b/lib/trivial.nix
@@ -36,18 +36,18 @@ rec {
/* bitwise “and” */
bitAnd = builtins.bitAnd
- or import ./zip-int-bits.nix
- (a: b: if a==1 && b==1 then 1 else 0);
+ or (import ./zip-int-bits.nix
+ (a: b: if a==1 && b==1 then 1 else 0));
/* bitwise “or” */
bitOr = builtins.bitOr
- or import ./zip-int-bits.nix
- (a: b: if a==1 || b==1 then 1 else 0);
+ or (import ./zip-int-bits.nix
+ (a: b: if a==1 || b==1 then 1 else 0));
/* bitwise “xor” */
bitXor = builtins.bitXor
- or import ./zip-int-bits.nix
- (a: b: if a!=b then 1 else 0);
+ or (import ./zip-int-bits.nix
+ (a: b: if a!=b then 1 else 0));
/* bitwise “not” */
bitNot = builtins.sub (-1);
diff --git a/nixos/doc/manual/default.nix b/nixos/doc/manual/default.nix
index be28c2c17afd..aaa6e0da545f 100644
--- a/nixos/doc/manual/default.nix
+++ b/nixos/doc/manual/default.nix
@@ -90,7 +90,9 @@ let
fi
${buildPackages.libxslt.bin}/bin/xsltproc \
--stringparam revision '${revision}' \
- -o $out ${./options-to-docbook.xsl} $optionsXML
+ -o intermediate.xml ${./options-to-docbook.xsl} $optionsXML
+ ${buildPackages.libxslt.bin}/bin/xsltproc \
+ -o "$out" ${./postprocess-option-descriptions.xsl} intermediate.xml
'';
sources = lib.sourceFilesBySuffices ./. [".xml"];
diff --git a/nixos/doc/manual/installation/upgrading.xml b/nixos/doc/manual/installation/upgrading.xml
index 85e5082575d3..69668b1d4bd6 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/options-to-docbook.xsl b/nixos/doc/manual/options-to-docbook.xsl
index 2038b0dff63e..72ac89d4ff62 100644
--- a/nixos/doc/manual/options-to-docbook.xsl
+++ b/nixos/doc/manual/options-to-docbook.xsl
@@ -4,6 +4,7 @@
xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
xmlns:str="http://exslt.org/strings"
xmlns:xlink="http://www.w3.org/1999/xlink"
+ xmlns:nixos="tag:nixos.org"
xmlns="http://docbook.org/ns/docbook"
extension-element-prefixes="str"
>
@@ -30,10 +31,12 @@
-
-
-
+
+
+
+
+
diff --git a/nixos/doc/manual/postprocess-option-descriptions.xsl b/nixos/doc/manual/postprocess-option-descriptions.xsl
new file mode 100644
index 000000000000..1201c7612c2e
--- /dev/null
+++ b/nixos/doc/manual/postprocess-option-descriptions.xsl
@@ -0,0 +1,115 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/nixos/modules/config/shells-environment.nix b/nixos/modules/config/shells-environment.nix
index 31adc9b82620..555db459f57a 100644
--- a/nixos/modules/config/shells-environment.nix
+++ b/nixos/modules/config/shells-environment.nix
@@ -163,15 +163,24 @@ in
/bin/sh
'';
+ # For resetting environment with `. /etc/set-environment` when needed
+ # and discoverability (see motivation of #30418).
+ environment.etc."set-environment".source = config.system.build.setEnvironment;
+
system.build.setEnvironment = pkgs.writeText "set-environment"
- ''
- ${exportedEnvVars}
+ ''
+ # DO NOT EDIT -- this file has been generated automatically.
- ${cfg.extraInit}
+ # Prevent this file from being sourced by child shells.
+ export __NIXOS_SET_ENVIRONMENT_DONE=1
- # ~/bin if it exists overrides other bin directories.
- export PATH="$HOME/bin:$PATH"
- '';
+ ${exportedEnvVars}
+
+ ${cfg.extraInit}
+
+ # ~/bin if it exists overrides other bin directories.
+ export PATH="$HOME/bin:$PATH"
+ '';
system.activationScripts.binsh = stringAfter [ "stdio" ]
''
diff --git a/nixos/modules/config/xdg/mime.nix b/nixos/modules/config/xdg/mime.nix
index f1b672234a34..eb8ac2a54ace 100644
--- a/nixos/modules/config/xdg/mime.nix
+++ b/nixos/modules/config/xdg/mime.nix
@@ -23,7 +23,7 @@ with lib;
];
environment.extraSetup = ''
- if [ -w $out/share/mime ]; then
+ 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
diff --git a/nixos/modules/installer/cd-dvd/iso-image.nix b/nixos/modules/installer/cd-dvd/iso-image.nix
index 98712f0759a9..96fdb997b2c0 100644
--- a/nixos/modules/installer/cd-dvd/iso-image.nix
+++ b/nixos/modules/installer/cd-dvd/iso-image.nix
@@ -233,7 +233,7 @@ let
"
# Make our own efi program, we can't rely on "grub-install" since it seems to
# probe for devices, even with --skip-fs-probe.
- ${pkgs.grub2_efi}/bin/grub-mkimage -o $out/EFI/boot/${if targetArch == "x64" then "bootx64" else "bootx32"}.efi -p /EFI/boot -O ${if targetArch == "x64" then "x86_64" else "i386"}-efi \
+ ${pkgs.grub2_efi}/bin/grub-mkimage -o $out/EFI/boot/${if targetArch == "x64" then "bootx64" else "bootia32"}.efi -p /EFI/boot -O ${if targetArch == "x64" then "x86_64" else "i386"}-efi \
$MODULES
cp ${pkgs.grub2_efi}/share/grub/unicode.pf2 $out/EFI/boot/
diff --git a/nixos/modules/installer/tools/nix-fallback-paths.nix b/nixos/modules/installer/tools/nix-fallback-paths.nix
index 7c5414257b46..cb182a08a830 100644
--- a/nixos/modules/installer/tools/nix-fallback-paths.nix
+++ b/nixos/modules/installer/tools/nix-fallback-paths.nix
@@ -1,6 +1,6 @@
{
- x86_64-linux = "/nix/store/0d60i73mcv8z1m8d2m74yfn84980gfsa-nix-2.0.4";
- i686-linux = "/nix/store/6ssafj2s5a2g9x28yld7b70vwd6vw6lb-nix-2.0.4";
- aarch64-linux = "/nix/store/3wwch7bp7n7xsl8apgy2a4b16yzyij1z-nix-2.0.4";
- x86_64-darwin = "/nix/store/771l8i0mz4c8kry8cz3sz8rr3alalckg-nix-2.0.4";
+ x86_64-linux = "/nix/store/h180y3n5k1ypxgm1pcvj243qix5j45zz-nix-2.1.1";
+ i686-linux = "/nix/store/v2y4k4v9ml07jmfq739wyflapg3b7b5k-nix-2.1.1";
+ aarch64-linux = "/nix/store/v485craglq7xm5996ci8qy5dyc17dab0-nix-2.1.1";
+ x86_64-darwin = "/nix/store/lc3ymlix73kaad5srjdgaxp9ngr1sg6g-nix-2.1.1";
}
diff --git a/nixos/modules/misc/version.nix b/nixos/modules/misc/version.nix
index 63717e0c6a81..2901dac442f3 100644
--- a/nixos/modules/misc/version.nix
+++ b/nixos/modules/misc/version.nix
@@ -68,7 +68,7 @@ in
defaultChannel = mkOption {
internal = true;
type = types.str;
- default = https://nixos.org/channels/nixos-unstable;
+ default = https://nixos.org/channels/nixos-18.09;
description = "Default NixOS channel to which the root user is subscribed.";
};
diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix
index 4795922abcfb..d3d298840de0 100644
--- a/nixos/modules/module-list.nix
+++ b/nixos/modules/module-list.nix
@@ -406,6 +406,7 @@
./services/misc/taskserver
./services/misc/tzupdate.nix
./services/misc/uhub.nix
+ ./services/misc/weechat.nix
./services/misc/xmr-stak.nix
./services/misc/zookeeper.nix
./services/monitoring/apcupsd.nix
diff --git a/nixos/modules/profiles/graphical.nix b/nixos/modules/profiles/graphical.nix
index 332cf58aa538..1a8372ddc43c 100644
--- a/nixos/modules/profiles/graphical.nix
+++ b/nixos/modules/profiles/graphical.nix
@@ -11,5 +11,5 @@
libinput.enable = true; # for touchpad support on many laptops
};
- environment.systemPackages = [ pkgs.glxinfo ];
+ environment.systemPackages = [ pkgs.glxinfo pkgs.firefox ];
}
diff --git a/nixos/modules/programs/bash/bash.nix b/nixos/modules/programs/bash/bash.nix
index 69a1a482d074..424e1506b4c5 100644
--- a/nixos/modules/programs/bash/bash.nix
+++ b/nixos/modules/programs/bash/bash.nix
@@ -126,7 +126,9 @@ in
programs.bash = {
shellInit = ''
- ${config.system.build.setEnvironment.text}
+ if [ -z "$__NIXOS_SET_ENVIRONMENT_DONE" ]; then
+ . ${config.system.build.setEnvironment}
+ fi
${cfge.shellInit}
'';
@@ -166,11 +168,11 @@ in
# Read system-wide modifications.
if test -f /etc/profile.local; then
- . /etc/profile.local
+ . /etc/profile.local
fi
if [ -n "''${BASH_VERSION:-}" ]; then
- . /etc/bashrc
+ . /etc/bashrc
fi
'';
@@ -191,12 +193,12 @@ in
# We are not always an interactive shell.
if [ -n "$PS1" ]; then
- ${cfg.interactiveShellInit}
+ ${cfg.interactiveShellInit}
fi
# Read system-wide modifications.
if test -f /etc/bashrc.local; then
- . /etc/bashrc.local
+ . /etc/bashrc.local
fi
'';
diff --git a/nixos/modules/programs/fish.nix b/nixos/modules/programs/fish.nix
index c8d94a47be28..c3f742acde2e 100644
--- a/nixos/modules/programs/fish.nix
+++ b/nixos/modules/programs/fish.nix
@@ -27,7 +27,7 @@ in
'';
type = types.bool;
};
-
+
vendor.config.enable = mkOption {
type = types.bool;
default = true;
@@ -43,7 +43,7 @@ in
Whether fish should use completion files provided by other packages.
'';
};
-
+
vendor.functions.enable = mkOption {
type = types.bool;
default = true;
@@ -107,9 +107,11 @@ in
# This happens before $__fish_datadir/config.fish sets fish_function_path, so it is currently
# unset. We set it and then completely erase it, leaving its configuration to $__fish_datadir/config.fish
set fish_function_path ${pkgs.fish-foreign-env}/share/fish-foreign-env/functions $__fish_datadir/functions
-
+
# source the NixOS environment config
- fenv source ${config.system.build.setEnvironment}
+ if [ -z "$__NIXOS_SET_ENVIRONMENT_DONE" ]
+ fenv source ${config.system.build.setEnvironment}
+ end
# clear fish_function_path so that it will be correctly set when we return to $__fish_datadir/config.fish
set -e fish_function_path
@@ -123,7 +125,7 @@ in
set fish_function_path ${pkgs.fish-foreign-env}/share/fish-foreign-env/functions $fish_function_path
fenv source /etc/fish/foreign-env/shellInit > /dev/null
set -e fish_function_path[1]
-
+
${cfg.shellInit}
# and leave a note so we don't source this config section again from
@@ -137,7 +139,7 @@ in
set fish_function_path ${pkgs.fish-foreign-env}/share/fish-foreign-env/functions $fish_function_path
fenv source /etc/fish/foreign-env/loginShellInit > /dev/null
set -e fish_function_path[1]
-
+
${cfg.loginShellInit}
# and leave a note so we don't source this config section again from
@@ -149,12 +151,11 @@ in
status --is-interactive; and not set -q __fish_nixos_interactive_config_sourced
and begin
${fishAliases}
-
set fish_function_path ${pkgs.fish-foreign-env}/share/fish-foreign-env/functions $fish_function_path
fenv source /etc/fish/foreign-env/interactiveShellInit > /dev/null
set -e fish_function_path[1]
-
+
${cfg.promptInit}
${cfg.interactiveShellInit}
@@ -170,7 +171,7 @@ in
++ optional cfg.vendor.config.enable "/share/fish/vendor_conf.d"
++ optional cfg.vendor.completions.enable "/share/fish/vendor_completions.d"
++ optional cfg.vendor.functions.enable "/share/fish/vendor_functions.d";
-
+
environment.systemPackages = [ pkgs.fish ];
environment.shells = [
diff --git a/nixos/modules/programs/yabar.nix b/nixos/modules/programs/yabar.nix
index a01083c3ace9..db085211366e 100644
--- a/nixos/modules/programs/yabar.nix
+++ b/nixos/modules/programs/yabar.nix
@@ -44,10 +44,23 @@ in
enable = mkEnableOption "yabar";
package = mkOption {
- default = pkgs.yabar;
- example = literalExample "pkgs.yabar-unstable";
+ default = pkgs.yabar-unstable;
+ example = literalExample "pkgs.yabar";
type = types.package;
+ # `yabar-stable` segfaults under certain conditions.
+ apply = x: if x == pkgs.yabar-unstable then x else flip warn x ''
+ It's not recommended to use `yabar' with `programs.yabar', the (old) stable release
+ tends to segfault under certain circumstances:
+
+ * https://github.com/geommer/yabar/issues/86
+ * https://github.com/geommer/yabar/issues/68
+ * https://github.com/geommer/yabar/issues/143
+
+ Most of them don't occur on master anymore, until a new release is published, it's recommended
+ to use `yabar-unstable'.
+ '';
+
description = ''
The package which contains the `yabar` binary.
diff --git a/nixos/modules/programs/zsh/zsh.nix b/nixos/modules/programs/zsh/zsh.nix
index d30b3415411f..b4ca8730958c 100644
--- a/nixos/modules/programs/zsh/zsh.nix
+++ b/nixos/modules/programs/zsh/zsh.nix
@@ -70,7 +70,7 @@ in
promptInit = mkOption {
default = ''
if [ "$TERM" != dumb ]; then
- autoload -U promptinit && promptinit && prompt walters
+ autoload -U promptinit && promptinit && prompt walters
fi
'';
description = ''
@@ -116,7 +116,9 @@ in
if [ -n "$__ETC_ZSHENV_SOURCED" ]; then return; fi
export __ETC_ZSHENV_SOURCED=1
- ${config.system.build.setEnvironment.text}
+ if [ -z "$__NIXOS_SET_ENVIRONMENT_DONE" ]; then
+ . ${config.system.build.setEnvironment}
+ fi
${cfge.shellInit}
@@ -124,7 +126,7 @@ in
# Read system-wide modifications.
if test -f /etc/zshenv.local; then
- . /etc/zshenv.local
+ . /etc/zshenv.local
fi
'';
@@ -143,7 +145,7 @@ in
# Read system-wide modifications.
if test -f /etc/zprofile.local; then
- . /etc/zprofile.local
+ . /etc/zprofile.local
fi
'';
@@ -169,7 +171,7 @@ in
# Tell zsh how to find installed completions
for p in ''${(z)NIX_PROFILES}; do
- fpath+=($p/share/zsh/site-functions $p/share/zsh/$ZSH_VERSION/functions $p/share/zsh/vendor-completions)
+ fpath+=($p/share/zsh/site-functions $p/share/zsh/$ZSH_VERSION/functions $p/share/zsh/vendor-completions)
done
${optionalString cfg.enableGlobalCompInit "autoload -U compinit && compinit"}
@@ -184,7 +186,7 @@ in
# Read system-wide modifications.
if test -f /etc/zshrc.local; then
- . /etc/zshrc.local
+ . /etc/zshrc.local
fi
'';
diff --git a/nixos/modules/security/acme.nix b/nixos/modules/security/acme.nix
index 946da92d80e7..092704c6fc3f 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/mail/exim.nix b/nixos/modules/services/mail/exim.nix
index 06c4b2811b3f..c05811291359 100644
--- a/nixos/modules/services/mail/exim.nix
+++ b/nixos/modules/services/mail/exim.nix
@@ -2,7 +2,7 @@
let
inherit (lib) mkIf mkOption singleton types;
- inherit (pkgs) coreutils exim;
+ inherit (pkgs) coreutils;
cfg = config.services.exim;
in
@@ -57,6 +57,16 @@ in
'';
};
+ package = mkOption {
+ type = types.package;
+ default = pkgs.exim;
+ defaultText = "pkgs.exim";
+ description = ''
+ The Exim derivation to use.
+ This can be used to enable features such as LDAP or PAM support.
+ '';
+ };
+
};
};
@@ -74,7 +84,7 @@ in
spool_directory = ${cfg.spoolDir}
${cfg.config}
'';
- systemPackages = [ exim ];
+ systemPackages = [ cfg.package ];
};
users.users = singleton {
@@ -89,14 +99,14 @@ in
gid = config.ids.gids.exim;
};
- security.wrappers.exim.source = "${exim}/bin/exim";
+ security.wrappers.exim.source = "${cfg.package}/bin/exim";
systemd.services.exim = {
description = "Exim Mail Daemon";
wantedBy = [ "multi-user.target" ];
restartTriggers = [ config.environment.etc."exim.conf".source ];
serviceConfig = {
- ExecStart = "${exim}/bin/exim -bdf -q30m";
+ ExecStart = "${cfg.package}/bin/exim -bdf -q30m";
ExecReload = "${coreutils}/bin/kill -HUP $MAINPID";
};
preStart = ''
diff --git a/nixos/modules/services/mail/rmilter.nix b/nixos/modules/services/mail/rmilter.nix
index 7f38d7570132..0d91b247cd34 100644
--- a/nixos/modules/services/mail/rmilter.nix
+++ b/nixos/modules/services/mail/rmilter.nix
@@ -89,7 +89,7 @@ in
bindSocket.path = mkOption {
type = types.str;
- default = "/run/rmilter/rmilter.sock";
+ default = "/run/rmilter.sock";
description = ''
Path to Unix domain socket to listen on.
'';
@@ -193,6 +193,9 @@ in
config = mkMerge [
(mkIf cfg.enable {
+ warnings = [
+ ''`config.services.rmilter' is deprecated, `rmilter' deprecated and unsupported by upstream, and will be removed from next releases. Use built-in rspamd milter instead.''
+ ];
users.users = singleton {
name = cfg.user;
diff --git a/nixos/modules/services/misc/nix-daemon.nix b/nixos/modules/services/misc/nix-daemon.nix
index c0eb882c58f3..9a8ca6f43bfe 100644
--- a/nixos/modules/services/misc/nix-daemon.nix
+++ b/nixos/modules/services/misc/nix-daemon.nix
@@ -345,7 +345,6 @@ in
type = types.listOf types.str;
default =
[
- "$HOME/.nix-defexpr/channels"
"nixpkgs=/nix/var/nix/profiles/per-user/root/channels/nixos"
"nixos-config=/etc/nixos/configuration.nix"
"/nix/var/nix/profiles/per-user/root/channels"
@@ -436,7 +435,7 @@ in
# Set up the environment variables for running Nix.
environment.sessionVariables = cfg.envVars //
- { NIX_PATH = concatStringsSep ":" cfg.nixPath;
+ { NIX_PATH = cfg.nixPath;
};
environment.extraInit = optionalString (!isNix20)
@@ -446,6 +445,8 @@ in
if [ "$USER" != root -o ! -w /nix/var/nix/db ]; then
export NIX_REMOTE=daemon
fi
+ '' + ''
+ export NIX_PATH="$HOME/.nix-defexpr/channels''${NIX_PATH:+:$NIX_PATH}"
'';
nix.nrBuildUsers = mkDefault (lib.max 32 cfg.maxJobs);
diff --git a/nixos/modules/services/misc/weechat.nix b/nixos/modules/services/misc/weechat.nix
new file mode 100644
index 000000000000..1fcfb440485d
--- /dev/null
+++ b/nixos/modules/services/misc/weechat.nix
@@ -0,0 +1,56 @@
+{ config, lib, pkgs, ... }:
+
+with lib;
+
+let
+ cfg = config.services.weechat;
+in
+
+{
+ options.services.weechat = {
+ enable = mkEnableOption "weechat";
+ root = mkOption {
+ description = "Weechat state directory.";
+ type = types.str;
+ default = "/var/lib/weechat";
+ };
+ sessionName = mkOption {
+ description = "Name of the `screen' session for weechat.";
+ default = "weechat-screen";
+ type = types.str;
+ };
+ binary = mkOption {
+ description = "Binary to execute (by default \${weechat}/bin/weechat).";
+ example = literalExample ''
+ ''${pkgs.weechat}/bin/weechat-headless
+ '';
+ default = "${pkgs.weechat}/bin/weechat";
+ };
+ };
+
+ config = mkIf cfg.enable {
+ users = {
+ groups.weechat = {};
+ users.weechat = {
+ createHome = true;
+ group = "weechat";
+ home = cfg.root;
+ isSystemUser = true;
+ };
+ };
+
+ systemd.services.weechat = {
+ environment.WEECHAT_HOME = cfg.root;
+ serviceConfig = {
+ User = "weechat";
+ Group = "weechat";
+ RemainAfterExit = "yes";
+ };
+ script = "exec ${pkgs.screen}/bin/screen -Dm -S ${cfg.sessionName} ${cfg.binary}";
+ wantedBy = [ "multi-user.target" ];
+ wants = [ "network.target" ];
+ };
+ };
+
+ meta.doc = ./weechat.xml;
+}
diff --git a/nixos/modules/services/misc/weechat.xml b/nixos/modules/services/misc/weechat.xml
new file mode 100644
index 000000000000..de86dede2eb5
--- /dev/null
+++ b/nixos/modules/services/misc/weechat.xml
@@ -0,0 +1,61 @@
+
+
+WeeChat
+WeeChat is a fast and extensible IRC client.
+
+Basic Usage
+
+By default, the module creates a
+systemd unit
+which runs the chat client in a detached
+screen session.
+
+
+
+
+This can be done by enabling the weechat service:
+
+
+{ ... }:
+
+{
+ services.weechat.enable = true;
+}
+
+
+
+The service is managed by a dedicated user
+named weechat in the state directory
+/var/lib/weechat.
+
+
+Re-attaching to WeeChat
+
+WeeChat runs in a screen session owned by a dedicated user. To explicitly
+allow your another user to attach to this session, the screenrc needs to be tweaked
+by adding multiuser support:
+
+
+{
+ programs.screen.screenrc = ''
+ multiuser on
+ acladd normal_user
+ '';
+}
+
+
+Now, the session can be re-attached like this:
+
+
+screen -r weechat-screen
+
+
+
+The session name can be changed using services.weechat.sessionName.
+
+
+
diff --git a/nixos/modules/services/monitoring/datadog-agent.nix b/nixos/modules/services/monitoring/datadog-agent.nix
index e545e06b3495..8fd3455a238f 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
@@ -206,7 +213,6 @@ in {
Group = "datadog";
Restart = "always";
RestartSec = 2;
- PrivateTmp = true;
};
restartTriggers = [ datadogPkg ] ++ map (etc: etc.source) etcfiles;
} attrs;
@@ -229,6 +235,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 3e801f9b838d..c30647f5460b 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/chrony.nix b/nixos/modules/services/networking/chrony.nix
index cef30661cc33..a363b545d649 100644
--- a/nixos/modules/services/networking/chrony.nix
+++ b/nixos/modules/services/networking/chrony.nix
@@ -3,12 +3,10 @@
with lib;
let
+ cfg = config.services.chrony;
stateDir = "/var/lib/chrony";
-
- keyFile = "/etc/chrony.keys";
-
- cfg = config.services.chrony;
+ keyFile = "${stateDir}/chrony.keys";
configFile = pkgs.writeText "chrony.conf" ''
${concatMapStringsSep "\n" (server: "server " + server) cfg.servers}
@@ -19,7 +17,6 @@ let
}
driftfile ${stateDir}/chrony.drift
-
keyfile ${keyFile}
${optionalString (!config.time.hardwareClockInLocalTime) "rtconutc"}
@@ -27,18 +24,11 @@ let
${cfg.extraConfig}
'';
- chronyFlags = "-n -m -u chrony -f ${configFile} ${toString cfg.extraFlags}";
-
+ chronyFlags = "-m -u chrony -f ${configFile} ${toString cfg.extraFlags}";
in
-
{
-
- ###### interface
-
options = {
-
services.chrony = {
-
enable = mkOption {
default = false;
description = ''
@@ -83,15 +73,9 @@ in
description = "Extra flags passed to the chronyd command.";
};
};
-
};
-
- ###### implementation
-
config = mkIf cfg.enable {
-
- # Make chronyc available in the system path
environment.systemPackages = [ pkgs.chrony ];
users.groups = singleton
@@ -113,26 +97,30 @@ in
{ description = "chrony NTP daemon";
wantedBy = [ "multi-user.target" ];
- wants = [ "time-sync.target" ];
- before = [ "time-sync.target" ];
- after = [ "network.target" ];
+ wants = [ "time-sync.target" ];
+ before = [ "time-sync.target" ];
+ after = [ "network.target" ];
conflicts = [ "ntpd.service" "systemd-timesyncd.service" ];
path = [ pkgs.chrony ];
- preStart =
- ''
- mkdir -m 0755 -p ${stateDir}
- touch ${keyFile}
- chmod 0640 ${keyFile}
- chown chrony:chrony ${stateDir} ${keyFile}
- '';
+ preStart = ''
+ mkdir -m 0755 -p ${stateDir}
+ touch ${keyFile}
+ chmod 0640 ${keyFile}
+ chown chrony:chrony ${stateDir} ${keyFile}
+ '';
serviceConfig =
- { ExecStart = "${pkgs.chrony}/bin/chronyd ${chronyFlags}";
+ { Type = "forking";
+ ExecStart = "${pkgs.chrony}/bin/chronyd ${chronyFlags}";
+
+ ProtectHome = "yes";
+ ProtectSystem = "full";
+ PrivateTmp = "yes";
+
+ ConditionCapability = "CAP_SYS_TIME";
};
};
-
};
-
}
diff --git a/nixos/modules/services/networking/networkmanager.nix b/nixos/modules/services/networking/networkmanager.nix
index d5af4648e8f9..2d76e0676b24 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 2377cb2c8f11..8b60799891ca 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/tor.nix b/nixos/modules/services/security/tor.nix
index def77ba69e58..9b6d4be9bda8 100644
--- a/nixos/modules/services/security/tor.nix
+++ b/nixos/modules/services/security/tor.nix
@@ -208,7 +208,7 @@ in
enable = mkOption {
type = types.bool;
default = false;
- description = "Whether to enable tor transaprent proxy";
+ description = "Whether to enable tor transparent proxy";
};
listenAddress = mkOption {
diff --git a/nixos/modules/services/x11/desktop-managers/plasma5.nix b/nixos/modules/services/x11/desktop-managers/plasma5.nix
index d1cb962f6ff8..e759f69db897 100644
--- a/nixos/modules/services/x11/desktop-managers/plasma5.nix
+++ b/nixos/modules/services/x11/desktop-managers/plasma5.nix
@@ -81,6 +81,7 @@ in
kconfig
kconfigwidgets
kcoreaddons
+ kdoctools
kdbusaddons
kdeclarative
kded
diff --git a/nixos/modules/services/x11/display-managers/lightdm.nix b/nixos/modules/services/x11/display-managers/lightdm.nix
index cd9c3d81a0fb..8078b93a7574 100644
--- a/nixos/modules/services/x11/display-managers/lightdm.nix
+++ b/nixos/modules/services/x11/display-managers/lightdm.nix
@@ -197,7 +197,7 @@ in
# lightdm relaunches itself via just `lightdm`, so needs to be on the PATH
execCmd = ''
export PATH=${lightdm}/sbin:$PATH
- exec ${lightdm}/sbin/lightdm --log-dir=/var/log --run-dir=/run
+ exec ${lightdm}/sbin/lightdm
'';
};
@@ -246,12 +246,19 @@ in
'';
users.users.lightdm = {
- createHome = true;
- home = "/var/lib/lightdm-data";
+ home = "/var/lib/lightdm";
group = "lightdm";
uid = config.ids.uids.lightdm;
};
+ systemd.tmpfiles.rules = [
+ "d /run/lightdm 0711 lightdm lightdm 0"
+ "d /var/cache/lightdm 0711 root lightdm -"
+ "d /var/lib/lightdm 1770 lightdm lightdm -"
+ "d /var/lib/lightdm-data 1775 lightdm lightdm -"
+ "d /var/log/lightdm 0711 root lightdm -"
+ ];
+
users.groups.lightdm.gid = config.ids.gids.lightdm;
services.xserver.tty = null; # We might start multiple X servers so let the tty increment themselves..
services.xserver.display = null; # We specify our own display (and logfile) in xserver-wrapper up there
diff --git a/nixos/modules/system/activation/switch-to-configuration.pl b/nixos/modules/system/activation/switch-to-configuration.pl
index b3fe6caf62dc..c3e469e4b8a1 100644
--- a/nixos/modules/system/activation/switch-to-configuration.pl
+++ b/nixos/modules/system/activation/switch-to-configuration.pl
@@ -419,7 +419,7 @@ while (my $f = <$listActiveUsers>) {
my ($uid, $name) = ($+{uid}, $+{user});
print STDERR "reloading user units for $name...\n";
- system("su", "-l", $name, "-c", "XDG_RUNTIME_DIR=/run/user/$uid @systemd@/bin/systemctl --user daemon-reload");
+ system("su", "-s", "@shell@", "-l", $name, "-c", "XDG_RUNTIME_DIR=/run/user/$uid @systemd@/bin/systemctl --user daemon-reload");
}
close $listActiveUsers;
diff --git a/nixos/modules/system/activation/top-level.nix b/nixos/modules/system/activation/top-level.nix
index fff88e2c2bf3..254e9266e89e 100644
--- a/nixos/modules/system/activation/top-level.nix
+++ b/nixos/modules/system/activation/top-level.nix
@@ -115,6 +115,7 @@ let
inherit (pkgs) utillinux coreutils;
systemd = config.systemd.package;
+ shell = "${pkgs.bash}/bin/sh";
inherit children;
kernelParams = config.boot.kernelParams;
diff --git a/nixos/modules/tasks/network-interfaces.nix b/nixos/modules/tasks/network-interfaces.nix
index 20a740ce1f0c..815523093dde 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/nixos/modules/virtualisation/qemu-vm.nix b/nixos/modules/virtualisation/qemu-vm.nix
index 4e9c87222d0a..eec1a85162b5 100644
--- a/nixos/modules/virtualisation/qemu-vm.nix
+++ b/nixos/modules/virtualisation/qemu-vm.nix
@@ -32,15 +32,21 @@ let
# expressions and shell script stuff.
mkDiskIfaceDriveFlag = idx: driveArgs: let
inherit (cfg.qemu) diskInterface;
+ isSCSI = diskInterface == "scsi";
# The drive identifier created by incrementing the index by one using the
# shell.
drvId = "drive$((${idx} + 1))";
+ dvcId = "${diskInterface}$((${idx} + 1))";
# NOTE: DO NOT shell escape, because this may contain shell variables.
- commonArgs = "index=${idx},id=${drvId},${driveArgs}";
- isSCSI = diskInterface == "scsi";
- devArgs = "${diskInterface}-hd,drive=${drvId}";
- args = "-drive ${commonArgs},if=none -device lsi53c895a -device ${devArgs}";
- in if isSCSI then args else "-drive ${commonArgs},if=${diskInterface}";
+ commonDriveArgs = "media=disk,id=${drvId},${driveArgs}";
+ commonInterfaceArgs = "drive=${drvId},id=${dvcId},bootindex=${idx}";
+ in lib.concatStrings [
+ "-drive ${commonDriveArgs},if=none "
+ ''${if isSCSI then
+ "-device lsi53c895a -device ${diskInterface}-hd,${commonInterfaceArgs}"
+ else
+ "-device virtio-blk-pci,scsi=off,${commonInterfaceArgs}"} ''
+ ];
# Shell script to start the VM.
startVM =
@@ -97,15 +103,15 @@ let
-virtfs local,path=/nix/store,security_model=none,mount_tag=store \
-virtfs local,path=$TMPDIR/xchg,security_model=none,mount_tag=xchg \
-virtfs local,path=''${SHARED_DIR:-$TMPDIR/xchg},security_model=none,mount_tag=shared \
+ ${mkDiskIfaceDriveFlag "1" "file=$NIX_DISK_IMAGE,media=disk,cache=writeback,werror=report"} \
${if cfg.useBootLoader then ''
- ${mkDiskIfaceDriveFlag "0" "file=$NIX_DISK_IMAGE,cache=writeback,werror=report"} \
- ${mkDiskIfaceDriveFlag "1" "file=$TMPDIR/disk.img,media=disk"} \
+ -boot menu=on \
+ ${mkDiskIfaceDriveFlag "0" "file=$TMPDIR/disk.img,media=disk"} \
${if cfg.useEFIBoot then ''
-pflash $TMPDIR/bios.bin \
'' else ''
- ''}
- '' else ''
- ${mkDiskIfaceDriveFlag "0" "file=$NIX_DISK_IMAGE,cache=writeback,werror=report"} \
+ \''}
+ '' else '' \
-kernel ${config.system.build.toplevel}/kernel \
-initrd ${config.system.build.toplevel}/initrd \
-append "$(cat ${config.system.build.toplevel}/kernel-params) init=${config.system.build.toplevel}/init regInfo=${regInfo}/registration ${consoles} $QEMU_KERNEL_PARAMS" \
@@ -141,8 +147,9 @@ let
'';
buildInputs = [ pkgs.utillinux ];
QEMU_OPTS = if cfg.useEFIBoot
- then "-pflash $out/bios.bin -nographic -serial pty"
- else "-nographic -serial pty";
+ then "-pflash $out/bios.bin -nographic"
+ else "-nographic";
+ diskInterface = cfg.qemu.diskInterface;
}
''
# Create a /boot EFI partition with 40M and arbitrary but fixed GUIDs for reproducibility
@@ -155,10 +162,10 @@ let
--partition-guid=1:1C06F03B-704E-4657-B9CD-681A087A2FDC \
--partition-guid=2:970C694F-AFD0-4B99-B750-CDB7A329AB6F \
--hybrid 2 \
- --recompute-chs /dev/vda
- ${pkgs.dosfstools}/bin/mkfs.fat -F16 /dev/vda2
+ --recompute-chs ${config.virtualisation.bootDevice}
+ ${pkgs.dosfstools}/bin/mkfs.fat -F16 ${config.virtualisation.bootDevice}2
export MTOOLS_SKIP_CHECK=1
- ${pkgs.mtools}/bin/mlabel -i /dev/vda2 ::boot
+ ${pkgs.mtools}/bin/mlabel -i ${config.virtualisation.bootDevice}2 ::boot
# Mount /boot; load necessary modules first.
${pkgs.kmod}/bin/insmod ${pkgs.linux}/lib/modules/*/kernel/fs/nls/nls_cp437.ko.xz || true
@@ -167,11 +174,11 @@ let
${pkgs.kmod}/bin/insmod ${pkgs.linux}/lib/modules/*/kernel/fs/fat/vfat.ko.xz || true
${pkgs.kmod}/bin/insmod ${pkgs.linux}/lib/modules/*/kernel/fs/efivarfs/efivarfs.ko.xz || true
mkdir /boot
- mount /dev/vda2 /boot
+ mount ${config.virtualisation.bootDevice}2 /boot
# This is needed for GRUB 0.97, which doesn't know about virtio devices.
mkdir /boot/grub
- echo '(hd0) /dev/vda' > /boot/grub/device.map
+ echo '(hd0) ${config.virtualisation.bootDevice}' > /boot/grub/device.map
# Install GRUB and generate the GRUB boot menu.
touch /etc/NIXOS
@@ -464,7 +471,8 @@ in
boot.initrd.availableKernelModules =
optional cfg.writableStore "overlay"
- ++ optional (cfg.qemu.diskInterface == "scsi") "sym53c8xx";
+ ++ optional (cfg.qemu.diskInterface == "scsi") "sym53c8xx"
+ ++ optional (cfg.qemu.diskInterface == "scsi") "virtio_scsi";
virtualisation.bootDevice =
mkDefault (if cfg.qemu.diskInterface == "scsi" then "/dev/sda" else "/dev/vda");
diff --git a/nixos/release.nix b/nixos/release.nix
index 1013053b5b3b..3e03eb1f66d4 100644
--- a/nixos/release.nix
+++ b/nixos/release.nix
@@ -10,7 +10,7 @@ let
version = fileContents ../.version;
versionSuffix =
- (if stableBranch then "." else "pre") + "${toString nixpkgs.revCount}.${nixpkgs.shortRev}";
+ (if stableBranch then "." else "beta") + "${toString (nixpkgs.revCount - 151577)}.${nixpkgs.shortRev}";
importTest = fn: args: system: import fn ({
inherit system;
@@ -284,7 +284,8 @@ in rec {
tests.ecryptfs = callTest tests/ecryptfs.nix {};
tests.etcd = callTestOnMatchingSystems ["x86_64-linux"] tests/etcd.nix {};
tests.ec2-nixops = (callSubTestsOnMatchingSystems ["x86_64-linux"] tests/ec2.nix {}).boot-ec2-nixops or {};
- tests.ec2-config = (callSubTestsOnMatchingSystems ["x86_64-linux"] tests/ec2.nix {}).boot-ec2-config or {};
+ # ec2-config doesn't work in a sandbox as the simulated ec2 instance needs network access
+ #tests.ec2-config = (callSubTestsOnMatchingSystems ["x86_64-linux"] tests/ec2.nix {}).boot-ec2-config or {};
tests.elk = callSubTestsOnMatchingSystems ["x86_64-linux"] tests/elk.nix {};
tests.env = callTest tests/env.nix {};
tests.ferm = callTest tests/ferm.nix {};
@@ -327,7 +328,6 @@ in rec {
tests.keymap = callSubTests tests/keymap.nix {};
tests.initrdNetwork = callTest tests/initrd-network.nix {};
tests.kafka = callSubTests tests/kafka.nix {};
- tests.kernel-copperhead = callTest tests/kernel-copperhead.nix {};
tests.kernel-latest = callTest tests/kernel-latest.nix {};
tests.kernel-lts = callTest tests/kernel-lts.nix {};
tests.kubernetes.dns = callSubTestsOnMatchingSystems ["x86_64-linux"] tests/kubernetes/dns.nix {};
@@ -400,7 +400,7 @@ in rec {
tests.slurm = callTest tests/slurm.nix {};
tests.smokeping = callTest tests/smokeping.nix {};
tests.snapper = callTest tests/snapper.nix {};
- tests.statsd = callTest tests/statsd.nix {};
+ #tests.statsd = callTest tests/statsd.nix {}; # statsd is broken: #45946
tests.strongswan-swanctl = callTest tests/strongswan-swanctl.nix {};
tests.sudo = callTest tests/sudo.nix {};
tests.systemd = callTest tests/systemd.nix {};
diff --git a/nixos/tests/acme.nix b/nixos/tests/acme.nix
index c7fd4910e072..4669a092433e 100644
--- a/nixos/tests/acme.nix
+++ b/nixos/tests/acme.nix
@@ -1,32 +1,5 @@
let
- commonConfig = { lib, nodes, ... }: {
- networking.nameservers = [
- nodes.letsencrypt.config.networking.primaryIPAddress
- ];
-
- nixpkgs.overlays = lib.singleton (self: super: {
- cacert = super.cacert.overrideDerivation (drv: {
- installPhase = (drv.installPhase or "") + ''
- cat "${nodes.letsencrypt.config.test-support.letsencrypt.caCert}" \
- >> "$out/etc/ssl/certs/ca-bundle.crt"
- '';
- });
-
- # Override certifi so that it accepts fake certificate for Let's Encrypt
- # Need to override the attribute used by simp_le, which is python3Packages
- python3Packages = (super.python3.override {
- packageOverrides = lib.const (pysuper: {
- certifi = pysuper.certifi.overridePythonAttrs (attrs: {
- postPatch = (attrs.postPatch or "") + ''
- cat "${self.cacert}/etc/ssl/certs/ca-bundle.crt" \
- > certifi/cacert.pem
- '';
- });
- });
- }).pkgs;
- });
- };
-
+ commonConfig = ./common/letsencrypt/common.nix;
in import ./make-test.nix {
name = "acme";
diff --git a/nixos/tests/atd.nix b/nixos/tests/atd.nix
index 9f367d4c1d2a..25db72799241 100644
--- a/nixos/tests/atd.nix
+++ b/nixos/tests/atd.nix
@@ -16,6 +16,7 @@ import ./make-test.nix ({ pkgs, ... }:
testScript = ''
startAll;
+ $machine->waitForUnit('atd.service'); # wait for atd to start
$machine->fail("test -f ~root/at-1");
$machine->fail("test -f ~alice/at-1");
diff --git a/nixos/tests/common/letsencrypt/common.nix b/nixos/tests/common/letsencrypt/common.nix
new file mode 100644
index 000000000000..798a749f7f9b
--- /dev/null
+++ b/nixos/tests/common/letsencrypt/common.nix
@@ -0,0 +1,27 @@
+{ lib, nodes, ... }: {
+ networking.nameservers = [
+ nodes.letsencrypt.config.networking.primaryIPAddress
+ ];
+
+ nixpkgs.overlays = lib.singleton (self: super: {
+ cacert = super.cacert.overrideDerivation (drv: {
+ installPhase = (drv.installPhase or "") + ''
+ cat "${nodes.letsencrypt.config.test-support.letsencrypt.caCert}" \
+ >> "$out/etc/ssl/certs/ca-bundle.crt"
+ '';
+ });
+
+ # Override certifi so that it accepts fake certificate for Let's Encrypt
+ # Need to override the attribute used by simp_le, which is python3Packages
+ python3Packages = (super.python3.override {
+ packageOverrides = lib.const (pysuper: {
+ certifi = pysuper.certifi.overridePythonAttrs (attrs: {
+ postPatch = (attrs.postPatch or "") + ''
+ cat "${self.cacert}/etc/ssl/certs/ca-bundle.crt" \
+ > certifi/cacert.pem
+ '';
+ });
+ });
+ }).pkgs;
+ });
+}
diff --git a/nixos/tests/containers-imperative.nix b/nixos/tests/containers-imperative.nix
index 913d8bed19d0..6f86819f4e88 100644
--- a/nixos/tests/containers-imperative.nix
+++ b/nixos/tests/containers-imperative.nix
@@ -13,6 +13,7 @@ import ./make-test.nix ({ pkgs, ...} : {
# XXX: Sandbox setup fails while trying to hardlink files from the host's
# store file system into the prepared chroot directory.
nix.useSandbox = false;
+ nix.binaryCaches = []; # don't try to access cache.nixos.org
virtualisation.writableStore = true;
virtualisation.memorySize = 1024;
@@ -27,9 +28,10 @@ import ./make-test.nix ({ pkgs, ...} : {
};
};
};
- in [
- pkgs.stdenv pkgs.stdenvNoCC emptyContainer.config.containers.foo.path
- pkgs.libxslt
+ in with pkgs; [
+ stdenv stdenvNoCC emptyContainer.config.containers.foo.path
+ libxslt desktop-file-utils texinfo docbook5 libxml2
+ docbook_xsl_ns xorg.lndir documentation-highlighter
];
};
diff --git a/nixos/tests/docker-tools.nix b/nixos/tests/docker-tools.nix
index db4eacc37287..5a7590cbf364 100644
--- a/nixos/tests/docker-tools.nix
+++ b/nixos/tests/docker-tools.nix
@@ -20,7 +20,10 @@ import ./make-test.nix ({ pkgs, ... }: {
''
$docker->waitForUnit("sockets.target");
+ # Ensure Docker images use a stable date by default
$docker->succeed("docker load --input='${pkgs.dockerTools.examples.bash}'");
+ $docker->succeed("[ '1970-01-01T00:00:01Z' = \"\$(docker inspect ${pkgs.dockerTools.examples.bash.imageName} | ${pkgs.jq}/bin/jq -r .[].Created)\" ]");
+
$docker->succeed("docker run --rm ${pkgs.dockerTools.examples.bash.imageName} bash --version");
$docker->succeed("docker rmi ${pkgs.dockerTools.examples.bash.imageName}");
@@ -51,5 +54,9 @@ import ./make-test.nix ({ pkgs, ... }: {
$docker->succeed("docker run --rm runasrootextracommands cat extraCommands");
$docker->succeed("docker run --rm runasrootextracommands cat runAsRoot");
$docker->succeed("docker rmi '${pkgs.dockerTools.examples.runAsRootExtraCommands.imageName}'");
+
+ # Ensure Docker images can use an unstable date
+ $docker->succeed("docker load --input='${pkgs.dockerTools.examples.bash}'");
+ $docker->succeed("[ '1970-01-01T00:00:01Z' != \"\$(docker inspect ${pkgs.dockerTools.examples.unstableDate.imageName} | ${pkgs.jq}/bin/jq -r .[].Created)\" ]");
'';
})
diff --git a/nixos/tests/ferm.nix b/nixos/tests/ferm.nix
index 24b74df85ad1..b8e8663e3ad2 100644
--- a/nixos/tests/ferm.nix
+++ b/nixos/tests/ferm.nix
@@ -11,6 +11,7 @@ import ./make-test.nix ({ pkgs, ...} : {
with pkgs.lib;
{
networking = {
+ dhcpcd.enable = false;
interfaces.eth1.ipv6.addresses = mkOverride 0 [ { address = "fd00::2"; prefixLength = 64; } ];
interfaces.eth1.ipv4.addresses = mkOverride 0 [ { address = "192.168.1.2"; prefixLength = 24; } ];
};
@@ -20,6 +21,7 @@ import ./make-test.nix ({ pkgs, ...} : {
with pkgs.lib;
{
networking = {
+ dhcpcd.enable = false;
interfaces.eth1.ipv6.addresses = mkOverride 0 [ { address = "fd00::1"; prefixLength = 64; } ];
interfaces.eth1.ipv4.addresses = mkOverride 0 [ { address = "192.168.1.1"; prefixLength = 24; } ];
};
@@ -51,7 +53,7 @@ import ./make-test.nix ({ pkgs, ...} : {
''
startAll;
- $client->waitForUnit("network.target");
+ $client->waitForUnit("network-online.target");
$server->waitForUnit("ferm.service");
$server->waitForUnit("nginx.service");
$server->waitUntilSucceeds("ss -ntl | grep -q 80");
diff --git a/nixos/tests/gdk-pixbuf.nix b/nixos/tests/gdk-pixbuf.nix
index b20f61b5ffe2..005c5111da2b 100644
--- a/nixos/tests/gdk-pixbuf.nix
+++ b/nixos/tests/gdk-pixbuf.nix
@@ -10,10 +10,12 @@ import ./make-test.nix ({ pkgs, ... }: {
environment.systemPackages = with pkgs; [ gnome-desktop-testing ];
environment.variables.XDG_DATA_DIRS = [ "${pkgs.gdk_pixbuf.installedTests}/share" ];
- virtualisation.memorySize = 4096; # Tests allocate a lot of memory trying to exploit a CVE
+ # Tests allocate a lot of memory trying to exploit a CVE
+ # but qemu-system-i386 has a 2047M memory limit
+ virtualisation.memorySize = if pkgs.stdenv.isi686 then 2047 else 4096;
};
testScript = ''
- $machine->succeed("gnome-desktop-testing-runner");
+ $machine->succeed("gnome-desktop-testing-runner -t 1800"); # increase timeout to 1800s
'';
})
diff --git a/nixos/tests/hibernate.nix b/nixos/tests/hibernate.nix
index 1f98bb739f21..274aa7becc82 100644
--- a/nixos/tests/hibernate.nix
+++ b/nixos/tests/hibernate.nix
@@ -35,8 +35,8 @@ import ./make-test.nix (pkgs: {
$machine->waitForOpenPort(4444);
$machine->succeed("systemctl hibernate &");
$machine->waitForShutdown;
+ $probe->waitForUnit("multi-user.target");
$machine->start;
- $probe->waitForUnit("network.target");
$probe->waitUntilSucceeds("echo test | nc machine 4444 -N");
'';
diff --git a/nixos/tests/hound.nix b/nixos/tests/hound.nix
index f21c0ad58a85..cb8e25332c07 100644
--- a/nixos/tests/hound.nix
+++ b/nixos/tests/hound.nix
@@ -52,7 +52,7 @@ import ./make-test.nix ({ pkgs, ... } : {
$machine->waitForUnit("network.target");
$machine->waitForUnit("hound.service");
$machine->waitForOpenPort(6080);
- $machine->succeed('curl http://127.0.0.1:6080/api/v1/search\?stats\=fosho\&repos\=\*\&rng=%3A20\&q\=hi\&files\=\&i=nope | grep "Filename" | grep "hello"');
+ $machine->waitUntilSucceeds('curl http://127.0.0.1:6080/api/v1/search\?stats\=fosho\&repos\=\*\&rng=%3A20\&q\=hi\&files\=\&i=nope | grep "Filename" | grep "hello"');
'';
})
diff --git a/nixos/tests/installer.nix b/nixos/tests/installer.nix
index 3d31c8dc4457..3f9fa0e6016c 100644
--- a/nixos/tests/installer.nix
+++ b/nixos/tests/installer.nix
@@ -282,9 +282,9 @@ in {
{ createPartitions =
''
$machine->succeed(
- "parted --script /dev/vda mklabel msdos",
- "parted --script /dev/vda -- mkpart primary linux-swap 1M 1024M",
- "parted --script /dev/vda -- mkpart primary ext2 1024M -1s",
+ "flock /dev/vda parted --script /dev/vda -- mklabel msdos"
+ . " mkpart primary linux-swap 1M 1024M"
+ . " mkpart primary ext2 1024M -1s",
"udevadm settle",
"mkswap /dev/vda1 -L swap",
"swapon -L swap",
@@ -299,11 +299,11 @@ in {
{ createPartitions =
''
$machine->succeed(
- "parted --script /dev/vda mklabel gpt",
- "parted --script /dev/vda -- mkpart ESP fat32 1M 50MiB", # /boot
- "parted --script /dev/vda -- set 1 boot on",
- "parted --script /dev/vda -- mkpart primary linux-swap 50MiB 1024MiB",
- "parted --script /dev/vda -- mkpart primary ext2 1024MiB -1MiB", # /
+ "flock /dev/vda parted --script /dev/vda -- mklabel gpt"
+ . " mkpart ESP fat32 1M 50MiB" # /boot
+ . " set 1 boot on"
+ . " mkpart primary linux-swap 50MiB 1024MiB"
+ . " mkpart primary ext2 1024MiB -1MiB", # /
"udevadm settle",
"mkswap /dev/vda2 -L swap",
"swapon -L swap",
@@ -321,11 +321,11 @@ in {
{ createPartitions =
''
$machine->succeed(
- "parted --script /dev/vda mklabel gpt",
- "parted --script /dev/vda -- mkpart ESP fat32 1M 50MiB", # /boot
- "parted --script /dev/vda -- set 1 boot on",
- "parted --script /dev/vda -- mkpart primary linux-swap 50MiB 1024MiB",
- "parted --script /dev/vda -- mkpart primary ext2 1024MiB -1MiB", # /
+ "flock /dev/vda parted --script /dev/vda -- mklabel gpt"
+ . " mkpart ESP fat32 1M 50MiB" # /boot
+ . " set 1 boot on"
+ . " mkpart primary linux-swap 50MiB 1024MiB"
+ . " mkpart primary ext2 1024MiB -1MiB", # /
"udevadm settle",
"mkswap /dev/vda2 -L swap",
"swapon -L swap",
@@ -345,10 +345,10 @@ in {
{ createPartitions =
''
$machine->succeed(
- "parted --script /dev/vda mklabel msdos",
- "parted --script /dev/vda -- mkpart primary ext2 1M 50MB", # /boot
- "parted --script /dev/vda -- mkpart primary linux-swap 50MB 1024M",
- "parted --script /dev/vda -- mkpart primary ext2 1024M -1s", # /
+ "flock /dev/vda parted --script /dev/vda -- mklabel msdos"
+ . " mkpart primary ext2 1M 50MB" # /boot
+ . " mkpart primary linux-swap 50MB 1024M"
+ . " mkpart primary ext2 1024M -1s", # /
"udevadm settle",
"mkswap /dev/vda2 -L swap",
"swapon -L swap",
@@ -366,10 +366,10 @@ in {
{ createPartitions =
''
$machine->succeed(
- "parted --script /dev/vda mklabel msdos",
- "parted --script /dev/vda -- mkpart primary ext2 1M 50MB", # /boot
- "parted --script /dev/vda -- mkpart primary linux-swap 50MB 1024M",
- "parted --script /dev/vda -- mkpart primary ext2 1024M -1s", # /
+ "flock /dev/vda parted --script /dev/vda -- mklabel msdos"
+ . " mkpart primary ext2 1M 50MB" # /boot
+ . " mkpart primary linux-swap 50MB 1024M"
+ . " mkpart primary ext2 1024M -1s", # /
"udevadm settle",
"mkswap /dev/vda2 -L swap",
"swapon -L swap",
@@ -402,9 +402,9 @@ in {
createPartitions =
''
$machine->succeed(
- "parted --script /dev/vda mklabel msdos",
- "parted --script /dev/vda -- mkpart primary linux-swap 1M 1024M",
- "parted --script /dev/vda -- mkpart primary 1024M -1s",
+ "flock /dev/vda parted --script /dev/vda -- mklabel msdos"
+ . " mkpart primary linux-swap 1M 1024M"
+ . " mkpart primary 1024M -1s",
"udevadm settle",
"mkswap /dev/vda1 -L swap",
@@ -425,11 +425,11 @@ in {
{ createPartitions =
''
$machine->succeed(
- "parted --script /dev/vda mklabel msdos",
- "parted --script /dev/vda -- mkpart primary 1M 2048M", # PV1
- "parted --script /dev/vda -- set 1 lvm on",
- "parted --script /dev/vda -- mkpart primary 2048M -1s", # PV2
- "parted --script /dev/vda -- set 2 lvm on",
+ "flock /dev/vda parted --script /dev/vda -- mklabel msdos"
+ . " mkpart primary 1M 2048M" # PV1
+ . " set 1 lvm on"
+ . " mkpart primary 2048M -1s" # PV2
+ . " set 2 lvm on",
"udevadm settle",
"pvcreate /dev/vda1 /dev/vda2",
"vgcreate MyVolGroup /dev/vda1 /dev/vda2",
@@ -447,10 +447,10 @@ in {
luksroot = makeInstallerTest "luksroot"
{ createPartitions = ''
$machine->succeed(
- "parted --script /dev/vda mklabel msdos",
- "parted --script /dev/vda -- mkpart primary ext2 1M 50MB", # /boot
- "parted --script /dev/vda -- mkpart primary linux-swap 50M 1024M",
- "parted --script /dev/vda -- mkpart primary 1024M -1s", # LUKS
+ "flock /dev/vda parted --script /dev/vda -- mklabel msdos"
+ . " mkpart primary ext2 1M 50MB" # /boot
+ . " mkpart primary linux-swap 50M 1024M"
+ . " mkpart primary 1024M -1s", # LUKS
"udevadm settle",
"mkswap /dev/vda2 -L swap",
"swapon -L swap",
@@ -481,11 +481,11 @@ in {
filesystemEncryptedWithKeyfile = makeInstallerTest "filesystemEncryptedWithKeyfile"
{ createPartitions = ''
$machine->succeed(
- "parted --script /dev/vda mklabel msdos",
- "parted --script /dev/vda -- mkpart primary ext2 1M 50MB", # /boot
- "parted --script /dev/vda -- mkpart primary linux-swap 50M 1024M",
- "parted --script /dev/vda -- mkpart primary 1024M 1280M", # LUKS with keyfile
- "parted --script /dev/vda -- mkpart primary 1280M -1s",
+ "flock /dev/vda parted --script /dev/vda -- mklabel msdos"
+ . " mkpart primary ext2 1M 50MB" # /boot
+ . " mkpart primary linux-swap 50M 1024M"
+ . " mkpart primary 1024M 1280M" # LUKS with keyfile
+ . " mkpart primary 1280M -1s",
"udevadm settle",
"mkswap /dev/vda2 -L swap",
"swapon -L swap",
@@ -520,7 +520,7 @@ in {
{ createPartitions =
''
$machine->succeed(
- "parted --script /dev/vda --"
+ "flock /dev/vda parted --script /dev/vda --"
. " mklabel msdos"
. " mkpart primary ext2 1M 100MB" # /boot
. " mkpart extended 100M -1s"
@@ -531,8 +531,10 @@ in {
"udevadm settle",
"ls -l /dev/vda* >&2",
"cat /proc/partitions >&2",
+ "udevadm control --stop-exec-queue",
"mdadm --create --force /dev/md0 --metadata 1.2 --level=raid1 --raid-devices=2 /dev/vda5 /dev/vda6",
"mdadm --create --force /dev/md1 --metadata 1.2 --level=raid1 --raid-devices=2 /dev/vda7 /dev/vda8",
+ "udevadm control --start-exec-queue",
"udevadm settle",
"mkswap -f /dev/md1 -L swap",
"swapon -L swap",
@@ -555,14 +557,15 @@ in {
{ createPartitions =
''
$machine->succeed(
- "parted --script /dev/sda mklabel msdos",
- "parted --script /dev/sda -- mkpart primary linux-swap 1M 1024M",
- "parted --script /dev/sda -- mkpart primary ext2 1024M -1s",
+ "flock /dev/sda parted --script /dev/sda -- mklabel msdos"
+ . " mkpart primary linux-swap 1M 1024M"
+ . " mkpart primary ext2 1024M -1s",
"udevadm settle",
"mkswap /dev/sda1 -L swap",
"swapon -L swap",
"mkfs.ext3 -L nixos /dev/sda2",
"mount LABEL=nixos /mnt",
+ "mkdir -p /mnt/tmp",
);
'';
grubVersion = 1;
diff --git a/nixos/tests/kernel-copperhead.nix b/nixos/tests/kernel-copperhead.nix
deleted file mode 100644
index 652fbf055373..000000000000
--- a/nixos/tests/kernel-copperhead.nix
+++ /dev/null
@@ -1,19 +0,0 @@
-import ./make-test.nix ({ pkgs, ...} : {
- name = "kernel-copperhead";
- meta = with pkgs.stdenv.lib.maintainers; {
- maintainers = [ nequissimus ];
- };
-
- machine = { pkgs, ... }:
- {
- boot.kernelPackages = pkgs.linuxPackages_copperhead_lts;
- };
-
- testScript =
- ''
- $machine->succeed("uname -a");
- $machine->succeed("uname -s | grep 'Linux'");
- $machine->succeed("uname -a | grep '${pkgs.linuxPackages_copperhead_lts.kernel.modDirVersion}'");
- $machine->succeed("uname -a | grep 'hardened'");
- '';
-})
diff --git a/nixos/tests/networking.nix b/nixos/tests/networking.nix
index 02bd4bd98079..87a8c4c0e196 100644
--- a/nixos/tests/networking.nix
+++ b/nixos/tests/networking.nix
@@ -467,7 +467,7 @@ let
# Wait for networking to come up
$machine->start;
- $machine->waitForUnit("network.target");
+ $machine->waitForUnit("network-online.target");
# Test interfaces set up
my $list = $machine->succeed("ip tuntap list | sort");
@@ -479,7 +479,9 @@ let
# Test interfaces clean up
$machine->succeed("systemctl stop network-addresses-tap0");
+ $machine->sleep(10);
$machine->succeed("systemctl stop network-addresses-tun0");
+ $machine->sleep(10);
my $residue = $machine->succeed("ip tuntap list");
$residue eq "" or die(
"Some virtual interface has not been properly cleaned:\n",
diff --git a/nixos/tests/novacomd.nix b/nixos/tests/novacomd.nix
index 2b56aee0a2e7..4eb60c0feb5c 100644
--- a/nixos/tests/novacomd.nix
+++ b/nixos/tests/novacomd.nix
@@ -9,12 +9,16 @@ import ./make-test.nix ({ pkgs, ...} : {
};
testScript = ''
- startAll;
+ $machine->waitForUnit("multi-user.target");
+ # multi-user.target wants novacomd.service, but let's make sure
$machine->waitForUnit("novacomd.service");
# Check status and try connecting with novacom
$machine->succeed("systemctl status novacomd.service >&2");
+ # to prevent non-deterministic failure,
+ # make sure the daemon is really listening
+ $machine->waitForOpenPort(6968);
$machine->succeed("novacom -l");
# Stop the daemon, double-check novacom fails if daemon isn't working
@@ -23,6 +27,8 @@ import ./make-test.nix ({ pkgs, ...} : {
# And back again for good measure
$machine->startJob("novacomd");
+ # make sure the daemon is really listening
+ $machine->waitForOpenPort(6968);
$machine->succeed("novacom -l");
'';
})
diff --git a/nixos/tests/opensmtpd.nix b/nixos/tests/opensmtpd.nix
index 5079779f35b4..4c0cbca21010 100644
--- a/nixos/tests/opensmtpd.nix
+++ b/nixos/tests/opensmtpd.nix
@@ -102,11 +102,17 @@ import ./make-test.nix {
testScript = ''
startAll;
- $client->waitForUnit("network.target");
+ $client->waitForUnit("network-online.target");
$smtp1->waitForUnit('opensmtpd');
$smtp2->waitForUnit('opensmtpd');
$smtp2->waitForUnit('dovecot2');
+ # To prevent sporadic failures during daemon startup, make sure
+ # services are listening on their ports before sending requests
+ $smtp1->waitForOpenPort(25);
+ $smtp2->waitForOpenPort(25);
+ $smtp2->waitForOpenPort(143);
+
$client->succeed('send-a-test-mail');
$smtp1->waitUntilFails('smtpctl show queue | egrep .');
$smtp2->waitUntilFails('smtpctl show queue | egrep .');
diff --git a/nixos/tests/prosody.nix b/nixos/tests/prosody.nix
index 5d33aaf8d65d..61ae5bb38ed9 100644
--- a/nixos/tests/prosody.nix
+++ b/nixos/tests/prosody.nix
@@ -6,6 +6,9 @@ import ./make-test.nix {
enable = true;
# TODO: use a self-signed certificate
c2sRequireEncryption = false;
+ extraConfig = ''
+ storage = "sql"
+ '';
};
environment.systemPackages = let
sendMessage = pkgs.writeScriptBin "send-message" ''
diff --git a/nixos/tests/yabar.nix b/nixos/tests/yabar.nix
index 06fe5bc2b278..bbc0cf4c7dd7 100644
--- a/nixos/tests/yabar.nix
+++ b/nixos/tests/yabar.nix
@@ -8,18 +8,26 @@ with lib;
maintainers = [ ma27 ];
};
- nodes.yabar = {
+ machine = {
imports = [ ./common/x11.nix ./common/user-account.nix ];
services.xserver.displayManager.auto.user = "bob";
programs.yabar.enable = true;
+ programs.yabar.bars = {
+ top.indicators.date.exec = "YABAR_DATE";
+ };
};
testScript = ''
- $yabar->start;
- $yabar->waitForX;
+ $machine->start;
+ $machine->waitForX;
- $yabar->waitForUnit("yabar.service", "bob");
+ # confirm proper startup
+ $machine->waitForUnit("yabar.service", "bob");
+ $machine->sleep(10);
+ $machine->waitForUnit("yabar.service", "bob");
+
+ $machine->screenshot("top_bar");
'';
})
diff --git a/pkgs/applications/altcoins/bitcoin-abc.nix b/pkgs/applications/altcoins/bitcoin-abc.nix
index bd365e167304..1e11f0eefc4b 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 31c8ed6fc8d0..34faf77e980d 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 5a67dc565aa7..13ec55bb589d 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 feb2924f8651..cab1b388a126 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/bitcoin.nix b/pkgs/applications/altcoins/bitcoin.nix
index 24bc3875dd5e..878cb6064e8c 100644
--- a/pkgs/applications/altcoins/bitcoin.nix
+++ b/pkgs/applications/altcoins/bitcoin.nix
@@ -5,13 +5,13 @@
with stdenv.lib;
stdenv.mkDerivation rec{
name = "bitcoin" + (toString (optional (!withGui) "d")) + "-" + version;
- version = "0.16.2";
+ version = "0.16.3";
src = fetchurl {
urls = [ "https://bitcoincore.org/bin/bitcoin-core-${version}/bitcoin-${version}.tar.gz"
"https://bitcoin.org/bin/bitcoin-core-${version}/bitcoin-${version}.tar.gz"
];
- sha256 = "1n07qykx5hc0ph8fwn7hfrbsrjv19fdzvs5h0nysq4wfgn5wa40r";
+ sha256 = "060223dzzk2izfzhxwlzzd0fhbgglvbgps2nyc4zz767vybysvl3";
};
nativeBuildInputs = [ pkgconfig autoreconfHook ];
diff --git a/pkgs/applications/altcoins/btc1.nix b/pkgs/applications/altcoins/btc1.nix
index 95e03ee6a213..2f85a8947972 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/dapp.nix b/pkgs/applications/altcoins/dapp.nix
deleted file mode 100644
index a89725f6e30f..000000000000
--- a/pkgs/applications/altcoins/dapp.nix
+++ /dev/null
@@ -1,33 +0,0 @@
-{ lib, stdenv, fetchFromGitHub, makeWrapper
-, seth, git, solc, shellcheck, nodejs, hevm }:
-
-stdenv.mkDerivation rec {
- name = "dapp-${version}";
- version = "0.5.7";
-
- src = fetchFromGitHub {
- owner = "dapphub";
- repo = "dapp";
- rev = "v${version}";
- sha256 = "128f35hczarihb263as391wr9zbyc1q1p49qbxh30via23r1brb0";
- };
-
- nativeBuildInputs = [makeWrapper shellcheck];
- buildPhase = "true";
- doCheck = true;
- checkPhase = "make test";
- makeFlags = ["prefix=$(out)"];
- postInstall = let path = lib.makeBinPath [
- nodejs solc git seth hevm
- ]; in ''
- wrapProgram "$out/bin/dapp" --prefix PATH : "${path}"
- '';
-
- meta = {
- description = "Simple tool for creating Ethereum-based dapps";
- homepage = https://github.com/dapphub/dapp/;
- maintainers = [stdenv.lib.maintainers.dbrock];
- license = lib.licenses.gpl3;
- inherit version;
- };
-}
diff --git a/pkgs/applications/altcoins/default.nix b/pkgs/applications/altcoins/default.nix
index 95d79a8650fd..f0d2f64f0ff6 100644
--- a/pkgs/applications/altcoins/default.nix
+++ b/pkgs/applications/altcoins/default.nix
@@ -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 { };
@@ -47,7 +50,6 @@ rec {
dogecoin = callPackage ./dogecoin.nix { boost = boost165; withGui = true; };
dogecoind = callPackage ./dogecoin.nix { boost = boost165; withGui = false; };
- ethsign = callPackage ./ethsign { };
freicoin = callPackage ./freicoin.nix { boost = boost155; };
go-ethereum = callPackage ./go-ethereum.nix {
@@ -59,8 +61,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 { };
@@ -73,11 +77,6 @@ rec {
namecoind = callPackage ./namecoin.nix { withGui = false; };
ethabi = callPackage ./ethabi.nix { };
- ethrun = callPackage ./ethrun.nix { };
- seth = callPackage ./seth.nix { };
- dapp = callPackage ./dapp.nix { };
-
- hevm = (haskellPackages.callPackage ./hevm.nix {});
stellar-core = callPackage ./stellar-core.nix { };
diff --git a/pkgs/applications/altcoins/ethrun.nix b/pkgs/applications/altcoins/ethrun.nix
deleted file mode 100644
index c58d9d8faf48..000000000000
--- a/pkgs/applications/altcoins/ethrun.nix
+++ /dev/null
@@ -1,26 +0,0 @@
-{ stdenv, fetchFromGitHub, rustPlatform }:
-
-with rustPlatform;
-
-buildRustPackage rec {
- name = "ethrun-${version}";
- version = "0.1.0";
-
- src = fetchFromGitHub {
- owner = "dapphub";
- repo = "ethrun";
- rev = "v${version}";
- sha256 = "1w651g4p2mc4ljp20l8lwvfx3l3fzyp6gf2izr85vyb1wjbaccqn";
- };
-
- cargoSha256 = "14x8pbjgkz0g724lnvd9mi2alqd6fipjljw6xsraf9gqwijn1kn0";
-
- meta = with stdenv.lib; {
- description = "Directly run Ethereum bytecode";
- homepage = https://github.com/dapphub/ethrun/;
- maintainers = [ maintainers.dbrock ];
- license = licenses.gpl3;
- broken = true; # mark temporary as broken
- inherit version;
- };
-}
diff --git a/pkgs/applications/altcoins/ethsign/default.nix b/pkgs/applications/altcoins/ethsign/default.nix
deleted file mode 100644
index 35fd4bc718c8..000000000000
--- a/pkgs/applications/altcoins/ethsign/default.nix
+++ /dev/null
@@ -1,59 +0,0 @@
-{ stdenv, buildGoPackage, fetchFromGitHub, fetchgit }:
-
-buildGoPackage rec {
- name = "ethsign-${version}";
- version = "0.8.2";
-
- goPackagePath = "github.com/dapphub/ethsign";
- hardeningDisable = ["fortify"];
-
- src = fetchFromGitHub {
- owner = "dapphub";
- repo = "ethsign";
- rev = "v${version}";
- sha256 = "1gd0bq5x49sjm83r2wivjf03dxvhdli6cvwb9b853wwcvy4inmmh";
- };
-
- extraSrcs = [
- {
- goPackagePath = "github.com/ethereum/go-ethereum";
- src = fetchFromGitHub {
- owner = "ethereum";
- repo = "go-ethereum";
- rev = "v1.7.3";
- sha256 = "1w6rbq2qpjyf2v9mr18yiv2af1h2sgyvgrdk4bd8ixgl3qcd5b11";
- };
- }
- {
- goPackagePath = "gopkg.in/urfave/cli.v1";
- src = fetchFromGitHub {
- owner = "urfave";
- repo = "cli";
- rev = "v1.19.1";
- sha256 = "1ny63c7bfwfrsp7vfkvb4i0xhq4v7yxqnwxa52y4xlfxs4r6v6fg";
- };
- }
- {
- goPackagePath = "golang.org/x/crypto";
- src = fetchgit {
- url = "https://go.googlesource.com/crypto";
- rev = "94eea52f7b742c7cbe0b03b22f0c4c8631ece122";
- sha256 = "095zyvjb0m2pz382500miqadhk7w3nis8z3j941z8cq4rdafijvi";
- };
- }
- {
- goPackagePath = "golang.org/x/sys";
- src = fetchgit {
- url = "https://go.googlesource.com/sys";
- rev = "53aa286056ef226755cd898109dbcdaba8ac0b81";
- sha256 = "1yd17ccklby099cpdcsgx6lf0lj968hsnppp16mwh9009ldf72r1";
- };
- }
- ];
-
- meta = with stdenv.lib; {
- homepage = https://github.com/dapphub/ethsign;
- description = "Make raw signed Ethereum transactions";
- license = [licenses.gpl3];
- };
-}
diff --git a/pkgs/applications/altcoins/hevm.nix b/pkgs/applications/altcoins/hevm.nix
deleted file mode 100644
index e7f47d0f2200..000000000000
--- a/pkgs/applications/altcoins/hevm.nix
+++ /dev/null
@@ -1,62 +0,0 @@
-{ mkDerivation, abstract-par, aeson, ansi-wl-pprint, async, base
-, base16-bytestring, base64-bytestring, binary, brick, bytestring
-, cereal, containers, cryptonite, data-dword, deepseq, directory
-, filepath, ghci-pretty, here, HUnit, lens
-, lens-aeson, memory, monad-par, mtl, optparse-generic, process
-, QuickCheck, quickcheck-text, readline, rosezipper, scientific
-, stdenv, tasty, tasty-hunit, tasty-quickcheck, temporary, text
-, text-format, unordered-containers, vector, vty
-
-, restless-git
-
-, fetchFromGitHub, lib, makeWrapper
-, zlib, bzip2, solc, coreutils
-, bash
-}:
-
-lib.overrideDerivation (mkDerivation rec {
- pname = "hevm";
- version = "0.8.5";
-
- src = fetchFromGitHub {
- owner = "dapphub";
- repo = "hevm";
- rev = "v${version}";
- sha256 = "1a27bh0azf2hdg5hp6s9azv2rhzy7vrlq1kmg688g9nfwwwhgkp0";
- };
-
- isLibrary = false;
- isExecutable = true;
- enableSharedExecutables = false;
-
- postInstall = ''
- wrapProgram $out/bin/hevm \
- --add-flags '+RTS -N$((`${coreutils}/bin/nproc` - 1)) -RTS' \
- --suffix PATH : "${lib.makeBinPath [bash coreutils]}"
- '';
-
- extraLibraries = [
- abstract-par aeson ansi-wl-pprint base base16-bytestring
- base64-bytestring binary brick bytestring cereal containers
- cryptonite data-dword deepseq directory filepath ghci-pretty lens
- lens-aeson memory monad-par mtl optparse-generic process QuickCheck
- quickcheck-text readline rosezipper scientific temporary text text-format
- unordered-containers vector vty restless-git
- ];
- executableHaskellDepends = [
- async readline zlib bzip2
- ];
- testHaskellDepends = [
- base binary bytestring ghci-pretty here HUnit lens mtl QuickCheck
- tasty tasty-hunit tasty-quickcheck text vector
- ];
-
- homepage = https://github.com/dapphub/hevm;
- description = "Ethereum virtual machine evaluator";
- license = stdenv.lib.licenses.agpl3;
- maintainers = [stdenv.lib.maintainers.dbrock];
- broken = true; # 2018-04-10
-}) (attrs: {
- buildInputs = attrs.buildInputs ++ [solc];
- nativeBuildInputs = attrs.nativeBuildInputs ++ [makeWrapper];
-})
diff --git a/pkgs/applications/altcoins/litecoin.nix b/pkgs/applications/altcoins/litecoin.nix
index b930923e8f45..ed268e34946f 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/seth.nix b/pkgs/applications/altcoins/seth.nix
deleted file mode 100644
index 334ec9277e1b..000000000000
--- a/pkgs/applications/altcoins/seth.nix
+++ /dev/null
@@ -1,33 +0,0 @@
-{ stdenv, makeWrapper, lib, fetchFromGitHub
-, bc, coreutils, curl, ethabi, git, gnused, jshon, perl, solc, which
-, nodejs, ethsign
-}:
-
-stdenv.mkDerivation rec {
- name = "seth-${version}";
- version = "0.6.3";
-
- src = fetchFromGitHub {
- owner = "dapphub";
- repo = "seth";
- rev = "v${version}";
- sha256 = "0la2nfqsscpbq6zwa6hsd73nimdnrhilrmgyy77yr3jca2wjhsjk";
- };
-
- nativeBuildInputs = [makeWrapper];
- buildPhase = "true";
- makeFlags = ["prefix=$(out)"];
- postInstall = let path = lib.makeBinPath [
- bc coreutils curl ethabi git gnused jshon perl solc which nodejs ethsign
- ]; in ''
- wrapProgram "$out/bin/seth" --prefix PATH : "${path}"
- '';
-
- meta = {
- description = "Command-line client for talking to Ethereum nodes";
- homepage = https://github.com/dapphub/seth/;
- maintainers = [stdenv.lib.maintainers.dbrock];
- license = lib.licenses.gpl3;
- inherit version;
- };
-}
diff --git a/pkgs/applications/audio/banshee/default.nix b/pkgs/applications/audio/banshee/default.nix
deleted file mode 100644
index 8a4e8893c8d3..000000000000
--- 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/sayonara/default.nix b/pkgs/applications/audio/sayonara/default.nix
index 1bf1a8b2c49e..fbe90c5377df 100644
--- a/pkgs/applications/audio/sayonara/default.nix
+++ b/pkgs/applications/audio/sayonara/default.nix
@@ -1,14 +1,14 @@
{ stdenv, fetchurl, cmake, qt5, zlib, taglib, pkgconfig, pcre, gst_all_1 }:
let
- version = "1.0.0-git5-20180115";
+ version = "1.1.1-git1-20180828";
in
stdenv.mkDerivation {
name = "sayonara-player-${version}";
src = fetchurl {
url = "https://sayonara-player.com/sw/sayonara-player-${version}.tar.gz";
- sha256 = "1fl7zplnrrvbv1xm4g348bpd46jj39jvbm808hyjjq92i64wqg37";
+ sha256 = "0rvy47qvavrp03zjdrw025dmq9fq5aaii3q1qq8b94byarl0c5kn";
};
nativeBuildInputs = [ cmake pkgconfig ];
@@ -39,7 +39,7 @@ stdenv.mkDerivation {
{ description = "Sayonara music player";
homepage = https://sayonara-player.com/;
license = licenses.gpl3;
- platforms = qt5.qtbase.meta.platforms;
+ platforms = platforms.linux;
maintainers = [ maintainers.deepfire ];
};
}
diff --git a/pkgs/applications/audio/sound-juicer/default.nix b/pkgs/applications/audio/sound-juicer/default.nix
index e38f38dad78c..f402721e180d 100644
--- a/pkgs/applications/audio/sound-juicer/default.nix
+++ b/pkgs/applications/audio/sound-juicer/default.nix
@@ -22,6 +22,8 @@ in stdenv.mkDerivation rec{
gst_all_1.gst-libav
];
+ NIX_CFLAGS_COMPILE="-Wno-error=format-nonliteral";
+
passthru = {
updateScript = gnome3.updateScript {
packageName = pname;
diff --git a/pkgs/applications/audio/spotify/default.nix b/pkgs/applications/audio/spotify/default.nix
index 1639ab34b6cf..81cda4edaedb 100644
--- a/pkgs/applications/audio/spotify/default.nix
+++ b/pkgs/applications/audio/spotify/default.nix
@@ -5,14 +5,14 @@
let
# TO UPDATE: just execute the ./update.sh script (won't do anything if there is no update)
# "rev" decides what is actually being downloaded
- version = "1.0.88.353.g15c26ea1-14";
+ version = "1.0.83.316.ge96b6e67-5";
# To get the latest stable revision:
# curl -H 'X-Ubuntu-Series: 16' 'https://api.snapcraft.io/api/v1/snaps/details/spotify?channel=stable' | jq '.download_url,.version,.last_updated'
# To get general information:
# curl -H 'Snap-Device-Series: 16' 'https://api.snapcraft.io/v2/snaps/info/spotify' | jq '.'
- # More exapmles of api usage:
+ # More examples of api usage:
# https://github.com/canonical-websites/snapcraft.io/blob/master/webapp/publisher/snaps/views.py
- rev = "19";
+ rev = "17";
deps = [
@@ -65,7 +65,7 @@ stdenv.mkDerivation {
# https://community.spotify.com/t5/Desktop-Linux/Redistribute-Spotify-on-Linux-Distributions/td-p/1695334
src = fetchurl {
url = "https://api.snapcraft.io/api/v1/snaps/download/pOBIoZ2LrCB3rDohMxoYGnbN14EHOgD7_${rev}.snap";
- sha512 = "3a068cbe3c1fca84ae67e28830216f993aa459947517956897c3b3f63063005c9db646960e85185b149747ffc302060c208a7f9968ea69d50a3496067089f3db";
+ sha512 = "19bbr4142shsl4qrikf48vq7kyrd4k4jbsada13qxicxps46a9bx51vjm2hkijqv739c1gdkgzwx7llyk95z26lhrz53shm2n5ij8xi";
};
buildInputs = [ squashfsTools makeWrapper ];
diff --git a/pkgs/applications/backup/deja-dup/default.nix b/pkgs/applications/backup/deja-dup/default.nix
index c8fb4af3c4bf..797a00f4fc4a 100644
--- a/pkgs/applications/backup/deja-dup/default.nix
+++ b/pkgs/applications/backup/deja-dup/default.nix
@@ -39,7 +39,7 @@ stdenv.mkDerivation rec {
propagatedUserEnvPkgs = [ duplicity ];
- PKG_CONFIG_LIBNAUTILUS_EXTENSION_EXTENSIONDIR = "${placeholder "out"}/lib/nautilus/extensions-3.0";
+ PKG_CONFIG_LIBNAUTILUS_EXTENSION_EXTENSIONDIR = "lib/nautilus/extensions-3.0";
postInstall = ''
glib-compile-schemas $out/share/glib-2.0/schemas
diff --git a/pkgs/applications/editors/emacs-modes/melpa-packages.nix b/pkgs/applications/editors/emacs-modes/melpa-packages.nix
index bec845b815ce..addae2674684 100644
--- a/pkgs/applications/editors/emacs-modes/melpa-packages.nix
+++ b/pkgs/applications/editors/emacs-modes/melpa-packages.nix
@@ -146,6 +146,12 @@ self:
(attrs.nativeBuildInputs or []) ++ [ external.git ];
});
+ magit-todos = super.magit-todos.overrideAttrs (attrs: {
+ # searches for Git at build time
+ nativeBuildInputs =
+ (attrs.nativeBuildInputs or []) ++ [ external.git ];
+ });
+
# missing OCaml
merlin = markBroken super.merlin;
diff --git a/pkgs/applications/editors/emacs-modes/melpa-stable-packages.nix b/pkgs/applications/editors/emacs-modes/melpa-stable-packages.nix
index 61086b96230e..98927cbd9873 100644
--- a/pkgs/applications/editors/emacs-modes/melpa-stable-packages.nix
+++ b/pkgs/applications/editors/emacs-modes/melpa-stable-packages.nix
@@ -151,6 +151,12 @@ self:
(attrs.nativeBuildInputs or []) ++ [ external.git ];
});
+ magit-todos = super.magit-todos.overrideAttrs (attrs: {
+ # searches for Git at build time
+ nativeBuildInputs =
+ (attrs.nativeBuildInputs or []) ++ [ external.git ];
+ });
+
# missing OCaml
merlin = markBroken super.merlin;
diff --git a/pkgs/applications/editors/leo-editor/default.nix b/pkgs/applications/editors/leo-editor/default.nix
index 2084a047a086..a2274be463ed 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 64b8e48b2881..9c50d8e8b78e 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/graphics/PythonMagick/default.nix b/pkgs/applications/graphics/PythonMagick/default.nix
index f0b4a991f74a..938df76e2572 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 334a5a33dadf..aa6305ce8311 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/imgcat/default.nix b/pkgs/applications/graphics/imgcat/default.nix
index ad2cb4198d2d..a98029dd5807 100644
--- a/pkgs/applications/graphics/imgcat/default.nix
+++ b/pkgs/applications/graphics/imgcat/default.nix
@@ -4,7 +4,7 @@ stdenv.mkDerivation rec {
name = "imgcat-${version}";
version = "2.3.0";
- buildTools = [ autoconf automake libtool ncurses ];
+ buildInputs = [ autoconf automake libtool ncurses ];
preConfigure = ''
${autoconf}/bin/autoconf
diff --git a/pkgs/applications/graphics/photoflow/default.nix b/pkgs/applications/graphics/photoflow/default.nix
index ffef558e84dd..6f3bf69889c5 100644
--- a/pkgs/applications/graphics/photoflow/default.nix
+++ b/pkgs/applications/graphics/photoflow/default.nix
@@ -1,13 +1,13 @@
{ stdenv, fetchFromGitHub, gettext, glib, libxml2, pkgconfig, swig, automake, gobjectIntrospection, cmake, ninja, libtiff, libjpeg, fftw, exiv2, lensfun, gtkmm2, libraw, lcms2, libexif, vips, expat, pcre, pugixml }:
stdenv.mkDerivation {
- name = "photoflow-unstable-2018-03-06";
+ name = "photoflow-unstable-2018-08-28";
src = fetchFromGitHub {
owner = "aferrero2707";
repo = "PhotoFlow";
- rev = "f9bbea183fa02412d1d17075955d2284eeaf8174";
- sha256 = "1fsk7kdmlkd64wcswbxrl87aqwmzqak6p3s38ggxzx2h51fa7lmf";
+ rev = "df03f2538ddd232e693c307db4ab63eb5bdfea38";
+ sha256 = "08ybhv08h24y4li8wb4m89xgrz1szlwpksf6vjharp8cznn4y4x9";
};
nativeBuildInputs = [
@@ -50,6 +50,7 @@ stdenv.mkDerivation {
homepage = https://aferrero2707.github.io/PhotoFlow/;
license = licenses.gpl3Plus;
maintainers = [ maintainers.MtP ];
- platforms = platforms.all;
+ platforms = platforms.linux;
+ broken = stdenv.isAarch64;
};
}
diff --git a/pkgs/applications/misc/dbeaver/default.nix b/pkgs/applications/misc/dbeaver/default.nix
index 35698a323319..77cad142d41d 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 ed2f0626e5d2..95754579c487 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/khal/default.nix b/pkgs/applications/misc/khal/default.nix
index ede85aeada5a..f9c929c21bfb 100644
--- a/pkgs/applications/misc/khal/default.nix
+++ b/pkgs/applications/misc/khal/default.nix
@@ -46,6 +46,10 @@ in with python.pkgs; buildPythonApplication rec {
nativeBuildInputs = [ setuptools_scm pkgs.glibcLocales ];
checkInputs = [ pytest ];
+ postInstall = ''
+ install -D misc/__khal $out/share/zsh/site-functions/__khal
+ '';
+
checkPhase = ''
py.test
'';
diff --git a/pkgs/applications/misc/qmapshack/default.nix b/pkgs/applications/misc/qmapshack/default.nix
index 3b9e76aee4b8..a2c8c75dc245 100644
--- a/pkgs/applications/misc/qmapshack/default.nix
+++ b/pkgs/applications/misc/qmapshack/default.nix
@@ -1,17 +1,17 @@
-{ stdenv, fetchurl, cmake, qtscript, qtwebkit, gdal, proj, routino, quazip }:
+{ stdenv, fetchurl, cmake, qtscript, qtwebengine, gdal, proj, routino, quazip }:
stdenv.mkDerivation rec {
name = "qmapshack-${version}";
- version = "1.11.1";
+ version = "1.12.0";
src = fetchurl {
url = "https://bitbucket.org/maproom/qmapshack/downloads/${name}.tar.gz";
- sha256 = "0yqilfldmfw8m18jbkffv4ar1px6kjs0zlgb216bnhahcr1y8r9y";
+ sha256 = "0d5p60kq9pa2hfql4nr8p42n88lr42jrsryrsllvaj45b8b6kvih";
};
nativeBuildInputs = [ cmake ];
- buildInputs = [ qtscript qtwebkit gdal proj routino quazip ];
+ buildInputs = [ qtscript qtwebengine gdal proj routino quazip ];
cmakeFlags = [
"-DROUTINO_XML_PATH=${routino}/share/routino"
diff --git a/pkgs/applications/misc/qpdfview/default.nix b/pkgs/applications/misc/qpdfview/default.nix
index 263bc37660c9..dfaa90d43adf 100644
--- a/pkgs/applications/misc/qpdfview/default.nix
+++ b/pkgs/applications/misc/qpdfview/default.nix
@@ -21,16 +21,11 @@ stdenv.mkDerivation {
src = fetchurl {
inherit (s) url sha256;
};
- qmakeFlags = [
- "*.pro"
- "TARGET_INSTALL_PATH=${placeholder "out"}/bin"
- "PLUGIN_INSTALL_PATH=${placeholder "out"}/lib/qpdfview"
- "DATA_INSTALL_PATH=${placeholder "out"}/share/qpdfview"
- "MANUAL_INSTALL_PATH=${placeholder "out"}/share/man/man1"
- "ICON_INSTALL_PATH=${placeholder "out"}/share/icons/hicolor/scalable/apps"
- "LAUNCHER_INSTALL_PATH=${placeholder "out"}/share/applications"
- "APPDATA_INSTALL_PATH=${placeholder "out"}/share/appdata"
- ];
+
+ # TODO: revert this once placeholder is supported
+ preConfigure = ''
+ qmakeFlags="$qmakeFlags *.pro TARGET_INSTALL_PATH=$out/bin PLUGIN_INSTALL_PATH=$out/lib/qpdfview DATA_INSTALL_PATH=$out/share/qpdfview MANUAL_INSTALL_PATH=$out/share/man/man1 ICON_INSTALL_PATH=$out/share/icons/hicolor/scalable/apps LAUNCHER_INSTALL_PATH=$out/share/applications APPDATA_INSTALL_PATH=$out/share/appdata"
+ '';
meta = {
inherit (s) version;
diff --git a/pkgs/applications/misc/solaar/default.nix b/pkgs/applications/misc/solaar/default.nix
index afe944e868e7..e26071dd3612 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/zathura/core/default.nix b/pkgs/applications/misc/zathura/core/default.nix
index 001d70775d6d..56701cffb8cf 100644
--- a/pkgs/applications/misc/zathura/core/default.nix
+++ b/pkgs/applications/misc/zathura/core/default.nix
@@ -11,11 +11,11 @@ with stdenv.lib;
stdenv.mkDerivation rec {
name = "zathura-core-${version}";
- version = "0.4.0";
+ version = "0.4.1";
src = fetchurl {
url = "https://pwmt.org/projects/zathura/download/zathura-${version}.tar.xz";
- sha256 = "1j0yah09adv3bsjhhbqra5lambal32svk8fxmf89wwmcqrcr4qma";
+ sha256 = "1znr3psqda06xklzj8mn452w908llapcg1rj468jwpg0wzv6pxfn";
};
nativeBuildInputs = [
diff --git a/pkgs/applications/networking/browsers/chromium/common.nix b/pkgs/applications/networking/browsers/chromium/common.nix
index ebc700a7f37c..6b9f7225c84f 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 1995bf1fa8f5..000000000000
--- 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 84c4e6202625..9faa7e5e31fd 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 89b6a7ce3121..ebf730129079 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 8d7f4e6cc703..91c5f697132c 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/firefox-bin/release_sources.nix b/pkgs/applications/networking/browsers/firefox-bin/release_sources.nix
index 13808fca99fe..1500597318f3 100644
--- a/pkgs/applications/networking/browsers/firefox-bin/release_sources.nix
+++ b/pkgs/applications/networking/browsers/firefox-bin/release_sources.nix
@@ -1,985 +1,995 @@
{
- version = "61.0.2";
+ version = "62.0.2";
sources = [
- { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-x86_64/ach/firefox-61.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.2/linux-x86_64/ach/firefox-62.0.2.tar.bz2";
locale = "ach";
arch = "linux-x86_64";
- sha512 = "572696944414358a50dcf8e647f22f4d3172bf5ac846cd29bcb4baeb0ac5a351f361632ee87dacc1214633848f9970f93cbb25a6e9cfbd9ee796e30e06f34715";
+ sha512 = "30660e1377c125ec195006d84ba5ae356c8b53b21865675ac7649ffadd169e578ab91d0107f18f26530788ae66aacb7edeec1c507bccb456e1aa89bac95351dd";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-x86_64/af/firefox-61.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.2/linux-x86_64/af/firefox-62.0.2.tar.bz2";
locale = "af";
arch = "linux-x86_64";
- sha512 = "dc4b22a8df99c3519f3a8001d0bdbcfdf4fc5d4dd13d18bd15892fb29e928126d46e2ccb9b512dca0c5395852a3c918a5aacd2b9a7b7f2cdb982052e915d5413";
+ sha512 = "81e3d9b33af731c9a79bdac678c84d2f30de0b77b6d90d4adaa7da11383e360444f85bf7465add562048d13692cce88b3fb1bd63beac30a6d490f6b75eb9be26";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-x86_64/an/firefox-61.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.2/linux-x86_64/an/firefox-62.0.2.tar.bz2";
locale = "an";
arch = "linux-x86_64";
- sha512 = "2d57784a18278bac69c08e81fafbdc3530d17a112d3f1e7d407e2590935c87058641498c74300950d3f151bf5fd67065133d91c83e1e500c72b60ebc91a4572d";
+ sha512 = "42d3118c2bba77aed919a1675538f52230841ec6c8398e2b9964631100c22c70335fc80f8757a916aef7c0ebabccc5356ca323901061d1bd0e5ad4eb0a10b483";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-x86_64/ar/firefox-61.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.2/linux-x86_64/ar/firefox-62.0.2.tar.bz2";
locale = "ar";
arch = "linux-x86_64";
- sha512 = "e397f8d276c115105afcbab6fb71afd7bcc93778e79ec86a4274e10a6a039ad3107cbaabc9dd4bd197ce6be7add3cc0af954f029c179a6972ad2ba15ff2e3eb9";
+ sha512 = "c6a5a647e17b8b4fb4e20a32c2e492c6102cb899acf5af2d3af3af3cd122d989bfa452638d038b9b7c8c0bbade604f6caa11f42cbde5a3260fb13e44080cd720";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-x86_64/as/firefox-61.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.2/linux-x86_64/as/firefox-62.0.2.tar.bz2";
locale = "as";
arch = "linux-x86_64";
- sha512 = "9869e76e004c1e77d976f01f9a4cafe29c253ad3c85b1119d67a65c784b5f65dd7a4927ccd535ee80fd63a6a47127e614478effbd0455a227e200ca31c846acb";
+ sha512 = "c1664a83e3dbd7b3041449ab4f7b9b41b038425c126572d380bf9c5d1d7318264a8ba798d670156ba91625de0865ed0b6e4e38bbd2ea700a118b64bbeea95b25";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-x86_64/ast/firefox-61.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.2/linux-x86_64/ast/firefox-62.0.2.tar.bz2";
locale = "ast";
arch = "linux-x86_64";
- sha512 = "5b298cce253df9c8a072fdc93df894fdb4218c720ded3260f282c711270086104eca08e2d5afe1be4960beb274017eb4e0ae7313ceb5d6e596d0591f026f78fc";
+ sha512 = "31c15cde2d9a0f93fa742c41032e8b6e06ad24a5e6126c953e70c0addc5d1a74c5b5d06088002b4c1516a1f75b2e3e82d9d04c0a624db781bde2d3e8182062f3";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-x86_64/az/firefox-61.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.2/linux-x86_64/az/firefox-62.0.2.tar.bz2";
locale = "az";
arch = "linux-x86_64";
- sha512 = "cd8df2a19e10d5445ac0970814ad245e25f6ea695ec9590344c1a4e261b6fd7d15534028f6a8abf1943fb97f0e127ed55774e2cc2bf7cf85be525503bbb69f1e";
+ sha512 = "8d3f949c325bd5efb9619e96f8d8688324d113ac7add21b1d3290c160bba1e2193f923a54d3ce295e75b2ea0a59ab9c718e117374a46963ef69c53f3ceaa1957";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-x86_64/be/firefox-61.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.2/linux-x86_64/be/firefox-62.0.2.tar.bz2";
locale = "be";
arch = "linux-x86_64";
- sha512 = "94947ee7b7477b467016cd21daa8134bf28ab289ea29c0905e04291b7560da895124be2ab7403d2b9874291b7e33f5a92d36f9c0ed9d58ccc3306ecd7723305c";
+ sha512 = "7cb5fd02ba28c54acb1c73320f794165c0debf35a35c5e15602ccb7677b879ef41c910deb4668c0f160663b7a6afa43f30492fc23691406848e6adde7fcd0b02";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-x86_64/bg/firefox-61.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.2/linux-x86_64/bg/firefox-62.0.2.tar.bz2";
locale = "bg";
arch = "linux-x86_64";
- sha512 = "9b0bce62c85282c79708245fa792207dccd7bf939ebc23ddb2e6bb7bc3f6fdbfdeecf69d1ba599b2ec8d10fe2d79bab5dd229cf9fa7b79e076797267df39c54b";
+ sha512 = "c6484b8b19941e135d2dd983085325d9f5bef118105879b0f830762ec1899096146a454397510286a902d175f9ad4eb3e849fdce38844535bc8a92bcaa478862";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-x86_64/bn-BD/firefox-61.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.2/linux-x86_64/bn-BD/firefox-62.0.2.tar.bz2";
locale = "bn-BD";
arch = "linux-x86_64";
- sha512 = "4de95899462eafed03464fd054b7ee12cf53d004fbcb58ad18bd462e57f5c50c31d3b50f689a7d54f973228a2877e6c77c47740280daf7d6db4f7ba5988b9484";
+ sha512 = "4526b294ea939f88c92a3275ea17fe16932b410b0114af03d9f3db892cf6ed1a9d0ae0a6e0a651a0599aaee9bf53c69273b8d0286b94656635b3357ee2ab021a";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-x86_64/bn-IN/firefox-61.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.2/linux-x86_64/bn-IN/firefox-62.0.2.tar.bz2";
locale = "bn-IN";
arch = "linux-x86_64";
- sha512 = "2ecbf2ae7d1296dcfd6e2268dbc27060ce07bb4b3d9d62f6bf27fc8874f114dfcca73672adb4d411d2c1eca7ffac22f7832bc5cdad12a492c3bc4406e3a6746a";
+ sha512 = "3a17f78a48c7657d7ed834f4c05b523d661c5a692e27751e48ed8ea6f580cee21295b025a2474bca10fdc803ade0acef0ff0f0ce40de992a1fd072ca70a1062e";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-x86_64/br/firefox-61.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.2/linux-x86_64/br/firefox-62.0.2.tar.bz2";
locale = "br";
arch = "linux-x86_64";
- sha512 = "a92abcb1aaec11ae3b0eee75b5b5610157f8ca64627a20018925431ac09cc4295d14357e63ea0fa2b66bb415039c659f53292b8133558d591a16cbb5772f875f";
+ sha512 = "7932c59f390580c3a9f333fe40ddb9aace2c7d35703ec022468c503b4e58604fff777fb86e44cfcb84186845e8da26f55a7d0584d09982e88ee08e2b205f289e";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-x86_64/bs/firefox-61.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.2/linux-x86_64/bs/firefox-62.0.2.tar.bz2";
locale = "bs";
arch = "linux-x86_64";
- sha512 = "15dda8914e02198a9b6efdf0ba9dd4f37e41ec7c6674b8b32189ccc368ab6ee671e401cd668c5ed57157634220c176be543c277342e708baf7b0110cbbb4fe64";
+ sha512 = "509b1d013a5ef5bf5f5a8167685a7232ee400202c1bfda37eab1ad8965cf0d7a6ae2988163be050b5d37741bb405df5b28aa937c82e086708cd6d943b5215ede";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-x86_64/ca/firefox-61.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.2/linux-x86_64/ca/firefox-62.0.2.tar.bz2";
locale = "ca";
arch = "linux-x86_64";
- sha512 = "230591cd45dd9d3644313b96ea304d33e9c87d6968c37b73ac3c701132bf13a3869672317b135f31d8082f39298c978c07d614f5055555ba9079afc6e17a489e";
+ sha512 = "75b918bb00c9039228b8881ac8fef4dbd36521b80651dc2d6b1ad1f6701ca39f3527b244c88d9e97ba1ac0a6e12ea7b6a3c40f9b95c0c2167e7c175b5d9ce37e";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-x86_64/cak/firefox-61.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.2/linux-x86_64/cak/firefox-62.0.2.tar.bz2";
locale = "cak";
arch = "linux-x86_64";
- sha512 = "c622e622cc199b8a9946276afdf03f006403bd302d2c62a5076403e6764dfdcd121c1e15fc56d45bdb1751131326babdc9be96e6425fcab9e55d6c689e5959ca";
+ sha512 = "8803b41c4651174e4999804071b27d7cbf47497a8a5b83488654d0586fd6245d5d517c03e64e8e75ccc0991b2be47cb0ee95143d08828027e627409fe6c55cd6";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-x86_64/cs/firefox-61.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.2/linux-x86_64/cs/firefox-62.0.2.tar.bz2";
locale = "cs";
arch = "linux-x86_64";
- sha512 = "8e4d452a75befcb6c2a6e7ed0b4b1aaa8f18d4d61302ddf6b8143e024352a060621c375742748db5981efecb8075268f56811702586189a116698a669408dee2";
+ sha512 = "182cd25579ad04713852e0343e0d9604f42772a4c6ad06da512a8286314451f7b90c667c2f199afd1a1162c8ff6d1320abfc87207602182a3cb32196916189d1";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-x86_64/cy/firefox-61.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.2/linux-x86_64/cy/firefox-62.0.2.tar.bz2";
locale = "cy";
arch = "linux-x86_64";
- sha512 = "349f73f43be8dad527549ff158b267c62be7c0d828c2adcfc635e419ac9840076549a7a51396b306bc042d1d7697c8d6caea3bf0b4e3f42e7c0efbd5b8d92e1e";
+ sha512 = "c65fff984a351cc67dba5574e7d2b3291de4e6c78f7659a6020d70f09cdb3bc951696ba88b778df4057633e9e06013799af58f5f2d0a052bdc22e7c98aaec278";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-x86_64/da/firefox-61.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.2/linux-x86_64/da/firefox-62.0.2.tar.bz2";
locale = "da";
arch = "linux-x86_64";
- sha512 = "187bec61e1218fa6c2fe79b3e80066a617ee3c26f83aa16b61a21e3fc76a64c2c821120f9206240642dd10175b6976c352b13a5b2e5514126a3840524fdd1de6";
+ sha512 = "e9fa596fb6c825fd3c2b1d5f42ad1c192db42ee046ad2f348733a979135d41bf2b0efbcd8ac2fb68e0337890ac3131a3454425425ef727225786ab0cb51f4d9a";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-x86_64/de/firefox-61.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.2/linux-x86_64/de/firefox-62.0.2.tar.bz2";
locale = "de";
arch = "linux-x86_64";
- sha512 = "8aaa8aeecf1a2dff922b785ed3a4cbf248454cf010ea9c188a4ac70f0550813944a8e9265c2edb13bdbdfbe20ec5a0dda3168d2dcd529d082bafcfaef6271913";
+ sha512 = "7a4c786b18299378c4d8b797e99385e35ad501912f05c02bad311665be6d52a6435a3fa04c7a8ae8a562af654aa3cf17eb497fc9691fbd0b2cf46a67f5967353";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-x86_64/dsb/firefox-61.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.2/linux-x86_64/dsb/firefox-62.0.2.tar.bz2";
locale = "dsb";
arch = "linux-x86_64";
- sha512 = "c821eae950e48de43580c9dd4af7fc609927e3fd27ea876fca909bb3319574663120688e442ba83acf1d273e1fd22a87d0cd934e68151edd9a8561015e58a47c";
+ sha512 = "52ae2b79d9106fb304b4b3b945ac9960614efdc7780406e87bbe1dc15effc049e8cbb91c8f4f2dcd1966ed0085e3574e3e1a4234d933fa587e05901875234344";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-x86_64/el/firefox-61.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.2/linux-x86_64/el/firefox-62.0.2.tar.bz2";
locale = "el";
arch = "linux-x86_64";
- sha512 = "afa286bd1ac48a6007b6e5072bce0a26482a0eefdb00aee824de8c4dd06688d16731252933cb71b9f3bf6d30f951c6df68c2ede85733edc81facbb628118c72c";
+ sha512 = "956d5d36ec255ec122c09edda12a2242bbbb03793385fa9c417fbb8037fb19506298a31bed94eb39e825e4fcb66184901b3580ced8812cbc44f8a4d8ba339d19";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-x86_64/en-GB/firefox-61.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.2/linux-x86_64/en-CA/firefox-62.0.2.tar.bz2";
+ locale = "en-CA";
+ arch = "linux-x86_64";
+ sha512 = "6a93cedce6724a19ea663e70ef9d57d27c144c1250c438ff15cd8d36c3d92b8a95c9e3f81fb53862b550d0765a8f0b7bdc14d6d9929a41f18357e0d0cfae732e";
+ }
+ { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.2/linux-x86_64/en-GB/firefox-62.0.2.tar.bz2";
locale = "en-GB";
arch = "linux-x86_64";
- sha512 = "c2ca0c9a72503ac5817ed9ff3736b812005037c51534ef9a159b7914b974a356f3f1bc89d0669d05bde8dde124f2fcc3ff3a91cb412ec0329c2e6def875219fc";
+ sha512 = "c3f825196d8f1d1284644ebf07f08a7626086c869408603d50ded5b0eeaa98bb9f874c7df38bbbf3083dbb4a1ae8afa8e4c90ed35a83fd99bec78cf3813dd92e";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-x86_64/en-US/firefox-61.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.2/linux-x86_64/en-US/firefox-62.0.2.tar.bz2";
locale = "en-US";
arch = "linux-x86_64";
- sha512 = "9f32b33727e5877bfdeb186420a02f185896a2a5803565a811203d86e84d51ede06f27d63a88a482028c36b65ed92ac4c17196aa2069370d6cae09b74bf482a5";
+ sha512 = "f19a938af6bfe6499bb4e4337ece1cc0918fe56b361ced0f131f010652b2849d98e48a7cd06277580cc87843454c7bdfe816b65c99189e1ba749aaa64059a6ef";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-x86_64/en-ZA/firefox-61.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.2/linux-x86_64/en-ZA/firefox-62.0.2.tar.bz2";
locale = "en-ZA";
arch = "linux-x86_64";
- sha512 = "e41b7ea34f193bbcd892030b5feb2f117bb5f3f9dfbe69560ea64b7936bcdc47a55e878c645786999a2e52c4333c033320eb1ed9aace3481a9f37d87c9ae9ccb";
+ sha512 = "0214fbf75843617b0623eea8c8ea2ef46d23d739f63a74ff47fc87ff16817d9110862696f92ba614167386bc51c5e94a9627d0dcdd22c19c20bac4a24543c126";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-x86_64/eo/firefox-61.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.2/linux-x86_64/eo/firefox-62.0.2.tar.bz2";
locale = "eo";
arch = "linux-x86_64";
- sha512 = "e0850feb028cf0644340d2842b054e49608cdc1afbb9487ee744f6fe1ce0662874f0f96de2da52de2e0abbe39d7ea430efc70392d555e7cbff7a46f9029ba9fd";
+ sha512 = "7da531166d26dfa3cd1edc327eecd583e10c8a2c41d007daba41e6f28e42159e1c43be5759061891c74ab0157ca3d4ce58b8a6a7d879ad4ce4c50586341b460e";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-x86_64/es-AR/firefox-61.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.2/linux-x86_64/es-AR/firefox-62.0.2.tar.bz2";
locale = "es-AR";
arch = "linux-x86_64";
- sha512 = "72bde05493e4c140f6022e24cccf0ca580ed3c423840d2631cb28ce8a20be92837f78cfaa3b09a324bbc0fcb064ced351fc66a0edf2c56d972f629aed6662dcb";
+ sha512 = "e5bc4003ec881a41a28b6847dc9d90c81dec5ba9d103111922fdcc718713c67027f5b04a9d608d4e8b20a656abd94e0c5c8d5819135e8884d84eeb952b855590";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-x86_64/es-CL/firefox-61.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.2/linux-x86_64/es-CL/firefox-62.0.2.tar.bz2";
locale = "es-CL";
arch = "linux-x86_64";
- sha512 = "4bb298e184263edff9100e1e7f58cbbd405dbc73a265a5dc1d78e8cd25e538d34ef0994b6b5e79082fc12f1c0b2035c944e17eccaa7e1bd92eee8d27d8f50400";
+ sha512 = "c5360481d7a86bddb87805672dedab22735e484e3a048e5e57e9265034ac40d0e5586bedab617da1cb54a4b7c1d3b4e18bd5f0cc0c8b8d3563df54b7ad506b23";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-x86_64/es-ES/firefox-61.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.2/linux-x86_64/es-ES/firefox-62.0.2.tar.bz2";
locale = "es-ES";
arch = "linux-x86_64";
- sha512 = "13d7f54f7899eda53add9dc4a1bc27fd30e0caaa9c5a95d716c1ef8382c2317733cc7a71aba9aa4f2a024717eeb09be7fdd55dbf6183d1679e61e3b57964e61e";
+ sha512 = "8977a46f5946da99c4e3f30e3451110adf7993ad5a64f5dee09016932ee55a63ebca9126f7c3196191e658aa39465701db347068bdc6e6acc85d061873ccf226";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-x86_64/es-MX/firefox-61.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.2/linux-x86_64/es-MX/firefox-62.0.2.tar.bz2";
locale = "es-MX";
arch = "linux-x86_64";
- sha512 = "66c24cd9a80da6137a94bf9cf2bad4ad3ef0141bc10c8d92435f9d89e11712afc08018d7e1b4f17fe03e4ac62b2f6ed1cec638dc7d0726bf27453e1741a1ba06";
+ sha512 = "2bb3eeb2bef0f7c72c9bd95093e4c80b69e6f56ec41d0d4b3c54d2f8d7496884394583fb77e9f5e985ff6dedeb94711d4732baaaf5947e26e1f7b13f3024470b";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-x86_64/et/firefox-61.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.2/linux-x86_64/et/firefox-62.0.2.tar.bz2";
locale = "et";
arch = "linux-x86_64";
- sha512 = "a7a686b1e16b616a3aff8901148a2818cbbe2459851660a23610ddfb4b8109aac159fe80986744bdc4124a10ab160d2703b2e8f65def0c86977bfa3fcb3ab020";
+ sha512 = "cad31e57d54d5e533f5c999b2009d29c22c9469b7b620499df7f433d0e86f14ba336665a9d9917a48f55d9a57e30be70dd461e8e2159092d5c2c1435e842603f";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-x86_64/eu/firefox-61.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.2/linux-x86_64/eu/firefox-62.0.2.tar.bz2";
locale = "eu";
arch = "linux-x86_64";
- sha512 = "0760621f5d053fb802a46151f6283fb7a0b7de5c22ba0a55ae0f3056b0d43cf16c6da79af8a2217a665825a840b9c83134128f455dfe6e83f473290e425ad396";
+ sha512 = "6cfd46bc362a9dca327651ad9219979e321c8ec8ebef21fed64617e7c5540804ce0a16514848faff8e3a3018a454e8b90fac627054b92cb96f5fe8046326db50";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-x86_64/fa/firefox-61.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.2/linux-x86_64/fa/firefox-62.0.2.tar.bz2";
locale = "fa";
arch = "linux-x86_64";
- sha512 = "29e8466e754900b63704206b5b650ea60aea841aebfa58187013a495a95dd32d939308253b0f856ef5e04d3ddf320c289e74cb03830a16374e9fe2c03214a1b4";
+ sha512 = "cfcd0562561478bf2d14ea6b2d87c081d86c5c6d30bd7c2c1eea673e2a82f875a2f954955fdac959ba96ce5fe8461c82137bd3c6313eefb3fb24bd4993692c29";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-x86_64/ff/firefox-61.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.2/linux-x86_64/ff/firefox-62.0.2.tar.bz2";
locale = "ff";
arch = "linux-x86_64";
- sha512 = "240232a8dd4556c5c4df872b60b3352176490b7afd4388c26322008c7dca489f48f679c21d148016965ea81d850eaffe9fb7887b97cbbbac955f9cc29f28b4f6";
+ sha512 = "ffda297f92bfa0a76d613e7c54a71d376c2264570ee8d9f2bbed9faacded01cc8ea9fb171ae14f4d349702d91896899299bfd6b2cb66e9ded933bc6e34e63033";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-x86_64/fi/firefox-61.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.2/linux-x86_64/fi/firefox-62.0.2.tar.bz2";
locale = "fi";
arch = "linux-x86_64";
- sha512 = "63c7d4ede5e02c9d4b2e59234b57d4f539c0cd3666a053b127cc18d080900bcf488f8d3d7f2dfb98399a1cec5ec6780d86d93ad9dd2ce7612e84604481562a64";
+ sha512 = "be791b05d114f2d49c23714898f240aeaf9593aae6b7d06a85fb3e6dbe9116ee19d5089aff137e1c0fc56873c172a73937e15b19eb76db15122019649dd83a58";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-x86_64/fr/firefox-61.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.2/linux-x86_64/fr/firefox-62.0.2.tar.bz2";
locale = "fr";
arch = "linux-x86_64";
- sha512 = "3a4263e78c62faaab850c743660e633269dd9e625f03f94459b34ede41989cbaf498755fb8c2f507e4f4b88b633c29a3eae837ffce0572ee03afdf67c53d4ed1";
+ sha512 = "1f167a7df26ee83671a7c3dea3bcccaa7797da0253110eafa3de5a17b7e19d1710966ac3a82bb0e7bee3d7287a6b39f59b9152672618dbad5d782e297ea6587e";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-x86_64/fy-NL/firefox-61.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.2/linux-x86_64/fy-NL/firefox-62.0.2.tar.bz2";
locale = "fy-NL";
arch = "linux-x86_64";
- sha512 = "e8c7760f3f64b4c525bd0521cb66ed11bdd9142deee986fd6a5f6a322685633aa3539f819e3ec886884906998d37dd6401b77e4790a246cd098c47cd49f929d3";
+ sha512 = "ed9ee111ba5b451b5fa730bc0f8e14046ad7613d542a7695f68e28d9fddb279770e3663d8b9964617d803f073c7f02dc036e4cc6ce3a17b69ba5fba782831da0";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-x86_64/ga-IE/firefox-61.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.2/linux-x86_64/ga-IE/firefox-62.0.2.tar.bz2";
locale = "ga-IE";
arch = "linux-x86_64";
- sha512 = "8f59620f30767cd58babc163b803b2c8b174562e5a6a686c5a586d24db0da4c4ecf180c13673a6a434faee02c2b7ef746c1f10e45055d42327044a945925e514";
+ sha512 = "073b104cebd63452fecff3949195ebeb794dde2d4c2defb44f62f4493165f5dcac20320da8229bd7c3e5410b840bb51b4699d77fdc886974848745e066ccec16";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-x86_64/gd/firefox-61.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.2/linux-x86_64/gd/firefox-62.0.2.tar.bz2";
locale = "gd";
arch = "linux-x86_64";
- sha512 = "ba496ad0daec76e2c6e4f3c2dbb8219d1f3234893acb09602e51b7bfab4ef84d9f49104a021b206ff528bb323e2255c97e92a6949b3949098e5863f48e9fefa7";
+ sha512 = "307262bb8874fc6115051608bf4a79e51fb08910de7d3df44a6bb3bbde64d3a76aa88361f10b811a2af9a05518d7ba42b6f2e078d5db32f0118cd08f8a3ec7fb";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-x86_64/gl/firefox-61.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.2/linux-x86_64/gl/firefox-62.0.2.tar.bz2";
locale = "gl";
arch = "linux-x86_64";
- sha512 = "3ef33eda5d7a88fb6f67f91983ab2db11404f58686ecbe30dcbc27dd1358660b4c88ab8e678184cdd3fd4102f93120e0d0a4d75435812b047ec2bcb74cb52a83";
+ sha512 = "dbecb09308a701aaf13d278b208fb3b9e7631c8fc07b9b3fc99c27a4035ea7fd75da810063913449c2746933c63cf7a5175d4d5a17aa808f6bd8d19bf0692f0e";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-x86_64/gn/firefox-61.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.2/linux-x86_64/gn/firefox-62.0.2.tar.bz2";
locale = "gn";
arch = "linux-x86_64";
- sha512 = "5e86c34b627b66872a7f07e30ee6285e61d041e69b0e2355eec142b23ceac8ea5ef7e257adfd1ae877b442f7171381cb013fddd7593d1b6e42f3a22e2267a5df";
+ sha512 = "f62e0a0cb6794f6fc36c85f98952ccd313676d4389b12a054461789e30effd3effb6fc729bbdfd83674c2691d03aa219ddccfcb6eb74426ff49bd4a458ff7ca9";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-x86_64/gu-IN/firefox-61.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.2/linux-x86_64/gu-IN/firefox-62.0.2.tar.bz2";
locale = "gu-IN";
arch = "linux-x86_64";
- sha512 = "72e43c4dbc3db08473d96d0686fa2df56f82ebdbee064a152ebb2a49cb4fa7a9a80135fa9b7106ffdb64d3342b38400de5351a3b225360d5a730f0f4991418f3";
+ sha512 = "b0624b04a3a20a48358027aeac449c52198139a3e9dbf0bc035a06c22fae3bcb44f34a07ad88a14a44e87dc16a3393688ce8d45d5070264d1ce63b2c183aceb1";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-x86_64/he/firefox-61.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.2/linux-x86_64/he/firefox-62.0.2.tar.bz2";
locale = "he";
arch = "linux-x86_64";
- sha512 = "d3b5a43aff6e76264eec6d211a5a9dd0b7fb89e41bbb265f31091ce3261f4a160e1ddaf59432bc3771bc5afacf1a3e12e42e0d08107727b0e8b5941ff29174c6";
+ sha512 = "7b3f4478100b6122c22fc50a944dc86e46b3d2d73893209be748c001461968a21500562b2eb18a40669d13068618ca3093ada082470833085b78f4083064767f";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-x86_64/hi-IN/firefox-61.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.2/linux-x86_64/hi-IN/firefox-62.0.2.tar.bz2";
locale = "hi-IN";
arch = "linux-x86_64";
- sha512 = "7b568bad470b3fa069b44bc0d69fbae51408ab44751a99fc36a7c220548d0200ec57d8362dbe1dca7370e587d5aadb45b5c9dc91e6d267f2421fe5a2260d29fa";
+ sha512 = "13d42b552bca18e0020b891f6b3a563b66dd86b3e5fb9b5badae88ecf5a37b5febd5b9c927807f7996b81ddfcd4ef076553fc82655eb05c8a04a920f2a64ca71";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-x86_64/hr/firefox-61.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.2/linux-x86_64/hr/firefox-62.0.2.tar.bz2";
locale = "hr";
arch = "linux-x86_64";
- sha512 = "c69df1a2226a967dbc0cbd3813ced6ae36b696389187489ec62b78b3180800175d3c33b07bc84c45112947348e160cbcd6db2e68d5e4b6f07e0a2f6adfc8fd2a";
+ sha512 = "5bf92b1abd156019935c8728435101fcee9973ea413cca05760322dce94b62fed9f7271699610e00e812f0c7d320cbc966bf03fd5250b9dbf9bb2ac2a5f96466";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-x86_64/hsb/firefox-61.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.2/linux-x86_64/hsb/firefox-62.0.2.tar.bz2";
locale = "hsb";
arch = "linux-x86_64";
- sha512 = "080ad8f1bf263f96294e3e6178dd64d30a7fda50d229081b14e54bfaa183c6efeb0ba3aa66cd23c8541a622382e415a12e3e063cb3aace5619d3c8c212ea3078";
+ sha512 = "777ef75daae66a138f4013ff19fccaf7236700a8c2a46e6f0f811065326c7f4fb7dcb284ee9bac2dc3461b45cb8239015ff24731a691a85a199519398c03e53b";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-x86_64/hu/firefox-61.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.2/linux-x86_64/hu/firefox-62.0.2.tar.bz2";
locale = "hu";
arch = "linux-x86_64";
- sha512 = "44f07968bb89c3c0e2d365f9cfd45d89b138a269cdff48542124a34f9d9ba9df5103e4613934c504f90b494fe20bbc6f71a12c210799e689e8f69405ea22e4a1";
+ sha512 = "800f1cecd46b4adfaf1ed20878d422191709801e148aef5e827c4cc3b9fbd46ecb475dd3c4b412a39ae2b05d4af2be8ec7d75515e2b98b1e07aef74fe49c4d70";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-x86_64/hy-AM/firefox-61.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.2/linux-x86_64/hy-AM/firefox-62.0.2.tar.bz2";
locale = "hy-AM";
arch = "linux-x86_64";
- sha512 = "8d3ee8a030ad60ae2de062b21437e8d512ff3feaf614b91da71ff6af9d3994be79aab1753e3d46a94237d7e0a49eb670781c2567f96662b6057ee7172a0363c7";
+ sha512 = "910fe027a761480a4673207733fb5a78c0106249806f5c5347bb602de6853ba4299f2b13c896a088368eef036bef38962a487b4b3d6957f765f39eb06bedfebb";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-x86_64/ia/firefox-61.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.2/linux-x86_64/ia/firefox-62.0.2.tar.bz2";
locale = "ia";
arch = "linux-x86_64";
- sha512 = "448e543b5f7075e2e1b984c808dded1ee67dcefb600058635c87d0c226eb02aa8dd7f59c624ebec60c9c0b334f98607eba88e111f2b03a1aa579b74b1398511e";
+ sha512 = "4138b14e0cdb6f6760e5892bbdfea3c244460cf2c922e737a1af568b1df5aa0076cdebc836688cfd74d97ac859cb8fd71ba52752f5db1b28e8827ca59123756f";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-x86_64/id/firefox-61.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.2/linux-x86_64/id/firefox-62.0.2.tar.bz2";
locale = "id";
arch = "linux-x86_64";
- sha512 = "a1f8eceb53485ac41a685f98b1e9dcf57ac094c0911ed8f9a862d4b3a5fa8072c16fa6a4cef3e06d15b07b3866397fcf9ead7b4b43143e0f5dccf93acb2f7676";
+ sha512 = "463f2d340b7c439ee64ee6429021062cf05b2fd4f32226723bff37a67c5f25566ba5d6815a5e604d82df97b426b677b3158b2f8a565762a340cfa7425ea097ff";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-x86_64/is/firefox-61.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.2/linux-x86_64/is/firefox-62.0.2.tar.bz2";
locale = "is";
arch = "linux-x86_64";
- sha512 = "43d6ff785394bdfb6c376588531a9fe043b18fe44ae83f481b11d71a2422b5d5022356cf960d92f55fb3d0ee103e6534bc0299a3d84e9ca7e6b3a5544e11ad45";
+ sha512 = "ec264aad9cfe095119f7f52f3391d376dc1864c24eb133bd51bde3349afc92c3cd1bcd0673b1fe95fa03ad36f869e0a6ee9835e97e922bd949228954779c075c";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-x86_64/it/firefox-61.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.2/linux-x86_64/it/firefox-62.0.2.tar.bz2";
locale = "it";
arch = "linux-x86_64";
- sha512 = "460385b5854565f4ca33431c573ac355baddd7a35a2fbf631b3748b02102a749e56fb1128ec3e9f6b721b1123578060641bc3b783ece271a1708656626b10a13";
+ sha512 = "c81ee4ff685fae9108b07235931b9d0347ca46e3063211764fd1762e2ef9b5e4e337001304a14309c97593543859800d7dab9fbeb21a18af1b84a2b2b6c6d5cf";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-x86_64/ja/firefox-61.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.2/linux-x86_64/ja/firefox-62.0.2.tar.bz2";
locale = "ja";
arch = "linux-x86_64";
- sha512 = "682430030d87391692170bc81d759d806f4667b66b4e3df84e836e65678f274720038d0556f5338d8eb18e281b64249e758b5265b3ce30e6f272ca9d84ac1496";
+ sha512 = "2f0ac4bbf507d3c306dc30dbfb94cb3bf8d907431f9a5c6b863505012cc4b077e22144af3658dca60e056d287273129f4742c72cf78f800162347e64d2b887f7";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-x86_64/ka/firefox-61.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.2/linux-x86_64/ka/firefox-62.0.2.tar.bz2";
locale = "ka";
arch = "linux-x86_64";
- sha512 = "e8c9e6a61867efdb9d021aaa8f059e3ac9896444448b08b7d90f70fb2847d46d1950a24e6fa2db0b947cf3ec628bba1c230ee7d8d53a959928122018a9e5c7da";
+ sha512 = "4a85a9f34e69abb29d63ef8cae372f225d246a5065a26d03d99a22d137085609e6ef5adc03df70fd7fe1057731472808f510fde2a40926418fb98cdf8dd452ad";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-x86_64/kab/firefox-61.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.2/linux-x86_64/kab/firefox-62.0.2.tar.bz2";
locale = "kab";
arch = "linux-x86_64";
- sha512 = "17636e7157d6cf3ab73b7e36eeb7ad5bcc35e756fe6d369b98305c58b88208b5b11f673f52425363425d18c2a7fe79274a6e5babeb926adc9cea22afe3e55e5a";
+ sha512 = "7b03433b9c79203feb40705469c6788b8df08505ec2e92c704570e0cc5b8066d2b305a68a4c7a61f81e07cb6ea7ea12c059b00e8c11870bc44be54406e8a224b";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-x86_64/kk/firefox-61.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.2/linux-x86_64/kk/firefox-62.0.2.tar.bz2";
locale = "kk";
arch = "linux-x86_64";
- sha512 = "4eeb48f250c617ea8eefd99fb44159170311becc229f77ca014e801594260ea23ce46ae11e0526ad620dd830b857b73de8a3a90c18764ab2a8f71cebfecfa143";
+ sha512 = "51c141c62e3251101a5b110573c26547533fb2a8bb2019cee63734ffe4ef2c4d1b4b6e5e540d88e0237721ec7d0d88c26bf5c179630f685c037e3f9eaa0a6f02";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-x86_64/km/firefox-61.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.2/linux-x86_64/km/firefox-62.0.2.tar.bz2";
locale = "km";
arch = "linux-x86_64";
- sha512 = "57a0bb58ced30d8743c30d288250328568758674e55127d51e99485f5c85e8b0b300aeeec4d34526f53d1d538189b75925eb907e3b5fb2d455e0546e179dfe04";
+ sha512 = "113303e05d1ea54c38ddcb0476873214696f38b17aeae64381a7bc00bd59d3ec551540125190c0a48e9e85abc4de9ab232bda0a6dacd1bf7584b7d09c9be67ad";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-x86_64/kn/firefox-61.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.2/linux-x86_64/kn/firefox-62.0.2.tar.bz2";
locale = "kn";
arch = "linux-x86_64";
- sha512 = "c40e9f5906cf3968bc92932f45d4d0b712322e6efd9a5d1f3b48a7b94a162c6390142081a8a4fd2f0fb8737869723432eeb5a4b44c3161aa38a4d506bff8a3d8";
+ sha512 = "3dc579341533e0d9b82919aea3dddae1ad247f9a994d52d26699bd371c8910ae5b417e76be04002af53eb3caf5a6c2323261e48dccb8b4ffa63b27fe80272681";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-x86_64/ko/firefox-61.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.2/linux-x86_64/ko/firefox-62.0.2.tar.bz2";
locale = "ko";
arch = "linux-x86_64";
- sha512 = "3f6104ed9b2fb9f1b0e3f49b06aaaf513ecf7e31b417af90c11403bca7a3ad51a87b448fa0a2ae6a01462b57dfd21f90376421ca8cd9ea62b0e3a1c7462aa9db";
+ sha512 = "4269f0f945c360e8385dd83d3a62450825a9e74c349dd74a9f8f18e683a83526113ed315e5e363dfe00706b59bad92739e6b08c004e27608addcbf599b7da21e";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-x86_64/lij/firefox-61.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.2/linux-x86_64/lij/firefox-62.0.2.tar.bz2";
locale = "lij";
arch = "linux-x86_64";
- sha512 = "46c8eb64b30455ed97618d67215510b22acb6cf5946ba492c5938d879e656d983accfcd7ff2e93cebe7ea5a52e9fca348ebb9ba02e70ffb4196a9d9edf5abc51";
+ sha512 = "ee26793ff03184b9221f7cfc88bb351f27ce01a04fbf74681f355e2a0c6b4330eded098a4ecabc3215e3c6b78fd2d09090275a4793c845b3c6debab962e2999c";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-x86_64/lt/firefox-61.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.2/linux-x86_64/lt/firefox-62.0.2.tar.bz2";
locale = "lt";
arch = "linux-x86_64";
- sha512 = "54470adc31bdab9745f72598d402fc961d6b407b6f8fabc8e0c6b785a5a5f3e9922e06a922688c6bd1ba43be81ed37bbab216fe2182bdd0b32befabc55fa1a48";
+ sha512 = "2f7b98d182b4aea92f8e370107d56f647e16a11a1966c2e2e47b8b4ce2b45d9b9742d09c19478c200cd7fe42889ec4c2498304626fefa7531e987ad134e3c05b";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-x86_64/lv/firefox-61.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.2/linux-x86_64/lv/firefox-62.0.2.tar.bz2";
locale = "lv";
arch = "linux-x86_64";
- sha512 = "376ded474c9c8a898bab54b66a4a9e9cb598dee114d9a156b9e7fb925250511e610d2e17a5decf4c2db44f227065cb2840265d6955364a1405060ff022b04d07";
+ sha512 = "7c31be85ff6b3295636f50b9c7491fa467b2cba1e5ffe9c7ef997c3674d8cd801e14ab8fc9bc2d1ab75d2a379aa590109530c1ac81599f26b747a43cb557cfa9";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-x86_64/mai/firefox-61.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.2/linux-x86_64/mai/firefox-62.0.2.tar.bz2";
locale = "mai";
arch = "linux-x86_64";
- sha512 = "21643b1b723a42d81bb4476b16282d2550100278a221b5538d5666c8fd7f3e96f242393c4b175cf6431e82458e199fa80a51ef0f5bd6a9b691d0150bf1d4c8c6";
+ sha512 = "e365c3e4a9d2ccb80871c1530ae1e372d4ac1a809cb2c72f82c682161dab6d7707591194a72481a312760a7819fba0e5dc9ae3f80308b7a9c45af66d97e47230";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-x86_64/mk/firefox-61.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.2/linux-x86_64/mk/firefox-62.0.2.tar.bz2";
locale = "mk";
arch = "linux-x86_64";
- sha512 = "452571329b805586a1218dd5fcd5b48f7f20fc914ba006441ec3642ef8653537b764a98b7916c0e440888d60d41b290826114c3a37083ec098fcd6c86a6adc15";
+ sha512 = "e28b9564ce368a8e68c27436e967cd5ad5adbff1b78b50bad64f7646cee32a28f2dfbeaf0bd049d7057ffef59ce709765cedc85ea139b84cb6b02d95c743cb81";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-x86_64/ml/firefox-61.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.2/linux-x86_64/ml/firefox-62.0.2.tar.bz2";
locale = "ml";
arch = "linux-x86_64";
- sha512 = "8d2c850525f9ffab96c4d02908440a9a5f4b6fffc49e5505d5eb33d35d3690fd7a81ef73aac810d0c52e0deca5b69dff9eb3f0eaf508b7c866442943f7cf9547";
+ sha512 = "50ce7dc0445a37d125fddfb51951d455b91bec19f807df262bcba0734a7cf855d455e965144e1d8da4692c4013861f62cb683e364e33e85f4962c99097b74838";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-x86_64/mr/firefox-61.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.2/linux-x86_64/mr/firefox-62.0.2.tar.bz2";
locale = "mr";
arch = "linux-x86_64";
- sha512 = "1eedeaa3a2b6362c460e468b28bf7efc9bb5c960c766ec9f0e423834aaa67248c5bea0fe9b4fc0a8e62b0a40d8dfd1e7ff31adfebf6d1d6405daa02879977015";
+ sha512 = "defcaaf5c589d0a11104f06890f986ea3cb627db499c2bcd1fc39162402b09f8c1be3fd05ca33571dadae9e8d127d1d67dc5f08804f670e8f8db45b33ead6234";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-x86_64/ms/firefox-61.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.2/linux-x86_64/ms/firefox-62.0.2.tar.bz2";
locale = "ms";
arch = "linux-x86_64";
- sha512 = "fe2d5ae09b8921d366616eaee49c240ff529050e1b3f97c915d91c23dd67b22d78a75e14e2f192963f0fcb05eb812da2c5f68313599111d85c1abc0ac9dbb676";
+ sha512 = "2f36fd10942b2a700b6901efafe2fc14e8a7cd97d41241a070f87edf4d1ebed63bcb1d202b1c557426bdd8fd96639ac263ffcf0c96ecad9196916cc69c9e3e90";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-x86_64/my/firefox-61.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.2/linux-x86_64/my/firefox-62.0.2.tar.bz2";
locale = "my";
arch = "linux-x86_64";
- sha512 = "631a6059d38a64c24e1f7d2b9a27aa2e405fe413471ac1e1d7ab337f614df9a1470a091de35904c39664d679c06eaddcd239c4a392c1e2ee548ce0be7fd5e416";
+ sha512 = "71001dd61027cd3acbb12f555a19ac3534c547b2d9b2c964a6bdb656524429ccb25b6c601422ec7f8af9e7d6319319e4bdf0db15df3f3833611d72d3d9eba410";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-x86_64/nb-NO/firefox-61.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.2/linux-x86_64/nb-NO/firefox-62.0.2.tar.bz2";
locale = "nb-NO";
arch = "linux-x86_64";
- sha512 = "90d0c3c696ada86b47e9a6ce8aa9a8d0939eedf5746ccef79ae170a935e6b97906b187d7839af158a6008a9022cc50467febaf0617f3a3b1e8e21fd648805d13";
+ sha512 = "2bbb7a4cd756757c0559294a487c972ab0c6bc6df005c948a24978a35f51c369b66269dcf6fa96795525758ae66e24670fe8ef7fa0f5b05b7d81bff79f2cb762";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-x86_64/ne-NP/firefox-61.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.2/linux-x86_64/ne-NP/firefox-62.0.2.tar.bz2";
locale = "ne-NP";
arch = "linux-x86_64";
- sha512 = "b5e13e214cbea0d541aa8c29d53afa4ae952970a64bb5695be62ce19c829df901dba4c66cfd03d5d3a31f69041c9c700553b2689dcc4ac4ef254d155700bf5fc";
+ sha512 = "4bd51046dd55004e6a08dd0fc646344f91d7d830249fa8a33284f4c66bd5f11b1913920119593e45d9488db1b9d7aad1a74b296226633d94a02c0c705f527a60";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-x86_64/nl/firefox-61.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.2/linux-x86_64/nl/firefox-62.0.2.tar.bz2";
locale = "nl";
arch = "linux-x86_64";
- sha512 = "44470b1cc4e95a05b4198ac3458125651de9bf9548dcfbcab5850c519fea01a3e8c6161e4a66271af68d7f1a1b37456d2ae1e51ca890307e6185a531c8cbfe74";
+ sha512 = "408bf232f3c1e592a929ff2364b52af899aba1a7542e6199366a7bb0369ec14bf3c44964851a6dfb37ece8e9ffb342ce7448c11013c3013bb0d4e1d67a43e2ca";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-x86_64/nn-NO/firefox-61.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.2/linux-x86_64/nn-NO/firefox-62.0.2.tar.bz2";
locale = "nn-NO";
arch = "linux-x86_64";
- sha512 = "5e49d30ed8fb64e367ea3f5b472baf0caff6c4b880d811cba5db969d21f8e5dd0d8ae4c01a151fd495eab1eef817b35b6a6e14441a860059b8f20453dbe86116";
+ sha512 = "450239e4d62d03151b0ff093e04e4cd5cffafeaa91da7374390d31c5944366bdfd0361e6e59b162352418436f7bdb1ebdfbe959107efd14f0015de0e873cd5e1";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-x86_64/oc/firefox-61.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.2/linux-x86_64/oc/firefox-62.0.2.tar.bz2";
locale = "oc";
arch = "linux-x86_64";
- sha512 = "bd75cdbb1bcbe24347f35b748ec5d62da6bb20fb0f58f17a348f8bbe19e92ec3d08da3148d41f56e0b42a8e49e1c1b70b40770c737e626239b5b538bac6d42e0";
+ sha512 = "a7c00d91430494659a4a2285ae9505329e18a10985757a50f9543d46b6ddcb740cbc440e31a1718ba4b830661bed56a0054c5309b04bbd8029abc691b59f0c08";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-x86_64/or/firefox-61.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.2/linux-x86_64/or/firefox-62.0.2.tar.bz2";
locale = "or";
arch = "linux-x86_64";
- sha512 = "e88f706c60e93b205484411bde177fd9b1ea921372669b5665ecebd795d7abcef5d2caee16a8605bf7f3f23e8d0ebf8036c156097318e7f8d3a22517e1fdf017";
+ sha512 = "e0ed4fc73fcffd0c59f87b6ed8d1ba4ebf8526acc79ab5a2fdbd689c1329d185bf9717cd34f0921d9ae2028a18bb12d485a0cfdd20dffb3e2a9b33969df943b6";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-x86_64/pa-IN/firefox-61.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.2/linux-x86_64/pa-IN/firefox-62.0.2.tar.bz2";
locale = "pa-IN";
arch = "linux-x86_64";
- sha512 = "81af24b8ab70e373339ed4fd7116e1c4f2bc7a2ee14b46e2af29860add01ab492ec692ee2653de81856d04a465860e4cfda0af4928a237bc0c8469c4899136d5";
+ sha512 = "8106baacbc84b053eed0527ef78f9ba4bdc94f0679c0d887d72bf19ef5c6a7950b6d8e9a35d493b51de031ef2e4720d03abb9677355a65b2a539c9e73a4ab633";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-x86_64/pl/firefox-61.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.2/linux-x86_64/pl/firefox-62.0.2.tar.bz2";
locale = "pl";
arch = "linux-x86_64";
- sha512 = "f7b6b21ab27b58ab1bdaaac012dc035e7cb1226f46da43fa3de37c7e4fac73f5303dac02332510eae7a8bcec0172769b620acfbaab8b383a64404bb294d6df66";
+ sha512 = "9295362613e98387d10160af9f779a03c8318797e98daf39a514d70618eeffa53066113198257c6cbf1373fbcde33cef525c917c85fc3e838df5f918868e10b0";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-x86_64/pt-BR/firefox-61.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.2/linux-x86_64/pt-BR/firefox-62.0.2.tar.bz2";
locale = "pt-BR";
arch = "linux-x86_64";
- sha512 = "c17c0e7990b4192f10f7269a5c5c6c74cd6e6353b8649a0417c537197c5f853085948e9d0c50f08afbb16e242f3d8e9eaa1e9657bfb6c40075e5f4e640771d2f";
+ sha512 = "d5bb188822c7b8e5ecba035585621685cd1b334950b8480d73b1841f871325236f9a13a3a4f0098d11588c0085c20fac7525a57cf83687a29d15f05cf9d9cbd2";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-x86_64/pt-PT/firefox-61.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.2/linux-x86_64/pt-PT/firefox-62.0.2.tar.bz2";
locale = "pt-PT";
arch = "linux-x86_64";
- sha512 = "2a5db6053556c75d399bbad5ffbfe51505f6b25bcd73008d85f7dba66d89fdf56ee0ba2cfce6e2617b463cb8db087a1700507051322fdd2ea8f732be5bfadb9c";
+ sha512 = "ee2f8aa32c2e20bb69ee291f3bd4ea931d5b2ab863f6f650bce92d35b331234491b93296803f5ede49ce49027b805241db44989bf48ee6d68722d262625b1fe1";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-x86_64/rm/firefox-61.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.2/linux-x86_64/rm/firefox-62.0.2.tar.bz2";
locale = "rm";
arch = "linux-x86_64";
- sha512 = "94e95e037ea9f924363aa5b80298f67ecc678bb2e22d552c2207af1cdfdcd9ef5b85fa4a6b42ed08167a4b482859658ef6a946adb7462c2e2519c4685428bb90";
+ sha512 = "60605882860f1e1b805f8cb74539c421e45438aff07e79d6b3b1db3546d38950059665ca443d84617ddc9a4a3c104940d885f294932390170b3bc6c2eedd0529";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-x86_64/ro/firefox-61.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.2/linux-x86_64/ro/firefox-62.0.2.tar.bz2";
locale = "ro";
arch = "linux-x86_64";
- sha512 = "dc901a8b6ea913f976c915807bc4ab5fd4a756c98a78498ef52fa8577cb9e3a047e2a38240bf675d72644d975ac70d720f693db056e764218151431de572a37b";
+ sha512 = "850063575dd69270903a031748e665cb8363105057f1e170e43f264b3a9b228976fc901f7e3749cee22e3d9489b3357240198dc3f22e20de5b9581729e8c601c";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-x86_64/ru/firefox-61.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.2/linux-x86_64/ru/firefox-62.0.2.tar.bz2";
locale = "ru";
arch = "linux-x86_64";
- sha512 = "dcaddf1072b19f714e9f50eb1d5e8e15bce98bf96bbbc13e7a4a82581e76339818766e389279fb33d212afa6cea947185de130a3eb72c0f6079e159ff2f18e9d";
+ sha512 = "8491c625171c0bf7c88c3f3a053e5f49a7c56b9dfc7c0ea7c381bfcb7505ffdce6a1079d15c73ce6a4edc5f89125e849e8b5fe8d464a4440d4413dcf6666a0e8";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-x86_64/si/firefox-61.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.2/linux-x86_64/si/firefox-62.0.2.tar.bz2";
locale = "si";
arch = "linux-x86_64";
- sha512 = "5544833432d6b41efdff96fcc8d2d322f5c158764320ae6345e9183b2d48817afd796685bb87998e5e6fd227b1753f503bedda5f6fdfa9dcad2083cc9b7df9fd";
+ sha512 = "bde4eaf6879cb40967ebc872738f5ac6b931f6a1a633886e35985fda76de4ea4c0a4ebc7e68585dab34f7f453cd54977bc84fbcca636d53d6c5eddfad6d13bde";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-x86_64/sk/firefox-61.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.2/linux-x86_64/sk/firefox-62.0.2.tar.bz2";
locale = "sk";
arch = "linux-x86_64";
- sha512 = "d4702ea94482a276ecafaeb7e991ab850a432158009c95489b2b87a82402c92a84c33ce43b27ebf58367e20d63bc444e656f32cb957ad0ad03b1d9f793157052";
+ sha512 = "776ea025a2e087a7d8717c3b63e8a203f13ae7e44812e0bcbef8075aad1166f80cb6977970d88f68720772668cca982662c2172f1bfca02732a79daf45974112";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-x86_64/sl/firefox-61.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.2/linux-x86_64/sl/firefox-62.0.2.tar.bz2";
locale = "sl";
arch = "linux-x86_64";
- sha512 = "6103a4d340e45af988d17b93c4e8951a656ace095c9e13f5b0d6bcfd55d51e27f9f26614223d40dc19733aee34606a80a221838be86a1f91417a1c6f00a7771f";
+ sha512 = "1bc1a53815d287acef056c981bf306b1ae7cc36d4c8acd3bf556f3a2f44e6af2c05bede49f04bf7fd591cc5f0be40dba10b38c5b64379c673705b57ac0853d79";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-x86_64/son/firefox-61.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.2/linux-x86_64/son/firefox-62.0.2.tar.bz2";
locale = "son";
arch = "linux-x86_64";
- sha512 = "ea04aee1c01d4d545ab4a370e4be4bd23b9f1a698bc660877a754f42995334446bbc08412bc9f8ec92a2a69a6fb8bd0caee40f622813d9ac18b43773c3111029";
+ sha512 = "ba3f5377ad15c8586c7e826ffe8c614ba71f49c9867caeb1fbddf9ffa86d513f299fcf39d750c7e91db88ba17533097d38def63c8614aca743946d2a3b0b0484";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-x86_64/sq/firefox-61.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.2/linux-x86_64/sq/firefox-62.0.2.tar.bz2";
locale = "sq";
arch = "linux-x86_64";
- sha512 = "6789f071e366dfb3300cf5057d690c89daafe969a8b8b4e5a3ddee6683caa1426e62901d2288da61b8e8c59ac19d9764521b82f2d0d4fbe375d4e4eecd5751fb";
+ sha512 = "c3f35991e3ff9410c4829491acc4a7f7cdd61f9104778c168adf3e1d359d5d0c8cb57ef552aeed669f80098c546a72f7adaa09cac4f486dacf78bd381f5fad76";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-x86_64/sr/firefox-61.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.2/linux-x86_64/sr/firefox-62.0.2.tar.bz2";
locale = "sr";
arch = "linux-x86_64";
- sha512 = "2d079c315d0c66d2e1530cf2d30a357d62f9bb6517abe7313911bcfb5c42ac95c47b3f12f654ea61d2fdb74d44ed0b090443f6ec66ec22cbd51c674084a8c4e1";
+ sha512 = "df6bdface285322457f676d74703084cb677c6c429992a87dfb933bb3da25eff374dd2894f13c37616268266e3934a55cd61f3f6239a487595282ada58bf69ea";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-x86_64/sv-SE/firefox-61.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.2/linux-x86_64/sv-SE/firefox-62.0.2.tar.bz2";
locale = "sv-SE";
arch = "linux-x86_64";
- sha512 = "c78e06de0834a84bf0cdd22a46e80901db3dec7d5d9e0dcb6ad850a040e8df6d3ba2c6e68f8a3da118dd9306c7af7f352d9b56e839cf74afd3730b2d8ddbd38b";
+ sha512 = "a48a11e4b1e1bea955ddd73c77e7f5e1a7d03435b29659f7b610a089b604cdfed57893420d0c1827198efea6365a52ed236a8296646a980fabb6007b865a78e6";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-x86_64/ta/firefox-61.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.2/linux-x86_64/ta/firefox-62.0.2.tar.bz2";
locale = "ta";
arch = "linux-x86_64";
- sha512 = "d996633ce2cfc9d5766840d5198900a341c8158f4bc00c32ef168ac57a1c1d89dc10e9ebfcb2a504273d1722ed319acb9d9aca8d30257a7a6a01361ae7acbc4a";
+ sha512 = "e01845b225c5516ecfc25afde98e9691b9afedf27405207cb91e655a9b48edb416786a2cb99ad73df37da41cb22c58958165836e5e6b1018c6c9f788f2b9337f";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-x86_64/te/firefox-61.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.2/linux-x86_64/te/firefox-62.0.2.tar.bz2";
locale = "te";
arch = "linux-x86_64";
- sha512 = "81b745184db9c550a135efd9b085e074a0dbbce24d81a16a39fb51166233d84da6c61b556e39b2ec68365ded627b31065d367c224721bf9e99338456aec07698";
+ sha512 = "95b795fd6f995527d85fa83b122bfd9a2c091c792c879f7f4611dde63b4ddaf0502d3ae0ee33002363da359d1931d008c01e40611eea61f1ff66aafac2844f52";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-x86_64/th/firefox-61.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.2/linux-x86_64/th/firefox-62.0.2.tar.bz2";
locale = "th";
arch = "linux-x86_64";
- sha512 = "a6ba250aa390005ce6830f14a4f7518062b3a98444da87e36f515fe29d3408b7efe9947a9d865a220b9f60ce57dadc12099c5742012981ca9c4d3fcc0ff4c877";
+ sha512 = "9ad3d99c9479155e20559ee1c8ef276a69b591be2cb96700075ca19352f033d9063d9f9b57ea9fbcab5db9bf46e1cb03c9b001e6254b6b0bee5547f8c91fb59c";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-x86_64/tr/firefox-61.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.2/linux-x86_64/tr/firefox-62.0.2.tar.bz2";
locale = "tr";
arch = "linux-x86_64";
- sha512 = "55eef864538b70b8d6e7fc2e6af2c73853a48860dfdb1ac5e4471675ebd2d9f089793c1c6cee713654caaa253b059e9e01acb12aa0f6f4efedd09632d10315d6";
+ sha512 = "90fca950893500868edc6ae1c0aee417cbbee7b7a0f48e0f10421b3d7ba495a56e090543ffd097949c9bebe69784cb8fb03b559156863f9dee940aa867421135";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-x86_64/uk/firefox-61.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.2/linux-x86_64/uk/firefox-62.0.2.tar.bz2";
locale = "uk";
arch = "linux-x86_64";
- sha512 = "2bf67d7523c9b07acbef099dee48902d19a5b542ffe9eb65283524ce2cbcf853b1e3e862fa2a7640160cf5dec8ad884a237f4bddf215304a458a4d9575af8137";
+ sha512 = "18942b931cf09b03973a10e390ac15c6e5bfd1f730953b782b7929943838be19bf4a61f157b33979f1a8e13042f1f4facb08ab205b7825d285b9e96c0ac897b4";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-x86_64/ur/firefox-61.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.2/linux-x86_64/ur/firefox-62.0.2.tar.bz2";
locale = "ur";
arch = "linux-x86_64";
- sha512 = "4127578edad2690915aae81fac45cbc90694b68d593562f4c55a1545cd1b8cdcf3eda18fbfb2dc9fb3e0dd3119fad09db68d65e6fdc09d96aa65440750fcf380";
+ sha512 = "7f16c4810467469385a88346f5ee3fac4d3d95342c6a6d37e0df7880f0b08896d0e39e77091eb0262a66ed7fa15c3151f244eb47ce4ea774ad21797b5da502ac";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-x86_64/uz/firefox-61.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.2/linux-x86_64/uz/firefox-62.0.2.tar.bz2";
locale = "uz";
arch = "linux-x86_64";
- sha512 = "7b0257e2bf2edf26afaf6bff2a06f9fc81bbf5397c8823a65ee63e54cd32bd2329ddd858a5e1374df64bd188d3d3392434d83e05d0fcb4a71d0a73bb6da224dc";
+ sha512 = "8266d638c74a78fa26c939c1ba7a6abd05ede85a9e349135f1934a6e3df27e3f6172026486738cea28e50689b84c29c0dbc63cc8779faa11a6ae55b4f367c23d";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-x86_64/vi/firefox-61.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.2/linux-x86_64/vi/firefox-62.0.2.tar.bz2";
locale = "vi";
arch = "linux-x86_64";
- sha512 = "071e162e6919168fa4858aa98d68a2c6ff8ceeb10e5968a2dff55040613ecd7e7290f3acc929f8f2faf3fa4b97cdfbe4fd8b464f7df0c3d1d530af5a9ca8fd71";
+ sha512 = "787e570afae27cb668d6f4b9b6e8b3097f02148c2e2974efd1c58e406354724def031f04fc69c0ed10a04ce5833cbf7bb2ae8fd77ef068f8f17bf2118d1305c5";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-x86_64/xh/firefox-61.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.2/linux-x86_64/xh/firefox-62.0.2.tar.bz2";
locale = "xh";
arch = "linux-x86_64";
- sha512 = "7e12d3e453216ce6ef2dd56980a130c52e273b23543a3df0b5fb11c69d1366533eb4875814e5084682c54f86d2cb8a304b95b08a66c8595c8dada69d4e97af71";
+ sha512 = "805df0dcc24a7d77afca47335b31cbdfd0d0df51145c9cedfdaba4d865aae71697eee14e446351e6fd8db950e3264ed788f66d683356d4fbbab17ea9d7c2c452";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-x86_64/zh-CN/firefox-61.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.2/linux-x86_64/zh-CN/firefox-62.0.2.tar.bz2";
locale = "zh-CN";
arch = "linux-x86_64";
- sha512 = "1b98d214d15d0163aa91316fc6f507bda61169701a8accac3aa79dc8b6d7260d58813d87ce25d7083f6fc2d2a16519464267feaa3981e2e556298d3cc3f1abf0";
+ sha512 = "cb251f942c31cc0c30c46bab04f658567b16f379068e7bc946970ed512e2de08c6e3511990b722541756e95261dcdf96b03cb247072f0b230f66ba7afdb038f1";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-x86_64/zh-TW/firefox-61.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.2/linux-x86_64/zh-TW/firefox-62.0.2.tar.bz2";
locale = "zh-TW";
arch = "linux-x86_64";
- sha512 = "f466df89dcc7a4b72ef7b41800961828012fe913b2eecdf68f442b492109467ee69a95738db2afc1ff39fac0b6376598e8ae5b050aeddd6fe3d40d0dc8d424b6";
+ sha512 = "afa5847337657cee3ec28896a089bfc0fc2b25750d6dc271bb83740ea5170e2f926fdf3158b0b136eabe0d2d6b4b81db1ecfabcd8c2049164af54cd796e9a7c2";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-i686/ach/firefox-61.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.2/linux-i686/ach/firefox-62.0.2.tar.bz2";
locale = "ach";
arch = "linux-i686";
- sha512 = "6aafc9db497700c6c91087e2477b707a162447199f26c87a4921b278d81828e868214501e8b89deb387c097d5768faa18eab83076ed84aa59799b24f62a3663a";
+ sha512 = "99781074276e530b9ceaf2cdb8f902673ceeba3df515a6c2c2ece3fb3dfa84e6f3d494a3a69346a3f9fef20d11f7bac0361eb80968ec7b9e76b603f8b001749b";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-i686/af/firefox-61.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.2/linux-i686/af/firefox-62.0.2.tar.bz2";
locale = "af";
arch = "linux-i686";
- sha512 = "5cfe6413a70265360661dce8555941703feaf9045604313361553769b4738e3febf21a79c8be66e24272fef72b41dbf0c3a2e8e76e5b992789250d4b04fda45e";
+ sha512 = "bd9c6fe306a8802b22860cad8cb452b6591c0227e12ffc4a33db1a88b811d06725348e5f128d624240b9666393cef35b30f5bc7d12e41a046bb318dd346f63f2";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-i686/an/firefox-61.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.2/linux-i686/an/firefox-62.0.2.tar.bz2";
locale = "an";
arch = "linux-i686";
- sha512 = "cdd9509e49d563ed3d26f58fe957375357fcee36fca7526a20dbd09e9f4f2867c81508cb637cb8d35572bd730b13ed34fceb0af4aefcff631e632bb78a6713f3";
+ sha512 = "289c00b7bf464fb6d86cdbf24274514dca98dc47e78389125287792e8f77708090c120aeb5ebaf4688e16857c5fc6b78fc1eb6f0a7efd7afb62c22fee325e78d";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-i686/ar/firefox-61.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.2/linux-i686/ar/firefox-62.0.2.tar.bz2";
locale = "ar";
arch = "linux-i686";
- sha512 = "906d0020510eb911d7b2709c55cca0e4a69638c685bda7e7b406fb41f385b97ed95ee97515693d72f722a619d13583d227264d0819ef973f01e67427a269225f";
+ sha512 = "412cdcb82e2d60e2f37658001638bbe50cdd3a7db1e9bb4cb0e2fab49b878fe64b62ef019e499c3a960bca3510266a0afb3fb4c57cc5a8b6bff22aca772e643f";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-i686/as/firefox-61.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.2/linux-i686/as/firefox-62.0.2.tar.bz2";
locale = "as";
arch = "linux-i686";
- sha512 = "2fce0d7c990c7e2039a601ec5b5feafa7da368e24f363489c1cdae831bf36a11e2bf967ec4f74512f6ca06095ee3a59982b0a5ea3bd003bba9c3f4c763b9771e";
+ sha512 = "8068c78be22e42f9174cd6f9e1e7dedff527a00865f722c6dd9062c6f5cce2b83693d0938ae5f56197f72f5af71bbb485b0970b632ca5dfec9190214558fea2a";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-i686/ast/firefox-61.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.2/linux-i686/ast/firefox-62.0.2.tar.bz2";
locale = "ast";
arch = "linux-i686";
- sha512 = "872e0b0962b7d6f86663c0cdf5fed6f4927f4a24bfe1848debb605e7c19bc574d98bdcfb74a2e5a4362c27ed1b9372881fc1418c742e4cfa75d15d838cad6f87";
+ sha512 = "37ab6ad2899b3b115bd2b59f6be121e2d340c27eb745f698fd2942ab6424c0840273ddb4afeaf1083d9f458408b939270d971676e9b08e1f0fa409bca69f3e84";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-i686/az/firefox-61.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.2/linux-i686/az/firefox-62.0.2.tar.bz2";
locale = "az";
arch = "linux-i686";
- sha512 = "dd92dcd6f0c32d5487525cd88832fb567ef0e8fda5cf7f401399992243146bc2690881839d5752ebafb4e7e099c6594c71ef99d5509d94753256507216a2532a";
+ sha512 = "5724ae7680d7e88061a4cc45706590d519a5bd769b204d06ee0e8e6e86f706b312b665354d22314853af0a73b073acf68be8b7c3ae9dadb87984e1222722b4a8";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-i686/be/firefox-61.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.2/linux-i686/be/firefox-62.0.2.tar.bz2";
locale = "be";
arch = "linux-i686";
- sha512 = "1eda2b0945a4d8e70c0e61b187abce6873b9a8a578c089cb66b2728bfc71b90aab71b57599417ce775b4d5fa1c0fd908fa4b9b3183a3aa570da95d4fd726ba84";
+ sha512 = "6249b41382a1d2cdac2d9c9d235697a70bac76d0dfb341d3db41c0f329cce868ef66df6d2f249b4e22a1daf737d5ea3b7f2cad36a2d30b1dcd649fc1476218a5";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-i686/bg/firefox-61.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.2/linux-i686/bg/firefox-62.0.2.tar.bz2";
locale = "bg";
arch = "linux-i686";
- sha512 = "597dc8972c670f67f34ac23ffb57506b896efc9436d36270dbcdab484dcacab174aba53671f5462ffc7b54b9718c0280a66734e789edeb7710cd7c2b9fd602a8";
+ sha512 = "a769ead4a10d4168d64ac9c2391c0cfcc5e0dc33f4521d6df73c5b53087e3aa073096af09adc49c901489e60af9839ac888483d63f7e9bcb1de2588236cba75a";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-i686/bn-BD/firefox-61.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.2/linux-i686/bn-BD/firefox-62.0.2.tar.bz2";
locale = "bn-BD";
arch = "linux-i686";
- sha512 = "79989196e4647c035d4af9f24dc9edfceebf9d90afb1efe894e0a54e940ffcf32e3746b9e07b486bd89a11ef8f35cfaf2e61992071352a561a535bb058c0396b";
+ sha512 = "0761e32fd88fdea9c87686411ed87affa8875f2047ff9b1b1ec11376583001c9c9b421b2b27cedfe883cc5cd233d4d3a932aba74e50cbd74aea63a6aaeb64c8a";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-i686/bn-IN/firefox-61.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.2/linux-i686/bn-IN/firefox-62.0.2.tar.bz2";
locale = "bn-IN";
arch = "linux-i686";
- sha512 = "25b3d138308e0667d62e41a8384619fea548dfe441cec761c82e238c1f0467300d6abc89d265f22f1d9699ffa2165bbb7dceab76169a78acaa4bb1c46396182e";
+ sha512 = "1868b2d7d6f32936c6072998afd1ebfc232158940e5270bf483c6c29a8a30682f0ba729161e9b0aeef7d839c9e9209739380a20b8b118c49112bd71caba03ec9";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-i686/br/firefox-61.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.2/linux-i686/br/firefox-62.0.2.tar.bz2";
locale = "br";
arch = "linux-i686";
- sha512 = "8f18a08ed64cf071462b2eb65e0965f4b3825857e867da2898f959fbe84ea55cf19fbed289a4c4e739e5c4fc5392f1f496feb6b4f383e86a753f5041dfa333ee";
+ sha512 = "43d1691d6b1d9aafaee55be50bf8c4934b75c0501c811314d12e1156c2b68cd58914362e167ed50fdf5267a0d7a2db9730c68bf318d492bacb8c33eee7bdd12e";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-i686/bs/firefox-61.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.2/linux-i686/bs/firefox-62.0.2.tar.bz2";
locale = "bs";
arch = "linux-i686";
- sha512 = "2cd2a33ff71b4a471d694912f8c102b53327f1bdf005316e16d32ef17a510784cfeac972f9a854304b07d6c9d19459b19bf3f7e47caae2e58a635fa555115039";
+ sha512 = "aeac8dc018ed59e2aeb68b63c1a1d6281e543975844e3ce5b7f22991968bf0e05f40cdf1ad3bf434cf9de774363b0ffa6f96d1c0b457f0372d4d1d943c0a40bd";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-i686/ca/firefox-61.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.2/linux-i686/ca/firefox-62.0.2.tar.bz2";
locale = "ca";
arch = "linux-i686";
- sha512 = "78649a90b8e890adb271fc57328669afb49f70e9f323a2849a2071b83125f3f1f40e13beb353336a9c5aebd930979889c719075b49ce4099715951164d979926";
+ sha512 = "10b6c40701b7cb8f2543e97a61335f426b210273d46d542034bcefd7d23c95124cada1d1df85c3b5e33d25e8680678b18815ed0c8ed58936061f670b0abf1d87";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-i686/cak/firefox-61.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.2/linux-i686/cak/firefox-62.0.2.tar.bz2";
locale = "cak";
arch = "linux-i686";
- sha512 = "8e66b6ed5b20efda281350535f2b08892763c2dcb62ba4fc764b598606a36b4a6f3d5960919a8f2967f736add11132252449efc4bef827653534b45566ff69ce";
+ sha512 = "029cfee850c3ba5ac408b6db45d66dd9849db392097dcedc64d637756ffba893770a93915eaded6302f6e667f072949fe6decfdd918be292abb9ab8d1300c2fb";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-i686/cs/firefox-61.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.2/linux-i686/cs/firefox-62.0.2.tar.bz2";
locale = "cs";
arch = "linux-i686";
- sha512 = "5e81414b8411fda775b35704de90d006be40cffbb51b495171b9f69896b9d486e4438bcc2bd2f3775ab5f998b7b41599f44f92ee150ddbbb2a84f64058657938";
+ sha512 = "ce919ca42a629f171df4faacabc18fc3db0faf2d38f04912720ba697612215e0c26f650781a535b5e956dca912fd47d1d9b9528910b8e9b7a18841c411e25623";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-i686/cy/firefox-61.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.2/linux-i686/cy/firefox-62.0.2.tar.bz2";
locale = "cy";
arch = "linux-i686";
- sha512 = "8f4c5db5c760e16ef258bf2da401e51c2cf3d75808d83eb4b7adfaea4c2b69bfca0cd92c9cf69d7e4de188a2c43574d37c49b3c641dd9c8edb7bb6aefd2e4755";
+ sha512 = "727827fa6b47cdec5048f40005872f021cc506d7c72a7f1a6bef9f736612341fe3cc6127b3bf005f63620f17b180a00c3fa0f799f63e685111119f9661d9ca7c";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-i686/da/firefox-61.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.2/linux-i686/da/firefox-62.0.2.tar.bz2";
locale = "da";
arch = "linux-i686";
- sha512 = "4aceadbf8cd2ced63f15aed369d98f4234faef18560e767aab1026c876fd3d6a069cbba49139eea60a78e0e42c063451918ce4090e850fc5528a93f527067335";
+ sha512 = "e795a7aaa38c28733a8864928229d91d752d6f0fe108bc5a3350b34e783155c3be14a5c0261eea26642097db2a583a34553d746d6040704f34de82953952f21a";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-i686/de/firefox-61.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.2/linux-i686/de/firefox-62.0.2.tar.bz2";
locale = "de";
arch = "linux-i686";
- sha512 = "327c8b22f3ff3c11061b5ee58d1ea2311743e53d804bcff6e66615eeae3aada694c8adbba58f3521b6bcd8f54513bcff1d50ac952ffe5f1ff3f22b52264bdb68";
+ sha512 = "56185cb92f9a246140b58119cbbb6a128905c8e244a7ed8917613a65fe8f87a542b103afe69f1fa542e47efca18c8666e669c266e9c107661b800c5e3b4ebb75";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-i686/dsb/firefox-61.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.2/linux-i686/dsb/firefox-62.0.2.tar.bz2";
locale = "dsb";
arch = "linux-i686";
- sha512 = "5a964d9c25326d2a97730723be2a999bcd8a1bc91b2d0d7ebb4aee9bd773fe93cdfdd94c70cb2f9c0ef10f84474c28726c21c23e19a1fb9b55e6db5c2a74b6b9";
+ sha512 = "ff30865cf3135f466d67143487ad34a50b73c11000419b2caec1c232d4efc805cee5cbd282bd1e0b9ccaf03ccc95e08ac4d1baed93abde27b45b0f2af5d71fbe";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-i686/el/firefox-61.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.2/linux-i686/el/firefox-62.0.2.tar.bz2";
locale = "el";
arch = "linux-i686";
- sha512 = "ed1eceba7d5bae11af3a916902a55c66ed97ca6da9f1a6421e4be76c65b25111e2ca7c979c55f920d5fa30146016980fde273c643a5ff4996ed32b82f0b9087e";
+ sha512 = "e22d89c822843db26e05834c088e5d687c6d315a870ef2457f13126bd740135016ebacf83b9fae131128b4fcf62b474a68fcb1fa12098aec22f199a5871e63b6";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-i686/en-GB/firefox-61.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.2/linux-i686/en-CA/firefox-62.0.2.tar.bz2";
+ locale = "en-CA";
+ arch = "linux-i686";
+ sha512 = "0f462a6900bf92513c40f28a9fd2ecb0fb3a69678b2b0091e6495b89b9a2fbe6c805e48b2e55fe274996ff7a15c32294d02a3e025b97505f920069cd71b23341";
+ }
+ { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.2/linux-i686/en-GB/firefox-62.0.2.tar.bz2";
locale = "en-GB";
arch = "linux-i686";
- sha512 = "019be53a2e1bafbc4ea77730545c40be314d7e4a370e5cadaffd735a2dcb3dbca14e4d23b88dd2e34aa4518a57aae1b37ca561e8e62d7acd3417227f0d18d344";
+ sha512 = "dd7a7fc0b05877f1e1f297b123075695c97247e2641311ff646b953e002278e2e16187682226eb46034cf3959880b2d17d74314ff7dcc654b1963beca6785410";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-i686/en-US/firefox-61.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.2/linux-i686/en-US/firefox-62.0.2.tar.bz2";
locale = "en-US";
arch = "linux-i686";
- sha512 = "ee88e6d55855a9e2fccf2a362f26177393447dd1210eb8f78992a7760bd0e8245267c4143eb5309a7ac5826b345b8c9637bcc504bb7214d1f7897db70e9c7697";
+ sha512 = "bdb45cca1c207502ae5f76fe10e4b73d3f7e6079913bc9a6216e9325b8c70fac37d14e32b4e5ef6acadd73c301c3ca1aa2d72a5d44acc0b6cb0c22b481de2e46";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-i686/en-ZA/firefox-61.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.2/linux-i686/en-ZA/firefox-62.0.2.tar.bz2";
locale = "en-ZA";
arch = "linux-i686";
- sha512 = "877cb9d50e95a8b0789660d871f263497279ea229b11218bc9398facb23d78200db4ad19e0030ca44cf36ae3913f8a119abddc3278e85a4c89d298c59a3443fb";
+ sha512 = "351ab5114b25daf11ff2ce1aa377e6c16a7adf9807a7609c97e04f30911f8680da727c6dd1d3067e028978d3f6f793351d99f500374372dc22b11ca760e4d36a";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-i686/eo/firefox-61.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.2/linux-i686/eo/firefox-62.0.2.tar.bz2";
locale = "eo";
arch = "linux-i686";
- sha512 = "5c78af15b977019cf7402e88b823ab2488b08ba9e8dd27a55caac7570392e78afd8aa972f0f95f21dfb1239936ba23272ed5b84cf24578cda5e7bb1048ce7d67";
+ sha512 = "1ec40261c42db667f1680361e4e7f12db271f5fbe6d213d44d0722e692a93421bb92d73193f87f42e43df40700cfddc7913454d6a64f5e15fb78f08d7a5a3c0f";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-i686/es-AR/firefox-61.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.2/linux-i686/es-AR/firefox-62.0.2.tar.bz2";
locale = "es-AR";
arch = "linux-i686";
- sha512 = "8328fef71e94c07c37491a331ac362d142d44e93404c0a3ea883426c8f11ebf6f5bf6584237b7fa75439c7312bd1f33a2ddcfcb8882c3cf3c526abfae48a620e";
+ sha512 = "00cc8c232fb4b7b2c56aeed098719d60deb26abacb38f8a7ffd9117c8d8875c838fc702413a6d8584f862b35843262e2bd31074bfbbc7cefa6f62247d8a16abe";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-i686/es-CL/firefox-61.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.2/linux-i686/es-CL/firefox-62.0.2.tar.bz2";
locale = "es-CL";
arch = "linux-i686";
- sha512 = "ef4e96123acde3a3ed75d8d93868894f859349613b556d44056009d55a3794e78824928eb04afe8746e291fb3d443b7a1b6f63376ebeb65102f7e03067480b86";
+ sha512 = "70da97fd43b84b5475e707780c215f73b05a423577f6ccb67a31e01370842319d40c6d691c99da138db881d6c5de8f73c1bea8287fb9ba1cd3647bc74ff8125b";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-i686/es-ES/firefox-61.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.2/linux-i686/es-ES/firefox-62.0.2.tar.bz2";
locale = "es-ES";
arch = "linux-i686";
- sha512 = "934e92d37b920ccb715a411509905c150501eb14d11aefd084f2639afb8ee1a4ce3e869d682ec9f9db4b70a795875f09ca3d7d997f0e621ef99cffeeb1675f04";
+ sha512 = "76b717e852c1aa2f3801a5460a8f0d51256486d5bb688b30cb85abaa30eb8a441cb28391988ef8ac4fdd1a430e0c09a2c298c8738f7a76e6a18742bc2a4f3998";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-i686/es-MX/firefox-61.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.2/linux-i686/es-MX/firefox-62.0.2.tar.bz2";
locale = "es-MX";
arch = "linux-i686";
- sha512 = "57e7bacb006bd079554670fc216ab2c1912a252b7966b32cc25a7d6735f7b0928ae0911b666c2810c63031d57513a4ff800cf92906a95868aa32608eb927e2f6";
+ sha512 = "e4e7f734ba533a0daf56d9c99881c0c1c758ba6e492e8e62b67944fc3a6c42c82df7e4d01a27fe797077708d49c810a51bb05d3fa4f2cf91fb63548f82e25322";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-i686/et/firefox-61.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.2/linux-i686/et/firefox-62.0.2.tar.bz2";
locale = "et";
arch = "linux-i686";
- sha512 = "b357f29c0f77e7ed4ac764f7feab6588cf322a1807210052359402e5d1092d3d8cf515e04beac86d32a6ddac43b4be8b92d88a1437f6899b4007d2c9faeb7fc2";
+ sha512 = "6b832c2b71b0e42db5a2292d90f1545ab545845f30b09baf277bd48597975e426cb98442fc16b7053d5c573d50d42e37e89cc49d7f325835aa5582262333fc4e";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-i686/eu/firefox-61.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.2/linux-i686/eu/firefox-62.0.2.tar.bz2";
locale = "eu";
arch = "linux-i686";
- sha512 = "61b4a7b767e62b1a1b4eee4cb024e869969b5623de658ca2a3762c271a6519fb4869c9398e7a3cbb987f01799961021fff6f8634b78dc62770ca1f345e56d061";
+ sha512 = "5bc67a8afec07f48c99ad331257236cb2fdde7fa23afadeb3de8c270d78e93bf855702bf82781c9c90eb5a4a0b9966d83bcc6d8f357ff5ef2bc265378200d674";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-i686/fa/firefox-61.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.2/linux-i686/fa/firefox-62.0.2.tar.bz2";
locale = "fa";
arch = "linux-i686";
- sha512 = "4eec6e7231fa548c0a24b8904b55311058dfc89b2ffb87142859b994aa0a31a07c48107495cfa66bb4a65094328f6bbd7f33e0ca33632457f620ecd90678552d";
+ sha512 = "43d16efdabc3eb39e3aa924387040f6e92c80333087369b754065c34403d202f0881c993bf667322f8ddf303a8e066c4203b2a4daebaf68ce5b95a8c1cf80844";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-i686/ff/firefox-61.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.2/linux-i686/ff/firefox-62.0.2.tar.bz2";
locale = "ff";
arch = "linux-i686";
- sha512 = "0a17ac2aa0a855c97b613741d7933dffc4569da9fef9f753a4e404847e683cf10a4444ff4cee5b5d1f86ef069525d0f2635433e8249ef029bfa2c247ed605386";
+ sha512 = "86837496c81d9f1209719d46aa396d17eca17a13f111ad0ac3b94f1d3f9bc60ddf8d8b10018e41100e091996d820975db897abb470fc85e0d87a0ff742a67b34";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-i686/fi/firefox-61.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.2/linux-i686/fi/firefox-62.0.2.tar.bz2";
locale = "fi";
arch = "linux-i686";
- sha512 = "32526703d86dcd74739f419518974ba7f43083a8b3f971d0dd7446caf787c5ed4be82710e3bd53f2d1e9e5dcb67f46735bb55f60ec7d9c49c62cfc2857866fc2";
+ sha512 = "baae77ef1bfc59c87eb72c3ad6f8524dbdf5fda9502abccf297c3b3f6e1033002d9b4e5b341c9fe101bbdbc93dbac768bd962ac9378088c9c567ec5d71ff00d4";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-i686/fr/firefox-61.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.2/linux-i686/fr/firefox-62.0.2.tar.bz2";
locale = "fr";
arch = "linux-i686";
- sha512 = "b7e00691c8a1a5f0c1a6312a79eb40ae17e455e156f66da2f4e43beaad5ec35d770b783aba83c500db1fa885b1038095effe69f936e17d69bd320f41b71d4b2f";
+ sha512 = "60fc885a6b5703a88dbbb60bed41296e2a1bf73405eba33a82e5f916ac0b22972377aec321c2b13d7007dbd94fdfcd24d43fc8f0acee37fcc9e23543c5a65f67";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-i686/fy-NL/firefox-61.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.2/linux-i686/fy-NL/firefox-62.0.2.tar.bz2";
locale = "fy-NL";
arch = "linux-i686";
- sha512 = "d8d70ed1d04686cabc9862c5cad06dffa6fa8b975a2a61f0154a6c1c6b182a173abe4563b727de30f414a4d04311744917a82158665883697d26589b29a25263";
+ sha512 = "945c2b7241e0faa83e1dfa1f36a3dc86cefb03d3c48191f2ae6b3dfe8384ae848440731d69363197f724da3c32988e20c0bbfa3adbc52e7eb99018b7ef8c4510";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-i686/ga-IE/firefox-61.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.2/linux-i686/ga-IE/firefox-62.0.2.tar.bz2";
locale = "ga-IE";
arch = "linux-i686";
- sha512 = "352620fb58ed1fc024e8633e70ce3a705fa518cb8f600b3bbcf1c50c440812ab8f04608bb5a3582f96dfb2a19b0d52debe6c4947dff2f06f426710d8f927977c";
+ sha512 = "6b3ffd73216ce3879b26211a3dd26db393eba8f0ec3f35b6626bea3847a614d6624f1fd6fcedd5ac00e5bb08c9465b8ae63fd4105a79acf86bc357dd331d44c7";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-i686/gd/firefox-61.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.2/linux-i686/gd/firefox-62.0.2.tar.bz2";
locale = "gd";
arch = "linux-i686";
- sha512 = "90923e5ecaa85d21d7d6de57c79a3f35b329faa14a74e8b210cc2024f1d48f3aa5c4930c63e8e1688778bdbe998f06c72b5bdce8287ffd7ae05fe62845ba2bfd";
+ sha512 = "cdea3ed1ffd14d02d6489983832cf11f87b1f17bc73539e4b27f7a76f267b491ddd3163a80ef9a953e3c79fe184631a32be842474427d9792b2d525df8006ffd";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-i686/gl/firefox-61.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.2/linux-i686/gl/firefox-62.0.2.tar.bz2";
locale = "gl";
arch = "linux-i686";
- sha512 = "339f8ebd6d714945e50be0d18be3af010e2f00924a84df2fe5641b06842278550bc76b01474ad2b2a0feda734f6f2ac9254c008c3a6f942714c684504bdd47b9";
+ sha512 = "b098ab10e0fda3fe67a04bf3040112e08ae1e94e30d65a076fa0e1f4d4e30e1be99e9578e06650f2fcddc6cc6b57309afbbda71008af67ad97caf9eacc7dd550";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-i686/gn/firefox-61.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.2/linux-i686/gn/firefox-62.0.2.tar.bz2";
locale = "gn";
arch = "linux-i686";
- sha512 = "35de07bd227904bf0372555d81ead164d993410d963e0e733f536ec445112652c04d3bce8f910d0b3daa3d9ef2ff956d24ed680916a5e86c3e9a6f9366d0dda9";
+ sha512 = "a83c0134556894a375ba91137d9513322a876299edd0347eead0869aebb4b04003dca12594cb276e3a521452d4b6ebbabc6be8f79040514f26f6827f55c15d3c";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-i686/gu-IN/firefox-61.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.2/linux-i686/gu-IN/firefox-62.0.2.tar.bz2";
locale = "gu-IN";
arch = "linux-i686";
- sha512 = "20b1b40d84264f0e98ab91a4e5943da078b7c37816b24443f8936933d779453d640b26ae04eca1b24b3a68134a29e7853bbd544c4cd725b934660574c6381284";
+ sha512 = "d313657b11f3fecbb0ef26a0c5a2d4b9ead411f2a3c55bbb4bca3ea3a6d861ee54ed1950e9bd5b14b24b9fa569c7c67b73807353331af60e3cd942b570430a76";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-i686/he/firefox-61.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.2/linux-i686/he/firefox-62.0.2.tar.bz2";
locale = "he";
arch = "linux-i686";
- sha512 = "f8652f2cdc19827a7f2a92e6ec251c5f0bd8448d3dfaa3bd930a4ba116dbdcdd7f2a9c083c5fa93ba2a24395147782146c5443221c6183622248e54d0687f287";
+ sha512 = "a05a94f0634f1a857eab463825c97ebf2fa1b5315c44082095d6fb674884b77375968ebd39df05fe6f0f3892b87d9f1313532ea022012cb411eb32a43e1d01f7";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-i686/hi-IN/firefox-61.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.2/linux-i686/hi-IN/firefox-62.0.2.tar.bz2";
locale = "hi-IN";
arch = "linux-i686";
- sha512 = "7051302d9315dc30fc8f6ebebaa587b49d17823aae7a542133d2f82a1d5a18e3062ff02880f347518e5f88a0de913568d9f6b4ab72bf7dd20cff5812cea65ebe";
+ sha512 = "e4cc460637c6aefab1b323ac5a13674f9f95eaf5cf0bfc2020869a196fd13f1708814b33c938981017fc27cdaaf57e75591ce2917cc66e5f97b3c8f22d3d44ab";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-i686/hr/firefox-61.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.2/linux-i686/hr/firefox-62.0.2.tar.bz2";
locale = "hr";
arch = "linux-i686";
- sha512 = "acc1297166057cdac0015758d6556bc870481d96951e7a14704792e39010938a6c0bafab2cb28e9a23bf24695813e8dc1a80512c1c5fc75bfb8a0d29f7091c93";
+ sha512 = "74c11421c3815b5772cd9a5f74e1c48d914d335babcffbca984187b72dc7a5db0609e7b31915f58d358a12c52a0db204ff191c78af28609c1e68d002a32f313a";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-i686/hsb/firefox-61.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.2/linux-i686/hsb/firefox-62.0.2.tar.bz2";
locale = "hsb";
arch = "linux-i686";
- sha512 = "2ec761ce5eaa14cf5fa114524f70b93998d76971de7b8d001e656cd6331c32252ef3ae78f54906f5dd416896b2cf8b6f5afcb5e3a02d017d9c8a33835655718e";
+ sha512 = "8b399983719f73f65d2db17af40065faaab4793ab32ab1596e79b6f844d43fe4bf3386343b50a244480bb9f724defc795a6479703cfdce305dba0321e4b5fc09";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-i686/hu/firefox-61.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.2/linux-i686/hu/firefox-62.0.2.tar.bz2";
locale = "hu";
arch = "linux-i686";
- sha512 = "160d7307aeb834f9ac15ad77c0cced4cf7abb855264e10d8a62eea1b1ef85aa3b0a00fa9221052bf4a3df010e54fa198d7033d8450d59212ff36c936d99a1469";
+ sha512 = "a5443cc52bcc5881a7297f2f200418e2a9791835f705d472bb657caceb0bb59f8dc1a7c424b196c2a66bf1f0c042d092a55c5b0d04a085dea702e11e433ed98e";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-i686/hy-AM/firefox-61.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.2/linux-i686/hy-AM/firefox-62.0.2.tar.bz2";
locale = "hy-AM";
arch = "linux-i686";
- sha512 = "09950c9536fa0bdbad207b84ccc83088b23a7f2f960d094ea0615de566ac1bd9cf55acbe01c0f574114dd9246bc74e582e67706ec0c34a2c9ed6dea3d30bae17";
+ sha512 = "ea3e471c41d3e17c99c5b819ab8c3de8759a275d1ee1af66f133f835ebb6be9c7aeb52ae8b6f79d849e489e0c8f79f69d557d101efe681b27ff38b4e8b306b54";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-i686/ia/firefox-61.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.2/linux-i686/ia/firefox-62.0.2.tar.bz2";
locale = "ia";
arch = "linux-i686";
- sha512 = "e6c1b00971dce7387e183a8328234ba65722c69c7d48e328223eb7e490af3706298d43c11844505ba2ea5aaf21a1fcf7b3cc8ec8946862fe7aed8128e6c6d5cb";
+ sha512 = "8bd09d0a8bfefc1a73b3a256a2e5be976b88998055299485c6270afc7ee7805a90e6ea9de144bd5ee8d3e40c079adac1dc29e9beb6d7ca376514fbac902f8de2";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-i686/id/firefox-61.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.2/linux-i686/id/firefox-62.0.2.tar.bz2";
locale = "id";
arch = "linux-i686";
- sha512 = "85506ef07ecdd1d466fbb261d46bca8cc4ac8b3a707f27db9083dfe1996e5214cc0e78080f33c2b3198e27e044c6a6d13717d69b43c3ad98a1c43f50b12bb69b";
+ sha512 = "c19859ab8b24aa239b0fc91930d8fb581850e631a9aa9033a98aea0287055d2a02ca6ae154ea23e37fd407a00999af1b5f7ce0854865b4b19a8462ccc3838cf5";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-i686/is/firefox-61.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.2/linux-i686/is/firefox-62.0.2.tar.bz2";
locale = "is";
arch = "linux-i686";
- sha512 = "973b863ef94121836f472f5450f8a1a2d3329306f289b8ba09ff811b336196a157cfc966fdffecd54e78f4f48508ca1f8284f0c2d3804579ef82be4e1adda48d";
+ sha512 = "68fc21b8b3aefe39bc6e87e8d90fb2652f2125af45520e7f91eef12615aff81d0c6237f3fbacce99259761f0f45c7b49aecb59894f161faa8760184271b2fbbb";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-i686/it/firefox-61.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.2/linux-i686/it/firefox-62.0.2.tar.bz2";
locale = "it";
arch = "linux-i686";
- sha512 = "fbb8e899b2aac3f4c64ccde0fffa11f8609ca3b7ea8bc05e062d207b46234b2414746822e0fad8d24fe8ae43e3bd8ebf2fc5d26a02365012a95a4070de002274";
+ sha512 = "8c8866bff0ea8c2e70a82798253334feca4d96d2e79d37d479f8bf2b5580912565ce08bc47777ff9340ceb4e5677d01eda6cb1d28f25274bab400086493e4610";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-i686/ja/firefox-61.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.2/linux-i686/ja/firefox-62.0.2.tar.bz2";
locale = "ja";
arch = "linux-i686";
- sha512 = "c6585b28baaeffcdedeb1167aae4d20874755e970f53aafb351a31acd3933e6b805cde1e22ce0c2ade58984ad940a5d8b6857116f11ea6070bfa88c8232bbae8";
+ sha512 = "56e1bd61de818e9271d483bdbeac7c8a95e00a1a2acee2ad7d7e5779b0bba452170d8e0fa6463b0f978ee3c3df720bf338367b8b1f041e5000054268cf267af6";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-i686/ka/firefox-61.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.2/linux-i686/ka/firefox-62.0.2.tar.bz2";
locale = "ka";
arch = "linux-i686";
- sha512 = "136f49750c33d72e7aee3fd5733730f1b78d6656fd45b2aa2299d8e9d01adf13f9debe1d08d8fb9149107e96ce5f5fefce81b5d9a2d9a1e1896cb8df3c588829";
+ sha512 = "de329fbe61b7563aaa2e62b1dad827445809df6f675518d7d19d9483acd6e23fc502f6abeabc13ed7c5eb2cc5b26a6ad0f0dd431c733f25a68a0ae7e2ee9923b";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-i686/kab/firefox-61.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.2/linux-i686/kab/firefox-62.0.2.tar.bz2";
locale = "kab";
arch = "linux-i686";
- sha512 = "2a0fd4952c493a4c22e76135efbf155962fb51444328726f29660cb97586ba76c1903d28c7baed9bb4815e57747b5a009649e179971b3c7aafd19fb96be23c75";
+ sha512 = "f739aa9432ce0bd8bea4917f590b076c0d88643aa595be951dfec27872d534fa3926a7ed8d82527e95a70689d365c1219d164cda79e06b7418b90652bd2b7cc7";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-i686/kk/firefox-61.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.2/linux-i686/kk/firefox-62.0.2.tar.bz2";
locale = "kk";
arch = "linux-i686";
- sha512 = "0cad124b5e3d995124057fe0d818121be4f7f186c7cd4ada4d13b89ca5d505a8830525ffcda9a27a0f5f2241fb65b44b8433d95221220740ab8643f374c938ad";
+ sha512 = "131b3ab83b953130cda7c9c388bf096edf90c424f86d1b6f4221b3601829a2ae0b7cc073a9336d7e4af588e497fb5df7731cca80a8413edf40a2f605927ba410";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-i686/km/firefox-61.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.2/linux-i686/km/firefox-62.0.2.tar.bz2";
locale = "km";
arch = "linux-i686";
- sha512 = "06a58d8d54bf641e3ddc7fdb3417f8a5a2aaa16e8c11f961321c939e803249edb7dd3e08027a4b20ea840298b4a12da20c2771364d2b9caaba496d1eba863e15";
+ sha512 = "6b0f4a83a746630b87b5a6c933f9aa65d6dbdb2e686af870562800aaa683371a23fbe79f31dcb0ef6ed397f556df83e1e30f83cb493921631e6ac1c8cbcd37f8";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-i686/kn/firefox-61.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.2/linux-i686/kn/firefox-62.0.2.tar.bz2";
locale = "kn";
arch = "linux-i686";
- sha512 = "92a9d9e4fc65472200f408238ade4ed23321d4e25b0c7eff9096f23f76e480cea0031159b53e509cc6d3d6b2c0c0c8396742c81f2fc3e9825c1d5e45a35a12f3";
+ sha512 = "e4042bb8884ecf46396e9e45a70b57c22b0ef76dd6d452ee0609382e87669e6163c1d86845aa904e13894e750eb2f35d1c9a2b7987aa6e7d3fcd5eaad38d8199";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-i686/ko/firefox-61.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.2/linux-i686/ko/firefox-62.0.2.tar.bz2";
locale = "ko";
arch = "linux-i686";
- sha512 = "dd9d7674f6261a94cb00fb823a02cec12758476c1ca1cf6a973eae78dbc1c94ebfcc14155c035966781398e1d3262e000da4291e90ec434756c8c3ba0de7b7b4";
+ sha512 = "02d30f4b2cc7285506239adfea681c780d0e16c1719c6cb68c908c54388e565bf98f1a3a3d98449b0e55b2cdda00627ad6c6f3e63fc9ad10f8c96b2df6138620";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-i686/lij/firefox-61.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.2/linux-i686/lij/firefox-62.0.2.tar.bz2";
locale = "lij";
arch = "linux-i686";
- sha512 = "1d01c34ab89ff1122147685b0551aa650f5b751deec35a5e7d64d6ba46272e929d7f1c49601fb2b1f5514b840ba6554af892c79c1a3f71af392216271d206cd5";
+ sha512 = "3cf57550bc091d756c5a2bb707aabf78cfab1660e1486c9276de5ad37cbae91be24f2170f5b20560ecf7f53d21217bd738b4e4277504d6f8934d3fe1ca5fcb1f";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-i686/lt/firefox-61.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.2/linux-i686/lt/firefox-62.0.2.tar.bz2";
locale = "lt";
arch = "linux-i686";
- sha512 = "93d3dfaca37a668eb7c43bdc74ba521bee0344fff43ff9cefad5e4746b7c3ccdba445f97577338606951a15fc5e629bcd4b8cb979842fbe550d3e7e88169b3a4";
+ sha512 = "606f27cc78c5ee0ea3a61f6110611ecc10c35af63cb9e7c5fa1d3d0ca7a74ac8cd81fec30c1ffe5573c27e0a7f5f04ed82105b8cf26b7c22d648ea217cb57e83";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-i686/lv/firefox-61.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.2/linux-i686/lv/firefox-62.0.2.tar.bz2";
locale = "lv";
arch = "linux-i686";
- sha512 = "0037d16778bccde9146965d7553513a21a443960cabca4a65b6f58ca2ea9f243b3405d3993e8ed078c1a2b7bd636deb86ed829f8f699400fd755f35cf048c463";
+ sha512 = "ab028d6f31a966ffee99cbcd5263b18cae94c6e0a6e3e055d2c86354849b68120d870a142678184a32f816c7e5803d221f3230b895c6ec71dda20a6540101c50";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-i686/mai/firefox-61.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.2/linux-i686/mai/firefox-62.0.2.tar.bz2";
locale = "mai";
arch = "linux-i686";
- sha512 = "d8025e4c4ab5b7e9b2d8dd8afbc221e1765eddf878943c4daece0e27b7443e7e17de3e400d99a5ef5b62a5ba9e3f2a4c27112551c8c0ea1f81136d6d74b7e91e";
+ sha512 = "faebf74c8a194f3dfe33addea35965b11f3f9e0c2b4bac4f9e4056c2248df24c26bc9e5a5696fe3f8c2e30e2172dae03fddcffef09bf7837fb6dd9fb6a1b3075";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-i686/mk/firefox-61.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.2/linux-i686/mk/firefox-62.0.2.tar.bz2";
locale = "mk";
arch = "linux-i686";
- sha512 = "6ed44201501bd8336615b29078de4e52374712f857e2816732277cc37b6f8b305af0861894f3f70fa62fe2de6476d689bc5b79bd245b4dd750dcbab0b448c69e";
+ sha512 = "dddef2e42aef03d11327ae2bc186c0dfd25e81b11845b319848e7c7253c101d32b2801548f6444f4ca01a91c365cb2bc6067e765490f3b876d149899a9edbf3e";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-i686/ml/firefox-61.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.2/linux-i686/ml/firefox-62.0.2.tar.bz2";
locale = "ml";
arch = "linux-i686";
- sha512 = "5b7272acc37c4dffc2421824b86c5f0192b7a92535f193a0b567fff8e79129f41bdb336bfc1c742ea0f106739eca47339d9f550b785951364233e612b035f94b";
+ sha512 = "0157abf3d8dbd54f50f6a17d796fba6c66e0270649b8dea1674a696a036d2a59f5841bda55d8b326d90266a198ec0dea3a65753b09fffa583b104c976ab75cd1";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-i686/mr/firefox-61.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.2/linux-i686/mr/firefox-62.0.2.tar.bz2";
locale = "mr";
arch = "linux-i686";
- sha512 = "fff73ffc6f080aa064df90a2f19c85364a09c831a095bf3722a5bc0760e04e305be8683804883968a492589a652d705f1cfbbed617de2f00348a723babf60a86";
+ sha512 = "9c6aa7a0a943b8f62f6888effeb65c6c3f36aac3353ff54011eeba06ff2bb0b66ead6b75d1107ffc358184df927cb2dc7cd3bca183fc54879427baf74cb8e570";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-i686/ms/firefox-61.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.2/linux-i686/ms/firefox-62.0.2.tar.bz2";
locale = "ms";
arch = "linux-i686";
- sha512 = "a7574ce597a12b92aec0e88ca72d544cca1ec1a5def40b034a8cb25a24a3672c42e2fbe7ebcf0b5293f55fa12216856503af5514c3ab2b3cea551a8a43900b04";
+ sha512 = "b7a723f79a18db5b3d886c39e76a65975c2f6229022c62cab7d7e38c840206d9004c81da1783f4bf0cc373438518f1367f4a34e3764ea9919568ed4c8725c94a";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-i686/my/firefox-61.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.2/linux-i686/my/firefox-62.0.2.tar.bz2";
locale = "my";
arch = "linux-i686";
- sha512 = "0bb892e7ab8126f2f946b1d3c9b8b00119dde0a165832ed211265be4f698087ab83970b1c1d47171913db7e01f43036e90b4aea135accb91c33beea1031d545c";
+ sha512 = "5538fa15d3ff02409bf9145d384e1c8e28a182239a682aa5beba671c09a0b813b56af6482476d57084af6a5895ad21af1f6ead71ecf23ea817780aedbd33661b";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-i686/nb-NO/firefox-61.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.2/linux-i686/nb-NO/firefox-62.0.2.tar.bz2";
locale = "nb-NO";
arch = "linux-i686";
- sha512 = "184130d826eda76da820974a4f729de6eb569bbc7f36ffe2d4599b7c142d75c5537546511770db38abaf28b9d3866937fc6d51c7fbcffb074432da3d98310b06";
+ sha512 = "8349c51a6b01301de6b0e0e37b665f44bd83abe9f771bc086c3f369534b6d4efc692441a46576b2335afda93cd8dbeff60ce17936e205e3c7212a2ef1b2844ce";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-i686/ne-NP/firefox-61.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.2/linux-i686/ne-NP/firefox-62.0.2.tar.bz2";
locale = "ne-NP";
arch = "linux-i686";
- sha512 = "2428dc2175f0da8e4fa66ac11810467306a59b181c34165e4a54dfe5f3bebc182f0fbcb117f15707e72baf97f4d75131a3ec97d03d0fc1109229caf83519dd51";
+ sha512 = "f16911685a7d233a8957780c5526be9e94c07f73b259dad09855b8c21bdba1756ca70ee71dd7b732ac56555135d749584986bf4501adb056373ded74f96e265d";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-i686/nl/firefox-61.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.2/linux-i686/nl/firefox-62.0.2.tar.bz2";
locale = "nl";
arch = "linux-i686";
- sha512 = "96bd92c9979e02a13db550f7f3a795585baa1017691371c5e5bc99825d730d535c63ddbf805ebf8a0e6406ae80ec644d0f715d04f913935f845ad89467c01832";
+ sha512 = "07e271170d05cb87cee9361efe8fee2007ca032b462ce68c562406fde581f4baab96c2ccea66cf92b8e72aba4647e7bb8271ec50e3adcfff6b787699b687a23c";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-i686/nn-NO/firefox-61.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.2/linux-i686/nn-NO/firefox-62.0.2.tar.bz2";
locale = "nn-NO";
arch = "linux-i686";
- sha512 = "26f35cd02873ba061cd0f38cca18947e2c05589d3b399c55fb4d0f356c26d399848467a20fc542c7f51c67c912ab7c8fe5fae25c97d942260276faba40d24c89";
+ sha512 = "eaace3b808dbc919d05a9701e7af2bdb241d57cb0356e4eb60b4706def37372a16b7767540947efaa91d5a3f338785187f83caf8bfa5bffe5f4f92aa3bec13d0";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-i686/oc/firefox-61.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.2/linux-i686/oc/firefox-62.0.2.tar.bz2";
locale = "oc";
arch = "linux-i686";
- sha512 = "711b260ac771280d795d6e3746df07bed4b9357b7261e83e8b17934ab027d77bfa1781d3d9d1923724f49f16136468c1fef40d1809d6a020d5b49b7767030f85";
+ sha512 = "aeaab0fc9ba77aae2c0ddd92d7096c167a99335b3d795f232a24e685d49b53678bed59b6e873ce1c7667f76d1527bf685b910bb51b8defc539999500eac14d5a";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-i686/or/firefox-61.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.2/linux-i686/or/firefox-62.0.2.tar.bz2";
locale = "or";
arch = "linux-i686";
- sha512 = "dcd1d7068c75428533d268b50d3d1e7324dba2709abe4049c9cfea4fd4413b09c3c7dd9f944f5f54f57454d8d2aa8471b8ba5871e73cbeae6fa357c8c68e90fc";
+ sha512 = "92b82c7bca322a9bfb6e6df61c9f2b6d82cf39c67848f2905dd372a627eb0379d235982e5634577825ad72794fd1d49b2e591ad5347977dac9a745d1167f7467";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-i686/pa-IN/firefox-61.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.2/linux-i686/pa-IN/firefox-62.0.2.tar.bz2";
locale = "pa-IN";
arch = "linux-i686";
- sha512 = "f34c32479a92cce9fc6564899b5477fdbdbdc868b17904f8d7ae338c2924fb7cb8335b038378a805a2119ff5ad13e349c7b80efe7a29add706bbaf1466d623a6";
+ sha512 = "2aec320ba120dd3632fa95599a9934ce133544e7b0d15a74236fb20435ab0a9ad44d6515f82897e7badeeeae19eb80d6b68fec4d000d63772d4e5ccd1f11d1eb";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-i686/pl/firefox-61.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.2/linux-i686/pl/firefox-62.0.2.tar.bz2";
locale = "pl";
arch = "linux-i686";
- sha512 = "d62822aa991cd30cb6c5e47dc211bd4018de427b243543bd83bd166601e40e3bed35dfc073660573dc500ae19ead2dca858041a3b80bd616def3c2b3f72aee11";
+ sha512 = "b62565b94eaae3ee225f2bbc8981f493594f48d40e8e8d83564a6d4ac6a4194c952663f9db52d7694993f08f714463b7607d659790236a727cbf803b084eb73e";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-i686/pt-BR/firefox-61.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.2/linux-i686/pt-BR/firefox-62.0.2.tar.bz2";
locale = "pt-BR";
arch = "linux-i686";
- sha512 = "5a2ea1494423a5ce1afc60c2d1a4e53ef084a02050ca61a688ecf18ff9d99e43d6bd334683937c12965767e7e5b0bd1a32708f1f2c2a241db1f68271633ace66";
+ sha512 = "2b218b66feb456a86919b395d1cdc40aa73de6ebbca3bc4135c54d5dc1ac993bfaf169bc7b0d2d770aa6f4565e71ead1fa2aaab02dc7362a9f4e5a896dae2c2d";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-i686/pt-PT/firefox-61.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.2/linux-i686/pt-PT/firefox-62.0.2.tar.bz2";
locale = "pt-PT";
arch = "linux-i686";
- sha512 = "83cff834812ad238b103fcee8b801e46ae542eba3475709e04848f18df0bee68075b2834ee871bfa5eb58ad1ec7fb34239d661a27d0dcba17e6c39de8428cef6";
+ sha512 = "d89122b993083bee798279c72a2d6296a5b966f7ac30269edcfe17a2036db648cd3e1e77eaf5f2479afc3c6831657267b22f2507176d62ee08dfaf4c100e074c";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-i686/rm/firefox-61.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.2/linux-i686/rm/firefox-62.0.2.tar.bz2";
locale = "rm";
arch = "linux-i686";
- sha512 = "c4190e7e2007805b2c7507dd26b0695bc5d3c007eabd6a592c283a99cf0495ce1dfcd6dbb1e753a990f64466f24618d3b84df617f99fb266ceadf32fcd990af8";
+ sha512 = "4ecba1d3bc6b3bbbc3ca974afa86e9b6e7664a0dd23605ea34349bbf822fc2098e7dd394f132b43e2e4127eeec36ec820710391671405b14c414d966540b63e3";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-i686/ro/firefox-61.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.2/linux-i686/ro/firefox-62.0.2.tar.bz2";
locale = "ro";
arch = "linux-i686";
- sha512 = "292112e0af6bad96b97bb0a1d58d0b7c9d4cb476cf531b1caaffcfd54c2f0ecd72a4311f98b614d7f834ffe2779261f77eb43d4d7ab724378dc6b7ad83bb1840";
+ sha512 = "97e8ebd7bc491bd320106765408bdd88542bd932c3c1b43a373aa5679f20e2a0aa12b48182454ec36812dbf4044364850cfe3e6878bec670ee46e8971e9293cc";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-i686/ru/firefox-61.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.2/linux-i686/ru/firefox-62.0.2.tar.bz2";
locale = "ru";
arch = "linux-i686";
- sha512 = "3d6fa0994fba5ff988e281ac4feff8655a5353ebf0d99df5ac7412cff2d19d478a912851d27f2af5bd78fdbc68030878682bb7ffa912180d2c4aa9bafcd77cd5";
+ sha512 = "f8f433e0d2970d028a01f1039951f1e725cae8e263bed9f0dff64387913ae269558f037d672a65d32614408cdd3267ddd65677dbcf212188c531d04960266535";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-i686/si/firefox-61.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.2/linux-i686/si/firefox-62.0.2.tar.bz2";
locale = "si";
arch = "linux-i686";
- sha512 = "e6d3c4049f267e68216e9824743b123539e5445a5d53297eb8af33af95a418e492a655a456970d02049f8969c81c0ab8c5be1471a5ab8e01b4744995b799158a";
+ sha512 = "11620e27c01dd91114d5e2080b430876282316ce6d527100305806314b4e7fccc38f2e93165f3e544cd3ef63b03aeaf738d6079201a0f7ae3f867b2e0b28239f";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-i686/sk/firefox-61.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.2/linux-i686/sk/firefox-62.0.2.tar.bz2";
locale = "sk";
arch = "linux-i686";
- sha512 = "66fc1f3f4fb7dec1c261db144243dc0647b4dbc4257de93c5fb017ae616d31d6825fdfafc30d3fc299a278d5fd51731f24e6033cb3807c69ccd1512527029063";
+ sha512 = "0a43e8fdc1c3f2bc63b6bacc15f9e3f3527302d0d7f0f0e0cc9498bab7728cca944fddf886c33ab67c60bcd9bafa051db97c8e8a77e781d6869a4bdb8096f4b1";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-i686/sl/firefox-61.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.2/linux-i686/sl/firefox-62.0.2.tar.bz2";
locale = "sl";
arch = "linux-i686";
- sha512 = "e089b96b77a60c2c8e96f107cd26f37e681f8a8c702cf32ee3592344900c81daba274516c32ac856609917a30f8d60d853fd649fe575c3a2915072e45908126b";
+ sha512 = "343a22feab53142ff585985fbaa8a037dbe9c3d3c2c073361f8d4af3b74272a47e5df2053ea91b333bf0da15334b9512c0513726ae80176838774020a7c7c639";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-i686/son/firefox-61.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.2/linux-i686/son/firefox-62.0.2.tar.bz2";
locale = "son";
arch = "linux-i686";
- sha512 = "00eecadab36816ae5e977dd50f335222e1fd8253b98daa1f14920e48678afb22b0e619ae4a86e6a45c8d2973f83f614f16a1f860e6ed1ed488851032075d6c72";
+ sha512 = "bb9c9c4bc82550b6d83c3b9995a1ca3afadc9fb5b27a5de4503682d29428ed7751895d1225a3b5ba8472d539c9efca957522187e4119e4e134f46b37da2f43e6";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-i686/sq/firefox-61.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.2/linux-i686/sq/firefox-62.0.2.tar.bz2";
locale = "sq";
arch = "linux-i686";
- sha512 = "ebd8ed00c12288a3ae4f6a113bbac8595ea9c0fbc35575115fd019c6158857ad083588100d4cae440822780bf25789501d0dd800bbe2baef5f037fb43aeabb74";
+ sha512 = "97b2c394f71e9bda6fa679353c579a01f40a4fb5b588bc177329d6fbfcff0d126e2db072c868eafd6078c26f9190f1a2d4c65f887754af4d25eb9c128d807030";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-i686/sr/firefox-61.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.2/linux-i686/sr/firefox-62.0.2.tar.bz2";
locale = "sr";
arch = "linux-i686";
- sha512 = "bfce8265755adbc3c30d56a1e4bbbbb14385ddd3d2434b6404b04e3fa3120d58b32cb9e598aeb1540f23d2757c23fe903fd5c9d5167db305a88077e98d9a39b2";
+ sha512 = "84024816cfd48076ef5ddbe0af392ab5ae0bcb8a02cc0ee1f6d0dafdf5673d9dfee377e83f0a9508c11593d8f4db682ad400c336a1c37591c25864c9299939f9";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-i686/sv-SE/firefox-61.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.2/linux-i686/sv-SE/firefox-62.0.2.tar.bz2";
locale = "sv-SE";
arch = "linux-i686";
- sha512 = "518b28e8f88a763aa09c5aed12eb0f2b582f84770401f3e11e5083fe69d176ce1483a81c2345a7fae2473551bf41db6a35f341495eb59c559a99398b93a7195a";
+ sha512 = "b630b627b038b16ae1b97f669e79afccba95e66a93dc3b7358e26960ae836f1f3663a49394b7a9be9906871a2301824c6b1f78f1f38943b54e4631f9beb90407";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-i686/ta/firefox-61.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.2/linux-i686/ta/firefox-62.0.2.tar.bz2";
locale = "ta";
arch = "linux-i686";
- sha512 = "a4d5960e0b60cf03c0ecf7f0d2b697dbb68dbfb4e0f3c77548c020d574f60c0fe7cc032a81215f34108a11651800deb1b1533efad3e238fd32780f22bd5524fc";
+ sha512 = "1306d444c620f558894ea81512944e1d07dfe706306206d1638c2e86ae5a2dba4e02b5927e4c9250df3cbc607d15da15bf2cb1c9e1ff74332354ae883c6bcc42";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-i686/te/firefox-61.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.2/linux-i686/te/firefox-62.0.2.tar.bz2";
locale = "te";
arch = "linux-i686";
- sha512 = "8bf1510077ce86f50c668cb8d931d6d0899d1b7559736312c86acfdc3149da75f8c8f750393e02023a9b063c27c03adcc6bd5c29c950fc0a6055392a2e0eb2d4";
+ sha512 = "3b0e1d6fea01ac99e315419365afdee54c107dd33ad577b19fcd9a59de1a176f34497e607fc7466217ddef5a6c442a62f1dd41cdb137651c0274274cb9357171";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-i686/th/firefox-61.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.2/linux-i686/th/firefox-62.0.2.tar.bz2";
locale = "th";
arch = "linux-i686";
- sha512 = "af32b002380fee3b147b2cc44831c3d2ee29d784b8c935fe1be464b302992aebba73a39929ca23b35b9b6a8475e909a73622f70810e0a4a21bc7db74a8b4da46";
+ sha512 = "7bcb0d7e17d397a7b114172234f3306f9faa28e7d9f8bb2db1399b58c28bd36ce4e478686c3ec98c76793cc75bbb974a316599b3a7c38fb034e852100ffa13e3";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-i686/tr/firefox-61.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.2/linux-i686/tr/firefox-62.0.2.tar.bz2";
locale = "tr";
arch = "linux-i686";
- sha512 = "4216a4e126a41f26b344804e4222535aee43c9f52fafbb6e1d019cc743fe18c0cdeed7fc04dd06fb921efc0431256ed2f09ed21fafff8a1132d097082b849388";
+ sha512 = "5c543b8bf79fdcb605b6d763688ca5bcd1e61b0e2088441e1d6d6dd4f0823f9f3d2075f39776d582bb468dc41ef39f7d562c7ebb6d5e4f084c3c1aaf1e61de8e";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-i686/uk/firefox-61.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.2/linux-i686/uk/firefox-62.0.2.tar.bz2";
locale = "uk";
arch = "linux-i686";
- sha512 = "dfe75bb618097d0a96066dd65ba0da7e9d3ce91c14075023c48aedfb88c6d30b83c8ab503666c7581783baf347beac58e81d49e7f9b671bedcdb6827f0843b35";
+ sha512 = "2fe636a02d0adc75d00f67620fcfaba902d16b5d828c2c9770560300c33cd0a8a8bd7208f146943cd62ac0aa8e3be784ff8549de78eb4f247783e1cfc823dd1c";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-i686/ur/firefox-61.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.2/linux-i686/ur/firefox-62.0.2.tar.bz2";
locale = "ur";
arch = "linux-i686";
- sha512 = "0a1a8cae5f364b5e0e2570ef6e06870efd136322082e2fb7690b381f05195eee48787ac679916cd7508f9f51458c038798c9e73f982992dd5b0de8d596e83ca4";
+ sha512 = "c84e1bf737b3a4b93f77098a087bd7ae598364d6a15110d3032bab4ee8aab6d1a64ce3ec4ef17b197b920e334f1e57a7a093581b8ac3b1ecab85d9cbb2da2c50";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-i686/uz/firefox-61.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.2/linux-i686/uz/firefox-62.0.2.tar.bz2";
locale = "uz";
arch = "linux-i686";
- sha512 = "153e781c6e4a530fad7631168afaaed74b0c8323317b1b4104cfffd8ee9250ae9af0ed9a0a0f157fc6745dfef7889402426c3d5e13d0c1b234fdaf952c9cb3aa";
+ sha512 = "cee9849825181c517a82c6f6cb07920767ff2c02d54b87c8e509e60bef3adff260f282882b9495b6034fa61b11e2cf831e3adc3ed3928ff32792a62084cf115b";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-i686/vi/firefox-61.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.2/linux-i686/vi/firefox-62.0.2.tar.bz2";
locale = "vi";
arch = "linux-i686";
- sha512 = "1cc2e611316137b1d569d3c2617d41bddc48a8618a8937eab643ebdf94727139743b8bc6e1d18a7487e9d30f867ae1b7f77bfd528e0b535d122a4e8f9fcd311c";
+ sha512 = "a0eddaf392addf41017108ded0d32418175ab5ff7cddf74e3224929da93bc84cf07312671f16aa5652ecdc315707a4301c69b856be709f4298861298541a065f";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-i686/xh/firefox-61.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.2/linux-i686/xh/firefox-62.0.2.tar.bz2";
locale = "xh";
arch = "linux-i686";
- sha512 = "b0c4a093950fe90ad2249a5259843e7b3b4bdf2179b0c7ee61e1f965a4104636a53d7db0b91aaff3047cc7252855970f12e1b3bc4aa9e4f85d301652cb53c6c0";
+ sha512 = "50741d2ff1b7f1d9cf503af66ec61a2d19600ad7240db837392440b2943c6d96a7b8d5538ca24f0d528cbe9fbaede7964c9f8404474f95a1c022e193fa91f81e";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-i686/zh-CN/firefox-61.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.2/linux-i686/zh-CN/firefox-62.0.2.tar.bz2";
locale = "zh-CN";
arch = "linux-i686";
- sha512 = "b3d1ea1e74ce5c7779bd1c7299197d0143688cc6bd9c4ae0b391e3849fec40c3142a9b7db19d3805616fa885deb16a6fdbe2fd23ddf0eac0fb0094498917d356";
+ sha512 = "103be3f37fa7a92c00d6465f93bedffc31527939bd85df0c742c04ac75f9ddec4018a368a2ff29730f5a055459b018c64afa344df255638ec3c26bb295e1a31a";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-i686/zh-TW/firefox-61.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.2/linux-i686/zh-TW/firefox-62.0.2.tar.bz2";
locale = "zh-TW";
arch = "linux-i686";
- sha512 = "cda9d835f282746cb711054f1ed2f137e0f7e89c27429af12f470ed8984ea0c9a4f28e5cd403aa2f37fe0c06271c7651f794009ec11ddc64a96c4c661ca9ecb6";
+ sha512 = "0ac22e595f2d87f75b586eabab07470f9eec16026a45902fb40c19fd2cbf93f2f88241900a13703edb89290953127c689bacbc0eccd560822e43bc07a97e3ddf";
}
];
}
diff --git a/pkgs/applications/networking/browsers/firefox/packages.nix b/pkgs/applications/networking/browsers/firefox/packages.nix
index 984d80167c39..e48fd6dc8ccf 100644
--- a/pkgs/applications/networking/browsers/firefox/packages.nix
+++ b/pkgs/applications/networking/browsers/firefox/packages.nix
@@ -20,10 +20,10 @@ rec {
firefox = common rec {
pname = "firefox";
- version = "61.0.2";
+ version = "62.0.2";
src = fetchurl {
url = "mirror://mozilla/firefox/releases/${version}/source/firefox-${version}.source.tar.xz";
- sha512 = "3zzcxqjpsn2m5z4l66rxrq7yf58aii370jj8pcl50smcd55sfsyknnc20agbppsw4k4pnwycfn57im33swwkjzg0hk0h2ng4rvi42x2";
+ sha512 = "0j5q1aa7jhq4pydaywp8ymibc319wv3gw2q15qp14i069qk3fpn33zb5z86lhb6z864f88ikx3zxv6phqs96qvzj25yqbh7nxmzwhvv";
};
patches = nixpkgsPatches ++ [
@@ -69,10 +69,10 @@ rec {
firefox-esr-60 = common rec {
pname = "firefox-esr";
- version = "60.1.0esr";
+ version = "60.2.1esr";
src = fetchurl {
url = "mirror://mozilla/firefox/releases/${version}/source/firefox-${version}.source.tar.xz";
- sha512 = "2bg7zvkpy1x2ryiazvk4nn5m94v0addbhrcrlcf9djnqjf14rp5q50lbiymhxxz0988vgpicsvizifb8gb3hi7b8g17rdw6438ddhh6";
+ sha512 = "2mklws09haki91w3js2i5pv8g3z5ck4blnzxvdbk5qllqlv465hn7rvns78hbcbids55mqx50fsn0161la73v25zs04bf8xdhbkcpsm";
};
patches = nixpkgsPatches ++ [
diff --git a/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer/default.nix b/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer/default.nix
index 72e1a08f40b3..07ef1397f9fb 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 ba8a8de93209..03255e6eecc0 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/qtchan/default.nix b/pkgs/applications/networking/browsers/qtchan/default.nix
index f6bc05371f30..df956addf5cc 100644
--- a/pkgs/applications/networking/browsers/qtchan/default.nix
+++ b/pkgs/applications/networking/browsers/qtchan/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, qt, makeWrapper }:
+{ stdenv, fetchFromGitHub, fetchpatch, qt, makeWrapper }:
stdenv.mkDerivation rec {
name = "qtchan-${version}";
@@ -11,6 +11,13 @@ stdenv.mkDerivation rec {
sha256 = "0n94jd6b1y8v6x5lkinr9rzm4bjg9xh9m7zj3j73pgq829gpmj3a";
};
+ patches = [
+ (fetchpatch {
+ url = https://github.com/siavash119/qtchan/commit/718abeee5cf4aca8c99b35b26f43909362a29ee6.patch;
+ sha256 = "11b72l5njvfsyapd479hp4yfvwwb1mhq3f077hwgg0waz5l7n00z";
+ })
+ ];
+
enableParallelBuilding = true;
nativeBuildInputs = [ qt.qmake makeWrapper ];
buildInputs = [ qt.qtbase ];
diff --git a/pkgs/applications/networking/browsers/qutebrowser/default.nix b/pkgs/applications/networking/browsers/qutebrowser/default.nix
index 47a273e99f98..20f7d4d2a3e6 100644
--- a/pkgs/applications/networking/browsers/qutebrowser/default.nix
+++ b/pkgs/applications/networking/browsers/qutebrowser/default.nix
@@ -58,7 +58,7 @@ in python3Packages.buildPythonApplication rec {
];
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
'';
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 ffa5d4472527..90287c05b5e4 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.1";
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 = "05k914066pk11qxbwr77g6v20cfc8h9mh9yc3bpsfy35p8sypv8c";
};
"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 = "1w2apsiimy6d5vpql37j5bmf8y8xhx4irryd5ad3vqqsr0x5wla7";
};
};
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/cluster/click/default.nix b/pkgs/applications/networking/cluster/click/default.nix
index 7fd4cd9fa824..2c7a026b277e 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 000000000000..bc4db7ef7c12
--- /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/kubernetes/default.nix b/pkgs/applications/networking/cluster/kubernetes/default.nix
index 01bf3467af95..96dab6aa66a1 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/instant-messengers/SkypeExport/default.nix b/pkgs/applications/networking/instant-messengers/SkypeExport/default.nix
index 9ec9a3451bef..163f0ba3f497 100644
--- a/pkgs/applications/networking/instant-messengers/SkypeExport/default.nix
+++ b/pkgs/applications/networking/instant-messengers/SkypeExport/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, cmake, boost }:
+{ stdenv, fetchFromGitHub, cmake, boost166 }:
stdenv.mkDerivation rec {
name = "SkypeExport-${version}";
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
};
nativeBuildInputs = [ cmake ];
- buildInputs = [ boost ];
+ buildInputs = [ boost166 ];
preConfigure = "cd src/SkypeExport/_gccbuild/linux";
installPhase = "install -Dt $out/bin SkypeExport";
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 000000000000..91ba8e7175ce
--- /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 cf9558b4b955..6716305df8b5 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 fa388edfb75a..000000000000
--- 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 e2f72f600ed8..000000000000
--- 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/instant-messengers/pidgin-plugins/purple-matrix/default.nix b/pkgs/applications/networking/instant-messengers/pidgin-plugins/purple-matrix/default.nix
index a6d893fd95a4..d4a26a266c30 100644
--- a/pkgs/applications/networking/instant-messengers/pidgin-plugins/purple-matrix/default.nix
+++ b/pkgs/applications/networking/instant-messengers/pidgin-plugins/purple-matrix/default.nix
@@ -1,30 +1,32 @@
-{ stdenv, fetchgit, pkgconfig, pidgin, json-glib, glib, http-parser } :
+{ stdenv, fetchgit, pkgconfig, pidgin, json-glib, glib, http-parser, sqlite, olm, libgcrypt } :
let
- version = "2016-07-11";
+ version = "2018-08-03";
in
stdenv.mkDerivation rec {
name = "purple-matrix-unstable-${version}";
src = fetchgit {
url = "https://github.com/matrix-org/purple-matrix";
- rev = "f9d36198a57de1cd1740a3ae11c2ad59b03b724a";
- sha256 = "1mmyvc70gslniphmcpk8sfl6ylik6dnprqghx4n47gsj1sb1cy00";
+ rev = "5a7166a3f54f85793c6b60662f8d12196aeaaeb0";
+ sha256 = "0ph0s24b37d1c50p8zbzgf4q2xns43a8v6vk85iz633wdd72zsa0";
};
nativeBuildInputs = [ pkgconfig ];
- buildInputs = [ pidgin json-glib glib http-parser ];
+ buildInputs = [ pidgin json-glib glib http-parser sqlite olm libgcrypt ];
- installPhase = ''
- install -Dm755 -t $out/lib/pidgin/ libmatrix.so
- for size in 16 22 48; do
- install -TDm644 matrix-"$size"px.png $out/pixmaps/pidgin/protocols/$size/matrix.png
- done
- '';
+ hardeningDisable = [ "fortify" ]; # upstream compiles with -O0
- meta = {
+ makeFlags = [
+ "DESTDIR=$(out)"
+ "PLUGIN_DIR_PURPLE=/lib/pidgin/"
+ "DATA_ROOT_DIR_PURPLE=/share"
+ ];
+
+ meta = with stdenv.lib; {
homepage = https://github.com/matrix-org/purple-matrix;
description = "Matrix support for Pidgin / libpurple";
- license = stdenv.lib.licenses.gpl2;
+ license = licenses.gpl2;
+ maintainers = with maintainers; [ symphorien ];
};
}
diff --git a/pkgs/applications/networking/instant-messengers/psi-plus/default.nix b/pkgs/applications/networking/instant-messengers/psi-plus/default.nix
index 7c6f33935dc0..0fdd8dfb4bd3 100644
--- a/pkgs/applications/networking/instant-messengers/psi-plus/default.nix
+++ b/pkgs/applications/networking/instant-messengers/psi-plus/default.nix
@@ -1,24 +1,24 @@
{ stdenv, fetchFromGitHub, cmake
, qt5, libidn, qca2-qt5, libXScrnSaver, hunspell
-, libgcrypt, libotr, html-tidy, libgpgerror
+, libgcrypt, libotr, html-tidy, libgpgerror, libsignal-protocol-c
}:
stdenv.mkDerivation rec {
name = "psi-plus-${version}";
- version = "1.2.235";
+ version = "1.3.410";
src = fetchFromGitHub {
owner = "psi-plus";
repo = "psi-plus-snapshots";
rev = "${version}";
- sha256 = "0rc65gs6m3jxg407r99kikdylvrar5mq7x5m66ma604yk5igwg47";
+ sha256 = "02m984z2dfmlx522q9x1z0aalvi2mi48s5ghhs80hr5afnfyc5w6";
};
resources = fetchFromGitHub {
owner = "psi-plus";
repo = "resources";
- rev = "8f5038380e1be884b04b5a1ad3cc3385e793f668";
- sha256 = "1b8a2aixg966fzjwp9hz51rc31imyvpx014mp2fsm47k8na4470d";
+ rev = "c0bfb8a025eeec82cd0a23a559e0aa3da15c3ec3";
+ sha256 = "1q7v01w085vk7ml6gwis7j409w6f5cplpm7c0ajs4i93c4j53xdf";
};
postUnpack = ''
@@ -34,7 +34,7 @@ stdenv.mkDerivation rec {
buildInputs = [
qt5.qtbase qt5.qtmultimedia qt5.qtx11extras qt5.qttools qt5.qtwebkit
libidn qca2-qt5 libXScrnSaver hunspell
- libgcrypt libotr html-tidy libgpgerror
+ libgcrypt libotr html-tidy libgpgerror libsignal-protocol-c
];
enableParallelBuilding = true;
@@ -42,6 +42,7 @@ stdenv.mkDerivation rec {
meta = with stdenv.lib; {
description = "XMPP (Jabber) client";
maintainers = with maintainers; [ orivej ];
+ license = licenses.gpl2;
platforms = platforms.linux;
};
}
diff --git a/pkgs/applications/networking/instant-messengers/psi/default.nix b/pkgs/applications/networking/instant-messengers/psi/default.nix
index 37d9de8794e5..daa9d04cfb53 100644
--- a/pkgs/applications/networking/instant-messengers/psi/default.nix
+++ b/pkgs/applications/networking/instant-messengers/psi/default.nix
@@ -22,9 +22,10 @@ stdenv.mkDerivation rec {
enableParallelBuilding = true;
- meta = {
+ meta = with stdenv.lib; {
description = "Psi, an XMPP (Jabber) client";
- maintainers = [ stdenv.lib.maintainers.raskin ];
+ maintainers = [ maintainers.raskin ];
+ license = licenses.gpl2;
platforms = stdenv.lib.platforms.linux;
};
}
diff --git a/pkgs/applications/networking/instant-messengers/swift-im/default.nix b/pkgs/applications/networking/instant-messengers/swift-im/default.nix
index e3b3d7191892..8316c560b069 100644
--- a/pkgs/applications/networking/instant-messengers/swift-im/default.nix
+++ b/pkgs/applications/networking/instant-messengers/swift-im/default.nix
@@ -14,7 +14,7 @@ in stdenv.mkDerivation rec {
sha256 = "0w0aiszjd58ynxpacwcgf052zpmbpcym4dhci64vbfgch6wryz0w";
};
- patches = [ ./scons.patch ];
+ patches = [ ./qt-5.11.patch ./scons.patch ];
nativeBuildInputs = [ pkgconfig qttools scons ];
@@ -28,6 +28,8 @@ in stdenv.mkDerivation rec {
NIX_CFLAGS_COMPILE = [
"-I${libxml2.dev}/include/libxml2"
"-I${miniupnpc}/include/miniupnpc"
+ "-I${qtwebkit.dev}/include/QtWebKit"
+ "-I${qtwebkit.dev}/include/QtWebKitWidgets"
];
buildPhase = ''
diff --git a/pkgs/applications/networking/instant-messengers/swift-im/qt-5.11.patch b/pkgs/applications/networking/instant-messengers/swift-im/qt-5.11.patch
new file mode 100644
index 000000000000..911e7570427f
--- /dev/null
+++ b/pkgs/applications/networking/instant-messengers/swift-im/qt-5.11.patch
@@ -0,0 +1,10 @@
+--- a/Swift/QtUI/UserSearch/QtUserSearchWindow.h
++++ b/Swift/QtUI/UserSearch/QtUserSearchWindow.h
+@@ -8,6 +8,7 @@
+
+ #include
+
++#include
+ #include
+
+ #include
diff --git a/pkgs/applications/networking/instant-messengers/zoom-us/default.nix b/pkgs/applications/networking/instant-messengers/zoom-us/default.nix
index 882215c50c5c..d271d5d48491 100644
--- a/pkgs/applications/networking/instant-messengers/zoom-us/default.nix
+++ b/pkgs/applications/networking/instant-messengers/zoom-us/default.nix
@@ -13,11 +13,11 @@ assert pulseaudioSupport -> libpulseaudio != null;
let
inherit (stdenv.lib) concatStringsSep makeBinPath optional;
- version = "2.3.128305.0716";
+ version = "2.4.129780.0915";
srcs = {
x86_64-linux = fetchurl {
url = "https://zoom.us/client/${version}/zoom_x86_64.tar.xz";
- sha256 = "1jpw5sclr5bhif559hmnyiggjh6gkm1smiw34y3ad4k8xhag9dkh";
+ sha256 = "0s4014ymc92rwpagcwjhmwwfz0vq35wiq2nhh6nlxcrr6jl4wd78";
};
};
diff --git a/pkgs/applications/networking/ipfs-migrator/default.nix b/pkgs/applications/networking/ipfs-migrator/default.nix
index 6a4afdb1c17d..f070c5109376 100644
--- a/pkgs/applications/networking/ipfs-migrator/default.nix
+++ b/pkgs/applications/networking/ipfs-migrator/default.nix
@@ -2,7 +2,7 @@
buildGoPackage rec {
name = "ipfs-migrator-${version}";
- version = "6";
+ version = "7";
goPackagePath = "github.com/ipfs/fs-repo-migrations";
@@ -11,8 +11,8 @@ buildGoPackage rec {
src = fetchFromGitHub {
owner = "ipfs";
repo = "fs-repo-migrations";
- rev = "a89e9769b9cac25ad9ca31c7e9a4445c7966d35b";
- sha256 = "0x4mbkx7wlqjmkg6852hljq947v9y9k3hjd5yfj7kka1hpvxd7bn";
+ rev = "4e8e0b41d7348646c719d572c678c3d0677e541a";
+ sha256 = "1i6izncgc3wgabppglnnrslffvwrv3cazbdhsk4vjfsd66hb4d37";
};
patches = [ ./lru-repo-path-fix.patch ];
diff --git a/pkgs/applications/networking/ipfs-migrator/deps.nix b/pkgs/applications/networking/ipfs-migrator/deps.nix
index 2d52ca0ef70a..1ad1c383c8c6 100644
--- a/pkgs/applications/networking/ipfs-migrator/deps.nix
+++ b/pkgs/applications/networking/ipfs-migrator/deps.nix
@@ -1,13 +1,4 @@
[
- {
- goPackagePath = "github.com/dustin/go-humanize";
- fetch = {
- type = "git";
- url = https://github.com/dustin/go-humanize;
- rev = "79e699ccd02f240a1f1fbbdcee7e64c1c12e41aa";
- sha256 = "0awfqszgjw8qrdw31v74jnvj1jbp7czhd8aq59j57yyj4hy50fzj";
- };
- }
{
goPackagePath = "github.com/jbenet/goprocess";
fetch = {
@@ -40,8 +31,8 @@
fetch = {
type = "git";
url = https://github.com/hashicorp/golang-lru;
- rev = "0a025b7e63adc15a622f29b0b2c4c3848243bbf6";
- sha256 = "1iq7lbpsz7ks052mpznmkf8s4k43p51z4dik2n9ivrxk666q2wxi";
+ rev = "20f1fb78b0740ba8c3cb143a61e86ba5c8669768";
+ sha256 = "12k2cp2k615fjvfa5hyb9k2alian77wivds8s65diwshwv41939f";
};
}
{
@@ -49,8 +40,8 @@
fetch = {
type = "git";
url = "https://go.googlesource.com/net";
- rev = "71a035914f99bb58fe82eac0f1289f10963d876c";
- sha256 = "06m16c9vkwc8m2mcxcxa7p8mb26ikc810lgzd5m8k1r6lp3hc8wm";
+ rev = "26e67e76b6c3f6ce91f7c52def5af501b4e0f3a2";
+ sha256 = "17bqkd64zksi1578lb10ls4qf5lbqs7shfjcc6bi97y1qz5k31c4";
};
}
]
diff --git a/pkgs/applications/networking/irc/weechat/aggregate-commands.patch b/pkgs/applications/networking/irc/weechat/aggregate-commands.patch
new file mode 100644
index 000000000000..41e3c54a2d57
--- /dev/null
+++ b/pkgs/applications/networking/irc/weechat/aggregate-commands.patch
@@ -0,0 +1,110 @@
+diff --git a/src/core/wee-command.c b/src/core/wee-command.c
+index 91c3c068d..8105e4171 100644
+--- a/src/core/wee-command.c
++++ b/src/core/wee-command.c
+@@ -8345,10 +8345,20 @@ command_exec_list (const char *command_list)
+ void
+ command_startup (int plugins_loaded)
+ {
++ int i;
++
+ if (plugins_loaded)
+ {
+ command_exec_list (CONFIG_STRING(config_startup_command_after_plugins));
+- command_exec_list (weechat_startup_commands);
++ if (weechat_startup_commands)
++ {
++ for (i = 0; i < weelist_size (weechat_startup_commands); i++)
++ {
++ command_exec_list (
++ weelist_string (
++ weelist_get (weechat_startup_commands, i)));
++ }
++ }
+ }
+ else
+ command_exec_list (CONFIG_STRING(config_startup_command_before_plugins));
+diff --git a/src/core/weechat.c b/src/core/weechat.c
+index f74598ad5..ff2e539d1 100644
+--- a/src/core/weechat.c
++++ b/src/core/weechat.c
+@@ -60,6 +60,7 @@
+ #include "wee-eval.h"
+ #include "wee-hdata.h"
+ #include "wee-hook.h"
++#include "wee-list.h"
+ #include "wee-log.h"
+ #include "wee-network.h"
+ #include "wee-proxy.h"
+@@ -102,7 +103,8 @@ int weechat_no_gnutls = 0; /* remove init/deinit of gnutls */
+ /* (useful with valgrind/electric-f.)*/
+ int weechat_no_gcrypt = 0; /* remove init/deinit of gcrypt */
+ /* (useful with valgrind) */
+-char *weechat_startup_commands = NULL; /* startup commands (-r flag) */
++struct t_weelist *weechat_startup_commands = NULL; /* startup commands */
++ /* (option -r) */
+
+
+ /*
+@@ -152,9 +154,13 @@ weechat_display_usage ()
+ " -h, --help display this help\n"
+ " -l, --license display WeeChat license\n"
+ " -p, --no-plugin don't load any plugin at startup\n"
+- " -r, --run-command run command(s) after startup\n"
+- " (many commands can be separated by "
+- "semicolons)\n"
++ " -P, --plugins load only these plugins at startup\n"
++ " (see /help weechat.plugin.autoload)\n"
++ " -r, --run-command run command(s) after startup;\n"
++ " many commands can be separated by "
++ "semicolons,\n"
++ " this option can be given multiple "
++ "times\n"
+ " -s, --no-script don't load any script at startup\n"
+ " --upgrade upgrade WeeChat using session files "
+ "(see /help upgrade in WeeChat)\n"
+@@ -276,9 +282,10 @@ weechat_parse_args (int argc, char *argv[])
+ {
+ if (i + 1 < argc)
+ {
+- if (weechat_startup_commands)
+- free (weechat_startup_commands);
+- weechat_startup_commands = strdup (argv[++i]);
++ if (!weechat_startup_commands)
++ weechat_startup_commands = weelist_new ();
++ weelist_add (weechat_startup_commands, argv[++i],
++ WEECHAT_LIST_POS_END, NULL);
+ }
+ else
+ {
+@@ -616,6 +623,8 @@ weechat_shutdown (int return_code, int crash)
+ free (weechat_home);
+ if (weechat_local_charset)
+ free (weechat_local_charset);
++ if (weechat_startup_commands)
++ weelist_free (weechat_startup_commands);
+
+ if (crash)
+ abort ();
+diff --git a/src/core/weechat.h b/src/core/weechat.h
+index 9420ff415..cbb565a03 100644
+--- a/src/core/weechat.h
++++ b/src/core/weechat.h
+@@ -96,6 +96,8 @@
+ /* name of environment variable with an extra lib dir */
+ #define WEECHAT_EXTRA_LIBDIR "WEECHAT_EXTRA_LIBDIR"
+
++struct t_weelist;
++
+ /* global variables and functions */
+ extern int weechat_headless;
+ extern int weechat_debug_core;
+@@ -112,7 +114,7 @@ extern char *weechat_local_charset;
+ extern int weechat_plugin_no_dlclose;
+ extern int weechat_no_gnutls;
+ extern int weechat_no_gcrypt;
+-extern char *weechat_startup_commands;
++extern struct t_weelist *weechat_startup_commands;
+
+ extern void weechat_term_check ();
+ extern void weechat_shutdown (int return_code, int crash);
diff --git a/pkgs/applications/networking/irc/weechat/default.nix b/pkgs/applications/networking/irc/weechat/default.nix
index 16162435e09a..bf5d06423142 100644
--- a/pkgs/applications/networking/irc/weechat/default.nix
+++ b/pkgs/applications/networking/irc/weechat/default.nix
@@ -12,7 +12,8 @@
, tclSupport ? true, tcl
, extraBuildInputs ? []
, configure ? { availablePlugins, ... }: { plugins = builtins.attrValues availablePlugins; }
-, runCommand }:
+, runCommand, buildEnv
+}:
let
inherit (pythonPackages) python;
@@ -29,12 +30,12 @@ let
weechat =
assert lib.all (p: p.enabled -> ! (builtins.elem null p.buildInputs)) plugins;
stdenv.mkDerivation rec {
- version = "2.1";
+ version = "2.2";
name = "weechat-${version}";
src = fetchurl {
url = "http://weechat.org/files/src/weechat-${version}.tar.bz2";
- sha256 = "0fq68wgynv2c3319gmzi0lz4ln4yrrk755y5mbrlr7fc1sx7ffd8";
+ sha256 = "0p4nhh7f7w4q77g7jm9i6fynndqlgjkc9dk5g1xb4gf9imiisqlg";
};
outputs = [ "out" "man" ] ++ map (p: p.name) enabledPlugins;
@@ -69,6 +70,13 @@ let
done
'';
+ # remove when bumping to the latest version.
+ # This patch basically rebases `fcf7469d7664f37e94d5f6d0b3fe6fce6413f88c`
+ # from weechat upstream to weechat-2.2.
+ patches = [
+ ./aggregate-commands.patch
+ ];
+
meta = {
homepage = http://www.weechat.org/;
description = "A fast, light and extensible chat client";
@@ -78,38 +86,38 @@ let
on https://nixos.org/nixpkgs/manual/#sec-weechat .
'';
license = stdenv.lib.licenses.gpl3;
- maintainers = with stdenv.lib.maintainers; [ lovek323 garbas the-kenny lheckemann ];
+ maintainers = with stdenv.lib.maintainers; [ lovek323 garbas the-kenny lheckemann ma27 ];
platforms = stdenv.lib.platforms.unix;
};
};
in if configure == null then weechat else
let
perlInterpreter = perl;
- config = configure {
- availablePlugins = let
- simplePlugin = name: {pluginFile = "${weechat.${name}}/lib/weechat/plugins/${name}.so";};
- in rec {
- python = {
- pluginFile = "${weechat.python}/lib/weechat/plugins/python.so";
- withPackages = pkgsFun: (python // {
- extraEnv = ''
- export PYTHONHOME="${pythonPackages.python.withPackages pkgsFun}"
- '';
- });
- };
- perl = (simplePlugin "perl") // {
+ availablePlugins = let
+ simplePlugin = name: {pluginFile = "${weechat.${name}}/lib/weechat/plugins/${name}.so";};
+ in rec {
+ python = {
+ pluginFile = "${weechat.python}/lib/weechat/plugins/python.so";
+ withPackages = pkgsFun: (python // {
extraEnv = ''
- export PATH="${perlInterpreter}/bin:$PATH"
+ export PYTHONHOME="${pythonPackages.python.withPackages pkgsFun}"
'';
- };
- tcl = simplePlugin "tcl";
- ruby = simplePlugin "ruby";
- guile = simplePlugin "guile";
- lua = simplePlugin "lua";
+ });
};
+ perl = (simplePlugin "perl") // {
+ extraEnv = ''
+ export PATH="${perlInterpreter}/bin:$PATH"
+ '';
+ };
+ tcl = simplePlugin "tcl";
+ ruby = simplePlugin "ruby";
+ guile = simplePlugin "guile";
+ lua = simplePlugin "lua";
};
- inherit (config) plugins;
+ config = configure { inherit availablePlugins; };
+
+ plugins = config.plugins or (builtins.attrValues availablePlugins);
pluginsDir = runCommand "weechat-plugins" {} ''
mkdir -p $out/plugins
@@ -117,13 +125,30 @@ in if configure == null then weechat else
ln -s $plugin $out/plugins
done
'';
- in (writeScriptBin "weechat" ''
- #!${stdenv.shell}
- export WEECHAT_EXTRA_LIBDIR=${pluginsDir}
- ${lib.concatMapStringsSep "\n" (p: lib.optionalString (p ? extraEnv) p.extraEnv) plugins}
- exec ${weechat}/bin/weechat "$@"
- '') // {
- name = weechat.name;
- unwrapped = weechat;
+
+ init = let
+ init = builtins.replaceStrings [ "\n" ] [ ";" ] (config.init or "");
+
+ mkScript = drv: lib.flip map drv.scripts (script: "/script load ${drv}/share/${script}");
+
+ scripts = builtins.concatStringsSep ";" (lib.foldl (scripts: drv: scripts ++ mkScript drv)
+ [ ] (config.scripts or []));
+ 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 ${lib.escapeShellArg init}
+ '') // {
+ inherit (weechat) name meta;
+ unwrapped = weechat;
+ };
+ in buildEnv {
+ name = "weechat-bin-env-${weechat.version}";
+ paths = [
+ (mkWeechat "weechat")
+ (mkWeechat "weechat-headless")
+ ];
meta = weechat.meta;
}
diff --git a/pkgs/applications/networking/irc/weechat/scripts/default.nix b/pkgs/applications/networking/irc/weechat/scripts/default.nix
new file mode 100644
index 000000000000..21038a2fa966
--- /dev/null
+++ b/pkgs/applications/networking/irc/weechat/scripts/default.nix
@@ -0,0 +1,13 @@
+{ callPackage, luaPackages, pythonPackages }:
+
+{
+ weechat-xmpp = callPackage ./weechat-xmpp {
+ inherit (pythonPackages) pydns;
+ };
+
+ weechat-matrix-bridge = callPackage ./weechat-matrix-bridge {
+ inherit (luaPackages) cjson;
+ };
+
+ wee-slack = callPackage ./wee-slack { };
+}
diff --git a/pkgs/applications/networking/irc/weechat/scripts/wee-slack/default.nix b/pkgs/applications/networking/irc/weechat/scripts/wee-slack/default.nix
new file mode 100644
index 000000000000..1b6e52157449
--- /dev/null
+++ b/pkgs/applications/networking/irc/weechat/scripts/wee-slack/default.nix
@@ -0,0 +1,29 @@
+{ stdenv, fetchFromGitHub }:
+
+stdenv.mkDerivation rec {
+ name = "wee-slack-${version}";
+ version = "2.1.1";
+
+ src = fetchFromGitHub {
+ repo = "wee-slack";
+ owner = "wee-slack";
+ rev = "v${version}";
+ sha256 = "05caackz645aw6kljmiihiy7xz9jld8b9blwpmh0cnaihavgj1wc";
+ };
+
+ passthru.scripts = [ "wee_slack.py" ];
+
+ installPhase = ''
+ mkdir -p $out/share
+ cp wee_slack.py $out/share/wee_slack.py
+ '';
+
+ meta = with stdenv.lib; {
+ homepage = https://github.com/wee-slack/wee-slack;
+ license = licenses.mit;
+ maintainers = with maintainers; [ ma27 ];
+ description = ''
+ A WeeChat plugin for Slack.com. Synchronizes read markers, provides typing notification, search, etc..
+ '';
+ };
+}
diff --git a/pkgs/applications/networking/instant-messengers/weechat-matrix-bridge/default.nix b/pkgs/applications/networking/irc/weechat/scripts/weechat-matrix-bridge/default.nix
similarity index 97%
rename from pkgs/applications/networking/instant-messengers/weechat-matrix-bridge/default.nix
rename to pkgs/applications/networking/irc/weechat/scripts/weechat-matrix-bridge/default.nix
index 4a8ffaaa261a..d2960ae93a99 100644
--- a/pkgs/applications/networking/instant-messengers/weechat-matrix-bridge/default.nix
+++ b/pkgs/applications/networking/irc/weechat/scripts/weechat-matrix-bridge/default.nix
@@ -25,6 +25,8 @@ stdenv.mkDerivation {
--replace "__NIX_LIB_PATH__" "$out/lib/?.so"
'';
+ passthru.scripts = [ "matrix.lua" ];
+
installPhase = ''
mkdir -p $out/{share,lib}
diff --git a/pkgs/applications/networking/instant-messengers/weechat-matrix-bridge/library-path.patch b/pkgs/applications/networking/irc/weechat/scripts/weechat-matrix-bridge/library-path.patch
similarity index 100%
rename from pkgs/applications/networking/instant-messengers/weechat-matrix-bridge/library-path.patch
rename to pkgs/applications/networking/irc/weechat/scripts/weechat-matrix-bridge/library-path.patch
diff --git a/pkgs/applications/networking/instant-messengers/weechat-xmpp/default.nix b/pkgs/applications/networking/irc/weechat/scripts/weechat-xmpp/default.nix
similarity index 95%
rename from pkgs/applications/networking/instant-messengers/weechat-xmpp/default.nix
rename to pkgs/applications/networking/irc/weechat/scripts/weechat-xmpp/default.nix
index 4b92d1212c55..dad5b9c5e02a 100644
--- a/pkgs/applications/networking/instant-messengers/weechat-xmpp/default.nix
+++ b/pkgs/applications/networking/irc/weechat/scripts/weechat-xmpp/default.nix
@@ -25,6 +25,8 @@ stdenv.mkDerivation {
})
];
+ passthru.scripts = [ "jabber.py" ];
+
meta = with stdenv.lib; {
description = "A fork of the jabber plugin for weechat";
homepage = "https://github.com/sleduc/weechat-xmpp";
diff --git a/pkgs/applications/networking/instant-messengers/weechat-xmpp/libpath.patch b/pkgs/applications/networking/irc/weechat/scripts/weechat-xmpp/libpath.patch
similarity index 100%
rename from pkgs/applications/networking/instant-messengers/weechat-xmpp/libpath.patch
rename to pkgs/applications/networking/irc/weechat/scripts/weechat-xmpp/libpath.patch
diff --git a/pkgs/applications/networking/p2p/eiskaltdcpp/default.nix b/pkgs/applications/networking/p2p/eiskaltdcpp/default.nix
index 48b2d883849b..db30da82bdb2 100644
--- a/pkgs/applications/networking/p2p/eiskaltdcpp/default.nix
+++ b/pkgs/applications/networking/p2p/eiskaltdcpp/default.nix
@@ -1,5 +1,5 @@
{ stdenv, fetchFromGitHub, cmake, pkgconfig, qt4, boost, bzip2, libX11
-, fetchpatch, pcre-cpp, libidn, lua5, miniupnpc, aspell, gettext }:
+, fetchpatch, libiconv, pcre-cpp, libidn, lua5, miniupnpc, aspell, gettext }:
stdenv.mkDerivation rec {
name = "eiskaltdcpp-${version}";
@@ -12,8 +12,9 @@ stdenv.mkDerivation rec {
sha256 = "1mqz0g69njmlghcra3izarjxbxi1jrhiwn4ww94b8jv8xb9cv682";
};
- nativeBuildInputs = [ pkgconfig ];
- buildInputs = [ cmake qt4 boost bzip2 libX11 pcre-cpp libidn lua5 miniupnpc aspell gettext ];
+ nativeBuildInputs = [ cmake pkgconfig ];
+ buildInputs = [ qt4 boost bzip2 libX11 pcre-cpp libidn lua5 miniupnpc aspell gettext ]
+ ++ stdenv.lib.optional stdenv.isDarwin libiconv;
patches = [
(fetchpatch {
@@ -59,6 +60,6 @@ stdenv.mkDerivation rec {
description = "A cross-platform program that uses the Direct Connect and ADC protocols";
homepage = https://github.com/eiskaltdcpp/eiskaltdcpp;
license = licenses.gpl3Plus;
- platforms = platforms.all;
+ platforms = platforms.linux;
};
}
diff --git a/pkgs/applications/networking/syncthing/default.nix b/pkgs/applications/networking/syncthing/default.nix
index 25d482fd9b06..b7bad13a30d8 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/office/homebank/default.nix b/pkgs/applications/office/homebank/default.nix
index 94e0e46767a0..039e2fc1fde9 100644
--- a/pkgs/applications/office/homebank/default.nix
+++ b/pkgs/applications/office/homebank/default.nix
@@ -2,10 +2,10 @@
, hicolor-icon-theme, libsoup, gnome3 }:
stdenv.mkDerivation rec {
- name = "homebank-5.1.8";
+ name = "homebank-5.2.1";
src = fetchurl {
url = "http://homebank.free.fr/public/${name}.tar.gz";
- sha256 = "0fzjmwz2pgi0nw49xljp1za3vp67kjh88gf688d9ig4wc2ygr0qh";
+ sha256 = "0i3pb4v4fs98xd6d4x2gjvhqrsrjvssaws3nkpjia4fagd4dvqbz";
};
nativeBuildInputs = [ pkgconfig wrapGAppsHook ];
diff --git a/pkgs/applications/science/astronomy/gildas/default.nix b/pkgs/applications/science/astronomy/gildas/default.nix
index ee19077065e0..82575d9c6ff0 100644
--- a/pkgs/applications/science/astronomy/gildas/default.nix
+++ b/pkgs/applications/science/astronomy/gildas/default.nix
@@ -12,7 +12,10 @@ stdenv.mkDerivation rec {
name = "gildas-${version}";
src = fetchurl {
- url = "http://www.iram.fr/~gildas/dist/gildas-src-${srcVersion}.tar.gz";
+ # For each new release, the upstream developers of Gildas move the
+ # source code of the previous release to a different directory
+ urls = [ "http://www.iram.fr/~gildas/dist/gildas-src-${srcVersion}.tar.gz"
+ "http://www.iram.fr/~gildas/dist/archive/gildas/gildas-src-${srcVersion}.tar.gz" ];
sha256 = "0mg3wijrj8x1p912vkgrhxbypjx7aj9b1492yxvq2y3fxban6bj1";
};
@@ -22,7 +25,9 @@ stdenv.mkDerivation rec {
buildInputs = [ gtk2-x11 lesstif cfitsio python27Env ];
- patches = [ ./wrapper.patch ./return-error-code.patch ./clang.patch ./aarch64.patch ];
+ patches = [ ./wrapper.patch ./return-error-code.patch ./clang.patch ./aarch64.patch ./gag-font-bin-rule.patch ];
+
+ NIX_CFLAGS_COMPILE = stdenv.lib.optionalString stdenv.cc.isClang "-Wno-unused-command-line-argument";
configurePhase=''
substituteInPlace admin/wrapper.sh --replace '%%OUT%%' $out
diff --git a/pkgs/applications/science/astronomy/gildas/gag-font-bin-rule.patch b/pkgs/applications/science/astronomy/gildas/gag-font-bin-rule.patch
new file mode 100644
index 000000000000..61ddc37c7fd4
--- /dev/null
+++ b/pkgs/applications/science/astronomy/gildas/gag-font-bin-rule.patch
@@ -0,0 +1,13 @@
+diff -ruN gildas-src-aug18a/kernel/etc/Makefile gildas-src-aug18a.gag-font-bin-rule/kernel/etc/Makefile
+--- gildas-src-aug18a/kernel/etc/Makefile 2016-09-09 09:39:37.000000000 +0200
++++ gildas-src-aug18a.gag-font-bin-rule/kernel/etc/Makefile 2018-09-04 12:03:11.000000000 +0200
+@@ -29,7 +29,8 @@
+
+ SEDEXE=sed -e 's?source tree?executable tree?g'
+
+-$(datadir)/gag-font.bin: hershey-font.dat $(bindir)/hershey
++$(datadir)/gag-font.bin: hershey-font.dat $(bindir)/hershey \
++ $(gagintdir)/etc/gag.dico.gbl $(gagintdir)/etc/gag.dico.lcl
+ ifeq ($(GAG_ENV_KIND)-$(GAG_TARGET_KIND),cygwin-mingw)
+ $(bindir)/hershey `cygpath -w $(datadir)`/gag-font.bin
+ else
diff --git a/pkgs/applications/science/logic/tamarin-prover/default.nix b/pkgs/applications/science/logic/tamarin-prover/default.nix
index 4efc384ed227..9056eab71ea3 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 000000000000..f93919faf54e
--- /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 000000000000..f7393e37f1b2
--- /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 000000000000..d6cd6d73f99e
--- /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/mxnet/default.nix b/pkgs/applications/science/math/mxnet/default.nix
index ce9c214b3f0c..990d3f1a5d59 100644
--- a/pkgs/applications/science/math/mxnet/default.nix
+++ b/pkgs/applications/science/math/mxnet/default.nix
@@ -1,5 +1,5 @@
-{ stdenv, lib, fetchgit, cmake
-, opencv, gtest, openblas, liblapack
+{ stdenv, lib, fetchurl, bash, cmake
+, opencv, gtest, openblas, liblapack, perl
, cudaSupport ? false, cudatoolkit, nvidia_x11
, cudnnSupport ? false, cudnn
}:
@@ -8,16 +8,17 @@ assert cudnnSupport -> cudaSupport;
stdenv.mkDerivation rec {
name = "mxnet-${version}";
- version = "1.1.0";
+ version = "1.2.1";
- # Submodules needed
- src = fetchgit {
- url = "https://github.com/apache/incubator-mxnet";
- rev = "refs/tags/${version}";
- sha256 = "1qgns0c70a1gfyil96h17ms736nwdkp9kv496gvs9pkzqzvr6cpz";
+ # Fetching from git does not work at the time (1.2.1) due to an
+ # incorrect hash in one of the submodules. The provided tarballs
+ # contain all necessary sources.
+ src = fetchurl {
+ url = "https://github.com/apache/incubator-mxnet/releases/download/${version}/apache-mxnet-src-${version}-incubating.tar.gz";
+ sha256 = "053zbdgs4j8l79ipdz461zc7wyfbfcflmi5bw7lj2q08zm1glnb2";
};
- nativeBuildInputs = [ cmake ];
+ nativeBuildInputs = [ cmake perl ];
buildInputs = [ opencv gtest openblas liblapack ]
++ lib.optionals cudaSupport [ cudatoolkit nvidia_x11 ]
@@ -30,9 +31,17 @@ stdenv.mkDerivation rec {
] else [ "-DUSE_CUDA=OFF" ])
++ lib.optional (!cudnnSupport) "-DUSE_CUDNN=OFF";
- installPhase = ''
- install -Dm755 libmxnet.so $out/lib/libmxnet.so
- cp -r ../include $out
+ postPatch = ''
+ substituteInPlace 3rdparty/mkldnn/tests/CMakeLists.txt \
+ --replace "/bin/bash" "${bash}/bin/bash"
+
+ # Build against the system version of OpenMP.
+ # https://github.com/apache/incubator-mxnet/pull/12160
+ rm -rf 3rdparty/openmp
+ '';
+
+ postInstall = ''
+ rm "$out"/lib/*.a
'';
enableParallelBuilding = true;
diff --git a/pkgs/applications/science/math/sage/patches/numpy-1.14.3.patch b/pkgs/applications/science/math/sage/patches/numpy-1.15.1.patch
similarity index 78%
rename from pkgs/applications/science/math/sage/patches/numpy-1.14.3.patch
rename to pkgs/applications/science/math/sage/patches/numpy-1.15.1.patch
index 5927bc116096..9e855ba4ad94 100644
--- a/pkgs/applications/science/math/sage/patches/numpy-1.14.3.patch
+++ b/pkgs/applications/science/math/sage/patches/numpy-1.15.1.patch
@@ -1,5 +1,5 @@
diff --git a/src/doc/en/faq/faq-usage.rst b/src/doc/en/faq/faq-usage.rst
-index 79b4205fd3..9a89bd2136 100644
+index 2347a1190d..f5b0fe71a4 100644
--- a/src/doc/en/faq/faq-usage.rst
+++ b/src/doc/en/faq/faq-usage.rst
@@ -338,7 +338,7 @@ ints. For example::
@@ -174,7 +174,7 @@ index 5b89cd75ee..e50b2ea5d4 100644
This creates a random 5x5 matrix ``A``, and solves `Ax=b` where
``b=[0.0,1.0,2.0,3.0,4.0]``. There are many other routines in the :mod:`numpy.linalg`
diff --git a/src/sage/calculus/riemann.pyx b/src/sage/calculus/riemann.pyx
-index df85cce43d..34ea164be0 100644
+index 60f37f7557..4ac3dedf1d 100644
--- a/src/sage/calculus/riemann.pyx
+++ b/src/sage/calculus/riemann.pyx
@@ -1191,30 +1191,30 @@ cpdef complex_to_spiderweb(np.ndarray[COMPLEX_T, ndim = 2] z_values,
@@ -248,7 +248,7 @@ index df85cce43d..34ea164be0 100644
TESTS::
diff --git a/src/sage/combinat/fully_packed_loop.py b/src/sage/combinat/fully_packed_loop.py
-index 61b1003002..4baee9cbbd 100644
+index 0a9bd61267..d2193cc2d6 100644
--- a/src/sage/combinat/fully_packed_loop.py
+++ b/src/sage/combinat/fully_packed_loop.py
@@ -72,11 +72,11 @@ def _make_color_list(n, colors=None, color_map=None, randomize=False):
@@ -269,10 +269,10 @@ index 61b1003002..4baee9cbbd 100644
['blue', 'blue', 'red', 'blue', 'red', 'red', 'red', 'blue']
"""
diff --git a/src/sage/finance/time_series.pyx b/src/sage/finance/time_series.pyx
-index c37700d14e..49b7298d0b 100644
+index 28779365df..3ab0282861 100644
--- a/src/sage/finance/time_series.pyx
+++ b/src/sage/finance/time_series.pyx
-@@ -109,8 +109,8 @@ cdef class TimeSeries:
+@@ -111,8 +111,8 @@ cdef class TimeSeries:
sage: import numpy
sage: v = numpy.array([[1,2], [3,4]], dtype=float); v
@@ -283,7 +283,7 @@ index c37700d14e..49b7298d0b 100644
sage: finance.TimeSeries(v)
[1.0000, 2.0000, 3.0000, 4.0000]
sage: finance.TimeSeries(v[:,0])
-@@ -2098,14 +2098,14 @@ cdef class TimeSeries:
+@@ -2100,14 +2100,14 @@ cdef class TimeSeries:
sage: w[0] = 20
sage: w
@@ -301,7 +301,7 @@ index c37700d14e..49b7298d0b 100644
sage: v
[20.0000, -3.0000, 4.5000, -2.0000]
diff --git a/src/sage/functions/hyperbolic.py b/src/sage/functions/hyperbolic.py
-index 931a4b41e4..bf33fc483d 100644
+index aff552f450..7a6df931e7 100644
--- a/src/sage/functions/hyperbolic.py
+++ b/src/sage/functions/hyperbolic.py
@@ -214,7 +214,7 @@ class Function_coth(GinacFunction):
@@ -341,7 +341,7 @@ index 931a4b41e4..bf33fc483d 100644
return arctanh(1.0 / x)
diff --git a/src/sage/functions/orthogonal_polys.py b/src/sage/functions/orthogonal_polys.py
-index 017c85a96f..33fbb499c5 100644
+index ed6365bef4..99b8b04dad 100644
--- a/src/sage/functions/orthogonal_polys.py
+++ b/src/sage/functions/orthogonal_polys.py
@@ -810,12 +810,12 @@ class Func_chebyshev_T(ChebyshevFunction):
@@ -379,10 +379,10 @@ index 017c85a96f..33fbb499c5 100644
array([ 0.2 , -0.96])
"""
diff --git a/src/sage/functions/other.py b/src/sage/functions/other.py
-index 679384c907..d63b295a4c 100644
+index 1883daa3e6..9885222817 100644
--- a/src/sage/functions/other.py
+++ b/src/sage/functions/other.py
-@@ -390,7 +390,7 @@ class Function_ceil(BuiltinFunction):
+@@ -389,7 +389,7 @@ class Function_ceil(BuiltinFunction):
sage: import numpy
sage: a = numpy.linspace(0,2,6)
sage: ceil(a)
@@ -391,7 +391,7 @@ index 679384c907..d63b295a4c 100644
Test pickling::
-@@ -539,7 +539,7 @@ class Function_floor(BuiltinFunction):
+@@ -553,7 +553,7 @@ class Function_floor(BuiltinFunction):
sage: import numpy
sage: a = numpy.linspace(0,2,6)
sage: floor(a)
@@ -400,7 +400,7 @@ index 679384c907..d63b295a4c 100644
sage: floor(x)._sympy_()
floor(x)
-@@ -840,7 +840,7 @@ def sqrt(x, *args, **kwds):
+@@ -869,7 +869,7 @@ def sqrt(x, *args, **kwds):
sage: import numpy
sage: a = numpy.arange(2,5)
sage: sqrt(a)
@@ -409,11 +409,35 @@ index 679384c907..d63b295a4c 100644
"""
if isinstance(x, float):
return math.sqrt(x)
+diff --git a/src/sage/functions/spike_function.py b/src/sage/functions/spike_function.py
+index 1e021de3fe..56635ca98f 100644
+--- a/src/sage/functions/spike_function.py
++++ b/src/sage/functions/spike_function.py
+@@ -157,7 +157,7 @@ class SpikeFunction:
+ sage: S = spike_function([(-3,4),(-1,1),(2,3)]); S
+ A spike function with spikes at [-3.0, -1.0, 2.0]
+ sage: P = S.plot_fft_abs(8)
+- sage: p = P[0]; p.ydata
++ sage: p = P[0]; p.ydata # abs tol 1e-8
+ [5.0, 5.0, 3.367958691924177, 3.367958691924177, 4.123105625617661, 4.123105625617661, 4.759921664218055, 4.759921664218055]
+ """
+ w = self.vector(samples = samples, xmin=xmin, xmax=xmax)
+@@ -176,8 +176,8 @@ class SpikeFunction:
+ sage: S = spike_function([(-3,4),(-1,1),(2,3)]); S
+ A spike function with spikes at [-3.0, -1.0, 2.0]
+ sage: P = S.plot_fft_arg(8)
+- sage: p = P[0]; p.ydata
+- [0.0, 0.0, -0.211524990023434..., -0.211524990023434..., 0.244978663126864..., 0.244978663126864..., -0.149106180027477..., -0.149106180027477...]
++ sage: p = P[0]; p.ydata # abs tol 1e-8
++ [0.0, 0.0, -0.211524990023434, -0.211524990023434, 0.244978663126864, 0.244978663126864, -0.149106180027477, -0.149106180027477]
+ """
+ w = self.vector(samples = samples, xmin=xmin, xmax=xmax)
+ xmin, xmax = self._ranges(xmin, xmax)
diff --git a/src/sage/functions/trig.py b/src/sage/functions/trig.py
-index e7e7a311cd..e7ff78a9de 100644
+index 501e7ff6b6..5f760912f0 100644
--- a/src/sage/functions/trig.py
+++ b/src/sage/functions/trig.py
-@@ -731,7 +731,7 @@ class Function_arccot(GinacFunction):
+@@ -724,7 +724,7 @@ class Function_arccot(GinacFunction):
sage: import numpy
sage: a = numpy.arange(2, 5)
sage: arccot(a)
@@ -422,7 +446,7 @@ index e7e7a311cd..e7ff78a9de 100644
"""
return math.pi/2 - arctan(x)
-@@ -787,7 +787,7 @@ class Function_arccsc(GinacFunction):
+@@ -780,7 +780,7 @@ class Function_arccsc(GinacFunction):
sage: import numpy
sage: a = numpy.arange(2, 5)
sage: arccsc(a)
@@ -431,7 +455,7 @@ index e7e7a311cd..e7ff78a9de 100644
"""
return arcsin(1.0/x)
-@@ -845,7 +845,7 @@ class Function_arcsec(GinacFunction):
+@@ -838,7 +838,7 @@ class Function_arcsec(GinacFunction):
sage: import numpy
sage: a = numpy.arange(2, 5)
sage: arcsec(a)
@@ -440,7 +464,7 @@ index e7e7a311cd..e7ff78a9de 100644
"""
return arccos(1.0/x)
-@@ -920,13 +920,13 @@ class Function_arctan2(GinacFunction):
+@@ -913,13 +913,13 @@ class Function_arctan2(GinacFunction):
sage: a = numpy.linspace(1, 3, 3)
sage: b = numpy.linspace(3, 6, 3)
sage: atan2(a, b)
@@ -458,10 +482,10 @@ index e7e7a311cd..e7ff78a9de 100644
TESTS::
diff --git a/src/sage/matrix/constructor.pyx b/src/sage/matrix/constructor.pyx
-index 19a1d37df0..5780dfae1c 100644
+index 12136f1773..491bf22e62 100644
--- a/src/sage/matrix/constructor.pyx
+++ b/src/sage/matrix/constructor.pyx
-@@ -494,8 +494,8 @@ class MatrixFactory(object):
+@@ -503,8 +503,8 @@ def matrix(*args, **kwds):
[7 8 9]
Full MatrixSpace of 3 by 3 dense matrices over Integer Ring
sage: n = matrix(QQ, 2, 2, [1, 1/2, 1/3, 1/4]).numpy(); n
@@ -473,10 +497,31 @@ index 19a1d37df0..5780dfae1c 100644
[ 1 1/2]
[1/3 1/4]
diff --git a/src/sage/matrix/matrix_double_dense.pyx b/src/sage/matrix/matrix_double_dense.pyx
-index 48e0a8a97f..1be5d35b19 100644
+index 66e54a79a4..0498334f4b 100644
--- a/src/sage/matrix/matrix_double_dense.pyx
+++ b/src/sage/matrix/matrix_double_dense.pyx
-@@ -2546,7 +2546,7 @@ cdef class Matrix_double_dense(Matrix_dense):
+@@ -606,6 +606,9 @@ cdef class Matrix_double_dense(Matrix_dense):
+ [ 3.0 + 9.0*I 4.0 + 16.0*I 5.0 + 25.0*I]
+ [6.0 + 36.0*I 7.0 + 49.0*I 8.0 + 64.0*I]
+ sage: B.condition()
++ doctest:warning
++ ...
++ ComplexWarning: Casting complex values to real discards the imaginary part
+ 203.851798...
+ sage: B.condition(p='frob')
+ 203.851798...
+@@ -654,9 +657,7 @@ cdef class Matrix_double_dense(Matrix_dense):
+ True
+ sage: B = A.change_ring(CDF)
+ sage: B.condition()
+- Traceback (most recent call last):
+- ...
+- LinAlgError: Singular matrix
++ +Infinity
+
+ Improper values of ``p`` are caught. ::
+
+@@ -2519,7 +2520,7 @@ cdef class Matrix_double_dense(Matrix_dense):
sage: P.is_unitary(algorithm='orthonormal')
Traceback (most recent call last):
...
@@ -485,7 +530,7 @@ index 48e0a8a97f..1be5d35b19 100644
TESTS::
-@@ -3662,8 +3662,8 @@ cdef class Matrix_double_dense(Matrix_dense):
+@@ -3635,8 +3636,8 @@ cdef class Matrix_double_dense(Matrix_dense):
[0.0 1.0 2.0]
[3.0 4.0 5.0]
sage: m.numpy()
@@ -496,7 +541,7 @@ index 48e0a8a97f..1be5d35b19 100644
Alternatively, numpy automatically calls this function (via
the magic :meth:`__array__` method) to convert Sage matrices
-@@ -3674,16 +3674,16 @@ cdef class Matrix_double_dense(Matrix_dense):
+@@ -3647,16 +3648,16 @@ cdef class Matrix_double_dense(Matrix_dense):
[0.0 1.0 2.0]
[3.0 4.0 5.0]
sage: numpy.array(m)
@@ -518,10 +563,10 @@ index 48e0a8a97f..1be5d35b19 100644
dtype('complex128')
diff --git a/src/sage/matrix/special.py b/src/sage/matrix/special.py
-index c698ba5e97..b743bab354 100644
+index ccbd208810..c3f9a65093 100644
--- a/src/sage/matrix/special.py
+++ b/src/sage/matrix/special.py
-@@ -705,7 +705,7 @@ def diagonal_matrix(arg0=None, arg1=None, arg2=None, sparse=True):
+@@ -706,7 +706,7 @@ def diagonal_matrix(arg0=None, arg1=None, arg2=None, sparse=True):
sage: import numpy
sage: entries = numpy.array([1.2, 5.6]); entries
@@ -530,7 +575,7 @@ index c698ba5e97..b743bab354 100644
sage: A = diagonal_matrix(3, entries); A
[1.2 0.0 0.0]
[0.0 5.6 0.0]
-@@ -715,7 +715,7 @@ def diagonal_matrix(arg0=None, arg1=None, arg2=None, sparse=True):
+@@ -716,7 +716,7 @@ def diagonal_matrix(arg0=None, arg1=None, arg2=None, sparse=True):
sage: j = numpy.complex(0,1)
sage: entries = numpy.array([2.0+j, 8.1, 3.4+2.6*j]); entries
@@ -540,10 +585,10 @@ index c698ba5e97..b743bab354 100644
[2.0 + 1.0*I 0.0 0.0]
[ 0.0 8.1 0.0]
diff --git a/src/sage/modules/free_module_element.pyx b/src/sage/modules/free_module_element.pyx
-index 230f142117..2ab1c0ae68 100644
+index 37d92c1282..955d083b34 100644
--- a/src/sage/modules/free_module_element.pyx
+++ b/src/sage/modules/free_module_element.pyx
-@@ -982,7 +982,7 @@ cdef class FreeModuleElement(Vector): # abstract base class
+@@ -988,7 +988,7 @@ cdef class FreeModuleElement(Vector): # abstract base class
sage: v.numpy()
array([1, 2, 5/6], dtype=object)
sage: v.numpy(dtype=float)
@@ -552,7 +597,7 @@ index 230f142117..2ab1c0ae68 100644
sage: v.numpy(dtype=int)
array([1, 2, 0])
sage: import numpy
-@@ -993,7 +993,7 @@ cdef class FreeModuleElement(Vector): # abstract base class
+@@ -999,7 +999,7 @@ cdef class FreeModuleElement(Vector): # abstract base class
be more efficient but may have unintended consequences::
sage: v.numpy(dtype=None)
@@ -596,22 +641,6 @@ index 39fc2970de..2badf98284 100644
"""
if dtype is None or dtype is self._vector_numpy.dtype:
from copy import copy
-diff --git a/src/sage/numerical/optimize.py b/src/sage/numerical/optimize.py
-index 17b5ebb84b..92ce35c502 100644
---- a/src/sage/numerical/optimize.py
-+++ b/src/sage/numerical/optimize.py
-@@ -486,9 +486,9 @@ def minimize_constrained(func,cons,x0,gradient=None,algorithm='default', **args)
- else:
- min = optimize.fmin_tnc(f, x0, approx_grad=True, bounds=cons, messages=0, **args)[0]
- elif isinstance(cons[0], function_type) or isinstance(cons[0], Expression):
-- min = optimize.fmin_cobyla(f, x0, cons, iprint=0, **args)
-+ min = optimize.fmin_cobyla(f, x0, cons, disp=0, **args)
- elif isinstance(cons, function_type) or isinstance(cons, Expression):
-- min = optimize.fmin_cobyla(f, x0, cons, iprint=0, **args)
-+ min = optimize.fmin_cobyla(f, x0, cons, disp=0, **args)
- return vector(RDF, min)
-
-
diff --git a/src/sage/plot/complex_plot.pyx b/src/sage/plot/complex_plot.pyx
index ad9693da62..758fb709b7 100644
--- a/src/sage/plot/complex_plot.pyx
@@ -649,6 +678,76 @@ index ad9693da62..758fb709b7 100644
"""
import numpy
cdef unsigned int i, j, imax, jmax
+diff --git a/src/sage/plot/histogram.py b/src/sage/plot/histogram.py
+index 5d28473731..fc4b2046c0 100644
+--- a/src/sage/plot/histogram.py
++++ b/src/sage/plot/histogram.py
+@@ -53,10 +53,17 @@ class Histogram(GraphicPrimitive):
+ """
+ import numpy as np
+ self.datalist=np.asarray(datalist,dtype=float)
++ if 'normed' in options:
++ from sage.misc.superseded import deprecation
++ deprecation(25260, "the 'normed' option is deprecated. Use 'density' instead.")
+ if 'linestyle' in options:
+ from sage.plot.misc import get_matplotlib_linestyle
+ options['linestyle'] = get_matplotlib_linestyle(
+ options['linestyle'], return_type='long')
++ if options.get('range', None):
++ # numpy.histogram performs type checks on "range" so this must be
++ # actual floats
++ options['range'] = [float(x) for x in options['range']]
+ GraphicPrimitive.__init__(self, options)
+
+ def get_minmax_data(self):
+@@ -80,10 +87,14 @@ class Histogram(GraphicPrimitive):
+ {'xmax': 4.0, 'xmin': 0, 'ymax': 2, 'ymin': 0}
+
+ TESTS::
+-
+ sage: h = histogram([10,3,5], normed=True)[0]
+- sage: h.get_minmax_data() # rel tol 1e-15
+- {'xmax': 10.0, 'xmin': 3.0, 'ymax': 0.4761904761904765, 'ymin': 0}
++ doctest:warning...:
++ DeprecationWarning: the 'normed' option is deprecated. Use 'density' instead.
++ See https://trac.sagemath.org/25260 for details.
++ sage: h.get_minmax_data()
++ doctest:warning ...:
++ VisibleDeprecationWarning: Passing `normed=True` on non-uniform bins has always been broken, and computes neither the probability density function nor the probability mass function. The result is only correct if the bins are uniform, when density=True will produce the same result anyway. The argument will be removed in a future version of numpy.
++ {'xmax': 10.0, 'xmin': 3.0, 'ymax': 0.476190476190..., 'ymin': 0}
+ """
+ import numpy
+
+@@ -152,7 +163,7 @@ class Histogram(GraphicPrimitive):
+ 'rwidth': 'The relative width of the bars as a fraction of the bin width',
+ 'cumulative': '(True or False) If True, then a histogram is computed in which each bin gives the counts in that bin plus all bins for smaller values. Negative values give a reversed direction of accumulation.',
+ 'range': 'A list [min, max] which define the range of the histogram. Values outside of this range are treated as outliers and omitted from counts.',
+- 'normed': 'Deprecated alias for density',
++ 'normed': 'Deprecated. Use density instead.',
+ 'density': '(True or False) If True, the counts are normalized to form a probability density. (n/(len(x)*dbin)',
+ 'weights': 'A sequence of weights the same length as the data list. If supplied, then each value contributes its associated weight to the bin count.',
+ 'stacked': '(True or False) If True, multiple data are stacked on top of each other.',
+@@ -199,7 +210,7 @@ class Histogram(GraphicPrimitive):
+ subplot.hist(self.datalist.transpose(), **options)
+
+
+-@options(aspect_ratio='automatic',align='mid', weights=None, range=None, bins=10, edgecolor='black')
++@options(aspect_ratio='automatic', align='mid', weights=None, range=None, bins=10, edgecolor='black')
+ def histogram(datalist, **options):
+ """
+ Computes and draws the histogram for list(s) of numerical data.
+@@ -231,8 +242,9 @@ def histogram(datalist, **options):
+ - ``linewidth`` -- (float) width of the lines defining the bars
+ - ``linestyle`` -- (default: 'solid') Style of the line. One of 'solid'
+ or '-', 'dashed' or '--', 'dotted' or ':', 'dashdot' or '-.'
+- - ``density`` -- (boolean - default: False) If True, the counts are
+- normalized to form a probability density.
++ - ``density`` -- (boolean - default: False) If True, the result is the
++ value of the probability density function at the bin, normalized such
++ that the integral over the range is 1.
+ - ``range`` -- A list [min, max] which define the range of the
+ histogram. Values outside of this range are treated as outliers and
+ omitted from counts
diff --git a/src/sage/plot/line.py b/src/sage/plot/line.py
index 23f5e61446..3b1b51d7cf 100644
--- a/src/sage/plot/line.py
@@ -718,7 +817,7 @@ index f3da57c370..3806f4b32f 100644
TESTS:
diff --git a/src/sage/probability/probability_distribution.pyx b/src/sage/probability/probability_distribution.pyx
-index f66cd898b9..35995886d5 100644
+index 1b119e323f..3290b00695 100644
--- a/src/sage/probability/probability_distribution.pyx
+++ b/src/sage/probability/probability_distribution.pyx
@@ -130,7 +130,17 @@ cdef class ProbabilityDistribution:
@@ -741,10 +840,10 @@ index f66cd898b9..35995886d5 100644
import pylab
l = [float(self.get_random_element()) for _ in range(num_samples)]
diff --git a/src/sage/rings/rational.pyx b/src/sage/rings/rational.pyx
-index a0bfe080f5..7d95e7a1a8 100644
+index 12ca1b222b..9bad7dae0c 100644
--- a/src/sage/rings/rational.pyx
+++ b/src/sage/rings/rational.pyx
-@@ -1056,7 +1056,7 @@ cdef class Rational(sage.structure.element.FieldElement):
+@@ -1041,7 +1041,7 @@ cdef class Rational(sage.structure.element.FieldElement):
dtype('O')
sage: numpy.array([1, 1/2, 3/4])
@@ -754,10 +853,10 @@ index a0bfe080f5..7d95e7a1a8 100644
if mpz_cmp_ui(mpq_denref(self.value), 1) == 0:
if mpz_fits_slong_p(mpq_numref(self.value)):
diff --git a/src/sage/rings/real_mpfr.pyx b/src/sage/rings/real_mpfr.pyx
-index 4c630867a4..64e2187f5b 100644
+index 9b90c8833e..1ce05b937d 100644
--- a/src/sage/rings/real_mpfr.pyx
+++ b/src/sage/rings/real_mpfr.pyx
-@@ -1438,7 +1438,7 @@ cdef class RealNumber(sage.structure.element.RingElement):
+@@ -1439,7 +1439,7 @@ cdef class RealNumber(sage.structure.element.RingElement):
sage: import numpy
sage: numpy.arange(10.0)
@@ -767,10 +866,10 @@ index 4c630867a4..64e2187f5b 100644
dtype('float64')
sage: numpy.array([1.000000000000000000000000000000000000]).dtype
diff --git a/src/sage/schemes/elliptic_curves/height.py b/src/sage/schemes/elliptic_curves/height.py
-index 3d270ebf9d..1144f168e3 100644
+index de31fe9883..7a33ea6f5b 100644
--- a/src/sage/schemes/elliptic_curves/height.py
+++ b/src/sage/schemes/elliptic_curves/height.py
-@@ -1623,18 +1623,18 @@ class EllipticCurveCanonicalHeight:
+@@ -1627,18 +1627,18 @@ class EllipticCurveCanonicalHeight:
even::
sage: H.wp_on_grid(v,4)
@@ -798,10 +897,10 @@ index 3d270ebf9d..1144f168e3 100644
tau = self.tau(v)
fk, err = self.fk_intervals(v, 15, CDF)
diff --git a/src/sage/symbolic/ring.pyx b/src/sage/symbolic/ring.pyx
-index 2dcb0492b9..2b1a06385c 100644
+index 9da38002e8..d61e74bf82 100644
--- a/src/sage/symbolic/ring.pyx
+++ b/src/sage/symbolic/ring.pyx
-@@ -1135,7 +1135,7 @@ cdef class NumpyToSRMorphism(Morphism):
+@@ -1136,7 +1136,7 @@ cdef class NumpyToSRMorphism(Morphism):
sage: cos(numpy.int('2'))
cos(2)
sage: numpy.cos(numpy.int('2'))
diff --git a/pkgs/applications/science/math/sage/sage-src.nix b/pkgs/applications/science/math/sage/sage-src.nix
index 7fd49fe205cc..f74da33f4026 100644
--- a/pkgs/applications/science/math/sage/sage-src.nix
+++ b/pkgs/applications/science/math/sage/sage-src.nix
@@ -94,9 +94,20 @@ stdenv.mkDerivation rec {
stripLen = 1;
})
- # Only formatting changes.
+ (fetchpatch {
+ name = "matplotlib-2.2.2";
+ url = "https://git.sagemath.org/sage.git/patch?id=0d6244ed53b71aba861ce3d683d33e542c0bf0b0";
+ sha256 = "15x4cadxxlsdfh2sblgagqjj6ir13fgdzixxnwnvzln60saahb34";
+ })
+
+ (fetchpatch {
+ name = "scipy-1.1.0";
+ url = "https://git.sagemath.org/sage.git/patch?id=e0db968a51678b34ebd8d34906c7042900272378";
+ sha256 = "0kq5zxqphhrmavrmg830wdr7hwp1bkzdqlf3jfqfr8r8xq12qwf7";
+ })
+
# https://trac.sagemath.org/ticket/25260
- ./patches/numpy-1.14.3.patch
+ ./patches/numpy-1.15.1.patch
# https://trac.sagemath.org/ticket/25862
./patches/eclib-20180710.patch
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 3fb227909040..5bfd74344e8c 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/default.nix b/pkgs/applications/version-management/git-and-tools/default.nix
index 2093c86b050c..10c3d3391d60 100644
--- a/pkgs/applications/version-management/git-and-tools/default.nix
+++ b/pkgs/applications/version-management/git-and-tools/default.nix
@@ -4,7 +4,6 @@
args @ {config, lib, pkgs}: with args; with pkgs;
let
gitBase = callPackage ./git {
- texinfo = texinfo5;
svnSupport = false; # for git-svn support
guiSupport = false; # requires tcl/tk
sendEmailSupport = false; # requires plenty of perl libraries
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 cfb028004c70..3b4e3a452111 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/tig/default.nix b/pkgs/applications/version-management/git-and-tools/tig/default.nix
index 6d2753e45437..a407f6e7ab12 100644
--- a/pkgs/applications/version-management/git-and-tools/tig/default.nix
+++ b/pkgs/applications/version-management/git-and-tools/tig/default.nix
@@ -31,6 +31,10 @@ stdenv.mkDerivation rec {
installPhase = ''
make install
make install-doc
+
+ substituteInPlace contrib/tig-completion.zsh \
+ --replace 'e=$(dirname ''${funcsourcetrace[1]%:*})/tig-completion.bash' "e=$out/etc/bash_completion.d/tig-completion.bash"
+
install -D contrib/tig-completion.bash $out/etc/bash_completion.d/tig-completion.bash
install -D contrib/tig-completion.zsh $out/share/zsh/site-functions/_tig
cp contrib/vim.tigrc $out/etc/
diff --git a/pkgs/applications/version-management/gitea/default.nix b/pkgs/applications/version-management/gitea/default.nix
index 592b348d03fd..c6eb563155f6 100644
--- a/pkgs/applications/version-management/gitea/default.nix
+++ b/pkgs/applications/version-management/gitea/default.nix
@@ -7,13 +7,13 @@ with stdenv.lib;
buildGoPackage rec {
name = "gitea-${version}";
- version = "1.5.0";
+ version = "1.5.1";
src = fetchFromGitHub {
owner = "go-gitea";
repo = "gitea";
rev = "v${version}";
- sha256 = "0gp777x8yjbqvz9i79qv3bn3hrlp1bn7ib57r7w5a7jmr9rd0nca";
+ sha256 = "06h6v9py35mm0xk9l8xrq02vvr5vzl15gfbw9qqvpn8kiamkn53r";
};
patches = [ ./static-root-path.patch ];
diff --git a/pkgs/applications/version-management/gitlab/default.nix b/pkgs/applications/version-management/gitlab/default.nix
index 90d16d846608..64e0ef2b59d0 100644
--- a/pkgs/applications/version-management/gitlab/default.nix
+++ b/pkgs/applications/version-management/gitlab/default.nix
@@ -109,5 +109,6 @@ stdenv.mkDerivation rec {
description = "Web-based Git-repository manager";
homepage = https://gitlab.com;
license = licenses.mit;
+ platforms = platforms.linux;
};
}
diff --git a/pkgs/applications/video/kodi/default.nix b/pkgs/applications/video/kodi/default.nix
index 5ca678a2e175..454665455c51 100644
--- a/pkgs/applications/video/kodi/default.nix
+++ b/pkgs/applications/video/kodi/default.nix
@@ -189,7 +189,7 @@ in stdenv.mkDerivation rec {
wrapProgram $out/bin/$p \
--prefix PATH ":" "${lib.makeBinPath [ python2 glxinfo xdpyinfo ]}" \
--prefix LD_LIBRARY_PATH ":" "${lib.makeLibraryPath
- [ curl systemd libmad libvdpau libcec libcec_platform rtmpdump libass ]}"
+ ([ curl systemd libmad libvdpau libcec libcec_platform rtmpdump libass ] ++ lib.optional nfsSupport libnfs)}"
done
substituteInPlace $out/share/xsessions/kodi.desktop \
diff --git a/pkgs/applications/virtualization/OVMF/default.nix b/pkgs/applications/virtualization/OVMF/default.nix
index ee4ea4346e4a..c858f4c4d6d3 100644
--- a/pkgs/applications/virtualization/OVMF/default.nix
+++ b/pkgs/applications/virtualization/OVMF/default.nix
@@ -85,7 +85,7 @@ stdenv.mkDerivation (edk2.setup projectDscPath {
meta = {
description = "Sample UEFI firmware for QEMU and KVM";
- homepage = https://sourceforge.net/apps/mediawiki/tianocore/index.php?title=OVMF;
+ homepage = https://github.com/tianocore/tianocore.github.io/wiki/OVMF;
license = stdenv.lib.licenses.bsd2;
platforms = ["x86_64-linux" "i686-linux" "aarch64-linux"];
};
diff --git a/pkgs/applications/virtualization/docker/proxy.nix b/pkgs/applications/virtualization/docker/proxy.nix
index 651631b478fc..8b7021f7dbb8 100644
--- a/pkgs/applications/virtualization/docker/proxy.nix
+++ b/pkgs/applications/virtualization/docker/proxy.nix
@@ -24,6 +24,6 @@ buildGoPackage rec {
license = licenses.asl20;
homepage = https://github.com/docker/libnetwork;
maintainers = with maintainers; [vdemeester];
- platforms = docker.meta.platforms;
+ platforms = platforms.linux;
};
}
diff --git a/pkgs/applications/virtualization/open-vm-tools/default.nix b/pkgs/applications/virtualization/open-vm-tools/default.nix
index e42c1d5dd1e4..49df39040db3 100644
--- a/pkgs/applications/virtualization/open-vm-tools/default.nix
+++ b/pkgs/applications/virtualization/open-vm-tools/default.nix
@@ -6,13 +6,13 @@
stdenv.mkDerivation rec {
name = "open-vm-tools-${version}";
- version = "10.1.10";
+ version = "10.3.0";
src = fetchFromGitHub {
owner = "vmware";
repo = "open-vm-tools";
rev = "stable-${version}";
- sha256 = "13ifpi53rc2463ka8xw9zx407d1fz119x8sb9k48g5mwxm6c85fm";
+ sha256 = "0arx4yd8c5qszfgw8rqyi65j37r46dxibmzqqxb096isxhxjymw6";
};
sourceRoot = "${src.name}/open-vm-tools";
diff --git a/pkgs/build-support/docker/default.nix b/pkgs/build-support/docker/default.nix
index bc79f9ff12fd..0cee1dd2916f 100644
--- a/pkgs/build-support/docker/default.nix
+++ b/pkgs/build-support/docker/default.nix
@@ -40,7 +40,7 @@ rec {
, imageDigest
, sha256
, os ? "linux"
- , arch ? "x86_64"
+ , arch ? "amd64"
# This used to set a tag to the pulled image
, finalImageTag ? "latest"
, name ? fixName "docker-image-${imageName}-${finalImageTag}.tar"
@@ -450,11 +450,18 @@ rec {
baseName = baseNameOf name;
# Create a JSON blob of the configuration. Set the date to unix zero.
- baseJson = writeText "${baseName}-config.json" (builtins.toJSON {
- inherit created config;
- architecture = "amd64";
- os = "linux";
- });
+ baseJson = let
+ pure = writeText "${baseName}-config.json" (builtins.toJSON {
+ inherit created config;
+ architecture = "amd64";
+ os = "linux";
+ });
+ impure = runCommand "${baseName}-config.json"
+ { buildInputs = [ jq ]; }
+ ''
+ jq ".created = \"$(TZ=utc date --iso-8601="seconds")\"" ${pure} > $out
+ '';
+ in if created == "now" then impure else pure;
layer =
if runAsRoot == null
@@ -577,7 +584,7 @@ rec {
currentID=$layerID
while [[ -n "$currentID" ]]; do
layerChecksum=$(sha256sum image/$currentID/layer.tar | cut -d ' ' -f1)
- imageJson=$(echo "$imageJson" | jq ".history |= [{\"created\": \"${created}\"}] + .")
+ imageJson=$(echo "$imageJson" | jq ".history |= [{\"created\": \"$(jq -r .created ${baseJson})\"}] + .")
imageJson=$(echo "$imageJson" | jq ".rootfs.diff_ids |= [\"sha256:$layerChecksum\"] + .")
manifestJson=$(echo "$manifestJson" | jq ".[0].Layers |= [\"$currentID/layer.tar\"] + .")
diff --git a/pkgs/build-support/docker/examples.nix b/pkgs/build-support/docker/examples.nix
index ec2667310cdd..822e0dbb31f2 100644
--- a/pkgs/build-support/docker/examples.nix
+++ b/pkgs/build-support/docker/examples.nix
@@ -141,4 +141,13 @@ rec {
runAsRoot = ''echo "(runAsRoot)" > runAsRoot'';
extraCommands = ''echo "(extraCommand)" > extraCommands'';
};
+
+ # 9. Ensure that setting created to now results in a date which
+ # isn't the epoch + 1
+ unstableDate = pkgs.dockerTools.buildImage {
+ name = "unstable-date";
+ tag = "latest";
+ contents = [ pkgs.coreutils ];
+ created = "now";
+ };
}
diff --git a/pkgs/build-support/vm/default.nix b/pkgs/build-support/vm/default.nix
index 67c67c881776..ea0d9fa0dd3f 100644
--- a/pkgs/build-support/vm/default.nix
+++ b/pkgs/build-support/vm/default.nix
@@ -3,8 +3,9 @@
, img ? pkgs.stdenv.hostPlatform.platform.kernelTarget
, storeDir ? builtins.storeDir
, rootModules ?
- [ "virtio_pci" "virtio_mmio" "virtio_blk" "virtio_balloon" "virtio_rng" "ext4" "unix" "9p" "9pnet_virtio" "crc32c_generic" ]
+ [ "virtio_pci" "virtio_mmio" "virtio_blk" "virtio_balloon" "virtio_rng" "ext4" "unix" "9p" "9pnet_virtio" "crc32c_generic" "sym53c8xx" "virtio_scsi" "ahci "]
++ pkgs.lib.optional (pkgs.stdenv.isi686 || pkgs.stdenv.isx86_64) "rtc_cmos"
+, config
}:
with pkgs;
@@ -196,9 +197,17 @@ rec {
${qemuBinary qemu} \
-nographic -no-reboot \
-device virtio-rng-pci \
+ ${if "$diskInterface" == "scsi" then '' \
+ \ # FIXME: /dev/sda is not created within the VM
+ -device lsi53c895a \
+ -device scsi-hd,drive=hd,id=scsi1,bootindex=1 \
+ ''${diskImage:+-drive file=$diskImage,media=disk,if=none,id=hd,cache=unsafe,werror=report} \
+ '' else '' \
+ -drive file=$diskImage,media=disk,if=none,id=hd \
+ -device virtio-blk-pci,scsi=off,drive=hd,id=virtio0,bootindex=1 \
+ \''}
-virtfs local,path=${storeDir},security_model=none,mount_tag=store \
-virtfs local,path=$TMPDIR/xchg,security_model=none,mount_tag=xchg \
- ''${diskImage:+-drive file=$diskImage,if=virtio,cache=unsafe,werror=report} \
-kernel ${kernel}/${img} \
-initrd ${initrd}/initrd \
-append "console=${qemuSerialDevice} panic=1 command=${stage2Init} out=$out mountDisk=$mountDisk loglevel=4" \
@@ -298,12 +307,13 @@ rec {
`run-vm' will be left behind in the temporary build directory
that allows you to boot into the VM and debug it interactively. */
- runInLinuxVM = drv: lib.overrideDerivation drv ({ memSize ? 512, QEMU_OPTS ? "", args, builder, ... }: {
+ runInLinuxVM = drv: lib.overrideDerivation drv ({ memSize ? 512, QEMU_OPTS ? "", args, builder, ... } @ moreArgs : {
requiredSystemFeatures = [ "kvm" ];
builder = "${bash}/bin/sh";
args = ["-e" (vmRunCommand qemuCommandLinux)];
origArgs = args;
origBuilder = builder;
+ diskInterface = "${moreArgs.diskInterface}";
QEMU_OPTS = "${QEMU_OPTS} -m ${toString memSize}";
passAsFile = []; # HACK fix - see https://github.com/NixOS/nixpkgs/issues/16742
});
diff --git a/pkgs/data/misc/hackage/default.nix b/pkgs/data/misc/hackage/default.nix
index fce8f44bd3ff..a72c94759fa8 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/d5c89ad106556f7890c89c50a2b4d3fbdcea7616.tar.gz";
- sha256 = "0j8r88wwf0qvqxcnwmcs6xcn4vi0189c9f5chfl80941ggxfbpxk";
+ url = "https://github.com/commercialhaskell/all-cabal-hashes/archive/e44c7d34b0e57883da9cc0e09b0b5de3b065fe98.tar.gz";
+ sha256 = "1manarsja8lsvs75zd3jnjhy5yb1576yv8ba0jqa4a1rszrkil1d";
}
diff --git a/pkgs/data/misc/iana-etc/default.nix b/pkgs/data/misc/iana-etc/default.nix
index e6c33fc260e8..af8270e6eefa 100644
--- a/pkgs/data/misc/iana-etc/default.nix
+++ b/pkgs/data/misc/iana-etc/default.nix
@@ -1,12 +1,11 @@
{ stdenv, fetchzip }:
let
- version = "20180711";
+ version = "20180905";
in fetchzip {
name = "iana-etc-${version}";
-
url = "https://github.com/Mic92/iana-etc/releases/download/${version}/iana-etc-${version}.tar.gz";
- sha256 = "0vbgk3paix2v4rlh90a8yh1l39s322awng06izqj44zcg704fjbj";
+ sha256 = "1vl3by24xddl267cjq9bcwb7yvfd7gqalwgd5sgx8i7kz9bk40q2";
postFetch = ''
tar -xzvf $downloadedFile --strip-components=1
diff --git a/pkgs/desktops/enlightenment/efl.nix b/pkgs/desktops/enlightenment/efl.nix
index dd8162382023..bc58302cb20f 100644
--- a/pkgs/desktops/enlightenment/efl.nix
+++ b/pkgs/desktops/enlightenment/efl.nix
@@ -8,11 +8,11 @@
stdenv.mkDerivation rec {
name = "efl-${version}";
- version = "1.21.0";
+ version = "1.21.1";
src = fetchurl {
url = "http://download.enlightenment.org/rel/libs/efl/${name}.tar.xz";
- sha256 = "0jxfrcz2aq1synxzd6sh9nhxz7fg9qgz0idr8zj6gaiplmwbwrby";
+ sha256 = "0a5907h896pvpix7a6idc2fspzy6d78xrzf84k8y9fyvnd14nxs4";
};
nativeBuildInputs = [ pkgconfig ];
diff --git a/pkgs/desktops/enlightenment/ephoto.nix b/pkgs/desktops/enlightenment/ephoto.nix
index 6a49852909e6..ad4620d4f450 100644
--- a/pkgs/desktops/enlightenment/ephoto.nix
+++ b/pkgs/desktops/enlightenment/ephoto.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, pkgconfig, efl, pcre, makeWrapper }:
+{ stdenv, fetchurl, pkgconfig, efl, pcre, mesa_noglu, makeWrapper }:
stdenv.mkDerivation rec {
name = "ephoto-${version}";
@@ -9,9 +9,16 @@ stdenv.mkDerivation rec {
sha256 = "09kraa5zz45728h2dw1ssh23b87j01bkfzf977m48y1r507sy3vb";
};
- nativeBuildInputs = [ (pkgconfig.override { vanilla = true; }) makeWrapper ];
+ nativeBuildInputs = [
+ (pkgconfig.override { vanilla = true; })
+ mesa_noglu.dev # otherwise pkg-config does not find gbm
+ makeWrapper
+ ];
- buildInputs = [ efl pcre ];
+ buildInputs = [
+ efl
+ pcre
+ ];
meta = {
description = "Image viewer and editor written using the Enlightenment Foundation Libraries";
diff --git a/pkgs/desktops/enlightenment/rage.nix b/pkgs/desktops/enlightenment/rage.nix
index 5de225220733..e7dfb5ca3989 100644
--- a/pkgs/desktops/enlightenment/rage.nix
+++ b/pkgs/desktops/enlightenment/rage.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, meson, ninja, pkgconfig, efl, gst_all_1, pcre, wrapGAppsHook }:
+{ stdenv, fetchurl, meson, ninja, pkgconfig, efl, gst_all_1, pcre, mesa_noglu, wrapGAppsHook }:
stdenv.mkDerivation rec {
name = "rage-${version}";
@@ -13,6 +13,7 @@ stdenv.mkDerivation rec {
meson
ninja
(pkgconfig.override { vanilla = true; })
+ mesa_noglu.dev
wrapGAppsHook
];
diff --git a/pkgs/desktops/gnome-3/apps/file-roller/default.nix b/pkgs/desktops/gnome-3/apps/file-roller/default.nix
index 42f0ddc6e4bb..45aab553c418 100644
--- a/pkgs/desktops/gnome-3/apps/file-roller/default.nix
+++ b/pkgs/desktops/gnome-3/apps/file-roller/default.nix
@@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
buildInputs = [ glib gtk json-glib libarchive file gnome3.defaultIconTheme libnotify nautilus ];
- PKG_CONFIG_LIBNAUTILUS_EXTENSION_EXTENSIONDIR = "${placeholder "out"}/lib/nautilus/extensions-3.0";
+ PKG_CONFIG_LIBNAUTILUS_EXTENSION_EXTENSIONDIR = "lib/nautilus/extensions-3.0";
postPatch = ''
chmod +x postinstall.py # patchShebangs requires executable file
diff --git a/pkgs/desktops/gnome-3/apps/gnome-characters/default.nix b/pkgs/desktops/gnome-3/apps/gnome-characters/default.nix
index 92ce0eb8debb..b5525957d468 100644
--- a/pkgs/desktops/gnome-3/apps/gnome-characters/default.nix
+++ b/pkgs/desktops/gnome-3/apps/gnome-characters/default.nix
@@ -26,7 +26,7 @@ stdenv.mkDerivation rec {
buildInputs = [ glib gtk3 gjs pango gnome3.gsettings-desktop-schemas gnome3.defaultIconTheme libunistring ];
mesonFlags = [
- "-Ddbus_service_dir=${placeholder "out"}/share/dbus-1/services"
+ "-Ddbus_service_dir=share/dbus-1/services"
];
meta = with stdenv.lib; {
diff --git a/pkgs/desktops/gnome-3/core/evolution-data-server/default.nix b/pkgs/desktops/gnome-3/core/evolution-data-server/default.nix
index c355c9bbce69..842ad6634227 100644
--- a/pkgs/desktops/gnome-3/core/evolution-data-server/default.nix
+++ b/pkgs/desktops/gnome-3/core/evolution-data-server/default.nix
@@ -37,9 +37,11 @@ stdenv.mkDerivation rec {
"-DENABLE_VALA_BINDINGS=ON"
"-DENABLE_INTROSPECTION=ON"
"-DCMAKE_SKIP_BUILD_RPATH=OFF"
- "-DINCLUDE_INSTALL_DIR=${placeholder "dev"}/include"
];
+ postPatch = ''
+ cmakeFlags="-DINCLUDE_INSTALL_DIR=$dev/include $cmakeFlags"
+ '';
passthru = {
updateScript = gnome3.updateScript {
diff --git a/pkgs/desktops/gnome-3/core/gnome-settings-daemon/default.nix b/pkgs/desktops/gnome-3/core/gnome-settings-daemon/default.nix
index bfaf430d5932..cfb41c01e6ad 100644
--- a/pkgs/desktops/gnome-3/core/gnome-settings-daemon/default.nix
+++ b/pkgs/desktops/gnome-3/core/gnome-settings-daemon/default.nix
@@ -32,7 +32,7 @@ stdenv.mkDerivation rec {
];
mesonFlags = [
- "-Dudev_dir=${placeholder "out"}/lib/udev"
+ "-Dudev_dir=lib/udev"
];
postPatch = ''
diff --git a/pkgs/desktops/gnome-3/core/libgee/default.nix b/pkgs/desktops/gnome-3/core/libgee/default.nix
index a65d0f401f0e..a5ce9ee5e105 100644
--- a/pkgs/desktops/gnome-3/core/libgee/default.nix
+++ b/pkgs/desktops/gnome-3/core/libgee/default.nix
@@ -6,8 +6,6 @@ in
stdenv.mkDerivation rec {
name = "${pname}-${version}";
- outputs = [ "out" "dev" ];
-
src = fetchurl {
url = "mirror://gnome/sources/${pname}/${gnome3.versionBranch version}/${name}.tar.xz";
sha256 = "0c26x8gi3ivmhlbqcmiag4jwrkvcy28ld24j55nqr3jikb904a5v";
@@ -15,12 +13,11 @@ stdenv.mkDerivation rec {
doCheck = true;
+ patches = [ ./fix_introspection_paths.patch ];
+
nativeBuildInputs = [ pkgconfig autoconf vala gobjectIntrospection ];
buildInputs = [ glib ];
- PKG_CONFIG_GOBJECT_INTROSPECTION_1_0_GIRDIR = "${placeholder "dev"}/share/gir-1.0";
- PKG_CONFIG_GOBJECT_INTROSPECTION_1_0_TYPELIBDIR = "${placeholder "out"}/lib/girepository-1.0";
-
passthru = {
updateScript = gnome3.updateScript {
packageName = pname;
diff --git a/pkgs/desktops/gnome-3/core/libgee/fix_introspection_paths.patch b/pkgs/desktops/gnome-3/core/libgee/fix_introspection_paths.patch
new file mode 100644
index 000000000000..67003f451645
--- /dev/null
+++ b/pkgs/desktops/gnome-3/core/libgee/fix_introspection_paths.patch
@@ -0,0 +1,13 @@
+--- fix_introspection_paths.patch/configure 2014-01-07 17:43:53.521339338 +0000
++++ fix_introspection_paths.patch/configure-fix 2014-01-07 17:45:11.068635069 +0000
+@@ -12085,8 +12085,8 @@
+ INTROSPECTION_SCANNER=`$PKG_CONFIG --variable=g_ir_scanner gobject-introspection-1.0`
+ INTROSPECTION_COMPILER=`$PKG_CONFIG --variable=g_ir_compiler gobject-introspection-1.0`
+ INTROSPECTION_GENERATE=`$PKG_CONFIG --variable=g_ir_generate gobject-introspection-1.0`
+- INTROSPECTION_GIRDIR=`$PKG_CONFIG --variable=girdir gobject-introspection-1.0`
+- INTROSPECTION_TYPELIBDIR="$($PKG_CONFIG --variable=typelibdir gobject-introspection-1.0)"
++ INTROSPECTION_GIRDIR="${datadir}/gir-1.0"
++ INTROSPECTION_TYPELIBDIR="${libdir}/girepository-1.0"
+ INTROSPECTION_CFLAGS=`$PKG_CONFIG --cflags gobject-introspection-1.0`
+ INTROSPECTION_LIBS=`$PKG_CONFIG --libs gobject-introspection-1.0`
+ INTROSPECTION_MAKEFILE=`$PKG_CONFIG --variable=datadir gobject-introspection-1.0`/gobject-introspection-1.0/Makefile.introspection
diff --git a/pkgs/desktops/gnome-3/core/totem/default.nix b/pkgs/desktops/gnome-3/core/totem/default.nix
index 50e060c13c3a..b8197ccf83c5 100644
--- a/pkgs/desktops/gnome-3/core/totem/default.nix
+++ b/pkgs/desktops/gnome-3/core/totem/default.nix
@@ -33,7 +33,7 @@ stdenv.mkDerivation rec {
'';
mesonFlags = [
- "-Dwith-nautilusdir=${placeholder "out"}/lib/nautilus/extensions-3.0"
+ "-Dwith-nautilusdir=lib/nautilus/extensions-3.0"
# https://bugs.launchpad.net/ubuntu/+source/totem/+bug/1712021
# https://bugzilla.gnome.org/show_bug.cgi?id=784236
# https://github.com/mesonbuild/meson/issues/1994
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 015807ec684e..62b8aaf25abe 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/xfce4-13/xfce4-mixer/default.nix b/pkgs/desktops/xfce4-13/xfce4-mixer/default.nix
index 266b05199ddb..a4bc0a3eaddb 100644
--- a/pkgs/desktops/xfce4-13/xfce4-mixer/default.nix
+++ b/pkgs/desktops/xfce4-13/xfce4-mixer/default.nix
@@ -1,5 +1,10 @@
-{ mkXfceDerivation, automakeAddFlags, dbus-glib, gtk2, libxfce4ui, libxfce4util, xfce4-panel, xfconf }:
+{ mkXfceDerivation, automakeAddFlags, dbus-glib, gtk2, libxfce4ui, libxfce4util, xfce4-panel, xfconf, gst-plugins-base, libunique }:
+let
+ gst_plugins_minimal = gst-plugins-base.override {
+ minimalDeps = true;
+ };
+in
mkXfceDerivation rec {
category = "apps";
pname = "xfce4-mixer";
@@ -16,7 +21,9 @@ mkXfceDerivation rec {
buildInputs = [
dbus-glib
+ gst_plugins_minimal
gtk2
+ libunique
libxfce4ui
libxfce4util
xfce4-panel
diff --git a/pkgs/development/compilers/boo/config.patch b/pkgs/development/compilers/boo/config.patch
deleted file mode 100644
index f6e0eee29b1b..000000000000
--- 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 ec5e08ffda40..000000000000
--- 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 6ff2028e3c16..2c260e110d60 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/dotnet/sdk/default.nix b/pkgs/development/compilers/dotnet/sdk/default.nix
index 50057f91e804..434b4d13e771 100644
--- a/pkgs/development/compilers/dotnet/sdk/default.nix
+++ b/pkgs/development/compilers/dotnet/sdk/default.nix
@@ -20,7 +20,11 @@ in
sha256 = "1a8z9q69cd9a33j7fr7907abm5z4qiivw5k379cgsjmmvxwyvjia";
};
- unpackPhase = "tar xvzf $src";
+ unpackPhase = ''
+ mkdir src
+ cd src
+ tar xvzf $src
+ '';
buildPhase = ''
runHook preBuild
diff --git a/pkgs/development/compilers/elm/default.nix b/pkgs/development/compilers/elm/default.nix
index 93deb4a90aff..692404a19bf6 100644
--- a/pkgs/development/compilers/elm/default.nix
+++ b/pkgs/development/compilers/elm/default.nix
@@ -1,4 +1,6 @@
-{ lib, stdenv, buildEnv, haskell, nodejs, fetchurl, makeWrapper, git }:
+{ lib, stdenv, buildEnv
+, haskell, nodejs
+, fetchurl, fetchpatch, makeWrapper, git }:
# To update:
@@ -90,6 +92,12 @@ let
export ELM_HOME=`pwd`/.elm
'' + (makeDotElm "0.19.0" (import ./packages/elm-elm.nix));
buildTools = drv.buildTools or [] ++ [ makeWrapper ];
+ patches = [
+ (fetchpatch {
+ url = "https://github.com/elm/compiler/pull/1784/commits/78d2d8eab310552b1b877a3e90e1e57e7a09ddec.patch";
+ sha256 = "0vdhk16xqm2hxw12s1b91a0bmi8w4wsxc086qlzglgnjxrl5b3w4";
+ })
+ ];
postInstall = ''
wrapProgram $out/bin/elm \
--prefix PATH ':' ${lib.makeBinPath [ nodejs ]}
diff --git a/pkgs/development/compilers/elm/packages/elm.nix b/pkgs/development/compilers/elm/packages/elm.nix
index 1097c8a1e192..41998f4c9b3d 100644
--- a/pkgs/development/compilers/elm/packages/elm.nix
+++ b/pkgs/development/compilers/elm/packages/elm.nix
@@ -11,8 +11,8 @@ mkDerivation {
version = "0.19.0";
src = fetchgit {
url = "https://github.com/elm/compiler";
- sha256 = "0s93z9vr0vp5w894ghc5s34nsq09sg1msf59zfiba87sid5vgjqy";
- rev = "32059a289d27e303fa1665e9ada0a52eb688f302";
+ sha256 = "13jks6c6i80z71mjjfg46ri570g5ini0k3xw3857v6z66zcl56x4";
+ rev = "d5cbc41aac23da463236bbc250933d037da4055a";
};
isLibrary = false;
isExecutable = true;
diff --git a/pkgs/development/compilers/ghc/8.4.3.nix b/pkgs/development/compilers/ghc/8.4.3.nix
index 7028a78eb21d..8fba60d527fd 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 3722b16f6573..c12401f05778 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
-, autoconf, automake, coreutils, fetchurl, perl, python3, m4
+, autoconf, automake, coreutils, fetchurl, fetchpatch, perl, python3, m4
, libiconv ? null, ncurses
@@ -78,18 +78,24 @@ let
in
stdenv.mkDerivation (rec {
- version = "8.6.0.20180810";
+ version = "8.6.1";
name = "${targetPrefix}ghc-${version}";
src = fetchurl {
- url = "https://downloads.haskell.org/~ghc/8.6.1-beta1/ghc-${version}-src.tar.xz";
- sha256 = "0b3nyjs4lsh67lfw7wh7r7kkf4g2xiypdxd77aycmwd3pdxj09yw";
+ url = "https://downloads.haskell.org/~ghc/${version}/ghc-${version}-src.tar.xz";
+ sha256 = "0dkh7idgrqr567fq94a0f5x3w0r4cm2ydn51nb5wfisw3rnw499c";
};
enableParallelBuilding = true;
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/compilers/gnu-smalltalk/default.nix b/pkgs/development/compilers/gnu-smalltalk/default.nix
index 21c0a5ede91b..39d1652fc700 100644
--- a/pkgs/development/compilers/gnu-smalltalk/default.nix
+++ b/pkgs/development/compilers/gnu-smalltalk/default.nix
@@ -34,6 +34,8 @@ in stdenv.mkDerivation rec {
configureFlags = stdenv.lib.optional (!emacsSupport) "--without-emacs";
+ hardeningDisable = [ "format" ];
+
installFlags = stdenv.lib.optional emacsSupport "lispdir=$(out)/share/emacs/site-lisp";
# For some reason the tests fail if executated with nix-build, but pass if
diff --git a/pkgs/development/compilers/go/1.11.nix b/pkgs/development/compilers/go/1.11.nix
index 55cc654b0aa9..4a84c622a73e 100644
--- a/pkgs/development/compilers/go/1.11.nix
+++ b/pkgs/development/compilers/go/1.11.nix
@@ -125,6 +125,7 @@ stdenv.mkDerivation rec {
./remove-fhs-test-references.patch
./skip-external-network-tests.patch
./skip-nohup-tests.patch
+ ./skip-test-extra-files-on-386.patch
];
postPatch = optionalString stdenv.isDarwin ''
@@ -139,7 +140,7 @@ stdenv.mkDerivation rec {
else if stdenv.targetPlatform.isAarch32 then "arm"
else if stdenv.targetPlatform.isAarch64 then "arm64"
else throw "Unsupported system";
- GOARM = stdenv.targetPlatform.parsed.cpu.version or "";
+ GOARM = toString (stdenv.lib.intersectLists [(stdenv.targetPlatform.parsed.cpu.version or "")] ["5" "6" "7"]);
GO386 = 387; # from Arch: don't assume sse2 on i686
CGO_ENABLED = 1;
GOROOT_BOOTSTRAP = "${goBootstrap}/share/go";
diff --git a/pkgs/development/compilers/go/skip-test-extra-files-on-386.patch b/pkgs/development/compilers/go/skip-test-extra-files-on-386.patch
new file mode 100644
index 000000000000..afe5aea3d916
--- /dev/null
+++ b/pkgs/development/compilers/go/skip-test-extra-files-on-386.patch
@@ -0,0 +1,15 @@
+diff --git a/src/os/exec/exec_test.go b/src/os/exec/exec_test.go
+index 558345ff63..22129bf022 100644
+--- a/src/os/exec/exec_test.go
++++ b/src/os/exec/exec_test.go
+@@ -593,6 +593,10 @@ func TestExtraFiles(t *testing.T) {
+ t.Skipf("skipping test on %q", runtime.GOOS)
+ }
+
++ if runtime.GOOS == "linux" && runtime.GOARCH == "386" {
++ t.Skipf("skipping test on %q %q", runtime.GOARCH, runtime.GOOS)
++ }
++
+ // Ensure that file descriptors have not already been leaked into
+ // our environment.
+ if !testedAlreadyLeaked {
diff --git a/pkgs/development/compilers/ocaml/generic.nix b/pkgs/development/compilers/ocaml/generic.nix
index 1ee6fee613c9..1ed6d2c6db22 100644
--- a/pkgs/development/compilers/ocaml/generic.nix
+++ b/pkgs/development/compilers/ocaml/generic.nix
@@ -90,6 +90,7 @@ stdenv.mkDerivation (args // rec {
'';
platforms = with platforms; linux ++ darwin;
+ broken = stdenv.isAarch64 && !stdenv.lib.versionAtLeast version "4.06";
};
})
diff --git a/pkgs/development/coq-modules/QuickChick/default.nix b/pkgs/development/coq-modules/QuickChick/default.nix
index 35cf63af8627..fc88a1c33eed 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 795c177bc80d..c707fcdbd6be 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 a66e941a8c9c..9d9a4cb5f1a1 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 ef55272d6e97..75f5d8c2f069 100644
--- a/pkgs/development/haskell-modules/configuration-common.nix
+++ b/pkgs/development/haskell-modules/configuration-common.nix
@@ -926,8 +926,9 @@ self: super: {
text-icu = dontCheck super.text-icu;
# https://github.com/haskell/cabal/issues/4969
- haddock-library_1_4_4 = dontHaddock super.haddock-library_1_4_4;
- haddock-api = super.haddock-api.override { haddock-library = self.haddock-library_1_4_4; };
+ haddock-api = (super.haddock-api.overrideScope (self: super: {
+ haddock-library = self.haddock-library_1_6_0;
+ })).override { hspec = self.hspec_2_4_8; };
# Jailbreak "unix-compat >=0.1.2 && <0.5".
# Jailbreak "graphviz >=2999.18.1 && <2999.20".
@@ -1074,21 +1075,20 @@ 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;
+ });
+ stack2nix = super.stack2nix.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".
stack = doJailbreak super.stack;
+
# https://github.com/pikajude/stylish-cabal/issues/11
stylish-cabal = super.stylish-cabal.override { hspec = self.hspec_2_4_8; hspec-core = self.hspec-core_2_4_8; };
hspec_2_4_8 = super.hspec_2_4_8.override { hspec-core = self.hspec-core_2_4_8; hspec-discover = self.hspec-discover_2_4_8; };
@@ -1120,7 +1120,7 @@ self: super: {
})) ./patches/sexpr-0.2.1.patch;
# Can be removed once yi-language >= 0.18 is in the LTS
- yi-core = super.yi-core.override { yi-language = self.yi-language_0_18_0; };
+ yi-core = super.yi-core.overrideScope (self: super: { yi-language = self.yi-language_0_18_0; });
# https://github.com/MarcWeber/hasktags/issues/52
hasktags = dontCheck super.hasktags;
@@ -1130,4 +1130,31 @@ 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.overrideScope (self: super: { safe-money = self.safe-money_0_7; });
+ safe-money-store = super.safe-money-store.overrideScope (self: super: { safe-money = self.safe-money_0_7; });
+ safe-money-cereal = super.safe-money-cereal.overrideScope (self: super: { safe-money = self.safe-money_0_7; });
+ safe-money-serialise = super.safe-money-serialise.overrideScope (self: super: { safe-money = self.safe-money_0_7; });
+ safe-money-xmlbf = super.safe-money-xmlbf.overrideScope (self: super: { safe-money = self.safe-money_0_7; });
+
+ # https://github.com/adinapoli/mandrill/pull/52
+ mandrill = appendPatch super.mandrill (pkgs.fetchpatch {
+ url = https://github.com/adinapoli/mandrill/commit/30356d9dfc025a5f35a156b17685241fc3882c55.patch;
+ sha256 = "1qair09xs6vln3vsjz7sy4hhv037146zak4mq3iv6kdhmp606hqv";
+ });
+
+ # Can be removed once vinyl >= 0.10 is in the LTS.
+ Frames = super.Frames.overrideScope (self: super: { vinyl = self.vinyl_0_10_0; });
+
+ # https://github.com/Euterpea/Euterpea2/pull/22
+ Euterpea = overrideSrc super.Euterpea {
+ src = pkgs.fetchFromGitHub {
+ owner = "Euterpea";
+ repo = "Euterpea2";
+ rev = "6f49b790adfb8b65d95a758116c20098fb0cd34c";
+ sha256 = "0qz1svb96n42nmig16vyphwxas34hypgayvwc91ri7w7xd6yi1ba";
+ };
+ };
+
} // 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 9bd45c9887f1..5684d14caddf 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 f475512a8dab..eca2d111b542 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 f73172e02d38..5d499c803dae 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 c79406a94727..7e8bc1a1e8e3 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 3aee4857f993..f017772836e0 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
@@ -2393,7 +2395,6 @@ extra-packages:
- haddock-api == 2.17.* # required on GHC 8.0.x
- haddock-library == 1.2.* # required for haddock-api-2.16.x
- haddock-library == 1.4.3 # required for haddock-api-2.17.x
- - haddock-library == 1.4.4 # required for haddock-api-2.18.x
- haddock-library == 1.5.* # required for stylish-cabal-0.4.0.1
- happy <1.19.6 # newer versions break Agda
- haskell-gi-overloading == 0.0 # gi-* packages use this dependency to disable overloading support
diff --git a/pkgs/development/haskell-modules/configuration-nix.nix b/pkgs/development/haskell-modules/configuration-nix.nix
index cf53f9e2b510..eb28e11c4402 100644
--- a/pkgs/development/haskell-modules/configuration-nix.nix
+++ b/pkgs/development/haskell-modules/configuration-nix.nix
@@ -510,4 +510,13 @@ self: super: builtins.intersectAttrs super {
LDAP = dontCheck (overrideCabal super.LDAP (drv: {
librarySystemDepends = drv.librarySystemDepends or [] ++ [ pkgs.cyrus_sasl.dev ];
}));
+
+ # Expects z3 to be on path so we replace it with a hard
+ sbv = overrideCabal super.sbv (drv: {
+ postPatch = ''
+ sed -i -e 's|"z3"|"${pkgs.z3}/bin/z3"|' Data/SBV/Provers/Z3.hs'';
+ });
+
+ # The test-suite requires a running PostgreSQL server.
+ Frames-beam = dontCheck super.Frames-beam;
}
diff --git a/pkgs/development/haskell-modules/generic-builder.nix b/pkgs/development/haskell-modules/generic-builder.nix
index be104a82fd77..1fd64c79fc2c 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)
@@ -135,7 +135,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 c1fb70ee2e6e..003d9d259ace 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/interpreters/acl2/default.nix b/pkgs/development/interpreters/acl2/default.nix
index 14b9a78af46e..cc88b32119e7 100644
--- a/pkgs/development/interpreters/acl2/default.nix
+++ b/pkgs/development/interpreters/acl2/default.nix
@@ -4,15 +4,20 @@
let hashes = {
"8.0" = "1x1giy2c1y6krg3kf8pf9wrmvk981shv0pxcwi483yjqm90xng4r";
+ "8.1" = "0isi75j94q79x4341rhd94c60228iwvccy71ssnyvh1025m93xcd";
+};
+revs = {
+ "8.0" = "8.0";
+ "8.1" = "8.1";
};
in stdenv.mkDerivation rec {
name = "acl2-${version}";
- version = "8.0";
+ version = "8.1";
src = fetchFromGitHub {
owner = "acl2-devel";
repo = "acl2-devel";
- rev = "${version}";
+ rev = revs."${version}";
sha256 = hashes."${version}";
};
diff --git a/pkgs/development/interpreters/erlang/R18.nix b/pkgs/development/interpreters/erlang/R18.nix
index ee524feb4c6c..58b7fd71f0be 100644
--- a/pkgs/development/interpreters/erlang/R18.nix
+++ b/pkgs/development/interpreters/erlang/R18.nix
@@ -11,6 +11,16 @@ let
sha256 = "00fx5wc88ki3z71z5q4xzi9h3whhjw1zblpn09w995ygn07m9qhm";
};
+ makeOrderingPatch = fetchpatch {
+ url = "https://github.com/erlang/otp/commit/2f1a37f1011ff9d129bc35a6efa0ab937a2aa0e9.patch";
+ sha256 = "0xfa6hzxh9d7qllkyidcgh57xrrx11w65y7s1hyg52alm06l6b9n";
+ };
+
+ makeParallelInstallPatch = fetchpatch {
+ url ="https://github.com/erlang/otp/commit/de8fe86f67591dd992bae33f7451523dab36e5bd.patch";
+ sha256 = "1cj9fjhdng6yllajjm3gkk04ag9bwyb3n70hrb5nk6c292v8a45c";
+ };
+
in mkDerivation rec {
version = "18.3.4.8";
sha256 = "16c0h25hh5yvkv436ks5jbd7qmxzb6ndvk64mr404347a20iib0g";
@@ -18,5 +28,7 @@ in mkDerivation rec {
patches = [
rmAndPwdPatch
envAndCpPatch
+ makeOrderingPatch
+ makeParallelInstallPatch
];
}
diff --git a/pkgs/development/interpreters/lua-5/5.2.nix b/pkgs/development/interpreters/lua-5/5.2.nix
index 6d8de7bae27e..a8badf647c0c 100644
--- a/pkgs/development/interpreters/lua-5/5.2.nix
+++ b/pkgs/development/interpreters/lua-5/5.2.nix
@@ -10,11 +10,11 @@ in
stdenv.mkDerivation rec {
name = "lua-${version}";
luaversion = "5.2";
- version = "${luaversion}.3";
+ version = "${luaversion}.4";
src = fetchurl {
url = "https://www.lua.org/ftp/${name}.tar.gz";
- sha256 = "0b8034v1s82n4dg5rzcn12067ha3nxaylp2vdp8gg08kjsbzphhk";
+ sha256 = "0jwznq0l8qg9wh5grwg07b5cy3lzngvl5m2nl1ikp6vqssmf9qmr";
};
buildInputs = [ readline ];
diff --git a/pkgs/development/interpreters/php/default.nix b/pkgs/development/interpreters/php/default.nix
index 37a51ffded31..67c38a354b43 100644
--- a/pkgs/development/interpreters/php/default.nix
+++ b/pkgs/development/interpreters/php/default.nix
@@ -3,7 +3,7 @@
, mysql, libxml2, readline, zlib, curl, postgresql, gettext
, openssl, pcre, pkgconfig, sqlite, config, libjpeg, libpng, freetype
, libxslt, libmcrypt, bzip2, icu, openldap, cyrus_sasl, libmhash, freetds
-, uwimap, pam, gmp, apacheHttpd, libiconv, systemd, libsodium, html-tidy
+, uwimap, pam, gmp, apacheHttpd, libiconv, systemd, libsodium, html-tidy, libargon2
}:
with lib;
@@ -51,6 +51,7 @@ let
, calendarSupport ? config.php.calendar or true
, sodiumSupport ? (config.php.sodium or true) && (versionAtLeast version "7.2")
, tidySupport ? (config.php.tidy or false)
+ , argon2Support ? (config.php.argon2 or true) && (versionAtLeast version "7.2")
}:
let
@@ -92,7 +93,8 @@ let
++ optional bz2Support bzip2
++ optional (mssqlSupport && !stdenv.isDarwin) freetds
++ optional sodiumSupport libsodium
- ++ optional tidySupport html-tidy;
+ ++ optional tidySupport html-tidy
+ ++ optional argon2Support libargon2;
CXXFLAGS = optional stdenv.cc.isClang "-std=c++11";
@@ -131,6 +133,7 @@ let
++ optionals mysqliSupport [
"--with-mysqli=${if mysqlndSupport then "mysqlnd" else "${mysql.connector-c}/bin/mysql_config"}"
]
+ ++ optional ( pdo_mysqlSupport || mysqlSupport || mysqliSupport ) "--with-mysql-sock=/run/mysqld/mysqld.sock"
++ optional bcmathSupport "--enable-bcmath"
# FIXME: Our own gd package doesn't work, see https://bugs.php.net/bug.php?id=60108.
++ optionals gdSupport [
@@ -157,7 +160,8 @@ let
++ optional ztsSupport "--enable-maintainer-zts"
++ optional calendarSupport "--enable-calendar"
++ optional sodiumSupport "--with-sodium=${libsodium.dev}"
- ++ optional tidySupport "--with-tidy=${html-tidy}";
+ ++ optional tidySupport "--with-tidy=${html-tidy}"
+ ++ optional argon2Support "--with-password-argon2=${libargon2}";
hardeningDisable = [ "bindnow" ];
@@ -219,13 +223,35 @@ let
};
in {
- php71 = generic {
- version = "7.1.21";
- sha256 = "104mn4kppklb21hgz1a50kgmc0ak5y996sx990xpc8yy9dbrqh62";
- };
+ # Because of an upstream bug: https://bugs.php.net/bug.php?id=76826
+ # We can't update the darwin versions because they simply don't compile at
+ # all due to a bug in the intl extensions.
+ #
+ # The bug so far is present in 7.1.21, 7.1.22, 7.2.9, 7.2.10.
- php72 = generic {
- version = "7.2.8";
- sha256 = "1rky321gcvjm0npbfd4bznh36an0y14viqcvn4yzy3x643sni00z";
- };
+ php71 = generic (
+ if stdenv.isDarwin then
+ {
+ version = "7.1.20";
+ sha256 = "0i8xd6p4zdg8fl6f0j430raanlshsshr3s3jlm72b0gvi1n4f6rs";
+ }
+ else
+ {
+ version = "7.1.22";
+ sha256 = "0qz74qdlk19cw478f42ckyw5r074y0fg73r2bzlhm0dar0cizsf8";
+ }
+ );
+
+ php72 = generic (
+ if stdenv.isDarwin then
+ {
+ version = "7.2.8";
+ sha256 = "1rky321gcvjm0npbfd4bznh36an0y14viqcvn4yzy3x643sni00z";
+ }
+ else
+ {
+ version = "7.2.10";
+ sha256 = "17fsvdi6ihjghjsz9kk2li2rwrknm2ccb6ys0xmn789116d15dh1";
+ }
+ );
}
diff --git a/pkgs/development/libraries/arrow-cpp/default.nix b/pkgs/development/libraries/arrow-cpp/default.nix
index 8e89aeb21a24..952f7435c069 100644
--- a/pkgs/development/libraries/arrow-cpp/default.nix
+++ b/pkgs/development/libraries/arrow-cpp/default.nix
@@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
name = "arrow-cpp-${version}";
- version = "0.10.0";
+ version = "0.9.0";
src = fetchurl {
url = "mirror://apache/arrow/arrow-${version}/apache-arrow-${version}.tar.gz";
- sha256 = "0bc4krapz1kzdm16npzmgdz7zvg9lip6rnqbwph8vfn7zji0fcll";
+ sha256 = "16l91fixb5dgx3v6xc73ipn1w1hjgbmijyvs81j7ywzpna2cdcdy";
};
sourceRoot = "apache-arrow-${version}/cpp";
diff --git a/pkgs/development/libraries/asio/generic.nix b/pkgs/development/libraries/asio/generic.nix
index 58dd4f614231..72305cb633fb 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/boost/generic.nix b/pkgs/development/libraries/boost/generic.nix
index 617484e5a403..4131e5f7a27c 100644
--- a/pkgs/development/libraries/boost/generic.nix
+++ b/pkgs/development/libraries/boost/generic.nix
@@ -47,10 +47,24 @@ let
# To avoid library name collisions
layout = if taggedLayout then "tagged" else "system";
+ # Versions of b2 before 1.65 have job limits; specifically:
+ # - Versions before 1.58 support up to 64 jobs[0]
+ # - Versions before 1.65 support up to 256 jobs[1]
+ #
+ # [0]: https://github.com/boostorg/build/commit/0ef40cb86728f1cd804830fef89a6d39153ff632
+ # [1]: https://github.com/boostorg/build/commit/316e26ca718afc65d6170029284521392524e4f8
+ jobs =
+ if versionOlder version "1.58" then
+ "$(($NIX_BUILD_CORES<=64 ? $NIX_BUILD_CORES : 64))"
+ else if versionOlder version "1.65" then
+ "$(($NIX_BUILD_CORES<=256 ? $NIX_BUILD_CORES : 256))"
+ else
+ "$NIX_BUILD_CORES";
+
b2Args = concatStringsSep " " ([
"--includedir=$dev/include"
"--libdir=$out/lib"
- "-j$NIX_BUILD_CORES"
+ "-j${jobs}"
"--layout=${layout}"
"variant=${variant}"
"threading=${threading}"
@@ -74,6 +88,7 @@ let
] ++ optional (link != "static") "runtime-link=${runtime-link}"
++ optional (variant == "release") "debug-symbols=off"
++ optional (toolset != null) "toolset=${toolset}"
+ ++ optional (!enablePython) "--without-python"
++ optional (mpi != null || stdenv.hostPlatform != stdenv.buildPlatform) "--user-config=user-config.jam"
++ optionals (stdenv.hostPlatform.libc == "msvcrt") [
"threadapi=win32"
diff --git a/pkgs/development/libraries/bullet/default.nix b/pkgs/development/libraries/bullet/default.nix
index 4d94faa9566a..fca5e8d70a3b 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 432e49c4354f..043b9e263d8a 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 8f66b65e49ac..6ec18b9514d7 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/czmq/4.x.nix b/pkgs/development/libraries/czmq/4.x.nix
index 840fa34d6ae1..67e005943fa5 100644
--- a/pkgs/development/libraries/czmq/4.x.nix
+++ b/pkgs/development/libraries/czmq/4.x.nix
@@ -1,21 +1,14 @@
{ stdenv, fetchurl, fetchpatch, zeromq }:
stdenv.mkDerivation rec {
- version = "4.0.2";
+ version = "4.1.1";
name = "czmq-${version}";
src = fetchurl {
url = "https://github.com/zeromq/czmq/releases/download/v${version}/${name}.tar.gz";
- sha256 = "12gbh57xnz2v82x1g80gv4bwapmyzl00lbin5ix3swyac8i7m340";
+ sha256 = "1h5hrcsc30fcwb032vy5gxkq4j4vv1y4dj460rfs1hhxi0cz83zh";
};
- patches = [
- (fetchpatch {
- url = https://patch-diff.githubusercontent.com/raw/zeromq/czmq/pull/1618.patch;
- sha256 = "1dssy7k0fni6djail8rz0lk8p777158jvrqhgn500i636gkxaxhp";
- })
- ];
-
# Needs to be propagated for the .pc file to work
propagatedBuildInputs = [ zeromq ];
diff --git a/pkgs/development/libraries/dbus-sharp/default.nix b/pkgs/development/libraries/dbus-sharp/default.nix
index 40c633dda523..855dd9f3832e 100644
--- a/pkgs/development/libraries/dbus-sharp/default.nix
+++ b/pkgs/development/libraries/dbus-sharp/default.nix
@@ -1,4 +1,4 @@
-{stdenv, fetchFromGitHub, pkgconfig, mono, autoreconfHook }:
+{stdenv, fetchFromGitHub, pkgconfig, mono48, autoreconfHook }:
stdenv.mkDerivation rec {
name = "dbus-sharp-${version}";
@@ -13,7 +13,10 @@ stdenv.mkDerivation rec {
};
nativeBuildInputs = [ pkgconfig autoreconfHook ];
- buildInputs = [ mono ];
+
+ # Use msbuild when https://github.com/NixOS/nixpkgs/pull/43680 is merged
+ # See: https://github.com/NixOS/nixpkgs/pull/46060
+ buildInputs = [ mono48 ];
dontStrip = true;
diff --git a/pkgs/development/libraries/elf-header/default.nix b/pkgs/development/libraries/elf-header/default.nix
index 48e5b73d9e72..ab8c217dce43 100644
--- a/pkgs/development/libraries/elf-header/default.nix
+++ b/pkgs/development/libraries/elf-header/default.nix
@@ -32,6 +32,7 @@ stdenvNoCC.mkDerivation {
'';
meta = libc.meta // {
+ outputsToInstall = [ "out" ];
description = "The datastructures of ELF according to the target platform's libc";
longDescription = ''
The Executable and Linkable Format (ELF, formerly named Extensible Linking
diff --git a/pkgs/development/libraries/geis/default.nix b/pkgs/development/libraries/geis/default.nix
index 56d8cd21f844..fa3aa77cd3ad 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/glib-networking/default.nix b/pkgs/development/libraries/glib-networking/default.nix
index 3deaf28373dd..e0bbae69c4ff 100644
--- a/pkgs/development/libraries/glib-networking/default.nix
+++ b/pkgs/development/libraries/glib-networking/default.nix
@@ -23,7 +23,7 @@ stdenv.mkDerivation rec {
})
];
- PKG_CONFIG_GIO_2_0_GIOMODULEDIR = "${placeholder "out"}/lib/gio/modules";
+ PKG_CONFIG_GIO_2_0_GIOMODULEDIR = "lib/gio/modules";
postPatch = ''
chmod +x meson_post_install.py # patchShebangs requires executable file
diff --git a/pkgs/development/libraries/gpgme/default.nix b/pkgs/development/libraries/gpgme/default.nix
index 71fe23ea6b0d..416ecb5631ed 100644
--- a/pkgs/development/libraries/gpgme/default.nix
+++ b/pkgs/development/libraries/gpgme/default.nix
@@ -2,7 +2,7 @@
, file, which
, autoreconfHook
, git
-, texinfo5
+, texinfo
, qtbase ? null
, withPython ? false, swig2 ? null, python ? null
}:
@@ -28,7 +28,7 @@ stdenv.mkDerivation rec {
[ libgpgerror glib libassuan pth ]
++ lib.optional (qtbase != null) qtbase;
- nativeBuildInputs = [ file pkgconfig gnupg autoreconfHook git texinfo5 ]
+ nativeBuildInputs = [ file pkgconfig gnupg autoreconfHook git texinfo ]
++ lib.optionals withPython [ python swig2 which ];
postPatch =''
diff --git a/pkgs/development/libraries/gvfs/default.nix b/pkgs/development/libraries/gvfs/default.nix
index 360c1fb41f4e..86cbd01a6026 100644
--- a/pkgs/development/libraries/gvfs/default.nix
+++ b/pkgs/development/libraries/gvfs/default.nix
@@ -63,9 +63,9 @@ stdenv.mkDerivation rec {
# Uncomment when switching back to meson
# mesonFlags = [
- # "-Dgio_module_dir=${placeholder "out"}/lib/gio/modules"
- # "-Dsystemduserunitdir=${placeholder "out"}/lib/systemd/user"
- # "-Ddbus_service_dir=${placeholder "out"}/share/dbus-1/services"
+ # "-Dgio_module_dir=lib/gio/modules"
+ # "-Dsystemduserunitdir=lib/systemd/user"
+ # "-Ddbus_service_dir=share/dbus-1/services"
# "-Dtmpfilesdir=no"
# ] ++ stdenv.lib.optionals (!gnomeSupport) [
# "-Dgcr=false" "-Dgoa=false" "-Dkeyring=false" "-Dhttp=false"
diff --git a/pkgs/development/libraries/jbig2dec/default.nix b/pkgs/development/libraries/jbig2dec/default.nix
index cc838be0f4f0..04a165866faf 100644
--- a/pkgs/development/libraries/jbig2dec/default.nix
+++ b/pkgs/development/libraries/jbig2dec/default.nix
@@ -4,7 +4,7 @@ stdenv.mkDerivation rec {
name = "jbig2dec-0.14";
src = fetchurl {
- url = "http://downloads.ghostscript.com/public/jbig2dec/${name}.tar.gz";
+ url = "https://github.com/ArtifexSoftware/ghostpdl-downloads/releases/download/gs922/${name}.tar.gz";
sha256 = "0k01hp0q4275fj4rbr1gy64svfraw5w7wvwl08yjhvsnpb1rid11";
};
@@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
doCheck = false; # fails 1 of 4 tests
meta = {
- homepage = https://www.ghostscript.com/jbig2dec.html;
+ homepage = https://www.jbig2dec.com/;
description = "Decoder implementation of the JBIG2 image compression format";
license = stdenv.lib.licenses.gpl2Plus;
platforms = stdenv.lib.platforms.unix;
diff --git a/pkgs/development/libraries/kmsxx/default.nix b/pkgs/development/libraries/kmsxx/default.nix
index 8be8eb713572..d270e2f0678d 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/libguestfs/appliance.nix b/pkgs/development/libraries/libguestfs/appliance.nix
index d47b0902818d..9c2b317ab086 100644
--- a/pkgs/development/libraries/libguestfs/appliance.nix
+++ b/pkgs/development/libraries/libguestfs/appliance.nix
@@ -4,4 +4,8 @@ fetchzip {
name = "libguestfs-appliance-1.38.0";
url = "http://libguestfs.org/download/binaries/appliance/appliance-1.38.0.tar.xz";
sha256 = "15rxwj5qjflizxk7slpbrj9lcwkd2lgm52f5yv101qba4yyn3g76";
+
+ meta = {
+ hydraPlatforms = []; # Hydra fails with "Output limit exceeded"
+ };
}
diff --git a/pkgs/development/libraries/libiio/default.nix b/pkgs/development/libraries/libiio/default.nix
new file mode 100644
index 000000000000..defb17bcd88a
--- /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/libsigcxx/1.2.nix b/pkgs/development/libraries/libsigcxx/1.2.nix
index 9fc6ff86773b..38e5ffcb4de0 100644
--- a/pkgs/development/libraries/libsigcxx/1.2.nix
+++ b/pkgs/development/libraries/libsigcxx/1.2.nix
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
buildInputs = [ m4];
meta = {
- homepage = http://libsigc.sourceforge.net/;
+ homepage = https://libsigcplusplus.github.io/libsigcplusplus/;
description = "A typesafe callback system for standard C++";
branch = "1.2";
platforms = stdenv.lib.platforms.unix;
diff --git a/pkgs/development/libraries/libsigcxx/default.nix b/pkgs/development/libraries/libsigcxx/default.nix
index def5ee0e19a2..8eba5377bc34 100644
--- a/pkgs/development/libraries/libsigcxx/default.nix
+++ b/pkgs/development/libraries/libsigcxx/default.nix
@@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
doCheck = true;
meta = with stdenv.lib; {
- homepage = http://libsigc.sourceforge.net/;
+ homepage = https://libsigcplusplus.github.io/libsigcplusplus/;
description = "A typesafe callback system for standard C++";
license = licenses.lgpl21;
platforms = platforms.all;
diff --git a/pkgs/development/libraries/libsignal-protocol-c/default.nix b/pkgs/development/libraries/libsignal-protocol-c/default.nix
new file mode 100644
index 000000000000..379361a7031e
--- /dev/null
+++ b/pkgs/development/libraries/libsignal-protocol-c/default.nix
@@ -0,0 +1,29 @@
+{ stdenv, fetchFromGitHub, cmake, openssl }:
+
+stdenv.mkDerivation rec {
+ name = "libsignal-protocol-c";
+ version = "2.3.2";
+
+ src = fetchFromGitHub {
+ owner = "signalapp";
+ repo = "libsignal-protocol-c";
+ rev = "v${version}";
+ sha256 = "1qj2w4csy6j9jg1jy66n1qwysx7hgjywk4n35hlqcnh1kpa14k3p";
+ };
+
+ nativeBuildInputs = [ cmake ];
+
+ buildInputs = [ openssl ];
+
+ cmakeFlags = [ "-DBUILD_SHARED_LIBS=ON" ];
+
+ outputs = [ "out" "dev" ];
+
+ meta = with stdenv.lib; {
+ description = "Signal Protocol C Library";
+ homepage = https://github.com/signalapp/libsignal-protocol-c;
+ license = licenses.gpl3;
+ platforms = platforms.all;
+ maintainers = with maintainers; [ orivej ];
+ };
+}
diff --git a/pkgs/development/libraries/libtensorflow/default.nix b/pkgs/development/libraries/libtensorflow/default.nix
index b4e616409c4f..e6cd140c4e4b 100644
--- a/pkgs/development/libraries/libtensorflow/default.nix
+++ b/pkgs/development/libraries/libtensorflow/default.nix
@@ -31,19 +31,19 @@ let
in stdenv.mkDerivation rec {
pname = "libtensorflow";
- version = "1.10.0";
+ version = "1.9.0";
name = "${pname}-${version}";
src = fetchurl {
url = "https://storage.googleapis.com/tensorflow/${pname}/${pname}-${tfType}-${system}-${version}.tar.gz";
sha256 =
if system == "linux-x86_64" then
if cudaSupport
- then "0v66sscxpyixjrf9yjshl001nix233i6chc61akx0kx7ial4l1wn"
- else "11sbpcbgdzj8v17mdppfv7v1fn3nbzkdad60gc42y2j6knjbmwxb"
+ then "1q3mh06x344im25z7r3vgrfksfdsi8fh8ldn6y2mf86h4d11yxc3"
+ else "0l9ps115ng5ffzdwphlqmj3jhidps2v5afppdzrbpzmy41xz0z21"
else if system == "darwin-x86_64" then
if cudaSupport
then unavailable
- else "11p0f77m4wycpc024mh7jx0kbdhgm0wp6ir6dsa8lkcpdb59bn59"
+ else "1qj0v1706w6mczycdsh38h2glyv5d25v62kdn98wxd5rw8f9v657"
else unavailable;
};
diff --git a/pkgs/development/libraries/libwnck/3.x.nix b/pkgs/development/libraries/libwnck/3.x.nix
index f2d05d14d693..8efd908584e1 100644
--- a/pkgs/development/libraries/libwnck/3.x.nix
+++ b/pkgs/development/libraries/libwnck/3.x.nix
@@ -19,8 +19,8 @@ in stdenv.mkDerivation rec{
nativeBuildInputs = [ pkgconfig intltool gobjectIntrospection ];
propagatedBuildInputs = [ libX11 gtk3 ];
- PKG_CONFIG_GOBJECT_INTROSPECTION_1_0_GIRDIR = "${placeholder "dev"}/share/gir-1.0";
- PKG_CONFIG_GOBJECT_INTROSPECTION_1_0_TYPELIBDIR = "${placeholder "out"}/lib/girepository-1.0";
+ PKG_CONFIG_GOBJECT_INTROSPECTION_1_0_GIRDIR = "$(dev)/share/gir-1.0";
+ PKG_CONFIG_GOBJECT_INTROSPECTION_1_0_TYPELIBDIR = "$(out)/lib/girepository-1.0";
passthru = {
updateScript = gnome3.updateScript {
diff --git a/pkgs/development/libraries/mono-addins/default.nix b/pkgs/development/libraries/mono-addins/default.nix
index e68661b44ec3..780f68e7d485 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 000000000000..465a70576356
--- /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/nix-plugins/default.nix b/pkgs/development/libraries/nix-plugins/default.nix
index ff8a54f87f2a..d3a4b21b4b61 100644
--- a/pkgs/development/libraries/nix-plugins/default.nix
+++ b/pkgs/development/libraries/nix-plugins/default.nix
@@ -1,5 +1,5 @@
{ stdenv, fetchFromGitHub, nix, cmake, pkgconfig, boost }:
-let version = "4.0.5"; in
+let version = "5.0.0"; in
stdenv.mkDerivation {
name = "nix-plugins-${version}";
@@ -7,7 +7,7 @@ stdenv.mkDerivation {
owner = "shlevy";
repo = "nix-plugins";
rev = version;
- sha256 = "170f365rnik62fp9wllbqlspr8lf1yb96pmn2z708i2wjlkdnrny";
+ sha256 = "0231j92504vx0f4wax9hwjdni1j4z0g8bx9wbakg6rbghl4svmdv";
};
nativeBuildInputs = [ cmake pkgconfig ];
diff --git a/pkgs/development/libraries/openbsm/default.nix b/pkgs/development/libraries/openbsm/default.nix
index a9559c6abfba..136665425280 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/opencv/3.x.nix b/pkgs/development/libraries/opencv/3.x.nix
index 81d106a2a40c..dd87fa932604 100644
--- a/pkgs/development/libraries/opencv/3.x.nix
+++ b/pkgs/development/libraries/opencv/3.x.nix
@@ -35,20 +35,20 @@
}:
let
- version = "3.4.2";
+ version = "3.4.3";
src = fetchFromGitHub {
owner = "opencv";
repo = "opencv";
rev = version;
- sha256 = "0q752s1ir6iyqbp3pn425fi215fi7bzjl4aa3arvgh6sridda9lx";
+ sha256 = "138q3wiv4g4xvqzsp93xaqayv7kz7bl2vrgppp8jm8w6m25cd4i2";
};
contribSrc = fetchFromGitHub {
owner = "opencv";
repo = "opencv_contrib";
rev = version;
- sha256 = "1fbgbf9xdby9a5yy6bmnkzchdsfii0jagfd373y015cjpr1mrlvz";
+ sha256 = "1f334glf39nk42mpqq6j732h3ql2mpz89jd4mcl678s8n73nfjh2";
};
# Contrib must be built in order to enable Tesseract support:
@@ -145,11 +145,6 @@ stdenv.mkDerivation rec {
cp --no-preserve=mode -r "${contribSrc}/modules" "$NIX_BUILD_TOP/opencv_contrib"
'';
- # TODO: remove the following patch once commit
- # https://github.com/opencv/opencv/commit/e2b5d112909b9dfd764f14833b82e38e4bc2f81f
- # is released.
- patches = [ ./fix-dnn.patch ];
-
# This prevents cmake from using libraries in impure paths (which
# causes build failure on non NixOS)
# Also, work around https://github.com/NixOS/nixpkgs/issues/26304 with
diff --git a/pkgs/development/libraries/opencv/fix-dnn.patch b/pkgs/development/libraries/opencv/fix-dnn.patch
deleted file mode 100644
index 62234a43e461..000000000000
--- a/pkgs/development/libraries/opencv/fix-dnn.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/modules/dnn/src/caffe/caffe_io.cpp b/modules/dnn/src/caffe/caffe_io.cpp
-index 730c752ce..abbce0453 100644
---- a/modules/dnn/src/caffe/caffe_io.cpp
-+++ b/modules/dnn/src/caffe/caffe_io.cpp
-@@ -1120,7 +1120,7 @@ bool ReadProtoFromTextFile(const char* filename, Message* proto) {
- std::ifstream fs(filename, std::ifstream::in);
- CHECK(fs.is_open()) << "Can't open \"" << filename << "\"";
- IstreamInputStream input(&fs);
-- return google::protobuf::TextFormat::Parser(true).Parse(&input, proto);
-+ return google::protobuf::TextFormat::Parser().Parse(&input, proto);
- }
-
- bool ReadProtoFromBinaryFile(const char* filename, Message* proto) {
diff --git a/pkgs/development/libraries/physics/cernlib/default.nix b/pkgs/development/libraries/physics/cernlib/default.nix
index f837d807219f..92d2ab962323 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/pipewire/default.nix b/pkgs/development/libraries/pipewire/default.nix
index e87ed8e48a98..c50fc9fb35c8 100644
--- a/pkgs/development/libraries/pipewire/default.nix
+++ b/pkgs/development/libraries/pipewire/default.nix
@@ -34,7 +34,7 @@ in stdenv.mkDerivation rec {
"-Denable_gstreamer=true"
];
- PKG_CONFIG_SYSTEMD_SYSTEMDUSERUNITDIR = "${placeholder "out"}/lib/systemd/user";
+ PKG_CONFIG_SYSTEMD_SYSTEMDUSERUNITDIR = "lib/systemd/user";
FONTCONFIG_FILE = fontsConf; # Fontconfig error: Cannot load default config file
diff --git a/pkgs/development/libraries/poppler/0.61.nix b/pkgs/development/libraries/poppler/0.61.nix
index 4456cd7ff285..1e86b19ad5af 100644
--- a/pkgs/development/libraries/poppler/0.61.nix
+++ b/pkgs/development/libraries/poppler/0.61.nix
@@ -1,5 +1,5 @@
{ stdenv, lib, fetchurl, cmake, ninja, pkgconfig, libiconv, libintl
-, zlib, curl, cairo, freetype, fontconfig, lcms, libjpeg, openjpeg
+, zlib, curl, cairo, freetype, fontconfig, lcms, libjpeg, openjpeg, fetchpatch
, withData ? true, poppler_data
, qt5Support ? false, qtbase ? null
, introspectionSupport ? false, gobjectIntrospection ? null
@@ -21,6 +21,14 @@ stdenv.mkDerivation rec {
outputs = [ "out" "dev" ];
+ patches = [
+ (fetchpatch {
+ name = "CVE-2018-13988";
+ url = "https://cgit.freedesktop.org/poppler/poppler/patch/?id=004e3c10df0abda214f0c293f9e269fdd979c5ee";
+ sha256 = "1l8713s57xc6g81bldw934rsfm140fqc7ggd50ha5mxdl1b3app2";
+ })
+ ];
+
buildInputs = [ libiconv libintl ] ++ lib.optional withData poppler_data;
# TODO: reduce propagation to necessary libs
diff --git a/pkgs/development/libraries/qt-5/5.11/default.nix b/pkgs/development/libraries/qt-5/5.11/default.nix
index 2a706fc7b6e8..d65fe9d219c0 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 aae15c62d73c..ad54a49e50b7 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 833433fabeca..970ee2e5c807 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 e18564aaabe2..84a9d30918b1 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/qtkeychain/0001-Fixes-build-with-Qt4.patch b/pkgs/development/libraries/qtkeychain/0001-Fixes-build-with-Qt4.patch
new file mode 100644
index 000000000000..4cd7214e61e2
--- /dev/null
+++ b/pkgs/development/libraries/qtkeychain/0001-Fixes-build-with-Qt4.patch
@@ -0,0 +1,25 @@
+From f72e5b67ee1137a0ccd57db5d077a197b01b3cdc Mon Sep 17 00:00:00 2001
+From: Samuel Dionne-Riel
+Date: Tue, 4 Sep 2018 23:19:29 -0400
+Subject: [PATCH] Fixes build with Qt4.
+
+---
+ keychain_unix.cpp | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/keychain_unix.cpp b/keychain_unix.cpp
+index 30b26c3..b27ebef 100644
+--- a/keychain_unix.cpp
++++ b/keychain_unix.cpp
+@@ -91,7 +91,7 @@ static bool isKwallet5Available()
+ // a wallet can be opened.
+
+ iface.setTimeout(500);
+- QDBusMessage reply = iface.call(QStringLiteral("networkWallet"));
++ QDBusMessage reply = iface.call("networkWallet");
+ return reply.type() == QDBusMessage::ReplyMessage;
+ }
+
+--
+2.16.4
+
diff --git a/pkgs/development/libraries/qtkeychain/default.nix b/pkgs/development/libraries/qtkeychain/default.nix
index 220c6241096d..2b3c88d58860 100644
--- a/pkgs/development/libraries/qtkeychain/default.nix
+++ b/pkgs/development/libraries/qtkeychain/default.nix
@@ -18,6 +18,8 @@ stdenv.mkDerivation rec {
sha256 = "0h4wgngn2yl35hapbjs24amkjfbzsvnna4ixfhn87snjnq5lmjbc"; # v0.9.1
};
+ patches = if withQt5 then null else [ ./0001-Fixes-build-with-Qt4.patch ];
+
cmakeFlags = [ "-DQT_TRANSLATIONS_DIR=share/qt/translations" ]
++ stdenv.lib.optional stdenv.isDarwin [
# correctly detect the compiler
diff --git a/pkgs/development/libraries/science/math/atlas/default.nix b/pkgs/development/libraries/science/math/atlas/default.nix
index 8b740bdb6f6d..fb90ed754da9 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/openblas/default.nix b/pkgs/development/libraries/science/math/openblas/default.nix
index 3f271d015027..2efabcdd05e0 100644
--- a/pkgs/development/libraries/science/math/openblas/default.nix
+++ b/pkgs/development/libraries/science/math/openblas/default.nix
@@ -140,7 +140,7 @@ stdenv.mkDerivation rec {
# Write pkgconfig aliases. Upstream report:
# https://github.com/xianyi/OpenBLAS/issues/1740
for alias in blas cblas lapack; do
- cat < $out/lib/pkgconfig/openblas-$alias.pc
+ cat < $out/lib/pkgconfig/$alias.pc
Name: $alias
Version: ${version}
Description: $alias provided by the OpenBLAS package.
diff --git a/pkgs/development/libraries/science/math/scs/default.nix b/pkgs/development/libraries/science/math/scs/default.nix
index 0539083e823c..f9d1a84b1f03 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/science/math/sympow/default.nix b/pkgs/development/libraries/science/math/sympow/default.nix
index f421755b6182..c34701e3f913 100644
--- a/pkgs/development/libraries/science/math/sympow/default.nix
+++ b/pkgs/development/libraries/science/math/sympow/default.nix
@@ -34,11 +34,13 @@ stdenv.mkDerivation rec {
makeWrapper "$out/share/sympow/sympow" "$out/bin/sympow" \
--run 'export SYMPOW_LOCAL="$HOME/.local/share/sympow"' \
--run 'if [ ! -d "$SYMPOW_LOCAL" ]; then
- mkdir -p "$SYMPOW_LOCAL"
- cp -r ${placeholder "out"}/share/sympow/* "$SYMPOW_LOCAL"
+ mkdir -p "$SYMPOW_LOCAL"
+ cp -r @out@/share/sympow/* "$SYMPOW_LOCAL"
chmod -R +xw "$SYMPOW_LOCAL"
fi' \
--run 'cd "$SYMPOW_LOCAL"'
+ substituteInPlace $out/bin/sympow --subst-var out
+
runHook postInstall
'';
diff --git a/pkgs/development/libraries/spdlog/default.nix b/pkgs/development/libraries/spdlog/default.nix
index 1c9e67f87675..a96cd455f554 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/spice-gtk/default.nix b/pkgs/development/libraries/spice-gtk/default.nix
index f5258c1cd6d8..f4f10978ec13 100644
--- a/pkgs/development/libraries/spice-gtk/default.nix
+++ b/pkgs/development/libraries/spice-gtk/default.nix
@@ -52,7 +52,7 @@ in stdenv.mkDerivation rec {
nativeBuildInputs = [ pkgconfig gettext libsoup autoreconfHook vala gobjectIntrospection ];
- PKG_CONFIG_POLKIT_GOBJECT_1_POLICYDIR = "${placeholder "out"}/share/polkit-1/actions";
+ PKG_CONFIG_POLKIT_GOBJECT_1_POLICYDIR = "$(out)/share/polkit-1/actions";
configureFlags = [
"--with-gtk3"
diff --git a/pkgs/development/libraries/wolfssl/default.nix b/pkgs/development/libraries/wolfssl/default.nix
index 2b69f6283d60..30291a180226 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/lisp-modules/lisp-packages.nix b/pkgs/development/lisp-modules/lisp-packages.nix
index f208b47234c6..5769ee94a1be 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 000000000000..e2c632b8ebad
--- /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 22aa818f8756..9b9486e9758c 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 c90a9e091920..9daab46784d3 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 4612e6175b91..65df45d95a50 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 f0fc5d4d0c0f..c5305587a029 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 6dbff1d6e56c..ec4e31013f92 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 ecc1634bfce0..86bdb36c8d23 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 02e6e2bf6045..f3e64cb965e4 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 c8f34e0fa17f..a9808173b626 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 a420c22054f6..531d429df244 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 42a7bd595853..a413743eb8d5 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 d72a9c69ac0f..377c8c2209bc 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 f7392b880d11..2129c7f83f7a 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 90638ed56f16..e5a2a0bc7fd3 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 b0fe8888dcfc..56ccab7b5cd5 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 995ef9bc745e..40c1ac7d6a9a 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 0321572e72a6..61a35f2b58c6 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 d4ce8531291e..1f58be6c09e9 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 825fea4eb906..dfabda0428f0 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 1aced09d34fd..c950fa292a8b 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 67468edbb6cb..8967b0970c56 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 f546e4711acc..e8034b11c237 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 60e38a7de720..a0443cb5af08 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 7853d5a279a2..e65c0a03ddc5 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 cbdf3a471461..3f56cf3dfaee 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 658ffdb51b82..15fd56107c82 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 4434e711d9de..6d284b7b0120 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 1b78d0d28983..750da99d5d6a 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 a757b3d4a8a0..af0e917425a1 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 000000000000..252f9794e769
--- /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 a4a66ecfa64f..d5163cabe045 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 be88069fd5d9..1d081fbef581 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 b810de3fd1c8..8b2e2c70453a 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 08e5ff71cc5c..0b2828d06dfc 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 ec7599f2bd3f..a13537d7e90f 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 29c90369244a..f55ccecadc61 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 76f50463a6ae..3f6d6ae32ac6 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 bd2b0ff19bdb..685e81283688 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 1ae6fa0f4ec4..e1fb59658528 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 bb5ab940638a..f4941aa80cd6 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 ba523ae837d7..c83b29939687 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 fbe06a179fdd..69ada2ce80a3 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 2ad018e5549c..3316f59447d7 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 6dfa61634f2b..218107e95d6a 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 bb9558fda51e..9387806255ac 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 6e8e85e72abc..808914068a35 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 e75961dd9ace..2de381f44b8e 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 d3111b18b22b..2e392928f495 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 7ee5f91a1580..541f1c6a169d 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 99792023bdd0..82c8603d4a45 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 7b37e5709e86..08b6d35a1fb9 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 2aa5c0749250..4a23cbf51ee7 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 8061f3844e0b..3d259fc5b6c5 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 f85b128652d0..f276ec72736d 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 62a3ae2bb7d1..e5cbad3e9e83 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 79f2d38ef10d..94edb06e6aee 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 c0acbc2f01fc..a98028e0c060 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 29fcd359f6b6..3478ac8488b4 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 9260b06dd830..fdcda10a275f 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 b44c0c8a9874..a3ddc2fd953e 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 62197234305a..8d21f88cbf82 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 1ca094d139db..ad335774cbb5 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 006361ed80c1..db25e6ae5347 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 c34d79f3d13d..4f6842606b45 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 c65d95d9ef7a..953dd0a58a4a 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 5647b9a92707..d72e0839d1e8 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 3c289fefa9ab..6334804c4f70 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 29460307e698..a8cfc070bf99 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 e1d6a1477a7b..82d06b1c93b2 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 67636d3f6cf3..4e7c84566a0a 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 d706bc5bad1a..ea6adac9e9f8 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 5c1f90220eb3..e636df0805e7 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 2bde901ad43e..0a1591d7c424 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 c90b252313bf..ffa2e595c26a 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 41ead034791a..25d535176a6a 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 8ed7c1a44993..d5be4be7daf4 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 d55f7700092c..9056cfbdcca8 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 07b1498f2e3f..b1e89b3eef8a 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 9cc6338c8b89..17a56c09b7e8 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 883e648a2f68..bb39c74c9625 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 6819e4b25713..9734118526c6 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 a772694b9830..9a4afce3280f 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 5efc57669552..1a562c2288bb 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 9a285fea2f18..edb01bd2fc52 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 e044f097701d..4214779af320 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 6946141f1121..f06c0d7ebf57 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 1af66736f30f..8cc04c2c64ac 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 753f21dbcb96..c925382d81d4 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 0ac190993d80..1986f7c88f7a 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 afb8b3885681..fdaa07109b49 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 3a4b05e05269..6c4564967320 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 b4b4f4543a10..6d02b9764701 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 11b9351c03ad..6a4751f799ea 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 cc5c23faf862..4a36b6563534 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 8c4afa9697d8..6db21bf9005e 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 c70c3f2e1e12..b9ab71744c3a 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 733185e2b26f..c7031f4aa3fc 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 090aa670ad9e..74e5d7e97e95 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 91493d7431e8..face797fe2a3 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 71d974d9711b..8a126d4fd986 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 9eba1e15b799..b3d50b2fb075 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/node-packages/default-v8.nix b/pkgs/development/node-packages/default-v8.nix
index 4eb22d5cbc38..0144400859ab 100644
--- a/pkgs/development/node-packages/default-v8.nix
+++ b/pkgs/development/node-packages/default-v8.nix
@@ -78,6 +78,12 @@ nodePackages // {
'';
};
+ statsd = nodePackages.statsd.override {
+ # broken with node v8, dead upstream,
+ # see #45946 and https://github.com/etsy/statsd/issues/646
+ meta.broken = true;
+ };
+
webdrvr = nodePackages.webdrvr.override {
buildInputs = [ pkgs.phantomjs ];
diff --git a/pkgs/development/python-modules/Flask-PyMongo/default.nix b/pkgs/development/python-modules/Flask-PyMongo/default.nix
index 862fd84c4921..7c37bdaddd51 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/alot/default.nix b/pkgs/development/python-modules/alot/default.nix
index dd06d4dde7a6..7c4e15f85683 100644
--- a/pkgs/development/python-modules/alot/default.nix
+++ b/pkgs/development/python-modules/alot/default.nix
@@ -47,6 +47,8 @@ buildPythonPackage rec {
mkdir -p $out/share/{applications,alot}
cp -r extra/themes $out/share/alot
+ install -D extra/completion/alot-completion.zsh $out/share/zsh/site-functions/_alot
+
sed "s,/usr/bin,$out/bin,g" extra/alot.desktop > $out/share/applications/alot.desktop
'';
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 000000000000..9900f86567e0
--- /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 c96d305a7f61..665d5347bbaf 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/circus/default.nix b/pkgs/development/python-modules/circus/default.nix
index 0a82238b703e..a4f96ccaf68e 100644
--- a/pkgs/development/python-modules/circus/default.nix
+++ b/pkgs/development/python-modules/circus/default.nix
@@ -1,4 +1,4 @@
-{ buildPythonPackage, fetchPypi
+{ stdenv, buildPythonPackage, fetchPypi
, iowait, psutil, pyzmq, tornado, mock }:
buildPythonPackage rec {
@@ -10,7 +10,22 @@ buildPythonPackage rec {
sha256 = "d1603cf4c4f620ce6593d3d2a67fad25bf0242183ea24110d8bb1c8079c55d1b";
};
+ postPatch = ''
+ # relax version restrictions to fix build
+ substituteInPlace setup.py \
+ --replace "pyzmq>=13.1.0,<17.0" "pyzmq>13.1.0" \
+ --replace "tornado>=3.0,<5.0" "tornado>=3.0"
+ '';
+
+ checkInputs = [ mock ];
+
doCheck = false; # weird error
- propagatedBuildInputs = [ iowait psutil pyzmq tornado mock ];
+ propagatedBuildInputs = [ iowait psutil pyzmq tornado ];
+
+ meta = with stdenv.lib; {
+ description = "A process and socket manager";
+ homepage = "https://github.circus.com/circus-tent/circus";
+ license = licenses.asl20;
+ };
}
diff --git a/pkgs/development/python-modules/confluent-kafka/default.nix b/pkgs/development/python-modules/confluent-kafka/default.nix
index 0638ea3a36d2..a0183e4595c4 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/cozy/default.nix b/pkgs/development/python-modules/cozy/default.nix
index 0feca2773b37..7515891456e9 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 7ead1cacfa66..258fc746e4b5 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/dendropy/default.nix b/pkgs/development/python-modules/dendropy/default.nix
index 6220a1e15f0c..6409a5d12e59 100644
--- a/pkgs/development/python-modules/dendropy/default.nix
+++ b/pkgs/development/python-modules/dendropy/default.nix
@@ -1,29 +1,33 @@
{ lib
, pkgs
, buildPythonPackage
-, fetchPypi
+, fetchFromGitHub
+, pytest
}:
buildPythonPackage rec {
pname = "DendroPy";
version = "4.4.0";
- src = fetchPypi {
- inherit pname version;
- sha256 = "f0a0e2ce78b3ed213d6c1791332d57778b7f63d602430c1548a5d822acf2799c";
+ # tests are incorrectly packaged in pypi version
+ src = fetchFromGitHub {
+ owner = "jeetsukumaran";
+ repo = pname;
+ rev = "v${version}";
+ sha256 = "097hfyv2kaf4x92i4rjx0paw2cncxap48qivv8zxng4z7nhid0x9";
};
- prePatch = ''
- # Test removed/disabled and reported upstream: https://github.com/jeetsukumaran/DendroPy/issues/74
- rm -f dendropy/test/test_dataio_nexml_reader_tree_list.py
- '';
-
preCheck = ''
# Needed for unicode python tests
export LC_ALL="en_US.UTF-8"
+ cd tests # to find the 'support' module
'';
- checkInputs = [ pkgs.glibcLocales ];
+ checkInputs = [ pytest pkgs.glibcLocales ];
+
+ checkPhase = ''
+ pytest -k 'not test_dataio_nexml_reader_tree_list and not test_pscores_with'
+ '';
meta = {
homepage = http://dendropy.org/;
diff --git a/pkgs/development/python-modules/django-raster/default.nix b/pkgs/development/python-modules/django-raster/default.nix
index 19ef783fe759..39634b8d293a 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 000000000000..ce5fce1b1cba
--- /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 000000000000..070923c83855
--- /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 000000000000..cae3f34f0c9f
--- /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 b8daa5304c77..b145f1b2e2b8 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 e6d347b440d3..0e6ab256d0d8 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-assets/default.nix b/pkgs/development/python-modules/flask-assets/default.nix
index 7f3b6367b6ee..a8e454f4a2cc 100644
--- a/pkgs/development/python-modules/flask-assets/default.nix
+++ b/pkgs/development/python-modules/flask-assets/default.nix
@@ -9,6 +9,10 @@ buildPythonPackage rec {
sha256 = "0ivqsihk994rxw58vdgzrx4d77d7lpzjm4qxb38hjdgvi5xm4cb0";
};
+ patchPhase = ''
+ substituteInPlace tests/test_integration.py --replace 'static_path=' 'static_url_path='
+ '';
+
propagatedBuildInputs = [ flask webassets flask_script nose ];
meta = with lib; {
diff --git a/pkgs/development/python-modules/flask-ldap-login/default.nix b/pkgs/development/python-modules/flask-ldap-login/default.nix
index b95e694a232f..99b57dac816f 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/genanki/default.nix b/pkgs/development/python-modules/genanki/default.nix
new file mode 100644
index 000000000000..bcc462e7237d
--- /dev/null
+++ b/pkgs/development/python-modules/genanki/default.nix
@@ -0,0 +1,38 @@
+{ stdenv, buildPythonPackage, fetchPypi, isPy3k
+, cached-property, frozendict, pystache, pyyaml, pytest, pytestrunner
+}:
+
+buildPythonPackage rec {
+ pname = "genanki";
+ version = "0.6.0";
+
+ src = fetchPypi {
+ inherit pname version;
+ sha256 = "0xj8yd3acl8h457sh42balvcd0z4mg5idd4q63f7qlfzc5wgbb74";
+ };
+
+ propagatedBuildInputs = [
+ pytestrunner
+ cached-property
+ frozendict
+ pystache
+ pyyaml
+ ];
+
+ checkInputs = [ pytest ];
+
+ disabled = !isPy3k;
+
+ # relies on upstream anki
+ doCheck = false;
+ checkPhase = ''
+ py.test
+ '';
+
+ meta = with stdenv.lib; {
+ homepage = http://github.com/kerrickstaley/genanki;
+ description = "Generate Anki decks programmatically";
+ license = licenses.mit;
+ maintainers = with maintainers; [ teto ];
+ };
+}
diff --git a/pkgs/development/python-modules/geopandas/default.nix b/pkgs/development/python-modules/geopandas/default.nix
index cab25a60f3b4..976df0952615 100644
--- a/pkgs/development/python-modules/geopandas/default.nix
+++ b/pkgs/development/python-modules/geopandas/default.nix
@@ -1,23 +1,23 @@
{ stdenv, buildPythonPackage, fetchFromGitHub
, pandas, shapely, fiona, descartes, pyproj
-, pytest }:
+, pytest, Rtree }:
buildPythonPackage rec {
pname = "geopandas";
- version = "0.3.0";
+ version = "0.4.0";
name = pname + "-" + version;
src = fetchFromGitHub {
owner = "geopandas";
repo = "geopandas";
rev = "v${version}";
- sha256 = "0maafafr7sjjmlg2f19bizg06c8a5z5igmbcgq6kgmi7rklx8xxz";
+ sha256 = "025zpgck5pnmidvzk0805pr345rd7k6z66qb2m34gjh1814xjkhv";
};
- checkInputs = [ pytest ];
+ checkInputs = [ pytest Rtree ];
checkPhase = ''
- py.test geopandas
+ py.test geopandas -m "not web"
'';
propagatedBuildInputs = [
diff --git a/pkgs/development/python-modules/joblib/default.nix b/pkgs/development/python-modules/joblib/default.nix
index 7164fd1197b8..91406c5331fb 100644
--- a/pkgs/development/python-modules/joblib/default.nix
+++ b/pkgs/development/python-modules/joblib/default.nix
@@ -18,7 +18,9 @@ buildPythonPackage rec {
checkInputs = [ sphinx numpydoc pytest ];
checkPhase = ''
- py.test -k 'not test_disk_used and not test_nested_parallel_warnings' joblib/test
+ py.test -k 'not test_disk_used and \
+ not test_nested_parallel_warnings and \
+ not test_nested_parallelism_limit' joblib/test
'';
meta = {
diff --git a/pkgs/development/python-modules/jupyterlab_launcher/default.nix b/pkgs/development/python-modules/jupyterlab_launcher/default.nix
index 1831b47ee792..af29b9155a58 100644
--- a/pkgs/development/python-modules/jupyterlab_launcher/default.nix
+++ b/pkgs/development/python-modules/jupyterlab_launcher/default.nix
@@ -1,7 +1,8 @@
-{ lib, buildPythonPackage, fetchPypi, jsonschema, notebook }:
+{ lib, buildPythonPackage, fetchPypi, jsonschema, notebook, pythonOlder }:
buildPythonPackage rec {
pname = "jupyterlab_launcher";
version = "0.13.1";
+ disabled = pythonOlder "3.5";
src = fetchPypi {
inherit pname version;
diff --git a/pkgs/development/python-modules/keras/default.nix b/pkgs/development/python-modules/keras/default.nix
index ea699c9c04a9..43f3bd935d24 100644
--- a/pkgs/development/python-modules/keras/default.nix
+++ b/pkgs/development/python-modules/keras/default.nix
@@ -25,6 +25,14 @@ buildPythonPackage rec {
keras-applications keras-preprocessing
];
+ # Keras 2.2.2 expects older versions of keras_applications
+ # and keras_preprocessing. These substitutions can be removed
+ # for for the next Keras release.
+ postPatch = ''
+ substituteInPlace setup.py --replace "keras_applications==1.0.4" "keras_applications==1.0.5"
+ substituteInPlace setup.py --replace "keras_preprocessing==1.0.2" "keras_preprocessing==1.0.3"
+ '';
+
# Couldn't get tests working
doCheck = false;
diff --git a/pkgs/development/python-modules/kubernetes/default.nix b/pkgs/development/python-modules/kubernetes/default.nix
index 030766eb6982..55d29729db83 100644
--- a/pkgs/development/python-modules/kubernetes/default.nix
+++ b/pkgs/development/python-modules/kubernetes/default.nix
@@ -1,5 +1,5 @@
{ stdenv, buildPythonPackage, fetchPypi, pythonAtLeast,
- ipaddress, websocket_client, urllib3, pyyaml, requests_oauthlib, python-dateutil, google_auth,
+ ipaddress, websocket_client, urllib3, pyyaml, requests_oauthlib, python-dateutil, google_auth, adal,
isort, pytest, coverage, mock, sphinx, autopep8, pep8, codecov, recommonmark, nose }:
buildPythonPackage rec {
@@ -27,7 +27,7 @@ buildPythonPackage rec {
};
checkInputs = [ isort coverage pytest mock sphinx autopep8 pep8 codecov recommonmark nose ];
- propagatedBuildInputs = [ ipaddress websocket_client urllib3 pyyaml requests_oauthlib python-dateutil google_auth ];
+ propagatedBuildInputs = [ ipaddress websocket_client urllib3 pyyaml requests_oauthlib python-dateutil google_auth adal ];
meta = with stdenv.lib; {
description = "Kubernetes python client";
diff --git a/pkgs/development/python-modules/ldappool/default.nix b/pkgs/development/python-modules/ldappool/default.nix
index a09fa75ce349..02d10b832ff2 100644
--- a/pkgs/development/python-modules/ldappool/default.nix
+++ b/pkgs/development/python-modules/ldappool/default.nix
@@ -3,12 +3,12 @@
buildPythonPackage rec {
name = "ldappool-${version}";
- version = "2.3.0";
+ version = "2.2.0";
src = fetchPypi {
pname = "ldappool";
inherit version;
- sha256 = "899d38e891372981166350c813ff5ce2ad8ac383311edccda8102362c1d60952";
+ sha256 = "1akmzf51cjfvmd0nvvm562z1w9vq45zsx6fa72kraqgsgxhnrhqz";
};
nativeBuildInputs = [ pbr ];
diff --git a/pkgs/development/python-modules/ledgerblue/default.nix b/pkgs/development/python-modules/ledgerblue/default.nix
index 4f6c2a96c566..d324afcc647a 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 950a0dd5ba6f..f70d538bb8d0 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/libnacl/default.nix b/pkgs/development/python-modules/libnacl/default.nix
index a8acb4dc9696..c575e5594be3 100644
--- a/pkgs/development/python-modules/libnacl/default.nix
+++ b/pkgs/development/python-modules/libnacl/default.nix
@@ -14,8 +14,9 @@ buildPythonPackage rec {
buildInputs = [ pytest ];
propagatedBuildInputs = [ libsodium ];
- postPatch = ''
- substituteInPlace "./libnacl/__init__.py" --replace "ctypes.cdll.LoadLibrary('libsodium.so')" "ctypes.cdll.LoadLibrary('${libsodium}/lib/libsodium.so')"
+ postPatch =
+ let soext = stdenv.hostPlatform.extensions.sharedLibrary; in ''
+ substituteInPlace "./libnacl/__init__.py" --replace "ctypes.cdll.LoadLibrary('libsodium${soext}')" "ctypes.cdll.LoadLibrary('${libsodium}/lib/libsodium${soext}')"
'';
checkPhase = ''
@@ -27,6 +28,6 @@ buildPythonPackage rec {
description = "Python bindings for libsodium based on ctypes";
homepage = https://pypi.python.org/pypi/libnacl;
license = licenses.asl20;
- platforms = platforms.linux;
+ platforms = platforms.unix;
};
}
diff --git a/pkgs/development/python-modules/libusb1/default.nix b/pkgs/development/python-modules/libusb1/default.nix
index 245ea90038ea..8a9b5da68ef9 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/locustio/default.nix b/pkgs/development/python-modules/locustio/default.nix
index c3e27c8b36a0..18875f840644 100644
--- a/pkgs/development/python-modules/locustio/default.nix
+++ b/pkgs/development/python-modules/locustio/default.nix
@@ -1,8 +1,8 @@
{ buildPythonPackage
-, fetchPypi
+, fetchFromGitHub
, mock
, unittest2
-, msgpack-python
+, msgpack
, requests
, flask
, gevent
@@ -11,18 +11,16 @@
buildPythonPackage rec {
pname = "locustio";
- version = "0.8.1";
+ version = "0.9.0";
- src = fetchPypi {
- inherit pname version;
- sha256 = "64583987ba1c330bb071aee3e29d2eedbfb7c8b342fa064bfb74fafcff660d61";
+ src = fetchFromGitHub {
+ owner = "locustio";
+ repo = "locust";
+ rev = "${version}";
+ sha256 = "1645d63ig4ymw716b6h53bhmjqqc13p9r95k1xfx66ck6vdqnisd";
};
- patchPhase = ''
- sed -i s/"pyzmq=="/"pyzmq>="/ setup.py
- '';
-
- propagatedBuildInputs = [ msgpack-python requests flask gevent pyzmq ];
+ propagatedBuildInputs = [ msgpack requests flask gevent pyzmq ];
buildInputs = [ mock unittest2 ];
meta = {
diff --git a/pkgs/development/python-modules/mahotas/default.nix b/pkgs/development/python-modules/mahotas/default.nix
new file mode 100644
index 000000000000..a7e92e0b5b8e
--- /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 000000000000..f19bd329e662
--- /dev/null
+++ b/pkgs/development/python-modules/mahotas/disable-impure-tests.patch
@@ -0,0 +1,76 @@
+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/mahotas/tests/test_moments.py b/mahotas/tests/test_moments.py
+index 686c7c3..ba3487b 100644
+--- a/mahotas/tests/test_moments.py
++++ b/mahotas/tests/test_moments.py
+@@ -1,6 +1,7 @@
+ import numpy as np
+ import mahotas as mh
+ from mahotas.features.moments import moments
++from nose.tools import nottest
+
+ def _slow(A, p0, p1, cm):
+ c0,c1 = cm
+@@ -28,7 +29,7 @@ def test_against_slow():
+ yield perform, 1, 2, (0, 0), A
+ yield perform, 1, 0, (0, 0), A
+
+-
++@nottest
+ def test_normalize():
+ A,B = np.meshgrid(np.arange(128),np.arange(128))
+ for p0,p1 in [(1,1), (1,2), (2,1), (2,2)]:
+diff --git a/mahotas/tests/test_texture.py b/mahotas/tests/test_texture.py
+index 7e101ba..af1305d 100644
+--- a/mahotas/tests/test_texture.py
++++ b/mahotas/tests/test_texture.py
+@@ -2,7 +2,7 @@ import numpy as np
+ from mahotas.features import texture
+ import mahotas as mh
+ import mahotas.features._texture
+-from nose.tools import raises
++from nose.tools import raises, nottest
+
+ def test__cooccurence():
+ cooccurence = mahotas.features._texture.cooccurence
+@@ -149,6 +149,7 @@ def test_float_haralick():
+ A[2,2]=12
+ texture.haralick(A)
+
++@nottest
+ def test_haralick3d():
+ np.random.seed(22)
+ img = mahotas.stretch(255*np.random.rand(20,20,4))
diff --git a/pkgs/development/python-modules/ncclient/default.nix b/pkgs/development/python-modules/ncclient/default.nix
index 9dc7710ff28f..9933e849d0be 100644
--- a/pkgs/development/python-modules/ncclient/default.nix
+++ b/pkgs/development/python-modules/ncclient/default.nix
@@ -2,6 +2,7 @@
, buildPythonPackage
, fetchPypi
, paramiko
+, selectors2
, lxml
, libxml2
, libxslt
@@ -21,7 +22,7 @@ buildPythonPackage rec {
checkInputs = [ nose rednose ];
propagatedBuildInputs = [
- paramiko lxml libxml2 libxslt
+ paramiko lxml libxml2 libxslt selectors2
];
checkPhase = ''
diff --git a/pkgs/development/python-modules/nilearn/default.nix b/pkgs/development/python-modules/nilearn/default.nix
index 93871d9a9a7e..32ec4b74509d 100644
--- a/pkgs/development/python-modules/nilearn/default.nix
+++ b/pkgs/development/python-modules/nilearn/default.nix
@@ -11,9 +11,14 @@ 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 \
+ -e test_clean_detrending -e test_high_variance_confounds
+ '';
- buildInputs = [ nose ];
+ checkInputs = [ nose ];
propagatedBuildInputs = [
matplotlib
diff --git a/pkgs/development/python-modules/nipype/default.nix b/pkgs/development/python-modules/nipype/default.nix
index 8b0ee06b3495..a092123da826 100644
--- a/pkgs/development/python-modules/nipype/default.nix
+++ b/pkgs/development/python-modules/nipype/default.nix
@@ -18,6 +18,8 @@
, psutil
, pydot
, pytest
+, pytest_xdist
+, pytest-forked
, scipy
, simplejson
, traits
@@ -47,8 +49,6 @@ buildPythonPackage rec {
postPatch = ''
substituteInPlace nipype/interfaces/base/tests/test_core.py \
--replace "/usr/bin/env bash" "${bash}/bin/bash"
-
- rm pytest.ini
'';
propagatedBuildInputs = [
@@ -56,7 +56,6 @@ buildPythonPackage rec {
dateutil
funcsigs
future
- futures
networkx
nibabel
numpy
@@ -70,9 +69,10 @@ buildPythonPackage rec {
xvfbwrapper
] ++ stdenv.lib.optional (!isPy3k) [
configparser
+ futures
];
- checkInputs = [ pytest mock pytestcov codecov which glibcLocales ];
+ checkInputs = [ pytest mock pytestcov pytest_xdist pytest-forked codecov which glibcLocales ];
checkPhase = ''
LC_ALL="en_US.UTF-8" py.test -v --doctest-modules nipype
diff --git a/pkgs/development/python-modules/ordered-set/default.nix b/pkgs/development/python-modules/ordered-set/default.nix
index bf20f7827be3..4044ad3f2fd1 100644
--- a/pkgs/development/python-modules/ordered-set/default.nix
+++ b/pkgs/development/python-modules/ordered-set/default.nix
@@ -1,10 +1,10 @@
-{ buildPythonPackage, fetchPypi, lib, pytest }:
+{ buildPythonPackage, fetchPypi, lib, pytest, pytestrunner }:
buildPythonPackage rec {
pname = "ordered-set";
version = "3.0.1";
- buildInputs = [ pytest ];
+ buildInputs = [ pytest pytestrunner ];
src = fetchPypi {
inherit pname version;
@@ -21,6 +21,3 @@ buildPythonPackage rec {
maintainers = [ lib.maintainers.MostAwesomeDude ];
};
}
-
-
-
diff --git a/pkgs/development/python-modules/persistent/default.nix b/pkgs/development/python-modules/persistent/default.nix
index 542a68728af1..721385f3ed6a 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/phonopy/default.nix b/pkgs/development/python-modules/phonopy/default.nix
index cf15ccc18fce..903b2b90c300 100644
--- a/pkgs/development/python-modules/phonopy/default.nix
+++ b/pkgs/development/python-modules/phonopy/default.nix
@@ -10,9 +10,12 @@ buildPythonPackage rec {
};
propagatedBuildInputs = [ numpy pyyaml matplotlib h5py ];
-
+
checkPhase = ''
- cd test/phonopy
+ cd test
+ # dynamic structure factor test ocassionally fails do to roundoff
+ # see issue https://github.com/atztogo/phonopy/issues/79
+ rm spectrum/test_dynamic_structure_factor.py
${python.interpreter} -m unittest discover -b
cd ../..
'';
@@ -24,4 +27,3 @@ buildPythonPackage rec {
maintainers = with maintainers; [ psyanticy ];
};
}
-
diff --git a/pkgs/development/python-modules/py3exiv2/default.nix b/pkgs/development/python-modules/py3exiv2/default.nix
index d8633488102b..4c6ca0bad338 100644
--- a/pkgs/development/python-modules/py3exiv2/default.nix
+++ b/pkgs/development/python-modules/py3exiv2/default.nix
@@ -1,4 +1,4 @@
-{ buildPythonPackage, isPy3k, fetchPypi, stdenv, exiv2, boost, libcxx }:
+{ buildPythonPackage, isPy3k, fetchPypi, stdenv, exiv2, boost, libcxx, substituteAll, python }:
buildPythonPackage rec {
pname = "py3exiv2";
@@ -16,7 +16,12 @@ buildPythonPackage rec {
NIX_CFLAGS_COMPILE = stdenv.lib.optionalString stdenv.isDarwin "-I${libcxx}/include/c++/v1";
# fix broken libboost_python3 detection
- patches = [ ./setup.patch ];
+ patches = [
+ (substituteAll {
+ src = ./setup.patch;
+ version = "3${stdenv.lib.versions.minor python.version}";
+ })
+ ];
meta = {
homepage = "https://launchpad.net/py3exiv2";
diff --git a/pkgs/development/python-modules/py3exiv2/setup.patch b/pkgs/development/python-modules/py3exiv2/setup.patch
index bb4b11523479..8b0619c5bc5f 100644
--- a/pkgs/development/python-modules/py3exiv2/setup.patch
+++ b/pkgs/development/python-modules/py3exiv2/setup.patch
@@ -5,7 +5,7 @@
return l.replace('libboost', 'boost')
-libboost = get_libboost_name()
-+libboost = 'boost_python3'
++libboost = 'boost_python@version@'
setup(
name='py3exiv2',
diff --git a/pkgs/development/python-modules/py3status/default.nix b/pkgs/development/python-modules/py3status/default.nix
index 8a7dcc63f572..fd42faaad213 100644
--- a/pkgs/development/python-modules/py3status/default.nix
+++ b/pkgs/development/python-modules/py3status/default.nix
@@ -1,6 +1,7 @@
{ stdenv
, buildPythonPackage
, fetchPypi
+, fetchpatch
, requests
, pytz
, tzlocal
@@ -19,10 +20,18 @@
buildPythonPackage rec {
pname = "py3status";
version = "3.12";
+
src = fetchPypi {
inherit pname version;
sha256 = "c9ef49f72c2d83976d2841ab7e70faee3c77f4d7dbb2d3390ef0f0509473ea9a";
};
+
+ # ImportError: cannot import name '_to_ascii'
+ patches = fetchpatch {
+ url = "${meta.homepage}/commit/8a48e01cb68b514b532f56037e4f5a6c19662de5.patch";
+ sha256 = "0v1yja5lvdjk6vh13lvh07n7aw5hjcy7v9lrs2dfb0y0cjw4kx9n";
+ };
+
doCheck = false;
propagatedBuildInputs = [ pytz requests tzlocal ];
buildInputs = [ file ];
diff --git a/pkgs/development/python-modules/pycaption/default.nix b/pkgs/development/python-modules/pycaption/default.nix
index d4ed6088409b..468011e2a807 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 28a76da4bd96..0770c78b674b 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 58c56db5b8a5..000000000000
--- 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 cfb575c7675e..64d547ce97ed 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/pyftgl/default.nix b/pkgs/development/python-modules/pyftgl/default.nix
index a85837472255..1163f007b092 100644
--- a/pkgs/development/python-modules/pyftgl/default.nix
+++ b/pkgs/development/python-modules/pyftgl/default.nix
@@ -1,5 +1,13 @@
-{ stdenv, buildPythonPackage, fetchFromGitHub, isPy3k
-, boost, freetype, ftgl, libGLU_combined }:
+{ lib, buildPythonPackage, fetchFromGitHub, isPy3k
+, boost, freetype, ftgl, libGLU_combined
+, python
+}:
+
+let
+
+ pythonVersion = with lib.versions; "${major python.version}${minor python.version}";
+
+in
buildPythonPackage rec {
pname = "pyftgl";
@@ -13,13 +21,13 @@ buildPythonPackage rec {
sha256 = "12zcjv4cwwjihiaf74kslrdmmk4bs47h7006gyqfwdfchfjdgg4r";
};
- postPatch = stdenv.lib.optional isPy3k ''
- sed -i "s,'boost_python','boost_python3',g" setup.py
+ postPatch = ''
+ sed -i "s,'boost_python','boost_python${pythonVersion}',g" setup.py
'';
buildInputs = [ boost freetype ftgl libGLU_combined ];
- meta = with stdenv.lib; {
+ meta = with lib; {
description = "Python bindings for FTGL (FreeType for OpenGL)";
license = licenses.gpl2Plus;
};
diff --git a/pkgs/development/python-modules/pymatgen/default.nix b/pkgs/development/python-modules/pymatgen/default.nix
index d810a5d6b4df..523e7f808064 100644
--- a/pkgs/development/python-modules/pymatgen/default.nix
+++ b/pkgs/development/python-modules/pymatgen/default.nix
@@ -1,17 +1,17 @@
-{ stdenv, buildPythonPackage, fetchPypi, glibcLocales, numpy, pydispatcher, sympy, requests, monty, ruamel_yaml, six, scipy, tabulate, enum34, matplotlib, palettable, spglib, pandas }:
+{ stdenv, buildPythonPackage, fetchPypi, glibcLocales, numpy, pydispatcher, sympy, requests, monty, ruamel_yaml, six, scipy, tabulate, enum34, matplotlib, palettable, spglib, pandas, networkx }:
buildPythonPackage rec {
pname = "pymatgen";
- version = "2018.8.10";
+ version = "2018.9.1";
src = fetchPypi {
inherit pname version;
- sha256 = "9bb3b170ca8654c956fa2efdd31107570c0610f7585d90e4a541eb99cee41603";
+ sha256 = "dee5dbd8008081de9f27759c20c550d09a07136eeebfe941e3d05fd88ccace18";
};
nativeBuildInputs = [ glibcLocales ];
- propagatedBuildInputs = [ numpy pydispatcher sympy requests monty ruamel_yaml six scipy tabulate enum34 matplotlib palettable spglib pandas ];
-
+ propagatedBuildInputs = [ numpy pydispatcher sympy requests monty ruamel_yaml six scipy tabulate enum34 matplotlib palettable spglib pandas networkx ];
+
# No tests in pypi tarball.
doCheck = false;
@@ -22,4 +22,3 @@ buildPythonPackage rec {
maintainers = with maintainers; [ psyanticy ];
};
}
-
diff --git a/pkgs/development/python-modules/pymsgbox/default.nix b/pkgs/development/python-modules/pymsgbox/default.nix
new file mode 100644
index 000000000000..38cc411f54df
--- /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/pyodbc/default.nix b/pkgs/development/python-modules/pyodbc/default.nix
index b28c1a876479..45ba2a2e307e 100644
--- a/pkgs/development/python-modules/pyodbc/default.nix
+++ b/pkgs/development/python-modules/pyodbc/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, buildPythonPackage, fetchPypi, isPyPy, libiodbc }:
+{ stdenv, buildPythonPackage, fetchPypi, isPyPy, unixODBC }:
buildPythonPackage rec {
pname = "pyodbc";
@@ -10,7 +10,9 @@ buildPythonPackage rec {
sha256 = "4326abb737dec36156998d52324921673d30f575e1e0998f0c5edd7de20e61d4";
};
- buildInputs = [ libiodbc ];
+ buildInputs = [ unixODBC ];
+
+ doCheck = false; # tests require a database server
meta = with stdenv.lib; {
description = "Python ODBC module to connect to almost any database";
diff --git a/pkgs/development/python-modules/pyowm/default.nix b/pkgs/development/python-modules/pyowm/default.nix
index 58a8dee155a8..c853965469a9 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/pyslurm/default.nix b/pkgs/development/python-modules/pyslurm/default.nix
index 9057c3970e15..24704bd8f309 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 = "20180604";
+ version = "20180811";
src = fetchFromGitHub {
repo = "pyslurm";
owner = "PySlurm";
- rev = "9dd4817e785fee138a9e29c3d71d2ea44898eedc";
- sha256 = "14ivwc27sjnk0z0jpfgyy9bd91m2bhcz11lzp1kk9xn4495i7wvj";
+ rev = "2d4f0553de971309b7e465d4d64528b8a5fafb05";
+ sha256 = "1cy57gyvvmzx0c8fx4h6p8dgan0ay6pdivdf24k1xiancjnw20xr";
};
buildInputs = [ cython slurm ];
diff --git a/pkgs/development/python-modules/pytest-fixture-config/default.nix b/pkgs/development/python-modules/pytest-fixture-config/default.nix
index df700526d1b4..67ceebef3057 100644
--- a/pkgs/development/python-modules/pytest-fixture-config/default.nix
+++ b/pkgs/development/python-modules/pytest-fixture-config/default.nix
@@ -1,5 +1,5 @@
{ stdenv, buildPythonPackage, fetchPypi
-, setuptools-git, pytest, six }:
+, setuptools-git, pytest }:
buildPythonPackage rec {
pname = "pytest-fixture-config";
@@ -14,11 +14,7 @@ buildPythonPackage rec {
buildInputs = [ pytest ];
- checkInputs = [ six ];
-
- checkPhase = ''
- py.test
- '';
+ doCheck = false;
meta = with stdenv.lib; {
description = "Simple configuration objects for Py.test fixtures. Allows you to skip tests when their required config variables aren’t set.";
diff --git a/pkgs/development/python-modules/pytest-flakes/default.nix b/pkgs/development/python-modules/pytest-flakes/default.nix
index f8823b966da0..52cfed14150a 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-rerunfailures/default.nix b/pkgs/development/python-modules/pytest-rerunfailures/default.nix
index 5931afa37e20..d71cc420d59b 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/python-u2flib-host/default.nix b/pkgs/development/python-modules/python-u2flib-host/default.nix
new file mode 100644
index 000000000000..38785d813138
--- /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 4690dcc89bc8..d6c333ce36de 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/restview/default.nix b/pkgs/development/python-modules/restview/default.nix
index e8a8b9dd637d..a6b22220da35 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 77ada95b3019..150234a3dd29 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/selectors2/default.nix b/pkgs/development/python-modules/selectors2/default.nix
new file mode 100644
index 000000000000..030178fef830
--- /dev/null
+++ b/pkgs/development/python-modules/selectors2/default.nix
@@ -0,0 +1,29 @@
+{ stdenv, buildPythonPackage, fetchPypi
+, nose, psutil, mock }:
+
+buildPythonPackage rec {
+ version = "2.0.1";
+ pname = "selectors2";
+
+ src = fetchPypi {
+ inherit pname version;
+ sha256 = "81b77c4c6f607248b1d6bbdb5935403fef294b224b842a830bbfabb400c81884";
+ };
+
+ checkInputs = [ nose psutil mock ];
+
+ checkPhase = ''
+ # https://github.com/NixOS/nixpkgs/pull/46186#issuecomment-419450064
+ # Trick to disable certain tests that depend on timing which
+ # will always fail on hydra
+ export TRAVIS=""
+ nosetests tests/test_selectors2.py
+ '';
+
+ meta = with stdenv.lib; {
+ homepage = https://www.github.com/SethMichaelLarson/selectors2;
+ description = "Back-ported, durable, and portable selectors";
+ license = licenses.mit;
+ maintainers = [ maintainers.costrouc ];
+ };
+}
diff --git a/pkgs/development/python-modules/sniffio/default.nix b/pkgs/development/python-modules/sniffio/default.nix
new file mode 100644
index 000000000000..9893bc5828a0
--- /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/spacy/default.nix b/pkgs/development/python-modules/spacy/default.nix
index dc0509e226c0..0667565c0de8 100644
--- a/pkgs/development/python-modules/spacy/default.nix
+++ b/pkgs/development/python-modules/spacy/default.nix
@@ -37,7 +37,8 @@ buildPythonPackage rec {
--replace "ftfy==" "ftfy>=" \
--replace "msgpack-python==" "msgpack-python>=" \
--replace "msgpack-numpy==" "msgpack-numpy>=" \
- --replace "pathlib" "pathlib; python_version<\"3.4\""
+ --replace "thinc>=6.10.3,<6.11.0" "thinc>=6.10.3" \
+ --replace "plac<1.0.0,>=0.9.6" "plac>=0.9.6"
'';
propagatedBuildInputs = [
diff --git a/pkgs/development/python-modules/spacy/models.json b/pkgs/development/python-modules/spacy/models.json
index e9c163c65259..34b8082872b7 100644
--- a/pkgs/development/python-modules/spacy/models.json
+++ b/pkgs/development/python-modules/spacy/models.json
@@ -1,42 +1,78 @@
[{
- "pname": "es_core_web_md",
- "version": "1.0.0",
- "sha256": "0ikyakdhnj6rrfpr8k83695d1gd3z9n60a245hwwchv94jmr7r6s",
+ "pname": "de_core_news_sm",
+ "version": "2.0.0",
+ "sha256": "13fs4f46qg9mlxd9ynmh81gxizm11kfq3g52pk8d2m7wp89xfc6a",
"license": "cc-by-sa-40"
},
{
- "pname": "fr_depvec_web_lg",
- "version": "1.0.0",
- "sha256": "0nxmdszs1s5by2874cz37azrmwamh1ngdsiylffkfihzq6s8bhka",
- "license": "cc-by-nc-sa-40"
+ "pname": "en_core_web_lg",
+ "version": "2.0.0",
+ "sha256": "1r33l02jrkzjn78nd0bzzzd6rwjlz7qfgs3bg5yr2ki6q0m7qxvw",
+ "license": "cc-by-sa-40"
},
{
"pname": "en_core_web_md",
- "version": "1.2.1",
- "sha256": "12prr4hcbfdaky9rcna1y1ykr417jkhkks2r8l06g8fb7am3pvp3",
- "license": "cc-by-sa-40"
-},
-{
- "pname": "en_depent_web_md",
- "version": "1.2.1",
- "sha256": "0giyr35q5lpp5drpcamyvb5gsjnhj62mk3ndfr49nm1s6d5f6m52",
+ "version": "2.0.0",
+ "sha256": "1b5g5gma1gzm8ffj0pgli1pllccx5jpjvb7a19n7c8bfswpifxzc",
"license": "cc-by-sa-40"
},
{
"pname": "en_core_web_sm",
- "version": "1.2.0",
- "sha256": "0vc4l77dcwa9lmzyqdci8ikjc0m2rhasl2zvyba547vf76qb0528",
+ "version": "2.0.0",
+ "sha256": "161298pl6kzc0cgf2g7ji84xbqv8ayrgsrmmg0hxiflwghfj77cx",
"license": "cc-by-sa-40"
},
{
- "pname": "de_core_news_md",
- "version": "1.0.0",
- "sha256": "072jz2rdi1nckny7k16avp86vjg4didfdsw816kfl9zwr88iny6g",
+ "pname": "en_vectors_web_lg",
+ "version": "2.0.0",
+ "sha256": "15qfd8vzdv56x41fzghy7k5x1c8ql92ds70r37b6a8hkb87z9byw",
"license": "cc-by-sa-40"
},
{
- "pname": "en_vectors_glove_md",
- "version": "1.0.0",
- "sha256": "1jbr27xnh5fdww8yphpvk2brfnzb174wfnxkzdqwv3iyi02zsin6",
+ "pname": "es_core_news_md",
+ "version": "2.0.0",
+ "sha256": "03056qz866r641q4nagymw6pc78qnn5vdvcp7p1ph2cvxh7081kp",
+ "license": "cc-by-sa-40"
+},
+{
+ "pname": "es_core_news_sm",
+ "version": "2.0.0",
+ "sha256": "1b91lcmw2kyqmcrxlfq7m5vlj1a57i3bb9a5h4y31smjgzmsr81s",
+ "license": "cc-by-sa-40"
+},
+{
+ "pname": "fr_core_news_md",
+ "version": "2.0.0",
+ "sha256": "06kva46l1nw819bidzj2vks69ap1a9fa7rnvpd28l3z2haci38ls",
+ "license": "cc-by-sa-40"
+},
+{
+ "pname": "fr_core_news_sm",
+ "version": "2.0.0",
+ "sha256": "1zlhm9646g3cwcv4cs33160f3v8gxmzdr02x8hx7jpw1fbnmc5mx",
+ "license": "cc-by-sa-40"
+},
+{
+ "pname": "it_core_news_sm",
+ "version": "2.0.0",
+ "sha256": "0fs68rdq19migb3x3hb510b96aabibsi01adlk1fipll1x48msaz",
+ "license": "cc-by-sa-40"
+},
+{
+ "pname": "nl_core_news_sm",
+ "version": "2.0.0",
+ "sha256": "0n5x61jp8rdxa3ki250ipbd68rjpp9li6xwbx3fbzycpngffwy8z",
+ "license": "cc-by-sa-40"
+},
+{
+ "pname": "pt_core_news_sm",
+ "version": "2.0.0",
+ "sha256": "1sg500b3f3qnx1ga32hbq9p4qfynqhpdzhlmdjrxgqw8i58ys23g",
+ "license": "cc-by-sa-40"
+},
+{
+ "pname": "xx_ent_wiki_sm",
+ "version": "2.0.0",
+ "sha256": "0mc3mm6nfjp31wbjysdj2x72akyi52hgprm1g54djxfypm3pmn35",
"license": "cc-by-sa-40"
}]
diff --git a/pkgs/development/python-modules/tflearn/default.nix b/pkgs/development/python-modules/tflearn/default.nix
new file mode 100644
index 000000000000..341c1da56801
--- /dev/null
+++ b/pkgs/development/python-modules/tflearn/default.nix
@@ -0,0 +1,24 @@
+{ lib, fetchPypi, buildPythonPackage, fetchurl, pytest, scipy, h5py
+, pillow, tensorflow }:
+
+buildPythonPackage rec {
+ pname = "tflearn";
+ version = "0.3.2";
+
+ src = fetchPypi {
+ inherit pname version;
+ sha256 = "034lvbslcivyj64r4w6xmr90ckmyxmrnkka9kal50x4175h02n1z";
+ };
+
+ buildInputs = [ pytest ];
+
+ propagatedBuildInputs = [ scipy h5py pillow tensorflow ];
+
+ doCheck = false;
+
+ meta = with lib; {
+ description = "Deep learning library featuring a higher-level API for TensorFlow";
+ homepage = "https://github.com/tflearn/tflearn";
+ license = licenses.mit;
+ };
+}
diff --git a/pkgs/development/python-modules/thinc/default.nix b/pkgs/development/python-modules/thinc/default.nix
index 88e6c8d16742..6217a4200574 100644
--- a/pkgs/development/python-modules/thinc/default.nix
+++ b/pkgs/development/python-modules/thinc/default.nix
@@ -6,6 +6,7 @@
, pytest
, cython
, cymem
+, darwin
, msgpack-numpy
, msgpack-python
, preshed
@@ -35,9 +36,15 @@ buildPythonPackage rec {
postPatch = ''
substituteInPlace setup.py \
--replace "msgpack-python==" "msgpack-python>=" \
- --replace "msgpack-numpy==" "msgpack-numpy>="
+ --replace "msgpack-numpy==" "msgpack-numpy>=" \
+ --replace "plac>=0.9,<1.0" "plac>=0.9" \
+ --replace "hypothesis>=2,<3" "hypothesis>=2"
'';
+ buildInputs = lib.optionals stdenv.isDarwin (with darwin.apple_sdk.frameworks; [
+ Accelerate CoreFoundation CoreGraphics CoreVideo
+ ]);
+
propagatedBuildInputs = [
cython
cymem
diff --git a/pkgs/development/python-modules/tifffile/default.nix b/pkgs/development/python-modules/tifffile/default.nix
index 159051b9a6a8..3910ddf07256 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/tornado/default.nix b/pkgs/development/python-modules/tornado/default.nix
index 6d86404e1925..d446d377e66f 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 4924fa527c62..89addb377dc4 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/typeguard/default.nix b/pkgs/development/python-modules/typeguard/default.nix
index 6ccde34f48a0..7fb6f8fef435 100644
--- a/pkgs/development/python-modules/typeguard/default.nix
+++ b/pkgs/development/python-modules/typeguard/default.nix
@@ -4,6 +4,7 @@
, stdenv
, setuptools_scm
, pytest
+, glibcLocales
}:
buildPythonPackage rec {
@@ -16,6 +17,9 @@ buildPythonPackage rec {
};
buildInputs = [ setuptools_scm ];
+ nativeBuildInputs = [ glibcLocales ];
+
+ LC_ALL="en_US.utf-8";
postPatch = ''
substituteInPlace setup.cfg --replace " --cov" ""
diff --git a/pkgs/development/python-modules/urlgrabber/default.nix b/pkgs/development/python-modules/urlgrabber/default.nix
index f399f4d426ee..528846d72381 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 eb001410ce5f..53b5bc9ad166 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/vowpalwabbit/default.nix b/pkgs/development/python-modules/vowpalwabbit/default.nix
index a8661fd3a985..9bc2bbc27047 100644
--- a/pkgs/development/python-modules/vowpalwabbit/default.nix
+++ b/pkgs/development/python-modules/vowpalwabbit/default.nix
@@ -1,5 +1,5 @@
-{ lib, buildPythonPackage, fetchPypi, python, boost, zlib, clang, ncurses
-, pytest, docutils, pygments, numpy, scipy, scikitlearn }:
+{ stdenv, lib, buildPythonPackage, fetchPypi, python, boost, zlib, clang
+, ncurses, pytest, docutils, pygments, numpy, scipy, scikitlearn }:
buildPythonPackage rec {
pname = "vowpalwabbit";
@@ -9,15 +9,27 @@ buildPythonPackage rec {
inherit pname version;
sha256 = "0b517371fc64f1c728a0af42a31fa93def27306e9b4d25d6e5fd01bcff1b7304";
};
+
+ # Should be fixed in next Python release after 8.5.0:
+ # https://github.com/JohnLangford/vowpal_wabbit/pull/1533
+ patches = [
+ ./vowpal-wabbit-find-boost.diff
+ ];
+
# vw tries to write some explicit things to home
# python installed: The directory '/homeless-shelter/.cache/pip/http'
preInstall = ''
export HOME=$PWD
'';
- buildInputs = [ boost.dev zlib.dev clang ncurses pytest docutils pygments ];
+ buildInputs = [ python.pkgs.boost zlib.dev clang ncurses pytest docutils pygments ];
propagatedBuildInputs = [ numpy scipy scikitlearn ];
+ # Python ctypes.find_library uses DYLD_LIBRARY_PATH.
+ preConfigure = lib.optionalString stdenv.isDarwin ''
+ export DYLD_LIBRARY_PATH="${python.pkgs.boost}/lib"
+ '';
+
checkPhase = ''
# check-manifest requires a git clone, not a tarball
# check-manifest --ignore "Makefile,PACKAGE.rst,*.cc,tox.ini,tests*,examples*,src*"
@@ -28,6 +40,7 @@ buildPythonPackage rec {
description = "Vowpal Wabbit is a fast machine learning library for online learning, and this is the python wrapper for the project.";
homepage = https://github.com/JohnLangford/vowpal_wabbit;
license = licenses.bsd3;
+ broken = stdenv.isAarch64;
maintainers = with maintainers; [ teh ];
};
}
diff --git a/pkgs/development/python-modules/vowpalwabbit/vowpal-wabbit-find-boost.diff b/pkgs/development/python-modules/vowpalwabbit/vowpal-wabbit-find-boost.diff
new file mode 100644
index 000000000000..645956594bf6
--- /dev/null
+++ b/pkgs/development/python-modules/vowpalwabbit/vowpal-wabbit-find-boost.diff
@@ -0,0 +1,34 @@
+--- vowpalwabbit-8.5.0.orig/setup.py 2018-09-03 20:32:39.000000000 +0200
++++ vowpalwabbit-8.5.0/setup.py 2018-09-03 20:34:09.000000000 +0200
+@@ -23,18 +23,11 @@
+
+ def find_boost():
+ """Find correct boost-python library information """
+- if system == 'Linux':
++ if system == 'Linux' or system == 'Darwin':
+ # use version suffix if present
+- boost_lib = 'boost_python-py{v[0]}{v[1]}'.format(v=sys.version_info)
+- if sys.version_info.major == 3:
+- for candidate in ['-py36', '-py35', '-py34', '3']:
+- boost_lib = 'boost_python{}'.format(candidate)
+- if find_library(boost_lib):
+- exit
++ boost_lib = 'boost_python{v[0]}{v[1]}'.format(v=sys.version_info)
+ if not find_library(boost_lib):
+ boost_lib = "boost_python"
+- elif system == 'Darwin':
+- boost_lib = 'boost_python-mt' if sys.version_info[0] == 2 else 'boost_python3-mt'
+ elif system == 'Cygwin':
+ boost_lib = 'boost_python-mt' if sys.version_info[0] == 2 else 'boost_python3-mt'
+ else:
+--- vowpalwabbit-8.5.0.orig/src/Makefile 2018-09-03 20:32:40.000000000 +0200
++++ vowpalwabbit-8.5.0/src/Makefile 2018-09-03 21:42:30.000000000 +0200
+@@ -37,7 +37,7 @@
+ NPROCS:=$(shell grep -c ^processor /proc/cpuinfo)
+ endif
+ ifeq ($(UNAME), Darwin)
+- LIBS = -lboost_program_options-mt -lboost_serialization-mt -l pthread -l z
++ LIBS = -lboost_program_options -lboost_serialization -l pthread -l z
+ # On Macs, the location isn't always clear
+ # brew uses /usr/local
+ # but /opt/local seems to be preferred by some users
diff --git a/pkgs/development/python-modules/wordfreq/default.nix b/pkgs/development/python-modules/wordfreq/default.nix
index 9de1fd5b3922..d672cb8bae90 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 c23f332638d0..848da5b21717 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 000000000000..57946dd29863
--- /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/tools/build-managers/bazel/default.nix b/pkgs/development/tools/build-managers/bazel/default.nix
index 6a25aef8b36a..ea6b713daa37 100644
--- a/pkgs/development/tools/build-managers/bazel/default.nix
+++ b/pkgs/development/tools/build-managers/bazel/default.nix
@@ -26,7 +26,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 +40,7 @@ stdenv.mkDerivation rec {
src = fetchurl {
url = "https://github.com/bazelbuild/bazel/releases/download/${version}/bazel-${version}-dist.zip";
- sha256 = "1ca9pncnj6v4r1kvgxys7607wpz4d2ic6g0i7lpsc2zg2qwmjc67";
+ sha256 = "0v5kcz8q9vzf4cpmlx8k2gg0dsr8mj0jmx9a44pwb0kc6na6pih9";
};
sourceRoot = ".";
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 c394d87e09ec..000000000000
--- 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 1ad52f327e15..02bf9c23cbac 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 b5751a19455e..bbbbbf462ec8 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 06d6697ef965..e350e475f73c 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 603b155ee4f9..aea94633bae3 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 c6fcaa0a44a0..a6a6e9a11054 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 6367f6be2981..e7033c44dd49 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/devpi-client/default.nix b/pkgs/development/tools/devpi-client/default.nix
index 26d96a641263..e70971b670c2 100644
--- a/pkgs/development/tools/devpi-client/default.nix
+++ b/pkgs/development/tools/devpi-client/default.nix
@@ -9,28 +9,28 @@
pythonPackages.buildPythonApplication rec {
name = "${pname}-${version}";
pname = "devpi-client";
- version = "3.1.0";
+ version = "4.1.0";
src = pythonPackages.fetchPypi {
inherit pname version;
- sha256 = "0w47x3lkafcg9ijlaxllmq4886nsc91w49ck1cd7vn2gafkwjkgr";
+ sha256 = "0f5jkvxx9fl8v5vwbwmplqhjsdfgiib7j3zvn0zxd8krvi2s38fq";
};
checkInputs = with pythonPackages; [
- pytest webtest mock
+ pytest pytestflakes webtest mock
devpi-server tox
sphinx wheel git mercurial detox
setuptools
];
checkPhase = ''
export PATH=$PATH:$out/bin
+ export HOME=$TMPDIR # fix tests failing in sandbox due to "/homeless-shelter"
# setuptools do not get propagated into the tox call (cannot import setuptools)
rm testing/test_test.py
# test_pypi_index_attributes tries to connect to upstream pypi
- # test_download_release_error is fixed in the next release
- py.test -k 'not test_pypi_index_attributes and not test_download_release_error' testing
+ py.test -k 'not test_pypi_index_attributes' testing
'';
LC_ALL = "en_US.UTF-8";
diff --git a/pkgs/development/tools/documentation/gtk-doc/default.nix b/pkgs/development/tools/documentation/gtk-doc/default.nix
index 8ec6aec9918e..0213eca30d22 100644
--- a/pkgs/development/tools/documentation/gtk-doc/default.nix
+++ b/pkgs/development/tools/documentation/gtk-doc/default.nix
@@ -1,5 +1,6 @@
{ stdenv, fetchurl, autoreconfHook, pkgconfig, perl, python, libxml2Python, libxslt, which
-, docbook_xml_dtd_43, docbook_xsl, gnome-doc-utils, dblatex, gettext, itstool
+, docbook_xml_dtd_43, docbook_xsl, gnome-doc-utils, gettext, itstool
+, withDblatex ? false, dblatex
}:
stdenv.mkDerivation rec {
@@ -20,8 +21,8 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ autoreconfHook ];
buildInputs =
[ pkgconfig perl python libxml2Python libxslt docbook_xml_dtd_43 docbook_xsl
- gnome-doc-utils dblatex gettext which itstool
- ];
+ gnome-doc-utils gettext which itstool
+ ] ++ stdenv.lib.optional withDblatex dblatex;
configureFlags = [ "--disable-scrollkeeper" ];
diff --git a/pkgs/development/tools/govendor/default.nix b/pkgs/development/tools/govendor/default.nix
new file mode 100644
index 000000000000..2030c8ba444a
--- /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 f1c754ddff96..ec2fb334a3b3 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/hcloud/default.nix b/pkgs/development/tools/hcloud/default.nix
index 877080508d40..b3fa6f852f76 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/heroku/default.nix b/pkgs/development/tools/heroku/default.nix
index 9c5cbb1aa285..ba9ac923d11c 100644
--- a/pkgs/development/tools/heroku/default.nix
+++ b/pkgs/development/tools/heroku/default.nix
@@ -1,70 +1,32 @@
-{ stdenv, lib, fetchurl, makeWrapper, buildGoPackage, fetchFromGitHub
-, nodejs-6_x, postgresql, ruby }:
+{ stdenv, lib, fetchurl, makeWrapper, nodejs }:
-with stdenv.lib;
-
-let
- cli = buildGoPackage rec {
- name = "cli-${version}";
- version = "5.6.32";
-
- goPackagePath = "github.com/heroku/cli";
-
- src = fetchFromGitHub {
- owner = "heroku";
- repo = "cli";
- rev = "v${version}";
- sha256 = "062aa79mv2njjb0ix7isbz6646wxmsldv27bsz5v2pbv597km0vz";
- };
-
- buildFlagsArray = ''
- -ldflags=
- -X=main.Version=${version}
- -X=main.Channel=stable
- -X=main.Autoupdate=no
- '';
-
- preCheck = ''
- export HOME=/tmp
- '';
-
- doCheck = true;
- };
-
-in stdenv.mkDerivation rec {
+stdenv.mkDerivation rec {
name = "heroku-${version}";
- version = "3.43.16";
+ version = "7.16.0";
- meta = {
- homepage = https://toolbelt.heroku.com;
- description = "Everything you need to get started using Heroku";
- maintainers = with maintainers; [ aflatter mirdhyn peterhoeg ];
- license = licenses.mit;
- platforms = with platforms; unix;
- broken = true; # Outdated function, not supported upstream. https://github.com/NixOS/nixpkgs/issues/27447
+ src = fetchurl {
+ url = "https://cli-assets.heroku.com/heroku-v${version}/heroku-v${version}.tar.xz";
+ sha256 = "434573b4773ce7ccbb21b43b19529475d941fa7dd219b01b75968b42e6b62abe";
};
- binPath = lib.makeBinPath [ postgresql ruby ];
-
buildInputs = [ makeWrapper ];
- doUnpack = false;
-
- src = fetchurl {
- url = "https://s3.amazonaws.com/assets.heroku.com/heroku-client/heroku-client-${version}.tgz";
- sha256 = "08pai3cjaj7wshhyjcmkvyr1qxv5ab980whcm406798ng8f91hn7";
- };
+ dontBuild = true;
installPhase = ''
- mkdir -p $out
-
- tar xzf $src -C $out --strip-components=1
- install -Dm755 ${cli}/bin/cli $out/share/heroku/cli/bin/heroku
-
- wrapProgram $out/bin/heroku \
- --set HEROKU_NODE_PATH ${nodejs-6_x}/bin/node \
- --set XDG_DATA_HOME $out/share \
- --set XDG_DATA_DIRS $out/share \
- --prefix PATH : ${binPath}
+ mkdir -p $out/share/heroku $out/bin
+ cp -pr * $out/share/heroku
+ substituteInPlace $out/share/heroku/bin/run \
+ --replace "/usr/bin/env node" "${nodejs}/bin/node"
+ makeWrapper $out/share/heroku/bin/run $out/bin/heroku \
+ --set HEROKU_DISABLE_AUTOUPDATE 1
'';
+
+ meta = {
+ homepage = https://cli.heroku.com;
+ description = "Everything you need to get started using Heroku";
+ maintainers = with lib.maintainers; [ aflatter mirdhyn peterhoeg ];
+ license = lib.licenses.mit;
+ platforms = with lib.platforms; unix;
+ };
}
diff --git a/pkgs/development/tools/jbake/default.nix b/pkgs/development/tools/jbake/default.nix
index 152cddc101d6..9c3094fb4fec 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/gede/default.nix b/pkgs/development/tools/misc/gede/default.nix
index 9e8ce3d93314..9db0062023ce 100644
--- a/pkgs/development/tools/misc/gede/default.nix
+++ b/pkgs/development/tools/misc/gede/default.nix
@@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
name = "gede-${version}";
- version = "2.6.1";
+ version = "2.10.9";
src = fetchurl {
url = "http://gede.acidron.com/uploads/source/${name}.tar.xz";
- sha256 = "0jallpchl3c3i90hwic4n7n0ggk5wra0fki4by9ag26ln0k42c4r";
+ sha256 = "0av9v3r6x6anjjm4hzn8wxnvrqc8zp1g7570m5ndg7cgc3sy3bg6";
};
nativeBuildInputs = [ qmake makeWrapper python ];
@@ -27,7 +27,7 @@ stdenv.mkDerivation rec {
description = "Graphical frontend (GUI) to GDB";
homepage = http://gede.acidron.com;
license = licenses.bsd2;
- platforms = platforms.unix;
+ platforms = platforms.linux;
maintainers = with maintainers; [ juliendehos ];
};
}
diff --git a/pkgs/development/tools/misc/texinfo/common.nix b/pkgs/development/tools/misc/texinfo/common.nix
index 101298cd3052..c6877ed4d1a1 100644
--- a/pkgs/development/tools/misc/texinfo/common.nix
+++ b/pkgs/development/tools/misc/texinfo/common.nix
@@ -17,6 +17,9 @@ stdenv.mkDerivation rec {
inherit sha256;
};
+ # TODO: fix on mass rebuild
+ ${if interactive then "patches" else null} = optional (version == "6.5") ./perl.patch;
+
# We need a native compiler to build perl XS extensions
# when cross-compiling.
depsBuildBuild = [ buildPackages.stdenv.cc perl ];
diff --git a/pkgs/development/tools/misc/texinfo/perl.patch b/pkgs/development/tools/misc/texinfo/perl.patch
new file mode 100644
index 000000000000..e651b37371c7
--- /dev/null
+++ b/pkgs/development/tools/misc/texinfo/perl.patch
@@ -0,0 +1,43 @@
+Adapted from http://svn.savannah.gnu.org/viewvc/texinfo/
+Author: gavin
+--- trunk/tp/Texinfo/Parser.pm 2018-06-04 19:51:36 UTC (rev 8006)
++++ trunk/tp/Texinfo/Parser.pm 2018-07-13 15:31:28 UTC (rev 8007)
+@@ -5531,11 +5531,11 @@
+ }
+ } elsif ($command eq 'clickstyle') {
+ # REMACRO
+- if ($line =~ /^\s+@([[:alnum:]][[:alnum:]\-]*)({})?\s*/) {
++ if ($line =~ /^\s+@([[:alnum:]][[:alnum:]\-]*)(\{\})?\s*/) {
+ $args = ['@'.$1];
+ $self->{'clickstyle'} = $1;
+ $remaining = $line;
+- $remaining =~ s/^\s+@([[:alnum:]][[:alnum:]\-]*)({})?\s*(\@(c|comment)((\@|\s+).*)?)?//;
++ $remaining =~ s/^\s+@([[:alnum:]][[:alnum:]\-]*)(\{\})?\s*(\@(c|comment)((\@|\s+).*)?)?//;
+ $has_comment = 1 if (defined($4));
+ } else {
+ $self->line_error (sprintf($self->__(
+--- trunk/tp/Texinfo/Convert/XSParagraph/xspara.c 2018-07-13 15:31:28 UTC (rev 8007)
++++ trunk/tp/Texinfo/Convert/XSParagraph/xspara.c 2018-07-13 15:39:29 UTC (rev 8008)
+@@ -248,6 +248,11 @@
+
+ dTHX;
+
++#if PERL_VERSION > 27 || (PERL_VERSION == 27 && PERL_SUBVERSION > 8)
++ /* needed due to thread-safe locale handling in newer perls */
++ switch_to_global_locale();
++#endif
++
+ if (setlocale (LC_CTYPE, "en_US.UTF-8")
+ || setlocale (LC_CTYPE, "en_US.utf8"))
+ goto success;
+@@ -320,6 +325,10 @@
+ {
+ success: ;
+ free (utf8_locale);
++#if PERL_VERSION > 27 || (PERL_VERSION == 27 && PERL_SUBVERSION > 8)
++ /* needed due to thread-safe locale handling in newer perls */
++ sync_locale();
++#endif
+ /*
+ fprintf (stderr, "tried to set LC_CTYPE to UTF-8.\n");
+ fprintf (stderr, "character encoding is: %s\n",
diff --git a/pkgs/development/tools/profiling/EZTrace/default.nix b/pkgs/development/tools/profiling/EZTrace/default.nix
index 2ff337ef2083..8155f3016c3f 100644
--- a/pkgs/development/tools/profiling/EZTrace/default.nix
+++ b/pkgs/development/tools/profiling/EZTrace/default.nix
@@ -5,12 +5,12 @@
}:
stdenv.mkDerivation rec {
- version = "1.0.6";
+ version = "1.1-7";
name = "EZTrace-${version}";
src = fetchurl {
- url = "https://gforge.inria.fr/frs/download.php/file/34082/eztrace-${version}.tar.gz";
- sha256 = "06q5y9qmdn1h0wjmy28z6gwswskmph49j7simfqcqwv05gvd9svr";
+ url = "https://gforge.inria.fr/frs/download.php/file/37155/eztrace-${version}.tar.gz";
+ sha256 = "0cr2d4fdv4ljvag55dsz3rpha1jan2gc3jhr06ycyk43450pl58p";
};
# Goes past the rpl_malloc linking failure; fixes silent file breakage
diff --git a/pkgs/development/tools/solarus-quest-editor/default.nix b/pkgs/development/tools/solarus-quest-editor/default.nix
index 3df6d3de3e16..5a340d309495 100644
--- a/pkgs/development/tools/solarus-quest-editor/default.nix
+++ b/pkgs/development/tools/solarus-quest-editor/default.nix
@@ -1,17 +1,17 @@
-{ stdenv, fetchFromGitHub, cmake, luajit,
+{ stdenv, fetchFromGitLab, cmake, luajit,
SDL2, SDL2_image, SDL2_ttf, physfs,
openal, libmodplug, libvorbis, solarus,
- qtbase, qttools }:
+ qtbase, qttools, fetchpatch }:
stdenv.mkDerivation rec {
name = "solarus-quest-editor-${version}";
- version = "1.4.5";
+ version = "1.5.3";
- src = fetchFromGitHub {
- owner = "christopho";
+ src = fetchFromGitLab {
+ owner = "solarus-games";
repo = "solarus-quest-editor";
- rev = "61f0fa7a5048994fcd9c9f3a3d1255d0be2967df";
- sha256 = "1fpq55nvs5k2rxgzgf39c069rmm73vmv4gr5lvmqzgsz07rkh07f";
+ rev = "v1.5.3";
+ sha256 = "1b9mg04yy4pnrl745hbc82rz79k0f8ci3wv7gvsm3a998q8m98si";
};
buildInputs = [ cmake luajit SDL2
@@ -19,7 +19,18 @@ stdenv.mkDerivation rec {
openal libmodplug libvorbis
solarus qtbase qttools ];
- patches = [ ./patches/fix-install.patch ];
+ patches = [
+ ./patches/fix-install.patch
+
+ # Next two patches should be fine to remove for next release.
+ # This commit fixes issues AND adds features *sighs*
+ ./patches/partial-f285beab62594f73e57190c49848c848487214cf.patch
+
+ (fetchpatch {
+ url = https://gitlab.com/solarus-games/solarus-quest-editor/commit/8f308463030c18cd4f7c8a6052028fff3b7ca35a.patch;
+ sha256 = "1jq48ghhznrp47q9lq2rhh48a1z4aylyy4qaniaqyfyq3vihrchr";
+ })
+ ];
meta = with stdenv.lib; {
description = "The editor for the Zelda-like ARPG game engine, Solarus";
diff --git a/pkgs/development/tools/solarus-quest-editor/patches/partial-f285beab62594f73e57190c49848c848487214cf.patch b/pkgs/development/tools/solarus-quest-editor/patches/partial-f285beab62594f73e57190c49848c848487214cf.patch
new file mode 100644
index 000000000000..73e817fcfbe8
--- /dev/null
+++ b/pkgs/development/tools/solarus-quest-editor/patches/partial-f285beab62594f73e57190c49848c848487214cf.patch
@@ -0,0 +1,33 @@
+From f285beab62594f73e57190c49848c848487214cf Mon Sep 17 00:00:00 2001
+From: stdgregwar
+Date: Sun, 1 Jul 2018 00:00:41 +0200
+Subject: [PATCH] Shader previewer base
+
+
+diff --git a/include/widgets/tileset_view.h b/include/widgets/tileset_view.h
+index 615f432..799a4c6 100644
+--- a/include/widgets/tileset_view.h
++++ b/include/widgets/tileset_view.h
+@@ -23,6 +23,7 @@
+ #include "pattern_separation.h"
+ #include
+ #include
++#include
+
+ class QAction;
+
+diff --git a/src/widgets/text_editor.cpp b/src/widgets/text_editor.cpp
+index 4f2ff68..90080a9 100644
+--- a/src/widgets/text_editor.cpp
++++ b/src/widgets/text_editor.cpp
+@@ -26,6 +26,7 @@
+ #include
+ #include
+ #include
++#include
+ #include
+ #include
+
+--
+2.18.0
+
diff --git a/pkgs/development/tools/valadoc/default.nix b/pkgs/development/tools/valadoc/default.nix
index 8f9087ee3b3a..6515e220f3d5 100644
--- a/pkgs/development/tools/valadoc/default.nix
+++ b/pkgs/development/tools/valadoc/default.nix
@@ -11,8 +11,6 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ automake autoconf which gnome3.vala libtool pkgconfig gobjectIntrospection ];
buildInputs = [ graphviz glib gnome3.libgee expat ];
- preConfigure = "./autogen.sh";
-
passthru = {
updateScript = gnome3.updateScript {
packageName = "valadoc";
@@ -20,10 +18,10 @@ stdenv.mkDerivation rec {
};
meta = with stdenv.lib; {
- description = "valadoc is a documentation generator for generating API documentation from Vala source code";
- homepage = https://valadoc.org;
- license = stdenv.lib.licenses.gpl2;
+ description = "A documentation generator for generating API documentation from Vala source code";
+ homepage = https://valadoc.org;
+ license = licenses.gpl2;
maintainers = with maintainers; [ sternenseemann ];
- platforms = with platforms; linux;
+ platforms = platforms.linux;
};
}
diff --git a/pkgs/development/web/nodejs/nodejs.nix b/pkgs/development/web/nodejs/nodejs.nix
index b2ee7528814f..ea764ef22e6e 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 2e94923441fc..7250613e8628 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/btanks/default.nix b/pkgs/games/btanks/default.nix
index 8379e1aa7bb2..d606662323f3 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 c8d23fcc9de6..e4ec4dffa1db 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/liquidwar/default.nix b/pkgs/games/liquidwar/default.nix
index 53556b8cd914..1ff1f96b5a23 100644
--- a/pkgs/games/liquidwar/default.nix
+++ b/pkgs/games/liquidwar/default.nix
@@ -2,7 +2,7 @@
, gmp, libGLU_combined, libjpeg, libpng
, expat, gettext, perl, guile
, SDL, SDL_image, SDL_mixer, SDL_ttf
-, curl, sqlite
+, curl, sqlite, libtool, readline
, libogg, libvorbis, libcaca, csound, cunit } :
stdenv.mkDerivation rec {
@@ -22,6 +22,7 @@ stdenv.mkDerivation rec {
curl sqlite
libogg libvorbis csound
libXrender libcaca cunit
+ libtool readline
];
hardeningDisable = [ "format" ];
diff --git a/pkgs/games/quakespasm/vulkan.nix b/pkgs/games/quakespasm/vulkan.nix
index 2cf09e2ec938..6f69c6469503 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/solarus/default.nix b/pkgs/games/solarus/default.nix
index 6f7876e48723..23abadf66ae5 100644
--- a/pkgs/games/solarus/default.nix
+++ b/pkgs/games/solarus/default.nix
@@ -1,21 +1,23 @@
-{ stdenv, fetchFromGitHub, cmake, luajit,
+{ stdenv, fetchFromGitLab, cmake, luajit,
SDL2, SDL2_image, SDL2_ttf, physfs,
- openal, libmodplug, libvorbis}:
+ openal, libmodplug, libvorbis,
+ qtbase, qttools }:
stdenv.mkDerivation rec {
name = "solarus-${version}";
- version = "1.4.5";
+ version = "1.5.3";
- src = fetchFromGitHub {
- owner = "christopho";
+ src = fetchFromGitLab {
+ owner = "solarus-games";
repo = "solarus";
- rev = "d9fdb9fdb4e1b9fc384730a9279d134ae9f2c70e";
- sha256 = "0xjx789d6crm322wmkqyq9r288vddsha59yavhy78c4r01gs1p5v";
+ rev = "v1.5.3";
+ sha256 = "035hkdw3a1ryasj5wfa1xla1xmpnc3hjp4s20sl9ywip41675vaz";
};
buildInputs = [ cmake luajit SDL2
SDL2_image SDL2_ttf physfs
- openal libmodplug libvorbis ];
+ openal libmodplug libvorbis
+ qtbase qttools ];
enableParallelBuilding = true;
diff --git a/pkgs/misc/calaos/installer/default.nix b/pkgs/misc/calaos/installer/default.nix
index 36c8825d27a8..618bc6d85059 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 1786a4996a30..46c38892bf8f 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/emulators/dolphin-emu/master.nix b/pkgs/misc/emulators/dolphin-emu/master.nix
index 140e199908ce..05b75312646d 100644
--- a/pkgs/misc/emulators/dolphin-emu/master.nix
+++ b/pkgs/misc/emulators/dolphin-emu/master.nix
@@ -78,6 +78,7 @@ in stdenv.mkDerivation rec {
branch = "master";
# x86_32 is an unsupported platform.
# Enable generic build if you really want a JIT-less binary.
+ broken = stdenv.isDarwin;
platforms = [ "x86_64-linux" "x86_64-darwin" ];
};
}
diff --git a/pkgs/misc/emulators/retroarch/cores.nix b/pkgs/misc/emulators/retroarch/cores.nix
index 371ace848fb7..2eef6009ac26 100644
--- a/pkgs/misc/emulators/retroarch/cores.nix
+++ b/pkgs/misc/emulators/retroarch/cores.nix
@@ -234,8 +234,8 @@ in with stdenv.lib.licenses;
core = "mame";
src = fetchRetro {
repo = "mame";
- rev = "9f8a36adeb4dc54ec2ecac992ce91bcdb377519e";
- sha256 = "0blfvq28hgv9kkpijd8c9d9sa5g2qr448clwi7wrj8kqfdnrr8m1";
+ rev = "9f9e6b6c9bde4d50c72e9a5c80496a1fec6b8aa9";
+ sha256 = "0lfj8bjchkcvyb5x0x29cg10fkfklxndk80947k4qfysclijxpkv";
};
description = "Port of MAME to libretro";
license = gpl2Plus;
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 000000000000..43539ef4ca58
--- /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 e7237fd4454c..a2d462fd990e 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 5f13d2ee1837..000000000000
--- 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
-
--
-
-
-