diff --git a/doc/languages-frameworks/python.section.md b/doc/languages-frameworks/python.section.md
index 0f871395854..23ceb82eb31 100644
--- a/doc/languages-frameworks/python.section.md
+++ b/doc/languages-frameworks/python.section.md
@@ -374,7 +374,7 @@ and `CFLAGS`.
description = "A pythonic wrapper around FFTW, the FFT library, presenting a unified interface for all the supported transforms";
homepage = http://hgomersall.github.com/pyFFTW/;
license = with licenses; [ bsd2 bsd3 ];
- maintainer = with maintainers; [ fridh ];
+ maintainers = with maintainers; [ fridh ];
};
};
}
diff --git a/lib/systems/default.nix b/lib/systems/default.nix
index bd408e00bb1..e7346a538d3 100644
--- a/lib/systems/default.nix
+++ b/lib/systems/default.nix
@@ -44,6 +44,8 @@ rec {
};
# Misc boolean options
useAndroidPrebuilt = false;
+ useiOSPrebuilt = false;
+ isiPhoneSimulator = false;
} // mapAttrs (n: v: v final.parsed) inspect.predicates
// args;
in assert final.useAndroidPrebuilt -> final.isAndroid;
diff --git a/lib/systems/parse.nix b/lib/systems/parse.nix
index f7c84bd41cc..381108d76fe 100644
--- a/lib/systems/parse.nix
+++ b/lib/systems/parse.nix
@@ -201,7 +201,7 @@ rec {
################################################################################
- types.system = mkOptionType {
+ types.parsedPlatform = mkOptionType {
name = "system";
description = "fully parsed representation of llvm- or nix-style platform tuple";
merge = mergeOneOption;
@@ -215,7 +215,7 @@ rec {
isSystem = isType "system";
mkSystem = components:
- assert types.system.check components;
+ assert types.parsedPlatform.check components;
setType "system" components;
mkSkeletonFromList = l: {
diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix
index 8c5fdec0bd7..fbeed6cdcd2 100644
--- a/maintainers/maintainer-list.nix
+++ b/maintainers/maintainer-list.nix
@@ -1971,6 +1971,11 @@
github = "kragniz";
name = "Louis Taylor";
};
+ krav = {
+ email = "kristoffer@microdisko.no";
+ github = "krav";
+ name = "Kristoffer Thømt Ravneberg";
+ };
kristoff3r = {
email = "k.soeholm@gmail.com";
github = "kristoff3r";
diff --git a/nixos/doc/manual/man-nixos-build-vms.xml b/nixos/doc/manual/man-nixos-build-vms.xml
index 878ebee0527..f4b59a7c6d4 100644
--- a/nixos/doc/manual/man-nixos-build-vms.xml
+++ b/nixos/doc/manual/man-nixos-build-vms.xml
@@ -40,7 +40,7 @@ points to the generated virtual network.
test1 = {pkgs, config, ...}:
{
services.openssh.enable = true;
- nixpkgs.system = "i686-linux";
+ nixpkgs.localSystem.system = "i686-linux";
deployment.targetHost = "test1.example.net";
# Other NixOS options
@@ -51,7 +51,7 @@ points to the generated virtual network.
services.openssh.enable = true;
services.httpd.enable = true;
environment.systemPackages = [ pkgs.lynx ];
- nixpkgs.system = "x86_64-linux";
+ nixpkgs.localSystem.system = "x86_64-linux";
deployment.targetHost = "test2.example.net";
# Other NixOS options
@@ -66,7 +66,7 @@ In each NixOS configuration, two attributes have a special meaning.
The deployment.targetHost specifies the address
(domain name or IP address)
of the system which is used by ssh to perform
-remote deployment operations. The nixpkgs.system
+remote deployment operations. The nixpkgs.localSystem.system
attribute can be used to specify an architecture for the target machine,
such as i686-linux which builds a 32-bit NixOS
configuration. Omitting this property will build the configuration
diff --git a/nixos/lib/eval-config.nix b/nixos/lib/eval-config.nix
index 2e7971cca81..97c79487df4 100644
--- a/nixos/lib/eval-config.nix
+++ b/nixos/lib/eval-config.nix
@@ -26,7 +26,7 @@
, lib ? import ../../lib
}:
-let extraArgs_ = extraArgs; pkgs_ = pkgs; system_ = system;
+let extraArgs_ = extraArgs; pkgs_ = pkgs;
extraModules = let e = builtins.getEnv "NIXOS_EXTRA_MODULE_PATH";
in if e == "" then [] else [(import (builtins.toPath e))];
in
@@ -36,7 +36,7 @@ let
_file = ./eval-config.nix;
key = _file;
config = {
- nixpkgs.system = lib.mkDefault system_;
+ nixpkgs.localSystem = lib.mkDefault { inherit system; };
_module.args.pkgs = lib.mkIf (pkgs_ != null) (lib.mkForce pkgs_);
};
};
diff --git a/nixos/modules/misc/nixpkgs.nix b/nixos/modules/misc/nixpkgs.nix
index 9217250eec2..b8a55a24394 100644
--- a/nixos/modules/misc/nixpkgs.nix
+++ b/nixos/modules/misc/nixpkgs.nix
@@ -58,10 +58,13 @@ in
pkgs = mkOption {
defaultText = literalExample
''import "''${nixos}/.." {
- inherit (config.nixpkgs) config overlays system;
+ inherit (config.nixpkgs) config overlays localSystem crossSystem;
}
'';
- default = import ../../.. { inherit (cfg) config overlays system crossSystem; };
+ default = import ../../.. {
+ localSystem = { inherit (cfg) system; } // cfg.localSystem;
+ inherit (cfg) config overlays crossSystem;
+ };
type = pkgsType;
example = literalExample ''import {}'';
description = ''
@@ -73,8 +76,9 @@ in
relative to the location of this NixOS module, because
NixOS and Nixpkgs are distributed together for consistency,
so the nixos in the default value is in fact a
- relative path. The config, overlays
- and system come from this option's siblings.
+ relative path. The config, overlays,
+ localSystem, and crossSystem come
+ from this option's siblings.
This option can be used by applications like NixOps to increase
the performance of evaluation, or to create packages that depend
@@ -130,13 +134,40 @@ in
'';
};
- crossSystem = mkOption {
- type = types.nullOr types.attrs;
- default = null;
+ localSystem = mkOption {
+ type = types.attrs; # TODO utilize lib.systems.parsedPlatform
+ default = { system = builtins.currentSystem; };
+ example = { system = "aarch64-linux"; config = "aarch64-unknown-linux-gnu"; };
+ defaultText = literalExample
+ ''(import "''${nixos}/../lib").lib.systems.examples.aarch64-multiplatform'';
description = ''
- The description of the system we're cross-compiling to, or null
- if this isn't a cross-compile. See the description of the
- crossSystem argument in the nixpkgs manual.
+ Specifies the platform on which NixOS should be built. When
+ nixpkgs.crossSystem is unset, it also specifies
+ the platform for which NixOS should be
+ built. If this option is unset, it defaults to the platform
+ type of the machine where evaluation happens. Specifying this
+ option is useful when doing distributed multi-platform
+ deployment, or when building virtual machines. See its
+ description in the Nixpkgs manual for more details.
+
+ Ignored when nixpkgs.pkgs is set.
+ '';
+ };
+
+ crossSystem = mkOption {
+ type = types.nullOr types.attrs; # TODO utilize lib.systems.parsedPlatform
+ default = null;
+ example = { system = "aarch64-linux"; config = "aarch64-unknown-linux-gnu"; };
+ defaultText = literalExample
+ ''(import "''${nixos}/../lib").lib.systems.examples.aarch64-multiplatform'';
+ description = ''
+ Specifies the platform for which NixOS should be
+ built. Specify this only if it is different from
+ nixpkgs.localSystem, the platform
+ on which NixOS should be built. In other
+ words, specify this to cross-compile NixOS. Otherwise it
+ should be set as null, the default. See its description in the
+ Nixpkgs manual for more details.
Ignored when nixpkgs.pkgs is set.
'';
@@ -146,10 +177,20 @@ in
type = types.str;
example = "i686-linux";
description = ''
- Specifies the Nix platform type for which NixOS should be built.
- If unset, it defaults to the platform type of your host system.
- Specifying this option is useful when doing distributed
- multi-platform deployment, or when building virtual machines.
+ Specifies the Nix platform type on which NixOS should be built.
+ It is better to specify nixpkgs.localSystem instead.
+
+ {
+ nixpkgs.system = ..;
+ }
+
+ is the same as
+
+ {
+ nixpkgs.localSystem.system = ..;
+ }
+
+ See nixpkgs.localSystem for more information.
Ignored when nixpkgs.pkgs is set.
'';
diff --git a/nixos/modules/services/misc/dysnomia.nix b/nixos/modules/services/misc/dysnomia.nix
index 25cd0038e36..9e66e0811ab 100644
--- a/nixos/modules/services/misc/dysnomia.nix
+++ b/nixos/modules/services/misc/dysnomia.nix
@@ -158,7 +158,7 @@ in
services.dysnomia.properties = {
hostname = config.networking.hostName;
- system = if config.nixpkgs.system == "" then builtins.currentSystem else config.nixpkgs.system;
+ inherit (config.nixpkgs.localSystem) system;
supportedTypes = (import "${pkgs.stdenv.mkDerivation {
name = "supportedtypes";
diff --git a/nixos/modules/services/misc/nixos-manual.nix b/nixos/modules/services/misc/nixos-manual.nix
index abf506ea7c6..4bd1c20edf7 100644
--- a/nixos/modules/services/misc/nixos-manual.nix
+++ b/nixos/modules/services/misc/nixos-manual.nix
@@ -23,7 +23,7 @@ let
options =
let
scrubbedEval = evalModules {
- modules = [ { nixpkgs.system = config.nixpkgs.system; } ] ++ baseModules;
+ modules = [ { nixpkgs.localSystem = config.nixpkgs.localSystem; } ] ++ baseModules;
args = (config._module.args) // { modules = [ ]; };
specialArgs = { pkgs = scrubDerivations "pkgs" pkgs; };
};
diff --git a/nixos/modules/system/boot/grow-partition.nix b/nixos/modules/system/boot/grow-partition.nix
index c4c6d82dc5c..1e6f9e442b6 100644
--- a/nixos/modules/system/boot/grow-partition.nix
+++ b/nixos/modules/system/boot/grow-partition.nix
@@ -32,8 +32,15 @@ with lib;
rootDevice="${config.fileSystems."/".device}"
if [ -e "$rootDevice" ]; then
rootDevice="$(readlink -f "$rootDevice")"
- parentDevice="$(lsblk -npo PKNAME "$rootDevice")"
- TMPDIR=/run sh $(type -P growpart) "$parentDevice" "''${rootDevice#$parentDevice}"
+ parentDevice="$rootDevice"
+ while [ "''${parentDevice%[0-9]}" != "''${parentDevice}" ]; do
+ parentDevice="''${parentDevice%[0-9]}";
+ done
+ partNum="''${rootDevice#''${parentDevice}}"
+ if [ "''${parentDevice%[0-9]p}" != "''${parentDevice}" ] && [ -b "''${parentDevice%p}" ]; then
+ parentDevice="''${parentDevice%p}"
+ fi
+ TMPDIR=/run sh $(type -P growpart) "$parentDevice" "$partNum"
udevadm settle
fi
'';
diff --git a/nixos/modules/virtualisation/containers.nix b/nixos/modules/virtualisation/containers.nix
index e54a5fe7d40..7ec443248de 100644
--- a/nixos/modules/virtualisation/containers.nix
+++ b/nixos/modules/virtualisation/containers.nix
@@ -112,7 +112,7 @@ let
# If the host is 64-bit and the container is 32-bit, add a
# --personality flag.
- ${optionalString (config.nixpkgs.system == "x86_64-linux") ''
+ ${optionalString (config.nixpkgs.localSystem.system == "x86_64-linux") ''
if [ "$(< ''${SYSTEM_PATH:-/nix/var/nix/profiles/per-container/$INSTANCE/system}/system)" = i686-linux ]; then
extraFlags+=" --personality=x86"
fi
@@ -255,7 +255,7 @@ let
};
- system = config.nixpkgs.system;
+ system = config.nixpkgs.localSystem.system;
bindMountOpts = { name, config, ... }: {
diff --git a/nixos/tests/containers-imperative.nix b/nixos/tests/containers-imperative.nix
index 20902913e9a..015b79b1cee 100644
--- a/nixos/tests/containers-imperative.nix
+++ b/nixos/tests/containers-imperative.nix
@@ -15,7 +15,7 @@ import ./make-test.nix ({ pkgs, ...} : {
# container available within the VM, because we don't have network access.
virtualisation.pathsInNixDB = let
emptyContainer = import ../lib/eval-config.nix {
- inherit (config.nixpkgs) system;
+ inherit (config.nixpkgs.localSystem) system;
modules = lib.singleton {
containers.foo.config = {};
};
diff --git a/pkgs/applications/audio/faust/faust1.nix b/pkgs/applications/audio/faust/faust1.nix
index 4875ee8b57d..bf5bb781585 100644
--- a/pkgs/applications/audio/faust/faust1.nix
+++ b/pkgs/applications/audio/faust/faust1.nix
@@ -49,7 +49,7 @@ let
# faust.wrapWithBuildEnv.
postInstall = ''
# syntax error when eval'd directly
- pattern="faust2!(svg)"
+ pattern="faust2!(*@(atomsnippets|graph|graphviewer|md|plot|sig|sigviewer|svg))"
(shopt -s extglob; rm "$out"/bin/$pattern)
'';
diff --git a/pkgs/applications/audio/faust/faust2.nix b/pkgs/applications/audio/faust/faust2.nix
index f0564f37d6b..db5433cc35f 100644
--- a/pkgs/applications/audio/faust/faust2.nix
+++ b/pkgs/applications/audio/faust/faust2.nix
@@ -78,7 +78,7 @@ let
# faust.wrapWithBuildEnv.
postInstall = ''
# syntax error when eval'd directly
- pattern="faust2!(svg)"
+ pattern="faust2!(*@(atomsnippets|graph|graphviewer|md|plot|sig|sigviewer|svg))"
(shopt -s extglob; rm "$out"/bin/$pattern)
'';
diff --git a/pkgs/applications/editors/emacs-modes/icicles/default.nix b/pkgs/applications/editors/emacs-modes/icicles/default.nix
index f0d120dd803..2277ebef4ff 100644
--- a/pkgs/applications/editors/emacs-modes/icicles/default.nix
+++ b/pkgs/applications/editors/emacs-modes/icicles/default.nix
@@ -2,25 +2,25 @@
let
modules = [
- { name = "icicles.el"; sha256 = "10w1lghh9jqxxm5cszi2qyk24vnvazfywmyyz1v7zf6cyiwbndrz"; }
- { name = "icicles-chg.el"; sha256 = "020yg4hv120mcy7qvn76j85q6hl7mfcfv66w55c6izc9lbrvvnv8"; }
- { name = "icicles-cmd1.el"; sha256 = "1715x1vkiax93890gfjbzslxsn4swsv37spvyx7chy4s1mym9kfw"; }
- { name = "icicles-cmd2.el"; sha256 = "187k0gmn34fn6w1dw9hjf4i788y01vk47z7ac11ar4bddwh97ddx"; }
- { name = "icicles-doc1.el"; sha256 = "1bw5dkymn2xdrfrp80am0gqi0szs0xihny4qmgzgx6hfbng351qh"; }
- { name = "icicles-doc2.el"; sha256 = "0zd94m1a8mwwbrbcrahxxx8q34w8cg5lna4yww4m1gliyklww86s"; }
- { name = "icicles-face.el"; sha256 = "1mlz8dq7bgzp2cf5j37i25yw90ry657d2m8r93rdj67h7l4wyxhj"; }
- { name = "icicles-fn.el"; sha256 = "1cdghvgsr0b7pdq4lmnfm6kwwcqbk4wqf168kf2sjajbpa24ix96"; }
- { name = "icicles-mac.el"; sha256 = "1w5sgzbp8hyjzrmqd8bwivszaayzh8dkyqa0d751adiwjfs9sq9m"; }
- { name = "icicles-mcmd.el"; sha256 = "1lf2galn3g52hfz61avlr4ifyn5b42dfbmyq78cpzlq7hzc928v2"; }
- { name = "icicles-mode.el"; sha256 = "0gci04j6vx0vqsh4skarznklam1xibj7pjvy67kaip8b6a4zx9ip"; }
- { name = "icicles-opt.el"; sha256 = "17g35ancml0mvywagzhjrgmlr4rhm1wgb5wg3fsqhhldib9qlz56"; }
- { name = "icicles-var.el"; sha256 = "0ydixg41h09yncp8g2nv8zsyv8avg1hj2f3mgrmd2kf0n27bw2nv"; }
+ { name = "icicles.el"; sha256 = "0wxak7wh0rrb3h77ay2vypbb53skcfbrv71xkajhax0w12q6zpaj"; }
+ { name = "icicles-chg.el"; sha256 = "1kqlhisg5g9ycylzqiwxrmmgfw2jw599wisz26wvi48lac2icgg7"; }
+ { name = "icicles-cmd1.el"; sha256 = "17cpw798bl6p77cmjl7lwdnxa1qpw4z1wacjq2mdc8fh81cyw3am"; }
+ { name = "icicles-cmd2.el"; sha256 = "15swxk7fr7wsqpf26xzbvyk12ikkvfcyh9w8wmnpc38dmpyq79rb"; }
+ { name = "icicles-doc1.el"; sha256 = "04j5qvj7pqnjh8h2y2sdgi7x55czdp9xn7yysr3bzcmr1rq5p4bz"; }
+ { name = "icicles-doc2.el"; sha256 = "1k8vfhi3fa4bzsxr074bw5q6srvq6z6hi61rzlxdw7pah6qf7hcz"; }
+ { name = "icicles-face.el"; sha256 = "1pvygqzmh6ag0zhfjn1vhdvlhxybwxzj22ah2pc0ls80dlywhi4l"; }
+ { name = "icicles-fn.el"; sha256 = "1sn56z5rjsvqsy3vs7af7yai0c0qdjvcxvwwc59rhswrbi6zlxz5"; }
+ { name = "icicles-mac.el"; sha256 = "1wyvqzlpq5n70mggqijb8f5r5q9y1hxxngp64sixy0xszy5d12dk"; }
+ { name = "icicles-mcmd.el"; sha256 = "05dniz6337v9r15w8r2zad0n2h6jlygzjp7vw75vvq8mds0acmia"; }
+ { name = "icicles-mode.el"; sha256 = "1xfv8nryf5y2gygg02naawzm5qhrkba3h84g43518r1xc6rgbpp6"; }
+ { name = "icicles-opt.el"; sha256 = "10n4p999ylkapirs75y5fh33lpiyx42i3ajzl2zjfwyr1zksg1iz"; }
+ { name = "icicles-var.el"; sha256 = "1r5gb01zg8nf2qryq9saxfpnzlymmppsk7w1g09lac35c87vh8yl"; }
];
forAll = f: map f modules;
in
stdenv.mkDerivation rec {
- version = "2017-10-28";
+ version = "2018-04-16";
name = "icicles-${version}";
srcs = forAll ({name, sha256}: fetchurl { url = "http://www.emacswiki.org/emacs/download/${name}"; inherit sha256; });
diff --git a/pkgs/applications/graphics/fstl/default.nix b/pkgs/applications/graphics/fstl/default.nix
new file mode 100644
index 00000000000..355acf7681a
--- /dev/null
+++ b/pkgs/applications/graphics/fstl/default.nix
@@ -0,0 +1,35 @@
+{stdenv, fetchFromGitHub, qtbase, mesa_glu, qmake}:
+stdenv.mkDerivation rec {
+ name = "fstl-${version}";
+ version = "0.9.3";
+
+ buildInputs = [qtbase mesa_glu];
+
+ prePatch = ''
+ sed -i "s|/usr/bin|$out/bin|g" qt/fstl.pro
+ '';
+
+ preBuild = ''
+ qmake qt/fstl.pro
+ '';
+
+ postInstall = stdenv.lib.optionalString stdenv.isDarwin ''
+ mkdir -p $out/Applications
+ mv fstl.app $out/Applications
+ '';
+
+ src = fetchFromGitHub {
+ owner = "mkeeter";
+ repo = "fstl";
+ rev = "v" + version;
+ sha256 = "1j0y9xbf0ybrrnsmfzgpyyz6bi98xgzn9ivani424j01vffns892";
+ };
+
+ meta = with stdenv.lib; {
+ description = "The fastest STL file viewer";
+ homepage = "https://github.com/mkeeter/fstl";
+ license = licenses.mit;
+ platforms = platforms.linux ++ platforms.darwin;
+ maintainers = with maintainers; [ tweber ];
+ };
+}
diff --git a/pkgs/applications/graphics/shutter/default.nix b/pkgs/applications/graphics/shutter/default.nix
index a8b4973203d..2cc127a3fc6 100644
--- a/pkgs/applications/graphics/shutter/default.nix
+++ b/pkgs/applications/graphics/shutter/default.nix
@@ -8,6 +8,7 @@ let
ProcProcessTable URI ImageExifTool Gtk2AppIndicator LWPUserAgent JSON
PerlMagick WWWMechanize HTTPDate HTMLForm HTMLParser HTMLTagset JSONXS
CommonSense HTTPCookies NetOAuth PathClass GooCanvas X11Protocol Cairo
+ EncodeLocale TryTiny TypesSerialiser LWPMediaTypes
];
in
stdenv.mkDerivation rec {
diff --git a/pkgs/applications/misc/gv/default.nix b/pkgs/applications/misc/gv/default.nix
index 3fad634b18b..b13e7ae5232 100644
--- a/pkgs/applications/misc/gv/default.nix
+++ b/pkgs/applications/misc/gv/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, Xaw3d, ghostscriptX, perl }:
+{ stdenv, fetchurl, Xaw3d, ghostscriptX, perl, pkgconfig, libiconv }:
let
name = "gv-3.7.4";
@@ -11,7 +11,18 @@ stdenv.mkDerivation {
sha256 = "0q8s43z14vxm41pfa8s5h9kyyzk1fkwjhkiwbf2x70alm6rv6qi1";
};
- buildInputs = [ Xaw3d ghostscriptX perl ];
+ configureFlags = stdenv.lib.optionals stdenv.isDarwin [
+ "--enable-SIGCHLD-fallback"
+ ];
+
+ buildInputs = [
+ Xaw3d
+ ghostscriptX
+ perl
+ ] ++ stdenv.lib.optionals stdenv.isDarwin [
+ pkgconfig
+ libiconv
+ ];
patchPhase = ''
sed 's|\|${ghostscriptX}/bin/gs|g' -i "src/"*.in
@@ -32,6 +43,6 @@ stdenv.mkDerivation {
license = stdenv.lib.licenses.gpl3Plus;
maintainers = [ ];
- platforms = stdenv.lib.platforms.gnu; # arbitrary choice
+ platforms = stdenv.lib.platforms.unix;
};
}
diff --git a/pkgs/applications/misc/jekyll/basic/Gemfile.lock b/pkgs/applications/misc/jekyll/basic/Gemfile.lock
index d18546cb36f..f231df3d8e7 100644
--- a/pkgs/applications/misc/jekyll/basic/Gemfile.lock
+++ b/pkgs/applications/misc/jekyll/basic/Gemfile.lock
@@ -23,7 +23,7 @@ GEM
http_parser.rb (0.6.0)
i18n (0.9.5)
concurrent-ruby (~> 1.0)
- jekyll (3.7.3)
+ jekyll (3.8.0)
addressable (~> 2.4)
colorator (~> 1.0)
em-websocket (~> 0.5)
@@ -36,9 +36,9 @@ GEM
pathutil (~> 0.9)
rouge (>= 1.7, < 4)
safe_yaml (~> 1.0)
- jekyll-avatar (0.5.0)
+ jekyll-avatar (0.6.0)
jekyll (~> 3.0)
- jekyll-mentions (1.2.0)
+ jekyll-mentions (1.3.0)
activesupport (~> 4.0)
html-pipeline (~> 2.3)
jekyll (~> 3.0)
@@ -69,13 +69,13 @@ GEM
pathutil (0.16.1)
forwardable-extended (~> 2.6)
public_suffix (3.0.2)
- rb-fsevent (0.10.2)
+ rb-fsevent (0.10.3)
rb-inotify (0.9.10)
ffi (>= 0.5.0, < 2)
rouge (3.1.1)
ruby_dep (1.5.0)
safe_yaml (1.0.4)
- sass (3.5.5)
+ sass (3.5.6)
sass-listen (~> 4.0.0)
sass-listen (4.0.0)
rb-fsevent (~> 0.9, >= 0.9.4)
diff --git a/pkgs/applications/misc/jekyll/basic/gemset.nix b/pkgs/applications/misc/jekyll/basic/gemset.nix
index b5b21dec438..7c6ac55c201 100644
--- a/pkgs/applications/misc/jekyll/basic/gemset.nix
+++ b/pkgs/applications/misc/jekyll/basic/gemset.nix
@@ -104,28 +104,28 @@
dependencies = ["addressable" "colorator" "em-websocket" "i18n" "jekyll-sass-converter" "jekyll-watch" "kramdown" "liquid" "mercenary" "pathutil" "rouge" "safe_yaml"];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "1k8pz95yiwxj6h645sxwckl227lah97lshv9xxrddhldxwf0n0ff";
+ sha256 = "0fdb3qfbpjhlz5vlx4aw7kg9iy4bvaa5k1v82fxapyjghs2zg8as";
type = "gem";
};
- version = "3.7.3";
+ version = "3.8.0";
};
jekyll-avatar = {
dependencies = ["jekyll"];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "0y2w7pnahkm3ddxrq589wv1w53ay7p1pvfs6khcmh6wq85r6wpsf";
+ sha256 = "124624r83pmn7sp2idnsph9m1bbdiha5jnza4ypna8w2inpih51p";
type = "gem";
};
- version = "0.5.0";
+ version = "0.6.0";
};
jekyll-mentions = {
dependencies = ["activesupport" "html-pipeline" "jekyll"];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "00nqm1ng4iiibmv4vx0ayzq7fqm2sm1af98r4ykvld6asqj5qkyd";
+ sha256 = "11rfn2w9d50szbwbn3pajswjgcg85714d4d052mq2p803zg1i3mn";
type = "gem";
};
- version = "1.2.0";
+ version = "1.3.0";
};
jekyll-sass-converter = {
dependencies = ["sass"];
@@ -250,10 +250,10 @@
rb-fsevent = {
source = {
remotes = ["https://rubygems.org"];
- sha256 = "1fbpmjypwxkb8r7y1kmhmyp6gawa4byw0yb3jc3dn9ly4ld9lizf";
+ sha256 = "1lm1k7wpz69jx7jrc92w3ggczkjyjbfziq5mg62vjnxmzs383xx8";
type = "gem";
};
- version = "0.10.2";
+ version = "0.10.3";
};
rb-inotify = {
dependencies = ["ffi"];
@@ -292,10 +292,10 @@
dependencies = ["sass-listen"];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "10401m2xlv6vaxfwzy4xxmk51ddcnkvwi918cw3jkki0qqdl7d8v";
+ sha256 = "19wyzp9qsg8hdkkxlsv713w0qmy66qrdp0shj42587ssx4qhrlag";
type = "gem";
};
- version = "3.5.5";
+ version = "3.5.6";
};
sass-listen = {
dependencies = ["rb-fsevent" "rb-inotify"];
diff --git a/pkgs/applications/misc/jekyll/full/Gemfile.lock b/pkgs/applications/misc/jekyll/full/Gemfile.lock
index 190f1d66479..45bd34187ca 100644
--- a/pkgs/applications/misc/jekyll/full/Gemfile.lock
+++ b/pkgs/applications/misc/jekyll/full/Gemfile.lock
@@ -22,7 +22,7 @@ GEM
http_parser.rb (~> 0.6.0)
eventmachine (1.2.5)
execjs (2.7.0)
- faraday (0.14.0)
+ faraday (0.15.0)
multipart-post (>= 1.2, < 3)
fast-stemmer (1.0.2)
ffi (1.9.23)
@@ -34,7 +34,7 @@ GEM
http_parser.rb (0.6.0)
i18n (0.9.5)
concurrent-ruby (~> 1.0)
- jekyll (3.7.3)
+ jekyll (3.8.0)
addressable (~> 2.4)
colorator (~> 1.0)
em-websocket (~> 0.5)
@@ -47,7 +47,7 @@ GEM
pathutil (~> 0.9)
rouge (>= 1.7, < 4)
safe_yaml (~> 1.0)
- jekyll-avatar (0.5.0)
+ jekyll-avatar (0.6.0)
jekyll (~> 3.0)
jekyll-coffeescript (1.1.1)
coffee-script (~> 2.2)
@@ -56,7 +56,7 @@ GEM
jekyll (~> 3.3)
jekyll-gist (1.5.0)
octokit (~> 4.2)
- jekyll-mentions (1.2.0)
+ jekyll-mentions (1.3.0)
activesupport (~> 4.0)
html-pipeline (~> 2.3)
jekyll (~> 3.0)
@@ -101,16 +101,16 @@ GEM
public_suffix (3.0.2)
pygments.rb (1.2.1)
multi_json (>= 1.0.0)
- rb-fsevent (0.10.2)
+ rb-fsevent (0.10.3)
rb-inotify (0.9.10)
ffi (>= 0.5.0, < 2)
rdiscount (2.2.0.1)
- rdoc (6.0.1)
+ rdoc (6.0.3)
redcarpet (3.4.0)
rouge (3.1.1)
ruby_dep (1.5.0)
safe_yaml (1.0.4)
- sass (3.5.5)
+ sass (3.5.6)
sass-listen (~> 4.0.0)
sass-listen (4.0.0)
rb-fsevent (~> 0.9, >= 0.9.4)
diff --git a/pkgs/applications/misc/jekyll/full/gemset.nix b/pkgs/applications/misc/jekyll/full/gemset.nix
index 3a115f8a4b0..b45ea5b9d07 100644
--- a/pkgs/applications/misc/jekyll/full/gemset.nix
+++ b/pkgs/applications/misc/jekyll/full/gemset.nix
@@ -96,10 +96,10 @@
dependencies = ["multipart-post"];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "1c3x3s8vb5nf7inyfvhdxwa4q3swmnacpxby6pish5fgmhws7zrr";
+ sha256 = "1dv1vcxxyw4vy0r2diiml0r8zqk1csrksfxv8nkrw61xlf2daaaa";
type = "gem";
};
- version = "0.14.0";
+ version = "0.15.0";
};
fast-stemmer = {
source = {
@@ -163,19 +163,19 @@
dependencies = ["addressable" "colorator" "em-websocket" "i18n" "jekyll-sass-converter" "jekyll-watch" "kramdown" "liquid" "mercenary" "pathutil" "rouge" "safe_yaml"];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "1k8pz95yiwxj6h645sxwckl227lah97lshv9xxrddhldxwf0n0ff";
+ sha256 = "0fdb3qfbpjhlz5vlx4aw7kg9iy4bvaa5k1v82fxapyjghs2zg8as";
type = "gem";
};
- version = "3.7.3";
+ version = "3.8.0";
};
jekyll-avatar = {
dependencies = ["jekyll"];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "0y2w7pnahkm3ddxrq589wv1w53ay7p1pvfs6khcmh6wq85r6wpsf";
+ sha256 = "124624r83pmn7sp2idnsph9m1bbdiha5jnza4ypna8w2inpih51p";
type = "gem";
};
- version = "0.5.0";
+ version = "0.6.0";
};
jekyll-coffeescript = {
dependencies = ["coffee-script" "coffee-script-source"];
@@ -208,10 +208,10 @@
dependencies = ["activesupport" "html-pipeline" "jekyll"];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "00nqm1ng4iiibmv4vx0ayzq7fqm2sm1af98r4ykvld6asqj5qkyd";
+ sha256 = "11rfn2w9d50szbwbn3pajswjgcg85714d4d052mq2p803zg1i3mn";
type = "gem";
};
- version = "1.2.0";
+ version = "1.3.0";
};
jekyll-paginate = {
source = {
@@ -413,10 +413,10 @@
rb-fsevent = {
source = {
remotes = ["https://rubygems.org"];
- sha256 = "1fbpmjypwxkb8r7y1kmhmyp6gawa4byw0yb3jc3dn9ly4ld9lizf";
+ sha256 = "1lm1k7wpz69jx7jrc92w3ggczkjyjbfziq5mg62vjnxmzs383xx8";
type = "gem";
};
- version = "0.10.2";
+ version = "0.10.3";
};
rb-inotify = {
dependencies = ["ffi"];
@@ -438,10 +438,10 @@
rdoc = {
source = {
remotes = ["https://rubygems.org"];
- sha256 = "1vzhv04lp76iax258dh47zsxhjg34r9sg76vgikbyfywjzflvfyj";
+ sha256 = "0ia6gq4fnwkm29j34yncg74w0nq5iyyrcjjhmkwzmzw9dbs0zy8a";
type = "gem";
};
- version = "6.0.1";
+ version = "6.0.3";
};
redcarpet = {
source = {
@@ -479,10 +479,10 @@
dependencies = ["sass-listen"];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "10401m2xlv6vaxfwzy4xxmk51ddcnkvwi918cw3jkki0qqdl7d8v";
+ sha256 = "19wyzp9qsg8hdkkxlsv713w0qmy66qrdp0shj42587ssx4qhrlag";
type = "gem";
};
- version = "3.5.5";
+ version = "3.5.6";
};
sass-listen = {
dependencies = ["rb-fsevent" "rb-inotify"];
diff --git a/pkgs/applications/misc/jekyll/update.sh b/pkgs/applications/misc/jekyll/update.sh
new file mode 100755
index 00000000000..528f1062c73
--- /dev/null
+++ b/pkgs/applications/misc/jekyll/update.sh
@@ -0,0 +1,15 @@
+#!/usr/bin/env nix-shell
+#!nix-shell -i bash -p bundix zlib
+
+set -o errexit
+set -o nounset
+
+readonly BASEDIR="$(dirname $(readlink -f $0))"
+
+for directory in "basic" "full"; do
+ pushd "$BASEDIR/$directory"
+ rm -f Gemfile.lock gemset.nix
+ bundix --magic
+ rm -rf .bundle vendor
+ popd
+done
diff --git a/pkgs/applications/misc/oneko/default.nix b/pkgs/applications/misc/oneko/default.nix
index 4655b059b33..58e80e7f726 100644
--- a/pkgs/applications/misc/oneko/default.nix
+++ b/pkgs/applications/misc/oneko/default.nix
@@ -28,7 +28,7 @@ stdenv.mkDerivation rec {
homepage = "http://www.daidouji.com/oneko/";
license = licenses.publicDomain;
maintainers = [ maintainers.xaverdh ];
- platforms = platforms.linux;
+ platforms = platforms.unix;
};
}
diff --git a/pkgs/applications/misc/qmapshack/default.nix b/pkgs/applications/misc/qmapshack/default.nix
index bc09d0b4d0a..3b9e76aee4b 100644
--- a/pkgs/applications/misc/qmapshack/default.nix
+++ b/pkgs/applications/misc/qmapshack/default.nix
@@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
name = "qmapshack-${version}";
- version = "1.10.0";
+ version = "1.11.1";
src = fetchurl {
url = "https://bitbucket.org/maproom/qmapshack/downloads/${name}.tar.gz";
- sha256 = "10qk6c5myw5dhkbw7pcrx3900kiqhs32vy47xl2844nzb4fq2liw";
+ sha256 = "0yqilfldmfw8m18jbkffv4ar1px6kjs0zlgb216bnhahcr1y8r9y";
};
nativeBuildInputs = [ cmake ];
diff --git a/pkgs/applications/misc/sleepyhead/default.nix b/pkgs/applications/misc/sleepyhead/default.nix
new file mode 100644
index 00000000000..cf5c4625c95
--- /dev/null
+++ b/pkgs/applications/misc/sleepyhead/default.nix
@@ -0,0 +1,42 @@
+{ stdenv, fetchgit, qt5, zlib, libGLU, libX11 }:
+
+let
+ name = "sleepyhead-${version}";
+ version = "1.0.0-beta-git";
+in stdenv.mkDerivation {
+ inherit name;
+
+ src = fetchgit {
+ url = https://gitlab.com/sleepyhead/sleepyhead-code.git;
+ rev = "9e2329d8bca45693231b5e3dae80063717c24578";
+ sha256 = "0448z8gyaxpgpnksg34lzmffj36jdpm0ir4xxa5gvzagkx0wk07h";
+ };
+
+ buildInputs = [
+ qt5.qtbase qt5.qtwebkit qt5.qtserialport
+ zlib
+ libGLU
+ libX11
+ ];
+
+ patchPhase = ''
+ patchShebangs configure
+ '';
+
+ installPhase = ''
+ mkdir -p $out/bin
+ cp sleepyhead/SleepyHead $out/bin
+ '';
+
+ meta = with stdenv.lib; {
+ homepage = https://sleepyhead.jedimark.net/;
+ description = "Review and explore data produced by CPAP and related machines";
+ longDescription = ''
+ SleepyHead is cross platform, opensource sleep tracking program for reviewing CPAP and Oximetry data, which are devices used in the treatment of Sleep Disorders like Obstructive Sleep Apnea.
+ '';
+ license = licenses.gpl3;
+ platforms = platforms.all;
+ maintainers = [ maintainers.krav ];
+ };
+
+}
diff --git a/pkgs/applications/networking/gns3/default.nix b/pkgs/applications/networking/gns3/default.nix
index 66bf843865e..74287dc6af4 100644
--- a/pkgs/applications/networking/gns3/default.nix
+++ b/pkgs/applications/networking/gns3/default.nix
@@ -1,7 +1,7 @@
{ callPackage, stdenv }:
let
- stableVersion = "2.1.4";
+ stableVersion = "2.1.5";
# Currently there is no preview version.
previewVersion = stableVersion;
addVersion = args:
@@ -10,8 +10,8 @@ let
in args // { inherit version branch; };
mkGui = args: callPackage (import ./gui.nix (addVersion args)) { };
mkServer = args: callPackage (import ./server.nix (addVersion args)) { };
- guiSrcHash = "03x9qgqs4y9swyipigviyscvlcfkb2v6iasc54nv07ks8srqwf93";
- serverSrcHash = "0qzx0y4mqxpn5xhzgr2865lvszhi6szdli1jq64gihwdy3bhli4f";
+ guiSrcHash = "1d7pwm36bqjm0d021z5qnx49v8zf4yi9jn5hn6zlbiqbz53l1x7l";
+ serverSrcHash = "002pqm4jcm5qbbw1vnhjdrgysh7d6xmdl66605wz1vbp7xn5s961";
in {
guiStable = mkGui {
stable = true;
diff --git a/pkgs/applications/networking/mailreaders/inboxer/default.nix b/pkgs/applications/networking/mailreaders/inboxer/default.nix
index 95bdb6cb581..c0f015944b0 100644
--- a/pkgs/applications/networking/mailreaders/inboxer/default.nix
+++ b/pkgs/applications/networking/mailreaders/inboxer/default.nix
@@ -2,7 +2,7 @@
stdenv.mkDerivation rec {
name = "inboxer-${version}";
- version = "1.0.4";
+ version = "1.1.2";
meta = with stdenv.lib; {
description = "Unofficial, free and open-source Google Inbox Desktop App";
@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
src = fetchurl {
url = "https://github.com/denysdovhan/inboxer/releases/download/v${version}/inboxer_${version}_amd64.deb";
- sha256 = "0i6qmrnga80q8s6dabfgh0fcdnc2wpj948za04zi1ajv4fjwjh0n";
+ sha256 = "100185j10dj044mg5p9xlq7fj7n7xki9qw5xn845dgq0dpj8rkrm";
};
unpackPhase = ''
diff --git a/pkgs/applications/networking/p2p/tixati/default.nix b/pkgs/applications/networking/p2p/tixati/default.nix
index 688f908c798..9f47f8464a1 100644
--- a/pkgs/applications/networking/p2p/tixati/default.nix
+++ b/pkgs/applications/networking/p2p/tixati/default.nix
@@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
name = "tixati-${version}";
- version = "2.55";
+ version = "2.57";
src = fetchurl {
url = "https://download2.tixati.com/download/tixati-${version}-1.x86_64.manualinstall.tar.gz";
- sha256 = "02mha6lfcb0mg0y977bxa6xg8krpbsbzpm4b5xw6y6wign4d8a8w";
+ sha256 = "0z6znh62ry4fmc6c54zq79pk1b5bwkz93bxsfgvxpf6sajpyf9n7";
};
installPhase = ''
diff --git a/pkgs/applications/science/machine-learning/shogun/default.nix b/pkgs/applications/science/machine-learning/shogun/default.nix
index e33b55503bd..0ac40b1e7d4 100644
--- a/pkgs/applications/science/machine-learning/shogun/default.nix
+++ b/pkgs/applications/science/machine-learning/shogun/default.nix
@@ -52,6 +52,10 @@ stdenv.mkDerivation rec {
++ (optional (opencvSupport) "-DOpenCV=ON")
;
+ # Previous attempts to fix parallel builds (see patch above) were not entirely successful.
+ # Sporadic build failures still exist. Dislable parallel builds for now.
+ enableParallelBuilding = false;
+
meta = with stdenv.lib; {
description = "A toolbox which offers a wide range of efficient and unified machine learning methods";
homepage = "http://shogun-toolbox.org/";
diff --git a/pkgs/applications/science/math/giac/default.nix b/pkgs/applications/science/math/giac/default.nix
index 6acaa406744..dd92e264889 100644
--- a/pkgs/applications/science/math/giac/default.nix
+++ b/pkgs/applications/science/math/giac/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, texlive, bison, flex
+{ stdenv, fetchurl, fetchpatch, texlive, bison, flex
, gmp, mpfr, pari, ntl, gsl, blas, mpfi, liblapackWithAtlas
, readline, gettext, libpng, libao, gfortran, perl
, enableGUI ? false, libGLU_combined ? null, xorg ? null, fltk ? null
@@ -16,6 +16,15 @@ stdenv.mkDerivation rec {
sha256 = "0dv5p5y6gkrsmz3xa7fw87rjyabwdwk09mqb09kb7gai9n9dgayk";
};
+ patches = stdenv.lib.optionals (!enableGUI) [
+ # when enableGui is false, giac is compiled without fltk. That means some
+ # outputs differ in the make check. Patch around this:
+ (fetchpatch {
+ url = "https://git.sagemath.org/sage.git/plain/build/pkgs/giac/patches/nofltk-check.patch?id=7553a3c8dfa7bcec07241a07e6a4e7dcf5bb4f26";
+ sha256 = "0xkmfc028vg5w6va04gp2x2iv31n8v4shd6vbyvk4blzgfmpj2cw";
+ })
+ ];
+
postPatch = ''
for i in doc/*/Makefile*; do
substituteInPlace "$i" --replace "/bin/cp" "cp";
@@ -37,10 +46,11 @@ stdenv.mkDerivation rec {
libGLU_combined fltk xorg.libX11
];
- outputs = [ "out" ];
+ outputs = [ "out" "doc" ];
+
+ doCheck = true;
enableParallelBuilding = true;
- hardeningDisable = [ "format" "bindnow" "relro" ];
configureFlags = [
"--enable-gc" "--enable-png" "--enable-gsl" "--enable-lapack"
@@ -57,6 +67,13 @@ stdenv.mkDerivation rec {
for file in $(find $out -name Makefile) ; do
sed -i "s@/nix/store/[^/]*/bin/@@" "$file" ;
done;
+
+ # reference cycle
+ rm "$out/share/giac/doc/el/"{casinter,tutoriel}/Makefile
+
+ mkdir -p "$doc/share/giac"
+ mv "$out/share/giac/doc" "$doc/share/giac"
+ mv "$out/share/giac/examples" "$doc/share/giac"
'';
meta = with stdenv.lib; {
diff --git a/pkgs/applications/search/grepcidr/default.nix b/pkgs/applications/search/grepcidr/default.nix
new file mode 100644
index 00000000000..69fc0e76932
--- /dev/null
+++ b/pkgs/applications/search/grepcidr/default.nix
@@ -0,0 +1,21 @@
+{ stdenv, fetchurl }:
+
+stdenv.mkDerivation rec {
+ name = "grepcidr-${version}";
+ version = "2.0";
+
+ src = fetchurl {
+ url = "http://www.pc-tools.net/files/unix/${name}.tar.gz";
+ sha256 = "1yzpa1nigmmp4hir6377hrkpp0z6jnxgccaw2jbqgydbglvnm231";
+ };
+
+ installFlags = [ "PREFIX=$(out)" ];
+
+ meta = with stdenv.lib; {
+ description = "Filter IPv4 and IPv6 addresses matching CIDR patterns";
+ homepage = http://www.pc-tools.net/unix/grepcidr/;
+ license = licenses.gpl3;
+ platforms = platforms.unix;
+ maintainers = [ maintainers.fadenb ];
+ };
+}
diff --git a/pkgs/applications/version-management/bazaar/default.nix b/pkgs/applications/version-management/bazaar/default.nix
index 47d667a0c06..72e010fd283 100644
--- a/pkgs/applications/version-management/bazaar/default.nix
+++ b/pkgs/applications/version-management/bazaar/default.nix
@@ -1,4 +1,5 @@
{ stdenv, fetchurl, python2Packages
+, fetchpatch
, withSFTP ? true
}:
@@ -17,8 +18,15 @@ python2Packages.buildPythonApplication rec {
propagatedBuildInputs = []
++ stdenv.lib.optionals withSFTP [ python2Packages.paramiko ];
- # Bazaar can't find the certificates alone
- patches = [ ./add_certificates.patch ];
+ patches = [
+ # Bazaar can't find the certificates alone
+ ./add_certificates.patch
+ (fetchpatch {
+ url = "https://bazaar.launchpad.net/~brz/brz/trunk/revision/6754";
+ sha256 = "0mdqa9w1p6cmli6976v4wi0sw9r4p5prkj7lzfd1877wk11c9c73";
+ name = "CVE-2017-14176.patch";
+ })
+ ];
postPatch = ''
substituteInPlace bzrlib/transport/http/_urllib2_wrappers.py \
--subst-var-by certPath /etc/ssl/certs/ca-certificates.crt
diff --git a/pkgs/applications/video/vlc/default.nix b/pkgs/applications/video/vlc/default.nix
index fffbd5c0ffb..44c4d317d36 100644
--- a/pkgs/applications/video/vlc/default.nix
+++ b/pkgs/applications/video/vlc/default.nix
@@ -7,7 +7,6 @@
, libmtp, unzip, taglib, libkate, libtiger, libv4l, samba, liboggz
, libass, libva, libdvbpsi, libdc1394, libraw1394, libopus
, libvdpau, libsamplerate, live555, fluidsynth
-, onlyLibVLC ? false
, qt4 ? null
, withQt5 ? false, qtbase ? null, qtx11extras ? null
, jackSupport ? false
@@ -68,8 +67,7 @@ stdenv.mkDerivation rec {
"--enable-vdpau"
"--enable-dvdnav"
"--enable-samplerate"
- ]
- ++ optional onlyLibVLC "--disable-vlc";
+ ];
enableParallelBuilding = true;
diff --git a/pkgs/applications/window-managers/weston/default.nix b/pkgs/applications/window-managers/weston/default.nix
index 0a5e601b012..4a15e323616 100644
--- a/pkgs/applications/window-managers/weston/default.nix
+++ b/pkgs/applications/window-managers/weston/default.nix
@@ -7,11 +7,11 @@
stdenv.mkDerivation rec {
name = "weston-${version}";
- version = "3.0.0";
+ version = "4.0.0";
src = fetchurl {
url = "http://wayland.freedesktop.org/releases/${name}.tar.xz";
- sha256 = "19936zlkb75xcaidd8fag4ah8000wrh2ziqy7nxkq36pimgdbqfd";
+ sha256 = "0n2big8xw6g6n46zm1jyf00dv9r4d84visdz5b8vxpw3xzkhmz50";
};
nativeBuildInputs = [ pkgconfig ];
diff --git a/pkgs/build-support/rust/build-rust-crate.nix b/pkgs/build-support/rust/build-rust-crate.nix
index b07a09d6355..e0aec6e0e18 100644
--- a/pkgs/build-support/rust/build-rust-crate.nix
+++ b/pkgs/build-support/rust/build-rust-crate.nix
@@ -47,7 +47,7 @@ let makeDeps = dependencies:
'';
configureCrate =
- { crateName, crateVersion, crateAuthors, build, libName, crateFeatures, colors, libPath, release, buildDependencies, completeDeps, completeBuildDeps, verbose, dependencies }:
+ { crateName, crateVersion, crateAuthors, build, libName, crateFeatures, colors, libPath, release, buildDependencies, completeDeps, completeBuildDeps, verbose, dependencies, workspace_member }:
let version_ = lib.splitString "-" crateVersion;
versionPre = if lib.tail version_ == [] then "" else builtins.elemAt version_ 1;
version = lib.splitString "." (lib.head version_);
@@ -58,6 +58,7 @@ let makeDeps = dependencies:
completeDepsDir = lib.concatStringsSep " " completeDeps;
completeBuildDepsDir = lib.concatStringsSep " " completeBuildDeps;
in ''
+ cd ${workspace_member}
runHook preConfigure
${echo_build_heading colors}
${noisily colors verbose}
@@ -146,10 +147,15 @@ let makeDeps = dependencies:
mkdir -p $OUT_DIR
target/build/${crateName}/build_script_build > target/build/${crateName}.opt
set +e
- EXTRA_BUILD=$(sed -n "s/^cargo:rustc-flags=\(.*\)/\1/p" target/build/${crateName}.opt | tr '\n' ' ')
+ EXTRA_BUILD=$(sed -n "s/^cargo:rustc-flags=\(.*\)/\1/p" target/build/${crateName}.opt | tr '\n' ' ' | sort -u)
EXTRA_FEATURES=$(sed -n "s/^cargo:rustc-cfg=\(.*\)/--cfg \1/p" target/build/${crateName}.opt | tr '\n' ' ')
- EXTRA_LINK=$(sed -n "s/^cargo:rustc-link-lib=\(.*\)/\1/p" target/build/${crateName}.opt | tr '\n' ' ')
- EXTRA_LINK_SEARCH=$(sed -n "s/^cargo:rustc-link-search=\(.*\)/\1/p" target/build/${crateName}.opt | tr '\n' ' ')
+ EXTRA_LINK=$(sed -n "s/^cargo:rustc-link-lib=\(.*\)/\1/p" target/build/${crateName}.opt | tr '\n' ' ' | sort -u)
+ EXTRA_LINK_SEARCH=$(sed -n "s/^cargo:rustc-link-search=\(.*\)/\1/p" target/build/${crateName}.opt | tr '\n' ' ' | sort -u)
+
+ for env in $(sed -n "s/^cargo:rustc-env=\(.*\)/\1/p" target/build/${crateName}.opt); do
+ export $env
+ done
+
CRATENAME=$(echo ${crateName} | sed -e "s/\(.*\)-sys$/\U\1/")
grep -P "^cargo:(?!(rustc-|warning=|rerun-if-changed=|rerun-if-env-changed))" target/build/${crateName}.opt \
| sed -e "s/cargo:\([^=]*\)=\(.*\)/export DEP_$(echo $CRATENAME)_\U\1\E=\2/" > target/env
@@ -171,8 +177,7 @@ let makeDeps = dependencies:
dependencies, completeDeps, completeBuildDeps,
crateFeatures, libName, build, release, libPath,
crateType, metadata, crateBin, finalBins,
- extraRustcOpts,
- verbose, colors }:
+ extraRustcOpts, verbose, colors }:
let depsDir = lib.concatStringsSep " " dependencies;
completeDepsDir = lib.concatStringsSep " " completeDeps;
@@ -182,7 +187,7 @@ let makeDeps = dependencies:
rustcOpts =
lib.lists.foldl' (opts: opt: opts + " " + opt)
(if release then "-C opt-level=3" else "-C debuginfo=2")
- extraRustcOpts;
+ (["-C codegen-units=1"] ++ extraRustcOpts);
rustcMeta = "-C metadata=${metadata} -C extra-filename=-${metadata}";
version_ = lib.splitString "-" crateVersion;
versionPre = if lib.tail version_ == [] then "" else builtins.elemAt version_ 1;
@@ -221,12 +226,12 @@ let makeDeps = dependencies:
build_bin() {
crate_name=$1
crate_name_=$(echo $crate_name | sed -e "s/-/_/g")
- main_file=""
- if [[ ! -z $2 ]]; then
+ main_file=""
+ if [[ ! -z $2 ]]; then
main_file=$2
- fi
- echo_build_heading $@
- noisily rustc --crate-name $crate_name_ $main_file --crate-type bin ${rustcOpts}\
+ fi
+ echo_build_heading $@
+ noisily rustc --crate-name $crate_name_ $main_file --crate-type bin ${rustcOpts}\
${crateFeatures} --out-dir target/bin --emit=dep-info,link -L dependency=target/deps \
$LINK ${deps}$EXTRA_LIB --cap-lints allow \
$BUILD_OUT_DIR $EXTRA_BUILD $EXTRA_FEATURES --color ${colors}
@@ -374,7 +379,7 @@ stdenv.mkDerivation (rec {
);
crateFeatures = if crate ? features then
- lib.concatMapStringsSep " " (f: "--cfg feature=\\\"${f}\\\"") (crate.features ++ features)
+ lib.concatMapStringsSep " " (f: "--cfg feature=\\\"${f}\\\"") (crate.features ++ features) #"
else "";
libName = if crate ? libName then crate.libName else crate.crateName;
@@ -407,24 +412,26 @@ stdenv.mkDerivation (rec {
) "" crate.crateBin
else "";
- build = if crate ? build then crate.build else "";
+ build = crate.build or "";
+ workspace_member = crate.workspace_member or ".";
crateVersion = crate.version;
crateAuthors = if crate ? authors && lib.isList crate.authors then crate.authors else [];
crateType =
if lib.attrByPath ["procMacro"] false crate then "proc-macro" else
if lib.attrByPath ["plugin"] false crate then "dylib" else
- if crate ? type then crate.type else "lib";
+ (crate.type or "lib");
colors = lib.attrByPath [ "colors" ] "always" crate;
configurePhase = configureCrate {
inherit crateName dependencies buildDependencies completeDeps completeBuildDeps
- crateFeatures libName build release libPath crateVersion
+ crateFeatures libName build workspace_member release libPath crateVersion
crateAuthors verbose colors;
};
extraRustcOpts = if crate ? extraRustcOpts then crate.extraRustcOpts else [];
buildPhase = buildCrate {
inherit crateName dependencies completeDeps completeBuildDeps
- crateFeatures libName build release libPath crateType crateVersion
- crateAuthors metadata crateBin finalBins verbose colors extraRustcOpts;
+ crateFeatures libName build release libPath crateType
+ crateVersion crateAuthors metadata crateBin finalBins verbose colors
+ extraRustcOpts;
};
installPhase = installCrate crateName metadata;
diff --git a/pkgs/build-support/rust/carnix.nix b/pkgs/build-support/rust/carnix.nix
index ebb46b0f592..5b79d607f9d 100644
--- a/pkgs/build-support/rust/carnix.nix
+++ b/pkgs/build-support/rust/carnix.nix
@@ -1,4 +1,4 @@
-# Generated by carnix 0.6.5: carnix -o carnix.nix Cargo.lock
+# Generated by carnix 0.7.2: carnix nix
{ lib, buildPlatform, buildRustCrate, fetchgit }:
let kernel = buildPlatform.parsed.kernel.name;
abi = buildPlatform.parsed.abi.name;
@@ -18,35 +18,36 @@ let kernel = buildPlatform.parsed.kernel.name;
) [] (builtins.attrNames feat);
in
rec {
- carnix = f: carnix_0_6_6 { features = carnix_0_6_6_features { carnix_0_6_6 = f; }; };
- aho_corasick_0_6_3_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
+ carnix = f: carnix_0_7_2 { features = carnix_0_7_2_features { carnix_0_7_2 = f; }; };
+ __all = [ (carnix {}) ];
+ aho_corasick_0_6_4_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
crateName = "aho-corasick";
- version = "0.6.3";
+ version = "0.6.4";
authors = [ "Andrew Gallant " ];
- sha256 = "1cpqzf6acj8lm06z3f1cg41wn6c2n9l3v49nh0dvimv4055qib6k";
+ sha256 = "189v919mp6rzzgjp1khpn4zlq8ls81gh43x1lmc8kbkagdlpq888";
libName = "aho_corasick";
crateBin = [ { name = "aho-corasick-dot"; } ];
inherit dependencies buildDependencies features;
};
- ansi_term_0_10_2_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
+ ansi_term_0_11_0_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
crateName = "ansi_term";
- version = "0.10.2";
+ version = "0.11.0";
authors = [ "ogham@bsago.me" "Ryan Scheel (Havvy) " "Josh Triplett " ];
- sha256 = "07k0hfmlhv43lihyxb9d81l5mq5zlpqvv30dkfd3knmv2ginasn9";
+ sha256 = "08fk0p2xvkqpmz3zlrwnf6l8sj2vngw464rvzspzp31sbgxbwm4v";
inherit dependencies buildDependencies features;
};
- atty_0_2_3_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
+ atty_0_2_8_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
crateName = "atty";
- version = "0.2.3";
+ version = "0.2.8";
authors = [ "softprops " ];
- sha256 = "0zl0cjfgarp5y78nd755lpki5bbkj4hgmi88v265m543yg29i88f";
+ sha256 = "03w1q3h4w7vhcdxdwa9cirjkzdjz3ja636fj3g64659z6yax6p6d";
inherit dependencies buildDependencies features;
};
- backtrace_0_3_4_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
+ backtrace_0_3_6_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
crateName = "backtrace";
- version = "0.3.4";
+ version = "0.3.6";
authors = [ "Alex Crichton " "The Rust Project Developers" ];
- sha256 = "1caba8w3rqd5ghr88ghyz5wgkf81dgx18bj1llkax6qmianc6gk7";
+ sha256 = "00p77iqrv2p47m4y5lq1clb8fi1xfmnz2520frqx88497ff4zhrx";
inherit dependencies buildDependencies features;
};
backtrace_sys_0_1_16_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
@@ -57,13 +58,6 @@ rec {
build = "build.rs";
inherit dependencies buildDependencies features;
};
- bitflags_0_7_0_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
- crateName = "bitflags";
- version = "0.7.0";
- authors = [ "The Rust Project Developers" ];
- sha256 = "1hr72xg5slm0z4pxs2hiy4wcyx3jva70h58b7mid8l0a4c8f7gn5";
- inherit dependencies buildDependencies features;
- };
bitflags_1_0_1_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
crateName = "bitflags";
version = "1.0.1";
@@ -71,18 +65,19 @@ rec {
sha256 = "0p4b3nr0s5nda2qmm7xdhnvh4lkqk3xd8l9ffmwbvqw137vx7mj1";
inherit dependencies buildDependencies features;
};
- carnix_0_6_6_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
+ carnix_0_7_2_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
crateName = "carnix";
- version = "0.6.6";
+ version = "0.7.2";
authors = [ "pe@pijul.org " ];
- sha256 = "1ai2r52j6vlrclhb7cvifx3lsg9naiy3jpsrbi3mmfmr6zbi7rdw";
+ sha256 = "0zsmc4wiz7vill676mcdh6ibyzmr9rn030j555ncqgavs7k5yhq5";
+ crateBin = [ { name = "cargo-generate-nixfile"; path = "src/cargo-generate-nixfile.rs"; } { name = "carnix"; path = "src/main.rs"; } ];
inherit dependencies buildDependencies features;
};
- cc_1_0_3_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
+ cc_1_0_10_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
crateName = "cc";
- version = "1.0.3";
+ version = "1.0.10";
authors = [ "Alex Crichton " ];
- sha256 = "193pwqgh79w6k0k29svyds5nnlrwx44myqyrw605d5jj4yk2zmpr";
+ sha256 = "0fqchrxcrd2j2b9x7cqs49ck7b3ilsap8s9xhs75gzgl6c1ylpdn";
inherit dependencies buildDependencies features;
};
cfg_if_0_1_2_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
@@ -92,27 +87,11 @@ rec {
sha256 = "0x06hvrrqy96m97593823vvxcgvjaxckghwyy2jcyc8qc7c6cyhi";
inherit dependencies buildDependencies features;
};
- chrono_0_4_0_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
- crateName = "chrono";
- version = "0.4.0";
- authors = [ "Kang Seonghoon " ];
- sha256 = "0hm53hi6v7b6b1va6vn96lx26wvj8gzi2g51s1j02nlz0jcprw6a";
- inherit dependencies buildDependencies features;
- };
- clap_2_28_0_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
+ clap_2_31_2_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
crateName = "clap";
- version = "2.28.0";
+ version = "2.31.2";
authors = [ "Kevin K. " ];
- sha256 = "0m0rj9xw6mja4gdhqmaldv0q5y5jfsfzbyzfd70mm3857aynq03k";
- inherit dependencies buildDependencies features;
- };
- dbghelp_sys_0_2_0_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
- crateName = "dbghelp-sys";
- version = "0.2.0";
- authors = [ "Peter Atashian " ];
- sha256 = "0ylpi3bbiy233m57hnisn1df1v0lbl7nsxn34b0anzsgg440hqpq";
- libName = "dbghelp";
- build = "build.rs";
+ sha256 = "0r24ziw85a8y1sf2l21y4mvv5qan3rjafcshpyfsjfadqfxsij72";
inherit dependencies buildDependencies features;
};
dtoa_0_4_2_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
@@ -122,18 +101,18 @@ rec {
sha256 = "1bxsh6fags7nr36vlz07ik2a1rzyipc8x1y30kjk832hf2pzadmw";
inherit dependencies buildDependencies features;
};
- either_1_4_0_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
+ either_1_5_0_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
crateName = "either";
- version = "1.4.0";
+ version = "1.5.0";
authors = [ "bluss" ];
- sha256 = "04kpfd84lvyrkb2z4sljlz2d3d5qczd0sb1yy37fgijq2yx3vb37";
+ sha256 = "1f7kl2ln01y02m8fpd2zrdjiwqmgfvl9nxxrfry3k19d1gd2bsvz";
inherit dependencies buildDependencies features;
};
- env_logger_0_5_3_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
+ env_logger_0_5_7_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
crateName = "env_logger";
- version = "0.5.3";
+ version = "0.5.7";
authors = [ "The Rust Project Developers" ];
- sha256 = "1i7jyxrwwv3w2h200ynq3fjg1iyyvi76ny215hi6d334vkkw2s2y";
+ sha256 = "0wgd9fashmwbx5ssrxx69naam6hlb5c7qmh1nln645q4gms35i2l";
inherit dependencies buildDependencies features;
};
error_chain_0_11_0_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
@@ -143,62 +122,61 @@ rec {
sha256 = "19nz17q6dzp0mx2jhh9qbj45gkvvgcl7zq9z2ai5a8ihbisfj6d7";
inherit dependencies buildDependencies features;
};
- fuchsia_zircon_0_2_1_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
+ fuchsia_zircon_0_3_3_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
crateName = "fuchsia-zircon";
- version = "0.2.1";
+ version = "0.3.3";
authors = [ "Raph Levien " ];
- sha256 = "0yd4rd7ql1vdr349p6vgq2dnwmpylky1kjp8g1zgvp250jxrhddb";
+ sha256 = "0jrf4shb1699r4la8z358vri8318w4mdi6qzfqy30p2ymjlca4gk";
inherit dependencies buildDependencies features;
};
- fuchsia_zircon_sys_0_2_0_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
+ fuchsia_zircon_sys_0_3_3_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
crateName = "fuchsia-zircon-sys";
- version = "0.2.0";
+ version = "0.3.3";
authors = [ "Raph Levien " ];
- sha256 = "1yrqsrjwlhl3di6prxf5xmyd82gyjaysldbka5wwk83z11mpqh4w";
+ sha256 = "08jp1zxrm9jbrr6l26bjal4dbm8bxfy57ickdgibsqxr1n9j3hf5";
inherit dependencies buildDependencies features;
};
- itertools_0_7_3_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
+ humantime_1_1_1_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
+ crateName = "humantime";
+ version = "1.1.1";
+ authors = [ "Paul Colomiets " ];
+ sha256 = "1lzdfsfzdikcp1qb6wcdvnsdv16pmzr7p7cv171vnbnyz2lrwbgn";
+ libPath = "src/lib.rs";
+ inherit dependencies buildDependencies features;
+ };
+ itertools_0_7_8_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
crateName = "itertools";
- version = "0.7.3";
+ version = "0.7.8";
authors = [ "bluss" ];
- sha256 = "128a69cnmgpj38rs6lcwzya773d2vx7f9y7012iycjf9yi2pyckj";
+ sha256 = "0ib30cd7d1icjxsa13mji1gry3grp72kx8p33yd84mphdbc3d357";
inherit dependencies buildDependencies features;
};
- itoa_0_3_4_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
+ itoa_0_4_1_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
crateName = "itoa";
- version = "0.3.4";
+ version = "0.4.1";
authors = [ "David Tolnay " ];
- sha256 = "1nfkzz6vrgj0d9l3yzjkkkqzdgs68y294fjdbl7jq118qi8xc9d9";
+ sha256 = "1jyrsmrm5q4r2ipmq5hvvkqg0mgnlbk44lm7gr0v9ymvbrh2gbij";
inherit dependencies buildDependencies features;
};
- kernel32_sys_0_2_2_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
- crateName = "kernel32-sys";
- version = "0.2.2";
- authors = [ "Peter Atashian " ];
- sha256 = "1lrw1hbinyvr6cp28g60z97w32w8vsk6pahk64pmrv2fmby8srfj";
- libName = "kernel32";
- build = "build.rs";
- inherit dependencies buildDependencies features;
- };
- lazy_static_0_2_11_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
+ lazy_static_1_0_0_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
crateName = "lazy_static";
- version = "0.2.11";
+ version = "1.0.0";
authors = [ "Marvin Löbel " ];
- sha256 = "1x6871cvpy5b96yv4c7jvpq316fp5d4609s9py7qk6cd6x9k34vm";
+ sha256 = "0wfvqyr2nvx2mbsrscg5y7gfa9skhb8p72ayanl8vl49pw24v4fh";
inherit dependencies buildDependencies features;
};
- libc_0_2_33_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
+ libc_0_2_40_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
crateName = "libc";
- version = "0.2.33";
+ version = "0.2.40";
authors = [ "The Rust Project Developers" ];
- sha256 = "1l7synziccnvarsq2kk22vps720ih6chmn016bhr2bq54hblbnl1";
+ sha256 = "1xfc39237ldzgr8x8wcflgdr8zssi3wif7g2zxc02d94gzkjsw83";
inherit dependencies buildDependencies features;
};
- libsqlite3_sys_0_9_0_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
+ libsqlite3_sys_0_9_1_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
crateName = "libsqlite3-sys";
- version = "0.9.0";
+ version = "0.9.1";
authors = [ "John Gallagher " ];
- sha256 = "1pnx3i9h85si6cs4nhazfb28hsvk7dn0arnfvpdzpjdnj9z38q57";
+ sha256 = "1j599xygsh564xmx29942w0sq7w05c1jipk6dsyrxj6b33kw3fw7";
build = "build.rs";
inherit dependencies buildDependencies features;
};
@@ -230,6 +208,13 @@ rec {
sha256 = "0dfb8ifl9nrc9kzgd5z91q6qg87sh285q1ih7xgrsglmqfav9lg7";
inherit dependencies buildDependencies features;
};
+ memchr_2_0_1_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
+ crateName = "memchr";
+ version = "2.0.1";
+ authors = [ "Andrew Gallant " "bluss" ];
+ sha256 = "0ls2y47rjwapjdax6bp974gdp06ggm1v8d1h69wyydmh1nhgm5gr";
+ inherit dependencies buildDependencies features;
+ };
nom_3_2_1_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
crateName = "nom";
version = "3.2.1";
@@ -237,32 +222,11 @@ rec {
sha256 = "1vcllxrz9hdw6j25kn020ka3psz1vkaqh1hm3yfak2240zrxgi07";
inherit dependencies buildDependencies features;
};
- num_0_1_40_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
- crateName = "num";
- version = "0.1.40";
- authors = [ "The Rust Project Developers" ];
- sha256 = "0b29c25n9mpf6a921khj7a6y3hz5va4vgwppcd2if975qq1shakg";
- inherit dependencies buildDependencies features;
- };
- num_integer_0_1_35_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
- crateName = "num-integer";
- version = "0.1.35";
- authors = [ "The Rust Project Developers" ];
- sha256 = "0xybj8isi9b6wc646d5rc043i8l8j6wy0vrl4pn995qms9fxbbcc";
- inherit dependencies buildDependencies features;
- };
- num_iter_0_1_34_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
- crateName = "num-iter";
- version = "0.1.34";
- authors = [ "The Rust Project Developers" ];
- sha256 = "02cld7x9dzbqbs6sxxzq1i22z3awlcd6ljkgvhkfr9rsnaxphzl9";
- inherit dependencies buildDependencies features;
- };
- num_traits_0_1_40_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
+ num_traits_0_2_2_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
crateName = "num-traits";
- version = "0.1.40";
+ version = "0.2.2";
authors = [ "The Rust Project Developers" ];
- sha256 = "1fr8ghp4i97q3agki54i0hpmqxv3s65i2mqd1pinc7w7arc3fplw";
+ sha256 = "1gcqhcd27gi72al5salxlp3m374qr3xnc3zh249f7dsrxc9rmgh0";
inherit dependencies buildDependencies features;
};
pkg_config_0_3_9_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
@@ -272,25 +236,39 @@ rec {
sha256 = "06k8fxgrsrxj8mjpjcq1n7mn2p1shpxif4zg9y5h09c7vy20s146";
inherit dependencies buildDependencies features;
};
- quote_0_3_15_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
+ proc_macro2_0_3_6_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
+ crateName = "proc-macro2";
+ version = "0.3.6";
+ authors = [ "Alex Crichton " ];
+ sha256 = "1viqlvsknzvgc2j0bcz53n94zxv7c816py7hv2r27y0bv1dq4iqp";
+ inherit dependencies buildDependencies features;
+ };
+ quick_error_1_2_1_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
+ crateName = "quick-error";
+ version = "1.2.1";
+ authors = [ "Paul Colomiets " "Colin Kiegel " ];
+ sha256 = "0vq41csw68ynaq2fy5dvldh4lx7pnbw6pr332kv5rvrz4pz0jnq6";
+ inherit dependencies buildDependencies features;
+ };
+ quote_0_5_1_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
crateName = "quote";
- version = "0.3.15";
+ version = "0.5.1";
authors = [ "David Tolnay " ];
- sha256 = "09il61jv4kd1360spaj46qwyl21fv1qz18fsv2jra8wdnlgl5jsg";
+ sha256 = "0jppgddqp6vp67ns4hpyf644n5678fligp711isp0xkvfv19la3r";
inherit dependencies buildDependencies features;
};
- rand_0_3_18_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
+ rand_0_4_2_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
crateName = "rand";
- version = "0.3.18";
+ version = "0.4.2";
authors = [ "The Rust Project Developers" ];
- sha256 = "15d7c3myn968dzjs0a2pgv58hzdavxnq6swgj032lw2v966ir4xv";
+ sha256 = "0h8pkg23wb67i8904sm76iyr1jlmhklb85vbpz9c9191a24xzkfm";
inherit dependencies buildDependencies features;
};
- redox_syscall_0_1_32_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
+ redox_syscall_0_1_37_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
crateName = "redox_syscall";
- version = "0.1.32";
+ version = "0.1.37";
authors = [ "Jeremy Soller " ];
- sha256 = "1axxj8x6ngh6npkzqc5h216fajkcyrdxdgb7m2f0n5xfclbk47fv";
+ sha256 = "0qa0jl9cr3qp80an8vshp2mcn8rzvwiavs1398hq1vsjw7pc3h2v";
libName = "syscall";
inherit dependencies buildDependencies features;
};
@@ -302,18 +280,25 @@ rec {
libPath = "src/lib.rs";
inherit dependencies buildDependencies features;
};
- regex_0_2_2_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
+ regex_0_2_10_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
crateName = "regex";
- version = "0.2.2";
+ version = "0.2.10";
authors = [ "The Rust Project Developers" ];
- sha256 = "1f1zrrynfylg0vcfyfp60bybq4rp5g1yk2k7lc7fyz7mmc7k2qr7";
+ sha256 = "0cwdmcllssm984b5nnpr55rgla1yzw31kmp2imxdpgk6hvlhf1ca";
inherit dependencies buildDependencies features;
};
- regex_syntax_0_4_1_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
+ regex_syntax_0_5_5_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
crateName = "regex-syntax";
- version = "0.4.1";
+ version = "0.5.5";
authors = [ "The Rust Project Developers" ];
- sha256 = "01yrsm68lj86ad1whgg1z95c2pfsvv58fz8qjcgw7mlszc0c08ls";
+ sha256 = "1m5v66r6xxglgkdl1ci23qq0bl0k2wqplm6li4pmg1k7szvgxcbp";
+ inherit dependencies buildDependencies features;
+ };
+ remove_dir_all_0_5_0_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
+ crateName = "remove_dir_all";
+ version = "0.5.0";
+ authors = [ "Aaronepower " ];
+ sha256 = "0cgmlm9xvf19z84zcb7d62c2lfv60g6gd58c9717giq7c9ib284y";
inherit dependencies buildDependencies features;
};
rusqlite_0_13_0_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
@@ -323,75 +308,68 @@ rec {
sha256 = "1hj2464ar2y4324sk3jx7m9byhkcp60krrrs1v1i8dlhhlnkb9hc";
inherit dependencies buildDependencies features;
};
- rustc_demangle_0_1_5_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
+ rustc_demangle_0_1_7_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
crateName = "rustc-demangle";
- version = "0.1.5";
+ version = "0.1.7";
authors = [ "Alex Crichton " ];
- sha256 = "096kkcx9j747700fhxj1s4rlwkj21pqjmvj64psdj6bakb2q13nc";
+ sha256 = "0wrln6jvwmqrhyvqlw5vq9a2s4r04ja8mrybxjj9aaaar1fyvns6";
inherit dependencies buildDependencies features;
};
- serde_1_0_21_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
+ serde_1_0_38_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
crateName = "serde";
- version = "1.0.21";
+ version = "1.0.38";
authors = [ "Erick Tryzelaar " "David Tolnay " ];
- sha256 = "10almq7pvx8s4ryiqk8gf7fj5igl0yq6dcjknwc67rkmxd8q50w3";
+ sha256 = "0dri7vmzjsfmak1qq5wdinykqqvd5shpms504p8acpgyx7817jgk";
inherit dependencies buildDependencies features;
};
- serde_derive_1_0_21_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
+ serde_derive_1_0_38_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
crateName = "serde_derive";
- version = "1.0.21";
+ version = "1.0.38";
authors = [ "Erick Tryzelaar " "David Tolnay " ];
- sha256 = "0r20qyimm9scfaz7lc0swnhik9d045zklmbidd0zzpd4b2f3jsqm";
+ sha256 = "027c13sbnqkfzc8vxx0m6wnkr68im8kdbkbnix07dgw1l616yw0m";
procMacro = true;
inherit dependencies buildDependencies features;
};
- serde_derive_internals_0_17_0_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
+ serde_derive_internals_0_23_1_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
crateName = "serde_derive_internals";
- version = "0.17.0";
+ version = "0.23.1";
authors = [ "Erick Tryzelaar " "David Tolnay " ];
- sha256 = "1g1j3v6pj9wbcz3v3w4smjpwrcdwjicmf6yd5cbai04as9iwhw74";
+ sha256 = "0bjgcn2irh6sd34q3j3xkbn5ghfgiv3cfdlffb31lh0bikwpk1b4";
inherit dependencies buildDependencies features;
};
- serde_json_1_0_6_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
+ serde_json_1_0_14_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
crateName = "serde_json";
- version = "1.0.6";
+ version = "1.0.14";
authors = [ "Erick Tryzelaar " "David Tolnay " ];
- sha256 = "1kacyc59splwbg8gr7qs32pp9smgy1khq0ggnv07yxhs7h355vjz";
+ sha256 = "053n2vbcx32f28pr8fxi0fxq7m3g0gm94kz9i1fmi1kiwq9j5lsj";
inherit dependencies buildDependencies features;
};
- strsim_0_6_0_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
+ strsim_0_7_0_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
crateName = "strsim";
- version = "0.6.0";
+ version = "0.7.0";
authors = [ "Danny Guo " ];
- sha256 = "1lz85l6y68hr62lv4baww29yy7g8pg20dlr0lbaswxmmcb0wl7gd";
+ sha256 = "0fy0k5f2705z73mb3x9459bpcvrx4ky8jpr4zikcbiwan4bnm0iv";
inherit dependencies buildDependencies features;
};
- syn_0_11_11_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
+ syn_0_13_1_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
crateName = "syn";
- version = "0.11.11";
+ version = "0.13.1";
authors = [ "David Tolnay " ];
- sha256 = "0yw8ng7x1dn5a6ykg0ib49y7r9nhzgpiq2989rqdp7rdz3n85502";
+ sha256 = "1pimp7fpvillhz06xz0k6450h9nis3ab6h1j2hzrzykrpxs2qnyg";
inherit dependencies buildDependencies features;
};
- synom_0_11_3_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
- crateName = "synom";
- version = "0.11.3";
- authors = [ "David Tolnay " ];
- sha256 = "1l6d1s9qjfp6ng2s2z8219igvlv7gyk8gby97sdykqc1r93d8rhc";
- inherit dependencies buildDependencies features;
- };
- tempdir_0_3_5_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
+ tempdir_0_3_7_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
crateName = "tempdir";
- version = "0.3.5";
+ version = "0.3.7";
authors = [ "The Rust Project Developers" ];
- sha256 = "0rirc5prqppzgd15fm8ayan349lgk2k5iqdkrbwrwrv5pm4znsnz";
+ sha256 = "0y53sxybyljrr7lh0x0ysrsa7p7cljmwv9v80acy3rc6n97g67vy";
inherit dependencies buildDependencies features;
};
- termcolor_0_3_3_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
+ termcolor_0_3_6_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
crateName = "termcolor";
- version = "0.3.3";
+ version = "0.3.6";
authors = [ "Andrew Gallant " ];
- sha256 = "1rb853jzvkbwm62373dhls4x4r3r5cvfcsxvqh0i75rhx5j8kwsz";
+ sha256 = "0w609sa1apl1kii67ln2g82r4rrycw45zgjq7mxxjrx1fa21v05z";
inherit dependencies buildDependencies features;
};
termion_1_5_1_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
@@ -408,25 +386,32 @@ rec {
sha256 = "18jg79ndjlwndz01mlbh82kkr2arqm658yn5kwp65l5n1hz8w4yb";
inherit dependencies buildDependencies features;
};
- thread_local_0_3_4_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
+ thread_local_0_3_5_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
crateName = "thread_local";
- version = "0.3.4";
+ version = "0.3.5";
authors = [ "Amanieu d'Antras " ];
- sha256 = "1y6cwyhhx2nkz4b3dziwhqdvgq830z8wjp32b40pjd8r0hxqv2jr";
+ sha256 = "0mkp0sp91aqsk7brgygai4igv751r1754rsxn37mig3ag5rx8np6";
inherit dependencies buildDependencies features;
};
- time_0_1_38_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
+ time_0_1_39_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
crateName = "time";
- version = "0.1.38";
+ version = "0.1.39";
authors = [ "The Rust Project Developers" ];
- sha256 = "1ws283vvz7c6jfiwn53rmc6kybapr4pjaahfxxrz232b0qzw7gcp";
+ sha256 = "1ryy3bwhvyzj6fym123il38mk9ranm4vradj2a47l5ij8jd7w5if";
inherit dependencies buildDependencies features;
};
- toml_0_4_5_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
+ toml_0_4_6_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
crateName = "toml";
- version = "0.4.5";
+ version = "0.4.6";
authors = [ "Alex Crichton " ];
- sha256 = "06zxqhn3y58yzjfaykhcrvlf7p2dnn54kn3g4apmja3cn5b18lkk";
+ sha256 = "0rfl7lyb5f67spk69s604nw87f97g7fvv36hj9v88qlr2bwyrn8v";
+ inherit dependencies buildDependencies features;
+ };
+ ucd_util_0_1_1_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
+ crateName = "ucd-util";
+ version = "0.1.1";
+ authors = [ "Andrew Gallant " ];
+ sha256 = "02a8h3siipx52b832xc8m8rwasj6nx9jpiwfldw8hp6k205hgkn0";
inherit dependencies buildDependencies features;
};
unicode_width_0_1_4_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
@@ -436,11 +421,11 @@ rec {
sha256 = "1rp7a04icn9y5c0lm74nrd4py0rdl0af8bhdwq7g478n1xifpifl";
inherit dependencies buildDependencies features;
};
- unicode_xid_0_0_4_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
+ unicode_xid_0_1_0_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
crateName = "unicode-xid";
- version = "0.0.4";
+ version = "0.1.0";
authors = [ "erick.tryzelaar " "kwantam " ];
- sha256 = "1dc8wkkcd3s6534s5aw4lbjn8m67flkkbnajp5bl8408wdg8rh9v";
+ sha256 = "05wdmwlfzxhq3nhsxn6wx4q8dhxzzfb9szsz6wiw092m1rjj01zj";
inherit dependencies buildDependencies features;
};
unreachable_1_0_0_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
@@ -457,11 +442,11 @@ rec {
sha256 = "0rzmqprwjv9yp1n0qqgahgm24872x6c0xddfym5pfndy7a36vkn0";
inherit dependencies buildDependencies features;
};
- vcpkg_0_2_2_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
+ vcpkg_0_2_3_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
crateName = "vcpkg";
- version = "0.2.2";
+ version = "0.2.3";
authors = [ "Jim McGrath " ];
- sha256 = "1fl5j0ksnwrnsrf1b1a9lqbjgnajdipq0030vsbhx81mb7d9478a";
+ sha256 = "0achi8sfy0wm4q04gj7nwpq9xfx8ynk6vv4r12a3ijg26hispq0c";
inherit dependencies buildDependencies features;
};
vec_map_0_8_0_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
@@ -478,141 +463,161 @@ rec {
sha256 = "0h1dm0dx8dhf56a83k68mijyxigqhizpskwxfdrs1drwv2cdclv3";
inherit dependencies buildDependencies features;
};
- winapi_0_2_8_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
+ winapi_0_3_4_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
crateName = "winapi";
- version = "0.2.8";
+ version = "0.3.4";
authors = [ "Peter Atashian " ];
- sha256 = "0a45b58ywf12vb7gvj6h3j264nydynmzyqz8d8rqxsj6icqv82as";
+ sha256 = "1qbrf5dcnd8j36cawby5d9r5vx07r0l4ryf672pfncnp8895k9lx";
+ build = "build.rs";
inherit dependencies buildDependencies features;
};
- winapi_build_0_1_1_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
- crateName = "winapi-build";
- version = "0.1.1";
+ winapi_i686_pc_windows_gnu_0_4_0_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
+ crateName = "winapi-i686-pc-windows-gnu";
+ version = "0.4.0";
authors = [ "Peter Atashian " ];
- sha256 = "1lxlpi87rkhxcwp2ykf1ldw3p108hwm24nywf3jfrvmff4rjhqga";
- libName = "build";
+ sha256 = "05ihkij18r4gamjpxj4gra24514can762imjzlmak5wlzidplzrp";
+ build = "build.rs";
inherit dependencies buildDependencies features;
};
- wincolor_0_1_4_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
+ winapi_x86_64_pc_windows_gnu_0_4_0_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
+ crateName = "winapi-x86_64-pc-windows-gnu";
+ version = "0.4.0";
+ authors = [ "Peter Atashian " ];
+ sha256 = "0n1ylmlsb8yg1v583i4xy0qmqg42275flvbc51hdqjjfjcl9vlbj";
+ build = "build.rs";
+ inherit dependencies buildDependencies features;
+ };
+ wincolor_0_1_6_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
crateName = "wincolor";
- version = "0.1.4";
+ version = "0.1.6";
authors = [ "Andrew Gallant " ];
- sha256 = "0cxv6hadnj5vffb8a73y7055p59n20bpqd524df85cm29dcjl38a";
+ sha256 = "0f8m3l86pw6qi31jidqj78pgd15xj914850lyvsxkbln4f1drv47";
inherit dependencies buildDependencies features;
};
- aho_corasick_0_6_3 = { features?(aho_corasick_0_6_3_features {}) }: aho_corasick_0_6_3_ {
- dependencies = mapFeatures features ([ memchr_1_0_2 ]);
+ aho_corasick_0_6_4 = { features?(aho_corasick_0_6_4_features {}) }: aho_corasick_0_6_4_ {
+ dependencies = mapFeatures features ([ memchr_2_0_1 ]);
};
- aho_corasick_0_6_3_features = f: updateFeatures f (rec {
- aho_corasick_0_6_3.default = (f.aho_corasick_0_6_3.default or true);
- memchr_1_0_2.default = true;
- }) [ memchr_1_0_2_features ];
- ansi_term_0_10_2 = { features?(ansi_term_0_10_2_features {}) }: ansi_term_0_10_2_ {};
- ansi_term_0_10_2_features = f: updateFeatures f (rec {
- ansi_term_0_10_2.default = (f.ansi_term_0_10_2.default or true);
- }) [];
- atty_0_2_3 = { features?(atty_0_2_3_features {}) }: atty_0_2_3_ {
+ aho_corasick_0_6_4_features = f: updateFeatures f (rec {
+ aho_corasick_0_6_4.default = (f.aho_corasick_0_6_4.default or true);
+ memchr_2_0_1.default = true;
+ }) [ memchr_2_0_1_features ];
+ ansi_term_0_11_0 = { features?(ansi_term_0_11_0_features {}) }: ansi_term_0_11_0_ {
+ dependencies = (if kernel == "windows" then mapFeatures features ([ winapi_0_3_4 ]) else []);
+ };
+ ansi_term_0_11_0_features = f: updateFeatures f (rec {
+ ansi_term_0_11_0.default = (f.ansi_term_0_11_0.default or true);
+ winapi_0_3_4.consoleapi = true;
+ winapi_0_3_4.default = true;
+ winapi_0_3_4.errhandlingapi = true;
+ winapi_0_3_4.processenv = true;
+ }) [ winapi_0_3_4_features ];
+ atty_0_2_8 = { features?(atty_0_2_8_features {}) }: atty_0_2_8_ {
dependencies = (if kernel == "redox" then mapFeatures features ([ termion_1_5_1 ]) else [])
- ++ (if (kernel == "linux" || kernel == "darwin") then mapFeatures features ([ libc_0_2_33 ]) else [])
- ++ (if kernel == "windows" then mapFeatures features ([ kernel32_sys_0_2_2 winapi_0_2_8 ]) else []);
+ ++ (if (kernel == "linux" || kernel == "darwin") then mapFeatures features ([ libc_0_2_40 ]) else [])
+ ++ (if kernel == "windows" then mapFeatures features ([ winapi_0_3_4 ]) else []);
};
- atty_0_2_3_features = f: updateFeatures f (rec {
- atty_0_2_3.default = (f.atty_0_2_3.default or true);
- kernel32_sys_0_2_2.default = true;
- libc_0_2_33.default = (f.libc_0_2_33.default or false);
+ atty_0_2_8_features = f: updateFeatures f (rec {
+ atty_0_2_8.default = (f.atty_0_2_8.default or true);
+ libc_0_2_40.default = (f.libc_0_2_40.default or false);
termion_1_5_1.default = true;
- winapi_0_2_8.default = true;
- }) [ termion_1_5_1_features libc_0_2_33_features kernel32_sys_0_2_2_features winapi_0_2_8_features ];
- backtrace_0_3_4 = { features?(backtrace_0_3_4_features {}) }: backtrace_0_3_4_ {
- dependencies = mapFeatures features ([ cfg_if_0_1_2 rustc_demangle_0_1_5 ])
+ winapi_0_3_4.consoleapi = true;
+ winapi_0_3_4.default = true;
+ winapi_0_3_4.minwinbase = true;
+ winapi_0_3_4.minwindef = true;
+ winapi_0_3_4.processenv = true;
+ winapi_0_3_4.winbase = true;
+ }) [ termion_1_5_1_features libc_0_2_40_features winapi_0_3_4_features ];
+ backtrace_0_3_6 = { features?(backtrace_0_3_6_features {}) }: backtrace_0_3_6_ {
+ dependencies = mapFeatures features ([ cfg_if_0_1_2 rustc_demangle_0_1_7 ])
++ (if (kernel == "linux" || kernel == "darwin") && !(kernel == "fuchsia") && !(kernel == "emscripten") && !(kernel == "darwin") && !(kernel == "ios") then mapFeatures features ([ ]
- ++ (if features.backtrace_0_3_4.backtrace-sys or false then [ backtrace_sys_0_1_16 ] else [])) else [])
- ++ (if (kernel == "linux" || kernel == "darwin") then mapFeatures features ([ libc_0_2_33 ]) else [])
+ ++ (if features.backtrace_0_3_6.backtrace-sys or false then [ backtrace_sys_0_1_16 ] else [])) else [])
+ ++ (if (kernel == "linux" || kernel == "darwin") then mapFeatures features ([ libc_0_2_40 ]) else [])
++ (if kernel == "windows" then mapFeatures features ([ ]
- ++ (if features.backtrace_0_3_4.dbghelp-sys or false then [ dbghelp_sys_0_2_0 ] else [])
- ++ (if features.backtrace_0_3_4.kernel32-sys or false then [ kernel32_sys_0_2_2 ] else [])
- ++ (if features.backtrace_0_3_4.winapi or false then [ winapi_0_2_8 ] else [])) else []);
- features = mkFeatures (features.backtrace_0_3_4 or {});
+ ++ (if features.backtrace_0_3_6.winapi or false then [ winapi_0_3_4 ] else [])) else []);
+ features = mkFeatures (features.backtrace_0_3_6 or {});
};
- backtrace_0_3_4_features = f: updateFeatures f (rec {
- backtrace_0_3_4.addr2line =
- (f.backtrace_0_3_4.addr2line or false) ||
- (f.backtrace_0_3_4.gimli-symbolize or false) ||
- (backtrace_0_3_4.gimli-symbolize or false);
- backtrace_0_3_4.backtrace-sys =
- (f.backtrace_0_3_4.backtrace-sys or false) ||
- (f.backtrace_0_3_4.libbacktrace or false) ||
- (backtrace_0_3_4.libbacktrace or false);
- backtrace_0_3_4.coresymbolication =
- (f.backtrace_0_3_4.coresymbolication or false) ||
- (f.backtrace_0_3_4.default or false) ||
- (backtrace_0_3_4.default or false);
- backtrace_0_3_4.dbghelp =
- (f.backtrace_0_3_4.dbghelp or false) ||
- (f.backtrace_0_3_4.default or false) ||
- (backtrace_0_3_4.default or false);
- backtrace_0_3_4.dbghelp-sys =
- (f.backtrace_0_3_4.dbghelp-sys or false) ||
- (f.backtrace_0_3_4.dbghelp or false) ||
- (backtrace_0_3_4.dbghelp or false);
- backtrace_0_3_4.default = (f.backtrace_0_3_4.default or true);
- backtrace_0_3_4.dladdr =
- (f.backtrace_0_3_4.dladdr or false) ||
- (f.backtrace_0_3_4.default or false) ||
- (backtrace_0_3_4.default or false);
- backtrace_0_3_4.findshlibs =
- (f.backtrace_0_3_4.findshlibs or false) ||
- (f.backtrace_0_3_4.gimli-symbolize or false) ||
- (backtrace_0_3_4.gimli-symbolize or false);
- backtrace_0_3_4.kernel32-sys =
- (f.backtrace_0_3_4.kernel32-sys or false) ||
- (f.backtrace_0_3_4.dbghelp or false) ||
- (backtrace_0_3_4.dbghelp or false);
- backtrace_0_3_4.libbacktrace =
- (f.backtrace_0_3_4.libbacktrace or false) ||
- (f.backtrace_0_3_4.default or false) ||
- (backtrace_0_3_4.default or false);
- backtrace_0_3_4.libunwind =
- (f.backtrace_0_3_4.libunwind or false) ||
- (f.backtrace_0_3_4.default or false) ||
- (backtrace_0_3_4.default or false);
- backtrace_0_3_4.rustc-serialize =
- (f.backtrace_0_3_4.rustc-serialize or false) ||
- (f.backtrace_0_3_4.serialize-rustc or false) ||
- (backtrace_0_3_4.serialize-rustc or false);
- backtrace_0_3_4.serde =
- (f.backtrace_0_3_4.serde or false) ||
- (f.backtrace_0_3_4.serialize-serde or false) ||
- (backtrace_0_3_4.serialize-serde or false);
- backtrace_0_3_4.serde_derive =
- (f.backtrace_0_3_4.serde_derive or false) ||
- (f.backtrace_0_3_4.serialize-serde or false) ||
- (backtrace_0_3_4.serialize-serde or false);
- backtrace_0_3_4.winapi =
- (f.backtrace_0_3_4.winapi or false) ||
- (f.backtrace_0_3_4.dbghelp or false) ||
- (backtrace_0_3_4.dbghelp or false);
+ backtrace_0_3_6_features = f: updateFeatures f (rec {
+ backtrace_0_3_6.addr2line =
+ (f.backtrace_0_3_6.addr2line or false) ||
+ (f.backtrace_0_3_6.gimli-symbolize or false) ||
+ (backtrace_0_3_6.gimli-symbolize or false);
+ backtrace_0_3_6.backtrace-sys =
+ (f.backtrace_0_3_6.backtrace-sys or false) ||
+ (f.backtrace_0_3_6.libbacktrace or false) ||
+ (backtrace_0_3_6.libbacktrace or false);
+ backtrace_0_3_6.coresymbolication =
+ (f.backtrace_0_3_6.coresymbolication or false) ||
+ (f.backtrace_0_3_6.default or false) ||
+ (backtrace_0_3_6.default or false);
+ backtrace_0_3_6.dbghelp =
+ (f.backtrace_0_3_6.dbghelp or false) ||
+ (f.backtrace_0_3_6.default or false) ||
+ (backtrace_0_3_6.default or false);
+ backtrace_0_3_6.default = (f.backtrace_0_3_6.default or true);
+ backtrace_0_3_6.dladdr =
+ (f.backtrace_0_3_6.dladdr or false) ||
+ (f.backtrace_0_3_6.default or false) ||
+ (backtrace_0_3_6.default or false);
+ backtrace_0_3_6.findshlibs =
+ (f.backtrace_0_3_6.findshlibs or false) ||
+ (f.backtrace_0_3_6.gimli-symbolize or false) ||
+ (backtrace_0_3_6.gimli-symbolize or false);
+ backtrace_0_3_6.gimli =
+ (f.backtrace_0_3_6.gimli or false) ||
+ (f.backtrace_0_3_6.gimli-symbolize or false) ||
+ (backtrace_0_3_6.gimli-symbolize or false);
+ backtrace_0_3_6.libbacktrace =
+ (f.backtrace_0_3_6.libbacktrace or false) ||
+ (f.backtrace_0_3_6.default or false) ||
+ (backtrace_0_3_6.default or false);
+ backtrace_0_3_6.libunwind =
+ (f.backtrace_0_3_6.libunwind or false) ||
+ (f.backtrace_0_3_6.default or false) ||
+ (backtrace_0_3_6.default or false);
+ backtrace_0_3_6.memmap =
+ (f.backtrace_0_3_6.memmap or false) ||
+ (f.backtrace_0_3_6.gimli-symbolize or false) ||
+ (backtrace_0_3_6.gimli-symbolize or false);
+ backtrace_0_3_6.object =
+ (f.backtrace_0_3_6.object or false) ||
+ (f.backtrace_0_3_6.gimli-symbolize or false) ||
+ (backtrace_0_3_6.gimli-symbolize or false);
+ backtrace_0_3_6.rustc-serialize =
+ (f.backtrace_0_3_6.rustc-serialize or false) ||
+ (f.backtrace_0_3_6.serialize-rustc or false) ||
+ (backtrace_0_3_6.serialize-rustc or false);
+ backtrace_0_3_6.serde =
+ (f.backtrace_0_3_6.serde or false) ||
+ (f.backtrace_0_3_6.serialize-serde or false) ||
+ (backtrace_0_3_6.serialize-serde or false);
+ backtrace_0_3_6.serde_derive =
+ (f.backtrace_0_3_6.serde_derive or false) ||
+ (f.backtrace_0_3_6.serialize-serde or false) ||
+ (backtrace_0_3_6.serialize-serde or false);
+ backtrace_0_3_6.winapi =
+ (f.backtrace_0_3_6.winapi or false) ||
+ (f.backtrace_0_3_6.dbghelp or false) ||
+ (backtrace_0_3_6.dbghelp or false);
backtrace_sys_0_1_16.default = true;
cfg_if_0_1_2.default = true;
- dbghelp_sys_0_2_0.default = true;
- kernel32_sys_0_2_2.default = true;
- libc_0_2_33.default = true;
- rustc_demangle_0_1_5.default = true;
- winapi_0_2_8.default = true;
- }) [ cfg_if_0_1_2_features rustc_demangle_0_1_5_features backtrace_sys_0_1_16_features libc_0_2_33_features dbghelp_sys_0_2_0_features kernel32_sys_0_2_2_features winapi_0_2_8_features ];
+ libc_0_2_40.default = true;
+ rustc_demangle_0_1_7.default = true;
+ winapi_0_3_4.dbghelp = true;
+ winapi_0_3_4.default = true;
+ winapi_0_3_4.minwindef = true;
+ winapi_0_3_4.processthreadsapi = true;
+ winapi_0_3_4.std = true;
+ winapi_0_3_4.winnt = true;
+ }) [ cfg_if_0_1_2_features rustc_demangle_0_1_7_features backtrace_sys_0_1_16_features libc_0_2_40_features winapi_0_3_4_features ];
backtrace_sys_0_1_16 = { features?(backtrace_sys_0_1_16_features {}) }: backtrace_sys_0_1_16_ {
- dependencies = mapFeatures features ([ libc_0_2_33 ]);
- buildDependencies = mapFeatures features ([ cc_1_0_3 ]);
+ dependencies = mapFeatures features ([ libc_0_2_40 ]);
+ buildDependencies = mapFeatures features ([ cc_1_0_10 ]);
};
backtrace_sys_0_1_16_features = f: updateFeatures f (rec {
backtrace_sys_0_1_16.default = (f.backtrace_sys_0_1_16.default or true);
- cc_1_0_3.default = true;
- libc_0_2_33.default = true;
- }) [ libc_0_2_33_features cc_1_0_3_features ];
- bitflags_0_7_0 = { features?(bitflags_0_7_0_features {}) }: bitflags_0_7_0_ {};
- bitflags_0_7_0_features = f: updateFeatures f (rec {
- bitflags_0_7_0.default = (f.bitflags_0_7_0.default or true);
- }) [];
+ cc_1_0_10.default = true;
+ libc_0_2_40.default = true;
+ }) [ libc_0_2_40_features cc_1_0_10_features ];
bitflags_1_0_1 = { features?(bitflags_1_0_1_features {}) }: bitflags_1_0_1_ {
features = mkFeatures (features.bitflags_1_0_1 or {});
};
@@ -623,159 +628,143 @@ rec {
(f.bitflags_1_0_1.default or false) ||
(bitflags_1_0_1.default or false);
}) [];
- carnix_0_6_6 = { features?(carnix_0_6_6_features {}) }: carnix_0_6_6_ {
- dependencies = mapFeatures features ([ clap_2_28_0 env_logger_0_5_3 error_chain_0_11_0 itertools_0_7_3 log_0_4_1 nom_3_2_1 regex_0_2_2 rusqlite_0_13_0 serde_1_0_21 serde_derive_1_0_21 serde_json_1_0_6 tempdir_0_3_5 toml_0_4_5 ]);
+ carnix_0_7_2 = { features?(carnix_0_7_2_features {}) }: carnix_0_7_2_ {
+ dependencies = mapFeatures features ([ clap_2_31_2 env_logger_0_5_7 error_chain_0_11_0 itertools_0_7_8 log_0_4_1 nom_3_2_1 regex_0_2_10 rusqlite_0_13_0 serde_1_0_38 serde_derive_1_0_38 serde_json_1_0_14 tempdir_0_3_7 toml_0_4_6 ]);
};
- carnix_0_6_6_features = f: updateFeatures f (rec {
- carnix_0_6_6.default = (f.carnix_0_6_6.default or true);
- clap_2_28_0.default = true;
- env_logger_0_5_3.default = true;
+ carnix_0_7_2_features = f: updateFeatures f (rec {
+ carnix_0_7_2.default = (f.carnix_0_7_2.default or true);
+ clap_2_31_2.default = true;
+ env_logger_0_5_7.default = true;
error_chain_0_11_0.default = true;
- itertools_0_7_3.default = true;
+ itertools_0_7_8.default = true;
log_0_4_1.default = true;
nom_3_2_1.default = true;
- regex_0_2_2.default = true;
+ regex_0_2_10.default = true;
rusqlite_0_13_0.default = true;
- serde_1_0_21.default = true;
- serde_derive_1_0_21.default = true;
- serde_json_1_0_6.default = true;
- tempdir_0_3_5.default = true;
- toml_0_4_5.default = true;
- }) [ clap_2_28_0_features env_logger_0_5_3_features error_chain_0_11_0_features itertools_0_7_3_features log_0_4_1_features nom_3_2_1_features regex_0_2_2_features rusqlite_0_13_0_features serde_1_0_21_features serde_derive_1_0_21_features serde_json_1_0_6_features tempdir_0_3_5_features toml_0_4_5_features ];
- cc_1_0_3 = { features?(cc_1_0_3_features {}) }: cc_1_0_3_ {
+ serde_1_0_38.default = true;
+ serde_derive_1_0_38.default = true;
+ serde_json_1_0_14.default = true;
+ tempdir_0_3_7.default = true;
+ toml_0_4_6.default = true;
+ }) [ clap_2_31_2_features env_logger_0_5_7_features error_chain_0_11_0_features itertools_0_7_8_features log_0_4_1_features nom_3_2_1_features regex_0_2_10_features rusqlite_0_13_0_features serde_1_0_38_features serde_derive_1_0_38_features serde_json_1_0_14_features tempdir_0_3_7_features toml_0_4_6_features ];
+ cc_1_0_10 = { features?(cc_1_0_10_features {}) }: cc_1_0_10_ {
dependencies = mapFeatures features ([]);
- features = mkFeatures (features.cc_1_0_3 or {});
+ features = mkFeatures (features.cc_1_0_10 or {});
};
- cc_1_0_3_features = f: updateFeatures f (rec {
- cc_1_0_3.default = (f.cc_1_0_3.default or true);
- cc_1_0_3.rayon =
- (f.cc_1_0_3.rayon or false) ||
- (f.cc_1_0_3.parallel or false) ||
- (cc_1_0_3.parallel or false);
+ cc_1_0_10_features = f: updateFeatures f (rec {
+ cc_1_0_10.default = (f.cc_1_0_10.default or true);
+ cc_1_0_10.rayon =
+ (f.cc_1_0_10.rayon or false) ||
+ (f.cc_1_0_10.parallel or false) ||
+ (cc_1_0_10.parallel or false);
}) [];
cfg_if_0_1_2 = { features?(cfg_if_0_1_2_features {}) }: cfg_if_0_1_2_ {};
cfg_if_0_1_2_features = f: updateFeatures f (rec {
cfg_if_0_1_2.default = (f.cfg_if_0_1_2.default or true);
}) [];
- chrono_0_4_0 = { features?(chrono_0_4_0_features {}) }: chrono_0_4_0_ {
- dependencies = mapFeatures features ([ num_0_1_40 time_0_1_38 ]);
- };
- chrono_0_4_0_features = f: updateFeatures f (rec {
- chrono_0_4_0.default = (f.chrono_0_4_0.default or true);
- num_0_1_40.default = (f.num_0_1_40.default or false);
- time_0_1_38.default = true;
- }) [ num_0_1_40_features time_0_1_38_features ];
- clap_2_28_0 = { features?(clap_2_28_0_features {}) }: clap_2_28_0_ {
+ clap_2_31_2 = { features?(clap_2_31_2_features {}) }: clap_2_31_2_ {
dependencies = mapFeatures features ([ bitflags_1_0_1 textwrap_0_9_0 unicode_width_0_1_4 ]
- ++ (if features.clap_2_28_0.ansi_term or false then [ ansi_term_0_10_2 ] else [])
- ++ (if features.clap_2_28_0.atty or false then [ atty_0_2_3 ] else [])
- ++ (if features.clap_2_28_0.strsim or false then [ strsim_0_6_0 ] else [])
- ++ (if features.clap_2_28_0.vec_map or false then [ vec_map_0_8_0 ] else []));
- features = mkFeatures (features.clap_2_28_0 or {});
+ ++ (if features.clap_2_31_2.atty or false then [ atty_0_2_8 ] else [])
+ ++ (if features.clap_2_31_2.strsim or false then [ strsim_0_7_0 ] else [])
+ ++ (if features.clap_2_31_2.vec_map or false then [ vec_map_0_8_0 ] else []))
+ ++ (if !(kernel == "windows") then mapFeatures features ([ ]
+ ++ (if features.clap_2_31_2.ansi_term or false then [ ansi_term_0_11_0 ] else [])) else []);
+ features = mkFeatures (features.clap_2_31_2 or {});
};
- clap_2_28_0_features = f: updateFeatures f (rec {
- ansi_term_0_10_2.default = true;
- atty_0_2_3.default = true;
+ clap_2_31_2_features = f: updateFeatures f (rec {
+ ansi_term_0_11_0.default = true;
+ atty_0_2_8.default = true;
bitflags_1_0_1.default = true;
- clap_2_28_0.ansi_term =
- (f.clap_2_28_0.ansi_term or false) ||
- (f.clap_2_28_0.color or false) ||
- (clap_2_28_0.color or false);
- clap_2_28_0.atty =
- (f.clap_2_28_0.atty or false) ||
- (f.clap_2_28_0.color or false) ||
- (clap_2_28_0.color or false);
- clap_2_28_0.clippy =
- (f.clap_2_28_0.clippy or false) ||
- (f.clap_2_28_0.lints or false) ||
- (clap_2_28_0.lints or false);
- clap_2_28_0.color =
- (f.clap_2_28_0.color or false) ||
- (f.clap_2_28_0.default or false) ||
- (clap_2_28_0.default or false);
- clap_2_28_0.default = (f.clap_2_28_0.default or true);
- clap_2_28_0.strsim =
- (f.clap_2_28_0.strsim or false) ||
- (f.clap_2_28_0.suggestions or false) ||
- (clap_2_28_0.suggestions or false);
- clap_2_28_0.suggestions =
- (f.clap_2_28_0.suggestions or false) ||
- (f.clap_2_28_0.default or false) ||
- (clap_2_28_0.default or false);
- clap_2_28_0.term_size =
- (f.clap_2_28_0.term_size or false) ||
- (f.clap_2_28_0.wrap_help or false) ||
- (clap_2_28_0.wrap_help or false);
- clap_2_28_0.vec_map =
- (f.clap_2_28_0.vec_map or false) ||
- (f.clap_2_28_0.default or false) ||
- (clap_2_28_0.default or false);
- clap_2_28_0.yaml =
- (f.clap_2_28_0.yaml or false) ||
- (f.clap_2_28_0.doc or false) ||
- (clap_2_28_0.doc or false);
- clap_2_28_0.yaml-rust =
- (f.clap_2_28_0.yaml-rust or false) ||
- (f.clap_2_28_0.yaml or false) ||
- (clap_2_28_0.yaml or false);
- strsim_0_6_0.default = true;
+ clap_2_31_2.ansi_term =
+ (f.clap_2_31_2.ansi_term or false) ||
+ (f.clap_2_31_2.color or false) ||
+ (clap_2_31_2.color or false);
+ clap_2_31_2.atty =
+ (f.clap_2_31_2.atty or false) ||
+ (f.clap_2_31_2.color or false) ||
+ (clap_2_31_2.color or false);
+ clap_2_31_2.clippy =
+ (f.clap_2_31_2.clippy or false) ||
+ (f.clap_2_31_2.lints or false) ||
+ (clap_2_31_2.lints or false);
+ clap_2_31_2.color =
+ (f.clap_2_31_2.color or false) ||
+ (f.clap_2_31_2.default or false) ||
+ (clap_2_31_2.default or false);
+ clap_2_31_2.default = (f.clap_2_31_2.default or true);
+ clap_2_31_2.strsim =
+ (f.clap_2_31_2.strsim or false) ||
+ (f.clap_2_31_2.suggestions or false) ||
+ (clap_2_31_2.suggestions or false);
+ clap_2_31_2.suggestions =
+ (f.clap_2_31_2.suggestions or false) ||
+ (f.clap_2_31_2.default or false) ||
+ (clap_2_31_2.default or false);
+ clap_2_31_2.term_size =
+ (f.clap_2_31_2.term_size or false) ||
+ (f.clap_2_31_2.wrap_help or false) ||
+ (clap_2_31_2.wrap_help or false);
+ clap_2_31_2.vec_map =
+ (f.clap_2_31_2.vec_map or false) ||
+ (f.clap_2_31_2.default or false) ||
+ (clap_2_31_2.default or false);
+ clap_2_31_2.yaml =
+ (f.clap_2_31_2.yaml or false) ||
+ (f.clap_2_31_2.doc or false) ||
+ (clap_2_31_2.doc or false);
+ clap_2_31_2.yaml-rust =
+ (f.clap_2_31_2.yaml-rust or false) ||
+ (f.clap_2_31_2.yaml or false) ||
+ (clap_2_31_2.yaml or false);
+ strsim_0_7_0.default = true;
textwrap_0_9_0.default = true;
textwrap_0_9_0.term_size =
(f.textwrap_0_9_0.term_size or false) ||
- (clap_2_28_0.wrap_help or false) ||
- (f.clap_2_28_0.wrap_help or false);
+ (clap_2_31_2.wrap_help or false) ||
+ (f.clap_2_31_2.wrap_help or false);
unicode_width_0_1_4.default = true;
vec_map_0_8_0.default = true;
- }) [ ansi_term_0_10_2_features atty_0_2_3_features bitflags_1_0_1_features strsim_0_6_0_features textwrap_0_9_0_features unicode_width_0_1_4_features vec_map_0_8_0_features ];
- dbghelp_sys_0_2_0 = { features?(dbghelp_sys_0_2_0_features {}) }: dbghelp_sys_0_2_0_ {
- dependencies = mapFeatures features ([ winapi_0_2_8 ]);
- buildDependencies = mapFeatures features ([ winapi_build_0_1_1 ]);
- };
- dbghelp_sys_0_2_0_features = f: updateFeatures f (rec {
- dbghelp_sys_0_2_0.default = (f.dbghelp_sys_0_2_0.default or true);
- winapi_0_2_8.default = true;
- winapi_build_0_1_1.default = true;
- }) [ winapi_0_2_8_features winapi_build_0_1_1_features ];
+ }) [ atty_0_2_8_features bitflags_1_0_1_features strsim_0_7_0_features textwrap_0_9_0_features unicode_width_0_1_4_features vec_map_0_8_0_features ansi_term_0_11_0_features ];
dtoa_0_4_2 = { features?(dtoa_0_4_2_features {}) }: dtoa_0_4_2_ {};
dtoa_0_4_2_features = f: updateFeatures f (rec {
dtoa_0_4_2.default = (f.dtoa_0_4_2.default or true);
}) [];
- either_1_4_0 = { features?(either_1_4_0_features {}) }: either_1_4_0_ {
+ either_1_5_0 = { features?(either_1_5_0_features {}) }: either_1_5_0_ {
dependencies = mapFeatures features ([]);
- features = mkFeatures (features.either_1_4_0 or {});
+ features = mkFeatures (features.either_1_5_0 or {});
};
- either_1_4_0_features = f: updateFeatures f (rec {
- either_1_4_0.default = (f.either_1_4_0.default or true);
- either_1_4_0.use_std =
- (f.either_1_4_0.use_std or false) ||
- (f.either_1_4_0.default or false) ||
- (either_1_4_0.default or false);
+ either_1_5_0_features = f: updateFeatures f (rec {
+ either_1_5_0.default = (f.either_1_5_0.default or true);
+ either_1_5_0.use_std =
+ (f.either_1_5_0.use_std or false) ||
+ (f.either_1_5_0.default or false) ||
+ (either_1_5_0.default or false);
}) [];
- env_logger_0_5_3 = { features?(env_logger_0_5_3_features {}) }: env_logger_0_5_3_ {
- dependencies = mapFeatures features ([ atty_0_2_3 chrono_0_4_0 log_0_4_1 termcolor_0_3_3 ]
- ++ (if features.env_logger_0_5_3.regex or false then [ regex_0_2_2 ] else []));
- features = mkFeatures (features.env_logger_0_5_3 or {});
+ env_logger_0_5_7 = { features?(env_logger_0_5_7_features {}) }: env_logger_0_5_7_ {
+ dependencies = mapFeatures features ([ atty_0_2_8 humantime_1_1_1 log_0_4_1 termcolor_0_3_6 ]
+ ++ (if features.env_logger_0_5_7.regex or false then [ regex_0_2_10 ] else []));
+ features = mkFeatures (features.env_logger_0_5_7 or {});
};
- env_logger_0_5_3_features = f: updateFeatures f (rec {
- atty_0_2_3.default = true;
- chrono_0_4_0.default = true;
- env_logger_0_5_3.default = (f.env_logger_0_5_3.default or true);
- env_logger_0_5_3.regex =
- (f.env_logger_0_5_3.regex or false) ||
- (f.env_logger_0_5_3.default or false) ||
- (env_logger_0_5_3.default or false);
+ env_logger_0_5_7_features = f: updateFeatures f (rec {
+ atty_0_2_8.default = true;
+ env_logger_0_5_7.default = (f.env_logger_0_5_7.default or true);
+ env_logger_0_5_7.regex =
+ (f.env_logger_0_5_7.regex or false) ||
+ (f.env_logger_0_5_7.default or false) ||
+ (env_logger_0_5_7.default or false);
+ humantime_1_1_1.default = true;
log_0_4_1.default = true;
log_0_4_1.std = true;
- regex_0_2_2.default = true;
- termcolor_0_3_3.default = true;
- }) [ atty_0_2_3_features chrono_0_4_0_features log_0_4_1_features regex_0_2_2_features termcolor_0_3_3_features ];
+ regex_0_2_10.default = true;
+ termcolor_0_3_6.default = true;
+ }) [ atty_0_2_8_features humantime_1_1_1_features log_0_4_1_features regex_0_2_10_features termcolor_0_3_6_features ];
error_chain_0_11_0 = { features?(error_chain_0_11_0_features {}) }: error_chain_0_11_0_ {
dependencies = mapFeatures features ([ ]
- ++ (if features.error_chain_0_11_0.backtrace or false then [ backtrace_0_3_4 ] else []));
+ ++ (if features.error_chain_0_11_0.backtrace or false then [ backtrace_0_3_6 ] else []));
features = mkFeatures (features.error_chain_0_11_0 or {});
};
error_chain_0_11_0_features = f: updateFeatures f (rec {
- backtrace_0_3_4.default = true;
+ backtrace_0_3_6.default = true;
error_chain_0_11_0.backtrace =
(f.error_chain_0_11_0.backtrace or false) ||
(f.error_chain_0_11_0.default or false) ||
@@ -785,129 +774,129 @@ rec {
(f.error_chain_0_11_0.example_generated or false) ||
(f.error_chain_0_11_0.default or false) ||
(error_chain_0_11_0.default or false);
- }) [ backtrace_0_3_4_features ];
- fuchsia_zircon_0_2_1 = { features?(fuchsia_zircon_0_2_1_features {}) }: fuchsia_zircon_0_2_1_ {
- dependencies = mapFeatures features ([ fuchsia_zircon_sys_0_2_0 ]);
+ }) [ backtrace_0_3_6_features ];
+ fuchsia_zircon_0_3_3 = { features?(fuchsia_zircon_0_3_3_features {}) }: fuchsia_zircon_0_3_3_ {
+ dependencies = mapFeatures features ([ bitflags_1_0_1 fuchsia_zircon_sys_0_3_3 ]);
};
- fuchsia_zircon_0_2_1_features = f: updateFeatures f (rec {
- fuchsia_zircon_0_2_1.default = (f.fuchsia_zircon_0_2_1.default or true);
- fuchsia_zircon_sys_0_2_0.default = true;
- }) [ fuchsia_zircon_sys_0_2_0_features ];
- fuchsia_zircon_sys_0_2_0 = { features?(fuchsia_zircon_sys_0_2_0_features {}) }: fuchsia_zircon_sys_0_2_0_ {
- dependencies = mapFeatures features ([ bitflags_0_7_0 ]);
- };
- fuchsia_zircon_sys_0_2_0_features = f: updateFeatures f (rec {
- bitflags_0_7_0.default = true;
- fuchsia_zircon_sys_0_2_0.default = (f.fuchsia_zircon_sys_0_2_0.default or true);
- }) [ bitflags_0_7_0_features ];
- itertools_0_7_3 = { features?(itertools_0_7_3_features {}) }: itertools_0_7_3_ {
- dependencies = mapFeatures features ([ either_1_4_0 ]);
- features = mkFeatures (features.itertools_0_7_3 or {});
- };
- itertools_0_7_3_features = f: updateFeatures f (rec {
- either_1_4_0.default = (f.either_1_4_0.default or false);
- itertools_0_7_3.default = (f.itertools_0_7_3.default or true);
- itertools_0_7_3.use_std =
- (f.itertools_0_7_3.use_std or false) ||
- (f.itertools_0_7_3.default or false) ||
- (itertools_0_7_3.default or false);
- }) [ either_1_4_0_features ];
- itoa_0_3_4 = { features?(itoa_0_3_4_features {}) }: itoa_0_3_4_ {
- features = mkFeatures (features.itoa_0_3_4 or {});
- };
- itoa_0_3_4_features = f: updateFeatures f (rec {
- itoa_0_3_4.default = (f.itoa_0_3_4.default or true);
+ fuchsia_zircon_0_3_3_features = f: updateFeatures f (rec {
+ bitflags_1_0_1.default = true;
+ fuchsia_zircon_0_3_3.default = (f.fuchsia_zircon_0_3_3.default or true);
+ fuchsia_zircon_sys_0_3_3.default = true;
+ }) [ bitflags_1_0_1_features fuchsia_zircon_sys_0_3_3_features ];
+ fuchsia_zircon_sys_0_3_3 = { features?(fuchsia_zircon_sys_0_3_3_features {}) }: fuchsia_zircon_sys_0_3_3_ {};
+ fuchsia_zircon_sys_0_3_3_features = f: updateFeatures f (rec {
+ fuchsia_zircon_sys_0_3_3.default = (f.fuchsia_zircon_sys_0_3_3.default or true);
}) [];
- kernel32_sys_0_2_2 = { features?(kernel32_sys_0_2_2_features {}) }: kernel32_sys_0_2_2_ {
- dependencies = mapFeatures features ([ winapi_0_2_8 ]);
- buildDependencies = mapFeatures features ([ winapi_build_0_1_1 ]);
+ humantime_1_1_1 = { features?(humantime_1_1_1_features {}) }: humantime_1_1_1_ {
+ dependencies = mapFeatures features ([ quick_error_1_2_1 ]);
};
- kernel32_sys_0_2_2_features = f: updateFeatures f (rec {
- kernel32_sys_0_2_2.default = (f.kernel32_sys_0_2_2.default or true);
- winapi_0_2_8.default = true;
- winapi_build_0_1_1.default = true;
- }) [ winapi_0_2_8_features winapi_build_0_1_1_features ];
- lazy_static_0_2_11 = { features?(lazy_static_0_2_11_features {}) }: lazy_static_0_2_11_ {
+ humantime_1_1_1_features = f: updateFeatures f (rec {
+ humantime_1_1_1.default = (f.humantime_1_1_1.default or true);
+ quick_error_1_2_1.default = true;
+ }) [ quick_error_1_2_1_features ];
+ itertools_0_7_8 = { features?(itertools_0_7_8_features {}) }: itertools_0_7_8_ {
+ dependencies = mapFeatures features ([ either_1_5_0 ]);
+ features = mkFeatures (features.itertools_0_7_8 or {});
+ };
+ itertools_0_7_8_features = f: updateFeatures f (rec {
+ either_1_5_0.default = (f.either_1_5_0.default or false);
+ itertools_0_7_8.default = (f.itertools_0_7_8.default or true);
+ itertools_0_7_8.use_std =
+ (f.itertools_0_7_8.use_std or false) ||
+ (f.itertools_0_7_8.default or false) ||
+ (itertools_0_7_8.default or false);
+ }) [ either_1_5_0_features ];
+ itoa_0_4_1 = { features?(itoa_0_4_1_features {}) }: itoa_0_4_1_ {
+ features = mkFeatures (features.itoa_0_4_1 or {});
+ };
+ itoa_0_4_1_features = f: updateFeatures f (rec {
+ itoa_0_4_1.default = (f.itoa_0_4_1.default or true);
+ itoa_0_4_1.std =
+ (f.itoa_0_4_1.std or false) ||
+ (f.itoa_0_4_1.default or false) ||
+ (itoa_0_4_1.default or false);
+ }) [];
+ lazy_static_1_0_0 = { features?(lazy_static_1_0_0_features {}) }: lazy_static_1_0_0_ {
dependencies = mapFeatures features ([]);
- features = mkFeatures (features.lazy_static_0_2_11 or {});
+ features = mkFeatures (features.lazy_static_1_0_0 or {});
};
- lazy_static_0_2_11_features = f: updateFeatures f (rec {
- lazy_static_0_2_11.compiletest_rs =
- (f.lazy_static_0_2_11.compiletest_rs or false) ||
- (f.lazy_static_0_2_11.compiletest or false) ||
- (lazy_static_0_2_11.compiletest or false);
- lazy_static_0_2_11.default = (f.lazy_static_0_2_11.default or true);
- lazy_static_0_2_11.nightly =
- (f.lazy_static_0_2_11.nightly or false) ||
- (f.lazy_static_0_2_11.spin_no_std or false) ||
- (lazy_static_0_2_11.spin_no_std or false);
- lazy_static_0_2_11.spin =
- (f.lazy_static_0_2_11.spin or false) ||
- (f.lazy_static_0_2_11.spin_no_std or false) ||
- (lazy_static_0_2_11.spin_no_std or false);
+ lazy_static_1_0_0_features = f: updateFeatures f (rec {
+ lazy_static_1_0_0.compiletest_rs =
+ (f.lazy_static_1_0_0.compiletest_rs or false) ||
+ (f.lazy_static_1_0_0.compiletest or false) ||
+ (lazy_static_1_0_0.compiletest or false);
+ lazy_static_1_0_0.default = (f.lazy_static_1_0_0.default or true);
+ lazy_static_1_0_0.nightly =
+ (f.lazy_static_1_0_0.nightly or false) ||
+ (f.lazy_static_1_0_0.spin_no_std or false) ||
+ (lazy_static_1_0_0.spin_no_std or false);
+ lazy_static_1_0_0.spin =
+ (f.lazy_static_1_0_0.spin or false) ||
+ (f.lazy_static_1_0_0.spin_no_std or false) ||
+ (lazy_static_1_0_0.spin_no_std or false);
}) [];
- libc_0_2_33 = { features?(libc_0_2_33_features {}) }: libc_0_2_33_ {
- features = mkFeatures (features.libc_0_2_33 or {});
+ libc_0_2_40 = { features?(libc_0_2_40_features {}) }: libc_0_2_40_ {
+ features = mkFeatures (features.libc_0_2_40 or {});
};
- libc_0_2_33_features = f: updateFeatures f (rec {
- libc_0_2_33.default = (f.libc_0_2_33.default or true);
- libc_0_2_33.use_std =
- (f.libc_0_2_33.use_std or false) ||
- (f.libc_0_2_33.default or false) ||
- (libc_0_2_33.default or false);
+ libc_0_2_40_features = f: updateFeatures f (rec {
+ libc_0_2_40.default = (f.libc_0_2_40.default or true);
+ libc_0_2_40.use_std =
+ (f.libc_0_2_40.use_std or false) ||
+ (f.libc_0_2_40.default or false) ||
+ (libc_0_2_40.default or false);
}) [];
- libsqlite3_sys_0_9_0 = { features?(libsqlite3_sys_0_9_0_features {}) }: libsqlite3_sys_0_9_0_ {
+ libsqlite3_sys_0_9_1 = { features?(libsqlite3_sys_0_9_1_features {}) }: libsqlite3_sys_0_9_1_ {
dependencies = (if abi == "msvc" then mapFeatures features ([]) else []);
buildDependencies = mapFeatures features ([ ]
- ++ (if features.libsqlite3_sys_0_9_0.pkg-config or false then [ pkg_config_0_3_9 ] else []));
- features = mkFeatures (features.libsqlite3_sys_0_9_0 or {});
+ ++ (if features.libsqlite3_sys_0_9_1.pkg-config or false then [ pkg_config_0_3_9 ] else []));
+ features = mkFeatures (features.libsqlite3_sys_0_9_1 or {});
};
- libsqlite3_sys_0_9_0_features = f: updateFeatures f (rec {
- libsqlite3_sys_0_9_0.bindgen =
- (f.libsqlite3_sys_0_9_0.bindgen or false) ||
- (f.libsqlite3_sys_0_9_0.buildtime_bindgen or false) ||
- (libsqlite3_sys_0_9_0.buildtime_bindgen or false);
- libsqlite3_sys_0_9_0.cc =
- (f.libsqlite3_sys_0_9_0.cc or false) ||
- (f.libsqlite3_sys_0_9_0.bundled or false) ||
- (libsqlite3_sys_0_9_0.bundled or false);
- libsqlite3_sys_0_9_0.default = (f.libsqlite3_sys_0_9_0.default or true);
- libsqlite3_sys_0_9_0.min_sqlite_version_3_6_8 =
- (f.libsqlite3_sys_0_9_0.min_sqlite_version_3_6_8 or false) ||
- (f.libsqlite3_sys_0_9_0.default or false) ||
- (libsqlite3_sys_0_9_0.default or false);
- libsqlite3_sys_0_9_0.pkg-config =
- (f.libsqlite3_sys_0_9_0.pkg-config or false) ||
- (f.libsqlite3_sys_0_9_0.buildtime_bindgen or false) ||
- (libsqlite3_sys_0_9_0.buildtime_bindgen or false) ||
- (f.libsqlite3_sys_0_9_0.min_sqlite_version_3_6_11 or false) ||
- (libsqlite3_sys_0_9_0.min_sqlite_version_3_6_11 or false) ||
- (f.libsqlite3_sys_0_9_0.min_sqlite_version_3_6_23 or false) ||
- (libsqlite3_sys_0_9_0.min_sqlite_version_3_6_23 or false) ||
- (f.libsqlite3_sys_0_9_0.min_sqlite_version_3_6_8 or false) ||
- (libsqlite3_sys_0_9_0.min_sqlite_version_3_6_8 or false) ||
- (f.libsqlite3_sys_0_9_0.min_sqlite_version_3_7_16 or false) ||
- (libsqlite3_sys_0_9_0.min_sqlite_version_3_7_16 or false) ||
- (f.libsqlite3_sys_0_9_0.min_sqlite_version_3_7_3 or false) ||
- (libsqlite3_sys_0_9_0.min_sqlite_version_3_7_3 or false) ||
- (f.libsqlite3_sys_0_9_0.min_sqlite_version_3_7_4 or false) ||
- (libsqlite3_sys_0_9_0.min_sqlite_version_3_7_4 or false);
- libsqlite3_sys_0_9_0.vcpkg =
- (f.libsqlite3_sys_0_9_0.vcpkg or false) ||
- (f.libsqlite3_sys_0_9_0.buildtime_bindgen or false) ||
- (libsqlite3_sys_0_9_0.buildtime_bindgen or false) ||
- (f.libsqlite3_sys_0_9_0.min_sqlite_version_3_6_11 or false) ||
- (libsqlite3_sys_0_9_0.min_sqlite_version_3_6_11 or false) ||
- (f.libsqlite3_sys_0_9_0.min_sqlite_version_3_6_23 or false) ||
- (libsqlite3_sys_0_9_0.min_sqlite_version_3_6_23 or false) ||
- (f.libsqlite3_sys_0_9_0.min_sqlite_version_3_6_8 or false) ||
- (libsqlite3_sys_0_9_0.min_sqlite_version_3_6_8 or false) ||
- (f.libsqlite3_sys_0_9_0.min_sqlite_version_3_7_16 or false) ||
- (libsqlite3_sys_0_9_0.min_sqlite_version_3_7_16 or false) ||
- (f.libsqlite3_sys_0_9_0.min_sqlite_version_3_7_3 or false) ||
- (libsqlite3_sys_0_9_0.min_sqlite_version_3_7_3 or false) ||
- (f.libsqlite3_sys_0_9_0.min_sqlite_version_3_7_4 or false) ||
- (libsqlite3_sys_0_9_0.min_sqlite_version_3_7_4 or false);
+ libsqlite3_sys_0_9_1_features = f: updateFeatures f (rec {
+ libsqlite3_sys_0_9_1.bindgen =
+ (f.libsqlite3_sys_0_9_1.bindgen or false) ||
+ (f.libsqlite3_sys_0_9_1.buildtime_bindgen or false) ||
+ (libsqlite3_sys_0_9_1.buildtime_bindgen or false);
+ libsqlite3_sys_0_9_1.cc =
+ (f.libsqlite3_sys_0_9_1.cc or false) ||
+ (f.libsqlite3_sys_0_9_1.bundled or false) ||
+ (libsqlite3_sys_0_9_1.bundled or false);
+ libsqlite3_sys_0_9_1.default = (f.libsqlite3_sys_0_9_1.default or true);
+ libsqlite3_sys_0_9_1.min_sqlite_version_3_6_8 =
+ (f.libsqlite3_sys_0_9_1.min_sqlite_version_3_6_8 or false) ||
+ (f.libsqlite3_sys_0_9_1.default or false) ||
+ (libsqlite3_sys_0_9_1.default or false);
+ libsqlite3_sys_0_9_1.pkg-config =
+ (f.libsqlite3_sys_0_9_1.pkg-config or false) ||
+ (f.libsqlite3_sys_0_9_1.buildtime_bindgen or false) ||
+ (libsqlite3_sys_0_9_1.buildtime_bindgen or false) ||
+ (f.libsqlite3_sys_0_9_1.min_sqlite_version_3_6_11 or false) ||
+ (libsqlite3_sys_0_9_1.min_sqlite_version_3_6_11 or false) ||
+ (f.libsqlite3_sys_0_9_1.min_sqlite_version_3_6_23 or false) ||
+ (libsqlite3_sys_0_9_1.min_sqlite_version_3_6_23 or false) ||
+ (f.libsqlite3_sys_0_9_1.min_sqlite_version_3_6_8 or false) ||
+ (libsqlite3_sys_0_9_1.min_sqlite_version_3_6_8 or false) ||
+ (f.libsqlite3_sys_0_9_1.min_sqlite_version_3_7_16 or false) ||
+ (libsqlite3_sys_0_9_1.min_sqlite_version_3_7_16 or false) ||
+ (f.libsqlite3_sys_0_9_1.min_sqlite_version_3_7_3 or false) ||
+ (libsqlite3_sys_0_9_1.min_sqlite_version_3_7_3 or false) ||
+ (f.libsqlite3_sys_0_9_1.min_sqlite_version_3_7_4 or false) ||
+ (libsqlite3_sys_0_9_1.min_sqlite_version_3_7_4 or false);
+ libsqlite3_sys_0_9_1.vcpkg =
+ (f.libsqlite3_sys_0_9_1.vcpkg or false) ||
+ (f.libsqlite3_sys_0_9_1.buildtime_bindgen or false) ||
+ (libsqlite3_sys_0_9_1.buildtime_bindgen or false) ||
+ (f.libsqlite3_sys_0_9_1.min_sqlite_version_3_6_11 or false) ||
+ (libsqlite3_sys_0_9_1.min_sqlite_version_3_6_11 or false) ||
+ (f.libsqlite3_sys_0_9_1.min_sqlite_version_3_6_23 or false) ||
+ (libsqlite3_sys_0_9_1.min_sqlite_version_3_6_23 or false) ||
+ (f.libsqlite3_sys_0_9_1.min_sqlite_version_3_6_8 or false) ||
+ (libsqlite3_sys_0_9_1.min_sqlite_version_3_6_8 or false) ||
+ (f.libsqlite3_sys_0_9_1.min_sqlite_version_3_7_16 or false) ||
+ (libsqlite3_sys_0_9_1.min_sqlite_version_3_7_16 or false) ||
+ (f.libsqlite3_sys_0_9_1.min_sqlite_version_3_7_3 or false) ||
+ (libsqlite3_sys_0_9_1.min_sqlite_version_3_7_3 or false) ||
+ (f.libsqlite3_sys_0_9_1.min_sqlite_version_3_7_4 or false) ||
+ (libsqlite3_sys_0_9_1.min_sqlite_version_3_7_4 or false);
pkg_config_0_3_9.default = true;
}) [ pkg_config_0_3_9_features ];
linked_hash_map_0_4_2 = { features?(linked_hash_map_0_4_2_features {}) }: linked_hash_map_0_4_2_ {
@@ -955,13 +944,13 @@ rec {
}) [ linked_hash_map_0_4_2_features ];
memchr_1_0_2 = { features?(memchr_1_0_2_features {}) }: memchr_1_0_2_ {
dependencies = mapFeatures features ([ ]
- ++ (if features.memchr_1_0_2.libc or false then [ libc_0_2_33 ] else []));
+ ++ (if features.memchr_1_0_2.libc or false then [ libc_0_2_40 ] else []));
features = mkFeatures (features.memchr_1_0_2 or {});
};
memchr_1_0_2_features = f: updateFeatures f (rec {
- libc_0_2_33.default = (f.libc_0_2_33.default or false);
- libc_0_2_33.use_std =
- (f.libc_0_2_33.use_std or false) ||
+ libc_0_2_40.default = (f.libc_0_2_40.default or false);
+ libc_0_2_40.use_std =
+ (f.libc_0_2_40.use_std or false) ||
(memchr_1_0_2.use_std or false) ||
(f.memchr_1_0_2.use_std or false);
memchr_1_0_2.default = (f.memchr_1_0_2.default or true);
@@ -975,7 +964,30 @@ rec {
(f.memchr_1_0_2.use_std or false) ||
(f.memchr_1_0_2.default or false) ||
(memchr_1_0_2.default or false);
- }) [ libc_0_2_33_features ];
+ }) [ libc_0_2_40_features ];
+ memchr_2_0_1 = { features?(memchr_2_0_1_features {}) }: memchr_2_0_1_ {
+ dependencies = mapFeatures features ([ ]
+ ++ (if features.memchr_2_0_1.libc or false then [ libc_0_2_40 ] else []));
+ features = mkFeatures (features.memchr_2_0_1 or {});
+ };
+ memchr_2_0_1_features = f: updateFeatures f (rec {
+ libc_0_2_40.default = (f.libc_0_2_40.default or false);
+ libc_0_2_40.use_std =
+ (f.libc_0_2_40.use_std or false) ||
+ (memchr_2_0_1.use_std or false) ||
+ (f.memchr_2_0_1.use_std or false);
+ memchr_2_0_1.default = (f.memchr_2_0_1.default or true);
+ memchr_2_0_1.libc =
+ (f.memchr_2_0_1.libc or false) ||
+ (f.memchr_2_0_1.default or false) ||
+ (memchr_2_0_1.default or false) ||
+ (f.memchr_2_0_1.use_std or false) ||
+ (memchr_2_0_1.use_std or false);
+ memchr_2_0_1.use_std =
+ (f.memchr_2_0_1.use_std or false) ||
+ (f.memchr_2_0_1.default or false) ||
+ (memchr_2_0_1.default or false);
+ }) [ libc_0_2_40_features ];
nom_3_2_1 = { features?(nom_3_2_1_features {}) }: nom_3_2_1_ {
dependencies = mapFeatures features ([ memchr_1_0_2 ]);
features = mkFeatures (features.nom_3_2_1 or {});
@@ -1012,282 +1024,303 @@ rec {
(f.nom_3_2_1.default or false) ||
(nom_3_2_1.default or false);
}) [ memchr_1_0_2_features ];
- num_0_1_40 = { features?(num_0_1_40_features {}) }: num_0_1_40_ {
- dependencies = mapFeatures features ([ num_integer_0_1_35 num_iter_0_1_34 num_traits_0_1_40 ]);
- features = mkFeatures (features.num_0_1_40 or {});
+ num_traits_0_2_2 = { features?(num_traits_0_2_2_features {}) }: num_traits_0_2_2_ {
+ features = mkFeatures (features.num_traits_0_2_2 or {});
};
- num_0_1_40_features = f: updateFeatures f (rec {
- num_0_1_40.bigint =
- (f.num_0_1_40.bigint or false) ||
- (f.num_0_1_40.default or false) ||
- (num_0_1_40.default or false);
- num_0_1_40.complex =
- (f.num_0_1_40.complex or false) ||
- (f.num_0_1_40.default or false) ||
- (num_0_1_40.default or false);
- num_0_1_40.default = (f.num_0_1_40.default or true);
- num_0_1_40.num-bigint =
- (f.num_0_1_40.num-bigint or false) ||
- (f.num_0_1_40.bigint or false) ||
- (num_0_1_40.bigint or false);
- num_0_1_40.num-complex =
- (f.num_0_1_40.num-complex or false) ||
- (f.num_0_1_40.complex or false) ||
- (num_0_1_40.complex or false);
- num_0_1_40.num-rational =
- (f.num_0_1_40.num-rational or false) ||
- (f.num_0_1_40.rational or false) ||
- (num_0_1_40.rational or false);
- num_0_1_40.rational =
- (f.num_0_1_40.rational or false) ||
- (f.num_0_1_40.default or false) ||
- (num_0_1_40.default or false);
- num_0_1_40.rustc-serialize =
- (f.num_0_1_40.rustc-serialize or false) ||
- (f.num_0_1_40.default or false) ||
- (num_0_1_40.default or false);
- num_integer_0_1_35.default = true;
- num_iter_0_1_34.default = true;
- num_traits_0_1_40.default = true;
- }) [ num_integer_0_1_35_features num_iter_0_1_34_features num_traits_0_1_40_features ];
- num_integer_0_1_35 = { features?(num_integer_0_1_35_features {}) }: num_integer_0_1_35_ {
- dependencies = mapFeatures features ([ num_traits_0_1_40 ]);
- };
- num_integer_0_1_35_features = f: updateFeatures f (rec {
- num_integer_0_1_35.default = (f.num_integer_0_1_35.default or true);
- num_traits_0_1_40.default = true;
- }) [ num_traits_0_1_40_features ];
- num_iter_0_1_34 = { features?(num_iter_0_1_34_features {}) }: num_iter_0_1_34_ {
- dependencies = mapFeatures features ([ num_integer_0_1_35 num_traits_0_1_40 ]);
- };
- num_iter_0_1_34_features = f: updateFeatures f (rec {
- num_integer_0_1_35.default = true;
- num_iter_0_1_34.default = (f.num_iter_0_1_34.default or true);
- num_traits_0_1_40.default = true;
- }) [ num_integer_0_1_35_features num_traits_0_1_40_features ];
- num_traits_0_1_40 = { features?(num_traits_0_1_40_features {}) }: num_traits_0_1_40_ {};
- num_traits_0_1_40_features = f: updateFeatures f (rec {
- num_traits_0_1_40.default = (f.num_traits_0_1_40.default or true);
+ num_traits_0_2_2_features = f: updateFeatures f (rec {
+ num_traits_0_2_2.default = (f.num_traits_0_2_2.default or true);
+ num_traits_0_2_2.std =
+ (f.num_traits_0_2_2.std or false) ||
+ (f.num_traits_0_2_2.default or false) ||
+ (num_traits_0_2_2.default or false);
}) [];
pkg_config_0_3_9 = { features?(pkg_config_0_3_9_features {}) }: pkg_config_0_3_9_ {};
pkg_config_0_3_9_features = f: updateFeatures f (rec {
pkg_config_0_3_9.default = (f.pkg_config_0_3_9.default or true);
}) [];
- quote_0_3_15 = { features?(quote_0_3_15_features {}) }: quote_0_3_15_ {};
- quote_0_3_15_features = f: updateFeatures f (rec {
- quote_0_3_15.default = (f.quote_0_3_15.default or true);
- }) [];
- rand_0_3_18 = { features?(rand_0_3_18_features {}) }: rand_0_3_18_ {
- dependencies = mapFeatures features ([ libc_0_2_33 ])
- ++ (if kernel == "fuchsia" then mapFeatures features ([ fuchsia_zircon_0_2_1 ]) else []);
- features = mkFeatures (features.rand_0_3_18 or {});
+ proc_macro2_0_3_6 = { features?(proc_macro2_0_3_6_features {}) }: proc_macro2_0_3_6_ {
+ dependencies = mapFeatures features ([ unicode_xid_0_1_0 ]);
+ features = mkFeatures (features.proc_macro2_0_3_6 or {});
};
- rand_0_3_18_features = f: updateFeatures f (rec {
- fuchsia_zircon_0_2_1.default = true;
- libc_0_2_33.default = true;
- rand_0_3_18.default = (f.rand_0_3_18.default or true);
- rand_0_3_18.i128_support =
- (f.rand_0_3_18.i128_support or false) ||
- (f.rand_0_3_18.nightly or false) ||
- (rand_0_3_18.nightly or false);
- }) [ libc_0_2_33_features fuchsia_zircon_0_2_1_features ];
- redox_syscall_0_1_32 = { features?(redox_syscall_0_1_32_features {}) }: redox_syscall_0_1_32_ {};
- redox_syscall_0_1_32_features = f: updateFeatures f (rec {
- redox_syscall_0_1_32.default = (f.redox_syscall_0_1_32.default or true);
+ proc_macro2_0_3_6_features = f: updateFeatures f (rec {
+ proc_macro2_0_3_6.default = (f.proc_macro2_0_3_6.default or true);
+ proc_macro2_0_3_6.proc-macro =
+ (f.proc_macro2_0_3_6.proc-macro or false) ||
+ (f.proc_macro2_0_3_6.default or false) ||
+ (proc_macro2_0_3_6.default or false) ||
+ (f.proc_macro2_0_3_6.nightly or false) ||
+ (proc_macro2_0_3_6.nightly or false);
+ unicode_xid_0_1_0.default = true;
+ }) [ unicode_xid_0_1_0_features ];
+ quick_error_1_2_1 = { features?(quick_error_1_2_1_features {}) }: quick_error_1_2_1_ {};
+ quick_error_1_2_1_features = f: updateFeatures f (rec {
+ quick_error_1_2_1.default = (f.quick_error_1_2_1.default or true);
+ }) [];
+ quote_0_5_1 = { features?(quote_0_5_1_features {}) }: quote_0_5_1_ {
+ dependencies = mapFeatures features ([ proc_macro2_0_3_6 ]);
+ features = mkFeatures (features.quote_0_5_1 or {});
+ };
+ quote_0_5_1_features = f: updateFeatures f (rec {
+ proc_macro2_0_3_6.default = (f.proc_macro2_0_3_6.default or false);
+ proc_macro2_0_3_6.proc-macro =
+ (f.proc_macro2_0_3_6.proc-macro or false) ||
+ (quote_0_5_1.proc-macro or false) ||
+ (f.quote_0_5_1.proc-macro or false);
+ quote_0_5_1.default = (f.quote_0_5_1.default or true);
+ quote_0_5_1.proc-macro =
+ (f.quote_0_5_1.proc-macro or false) ||
+ (f.quote_0_5_1.default or false) ||
+ (quote_0_5_1.default or false);
+ }) [ proc_macro2_0_3_6_features ];
+ rand_0_4_2 = { features?(rand_0_4_2_features {}) }: rand_0_4_2_ {
+ dependencies = (if kernel == "fuchsia" then mapFeatures features ([ fuchsia_zircon_0_3_3 ]) else [])
+ ++ (if (kernel == "linux" || kernel == "darwin") then mapFeatures features ([ ]
+ ++ (if features.rand_0_4_2.libc or false then [ libc_0_2_40 ] else [])) else [])
+ ++ (if kernel == "windows" then mapFeatures features ([ winapi_0_3_4 ]) else []);
+ features = mkFeatures (features.rand_0_4_2 or {});
+ };
+ rand_0_4_2_features = f: updateFeatures f (rec {
+ fuchsia_zircon_0_3_3.default = true;
+ libc_0_2_40.default = true;
+ rand_0_4_2.default = (f.rand_0_4_2.default or true);
+ rand_0_4_2.i128_support =
+ (f.rand_0_4_2.i128_support or false) ||
+ (f.rand_0_4_2.nightly or false) ||
+ (rand_0_4_2.nightly or false);
+ rand_0_4_2.libc =
+ (f.rand_0_4_2.libc or false) ||
+ (f.rand_0_4_2.std or false) ||
+ (rand_0_4_2.std or false);
+ rand_0_4_2.std =
+ (f.rand_0_4_2.std or false) ||
+ (f.rand_0_4_2.default or false) ||
+ (rand_0_4_2.default or false);
+ winapi_0_3_4.default = true;
+ winapi_0_3_4.minwindef = true;
+ winapi_0_3_4.ntsecapi = true;
+ winapi_0_3_4.profileapi = true;
+ winapi_0_3_4.winnt = true;
+ }) [ fuchsia_zircon_0_3_3_features libc_0_2_40_features winapi_0_3_4_features ];
+ redox_syscall_0_1_37 = { features?(redox_syscall_0_1_37_features {}) }: redox_syscall_0_1_37_ {};
+ redox_syscall_0_1_37_features = f: updateFeatures f (rec {
+ redox_syscall_0_1_37.default = (f.redox_syscall_0_1_37.default or true);
}) [];
redox_termios_0_1_1 = { features?(redox_termios_0_1_1_features {}) }: redox_termios_0_1_1_ {
- dependencies = mapFeatures features ([ redox_syscall_0_1_32 ]);
+ dependencies = mapFeatures features ([ redox_syscall_0_1_37 ]);
};
redox_termios_0_1_1_features = f: updateFeatures f (rec {
- redox_syscall_0_1_32.default = true;
+ redox_syscall_0_1_37.default = true;
redox_termios_0_1_1.default = (f.redox_termios_0_1_1.default or true);
- }) [ redox_syscall_0_1_32_features ];
- regex_0_2_2 = { features?(regex_0_2_2_features {}) }: regex_0_2_2_ {
- dependencies = mapFeatures features ([ aho_corasick_0_6_3 memchr_1_0_2 regex_syntax_0_4_1 thread_local_0_3_4 utf8_ranges_1_0_0 ]);
- features = mkFeatures (features.regex_0_2_2 or {});
+ }) [ redox_syscall_0_1_37_features ];
+ regex_0_2_10 = { features?(regex_0_2_10_features {}) }: regex_0_2_10_ {
+ dependencies = mapFeatures features ([ aho_corasick_0_6_4 memchr_2_0_1 regex_syntax_0_5_5 thread_local_0_3_5 utf8_ranges_1_0_0 ]);
+ features = mkFeatures (features.regex_0_2_10 or {});
};
- regex_0_2_2_features = f: updateFeatures f (rec {
- aho_corasick_0_6_3.default = true;
- memchr_1_0_2.default = true;
- regex_0_2_2.default = (f.regex_0_2_2.default or true);
- regex_0_2_2.simd =
- (f.regex_0_2_2.simd or false) ||
- (f.regex_0_2_2.simd-accel or false) ||
- (regex_0_2_2.simd-accel or false);
- regex_syntax_0_4_1.default = true;
- thread_local_0_3_4.default = true;
+ regex_0_2_10_features = f: updateFeatures f (rec {
+ aho_corasick_0_6_4.default = true;
+ memchr_2_0_1.default = true;
+ regex_0_2_10.default = (f.regex_0_2_10.default or true);
+ regex_0_2_10.pattern =
+ (f.regex_0_2_10.pattern or false) ||
+ (f.regex_0_2_10.unstable or false) ||
+ (regex_0_2_10.unstable or false);
+ regex_syntax_0_5_5.default = true;
+ thread_local_0_3_5.default = true;
utf8_ranges_1_0_0.default = true;
- }) [ aho_corasick_0_6_3_features memchr_1_0_2_features regex_syntax_0_4_1_features thread_local_0_3_4_features utf8_ranges_1_0_0_features ];
- regex_syntax_0_4_1 = { features?(regex_syntax_0_4_1_features {}) }: regex_syntax_0_4_1_ {};
- regex_syntax_0_4_1_features = f: updateFeatures f (rec {
- regex_syntax_0_4_1.default = (f.regex_syntax_0_4_1.default or true);
- }) [];
+ }) [ aho_corasick_0_6_4_features memchr_2_0_1_features regex_syntax_0_5_5_features thread_local_0_3_5_features utf8_ranges_1_0_0_features ];
+ regex_syntax_0_5_5 = { features?(regex_syntax_0_5_5_features {}) }: regex_syntax_0_5_5_ {
+ dependencies = mapFeatures features ([ ucd_util_0_1_1 ]);
+ };
+ regex_syntax_0_5_5_features = f: updateFeatures f (rec {
+ regex_syntax_0_5_5.default = (f.regex_syntax_0_5_5.default or true);
+ ucd_util_0_1_1.default = true;
+ }) [ ucd_util_0_1_1_features ];
+ remove_dir_all_0_5_0 = { features?(remove_dir_all_0_5_0_features {}) }: remove_dir_all_0_5_0_ {
+ dependencies = (if kernel == "windows" then mapFeatures features ([ winapi_0_3_4 ]) else []);
+ };
+ remove_dir_all_0_5_0_features = f: updateFeatures f (rec {
+ remove_dir_all_0_5_0.default = (f.remove_dir_all_0_5_0.default or true);
+ winapi_0_3_4.default = true;
+ winapi_0_3_4.errhandlingapi = true;
+ winapi_0_3_4.fileapi = true;
+ winapi_0_3_4.std = true;
+ winapi_0_3_4.winbase = true;
+ winapi_0_3_4.winerror = true;
+ }) [ winapi_0_3_4_features ];
rusqlite_0_13_0 = { features?(rusqlite_0_13_0_features {}) }: rusqlite_0_13_0_ {
- dependencies = mapFeatures features ([ bitflags_1_0_1 libsqlite3_sys_0_9_0 lru_cache_0_1_1 time_0_1_38 ]);
+ dependencies = mapFeatures features ([ bitflags_1_0_1 libsqlite3_sys_0_9_1 lru_cache_0_1_1 time_0_1_39 ]);
features = mkFeatures (features.rusqlite_0_13_0 or {});
};
rusqlite_0_13_0_features = f: updateFeatures f (rec {
bitflags_1_0_1.default = true;
- libsqlite3_sys_0_9_0.buildtime_bindgen =
- (f.libsqlite3_sys_0_9_0.buildtime_bindgen or false) ||
+ libsqlite3_sys_0_9_1.buildtime_bindgen =
+ (f.libsqlite3_sys_0_9_1.buildtime_bindgen or false) ||
(rusqlite_0_13_0.buildtime_bindgen or false) ||
(f.rusqlite_0_13_0.buildtime_bindgen or false);
- libsqlite3_sys_0_9_0.bundled =
- (f.libsqlite3_sys_0_9_0.bundled or false) ||
+ libsqlite3_sys_0_9_1.bundled =
+ (f.libsqlite3_sys_0_9_1.bundled or false) ||
(rusqlite_0_13_0.bundled or false) ||
(f.rusqlite_0_13_0.bundled or false);
- libsqlite3_sys_0_9_0.default = true;
- libsqlite3_sys_0_9_0.min_sqlite_version_3_6_11 =
- (f.libsqlite3_sys_0_9_0.min_sqlite_version_3_6_11 or false) ||
+ libsqlite3_sys_0_9_1.default = true;
+ libsqlite3_sys_0_9_1.min_sqlite_version_3_6_11 =
+ (f.libsqlite3_sys_0_9_1.min_sqlite_version_3_6_11 or false) ||
(rusqlite_0_13_0.backup or false) ||
(f.rusqlite_0_13_0.backup or false);
- libsqlite3_sys_0_9_0.min_sqlite_version_3_6_23 =
- (f.libsqlite3_sys_0_9_0.min_sqlite_version_3_6_23 or false) ||
+ libsqlite3_sys_0_9_1.min_sqlite_version_3_6_23 =
+ (f.libsqlite3_sys_0_9_1.min_sqlite_version_3_6_23 or false) ||
(rusqlite_0_13_0.trace or false) ||
(f.rusqlite_0_13_0.trace or false);
- libsqlite3_sys_0_9_0.min_sqlite_version_3_7_3 =
- (f.libsqlite3_sys_0_9_0.min_sqlite_version_3_7_3 or false) ||
+ libsqlite3_sys_0_9_1.min_sqlite_version_3_7_3 =
+ (f.libsqlite3_sys_0_9_1.min_sqlite_version_3_7_3 or false) ||
(rusqlite_0_13_0.functions or false) ||
(f.rusqlite_0_13_0.functions or false);
- libsqlite3_sys_0_9_0.min_sqlite_version_3_7_4 =
- (f.libsqlite3_sys_0_9_0.min_sqlite_version_3_7_4 or false) ||
+ libsqlite3_sys_0_9_1.min_sqlite_version_3_7_4 =
+ (f.libsqlite3_sys_0_9_1.min_sqlite_version_3_7_4 or false) ||
(rusqlite_0_13_0.blob or false) ||
(f.rusqlite_0_13_0.blob or false);
- libsqlite3_sys_0_9_0.sqlcipher =
- (f.libsqlite3_sys_0_9_0.sqlcipher or false) ||
+ libsqlite3_sys_0_9_1.sqlcipher =
+ (f.libsqlite3_sys_0_9_1.sqlcipher or false) ||
(rusqlite_0_13_0.sqlcipher or false) ||
(f.rusqlite_0_13_0.sqlcipher or false);
lru_cache_0_1_1.default = true;
rusqlite_0_13_0.default = (f.rusqlite_0_13_0.default or true);
- time_0_1_38.default = true;
- }) [ bitflags_1_0_1_features libsqlite3_sys_0_9_0_features lru_cache_0_1_1_features time_0_1_38_features ];
- rustc_demangle_0_1_5 = { features?(rustc_demangle_0_1_5_features {}) }: rustc_demangle_0_1_5_ {};
- rustc_demangle_0_1_5_features = f: updateFeatures f (rec {
- rustc_demangle_0_1_5.default = (f.rustc_demangle_0_1_5.default or true);
+ time_0_1_39.default = true;
+ }) [ bitflags_1_0_1_features libsqlite3_sys_0_9_1_features lru_cache_0_1_1_features time_0_1_39_features ];
+ rustc_demangle_0_1_7 = { features?(rustc_demangle_0_1_7_features {}) }: rustc_demangle_0_1_7_ {};
+ rustc_demangle_0_1_7_features = f: updateFeatures f (rec {
+ rustc_demangle_0_1_7.default = (f.rustc_demangle_0_1_7.default or true);
}) [];
- serde_1_0_21 = { features?(serde_1_0_21_features {}) }: serde_1_0_21_ {
+ serde_1_0_38 = { features?(serde_1_0_38_features {}) }: serde_1_0_38_ {
dependencies = mapFeatures features ([]);
- features = mkFeatures (features.serde_1_0_21 or {});
+ features = mkFeatures (features.serde_1_0_38 or {});
};
- serde_1_0_21_features = f: updateFeatures f (rec {
- serde_1_0_21.default = (f.serde_1_0_21.default or true);
- serde_1_0_21.serde_derive =
- (f.serde_1_0_21.serde_derive or false) ||
- (f.serde_1_0_21.derive or false) ||
- (serde_1_0_21.derive or false) ||
- (f.serde_1_0_21.playground or false) ||
- (serde_1_0_21.playground or false);
- serde_1_0_21.std =
- (f.serde_1_0_21.std or false) ||
- (f.serde_1_0_21.default or false) ||
- (serde_1_0_21.default or false);
- serde_1_0_21.unstable =
- (f.serde_1_0_21.unstable or false) ||
- (f.serde_1_0_21.alloc or false) ||
- (serde_1_0_21.alloc or false);
+ serde_1_0_38_features = f: updateFeatures f (rec {
+ serde_1_0_38.default = (f.serde_1_0_38.default or true);
+ serde_1_0_38.serde_derive =
+ (f.serde_1_0_38.serde_derive or false) ||
+ (f.serde_1_0_38.derive or false) ||
+ (serde_1_0_38.derive or false) ||
+ (f.serde_1_0_38.playground or false) ||
+ (serde_1_0_38.playground or false);
+ serde_1_0_38.std =
+ (f.serde_1_0_38.std or false) ||
+ (f.serde_1_0_38.default or false) ||
+ (serde_1_0_38.default or false);
+ serde_1_0_38.unstable =
+ (f.serde_1_0_38.unstable or false) ||
+ (f.serde_1_0_38.alloc or false) ||
+ (serde_1_0_38.alloc or false);
}) [];
- serde_derive_1_0_21 = { features?(serde_derive_1_0_21_features {}) }: serde_derive_1_0_21_ {
- dependencies = mapFeatures features ([ quote_0_3_15 serde_derive_internals_0_17_0 syn_0_11_11 ]);
+ serde_derive_1_0_38 = { features?(serde_derive_1_0_38_features {}) }: serde_derive_1_0_38_ {
+ dependencies = mapFeatures features ([ proc_macro2_0_3_6 quote_0_5_1 serde_derive_internals_0_23_1 syn_0_13_1 ]);
+ features = mkFeatures (features.serde_derive_1_0_38 or {});
};
- serde_derive_1_0_21_features = f: updateFeatures f (rec {
- quote_0_3_15.default = true;
- serde_derive_1_0_21.default = (f.serde_derive_1_0_21.default or true);
- serde_derive_internals_0_17_0.default = (f.serde_derive_internals_0_17_0.default or false);
- syn_0_11_11.default = true;
- syn_0_11_11.visit = true;
- }) [ quote_0_3_15_features serde_derive_internals_0_17_0_features syn_0_11_11_features ];
- serde_derive_internals_0_17_0 = { features?(serde_derive_internals_0_17_0_features {}) }: serde_derive_internals_0_17_0_ {
- dependencies = mapFeatures features ([ syn_0_11_11 synom_0_11_3 ]);
+ serde_derive_1_0_38_features = f: updateFeatures f (rec {
+ proc_macro2_0_3_6.default = true;
+ quote_0_5_1.default = true;
+ serde_derive_1_0_38.default = (f.serde_derive_1_0_38.default or true);
+ serde_derive_internals_0_23_1.default = (f.serde_derive_internals_0_23_1.default or false);
+ syn_0_13_1.default = true;
+ syn_0_13_1.visit = true;
+ }) [ proc_macro2_0_3_6_features quote_0_5_1_features serde_derive_internals_0_23_1_features syn_0_13_1_features ];
+ serde_derive_internals_0_23_1 = { features?(serde_derive_internals_0_23_1_features {}) }: serde_derive_internals_0_23_1_ {
+ dependencies = mapFeatures features ([ proc_macro2_0_3_6 syn_0_13_1 ]);
};
- serde_derive_internals_0_17_0_features = f: updateFeatures f (rec {
- serde_derive_internals_0_17_0.default = (f.serde_derive_internals_0_17_0.default or true);
- syn_0_11_11.default = (f.syn_0_11_11.default or false);
- syn_0_11_11.parsing = true;
- synom_0_11_3.default = true;
- }) [ syn_0_11_11_features synom_0_11_3_features ];
- serde_json_1_0_6 = { features?(serde_json_1_0_6_features {}) }: serde_json_1_0_6_ {
- dependencies = mapFeatures features ([ dtoa_0_4_2 itoa_0_3_4 num_traits_0_1_40 serde_1_0_21 ]);
- features = mkFeatures (features.serde_json_1_0_6 or {});
+ serde_derive_internals_0_23_1_features = f: updateFeatures f (rec {
+ proc_macro2_0_3_6.default = true;
+ serde_derive_internals_0_23_1.default = (f.serde_derive_internals_0_23_1.default or true);
+ syn_0_13_1.clone-impls = true;
+ syn_0_13_1.default = (f.syn_0_13_1.default or false);
+ syn_0_13_1.derive = true;
+ syn_0_13_1.parsing = true;
+ }) [ proc_macro2_0_3_6_features syn_0_13_1_features ];
+ serde_json_1_0_14 = { features?(serde_json_1_0_14_features {}) }: serde_json_1_0_14_ {
+ dependencies = mapFeatures features ([ dtoa_0_4_2 itoa_0_4_1 num_traits_0_2_2 serde_1_0_38 ]);
+ features = mkFeatures (features.serde_json_1_0_14 or {});
};
- serde_json_1_0_6_features = f: updateFeatures f (rec {
+ serde_json_1_0_14_features = f: updateFeatures f (rec {
dtoa_0_4_2.default = true;
- itoa_0_3_4.default = true;
- num_traits_0_1_40.default = true;
- serde_1_0_21.default = true;
- serde_json_1_0_6.default = (f.serde_json_1_0_6.default or true);
- serde_json_1_0_6.linked-hash-map =
- (f.serde_json_1_0_6.linked-hash-map or false) ||
- (f.serde_json_1_0_6.preserve_order or false) ||
- (serde_json_1_0_6.preserve_order or false);
- }) [ dtoa_0_4_2_features itoa_0_3_4_features num_traits_0_1_40_features serde_1_0_21_features ];
- strsim_0_6_0 = { features?(strsim_0_6_0_features {}) }: strsim_0_6_0_ {};
- strsim_0_6_0_features = f: updateFeatures f (rec {
- strsim_0_6_0.default = (f.strsim_0_6_0.default or true);
+ itoa_0_4_1.default = true;
+ num_traits_0_2_2.default = (f.num_traits_0_2_2.default or false);
+ serde_1_0_38.default = true;
+ serde_json_1_0_14.default = (f.serde_json_1_0_14.default or true);
+ serde_json_1_0_14.linked-hash-map =
+ (f.serde_json_1_0_14.linked-hash-map or false) ||
+ (f.serde_json_1_0_14.preserve_order or false) ||
+ (serde_json_1_0_14.preserve_order or false);
+ }) [ dtoa_0_4_2_features itoa_0_4_1_features num_traits_0_2_2_features serde_1_0_38_features ];
+ strsim_0_7_0 = { features?(strsim_0_7_0_features {}) }: strsim_0_7_0_ {};
+ strsim_0_7_0_features = f: updateFeatures f (rec {
+ strsim_0_7_0.default = (f.strsim_0_7_0.default or true);
}) [];
- syn_0_11_11 = { features?(syn_0_11_11_features {}) }: syn_0_11_11_ {
- dependencies = mapFeatures features ([ ]
- ++ (if features.syn_0_11_11.quote or false then [ quote_0_3_15 ] else [])
- ++ (if features.syn_0_11_11.synom or false then [ synom_0_11_3 ] else [])
- ++ (if features.syn_0_11_11.unicode-xid or false then [ unicode_xid_0_0_4 ] else []));
- features = mkFeatures (features.syn_0_11_11 or {});
+ syn_0_13_1 = { features?(syn_0_13_1_features {}) }: syn_0_13_1_ {
+ dependencies = mapFeatures features ([ proc_macro2_0_3_6 unicode_xid_0_1_0 ]
+ ++ (if features.syn_0_13_1.quote or false then [ quote_0_5_1 ] else []));
+ features = mkFeatures (features.syn_0_13_1 or {});
};
- syn_0_11_11_features = f: updateFeatures f (rec {
- quote_0_3_15.default = true;
- syn_0_11_11.default = (f.syn_0_11_11.default or true);
- syn_0_11_11.parsing =
- (f.syn_0_11_11.parsing or false) ||
- (f.syn_0_11_11.default or false) ||
- (syn_0_11_11.default or false);
- syn_0_11_11.printing =
- (f.syn_0_11_11.printing or false) ||
- (f.syn_0_11_11.default or false) ||
- (syn_0_11_11.default or false);
- syn_0_11_11.quote =
- (f.syn_0_11_11.quote or false) ||
- (f.syn_0_11_11.printing or false) ||
- (syn_0_11_11.printing or false);
- syn_0_11_11.synom =
- (f.syn_0_11_11.synom or false) ||
- (f.syn_0_11_11.parsing or false) ||
- (syn_0_11_11.parsing or false);
- syn_0_11_11.unicode-xid =
- (f.syn_0_11_11.unicode-xid or false) ||
- (f.syn_0_11_11.parsing or false) ||
- (syn_0_11_11.parsing or false);
- synom_0_11_3.default = true;
- unicode_xid_0_0_4.default = true;
- }) [ quote_0_3_15_features synom_0_11_3_features unicode_xid_0_0_4_features ];
- synom_0_11_3 = { features?(synom_0_11_3_features {}) }: synom_0_11_3_ {
- dependencies = mapFeatures features ([ unicode_xid_0_0_4 ]);
+ syn_0_13_1_features = f: updateFeatures f (rec {
+ proc_macro2_0_3_6.default = (f.proc_macro2_0_3_6.default or false);
+ proc_macro2_0_3_6.proc-macro =
+ (f.proc_macro2_0_3_6.proc-macro or false) ||
+ (syn_0_13_1.proc-macro or false) ||
+ (f.syn_0_13_1.proc-macro or false);
+ quote_0_5_1.default = (f.quote_0_5_1.default or false);
+ quote_0_5_1.proc-macro =
+ (f.quote_0_5_1.proc-macro or false) ||
+ (syn_0_13_1.proc-macro or false) ||
+ (f.syn_0_13_1.proc-macro or false);
+ syn_0_13_1.clone-impls =
+ (f.syn_0_13_1.clone-impls or false) ||
+ (f.syn_0_13_1.default or false) ||
+ (syn_0_13_1.default or false);
+ syn_0_13_1.default = (f.syn_0_13_1.default or true);
+ syn_0_13_1.derive =
+ (f.syn_0_13_1.derive or false) ||
+ (f.syn_0_13_1.default or false) ||
+ (syn_0_13_1.default or false);
+ syn_0_13_1.parsing =
+ (f.syn_0_13_1.parsing or false) ||
+ (f.syn_0_13_1.default or false) ||
+ (syn_0_13_1.default or false);
+ syn_0_13_1.printing =
+ (f.syn_0_13_1.printing or false) ||
+ (f.syn_0_13_1.default or false) ||
+ (syn_0_13_1.default or false);
+ syn_0_13_1.proc-macro =
+ (f.syn_0_13_1.proc-macro or false) ||
+ (f.syn_0_13_1.default or false) ||
+ (syn_0_13_1.default or false);
+ syn_0_13_1.quote =
+ (f.syn_0_13_1.quote or false) ||
+ (f.syn_0_13_1.printing or false) ||
+ (syn_0_13_1.printing or false);
+ unicode_xid_0_1_0.default = true;
+ }) [ proc_macro2_0_3_6_features quote_0_5_1_features unicode_xid_0_1_0_features ];
+ tempdir_0_3_7 = { features?(tempdir_0_3_7_features {}) }: tempdir_0_3_7_ {
+ dependencies = mapFeatures features ([ rand_0_4_2 remove_dir_all_0_5_0 ]);
};
- synom_0_11_3_features = f: updateFeatures f (rec {
- synom_0_11_3.default = (f.synom_0_11_3.default or true);
- unicode_xid_0_0_4.default = true;
- }) [ unicode_xid_0_0_4_features ];
- tempdir_0_3_5 = { features?(tempdir_0_3_5_features {}) }: tempdir_0_3_5_ {
- dependencies = mapFeatures features ([ rand_0_3_18 ]);
+ tempdir_0_3_7_features = f: updateFeatures f (rec {
+ rand_0_4_2.default = true;
+ remove_dir_all_0_5_0.default = true;
+ tempdir_0_3_7.default = (f.tempdir_0_3_7.default or true);
+ }) [ rand_0_4_2_features remove_dir_all_0_5_0_features ];
+ termcolor_0_3_6 = { features?(termcolor_0_3_6_features {}) }: termcolor_0_3_6_ {
+ dependencies = (if kernel == "windows" then mapFeatures features ([ wincolor_0_1_6 ]) else []);
};
- tempdir_0_3_5_features = f: updateFeatures f (rec {
- rand_0_3_18.default = true;
- tempdir_0_3_5.default = (f.tempdir_0_3_5.default or true);
- }) [ rand_0_3_18_features ];
- termcolor_0_3_3 = { features?(termcolor_0_3_3_features {}) }: termcolor_0_3_3_ {
- dependencies = (if kernel == "windows" then mapFeatures features ([ wincolor_0_1_4 ]) else []);
- };
- termcolor_0_3_3_features = f: updateFeatures f (rec {
- termcolor_0_3_3.default = (f.termcolor_0_3_3.default or true);
- wincolor_0_1_4.default = true;
- }) [ wincolor_0_1_4_features ];
+ termcolor_0_3_6_features = f: updateFeatures f (rec {
+ termcolor_0_3_6.default = (f.termcolor_0_3_6.default or true);
+ wincolor_0_1_6.default = true;
+ }) [ wincolor_0_1_6_features ];
termion_1_5_1 = { features?(termion_1_5_1_features {}) }: termion_1_5_1_ {
- dependencies = (if !(kernel == "redox") then mapFeatures features ([ libc_0_2_33 ]) else [])
- ++ (if kernel == "redox" then mapFeatures features ([ redox_syscall_0_1_32 redox_termios_0_1_1 ]) else []);
+ dependencies = (if !(kernel == "redox") then mapFeatures features ([ libc_0_2_40 ]) else [])
+ ++ (if kernel == "redox" then mapFeatures features ([ redox_syscall_0_1_37 redox_termios_0_1_1 ]) else []);
};
termion_1_5_1_features = f: updateFeatures f (rec {
- libc_0_2_33.default = true;
- redox_syscall_0_1_32.default = true;
+ libc_0_2_40.default = true;
+ redox_syscall_0_1_37.default = true;
redox_termios_0_1_1.default = true;
termion_1_5_1.default = (f.termion_1_5_1.default or true);
- }) [ libc_0_2_33_features redox_syscall_0_1_32_features redox_termios_0_1_1_features ];
+ }) [ libc_0_2_40_features redox_syscall_0_1_37_features redox_termios_0_1_1_features ];
textwrap_0_9_0 = { features?(textwrap_0_9_0_features {}) }: textwrap_0_9_0_ {
dependencies = mapFeatures features ([ unicode_width_0_1_4 ]);
};
@@ -1295,44 +1328,54 @@ rec {
textwrap_0_9_0.default = (f.textwrap_0_9_0.default or true);
unicode_width_0_1_4.default = true;
}) [ unicode_width_0_1_4_features ];
- thread_local_0_3_4 = { features?(thread_local_0_3_4_features {}) }: thread_local_0_3_4_ {
- dependencies = mapFeatures features ([ lazy_static_0_2_11 unreachable_1_0_0 ]);
+ thread_local_0_3_5 = { features?(thread_local_0_3_5_features {}) }: thread_local_0_3_5_ {
+ dependencies = mapFeatures features ([ lazy_static_1_0_0 unreachable_1_0_0 ]);
};
- thread_local_0_3_4_features = f: updateFeatures f (rec {
- lazy_static_0_2_11.default = true;
- thread_local_0_3_4.default = (f.thread_local_0_3_4.default or true);
+ thread_local_0_3_5_features = f: updateFeatures f (rec {
+ lazy_static_1_0_0.default = true;
+ thread_local_0_3_5.default = (f.thread_local_0_3_5.default or true);
unreachable_1_0_0.default = true;
- }) [ lazy_static_0_2_11_features unreachable_1_0_0_features ];
- time_0_1_38 = { features?(time_0_1_38_features {}) }: time_0_1_38_ {
- dependencies = mapFeatures features ([ libc_0_2_33 ])
- ++ (if kernel == "redox" then mapFeatures features ([ redox_syscall_0_1_32 ]) else [])
- ++ (if kernel == "windows" then mapFeatures features ([ kernel32_sys_0_2_2 winapi_0_2_8 ]) else []);
+ }) [ lazy_static_1_0_0_features unreachable_1_0_0_features ];
+ time_0_1_39 = { features?(time_0_1_39_features {}) }: time_0_1_39_ {
+ dependencies = mapFeatures features ([ libc_0_2_40 ])
+ ++ (if kernel == "redox" then mapFeatures features ([ redox_syscall_0_1_37 ]) else [])
+ ++ (if kernel == "windows" then mapFeatures features ([ winapi_0_3_4 ]) else []);
};
- time_0_1_38_features = f: updateFeatures f (rec {
- kernel32_sys_0_2_2.default = true;
- libc_0_2_33.default = true;
- redox_syscall_0_1_32.default = true;
- time_0_1_38.default = (f.time_0_1_38.default or true);
- winapi_0_2_8.default = true;
- }) [ libc_0_2_33_features redox_syscall_0_1_32_features kernel32_sys_0_2_2_features winapi_0_2_8_features ];
- toml_0_4_5 = { features?(toml_0_4_5_features {}) }: toml_0_4_5_ {
- dependencies = mapFeatures features ([ serde_1_0_21 ]);
+ time_0_1_39_features = f: updateFeatures f (rec {
+ libc_0_2_40.default = true;
+ redox_syscall_0_1_37.default = true;
+ time_0_1_39.default = (f.time_0_1_39.default or true);
+ winapi_0_3_4.default = true;
+ winapi_0_3_4.minwinbase = true;
+ winapi_0_3_4.minwindef = true;
+ winapi_0_3_4.ntdef = true;
+ winapi_0_3_4.profileapi = true;
+ winapi_0_3_4.std = true;
+ winapi_0_3_4.sysinfoapi = true;
+ winapi_0_3_4.timezoneapi = true;
+ }) [ libc_0_2_40_features redox_syscall_0_1_37_features winapi_0_3_4_features ];
+ toml_0_4_6 = { features?(toml_0_4_6_features {}) }: toml_0_4_6_ {
+ dependencies = mapFeatures features ([ serde_1_0_38 ]);
};
- toml_0_4_5_features = f: updateFeatures f (rec {
- serde_1_0_21.default = true;
- toml_0_4_5.default = (f.toml_0_4_5.default or true);
- }) [ serde_1_0_21_features ];
+ toml_0_4_6_features = f: updateFeatures f (rec {
+ serde_1_0_38.default = true;
+ toml_0_4_6.default = (f.toml_0_4_6.default or true);
+ }) [ serde_1_0_38_features ];
+ ucd_util_0_1_1 = { features?(ucd_util_0_1_1_features {}) }: ucd_util_0_1_1_ {};
+ ucd_util_0_1_1_features = f: updateFeatures f (rec {
+ ucd_util_0_1_1.default = (f.ucd_util_0_1_1.default or true);
+ }) [];
unicode_width_0_1_4 = { features?(unicode_width_0_1_4_features {}) }: unicode_width_0_1_4_ {
features = mkFeatures (features.unicode_width_0_1_4 or {});
};
unicode_width_0_1_4_features = f: updateFeatures f (rec {
unicode_width_0_1_4.default = (f.unicode_width_0_1_4.default or true);
}) [];
- unicode_xid_0_0_4 = { features?(unicode_xid_0_0_4_features {}) }: unicode_xid_0_0_4_ {
- features = mkFeatures (features.unicode_xid_0_0_4 or {});
+ unicode_xid_0_1_0 = { features?(unicode_xid_0_1_0_features {}) }: unicode_xid_0_1_0_ {
+ features = mkFeatures (features.unicode_xid_0_1_0 or {});
};
- unicode_xid_0_0_4_features = f: updateFeatures f (rec {
- unicode_xid_0_0_4.default = (f.unicode_xid_0_0_4.default or true);
+ unicode_xid_0_1_0_features = f: updateFeatures f (rec {
+ unicode_xid_0_1_0.default = (f.unicode_xid_0_1_0.default or true);
}) [];
unreachable_1_0_0 = { features?(unreachable_1_0_0_features {}) }: unreachable_1_0_0_ {
dependencies = mapFeatures features ([ void_1_0_2 ]);
@@ -1345,9 +1388,9 @@ rec {
utf8_ranges_1_0_0_features = f: updateFeatures f (rec {
utf8_ranges_1_0_0.default = (f.utf8_ranges_1_0_0.default or true);
}) [];
- vcpkg_0_2_2 = { features?(vcpkg_0_2_2_features {}) }: vcpkg_0_2_2_ {};
- vcpkg_0_2_2_features = f: updateFeatures f (rec {
- vcpkg_0_2_2.default = (f.vcpkg_0_2_2.default or true);
+ vcpkg_0_2_3 = { features?(vcpkg_0_2_3_features {}) }: vcpkg_0_2_3_ {};
+ vcpkg_0_2_3_features = f: updateFeatures f (rec {
+ vcpkg_0_2_3.default = (f.vcpkg_0_2_3.default or true);
}) [];
vec_map_0_8_0 = { features?(vec_map_0_8_0_features {}) }: vec_map_0_8_0_ {
dependencies = mapFeatures features ([]);
@@ -1374,20 +1417,34 @@ rec {
(f.void_1_0_2.default or false) ||
(void_1_0_2.default or false);
}) [];
- winapi_0_2_8 = { features?(winapi_0_2_8_features {}) }: winapi_0_2_8_ {};
- winapi_0_2_8_features = f: updateFeatures f (rec {
- winapi_0_2_8.default = (f.winapi_0_2_8.default or true);
- }) [];
- winapi_build_0_1_1 = { features?(winapi_build_0_1_1_features {}) }: winapi_build_0_1_1_ {};
- winapi_build_0_1_1_features = f: updateFeatures f (rec {
- winapi_build_0_1_1.default = (f.winapi_build_0_1_1.default or true);
- }) [];
- wincolor_0_1_4 = { features?(wincolor_0_1_4_features {}) }: wincolor_0_1_4_ {
- dependencies = mapFeatures features ([ kernel32_sys_0_2_2 winapi_0_2_8 ]);
+ winapi_0_3_4 = { features?(winapi_0_3_4_features {}) }: winapi_0_3_4_ {
+ dependencies = (if kernel == "i686-pc-windows-gnu" then mapFeatures features ([ winapi_i686_pc_windows_gnu_0_4_0 ]) else [])
+ ++ (if kernel == "x86_64-pc-windows-gnu" then mapFeatures features ([ winapi_x86_64_pc_windows_gnu_0_4_0 ]) else []);
+ features = mkFeatures (features.winapi_0_3_4 or {});
};
- wincolor_0_1_4_features = f: updateFeatures f (rec {
- kernel32_sys_0_2_2.default = true;
- winapi_0_2_8.default = true;
- wincolor_0_1_4.default = (f.wincolor_0_1_4.default or true);
- }) [ kernel32_sys_0_2_2_features winapi_0_2_8_features ];
+ winapi_0_3_4_features = f: updateFeatures f (rec {
+ winapi_0_3_4.default = (f.winapi_0_3_4.default or true);
+ winapi_i686_pc_windows_gnu_0_4_0.default = true;
+ winapi_x86_64_pc_windows_gnu_0_4_0.default = true;
+ }) [ winapi_i686_pc_windows_gnu_0_4_0_features winapi_x86_64_pc_windows_gnu_0_4_0_features ];
+ winapi_i686_pc_windows_gnu_0_4_0 = { features?(winapi_i686_pc_windows_gnu_0_4_0_features {}) }: winapi_i686_pc_windows_gnu_0_4_0_ {};
+ winapi_i686_pc_windows_gnu_0_4_0_features = f: updateFeatures f (rec {
+ winapi_i686_pc_windows_gnu_0_4_0.default = (f.winapi_i686_pc_windows_gnu_0_4_0.default or true);
+ }) [];
+ winapi_x86_64_pc_windows_gnu_0_4_0 = { features?(winapi_x86_64_pc_windows_gnu_0_4_0_features {}) }: winapi_x86_64_pc_windows_gnu_0_4_0_ {};
+ winapi_x86_64_pc_windows_gnu_0_4_0_features = f: updateFeatures f (rec {
+ winapi_x86_64_pc_windows_gnu_0_4_0.default = (f.winapi_x86_64_pc_windows_gnu_0_4_0.default or true);
+ }) [];
+ wincolor_0_1_6 = { features?(wincolor_0_1_6_features {}) }: wincolor_0_1_6_ {
+ dependencies = mapFeatures features ([ winapi_0_3_4 ]);
+ };
+ wincolor_0_1_6_features = f: updateFeatures f (rec {
+ winapi_0_3_4.consoleapi = true;
+ winapi_0_3_4.default = true;
+ winapi_0_3_4.minwindef = true;
+ winapi_0_3_4.processenv = true;
+ winapi_0_3_4.winbase = true;
+ winapi_0_3_4.wincon = true;
+ wincolor_0_1_6.default = (f.wincolor_0_1_6.default or true);
+ }) [ winapi_0_3_4_features ];
}
diff --git a/pkgs/data/misc/hackage/default.nix b/pkgs/data/misc/hackage/default.nix
index 781f57610e0..e7dbf947815 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/b35023f435e7713e5053d3dcd16691e3aff48227.tar.gz";
- sha256 = "1mnh1bhr8caszxrl44l3iig8kshq7djibnmy0sx0q7inj260xcs7";
+ url = "https://github.com/commercialhaskell/all-cabal-hashes/archive/61de1110af16fa0645a8cc8bbaf4a9c6fca9d8e8.tar.gz";
+ sha256 = "0vwfm1imwcffyliaama572ksjgqmwxk48py0wgvgpi2vg08w7a12";
}
diff --git a/pkgs/development/compilers/ghc/8.4.2.nix b/pkgs/development/compilers/ghc/8.4.2.nix
index e381c411925..296c10b9346 100644
--- a/pkgs/development/compilers/ghc/8.4.2.nix
+++ b/pkgs/development/compilers/ghc/8.4.2.nix
@@ -3,7 +3,7 @@
# build-tools
, bootPkgs, alex, happy
-, autoconf, automake, coreutils, fetchgit, fetchpatch, perl, python3
+, autoconf, automake, coreutils, fetchurl, perl, python3
, libffi, libiconv ? null, ncurses
@@ -68,13 +68,11 @@ let
in
stdenv.mkDerivation rec {
inherit version;
- inherit (src) rev;
name = "${targetPrefix}ghc-${version}";
- src = fetchgit {
- url = "git://git.haskell.org/ghc.git";
- rev = "6d7eecff7948ad77854f834f55b4d4f942276ad3";
- sha256 = "0aqy5x0b6qxhyvxw1q9pssf1xvhbyviglqkjrx4gvhbr3nax3wxp";
+ src = fetchurl {
+ url = "https://downloads.haskell.org/~ghc/${version}/ghc-${version}-src.tar.xz";
+ sha256 = "0yq4y0smn92sksnjjva28b8847krxizns6rm50j3pgq69br35k01";
};
enableParallelBuilding = true;
@@ -102,9 +100,6 @@ stdenv.mkDerivation rec {
export STRIP="${targetCC.bintools.bintools}/bin/${targetCC.bintools.targetPrefix}strip"
echo -n "${buildMK}" > mk/build.mk
- echo ${version} >VERSION
- echo ${src.rev} >GIT_COMMIT_ID
- ./boot
sed -i -e 's|-isysroot /Developer/SDKs/MacOSX10.5.sdk||' configure
'' + stdenv.lib.optionalString (!stdenv.isDarwin) ''
export NIX_LDFLAGS+=" -rpath $out/lib/ghc-${version}"
diff --git a/pkgs/development/compilers/oraclejdk/jdk10-linux.nix b/pkgs/development/compilers/oraclejdk/jdk10-linux.nix
index 1d06f122b23..642c17dc6d3 100644
--- a/pkgs/development/compilers/oraclejdk/jdk10-linux.nix
+++ b/pkgs/development/compilers/oraclejdk/jdk10-linux.nix
@@ -29,7 +29,7 @@ assert stdenv.system == "x86_64-linux";
assert swingSupport -> xorg != null;
let
- version = "10";
+ version = "10.0.1";
downloadUrlBase = http://www.oracle.com/technetwork/java/javase/downloads;
@@ -52,19 +52,19 @@ let result = stdenv.mkDerivation rec {
requireFile {
name = "jdk-${version}_linux-x64_bin.tar.gz";
url = "${downloadUrlBase}/jdk10-downloads-4416644.html";
- sha256 = "0338m0x5lka0xjsbcll70r1i308bjw3m42cm9dx9zmfk70kplj5c";
+ sha256 = "1975s6cn2lxb8jmxp236afvq6hhxqrx5jix8aqm46f5gwr2xd3mf";
}
else if packageType == "JRE" then
requireFile {
name = "jre-${version}_linux-x64_bin.tar.gz";
url = "${downloadUrlBase}/jre10-downloads-4417026.html";
- sha256 = "1clawcahkla1h9pxnqfqzcgv51aqgq78v1ws5jygbk6fbbi7l54w";
+ sha256 = "11pb8cwzmalc6ax735m84g13jh1mrfc8g84b5qypnmqjjdv6fpiq";
}
else if packageType == "ServerJRE" then
requireFile {
name = "serverjre-${version}_linux-x64_bin.tar.gz";
url = "${downloadUrlBase}/sjre10-downloads-4417025.html";
- sha256 = "0kiyg33fv29ad0nyl35r7y0bhyxivb2hxlds44m9l0259s55nwhw";
+ sha256 = "0hvfqgr22sq9zyqc496vqgg5ail189h3a4pazp39i8n86brd48lw";
}
else abort "unknown package Type ${packageType}";
diff --git a/pkgs/development/compilers/oraclejdk/jdk8psu-linux.nix b/pkgs/development/compilers/oraclejdk/jdk8psu-linux.nix
index 78d5a6f2c40..901eea0f8f1 100644
--- a/pkgs/development/compilers/oraclejdk/jdk8psu-linux.nix
+++ b/pkgs/development/compilers/oraclejdk/jdk8psu-linux.nix
@@ -1,11 +1,11 @@
import ./jdk-linux-base.nix {
productVersion = "8";
- patchVersion = "162";
+ patchVersion = "172";
downloadUrl = http://www.oracle.com/technetwork/java/javase/downloads/jdk8-downloads-2133151.html;
- sha256.i686-linux = "097vlvvj1vr7815rgarf5x97lagi4q0kai0x4lvd4y3wrzdqikzf";
- sha256.x86_64-linux = "0mq2d0lj53gzn4qqdjdgbwl0h857k2rnsnr2hkmvihnrgza85v38";
- sha256.armv7l-linux = "0xzsgdmpgs1n1g70hgly0mpxflhjrmq3vxwx8gl0kmqdiv4hqwjp";
- sha256.aarch64-linux = "19ykcsmvkf7sdq2lqwvyi60nhb8v7f88dqjycimrsar9y4r7skf8";
+ sha256.i686-linux = "0csskx8xis0dr1948j76fgrwwsj4gzdbjqfi7if4v4j62b9i0hqa";
+ sha256.x86_64-linux = "0inkx73rwv7cvn9lqcr3hmnm0sr89h1fh29yamikb4dn02a0p818";
+ sha256.armv7l-linux = "1576cb0rlc42dsnmh388gy1wjas7ac6g135s8h74x8sm4b56qpln";
+ sha256.aarch64-linux = "0zpkmq8zxmpifawj611fg67srki63haz02rm6xwfc5qm2lxx5g6s";
jceName = "jce_policy-8.zip";
jceDownloadUrl = http://www.oracle.com/technetwork/java/javase/downloads/jce8-download-2133166.html;
sha256JCE = "0n8b6b8qmwb14lllk2lk1q1ahd3za9fnjigz5xn65mpg48whl0pk";
diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix
index 3935089cb79..21207f40d38 100644
--- a/pkgs/development/haskell-modules/configuration-common.nix
+++ b/pkgs/development/haskell-modules/configuration-common.nix
@@ -866,6 +866,9 @@ self: super: {
# https://github.com/fpco/stackage/issues/3126
stack = doJailbreak super.stack;
+ # https://github.com/snoyberg/monad-logger/issues/1
+ monad-logger = self.monad-logger_0_3_28_5;
+
# These packages depend on each other, forming an infinite loop.
scalendar = markBroken (super.scalendar.override { SCalendar = null; });
SCalendar = markBroken (super.SCalendar.override { scalendar = null; });
@@ -1022,6 +1025,11 @@ self: super: {
# This package refers to the wrong library (itself in fact!)
vulkan = super.vulkan.override { vulkan = pkgs.vulkan-loader; };
+
+ # Both need a more up-to-date version
+ hlint = super.hlint.override { extra = self.extra_1_6_6; };
+ hoogle = super.hoogle.override { extra = self.extra_1_6_6; };
+
}
//
diff --git a/pkgs/development/haskell-modules/configuration-ghc-8.4.x.nix b/pkgs/development/haskell-modules/configuration-ghc-8.4.x.nix
index 7538c369741..f55de74d6ce 100644
--- a/pkgs/development/haskell-modules/configuration-ghc-8.4.x.nix
+++ b/pkgs/development/haskell-modules/configuration-ghc-8.4.x.nix
@@ -583,7 +583,7 @@ self: super: {
});
# Older versions don't compile.
- brick = self.brick_0_36;
+ brick = doJailbreak super.brick_0_36; # https://github.com/jtdaugherty/brick/issues/171
HaTeX = self.HaTeX_3_19_0_0;
matrix = self.matrix_0_3_6_1;
pandoc = self.pandoc_2_1_3;
diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml
index 7b982cb7781..06b5c7b1a64 100644
--- a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml
+++ b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml
@@ -38,7 +38,7 @@ core-packages:
- ghcjs-base-0
default-package-overrides:
- # LTS Haskell 11.4
+ # LTS Haskell 11.5
- abstract-deque ==0.3
- abstract-deque-tests ==0.3
- abstract-par ==0.3.3
@@ -72,7 +72,7 @@ default-package-overrides:
- aeson-generic-compat ==0.0.1.1
- aeson-injector ==1.1.0.0
- aeson-picker ==0.1.0.4
- - aeson-pretty ==0.8.5
+ - aeson-pretty ==0.8.7
- aeson-qq ==0.8.2
- aeson-typescript ==0.1.0.6
- aeson-utils ==0.3.0.2
@@ -140,8 +140,8 @@ default-package-overrides:
- auto-update ==0.1.4
- avwx ==0.3.0.2
- axiom ==0.4.6
- - b9 ==0.5.43
- - backprop ==0.1.5.0
+ - b9 ==0.5.44
+ - backprop ==0.1.5.1
- bank-holidays-england ==0.1.0.6
- barrier ==0.1.1
- base16-bytestring ==0.1.1.6
@@ -157,6 +157,9 @@ default-package-overrides:
- basic-prelude ==0.7.0
- bbdb ==0.8
- bcrypt ==0.0.11
+ - beam-core ==0.7.2.0
+ - beam-migrate ==0.3.1.0
+ - beam-sqlite ==0.3.2.0
- bench ==1.0.9
- benchpress ==0.2.2.10
- bencode ==0.6.0.0
@@ -178,7 +181,7 @@ default-package-overrides:
- binary-shared ==0.8.3
- binary-tagged ==0.1.4.2
- bindings-DSL ==1.0.24
- - bindings-GLFW ==3.1.2.3
+ - bindings-GLFW ==3.1.2.4
- bindings-libzip ==1.0.1
- bindings-uname ==0.1
- bioace ==0.0.1
@@ -207,7 +210,7 @@ default-package-overrides:
- blaze-bootstrap ==0.1.0.1
- blaze-builder ==0.4.1.0
- blaze-html ==0.9.0.1
- - blaze-markup ==0.8.2.0
+ - blaze-markup ==0.8.2.1
- blaze-svg ==0.3.6.1
- blaze-textual ==0.2.1.0
- bloodhound ==0.15.0.2
@@ -462,7 +465,7 @@ default-package-overrides:
- data-serializer ==0.3.4
- datasets ==0.2.5
- data-textual ==0.3.0.2
- - data-tree-print ==0.1.0.0
+ - data-tree-print ==0.1.0.1
- dataurl ==0.1.0.0
- DAV ==1.3.2
- dawg-ord ==0.5.1.0
@@ -551,8 +554,8 @@ default-package-overrides:
- ekg ==0.4.0.15
- ekg-core ==0.1.1.4
- ekg-json ==0.1.0.6
- - ekg-statsd ==0.2.2.0
- - ekg-wai ==0.1.0.2
+ - ekg-statsd ==0.2.3.0
+ - ekg-wai ==0.1.0.3
- elerea ==2.9.0
- eliminators ==0.3
- elm-core-sources ==1.0.0
@@ -755,7 +758,7 @@ default-package-overrides:
- glaze ==0.3.0.1
- glazier ==0.11.0.1
- glazier-pipes ==0.1.5.1
- - GLFW-b ==1.4.8.1
+ - GLFW-b ==1.4.8.3
- glib ==0.13.5.0
- Glob ==0.9.2
- glob-posix ==0.1.0.1
@@ -768,7 +771,7 @@ default-package-overrides:
- GLURaw ==2.0.0.4
- GLUT ==2.7.0.13
- gluturtle ==0.0.58.1
- - gnuplot ==0.5.5.1
+ - gnuplot ==0.5.5.2
- goggles ==0.3.2
- google-cloud ==0.0.4
- google-oauth2-jwt ==0.2.2
@@ -802,7 +805,7 @@ default-package-overrides:
- hamilton ==0.1.0.2
- HandsomeSoup ==0.4.2
- handwriting ==0.1.0.3
- - hapistrano ==0.3.5.3
+ - hapistrano ==0.3.5.4
- happstack-jmacro ==7.0.12
- happstack-server ==7.5.1
- happstack-server-tls ==7.1.6.5
@@ -855,7 +858,7 @@ default-package-overrides:
- HDBC-mysql ==0.7.1.0
- HDBC-session ==0.1.1.1
- hdevtools ==0.1.6.1
- - heap ==1.0.3
+ - heap ==1.0.4
- heaps ==0.3.6
- heatshrink ==0.1.0.0
- hebrew-time ==0.1.1
@@ -983,7 +986,7 @@ default-package-overrides:
- http-client-openssl ==0.2.1.1
- http-client-tls ==0.3.5.3
- http-common ==0.8.2.0
- - http-conduit ==2.3.0
+ - http-conduit ==2.3.1
- http-date ==0.0.6.1
- http-link-header ==1.0.3
- http-media ==0.7.1.2
@@ -1050,7 +1053,7 @@ default-package-overrides:
- indexed-list-literals ==0.1.0.1
- inflections ==0.4.0.1
- influxdb ==1.3.0.1
- - ini ==0.3.5
+ - ini ==0.3.6
- inline-c ==0.6.0.5
- inline-c-cpp ==0.2.1.0
- inline-java ==0.8.2
@@ -1201,7 +1204,7 @@ default-package-overrides:
- llvm-hs-pure ==5.1.2
- lmdb ==0.2.5
- load-env ==0.1.2
- - loch-th ==0.2.1
+ - loch-th ==0.2.2
- lockfree-queue ==0.2.3.1
- log ==0.9.0.1
- log-base ==0.7.4.0
@@ -1241,8 +1244,8 @@ default-package-overrides:
- markov-chain ==0.0.3.4
- markup ==4.0.4
- marvin-interpolate ==1.1.2
- - massiv ==0.1.4.0
- - massiv-io ==0.1.1.0
+ - massiv ==0.1.6.1
+ - massiv-io ==0.1.2.0
- mathexpr ==0.3.0.0
- math-functions ==0.2.1.0
- matplotlib ==0.6.0
@@ -1282,7 +1285,7 @@ default-package-overrides:
- mime-mail-ses ==0.4.0.0
- mime-types ==0.1.0.7
- minimorph ==0.1.6.1
- - miniutter ==0.4.6.0
+ - miniutter ==0.4.7.0
- mintty ==0.1.1
- misfortune ==0.1.1.2
- miso ==0.14.0.0
@@ -1309,7 +1312,7 @@ default-package-overrides:
- monadic-arrays ==0.2.2
- monad-journal ==0.8.1
- monadloc ==0.7.1
- - monad-logger ==0.3.28.3
+ - monad-logger ==0.3.28.4
- monad-logger-json ==0.1.0.0
- monad-logger-prefix ==0.1.9
- monad-logger-syslog ==0.1.4.0
@@ -1335,7 +1338,7 @@ default-package-overrides:
- monad-unlift-ref ==0.2.1
- mongoDB ==2.3.0.5
- monoidal-containers ==0.3.1.0
- - monoid-extras ==0.4.3
+ - monoid-extras ==0.4.4
- monoid-subclasses ==0.4.6
- monoid-transformer ==0.0.4
- mono-traversable ==1.0.8.1
@@ -1378,7 +1381,7 @@ default-package-overrides:
- nettle ==0.2.0
- netwire ==5.0.3
- netwire-input ==0.0.7
- - netwire-input-glfw ==0.0.8
+ - netwire-input-glfw ==0.0.10
- network ==2.6.3.5
- network-anonymous-i2p ==0.10.0
- network-anonymous-tor ==0.11.0
@@ -1505,7 +1508,7 @@ default-package-overrides:
- perfect-hash-generator ==0.2.0.6
- persistable-record ==0.6.0.3
- persistable-types-HDBC-pg ==0.0.1.5
- - persistent ==2.8.1
+ - persistent ==2.8.2
- persistent-mongoDB ==2.8.0
- persistent-mysql ==2.8.1
- persistent-mysql-haskell ==0.4.0
@@ -1554,7 +1557,7 @@ default-package-overrides:
- poly-arity ==0.1.0
- polynomials-bernstein ==1.1.2
- polyparse ==1.12
- - pomaps ==0.0.0.3
+ - pomaps ==0.0.0.4
- pooled-io ==0.0.2.1
- PortMidi ==0.1.6.1
- posix-paths ==0.2.1.5
@@ -1595,7 +1598,7 @@ default-package-overrides:
- prim-uniq ==0.1.0.1
- probability ==0.2.5.1
- process-extras ==0.7.4
- - product-isomorphic ==0.0.3.1
+ - product-isomorphic ==0.0.3.2
- product-profunctors ==0.9.0.0
- profiterole ==0.1
- profunctors ==5.2.2
@@ -1715,7 +1718,7 @@ default-package-overrides:
- req-url-extra ==0.1.0.0
- reroute ==0.4.1.0
- resource-pool ==0.2.3.2
- - resourcet ==1.2.0
+ - resourcet ==1.2.1
- rest-core ==0.39
- rest-snap ==0.3.0.0
- rest-stringmap ==0.2.0.7
@@ -1750,8 +1753,8 @@ default-package-overrides:
- say ==0.1.0.0
- sbp ==2.3.13
- sbv ==7.5
- - SCalendar ==1.1.0
- scalendar ==1.2.0
+ - SCalendar ==1.1.0
- scalpel ==0.5.1
- scalpel-core ==0.5.1
- scanner ==0.2
@@ -1776,16 +1779,16 @@ default-package-overrides:
- semiring-simple ==1.0.0.1
- semver ==0.3.3.1
- sendfile ==0.7.9
- - sensu-run ==0.4.0.4
+ - sensu-run ==0.4.0.5
- seqalign ==0.2.0.4
- seqloc ==0.6.1.1
- sequence ==0.9.8
- serf ==0.1.1.0
- - servant ==0.13
+ - servant ==0.13.0.1
- servant-blaze ==0.8
- servant-cassava ==0.10
- - servant-client ==0.13
- - servant-client-core ==0.13
+ - servant-client ==0.13.0.1
+ - servant-client-core ==0.13.0.1
- servant-docs ==0.11.2
- servant-elm ==0.4.0.1
- servant-exceptions ==0.1.1
@@ -1800,7 +1803,7 @@ default-package-overrides:
- servant-pandoc ==0.5.0.0
- servant-purescript ==0.9.0.2
- servant-ruby ==0.7.0.0
- - servant-server ==0.13
+ - servant-server ==0.13.0.1
- servant-static-th ==0.2.0.1
- servant-subscriber ==0.6.0.1
- servant-swagger ==1.1.5
@@ -2055,8 +2058,7 @@ default-package-overrides:
- th-to-exp ==0.0.1.1
- th-utilities ==0.2.0.1
- tibetan-utils ==0.1.1.5
- - tidal ==0.9.6
- - tidal-midi ==0.9.5.2
+ - tidal ==0.9.8
- tile ==0.3.0.0
- time-compat ==0.1.0.3
- timeit ==2.0
@@ -2138,8 +2140,8 @@ default-package-overrides:
- union-find ==0.2
- uniplate ==1.6.12
- uniq-deep ==1.1.0.0
- - unique ==0
- Unique ==0.4.7.2
+ - unique ==0
- unit-constraint ==0.0.0
- units-parser ==0.1.1.2
- universe ==1.0
@@ -2261,8 +2263,8 @@ default-package-overrides:
- weigh ==0.0.7
- wide-word ==0.1.0.6
- wikicfp-scraper ==0.1.0.9
- - wild-bind ==0.1.1.1
- - wild-bind-x11 ==0.2.0.1
+ - wild-bind ==0.1.2.0
+ - wild-bind-x11 ==0.2.0.2
- Win32 ==2.5.4.1
- Win32-notify ==0.3.0.3
- wire-streams ==0.1.1.0
@@ -2336,11 +2338,11 @@ default-package-overrides:
- yeshql ==3.0.1.3
- yesod ==1.6.0
- yesod-alerts ==0.1.2.0
- - yesod-auth ==1.6.2
+ - yesod-auth ==1.6.3
- yesod-auth-fb ==1.9.0
- yesod-auth-hashdb ==1.7
- yesod-bin ==1.6.0
- - yesod-core ==1.6.2
+ - yesod-core ==1.6.3
- yesod-csp ==0.2.4.0
- yesod-eventsource ==1.6.0
- yesod-fb ==0.5.0
@@ -2385,7 +2387,7 @@ default-package-overrides:
- zlib-lens ==0.1.2.1
- zot ==0.0.3
- zstd ==0.1.0.0
- - ztail ==1.2.0.1
+ - ztail ==1.2.0.2
extra-packages:
- aeson < 0.8 # newer versions don't work with GHC 7.6.x or earlier
@@ -2699,6 +2701,7 @@ dont-distribute-packages:
AERN-RnToRm: [ i686-linux, x86_64-linux, x86_64-darwin ]
aeson-applicative: [ i686-linux, x86_64-linux, x86_64-darwin ]
aeson-bson: [ i686-linux, x86_64-linux, x86_64-darwin ]
+ aeson-diff-generic: [ i686-linux, x86_64-linux, x86_64-darwin ]
aeson-diff: [ i686-linux, x86_64-linux, x86_64-darwin ]
aeson-extra: [ i686-linux, x86_64-linux, x86_64-darwin ]
aeson-flowtyped: [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -2739,6 +2742,7 @@ dont-distribute-packages:
algebraic-prelude: [ i686-linux, x86_64-linux, x86_64-darwin ]
algebraic: [ i686-linux, x86_64-linux, x86_64-darwin ]
algo-s: [ i686-linux, x86_64-linux, x86_64-darwin ]
+ AlgoRhythm: [ i686-linux, x86_64-linux, x86_64-darwin ]
AlgorithmW: [ i686-linux, x86_64-linux, x86_64-darwin ]
align-text: [ i686-linux, x86_64-linux, x86_64-darwin ]
AlignmentAlgorithms: [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -2754,6 +2758,7 @@ dont-distribute-packages:
alternative-extra: [ i686-linux, x86_64-linux, x86_64-darwin ]
alternative-io: [ i686-linux, x86_64-linux, x86_64-darwin ]
altfloat: [ i686-linux, x86_64-linux, x86_64-darwin ]
+ alto: [ i686-linux, x86_64-linux, x86_64-darwin ]
alure: [ i686-linux, x86_64-linux, x86_64-darwin ]
amazon-emailer-client-snap: [ i686-linux, x86_64-linux, x86_64-darwin ]
amazon-emailer: [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -3080,6 +3085,7 @@ dont-distribute-packages:
barrie: [ i686-linux, x86_64-linux, x86_64-darwin ]
barrier-monad: [ i686-linux, x86_64-linux, x86_64-darwin ]
barrier: [ i686-linux, x86_64-linux, x86_64-darwin ]
+ base-compat-batteries: [ i686-linux, x86_64-linux, x86_64-darwin ]
base-generics: [ i686-linux, x86_64-linux, x86_64-darwin ]
base-io-access: [ i686-linux, x86_64-linux, x86_64-darwin ]
base-noprelude: [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -3098,6 +3104,7 @@ dont-distribute-packages:
bdcs: [ i686-linux, x86_64-linux, x86_64-darwin ]
beam-core: [ i686-linux, x86_64-linux, x86_64-darwin ]
beam-migrate: [ i686-linux, x86_64-linux, x86_64-darwin ]
+ beam-postgres: [ i686-linux, x86_64-linux, x86_64-darwin ]
beam-sqlite: [ i686-linux, x86_64-linux, x86_64-darwin ]
beam-th: [ i686-linux, x86_64-linux, x86_64-darwin ]
beam: [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -3265,6 +3272,7 @@ dont-distribute-packages:
bowntz: [ i686-linux, x86_64-linux, x86_64-darwin ]
braid: [ i686-linux, x86_64-linux, x86_64-darwin ]
brain-bleep: [ i686-linux, x86_64-linux, x86_64-darwin ]
+ brainheck: [ i686-linux, x86_64-linux, x86_64-darwin ]
Bravo: [ i686-linux, x86_64-linux, x86_64-darwin ]
breakout: [ i686-linux, x86_64-linux, x86_64-darwin ]
breve: [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -3277,6 +3285,7 @@ dont-distribute-packages:
brillig: [ i686-linux, x86_64-linux, x86_64-darwin ]
broccoli: [ i686-linux, x86_64-linux, x86_64-darwin ]
broker-haskell: [ i686-linux, x86_64-linux, x86_64-darwin ]
+ bronyradiogermany-streaming: [ i686-linux, x86_64-linux, x86_64-darwin ]
browscap: [ i686-linux, x86_64-linux, x86_64-darwin ]
bson-generic: [ i686-linux, x86_64-linux, x86_64-darwin ]
bson-generics: [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -3594,6 +3603,7 @@ dont-distribute-packages:
coltrane: [ i686-linux, x86_64-linux, x86_64-darwin ]
columbia: [ i686-linux, x86_64-linux, x86_64-darwin ]
com: [ i686-linux, x86_64-linux, x86_64-darwin ]
+ combinat-compat: [ i686-linux, x86_64-linux, x86_64-darwin ]
combinat-diagrams: [ i686-linux, x86_64-linux, x86_64-darwin ]
combinator-interactive: [ i686-linux, x86_64-linux, x86_64-darwin ]
combinatorial-problems: [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -3709,6 +3719,7 @@ dont-distribute-packages:
convert: [ i686-linux, x86_64-linux, x86_64-darwin ]
convertible-ascii: [ i686-linux, x86_64-linux, x86_64-darwin ]
convertible-text: [ i686-linux, x86_64-linux, x86_64-darwin ]
+ coordinate: [ i686-linux, x86_64-linux, x86_64-darwin ]
copilot-cbmc: [ i686-linux, x86_64-linux, x86_64-darwin ]
copilot-language: [ i686-linux, x86_64-linux, x86_64-darwin ]
copilot-libraries: [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -3742,6 +3753,7 @@ dont-distribute-packages:
cplusplus-th: [ i686-linux, x86_64-linux, x86_64-darwin ]
cprng-aes-effect: [ i686-linux, x86_64-linux, x86_64-darwin ]
cpuperf: [ i686-linux, x86_64-linux, x86_64-darwin ]
+ cpython: [ i686-linux, x86_64-linux, x86_64-darwin ]
cqrs-core: [ i686-linux, x86_64-linux, x86_64-darwin ]
cqrs-example: [ i686-linux, x86_64-linux, x86_64-darwin ]
cqrs-memory: [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -4236,6 +4248,7 @@ dont-distribute-packages:
eros-client: [ i686-linux, x86_64-linux, x86_64-darwin ]
eros-http: [ i686-linux, x86_64-linux, x86_64-darwin ]
eros: [ i686-linux, x86_64-linux, x86_64-darwin ]
+ error-context: [ i686-linux, x86_64-linux, x86_64-darwin ]
error-continuations: [ i686-linux, x86_64-linux, x86_64-darwin ]
error-list: [ i686-linux, x86_64-linux, x86_64-darwin ]
error-loc: [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -4332,6 +4345,7 @@ dont-distribute-packages:
fallingblocks: [ i686-linux, x86_64-linux, x86_64-darwin ]
family-tree: [ i686-linux, x86_64-linux, x86_64-darwin ]
fast-arithmetic: [ i686-linux, x86_64-linux, x86_64-darwin ]
+ fast-builder: [ i686-linux, x86_64-linux, x86_64-darwin ]
fast-combinatorics: [ i686-linux, x86_64-linux, x86_64-darwin ]
fast-nats: [ i686-linux, x86_64-linux, x86_64-darwin ]
fasta: [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -4661,6 +4675,7 @@ dont-distribute-packages:
gf: [ i686-linux, x86_64-linux, x86_64-darwin ]
GGg: [ i686-linux, x86_64-linux, x86_64-darwin ]
ggtsTC: [ i686-linux, x86_64-linux, x86_64-darwin ]
+ ghc-core-smallstep: [ i686-linux, x86_64-linux, x86_64-darwin ]
ghc-datasize: [ i686-linux, x86_64-linux, x86_64-darwin ]
ghc-dump-core: [ i686-linux, x86_64-linux, x86_64-darwin ]
ghc-dump-tree: [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -5019,6 +5034,7 @@ dont-distribute-packages:
gtfs: [ i686-linux, x86_64-linux, x86_64-darwin ]
gtk-mac-integration: [ i686-linux, x86_64-linux, x86_64-darwin ]
gtk-serialized-event: [ i686-linux, x86_64-linux, x86_64-darwin ]
+ gtk-strut: [ i686-linux, x86_64-linux, x86_64-darwin ]
gtk-toy: [ i686-linux, x86_64-linux, x86_64-darwin ]
gtk2hs-cast-glade: [ i686-linux, x86_64-linux, x86_64-darwin ]
gtk2hs-cast-gnomevfs: [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -5575,6 +5591,7 @@ dont-distribute-packages:
HLearn-datastructures: [ i686-linux, x86_64-linux, x86_64-darwin ]
HLearn-distributions: [ i686-linux, x86_64-linux, x86_64-darwin ]
hledger-chart: [ i686-linux, x86_64-linux, x86_64-darwin ]
+ hledger-irr: [ i686-linux, x86_64-linux, x86_64-darwin ]
hledger-vty: [ i686-linux, x86_64-linux, x86_64-darwin ]
hlibBladeRF: [ i686-linux, x86_64-linux, x86_64-darwin ]
hlibev: [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -5688,6 +5705,8 @@ dont-distribute-packages:
hpasteit: [ i686-linux, x86_64-linux, x86_64-darwin ]
HPath: [ i686-linux, x86_64-linux, x86_64-darwin ]
hpc-tracer: [ i686-linux, x86_64-linux, x86_64-darwin ]
+ hPDB-examples: [ i686-linux, x86_64-linux, x86_64-darwin ]
+ hPDB: [ i686-linux, x86_64-linux, x86_64-darwin ]
hpdft: [ i686-linux, x86_64-linux, x86_64-darwin ]
HPhone: [ i686-linux, x86_64-linux, x86_64-darwin ]
HPi: [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -5749,6 +5768,7 @@ dont-distribute-packages:
hs2bf: [ i686-linux, x86_64-linux, x86_64-darwin ]
hs2dot: [ i686-linux, x86_64-linux, x86_64-darwin ]
Hs2lib: [ i686-linux, x86_64-linux, x86_64-darwin ]
+ hsaml2: [ i686-linux, x86_64-linux, x86_64-darwin ]
hsass: [ i686-linux, x86_64-linux, x86_64-darwin ]
hsay: [ i686-linux, x86_64-linux, x86_64-darwin ]
hsbackup: [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -5936,6 +5956,7 @@ dont-distribute-packages:
hw-json-lens: [ i686-linux, x86_64-linux, x86_64-darwin ]
hw-json: [ i686-linux, x86_64-linux, x86_64-darwin ]
hw-kafka-avro: [ i686-linux, x86_64-linux, x86_64-darwin ]
+ hw-prim-bits: [ i686-linux, x86_64-linux, x86_64-darwin ]
hw-xml: [ i686-linux, x86_64-linux, x86_64-darwin ]
hwall-auth-iitk: [ i686-linux, x86_64-linux, x86_64-darwin ]
hweblib: [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -5943,6 +5964,9 @@ dont-distribute-packages:
hworker-ses: [ i686-linux, x86_64-linux, x86_64-darwin ]
hworker: [ i686-linux, x86_64-linux, x86_64-darwin ]
hws: [ i686-linux, x86_64-linux, x86_64-darwin ]
+ hwsl2-bytevector: [ i686-linux, x86_64-linux, x86_64-darwin ]
+ hwsl2-reducers: [ i686-linux, x86_64-linux, x86_64-darwin ]
+ hwsl2: [ i686-linux, x86_64-linux, x86_64-darwin ]
HXMPP: [ i686-linux, x86_64-linux, x86_64-darwin ]
hxmppc: [ i686-linux, x86_64-linux, x86_64-darwin ]
hxournal: [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -6347,6 +6371,7 @@ dont-distribute-packages:
language-lua-qq: [ i686-linux, x86_64-linux, x86_64-darwin ]
language-mixal: [ i686-linux, x86_64-linux, x86_64-darwin ]
language-ninja: [ i686-linux, x86_64-linux, x86_64-darwin ]
+ language-oberon: [ i686-linux, x86_64-linux, x86_64-darwin ]
language-objc: [ i686-linux, x86_64-linux, x86_64-darwin ]
language-pig: [ i686-linux, x86_64-linux, x86_64-darwin ]
language-puppet: [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -6371,9 +6396,11 @@ dont-distribute-packages:
latex-formulae-pandoc: [ i686-linux, x86_64-linux, x86_64-darwin ]
LATS: [ i686-linux, x86_64-linux, x86_64-darwin ]
launchpad-control: [ i686-linux, x86_64-linux, x86_64-darwin ]
+ layered-state: [ i686-linux, x86_64-linux, x86_64-darwin ]
layers-game: [ i686-linux, x86_64-linux, x86_64-darwin ]
layers: [ i686-linux, x86_64-linux, x86_64-darwin ]
layout-bootstrap: [ i686-linux, x86_64-linux, x86_64-darwin ]
+ layouting: [ i686-linux, x86_64-linux, x86_64-darwin ]
lazy-hash-cache: [ i686-linux, x86_64-linux, x86_64-darwin ]
lazy-hash: [ i686-linux, x86_64-linux, x86_64-darwin ]
lazy-io-streams: [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -6439,6 +6466,7 @@ dont-distribute-packages:
libstackexchange: [ i686-linux, x86_64-linux, x86_64-darwin ]
libsystemd-daemon: [ i686-linux, x86_64-linux, x86_64-darwin ]
libtagc: [ i686-linux, x86_64-linux, x86_64-darwin ]
+ libvirt-hs: [ i686-linux, x86_64-linux, x86_64-darwin ]
libxls: [ i686-linux, x86_64-linux, x86_64-darwin ]
libxml-enumerator: [ i686-linux, x86_64-linux, x86_64-darwin ]
libxslt: [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -6619,6 +6647,7 @@ dont-distribute-packages:
mailchimp: [ i686-linux, x86_64-linux, x86_64-darwin ]
MailchimpSimple: [ i686-linux, x86_64-linux, x86_64-darwin ]
mailgun: [ i686-linux, x86_64-linux, x86_64-darwin ]
+ main-tester: [ i686-linux, x86_64-linux, x86_64-darwin ]
majordomo: [ i686-linux, x86_64-linux, x86_64-darwin ]
majority: [ i686-linux, x86_64-linux, x86_64-darwin ]
make-hard-links: [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -6786,12 +6815,14 @@ dont-distribute-packages:
MoeDict: [ i686-linux, x86_64-linux, x86_64-darwin ]
mohws: [ i686-linux, x86_64-linux, x86_64-darwin ]
mollie-api-haskell: [ i686-linux, x86_64-linux, x86_64-darwin ]
+ monad-abort-fd: [ i686-linux, x86_64-linux, x86_64-darwin ]
monad-atom-simple: [ i686-linux, x86_64-linux, x86_64-darwin ]
monad-atom: [ i686-linux, x86_64-linux, x86_64-darwin ]
monad-classes-logging: [ i686-linux, x86_64-linux, x86_64-darwin ]
monad-classes: [ i686-linux, x86_64-linux, x86_64-darwin ]
monad-dijkstra: [ i686-linux, x86_64-linux, x86_64-darwin ]
monad-exception: [ i686-linux, x86_64-linux, x86_64-darwin ]
+ monad-finally: [ i686-linux, x86_64-linux, x86_64-darwin ]
monad-fork: [ i686-linux, x86_64-linux, x86_64-darwin ]
monad-http: [ i686-linux, x86_64-linux, x86_64-darwin ]
monad-interleave: [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -7099,6 +7130,7 @@ dont-distribute-packages:
numeric-ranges: [ i686-linux, x86_64-linux, x86_64-darwin ]
numhask-array: [ i686-linux, x86_64-linux, x86_64-darwin ]
numhask-histogram: [ i686-linux, x86_64-linux, x86_64-darwin ]
+ numhask-prelude: [ i686-linux, x86_64-linux, x86_64-darwin ]
numhask-range: [ i686-linux, x86_64-linux, x86_64-darwin ]
numhask: [ i686-linux, x86_64-linux, x86_64-darwin ]
Nussinov78: [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -7231,6 +7263,7 @@ dont-distribute-packages:
pagarme: [ i686-linux, x86_64-linux, x86_64-darwin ]
PageIO: [ i686-linux, x86_64-linux, x86_64-darwin ]
Paillier: [ i686-linux, x86_64-linux, x86_64-darwin ]
+ pam: [ i686-linux, x86_64-linux, x86_64-darwin ]
panda: [ i686-linux, x86_64-linux, x86_64-darwin ]
pandoc-crossref: [ i686-linux, x86_64-linux, x86_64-darwin ]
pandoc-csv2table: [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -7375,6 +7408,7 @@ dont-distribute-packages:
picosat: [ i686-linux, x86_64-linux, x86_64-darwin ]
pictikz: [ i686-linux, x86_64-linux, x86_64-darwin ]
piet: [ i686-linux, x86_64-linux, x86_64-darwin ]
+ pig: [ i686-linux, x86_64-linux, x86_64-darwin ]
pinchot: [ i686-linux, x86_64-linux, x86_64-darwin ]
pinpon: [ i686-linux, x86_64-linux, x86_64-darwin ]
Pipe: [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -7428,6 +7462,7 @@ dont-distribute-packages:
plat: [ i686-linux, x86_64-linux, x86_64-darwin ]
platinum-parsing: [ i686-linux, x86_64-linux, x86_64-darwin ]
PlayingCards: [ i686-linux, x86_64-linux, x86_64-darwin ]
+ plex: [ i686-linux, x86_64-linux, x86_64-darwin ]
plist-buddy: [ i686-linux, x86_64-linux, x86_64-darwin ]
plivo: [ i686-linux, x86_64-linux, x86_64-darwin ]
plocketed: [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -8129,6 +8164,7 @@ dont-distribute-packages:
servant-auth-token-leveldb: [ i686-linux, x86_64-linux, x86_64-darwin ]
servant-auth-token-persistent: [ i686-linux, x86_64-linux, x86_64-darwin ]
servant-auth-token-rocksdb: [ i686-linux, x86_64-linux, x86_64-darwin ]
+ servant-cassava: [ i686-linux, x86_64-linux, x86_64-darwin ]
servant-client-core: [ i686-linux, x86_64-linux, x86_64-darwin ]
servant-csharp: [ i686-linux, x86_64-linux, x86_64-darwin ]
servant-db-postgresql: [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -8512,6 +8548,7 @@ dont-distribute-packages:
stats: [ i686-linux, x86_64-linux, x86_64-darwin ]
statsd-client: [ i686-linux, x86_64-linux, x86_64-darwin ]
statsd: [ i686-linux, x86_64-linux, x86_64-darwin ]
+ status-notifier-item: [ i686-linux, x86_64-linux, x86_64-darwin ]
stb-truetype: [ i686-linux, x86_64-linux, x86_64-darwin ]
stdata: [ i686-linux, x86_64-linux, x86_64-darwin ]
stdf: [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -8739,6 +8776,7 @@ dont-distribute-packages:
tensorflow: [ i686-linux, x86_64-linux, x86_64-darwin ]
term-rewriting: [ i686-linux, x86_64-linux, x86_64-darwin ]
termbox-bindings: [ i686-linux, x86_64-linux, x86_64-darwin ]
+ terminal-text: [ i686-linux, x86_64-linux, x86_64-darwin ]
termination-combinators: [ i686-linux, x86_64-linux, x86_64-darwin ]
termplot: [ i686-linux, x86_64-linux, x86_64-darwin ]
terntup: [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -8913,6 +8951,8 @@ dont-distribute-packages:
travis: [ i686-linux, x86_64-linux, x86_64-darwin ]
trawl: [ i686-linux, x86_64-linux, x86_64-darwin ]
traypoweroff: [ i686-linux, x86_64-linux, x86_64-darwin ]
+ tree-diff: [ i686-linux, x86_64-linux, x86_64-darwin ]
+ tree-traversals: [ i686-linux, x86_64-linux, x86_64-darwin ]
TreeCounter: [ i686-linux, x86_64-linux, x86_64-darwin ]
treemap-html-tools: [ i686-linux, x86_64-linux, x86_64-darwin ]
treemap-html: [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -8995,6 +9035,7 @@ dont-distribute-packages:
type-spine: [ i686-linux, x86_64-linux, x86_64-darwin ]
type-structure: [ i686-linux, x86_64-linux, x86_64-darwin ]
type-sub-th: [ i686-linux, x86_64-linux, x86_64-darwin ]
+ type-tree: [ i686-linux, x86_64-linux, x86_64-darwin ]
typeable-th: [ i686-linux, x86_64-linux, x86_64-darwin ]
TypeClass: [ i686-linux, x86_64-linux, x86_64-darwin ]
typed-spreadsheet: [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -9135,6 +9176,7 @@ dont-distribute-packages:
vector-space-map: [ i686-linux, x86_64-linux, x86_64-darwin ]
vector-space-opengl: [ i686-linux, x86_64-linux, x86_64-darwin ]
vector-static: [ i686-linux, x86_64-linux, x86_64-darwin ]
+ vector-text: [ i686-linux, x86_64-linux, x86_64-darwin ]
Verba: [ i686-linux, x86_64-linux, x86_64-darwin ]
verbalexpressions: [ i686-linux, x86_64-linux, x86_64-darwin ]
verdict-json: [ i686-linux, x86_64-linux, x86_64-darwin ]
diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix
index a28a0b7674a..bf7838b2b21 100644
--- a/pkgs/development/haskell-modules/hackage-packages.nix
+++ b/pkgs/development/haskell-modules/hackage-packages.nix
@@ -866,6 +866,7 @@ self: {
homepage = "http://github.com/omelkonian/AlgoRhythm/";
description = "Algorithmic music composition";
license = stdenv.lib.licenses.bsd3;
+ hydraPlatforms = stdenv.lib.platforms.none;
}) {};
"AlgorithmW" = callPackage
@@ -6093,16 +6094,17 @@ self: {
}) {inherit (pkgs.xorg) libX11; inherit (pkgs.xorg) libXrandr;};
"GLFW-b" = callPackage
- ({ mkDerivation, base, bindings-GLFW, HUnit, test-framework
- , test-framework-hunit
+ ({ mkDerivation, base, bindings-GLFW, deepseq, HUnit
+ , test-framework, test-framework-hunit
}:
mkDerivation {
pname = "GLFW-b";
- version = "1.4.8.1";
- sha256 = "1sca2wzkqw77jdj9mxnswx7zaicj1dsl5k3gjsaxmjznbkn4k2j3";
- libraryHaskellDepends = [ base bindings-GLFW ];
+ version = "1.4.8.3";
+ sha256 = "01dp6akv70wq9c5qib5f8cmrva9xmqrmdcf30k9y4kklrvbk599z";
+ libraryHaskellDepends = [ base bindings-GLFW deepseq ];
testHaskellDepends = [
- base bindings-GLFW HUnit test-framework test-framework-hunit
+ base bindings-GLFW deepseq HUnit test-framework
+ test-framework-hunit
];
description = "Bindings to GLFW OpenGL library";
license = stdenv.lib.licenses.bsd3;
@@ -8192,14 +8194,14 @@ self: {
}:
mkDerivation {
pname = "HMap";
- version = "1.2.7";
- sha256 = "0xq5qr1v74z9bppcgl4g06cpnmyrqmc41kvcyx58272pw70vlv40";
+ version = "1.3.0";
+ sha256 = "01y8mspmf7k0mxafyanfirbjp46x54wnm4n6lwc2jczw5bb48yx7";
enableSeparateDataOutput = true;
libraryHaskellDepends = [
base data-default hashable mtl unordered-containers
];
homepage = "https://github.com/atzeus/HMap";
- description = "Fast heterogeneous maps and unconstrained typeable like functionality";
+ description = "Fast heterogeneous maps and unconstrained typeable-like functionality";
license = stdenv.lib.licenses.bsd3;
hydraPlatforms = stdenv.lib.platforms.none;
}) {};
@@ -9537,8 +9539,8 @@ self: {
}:
mkDerivation {
pname = "Hastodon";
- version = "0.3.1";
- sha256 = "0z8ph9frrad5nn23hi3qr2gj7lh7p2qpcmx4rdyv8vlqal38zdv1";
+ version = "0.3.2";
+ sha256 = "0qdq23mg1nszsf3ldbdawdkcmbv18cmny6529k9kwlfq9fhdm83x";
libraryHaskellDepends = [
aeson base bytestring http-client http-conduit http-types
mime-types MissingH text
@@ -13800,13 +13802,13 @@ self: {
}) {};
"OddWord" = callPackage
- ({ mkDerivation, base, criterion, QuickCheck }:
+ ({ mkDerivation, base, criterion, hspec, QuickCheck }:
mkDerivation {
pname = "OddWord";
- version = "1.0.1.1";
- sha256 = "0sb0hmvvp6cdxf8siqfp7wvcxq8rbiz7h9mxmbkcksscjp8m02mm";
+ version = "1.0.2.0";
+ sha256 = "14hd7dd3dyfd9cs9kgxjippi2awpambn2ia7s3kxcvinnfbigj3r";
libraryHaskellDepends = [ base ];
- testHaskellDepends = [ base QuickCheck ];
+ testHaskellDepends = [ base hspec QuickCheck ];
benchmarkHaskellDepends = [ base criterion ];
homepage = "http://www.gekkou.co.uk/";
description = "Provides a wrapper for deriving word types with fewer bits";
@@ -15141,6 +15143,25 @@ self: {
license = stdenv.lib.licenses.gpl3;
}) {};
+ "PyF" = callPackage
+ ({ mkDerivation, base, containers, formatting, haskell-src-meta
+ , hspec, megaparsec, process, template-haskell, text
+ }:
+ mkDerivation {
+ pname = "PyF";
+ version = "0.5.0.0";
+ sha256 = "0i0ir7i17r7lzk6c58yybsvz4s9131d1xc3jz3m3lhl3hsvyrgz5";
+ libraryHaskellDepends = [
+ base containers formatting haskell-src-meta megaparsec
+ template-haskell text
+ ];
+ testHaskellDepends = [
+ base formatting hspec process template-haskell text
+ ];
+ description = "Quasiquotations for a python like interpolated string formater";
+ license = stdenv.lib.licenses.bsd3;
+ }) {};
+
"QIO" = callPackage
({ mkDerivation, base, containers, mtl, old-time, random }:
mkDerivation {
@@ -21715,8 +21736,8 @@ self: {
pname = "active";
version = "0.2.0.13";
sha256 = "1yw029rh0gb63bhwwjynbv173mny14is4cyjkrlvzvxwb0fi96jx";
- revision = "3";
- editedCabalFile = "0jm8kkqa5k9nppis3jdx11nmds6w0x62rmnv5bn5q3b75llhnlc1";
+ revision = "4";
+ editedCabalFile = "1p2gaazj7r98v45d57hshgv6nxam5l47dl6y9iq65z5zqylmz7q2";
libraryHaskellDepends = [
base lens linear semigroupoids semigroups vector
];
@@ -22329,21 +22350,22 @@ self: {
"aeson-diff-generic" = callPackage
({ mkDerivation, aeson, aeson-diff, base, base-compat, bytestring
- , containers, dlist, hashable, scientific, tagged, template-haskell
- , text, th-abstraction, time, unordered-containers, uuid-types
- , vector
+ , containers, dlist, hashable, lens, scientific, tagged
+ , template-haskell, text, th-abstraction, time
+ , unordered-containers, uuid-types, vector
}:
mkDerivation {
pname = "aeson-diff-generic";
- version = "0.0.2";
- sha256 = "0dm2rzww9rc6l3ql42px96fpsfjvw9g0w13j0y02dq33qb0w7a1v";
+ version = "0.0.3";
+ sha256 = "12vilqp1v49pchfq8xk8k1f3m8kgl7s5n5m1w680cbh5flj050w2";
libraryHaskellDepends = [
aeson aeson-diff base base-compat bytestring containers dlist
- hashable scientific tagged template-haskell text th-abstraction
- time unordered-containers uuid-types vector
+ hashable lens scientific tagged template-haskell text
+ th-abstraction time unordered-containers uuid-types vector
];
description = "Apply a json-patch to any haskell datatype";
license = stdenv.lib.licenses.bsd3;
+ hydraPlatforms = stdenv.lib.platforms.none;
}) {};
"aeson-extra" = callPackage
@@ -22377,6 +22399,35 @@ self: {
hydraPlatforms = stdenv.lib.platforms.none;
}) {};
+ "aeson-extra_0_4_1_1" = callPackage
+ ({ mkDerivation, aeson, aeson-compat, attoparsec
+ , attoparsec-iso8601, base, base-compat-batteries, bytestring
+ , containers, deepseq, exceptions, hashable, parsec
+ , quickcheck-instances, recursion-schemes, scientific, tasty
+ , tasty-hunit, tasty-quickcheck, template-haskell, text, these
+ , time, time-parsers, unordered-containers, vector
+ }:
+ mkDerivation {
+ pname = "aeson-extra";
+ version = "0.4.1.1";
+ sha256 = "1y7xss382hdxrv4jzprsm3b7ij7wiw8jgjg9wp49dx6bfvcnb2nl";
+ libraryHaskellDepends = [
+ aeson aeson-compat attoparsec attoparsec-iso8601 base
+ base-compat-batteries bytestring containers deepseq exceptions
+ hashable parsec recursion-schemes scientific template-haskell text
+ these time unordered-containers vector
+ ];
+ testHaskellDepends = [
+ base containers quickcheck-instances tasty tasty-hunit
+ tasty-quickcheck these time time-parsers unordered-containers
+ vector
+ ];
+ homepage = "https://github.com/phadej/aeson-extra#readme";
+ description = "Extra goodies for aeson";
+ license = stdenv.lib.licenses.bsd3;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ }) {};
+
"aeson-filthy" = callPackage
({ mkDerivation, aeson, base, bytestring, doctest, text
, unordered-containers
@@ -22458,6 +22509,18 @@ self: {
license = stdenv.lib.licenses.bsd3;
}) {};
+ "aeson-generic-compat_0_0_1_2" = 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;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ }) {};
+
"aeson-injector" = callPackage
({ mkDerivation, aeson, base, bifunctors, containers, deepseq
, hashable, HUnit, lens, QuickCheck, quickcheck-text, scientific
@@ -22629,28 +22692,6 @@ self: {
}) {};
"aeson-pretty" = callPackage
- ({ mkDerivation, aeson, attoparsec, base, base-compat, bytestring
- , cmdargs, scientific, text, unordered-containers, vector
- }:
- mkDerivation {
- pname = "aeson-pretty";
- version = "0.8.5";
- sha256 = "1yd98972srlbkn0f2jhrb3f443j9wnq2fnw5gbxjxzmkcinfh5yx";
- isLibrary = true;
- isExecutable = true;
- libraryHaskellDepends = [
- aeson base base-compat bytestring scientific text
- unordered-containers vector
- ];
- executableHaskellDepends = [
- aeson attoparsec base bytestring cmdargs
- ];
- homepage = "http://github.com/informatikr/aeson-pretty";
- description = "JSON pretty-printing library and command-line tool";
- license = stdenv.lib.licenses.bsd3;
- }) {};
-
- "aeson-pretty_0_8_7" = callPackage
({ mkDerivation, aeson, attoparsec, base, base-compat, bytestring
, cmdargs, scientific, text, unordered-containers, vector
}:
@@ -22670,7 +22711,6 @@ self: {
homepage = "http://github.com/informatikr/aeson-pretty";
description = "JSON pretty-printing library and command-line tool";
license = stdenv.lib.licenses.bsd3;
- hydraPlatforms = stdenv.lib.platforms.none;
}) {};
"aeson-qq" = callPackage
@@ -23299,16 +23339,16 @@ self: {
}) {};
"aivika" = callPackage
- ({ mkDerivation, array, base, binary, containers, deepseq, mtl
- , mwc-random, random, semigroups, vector
+ ({ mkDerivation, array, base, binary, containers, deepseq
+ , exceptions, mtl, mwc-random, random, semigroups, vector
}:
mkDerivation {
pname = "aivika";
- version = "5.6";
- sha256 = "0gri5kwzw2a9fjcr7924kdaxgs9zl4j8brgknwyxrky0p93a8zry";
+ version = "5.7";
+ sha256 = "1zhzb9pchpj9vk0zc3wb9bpxbw7zfn63m7ng37z46lwyv5s55d5m";
libraryHaskellDepends = [
- array base binary containers deepseq mtl mwc-random random
- semigroups vector
+ array base binary containers deepseq exceptions mtl mwc-random
+ random semigroups vector
];
homepage = "http://www.aivikasoft.com";
description = "A multi-method simulation library";
@@ -23338,8 +23378,8 @@ self: {
}:
mkDerivation {
pname = "aivika-distributed";
- version = "1.2";
- sha256 = "092jril2vfi90bbi9wc2ir4gidqzq0w84mgbgz72icx63nni1ah0";
+ version = "1.3";
+ sha256 = "1sm56b6z8ajkap3nlcrsl592m40vgb5zmhhnc8al6arrra2j21pc";
libraryHaskellDepends = [
aivika aivika-transformers array base binary containers
distributed-process exceptions mtl mwc-random random stm time
@@ -23471,16 +23511,16 @@ self: {
}) {};
"aivika-transformers" = callPackage
- ({ mkDerivation, aivika, array, base, containers, mtl, mwc-random
- , random, semigroups, vector
+ ({ mkDerivation, aivika, array, base, containers, exceptions, mtl
+ , mwc-random, random, semigroups, vector
}:
mkDerivation {
pname = "aivika-transformers";
- version = "5.6";
- sha256 = "0vy3d4vldifiwc12j6746axhb1k3ir703wzgycvk4xn60qhjp4g9";
+ version = "5.7";
+ sha256 = "1nwffb0x7lzl52xqki415dgmag9dg66jv45qirdnmkjs33x0by3r";
libraryHaskellDepends = [
- aivika array base containers mtl mwc-random random semigroups
- vector
+ aivika array base containers exceptions mtl mwc-random random
+ semigroups vector
];
homepage = "http://www.aivikasoft.com";
description = "Transformers for the Aivika simulation library";
@@ -23816,14 +23856,14 @@ self: {
license = stdenv.lib.licenses.mit;
}) {};
- "algebraic-graphs_0_1_1" = callPackage
+ "algebraic-graphs_0_1_1_1" = callPackage
({ mkDerivation, array, base, base-compat, base-orphans, containers
, criterion, deepseq, extra, QuickCheck
}:
mkDerivation {
pname = "algebraic-graphs";
- version = "0.1.1";
- sha256 = "085yb222gh5chlpa4xylvf1wfnsdhrm1fha4jvj5bsjlx9kyr4ah";
+ version = "0.1.1.1";
+ sha256 = "0c8jrp0z3ibla7isbn1v5nhfka56hwq8h10r7h3vca53yzbafiw7";
libraryHaskellDepends = [
array base base-compat containers deepseq
];
@@ -24161,6 +24201,27 @@ self: {
hydraPlatforms = [ "i686-linux" "x86_64-linux" ];
}) {inherit (pkgs) alsaLib;};
+ "alsa-pcm_0_6_1" = callPackage
+ ({ mkDerivation, alsa-core, alsaLib, array, base
+ , extensible-exceptions, sample-frame, semigroups, storable-record
+ }:
+ mkDerivation {
+ pname = "alsa-pcm";
+ version = "0.6.1";
+ sha256 = "0pafjds9xrhzwv3xz9qcknm9f2plz3bvqqjlznss1alhgf7pcga5";
+ isLibrary = true;
+ isExecutable = true;
+ libraryHaskellDepends = [
+ alsa-core array base extensible-exceptions sample-frame semigroups
+ storable-record
+ ];
+ libraryPkgconfigDepends = [ alsaLib ];
+ homepage = "http://www.haskell.org/haskellwiki/ALSA";
+ description = "Binding to the ALSA Library API (PCM audio)";
+ license = stdenv.lib.licenses.bsd3;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ }) {inherit (pkgs) alsaLib;};
+
"alsa-pcm-tests" = callPackage
({ mkDerivation, alsa, base }:
mkDerivation {
@@ -24313,6 +24374,7 @@ self: {
homepage = "https://oss.xkcd.com/";
description = "Implement a menu experience fit for web users";
license = stdenv.lib.licenses.bsd3;
+ hydraPlatforms = stdenv.lib.platforms.none;
}) {};
"alure" = callPackage
@@ -29529,6 +29591,18 @@ self: {
license = stdenv.lib.licenses.mit;
}) {};
+ "asset-bundle" = callPackage
+ ({ mkDerivation, base, Cabal, directory, filepath }:
+ mkDerivation {
+ pname = "asset-bundle";
+ version = "0.1.0.0";
+ sha256 = "0fdl3dgnc5q9mv8w5g3qrhyprqhbyp4jrr5gimf9xzd67fwsnf86";
+ libraryHaskellDepends = [ base Cabal directory filepath ];
+ homepage = "https://github.com/deech/asset-bundle#readme";
+ description = "A build-time Cabal library that bundles executables with assets";
+ license = stdenv.lib.licenses.bsd3;
+ }) {};
+
"assimp" = callPackage
({ mkDerivation, assimp, base, c2hs, haskell98, vect }:
mkDerivation {
@@ -30367,27 +30441,27 @@ self: {
({ mkDerivation, ansi-wl-pprint, base, binary, bytestring, bzlib
, Cabal, cli-setup, composition-prelude, containers, dependency
, dhall, directory, file-embed, filemanip, hashable, http-client
- , http-client-tls, lzma, microlens, microlens-th, mtl
- , optparse-applicative, parallel-io, process, shake, shake-ats
- , shake-ext, tar, temporary, text, unix, zip-archive, zlib
+ , http-client-tls, lens, lzma, mtl, optparse-applicative
+ , parallel-io, process, shake, shake-ats, shake-ext, tar, temporary
+ , text, unix, zip-archive, zlib
}:
mkDerivation {
pname = "ats-pkg";
- version = "2.10.0.2";
- sha256 = "1rafsa2xc47hgkn6hwyr5bph21xl16i8ajl14pkckwhrs21bk255";
+ version = "2.10.0.8";
+ sha256 = "159nf1dfb4zh7kbk534xxhvap3gi6943j9vrp7k6lkyvp3p2s1q9";
isLibrary = true;
isExecutable = true;
setupHaskellDepends = [ base Cabal cli-setup ];
libraryHaskellDepends = [
ansi-wl-pprint base binary bytestring bzlib Cabal
composition-prelude containers dependency dhall directory
- file-embed filemanip hashable http-client http-client-tls lzma
- microlens microlens-th mtl parallel-io process shake shake-ats
- shake-ext tar text unix zip-archive zlib
+ file-embed filemanip hashable http-client http-client-tls lens lzma
+ mtl parallel-io process shake shake-ats shake-ext tar text unix
+ zip-archive zlib
];
executableHaskellDepends = [
- base composition-prelude directory microlens optparse-applicative
- shake shake-ats temporary text
+ base composition-prelude directory lens optparse-applicative shake
+ shake-ats temporary text
];
homepage = "https://github.com/vmchale/atspkg#readme";
description = "A build tool for ATS";
@@ -30843,6 +30917,29 @@ self: {
license = stdenv.lib.licenses.bsd3;
}) {};
+ "audacity_0_0_2" = callPackage
+ ({ mkDerivation, base, bytestring, deepseq, directory
+ , explicit-exception, filepath, non-empty, semigroups
+ , storable-record, storablevector, tagchup, transformers
+ , utility-ht, xml-basic
+ }:
+ mkDerivation {
+ pname = "audacity";
+ version = "0.0.2";
+ sha256 = "1916phnj3m12apyjarmda48xr2bq19rfn7sn6nskkbg6qjqxzlnr";
+ isLibrary = true;
+ isExecutable = true;
+ libraryHaskellDepends = [
+ base bytestring deepseq directory explicit-exception filepath
+ non-empty semigroups storable-record storablevector tagchup
+ transformers utility-ht xml-basic
+ ];
+ homepage = "http://hub.darcs.net/thielema/audacity";
+ description = "Interchange with the Audacity sound signal editor";
+ license = stdenv.lib.licenses.bsd3;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ }) {};
+
"audiovisual" = callPackage
({ mkDerivation, base, boundingboxes, colors, deepseq, directory
, filepath, free, freetype2, hashable, JuicyPixels
@@ -31398,15 +31495,15 @@ self: {
"avro" = callPackage
({ mkDerivation, aeson, array, base, base16-bytestring, binary
- , bytestring, containers, data-binary-ieee754, entropy, extra, fail
- , hashable, hspec, lens, lens-aeson, mtl, pure-zlib, QuickCheck
- , scientific, semigroups, tagged, template-haskell, text
- , transformers, unordered-containers, vector
+ , 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.2.1.1";
- sha256 = "1y70ir44kg5awgf3x1sl584ag9ddw0mhgqniwar6lgry2ag4vz9f";
+ version = "0.3.0.0";
+ sha256 = "0sfi6jc7pcigpwgkfqq9ckwm7bzhfc9kf2rhznrrsy9qw5i7xrll";
libraryHaskellDepends = [
aeson array base base16-bytestring binary bytestring containers
data-binary-ieee754 entropy fail hashable mtl pure-zlib scientific
@@ -31414,11 +31511,11 @@ self: {
];
testHaskellDepends = [
aeson array base base16-bytestring binary bytestring containers
- entropy extra fail hashable hspec lens lens-aeson mtl pure-zlib
- QuickCheck scientific semigroups tagged template-haskell text
- transformers unordered-containers vector
+ directory entropy extra fail hashable hspec lens lens-aeson mtl
+ pure-zlib QuickCheck scientific semigroups tagged template-haskell
+ text transformers unordered-containers vector
];
- homepage = "https://github.com/GaloisInc/avro.git";
+ homepage = "https://github.com/GaloisInc/avro.git#readme";
description = "Avro serialization support for Haskell";
license = stdenv.lib.licenses.bsd3;
hydraPlatforms = stdenv.lib.platforms.none;
@@ -31576,23 +31673,24 @@ self: {
}) {};
"aws-cloudfront-signed-cookies" = callPackage
- ({ mkDerivation, aeson, asn1-encoding, asn1-types, base
- , base64-bytestring, bytestring, cookie, cryptonite
- , optparse-applicative, pem, text, time, unordered-containers
- , vector
+ ({ mkDerivation, aeson, aeson-pretty, asn1-encoding, asn1-types
+ , base, base64-bytestring, bytestring, cookie, cryptonite, hedgehog
+ , lens, lens-aeson, neat-interpolation, optparse-applicative, pem
+ , text, time, unordered-containers, vector
}:
mkDerivation {
pname = "aws-cloudfront-signed-cookies";
- version = "0.1.0.1";
- sha256 = "0321c5pjd6bhvnnn8zzqk23fb14jl89vj1frvikb65iw9f60v7dl";
+ version = "0.2.0.0";
+ sha256 = "0cbhlxrdx09050pblca1p8f0f7n51p4nifp1xk48203ap435dnpj";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [
- aeson asn1-encoding asn1-types base base64-bytestring bytestring
- cookie cryptonite optparse-applicative pem text time
- unordered-containers vector
+ aeson aeson-pretty asn1-encoding asn1-types base base64-bytestring
+ bytestring cookie cryptonite lens lens-aeson optparse-applicative
+ pem text time unordered-containers vector
];
executableHaskellDepends = [ base ];
+ testHaskellDepends = [ base hedgehog neat-interpolation ];
homepage = "https://github.com/typeclasses/aws-cloudfront-signed-cookies";
description = "Generate signed cookies for AWS CloudFront";
license = stdenv.lib.licenses.mit;
@@ -32334,8 +32432,8 @@ self: {
}:
mkDerivation {
pname = "b9";
- version = "0.5.43";
- sha256 = "168rgqqnxi8f39dg510nxlh813ch4dkdxxd4rymf09dkn87w1snk";
+ version = "0.5.44";
+ sha256 = "0fr9s2s4gwh6l80s9j4jj5s10mp92dkxs5fwjlk8vbyg6xi6sgza";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [
@@ -32357,6 +32455,40 @@ self: {
license = stdenv.lib.licenses.mit;
}) {};
+ "b9_0_5_47" = callPackage
+ ({ mkDerivation, aeson, async, base, bifunctors, binary, boxes
+ , bytestring, conduit, conduit-extra, ConfigFile, directory
+ , filepath, free, hashable, hspec, hspec-expectations, lens, mtl
+ , optparse-applicative, parallel, parsec, pretty, pretty-show
+ , process, QuickCheck, random, shake, syb, template, text, time
+ , transformers, unordered-containers, vector, yaml
+ }:
+ mkDerivation {
+ pname = "b9";
+ version = "0.5.47";
+ sha256 = "1jnfci7px5hf6i729mz1fbx5sfg35q8l3663ls6pkf6b4kx8qfyz";
+ isLibrary = true;
+ isExecutable = true;
+ libraryHaskellDepends = [
+ aeson async base bifunctors binary boxes bytestring conduit
+ conduit-extra ConfigFile directory filepath free hashable lens mtl
+ parallel parsec pretty pretty-show process QuickCheck random shake
+ syb template text time transformers unordered-containers vector
+ yaml
+ ];
+ executableHaskellDepends = [
+ base bytestring directory lens optparse-applicative
+ ];
+ testHaskellDepends = [
+ aeson base bytestring hspec hspec-expectations QuickCheck text
+ unordered-containers vector yaml
+ ];
+ homepage = "https://github.com/sheyll/b9-vm-image-builder";
+ description = "A tool and library for building virtual machine images";
+ license = stdenv.lib.licenses.mit;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ }) {};
+
"babl" = callPackage
({ mkDerivation, babl, base }:
mkDerivation {
@@ -32407,28 +32539,6 @@ self: {
}) {};
"backprop" = callPackage
- ({ mkDerivation, base, bifunctors, criterion, deepseq, directory
- , hmatrix, lens, microlens, mnist-idx, mwc-random, primitive
- , reflection, time, transformers, type-combinators, vector
- }:
- mkDerivation {
- pname = "backprop";
- version = "0.1.5.0";
- sha256 = "0b99krw1l574bcqxck1bqj5sb0slbm24hd85finv3v725ddy8k7f";
- libraryHaskellDepends = [
- base deepseq microlens primitive reflection transformers
- type-combinators vector
- ];
- benchmarkHaskellDepends = [
- base bifunctors criterion deepseq directory hmatrix lens mnist-idx
- mwc-random time transformers vector
- ];
- homepage = "https://github.com/mstksg/backprop#readme";
- description = "Heterogeneous automatic differentation (backpropagation)";
- license = stdenv.lib.licenses.bsd3;
- }) {};
-
- "backprop_0_1_5_1" = callPackage
({ mkDerivation, base, bifunctors, binary, criterion, deepseq
, directory, hmatrix, lens, microlens, mnist-idx, mwc-random
, primitive, reflection, time, transformers, type-combinators
@@ -32449,7 +32559,6 @@ self: {
homepage = "https://github.com/mstksg/backprop#readme";
description = "Heterogeneous automatic differentation (backpropagation)";
license = stdenv.lib.licenses.bsd3;
- hydraPlatforms = stdenv.lib.platforms.none;
}) {};
"backtracking-exceptions" = callPackage
@@ -32941,6 +33050,24 @@ self: {
testToolDepends = [ hspec-discover ];
description = "base-compat with extra batteries";
license = stdenv.lib.licenses.mit;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ }) {};
+
+ "base-compat-migrate" = callPackage
+ ({ mkDerivation, base, base-compat }:
+ mkDerivation {
+ pname = "base-compat-migrate";
+ version = "0.1.0.0";
+ sha256 = "1xppwdkg347k1qq4pibivv89y4k8q70bmj9fmq6qwsbkizp7hsym";
+ revision = "1";
+ editedCabalFile = "047zifghyzjg7c0pdbjg1r5w3d6v0pz5miifam1jrzp2pp9a2jai";
+ isLibrary = true;
+ isExecutable = true;
+ libraryHaskellDepends = [ base base-compat ];
+ doHaddock = false;
+ homepage = "https://github.com/bergmark/base-compat-migrate#readme";
+ description = "Helps migrating projects to base-compat(-batteries)";
+ license = stdenv.lib.licenses.bsd3;
}) {};
"base-encoding" = callPackage
@@ -33623,8 +33750,8 @@ self: {
}:
mkDerivation {
pname = "bdcs";
- version = "0.3.0";
- sha256 = "1sx5kcb85gyd59lkyjn0wq6nakz68mkwi33n4hwizzw9n9ijllv0";
+ version = "0.4.0";
+ sha256 = "008rd17zfg63w9szp4jrbd9z9sg4zjf4j4a5gm3skhn2nq7qaw9i";
isLibrary = true;
isExecutable = true;
enableSeparateDataOutput = true;
@@ -33730,8 +33857,8 @@ self: {
}:
mkDerivation {
pname = "beam-core";
- version = "0.7.1.0";
- sha256 = "1k4b8a1p9ky6w5b8iwlx7pm57sdy9mj5mxinsazawc0ss3760bjh";
+ version = "0.7.2.0";
+ sha256 = "1m3jyz1wh9g14cv5nyklqi6v8rqxi73xnppk308lrjh00iwrvgvb";
libraryHaskellDepends = [
aeson base bytestring containers dlist free ghc-prim hashable
microlens mtl network-uri tagged text time vector-sized
@@ -33749,16 +33876,17 @@ self: {
({ mkDerivation, aeson, base, beam-core, bytestring, containers
, deepseq, dependent-map, dependent-sum, free, ghc-prim, hashable
, haskell-src-exts, mtl, parallel, pqueue, pretty, scientific, text
- , time, unordered-containers, uuid, vector
+ , time, unordered-containers, uuid-types, vector
}:
mkDerivation {
pname = "beam-migrate";
- version = "0.3.0.0";
- sha256 = "05j051l8zpyzdzm8w9087wj5c6yxv6mmy05asvlw2jhcjxx3j23b";
+ version = "0.3.1.0";
+ sha256 = "03chg3xbsvpcq4m4vvmr1jwslaj9ik8v3x8fiw8b5r6x401pf8za";
libraryHaskellDepends = [
aeson base beam-core bytestring containers deepseq dependent-map
dependent-sum free ghc-prim hashable haskell-src-exts mtl parallel
- pqueue pretty scientific text time unordered-containers uuid vector
+ pqueue pretty scientific text time unordered-containers uuid-types
+ vector
];
homepage = "https://travis.athougies.net/projects/beam.html";
description = "SQL DDL support and migrations support library for Beam";
@@ -33786,6 +33914,7 @@ self: {
homepage = "http://tathougies.github.io/beam/user-guide/backends/beam-postgres";
description = "Connection layer between beam and postgres";
license = stdenv.lib.licenses.mit;
+ hydraPlatforms = stdenv.lib.platforms.none;
}) {};
"beam-sqlite" = callPackage
@@ -33795,8 +33924,8 @@ self: {
}:
mkDerivation {
pname = "beam-sqlite";
- version = "0.3.1.0";
- sha256 = "1frbic90nwxk8mr8s1agvx5s1v5aqfnr7sijb602spdz4hhsqsvy";
+ version = "0.3.2.0";
+ sha256 = "06lmsajdlqc2178p4lkgwv2hh49dmjygrfjk081sr2xbhgnslr9s";
libraryHaskellDepends = [
aeson attoparsec base beam-core beam-migrate bytestring dlist free
hashable mtl network-uri scientific sqlite-simple text time unix
@@ -35268,14 +35397,13 @@ self: {
"bindings-GLFW" = callPackage
({ mkDerivation, base, bindings-DSL, HUnit, libGL, libX11
, libXcursor, libXext, libXfixes, libXi, libXinerama, libXrandr
- , libXxf86vm, template-haskell, test-framework
- , test-framework-hunit
+ , libXxf86vm, test-framework, test-framework-hunit
}:
mkDerivation {
pname = "bindings-GLFW";
- version = "3.1.2.3";
- sha256 = "1xmmwxbjpxwndiacrh2mk3lih6cs8d83ax07vg5sgyp5d7qigvik";
- libraryHaskellDepends = [ base bindings-DSL template-haskell ];
+ version = "3.1.2.4";
+ sha256 = "0d8fjckqykvxy9fs6b7k1fb5161wfbnif5ghrc1q1nlx9ngiykkr";
+ libraryHaskellDepends = [ base bindings-DSL ];
librarySystemDepends = [
libGL libX11 libXcursor libXext libXfixes libXi libXinerama
libXrandr libXxf86vm
@@ -37576,24 +37704,6 @@ self: {
}) {};
"blaze-markup" = callPackage
- ({ mkDerivation, base, blaze-builder, bytestring, containers, HUnit
- , QuickCheck, tasty, tasty-hunit, tasty-quickcheck, text
- }:
- mkDerivation {
- pname = "blaze-markup";
- version = "0.8.2.0";
- sha256 = "0m3h3ryxj5r74mv5g5dnfq5jbbwmvkl7ray18vi20d5vd93sydj4";
- libraryHaskellDepends = [ base blaze-builder bytestring text ];
- testHaskellDepends = [
- base blaze-builder bytestring containers HUnit QuickCheck tasty
- tasty-hunit tasty-quickcheck text
- ];
- homepage = "http://jaspervdj.be/blaze";
- description = "A blazingly fast markup combinator library for Haskell";
- license = stdenv.lib.licenses.bsd3;
- }) {};
-
- "blaze-markup_0_8_2_1" = callPackage
({ mkDerivation, base, blaze-builder, bytestring, containers, HUnit
, QuickCheck, tasty, tasty-hunit, tasty-quickcheck, text
}:
@@ -37609,7 +37719,6 @@ self: {
homepage = "http://jaspervdj.be/blaze";
description = "A blazingly fast markup combinator library for Haskell";
license = stdenv.lib.licenses.bsd3;
- hydraPlatforms = stdenv.lib.platforms.none;
}) {};
"blaze-shields" = callPackage
@@ -38992,6 +39101,7 @@ self: {
homepage = "https://github.com/vmchale/brainheck#readme";
description = "Brainh*ck interpreter in haskell";
license = stdenv.lib.licenses.bsd3;
+ hydraPlatforms = stdenv.lib.platforms.none;
}) {};
"break" = callPackage
@@ -39398,6 +39508,40 @@ self: {
hydraPlatforms = stdenv.lib.platforms.none;
}) {broker = null;};
+ "bronyradiogermany-common" = callPackage
+ ({ mkDerivation, aeson, base, bytestring, network-uri, text, time
+ , tz, uuid-types
+ }:
+ mkDerivation {
+ pname = "bronyradiogermany-common";
+ version = "1.0.0.1";
+ sha256 = "1hwqif1jnwjhkb22j7rsc7fznvd7373gbfsl46196bb6489bbcvy";
+ libraryHaskellDepends = [
+ aeson base bytestring network-uri text time tz uuid-types
+ ];
+ description = "Common types and URIs for the BronyRadioGermany API bindings";
+ license = stdenv.lib.licenses.bsd3;
+ }) {};
+
+ "bronyradiogermany-streaming" = callPackage
+ ({ mkDerivation, aeson, base, bronyradiogermany-common, bytestring
+ , case-insensitive, http-types, mtl, streaming
+ , streaming-bytestring, streaming-utils, text, time, uuid
+ }:
+ mkDerivation {
+ pname = "bronyradiogermany-streaming";
+ version = "1.0.0.1";
+ sha256 = "1a2yz2cbjpcywis7fy5l1w3pipirh6rjfcgs1mdyhgza12qnbx09";
+ libraryHaskellDepends = [
+ aeson base bronyradiogermany-common bytestring case-insensitive
+ http-types mtl streaming streaming-bytestring streaming-utils text
+ time uuid
+ ];
+ description = "Streaming interface for the BronyRadioGermany API";
+ license = stdenv.lib.licenses.bsd3;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ }) {};
+
"browscap" = callPackage
({ mkDerivation, base, bytestring, deepseq, ini, lens, lrucache
, mtl, text, unordered-containers, wreq
@@ -39825,18 +39969,15 @@ self: {
"buildbox" = callPackage
({ mkDerivation, base, bytestring, containers, directory
- , exceptions, mtl, old-locale, pretty, process, stm, temporary
- , text, time
+ , exceptions, mtl, old-locale, process, stm, temporary, text, time
}:
mkDerivation {
pname = "buildbox";
- version = "2.1.9.3";
- sha256 = "1ffvf82qmf05vxzxi70jm1yq8apv5s62nms529n6x1p5lyrwwdr5";
- revision = "1";
- editedCabalFile = "0nqhdmkmgnqgfw8vkjnwbrzrj7lvrhc0gw23p8smxkppvh6y5zv3";
+ version = "2.2.1.1";
+ sha256 = "19kyi8w3z3k3ydbzw5y57j6m4ffg6y9pachwzsfzjpkfczi7ds7z";
libraryHaskellDepends = [
base bytestring containers directory exceptions mtl old-locale
- pretty process stm temporary text time
+ process stm temporary text time
];
homepage = "http://code.ouroborus.net/buildbox";
description = "Rehackable components for writing buildbots and test harnesses";
@@ -40092,6 +40233,8 @@ self: {
pname = "butcher";
version = "1.3.0.0";
sha256 = "0v85ganhfljxyqy9sfmhbqnfdazikmy8a3mpg1w1y827l4a3nkng";
+ revision = "1";
+ editedCabalFile = "1zw355fg08p90xv3f1qcray0vz68h4sab0q2zfb3hk3j8mpplgvp";
libraryHaskellDepends = [
base bifunctors containers deque extra free microlens microlens-th
mtl multistate pretty transformers unsafe void
@@ -40101,6 +40244,29 @@ self: {
license = stdenv.lib.licenses.bsd3;
}) {};
+ "butcher_1_3_1_1" = callPackage
+ ({ mkDerivation, base, bifunctors, containers, deque, extra, free
+ , hspec, microlens, microlens-th, mtl, multistate, pretty
+ , transformers, unsafe, void
+ }:
+ mkDerivation {
+ pname = "butcher";
+ version = "1.3.1.1";
+ sha256 = "1llhsqg8m4f7am14kvw4psm5fb8kcph27mk059vg2mq65xns470z";
+ libraryHaskellDepends = [
+ base bifunctors containers deque extra free microlens microlens-th
+ mtl multistate pretty transformers unsafe void
+ ];
+ testHaskellDepends = [
+ base containers deque extra free hspec microlens microlens-th mtl
+ multistate pretty transformers unsafe
+ ];
+ homepage = "https://github.com/lspitzner/butcher/";
+ description = "Chops a command or program invocation into digestable pieces";
+ license = stdenv.lib.licenses.bsd3;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ }) {};
+
"butterflies" = callPackage
({ mkDerivation, base, bytestring, gl-capture, GLUT, OpenGLRaw
, OpenGLRaw21, repa, repa-devil
@@ -40161,15 +40327,15 @@ self: {
}) {};
"bv-sized" = callPackage
- ({ mkDerivation, base, containers, lens, parameterized-utils
+ ({ mkDerivation, base, containers, lens, mtl, parameterized-utils
, prettyclass, QuickCheck, random
}:
mkDerivation {
pname = "bv-sized";
- version = "0.3.0";
- sha256 = "04y99mgcgaqpzryc921nqlggfamk0jnrqv482r0hpcdf9in533bc";
+ version = "0.4.0";
+ sha256 = "18z4k076q0bk23di1i1hh8k0h319psh5hrh6jdv6446c7sg7v1c8";
libraryHaskellDepends = [
- base containers lens parameterized-utils prettyclass QuickCheck
+ base containers lens mtl parameterized-utils prettyclass QuickCheck
random
];
testHaskellDepends = [
@@ -41555,6 +41721,8 @@ self: {
pname = "cabal-plan";
version = "0.3.0.0";
sha256 = "1axi3a60zq08d760w2x6akmszad599kij0r8zmlq8pin9mmmggls";
+ revision = "1";
+ editedCabalFile = "1xdmji5y2ssj8pgp0d78m8a5hd3swy2flhiaf1v9qb69502j8lwq";
configureFlags = [ "-fexe" ];
isLibrary = true;
isExecutable = true;
@@ -41923,8 +42091,8 @@ self: {
}:
mkDerivation {
pname = "cabal2spec";
- version = "2.0.2";
- sha256 = "1nklzsclsyxb9y7xyrvhricmkyjhwrs7g853vlf21vbrdcnf7mfs";
+ version = "2.1";
+ sha256 = "0zh3xypxn78z7p7mg46ykxnmj2fv92maqx8wmclj1hqngp8ifnp3";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [ base Cabal filepath time ];
@@ -43713,13 +43881,13 @@ self: {
}) {};
"catamorphism" = callPackage
- ({ mkDerivation, base, hspec, template-haskell }:
+ ({ mkDerivation, base, hspec, QuickCheck, template-haskell }:
mkDerivation {
pname = "catamorphism";
- version = "0.6.1.1";
- sha256 = "1bpmi4k7dfwjkg9qr70gj4y6z87jaa0q11v91wgffdmw84r341vp";
+ version = "0.7.0.0";
+ sha256 = "0a01nr2lk80pfv9dr4sxyixwhfpprrvbgh44901as4jnb3gcbk33";
libraryHaskellDepends = [ base template-haskell ];
- testHaskellDepends = [ base hspec ];
+ testHaskellDepends = [ base hspec QuickCheck ];
homepage = "https://github.com/frerich/catamorphism";
description = "Exposes a Template Haskell function for generating catamorphisms";
license = stdenv.lib.licenses.bsd3;
@@ -43846,6 +44014,28 @@ self: {
hydraPlatforms = stdenv.lib.platforms.none;
}) {};
+ "cautious" = callPackage
+ ({ mkDerivation, aeson, base, genvalidity, genvalidity-hspec
+ , genvalidity-hspec-aeson, hspec, hspec-discover, QuickCheck
+ , transformers, validity
+ }:
+ mkDerivation {
+ pname = "cautious";
+ version = "0.0.0.0";
+ sha256 = "0kr9aipbi95hz97lbidifsfm51rsjlpjgkbvnyiwrh1cckh6q0zw";
+ libraryHaskellDepends = [
+ aeson base genvalidity-hspec-aeson hspec hspec-discover QuickCheck
+ transformers validity
+ ];
+ testHaskellDepends = [
+ aeson base genvalidity genvalidity-hspec genvalidity-hspec-aeson
+ hspec hspec-discover QuickCheck transformers validity
+ ];
+ homepage = "https://github.com/Nickske666/cautious#readme";
+ description = "Keep track of warnings and errors during calculations";
+ license = stdenv.lib.licenses.bsd3;
+ }) {};
+
"cautious-file" = callPackage
({ mkDerivation, base, bytestring, directory, filepath, unix }:
mkDerivation {
@@ -44961,6 +45151,36 @@ self: {
license = stdenv.lib.licenses.mit;
}) {};
+ "chatwork_0_1_3_2" = callPackage
+ ({ mkDerivation, aeson, aeson-casing, base, bytestring, connection
+ , data-default-class, hspec, http-api-data, http-client
+ , http-client-tls, http-types, req, servant-server, text, warp
+ }:
+ mkDerivation {
+ pname = "chatwork";
+ version = "0.1.3.2";
+ sha256 = "17wvmn2immigdbc5kbckwbl8hsali8w0mdii9mib9lfxykawyh54";
+ isLibrary = true;
+ isExecutable = true;
+ libraryHaskellDepends = [
+ aeson aeson-casing base bytestring connection data-default-class
+ http-api-data http-client http-client-tls http-types req text
+ ];
+ executableHaskellDepends = [
+ aeson aeson-casing base bytestring connection data-default-class
+ http-api-data http-client http-client-tls http-types req text
+ ];
+ testHaskellDepends = [
+ aeson aeson-casing base bytestring connection data-default-class
+ hspec http-api-data http-client http-client-tls http-types req
+ servant-server text warp
+ ];
+ homepage = "https://github.com/matsubara0507/chatwork#readme";
+ description = "The ChatWork API in Haskell";
+ license = stdenv.lib.licenses.mit;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ }) {};
+
"cheapskate" = callPackage
({ mkDerivation, base, blaze-html, bytestring, containers
, data-default, deepseq, mtl, syb, text, uniplate, xss-sanitize
@@ -45104,6 +45324,21 @@ self: {
license = stdenv.lib.licenses.bsd3;
}) {};
+ "checkers_0_4_10" = callPackage
+ ({ mkDerivation, array, base, QuickCheck, random, semigroupoids }:
+ mkDerivation {
+ pname = "checkers";
+ version = "0.4.10";
+ sha256 = "07ki0qrw9rdjp3y2188wnbzx4g287qdsn9dwhg69i2ajdw83kxw9";
+ libraryHaskellDepends = [
+ array base QuickCheck random semigroupoids
+ ];
+ homepage = "https://github.com/conal/checkers";
+ description = "Check properties on standard classes and data structures";
+ license = stdenv.lib.licenses.bsd3;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ }) {};
+
"checkmate" = callPackage
({ mkDerivation, base, bytestring, containers, diff-parse
, directory, file-embed, filepath, github, hlint, hspec
@@ -45136,6 +45371,18 @@ self: {
hydraPlatforms = stdenv.lib.platforms.none;
}) {};
+ "checksum" = callPackage
+ ({ mkDerivation, base, explicit-exception, utility-ht }:
+ mkDerivation {
+ pname = "checksum";
+ version = "0.0";
+ sha256 = "0327lihvibnhs2c0gnmm13g6iaw53ka3w2j1rng4d1vnrxphyyik";
+ libraryHaskellDepends = [ base explicit-exception utility-ht ];
+ homepage = "http://hub.darcs.net/thielema/checksum";
+ description = "Compute and verify checksums of ISBN, IBAN, etc";
+ license = stdenv.lib.licenses.bsd3;
+ }) {};
+
"chell" = callPackage
({ mkDerivation, ansi-terminal, base, bytestring, options, patience
, random, template-haskell, text, transformers
@@ -47013,8 +47260,8 @@ self: {
}:
mkDerivation {
pname = "cli-setup";
- version = "0.2.0.3";
- sha256 = "1macadfh1dqd6n2cc5rlyn74fz450livy1bg0qns3kcijqilk0p4";
+ version = "0.2.0.4";
+ sha256 = "0mkxm1kpbfsiv3khp8d96j9bcq7j4zbidd5ks89r69bxsmrp1z7i";
libraryHaskellDepends = [
base bytestring directory file-embed process
];
@@ -47120,6 +47367,25 @@ self: {
hydraPlatforms = stdenv.lib.platforms.none;
}) {};
+ "clifm" = callPackage
+ ({ mkDerivation, base, brick, byteunits, directory, filepath
+ , optparse-applicative, pointedlist, process, time, vector, vty
+ }:
+ mkDerivation {
+ pname = "clifm";
+ version = "0.3.1.0";
+ sha256 = "17kd2cfxc9dswlqv141f2anc0g19xhj9w5mk3xicx7vyr6j43y0y";
+ isLibrary = false;
+ isExecutable = true;
+ executableHaskellDepends = [
+ base brick byteunits directory filepath optparse-applicative
+ pointedlist process time vector vty
+ ];
+ homepage = "https://github.com/pasqu4le/clifm";
+ description = "Command Line Interface File Manager";
+ license = stdenv.lib.licenses.bsd3;
+ }) {};
+
"clingo" = callPackage
({ mkDerivation, base, bifunctors, clingo, deepseq, exceptions
, hashable, mtl, StateVar, text, transformers, wl-pprint-text
@@ -47390,25 +47656,27 @@ self: {
"cloud-seeder" = callPackage
({ mkDerivation, aeson, amazonka, amazonka-cloudformation
- , amazonka-core, base, bytestring, containers, deepseq, exceptions
- , fast-logger, hspec, lens, monad-control, monad-logger, monad-mock
- , mtl, optparse-applicative, text, transformers, transformers-base
- , unordered-containers, uuid, yaml
+ , amazonka-core, amazonka-kms, amazonka-s3, base, bytestring
+ , containers, crypto-api, deepseq, exceptions, fast-logger, hspec
+ , lens, monad-control, monad-logger, monad-mock, mtl
+ , optparse-applicative, text, text-conversions, these, transformers
+ , transformers-base, unordered-containers, uuid, yaml
}:
mkDerivation {
pname = "cloud-seeder";
- version = "0.1.0.0";
- sha256 = "1jyxbk37xzx7dgxkgrmpn7nv7v494l26f4c5r1j665cd1d8x0m4f";
+ version = "0.2.0.0";
+ sha256 = "0886c6lfqcvwbq3cdxpq2rg25a0p9msjxqv3ncsw02rdcww0dsqc";
libraryHaskellDepends = [
- aeson amazonka amazonka-cloudformation amazonka-core base
- containers deepseq exceptions lens monad-control monad-logger mtl
- optparse-applicative text transformers transformers-base
+ aeson amazonka amazonka-cloudformation amazonka-core amazonka-kms
+ amazonka-s3 base bytestring containers crypto-api deepseq
+ exceptions lens monad-control monad-logger mtl optparse-applicative
+ text text-conversions transformers transformers-base
unordered-containers uuid yaml
];
testHaskellDepends = [
amazonka-cloudformation base bytestring containers deepseq
fast-logger hspec lens monad-logger monad-mock mtl
- optparse-applicative text transformers yaml
+ optparse-applicative text these transformers yaml
];
homepage = "https://github.com/cjdev/cloud-seeder#readme";
description = "A tool for interacting with AWS CloudFormation";
@@ -49019,6 +49287,7 @@ self: {
homepage = "http://code.haskell.org/~bkomuves/";
description = "Generate and manipulate various combinatorial objects";
license = stdenv.lib.licenses.bsd3;
+ hydraPlatforms = stdenv.lib.platforms.none;
}) {};
"combinat-diagrams" = callPackage
@@ -51815,12 +52084,29 @@ self: {
license = stdenv.lib.licenses.bsd2;
}) {};
+ "constraints-emerge" = callPackage
+ ({ mkDerivation, base, constraints, containers, ghc, hashable
+ , hspec, transformers
+ }:
+ mkDerivation {
+ pname = "constraints-emerge";
+ version = "0.1.2";
+ sha256 = "1l3n5k8q2jfhsiqbzzbpy798zvcv2dvwsvd165c38b2yvxn6zird";
+ libraryHaskellDepends = [
+ base constraints containers ghc hashable
+ ];
+ testHaskellDepends = [ base constraints hspec transformers ];
+ homepage = "https://github.com/isovector/constraints-emerge";
+ description = "Defer instance lookups until runtime";
+ license = stdenv.lib.licenses.mit;
+ }) {};
+
"constrictor" = callPackage
({ mkDerivation, base, transformers }:
mkDerivation {
pname = "constrictor";
- version = "0.1.0.2";
- sha256 = "13g8cks2bzwb0ndbak91b5k1n22i0hgza4l8i52fqhzs4addaxs3";
+ version = "0.1.1.0";
+ sha256 = "0vid1m5lsmpdx9bpc78ad3nk720z62chd0j9rx03laiz2fjzx2bh";
libraryHaskellDepends = [ base transformers ];
homepage = "https://github.com/chessai/constrictor.git";
description = "strict versions of many things in base";
@@ -52684,6 +52970,7 @@ self: {
homepage = "https://github.com/qfpl/coordinate";
description = "A representation of latitude and longitude";
license = stdenv.lib.licenses.bsd3;
+ hydraPlatforms = stdenv.lib.platforms.none;
}) {};
"copilot" = callPackage
@@ -53465,6 +53752,7 @@ self: {
homepage = "https://john-millikin.com/software/haskell-python/";
description = "Bindings for libpython";
license = stdenv.lib.licenses.gpl3;
+ hydraPlatforms = stdenv.lib.platforms.none;
}) {inherit (pkgs) python34;};
"cql" = callPackage
@@ -55269,8 +55557,8 @@ self: {
}:
mkDerivation {
pname = "csound-expression";
- version = "5.2.2";
- sha256 = "05vlyd3b2kkpspp6jmxrwhv0474rw6ij6ha7jajrbqyx42a4g8bl";
+ version = "5.3.1";
+ sha256 = "0fwzsmb9syk144d445cw1d9pjx3vn18pxi161yafv2q7q4m57i3g";
libraryHaskellDepends = [
base Boolean colour containers csound-expression-dynamic
csound-expression-opcodes csound-expression-typed data-default
@@ -55304,8 +55592,8 @@ self: {
}:
mkDerivation {
pname = "csound-expression-opcodes";
- version = "0.0.3.2";
- sha256 = "09vyvai2k6id2vsnbxnv809v2bml0v8spsrfcdg2zgnxnjv9s4s4";
+ version = "0.0.4.0";
+ sha256 = "1rzkv24xppysmx20x453wzxfapkic99c98jqzpf2iyfyny1qya2w";
libraryHaskellDepends = [
base csound-expression-dynamic csound-expression-typed transformers
];
@@ -55321,8 +55609,8 @@ self: {
}:
mkDerivation {
pname = "csound-expression-typed";
- version = "0.2.0.2";
- sha256 = "1fb3wayix991awxnns6y1a9kmb6kvnay7p4rx62nvj89qa513d82";
+ version = "0.2.1.0";
+ sha256 = "0w591ij97i1kkv2z5fix8zlvw9shagxq6lpkic71ldpvv1a4cf8q";
enableSeparateDataOutput = true;
libraryHaskellDepends = [
base Boolean colour containers csound-expression-dynamic
@@ -57454,6 +57742,25 @@ self: {
license = stdenv.lib.licenses.bsd3;
}) {};
+ "data-diverse_3_0_0_0" = callPackage
+ ({ mkDerivation, base, containers, criterion, deepseq, ghc-prim
+ , hspec, tagged
+ }:
+ mkDerivation {
+ pname = "data-diverse";
+ version = "3.0.0.0";
+ sha256 = "1sxv9pyggdpwba0771vpvrawnycjrnvpayq0fjf7ly57mrdi3zd0";
+ libraryHaskellDepends = [
+ base containers deepseq ghc-prim tagged
+ ];
+ testHaskellDepends = [ base hspec tagged ];
+ benchmarkHaskellDepends = [ base criterion ];
+ homepage = "https://github.com/louispan/data-diverse#readme";
+ description = "Extensible records and polymorphic variants";
+ license = stdenv.lib.licenses.bsd3;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ }) {};
+
"data-diverse-lens" = callPackage
({ mkDerivation, base, data-diverse, generic-lens, hspec, lens
, profunctors, tagged
@@ -57473,6 +57780,26 @@ self: {
license = stdenv.lib.licenses.bsd3;
}) {};
+ "data-diverse-lens_3_0_0_2" = callPackage
+ ({ mkDerivation, base, data-diverse, generic-lens, hspec, lens
+ , profunctors, tagged
+ }:
+ mkDerivation {
+ pname = "data-diverse-lens";
+ version = "3.0.0.2";
+ sha256 = "0hahvbyb6yr3bq36dlrvdsgzg3nifckyp10h83d2ryqgla7p7rbp";
+ libraryHaskellDepends = [
+ base data-diverse generic-lens lens profunctors tagged
+ ];
+ testHaskellDepends = [
+ base data-diverse generic-lens hspec lens tagged
+ ];
+ homepage = "https://github.com/louispan/data-diverse-lens#readme";
+ description = "Isos & Lens for Data.Diverse.Many and Prisms for Data.Diverse.Which";
+ license = stdenv.lib.licenses.bsd3;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ }) {};
+
"data-dword" = callPackage
({ mkDerivation, base, data-bword, ghc-prim, hashable, tasty
, tasty-quickcheck, template-haskell
@@ -58551,10 +58878,8 @@ self: {
({ mkDerivation, base, pretty, syb }:
mkDerivation {
pname = "data-tree-print";
- version = "0.1.0.0";
- sha256 = "0dymdf7bv98f0xkdm49yxdn5nlbp7ahrfsadx69wzy8si537fnk5";
- revision = "1";
- editedCabalFile = "0ilk496yh0fdw2qisappr91d1s4xwl6hqaf2bnv3l7ah4qv74436";
+ version = "0.1.0.1";
+ sha256 = "1zh1akyf8vvsqq39vrbn95v5md5in9fvzmz2jz79adh3w5wc5j6f";
libraryHaskellDepends = [ base pretty syb ];
homepage = "https://github.com/lspitzner/data-tree-print";
description = "Print Data instances as a nested tree";
@@ -59745,6 +60070,26 @@ self: {
license = stdenv.lib.licenses.bsd3;
}) {};
+ "debian-build_0_10_1_1" = 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 ];
+ homepage = "http://twitter.com/khibino/";
+ description = "Debian package build sequence tools";
+ license = stdenv.lib.licenses.bsd3;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ }) {};
+
"debug" = callPackage
({ mkDerivation, aeson, base, bytestring, clock, containers
, deepseq, directory, extra, filepath, ghc-prim, hashable, Hoed
@@ -60564,15 +60909,15 @@ self: {
"dependency" = callPackage
({ mkDerivation, ansi-wl-pprint, base, binary, containers
- , criterion, deepseq, hspec, microlens, recursion-schemes, tardis
+ , criterion, deepseq, hspec, lens, recursion-schemes, tardis
, transformers
}:
mkDerivation {
pname = "dependency";
- version = "0.1.0.10";
- sha256 = "1cr1h8c127sgbgjg1qy9c17aj3mfp1bh35ypv00sz19k0d6wvmly";
+ version = "0.1.0.11";
+ sha256 = "0nazbm1mf3agjkfc1ll0fy4jxdkb65dzx92jz15jp7xp5y10866h";
libraryHaskellDepends = [
- ansi-wl-pprint base binary containers deepseq microlens
+ ansi-wl-pprint base binary containers deepseq lens
recursion-schemes tardis transformers
];
testHaskellDepends = [ base containers hspec ];
@@ -61740,10 +62085,8 @@ self: {
}:
mkDerivation {
pname = "diagrams-lib";
- version = "1.4.2";
- sha256 = "1rdg8b46hc1ybk1y9dw7w725rag58rkr7hs7z3gvk4isxm11gm79";
- revision = "1";
- editedCabalFile = "0vz16br2gn4agi35k92qw84cja2dqj63g7q3ak64jhc8r99bd4a1";
+ version = "1.4.2.1";
+ sha256 = "17vmjcshq6kdpy4qvwabrd7yp7is7zrs6lf3zn25l2ya8a3m0a17";
libraryHaskellDepends = [
active adjunctions array base bytestring cereal colour containers
data-default-class diagrams-core diagrams-solve directory
@@ -61935,6 +62278,8 @@ self: {
pname = "diagrams-solve";
version = "0.1.1";
sha256 = "17agchqkmj14b17sw50kzxq4hm056g5d8yy0wnqn5w8h1d0my7x4";
+ revision = "1";
+ editedCabalFile = "1aabxq020ycmwynm96dvqh9xbvcsw7s4593kca35i4zl2kzg14bb";
libraryHaskellDepends = [ base ];
testHaskellDepends = [
base deepseq tasty tasty-hunit tasty-quickcheck
@@ -62520,15 +62865,16 @@ self: {
"digit" = callPackage
({ mkDerivation, ansi-wl-pprint, base, hedgehog, lens, papa, parsec
- , parsers, pretty, semigroupoids, semigroups, tasty, tasty-hedgehog
- , tasty-hspec, tasty-hunit, template-haskell, text
+ , parsers, pretty, scientific, semigroupoids, semigroups, tasty
+ , tasty-hedgehog, tasty-hspec, tasty-hunit, template-haskell, text
}:
mkDerivation {
pname = "digit";
- version = "0.5.1";
- sha256 = "141w8x7r4b3pkalqvgc71p9rdqsfg9nmhyijcg7vr5336qv52p2a";
+ version = "0.5.2";
+ sha256 = "18y3dln42avvzj8cxz7hkg6w106zhf64aywx23crywjhilcl5ha0";
libraryHaskellDepends = [
- base lens papa parsers semigroupoids semigroups template-haskell
+ base lens papa parsers scientific semigroupoids semigroups
+ template-haskell
];
testHaskellDepends = [
ansi-wl-pprint base hedgehog lens papa parsec parsers pretty tasty
@@ -66340,17 +66686,16 @@ self: {
}) {};
"dynamic-graph" = callPackage
- ({ mkDerivation, base, cairo, colour, either, GLFW-b, GLUtil
- , OpenGL, pango, pipes, transformers
+ ({ mkDerivation, base, cairo, colour, GLFW-b, GLUtil, OpenGL, pango
+ , pipes, transformers
}:
mkDerivation {
pname = "dynamic-graph";
- version = "0.1.0.11";
- sha256 = "0mgciglcq8cshbcrc0ff858596zlm07z6wcmjpaa3irqbkdn7ma1";
+ version = "0.1.0.12";
+ sha256 = "1jygkj2jryjxlkyf0104abhkhjmfdvjaaa4zcyz7kgpny342fhiy";
enableSeparateDataOutput = true;
libraryHaskellDepends = [
- base cairo colour either GLFW-b GLUtil OpenGL pango pipes
- transformers
+ base cairo colour GLFW-b GLUtil OpenGL pango pipes transformers
];
homepage = "https://github.com/adamwalker/dynamic-graph";
description = "Draw and update graphs in real time with OpenGL";
@@ -67802,24 +68147,6 @@ self: {
}) {};
"ekg-statsd" = callPackage
- ({ mkDerivation, base, bytestring, ekg-core, network, text, time
- , unordered-containers
- }:
- mkDerivation {
- pname = "ekg-statsd";
- version = "0.2.2.0";
- sha256 = "1z1si5zglmwq0qxhd4s8zmp8rps8z4xqnk4l8wlal79f1qkz9862";
- revision = "1";
- editedCabalFile = "1fnazaqdp0d7w5mfx038yv8isyw00dahis66dkyrigd57vrj3f8f";
- libraryHaskellDepends = [
- base bytestring ekg-core network text time unordered-containers
- ];
- homepage = "https://github.com/tibbe/ekg-statsd";
- description = "Push metrics to statsd";
- license = stdenv.lib.licenses.bsd3;
- }) {};
-
- "ekg-statsd_0_2_3_0" = callPackage
({ mkDerivation, base, bytestring, ekg-core, network, text, time
, unordered-containers
}:
@@ -67833,29 +68160,9 @@ self: {
homepage = "https://github.com/tibbe/ekg-statsd";
description = "Push metrics to statsd";
license = stdenv.lib.licenses.bsd3;
- hydraPlatforms = stdenv.lib.platforms.none;
}) {};
"ekg-wai" = callPackage
- ({ mkDerivation, aeson, base, bytestring, ekg-core, ekg-json
- , filepath, http-types, network, text, time, transformers
- , unordered-containers, wai, wai-app-static, warp
- }:
- mkDerivation {
- pname = "ekg-wai";
- version = "0.1.0.2";
- sha256 = "1ridcn930lf8gjj7lqdbhzzmz0i6r668bhid72anbq3v1h6fnhnw";
- enableSeparateDataOutput = true;
- libraryHaskellDepends = [
- aeson base bytestring ekg-core ekg-json filepath http-types network
- text time transformers unordered-containers wai wai-app-static warp
- ];
- homepage = "https://github.com/tvh/ekg-wai";
- description = "Remote monitoring of processes";
- license = stdenv.lib.licenses.bsd3;
- }) {};
-
- "ekg-wai_0_1_0_3" = callPackage
({ mkDerivation, aeson, base, bytestring, ekg-core, ekg-json
, filepath, http-types, network, text, time, transformers
, unordered-containers, wai, wai-app-static, warp
@@ -67872,7 +68179,6 @@ self: {
homepage = "https://github.com/tvh/ekg-wai";
description = "Remote monitoring of processes";
license = stdenv.lib.licenses.bsd3;
- hydraPlatforms = stdenv.lib.platforms.none;
}) {};
"electrum-mnemonic" = callPackage
@@ -69652,6 +69958,7 @@ self: {
homepage = "https://github.com/mtesseract/error-context#readme";
description = "Provides API for enriching errors with contexts";
license = stdenv.lib.licenses.bsd3;
+ hydraPlatforms = stdenv.lib.platforms.none;
}) {};
"error-continuations" = callPackage
@@ -70115,15 +70422,16 @@ self: {
"eternity-timestamped" = callPackage
({ mkDerivation, attoparsec, base, cereal, directory, eternity
- , foldl, generic-random, hashable, potoki, QuickCheck, text, time
+ , generic-random, hashable, potoki, QuickCheck, text, time
+ , timestamp
}:
mkDerivation {
pname = "eternity-timestamped";
- version = "0.2.5";
- sha256 = "1ndvb2gs8a9720k9wlbz01vm12s0pb4kmrkidc9w6m33985jckfa";
+ version = "0.4";
+ sha256 = "150xqf7kg4131qxnbjhly4ryy251gni1z6vyqcsy477hig2yv5gr";
libraryHaskellDepends = [
- attoparsec base cereal directory eternity foldl generic-random
- hashable potoki QuickCheck text time
+ attoparsec base cereal directory eternity generic-random hashable
+ potoki QuickCheck text time timestamp
];
homepage = "https://github.com/metrix-ai/eternity-timestamped";
description = "Automatic timestamping for Eternity";
@@ -70141,6 +70449,8 @@ self: {
pname = "ether";
version = "0.5.1.0";
sha256 = "1180l4z2cdgc6zj9pcr2c0lj28ka85kbk8sxd42fis65k2ahr61n";
+ revision = "1";
+ editedCabalFile = "01q86w79xswdkq08m375xwfqjgix6bzbc4lpxz4phqvzf38lc8i5";
libraryHaskellDepends = [
base exceptions mmorph monad-control mtl reflection tagged
template-haskell transformers transformers-base transformers-lift
@@ -71573,6 +71883,23 @@ self: {
license = stdenv.lib.licenses.bsd3;
}) {};
+ "expiring-containers" = callPackage
+ ({ mkDerivation, base, containers, hashable, int-multimap, time
+ , timestamp, unordered-containers
+ }:
+ mkDerivation {
+ pname = "expiring-containers";
+ version = "0.1.0.2";
+ sha256 = "006n6zwdgrdh0717wd85kwxrbpv3fl5srbc77acglms41pcn72yz";
+ libraryHaskellDepends = [
+ base containers hashable int-multimap time timestamp
+ unordered-containers
+ ];
+ homepage = "https://github.com/metrix-ai/expiring-containers";
+ description = "Expiring containers";
+ license = stdenv.lib.licenses.mit;
+ }) {};
+
"expiring-mvar" = callPackage
({ mkDerivation, base }:
mkDerivation {
@@ -71912,15 +72239,15 @@ self: {
hydraPlatforms = stdenv.lib.platforms.none;
}) {};
- "extensible-effects_2_5_2_0" = callPackage
+ "extensible-effects_2_5_3_0" = callPackage
({ mkDerivation, base, criterion, HUnit, monad-control, mtl
, QuickCheck, silently, test-framework, test-framework-hunit
, test-framework-quickcheck2, test-framework-th, transformers-base
}:
mkDerivation {
pname = "extensible-effects";
- version = "2.5.2.0";
- sha256 = "12rj2b1zn3lqk5anv01lf95mmadazripa6731jf3m2m5di00i4sc";
+ version = "2.5.3.0";
+ sha256 = "0dp6wsrlqivghmhwkj5js807i5m71lp9g3v3v8qb7xd3c08awy86";
libraryHaskellDepends = [ base monad-control transformers-base ];
testHaskellDepends = [
base HUnit monad-control QuickCheck silently test-framework
@@ -71989,6 +72316,24 @@ self: {
license = stdenv.lib.licenses.bsd3;
}) {};
+ "extra_1_6_6" = callPackage
+ ({ mkDerivation, base, clock, directory, filepath, process
+ , QuickCheck, time, unix
+ }:
+ mkDerivation {
+ pname = "extra";
+ version = "1.6.6";
+ sha256 = "17d0fd2hng1bwgdl8ms7vzjb4zzwk8cljci5wsd5ninxi9m6x6br";
+ libraryHaskellDepends = [
+ base clock directory filepath process time unix
+ ];
+ testHaskellDepends = [ base directory filepath QuickCheck unix ];
+ homepage = "https://github.com/ndmitchell/extra#readme";
+ description = "Extra functions I use";
+ license = stdenv.lib.licenses.bsd3;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ }) {};
+
"extract-dependencies" = callPackage
({ mkDerivation, async, base, Cabal, containers
, package-description-remote
@@ -72298,8 +72643,8 @@ self: {
}:
mkDerivation {
pname = "fake";
- version = "0.1";
- sha256 = "1q6l1nz4anq3njbs772y0mdyy6qhfza7yicxa6fkjaxzgc2dnf1m";
+ version = "0.1.1";
+ sha256 = "0xp737s8067bynh03d6zhi8w71pl1q8mrk5si80mykn401dzw7ir";
libraryHaskellDepends = [
base containers generics-sop random text time
];
@@ -72410,17 +72755,14 @@ self: {
}) {};
"fast-arithmetic" = callPackage
- ({ mkDerivation, arithmoi, ats-pkg, base, Cabal, combinat-compat
- , composition-prelude, criterion, gmpint, hspec, numbertheory
- , QuickCheck
+ ({ mkDerivation, arithmoi, base, combinat-compat
+ , composition-prelude, criterion, gmpint, hspec, QuickCheck
}:
mkDerivation {
pname = "fast-arithmetic";
- version = "0.3.3.7";
- sha256 = "13kcqs7z5vwafvs5d1h14brry0dmijld0c8vz2wmaqr6ijjx86a6";
- setupHaskellDepends = [ ats-pkg base Cabal ];
+ version = "0.5.0.0";
+ sha256 = "17jv9ysnd0bvlzc0sircj0mnbxpwzzby98wf6p6hj76m284acdx6";
libraryHaskellDepends = [ base composition-prelude gmpint ];
- librarySystemDepends = [ numbertheory ];
testHaskellDepends = [
arithmoi base combinat-compat hspec QuickCheck
];
@@ -72431,7 +72773,7 @@ self: {
description = "Fast functions on integers";
license = stdenv.lib.licenses.bsd3;
hydraPlatforms = stdenv.lib.platforms.none;
- }) {numbertheory = null;};
+ }) {};
"fast-builder" = callPackage
({ mkDerivation, aeson, base, bytestring, containers, criterion
@@ -72452,6 +72794,7 @@ self: {
homepage = "http://github.com/takano-akio/fast-builder";
description = "Fast ByteString Builder";
license = stdenv.lib.licenses.publicDomain;
+ hydraPlatforms = stdenv.lib.platforms.none;
}) {};
"fast-combinatorics" = callPackage
@@ -73319,8 +73662,8 @@ self: {
pname = "feed";
version = "1.0.0.0";
sha256 = "05rgg7x1984mgfhkmz792xj8lhwjgznixhygzr8blf517lns2nck";
- revision = "3";
- editedCabalFile = "1v1kx8s1fgw0wkqbpxq9q9ky1akvvpgim2rp1s7w8vmjnxm9lwbx";
+ revision = "4";
+ editedCabalFile = "0baavcavm3ywykcr9cm07aqr7sna98jba2n68lyn3kany8ri214d";
enableSeparateDataOutput = true;
libraryHaskellDepends = [
base base-compat bytestring old-locale old-time safe text time
@@ -75204,8 +75547,8 @@ self: {
pname = "flac";
version = "0.1.2";
sha256 = "0adc88h5dmazf9m2xah0qkcav3pm0l3jiy8wbg9fxjv1qpgv74jn";
- revision = "2";
- editedCabalFile = "0pn5mw1n152i106x60gz05bnpfhn50ll005v4ihvawq5faq3h44l";
+ revision = "3";
+ editedCabalFile = "09xml5mv63q0wzw09s0ssjdzgnq041gr6gjhk63dr252rydnn4zh";
enableSeparateDataOutput = true;
libraryHaskellDepends = [
base bytestring containers data-default-class directory exceptions
@@ -75230,6 +75573,8 @@ self: {
pname = "flac-picture";
version = "0.1.1";
sha256 = "1kn1zvv5izinyidmxij7zqml94a8q52bbm2icg7704sj906gh71w";
+ revision = "1";
+ editedCabalFile = "02vdh61nzig0yrv6ja6fjlgfcznj5k4iqh3i5f9g5p078ycqb17w";
enableSeparateDataOutput = true;
libraryHaskellDepends = [ base bytestring flac JuicyPixels ];
testHaskellDepends = [
@@ -76081,6 +76426,35 @@ self: {
license = stdenv.lib.licenses.bsd3;
}) {};
+ "fmt_0_6" = callPackage
+ ({ mkDerivation, base, base64-bytestring, bytestring, call-stack
+ , containers, criterion, deepseq, doctest, doctest-discover
+ , formatting, hspec, interpolate, microlens, neat-interpolation
+ , text, time, time-locale-compat, vector
+ }:
+ mkDerivation {
+ pname = "fmt";
+ version = "0.6";
+ sha256 = "14hk6ra8j1zzw7ibimj207mi1xl5pmln6kyz0y66j4bg1r8invsy";
+ libraryHaskellDepends = [
+ base base64-bytestring bytestring containers formatting microlens
+ text time time-locale-compat
+ ];
+ testHaskellDepends = [
+ base bytestring call-stack containers doctest hspec
+ neat-interpolation text vector
+ ];
+ testToolDepends = [ doctest-discover ];
+ benchmarkHaskellDepends = [
+ base bytestring containers criterion deepseq formatting interpolate
+ text vector
+ ];
+ homepage = "http://github.com/aelve/fmt";
+ description = "A new formatting library";
+ license = stdenv.lib.licenses.bsd3;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ }) {};
+
"fn" = callPackage
({ mkDerivation, base, blaze-builder, bytestring, directory
, filepath, hspec, http-types, resourcet, text
@@ -76193,6 +76567,27 @@ self: {
license = stdenv.lib.licenses.bsd3;
}) {};
+ "foldl_1_4_0" = callPackage
+ ({ mkDerivation, base, bytestring, comonad, containers
+ , contravariant, criterion, hashable, mwc-random, primitive
+ , profunctors, semigroups, text, transformers, unordered-containers
+ , vector, vector-builder
+ }:
+ mkDerivation {
+ pname = "foldl";
+ version = "1.4.0";
+ sha256 = "16vx35yl853g9ql9ncpa6r29bg5cai40s7jnpjj2d06ij9cad955";
+ libraryHaskellDepends = [
+ base bytestring comonad containers contravariant hashable
+ mwc-random primitive profunctors 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
@@ -76783,6 +77178,25 @@ self: {
license = stdenv.lib.licenses.bsd3;
}) {};
+ "formatting_6_3_4" = callPackage
+ ({ mkDerivation, array, base, bytestring, clock, ghc-prim, hspec
+ , integer-gmp, old-locale, scientific, semigroups, text, time
+ , transformers
+ }:
+ mkDerivation {
+ pname = "formatting";
+ version = "6.3.4";
+ sha256 = "1rcnnzbn1671lcwllpppgh3yv99k83y2n40r8mgsk08hsk1qs0wx";
+ libraryHaskellDepends = [
+ array base bytestring clock ghc-prim integer-gmp old-locale
+ scientific semigroups text time transformers
+ ];
+ testHaskellDepends = [ base hspec semigroups ];
+ description = "Combinator-based type-safe formatting (like printf() or FORMAT)";
+ license = stdenv.lib.licenses.bsd3;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ }) {};
+
"forml" = callPackage
({ mkDerivation, ansi-terminal, base, bytestring, cereal
, containers, directory, file-embed, ghc-prim, GraphSCC, hslogger
@@ -77815,6 +78229,17 @@ self: {
license = stdenv.lib.licenses.bsd3;
}) {};
+ "freq" = callPackage
+ ({ mkDerivation }:
+ mkDerivation {
+ pname = "freq";
+ version = "0.0.0";
+ sha256 = "0vrhdmhahhxp43312864mvq38w8100970n92vjd77fj50cbh0r2i";
+ doHaddock = false;
+ description = "TBA";
+ license = stdenv.lib.licenses.bsd3;
+ }) {};
+
"fresco-binding" = callPackage
({ mkDerivation, base, binary, binary-serialise-cbor, bytestring
, containers, text, unix
@@ -80344,8 +80769,8 @@ self: {
pname = "generics-sop";
version = "0.3.2.0";
sha256 = "168v62i845jh9jbfaz3ldz8svz4wmzq9mf2vhb7pxlnbkk8fqq1h";
- revision = "1";
- editedCabalFile = "1cijsc0chx04i8v1n8zhlkd00dmrjq2pcpiw0y9126vmnxw5l90l";
+ revision = "2";
+ editedCabalFile = "0hc00hjgxm7vzq146d9kwapgqnjbhdi0c7icyvrpc2fhc4cnwlwf";
libraryHaskellDepends = [ base deepseq ghc-prim template-haskell ];
testHaskellDepends = [ base ];
description = "Generic Programming using True Sums of Products";
@@ -81024,17 +81449,18 @@ self: {
}) {};
"geodetics" = callPackage
- ({ mkDerivation, array, base, dimensional, HUnit, QuickCheck
- , test-framework, test-framework-hunit, test-framework-quickcheck2
+ ({ mkDerivation, array, base, checkers, dimensional, HUnit
+ , QuickCheck, test-framework, test-framework-hunit
+ , test-framework-quickcheck2
}:
mkDerivation {
pname = "geodetics";
- version = "0.0.4";
- sha256 = "1zml9hpbj7shzsjv6hsyzv3p9yzm6cbvxp2cd79nd1fcsdss0zi3";
+ version = "0.0.5";
+ sha256 = "1fpfdn4bhdqjnrhiqd8yg5j4vs3rwlsr6nav3cjrvrhynlmqlcaq";
enableSeparateDataOutput = true;
libraryHaskellDepends = [ array base dimensional ];
testHaskellDepends = [
- array base dimensional HUnit QuickCheck test-framework
+ array base checkers dimensional HUnit QuickCheck test-framework
test-framework-hunit test-framework-quickcheck2
];
homepage = "https://github.com/PaulJohnson/geodetics";
@@ -81433,6 +81859,7 @@ self: {
testHaskellDepends = [ base ghc ghc-paths ];
description = "A small-step semantics for Core";
license = stdenv.lib.licenses.mit;
+ hydraPlatforms = stdenv.lib.platforms.none;
}) {};
"ghc-datasize" = callPackage
@@ -82130,6 +82557,19 @@ self: {
license = stdenv.lib.licenses.bsd2;
}) {};
+ "ghc-tcplugins-extra_0_2_5" = callPackage
+ ({ mkDerivation, base, ghc }:
+ mkDerivation {
+ pname = "ghc-tcplugins-extra";
+ version = "0.2.5";
+ sha256 = "0xkq24dr2div9d9hr4rpz65968syqjignn9xn5q48vmzh1m1xwws";
+ libraryHaskellDepends = [ base ghc ];
+ homepage = "http://github.com/clash-lang/ghc-tcplugins-extra";
+ description = "Utilities for writing GHC type-checker plugins";
+ license = stdenv.lib.licenses.bsd2;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ }) {};
+
"ghc-time-alloc-prof" = callPackage
({ mkDerivation, attoparsec, base, containers, directory, filepath
, process, tasty, tasty-hunit, temporary, text, time
@@ -82206,6 +82646,28 @@ self: {
license = stdenv.lib.licenses.bsd2;
}) {};
+ "ghc-typelits-knownnat_0_4_2" = callPackage
+ ({ mkDerivation, base, ghc, ghc-tcplugins-extra
+ , ghc-typelits-natnormalise, tasty, tasty-hunit, tasty-quickcheck
+ , template-haskell, transformers
+ }:
+ mkDerivation {
+ pname = "ghc-typelits-knownnat";
+ version = "0.4.2";
+ sha256 = "1h0l5hks2pdaibq4w46b9064idshan615iiyjjbzkc2zg04xsbbr";
+ libraryHaskellDepends = [
+ base ghc ghc-tcplugins-extra ghc-typelits-natnormalise
+ template-haskell transformers
+ ];
+ testHaskellDepends = [
+ base ghc-typelits-natnormalise tasty tasty-hunit tasty-quickcheck
+ ];
+ homepage = "http://clash-lang.org/";
+ description = "Derive KnownNat constraints from other KnownNat constraints";
+ license = stdenv.lib.licenses.bsd2;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ }) {};
+
"ghc-typelits-natnormalise" = callPackage
({ mkDerivation, base, ghc, ghc-tcplugins-extra, integer-gmp, tasty
, tasty-hunit, template-haskell
@@ -82223,6 +82685,24 @@ self: {
license = stdenv.lib.licenses.bsd2;
}) {};
+ "ghc-typelits-natnormalise_0_5_10" = callPackage
+ ({ mkDerivation, base, ghc, ghc-tcplugins-extra, integer-gmp, tasty
+ , tasty-hunit, template-haskell
+ }:
+ mkDerivation {
+ pname = "ghc-typelits-natnormalise";
+ version = "0.5.10";
+ sha256 = "15xn69jdv77pgyd4mgm35zbrc1h0phyvw733j6s5iy01fhrhrdny";
+ libraryHaskellDepends = [
+ base ghc ghc-tcplugins-extra integer-gmp
+ ];
+ testHaskellDepends = [ base tasty tasty-hunit template-haskell ];
+ homepage = "http://www.clash-lang.org/";
+ description = "GHC typechecker plugin for types of kind GHC.TypeLits.Nat";
+ license = stdenv.lib.licenses.bsd2;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ }) {};
+
"ghc-typelits-presburger" = callPackage
({ mkDerivation, base, containers, equational-reasoning, ghc
, ghc-tcplugins-extra, pretty, reflection
@@ -82414,6 +82894,34 @@ self: {
license = stdenv.lib.licenses.bsd3;
}) {};
+ "ghcid_0_7" = 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";
+ sha256 = "1dcx12vkjw5w1np4bz8ypaf8bdw1s8yrlhq6i5x2pilvsf1dljqg";
+ 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
+ ];
+ homepage = "https://github.com/ndmitchell/ghcid#readme";
+ 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 {
@@ -83458,8 +83966,8 @@ self: {
}:
mkDerivation {
pname = "gi-webkit2";
- version = "4.0.15";
- sha256 = "1mwd5jyis7rfqpigyk1yp3rx2hkdb2gwg4m1l41dggdb8svv1jhp";
+ version = "4.0.18";
+ sha256 = "0qxqsg9p2380z6cyvky8g0a90v1zyf90ff9mmislnzm89fmc8013";
setupHaskellDepends = [ base Cabal haskell-gi ];
libraryHaskellDepends = [
base bytestring containers gi-atk gi-cairo gi-gdk gi-gio gi-glib
@@ -85728,11 +86236,10 @@ self: {
({ mkDerivation, base, gmp, recursion-schemes }:
mkDerivation {
pname = "gmpint";
- version = "0.1.0.7";
- sha256 = "1p0iqsvx85ycd5xab73k5aaj796kqanbkjfmivslb6i6ibix02v9";
+ version = "0.1.0.11";
+ sha256 = "00sml2d5jbfc0qy0nvrmk9xv31zk66anzz5r4d7h049asq0zh20n";
libraryHaskellDepends = [ base recursion-schemes ];
librarySystemDepends = [ gmp ];
- homepage = "https://github.com/vmchale/gmpint#readme";
description = "GMP integer conversions";
license = stdenv.lib.licenses.bsd3;
}) {inherit (pkgs) gmp;};
@@ -85797,8 +86304,8 @@ self: {
}:
mkDerivation {
pname = "gnss-converters";
- version = "0.3.31";
- sha256 = "0raqapwms5c160n1nqjvmnzqxhimjd1aa8ji9jgb5iv37gfalv8z";
+ version = "0.3.32";
+ sha256 = "0b2v7msj54r6dd2w2wd4c8q6wvywnkmyddaa05r990cnbg9l4i9b";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [
@@ -85848,8 +86355,8 @@ self: {
}:
mkDerivation {
pname = "gnuplot";
- version = "0.5.5.1";
- sha256 = "1i0rlmk6kqv1lj71s1av64qc14qmaaplp6z9mxd9hkwjpwzyqdma";
+ version = "0.5.5.2";
+ sha256 = "1mlppnc13ygjzmf6ldydys4wvy35yb3xjwwfgf9rbi7nfcqjr6mn";
isLibrary = true;
isExecutable = true;
enableSeparateDataOutput = true;
@@ -90019,12 +90526,13 @@ self: {
({ mkDerivation, base, gi-gdk, gi-gtk, text, transformers }:
mkDerivation {
pname = "gtk-strut";
- version = "0.1.1.0";
- sha256 = "1g88afi75a727s85v37n4mvqr5zp4849s2kc1zdx3pvc9a15i9pd";
+ version = "0.1.2.0";
+ sha256 = "1v73qca2qdkpvfal2ndmwrxyj1qwgxgmammkbf88azs7wcxcf7y6";
libraryHaskellDepends = [ base gi-gdk gi-gtk text transformers ];
homepage = "https://github.com/IvanMalison/gtk-strut#readme";
description = "Libary for creating strut windows with gi-gtk";
license = stdenv.lib.licenses.bsd3;
+ hydraPlatforms = stdenv.lib.platforms.none;
}) {};
"gtk-toggle-button-list" = callPackage
@@ -90837,6 +91345,7 @@ self: {
homepage = "https://github.com/BioHaskell/hPDB";
description = "Protein Databank file format library";
license = stdenv.lib.licenses.bsd3;
+ hydraPlatforms = stdenv.lib.platforms.none;
}) {};
"hPDB-examples" = callPackage
@@ -90863,6 +91372,7 @@ self: {
homepage = "https://github.com/BioHaskell/hPDB-examples";
description = "Examples for hPDB library";
license = stdenv.lib.licenses.bsd3;
+ hydraPlatforms = stdenv.lib.platforms.none;
}) {};
"hPushover" = callPackage
@@ -93748,8 +94258,8 @@ self: {
}:
mkDerivation {
pname = "hapistrano";
- version = "0.3.5.3";
- sha256 = "04f7fiy4zdsl2pxb6yxq91lqgvyw0qwr9ky5sxsxj4nx40inv4d1";
+ version = "0.3.5.4";
+ sha256 = "02cc7bgld3cl36wq4n1c0n6gf2kbz0klj6ssfgjmjwvxvl064cg5";
isLibrary = true;
isExecutable = true;
enableSeparateDataOutput = true;
@@ -96038,6 +96548,35 @@ self: {
}) {inherit (pkgs) glib;
inherit (pkgs.gnome3) gobjectIntrospection;};
+ "haskell-gi_0_21_1" = callPackage
+ ({ mkDerivation, attoparsec, base, bytestring, Cabal, containers
+ , directory, doctest, filepath, glib, gobjectIntrospection
+ , haskell-gi-base, mtl, pretty-show, process, regex-tdfa, safe
+ , text, transformers, xdg-basedir, xml-conduit
+ }:
+ mkDerivation {
+ pname = "haskell-gi";
+ version = "0.21.1";
+ sha256 = "0nhsjw0cv29r6rbajz4lf1ca63lm1m0i57wcs8p6aw10kx246q1n";
+ isLibrary = true;
+ isExecutable = true;
+ libraryHaskellDepends = [
+ attoparsec base bytestring Cabal containers directory filepath
+ haskell-gi-base mtl pretty-show process regex-tdfa safe text
+ transformers xdg-basedir xml-conduit
+ ];
+ libraryPkgconfigDepends = [ glib gobjectIntrospection ];
+ executableHaskellDepends = [
+ base containers directory filepath haskell-gi-base pretty-show text
+ ];
+ testHaskellDepends = [ base doctest ];
+ homepage = "https://github.com/haskell-gi/haskell-gi";
+ description = "Generate Haskell bindings for GObject Introspection capable libraries";
+ license = stdenv.lib.licenses.lgpl21;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ }) {inherit (pkgs) glib;
+ inherit (pkgs.gnome3) gobjectIntrospection;};
+
"haskell-gi-base" = callPackage
({ mkDerivation, base, bytestring, containers, glib, text }:
mkDerivation {
@@ -100430,10 +100969,8 @@ self: {
({ mkDerivation, base, QuickCheck }:
mkDerivation {
pname = "heap";
- version = "1.0.3";
- sha256 = "00plmd5b8dlgb8324h1dbd168apfcx3hkv65rhi463a8lff7xmcv";
- revision = "1";
- editedCabalFile = "0j1f0xl3y2vqiyh3m9w5vssxyi62s6qic3zmpkm429vawyh4yad5";
+ version = "1.0.4";
+ sha256 = "0ahpsfmb76728w71xn4021ad7z752n6aqqgzdpcyis9i22g4ihm4";
libraryHaskellDepends = [ base ];
testHaskellDepends = [ base QuickCheck ];
description = "Heaps in Haskell";
@@ -104494,6 +105031,7 @@ self: {
];
description = "computes the internal rate of return of an investment";
license = stdenv.lib.licenses.bsd3;
+ hydraPlatforms = stdenv.lib.platforms.none;
}) {};
"hledger-lib" = callPackage
@@ -104584,8 +105122,8 @@ self: {
}:
mkDerivation {
pname = "hledger-web";
- version = "1.9";
- sha256 = "0xgd1akird9hpdrwml4dxc0vx3vzgacr5f6z19zy6q4bvnw1g58n";
+ version = "1.9.1";
+ sha256 = "0fkanj21ivrf5la7zxij1jws955hc0y98n2lg4qkbyw5fz54i9dj";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [
@@ -104718,8 +105256,8 @@ self: {
}:
mkDerivation {
pname = "hlint";
- version = "2.1.1";
- sha256 = "0mmfavd158l5ig5wb1b1zbhbraj8hhqvbk4mg85n6c8ndpr4grd4";
+ version = "2.1.3";
+ sha256 = "08i7b894vm0p8ipilvhx0pp04r6zgrf44w0mnlmsydq971y59g3a";
isLibrary = true;
isExecutable = true;
enableSeparateDataOutput = true;
@@ -106479,8 +107017,8 @@ self: {
}:
mkDerivation {
pname = "hoogle";
- version = "5.0.17.2";
- sha256 = "009brgwczkszmlk8rq6s5s73rnpi2gw94wr9wwp9rgf3r2cfs1br";
+ version = "5.0.17.3";
+ sha256 = "174gp41v0krzj37m75pnr3aawyhkbk2wq4q6zk2z3zh0avvvmgk6";
isLibrary = true;
isExecutable = true;
enableSeparateDataOutput = true;
@@ -107507,8 +108045,8 @@ self: {
}:
mkDerivation {
pname = "hpath";
- version = "0.9.0";
- sha256 = "1d0f58xvqpr5d9n3n8wpy5x59mfh57al4bvpllfmb6a6dm514k4d";
+ version = "0.9.2";
+ sha256 = "1b8fni11zk3p3yx6pi9sx6cxq9vm31fqx3gm7y6nz5cykpncsx27";
libraryHaskellDepends = [
base bytestring deepseq exceptions hspec IfElse simple-sendfile
unix unix-bytestring utf8-string word8
@@ -108809,17 +109347,17 @@ self: {
"hs2ats" = callPackage
({ mkDerivation, ansi-wl-pprint, base, casing, composition-prelude
, cpphs, criterion, deepseq, haskell-src-exts, hspec
- , hspec-dirstream, language-ats, microlens, system-filepath
+ , hspec-dirstream, language-ats, lens, system-filepath
}:
mkDerivation {
pname = "hs2ats";
- version = "0.3.0.0";
- sha256 = "1s92riisihcqim6hy4sa4z3dhk92dp2iyn32j0jl0qlpzdlbj4cp";
+ version = "0.3.0.1";
+ sha256 = "1z8afx8bc9igd0iv6anw635zfj6vwqq10kp4j95p3fs58wyjg21v";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [
ansi-wl-pprint base casing composition-prelude cpphs deepseq
- haskell-src-exts language-ats microlens
+ haskell-src-exts language-ats lens
];
testHaskellDepends = [
base hspec hspec-dirstream system-filepath
@@ -108949,6 +109487,7 @@ self: {
];
description = "OASIS Security Assertion Markup Language (SAML) V2.0";
license = stdenv.lib.licenses.asl20;
+ hydraPlatforms = stdenv.lib.platforms.none;
}) {inherit (pkgs) libxml2;};
"hsass" = callPackage
@@ -113030,6 +113569,35 @@ self: {
license = stdenv.lib.licenses.mit;
}) {};
+ "http-client_0_5_12_1" = callPackage
+ ({ mkDerivation, array, async, base, blaze-builder, bytestring
+ , case-insensitive, containers, cookie, deepseq, directory
+ , exceptions, filepath, ghc-prim, hspec, http-types, memory
+ , mime-types, monad-control, network, network-uri, random, stm
+ , streaming-commons, text, time, transformers, zlib
+ }:
+ mkDerivation {
+ pname = "http-client";
+ version = "0.5.12.1";
+ sha256 = "0gnnkcy2d2v1k44ip59s7l86jgigllsp3lsqsac08zr19lr1clab";
+ libraryHaskellDepends = [
+ array base blaze-builder bytestring case-insensitive containers
+ cookie deepseq exceptions filepath ghc-prim http-types memory
+ mime-types network network-uri random stm streaming-commons text
+ time transformers
+ ];
+ testHaskellDepends = [
+ async base blaze-builder bytestring case-insensitive containers
+ deepseq directory hspec http-types monad-control network
+ network-uri streaming-commons text time transformers zlib
+ ];
+ doCheck = false;
+ homepage = "https://github.com/snoyberg/http-client";
+ description = "An HTTP client engine";
+ license = stdenv.lib.licenses.mit;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ }) {};
+
"http-client-auth" = callPackage
({ mkDerivation, base, base64-string, blaze-builder, bytestring
, case-insensitive, conduit, crypto-conduit, http-client
@@ -113256,35 +113824,6 @@ self: {
}) {};
"http-conduit" = callPackage
- ({ mkDerivation, aeson, base, blaze-builder, bytestring
- , case-insensitive, conduit, conduit-extra, connection, cookie
- , data-default-class, hspec, http-client, http-client-tls
- , http-types, HUnit, mtl, network, resourcet, streaming-commons
- , temporary, text, time, transformers, unliftio, unliftio-core
- , utf8-string, wai, wai-conduit, warp, warp-tls
- }:
- mkDerivation {
- pname = "http-conduit";
- version = "2.3.0";
- sha256 = "0z9158a27g6kg7vbhkiw6icb2wgzb3lhsifgg5yh6wph5cd40fx4";
- libraryHaskellDepends = [
- aeson base bytestring conduit conduit-extra http-client
- http-client-tls http-types mtl resourcet transformers unliftio-core
- ];
- testHaskellDepends = [
- aeson base blaze-builder bytestring case-insensitive conduit
- conduit-extra connection cookie data-default-class hspec
- http-client http-types HUnit network resourcet streaming-commons
- temporary text time transformers unliftio utf8-string wai
- wai-conduit warp warp-tls
- ];
- doCheck = false;
- homepage = "http://www.yesodweb.com/book/http-conduit";
- description = "HTTP client package with conduit interface and HTTPS support";
- license = stdenv.lib.licenses.bsd3;
- }) {};
-
- "http-conduit_2_3_1" = callPackage
({ mkDerivation, aeson, base, blaze-builder, bytestring
, case-insensitive, conduit, conduit-extra, connection, cookie
, data-default-class, hspec, http-client, http-client-tls
@@ -113311,7 +113850,6 @@ self: {
homepage = "http://www.yesodweb.com/book/http-conduit";
description = "HTTP client package with conduit interface and HTTPS support";
license = stdenv.lib.licenses.bsd3;
- hydraPlatforms = stdenv.lib.platforms.none;
}) {};
"http-conduit-browser" = callPackage
@@ -113378,6 +113916,23 @@ self: {
license = stdenv.lib.licenses.bsd3;
}) {};
+ "http-date_0_0_7" = callPackage
+ ({ mkDerivation, array, attoparsec, base, bytestring, doctest
+ , hspec, old-locale, time
+ }:
+ mkDerivation {
+ pname = "http-date";
+ version = "0.0.7";
+ sha256 = "1hpzs646qqzp2g2qy7rx1bf3knf1hw38n82vcq6bs4mm1xzdryff";
+ libraryHaskellDepends = [ array attoparsec base bytestring time ];
+ testHaskellDepends = [
+ base bytestring doctest hspec old-locale time
+ ];
+ description = "HTTP Date parser/formatter";
+ license = stdenv.lib.licenses.bsd3;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ }) {};
+
"http-dispatch" = callPackage
({ mkDerivation, aeson, base, base64-bytestring, bytestring
, case-insensitive, hspec, http-client, http-client-tls, http-types
@@ -114967,8 +115522,8 @@ self: {
}:
mkDerivation {
pname = "hw-kafka-client";
- version = "2.4.1";
- sha256 = "0mhi85czipxk0mxrzxchljabhkiq5a6y3xn9k5rivi2dgy28mrrk";
+ version = "2.4.3";
+ sha256 = "18pyayl0xyb045db5584cfbbvzvmkwm3zkpvks30vrz9sb5jx1qd";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [
@@ -115091,6 +115646,7 @@ self: {
homepage = "https://github.com/githubuser/hw-prim-bits#readme";
description = "Primitive support for bit manipulation";
license = stdenv.lib.licenses.bsd3;
+ hydraPlatforms = stdenv.lib.platforms.none;
}) {};
"hw-rankselect" = callPackage
@@ -115433,6 +115989,7 @@ self: {
homepage = "https://github.com/srijs/hwsl2";
description = "Hashing with SL2";
license = stdenv.lib.licenses.mit;
+ hydraPlatforms = stdenv.lib.platforms.none;
}) {};
"hwsl2-bytevector" = callPackage
@@ -115445,6 +116002,7 @@ self: {
homepage = "https://github.com/srijs/hwsl2-haskell-bytevector";
description = "A hashed byte-vector based on algebraic hashes and finger trees";
license = stdenv.lib.licenses.mit;
+ hydraPlatforms = stdenv.lib.platforms.none;
}) {};
"hwsl2-reducers" = callPackage
@@ -115459,6 +116017,7 @@ self: {
homepage = "https://github.com/srijs/hwsl2-reducers";
description = "Semigroup and Reducer instances for Data.Hash.SL2";
license = stdenv.lib.licenses.mit;
+ hydraPlatforms = stdenv.lib.platforms.none;
}) {};
"hx" = callPackage
@@ -117947,6 +118506,22 @@ self: {
license = stdenv.lib.licenses.mit;
}) {};
+ "immortal_0_3" = callPackage
+ ({ mkDerivation, base, stm, tasty, tasty-hunit, transformers
+ , unliftio-core
+ }:
+ mkDerivation {
+ pname = "immortal";
+ version = "0.3";
+ sha256 = "120znjn7jrmcnzgka8zbiih4g8imh732iivjdzzbpj1kgywrvj0i";
+ libraryHaskellDepends = [ base stm unliftio-core ];
+ testHaskellDepends = [ base stm tasty tasty-hunit transformers ];
+ homepage = "https://github.com/feuerbach/immortal";
+ description = "Spawn threads that never die (unless told to do so)";
+ license = stdenv.lib.licenses.mit;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ }) {};
+
"imparse" = callPackage
({ mkDerivation, ascetic, base, compilation, containers, directory
, indents, MissingH, parsec, richreports, split, staticanalysis
@@ -118274,10 +118849,8 @@ self: {
({ mkDerivation, base }:
mkDerivation {
pname = "inchworm";
- version = "1.0.2.1";
- sha256 = "19fx9nrx1jia4qz3rhjsdmmmas7bn5rl59b2y2lnzyyz6n83sfzc";
- revision = "1";
- editedCabalFile = "0yg8x27fk0kr99ways4h64a5wbxmnh59l8mis9xd0faqx7hadic7";
+ version = "1.0.2.2";
+ sha256 = "0r8a8hg3fzfc619zsjdnid1la0njnfrijhqfgqjmis4ncivah52h";
libraryHaskellDepends = [ base ];
homepage = "https://github.com/DDCSF/inchworm";
description = "Inchworm Lexer Framework";
@@ -118578,6 +119151,20 @@ self: {
license = stdenv.lib.licenses.bsd3;
}) {};
+ "indexed-list-literals_0_2_0_0" = callPackage
+ ({ mkDerivation, base, Only }:
+ mkDerivation {
+ pname = "indexed-list-literals";
+ version = "0.2.0.0";
+ sha256 = "0n0j5x4v099000fm2ar0lmn06f21gnq39srmimy9bm3zisx8zmzd";
+ libraryHaskellDepends = [ base Only ];
+ testHaskellDepends = [ base ];
+ homepage = "https://github.com/davidm-d/indexed-list-literals";
+ description = "Type safe indexed list literals";
+ license = stdenv.lib.licenses.bsd3;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ }) {};
+
"indextype" = callPackage
({ mkDerivation, base, hspec }:
mkDerivation {
@@ -118802,23 +119389,24 @@ self: {
license = stdenv.lib.licenses.bsd3;
}) {};
- "influxdb_1_5_1" = callPackage
+ "influxdb_1_6_0" = callPackage
({ mkDerivation, aeson, attoparsec, base, bytestring, Cabal
, cabal-doctest, clock, containers, doctest, foldl, http-client
, http-types, HUnit, lens, mtl, network, optional-args, QuickCheck
- , scientific, tasty, tasty-hunit, tasty-quickcheck, tasty-th
- , template-haskell, text, time, unordered-containers, vector
+ , scientific, tagged, tasty, tasty-hunit, tasty-quickcheck
+ , tasty-th, template-haskell, text, time, unordered-containers
+ , vector
}:
mkDerivation {
pname = "influxdb";
- version = "1.5.1";
- sha256 = "1gxhd5ywz27z6jkx9bdmqsjafl2j0wk5vmrclz7l7hwfnn5553c7";
+ version = "1.6.0";
+ sha256 = "1fmz5n3mp3w1v2axp9g1nw9h5sj6cw3xbs44xczn59sgpmz5hv34";
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 text time
+ http-types lens network optional-args scientific tagged text time
unordered-containers vector
];
testHaskellDepends = [
@@ -118863,8 +119451,8 @@ self: {
({ mkDerivation, attoparsec, base, text, unordered-containers }:
mkDerivation {
pname = "ini";
- version = "0.3.5";
- sha256 = "1iicavbjr4qmlcdxh32cgqxlxd80xvzyxxskrs3hji1qzrnq7lxz";
+ version = "0.3.6";
+ sha256 = "1n9wsl7nz910bc8jx9ps7pvpql4hlnryjkqbdpfq0phjb9sf7fzw";
libraryHaskellDepends = [
attoparsec base text unordered-containers
];
@@ -119387,6 +119975,21 @@ self: {
license = stdenv.lib.licenses.bsd3;
}) {};
+ "int-multimap" = callPackage
+ ({ mkDerivation, base, containers, hashable, unordered-containers
+ }:
+ mkDerivation {
+ pname = "int-multimap";
+ version = "0.1.0.1";
+ sha256 = "0xi0n9hhra6pzqnxahf109qgifxnsgvc9v9jl0qmnxzz5yki1pvg";
+ libraryHaskellDepends = [
+ base containers hashable unordered-containers
+ ];
+ homepage = "https://github.com/metrix-ai/int-multimap";
+ description = "A data structure that associates each Int key with a set of values";
+ license = stdenv.lib.licenses.mit;
+ }) {};
+
"integer-gmp_1_0_1_0" = callPackage
({ mkDerivation, ghc-prim }:
mkDerivation {
@@ -119974,6 +120577,25 @@ self: {
hydraPlatforms = stdenv.lib.platforms.none;
}) {};
+ "invertible_0_2_0_5" = callPackage
+ ({ mkDerivation, base, haskell-src-meta, invariant, lens
+ , partial-isomorphisms, QuickCheck, semigroupoids, template-haskell
+ , transformers
+ }:
+ mkDerivation {
+ pname = "invertible";
+ version = "0.2.0.5";
+ sha256 = "1fwdbg0pimi9hfyp20fsvyxpicjd7jxg4vsh5kykkxviyfhxl2ha";
+ libraryHaskellDepends = [
+ base haskell-src-meta invariant lens partial-isomorphisms
+ semigroupoids template-haskell transformers
+ ];
+ testHaskellDepends = [ base QuickCheck transformers ];
+ description = "bidirectional arrows, bijective functions, and invariant functors";
+ license = stdenv.lib.licenses.bsd3;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ }) {};
+
"invertible-hlist" = callPackage
({ mkDerivation, base, HList, invertible }:
mkDerivation {
@@ -123917,8 +124539,8 @@ self: {
}:
mkDerivation {
pname = "judy";
- version = "0.4.0";
- sha256 = "115991jvp9gg9iy3n8p8y0y39x236v17g5xqchmlfsja1nx9hbzc";
+ version = "0.4.1";
+ sha256 = "0inm77n75066jcjw820cdpklqjfy76i7by4qz136c83x2x7w6fsm";
libraryHaskellDepends = [ base bytestring ghc-prim ];
librarySystemDepends = [ Judy ];
testHaskellDepends = [ base hspec QuickCheck ];
@@ -124182,6 +124804,34 @@ self: {
license = stdenv.lib.licenses.mit;
}) {};
+ "jwt_0_8_0" = callPackage
+ ({ mkDerivation, aeson, base, bytestring, containers, cryptonite
+ , doctest, HsOpenSSL, http-types, HUnit, lens, lens-aeson, memory
+ , network-uri, QuickCheck, RSA, scientific, semigroups, tasty
+ , tasty-hunit, tasty-quickcheck, tasty-th, text, time
+ , unordered-containers, vector
+ }:
+ mkDerivation {
+ pname = "jwt";
+ version = "0.8.0";
+ sha256 = "0ij921vgm0sqlc2ryymqxz6ipgl2iwm0916ny7g5l47qh2fjhcjg";
+ libraryHaskellDepends = [
+ aeson base bytestring containers cryptonite HsOpenSSL http-types
+ memory network-uri RSA scientific semigroups text time
+ unordered-containers vector
+ ];
+ testHaskellDepends = [
+ aeson base bytestring containers cryptonite doctest HsOpenSSL
+ http-types HUnit lens lens-aeson memory network-uri QuickCheck RSA
+ scientific semigroups tasty tasty-hunit tasty-quickcheck tasty-th
+ text time unordered-containers vector
+ ];
+ homepage = "https://bitbucket.org/ssaasen/haskell-jwt";
+ description = "JSON Web Token (JWT) decoding and encoding";
+ license = stdenv.lib.licenses.mit;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ }) {};
+
"kademlia" = callPackage
({ mkDerivation, base, bytestring, containers, HUnit, mtl, network
, QuickCheck, stm, tasty, tasty-hunit, tasty-quickcheck
@@ -125451,8 +126101,8 @@ self: {
({ mkDerivation, base, hspec }:
mkDerivation {
pname = "key-state";
- version = "0.1.0";
- sha256 = "0q5pfayi02xhka2xdn2nwng1cms0lyh6pbysvpxsmbiwzq80p4kp";
+ version = "0.2.0";
+ sha256 = "1n8bp8g2w16mb7ifafx4ypyx393lra4r2vnnmasxjc22fvyiwvsl";
libraryHaskellDepends = [ base ];
testHaskellDepends = [ base hspec ];
homepage = "https://github.com/jxv/key-state#readme";
@@ -127129,8 +127779,8 @@ self: {
pname = "lame";
version = "0.1.1";
sha256 = "0j35zpfhppb09m6h23awxgsawisvgsnrw7d99f5z3xq2bjihjq5k";
- revision = "3";
- editedCabalFile = "041hv4z4xxqidnlr5jgkwp13vj4lr9dvqlrgavl3dmsd07vfj0bc";
+ revision = "4";
+ editedCabalFile = "0r364limqm570a8xd82wwpcvmcx2j7nfndg5kad022vz2v5n0smz";
enableSeparateDataOutput = true;
libraryHaskellDepends = [
base bytestring data-default-class directory exceptions filepath
@@ -127195,17 +127845,17 @@ self: {
"language-ats" = callPackage
({ mkDerivation, alex, ansi-wl-pprint, array, base
, composition-prelude, containers, cpphs, criterion, deepseq, happy
- , hspec, hspec-dirstream, microlens, microlens-th
- , recursion-schemes, system-filepath, transformers
+ , hspec, hspec-dirstream, lens, recursion-schemes, system-filepath
+ , transformers
}:
mkDerivation {
pname = "language-ats";
- version = "1.2.0.6";
- sha256 = "0g1yq11pml5pkpszbzdqkhj172v9zyw8mbf9bl97p883p55p0nxa";
+ version = "1.2.0.8";
+ sha256 = "0609xpjcq294ypjq4blw1cb3a6jnjzm9gwzr54dnp3afhindbq3m";
enableSeparateDataOutput = true;
libraryHaskellDepends = [
ansi-wl-pprint array base composition-prelude containers deepseq
- microlens microlens-th recursion-schemes transformers
+ lens recursion-schemes transformers
];
libraryToolDepends = [ alex cpphs happy ];
testHaskellDepends = [
@@ -127544,6 +128194,32 @@ self: {
license = stdenv.lib.licenses.bsd3;
}) {};
+ "language-ecmascript_0_18" = callPackage
+ ({ mkDerivation, ansi-wl-pprint, base, charset, containers
+ , data-default-class, Diff, directory, filepath, HUnit, mtl, parsec
+ , QuickCheck, template-haskell, test-framework
+ , test-framework-hunit, test-framework-quickcheck2, testing-feat
+ , uniplate
+ }:
+ mkDerivation {
+ pname = "language-ecmascript";
+ version = "0.18";
+ sha256 = "0gg608hniq1v7f1d56akyk44zyrmd0acr33m53cbdlcq8w1c8h70";
+ libraryHaskellDepends = [
+ ansi-wl-pprint base charset containers data-default-class Diff mtl
+ parsec QuickCheck template-haskell testing-feat uniplate
+ ];
+ testHaskellDepends = [
+ ansi-wl-pprint base containers data-default-class Diff directory
+ filepath HUnit mtl parsec QuickCheck test-framework
+ test-framework-hunit test-framework-quickcheck2 uniplate
+ ];
+ homepage = "http://github.com/jswebtools/language-ecmascript";
+ description = "JavaScript parser and pretty-printer library";
+ license = stdenv.lib.licenses.bsd3;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ }) {};
+
"language-ecmascript-analysis" = callPackage
({ mkDerivation, base, containers, language-ecmascript, parsec
, uniplate
@@ -127969,6 +128645,7 @@ self: {
homepage = "https://github.com/blamario/language-oberon";
description = "Parser and pretty-printer for the Oberon programming language";
license = stdenv.lib.licenses.gpl3;
+ hydraPlatforms = stdenv.lib.platforms.none;
}) {};
"language-objc" = callPackage
@@ -128686,6 +129363,7 @@ self: {
homepage = "https://github.com/luna/layered-state";
description = "Control structure similar to Control.Monad.State, allowing multiple nested states, distinguishable by provided phantom types.";
license = stdenv.lib.licenses.asl20;
+ hydraPlatforms = stdenv.lib.platforms.none;
}) {};
"layers" = callPackage
@@ -128773,6 +129451,7 @@ self: {
homepage = "https://github.com/luna/layouting";
description = "General layouting library. Currently supports layouting 2D areas and can be used as a backend for text pretty printing or automatic windows layouting managers.";
license = stdenv.lib.licenses.asl20;
+ hydraPlatforms = stdenv.lib.platforms.none;
}) {};
"lazy-csv" = callPackage
@@ -130822,6 +131501,7 @@ self: {
homepage = "http://redmine.iportnov.ru/projects/libvirt-hs";
description = "FFI bindings to libvirt virtualization API (http://libvirt.org)";
license = stdenv.lib.licenses.bsd3;
+ hydraPlatforms = stdenv.lib.platforms.none;
}) {inherit (pkgs) libvirt;};
"libvorbis" = callPackage
@@ -133281,20 +133961,18 @@ self: {
}) {};
"load-font" = callPackage
- ({ mkDerivation, base, c2hs, fltkhs, text }:
+ ({ mkDerivation, base, c2hs, Cabal }:
mkDerivation {
pname = "load-font";
- version = "0.1.0.0";
- sha256 = "1xva9cxwscjyqpx5yvbicyizk4y439wdv8gzxir2jwkangpvrby5";
- revision = "2";
- editedCabalFile = "0qmz9kmb1cc3cvidxvspa186nkby4m060f6y9v23s3dqp3wd93mm";
+ version = "0.1.0.2";
+ sha256 = "06vzgyi8r1fhlc1ykdfynll7y4a0wwvjq9x0xg08csr4ypfgj6m3";
isLibrary = true;
isExecutable = true;
enableSeparateDataOutput = true;
+ setupHaskellDepends = [ base Cabal ];
libraryHaskellDepends = [ base ];
libraryToolDepends = [ c2hs ];
- executableHaskellDepends = [ base fltkhs text ];
- homepage = "https://github.com/deech/load-font#load-font";
+ homepage = "https://github.com/deech/load-font#readme";
description = "A cross platform library for loading bundled fonts into your application";
license = stdenv.lib.licenses.bsd3;
hydraPlatforms = stdenv.lib.platforms.none;
@@ -133469,18 +134147,6 @@ self: {
}) {};
"loch-th" = callPackage
- ({ mkDerivation, base, pretty, template-haskell }:
- mkDerivation {
- pname = "loch-th";
- version = "0.2.1";
- sha256 = "1kfrjsgzq6wl749n2wm1fhwwigjxcd9lww7whiwjrbmhiz5ism3p";
- libraryHaskellDepends = [ base pretty template-haskell ];
- homepage = "https://github.com/liskin/loch-th";
- description = "Support for precise error locations in source files (Template Haskell version)";
- license = stdenv.lib.licenses.bsd3;
- }) {};
-
- "loch-th_0_2_2" = callPackage
({ mkDerivation, base, pretty, template-haskell }:
mkDerivation {
pname = "loch-th";
@@ -133490,30 +134156,25 @@ self: {
homepage = "https://github.com/liskin/loch-th";
description = "Support for precise error locations in source files (Template Haskell version)";
license = stdenv.lib.licenses.bsd3;
- hydraPlatforms = stdenv.lib.platforms.none;
}) {};
"lock-file" = callPackage
({ mkDerivation, base, data-default-class, directory, exceptions
- , filepath, HUnit, tagged-exception-core, test-framework
- , test-framework-hunit, test-framework-quickcheck2, transformers
+ , filepath, HUnit, test-framework, test-framework-hunit
+ , test-framework-quickcheck2
}:
mkDerivation {
pname = "lock-file";
- version = "0.5.0.2";
- sha256 = "1l4slkykw59p20kw9iqaa4pjczqx701a9z14nvbzwrmgs2acnki7";
- revision = "4";
- editedCabalFile = "0fs4mrhzj90pnc64nvm6k5v095998rxqcq3875aypkgjn2fwfsrc";
+ version = "0.7.0.0";
+ sha256 = "1vpaw3hh1as00p9vbj90cyd8nhjimgyp9hn8axgiwc1l47ddp6vc";
libraryHaskellDepends = [
- base data-default-class directory exceptions tagged-exception-core
- transformers
+ base data-default-class directory exceptions
];
testHaskellDepends = [
base data-default-class directory exceptions filepath HUnit
- tagged-exception-core test-framework test-framework-hunit
- test-framework-quickcheck2 transformers
+ test-framework test-framework-hunit test-framework-quickcheck2
];
- homepage = "https://github.com/trskop/lock-file";
+ homepage = "https://github.com/trskop/lock-file#readme";
description = "Provide exclusive access to a resource using lock file";
license = stdenv.lib.licenses.bsd3;
hydraPlatforms = stdenv.lib.platforms.none;
@@ -135604,8 +136265,8 @@ self: {
}:
mkDerivation {
pname = "machinecell";
- version = "4.0.0";
- sha256 = "1wwrgd1ag104kdx97vii3rh9lj9lg1vg04rr98ldi2ikb90jbgwb";
+ version = "4.0.1";
+ sha256 = "1j2gzs7icvffga3b71dmik5ryb2mivmx5dvzii453nivgcxwyw22";
libraryHaskellDepends = [
base free mtl profunctors semigroups transformers
];
@@ -135846,8 +136507,8 @@ self: {
}:
mkDerivation {
pname = "madlang";
- version = "4.0.2.6";
- sha256 = "079100sdqh4g7mlbf7p1j04r7g6c6b3q58nm4qiy8yrdvbzjdrhv";
+ version = "4.0.2.7";
+ sha256 = "08zi6v7p5wy8764505n7wk69iliab1hy40agz9qvgsq9iqi20h3f";
isLibrary = true;
isExecutable = true;
setupHaskellDepends = [ base Cabal cli-setup ];
@@ -136138,6 +136799,7 @@ self: {
homepage = "https://gitlab.com/igrep/main-tester#readme";
description = "Capture stdout/stderr/exit code, and replace stdin of your main function";
license = stdenv.lib.licenses.asl20;
+ hydraPlatforms = stdenv.lib.platforms.none;
}) {};
"mainland-pretty" = callPackage
@@ -137163,6 +137825,26 @@ self: {
license = stdenv.lib.licenses.mit;
}) {};
+ "markup_4_2_0" = callPackage
+ ({ mkDerivation, attoparsec-uri, base, blaze-html, blaze-markup
+ , clay, comonad, lucid, mmorph, monad-control, monad-logger, mtl
+ , path, path-extra, resourcet, text, transformers-base, urlpath
+ }:
+ mkDerivation {
+ pname = "markup";
+ version = "4.2.0";
+ sha256 = "065pq5m12hk9k6c8lzrgr5mzgz2rzpafhlaql6bvv422j3pbkfgs";
+ libraryHaskellDepends = [
+ attoparsec-uri base blaze-html blaze-markup clay comonad lucid
+ mmorph monad-control monad-logger mtl path path-extra resourcet
+ text transformers-base urlpath
+ ];
+ homepage = "https://github.com/athanclark/markup#readme";
+ description = "Abstraction for HTML-embedded content";
+ license = stdenv.lib.licenses.bsd3;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ }) {};
+
"markup-preview" = callPackage
({ mkDerivation, base, cmdargs, directory, glib, gtk
, gtk2hs-buildtools, MissingH, mtl, pandoc, temporary, text
@@ -137371,8 +138053,8 @@ self: {
}:
mkDerivation {
pname = "massiv";
- version = "0.1.4.0";
- sha256 = "0hp0dvc9qr0px3x2w28wvks3918jc5z1ib2c0n2bfz0isi11gs1s";
+ version = "0.1.6.1";
+ sha256 = "1ifkzalbhp3jv41x9zwsn0ks3ahrab6gs1x57c4y0ww56qf0gv2y";
libraryHaskellDepends = [
base data-default-class deepseq ghc-prim primitive vector
];
@@ -137384,46 +138066,7 @@ self: {
license = stdenv.lib.licenses.bsd3;
}) {};
- "massiv_0_1_5_0" = callPackage
- ({ mkDerivation, base, data-default, data-default-class, deepseq
- , ghc-prim, hspec, primitive, QuickCheck, safe-exceptions, vector
- }:
- mkDerivation {
- pname = "massiv";
- version = "0.1.5.0";
- sha256 = "1azd011abvlkr27rssl6cra8an142z6jrfwj6yaas1favbs6r570";
- libraryHaskellDepends = [
- base data-default-class deepseq ghc-prim primitive vector
- ];
- testHaskellDepends = [
- base data-default deepseq hspec QuickCheck safe-exceptions vector
- ];
- homepage = "https://github.com/lehins/massiv";
- 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
- }:
- mkDerivation {
- pname = "massiv-io";
- version = "0.1.1.0";
- sha256 = "05sj1w06crdncibsknyrhbjwaldsixfw6qncld736ryr1sjcqv6j";
- revision = "1";
- editedCabalFile = "1nsi12h9jcmypim3vd9x1a5czx9cqcnpf12lbi7d1ipmnqclrj3r";
- libraryHaskellDepends = [
- base bytestring data-default deepseq directory filepath JuicyPixels
- massiv netpbm process vector
- ];
- homepage = "https://github.com/lehins/massiv";
- description = "Import/export of Image files into massiv Arrays";
- license = stdenv.lib.licenses.bsd3;
- }) {};
-
- "massiv-io_0_1_2_0" = callPackage
({ mkDerivation, base, bytestring, data-default, deepseq, directory
, filepath, JuicyPixels, massiv, netpbm, process, vector
}:
@@ -137438,7 +138081,6 @@ self: {
homepage = "https://github.com/lehins/massiv";
description = "Import/export of Image files into massiv Arrays";
license = stdenv.lib.licenses.bsd3;
- hydraPlatforms = stdenv.lib.platforms.none;
}) {};
"master-plan" = callPackage
@@ -139486,6 +140128,21 @@ self: {
hydraPlatforms = stdenv.lib.platforms.none;
}) {};
+ "micro-recursion-schemes" = callPackage
+ ({ mkDerivation, base, cpphs, HUnit, template-haskell
+ , th-abstraction
+ }:
+ mkDerivation {
+ pname = "micro-recursion-schemes";
+ version = "5.0.2.1";
+ sha256 = "1n1sza3a87vh74hx1da4mcfwarbjkz2cfvnkldnqwfnqvngq1gaq";
+ libraryHaskellDepends = [ base template-haskell th-abstraction ];
+ libraryToolDepends = [ cpphs ];
+ testHaskellDepends = [ base HUnit template-haskell ];
+ description = "Simple recursion schemes";
+ license = stdenv.lib.licenses.bsd3;
+ }) {};
+
"microbench" = callPackage
({ mkDerivation, base, time }:
mkDerivation {
@@ -140277,6 +140934,27 @@ self: {
license = stdenv.lib.licenses.mit;
}) {};
+ "mime-mail-ses_0_4_1" = callPackage
+ ({ mkDerivation, base, base64-bytestring, byteable, bytestring
+ , conduit, cryptohash, http-client, http-client-tls, http-conduit
+ , http-types, mime-mail, old-locale, text, time, transformers
+ , xml-conduit, xml-types
+ }:
+ mkDerivation {
+ pname = "mime-mail-ses";
+ version = "0.4.1";
+ sha256 = "1w6k4cm5yab9dhg7yn6mp7jzk1zdwpnzc6c1xb3vz3rdwp8jjvx7";
+ libraryHaskellDepends = [
+ base base64-bytestring byteable bytestring conduit cryptohash
+ http-client http-client-tls http-conduit http-types mime-mail
+ old-locale text time transformers xml-conduit xml-types
+ ];
+ homepage = "http://github.com/snoyberg/mime-mail";
+ description = "Send mime-mail messages via Amazon SES";
+ license = stdenv.lib.licenses.mit;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ }) {};
+
"mime-string" = callPackage
({ mkDerivation, base, base64-string, bytestring, iconv, mtl
, network, old-locale, old-time, random
@@ -140615,8 +141293,8 @@ self: {
}:
mkDerivation {
pname = "miniutter";
- version = "0.4.6.0";
- sha256 = "093ahw66byzgc9scvmlihl3sa2zph9mszpf9kdjd9ydi5gv6mrmx";
+ version = "0.4.7.0";
+ sha256 = "10nwg3vw0p8hb8hgc34xspg4vrwf8xyhi22b9j57ms3045marjdd";
libraryHaskellDepends = [
base binary containers ghc-prim minimorph text
];
@@ -140751,15 +141429,15 @@ self: {
license = stdenv.lib.licenses.bsd3;
}) {};
- "miso_0_18_0_0" = callPackage
+ "miso_0_19_0_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.18.0.0";
- sha256 = "17znwg6spm950qnjrw2v72lff5xng4c1rpcq3140qkmcq99v1zvi";
+ version = "0.19.0.0";
+ sha256 = "0xnnhs36rnbaq8q4s6r2lhm9g4qdvm0qm0pj3hgrkgn22cs2fq21";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [
@@ -141280,8 +141958,8 @@ self: {
({ mkDerivation, base, doctest, Glob }:
mkDerivation {
pname = "modular-arithmetic";
- version = "1.2.1.2";
- sha256 = "0xm1p63r4a8gdpsrdrsf80bihra11blnik2gwvlpph494pvk27wj";
+ version = "1.2.1.3";
+ sha256 = "1f5k25gqnn037fpan3l956ly0g5cgwnw7qxyc6sm6hgdcl91wn1l";
libraryHaskellDepends = [ base ];
testHaskellDepends = [ base doctest Glob ];
homepage = "https://github.com/TikhonJelvis/modular-arithmetic";
@@ -141518,6 +142196,7 @@ self: {
homepage = "https://github.com/mvv/monad-abort-fd";
description = "A better error monad transformer";
license = stdenv.lib.licenses.bsd3;
+ hydraPlatforms = stdenv.lib.platforms.none;
}) {};
"monad-atom" = callPackage
@@ -141766,6 +142445,7 @@ self: {
homepage = "https://github.com/mvv/monad-finally";
description = "Guard monadic computations with cleanup actions";
license = stdenv.lib.licenses.bsd3;
+ hydraPlatforms = stdenv.lib.platforms.none;
}) {};
"monad-fork" = callPackage
@@ -141942,19 +142622,42 @@ self: {
}:
mkDerivation {
pname = "monad-logger";
- version = "0.3.28.3";
- sha256 = "11v5014zqp1sl801wc39yyix8m30vrf3ibas28bcdjyfrbhhvskp";
+ version = "0.3.28.4";
+ sha256 = "1pqay81lk6divcfslg4dqcpyq2wv7vpdzb73kb2g4203mmpjcpv4";
libraryHaskellDepends = [
base bytestring conduit conduit-extra exceptions fast-logger
lifted-base monad-control monad-loops mtl resourcet stm stm-chans
template-haskell text transformers transformers-base
transformers-compat unliftio-core
];
- homepage = "https://github.com/kazu-yamamoto/logger";
+ homepage = "https://github.com/snoyberg/monad-logger#readme";
description = "A class of monads which can log messages";
license = stdenv.lib.licenses.mit;
}) {};
+ "monad-logger_0_3_28_5" = callPackage
+ ({ mkDerivation, base, bytestring, conduit, conduit-extra
+ , exceptions, fast-logger, lifted-base, monad-control, monad-loops
+ , mtl, resourcet, stm, stm-chans, template-haskell, text
+ , transformers, transformers-base, transformers-compat
+ , unliftio-core
+ }:
+ mkDerivation {
+ pname = "monad-logger";
+ version = "0.3.28.5";
+ sha256 = "1w9700v2vbrydpwr5jjivnkrqcrbl7xbklym0w15qdqd5p6xfpi2";
+ libraryHaskellDepends = [
+ base bytestring conduit conduit-extra exceptions fast-logger
+ lifted-base monad-control monad-loops mtl resourcet stm stm-chans
+ template-haskell text transformers transformers-base
+ transformers-compat unliftio-core
+ ];
+ homepage = "https://github.com/snoyberg/monad-logger#readme";
+ description = "A class of monads which can log messages";
+ license = stdenv.lib.licenses.mit;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ }) {};
+
"monad-logger-json" = callPackage
({ mkDerivation, aeson, base, monad-logger, template-haskell, text
}:
@@ -142675,8 +143378,8 @@ self: {
}:
mkDerivation {
pname = "monadcryptorandom";
- version = "0.7.2";
- sha256 = "12inwjh1smgrp62hvrca7608vjaff576503xi7ymbkq9szk8rkj9";
+ version = "0.7.2.1";
+ sha256 = "03bn19wkshs9bjfl65p8klagydva6c543zasibv3y0w1hrpknib9";
libraryHaskellDepends = [
base bytestring crypto-api exceptions mtl tagged transformers
transformers-compat
@@ -143155,21 +143858,6 @@ self: {
}) {};
"monoid-extras" = callPackage
- ({ mkDerivation, base, criterion, groups, semigroupoids, semigroups
- }:
- mkDerivation {
- pname = "monoid-extras";
- version = "0.4.3";
- sha256 = "1c2zdsyq0iyagzp9y64j75nxvpbjr5y3fdg8cd1pkfqgms977qsr";
- revision = "1";
- editedCabalFile = "08961ibwiqks8qw5cwpkzpz3acrlrd48l2sl1qny96gycaslzrps";
- libraryHaskellDepends = [ base groups semigroupoids semigroups ];
- benchmarkHaskellDepends = [ base criterion ];
- description = "Various extra monoid-related definitions and utilities";
- license = stdenv.lib.licenses.bsd3;
- }) {};
-
- "monoid-extras_0_4_4" = callPackage
({ mkDerivation, base, criterion, groups, semigroupoids, semigroups
}:
mkDerivation {
@@ -143180,7 +143868,6 @@ self: {
benchmarkHaskellDepends = [ base criterion ];
description = "Various extra monoid-related definitions and utilities";
license = stdenv.lib.licenses.bsd3;
- hydraPlatforms = stdenv.lib.platforms.none;
}) {};
"monoid-owns" = callPackage
@@ -143718,28 +144405,28 @@ self: {
}) {};
"mp" = callPackage
- ({ mkDerivation, base, binary, bytestring, ConfigFile, daemons
- , directory, filepath, glib, gstreamer, hgettext, MissingH, mtl
- , network, random, setlocale, text, unix, unordered-containers
- , utf8-string, vty, vty-ui
+ ({ mkDerivation, async, base, binary, ConfigFile, containers
+ , daemons, directory, exceptions, filepath, gi-glib, gi-gobject
+ , gi-gst, haskell-gi-base, haskell-gi-overloading, lens, MissingH
+ , mtl, network, random, resourcet, simple-ui, template-haskell
+ , text, utf8-string, vty
}:
mkDerivation {
pname = "mp";
- version = "0.2.2";
- sha256 = "1klz2ykglgkvxs66j5iacjbx5cv5gq0y4d12g68ng2pcmpwc93ir";
- revision = "1";
- editedCabalFile = "1cc85zdja69m16h32ii1jw1qkfz7jq3gp0m0m6pfaj146l8qcmwc";
+ version = "1.0.2";
+ sha256 = "07npcr1rjypjbxrv3hccqfac3piq00psc7yxgh7iw8pl8izqrwl7";
isLibrary = false;
isExecutable = true;
enableSeparateDataOutput = true;
executableHaskellDepends = [
- base binary bytestring ConfigFile daemons directory filepath glib
- gstreamer hgettext MissingH mtl network random setlocale text unix
- unordered-containers utf8-string vty vty-ui
+ async base binary ConfigFile containers daemons directory
+ exceptions filepath gi-glib gi-gobject gi-gst haskell-gi-base
+ haskell-gi-overloading lens MissingH mtl network random resourcet
+ simple-ui template-haskell text utf8-string vty
];
- homepage = "https://bitbucket.org/borekpiotr/linux-music-player";
+ homepage = "http://bitbucket.org/borekpiotr/linux-music-player";
description = "Music player for linux";
- license = "GPL";
+ license = stdenv.lib.licenses.gpl2;
hydraPlatforms = stdenv.lib.platforms.none;
}) {};
@@ -144866,6 +145553,28 @@ self: {
license = stdenv.lib.licenses.bsd3;
}) {};
+ "multistate_0_8_0_0" = callPackage
+ ({ mkDerivation, base, hspec, monad-control, mtl, tagged
+ , transformers, transformers-base
+ }:
+ mkDerivation {
+ pname = "multistate";
+ version = "0.8.0.0";
+ sha256 = "0sax983yjzcbailza3fpjjszg4vn0wb11wjr11jskk22lccbagq1";
+ revision = "1";
+ editedCabalFile = "1p5xf8i7y56fb4m7is0x1z852cq82sv0342z1h4qz1mi8vpln7zz";
+ isLibrary = true;
+ isExecutable = true;
+ libraryHaskellDepends = [
+ base monad-control mtl tagged transformers transformers-base
+ ];
+ testHaskellDepends = [ base hspec transformers ];
+ homepage = "https://github.com/lspitzner/multistate";
+ description = "like mtl's ReaderT / WriterT / StateT, but more than one contained value/type";
+ license = stdenv.lib.licenses.bsd3;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ }) {};
+
"multivariant" = callPackage
({ mkDerivation, base, containers, free, HUnit, invertible
, MonadRandom, profunctors, QuickCheck, semigroupoids, tasty
@@ -147601,23 +148310,6 @@ self: {
}) {};
"netwire-input-glfw" = callPackage
- ({ mkDerivation, base, containers, GLFW-b, mtl, netwire-input, stm
- }:
- mkDerivation {
- pname = "netwire-input-glfw";
- version = "0.0.8";
- sha256 = "1nf0ikx6cfsm9xh4zmz64iwq4w92g0g3zalsk3zzd0a7pq74cdz9";
- isLibrary = true;
- isExecutable = true;
- libraryHaskellDepends = [
- base containers GLFW-b mtl netwire-input stm
- ];
- homepage = "https://www.github.com/Mokosha/netwire-input-glfw";
- description = "GLFW instance of netwire-input";
- license = stdenv.lib.licenses.mit;
- }) {};
-
- "netwire-input-glfw_0_0_10" = callPackage
({ mkDerivation, base, containers, deepseq, GLFW-b, mtl
, netwire-input, stm
}:
@@ -147633,7 +148325,6 @@ self: {
homepage = "https://www.github.com/Mokosha/netwire-input-glfw";
description = "GLFW instance of netwire-input";
license = stdenv.lib.licenses.mit;
- hydraPlatforms = stdenv.lib.platforms.none;
}) {};
"netwire-input-javascript" = callPackage
@@ -148974,8 +149665,8 @@ self: {
}:
mkDerivation {
pname = "ngx-export";
- version = "1.4.0";
- sha256 = "16gs4wmv8qd8zlm2clsd2h4gcj8fsad6s926nspnbyznbmsbg6p2";
+ version = "1.4.1";
+ sha256 = "1a9swysq72igyfbqw078fj3j8vw6hw1v5h4f64kh9wvvdcrdl2rh";
libraryHaskellDepends = [
async base binary bytestring deepseq monad-loops template-haskell
unix
@@ -150334,17 +151025,18 @@ self: {
}) {};
"number-length" = callPackage
- ({ mkDerivation, base, criterion, HUnit, QuickCheck, test-framework
- , test-framework-hunit, test-framework-quickcheck2
+ ({ mkDerivation, base, criterion, HUnit, QuickCheck
+ , quickcheck-instances, test-framework, test-framework-hunit
+ , test-framework-quickcheck2
}:
mkDerivation {
pname = "number-length";
- version = "0.2.0.0";
- sha256 = "1jrlq7qdi7lcpkqqv9qafcgci2gc8rb3f3lv177s8narfdprx2hz";
+ version = "0.2.1.0";
+ sha256 = "1cdlwdas09q39jag5jl398wmw7ifbgdpp6p5kh0fi71m1c4f05w9";
libraryHaskellDepends = [ base ];
testHaskellDepends = [
- base HUnit QuickCheck test-framework test-framework-hunit
- test-framework-quickcheck2
+ base HUnit QuickCheck quickcheck-instances test-framework
+ test-framework-hunit test-framework-quickcheck2
];
benchmarkHaskellDepends = [ base criterion ];
homepage = "https://github.com/trskop/number-length";
@@ -150686,6 +151378,7 @@ self: {
homepage = "https://github.com/tonyday567/numhask#readme";
description = "A numeric prelude";
license = stdenv.lib.licenses.bsd3;
+ hydraPlatforms = stdenv.lib.platforms.none;
}) {};
"numhask-range" = callPackage
@@ -154443,8 +155136,8 @@ self: {
libraryToolDepends = [ c2hs ];
description = "Haskell binding for C PAM API";
license = stdenv.lib.licenses.bsd3;
- hydraPlatforms = [ "i686-linux" "x86_64-linux" ];
- }) {inherit (pkgs) pam;};
+ hydraPlatforms = stdenv.lib.platforms.none;
+ }) {pam = null;};
"panda" = callPackage
({ mkDerivation, base, cgi, containers, data-default, directory
@@ -154793,10 +155486,8 @@ self: {
({ mkDerivation, base, containers, lens, pandoc-types }:
mkDerivation {
pname = "pandoc-lens";
- version = "0.6.2";
- sha256 = "18v22salncjdghpg6gz78mpf9wp5qk622jia77qwlh9di36jdqg5";
- revision = "1";
- editedCabalFile = "1b3qk1afdd9l6i625spm26cgzmmd3bqmyp0lfszjnaf32ac7sldd";
+ version = "0.6.3";
+ sha256 = "1gv9n753qp8l7fivi96sgb8qsia5bijw2fla21dxyn81qza3fk6v";
libraryHaskellDepends = [ base containers lens pandoc-types ];
homepage = "http://github.com/bgamari/pandoc-lens";
description = "Lenses for Pandoc documents";
@@ -156692,15 +157383,21 @@ self: {
license = stdenv.lib.licenses.bsd3;
}) {};
- "path-extra_0_1_1" = callPackage
- ({ mkDerivation, base, path }:
+ "path-extra_0_2_0" = callPackage
+ ({ mkDerivation, attoparsec, base, path, QuickCheck
+ , quickcheck-instances, tasty, tasty-quickcheck, text
+ }:
mkDerivation {
pname = "path-extra";
- version = "0.1.1";
- sha256 = "0dyhazqz8gz6fk79v76j9kw7bj001njdvc0b3wpl6an3dqw8hy9j";
- libraryHaskellDepends = [ base path ];
+ version = "0.2.0";
+ sha256 = "0fh4m3vidf75j43rk1n46y3bsn0j4247bz71s35651vi9s8vw27b";
+ libraryHaskellDepends = [ attoparsec base path text ];
+ testHaskellDepends = [
+ attoparsec base path QuickCheck quickcheck-instances tasty
+ tasty-quickcheck text
+ ];
homepage = "https://github.com/athanclark/path-extra#readme";
- description = "Some extensions to Chris Done's path library, for use with urlpath and attoparsec-uri";
+ description = "URLs without host information";
license = stdenv.lib.licenses.bsd3;
hydraPlatforms = stdenv.lib.platforms.none;
}) {};
@@ -156713,8 +157410,8 @@ self: {
pname = "path-io";
version = "1.3.3";
sha256 = "1g9m3qliqjk1img894wsb89diym5zrq51qkkrwhz4sbm9a8hbv1a";
- revision = "2";
- editedCabalFile = "1zipck6lhhff9v86s4awgl6z35znjd7wcy1x25xplsdrxpzps3nl";
+ revision = "3";
+ editedCabalFile = "1h9hsibbflkxpjl2fqamqiv3x3gasf51apnmklrs9l9x8r32hzcc";
libraryHaskellDepends = [
base containers directory dlist exceptions filepath path temporary
time transformers unix-compat
@@ -156792,14 +157489,15 @@ self: {
"paths" = callPackage
({ mkDerivation, base, bytestring, deepseq, directory, filepath
- , time
+ , template-haskell, text, time
}:
mkDerivation {
pname = "paths";
- version = "0.1";
- sha256 = "0cccvc2p04rmhbg61jaa592jd86dp08ipamk3ddvswr5ih3rhdgx";
+ version = "0.2.0.0";
+ sha256 = "18pzjlnmx7w79riig7qzyhw13jla92lals9lwayl23qr02ndna4v";
libraryHaskellDepends = [
- base bytestring deepseq directory filepath time
+ base bytestring deepseq directory filepath template-haskell text
+ time
];
description = "Library for representing and manipulating type-safe file paths";
license = stdenv.lib.licenses.bsd3;
@@ -158146,8 +158844,8 @@ self: {
}:
mkDerivation {
pname = "persistent";
- version = "2.8.1";
- sha256 = "1mfk6mxicg12vnvc9049k55dgvcx4ss4z2219qr8wy89m2z72l1k";
+ version = "2.8.2";
+ sha256 = "1h0yijbf1yiwl50klyafy4ln99j8bib4kgbzviw7fc4y4mwv4sv9";
libraryHaskellDepends = [
aeson attoparsec base base64-bytestring blaze-html blaze-markup
bytestring conduit containers fast-logger haskell-src-meta
@@ -159587,6 +160285,7 @@ self: {
];
description = "dice game";
license = stdenv.lib.licenses.bsd3;
+ hydraPlatforms = stdenv.lib.platforms.none;
}) {};
"piki" = callPackage
@@ -161244,6 +161943,7 @@ self: {
homepage = "https://github.com/phlummox/hs-plex#readme";
description = "run a subprocess, combining stdout and stderr";
license = stdenv.lib.licenses.mit;
+ hydraPlatforms = stdenv.lib.platforms.none;
}) {};
"plist" = callPackage
@@ -161618,8 +162318,8 @@ self: {
({ mkDerivation, base, bytestring, containers, hspec }:
mkDerivation {
pname = "plural";
- version = "0.0.1";
- sha256 = "15hbvr565qvm608241xnx8sicspl2200jqbxd138a14qfi5aplc0";
+ version = "0.0.2";
+ sha256 = "1f35w7rzwq6f1zzdpglij41ra8pwyzjklv2pbnpmbp9q6rpi836p";
libraryHaskellDepends = [ base bytestring containers ];
testHaskellDepends = [ base hspec ];
description = "Pluralize";
@@ -161847,8 +162547,8 @@ self: {
}:
mkDerivation {
pname = "pointfree-fancy";
- version = "1.1.1.5";
- sha256 = "0wrsk5l83dzq0pv0dy24gil0mipw1yalalivjq92qx0dv68z15ja";
+ version = "1.1.1.7";
+ sha256 = "1xw2p96ghclfxmc12kwxyh25r5k9k6h3zriaf38wz5d3j36npa7w";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [
@@ -162306,30 +163006,6 @@ self: {
}) {};
"pomaps" = callPackage
- ({ mkDerivation, base, ChasingBottoms, containers, criterion
- , deepseq, doctest, ghc-prim, Glob, lattices, random, tasty
- , tasty-hspec, tasty-quickcheck, vector
- }:
- mkDerivation {
- pname = "pomaps";
- version = "0.0.0.3";
- sha256 = "1gxfaqcg6d9wkm67d8rrjvigy9kvvh9403v3jk790x9pfydcjvym";
- libraryHaskellDepends = [
- base containers deepseq ghc-prim lattices
- ];
- testHaskellDepends = [
- base ChasingBottoms containers doctest Glob lattices tasty
- tasty-hspec tasty-quickcheck
- ];
- benchmarkHaskellDepends = [
- base criterion deepseq lattices random vector
- ];
- homepage = "https://github.com/sgraf812/pomaps#readme";
- description = "Maps and sets of partial orders";
- license = stdenv.lib.licenses.mit;
- }) {};
-
- "pomaps_0_0_0_4" = callPackage
({ mkDerivation, base, ChasingBottoms, containers, criterion
, deepseq, doctest, ghc-prim, Glob, lattices, random, tasty
, tasty-hspec, tasty-quickcheck, vector
@@ -162351,7 +163027,6 @@ self: {
homepage = "https://github.com/sgraf812/pomaps#readme";
description = "Maps and sets of partial orders";
license = stdenv.lib.licenses.mit;
- hydraPlatforms = stdenv.lib.platforms.none;
}) {};
"pomodoro" = callPackage
@@ -163081,8 +163756,8 @@ self: {
}:
mkDerivation {
pname = "postgresql-connector";
- version = "0.2.4";
- sha256 = "0ly6p75c7vsrwlc7zsb91k19ffz0va6xc38djyc184qlji52hr1w";
+ version = "0.2.5";
+ sha256 = "0ilw7z16jzlys3pv4bvdd5ajprq4dbzgg3ivwpgzxrpnh2mfjkqq";
libraryHaskellDepends = [
base bytestring exceptions lens mtl postgresql-simple resource-pool
resourcet time transformers-base
@@ -164043,8 +164718,8 @@ self: {
}:
mkDerivation {
pname = "preamble";
- version = "0.0.60";
- sha256 = "1ygpyaniv4f9ahmnrpkirhmfry40afqwaici4ksrnr3pz64fsll5";
+ version = "0.0.61";
+ sha256 = "16zs8mqmbvzi4pmjqmga3d17mjk6kriclv3qg3rxhs3rd2gyipqa";
libraryHaskellDepends = [
aeson base basic-prelude exceptions fast-logger lens lifted-base
monad-control monad-logger MonadRandom mtl network resourcet safe
@@ -164597,6 +165272,8 @@ self: {
pname = "pretty-compact";
version = "3.0";
sha256 = "06m8n5rx1d62hwd017ss8nlxas5ia57lgxddm2hv2046938a5wm8";
+ revision = "2";
+ editedCabalFile = "04c309cdfrfwh031g8syyrwwn0lxdjj9f7d8szabscm19zwbi399";
libraryHaskellDepends = [ base base-compat containers ];
benchmarkHaskellDepends = [
aeson base base-compat bytestring criterion deepseq pretty text
@@ -165037,6 +165714,18 @@ self: {
license = stdenv.lib.licenses.bsd3;
}) {};
+ "primitive-checked" = callPackage
+ ({ mkDerivation, base, primitive }:
+ mkDerivation {
+ pname = "primitive-checked";
+ version = "0.6.3.0";
+ sha256 = "02097f658qidmcfaisrcl4k3vmipx8w8p6mcbnajc8ndb3m58bbl";
+ libraryHaskellDepends = [ base primitive ];
+ homepage = "https://github.com/andrewthad/primitive-checked#readme";
+ description = "primitive functions with bounds-checking";
+ license = stdenv.lib.licenses.bsd3;
+ }) {};
+
"primitive-simd" = callPackage
({ mkDerivation, base, criterion, deepseq, ghc-prim, primitive
, random, vector
@@ -165666,9 +166355,10 @@ self: {
({ mkDerivation, base, template-haskell, th-data-compat }:
mkDerivation {
pname = "product-isomorphic";
- version = "0.0.3.1";
- sha256 = "1vm502d3byxiyd01h3pddar9wvh522awvi3awsb34p8s2w01p70i";
+ version = "0.0.3.2";
+ sha256 = "1yqpfdbdq0zh69mbpgns8faj0ajc9a8wgp3c8sgn373py2as9jxl";
libraryHaskellDepends = [ base template-haskell th-data-compat ];
+ testHaskellDepends = [ base template-haskell ];
homepage = "http://github.com/khibino/haskell-product-isomorphic";
description = "Weaken applicative functor on products";
license = stdenv.lib.licenses.bsd3;
@@ -166123,8 +166813,8 @@ self: {
}:
mkDerivation {
pname = "prologue";
- version = "3.1.3";
- sha256 = "1nzm4hgjwpbxmvd1y1x58smxbk5ahfyygi22jwwyzqaknrgs5ara";
+ version = "3.1.7";
+ sha256 = "024ygn8q24sxdxdr1mip9pcjjmzm254am7fyzbqpmj5cjg1kykq6";
libraryHaskellDepends = [
base bifunctors binary comonad cond container convert data-default
deepseq deriving-compat either errors exceptions functor-utils
@@ -170078,6 +170768,32 @@ self: {
license = stdenv.lib.licenses.mit;
}) {};
+ "rakuten_0_1_1_1" = callPackage
+ ({ mkDerivation, aeson, base, bytestring, connection, constraints
+ , data-default-class, extensible, hspec, http-api-data, http-client
+ , http-client-tls, http-types, lens, req, servant-server, text
+ , warp
+ }:
+ mkDerivation {
+ pname = "rakuten";
+ version = "0.1.1.1";
+ sha256 = "01p6f8vapygcw6viwq7kkg6b5fifqzbkski0763x9by49h5gpbsi";
+ libraryHaskellDepends = [
+ aeson base bytestring connection constraints data-default-class
+ extensible http-api-data http-client http-client-tls http-types
+ lens req text
+ ];
+ testHaskellDepends = [
+ aeson base bytestring connection constraints data-default-class
+ extensible hspec http-api-data http-client http-client-tls
+ http-types lens req servant-server text warp
+ ];
+ homepage = "https://github.com/matsubara0507/rakuten#readme";
+ description = "The Rakuten API in Haskell";
+ license = stdenv.lib.licenses.mit;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ }) {};
+
"ralist" = callPackage
({ mkDerivation, base, criterion, deepseq, hspec }:
mkDerivation {
@@ -171014,8 +171730,8 @@ self: {
}:
mkDerivation {
pname = "rattletrap";
- version = "4.0.7";
- sha256 = "1ry5z8dc8hqq5sqxjz23mssk4symnl98zrm77hnfsfapx7jg8b8x";
+ version = "4.0.8";
+ sha256 = "05rad5dckya26mai39623n5bvhvk13yjxikrc6r7yc6nvlkkh8zb";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [
@@ -171330,8 +172046,8 @@ self: {
}:
mkDerivation {
pname = "rdf4h";
- version = "3.0.2";
- sha256 = "0a9klg4a6ilgmv1p3aa55p5pdimgs9xays8msy01gz38441nnpd3";
+ version = "3.0.3";
+ sha256 = "0lidqww0d8ckm4iipjx4gq32jspxidz0g009m5xrf8x6qsl26sx0";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [
@@ -175085,8 +175801,8 @@ self: {
pname = "req-conduit";
version = "1.0.0";
sha256 = "193bv4jp7rrbpb1i9as9s2l978wz5kbz5kvr7ppllif5ppj699qx";
- revision = "2";
- editedCabalFile = "1cbzvqfs8glr004viya4x3p08x8lmkrgwwxjy78s32xkf8b2xxpr";
+ revision = "3";
+ editedCabalFile = "1gnaq7ya4grjwadz58r9g10dybgg50ch89bhbnhyicdins2aa9b2";
libraryHaskellDepends = [
base bytestring conduit http-client req resourcet transformers
];
@@ -175456,23 +176172,6 @@ self: {
}) {};
"resourcet" = callPackage
- ({ mkDerivation, base, containers, exceptions, hspec, mtl
- , primitive, transformers, unliftio-core
- }:
- mkDerivation {
- pname = "resourcet";
- version = "1.2.0";
- sha256 = "09pscvkfr4cnicipdmx156xbxshg9aqgy0z3h0lcvxbhl5qwjp89";
- libraryHaskellDepends = [
- base containers exceptions mtl primitive transformers unliftio-core
- ];
- testHaskellDepends = [ base hspec transformers ];
- homepage = "http://github.com/snoyberg/conduit";
- description = "Deterministic allocation and freeing of scarce resources";
- license = stdenv.lib.licenses.bsd3;
- }) {};
-
- "resourcet_1_2_1" = callPackage
({ mkDerivation, base, containers, exceptions, hspec, mtl
, primitive, transformers, unliftio-core
}:
@@ -175487,7 +176186,6 @@ self: {
homepage = "http://github.com/snoyberg/conduit";
description = "Deterministic allocation and freeing of scarce resources";
license = stdenv.lib.licenses.bsd3;
- hydraPlatforms = stdenv.lib.platforms.none;
}) {};
"respond" = callPackage
@@ -176466,8 +177164,8 @@ self: {
}:
mkDerivation {
pname = "rio";
- version = "0.1.0.0";
- sha256 = "0k3r7859in1dyybc7lr3bqh91harf7g5yknwxmmsqnhlffzc6ygr";
+ version = "0.1.1.0";
+ sha256 = "0mr78bd5xcq4gxc7vhz1k70gxbng2rbpip648fs4k0hb7gf2z0ds";
libraryHaskellDepends = [
base bytestring containers deepseq directory exceptions filepath
hashable microlens mtl primitive process text time typed-process
@@ -177891,8 +178589,8 @@ self: {
}:
mkDerivation {
pname = "rtcm";
- version = "0.2.15";
- sha256 = "0si1cj5py2dwcdxwy2yix9bbfmx7gysbdshy5ql38r963yjdhfxs";
+ version = "0.2.16";
+ sha256 = "0sfllzq97yl1dn3f9avi538121kn7bj5syc27g7139fqrjhvjy18";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [
@@ -178381,6 +179079,17 @@ self: {
license = stdenv.lib.licenses.bsd3;
}) {};
+ "safe-coerce" = callPackage
+ ({ mkDerivation, base }:
+ mkDerivation {
+ pname = "safe-coerce";
+ version = "0.1.0.0";
+ sha256 = "0qv4a6p547cnyvchnjrya8paq39gqpnbska9v5l64lqn3a28yk8p";
+ libraryHaskellDepends = [ base ];
+ description = "A friendly shorthand for an old friend";
+ license = stdenv.lib.licenses.bsd3;
+ }) {};
+
"safe-exceptions" = callPackage
({ mkDerivation, base, deepseq, exceptions, hspec, transformers
, void
@@ -178504,19 +179213,20 @@ self: {
"safe-money" = callPackage
({ mkDerivation, aeson, base, binary, bytestring, cereal
, constraints, deepseq, hashable, serialise, store, tasty
- , tasty-hunit, tasty-quickcheck, text, xmlbf
+ , tasty-hunit, tasty-quickcheck, text, vector-space, xmlbf
}:
mkDerivation {
pname = "safe-money";
- version = "0.4.1";
- sha256 = "1ql02j1xb3m35y7axi3hsig894jzwzsm4l28ssms2m70lmbwv0qb";
+ version = "0.5";
+ sha256 = "09ia4sf98ggl2y8xl0gn1vjapvwbbqq3ibfrci2p2akkyykg2vk8";
libraryHaskellDepends = [
aeson base binary cereal constraints deepseq hashable serialise
- store text xmlbf
+ store text vector-space xmlbf
];
testHaskellDepends = [
aeson base binary bytestring cereal constraints deepseq hashable
- serialise store tasty tasty-hunit tasty-quickcheck text xmlbf
+ serialise store tasty tasty-hunit tasty-quickcheck text
+ vector-space xmlbf
];
homepage = "https://github.com/k0001/safe-money";
description = "Type-safe and lossless encoding and manipulation of money, fiat currencies, crypto currencies and precious metals";
@@ -178789,16 +179499,17 @@ self: {
"saltine" = callPackage
({ mkDerivation, base, bytestring, libsodium, profunctors
- , QuickCheck, test-framework, test-framework-quickcheck2
+ , QuickCheck, semigroups, test-framework
+ , test-framework-quickcheck2
}:
mkDerivation {
pname = "saltine";
- version = "0.1.0.0";
- sha256 = "1hkdvw4fr2p2wmgq9ghna0kq9x9yv3kc9sm9wh0c71cl7gxk9g52";
+ version = "0.1.0.1";
+ sha256 = "05m3w0xibnhk3whzp7rzn2y2hv9f2i8pyvjnmzsxwbs8ws30cac5";
libraryHaskellDepends = [ base bytestring profunctors ];
libraryPkgconfigDepends = [ libsodium ];
testHaskellDepends = [
- base bytestring QuickCheck test-framework
+ base bytestring QuickCheck semigroups test-framework
test-framework-quickcheck2
];
description = "Cryptography that's easy to digest (NaCl/libsodium bindings)";
@@ -179000,6 +179711,25 @@ self: {
license = stdenv.lib.licenses.mit;
}) {};
+ "sampling_0_3_3" = callPackage
+ ({ mkDerivation, base, containers, criterion, foldl, mwc-random
+ , primitive, vector
+ }:
+ mkDerivation {
+ pname = "sampling";
+ version = "0.3.3";
+ sha256 = "038fl0mdim3r25jsj8bgvnmkd7iy00hpwbc0yqwijsqyss9xrgn8";
+ libraryHaskellDepends = [
+ base containers foldl mwc-random primitive vector
+ ];
+ testHaskellDepends = [ base ];
+ benchmarkHaskellDepends = [ base criterion ];
+ homepage = "https://github.com/jtobin/sampling";
+ description = "Sample values from collections";
+ license = stdenv.lib.licenses.mit;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ }) {};
+
"samtools" = callPackage
({ mkDerivation, base, bytestring, c2hs, seqloc, vector, zlib }:
mkDerivation {
@@ -179338,6 +180068,25 @@ self: {
hydraPlatforms = stdenv.lib.platforms.none;
}) {};
+ "sax" = callPackage
+ ({ mkDerivation, base, bytestring, deepseq, hspec, mtl, streaming
+ , text, xeno
+ }:
+ mkDerivation {
+ pname = "sax";
+ version = "0.1.0.0";
+ sha256 = "08hw88sccb1jb6iki622a988b8j5panbnjpgqcmsi1yx2c9nyxkj";
+ revision = "3";
+ editedCabalFile = "1gzalbr1v4x99cgrbs5s81fr2y0lzh0qhhi7r5fbxigc2yk9z0gg";
+ libraryHaskellDepends = [
+ base bytestring deepseq mtl streaming text xeno
+ ];
+ testHaskellDepends = [ base bytestring hspec ];
+ homepage = "https://github.com/dredozubov/sax-parser";
+ description = "Monadic streaming XML parser";
+ license = stdenv.lib.licenses.bsd3;
+ }) {};
+
"say" = callPackage
({ mkDerivation, base, bytestring, criterion, hspec, temporary
, text, transformers
@@ -179383,6 +180132,34 @@ self: {
license = stdenv.lib.licenses.lgpl3;
}) {};
+ "sbp_2_3_16" = callPackage
+ ({ mkDerivation, aeson, array, base, base64-bytestring
+ , basic-prelude, binary, binary-conduit, bytestring, conduit
+ , conduit-extra, data-binary-ieee754, lens, lens-aeson, monad-loops
+ , resourcet, tasty, tasty-hunit, template-haskell, text, time, yaml
+ }:
+ mkDerivation {
+ pname = "sbp";
+ version = "2.3.16";
+ sha256 = "0m8i5n47bzlifp5pq6hkal7zbjga5j305sfccgjyrbiwpp1sxfg3";
+ isLibrary = true;
+ isExecutable = true;
+ libraryHaskellDepends = [
+ aeson array base base64-bytestring basic-prelude binary bytestring
+ data-binary-ieee754 lens lens-aeson monad-loops template-haskell
+ text
+ ];
+ executableHaskellDepends = [
+ aeson base basic-prelude binary-conduit bytestring conduit
+ conduit-extra resourcet time yaml
+ ];
+ testHaskellDepends = [ base basic-prelude tasty tasty-hunit ];
+ homepage = "https://github.com/swift-nav/libsbp";
+ description = "SwiftNav's SBP Library";
+ license = stdenv.lib.licenses.lgpl3;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ }) {};
+
"sbp2udp" = callPackage
({ mkDerivation, base, basic-prelude, binary, binary-conduit
, bytestring, conduit, conduit-extra, network, optparse-generic
@@ -180870,22 +181647,22 @@ self: {
"sdr" = callPackage
({ mkDerivation, array, base, bytestring, cairo, cereal, Chart
, Chart-cairo, colour, containers, criterion, Decimal
- , dynamic-graph, either, fftwRaw, GLFW-b, mwc-random, OpenGL
+ , dynamic-graph, fftwRaw, GLFW-b, mwc-random, OpenGL
, optparse-applicative, pango, pipes, pipes-bytestring
, pipes-concurrency, primitive, pulse-simple, QuickCheck, rtlsdr
, storable-complex, test-framework, test-framework-quickcheck2
- , time, tuple, vector
+ , time, transformers, tuple, vector
}:
mkDerivation {
pname = "sdr";
- version = "0.1.0.10";
- sha256 = "1cjp05sk558vcwasbi15j6qzpa9icfqcyjsvz3a4b2fb59z6gv6z";
+ version = "0.1.0.11";
+ sha256 = "0gkf7ql1a40vpb4qaivcyygvlykp4whljmhp2jy37bk56zr45yvv";
libraryHaskellDepends = [
array base bytestring cairo cereal Chart Chart-cairo colour
- containers Decimal dynamic-graph either fftwRaw GLFW-b mwc-random
- OpenGL optparse-applicative pango pipes pipes-bytestring
- pipes-concurrency primitive pulse-simple rtlsdr storable-complex
- time tuple vector
+ containers Decimal dynamic-graph fftwRaw GLFW-b mwc-random OpenGL
+ optparse-applicative pango pipes pipes-bytestring pipes-concurrency
+ primitive pulse-simple rtlsdr storable-complex time transformers
+ tuple vector
];
testHaskellDepends = [
base primitive QuickCheck storable-complex test-framework
@@ -181639,8 +182416,8 @@ self: {
}:
mkDerivation {
pname = "semver-range";
- version = "0.2.2";
- sha256 = "0rmllgibgyixqq59265qnygxlgp87lp1cfqzlfpzvvwl1kaixds5";
+ version = "0.2.7";
+ sha256 = "04492jx61yj4vq9bf1jg3xnviy22wb03d1kf358dy7w6xx1zzlfc";
libraryHaskellDepends = [
base classy-prelude parsec text unordered-containers
];
@@ -181753,8 +182530,8 @@ self: {
}:
mkDerivation {
pname = "sensu-run";
- version = "0.4.0.4";
- sha256 = "1pgzfa6ns67fq5cx7qizwjfb2gw6awx012iwhskx8s4wg9snbq5y";
+ version = "0.4.0.5";
+ sha256 = "0mmpfxc4vzcz1714fgskbjkrfb9bxh6wjcpd66cwbkb9d8nsa0f7";
isLibrary = false;
isExecutable = true;
executableHaskellDepends = [
@@ -181767,21 +182544,22 @@ self: {
license = stdenv.lib.licenses.bsd3;
}) {};
- "sensu-run_0_4_0_5" = callPackage
- ({ mkDerivation, aeson, base, bytestring, filepath, http-client
- , http-types, lens, network, optparse-applicative, process
- , temporary, text, time, unix, unix-compat, vector, wreq
+ "sensu-run_0_5_0" = callPackage
+ ({ mkDerivation, aeson, async, base, bytestring, filepath
+ , http-client, http-client-tls, http-types, lens, network
+ , optparse-applicative, process, temporary, text, time, unix
+ , unix-compat, vector, wreq
}:
mkDerivation {
pname = "sensu-run";
- version = "0.4.0.5";
- sha256 = "0mmpfxc4vzcz1714fgskbjkrfb9bxh6wjcpd66cwbkb9d8nsa0f7";
+ version = "0.5.0";
+ sha256 = "0826al67dwzdyazqkvrcsbxdv6gg6zk52q32avfz7l8dlpswgr9m";
isLibrary = false;
isExecutable = true;
executableHaskellDepends = [
- aeson base bytestring filepath http-client http-types lens network
- optparse-applicative process temporary text time unix unix-compat
- vector wreq
+ aeson async base bytestring filepath http-client http-client-tls
+ http-types lens network optparse-applicative process temporary text
+ time unix unix-compat vector wreq
];
homepage = "https://github.com/maoe/sensu-run#readme";
description = "A tool to send command execution results to Sensu";
@@ -182304,10 +183082,8 @@ self: {
}:
mkDerivation {
pname = "servant";
- version = "0.13";
- sha256 = "0fmwcrkjlq1rnlbzdn918z54pqbwrjpgwy2isxmfykb31m2pn230";
- revision = "1";
- editedCabalFile = "1l1a52xard2ax9avh1ic893gykhlvrvgw0cncjsaqvi9rvkd047y";
+ version = "0.13.0.1";
+ sha256 = "0vfypxdhz1yqkj6ini41ylas91jklvn05rrnarp4d57rli498jx7";
setupHaskellDepends = [ base Cabal cabal-doctest ];
libraryHaskellDepends = [
aeson attoparsec base base-compat bytestring case-insensitive
@@ -182713,8 +183489,8 @@ self: {
pname = "servant-cassava";
version = "0.10";
sha256 = "03jnyghwa5kjbl5j55njmp7as92flw91zs9cgdvb4jrsdy85sb4v";
- revision = "1";
- editedCabalFile = "165q0rvbk09z4k5zwhpx6380gakqbbz2xwvw40ahpjf46p0k9159";
+ revision = "2";
+ editedCabalFile = "11f5azqs007dfk5zr6sa43cri809k7jlf680gf3d7zcwhlf3xiq4";
libraryHaskellDepends = [
base base-compat bytestring cassava http-media servant vector
];
@@ -182725,6 +183501,7 @@ self: {
homepage = "http://haskell-servant.readthedocs.org/";
description = "Servant CSV content-type for cassava";
license = stdenv.lib.licenses.bsd3;
+ hydraPlatforms = stdenv.lib.platforms.none;
}) {};
"servant-checked-exceptions" = callPackage
@@ -182764,10 +183541,8 @@ self: {
}:
mkDerivation {
pname = "servant-client";
- version = "0.13";
- sha256 = "0bfrc3j2b6mbsvbv66l7mh3klkrrfdjvaq5s834jiivaavc6zf93";
- revision = "1";
- editedCabalFile = "0kdymqs9k90ig840bbj58znmfzlgr81jk7pfj1ygdvikjz1k1lpk";
+ version = "0.13.0.1";
+ sha256 = "120qs135arlby811p9z6zqjyrhsm517dq1xq41x3s2f167zkd7q8";
libraryHaskellDepends = [
aeson attoparsec base base-compat bytestring containers exceptions
http-client http-client-tls http-media http-types monad-control mtl
@@ -182794,10 +183569,8 @@ self: {
}:
mkDerivation {
pname = "servant-client-core";
- version = "0.13";
- sha256 = "1n7s47cqvahzfyyb4cwnq72a0qyrk8ybx4yj3g4lw9va2zlj78vp";
- revision = "1";
- editedCabalFile = "0zxkc0p436clpmh1y30d3ybqw12q2pk2gzfyjjgh17yvhzxzddnb";
+ version = "0.13.0.1";
+ sha256 = "0fr5lb5ra0nzjay9rm3xyyc01ijqxwr9wa0yxsjx1vippfnbds70";
libraryHaskellDepends = [
base base-compat base64-bytestring bytestring containers exceptions
generics-sop http-api-data http-media http-types mtl network-uri
@@ -182881,8 +183654,8 @@ self: {
pname = "servant-docs";
version = "0.11.2";
sha256 = "1x6lvpvlm1lh51y2pmldrjdjjrs5qnq44m2abczr75fjjy6hla3b";
- revision = "1";
- editedCabalFile = "0pm5gclgwna9bw3avjfp1pghzbk0a32sbd9v3fh321gmsax1h4zi";
+ revision = "2";
+ editedCabalFile = "17nv36pm0vv0lgfyk5ay65h7i5bdfq48n0npawcvmqfjsls61xs4";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [
@@ -183062,6 +183835,8 @@ self: {
pname = "servant-foreign";
version = "0.11.1";
sha256 = "01cq938b4szvnapf8c4ir8j09aq25jwgnp3jbfxnja027c1v3735";
+ revision = "1";
+ editedCabalFile = "1g9631l7cw0kgnsidi943fnzkvddjnm3vgm11ha5vh10pczvn6rb";
libraryHaskellDepends = [
base base-compat http-types lens servant text
];
@@ -183332,6 +184107,8 @@ self: {
pname = "servant-mock";
version = "0.8.4";
sha256 = "1705fw63lrzw79w1ypcdlf35d8qxx247q8isiqh28wzmc4j3kmnr";
+ revision = "1";
+ editedCabalFile = "0izm1slx384cgfaf16r3w1h6cqpssahphb9b0ccy2m04ysgy7chp";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [
@@ -183411,14 +184188,19 @@ self: {
}) {};
"servant-pagination" = callPackage
- ({ mkDerivation, base, safe, servant, servant-server, text }:
+ ({ mkDerivation, base, hspec, QuickCheck, safe, servant
+ , servant-server, text
+ }:
mkDerivation {
pname = "servant-pagination";
- version = "2.0.0";
- sha256 = "1z6sr43ir9sl85x65yfj21s77y1fqwzfmrfgjlqdas2zygd3fhh3";
+ version = "2.1.0";
+ sha256 = "00mbg8sxjwaxa6xjgaahdzjqppc01y6qzph6g5sc40rnp3j8ws2g";
+ revision = "1";
+ editedCabalFile = "0vb7v8yb1g1aqnnypa2hjsh58q2m9zhgz04dyj1vna1pg4yl3691";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [ base safe servant servant-server text ];
+ testHaskellDepends = [ base hspec QuickCheck servant-server text ];
homepage = "https://github.com/chordify/haskell-servant-pagination";
description = "Type-safe pagination for Servant APIs";
license = stdenv.lib.licenses.lgpl3;
@@ -183706,10 +184488,8 @@ self: {
}:
mkDerivation {
pname = "servant-server";
- version = "0.13";
- sha256 = "09hqihij87h031qcr4swsn82fsv8v1qklqc2hl0is8rd8bzi2cjy";
- revision = "1";
- editedCabalFile = "0kf88s2wkijfznp0sk3mrfyhr9rnq3kqpsl26di953ynxgd6z4yd";
+ version = "0.13.0.1";
+ sha256 = "0fggdqz2d6q96x8vnm64yvarg4fgxqh0jd3vis6yxpybfi174arm";
isLibrary = true;
isExecutable = true;
setupHaskellDepends = [ base Cabal cabal-doctest ];
@@ -183908,6 +184688,77 @@ self: {
license = stdenv.lib.licenses.bsd3;
}) {};
+ "servant-swagger-ui_0_3_0_3_13_2" = callPackage
+ ({ mkDerivation, base, bytestring, file-embed-lzma, servant
+ , servant-server, servant-swagger-ui-core, swagger2, text
+ }:
+ mkDerivation {
+ pname = "servant-swagger-ui";
+ version = "0.3.0.3.13.2";
+ sha256 = "0llkcag9bnhvni6ddar966i0pwql93s5icvw6pxa9ra5v14v7p5n";
+ libraryHaskellDepends = [
+ base bytestring file-embed-lzma servant servant-server
+ servant-swagger-ui-core swagger2 text
+ ];
+ homepage = "https://github.com/phadej/servant-swagger-ui";
+ description = "Servant swagger ui";
+ license = stdenv.lib.licenses.bsd3;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ }) {};
+
+ "servant-swagger-ui-core" = callPackage
+ ({ mkDerivation, base, blaze-markup, bytestring, http-media
+ , servant, servant-blaze, servant-server, swagger2, text
+ , transformers, transformers-compat, wai-app-static
+ }:
+ mkDerivation {
+ pname = "servant-swagger-ui-core";
+ version = "0.3";
+ sha256 = "1ji54q9x787dr5l81qn0shw2n3b8k9aglli03gxfbvs0l7ga5xrd";
+ libraryHaskellDepends = [
+ base blaze-markup bytestring http-media servant servant-blaze
+ servant-server swagger2 text transformers transformers-compat
+ wai-app-static
+ ];
+ homepage = "https://github.com/phadej/servant-swagger-ui";
+ description = "Servant swagger ui core components";
+ license = stdenv.lib.licenses.bsd3;
+ }) {};
+
+ "servant-swagger-ui-jensoleg" = callPackage
+ ({ mkDerivation, base, bytestring, file-embed-lzma, servant
+ , servant-server, servant-swagger-ui-core, swagger2, text
+ }:
+ mkDerivation {
+ pname = "servant-swagger-ui-jensoleg";
+ version = "0.3";
+ sha256 = "1ymw2lkfn0bkmddvpmv0ikv45fqac2zidnli8bfyp92jf0b5dnik";
+ libraryHaskellDepends = [
+ base bytestring file-embed-lzma servant servant-server
+ servant-swagger-ui-core swagger2 text
+ ];
+ homepage = "https://github.com/phadej/servant-swagger-ui";
+ description = "Servant swagger ui: Jens-Ole Graulund theme";
+ license = stdenv.lib.licenses.bsd3;
+ }) {};
+
+ "servant-swagger-ui-redoc" = callPackage
+ ({ mkDerivation, base, bytestring, file-embed-lzma, servant
+ , servant-server, servant-swagger-ui-core, swagger2, text
+ }:
+ mkDerivation {
+ pname = "servant-swagger-ui-redoc";
+ version = "0.3.0.1.21.2";
+ sha256 = "1p3mq7m5hvid7g7jwpf2jz923512wlprh6gikq5x2vcb14d40qwl";
+ libraryHaskellDepends = [
+ base bytestring file-embed-lzma servant servant-server
+ servant-swagger-ui-core swagger2 text
+ ];
+ homepage = "https://github.com/phadej/servant-swagger-ui";
+ description = "Servant swagger ui: ReDoc theme";
+ license = stdenv.lib.licenses.bsd3;
+ }) {};
+
"servant-tracing" = callPackage
({ mkDerivation, aeson, async, base, bytestring, bytestring-lexing
, containers, hashable, http-api-data, http-client, HUnit
@@ -183917,8 +184768,8 @@ self: {
}:
mkDerivation {
pname = "servant-tracing";
- version = "0.1.0.0";
- sha256 = "0wpybm1vl1bh3sj3vam8y40a0sjrx2ys761jyqrj2dnqymk8xc10";
+ version = "0.1.0.1";
+ sha256 = "0dff51fywa1z1png1hhwpn4f8av2jxdsplin8h80aad459czaid2";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [
@@ -183935,7 +184786,7 @@ self: {
QuickCheck tasty tasty-hunit tasty-quickcheck text time
transformers
];
- homepage = "https://github.com/ChrisCoffey/servant-tracing#readme";
+ homepage = "https://github.com/ChrisCoffey/haskell-opentracing-light#readme";
license = stdenv.lib.licenses.mit;
}) {};
@@ -183968,8 +184819,8 @@ self: {
}:
mkDerivation {
pname = "servant-xml";
- version = "1.0.1.1";
- sha256 = "1j1gbwywbb8n6zplvf1drrlpp2ghh7n2jrzl9x7pjplplr6mfpbh";
+ version = "1.0.1.2";
+ sha256 = "16zyvxscplgb08jljg7k728lq17b8xmrri6xbq47j74namp2n55z";
libraryHaskellDepends = [
base bytestring http-media servant xmlbf xmlbf-xeno
];
@@ -184112,8 +184963,8 @@ self: {
}:
mkDerivation {
pname = "serverless-haskell";
- version = "0.4.2";
- sha256 = "1cdpcin060qz5wicf8jqxayi2vjrhapybg401m3rw914s452safw";
+ version = "0.4.3";
+ sha256 = "0sdx28v81b6d5iankxbyb6psbrrsz5s2y01q36b7kbmg5sc4jiyy";
libraryHaskellDepends = [
aeson aeson-casing aeson-extra amazonka-core amazonka-kinesis
amazonka-s3 base bytestring case-insensitive lens text time unix
@@ -185020,16 +185871,15 @@ self: {
"shake-ats" = callPackage
({ mkDerivation, base, binary, dependency, directory, hashable
- , hs2ats, language-ats, microlens, microlens-th, shake, shake-ext
- , text
+ , hs2ats, language-ats, lens, shake, shake-ext, text
}:
mkDerivation {
pname = "shake-ats";
- version = "1.8.0.0";
- sha256 = "0p29bwh3jfjhy1x795irkwdq6qbmihh3sxgznfrwfz7pxwfx6nb7";
+ version = "1.8.0.1";
+ sha256 = "0rl0a2d55r55w705jx4si17n403l06jk3d6mrf3gd2ghn93hb13a";
libraryHaskellDepends = [
- base binary dependency directory hashable hs2ats language-ats
- microlens microlens-th shake shake-ext text
+ base binary dependency directory hashable hs2ats language-ats lens
+ shake shake-ext text
];
homepage = "https://github.com/vmchale/shake-ats#readme";
description = "Utilities for building ATS projects with shake";
@@ -185055,22 +185905,23 @@ self: {
}) {};
"shake-ext" = callPackage
- ({ mkDerivation, base, Cabal, composition-prelude, cpphs, directory
- , shake, template-haskell
+ ({ mkDerivation, base, Cabal, cdeps, composition-prelude, cpphs
+ , directory, shake, template-haskell
}:
mkDerivation {
pname = "shake-ext";
- version = "2.11.0.0";
- sha256 = "1ny8fj8wdshwp5df8skl3lsl5rp30fa8yclhh696pwk433pijc8f";
+ version = "2.11.0.1";
+ sha256 = "09gg30b8xiq2krz58lkavcgi1gybc5sn6snscdq8nj3qbxcvd0av";
libraryHaskellDepends = [
- base Cabal composition-prelude cpphs directory shake
+ base Cabal cdeps composition-prelude cpphs directory shake
template-haskell
];
homepage = "https://hub.darcs.net/vmchale/shake-ext";
description = "Helper functions for linting with shake";
license = stdenv.lib.licenses.bsd3;
hydraPlatforms = stdenv.lib.platforms.none;
- }) {};
+ broken = true;
+ }) {cdeps = null;};
"shake-extras" = callPackage
({ mkDerivation, base, bytestring, cmdargs, directory, filepath
@@ -185222,8 +186073,8 @@ self: {
}:
mkDerivation {
pname = "shakers";
- version = "0.0.45";
- sha256 = "0abzw28861k3larph3i6kaqsx4zcbk25f69y47v4i61riwdxcj0j";
+ version = "0.0.48";
+ sha256 = "1b2rwa6k4qj94mblfkvdj8asp26lknl6gfb4nfiqvi7m9kq27n45";
libraryHaskellDepends = [
base basic-prelude directory lifted-base shake
];
@@ -185670,6 +186521,19 @@ self: {
license = "GPL";
}) {};
+ "shellwords" = callPackage
+ ({ mkDerivation, base, hspec, megaparsec, text }:
+ mkDerivation {
+ pname = "shellwords";
+ version = "0.1.1.0";
+ sha256 = "1k3wmkmxr1rvjjrgg2swz8pl2nwf723q8zwpybadss4kz0f4w314";
+ libraryHaskellDepends = [ base megaparsec text ];
+ testHaskellDepends = [ base hspec text ];
+ homepage = "https://github.com/pbrisbin/hs-shellwords#readme";
+ description = "Parse strings into words, like a shell would";
+ license = stdenv.lib.licenses.mit;
+ }) {};
+
"shelly" = callPackage
({ mkDerivation, async, base, bytestring, containers, directory
, enclosed-exceptions, exceptions, filepath, hspec, hspec-contrib
@@ -185784,8 +186648,8 @@ self: {
}:
mkDerivation {
pname = "shimmer";
- version = "0.1.3.1";
- sha256 = "04hj31pw04xzhpicblc7mvqrwbs7gf00hps7bffymk2xx4v6xfl7";
+ version = "0.1.3.2";
+ sha256 = "1mr8y0f83bs0ay02hm6nj173x6djz7dkfpriymjgicnaicn0mvrh";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [
@@ -187102,6 +187966,23 @@ self: {
license = stdenv.lib.licenses.bsd3;
}) {};
+ "simple-ui" = callPackage
+ ({ mkDerivation, base, data-default-class, exceptions, lens, mtl
+ , stm, template-haskell, transformers, vector, vty
+ }:
+ mkDerivation {
+ pname = "simple-ui";
+ version = "0.1.1";
+ sha256 = "1phag0frz7l4xgrgjc72x9iwjl1z1l6mpz7lnifjgn7zp3wdkwzs";
+ enableSeparateDataOutput = true;
+ libraryHaskellDepends = [
+ base data-default-class exceptions lens mtl stm template-haskell
+ transformers vector vty
+ ];
+ description = "UI library for terminal";
+ license = stdenv.lib.licenses.gpl2;
+ }) {};
+
"simple-vec3" = callPackage
({ mkDerivation, base, criterion, doctest, doctest-discover
, QuickCheck, tasty, tasty-quickcheck, vector
@@ -187153,8 +188034,8 @@ self: {
({ mkDerivation, base, containers, generic-deriving, lens, text }:
mkDerivation {
pname = "simpleconfig";
- version = "0.0.8";
- sha256 = "0xxnirw7px97gssi2i823hsri168jy2rjwkhnkh6c80p997icdjf";
+ version = "0.0.9";
+ sha256 = "1xk8kxdnw118gzwh3i58iy0bdqi80f8li3bjydaqfn073106nf87";
libraryHaskellDepends = [ base containers lens ];
testHaskellDepends = [
base containers generic-deriving lens text
@@ -187687,6 +188568,30 @@ self: {
hydraPlatforms = stdenv.lib.platforms.none;
}) {};
+ "sized-grid" = callPackage
+ ({ mkDerivation, adjunctions, aeson, ansi-terminal, base, comonad
+ , constraints, distributive, generics-sop, hedgehog, HUnit, lens
+ , markdown-unlit, mtl, random, tasty, tasty-hedgehog, tasty-hunit
+ , vector, vector-space
+ }:
+ mkDerivation {
+ pname = "sized-grid";
+ version = "0.1.0.0";
+ sha256 = "1dj5sgmr8114i5ldpdmybwbwg5gkbm30kbk2196pq65jjcvjinxx";
+ libraryHaskellDepends = [
+ adjunctions aeson base comonad constraints distributive
+ generics-sop lens mtl random vector vector-space
+ ];
+ testHaskellDepends = [
+ adjunctions aeson ansi-terminal base comonad distributive
+ generics-sop hedgehog HUnit lens markdown-unlit tasty
+ tasty-hedgehog tasty-hunit vector-space
+ ];
+ homepage = "https://github.com/edwardwas/sized-grid";
+ description = "Multidimensional grids with sized specified at compile time";
+ license = stdenv.lib.licenses.mit;
+ }) {};
+
"sized-types" = callPackage
({ mkDerivation, array, base, base-compat, containers, singletons
}:
@@ -189810,8 +190715,8 @@ self: {
}:
mkDerivation {
pname = "snaplet-persistent";
- version = "0.5.1";
- sha256 = "00p5f1xysv618yd4s9zw66zfjpa1gx7nld5k9ysm8vrd0haa4v5r";
+ version = "0.6.0";
+ sha256 = "1gvnf4fkylazq8bjb8kcv70vcd2k1r2dw5l53r624d10p23fsa8k";
enableSeparateDataOutput = true;
libraryHaskellDepends = [
base bytestring clientsession configurator errors heist lens
@@ -191332,8 +192237,8 @@ self: {
}:
mkDerivation {
pname = "sparrow";
- version = "0.0.1.3";
- sha256 = "1n1zwhkvhypjmfmk2lqg1dlpw6x720mxd9giggklywhac1brdnzy";
+ version = "0.0.1.4";
+ sha256 = "0awj1gbrcdq4xp9dgj7q3jbfivjb4pjhkhd3acfgdqk08142fzj7";
libraryHaskellDepends = [
aeson aeson-attoparsec async attoparsec attoparsec-uri base
bytestring deepseq exceptions extractable-singleton hashable
@@ -192442,6 +193347,20 @@ self: {
license = stdenv.lib.licenses.bsd3;
}) {};
+ "sql-words_0_1_6_0" = callPackage
+ ({ mkDerivation, base, QuickCheck, quickcheck-simple }:
+ mkDerivation {
+ pname = "sql-words";
+ version = "0.1.6.0";
+ sha256 = "065ymcym5vm5xmprbzgv88wk3b09j44ajvsd59apw6qr32j218rn";
+ libraryHaskellDepends = [ base ];
+ testHaskellDepends = [ base QuickCheck quickcheck-simple ];
+ homepage = "http://khibino.github.io/haskell-relational-record/";
+ description = "SQL keywords data constructors into OverloadedString";
+ license = stdenv.lib.licenses.bsd3;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ }) {};
+
"sqlcipher" = callPackage
({ mkDerivation, base, bytestring, Cabal, directory, filepath
, hspec, openssl, pretty, temporary, time, utf8-string
@@ -194342,6 +195261,7 @@ self: {
homepage = "https://github.com/IvanMalison/status-notifier-item#readme";
description = "A wrapper over the StatusNotifierItem/libappindicator dbus specification";
license = stdenv.lib.licenses.bsd3;
+ hydraPlatforms = stdenv.lib.platforms.none;
}) {};
"statvfs" = callPackage
@@ -195281,15 +196201,15 @@ self: {
license = stdenv.lib.licenses.mit;
}) {};
- "stratosphere_0_20_0" = callPackage
+ "stratosphere_0_21_0" = callPackage
({ mkDerivation, aeson, aeson-pretty, base, bytestring, containers
, hashable, hspec, hspec-discover, lens, template-haskell, text
, unordered-containers
}:
mkDerivation {
pname = "stratosphere";
- version = "0.20.0";
- sha256 = "0qkhgm951b377i7ny28faczw2s32rrmfvrh1lcgzfz7gszakb5bw";
+ version = "0.21.0";
+ sha256 = "14bahvq1yz51dwa6ljyj4l3aw3sv2njin00k01bvbizsqnbl8j8k";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [
@@ -195462,6 +196382,18 @@ self: {
hydraPlatforms = stdenv.lib.platforms.none;
}) {};
+ "streamdeck" = callPackage
+ ({ mkDerivation, base, bytestring, hidapi, mtl }:
+ mkDerivation {
+ pname = "streamdeck";
+ version = "0.0.1";
+ sha256 = "05qdnhhjqjs7cg7yvg9ryzxlw1mw3y5y55z4dy1cf5g98j01s449";
+ libraryHaskellDepends = [ base bytestring hidapi mtl ];
+ homepage = "https://github.com/wuest/haskell-streamdeck";
+ description = "Control library for the Elgato Stream Deck";
+ license = stdenv.lib.licenses.bsd3;
+ }) {};
+
"streamed" = callPackage
({ mkDerivation, alsa-core, alsa-seq, base, containers
, data-accessor, data-accessor-transformers, event-list, midi
@@ -197983,6 +198915,39 @@ self: {
license = stdenv.lib.licenses.bsd3;
}) {};
+ "swagger2_2_2_2" = callPackage
+ ({ mkDerivation, aeson, aeson-qq, base, base-compat-batteries
+ , bytestring, Cabal, cabal-doctest, containers, doctest
+ , generics-sop, Glob, hashable, hspec, hspec-discover, http-media
+ , HUnit, insert-ordered-containers, lens, mtl, network, QuickCheck
+ , quickcheck-instances, scientific, template-haskell, text, time
+ , transformers, transformers-compat, unordered-containers
+ , uuid-types, vector
+ }:
+ mkDerivation {
+ pname = "swagger2";
+ version = "2.2.2";
+ sha256 = "1jkfmfrldqrfqqnjf0g4spd03w9xjmi35k33xnhsmfj122455lw2";
+ setupHaskellDepends = [ base Cabal cabal-doctest ];
+ libraryHaskellDepends = [
+ aeson base base-compat-batteries bytestring containers generics-sop
+ hashable http-media insert-ordered-containers lens mtl network
+ scientific template-haskell text time transformers
+ transformers-compat unordered-containers uuid-types vector
+ ];
+ testHaskellDepends = [
+ aeson aeson-qq base base-compat-batteries bytestring containers
+ doctest Glob hashable hspec HUnit insert-ordered-containers lens
+ mtl QuickCheck quickcheck-instances text time unordered-containers
+ vector
+ ];
+ testToolDepends = [ hspec-discover ];
+ homepage = "https://github.com/GetShopTV/swagger2";
+ description = "Swagger 2.0 data model";
+ license = stdenv.lib.licenses.bsd3;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ }) {};
+
"swapper" = callPackage
({ mkDerivation, base, binary, bytestring, deepseq, happstack-data
, happstack-state, parallel, tokyocabinet
@@ -200730,8 +201695,8 @@ self: {
pname = "tasty-hedgehog";
version = "0.2.0.0";
sha256 = "10m1akbiblnjq9ljk469725k30b254d36d267rk51z2f171py42s";
- revision = "2";
- editedCabalFile = "1if3pmvnnfs8zrqbg5awdc9qafqhwrgq4f75bqcqlapljlhp4xx0";
+ revision = "3";
+ editedCabalFile = "1r1sbcz12j9kmbdfr7mjc6z22c3737jc7mf0kdk1v6a3zr6n1js9";
libraryHaskellDepends = [ base hedgehog tagged tasty ];
testHaskellDepends = [
base hedgehog tasty tasty-expected-failure
@@ -201318,19 +202283,40 @@ self: {
hydraPlatforms = stdenv.lib.platforms.none;
}) {};
+ "tdigest_0_2" = callPackage
+ ({ mkDerivation, base, base-compat, binary, Cabal, cabal-doctest
+ , deepseq, doctest, reducers, semigroupoids, semigroups, tasty
+ , tasty-quickcheck, transformers, vector, vector-algorithms
+ }:
+ mkDerivation {
+ pname = "tdigest";
+ version = "0.2";
+ sha256 = "1wii4rkk1xqqdkwd24g6xb3imrrgr4y2vq0a7kg606g3a5mllsvq";
+ setupHaskellDepends = [ base Cabal cabal-doctest ];
+ libraryHaskellDepends = [
+ base base-compat binary deepseq reducers semigroupoids transformers
+ vector vector-algorithms
+ ];
+ testHaskellDepends = [
+ base base-compat binary deepseq doctest semigroups tasty
+ tasty-quickcheck vector vector-algorithms
+ ];
+ homepage = "https://github.com/futurice/haskell-tdigest#readme";
+ description = "On-line accumulation of rank-based statistics";
+ license = stdenv.lib.licenses.bsd3;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ }) {};
+
"tdigest-Chart" = callPackage
({ mkDerivation, base, base-compat, Chart, Chart-diagrams, colour
- , lens, mwc-random, semigroupoids, semigroups, statistics, tdigest
- , vector
+ , lens, mwc-random, semigroupoids, statistics, tdigest, vector
}:
mkDerivation {
pname = "tdigest-Chart";
- version = "0";
- sha256 = "19vhyk2wgvxnaad32vj9fm0vw8rl5n1lp540dp4yn9dsbilhda3l";
- revision = "2";
- editedCabalFile = "139qimahwi9q2vm2z6m42ghk59drgii71lrgcj2dbai5x5fnfcgb";
+ version = "0.2";
+ sha256 = "1ciq7d187as9sk1dpccm2s02b6jdhij1l477wff0a7labgw21l0l";
libraryHaskellDepends = [
- base base-compat Chart colour lens semigroupoids semigroups tdigest
+ base base-compat Chart colour lens semigroupoids tdigest
];
testHaskellDepends = [
base base-compat Chart Chart-diagrams lens mwc-random statistics
@@ -202285,6 +203271,7 @@ self: {
homepage = "https://github.com/luna/terminal-text";
description = "Text data type for styled terminal output, including all standard ANSI effects (bold, italic, blinking) and ANSI / 256 / truecolor colors support for Unix and Windows (whenever possible)";
license = stdenv.lib.licenses.asl20;
+ hydraPlatforms = stdenv.lib.platforms.none;
}) {};
"termination-combinators" = callPackage
@@ -202977,8 +203964,8 @@ self: {
}:
mkDerivation {
pname = "texbuilder";
- version = "0.1.4.0";
- sha256 = "0i301a78790cqhgb28bhc2qksymbx2jdr31m2x59nsj7hmw268b2";
+ version = "0.1.4.1";
+ sha256 = "0d8fwnrqlfjcls229iiq6x4v1a4yxm5qfsyymbqf6xwj8mcmqhb6";
isLibrary = false;
isExecutable = true;
executableHaskellDepends = [
@@ -203369,6 +204356,28 @@ self: {
license = stdenv.lib.licenses.bsd3;
}) {};
+ "text-ldap_0_1_1_12" = 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;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ }) {};
+
"text-lens" = callPackage
({ mkDerivation, base, extra, hspec, lens, text }:
mkDerivation {
@@ -204225,6 +205234,18 @@ self: {
license = stdenv.lib.licenses.bsd3;
}) {};
+ "th-data-compat_0_0_2_6" = 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;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ }) {};
+
"th-desugar" = callPackage
({ mkDerivation, base, containers, hspec, HUnit, mtl, syb
, template-haskell, th-expand-syns, th-lift, th-orphans
@@ -204539,6 +205560,19 @@ self: {
license = stdenv.lib.licenses.bsd3;
}) {};
+ "th-reify-compat_0_0_1_4" = callPackage
+ ({ mkDerivation, base, template-haskell }:
+ mkDerivation {
+ pname = "th-reify-compat";
+ version = "0.0.1.4";
+ sha256 = "08lal845ixcw62skw2rsi98y9v3dgj7bq4ygmlxm6k3lfgd9v7q8";
+ libraryHaskellDepends = [ base template-haskell ];
+ homepage = "http://github.com/khibino/haskell-th-reify-compat/";
+ description = "Compatibility for the result type of TH reify";
+ license = stdenv.lib.licenses.bsd3;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ }) {};
+
"th-reify-many" = callPackage
({ mkDerivation, base, containers, mtl, safe, template-haskell
, th-expand-syns
@@ -205446,16 +206480,16 @@ self: {
"tidal" = callPackage
({ mkDerivation, base, colour, containers, hashable, hosc
- , mersenne-random-pure64, mtl, parsec, safe, tasty, tasty-hunit
- , text, time, websockets
+ , mersenne-random-pure64, mtl, parsec, safe, semigroups, tasty
+ , tasty-hunit, text, time, websockets
}:
mkDerivation {
pname = "tidal";
- version = "0.9.6";
- sha256 = "1bldi0ygfn695x3an3qlsfzrbhmqcyhznkmsm5dsjmmh27zs1sx6";
+ version = "0.9.8";
+ sha256 = "08a8k4kdq6wmhggf3bm4c5a6xck2waf6n6815csms919rhlbkbpb";
libraryHaskellDepends = [
base colour containers hashable hosc mersenne-random-pure64 mtl
- parsec safe text time websockets
+ parsec safe semigroups text time websockets
];
testHaskellDepends = [ base tasty tasty-hunit ];
homepage = "http://tidalcycles.org/";
@@ -205463,18 +206497,18 @@ self: {
license = stdenv.lib.licenses.gpl3;
}) {};
- "tidal_0_9_7" = callPackage
+ "tidal_0_9_9" = callPackage
({ mkDerivation, base, colour, containers, hashable, hosc
- , mersenne-random-pure64, mtl, parsec, safe, tasty, tasty-hunit
- , text, time, websockets
+ , mersenne-random-pure64, mtl, parsec, safe, semigroups, tasty
+ , tasty-hunit, text, time, websockets
}:
mkDerivation {
pname = "tidal";
- version = "0.9.7";
- sha256 = "1b9005f9jf9pbiq5hwvqx4cw9c8hb8ygcpnb7qks4h5q6pf7yw6i";
+ version = "0.9.9";
+ sha256 = "1zpbnn1kw2ybmlg6g9yj39jhfp6sl12335rxqns0nfi8l2jjgbgr";
libraryHaskellDepends = [
base colour containers hashable hosc mersenne-random-pure64 mtl
- parsec safe text time websockets
+ parsec safe semigroups text time websockets
];
testHaskellDepends = [ base tasty tasty-hunit ];
homepage = "http://tidalcycles.org/";
@@ -205489,8 +206523,8 @@ self: {
}:
mkDerivation {
pname = "tidal-midi";
- version = "0.9.5.2";
- sha256 = "0yjbrsg2lwj6x32ly0j6b4ms6i1s447jk2b7c6qp85pblaanmzqc";
+ version = "0.9.10";
+ sha256 = "0d59s9vq2jmlb8b1bbay6n5911fjm9j04c9545p4i5visniv61b4";
libraryHaskellDepends = [
base containers PortMidi tidal time transformers
];
@@ -206360,6 +207394,22 @@ self: {
license = stdenv.lib.licenses.mit;
}) {};
+ "timestamp" = callPackage
+ ({ mkDerivation, base, cereal, foldl, generic-random, hashable
+ , QuickCheck, time
+ }:
+ mkDerivation {
+ pname = "timestamp";
+ version = "0.2";
+ sha256 = "1cl57lf53kqmrhplf944zqhp59vjah57yakqd9m2rn0m5n6hz6sg";
+ libraryHaskellDepends = [
+ base cereal foldl generic-random hashable QuickCheck time
+ ];
+ homepage = "https://github.com/metrix-ai/timestamp";
+ description = "Space-efficient Unix timestamp and utilities";
+ license = stdenv.lib.licenses.mit;
+ }) {};
+
"timestamp-subprocess-lines" = callPackage
({ mkDerivation, base, bytestring, process, split, time
, transformers
@@ -207224,16 +208274,13 @@ self: {
}:
mkDerivation {
pname = "tomlcheck";
- version = "0.1.0.19";
- sha256 = "1ql24s1wy4c34rmxh8x8lggnkpx686l8x5zsp3asdsxlx0k8n8zp";
- isLibrary = true;
+ version = "0.1.0.23";
+ sha256 = "0m58rrjrrd2n1w313806s9gyj840nzsm7vwdz40639mr3a6vaifg";
+ isLibrary = false;
isExecutable = true;
- enableSeparateDataOutput = true;
- libraryHaskellDepends = [
+ executableHaskellDepends = [
base htoml-megaparsec megaparsec optparse-generic text
];
- executableHaskellDepends = [ base ];
- homepage = "https://github.com/vmchale/tomlcheck#readme";
description = "Command-line tool to check syntax of TOML files";
license = stdenv.lib.licenses.bsd3;
}) {};
@@ -208179,6 +209226,28 @@ self: {
license = stdenv.lib.licenses.mit;
}) {};
+ "transient_0_6_0_1" = callPackage
+ ({ mkDerivation, atomic-primops, base, bytestring, containers
+ , directory, mtl, random, stm, time, transformers
+ }:
+ mkDerivation {
+ pname = "transient";
+ version = "0.6.0.1";
+ sha256 = "1k3zh4ahzzmj5ni0jyahzhfhbnvksa1ybq93541faa4g98h44ggy";
+ libraryHaskellDepends = [
+ atomic-primops base bytestring containers directory mtl random stm
+ time transformers
+ ];
+ testHaskellDepends = [
+ atomic-primops base bytestring containers directory mtl random stm
+ time transformers
+ ];
+ homepage = "https://github.com/transient-haskell/transient";
+ description = "composing programs with multithreading, events and distributed computing";
+ license = stdenv.lib.licenses.mit;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ }) {};
+
"transient-universe" = callPackage
({ mkDerivation, base, bytestring, case-insensitive, containers
, directory, filepath, hashable, HTTP, iproute, mtl, network
@@ -208212,18 +209281,51 @@ self: {
license = stdenv.lib.licenses.mit;
}) {};
+ "transient-universe_0_5_0_0" = callPackage
+ ({ mkDerivation, base, bytestring, case-insensitive, containers
+ , directory, filepath, hashable, HTTP, iproute, mtl, network
+ , network-info, network-uri, process, random, stm, TCache, text
+ , time, transformers, transient, vector, websockets
+ }:
+ mkDerivation {
+ pname = "transient-universe";
+ version = "0.5.0.0";
+ sha256 = "1d3bp4xjpi28ph7fa9wm49ssg53jfvlq77ka0zvrkilw1j6f8v3l";
+ isLibrary = true;
+ isExecutable = true;
+ libraryHaskellDepends = [
+ base bytestring case-insensitive containers directory filepath
+ hashable HTTP iproute mtl network network-info network-uri process
+ random stm TCache text time transformers transient vector
+ websockets
+ ];
+ executableHaskellDepends = [
+ base bytestring case-insensitive containers directory filepath
+ hashable HTTP mtl network network-info network-uri process random
+ stm TCache text time transformers transient vector websockets
+ ];
+ testHaskellDepends = [
+ base bytestring case-insensitive containers directory filepath
+ hashable HTTP mtl network network-info network-uri process random
+ stm TCache text time transformers transient vector websockets
+ ];
+ homepage = "https://github.com/transient-haskell/transient-universe";
+ description = "Remote execution and map-reduce: distributed computing for Transient";
+ license = stdenv.lib.licenses.mit;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ }) {};
+
"transient-universe-tls" = callPackage
- ({ mkDerivation, base, bytestring, certificate, cprng-aes
- , data-default, network, tls, transient, transient-universe
- , x509-store
+ ({ mkDerivation, base, bytestring, cprng-aes, data-default, network
+ , tls, transient, transient-universe, x509-store, x509-system
}:
mkDerivation {
pname = "transient-universe-tls";
- version = "0.1.0.0";
- sha256 = "0rw4plnc98ydb5za85hgdvprfxh1cry7ifyfzm93cyny09b38jwz";
+ version = "0.1.1.0";
+ sha256 = "0fawvdgm7a1s65jc3d3lfl38pak6xx39ian0cbx5sj3aqa7m99hs";
libraryHaskellDepends = [
- base bytestring certificate cprng-aes data-default network tls
- transient transient-universe x509-store
+ base bytestring cprng-aes data-default network tls transient
+ transient-universe x509-store x509-system
];
homepage = "http://github.com/transient-haskell/transient-universe-tls";
description = "transient with secure communications";
@@ -208485,8 +209587,8 @@ self: {
pname = "tree-diff";
version = "0.0.1";
sha256 = "049v44c520jy3icxlnrvbdblh3mjmvd7m6qmkzxbzkf02x63xqmz";
- revision = "2";
- editedCabalFile = "153gffmgdpk3crw9gg4i5mx4jdwglbbx0xwwhbx088j3alim3yvb";
+ revision = "3";
+ editedCabalFile = "04ajimrbywfnnnlx9axz3hmbi33c4g62hrmv52plgifjiw6c4y2y";
libraryHaskellDepends = [
aeson ansi-terminal ansi-wl-pprint base base-compat bytestring
containers generics-sop hashable MemoTrie parsec parsers pretty
@@ -208500,6 +209602,7 @@ self: {
homepage = "https://github.com/phadej/tree-diff";
description = "Diffing of (expression) trees";
license = stdenv.lib.licenses.bsd3;
+ hydraPlatforms = stdenv.lib.platforms.none;
}) {};
"tree-fun" = callPackage
@@ -208536,6 +209639,7 @@ self: {
homepage = "https://github.com/rampion/tree-traversals";
description = "Functions and newtype wrappers for traversing Trees";
license = stdenv.lib.licenses.cc0;
+ hydraPlatforms = stdenv.lib.platforms.none;
}) {};
"tree-view" = callPackage
@@ -209375,6 +210479,19 @@ self: {
license = stdenv.lib.licenses.bsd3;
}) {};
+ "tuple-sop" = callPackage
+ ({ mkDerivation, base, generics-sop }:
+ mkDerivation {
+ pname = "tuple-sop";
+ version = "0.1.0.0";
+ sha256 = "08g0jzqngw1bkrn212rj6d5h7ppfar7q1p8b79049ivrich6zspj";
+ libraryHaskellDepends = [ base generics-sop ];
+ testHaskellDepends = [ base generics-sop ];
+ homepage = "https://github.com/Ferdinand-vW/tuple-sop#readme";
+ description = "functions on n-ary tuples using generics-sop";
+ license = stdenv.lib.licenses.gpl3;
+ }) {};
+
"tuple-th" = callPackage
({ mkDerivation, base, containers, template-haskell }:
mkDerivation {
@@ -209618,8 +210735,8 @@ self: {
}:
mkDerivation {
pname = "tweet-hs";
- version = "1.0.1.36";
- sha256 = "1gmp1936cmz42vf8m3622pjf6gb9c2pi8z0jfki1di9m1p1lbr53";
+ version = "1.0.1.37";
+ sha256 = "14csa7p3z4ywxwybs0y4ylymsqg1m8scp5fhcm3mayy9cdz2g49n";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [
@@ -210667,8 +211784,8 @@ self: {
}:
mkDerivation {
pname = "type-natural";
- version = "0.8.0.0";
- sha256 = "0cdym66cvidccimhfpy9i5wa29c1aa6vchnywniyaxlmivqjybj4";
+ version = "0.8.0.1";
+ sha256 = "0ybcivp219h8xw9k31f5cimlnj63y5s2br3rahxgdacvhdb678zg";
libraryHaskellDepends = [
base constraints equational-reasoning ghc-typelits-natnormalise
ghc-typelits-presburger singletons template-haskell
@@ -210867,6 +211984,7 @@ self: {
homepage = "https://github.com/pikajude/type-tree";
description = "Tree representations of datatypes";
license = stdenv.lib.licenses.mit;
+ hydraPlatforms = stdenv.lib.platforms.none;
}) {};
"type-unary" = callPackage
@@ -213018,8 +214136,8 @@ self: {
}:
mkDerivation {
pname = "unliftio-pool";
- version = "0.1.0.0";
- sha256 = "13l0shpg0hmfp5n4rqfd6vl2x820w3558msy915qacbxfqvjis4x";
+ version = "0.1.0.1";
+ sha256 = "1z4h20jn3i3582i63vmih2ccr0pljp6whb3h4pbpj36s1q75bmgp";
libraryHaskellDepends = [
base resource-pool time transformers unliftio-core
];
@@ -213817,20 +214935,20 @@ self: {
license = stdenv.lib.licenses.mit;
}) {};
- "urlpath_8_1_0" = callPackage
+ "urlpath_9_0_0" = callPackage
({ mkDerivation, attoparsec-uri, base, exceptions, mmorph
- , monad-control, monad-control-aligned, monad-logger, mtl
+ , monad-control, monad-control-aligned, monad-logger, mtl, path
, path-extra, resourcet, split, strict, text, transformers
, transformers-base, vector
}:
mkDerivation {
pname = "urlpath";
- version = "8.1.0";
- sha256 = "0gv5mjhhmxq5zppda431vddpcl138qglxiyksj588d4zzg3kd8iy";
+ version = "9.0.0";
+ sha256 = "1ysjhb42sk34j29xy7hgf9b4qp90p6hrkqcmwdalvsasbwk8kgwh";
libraryHaskellDepends = [
attoparsec-uri base exceptions mmorph monad-control
- monad-control-aligned monad-logger mtl path-extra resourcet split
- strict text transformers transformers-base vector
+ monad-control-aligned monad-logger mtl path path-extra resourcet
+ split strict text transformers transformers-base vector
];
homepage = "https://github.com/athanclark/urlpath#readme";
description = "Painfully simple URL deployment";
@@ -215908,14 +217026,15 @@ self: {
}:
mkDerivation {
pname = "vector-text";
- version = "1.1.1";
- sha256 = "0hwis2xqj86j3smk9dnq9rpf8hraxzjczpajbkzma50g2kagj5r8";
+ version = "1.1.3";
+ sha256 = "00x35fv78vp8rffvd7hsccl8vdxzzdzjrqzwvj0mr6g1wmg3p4i3";
libraryHaskellDepends = [
base binary prologue text vector vector-binary-instances
];
homepage = "https://github.com/luna/vector-text";
description = "Text implementation based on unboxed char vector";
license = stdenv.lib.licenses.asl20;
+ hydraPlatforms = stdenv.lib.platforms.none;
}) {};
"vector-th-unbox" = callPackage
@@ -216970,8 +218089,8 @@ self: {
({ mkDerivation, base, vector-sized, vulkan }:
mkDerivation {
pname = "vulkan";
- version = "1.7.0.0";
- sha256 = "0rg9hv04j62z0ab2dg23qk09hkx4hnniwjmkqkv83vmdc5q47j0p";
+ version = "2.0.0.0";
+ sha256 = "1lm92sgv1nbc4h4znyilyp3hqlj5xl6i9zcrax0fxx69a9q2jg2l";
libraryHaskellDepends = [ base vector-sized ];
librarySystemDepends = [ vulkan ];
homepage = "http://github.com/expipiplus1/vulkan#readme";
@@ -216981,18 +218100,17 @@ self: {
}) {vulkan = null;};
"vulkan-api" = callPackage
- ({ mkDerivation, base, ghc-prim, vulkan }:
+ ({ mkDerivation, base }:
mkDerivation {
pname = "vulkan-api";
- version = "1.1.0.0";
- sha256 = "038iaiy16cyb0g6xhgax8333lz0y4jfmv4r8dqvvmnnmhiak5j8x";
- libraryHaskellDepends = [ base ghc-prim ];
- librarySystemDepends = [ vulkan ];
+ version = "1.1.1.0";
+ sha256 = "17209hslyqfx3lyh1a8sii3gn1ygsb5a81nampx1ym6f6gx9g3lh";
+ libraryHaskellDepends = [ base ];
homepage = "https://github.com/achirkin/vulkan#readme";
description = "Low-level low-overhead vulkan api bindings";
license = stdenv.lib.licenses.bsd3;
hydraPlatforms = stdenv.lib.platforms.none;
- }) {vulkan = null;};
+ }) {};
"wacom-daemon" = callPackage
({ mkDerivation, aeson, base, bytestring, containers, directory
@@ -217916,8 +219034,8 @@ self: {
}:
mkDerivation {
pname = "wai-middleware-content-type";
- version = "0.6.1.1";
- sha256 = "08lcbyycgr2mb8i00ncph38r0yixx6nn5yfkvv96700wfn0338q4";
+ version = "0.6.1.2";
+ sha256 = "057xrb6nik8imxg91chyhakddb0ywm7ccfkwjlyrbwrd5hm84j8r";
libraryHaskellDepends = [
aeson base blaze-builder blaze-html bytestring clay exceptions
extractable-singleton hashable http-media http-types lucid mmorph
@@ -218952,6 +220070,24 @@ self: {
license = stdenv.lib.licenses.mit;
}) {};
+ "warp-tls_3_2_4_3" = callPackage
+ ({ mkDerivation, base, bytestring, cryptonite, data-default-class
+ , network, streaming-commons, tls, tls-session-manager, wai, warp
+ }:
+ mkDerivation {
+ pname = "warp-tls";
+ version = "3.2.4.3";
+ sha256 = "17gj295fr98l7mkz2gdz6kahdnmja0sql3kvy2zab6q168g53kc4";
+ libraryHaskellDepends = [
+ base bytestring cryptonite data-default-class network
+ streaming-commons tls tls-session-manager wai warp
+ ];
+ homepage = "http://github.com/yesodweb/wai";
+ description = "HTTP over TLS support for Warp via the TLS package";
+ license = stdenv.lib.licenses.mit;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ }) {};
+
"warp-tls-uid" = callPackage
({ mkDerivation, base, bytestring, certificate, conduit
, crypto-random, network, network-conduit, pem, tls, tls-extra
@@ -218979,8 +220115,8 @@ self: {
}:
mkDerivation {
pname = "warped";
- version = "0.0.4";
- sha256 = "0gvsqabl1kh0vkzqiijkndk77jdc6md2c2p1f8bilrliqq2p21gq";
+ version = "0.0.5";
+ sha256 = "1gk7mfainbw8iyg8vqii39yl7n2dz052p8nrphhjbzphibl349jf";
libraryHaskellDepends = [
aeson base blaze-builder conduit http-types lifted-async
monad-control preamble uuid wai wai-conduit wai-cors warp
@@ -219070,6 +220206,8 @@ self: {
pname = "wave";
version = "0.1.5";
sha256 = "03zycmwrchhqvi37fdvlzz2d1vl4hy0i8xyys1zznw38qfq0h2i5";
+ revision = "1";
+ editedCabalFile = "1wvgxay0r5rpcc7yxkznxxcp1za0ifxvk87w0xrilxgb35r3izz8";
enableSeparateDataOutput = true;
libraryHaskellDepends = [
base bytestring cereal containers data-default-class transformers
@@ -220550,23 +221688,6 @@ self: {
}) {};
"wild-bind" = callPackage
- ({ mkDerivation, base, containers, hspec, microlens, QuickCheck
- , stm, text, transformers
- }:
- mkDerivation {
- pname = "wild-bind";
- version = "0.1.1.1";
- sha256 = "00xs9m87skqnwv6cysy84bfbpnhb4jp46x08gn9f07n5jz113asi";
- libraryHaskellDepends = [ base containers text transformers ];
- testHaskellDepends = [
- base hspec microlens QuickCheck stm transformers
- ];
- homepage = "https://github.com/debug-ito/wild-bind";
- description = "Dynamic key binding framework";
- license = stdenv.lib.licenses.bsd3;
- }) {};
-
- "wild-bind_0_1_2_0" = callPackage
({ mkDerivation, base, containers, hspec, microlens, QuickCheck
, semigroups, stm, text, transformers
}:
@@ -220583,7 +221704,6 @@ self: {
homepage = "https://github.com/debug-ito/wild-bind";
description = "Dynamic key binding framework";
license = stdenv.lib.licenses.bsd3;
- hydraPlatforms = stdenv.lib.platforms.none;
}) {};
"wild-bind-indicator" = callPackage
@@ -220622,26 +221742,6 @@ self: {
}) {};
"wild-bind-x11" = callPackage
- ({ mkDerivation, async, base, containers, fold-debounce, hspec, mtl
- , semigroups, stm, text, time, transformers, wild-bind, X11
- }:
- mkDerivation {
- pname = "wild-bind-x11";
- version = "0.2.0.1";
- sha256 = "0g02kv710yr8qzh48dcwzyn1aak9hz3ny2pq7v24g40kc7c6pd4d";
- libraryHaskellDepends = [
- base containers fold-debounce mtl semigroups stm text transformers
- wild-bind X11
- ];
- testHaskellDepends = [
- async base hspec text time transformers wild-bind X11
- ];
- homepage = "https://github.com/debug-ito/wild-bind";
- description = "X11-specific implementation for WildBind";
- license = stdenv.lib.licenses.bsd3;
- }) {};
-
- "wild-bind-x11_0_2_0_2" = callPackage
({ mkDerivation, async, base, containers, fold-debounce, hspec, mtl
, semigroups, stm, text, time, transformers, wild-bind, X11
}:
@@ -220659,18 +221759,15 @@ self: {
homepage = "https://github.com/debug-ito/wild-bind";
description = "X11-specific implementation for WildBind";
license = stdenv.lib.licenses.bsd3;
- hydraPlatforms = stdenv.lib.platforms.none;
}) {};
"wilton-ffi" = callPackage
- ({ mkDerivation, aeson, base, bytestring }:
+ ({ mkDerivation, aeson, base, bytestring, utf8-string }:
mkDerivation {
pname = "wilton-ffi";
- version = "0.1.0.0";
- sha256 = "0l7smpizp4r59nfk73vyl1vrpgdnf8cfgny9r981bpn6bnv1iv7f";
- revision = "1";
- editedCabalFile = "0fkfffxfph1nip54j9f5hd05339mmg19hn7jwggsi4qmdpf2jd0y";
- libraryHaskellDepends = [ aeson base bytestring ];
+ version = "0.2.0.0";
+ sha256 = "1n2cgf0cnpr7f9rgf2369qnz3mm1qvylpzncc7s42vcrrq4x3wj7";
+ libraryHaskellDepends = [ aeson base bytestring utf8-string ];
homepage = "https://github.com/wilton-iot/wilton-ffi#readme";
description = "Haskell modules support for Wilton JavaScript runtime";
license = stdenv.lib.licenses.mit;
@@ -220788,8 +221885,8 @@ self: {
}:
mkDerivation {
pname = "wires";
- version = "0.2.0";
- sha256 = "1c4ic3v3rrqanr6n3yhm8vy5i8sn5lwraks09kav60f4cc42s1nx";
+ version = "0.2.1";
+ sha256 = "0dh0kpmja296miax80y3qqq3s8rmab4d7yqdcxrhmy9gzq350hri";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [
@@ -221071,6 +222168,18 @@ self: {
license = stdenv.lib.licenses.bsd3;
}) {};
+ "wl-pprint-text_1_1_1_1" = callPackage
+ ({ mkDerivation, base, base-compat, text }:
+ mkDerivation {
+ pname = "wl-pprint-text";
+ version = "1.1.1.1";
+ sha256 = "1v227rc24ibb6qxiyhq9v9hv8ilkrm6i1snl5icblm8zgvpymplb";
+ libraryHaskellDepends = [ base base-compat text ];
+ description = "A Wadler/Leijen Pretty Printer for Text values";
+ license = stdenv.lib.licenses.bsd3;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ }) {};
+
"wlc-hs" = callPackage
({ mkDerivation, base, c2hs, containers, data-default, lens, pretty
, process, transformers, wlc, xkbcommon
@@ -221166,8 +222275,8 @@ self: {
}:
mkDerivation {
pname = "wolf";
- version = "0.3.43";
- sha256 = "1iy9qbpwnnzq8d7fvpl8iqn8bc3iz44rvxi4ijjj5xd4z1w6i5fv";
+ version = "0.3.44";
+ sha256 = "096j1f0xzjrnk8z7niyx19w05nx5222rgfbhgx8df8jwhfz0ymw7";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [
@@ -223471,6 +224580,31 @@ self: {
license = stdenv.lib.licenses.mit;
}) {};
+ "xml-isogen_0_3_0" = callPackage
+ ({ mkDerivation, base, data-default, deepseq, dom-parser
+ , generic-arbitrary, hspec, lens, mtl, QuickCheck
+ , quickcheck-instances, semigroups, template-haskell, text
+ , xml-conduit, xml-conduit-writer
+ }:
+ mkDerivation {
+ pname = "xml-isogen";
+ version = "0.3.0";
+ sha256 = "05qa83jzmfqa5yhzgp3n3bxi0dvyy9xdfgq1ymi0wa6xnmxjv0cz";
+ libraryHaskellDepends = [
+ base deepseq dom-parser lens mtl QuickCheck semigroups
+ template-haskell text xml-conduit xml-conduit-writer
+ ];
+ testHaskellDepends = [
+ base data-default deepseq dom-parser generic-arbitrary hspec
+ QuickCheck quickcheck-instances semigroups xml-conduit
+ xml-conduit-writer
+ ];
+ homepage = "https://github.com/typeable/xml-isogen";
+ description = "Generate XML-isomorphic types";
+ license = stdenv.lib.licenses.mit;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ }) {};
+
"xml-lens" = callPackage
({ mkDerivation, base, case-insensitive, containers, lens, text
, xml-conduit
@@ -223795,8 +224929,8 @@ self: {
}:
mkDerivation {
pname = "xmlbf";
- version = "0.3";
- sha256 = "0zvv7ajwj45wsm751951i37ncn2lh73d8h5vqhladi2g14pi9yjb";
+ version = "0.4";
+ sha256 = "1f63ibvv7ywly7paam238y4bjhvg7jmn87368dnv5lsz28mq432m";
libraryHaskellDepends = [
base bytestring containers text transformers unordered-containers
];
@@ -225514,36 +226648,6 @@ self: {
}) {};
"yesod-auth" = callPackage
- ({ mkDerivation, aeson, authenticate, base, base16-bytestring
- , base64-bytestring, binary, blaze-builder, blaze-html
- , blaze-markup, byteable, bytestring, conduit, conduit-extra
- , containers, cryptonite, data-default, email-validate, file-embed
- , http-client, http-client-tls, http-conduit, http-types, memory
- , mime-mail, network-uri, nonce, persistent, persistent-template
- , random, resourcet, safe, shakespeare, template-haskell, text
- , time, transformers, unliftio, unliftio-core, unordered-containers
- , wai, yesod-core, yesod-form, yesod-persistent
- }:
- mkDerivation {
- pname = "yesod-auth";
- version = "1.6.2";
- sha256 = "191sniq19glv0rdrhzqs2hhsjz9y25sqf15x0wnpmrmfh7jyyv6a";
- libraryHaskellDepends = [
- aeson authenticate base base16-bytestring base64-bytestring binary
- blaze-builder blaze-html blaze-markup byteable bytestring conduit
- conduit-extra containers cryptonite data-default email-validate
- file-embed http-client http-client-tls http-conduit http-types
- memory mime-mail network-uri nonce persistent persistent-template
- random resourcet safe shakespeare template-haskell text time
- transformers unliftio unliftio-core unordered-containers wai
- yesod-core yesod-form yesod-persistent
- ];
- homepage = "http://www.yesodweb.com/";
- description = "Authentication for Yesod";
- license = stdenv.lib.licenses.mit;
- }) {};
-
- "yesod-auth_1_6_3" = callPackage
({ mkDerivation, aeson, authenticate, base, base16-bytestring
, base64-bytestring, binary, blaze-builder, blaze-html
, blaze-markup, byteable, bytestring, conduit, conduit-extra
@@ -225571,7 +226675,6 @@ self: {
homepage = "http://www.yesodweb.com/";
description = "Authentication for Yesod";
license = stdenv.lib.licenses.mit;
- hydraPlatforms = stdenv.lib.platforms.none;
}) {};
"yesod-auth-account" = callPackage
@@ -226125,46 +227228,6 @@ self: {
}) {};
"yesod-core" = callPackage
- ({ mkDerivation, aeson, async, auto-update, base, blaze-html
- , blaze-markup, byteable, bytestring, case-insensitive, cereal
- , clientsession, conduit, conduit-extra, containers, cookie
- , deepseq, deepseq-generics, directory, fast-logger, gauge, hspec
- , hspec-expectations, http-types, HUnit, monad-logger, mtl, network
- , old-locale, parsec, path-pieces, primitive, QuickCheck, random
- , resourcet, safe, semigroups, shakespeare, streaming-commons
- , template-haskell, text, time, transformers, unix-compat, unliftio
- , unordered-containers, vector, wai, wai-extra, wai-logger, warp
- , word8
- }:
- mkDerivation {
- pname = "yesod-core";
- version = "1.6.2";
- sha256 = "0fcbp47rmljz0jas2gz9j7qswa4dab2fzf9mgs4sbk75s76i01b8";
- libraryHaskellDepends = [
- aeson auto-update base blaze-html blaze-markup byteable bytestring
- case-insensitive cereal clientsession conduit conduit-extra
- containers cookie deepseq deepseq-generics directory fast-logger
- http-types monad-logger mtl old-locale parsec path-pieces primitive
- random resourcet safe semigroups shakespeare template-haskell text
- time transformers unix-compat unliftio unordered-containers vector
- wai wai-extra wai-logger warp word8
- ];
- testHaskellDepends = [
- async base bytestring clientsession conduit conduit-extra
- containers cookie hspec hspec-expectations http-types HUnit network
- path-pieces QuickCheck random resourcet shakespeare
- streaming-commons template-haskell text transformers unliftio wai
- wai-extra
- ];
- benchmarkHaskellDepends = [
- base blaze-html bytestring gauge shakespeare text transformers
- ];
- homepage = "http://www.yesodweb.com/";
- description = "Creation of type-safe, RESTful web applications";
- license = stdenv.lib.licenses.mit;
- }) {};
-
- "yesod-core_1_6_3" = callPackage
({ mkDerivation, aeson, async, auto-update, base, blaze-html
, blaze-markup, byteable, bytestring, case-insensitive, cereal
, clientsession, conduit, conduit-extra, containers, cookie
@@ -226202,7 +227265,6 @@ self: {
homepage = "http://www.yesodweb.com/";
description = "Creation of type-safe, RESTful web applications";
license = stdenv.lib.licenses.mit;
- hydraPlatforms = stdenv.lib.platforms.none;
}) {};
"yesod-crud" = callPackage
@@ -228963,8 +230025,8 @@ self: {
pname = "zip";
version = "1.0.0";
sha256 = "166iqyrmghlwwnka1gyxqjh875x7d3h0jnljlaslfvkfjhvb9ym9";
- revision = "2";
- editedCabalFile = "14dcabh3h6b1c8yzjq848i7arprgx7imx2rb9s0y2v0ax6b4dm48";
+ revision = "3";
+ editedCabalFile = "0af1qpyn6vfzcdyi1md7aq39fznswxijzm0ap7mdwp0g0l7pcdyh";
libraryHaskellDepends = [
base bytestring bzlib-conduit case-insensitive cereal conduit
conduit-extra containers digest directory dlist exceptions filepath
@@ -229540,27 +230602,6 @@ self: {
}) {};
"ztail" = callPackage
- ({ mkDerivation, array, base, bytestring, filepath, hinotify
- , process, regex-posix, time, unix, unordered-containers
- }:
- mkDerivation {
- pname = "ztail";
- version = "1.2.0.1";
- sha256 = "1gnxjk48jlz988k9mk5mc9hrfqj9wq4v7fbkk648ifmassxyx6wb";
- revision = "1";
- editedCabalFile = "1hsiq6k5rncq6qa9gax2d45vnb4q737sh8djch6b2bq6wc2vyg2d";
- isLibrary = false;
- isExecutable = true;
- executableHaskellDepends = [
- array base bytestring filepath hinotify process regex-posix time
- unix unordered-containers
- ];
- description = "Multi-file, colored, filtered log tailer";
- license = stdenv.lib.licenses.bsd3;
- hydraPlatforms = stdenv.lib.platforms.none;
- }) {};
-
- "ztail_1_2_0_2" = callPackage
({ mkDerivation, array, base, bytestring, filepath, hinotify
, process, regex-posix, time, unix, unordered-containers
}:
diff --git a/pkgs/development/interpreters/j/default.nix b/pkgs/development/interpreters/j/default.nix
index 698986e6b40..cb351446301 100644
--- a/pkgs/development/interpreters/j/default.nix
+++ b/pkgs/development/interpreters/j/default.nix
@@ -2,13 +2,13 @@
stdenv.mkDerivation rec {
name = "j-${version}";
- version = "806";
+ version = "808";
jtype = "release";
src = fetchFromGitHub {
owner = "jsoftware";
repo = "jsource";
rev = "j${version}-${jtype}";
- sha256 = "0b9sbd5hbyr5454k0p53f03lpf03sz8mqwszaqi0vcs73bsprdjs";
+ sha256 = "1sshm04p3yznlhfp6vyc7g8qxw95y67vhnh92cmz3lfy69n2q6bf";
};
buildInputs = [ readline libedit ];
diff --git a/pkgs/development/libraries/Xaw3d/default.nix b/pkgs/development/libraries/Xaw3d/default.nix
index 93ebe955659..f28ab55010b 100644
--- a/pkgs/development/libraries/Xaw3d/default.nix
+++ b/pkgs/development/libraries/Xaw3d/default.nix
@@ -12,6 +12,6 @@ stdenv.mkDerivation {
meta = {
description = "3D widget set based on the Athena Widget set";
- platforms = stdenv.lib.platforms.linux;
+ platforms = stdenv.lib.platforms.unix;
};
}
diff --git a/pkgs/development/libraries/agg/default.nix b/pkgs/development/libraries/agg/default.nix
index c7f5ac86660..ab309858095 100644
--- a/pkgs/development/libraries/agg/default.nix
+++ b/pkgs/development/libraries/agg/default.nix
@@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
sh autogen.sh
'';
- configureFlags = "--x-includes=${libX11.dev}/include --x-libraries=${libX11.out}/lib";
+ configureFlags = "--x-includes=${libX11.dev}/include --x-libraries=${libX11.out}/lib --enable-examples=no";
# libtool --tag=CXX --mode=link g++ -g -O2 libexamples.la ../src/platform/X11/libaggplatformX11.la ../src/libagg.la -o alpha_mask2 alpha_mask2.o
# libtool: error: cannot find the library 'libexamples.la'
diff --git a/pkgs/development/libraries/rdkafka/default.nix b/pkgs/development/libraries/rdkafka/default.nix
index b0e43e08653..a1af4374843 100644
--- a/pkgs/development/libraries/rdkafka/default.nix
+++ b/pkgs/development/libraries/rdkafka/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, zlib, perl, pkgconfig, python }:
+{ stdenv, fetchFromGitHub, zlib, perl, pkgconfig, python, openssl }:
stdenv.mkDerivation rec {
name = "rdkafka-${version}";
@@ -12,12 +12,10 @@ stdenv.mkDerivation rec {
};
nativeBuildInputs = [ pkgconfig ];
- buildInputs = [ zlib perl python ];
+ buildInputs = [ zlib perl python openssl ];
NIX_CFLAGS_COMPILE = "-Wno-error=strict-overflow";
- configureFlags = stdenv.lib.optionals stdenv.isDarwin [ "--disable-ssl" ];
-
postPatch = ''
patchShebangs .
'';
diff --git a/pkgs/development/python-modules/cheroot/default.nix b/pkgs/development/python-modules/cheroot/default.nix
index d1ecfcc5c89..7aa01623b08 100644
--- a/pkgs/development/python-modules/cheroot/default.nix
+++ b/pkgs/development/python-modules/cheroot/default.nix
@@ -1,6 +1,6 @@
{ stdenv, fetchPypi, buildPythonPackage
, more-itertools, six
-, coverage, codecov, pytest, pytestcov, pytest-sugar, portend
+, pytest, pytestcov, portend
, backports_unittest-mock, setuptools_scm }:
buildPythonPackage rec {
@@ -16,7 +16,7 @@ buildPythonPackage rec {
buildInputs = [ setuptools_scm ];
- checkInputs = [ coverage codecov pytest pytestcov pytest-sugar portend backports_unittest-mock ];
+ checkInputs = [ pytest pytestcov portend backports_unittest-mock ];
checkPhase = ''
py.test cheroot
diff --git a/pkgs/development/python-modules/cherrypy/default.nix b/pkgs/development/python-modules/cherrypy/default.nix
index 18c0ab826b3..bb97a3a7e67 100644
--- a/pkgs/development/python-modules/cherrypy/default.nix
+++ b/pkgs/development/python-modules/cherrypy/default.nix
@@ -1,11 +1,10 @@
{ lib, buildPythonPackage, fetchPypi
, cheroot, portend, routes, six
, setuptools_scm
-, backports_unittest-mock, codecov, coverage, objgraph, pathpy, pytest, pytest-sugar, pytestcov
+, backports_unittest-mock, objgraph, pathpy, pytest, pytestcov
}:
buildPythonPackage rec {
- name = "${pname}-${version}";
pname = "CherryPy";
version = "14.0.1";
@@ -18,7 +17,7 @@ buildPythonPackage rec {
buildInputs = [ setuptools_scm ];
- checkInputs = [ backports_unittest-mock codecov coverage objgraph pathpy pytest pytest-sugar pytestcov ];
+ checkInputs = [ backports_unittest-mock objgraph pathpy pytest pytestcov ];
checkPhase = ''
LANG=en_US.UTF-8 pytest
diff --git a/pkgs/development/python-modules/mysql-connector/default.nix b/pkgs/development/python-modules/mysql-connector/default.nix
index 6a2b3de0016..78069d49246 100644
--- a/pkgs/development/python-modules/mysql-connector/default.nix
+++ b/pkgs/development/python-modules/mysql-connector/default.nix
@@ -4,17 +4,20 @@
buildPythonPackage rec {
pname = "mysql-connector";
- version = "8.0.6";
+ version = "8.0.11";
src = fetchFromGitHub {
owner = "mysql";
repo = "mysql-connector-python";
rev = version;
- sha256 = "1ygr7va56da12yp3gr7kzss9zgbs28q2lmdkw16rpxj108id4rkp";
+ sha256 = "0w5sxy0zdkdj5cj35wwfjy9y8yn5yzk9biwwsglvhkqlkrms8fw1";
};
propagatedBuildInputs = [ protobuf ];
+ # Tests are failing (TODO: unknown reason)
+ # TypeError: __init__() missing 1 required positional argument: 'string'
+ # But the library should be working as expected.
doCheck = false;
meta = {
diff --git a/pkgs/development/python-modules/portend/default.nix b/pkgs/development/python-modules/portend/default.nix
index bd13c63c404..3559053481e 100644
--- a/pkgs/development/python-modules/portend/default.nix
+++ b/pkgs/development/python-modules/portend/default.nix
@@ -1,20 +1,25 @@
{ stdenv, buildPythonPackage, fetchPypi
-, pytest, pytest-sugar, pytest-warnings, setuptools_scm
-, tempora }:
+, pytest, setuptools_scm, tempora }:
buildPythonPackage rec {
- name = "${pname}-${version}";
pname = "portend";
version = "2.2";
- buildInputs = [ pytest pytest-sugar pytest-warnings setuptools_scm ];
- propagatedBuildInputs = [ tempora ];
-
src = fetchPypi {
inherit pname version;
sha256 = "bc48d3d99e1eaf2e9406c729f8848bfdaf87876cd3560dc3ec6c16714f529586";
};
+ nativeBuildInputs = [ setuptools_scm ];
+
+ propagatedBuildInputs = [ tempora ];
+
+ checkInputs = [ pytest ];
+
+ checkPhase = ''
+ py.test
+ '';
+
meta = with stdenv.lib; {
description = "Monitor TCP ports for bound or unbound states";
homepage = https://github.com/jaraco/portend;
diff --git a/pkgs/development/python-modules/pytest-sugar/default.nix b/pkgs/development/python-modules/pytest-sugar/default.nix
index a266b461749..16cd9aa966a 100644
--- a/pkgs/development/python-modules/pytest-sugar/default.nix
+++ b/pkgs/development/python-modules/pytest-sugar/default.nix
@@ -19,5 +19,9 @@ buildPythonPackage rec {
description = "A plugin that changes the default look and feel of py.test";
homepage = https://github.com/Frozenball/pytest-sugar;
license = licenses.bsd3;
+
+ # incompatible with pytest 3.5
+ # https://github.com/Frozenball/pytest-sugar/issues/134
+ broken = true; # 2018-04-20
};
}
diff --git a/pkgs/development/python-modules/yolk/default.nix b/pkgs/development/python-modules/yolk/default.nix
index 958fcd72f84..6e05b6ced04 100644
--- a/pkgs/development/python-modules/yolk/default.nix
+++ b/pkgs/development/python-modules/yolk/default.nix
@@ -17,7 +17,7 @@ buildPythonApplication rec {
meta = {
description = "Command-line tool for querying PyPI and Python packages installed on your system";
homepage = https://github.com/cakebread/yolk;
- maintainer = with maintainers; [];
+ maintainers = with maintainers; [];
license = licenses.bsd3;
};
}
diff --git a/pkgs/development/python-modules/zipfile36/default.nix b/pkgs/development/python-modules/zipfile36/default.nix
index 0915eb002b7..2929afed1cd 100644
--- a/pkgs/development/python-modules/zipfile36/default.nix
+++ b/pkgs/development/python-modules/zipfile36/default.nix
@@ -28,6 +28,6 @@ buildPythonPackage rec {
description = "Read and write ZIP files - backport of the zipfile module from Python 3.6";
homepage = https://gitlab.com/takluyver/zipfile36;
license = lib.licenses.psfl;
- maintainer = lib.maintainers.fridh;
+ maintainers = lib.maintainers.fridh;
};
-}
\ No newline at end of file
+}
diff --git a/pkgs/development/tools/misc/binutils/default.nix b/pkgs/development/tools/misc/binutils/default.nix
index 5c88902a68c..123f679d779 100644
--- a/pkgs/development/tools/misc/binutils/default.nix
+++ b/pkgs/development/tools/misc/binutils/default.nix
@@ -1,5 +1,5 @@
{ stdenv, buildPackages
-, fetchurl, zlib
+, fetchurl, zlib, autoreconfHook264
, buildPlatform, hostPlatform, targetPlatform
, noSysDirs, gold ? true, bison ? null
}:
@@ -64,12 +64,16 @@ stdenv.mkDerivation rec {
# https://sourceware.org/bugzilla/show_bug.cgi?id=22868
./gold-symbol-visibility.patch
- ];
+ ] ++ stdenv.lib.optional targetPlatform.isiOS ./support-ios.patch;
outputs = [ "out" "info" "man" ];
depsBuildBuild = [ buildPackages.stdenv.cc ];
- nativeBuildInputs = [ bison ];
+ nativeBuildInputs = [
+ bison
+ ] ++ stdenv.lib.optionals targetPlatform.isiOS [
+ autoreconfHook264
+ ];
buildInputs = [ zlib ];
inherit noSysDirs;
diff --git a/pkgs/development/tools/misc/binutils/support-ios.patch b/pkgs/development/tools/misc/binutils/support-ios.patch
new file mode 100644
index 00000000000..919a3920727
--- /dev/null
+++ b/pkgs/development/tools/misc/binutils/support-ios.patch
@@ -0,0 +1,112 @@
+diff --git a/bfd/config.bfd b/bfd/config.bfd
+index f04a993f06..3357022f35 100644
+--- a/bfd/config.bfd
++++ b/bfd/config.bfd
+@@ -238,7 +238,7 @@ case "${targ}" in
+
+ # START OF targmatch.h
+ #ifdef BFD64
+- aarch64-*-darwin*)
++ aarch64-*-darwin* | aarch64-*-ios*)
+ targ_defvec=aarch64_mach_o_vec
+ targ_selvecs="arm_mach_o_vec mach_o_le_vec mach_o_be_vec mach_o_fat_vec"
+ targ_archs="$targ_archs bfd_i386_arch bfd_powerpc_arch bfd_rs6000_arch"
+@@ -358,7 +358,7 @@ case "${targ}" in
+ targ_selvecs=arc_elf32_be_vec
+ ;;
+
+- arm-*-darwin*)
++ arm-*-darwin* | arm-*-ios*)
+ targ_defvec=arm_mach_o_vec
+ targ_selvecs="mach_o_le_vec mach_o_be_vec mach_o_fat_vec"
+ targ_archs="$targ_archs bfd_i386_arch bfd_powerpc_arch bfd_rs6000_arch"
+diff --git a/configure.ac b/configure.ac
+index aae94501e4..4b1121e0d1 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -510,7 +510,7 @@ if test x$enable_libgomp = x ; then
+ ;;
+ *-*-solaris2* | *-*-hpux11*)
+ ;;
+- *-*-darwin* | *-*-aix*)
++ *-*-darwin* | *-*-ios* | *-*-aix*)
+ ;;
+ nvptx*-*-*)
+ ;;
+@@ -706,7 +706,7 @@ case "${target}" in
+ ;;
+ x86_64-*-darwin[[912]]*)
+ ;;
+- *-*-darwin*)
++ *-*-darwin* | *-*-ios*)
+ noconfigdirs="$noconfigdirs target-libffi"
+ ;;
+ *-*-netware*)
+@@ -788,7 +788,7 @@ esac
+ # Disable the go frontend on systems where it is known to not work. Please keep
+ # this in sync with contrib/config-list.mk.
+ case "${target}" in
+-*-*-darwin* | *-*-cygwin* | *-*-mingw*)
++*-*-darwin* | *-*-ios* | *-*-cygwin* | *-*-mingw*)
+ unsupported_languages="$unsupported_languages go"
+ ;;
+ esac
+@@ -797,7 +797,7 @@ esac
+ # For testing, you can easily override this with --enable-libgo.
+ if test x$enable_libgo = x; then
+ case "${target}" in
+- *-*-darwin*)
++ *-*-darwin* | *-*-ios*)
+ # PR 46986
+ noconfigdirs="$noconfigdirs target-libgo"
+ ;;
+@@ -916,11 +916,11 @@ esac
+ case "${target}" in
+ *-*-chorusos)
+ ;;
+- aarch64-*-darwin*)
++ aarch64-*-darwin* | aarch64-*-ios*)
+ noconfigdirs="$noconfigdirs ld gas gdb gprof"
+ noconfigdirs="$noconfigdirs sim target-rda"
+ ;;
+- arm-*-darwin*)
++ arm-*-darwin* | arm-*-ios*)
+ noconfigdirs="$noconfigdirs ld gas gdb gprof"
+ noconfigdirs="$noconfigdirs sim target-rda"
+ ;;
+@@ -936,7 +936,7 @@ case "${target}" in
+ noconfigdirs="$noconfigdirs ld gas gprof"
+ noconfigdirs="$noconfigdirs sim target-rda"
+ ;;
+- *-*-darwin*)
++ *-*-darwin* | *-*-ios*)
+ noconfigdirs="$noconfigdirs ld gas gdb gprof"
+ noconfigdirs="$noconfigdirs sim target-rda"
+ ;;
+@@ -1226,7 +1226,7 @@ case "${host}" in
+ hppa*-*)
+ host_makefile_frag="config/mh-pa"
+ ;;
+- *-*-darwin*)
++ *-*-darwin* | *-*-ios*)
+ host_makefile_frag="config/mh-darwin"
+ ;;
+ powerpc-*-aix*)
+@@ -1708,7 +1708,7 @@ ACX_ELF_TARGET_IFELSE([# ELF platforms build the lto-plugin always.
+ # warn during gcc/ subconfigure; unless you're bootstrapping with
+ # -flto it won't be needed until after installation anyway.
+ case $target in
+- *-cygwin* | *-mingw* | *-apple-darwin* | *djgpp*) ;;
++ *-cygwin* | *-mingw* | *-apple-darwin* | *-apple-ios* | *djgpp*) ;;
+ *) if test x"$enable_lto" = x"yes"; then
+ AC_MSG_ERROR([LTO support is not enabled for this target.])
+ fi
+@@ -2590,7 +2590,7 @@ rm -f conftest*
+ # Decide which environment variable is used to find dynamic libraries.
+ case "${host}" in
+ *-*-hpux*) RPATH_ENVVAR=SHLIB_PATH ;;
+- *-*-darwin*) RPATH_ENVVAR=DYLD_LIBRARY_PATH ;;
++ *-*-darwin* | *-*-ios* ) RPATH_ENVVAR=DYLD_LIBRARY_PATH ;;
+ *-*-mingw* | *-*-cygwin ) RPATH_ENVVAR=PATH ;;
+ *) RPATH_ENVVAR=LD_LIBRARY_PATH ;;
+ esac
diff --git a/pkgs/development/tools/misc/gede/default.nix b/pkgs/development/tools/misc/gede/default.nix
index 9e2f3587558..9e8ce3d9331 100644
--- a/pkgs/development/tools/misc/gede/default.nix
+++ b/pkgs/development/tools/misc/gede/default.nix
@@ -1,26 +1,24 @@
-{ stdenv, fetchurl, makeWrapper, python, qt4, ctags, gdb }:
+{ stdenv, fetchurl, makeWrapper, python, qmake, ctags, gdb }:
stdenv.mkDerivation rec {
name = "gede-${version}";
- version = "2.0.4";
+ version = "2.6.1";
src = fetchurl {
url = "http://gede.acidron.com/uploads/source/${name}.tar.xz";
- sha256 = "0ip86ss35sc330p4aykv5qj74jbdwh38i928w1bxb6g3w0xmfqba";
+ sha256 = "0jallpchl3c3i90hwic4n7n0ggk5wra0fki4by9ag26ln0k42c4r";
};
- nativeBuildInputs = [ makeWrapper python ];
+ nativeBuildInputs = [ qmake makeWrapper python ];
- buildInputs = [ qt4 ];
+ buildInputs = [ ctags ];
- postPatch = ''
- sed -i build.py -e 's,qmake-qt4,qmake,'
- '';
+ dontUseQmakeConfigure = true;
buildPhase = ":";
installPhase = ''
- python build.py install --prefix="$out"
+ python build.py install --verbose --prefix="$out"
wrapProgram $out/bin/gede \
--prefix PATH : ${stdenv.lib.makeBinPath [ ctags gdb ]}
'';
diff --git a/pkgs/development/tools/mypy/default.nix b/pkgs/development/tools/mypy/default.nix
index e0288b686ef..fd21a8a23d3 100644
--- a/pkgs/development/tools/mypy/default.nix
+++ b/pkgs/development/tools/mypy/default.nix
@@ -2,14 +2,14 @@
buildPythonApplication rec {
pname = "mypy";
- version = "0.580";
+ version = "0.590";
# Tests not included in pip package.
doCheck = false;
src = fetchPypi {
inherit pname version;
- sha256 = "3bd95a1369810f7693366911d85be9f0a0bd994f6cb7162b7a994e5ded90e3d9";
+ sha256 = "0ynyrrj0wjyw130ay9x1ca88lbhbblp06bfsjrpzbcvp4grgxgq4";
};
propagatedBuildInputs = [ lxml typed-ast psutil ];
diff --git a/pkgs/games/xskat/default.nix b/pkgs/games/xskat/default.nix
index bd41531d923..383bdb88284 100644
--- a/pkgs/games/xskat/default.nix
+++ b/pkgs/games/xskat/default.nix
@@ -30,7 +30,7 @@ stdenv.mkDerivation {
meta = {
inherit (s) version;
description = ''Famous german card game'';
- platforms = stdenv.lib.platforms.linux;
+ platforms = stdenv.lib.platforms.unix;
license = stdenv.lib.licenses.free;
longDescription = ''Play the german card game Skat against the AI or over IRC.'';
homepage = http://www.xskat.de/;
diff --git a/pkgs/games/xsok/default.nix b/pkgs/games/xsok/default.nix
index e683e96d206..0aa0c97f07d 100644
--- a/pkgs/games/xsok/default.nix
+++ b/pkgs/games/xsok/default.nix
@@ -27,6 +27,7 @@ stdenv.mkDerivation rec {
sed -e '/chown /d' -i src/Imakefile
sed -e '/chmod /d' -i src/Imakefile
sed -e '/InstallAppDefaults/d' -i src/Imakefile
+ sed -e 's/CC = gcc/CC = cc/g' -i src/Imakefile
'';
makeFlags = ["BINDIR=$(out)/bin"];
@@ -41,7 +42,7 @@ stdenv.mkDerivation rec {
description = "A generic Sokoban game for X11";
license = stdenv.lib.licenses.gpl2Plus;
maintainers = [stdenv.lib.maintainers.raskin];
- platforms = stdenv.lib.platforms.linux;
+ platforms = stdenv.lib.platforms.unix;
homepage = https://tracker.debian.org/pkg/xsok;
};
}
diff --git a/pkgs/misc/beep/cve-2018-0492.patch b/pkgs/misc/beep/cve-2018-0492.patch
deleted file mode 100644
index 533fc6c1557..00000000000
--- a/pkgs/misc/beep/cve-2018-0492.patch
+++ /dev/null
@@ -1,106 +0,0 @@
-diff --git a/beep.c b/beep.c
-index 7da2e70..4323d31 100644
---- a/beep.c
-+++ b/beep.c
-@@ -109,6 +109,7 @@ void do_beep(int freq) {
- /* BEEP_TYPE_EVDEV */
- struct input_event e;
-
-+ memset(&e, 0, sizeof(e));
- e.type = EV_SND;
- e.code = SND_TONE;
- e.value = freq;
-@@ -124,10 +125,6 @@ void do_beep(int freq) {
- /* If we get interrupted, it would be nice to not leave the speaker beeping in
- perpetuity. */
- void handle_signal(int signum) {
--
-- if(console_device)
-- free(console_device);
--
- switch(signum) {
- case SIGINT:
- case SIGTERM:
-@@ -257,7 +254,7 @@ void parse_command_line(int argc, char **argv, beep_parms_t *result) {
- result->verbose = 1;
- break;
- case 'e' : /* also --device */
-- console_device = strdup(optarg);
-+ console_device = optarg;
- break;
- case 'h' : /* notice that this is also --help */
- default :
-@@ -276,26 +273,6 @@ void play_beep(beep_parms_t parms) {
- "%d delay after) @ %.2f Hz\n",
- parms.reps, parms.length, parms.delay, parms.end_delay, parms.freq);
-
-- /* try to snag the console */
-- if(console_device)
-- console_fd = open(console_device, O_WRONLY);
-- else
-- if((console_fd = open("/dev/tty0", O_WRONLY)) == -1)
-- console_fd = open("/dev/vc/0", O_WRONLY);
--
-- if(console_fd == -1) {
-- fprintf(stderr, "Could not open %s for writing\n",
-- console_device != NULL ? console_device : "/dev/tty0 or /dev/vc/0");
-- printf("\a"); /* Output the only beep we can, in an effort to fall back on usefulness */
-- perror("open");
-- exit(1);
-- }
--
-- if (ioctl(console_fd, EVIOCGSND(0)) != -1)
-- console_type = BEEP_TYPE_EVDEV;
-- else
-- console_type = BEEP_TYPE_CONSOLE;
--
- /* Beep */
- for (i = 0; i < parms.reps; i++) { /* start beep */
- do_beep(parms.freq);
-@@ -305,8 +282,6 @@ void play_beep(beep_parms_t parms) {
- if(parms.end_delay || (i+1 < parms.reps))
- usleep(1000*parms.delay); /* wait... */
- } /* repeat. */
--
-- close(console_fd);
- }
-
-
-@@ -328,6 +303,26 @@ int main(int argc, char **argv) {
- signal(SIGTERM, handle_signal);
- parse_command_line(argc, argv, parms);
-
-+ /* try to snag the console */
-+ if(console_device)
-+ console_fd = open(console_device, O_WRONLY);
-+ else
-+ if((console_fd = open("/dev/tty0", O_WRONLY)) == -1)
-+ console_fd = open("/dev/vc/0", O_WRONLY);
-+
-+ if(console_fd == -1) {
-+ fprintf(stderr, "Could not open %s for writing\n",
-+ console_device != NULL ? console_device : "/dev/tty0 or /dev/vc/0");
-+ printf("\a"); /* Output the only beep we can, in an effort to fall back on usefulness */
-+ perror("open");
-+ exit(1);
-+ }
-+
-+ if (ioctl(console_fd, EVIOCGSND(0)) != -1)
-+ console_type = BEEP_TYPE_EVDEV;
-+ else
-+ console_type = BEEP_TYPE_CONSOLE;
-+
- /* this outermost while loop handles the possibility that -n/--new has been
- used, i.e. that we have multiple beeps specified. Each iteration will
- play, then free() one parms instance. */
-@@ -365,8 +360,8 @@ int main(int argc, char **argv) {
- parms = next;
- }
-
-- if(console_device)
-- free(console_device);
-+ close(console_fd);
-+ console_fd = -1;
-
- return EXIT_SUCCESS;
- }
diff --git a/pkgs/misc/beep/default.nix b/pkgs/misc/beep/default.nix
index 762b8d65a84..ce097bd5f23 100644
--- a/pkgs/misc/beep/default.nix
+++ b/pkgs/misc/beep/default.nix
@@ -1,33 +1,25 @@
-{ stdenv, fetchFromGitHub }:
+{ stdenv, fetchurl }:
# this package is working only as root
# in order to work as a non privileged user you would need to suid the bin
stdenv.mkDerivation {
name = "beep-1.3";
-
- src = fetchFromGitHub {
- owner = "johnath";
- repo = "beep";
- rev = "0d790fa45777896749a885c3b93b2c1476d59f20";
- sha256 = "0dxz58an0sz5r82al5sc935y2z2k60rz12ikjvx7sz39rfirgfpc";
+ src = fetchurl {
+ url = http://www.johnath.com/beep/beep-1.3.tar.gz;
+ sha256 = "0bgch6jq5cahakk3kbr9549iysf2dik09afixxy5brbxk1xfzb2r";
};
- patches = [ ./cve-2018-0492.patch ];
-
- makeFlags = [
- "INSTALL_DIR=${placeholder "out"}/bin/"
- "MAN_DIR=${placeholder "out"}/man/man1/"
- ];
+ makeFlags = "INSTALL_DIR=\${out}/bin/ MAN_DIR=\${out}/man/man1/";
preInstall = ''
- mkdir -p $out/{bin,man/man1}
+ mkdir -p $out/bin
+ mkdir -p $out/man/man1
'';
-
- meta = with stdenv.lib; {
+ meta = {
description = "The advanced PC speaker beeper";
homepage = http://www.johnath.com/beep/;
- license = licenses.gpl2;
- platforms = platforms.linux;
+ license = stdenv.lib.licenses.gpl2;
+ platforms = stdenv.lib.platforms.linux;
};
}
diff --git a/pkgs/misc/vscode-extensions/cpptools/default.nix b/pkgs/misc/vscode-extensions/cpptools/default.nix
index 87c782222fc..c537aa8a1f9 100644
--- a/pkgs/misc/vscode-extensions/cpptools/default.nix
+++ b/pkgs/misc/vscode-extensions/cpptools/default.nix
@@ -120,9 +120,9 @@ vscode-utils.buildVscodeMarketplaceExtension {
meta = with stdenv.lib; {
license = licenses.unfree;
- maintainer = [ maintainers.jraygauthier ];
+ maintainers = [ maintainers.jraygauthier ];
# A 32 bit linux would also be possible with some effort (specific download of binaries +
# patching of the elf files with 32 bit interpreter).
platforms = [ "x86_64-linux" ];
};
-}
\ No newline at end of file
+}
diff --git a/pkgs/misc/vscode-extensions/python/default.nix b/pkgs/misc/vscode-extensions/python/default.nix
index 4e28de871b8..430ce192ed0 100644
--- a/pkgs/misc/vscode-extensions/python/default.nix
+++ b/pkgs/misc/vscode-extensions/python/default.nix
@@ -36,6 +36,6 @@ vscode-utils.buildVscodeMarketplaceExtension {
meta = with lib; {
license = licenses.mit;
- maintainer = [ maintainers.jraygauthier ];
+ maintainers = [ maintainers.jraygauthier ];
};
-}
\ No newline at end of file
+}
diff --git a/pkgs/os-specific/darwin/cctools/ld-tbd-v2.patch b/pkgs/os-specific/darwin/cctools/ld-tbd-v2.patch
new file mode 100644
index 00000000000..9aae2be1d03
--- /dev/null
+++ b/pkgs/os-specific/darwin/cctools/ld-tbd-v2.patch
@@ -0,0 +1,98 @@
+diff --git a/cctools/ld64/src/ld/parsers/textstub_dylib_file.cpp b/cctools/ld64/src/ld/parsers/textstub_dylib_file.cpp
+index 09c0e12..ac6b085 100644
+--- a/cctools/ld64/src/ld/parsers/textstub_dylib_file.cpp
++++ b/cctools/ld64/src/ld/parsers/textstub_dylib_file.cpp
+@@ -187,6 +187,7 @@ struct DynamicLibrary {
+ ld::File::ObjcConstraint _objcConstraint;
+ Options::Platform _platform;
+ std::vector _allowedClients;
++ std::vector _allowableClients;
+ std::vector _reexportedLibraries;
+ std::vector _symbols;
+ std::vector _classes;
+@@ -246,6 +247,14 @@ class TBDFile {
+ });
+ }
+
++ void parseAllowableClients(DynamicLibrary& lib) {
++ if ( !hasOptionalToken("allowable-clients") )
++ return;
++ parseFlowSequence([&](Token name) {
++ lib._allowableClients.emplace_back(name);
++ });
++ }
++
+ void parseReexportedDylibs(DynamicLibrary& lib) {
+ if ( !hasOptionalToken("re-exports") )
+ return;
+@@ -306,6 +315,21 @@ class TBDFile {
+ return false;
+ }
+
++ void skipUUIDs(DynamicLibrary& lib) {
++ expectToken("uuids");
++ while ( true ) {
++ auto token = next();
++ if ( token == "]" )
++ break;
++ }
++ }
++
++ void skipParentUmbrella(DynamicLibrary& lib) {
++ if (!hasOptionalToken("parent-umbrella"))
++ return;
++ next();
++ }
++
+ void parsePlatform(DynamicLibrary& lib) {
+ expectToken("platform");
+
+@@ -410,6 +434,7 @@ class TBDFile {
+ }
+
+ parseAllowedClients(lib);
++ parseAllowableClients(lib);
+ parseReexportedDylibs(lib);
+ parseSymbols(lib);
+ if ( !hasOptionalToken("-") )
+@@ -455,17 +480,21 @@ class TBDFile {
+ return result.front();
+ }
+
+- void parseDocument(DynamicLibrary& lib, std::string &requestedArchName) {
++ void parseDocument(DynamicLibrary& lib, std::string &requestedArchName, bool isTbdV2) {
+ auto selectedArchName = parseAndSelectArchitecture(requestedArchName);
+ if (selectedArchName.empty())
+ throwf("invalid arch");
+
++ if(isTbdV2)
++ skipUUIDs(lib);
+ parsePlatform(lib);
+ parseInstallName(lib);
+ parseCurrentVersion(lib);
+ parseCompatibilityVersion(lib);
+ parseSwiftVersion(lib);
+ parseObjCConstraint(lib);
++ if(isTbdV2)
++ skipParentUmbrella(lib);
+ parseExportsBlock(lib, selectedArchName);
+ }
+
+@@ -476,7 +505,8 @@ public:
+ _tokenizer.reset();
+ DynamicLibrary lib;
+ expectToken("---");
+- parseDocument(lib, requestedArchName);
++ auto isTbdV2 = hasOptionalToken("!tapi-tbd-v2");
++ parseDocument(lib, requestedArchName, isTbdV2);
+ expectToken("...");
+ return lib;
+ }
+@@ -486,6 +516,7 @@ public:
+ auto token = next();
+ if ( token != "---" )
+ return false;
++ hasOptionalToken("!tapi-tbd-v2");
+ return !parseAndSelectArchitecture(requestedArchName).empty();
+ }
+
diff --git a/pkgs/os-specific/darwin/cctools/port.nix b/pkgs/os-specific/darwin/cctools/port.nix
index 55995c1592d..d8abdc2c6f8 100644
--- a/pkgs/os-specific/darwin/cctools/port.nix
+++ b/pkgs/os-specific/darwin/cctools/port.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, makeWrapper, autoconf, automake, libtool_2
+{ stdenv, fetchFromGitHub, makeWrapper, autoconf, automake, libtool_2, autoreconfHook
, llvm, libcxx, libcxxabi, clang, libuuid
, libobjc ? null, maloader ? null, xctoolchain ? null
, hostPlatform, targetPlatform
@@ -6,6 +6,14 @@
}:
let
+
+ # We need to use an old version of cctools-port to support linking TBD files
+ # in the iOS SDK. Note that this only provides support for SDK versions up to
+ # 10.x. For 11.0 and higher we will need to upgrade to a newer cctools than the
+ # default version here, which can support the new TBD format via Apple's
+ # libtapi.
+ useOld = targetPlatform.isiOS;
+
# The targetPrefix prepended to binary names to allow multiple binuntils on the
# PATH to both be usable.
targetPrefix = stdenv.lib.optionalString
@@ -16,10 +24,12 @@ in
# Non-Darwin alternatives
assert (!hostPlatform.isDarwin) -> (maloader != null && xctoolchain != null);
+assert enableDumpNormalizedLibArgs -> (!useOld);
+
let
baseParams = rec {
name = "${targetPrefix}cctools-port-${version}";
- version = "895";
+ version = if useOld then "886" else "895";
src = fetchFromGitHub (if enableDumpNormalizedLibArgs then {
owner = "tpoechtrager";
@@ -27,6 +37,11 @@ let
# master with https://github.com/tpoechtrager/cctools-port/pull/34
rev = "8395d4b2c3350356e2fb02f5e04f4f463c7388df";
sha256 = "10vbf1cfzx02q8chc77s84fp2kydjpx2y682mr6mrbb7sq5rwh8f";
+ } else if useOld then {
+ owner = "tpoechtrager";
+ repo = "cctools-port";
+ rev = "02f0b8ecd87a3951653d838a321ae744815e21a5";
+ sha256 = "0bzyabzr5dvbxglr74d0kbrk2ij5x7s5qcamqi1v546q1had1wz1";
} else {
owner = "tpoechtrager";
repo = "cctools-port";
@@ -36,7 +51,11 @@ let
outputs = [ "out" "dev" ];
- nativeBuildInputs = [ autoconf automake libtool_2 ];
+ nativeBuildInputs = [
+ autoconf automake libtool_2
+ ] ++ stdenv.lib.optionals useOld [
+ autoreconfHook
+ ];
buildInputs = [ libuuid ] ++
# Only need llvm and clang if the stdenv isn't already clang-based (TODO: just make a stdenv.cc.isClang)
stdenv.lib.optionals (!stdenv.isDarwin) [ llvm clang ] ++
@@ -44,9 +63,14 @@ let
patches = [
./ld-rpath-nonfinal.patch ./ld-ignore-rpath-link.patch
+ ] ++ stdenv.lib.optionals useOld [
+ # See https://github.com/tpoechtrager/cctools-port/issues/24. Remove when that's fixed.
+ ./undo-unknown-triple.patch
+ ./ld-tbd-v2.patch
+ ./support-ios.patch
];
- __propagatedImpureHostDeps = [
+ __propagatedImpureHostDeps = stdenv.lib.optionals (!useOld) [
# As far as I can tell, otool from cctools is the only thing that depends on these two, and we should fix them
"/usr/lib/libobjc.A.dylib"
"/usr/lib/libobjc.dylib"
@@ -86,12 +110,15 @@ let
EOF
'' + stdenv.lib.optionalString (!stdenv.isDarwin) ''
sed -i -e 's|clang++|& -I${libcxx}/include/c++/v1|' cctools/autogen.sh
+ '' + stdenv.lib.optionalString useOld ''
+ cd cctools
'';
# TODO: this builds an ld without support for LLVM's LTO. We need to teach it, but that's rather
# hairy to handle during bootstrap. Perhaps it could be optional?
- preConfigure = ''
+ preConfigure = stdenv.lib.optionalString (!useOld) ''
cd cctools
+ '' + ''
sh autogen.sh
'';
diff --git a/pkgs/os-specific/darwin/cctools/support-ios.patch b/pkgs/os-specific/darwin/cctools/support-ios.patch
new file mode 100644
index 00000000000..f78c6b63ac8
--- /dev/null
+++ b/pkgs/os-specific/darwin/cctools/support-ios.patch
@@ -0,0 +1,13 @@
+diff --git a/cctools/configure.ac b/cctools/configure.ac
+index 56e8f24..0b4b3ff 100644
+--- a/cctools/configure.ac
++++ b/cctools/configure.ac
+@@ -39,7 +39,7 @@ EXTRACXXFLAGS=""
+ WARNINGS=""
+
+ case $host_os in
+- darwin* )
++ darwin* | ios*)
+ isdarwin=yes
+ AM_CONDITIONAL([ISDARWIN], [true])
+ ;;
diff --git a/pkgs/os-specific/darwin/cctools/undo-unknown-triple.patch b/pkgs/os-specific/darwin/cctools/undo-unknown-triple.patch
new file mode 100644
index 00000000000..7df9bdd16da
--- /dev/null
+++ b/pkgs/os-specific/darwin/cctools/undo-unknown-triple.patch
@@ -0,0 +1,17 @@
+diff --git a/cctools/as/driver.c b/cctools/as/driver.c
+index b06d085..c03397a 100644
+--- a/cctools/as/driver.c
++++ b/cctools/as/driver.c
+@@ -363,12 +363,6 @@ char **envp)
+ /* Add -c or clang will run ld(1). */
+ new_argv[j] = "-c";
+ j++;
+- /* cctools-port start */
+- new_argv[j] = "-target";
+- j++;
+- new_argv[j] = "unknown-apple-darwin";
+- j++;
+- /* cctools-port end */
+ new_argv[j] = NULL;
+ if(execute(new_argv, verbose))
+ exit(0);
diff --git a/pkgs/os-specific/darwin/ios-cross/default.nix b/pkgs/os-specific/darwin/ios-cross/default.nix
deleted file mode 100644
index 175e9738ef9..00000000000
--- a/pkgs/os-specific/darwin/ios-cross/default.nix
+++ /dev/null
@@ -1,61 +0,0 @@
-{ runCommand
-, lib
-, llvm
-, clang
-, binutils
-, stdenv
-, coreutils
-, gnugrep
-, buildPackages
-, hostPlatform
-, targetPlatform
-}:
-
-/* As of this writing, known-good prefix/arch/simulator triples:
- * aarch64-apple-darwin14 | arm64 | false
- * arm-apple-darwin10 | armv7 | false
- * i386-apple-darwin11 | i386 | true
- * x86_64-apple-darwin14 | x86_64 | true
- */
-
-# Apple uses somewhat non-standard names for this. We could fall back on
-# `targetPlatform.parsed.cpu.name`, but that would be a more standard one and
-# likely to fail. Better just to require something manual.
-assert targetPlatform ? arch;
-
-let
-
- prefix = targetPlatform.config;
- inherit (targetPlatform) arch;
- simulator = targetPlatform.isiPhoneSimulator or false;
-
- sdkType = if simulator then "Simulator" else "OS";
-
- sdkVer = "10.2";
-
- sdk = "/Applications/Xcode.app/Contents/Developer/Platforms/iPhone${sdkType}.platform/Developer/SDKs/iPhone${sdkType}${sdkVer}.sdk";
-
-in (import ../../../build-support/cc-wrapper {
- inherit stdenv coreutils gnugrep runCommand buildPackages;
- nativeTools = false;
- nativeLibc = false;
- inherit binutils;
- libc = runCommand "empty-libc" {} "mkdir -p $out/{lib,include}";
- inherit (clang) cc;
- inherit hostPlatform targetPlatform;
- extraBuildCommands = ''
- if ! [ -d ${sdk} ]; then
- echo "You must have ${sdkVer} of the iPhone${sdkType} sdk installed at ${sdk}" >&2
- exit 1
- fi
- # ugh
- tr '\n' ' ' < $out/nix-support/cc-cflags > cc-cflags.tmp
- mv cc-cflags.tmp $out/nix-support/cc-cflags
- echo "-target ${prefix} -arch ${arch} -idirafter ${sdk}/usr/include ${if simulator then "-mios-simulator-version-min=7.0" else "-miphoneos-version-min=7.0"}" >> $out/nix-support/cc-cflags
-
- # Purposefully overwrite libc-ldflags-before, cctools ld doesn't know dynamic-linker and cc-wrapper doesn't do cross-compilation well enough to adjust
- echo "-arch ${arch} -L${sdk}/usr/lib ${lib.optionalString simulator "-L${sdk}/usr/lib/system "}-i${if simulator then "os_simulator" else "phoneos"}_version_min 7.0.0" > $out/nix-support/libc-ldflags-before
- '';
- }) // {
- inherit sdkType sdkVer sdk;
- }
diff --git a/pkgs/os-specific/darwin/ios-sdk-pkgs/default.nix b/pkgs/os-specific/darwin/ios-sdk-pkgs/default.nix
new file mode 100644
index 00000000000..5b9f30b62c3
--- /dev/null
+++ b/pkgs/os-specific/darwin/ios-sdk-pkgs/default.nix
@@ -0,0 +1,68 @@
+{ lib, hostPlatform, targetPlatform
+, clang-unwrapped
+, binutils-unwrapped
+, runCommand
+, stdenv
+, wrapBintoolsWith
+, wrapCCWith
+, buildIosSdk, targetIosSdkPkgs
+}:
+
+let
+
+minSdkVersion = "9.0";
+
+iosPlatformArch = { parsed, ... }: {
+ "arm" = "armv7";
+ "aarch64" = "arm64";
+ "x86_64" = "x86_64";
+}.${parsed.cpu.name};
+
+in
+
+rec {
+ # TODO(kmicklas): Make a pure version of this for each supported SDK version.
+ sdk = rec {
+ name = "ios-sdk";
+ type = "derivation";
+ outPath = "/Applications/Xcode.app/Contents/Developer/Platforms/iPhone${sdkType}.platform/Developer/SDKs/iPhone${sdkType}${version}.sdk";
+
+ sdkType = if targetPlatform.isiPhoneSimulator then "Simulator" else "OS";
+ version = targetPlatform.sdkVer;
+ };
+
+ binutils = wrapBintoolsWith {
+ libc = targetIosSdkPkgs.libraries;
+ bintools = binutils-unwrapped;
+ extraBuildCommands = ''
+ echo "-arch ${iosPlatformArch targetPlatform}" >> $out/nix-support/libc-ldflags
+ '';
+ };
+
+ clang = (wrapCCWith {
+ cc = clang-unwrapped;
+ bintools = binutils;
+ libc = targetIosSdkPkgs.libraries;
+ extraBuildCommands = ''
+ tr '\n' ' ' < $out/nix-support/cc-cflags > cc-cflags.tmp
+ mv cc-cflags.tmp $out/nix-support/cc-cflags
+ echo "-target ${targetPlatform.config} -arch ${iosPlatformArch targetPlatform}" >> $out/nix-support/cc-cflags
+ echo "-isystem ${sdk}/usr/include -isystem ${sdk}/usr/include/c++/4.2.1/ -stdlib=libstdc++" >> $out/nix-support/cc-cflags
+ echo "${if targetPlatform.isiPhoneSimulator then "-mios-simulator-version-min" else "-miphoneos-version-min"}=${minSdkVersion}" >> $out/nix-support/cc-cflags
+ '';
+ }) // {
+ inherit sdk;
+ };
+
+ libraries = let sdk = buildIosSdk; in runCommand "libSystem-prebuilt" {
+ passthru = {
+ inherit sdk;
+ };
+ } ''
+ if ! [ -d ${sdk} ]; then
+ echo "You must have version ${sdk.version} of the iPhone${sdk.sdkType} sdk installed at ${sdk}" >&2
+ exit 1
+ fi
+ ln -s ${sdk}/usr $out
+ '';
+}
diff --git a/pkgs/os-specific/linux/hwdata/default.nix b/pkgs/os-specific/linux/hwdata/default.nix
index 724242c588a..15b3903ddd1 100644
--- a/pkgs/os-specific/linux/hwdata/default.nix
+++ b/pkgs/os-specific/linux/hwdata/default.nix
@@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
name = "hwdata-${version}";
- version = "0.310";
+ version = "0.311";
src = fetchurl {
- url = "https://github.com/vcrhonek/hwdata/archive/v0.310.tar.gz";
- sha256 = "08mhwwc9g9cpfyxrwwviflkdk2jnqs6hc95iv4r5d59hqrj5kida";
+ url = "https://github.com/vcrhonek/hwdata/archive/v0.311.tar.gz";
+ sha256 = "159av9wvl3biryxd5pgqcwz6wkdaa0ydmcysmzznx939mfv7w18z";
};
preConfigure = "patchShebangs ./configure";
diff --git a/pkgs/os-specific/linux/kernel/linux-4.14.nix b/pkgs/os-specific/linux/kernel/linux-4.14.nix
index ba589b70b6b..e064dbfd85b 100644
--- a/pkgs/os-specific/linux/kernel/linux-4.14.nix
+++ b/pkgs/os-specific/linux/kernel/linux-4.14.nix
@@ -3,13 +3,13 @@
with stdenv.lib;
buildLinux (args // rec {
- version = "4.14.34";
+ version = "4.14.35";
# branchVersion needs to be x.y
extraMeta.branch = concatStrings (intersperse "." (take 2 (splitString "." version)));
src = fetchurl {
url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz";
- sha256 = "1f9bl4qw61xw49y5xz1wyilg8gh0wv9k868fh8n3hp17hm66qavq";
+ sha256 = "01zfbd766y8hfsd248lffaj6d4ghl4j918m3yvl892p84xsp5aq2";
};
} // (args.argsOverride or {}))
diff --git a/pkgs/os-specific/linux/kernel/linux-4.15.nix b/pkgs/os-specific/linux/kernel/linux-4.15.nix
index 63bfc79e62d..07f408027d8 100644
--- a/pkgs/os-specific/linux/kernel/linux-4.15.nix
+++ b/pkgs/os-specific/linux/kernel/linux-4.15.nix
@@ -3,7 +3,7 @@
with stdenv.lib;
buildLinux (args // rec {
- version = "4.15.17";
+ version = "4.15.18";
# modDirVersion needs to be x.y.z, will automatically add .0 if needed
modDirVersion = concatStrings (intersperse "." (take 3 (splitString "." "${version}.0")));
@@ -13,6 +13,6 @@ buildLinux (args // rec {
src = fetchurl {
url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz";
- sha256 = "1f20h22rrchvqd653a3ih8q6l13zl47bp6k2339x9ihq40rg5m9g";
+ sha256 = "0hdg5h91zwypsgb1lp1m5q1iak1g00rml54fh6j7nj8dgrqwv29z";
};
} // (args.argsOverride or {}))
diff --git a/pkgs/os-specific/linux/kernel/linux-4.16.nix b/pkgs/os-specific/linux/kernel/linux-4.16.nix
index aa225c8e7c7..343d7c9f9da 100644
--- a/pkgs/os-specific/linux/kernel/linux-4.16.nix
+++ b/pkgs/os-specific/linux/kernel/linux-4.16.nix
@@ -3,7 +3,7 @@
with stdenv.lib;
buildLinux (args // rec {
- version = "4.16.2";
+ version = "4.16.3";
# modDirVersion needs to be x.y.z, will automatically add .0 if needed
modDirVersion = concatStrings (intersperse "." (take 3 (splitString "." "${version}.0")));
@@ -13,6 +13,6 @@ buildLinux (args // rec {
src = fetchurl {
url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz";
- sha256 = "157q43px707nizqwzi5nk87c0nvdif9fbi751f71wpgfp3iiy2s7";
+ sha256 = "18w1dhq5dnmcqc3d8imwm90zwfw0fhda7sy5fjwkhzm93nl72s8d";
};
} // (args.argsOverride or {}))
diff --git a/pkgs/os-specific/linux/kernel/linux-4.4.nix b/pkgs/os-specific/linux/kernel/linux-4.4.nix
index b5974854112..b14418964da 100644
--- a/pkgs/os-specific/linux/kernel/linux-4.4.nix
+++ b/pkgs/os-specific/linux/kernel/linux-4.4.nix
@@ -1,11 +1,11 @@
{ stdenv, buildPackages, hostPlatform, fetchurl, perl, buildLinux, ... } @ args:
buildLinux (args // rec {
- version = "4.4.127";
+ version = "4.4.128";
extraMeta.branch = "4.4";
src = fetchurl {
url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz";
- sha256 = "1gscsvijik24p0skhjnhqxlvzj3kfy5cmn3x9wn6ka687hwjb3qa";
+ sha256 = "1c5nlxazn2ijfra1bn3x4fdz3fx02j76hg430jgyij61vndgi5ka";
};
} // (args.argsOverride or {}))
diff --git a/pkgs/os-specific/linux/kernel/linux-4.9.nix b/pkgs/os-specific/linux/kernel/linux-4.9.nix
index 86ddcf99dbe..569f472545e 100644
--- a/pkgs/os-specific/linux/kernel/linux-4.9.nix
+++ b/pkgs/os-specific/linux/kernel/linux-4.9.nix
@@ -1,11 +1,11 @@
{ stdenv, buildPackages, hostPlatform, fetchurl, perl, buildLinux, ... } @ args:
buildLinux (args // rec {
- version = "4.9.93";
+ version = "4.9.94";
extraMeta.branch = "4.9";
src = fetchurl {
url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz";
- sha256 = "00srda6plvirmrr0bjgiksf00ssiigf5cqi4giy4mij5r6v8mxsq";
+ sha256 = "15rd1rmvwx6wyqp857bdl77ijd233svm5wxyjyj8dy8n36yivk39";
};
} // (args.argsOverride or {}))
diff --git a/pkgs/os-specific/linux/kernel/linux-copperhead-hardened.nix b/pkgs/os-specific/linux/kernel/linux-copperhead-hardened.nix
index 0075cfbe165..5685e6dd904 100644
--- a/pkgs/os-specific/linux/kernel/linux-copperhead-hardened.nix
+++ b/pkgs/os-specific/linux/kernel/linux-copperhead-hardened.nix
@@ -3,9 +3,9 @@
with stdenv.lib;
let
- version = "4.15.17";
+ version = "4.15.18";
revision = "a";
- sha256 = "0rm5dlfj3ryz879p04px1y3hvlfgh3ryk13ihldnl2j1dzl2046i";
+ sha256 = "1wld16i3r06mqxwwkghsxnnivg1jpc6c15y9iclhdgl4srcs1qp6";
# modVersion needs to be x.y.z, will automatically add .0 if needed
modVersion = concatStrings (intersperse "." (take 3 (splitString "." "${version}.0")));
diff --git a/pkgs/servers/home-assistant/appdaemon.nix b/pkgs/servers/home-assistant/appdaemon.nix
index a6119e58d7c..49313179503 100644
--- a/pkgs/servers/home-assistant/appdaemon.nix
+++ b/pkgs/servers/home-assistant/appdaemon.nix
@@ -33,11 +33,11 @@ let
in python.pkgs.buildPythonApplication rec {
pname = "appdaemon";
- version = "3.0.0";
+ version = "3.0.1";
src = python.pkgs.fetchPypi {
inherit pname version;
- sha256 = "ed925d3cb25db2c3f57304a0bca8fd0d9072d7ffe347ac5fcf68c4a30b7f1721";
+ sha256 = "ad16773da21e34e258970bf5740d1634a36c8202ac72c6925d960308ef1c58cf";
};
propagatedBuildInputs = with python.pkgs; [
diff --git a/pkgs/servers/metabase/default.nix b/pkgs/servers/metabase/default.nix
index 90bd5b614dd..d36810b9f5c 100644
--- a/pkgs/servers/metabase/default.nix
+++ b/pkgs/servers/metabase/default.nix
@@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
name = "metabase-${version}";
- version = "0.28.1";
+ version = "0.28.6";
- jar = fetchurl {
+ src = fetchurl {
url = "http://downloads.metabase.com/v${version}/metabase.jar";
- sha256 = "1nv3y4pnvzd7lwyj14nmhr3k52qd8hilcjxvd7qr3hb7kzmjvbzk";
+ sha256 = "1dzs57yyx6k93gvyva9y38xdb4pbvdliad3zzgk3vs74fp1zh2vq";
};
nativeBuildInputs = [ makeWrapper ];
@@ -14,13 +14,14 @@ stdenv.mkDerivation rec {
unpackPhase = "true";
installPhase = ''
- makeWrapper ${jre}/bin/java $out/bin/metabase --add-flags "-jar $jar"
+ makeWrapper ${jre}/bin/java $out/bin/metabase --add-flags "-jar $src"
'';
meta = with stdenv.lib; {
description = "The easy, open source way for everyone in your company to ask questions and learn from data.";
- homepage = https://metabase.com;
- license = licenses.agpl3;
- maintainers = with maintainers; [ schneefux ];
+ homepage = https://metabase.com;
+ license = licenses.agpl3;
+ platforms = platforms.all;
+ maintainers = with maintainers; [ schneefux thoughtpolice ];
};
}
diff --git a/pkgs/servers/sql/postgresql/default.nix b/pkgs/servers/sql/postgresql/default.nix
index f7b894111e4..a2093962ea9 100644
--- a/pkgs/servers/sql/postgresql/default.nix
+++ b/pkgs/servers/sql/postgresql/default.nix
@@ -93,33 +93,33 @@ let
in {
postgresql93 = common {
- version = "9.3.21";
+ version = "9.3.22";
psqlSchema = "9.3";
- sha256 = "1q2038rvqa00rpk8sjbnwb19x64fcyjphw9x087432hq918vrfmr";
+ sha256 = "06p9rk2bav41ybp8ra1bpf44avw9kl5s1wyql21n5awvlm5fs60v";
};
postgresql94 = common {
- version = "9.4.16";
+ version = "9.4.17";
psqlSchema = "9.4";
- sha256 = "10ay2cy3m4g66jwvxknc0f0w6mv2v7vm0dzkq92s9n7446v65g6w";
+ sha256 = "1inpkwbr2xappz3kq3jr3hsn6mwn167nijcx406q8aq56p9hqcks";
};
postgresql95 = common {
- version = "9.5.11";
+ version = "9.5.12";
psqlSchema = "9.5";
- sha256 = "1pf8fwx8a6vn344b80a1bf2p4hjg06sh69kb2qwswxbsw9scv0l1";
+ sha256 = "167nlrpsnqz63gafgn21j4yc2f5g1mpfkz8qxjxk2xs6crf6zs02";
};
postgresql96 = common {
- version = "9.6.7";
+ version = "9.6.8";
psqlSchema = "9.6";
- sha256 = "1ii4lrw8sncnz5g0fss1011shjhmbajzzhxx4f0bgsniq7rkvgif";
+ sha256 = "0w7bwf19wbdd3jjbjv03cnx56qka4801srcbsayk9v792awv7zga";
};
postgresql100 = common {
- version = "10.2";
+ version = "10.3";
psqlSchema = "10.0";
- sha256 = "1bav2iyi93h866skrrlqlvsp4sfv1sfww1s305zpzffxcadh0cpy";
+ sha256 = "06lkcwsf851z49zqcws5yc77s2yrbaazf2nvbk38hpp31rw6i8kf";
};
}
diff --git a/pkgs/servers/x11/xorg/default.nix b/pkgs/servers/x11/xorg/default.nix
index f5d7f54eb5c..07faa8d3cc7 100644
--- a/pkgs/servers/x11/xorg/default.nix
+++ b/pkgs/servers/x11/xorg/default.nix
@@ -2570,6 +2570,9 @@ let
url = mirror://xorg/individual/util/xorg-cf-files-1.0.6.tar.bz2;
sha256 = "0kckng0zs1viz0nr84rdl6dswgip7ndn4pnh5nfwnviwpsfmmksd";
};
+ postInstall = stdenv.lib.optionalString stdenv.isDarwin ''
+ substituteInPlace $out/lib/X11/config/darwin.cf --replace "/usr/bin/" ""
+ '';
nativeBuildInputs = [ pkgconfig ];
buildInputs = [ ];
meta.platforms = stdenv.lib.platforms.unix;
diff --git a/pkgs/stdenv/cross/default.nix b/pkgs/stdenv/cross/default.nix
index 6e306571853..973be983186 100644
--- a/pkgs/stdenv/cross/default.nix
+++ b/pkgs/stdenv/cross/default.nix
@@ -39,8 +39,8 @@ in lib.init bootStages ++ [
buildPlatform = localSystem;
hostPlatform = crossSystem;
targetPlatform = crossSystem;
- cc = if crossSystem.useiOSCross or false
- then buildPackages.darwin.ios-cross
+ cc = if crossSystem.useiOSPrebuilt or false
+ then buildPackages.darwin.iosSdkPkgs.clang
else if crossSystem.useAndroidPrebuilt
then buildPackages.androidenv.androidndkPkgs.gcc
else buildPackages.gcc;
diff --git a/pkgs/stdenv/generic/check-meta.nix b/pkgs/stdenv/generic/check-meta.nix
index 11c11b5d77b..1350e7d3730 100644
--- a/pkgs/stdenv/generic/check-meta.nix
+++ b/pkgs/stdenv/generic/check-meta.nix
@@ -148,7 +148,7 @@ let
license = either (listOf lib.types.attrs) (either lib.types.attrs str);
maintainers = listOf (attrsOf str);
priority = int;
- platforms = listOf (either str lib.systems.parsed.types.system);
+ platforms = listOf (either str lib.systems.parsedPlatform.types.system);
hydraPlatforms = listOf str;
broken = bool;
diff --git a/pkgs/tools/admin/ansible/2.5.nix b/pkgs/tools/admin/ansible/2.5.nix
new file mode 100644
index 00000000000..32d83861cd8
--- /dev/null
+++ b/pkgs/tools/admin/ansible/2.5.nix
@@ -0,0 +1,40 @@
+{ stdenv
+, fetchurl
+, pythonPackages
+, windowsSupport ? false
+}:
+
+pythonPackages.buildPythonPackage rec {
+ pname = "ansible";
+ version = "2.5.1";
+ name = "${pname}-${version}";
+
+ src = fetchurl {
+ url = "http://releases.ansible.com/ansible/${name}.tar.gz";
+ sha256 = "06h0cmz0cgj1xszzn6rsypfc8lkazgh5g1yxyss1yx242d0wkw2i";
+ };
+
+ prePatch = ''
+ sed -i "s,/usr/,$out," lib/ansible/constants.py
+ '';
+
+ doCheck = false;
+ dontStrip = true;
+ dontPatchELF = true;
+ dontPatchShebangs = false;
+
+ propagatedBuildInputs = with pythonPackages; [
+ pycrypto paramiko jinja2 pyyaml httplib2 boto six netaddr dnspython
+ ] ++ stdenv.lib.optional windowsSupport pywinrm;
+
+ meta = with stdenv.lib; {
+ homepage = http://www.ansible.com;
+ description = "A simple automation tool";
+ license = with licenses; [ gpl3 ];
+ maintainers = with maintainers; [
+ jgeerds
+ joamaki
+ ];
+ platforms = with platforms; linux ++ darwin;
+ };
+}
diff --git a/pkgs/tools/misc/rw/default.nix b/pkgs/tools/misc/rw/default.nix
new file mode 100644
index 00000000000..345f26852dc
--- /dev/null
+++ b/pkgs/tools/misc/rw/default.nix
@@ -0,0 +1,28 @@
+{ stdenv, fetchurl }:
+
+stdenv.mkDerivation rec {
+ name = "rw-${version}";
+ version = "1.0";
+
+ src = fetchurl {
+ url = "https://sortix.org/rw/release/rw-portable-${version}.tar.gz";
+ # Use hash provided by upstream
+ sha256 = "50009730e36991dfe579716f91f4f616f5ba05ffb7bf69c03d41bf305ed93b6d";
+ };
+
+ makeFlags = [ "PREFIX=$(out)" ];
+
+ meta = with stdenv.lib; {
+ homepage = https://sortix.org/rw;
+ description = "Block device and byte copying program similar to dd";
+ longDescription = ''
+ rw is a command line program which copies information between files
+ or byte streams. The rw command is designed to be a replacement for
+ dd with standard style command line flags.
+ '';
+ license = licenses.isc;
+ maintainers = with maintainers; [ dtzWill ];
+
+ broken = stdenv.hostPlatform.isDarwin;
+ };
+}
diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix
index 4fec9d928c1..24ad2699e56 100644
--- a/pkgs/top-level/aliases.nix
+++ b/pkgs/top-level/aliases.nix
@@ -228,6 +228,7 @@ mapAliases (rec {
vimprobable2Wrapper = vimprobable2; # added 2015-01
virtviewer = virt-viewer; # added 2015-12-24
vorbisTools = vorbis-tools; # added 2016-01-26
+ wineStaging = wine-staging; # added 2018-01-08
winusb = woeusb; # added 2017-12-22
x11 = xlibsWrapper; # added 2015-09
xf86_video_nouveau = xorg.xf86videonouveau; # added 2015-09
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index b074a5572dd..bdf6ab03231 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -2395,6 +2395,8 @@ with pkgs;
fsfs = callPackage ../tools/filesystems/fsfs { };
+ fstl = qt5.callPackage ../applications/graphics/fstl { };
+
fswebcam = callPackage ../os-specific/linux/fswebcam { };
fuseiso = callPackage ../tools/filesystems/fuseiso { };
@@ -4699,6 +4701,8 @@ with pkgs;
runzip = callPackage ../tools/archivers/runzip { };
+ rw = callPackage ../tools/misc/rw { };
+
rxp = callPackage ../tools/text/xml/rxp { };
rzip = callPackage ../tools/compression/rzip { };
@@ -4853,6 +4857,8 @@ with pkgs;
sleuthkit = callPackage ../tools/system/sleuthkit {};
+ sleepyhead = callPackage ../applications/misc/sleepyhead {};
+
slimrat = callPackage ../tools/networking/slimrat {
inherit (perlPackages) WWWMechanize LWP;
};
@@ -6916,15 +6922,14 @@ with pkgs;
libc = if targetPlatform != hostPlatform then libcCross else stdenv.cc.libc;
};
- wrapBintoolsWith = { bintools, libc }: bintoolsWrapperFun {
+ wrapBintoolsWith = { bintools, libc, extraBuildCommands ? "" }: bintoolsWrapperFun {
nativeTools = targetPlatform == hostPlatform && stdenv.cc.nativeTools or false;
nativeLibc = targetPlatform == hostPlatform && stdenv.cc.nativeLibc or false;
nativePrefix = stdenv.cc.nativePrefix or "";
noLibc = (libc == null);
- inherit bintools libc;
- extraBuildCommands = "";
+ inherit bintools libc extraBuildCommands;
};
# prolog
@@ -7446,6 +7451,7 @@ with pkgs;
ansible_2_2 = callPackage ../tools/admin/ansible/2.2.nix {};
ansible_2_3 = callPackage ../tools/admin/ansible/2.3.nix {};
ansible_2_4 = callPackage ../tools/admin/ansible/2.4.nix {};
+ ansible_2_5 = callPackage ../tools/admin/ansible/2.5.nix {};
ansible = ansible_2_4;
ansible2 = ansible_2_4;
@@ -7816,7 +7822,7 @@ with pkgs;
funnelweb = callPackage ../development/tools/literate-programming/funnelweb { };
- gede = callPackage ../development/tools/misc/gede { };
+ gede = libsForQt5.callPackage ../development/tools/misc/gede { };
gdbgui = callPackage ../development/tools/misc/gdbgui { };
@@ -9009,6 +9015,7 @@ with pkgs;
else if name == "uclibc" then uclibcCross
else if name == "musl" then targetPackages.muslCross or muslCross
else if name == "msvcrt" then targetPackages.windows.mingw_w64 or windows.mingw_w64
+ else if targetPlatform.useiOSPrebuilt then targetPackages.iosSdkPkgs.libraries
else if name == "libSystem" then darwin.xcode
else throw "Unknown libc";
@@ -15685,6 +15692,8 @@ with pkgs;
grass = callPackage ../applications/gis/grass { };
+ grepcidr = callPackage ../applications/search/grepcidr { };
+
grepm = callPackage ../applications/search/grepm { };
grip = callPackage ../applications/misc/grip {
@@ -21036,9 +21045,9 @@ with pkgs;
staging = base.override { wineRelease = "staging"; };
};
- wine = winePackages.base;
+ wine = winePackages.full;
- wineStaging = lowPrio (winePackages.full.override {
+ wine-staging = lowPrio (winePackages.full.override {
wineRelease = "staging";
});
diff --git a/pkgs/top-level/darwin-packages.nix b/pkgs/top-level/darwin-packages.nix
index d1d5aa470bc..d2d41792c46 100644
--- a/pkgs/top-level/darwin-packages.nix
+++ b/pkgs/top-level/darwin-packages.nix
@@ -1,4 +1,6 @@
-{ pkgs, darwin, stdenv, callPackage, callPackages, newScope }:
+{ buildPackages, pkgs, targetPackages
+, darwin, stdenv, callPackage, callPackages, newScope
+}:
let
apple-source-releases = callPackage ../os-specific/darwin/apple-source-releases { };
@@ -10,19 +12,23 @@ in
apple_sdk = callPackage ../os-specific/darwin/apple-sdk { };
+ binutils-unwrapped = callPackage ../os-specific/darwin/binutils {
+ inherit (darwin) cctools;
+ inherit (pkgs) binutils-unwrapped;
+ };
+
binutils = pkgs.wrapBintoolsWith {
libc =
if pkgs.targetPlatform != pkgs.hostPlatform
then pkgs.libcCross
else pkgs.stdenv.cc.libc;
- bintools = callPackage ../os-specific/darwin/binutils {
- inherit (darwin) cctools;
- };
+ bintools = darwin.binutils-unwrapped;
};
cctools = callPackage ../os-specific/darwin/cctools/port.nix {
inherit (darwin) libobjc maloader;
stdenv = if stdenv.isDarwin then stdenv else pkgs.libcxxStdenv;
+ libcxxabi = pkgs.libcxxabi;
xctoolchain = darwin.xcode.toolchain;
};
@@ -39,8 +45,10 @@ in
insert_dylib = callPackage ../os-specific/darwin/insert_dylib { };
- ios-cross = callPackage ../os-specific/darwin/ios-cross {
- inherit (darwin) binutils;
+ iosSdkPkgs = darwin.callPackage ../os-specific/darwin/ios-sdk-pkgs {
+ buildIosSdk = buildPackages.darwin.iosSdkPkgs.sdk;
+ targetIosSdkPkgs = targetPackages.darwin.iosSdkPkgs;
+ inherit (pkgs.llvmPackages) clang-unwrapped;
};
libobjc = apple-source-releases.objc4;