From 251b9ca0e77963c48d9c198cec964f7a1cd91d4a Mon Sep 17 00:00:00 2001 From: Susan Potter Date: Tue, 28 Feb 2017 09:15:20 -0600 Subject: [PATCH 01/86] nginx service: add commonHttpConfig option --- .../services/web-servers/nginx/default.nix | 20 +++++++++ nixos/tests/nginx.nix | 42 +++++++++++++++++++ 2 files changed, 62 insertions(+) create mode 100644 nixos/tests/nginx.nix diff --git a/nixos/modules/services/web-servers/nginx/default.nix b/nixos/modules/services/web-servers/nginx/default.nix index 6bc7192963d1..548467ae7856 100644 --- a/nixos/modules/services/web-servers/nginx/default.nix +++ b/nixos/modules/services/web-servers/nginx/default.nix @@ -87,6 +87,8 @@ let server_tokens ${if cfg.serverTokens then "on" else "off"}; + ${cfg.commonHttpConfig} + ${vhosts} ${optionalString cfg.statusPage '' @@ -275,6 +277,24 @@ in ''; }; + commonHttpConfig = mkOption { + type = types.lines; + default = ""; + example = '' + resolver 127.0.0.1 valid=5s; + + log_format myformat '$remote_addr - $remote_user [$time_local] ' + '"$request" $status $body_bytes_sent ' + '"$http_referer" "$http_user_agent"'; + ''; + description = '' + With nginx you must provide common http context definitions before + they are used, e.g. log_format, resolver, etc. inside of server + or location contexts. Use this attribute to set these definitions + at the appropriate location. + ''; + }; + httpConfig = mkOption { type = types.lines; default = ""; diff --git a/nixos/tests/nginx.nix b/nixos/tests/nginx.nix new file mode 100644 index 000000000000..c2beb5590ef7 --- /dev/null +++ b/nixos/tests/nginx.nix @@ -0,0 +1,42 @@ +# verifies: +# 1. nginx generates config file with shared http context definitions above +# generated virtual hosts config. + +import ./make-test.nix ({ pkgs, ...} : { + name = "jenkins"; + meta = with pkgs.stdenv.lib.maintainers; { + maintainers = [ mbbx6spp ]; + }; + + nodes = { + webserver = + { config, pkgs, ... }: + { services.nginx.enable = true; + services.nginx.commonHttpConfig = '' + log_format ceeformat '@cee: {"status":"$status",' + '"request_time":$request_time,' + '"upstream_response_time":$upstream_response_time,' + '"pipe":"$pipe","bytes_sent":$bytes_sent,' + '"connection":"$connection",' + '"remote_addr":"$remote_addr",' + '"host":"$host",' + '"timestamp":"$time_iso8601",' + '"request":"$request",' + '"http_referer":"$http_referer",' + '"upstream_addr":"$upstream_addr"}'; + ''; + services.nginx.virtualHosts."0.my.test" = { + extraConfig = '' + access_log syslog:server=unix:/dev/log,facility=user,tag=mytag,severity=info ceeformat; + ''; + }; + }; + }; + + testScript = '' + startAll; + + $webserver->waitForUnit("nginx"); + $webserver->waitForOpenPort("80"); + ''; +}) From b052a3629463f2f064a0a3da50dbebd73b587651 Mon Sep 17 00:00:00 2001 From: Profpatsch Date: Wed, 15 Mar 2017 18:29:33 +0100 Subject: [PATCH 02/86] lib/trivial: expand function docs --- lib/trivial.nix | 33 ++++++++++++++++++++++++++++++--- 1 file changed, 30 insertions(+), 3 deletions(-) diff --git a/lib/trivial.nix b/lib/trivial.nix index abe5a16c67d6..40499b2b5092 100644 --- a/lib/trivial.nix +++ b/lib/trivial.nix @@ -1,17 +1,44 @@ rec { - # Identity function. + /* The identity function + For when you need a function that does “nothing”. + + Type: id :: a -> a + */ id = x: x; - # Constant function. + /* The constant function + Ignores the second argument. + Or: Construct a function that always returns a static value. + + Type: const :: a -> b -> a + Example: + let f = const 5; in f 10 + => 5 + */ const = x: y: x; - # Named versions corresponding to some builtin operators. + + ## Named versions corresponding to some builtin operators. + + /* Concat two strings */ concat = x: y: x ++ y; + + /* boolean “or” */ or = x: y: x || y; + + /* boolean “and” */ and = x: y: x && y; + + /* Merge two attribute sets shallowly, right side trumps left + + Example: + mergeAttrs { a = 1; b = 2; } // { b = 3; c = 4; } + => { a = 1; b = 3; c = 4; } + */ mergeAttrs = x: y: x // y; + # Compute the fixed point of the given function `f`, which is usually an # attribute set that expects its final, non-recursive representation as an # argument: From 918f33110425c1a82234b8718ea22753b932d6f6 Mon Sep 17 00:00:00 2001 From: rnhmjoj Date: Fri, 17 Mar 2017 14:43:27 +0100 Subject: [PATCH 03/86] firefox: reenable ALSA backend --- pkgs/applications/networking/browsers/firefox/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/applications/networking/browsers/firefox/default.nix b/pkgs/applications/networking/browsers/firefox/default.nix index 71e8d056ebe9..b991d647d0cc 100644 --- a/pkgs/applications/networking/browsers/firefox/default.nix +++ b/pkgs/applications/networking/browsers/firefox/default.nix @@ -61,6 +61,7 @@ common = { pname, version, sha512, updateScript }: stdenv.mkDerivation rec { "--with-system-libvpx" "--with-system-png" # needs APNG support "--with-system-icu" + "--enable-alsa" "--enable-system-ffi" "--enable-system-hunspell" "--enable-system-pixman" From 4defb788ebec831f6a868f46b969755d7754cc4f Mon Sep 17 00:00:00 2001 From: Peter Jones Date: Fri, 13 Jan 2017 15:23:34 -0700 Subject: [PATCH 04/86] rmilter service: Fix a couple of bugs * The module uses `stringSplit` but it should be `splitString` * `rmilter` doesn't actually support binding to multiple sockets. Therefore, bind to the last one specified if `socketActivation` is `false`. I also believe there is a bug in this module related to systemd `ListenStream`. If `socketActivation` is true, Postfix gets connection timeouts trying to connect to one of the `ListenStream` inet addresses. I don't know enough about `ListenStream` passing connections on to `fd:3` to understand what's going on. These changes are in production (with `socketActivation = false`) via NixOps. --- nixos/modules/services/mail/rmilter.nix | 45 +++++++++++++------------ 1 file changed, 23 insertions(+), 22 deletions(-) diff --git a/nixos/modules/services/mail/rmilter.nix b/nixos/modules/services/mail/rmilter.nix index 8f18b929c114..7fb4a5195821 100644 --- a/nixos/modules/services/mail/rmilter.nix +++ b/nixos/modules/services/mail/rmilter.nix @@ -7,32 +7,31 @@ let rspamdCfg = config.services.rspamd; cfg = config.services.rmilter; - inetSockets = map (sock: let s = stringSplit ":" sock; in "inet:${last s}:${head s}") cfg.bindInetSockets; + inetSockets = map (sock: let s = splitString ":" sock; in "inet:${last s}@${head s}") cfg.bindInetSockets; unixSockets = map (sock: "unix:${sock}") cfg.bindUnixSockets; allSockets = unixSockets ++ inetSockets; rmilterConf = '' -pidfile = /run/rmilter/rmilter.pid; -bind_socket = ${if cfg.socketActivation then "fd:3" else concatStringsSep ", " allSockets}; -tempdir = /tmp; - + pidfile = /run/rmilter/rmilter.pid; + bind_socket = ${if cfg.socketActivation then "fd:3" else last inetSockets}; + tempdir = /tmp; '' + (with cfg.rspamd; if enable then '' -spamd { - servers = ${concatStringsSep ", " servers}; - connect_timeout = 1s; - results_timeout = 20s; - error_time = 10; - dead_time = 300; - maxerrors = 10; - reject_message = "${rejectMessage}"; - ${optionalString (length whitelist != 0) "whitelist = ${concatStringsSep ", " whitelist};"} + spamd { + servers = ${concatStringsSep ", " servers}; + connect_timeout = 1s; + results_timeout = 20s; + error_time = 10; + dead_time = 300; + maxerrors = 10; + reject_message = "${rejectMessage}"; + ${optionalString (length whitelist != 0) "whitelist = ${concatStringsSep ", " whitelist};"} - # rspamd_metric - metric for using with rspamd - # Default: "default" - rspamd_metric = "default"; - ${extraConfig} -}; + # rspamd_metric - metric for using with rspamd + # Default: "default" + rspamd_metric = "default"; + ${extraConfig} + }; '' else "") + cfg.extraConfig; rmilterConfigFile = pkgs.writeText "rmilter.conf" rmilterConf; @@ -100,9 +99,11 @@ in default = true; description = '' Enable systemd socket activation for rmilter. - (disabling socket activation not recommended - when unix socket used, and follow to wrong - permissions on unix domain socket.) + + Disabling socket activation is not recommended when a Unix + domain socket is used and could lead to incorrect + permissions. Therefore, setting this to false will + configure rmilter to use an inet socket only. ''; }; From 8ab2d2ee27b84bfeb2e2077e87f5ccc7b0d129fe Mon Sep 17 00:00:00 2001 From: Franz Pletz Date: Sat, 28 Jan 2017 02:46:16 +0100 Subject: [PATCH 05/86] rmilter service: support only one socket --- nixos/doc/manual/release-notes/rl-1703.xml | 12 ++ nixos/modules/rename.nix | 3 + nixos/modules/services/mail/rmilter.nix | 157 ++++++++++++--------- 3 files changed, 103 insertions(+), 69 deletions(-) diff --git a/nixos/doc/manual/release-notes/rl-1703.xml b/nixos/doc/manual/release-notes/rl-1703.xml index fda46217144c..c03bf33de8bd 100644 --- a/nixos/doc/manual/release-notes/rl-1703.xml +++ b/nixos/doc/manual/release-notes/rl-1703.xml @@ -237,6 +237,18 @@ following incompatible changes: + + + The socket handling of the services.rmilter module + has been fixed and refactored. As rmilter doesn't support binding to + more than one socket, the options bindUnixSockets + and bindInetSockets have been replaced by + services.rmilter.bindSocket.*. The default is still + a unix socket in /run/rmilter/rmilter.sock. Refer to + the options documentation for more information. + + + diff --git a/nixos/modules/rename.nix b/nixos/modules/rename.nix index af8b34b5e5cb..7b75ca85219c 100644 --- a/nixos/modules/rename.nix +++ b/nixos/modules/rename.nix @@ -35,6 +35,9 @@ with lib; (mkRemovedOptionModule [ "security" "setuidOwners" ] "Use security.wrappers instead") (mkRemovedOptionModule [ "security" "setuidPrograms" ] "Use security.wrappers instead") + (mkRemovedOptionModule [ "services" "rmilter" "bindInetSockets" ] "Use services.rmilter.bindSocket.* instead") + (mkRemovedOptionModule [ "services" "rmilter" "bindUnixSockets" ] "Use services.rmilter.bindSocket.* instead") + # Old Grub-related options. (mkRenamedOptionModule [ "boot" "initrd" "extraKernelModules" ] [ "boot" "initrd" "kernelModules" ]) (mkRenamedOptionModule [ "boot" "extraKernelParams" ] [ "boot" "kernelParams" ]) diff --git a/nixos/modules/services/mail/rmilter.nix b/nixos/modules/services/mail/rmilter.nix index 7fb4a5195821..3153b1c79124 100644 --- a/nixos/modules/services/mail/rmilter.nix +++ b/nixos/modules/services/mail/rmilter.nix @@ -7,14 +7,17 @@ let rspamdCfg = config.services.rspamd; cfg = config.services.rmilter; - inetSockets = map (sock: let s = splitString ":" sock; in "inet:${last s}@${head s}") cfg.bindInetSockets; - unixSockets = map (sock: "unix:${sock}") cfg.bindUnixSockets; + inetSocket = addr: port: "inet:[${toString port}@${addr}]"; + unixSocket = sock: "unix:${sock}"; - allSockets = unixSockets ++ inetSockets; + systemdSocket = if cfg.bindSocket.type == "unix" then cfg.bindSocket.path + else "${cfg.bindSocket.address}:${toString cfg.bindSocket.port}"; + rmilterSocket = if cfg.bindSocket.type == "unix" then unixSocket cfg.bindSocket.path + else inetSocket cfg.bindSocket.address cfg.bindSocket.port; rmilterConf = '' pidfile = /run/rmilter/rmilter.pid; - bind_socket = ${if cfg.socketActivation then "fd:3" else last inetSockets}; + bind_socket = ${if cfg.socketActivation then "fd:3" else rmilterSocket}; tempdir = /tmp; '' + (with cfg.rspamd; if enable then '' spamd { @@ -32,7 +35,7 @@ let rspamd_metric = "default"; ${extraConfig} }; - '' else "") + cfg.extraConfig; + '' else "") + cfg.extraConfig; rmilterConfigFile = pkgs.writeText "rmilter.conf" rmilterConf; @@ -47,11 +50,13 @@ in services.rmilter = { enable = mkOption { + type = types.bool; default = cfg.rspamd.enable; description = "Whether to run the rmilter daemon."; }; debug = mkOption { + type = types.bool; default = false; description = "Whether to run the rmilter daemon in debug mode."; }; @@ -72,25 +77,37 @@ in ''; }; - bindUnixSockets = mkOption { - type = types.listOf types.str; - default = ["/run/rmilter/rmilter.sock"]; + bindSocket.type = mkOption { + type = types.enum [ "unix" "inet" ]; + default = "unix"; description = '' - Unix domain sockets to listen for MTA requests. - ''; - example = '' - [ "/run/rmilter.sock"] + What kind of socket rmilter should listen on. Either "unix" + for an Unix domain socket or "inet" for a TCP socket. ''; }; - bindInetSockets = mkOption { - type = types.listOf types.str; - default = []; - description = '' - Inet addresses to listen (in format accepted by systemd.socket) + bindSocket.path = mkOption { + type = types.str; + default = "/run/rmilter/rmilter.sock"; + description = '' + Path to Unix domain socket to listen on. ''; - example = '' - ["127.0.0.1:11990"] + }; + + bindSocket.address = mkOption { + type = types.str; + default = "::1"; + example = "0.0.0.0"; + description = '' + Inet address to listen on. + ''; + }; + + bindSocket.port = mkOption { + type = types.int; + default = 11990; + description = '' + Inet port to listen on. ''; }; @@ -102,13 +119,13 @@ in Disabling socket activation is not recommended when a Unix domain socket is used and could lead to incorrect - permissions. Therefore, setting this to false will - configure rmilter to use an inet socket only. + permissions. ''; }; rspamd = { enable = mkOption { + type = types.bool; default = rspamdCfg.enable; description = "Whether to use rspamd to filter mails"; }; @@ -158,13 +175,9 @@ in type = types.str; description = "Addon to postfix configuration"; default = '' -smtpd_milters = ${head allSockets} -# or for TCP socket -# # smtpd_milters = inet:localhost:9900 -milter_protocol = 6 -milter_mail_macros = i {mail_addr} {client_addr} {client_name} {auth_authen} -# skip mail without checks if milter will die -milter_default_action = accept + smtpd_milters = ${rmilterSocket} + milter_protocol = 6 + milter_mail_macros = i {mail_addr} {client_addr} {client_name} {auth_authen} ''; }; }; @@ -176,52 +189,58 @@ milter_default_action = accept ###### implementation - config = mkIf cfg.enable { + config = mkMerge [ - users.extraUsers = singleton { - name = cfg.user; - description = "rspamd daemon"; - uid = config.ids.uids.rmilter; - group = cfg.group; - }; + (mkIf cfg.enable { - users.extraGroups = singleton { - name = cfg.group; - gid = config.ids.gids.rmilter; - }; - - systemd.services.rmilter = { - description = "Rmilter Service"; - - wantedBy = [ "multi-user.target" ]; - after = [ "network.target" ]; - - serviceConfig = { - ExecStart = "${pkgs.rmilter}/bin/rmilter ${optionalString cfg.debug "-d"} -n -c ${rmilterConfigFile}"; - ExecReload = "${pkgs.coreutils}/bin/kill -USR1 $MAINPID"; - User = cfg.user; - Group = cfg.group; - PermissionsStartOnly = true; - Restart = "always"; - RuntimeDirectory = "rmilter"; - RuntimeDirectoryMode = "0755"; + users.extraUsers = singleton { + name = cfg.user; + description = "rmilter daemon"; + uid = config.ids.uids.rmilter; + group = cfg.group; }; - }; - - systemd.sockets.rmilter = mkIf cfg.socketActivation { - description = "Rmilter service socket"; - wantedBy = [ "sockets.target" ]; - socketConfig = { - ListenStream = cfg.bindUnixSockets ++ cfg.bindInetSockets; - SocketUser = cfg.user; - SocketGroup = cfg.group; - SocketMode = "0666"; + users.extraGroups = singleton { + name = cfg.group; + gid = config.ids.gids.rmilter; }; - }; - services.postfix.extraConfig = optionalString cfg.postfix.enable cfg.postfix.configFragment; - users.users.postfix.extraGroups = [ cfg.group ]; - }; + systemd.services.rmilter = { + description = "Rmilter Service"; + wantedBy = [ "multi-user.target" ]; + after = [ "network.target" ]; + + serviceConfig = { + ExecStart = "${pkgs.rmilter}/bin/rmilter ${optionalString cfg.debug "-d"} -n -c ${rmilterConfigFile}"; + ExecReload = "${pkgs.coreutils}/bin/kill -USR1 $MAINPID"; + User = cfg.user; + Group = cfg.group; + PermissionsStartOnly = true; + Restart = "always"; + RuntimeDirectory = "rmilter"; + RuntimeDirectoryMode = "0755"; + }; + + }; + + systemd.sockets.rmilter = mkIf cfg.socketActivation { + description = "Rmilter service socket"; + wantedBy = [ "sockets.target" ]; + socketConfig = { + ListenStream = systemdSocket; + SocketUser = cfg.user; + SocketGroup = cfg.group; + SocketMode = "0666"; + }; + }; + }) + + (mkIf (cfg.enable && cfg.postfix.enable) { + + services.postfix.extraConfig = cfg.postfix.configFragment; + users.users.postfix.extraGroups = [ cfg.group ]; + + }) + ]; } From 00239ce8e9baeef0ea55fd0995a55e0b15a25ac9 Mon Sep 17 00:00:00 2001 From: Franz Pletz Date: Fri, 17 Mar 2017 23:01:24 +0100 Subject: [PATCH 06/86] rmilter/rspamd service: tighten unix socket permissions --- nixos/modules/services/mail/rmilter.nix | 13 ++++++++----- nixos/modules/services/mail/rspamd.nix | 5 ++++- 2 files changed, 12 insertions(+), 6 deletions(-) diff --git a/nixos/modules/services/mail/rmilter.nix b/nixos/modules/services/mail/rmilter.nix index 3153b1c79124..e17b7516bfff 100644 --- a/nixos/modules/services/mail/rmilter.nix +++ b/nixos/modules/services/mail/rmilter.nix @@ -5,6 +5,7 @@ with lib; let rspamdCfg = config.services.rspamd; + postfixCfg = config.services.postfix; cfg = config.services.rmilter; inetSocket = addr: port: "inet:[${toString port}@${addr}]"; @@ -219,7 +220,7 @@ in PermissionsStartOnly = true; Restart = "always"; RuntimeDirectory = "rmilter"; - RuntimeDirectoryMode = "0755"; + RuntimeDirectoryMode = "0750"; }; }; @@ -231,16 +232,18 @@ in ListenStream = systemdSocket; SocketUser = cfg.user; SocketGroup = cfg.group; - SocketMode = "0666"; + SocketMode = "0660"; }; }; }) + (mkIf (cfg.enable && cfg.rspamd.enable && rspamdCfg.enable) { + users.extraUsers.${cfg.user}.extraGroups = [ rspamdCfg.group ]; + }) + (mkIf (cfg.enable && cfg.postfix.enable) { - services.postfix.extraConfig = cfg.postfix.configFragment; - users.users.postfix.extraGroups = [ cfg.group ]; - + users.extraUsers.${postfixCfg.user}.extraGroups = [ cfg.group ]; }) ]; } diff --git a/nixos/modules/services/mail/rspamd.nix b/nixos/modules/services/mail/rspamd.nix index 98489df78517..6d403e448e04 100644 --- a/nixos/modules/services/mail/rspamd.nix +++ b/nixos/modules/services/mail/rspamd.nix @@ -53,8 +53,11 @@ in bindSocket = mkOption { type = types.listOf types.str; default = [ - "/run/rspamd/rspamd.sock mode=0666 owner=${cfg.user}" + "/run/rspamd/rspamd.sock mode=0660 owner=${cfg.user} group=${cfg.group}" ]; + defaultText = ''[ + "/run/rspamd/rspamd.sock mode=0660 owner=${cfg.user} group=${cfg.group}" + ]''; description = '' List of sockets to listen, in format acceptable by rspamd ''; From cb9ff8bfa73fdfa1a38b609e878a52650dfdb682 Mon Sep 17 00:00:00 2001 From: Profpatsch Date: Wed, 15 Mar 2017 19:05:01 +0100 Subject: [PATCH 07/86] lib/lists: rename fold to foldr & improve fold docs In order to better distinguish foldr from foldl the default name is changed to foldr, but fold is still a synonym. Additionally the docs are improved and examples added. --- lib/lists.nix | 41 +++++++++++++++++++++++++++++------------ 1 file changed, 29 insertions(+), 12 deletions(-) diff --git a/lib/lists.nix b/lib/lists.nix index 5e224921de81..82d5ba0124cb 100644 --- a/lib/lists.nix +++ b/lib/lists.nix @@ -16,17 +16,22 @@ rec { */ singleton = x: [x]; - /* "Fold" a binary function `op' between successive elements of - `list' with `nul' as the starting value, i.e., `fold op nul [x_1 - x_2 ... x_n] == op x_1 (op x_2 ... (op x_n nul))'. (This is - Haskell's foldr). + /* “right fold” a binary function `op' between successive elements of + `list' with `nul' as the starting value, i.e., + `foldr op nul [x_1 x_2 ... x_n] == op x_1 (op x_2 ... (op x_n nul))'. + Type: + foldr :: (a -> b -> b) -> b -> [a] -> b Example: - concat = fold (a: b: a + b) "z" + concat = foldr (a: b: a + b) "z" concat [ "a" "b" "c" ] => "abcz" + # different types + strange = foldr (int: str: toString (int + 1) + str) "a" + strange [ 1 2 3 4 ] + => "2345a" */ - fold = op: nul: list: + foldr = op: nul: list: let len = length list; fold' = n: @@ -35,13 +40,25 @@ rec { else op (elemAt list n) (fold' (n + 1)); in fold' 0; - /* Left fold: `fold op nul [x_1 x_2 ... x_n] == op (... (op (op nul - x_1) x_2) ... x_n)'. + /* `fold' is an alias of `foldr' for historic reasons */ + # FIXME(Profpatsch): deprecate? + fold = foldr; + + + /* “left fold”, like `foldr', but from the left: + `foldl op nul [x_1 x_2 ... x_n] == op (... (op (op nul x_1) x_2) ... x_n)`. + + Type: + foldl :: (b -> a -> b) -> b -> [a] -> b Example: lconcat = foldl (a: b: a + b) "z" lconcat [ "a" "b" "c" ] => "zabc" + # different types + lstrange = foldl (str: int: str + toString (int + 1)) "" + strange [ 1 2 3 4 ] + => "a2345" */ foldl = op: nul: list: let @@ -52,7 +69,7 @@ rec { else op (foldl' (n - 1)) (elemAt list n); in foldl' (length list - 1); - /* Strict version of foldl. + /* Strict version of `foldl'. The difference is that evaluation is forced upon access. Usually used with small whole results (in contract with lazily-generated list or large @@ -140,7 +157,7 @@ rec { any isString [ 1 { } ] => false */ - any = builtins.any or (pred: fold (x: y: if pred x then true else y) false); + any = builtins.any or (pred: foldr (x: y: if pred x then true else y) false); /* Return true iff function `pred' returns true for all elements of `list'. @@ -151,7 +168,7 @@ rec { all (x: x < 3) [ 1 2 3 ] => false */ - all = builtins.all or (pred: fold (x: y: if pred x then y else false) true); + all = builtins.all or (pred: foldr (x: y: if pred x then y else false) true); /* Count how many times function `pred' returns true for the elements of `list'. @@ -219,7 +236,7 @@ rec { => { right = [ 5 3 4 ]; wrong = [ 1 2 ]; } */ partition = builtins.partition or (pred: - fold (h: t: + foldr (h: t: if pred h then { right = [h] ++ t.right; wrong = t.wrong; } else { right = t.right; wrong = [h] ++ t.wrong; } From 4f1d977877b5477d84ca1204ec7a3f87d6bbf871 Mon Sep 17 00:00:00 2001 From: Profpatsch Date: Sat, 18 Mar 2017 20:41:02 +0100 Subject: [PATCH 08/86] lib/tests: add more tests for fold functions Also the invocation of tests is documented. --- lib/tests.nix | 35 +++++++++++++++++++++++++++++++---- 1 file changed, 31 insertions(+), 4 deletions(-) diff --git a/lib/tests.nix b/lib/tests.nix index d33e3a824e34..f7119cf18ab6 100644 --- a/lib/tests.nix +++ b/lib/tests.nix @@ -1,3 +1,6 @@ +# to run these tests: +# nix-instantiate --eval --strict nixpkgs/lib/tests.nix +# if the resulting list is empty, all tests passed let inherit (builtins) add; in with import ./default.nix; @@ -45,10 +48,34 @@ runTests { expected = ["b" "c"]; }; - testFold = { - expr = fold (builtins.add) 0 (range 0 100); - expected = 5050; - }; + testFold = + let + f = op: fold: fold op 0 (range 0 100); + # fold with associative operator + assoc = f builtins.add; + # fold with non-associative operator + nonAssoc = f builtins.sub; + in { + expr = { + assocRight = assoc foldr; + # right fold with assoc operator is same as left fold + assocRightIsLeft = assoc foldr == assoc foldl; + nonAssocRight = nonAssoc foldr; + nonAssocLeft = nonAssoc foldl; + # with non-assoc operator the fold results are not the same + nonAssocRightIsNotLeft = nonAssoc foldl != nonAssoc foldr; + # fold is an alias for foldr + foldIsRight = nonAssoc fold == nonAssoc foldr; + }; + expected = { + assocRight = 5050; + assocRightIsLeft = true; + nonAssocRight = 50; + nonAssocLeft = (-5050); + nonAssocRightIsNotLeft = true; + foldIsRight = true; + }; + }; testTake = testAllTrue [ ([] == (take 0 [ 1 2 3 ])) From 501d9c71861b3797b96000a9ab83e32a6bd8d9e0 Mon Sep 17 00:00:00 2001 From: romildo Date: Sun, 19 Mar 2017 21:46:35 -0300 Subject: [PATCH 09/86] lumina: fix kwindowsystem and oxygen-icons5 attributes --- nixos/modules/services/x11/desktop-managers/lumina.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/nixos/modules/services/x11/desktop-managers/lumina.nix b/nixos/modules/services/x11/desktop-managers/lumina.nix index ed5ad4a2a001..ec5fbb13b323 100644 --- a/nixos/modules/services/x11/desktop-managers/lumina.nix +++ b/nixos/modules/services/x11/desktop-managers/lumina.nix @@ -32,8 +32,8 @@ in environment.systemPackages = [ pkgs.fluxbox - pkgs.qt5.kwindowsystem - pkgs.qt5.oxygen-icons5 + pkgs.libsForQt5.kwindowsystem + pkgs.kdeFrameworks.oxygen-icons5 pkgs.lumina pkgs.numlockx pkgs.qt5.qtsvg From addffa41b4bd8db87c67fa999d1c1b3f1b168ef4 Mon Sep 17 00:00:00 2001 From: Tuomas Tynkkynen Date: Sat, 11 Mar 2017 16:36:56 +0200 Subject: [PATCH 10/86] kmscube: 2016-09-19 -> 2017-03-19 --- pkgs/os-specific/linux/kmscube/default.nix | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/pkgs/os-specific/linux/kmscube/default.nix b/pkgs/os-specific/linux/kmscube/default.nix index 0b707ef7239a..079bfb7c5be1 100644 --- a/pkgs/os-specific/linux/kmscube/default.nix +++ b/pkgs/os-specific/linux/kmscube/default.nix @@ -1,13 +1,12 @@ -{ stdenv, fetchFromGitHub, autoreconfHook, libdrm, libX11, mesa_noglu, pkgconfig }: +{ stdenv, fetchgit, autoreconfHook, libdrm, libX11, mesa_noglu, pkgconfig }: stdenv.mkDerivation rec { - name = "kmscube-2016-09-19"; + name = "kmscube-2017-03-19"; - src = fetchFromGitHub { - owner = "robclark"; - repo = "kmscube"; - rev = "8c6a20901f95e1b465bbca127f9d47fcfb8762e6"; - sha256 = "045pf4q3g5b54cdbxppn1dxpcn81h630vmhrixz1d5bcl822nhwj"; + src = fetchgit { + url = git://anongit.freedesktop.org/mesa/kmscube; + rev = "b88a44d95eceaeebc5b9c6972ffcbfe9eca00aea"; + sha256 = "029ccslfavz6jllqv980sr6mj9bdbr0kx7bi21ra0q9yl2vh0yca"; }; nativeBuildInputs = [ autoreconfHook pkgconfig ]; From 031332ca9d864528ac1f0c75121b4be4a911e2f8 Mon Sep 17 00:00:00 2001 From: Florent Becker Date: Mon, 20 Mar 2017 08:18:34 +0100 Subject: [PATCH 11/86] update rustPackages --- pkgs/top-level/rust-packages.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/top-level/rust-packages.nix b/pkgs/top-level/rust-packages.nix index 1659208f76f2..ad147179f68f 100644 --- a/pkgs/top-level/rust-packages.nix +++ b/pkgs/top-level/rust-packages.nix @@ -7,9 +7,9 @@ { runCommand, fetchFromGitHub, git }: let - version = "2017-03-13"; - rev = "e5b7b45fa4e1168715a1132a65ad89fbc1d5ed82"; - sha256 = "1glwd7b5ckiw2nzc28djyarml21cqdajc1jn03vzf4sl58bvahyb"; + version = "2017-03-19"; + rev = "6ac4724ed839594a132f5199d70d40fa15bd6b7a"; + sha256 = "159b82zma3y0kcg55c6zm6ddsw4jm0c4y85b6l1ny108l9k3hy79"; src = fetchFromGitHub { inherit rev; From ac87d9ba8bb2a6602bd267c90ddcf25cfe29498f Mon Sep 17 00:00:00 2001 From: Florent Becker Date: Sat, 18 Mar 2017 21:15:27 +0100 Subject: [PATCH 12/86] Add a setup-hook to ocamlPackages.eliom, to look for distillery templates --- pkgs/development/ocaml-modules/eliom/default.nix | 2 ++ pkgs/development/ocaml-modules/eliom/setup-hook.sh | 5 +++++ 2 files changed, 7 insertions(+) create mode 100644 pkgs/development/ocaml-modules/eliom/setup-hook.sh diff --git a/pkgs/development/ocaml-modules/eliom/default.nix b/pkgs/development/ocaml-modules/eliom/default.nix index 57f3477edf6b..d21bd5977ee5 100644 --- a/pkgs/development/ocaml-modules/eliom/default.nix +++ b/pkgs/development/ocaml-modules/eliom/default.nix @@ -30,6 +30,8 @@ stdenv.mkDerivation rec createFindlibDestdir = true; + setupHook = [ ./setup-hook.sh ]; + meta = { homepage = http://ocsigen.org/eliom/; description = "Ocaml Framework for programming Web sites and client/server Web applications"; diff --git a/pkgs/development/ocaml-modules/eliom/setup-hook.sh b/pkgs/development/ocaml-modules/eliom/setup-hook.sh new file mode 100644 index 000000000000..096d8f8bf635 --- /dev/null +++ b/pkgs/development/ocaml-modules/eliom/setup-hook.sh @@ -0,0 +1,5 @@ +addOcsigenDistilleryTemplate() { + addToSearchPathWithCustomDelimiter : ELIOM_DISTILLERY_PATH $1/eliom-distillery-templates +} + +envHooks+=(addOcsigenDistilleryTemplate) From 15d3f8e7835b5d9b3fe17c3712bfbfc841339228 Mon Sep 17 00:00:00 2001 From: Nikolay Amiantov Date: Mon, 20 Mar 2017 02:54:54 +0300 Subject: [PATCH 13/86] sd-image-armv7l-multiplatform module: enable ODROID-XU3 console --- .../modules/installer/cd-dvd/sd-image-armv7l-multiplatform.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/modules/installer/cd-dvd/sd-image-armv7l-multiplatform.nix b/nixos/modules/installer/cd-dvd/sd-image-armv7l-multiplatform.nix index 0b858746ff0a..118ed20d47f5 100644 --- a/nixos/modules/installer/cd-dvd/sd-image-armv7l-multiplatform.nix +++ b/nixos/modules/installer/cd-dvd/sd-image-armv7l-multiplatform.nix @@ -28,7 +28,7 @@ in boot.loader.generic-extlinux-compatible.enable = true; boot.kernelPackages = pkgs.linuxPackages_latest; - boot.kernelParams = ["console=ttyS0,115200n8" "console=ttymxc0,115200n8" "console=ttyAMA0,115200n8" "console=ttyO0,115200n8" "console=tty0"]; + boot.kernelParams = ["console=ttyS0,115200n8" "console=ttymxc0,115200n8" "console=ttyAMA0,115200n8" "console=ttyO0,115200n8" "console=ttySAC2,115200n8" "console=tty0"]; # FIXME: this probably should be in installation-device.nix users.extraUsers.root.initialHashedPassword = ""; From a9d44b5c308c022ab198394e315d04f49a542fb6 Mon Sep 17 00:00:00 2001 From: Nikolay Amiantov Date: Mon, 20 Mar 2017 11:06:20 +0300 Subject: [PATCH 14/86] ubootOdroidXU3: init --- pkgs/misc/uboot/default.nix | 6 ++++++ pkgs/top-level/all-packages.nix | 1 + 2 files changed, 7 insertions(+) diff --git a/pkgs/misc/uboot/default.nix b/pkgs/misc/uboot/default.nix index f0ec5f483d40..5d9c83059c76 100644 --- a/pkgs/misc/uboot/default.nix +++ b/pkgs/misc/uboot/default.nix @@ -83,6 +83,12 @@ in rec { filesToInstall = ["u-boot" "u-boot.dtb" "u-boot-dtb-tegra.bin" "u-boot-nodtb-tegra.bin"]; }; + ubootOdroidXU3 = buildUBoot rec { + defconfig = "odroid-xu3_defconfig"; + targetPlatforms = ["armv7l-linux"]; + filesToInstall = ["u-boot.bin"]; + }; + ubootPcduino3Nano = buildUBoot rec { defconfig = "Linksprite_pcDuino3_Nano_defconfig"; targetPlatforms = ["armv7l-linux"]; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 63821dedc2b1..6128efa6c498 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -12131,6 +12131,7 @@ with pkgs; ubootBananaPi ubootBeagleboneBlack ubootJetsonTK1 + ubootOdroidXU3 ubootPcduino3Nano ubootRaspberryPi ubootRaspberryPi2 From 091073819a8e1cf98b7bb02f4a8d2e3af97b67e4 Mon Sep 17 00:00:00 2001 From: Florent Becker Date: Sat, 4 Mar 2017 14:44:15 +0100 Subject: [PATCH 15/86] ocamlPackages.ocsigen-start: init at 1.0.0 --- .../ocaml-modules/ocsigen-start/default.nix | 34 +++++++++++++++++++ .../ocsigen-start/templates-dir.patch | 13 +++++++ pkgs/top-level/ocaml-packages.nix | 2 ++ 3 files changed, 49 insertions(+) create mode 100644 pkgs/development/ocaml-modules/ocsigen-start/default.nix create mode 100644 pkgs/development/ocaml-modules/ocsigen-start/templates-dir.patch diff --git a/pkgs/development/ocaml-modules/ocsigen-start/default.nix b/pkgs/development/ocaml-modules/ocsigen-start/default.nix new file mode 100644 index 000000000000..13794602af4f --- /dev/null +++ b/pkgs/development/ocaml-modules/ocsigen-start/default.nix @@ -0,0 +1,34 @@ +{ stdenv, fetchurl, buildOcaml, ocsigen-toolkit, eliom, ocaml_pcre, pgocaml, macaque, safepass, yojson, ojquery, magick, ocsigen_deriving, ocsigen_server }: + +buildOcaml rec +{ + name = "ocsigen-start"; + version = "1.0.0"; + + buildInputs = [ eliom ]; + propagatedBuildInputs = [ pgocaml macaque safepass ocaml_pcre ocsigen-toolkit yojson ojquery ocsigen_deriving ocsigen_server magick ]; + + patches = [ ./templates-dir.patch ]; + + postPatch = '' + substituteInPlace "src/os_db.ml" --replace "citext" "text" + ''; + + src = fetchurl { + url = "https://github.com/ocsigen/${name}/archive/${version}.tar.gz"; + sha256 = "0npc2iq39ixci6ly0fssklv07zqi5cfa1adad4hm8dbzjawkqqll"; + }; + + createFindlibDestdir = true; + + meta = { + homepage = http://ocsigen.org/ocsigen-start; + description = "Eliom application skeleton"; + longDescription ='' + An Eliom application skeleton, ready to use to build your own application with users, (pre)registration, notifications, etc. + ''; + license = stdenv.lib.licenses.lgpl21; + maintainers = [ stdenv.lib.maintainers.gal_bolle ]; + }; + +} diff --git a/pkgs/development/ocaml-modules/ocsigen-start/templates-dir.patch b/pkgs/development/ocaml-modules/ocsigen-start/templates-dir.patch new file mode 100644 index 000000000000..38365a26b99a --- /dev/null +++ b/pkgs/development/ocaml-modules/ocsigen-start/templates-dir.patch @@ -0,0 +1,13 @@ +diff --git a/scripts/install.sh b/scripts/install.sh +index f88ae11..d6aae70 100755 +--- a/scripts/install.sh ++++ b/scripts/install.sh +@@ -11,9 +11,9 @@ fi + + TPL_DIR=$1 + TPL_NAME=$2 +-DEST0=$DESTDIR/$(eliom-distillery -dir) ++DEST0=$out/eliom-distillery-templates + DEST=$DEST0/$TPL_NAME + + mkdir -p $DEST0 diff --git a/pkgs/top-level/ocaml-packages.nix b/pkgs/top-level/ocaml-packages.nix index f46aa3a251c7..2291a4995152 100644 --- a/pkgs/top-level/ocaml-packages.nix +++ b/pkgs/top-level/ocaml-packages.nix @@ -384,6 +384,8 @@ let ocsigen_server = callPackage ../development/ocaml-modules/ocsigen-server { }; + ocsigen-start = callPackage ../development/ocaml-modules/ocsigen-start { }; + ocsigen-toolkit = callPackage ../development/ocaml-modules/ocsigen-toolkit { }; ojquery = callPackage ../development/ocaml-modules/ojquery { }; From e4d39749f288680c44152cdef7d438fe06534479 Mon Sep 17 00:00:00 2001 From: Florent Becker Date: Sat, 4 Mar 2017 14:46:04 +0100 Subject: [PATCH 16/86] ocsigen-i18n: init at 3.1 --- .../tools/ocaml/ocsigen-i18n/default.nix | 27 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 4 +++ 2 files changed, 31 insertions(+) create mode 100644 pkgs/development/tools/ocaml/ocsigen-i18n/default.nix diff --git a/pkgs/development/tools/ocaml/ocsigen-i18n/default.nix b/pkgs/development/tools/ocaml/ocsigen-i18n/default.nix new file mode 100644 index 000000000000..c212ce324b33 --- /dev/null +++ b/pkgs/development/tools/ocaml/ocsigen-i18n/default.nix @@ -0,0 +1,27 @@ +{ stdenv, fetchurl, ocamlPackages }: + +stdenv.mkDerivation rec +{ + name = "ocsigen-i18n"; + version = "3.1.0"; + + buildInputs = with ocamlPackages; [ ocaml findlib ]; + + installPhase = '' + mkdir -p $out/bin + make bindir=$out/bin install + ''; + + src = fetchurl { + url = "https://github.com/besport/${name}/archive/${version}.tar.gz"; + sha256 = "0cw0mmr67wx03j4279z7ldxwb01smkqz9rbklx5lafrj5sf99178"; + }; + + meta = { + homepage = https://github.com/besport/ocsigen-i18n; + description = "I18n made easy for web sites written with eliom"; + license = stdenv.lib.licenses.lgpl21; + maintainers = [ stdenv.lib.maintainers.gal_bolle ]; + }; + +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 63821dedc2b1..9fc039398556 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -5496,6 +5496,10 @@ with pkgs; ocaml-top = callPackage ../development/tools/ocaml/ocaml-top { }; + ocsigen-i18n = callPackage ../development/tools/ocaml/ocsigen-i18n { + ocamlPackages = ocamlPackages_4_03; + }; + opa = callPackage ../development/compilers/opa { nodejs = nodejs-4_x; ocamlPackages = ocamlPackages_4_02; From 74c4e30842657d09ec1cf000af89f95df27c6632 Mon Sep 17 00:00:00 2001 From: Tuomas Tynkkynen Date: Mon, 20 Mar 2017 10:30:51 +0200 Subject: [PATCH 17/86] Revert "nixos: build for aarch64-linux" This reverts commit b806e25d65421d7aa0a524ce1601f0e51099df11. This seems to push Hydra's memory usage out of the roof fail nixos evaluating with: Too many heap sections: Increase MAXHINCR or MAX_HEAP_SECTS Let's revert this for now. It's not a big deal at all since the nixpkgs-unstable jobset is still building the packages. --- nixos/release-combined.nix | 2 +- nixos/release.nix | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/nixos/release-combined.nix b/nixos/release-combined.nix index 1953fd1a26a7..63ca39a9b602 100644 --- a/nixos/release-combined.nix +++ b/nixos/release-combined.nix @@ -4,7 +4,7 @@ { nixpkgs ? { outPath = ./..; revCount = 56789; shortRev = "gfedcba"; } , stableBranch ? false -, supportedSystems ? [ "x86_64-linux" "i686-linux" "aarch64-linux" ] +, supportedSystems ? [ "x86_64-linux" "i686-linux" ] }: let diff --git a/nixos/release.nix b/nixos/release.nix index 325047ce10c4..d5cea1fe96c8 100644 --- a/nixos/release.nix +++ b/nixos/release.nix @@ -1,6 +1,6 @@ { nixpkgs ? { outPath = ./..; revCount = 56789; shortRev = "gfedcba"; } , stableBranch ? false -, supportedSystems ? [ "x86_64-linux" "i686-linux" "aarch64-linux" ] +, supportedSystems ? [ "x86_64-linux" "i686-linux" ] }: with import ../lib; From c1e279046b7517c803d4339f82a48ccf3c3405c8 Mon Sep 17 00:00:00 2001 From: Nikolay Amiantov Date: Mon, 20 Mar 2017 11:52:08 +0300 Subject: [PATCH 18/86] odroid-xu3-bootloader: init at 2015-12-04 --- .../misc/odroid-xu3-bootloader/default.nix | 31 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 33 insertions(+) create mode 100644 pkgs/tools/misc/odroid-xu3-bootloader/default.nix diff --git a/pkgs/tools/misc/odroid-xu3-bootloader/default.nix b/pkgs/tools/misc/odroid-xu3-bootloader/default.nix new file mode 100644 index 000000000000..595b0d84ff57 --- /dev/null +++ b/pkgs/tools/misc/odroid-xu3-bootloader/default.nix @@ -0,0 +1,31 @@ +{ stdenv, lib, fetchFromGitHub, coreutils, ubootOdroidXU3 }: + +stdenv.mkDerivation { + name = "odroid-xu3-bootloader-2015-12-04"; + + src = fetchFromGitHub { + owner = "hardkernel"; + repo = "u-boot"; + rev = "bbdea1841c4fbf767dcaf9d7ae8d3a46af235c4d"; + sha256 = "03rvyfj147xh83w8hlvbxix131l3nnvk8n517fdhv9nil1l8dd71"; + }; + + buildCommand = '' + install -Dm644 -t $out/lib/sd_fuse-xu3 $src/sd_fuse/hardkernel/*.hardkernel + ln -sf ${ubootOdroidXU3}/u-boot.bin $out/lib/sd_fuse-xu3/u-boot.bin.hardkernel + + install -Dm755 $src/sd_fuse/hardkernel/sd_fusing.sh $out/bin/sd_fuse-xu3 + sed -i \ + -e '1i#!${stdenv.shell}' \ + -e '1iPATH=${lib.makeBinPath [ coreutils ]}:$PATH' \ + -e "s,if=\./,if=$out/lib/sd_fuse-xu3/,g" \ + $out/bin/sd_fuse-xu3 + ''; + + meta = with stdenv.lib; { + platforms = platforms.linux; + license = licenses.unfreeRedistributableFirmware; + description = "Secure boot enabled boot loader for ODROID-XU{3,4}"; + maintainers = with maintainers; [ abbradar ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 6128efa6c498..c7188bc7f3a7 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -11935,6 +11935,8 @@ with pkgs; nss_ldap = callPackage ../os-specific/linux/nss_ldap { }; + odroid-xu3-bootloader = callPackage ../tools/misc/odroid-xu3-bootloader { }; + pagemon = callPackage ../os-specific/linux/pagemon { }; pam = callPackage ../os-specific/linux/pam { }; From d3028ba6b5a15ee3085434f3761f5737790e079f Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Tue, 14 Mar 2017 09:57:49 +0100 Subject: [PATCH 19/86] LTS Haskell 8.5 --- .../configuration-hackage2nix.yaml | 133 +++++++++++++----- 1 file changed, 99 insertions(+), 34 deletions(-) diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml index b693a55de55f..a2383d48eee0 100644 --- a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml +++ b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml @@ -38,7 +38,7 @@ core-packages: default-package-overrides: - store < 0.4.1 # https://github.com/fpco/store/issues/104 - # LTS Haskell 8.4 + # LTS Haskell 8.5 - abstract-deque ==0.3 - abstract-par ==0.3.3 - AC-Vector ==2.3.2 @@ -65,7 +65,7 @@ default-package-overrides: - airship ==0.6.0 - alarmclock ==0.4.0.2 - alex ==3.2.1 - - alternators ==0.1.1.0 + - alternators ==0.1.1.1 - ALUT ==2.4.0.2 - amazonka ==1.4.5 - amazonka-apigateway ==1.4.5 @@ -209,9 +209,11 @@ default-package-overrides: - base64-string ==0.2 - basic-prelude ==0.6.1.1 - bcrypt ==0.0.10 + - bench ==1.0.3 - benchpress ==0.2.2.9 - bencode ==0.6.0.0 - bento ==0.1.0 + - between ==0.11.0.0 - bifunctors ==5.4.1 - bimap ==0.3.2 - bimap-server ==0.1.0.1 @@ -235,6 +237,8 @@ default-package-overrides: - biofastq ==0.1 - biopsl ==0.4 - bitarray ==0.0.1.1 + - bitcoin-api ==0.12.1 + - bitcoin-api-extra ==0.9.1 - bitcoin-block ==0.13.1 - bitcoin-script ==0.11.1 - bitcoin-tx ==0.13.1 @@ -256,6 +260,8 @@ default-package-overrides: - bloodhound ==0.12.1.0 - blosum ==0.1.1.4 - bmp ==1.2.6.3 + - boltzmann-samplers ==0.1.0.0 + - bookkeeping ==0.2.1.1 - bool-extras ==0.4.0 - Boolean ==0.2.4 - boolean-like ==0.1.1.0 @@ -296,7 +302,7 @@ default-package-overrides: - cabal-helper ==0.7.3.0 - cabal-rpm ==0.11 - cache ==0.1.0.0 - - cacophony ==0.9.1 + - cacophony ==0.9.2 - cairo ==0.13.3.1 - call-stack ==0.1.0 - camfort ==0.901 @@ -365,7 +371,7 @@ default-package-overrides: - cmark ==0.5.5 - cmark-highlight ==0.2.0.0 - cmark-lucid ==0.1.0.0 - - cmdargs ==0.10.14 + - cmdargs ==0.10.15 - code-builder ==0.1.3 - code-page ==0.1.2 - codo-notation ==0.5.2 @@ -382,7 +388,7 @@ default-package-overrides: - concurrent-output ==1.7.9 - concurrent-supply ==0.1.8 - conduit ==1.2.9 - - conduit-combinators ==1.1.0 + - conduit-combinators ==1.1.1 - conduit-connection ==0.1.0.3 - conduit-extra ==1.1.15 - conduit-iconv ==0.1.1.1 @@ -392,6 +398,7 @@ default-package-overrides: - configurator ==0.3.0.0 - configurator-export ==0.1.0.1 - connection ==0.2.7 + - connection-pool ==0.2.1 - console-style ==0.0.2.1 - constraints ==0.9 - consul-haskell ==0.4.2 @@ -402,6 +409,10 @@ default-package-overrides: - control-monad-free ==0.6.1 - control-monad-loop ==0.1 - control-monad-omega ==0.3.1 + - conversion ==1.2.1 + - conversion-bytestring ==1.0.1 + - conversion-case-insensitive ==1.0.0.0 + - conversion-text ==1.0.1 - convert-annotation ==0.5.0.1 - convertible ==1.1.1.0 - cookie ==0.4.2.1 @@ -437,6 +448,7 @@ default-package-overrides: - cryptonite ==0.21 - cryptonite-conduit ==0.2.0 - cryptonite-openssl ==0.5 + - csp ==1.3.1 - css-syntax ==0.0.5 - css-text ==0.1.2.2 - csv ==0.1.2 @@ -500,11 +512,13 @@ default-package-overrides: - directory-tree ==0.12.1 - discount ==0.1.1 - disk-free-space ==0.1.0.1 + - disposable ==0.2.0.0 - distance ==0.1.0.0 - distributed-closure ==0.3.3.0 - distributed-process ==0.6.6 - distributed-process-simplelocalnet ==0.2.3.3 - distributed-static ==0.3.5.0 + - distribution ==1.1.0.0 - distribution-nixpkgs ==1.0.0.1 - distributive ==0.5.2 - diversity ==0.8.0.2 @@ -533,6 +547,7 @@ default-package-overrides: - drifter ==0.2.2 - drifter-postgresql ==0.1.0 - dual-tree ==0.2.0.9 + - dvorak ==0.1.0.0 - dynamic-state ==0.2.2.0 - dyre ==0.8.12 - Earley ==0.11.0.1 @@ -546,12 +561,14 @@ default-package-overrides: - edit-distance ==0.2.2.1 - editor-open ==0.6.0.0 - effect-handlers ==0.1.0.8 + - effin ==0.3.0.2 - either ==4.4.1.1 - either-unwrap ==1.1 - ekg ==0.4.0.12 - ekg-core ==0.1.1.1 - ekg-json ==0.1.0.4 - ekg-statsd ==0.2.1.0 + - ekg-wai ==0.1.0.0 - elerea ==2.9.0 - elm-bridge ==0.4.0 - elm-core-sources ==1.0.0 @@ -561,6 +578,8 @@ default-package-overrides: - emailaddress ==0.2.0.0 - enclosed-exceptions ==1.0.2 - encoding-io ==0.0.1 + - engine-io ==1.2.15 + - engine-io-wai ==1.0.6 - EntrezHTTP ==1.0.3 - entropy ==0.3.7 - enummapset-th ==0.6.1.1 @@ -594,6 +613,7 @@ default-package-overrides: - extensible-effects ==1.11.0.4 - extensible-exceptions ==0.1.1.4 - extra ==1.5.1 + - extract-dependencies ==0.2.0.1 - fail ==4.9.0.0 - farmhash ==0.1.0.5 - fast-builder ==0.0.0.6 @@ -650,6 +670,8 @@ default-package-overrides: - free ==4.12.4 - free-vl ==0.1.4 - freenect ==1.2.1 + - freer ==0.2.4.1 + - freer-effects ==0.3.0.0 - friendly-time ==0.4 - frisby ==0.2 - from-sum ==0.2.1.0 @@ -660,9 +682,10 @@ default-package-overrides: - fuzzcheck ==0.1.1 - gd ==3000.7.3 - Genbank ==1.0.3 + - general-games ==1.0.3 - generic-aeson ==0.2.0.8 - generic-deriving ==1.11.1 - - generic-random ==0.4.0.0 + - generic-random ==0.4.1.0 - generic-xmlpickler ==0.1.0.5 - GenericPretty ==1.2.1 - generics-eot ==0.2.1.1 @@ -701,6 +724,7 @@ default-package-overrides: - gio ==0.13.3.1 - gipeda ==0.3.3.1 - giphy-api ==0.5.2.0 + - git ==0.2.0 - github ==0.15.0 - github-release ==1.0.1 - github-types ==0.2.1 @@ -832,6 +856,12 @@ default-package-overrides: - gravatar ==0.8.0 - graylog ==0.1.0.1 - groom ==0.1.2 + - groundhog ==0.8 + - groundhog-inspector ==0.8 + - groundhog-mysql ==0.8 + - groundhog-postgresql ==0.8 + - groundhog-sqlite ==0.8 + - groundhog-th ==0.8 - grouped-list ==0.2.1.2 - groupoids ==4.0 - groups ==0.4.0.0 @@ -851,14 +881,16 @@ default-package-overrides: - hamilton ==0.1.0.0 - hamlet ==1.2.0 - HandsomeSoup ==0.4.2 + - handwriting ==0.1.0.3 - hapistrano ==0.2.1.2 - happstack-authenticate ==2.3.4.7 - happstack-clientsession ==7.3.1 - - happstack-hsp ==7.3.7.1 + - happstack-hsp ==7.3.7.2 - happstack-jmacro ==7.0.11 - - happstack-server ==7.4.6.3 + - happstack-server ==7.4.6.4 - happstack-server-tls ==7.1.6.2 - happy ==1.19.5 + - HaRe ==0.8.4.0 - harp ==0.4.2 - hasbolt ==0.1.1.1 - hashable ==1.2.5.0 @@ -868,6 +900,7 @@ default-package-overrides: - haskeline ==0.7.3.1 - haskell-gi ==0.20 - haskell-gi-base ==0.20 + - haskell-import-graph ==1.0.1 - haskell-lexer ==1.0.1 - haskell-names ==0.8.0 - haskell-neo4j-client ==0.3.2.4 @@ -916,6 +949,7 @@ default-package-overrides: - heterocephalus ==1.0.4.0 - hex ==0.1.2 - hexml ==0.3.1 + - hexpat ==0.20.10 - hexstring ==0.11.1 - hflags ==0.4.2 - hformat ==0.1.0.1 @@ -953,6 +987,7 @@ default-package-overrides: - hOpenPGP ==2.5.5 - hopenpgp-tools ==0.19.4 - hopenssl ==1.7 + - hopfli ==0.2.1.1 - hosc ==0.15 - hostname ==1.0 - hostname-validate ==1.0.0 @@ -1113,6 +1148,7 @@ default-package-overrides: - iso3166-country-codes ==0.20140203.8 - iso639 ==0.1.0.3 - iso8601-time ==0.1.4 + - isotope ==0.4.0.0 - iterable ==3.0 - ix-shapable ==0.1.0 - ixset ==1.0.7 @@ -1132,7 +1168,7 @@ default-package-overrides: - json-rpc-generic ==0.2.1.2 - json-schema ==0.7.4.1 - json-stream ==0.4.1.3 - - JuicyPixels ==3.2.8 + - JuicyPixels ==3.2.8.1 - JuicyPixels-extra ==0.1.1 - JuicyPixels-scale-dct ==0.1.1.2 - jvm ==0.1.2 @@ -1151,11 +1187,11 @@ default-package-overrides: - knob ==0.1.1 - koofr-client ==1.0.0.3 - kraken ==0.0.3 - - l10n ==0.1.0.0 + - l10n ==0.1.0.1 - labels ==0.3.2 - lackey ==0.4.2 - language-c ==0.5.0 - - language-c-quote ==0.11.7.1 + - language-c-quote ==0.11.7.3 - language-dockerfile ==0.3.5.0 - language-ecmascript ==0.17.1.0 - language-fortran ==0.5.1 @@ -1229,7 +1265,7 @@ default-package-overrides: - lzma-conduit ==1.1.3.1 - machines ==0.6.1 - machines-binary ==0.3.0.3 - - machines-directory ==0.2.0.10 + - machines-directory ==0.2.1.0 - machines-io ==0.2.0.13 - machines-process ==0.2.0.8 - magic ==1.1 @@ -1240,8 +1276,11 @@ default-package-overrides: - markdown ==0.1.16 - markdown-unlit ==0.4.0 - markup ==3.1.0 + - marvin ==0.2.3 + - marvin-interpolate ==1.1 - math-functions ==0.2.1.0 - mathexpr ==0.3.0.0 + - matplotlib ==0.4.1 - matrices ==0.4.4 - matrix ==0.3.5.0 - matrix-market-attoparsec ==0.1.0.5 @@ -1249,7 +1288,7 @@ default-package-overrides: - mbox ==0.3.3 - mcmc-types ==1.0.3 - median-stream ==0.7.0.0 - - mega-sdist ==0.3.0 + - mega-sdist ==0.3.0.2 - megaparsec ==5.2.0 - memory ==0.14.1 - MemoTrie ==0.6.7 @@ -1262,21 +1301,22 @@ default-package-overrides: - mfsolve ==0.3.2.0 - microbench ==0.1 - microformats2-parser ==1.0.1.6 - - microlens ==0.4.7.0 + - microlens ==0.4.8.0 - microlens-aeson ==2.2.0 - microlens-contra ==0.1.0.1 - - microlens-ghc ==0.4.7.0 + - microlens-ghc ==0.4.8.0 - microlens-mtl ==0.1.10.0 - - microlens-platform ==0.3.7.1 + - microlens-platform ==0.3.8.0 - microlens-th ==0.4.1.1 - mighty-metropolis ==1.2.0 - - mime-mail ==0.4.13 + - mime-mail ==0.4.13.1 - mime-mail-ses ==0.3.2.3 - mime-types ==0.1.0.7 - mintty ==0.1 - misfortune ==0.1.1.2 - missing-foreign ==0.1.1 - MissingH ==1.4.0.1 + - mixed-types-num ==0.1.0.1 - mmap ==0.5.9 - mmorph ==1.0.9 - mockery ==0.3.4 @@ -1330,6 +1370,7 @@ default-package-overrides: - multistate ==0.7.1.1 - murmur-hash ==0.1.0.9 - MusicBrainz ==0.2.4 + - mustache ==2.1.2 - mutable-containers ==0.3.3 - mwc-probability ==1.3.0 - mwc-random ==0.13.5.0 @@ -1380,6 +1421,7 @@ default-package-overrides: - nix-paths ==1.0.0.1 - non-empty-sequence ==0.2.0.2 - nonce ==1.0.2 + - nondeterminism ==1.4 - NoTrace ==0.3.0.1 - nsis ==0.3.1 - numbers ==3000.2.0.1 @@ -1413,13 +1455,14 @@ default-package-overrides: - opml-conduit ==0.6.0.1 - optional-args ==1.0.1 - options ==1.2.1.1 - - optparse-applicative ==0.13.1.0 + - optparse-applicative ==0.13.2.0 - optparse-generic ==1.1.4 - optparse-helper ==0.2.1.1 - optparse-simple ==0.0.3 - optparse-text ==0.1.1.0 - osdkeys ==0.0 - overloaded-records ==0.4.2.0 + - package-description-remote ==0.2.0.0 - packdeps ==0.4.3 - pager ==0.1.1.0 - pagerduty ==0.0.8 @@ -1457,13 +1500,13 @@ default-package-overrides: - permutation ==0.5.0.5 - persistable-record ==0.4.1.1 - persistable-types-HDBC-pg ==0.0.1.4 - - persistent ==2.6 - - persistent-mysql ==2.6 - - persistent-postgresql ==2.6 + - persistent ==2.6.1 + - persistent-mysql ==2.6.0.1 + - persistent-postgresql ==2.6.1 - persistent-redis ==2.5.2 - persistent-refs ==0.4 - - persistent-sqlite ==2.6.0.1 - - persistent-template ==2.5.1.6 + - persistent-sqlite ==2.6.2 + - persistent-template ==2.5.2 - pgp-wordlist ==0.1.0.2 - phantom-state ==0.2.1.2 - picedit ==0.2.3.0 @@ -1473,7 +1516,7 @@ default-package-overrides: - pinch ==0.3.0.2 - pinchot ==0.24.0.0 - pipes ==4.3.2 - - pipes-attoparsec ==0.5.1.4 + - pipes-attoparsec ==0.5.1.5 - pipes-bytestring ==2.1.4 - pipes-cacophony ==0.4.1 - pipes-category ==0.2.0.1 @@ -1509,6 +1552,7 @@ default-package-overrides: - post-mess-age ==0.2.1.0 - postgresql-binary ==0.9.3 - postgresql-libpq ==0.9.3.0 + - postgresql-schema ==0.1.10 - postgresql-simple ==0.5.2.1 - postgresql-simple-migration ==0.1.9.0 - postgresql-simple-url ==0.2.0.0 @@ -1567,9 +1611,10 @@ default-package-overrides: - quickcheck-instances ==0.3.12 - quickcheck-io ==0.1.4 - quickcheck-simple ==0.1.0.1 - - quickcheck-special ==0.1.0.3 + - quickcheck-special ==0.1.0.4 - quickcheck-text ==0.1.2.1 - quickcheck-unicode ==1.0.0.1 + - raaz ==0.1.1 - rainbow ==0.28.0.4 - rainbox ==0.18.0.10 - ramus ==0.1.2 @@ -1611,6 +1656,7 @@ default-package-overrides: - reform-happstack ==0.2.5.1 - reform-hsp ==0.2.7.1 - RefSerialize ==0.4.0 + - regex ==0.5.0.0 - regex-applicative ==0.3.3 - regex-applicative-text ==0.1.0.1 - regex-base ==0.93.2 @@ -1666,9 +1712,9 @@ default-package-overrides: - rvar ==0.2.0.3 - s3-signer ==0.3.0.0 - safe ==0.3.14 - - safe-exceptions ==0.1.4.0 + - safe-exceptions ==0.1.5.0 - safe-exceptions-checked ==0.1.0 - - safecopy ==0.9.2 + - safecopy ==0.9.3 - SafeSemaphore ==0.10.1 - sampling ==0.3.2 - sandi ==0.4.0 @@ -1680,11 +1726,13 @@ default-package-overrides: - scanner ==0.2 - scientific ==0.3.4.10 - scotty ==0.11.0 + - scrape-changes ==0.1.0.5 - scrypt ==0.5.0 - sdl2 ==2.2.0 - sdl2-gfx ==0.2 - sdl2-image ==2.0.0 - sdl2-mixer ==0.1 + - search-algorithms ==0.1.0 - securemem ==0.1.9 - SegmentTree ==0.3 - semigroupoid-extras ==5 @@ -1729,6 +1777,7 @@ default-package-overrides: - shake-language-c ==0.10.0 - shakespeare ==2.0.12.1 - shell-conduit ==4.5.2 + - shelly ==1.6.8.3 - shortcut-links ==0.4.2.0 - should-not-typecheck ==2.1.0 - show-prettyprint ==0.1.2 @@ -1790,7 +1839,8 @@ default-package-overrides: - sqlite-simple ==0.4.13.0 - sqlite-simple-errors ==0.6.0.0 - srcloc ==0.5.1.0 - - stache ==0.2.0 + - stache ==0.2.1 + - stack-run-auto ==0.1.1.4 - stack-type ==0.1.0.0 - state-plus ==0.1.2 - stateref ==0.3 @@ -1806,7 +1856,7 @@ default-package-overrides: - stm-conduit ==3.0.0 - stm-containers ==0.2.15 - stm-delay ==0.1.1.1 - - stm-extras ==0.1.0.1 + - stm-extras ==0.1.0.2 - stm-stats ==0.2.0.0 - stm-supply ==0.2.0.0 - STMonadTrans ==0.4.3 @@ -1814,6 +1864,7 @@ default-package-overrides: - storable-complex ==0.2.2 - storable-endian ==0.2.6 - storable-record ==0.0.3.1 + - store-core ==0.4 - Strafunski-StrategyLib ==5.0.0.10 - stratosphere ==0.4.1 - streaming ==0.1.4.5 @@ -1885,6 +1936,7 @@ default-package-overrides: - tasty-rerun ==1.1.6 - tasty-silver ==3.1.9 - tasty-smallcheck ==0.8.1 + - tasty-stats ==0.2.0.2 - tasty-tap ==0.0.4 - tasty-th ==0.1.4 - Taxonomy ==1.0.2 @@ -1892,7 +1944,7 @@ default-package-overrides: - tce-conf ==1.3 - tcp-streams ==0.6.0.0 - tcp-streams-openssl ==0.6.0.0 - - telegram-api ==0.6.0.2 + - telegram-api ==0.6.1.0 - template ==0.2.0.10 - temporary ==1.2.0.4 - temporary-rc ==1.2.0.3 @@ -1907,7 +1959,7 @@ default-package-overrides: - test-framework-th ==0.2.4 - test-simple ==0.1.9 - testing-feat ==0.4.0.3 - - texmath ==0.9.1 + - texmath ==0.9.3 - text ==1.2.2.1 - text-all ==0.3.0.2 - text-binary ==0.2.1.1 @@ -1935,10 +1987,12 @@ default-package-overrides: - th-reify-compat ==0.0.1.1 - th-reify-many ==0.1.6 - th-to-exp ==0.0.1.0 + - th-utilities ==0.2.0.1 - these ==0.7.3 - thread-local-storage ==0.1.1 - threads ==0.5.1.4 - threepenny-gui ==0.7.0.1 + - threepenny-gui-flexbox ==0.3.0.2 - through-text ==0.1.0.0 - thumbnail-plus ==1.0.5 - thyme ==0.3.5.5 @@ -1971,6 +2025,7 @@ default-package-overrides: - tree-fun ==0.8.1.0 - trifecta ==1.6.2.1 - true-name ==0.1.0.2 + - tsv2csv ==0.1.0.1 - ttrie ==0.1.2.1 - tttool ==1.7.0.1 - tuple ==0.3.0.2 @@ -2007,6 +2062,7 @@ default-package-overrides: - union ==0.1.1.1 - union-find ==0.2 - uniplate ==1.6.12 + - uniq-deep ==1.1.0.0 - Unique ==0.4.6.1 - units ==2.4 - units-defs ==2.0.1.1 @@ -2042,6 +2098,7 @@ default-package-overrides: - uuid-types ==1.0.3 - vado ==0.0.8 - validate-input ==0.4.0.0 + - validation ==0.5.4 - varying ==0.7.0.3 - vault ==0.3.0.6 - vcswrapper ==0.1.5 @@ -2056,6 +2113,7 @@ default-package-overrides: - vector-split ==1.0.0.2 - vector-th-unbox ==0.2.1.6 - vectortiles ==1.2.0.2 + - verbosity ==0.2.3.0 - versions ==3.0.0 - vhd ==0.2.2 - ViennaRNAParser ==1.3.2 @@ -2072,6 +2130,7 @@ default-package-overrides: - wai-extra ==3.0.19.1 - wai-handler-launch ==3.0.2.2 - wai-logger ==2.3.0 + - wai-middleware-auth ==0.1.1.1 - wai-middleware-caching ==0.1.0.2 - wai-middleware-caching-lru ==0.1.0.0 - wai-middleware-caching-redis ==0.2.0.0 @@ -2139,13 +2198,15 @@ default-package-overrides: - wordpass ==1.0.0.7 - Workflow ==0.8.3 - wrap ==0.0.0 + - wreq ==0.5.0.0 - writer-cps-full ==0.1.0.0 - - writer-cps-lens ==0.1.0.0 - - writer-cps-morph ==0.1.0.1 + - writer-cps-lens ==0.1.0.1 + - writer-cps-morph ==0.1.0.2 - writer-cps-mtl ==0.1.1.2 - writer-cps-transformers ==0.1.1.2 - wuss ==1.1.3 - X11 ==1.8 + - X11-xft ==0.3.1 - x509 ==1.6.5 - x509-store ==1.6.2 - x509-system ==1.6.4 @@ -2153,6 +2214,7 @@ default-package-overrides: - Xauth ==0.1 - xdcc ==1.1.3 - xdg-basedir ==0.2.2 + - xeno ==0.1 - xenstore ==0.1.1 - xhtml ==3000.2.1 - xlsior ==0.1.0.1 @@ -2164,6 +2226,7 @@ default-package-overrides: - xml-conduit-writer ==0.1.1.1 - xml-hamlet ==0.4.1 - xml-html-qq ==0.1.0.1 + - xml-indexed-cursor ==0.1.1.0 - xml-lens ==0.1.6.3 - xml-picklers ==0.3.6 - xml-to-json-fast ==2.0.0 @@ -2171,6 +2234,7 @@ default-package-overrides: - xmlgen ==0.6.2.1 - xmlhtml ==0.2.3.5 - xmonad ==0.13 + - xmonad-contrib ==0.13 - xss-sanitize ==0.3.5.7 - yackage ==0.8.1 - yahoo-finance-api ==0.2.0.1 @@ -2183,7 +2247,7 @@ default-package-overrides: - yesod-auth-account ==1.4.3 - yesod-auth-basic ==0.1.0.2 - yesod-auth-hashdb ==1.6.0.1 - - yesod-bin ==1.5.2 + - yesod-bin ==1.5.2.1 - yesod-core ==1.4.32 - yesod-eventsource ==1.4.1 - yesod-fay ==0.8.0 @@ -2191,6 +2255,7 @@ default-package-overrides: - yesod-form-richtext ==0.1.0.0 - yesod-gitrepo ==0.2.1.0 - yesod-gitrev ==0.1.0.0 + - yesod-markdown ==0.11.4 - yesod-newsfeed ==1.6 - yesod-persistent ==1.4.2 - yesod-sitemap ==1.4.0.1 From c3b0cb1acef2e0a4f633f0d19c688c78bbd2694a Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Sat, 18 Mar 2017 18:29:36 +0100 Subject: [PATCH 20/86] hackage2nix: keep binary 0.8.x around --- .../development/haskell-modules/configuration-hackage2nix.yaml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml index a2383d48eee0..b8ff822726d7 100644 --- a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml +++ b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml @@ -2293,7 +2293,8 @@ extra-packages: - aeson < 0.8 # newer versions don't work with GHC 6.12.3 - aeson < 1.1 # required by stack - aeson-pretty < 0.8 # required by elm compiler - - binary > 0.7 && < 0.8 # binary 0.8.x is the latest, but it's largely unsupported so far + - binary > 0.7 && < 0.8 # keep a 7.x major release around for older compilers + - binary > 0.8 && < 0.9 # keep a 8.x major release around for older compilers - Cabal == 1.18.* # required for cabal-install et al on old GHC versions - Cabal == 1.20.* # required for cabal-install et al on old GHC versions - containers < 0.5 # required to build alex with GHC 6.12.3 From 8f45ea61751509107a35dc00cad6721e56aa995a Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Wed, 8 Mar 2017 15:19:32 +0100 Subject: [PATCH 21/86] hackage-packages.nix: automatic Haskell package set update This update was generated by hackage2nix v2.1-7-g490c7d5 from Hackage revision https://github.com/commercialhaskell/all-cabal-hashes/commit/abc129b4f13a6b801b1a1e019f58b9db5ecc4cce. --- .../haskell-modules/hackage-packages.nix | 4876 +++++++++++------ 1 file changed, 3175 insertions(+), 1701 deletions(-) diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix index c50f9a12731a..0b033b61b3ab 100644 --- a/pkgs/development/haskell-modules/hackage-packages.nix +++ b/pkgs/development/haskell-modules/hackage-packages.nix @@ -247,14 +247,14 @@ self: { "ADPfusion" = callPackage ({ mkDerivation, base, bits, containers, DPutils, mmorph, mtl - , OrderedBits, primitive, PrimitiveArray, QuickCheck, strict - , template-haskell, test-framework, test-framework-quickcheck2 - , test-framework-th, th-orphans, transformers, tuple, vector + , OrderedBits, primitive, PrimitiveArray, QuickCheck, strict, tasty + , tasty-quickcheck, tasty-th, template-haskell, th-orphans + , transformers, tuple, vector }: mkDerivation { pname = "ADPfusion"; - version = "0.5.2.0"; - sha256 = "264284d9a7bb0978caec240c98d8cabbe89772248bd8e7514f53b277f902a61d"; + version = "0.5.2.2"; + sha256 = "90720d382870d77918f10c5c5a3cdcfe671e91ce3bfab52399bec307f9ba07e5"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -263,8 +263,8 @@ self: { transformers tuple vector ]; testHaskellDepends = [ - base bits OrderedBits PrimitiveArray QuickCheck strict - test-framework test-framework-quickcheck2 test-framework-th vector + base bits OrderedBits PrimitiveArray QuickCheck strict tasty + tasty-quickcheck tasty-th vector ]; homepage = "https://github.com/choener/ADPfusion"; description = "Efficient, high-level dynamic programming"; @@ -272,6 +272,31 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "ADPfusionSet" = callPackage + ({ mkDerivation, ADPfusion, base, bits, containers, DPutils, mmorph + , mtl, OrderedBits, primitive, PrimitiveArray, QuickCheck + , smallcheck, strict, tasty, tasty-quickcheck, tasty-smallcheck + , tasty-th, template-haskell, th-orphans, transformers, tuple + , vector + }: + mkDerivation { + pname = "ADPfusionSet"; + version = "0.0.0.1"; + sha256 = "cb5b430b49e6fb239f30a289def77ecd5197a33a5ec9768e163f21f2f6ef305f"; + libraryHaskellDepends = [ + ADPfusion base bits containers DPutils mmorph mtl OrderedBits + primitive PrimitiveArray QuickCheck strict template-haskell + th-orphans transformers tuple vector + ]; + testHaskellDepends = [ + base QuickCheck smallcheck tasty tasty-quickcheck tasty-smallcheck + tasty-th + ]; + homepage = "https://github.com/choener/ADPfusionSet"; + description = "Dynamic programming for Set data structures"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "AERN-Basics" = callPackage ({ mkDerivation, base, containers, criterion, deepseq, directory , QuickCheck, random, test-framework, test-framework-quickcheck2 @@ -802,8 +827,8 @@ self: { }: mkDerivation { pname = "AlignmentAlgorithms"; - version = "0.0.2.1"; - sha256 = "8d6118e9cd863cde4ac78f726d36105979ed9f463aa56a25ff4a20cfe881c99a"; + version = "0.1.0.0"; + sha256 = "e84cfd84634113be381bd066c8acfce326c88b8ccb3dcaa05bd2b923a7a4dc4c"; libraryHaskellDepends = [ ADPfusion base containers fmlist FormalGrammars GrammarProducts PrimitiveArray vector @@ -1352,8 +1377,8 @@ self: { }: mkDerivation { pname = "BioHMM"; - version = "1.0.5"; - sha256 = "f32d7c8e0433c38e77c3c06c08fd30bfc6eccaa8a4ccc074638de016ab13793f"; + version = "1.0.6"; + sha256 = "81728f5329327dce9f586fad4fc6c8d2da30964f6f9b5a1309c4d20f9eed3ac5"; libraryHaskellDepends = [ base colour diagrams-cairo diagrams-lib directory either-unwrap filepath parsec ParsecTools StockholmAlignment SVGFonts text vector @@ -1450,21 +1475,40 @@ self: { }) {}; "BiobaseInfernal" = callPackage - ({ mkDerivation, attoparsec, attoparsec-conduit, base, BiobaseXNA - , biocore, bytestring, bytestring-lexing, conduit, containers - , either-unwrap, lens, primitive, PrimitiveArray, repa - , transformers, tuple, vector + ({ mkDerivation, aeson, attoparsec, base, binary, BiobaseTypes + , BiobaseXNA, bytestring, cereal, cereal-text, cereal-vector + , cmdargs, containers, criterion, data-default, deepseq, DPutils + , filepath, hashable, HUnit, lens, parallel, pipes + , pipes-attoparsec, pipes-bytestring, pipes-parse, pipes-safe + , pipes-zlib, primitive, PrimitiveArray, QuickCheck, strict + , string-conversions, tasty, tasty-hunit, tasty-quickcheck + , tasty-th, text, text-binary, transformers, tuple + , unordered-containers, utf8-string, vector, vector-th-unbox, zlib }: mkDerivation { pname = "BiobaseInfernal"; - version = "0.7.1.0"; - sha256 = "5a3417356d462b64c10516fe898923373bb07bc6e1225b479b725c871546eaa5"; + version = "0.8.1.0"; + sha256 = "0f64adaac1795c537f4b535f904d484e7922eba197d115bf206392f6f225cf78"; + isLibrary = true; + isExecutable = true; libraryHaskellDepends = [ - attoparsec attoparsec-conduit base BiobaseXNA biocore bytestring - bytestring-lexing conduit containers either-unwrap lens primitive - PrimitiveArray repa transformers tuple vector + aeson attoparsec base binary BiobaseTypes BiobaseXNA bytestring + cereal cereal-text cereal-vector containers data-default deepseq + DPutils filepath hashable lens parallel pipes pipes-attoparsec + pipes-bytestring pipes-parse pipes-safe pipes-zlib primitive + PrimitiveArray strict string-conversions text text-binary + transformers tuple unordered-containers utf8-string vector + vector-th-unbox zlib ]; - homepage = "http://www.tbi.univie.ac.at/~choener/"; + executableHaskellDepends = [ base cmdargs ]; + testHaskellDepends = [ + base HUnit lens QuickCheck tasty tasty-hunit tasty-quickcheck + tasty-th + ]; + benchmarkHaskellDepends = [ + base criterion lens text transformers + ]; + homepage = "https://github.com/choener/BiobaseInfernal"; description = "Infernal data structures and tools"; license = stdenv.lib.licenses.gpl3; hydraPlatforms = stdenv.lib.platforms.none; @@ -1549,19 +1593,19 @@ self: { "BiobaseTypes" = callPackage ({ mkDerivation, aeson, base, bimaps, binary, cereal, cereal-text - , cereal-vector, data-default, deepseq, hashable, intern - , log-domain, primitive, PrimitiveArray, QuickCheck, stringable - , tasty, tasty-quickcheck, tasty-th, text, text-binary, vector + , cereal-vector, data-default, deepseq, hashable, intern, primitive + , PrimitiveArray, QuickCheck, string-conversions, tasty + , tasty-quickcheck, tasty-th, text, text-binary, vector , vector-binary-instances, vector-th-unbox }: mkDerivation { pname = "BiobaseTypes"; - version = "0.1.2.0"; - sha256 = "b1086f4228edfad9cddfb7abdbeca079bef5517a3629552069f3dfcd8378e84e"; + version = "0.1.2.1"; + sha256 = "92cbf8028151a61bb1e0ad70b5d83ce9a420146f72645d3bd2fbd8f4a1e58c87"; libraryHaskellDepends = [ aeson base bimaps binary cereal cereal-text cereal-vector - data-default deepseq hashable intern log-domain primitive - PrimitiveArray QuickCheck stringable text text-binary vector + data-default deepseq hashable intern primitive PrimitiveArray + QuickCheck string-conversions text text-binary vector vector-binary-instances vector-th-unbox ]; testHaskellDepends = [ @@ -1593,22 +1637,26 @@ self: { "BiobaseXNA" = callPackage ({ mkDerivation, aeson, base, bimaps, binary, bytes, bytestring , cereal, cereal-vector, cmdargs, containers, csv, deepseq - , file-embed, hashable, lens, primitive, PrimitiveArray, split - , text, tuple, vector, vector-binary-instances, vector-th-unbox + , file-embed, hashable, lens, primitive, PrimitiveArray, QuickCheck + , split, tasty, tasty-quickcheck, tasty-th, text, tuple, vector + , vector-binary-instances, vector-th-unbox }: mkDerivation { pname = "BiobaseXNA"; - version = "0.9.3.0"; - sha256 = "c5175ce6473b6f46885834acf600b11ca196d62ae0c5de2c598b8f01c07f3e45"; + version = "0.9.3.1"; + sha256 = "d0cca46d67b08b414f266d29660604615ce62c35704042322fed60aa416b8c4a"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ aeson base bimaps binary bytes bytestring cereal cereal-vector containers csv deepseq file-embed hashable lens primitive - PrimitiveArray split text tuple vector vector-binary-instances - vector-th-unbox + PrimitiveArray QuickCheck split text tuple vector + vector-binary-instances vector-th-unbox ]; executableHaskellDepends = [ base cmdargs ]; + testHaskellDepends = [ + base QuickCheck tasty tasty-quickcheck tasty-th vector + ]; homepage = "https://github.com/choener/BiobaseXNA"; description = "Efficient RNA/DNA representations"; license = stdenv.lib.licenses.gpl3; @@ -5410,13 +5458,14 @@ self: { "FormalGrammars" = callPackage ({ mkDerivation, ADPfusion, ansi-wl-pprint, base, bytestring , cmdargs, containers, data-default, HaTeX, lens, mtl, parsers - , PrimitiveArray, semigroups, template-haskell, text, transformers - , trifecta, unordered-containers, vector + , PrimitiveArray, QuickCheck, semigroups, smallcheck, tasty + , tasty-quickcheck, tasty-smallcheck, tasty-th, template-haskell + , text, transformers, trifecta, unordered-containers, vector }: mkDerivation { pname = "FormalGrammars"; - version = "0.3.1.0"; - sha256 = "cc6d92eeda014b8f1b89eed81e11f9b7c4b9c150771f330e43092644754fbac8"; + version = "0.3.1.1"; + sha256 = "5af499a9bbd43121d46e19be1c15eb2edddf20384487b9df76c2bc45fc69164e"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -5427,6 +5476,10 @@ self: { executableHaskellDepends = [ ansi-wl-pprint base cmdargs trifecta ]; + testHaskellDepends = [ + base QuickCheck smallcheck tasty tasty-quickcheck tasty-smallcheck + tasty-th + ]; homepage = "https://github.com/choener/FormalGrammars"; description = "(Context-free) grammars in formal language theory"; license = stdenv.lib.licenses.gpl3; @@ -6417,8 +6470,8 @@ self: { }: mkDerivation { pname = "GrammarProducts"; - version = "0.1.1.2"; - sha256 = "9023283298ad178efaf9ba965e7a0005ff41a8a01d2e0f581ed3c29e414f15a2"; + version = "0.1.1.3"; + sha256 = "20ff8fe82f9a4927bcb318e9c7ac6fb7a05adc99ad1fbc4f4a3a5f0b6abb25d7"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -8247,6 +8300,30 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "HTTP_4000_3_6" = callPackage + ({ mkDerivation, array, base, bytestring, case-insensitive, conduit + , conduit-extra, deepseq, http-types, httpd-shed, HUnit, mtl + , network, network-uri, parsec, pureMD5, split, test-framework + , test-framework-hunit, time, wai, warp + }: + mkDerivation { + pname = "HTTP"; + version = "4000.3.6"; + sha256 = "18c4887aac6268712fb4733b00a0681efc0527c1354601be1568ce7845f9ba48"; + libraryHaskellDepends = [ + array base bytestring mtl network network-uri parsec time + ]; + testHaskellDepends = [ + base bytestring case-insensitive conduit conduit-extra deepseq + http-types httpd-shed HUnit mtl network network-uri pureMD5 split + test-framework test-framework-hunit wai warp + ]; + homepage = "https://github.com/haskell/HTTP"; + description = "A library for client-side HTTP"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "HTTP-Simple" = callPackage ({ mkDerivation, base, HTTP, network }: mkDerivation { @@ -8732,6 +8809,23 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "HasCacBDD" = callPackage + ({ mkDerivation, base, Cabal, CacBDD, directory, process + , QuickCheck + }: + mkDerivation { + pname = "HasCacBDD"; + version = "0.1.0.0"; + sha256 = "be9d36029cbb47b03093bfc96a0ea48525f1fd8180f8310556308eb61d7de4b6"; + setupHaskellDepends = [ base Cabal directory ]; + libraryHaskellDepends = [ base process QuickCheck ]; + librarySystemDepends = [ CacBDD ]; + testHaskellDepends = [ base QuickCheck ]; + homepage = "https://github.com/m4lvin/HasCacBDD"; + description = "Haskell bindings for CacBDD"; + license = stdenv.lib.licenses.gpl2; + }) {CacBDD = null;}; + "HasGP" = callPackage ({ mkDerivation, base, haskell98, hmatrix, hmatrix-special, mtl , parsec, random @@ -9495,6 +9589,25 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {inherit (pkgs) openssl;}; + "HsOpenSSL_0_11_4_2" = callPackage + ({ mkDerivation, base, bytestring, integer-gmp, network, openssl + , time + }: + mkDerivation { + pname = "HsOpenSSL"; + version = "0.11.4.2"; + sha256 = "dc937f7119c00b5c8cc96038185d6078bfd37f968ee4534e207b9aa393ee5767"; + libraryHaskellDepends = [ + base bytestring integer-gmp network time + ]; + librarySystemDepends = [ openssl ]; + testHaskellDepends = [ base bytestring ]; + homepage = "https://github.com/vshabanov/HsOpenSSL"; + description = "Partial OpenSSL binding for Haskell"; + license = stdenv.lib.licenses.publicDomain; + hydraPlatforms = stdenv.lib.platforms.none; + }) {inherit (pkgs) openssl;}; + "HsOpenSSL-x509-system" = callPackage ({ mkDerivation, base, bytestring, HsOpenSSL, unix }: mkDerivation { @@ -10150,10 +10263,8 @@ self: { }: mkDerivation { pname = "JuicyPixels"; - version = "3.2.8"; - sha256 = "038c6547d543442a93b2028be4b84c225bb7a6fa913e1fc57325c58d043d5644"; - revision = "1"; - editedCabalFile = "5211841fbb8a9a7fe19ce715a749149ab03c28344531bc3163f8580b611a2e3e"; + version = "3.2.8.1"; + sha256 = "b325ed50b887d65af7175bba03a2df5ef04a1e0f73adf2e3aa62d1676fa27104"; libraryHaskellDepends = [ base binary bytestring containers deepseq mtl primitive transformers vector zlib @@ -10909,22 +11020,26 @@ self: { "LinguisticsTypes" = callPackage ({ mkDerivation, aeson, base, bimaps, binary, bytestring, cereal - , cereal-text, deepseq, hashable, intern, log-domain, QuickCheck - , stringable, test-framework, test-framework-quickcheck2 - , test-framework-th, text, text-binary, vector-th-unbox + , cereal-text, containers, criterion, deepseq, hashable, intern + , log-domain, QuickCheck, string-conversions, tasty + , tasty-quickcheck, tasty-th, text, text-binary, utf8-string + , vector-th-unbox }: mkDerivation { pname = "LinguisticsTypes"; - version = "0.0.0.2"; - sha256 = "9f5a722b1f88207b42801a72b6fc95453f134b7a4252251876a4ef069b7b4bcb"; + version = "0.0.0.3"; + sha256 = "2db4b10d3d9d1be5646627aaac8a12e117813aa5696bc52a9ae8cdabbeec42a7"; libraryHaskellDepends = [ aeson base bimaps binary bytestring cereal cereal-text deepseq - hashable intern log-domain QuickCheck stringable text text-binary - vector-th-unbox + hashable intern log-domain QuickCheck string-conversions text + text-binary utf8-string vector-th-unbox ]; testHaskellDepends = [ - aeson base binary cereal QuickCheck stringable test-framework - test-framework-quickcheck2 test-framework-th + aeson base binary cereal QuickCheck string-conversions tasty + tasty-quickcheck tasty-th + ]; + benchmarkHaskellDepends = [ + base bytestring containers criterion deepseq text ]; homepage = "https://github.com/choener/LinguisticsTypes"; description = "Collection of types for natural language"; @@ -12097,6 +12212,41 @@ self: { license = "LGPL"; }) {}; + "MutationOrder" = callPackage + ({ mkDerivation, ADPfusion, ADPfusionSet, aeson, base, bimaps + , BiobaseXNA, bytestring, cereal, cereal-vector, cmdargs + , containers, deepseq, directory, DPutils, file-embed, filepath + , FormalGrammars, log-domain, parallel, PrimitiveArray + , PrimitiveArray-Pretty, QuickCheck, serialize-instances + , ShortestPathProblems, tasty, tasty-quickcheck, tasty-th, text + , unordered-containers, vector, vector-strategies + , ViennaRNA-bindings, zlib + }: + mkDerivation { + pname = "MutationOrder"; + version = "0.0.0.2"; + sha256 = "0019590415bbcec4f8e4d8a04af277a3a9360b28255eb44290810b499015f32f"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + ADPfusion ADPfusionSet aeson base bimaps BiobaseXNA bytestring + cereal cereal-vector containers deepseq directory DPutils filepath + FormalGrammars log-domain parallel PrimitiveArray + PrimitiveArray-Pretty serialize-instances ShortestPathProblems text + unordered-containers vector vector-strategies ViennaRNA-bindings + zlib + ]; + executableHaskellDepends = [ + base bytestring cmdargs file-embed filepath + ]; + testHaskellDepends = [ + base QuickCheck tasty tasty-quickcheck tasty-th vector + ]; + homepage = "https://github.com/choener/MutationOrder"; + description = "Most likely order of mutation events in RNA"; + license = stdenv.lib.licenses.gpl3; + }) {}; + "MyPrimes" = callPackage ({ mkDerivation, base, containers, time }: mkDerivation { @@ -12231,27 +12381,22 @@ self: { }) {}; "NaturalLanguageAlphabets" = callPackage - ({ mkDerivation, aeson, array, attoparsec, base, bimaps, binary - , bytestring, cereal, cereal-text, containers, criterion, deepseq - , file-embed, hashable, hashtables, intern, LinguisticsTypes - , mwc-random, QuickCheck, random, stringable, system-filepath - , test-framework, test-framework-quickcheck2, test-framework-th - , text, text-binary, unordered-containers, vector, vector-th-unbox + ({ mkDerivation, aeson, attoparsec, base, binary, cereal + , containers, criterion, deepseq, file-embed, hashtables + , LinguisticsTypes, mwc-random, QuickCheck, random, tasty + , tasty-quickcheck, tasty-th, text, unordered-containers, vector }: mkDerivation { pname = "NaturalLanguageAlphabets"; - version = "0.1.0.0"; - sha256 = "c233d60b74a4131705e36b5873fae2973f168b8c1c0717055c6d546d40ac6215"; + version = "0.1.1.0"; + sha256 = "ffd069f7cbd6f48db278a15805e6ab2a6cc60c24cacd133ecd0c359eae23db8b"; libraryHaskellDepends = [ - aeson array attoparsec base bimaps binary bytestring cereal - cereal-text deepseq file-embed hashable intern LinguisticsTypes - QuickCheck stringable system-filepath text text-binary - unordered-containers vector vector-th-unbox + aeson attoparsec base file-embed LinguisticsTypes text + unordered-containers ]; testHaskellDepends = [ - aeson base binary cereal LinguisticsTypes QuickCheck stringable - test-framework test-framework-quickcheck2 test-framework-th text - unordered-containers + aeson base binary cereal LinguisticsTypes QuickCheck tasty + tasty-quickcheck tasty-th text unordered-containers ]; benchmarkHaskellDepends = [ base containers criterion deepseq hashtables LinguisticsTypes @@ -13782,8 +13927,8 @@ self: { }: mkDerivation { pname = "PrimitiveArray"; - version = "0.8.0.0"; - sha256 = "b4af0d0d8502dc8ba8985cd70b69a0220a70e8d44a2ee4dfa73db1bce5774445"; + version = "0.8.0.1"; + sha256 = "91e77d0f115514fd13f03e185b73bd437a57838cabaebed4d98d04bc52ad38f5"; libraryHaskellDepends = [ aeson base binary bits cereal cereal-vector deepseq DPutils hashable log-domain OrderedBits primitive QuickCheck smallcheck @@ -14462,6 +14607,39 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "RNAlien_1_3_7" = callPackage + ({ mkDerivation, aeson, base, biocore, biofasta, BlastHTTP + , blastxml, bytestring, cassava, ClustalParser, cmdargs, containers + , directory, edit-distance, either-unwrap, EntrezHTTP, filepath + , hierarchical-clustering, HTTP, http-conduit, http-types, hxt + , matrix, network, parsec, process, pureMD5, random, split + , Taxonomy, text, text-metrics, time, transformers, vector + , ViennaRNAParser + }: + mkDerivation { + pname = "RNAlien"; + version = "1.3.7"; + sha256 = "de54278982eecd9568ee155a3155f632b503776fff7634b8b3746e29d28248a5"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + aeson base biocore biofasta BlastHTTP blastxml bytestring cassava + ClustalParser cmdargs containers directory edit-distance + either-unwrap EntrezHTTP filepath hierarchical-clustering HTTP + http-conduit http-types hxt matrix network parsec process pureMD5 + random Taxonomy text text-metrics transformers vector + ViennaRNAParser + ]; + executableHaskellDepends = [ + base biocore biofasta bytestring cassava cmdargs containers + directory either-unwrap filepath process random split text time + vector ViennaRNAParser + ]; + description = "Unsupervized construction of RNA family models"; + license = stdenv.lib.licenses.gpl3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "RNAwolf" = callPackage ({ mkDerivation, base, BiobaseTrainingData, BiobaseXNA, bytestring , cmdargs, containers, deepseq, directory, parallel, PrimitiveArray @@ -14863,6 +15041,17 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "RtMidi" = callPackage + ({ mkDerivation, base }: + mkDerivation { + pname = "RtMidi"; + version = "0.1.0.0"; + sha256 = "c6534f2f1c279d1cbb2eccd085ca52121d6c94d00f322a4cf2a6c455ab26f720"; + libraryHaskellDepends = [ base ]; + homepage = "https://github.com/riottracker/RtMidi"; + license = stdenv.lib.licenses.mit; + }) {}; + "RxHaskell" = callPackage ({ mkDerivation, base, containers, stm, transformers }: mkDerivation { @@ -15578,6 +15767,27 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "ShortestPathProblems" = callPackage + ({ mkDerivation, ADPfusion, ADPfusionSet, base, FormalGrammars + , log-domain, PrimitiveArray, QuickCheck, tasty, tasty-quickcheck + , tasty-th, text, vector + }: + mkDerivation { + pname = "ShortestPathProblems"; + version = "0.0.0.1"; + sha256 = "0ec13f0863757534aca0e0c739aac1510f48178b14e84d64cc758409595e1ddd"; + libraryHaskellDepends = [ + ADPfusion ADPfusionSet base FormalGrammars log-domain + PrimitiveArray text vector + ]; + testHaskellDepends = [ + base QuickCheck tasty tasty-quickcheck tasty-th vector + ]; + homepage = "https://github.com/choener/ShortestPathProblems"; + description = "grammars for TSP and SHP"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "ShowF" = callPackage ({ mkDerivation, base }: mkDerivation { @@ -17509,13 +17719,14 @@ self: { }: mkDerivation { pname = "ViennaRNA-bindings"; - version = "0.233.1.1"; - sha256 = "8435afc87b0265175eef88b586e69934e8404bd5126b6d6f5969c6486ce31b1a"; + version = "0.233.1.2"; + sha256 = "6d3c1e8288727500bd07e2dc4c64bf0a0861e7cf9b8d6862d1ae5efb4b7004c7"; libraryHaskellDepends = [ array base ]; libraryToolDepends = [ c2hs ]; testHaskellDepends = [ array base QuickCheck tasty tasty-hunit tasty-silver tasty-th ]; + testToolDepends = [ c2hs ]; homepage = "https://github.com/choener/ViennaRNA-bindings"; description = "ViennaRNA v2 bindings"; license = "unknown"; @@ -17861,26 +18072,25 @@ self: { }) {advapi32 = null; gdi32 = null; shell32 = null; shfolder = null; user32 = null; winmm = null;}; - "Win32_2_5_1_0" = callPackage + "Win32_2_5_3_0" = callPackage ({ mkDerivation, advapi32, base, bytestring, filepath, gdi32, imm32 - , msimg32, ntdll, shell32, shfolder, shlwapi, user32, winmm + , msimg32, shell32, shfolder, shlwapi, user32, winmm }: mkDerivation { pname = "Win32"; - version = "2.5.1.0"; - sha256 = "84e1b1ee7e435ad4237d2f625114f205141988b964f42259b5e294066f31ca52"; + version = "2.5.3.0"; + sha256 = "fd66d7feafc7863cbd0726c8dbf605a007804e009fe4e5b5ebdf4f4727257c31"; libraryHaskellDepends = [ base bytestring filepath ]; librarySystemDepends = [ - advapi32 gdi32 imm32 msimg32 ntdll shell32 shfolder shlwapi user32 - winmm + advapi32 gdi32 imm32 msimg32 shell32 shfolder shlwapi user32 winmm ]; homepage = "https://github.com/haskell/win32"; description = "A binding to part of the Win32 library"; license = stdenv.lib.licenses.bsd3; platforms = stdenv.lib.platforms.none; }) {advapi32 = null; gdi32 = null; imm32 = null; msimg32 = null; - ntdll = null; shell32 = null; shfolder = null; shlwapi = null; - user32 = null; winmm = null;}; + shell32 = null; shfolder = null; shlwapi = null; user32 = null; + winmm = null;}; "Win32-console" = callPackage ({ mkDerivation, base, Win32 }: @@ -18039,38 +18249,39 @@ self: { }) {}; "WordAlignment" = callPackage - ({ mkDerivation, ADPfusion, AlignmentAlgorithms, ascii-progress - , attoparsec, base, bytestring, cmdargs, containers - , control-monad-omega, deepseq, file-embed, fmlist, FormalGrammars + ({ mkDerivation, ADPfusion, aeson, AlignmentAlgorithms, attoparsec + , base, bimaps, bytestring, cmdargs, containers, data-default + , deepseq, DPutils, file-embed, filepath, fmlist, FormalGrammars , ghc-prim, GrammarProducts, hashable, intern, lens - , LinguisticsTypes, NaturalLanguageAlphabets, parallel, primitive - , PrimitiveArray, QuickCheck, strict, stringable, template-haskell - , test-framework, test-framework-quickcheck2, test-framework-th - , text, text-format, transformers, tuple-th, unordered-containers - , vector + , LinguisticsTypes, mtl, NaturalLanguageAlphabets, parallel, pipes + , primitive, PrimitiveArray, split, strict, tasty, tasty-quickcheck + , tasty-silver, tasty-th, template-haskell, text, text-format + , transformers, tuple-th, unordered-containers, vector }: mkDerivation { pname = "WordAlignment"; - version = "0.1.0.0"; - sha256 = "0182ffbf3dfddcabd73dce16eef232fce5c680125391ce881ddf2b81c97593d0"; + version = "0.2.0.0"; + sha256 = "9ccd32606db500ecec43b74d8c6fbb84cfe2df7fcb0e50619a155d55d74511cc"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ - ADPfusion AlignmentAlgorithms attoparsec base bytestring containers - control-monad-omega deepseq file-embed fmlist FormalGrammars - ghc-prim GrammarProducts hashable intern lens LinguisticsTypes - NaturalLanguageAlphabets primitive PrimitiveArray strict stringable - template-haskell text text-format transformers tuple-th - unordered-containers vector + ADPfusion aeson AlignmentAlgorithms attoparsec base bimaps + bytestring containers data-default deepseq DPutils file-embed + fmlist FormalGrammars ghc-prim GrammarProducts hashable intern lens + LinguisticsTypes mtl NaturalLanguageAlphabets pipes primitive + PrimitiveArray strict template-haskell text text-format + transformers tuple-th unordered-containers vector ]; executableHaskellDepends = [ - ascii-progress base bytestring cmdargs containers file-embed intern - LinguisticsTypes NaturalLanguageAlphabets parallel strict text - unordered-containers vector + aeson base bytestring cmdargs containers data-default DPutils + file-embed intern lens LinguisticsTypes mtl + NaturalLanguageAlphabets parallel pipes strict text text-format + transformers unordered-containers vector ]; testHaskellDepends = [ - base QuickCheck test-framework test-framework-quickcheck2 - test-framework-th + base bytestring containers DPutils filepath + NaturalLanguageAlphabets split tasty tasty-quickcheck tasty-silver + tasty-th text ]; homepage = "https://github.com/choener/WordAlignment"; description = "Bigram word pair alignments"; @@ -19472,6 +19683,18 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "acme-functors" = callPackage + ({ mkDerivation, base }: + mkDerivation { + pname = "acme-functors"; + version = "0.1.0.0"; + sha256 = "381a686e8eecb39c4997205dcb9a43146ca7d1abae03c13301a9f0a26570292d"; + libraryHaskellDepends = [ base ]; + homepage = "https://github.com/chris-martin/acme-functors"; + description = "The best applicative functors"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "acme-grawlix" = callPackage ({ mkDerivation, base }: mkDerivation { @@ -20282,19 +20505,20 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "aeson_1_1_0_0" = callPackage + "aeson_1_1_1_0" = callPackage ({ mkDerivation, attoparsec, base, base-compat, base-orphans , base16-bytestring, bytestring, containers, deepseq, directory , dlist, filepath, generic-deriving, ghc-prim, hashable - , hashable-time, HUnit, QuickCheck, quickcheck-instances - , scientific, tagged, template-haskell, test-framework - , test-framework-hunit, test-framework-quickcheck2, text, time - , time-locale-compat, unordered-containers, uuid-types, vector + , hashable-time, HUnit, integer-logarithms, QuickCheck + , quickcheck-instances, scientific, tagged, template-haskell + , test-framework, test-framework-hunit, test-framework-quickcheck2 + , text, time, time-locale-compat, unordered-containers, uuid-types + , vector }: mkDerivation { pname = "aeson"; - version = "1.1.0.0"; - sha256 = "5810fc5f664855ba6457d119fffd176ee93e60a27e88f5eedc349d7d75f18880"; + version = "1.1.1.0"; + sha256 = "083791ed61fd5d2ce613ba9d54dd37e598a376fab63c9df0abfaa69e802272d6"; libraryHaskellDepends = [ attoparsec base base-compat bytestring containers deepseq dlist ghc-prim hashable scientific tagged template-haskell text time @@ -20303,7 +20527,7 @@ self: { testHaskellDepends = [ attoparsec base base-compat base-orphans base16-bytestring bytestring containers directory dlist filepath generic-deriving - ghc-prim hashable hashable-time HUnit QuickCheck + ghc-prim hashable hashable-time HUnit integer-logarithms QuickCheck quickcheck-instances scientific tagged template-haskell test-framework test-framework-hunit test-framework-quickcheck2 text time time-locale-compat unordered-containers uuid-types vector @@ -20872,16 +21096,17 @@ self: { }) {}; "aeson-value-parser" = callPackage - ({ mkDerivation, aeson, base-prelude, mtl-prelude, scientific - , success, text, unordered-containers, vector + ({ mkDerivation, aeson, base-prelude, json-pointer + , json-pointer-aeson, mtl-prelude, scientific, text, transformers + , unordered-containers, vector }: mkDerivation { pname = "aeson-value-parser"; - version = "0.11.4"; - sha256 = "f5a31e1aa81eaf7eed3b1a5ad3e793478f51043792435e537ff6649f4cad3c8e"; + version = "0.12.1"; + sha256 = "11096d66a70d036bbe5d685aa516e454623f2f6de98693dbb36e1016dce8ac8d"; libraryHaskellDepends = [ - aeson base-prelude mtl-prelude scientific success text - unordered-containers vector + aeson base-prelude json-pointer json-pointer-aeson mtl-prelude + scientific text transformers unordered-containers vector ]; homepage = "https://github.com/sannsyn/aeson-value-parser"; description = "An API for parsing \"aeson\" JSON tree into Haskell types"; @@ -21212,8 +21437,8 @@ self: { }: mkDerivation { pname = "airtable-api"; - version = "0.2.0.1"; - sha256 = "e17565f18a0ecee13f9650a350f4731e20a21df03c350a8aa6bfe30b37233230"; + version = "0.3.2.4"; + sha256 = "f44423ee40e66e35ad1ede9481e2c0148600c73001c1316b3f496a6be79ade3a"; libraryHaskellDepends = [ aeson base bytestring hashable lens text time unordered-containers wreq @@ -22054,8 +22279,8 @@ self: { ({ mkDerivation, base, mmorph, transformers }: mkDerivation { pname = "alternators"; - version = "0.1.1.0"; - sha256 = "f95d9a4826c57194e2a22e41a9f0eaef0e96cf95f6372179aa7c47bc3ca8f627"; + version = "0.1.1.1"; + sha256 = "9650d4126bfc2548e20e1ac3855b22568e19f7a40a6c0fa92ece3fcc63d03b0e"; libraryHaskellDepends = [ base mmorph transformers ]; homepage = "https://github.com/louispan/alternators#readme"; description = "Handy functions when using transformers"; @@ -25975,6 +26200,18 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "arrow-extras" = callPackage + ({ mkDerivation, base }: + mkDerivation { + pname = "arrow-extras"; + version = "0.1.0.1"; + sha256 = "c13c3aba839d1ec78a49991fa4038a68c5eb9ef6da61eceb6e68bc3ce0586a6c"; + libraryHaskellDepends = [ base ]; + homepage = "https://github.com/louispan/arrow-extras#readme"; + description = "Extra functions for Control.Arrow"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "arrow-improve" = callPackage ({ mkDerivation, arrows, base, pointed, profunctors, semigroupoids }: @@ -26300,24 +26537,6 @@ self: { }) {}; "asn1-encoding" = callPackage - ({ mkDerivation, asn1-types, base, bytestring, hourglass, mtl - , tasty, tasty-quickcheck, text - }: - mkDerivation { - pname = "asn1-encoding"; - version = "0.9.4"; - sha256 = "a78058f7db08fbd72f2b40c72af324a4d31ea95d70b4bfa372107b980394dde8"; - libraryHaskellDepends = [ asn1-types base bytestring hourglass ]; - testHaskellDepends = [ - asn1-types base bytestring hourglass mtl tasty tasty-quickcheck - text - ]; - homepage = "http://github.com/vincenthz/hs-asn1"; - description = "ASN1 data reader and writer in RAW, BER and DER forms"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "asn1-encoding_0_9_5" = callPackage ({ mkDerivation, asn1-types, base, bytestring, hourglass, mtl , tasty, tasty-quickcheck, text }: @@ -26333,7 +26552,6 @@ self: { homepage = "http://github.com/vincenthz/hs-asn1"; description = "ASN1 data reader and writer in RAW, BER and DER forms"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "asn1-parse" = callPackage @@ -26697,12 +26915,12 @@ self: { , configurator, containers, cryptohash, hostname, http-client , http-client-tls, http-media, http-types, jwt, mtl, network , network-api-support, network-uri, snap, snap-core, split, text - , time, time-units, transformers + , time, time-units, transformers, zlib }: mkDerivation { pname = "atlassian-connect-core"; - version = "0.7.0.1"; - sha256 = "febe860cd0151f4b26c9180c71ca7526b99c204e20dc5b03e8a63b827214ee9a"; + version = "0.7.0.2"; + sha256 = "6872f0ca4a70c50942b239828621fda3923a3763921130150be20c568c40ff50"; libraryHaskellDepends = [ aeson atlassian-connect-descriptor base base64-bytestring bytestring case-insensitive cipher-aes configurator containers @@ -26710,11 +26928,12 @@ self: { http-types jwt mtl network network-api-support network-uri snap snap-core split text time time-units transformers ]; + libraryPkgconfigDepends = [ zlib ]; homepage = "https://bitbucket.org/ajknoll/atlassian-connect-core"; description = "Atlassian Connect snaplet for the Snap Framework and helper code"; license = stdenv.lib.licenses.asl20; hydraPlatforms = stdenv.lib.platforms.none; - }) {}; + }) {inherit (pkgs) zlib;}; "atlassian-connect-descriptor" = callPackage ({ mkDerivation, aeson, base, bytestring, Cabal, cases, HUnit @@ -26723,8 +26942,8 @@ self: { }: mkDerivation { pname = "atlassian-connect-descriptor"; - version = "0.4.4.1"; - sha256 = "4a6c8efba3282d57abde8852e16aa8ea387858dcfbe1bbb28db2e18b47f80db8"; + version = "0.4.4.2"; + sha256 = "9352e134c720358694b7e839c5056ce62334303d0db9cb94e151c086da123598"; libraryHaskellDepends = [ aeson base cases network network-uri text time-units unordered-containers @@ -27252,13 +27471,13 @@ self: { }: mkDerivation { pname = "attoparsec-time"; - version = "0.1.1"; - sha256 = "9789759199654f3767823b62bb48182b5f83226ebde3ec74e31863309a77a362"; + version = "0.1.1.1"; + sha256 = "8d1ae65e5798e451ca692b0492dd58cde17b33c1a1239bb635215728de7419bb"; libraryHaskellDepends = [ attoparsec base-prelude text time ]; testHaskellDepends = [ base base-prelude directory doctest filepath ]; - homepage = "https://github.com/sannsyn/attoparsec-time"; + homepage = "https://github.com/nikita-volkov/attoparsec-time"; description = "Attoparsec parsers of time"; license = stdenv.lib.licenses.mit; }) {}; @@ -28398,16 +28617,16 @@ self: { "aws-simple" = callPackage ({ mkDerivation, amazonka, amazonka-core, amazonka-s3, amazonka-sqs - , base, blaze-builder, bytestring, conduit, lens, mtl, resourcet - , text, unordered-containers + , base, bytestring, conduit, lens, mtl, resourcet, text, timespan + , unordered-containers }: mkDerivation { pname = "aws-simple"; - version = "0.3.0.0"; - sha256 = "52fe1741cb4685b56bf9690273e2dc68626165aff4f59a13d82005c15962076d"; + version = "0.4.0.0"; + sha256 = "af86437bb0c29e177e85297fd9f431d8a91b9f75a7db853bf6cd52b26092bc60"; libraryHaskellDepends = [ - amazonka amazonka-core amazonka-s3 amazonka-sqs base blaze-builder - bytestring conduit lens mtl resourcet text unordered-containers + amazonka amazonka-core amazonka-s3 amazonka-sqs base bytestring + conduit lens mtl resourcet text timespan unordered-containers ]; homepage = "https://github.com/agrafix/aws-simple#readme"; description = "Dead simple bindings to commonly used AWS Services"; @@ -28671,6 +28890,30 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "backprop" = callPackage + ({ mkDerivation, ad, base, bifunctors, criterion, deepseq + , directory, generics-sop, hmatrix, microlens, microlens-mtl + , microlens-th, mnist-idx, mtl, mwc-random, profunctors, reflection + , tagged, time, transformers, transformers-base, type-combinators + , vector + }: + mkDerivation { + pname = "backprop"; + version = "0.0.3.0"; + sha256 = "ae199a345a134f2251deec151cd7d32cbe28f327a142fb3c5ed883e992d858e6"; + libraryHaskellDepends = [ + ad base generics-sop microlens microlens-mtl microlens-th mtl + profunctors reflection tagged transformers-base type-combinators + ]; + benchmarkHaskellDepends = [ + base bifunctors criterion deepseq directory generics-sop hmatrix + mnist-idx mwc-random time transformers type-combinators vector + ]; + homepage = "https://github.com/mstksg/backprop"; + description = "Heterogeneous, type-safe automatic backpropagation in Haskell"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "backtracking-exceptions" = callPackage ({ mkDerivation, base, either, free, kan-extensions, mtl , semigroupoids, semigroups, transformers @@ -29094,6 +29337,19 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "base-compat_0_9_2" = callPackage + ({ mkDerivation, base, hspec, QuickCheck, unix }: + mkDerivation { + pname = "base-compat"; + version = "0.9.2"; + sha256 = "b47c4cec234f9ec83c292e7e213ebcfb4e0418db142f151fd8c370ccd5e2b21b"; + libraryHaskellDepends = [ base unix ]; + testHaskellDepends = [ base hspec QuickCheck ]; + description = "A compatibility layer for base"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "base-generics" = callPackage ({ mkDerivation, base }: mkDerivation { @@ -29158,6 +29414,19 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "base-prelude_1_2_0_1" = callPackage + ({ mkDerivation, base }: + mkDerivation { + pname = "base-prelude"; + version = "1.2.0.1"; + sha256 = "811a494f5996ff1012be15a1236cc4afb6a67fc2a9f54fdb53f4e94a8fde119e"; + libraryHaskellDepends = [ base ]; + homepage = "https://github.com/nikita-volkov/base-prelude"; + description = "The most complete prelude formed solely from the \"base\" package"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "base-unicode-symbols" = callPackage ({ mkDerivation, base }: mkDerivation { @@ -29365,38 +29634,17 @@ self: { }) {}; "basic-lens" = callPackage - ({ mkDerivation, base }: + ({ mkDerivation, base, template-haskell }: mkDerivation { pname = "basic-lens"; - version = "0.0.0"; - sha256 = "d2ee8a48909db7f6bbf3deae03d9cfbbdfcce86932f0cae8fb59bf6d0c10ed61"; - revision = "1"; - editedCabalFile = "dcb1e49555431b94fedf161e3a2169213eea59167a34eb20b91be22baac9e170"; - libraryHaskellDepends = [ base ]; + version = "0.0.2"; + sha256 = "dae71ad00f4934019c724d057e63a924753e9c06baa3c3353ad0a5cf57ffd4e2"; + libraryHaskellDepends = [ base template-haskell ]; description = "Basic lens type and functions"; license = stdenv.lib.licenses.bsd3; }) {}; "basic-prelude" = callPackage - ({ mkDerivation, base, bytestring, containers, filepath, hashable - , lifted-base, ReadArgs, safe, text, transformers - , unordered-containers, vector - }: - mkDerivation { - pname = "basic-prelude"; - version = "0.6.1"; - sha256 = "6c2b905777d6e22157da48d7e3d5f3862e0698736afbf4f237fff9d14e803061"; - libraryHaskellDepends = [ - base bytestring containers filepath hashable lifted-base ReadArgs - safe text transformers unordered-containers vector - ]; - homepage = "https://github.com/snoyberg/basic-prelude"; - description = "An enhanced core prelude; a common foundation for alternate preludes"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - - "basic-prelude_0_6_1_1" = callPackage ({ mkDerivation, base, bytestring, containers, filepath, hashable , lifted-base, ReadArgs, safe, text, transformers , unordered-containers, vector @@ -29773,8 +30021,8 @@ self: { }: mkDerivation { pname = "bench"; - version = "1.0.2"; - sha256 = "9fac082305cc27d9ec7ee351ae1d301fc0a434c77cf1b121f51f2ca46d3a462e"; + version = "1.0.3"; + sha256 = "3107b94eee51a728da8d5e4f1a6b72e474840668029a6c6ddc287b73de4960c6"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -30417,6 +30665,31 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "binary_0_9_0_0" = callPackage + ({ mkDerivation, array, attoparsec, base, bytestring, Cabal, cereal + , containers, criterion, deepseq, directory, filepath, HUnit, mtl + , QuickCheck, random, tar, test-framework + , test-framework-quickcheck2, unordered-containers, zlib + }: + mkDerivation { + pname = "binary"; + version = "0.9.0.0"; + sha256 = "881dc60e21685846e1f2e8e02e60b30db96da3763492c7f1009aaf7ab9768dea"; + libraryHaskellDepends = [ array base bytestring containers ]; + testHaskellDepends = [ + array base bytestring Cabal containers directory filepath HUnit + QuickCheck random test-framework test-framework-quickcheck2 + ]; + benchmarkHaskellDepends = [ + array attoparsec base bytestring Cabal cereal containers criterion + deepseq directory filepath mtl tar unordered-containers zlib + ]; + homepage = "https://github.com/kolmodin/binary"; + description = "Binary serialisation for Haskell values using lazy ByteStrings"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "binary-bits" = callPackage ({ mkDerivation, base, binary, bytestring, QuickCheck, random , test-framework, test-framework-quickcheck2 @@ -31832,21 +32105,21 @@ self: { "biohazard" = callPackage ({ mkDerivation, aeson, async, attoparsec, base, base-prelude , binary, bytestring, bytestring-mmap, containers, directory - , exceptions, filepath, hashable, iteratee, ListLike, primitive - , random, scientific, stm, text, transformers, unix - , unordered-containers, vector, vector-algorithms, vector-th-unbox - , zlib + , exceptions, filepath, hashable, ListLike, monad-control + , primitive, random, scientific, stm, text, transformers + , transformers-base, unix, unordered-containers, vector + , vector-algorithms, vector-th-unbox, zlib }: mkDerivation { pname = "biohazard"; - version = "0.6.10"; - sha256 = "d966220ae495fb0b4ac792ac02aea3a8786f7a792ce7dcf0e88d4ee27378ebda"; + version = "0.6.13"; + sha256 = "a5e8015219273869d4d7b4971b12e707626dc599ca3b8455a2402538149d3a71"; libraryHaskellDepends = [ aeson async attoparsec base base-prelude binary bytestring bytestring-mmap containers directory exceptions filepath hashable - iteratee ListLike primitive random scientific stm text transformers - unix unordered-containers vector vector-algorithms vector-th-unbox - zlib + ListLike monad-control primitive random scientific stm text + transformers transformers-base unix unordered-containers vector + vector-algorithms vector-th-unbox zlib ]; homepage = "http://github.com/udo-stenzel/biohazard"; description = "bioinformatics support library"; @@ -32550,6 +32823,31 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "bitx-bitcoin_0_11_0_1" = callPackage + ({ mkDerivation, aeson, base, bytestring, deepseq, directory + , doctest, exceptions, hspec, http-client, http-client-tls + , http-types, microlens, microlens-th, network, QuickCheck, safe + , scientific, split, text, time + }: + mkDerivation { + pname = "bitx-bitcoin"; + version = "0.11.0.1"; + sha256 = "926a57fb85bd42185c2e8abb00e6ff309062abb6b24fce2eef61507896fb219c"; + libraryHaskellDepends = [ + aeson base bytestring deepseq exceptions http-client + http-client-tls http-types microlens microlens-th network + QuickCheck scientific split text time + ]; + testHaskellDepends = [ + aeson base bytestring directory doctest hspec http-client + http-types microlens safe text time + ]; + homepage = "https://github.com/tebello-thejane/bitx.hs"; + description = "A Haskell library for working with the BitX bitcoin exchange"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "bizzlelude" = callPackage ({ mkDerivation, base, containers, directory, text }: mkDerivation { @@ -33097,6 +33395,19 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "blaze-svg_0_3_6_1" = callPackage + ({ mkDerivation, base, blaze-markup, mtl }: + mkDerivation { + pname = "blaze-svg"; + version = "0.3.6.1"; + sha256 = "f6a4f1bba1e973b336e94de73369f4562778fde43b6ac7c0b32d6a501527aa60"; + libraryHaskellDepends = [ base blaze-markup mtl ]; + homepage = "https://github.com/deepakjois/blaze-svg"; + description = "SVG combinator library"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "blaze-textual" = callPackage ({ mkDerivation, base, blaze-builder, bytestring, double-conversion , ghc-prim, integer-gmp, old-locale, QuickCheck, test-framework @@ -33828,12 +34139,16 @@ self: { }) {}; "bookkeeping-jp" = callPackage - ({ mkDerivation, base, bookkeeping, doctest, Glob }: + ({ mkDerivation, base, bookkeeping, doctest, Glob, mono-traversable + , text, time + }: mkDerivation { pname = "bookkeeping-jp"; - version = "0.1.0.1"; - sha256 = "10cb27933f689d38c0bc6e24ae6b1a06cdd9f69aef83dc6aa779c9872410cde5"; - libraryHaskellDepends = [ base bookkeeping ]; + version = "0.1.1.0"; + sha256 = "b5afda1702307402f950346400d293609e3d066afc728fca260edc400046b0c2"; + libraryHaskellDepends = [ + base bookkeeping mono-traversable text time + ]; testHaskellDepends = [ base doctest Glob ]; homepage = "https://github.com/arowM/haskell-bookkeeping-jp#readme"; description = "Helper functions for Japanese bookkeeping"; @@ -34407,6 +34722,28 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "brick_0_17_2" = callPackage + ({ mkDerivation, base, containers, contravariant, deepseq, dlist + , microlens, microlens-mtl, microlens-th, stm, template-haskell + , text, text-zipper, transformers, vector, vty + }: + mkDerivation { + pname = "brick"; + version = "0.17.2"; + sha256 = "ad154e23b4c38d045c3621de45b876e41eebdde7cae510b733930f0f59ae1c2a"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + base containers contravariant deepseq dlist microlens microlens-mtl + microlens-th stm template-haskell text text-zipper transformers + vector vty + ]; + homepage = "https://github.com/jtdaugherty/brick/"; + description = "A declarative terminal user interface library"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "brillig" = callPackage ({ mkDerivation, base, binary, cmdargs, containers, directory , filepath, ListZipper, text @@ -35690,6 +36027,31 @@ self: { license = stdenv.lib.licenses.gpl2; }) {}; + "c2hs_0_28_2" = callPackage + ({ mkDerivation, array, base, bytestring, containers, directory + , dlist, filepath, HUnit, language-c, pretty, process, shelly + , test-framework, test-framework-hunit, text, transformers + }: + mkDerivation { + pname = "c2hs"; + version = "0.28.2"; + sha256 = "f4171478cafe9f4906735763c2e0bc1ca0a9f56b50e9d59aac07520434920f9e"; + isLibrary = false; + isExecutable = true; + executableHaskellDepends = [ + array base bytestring containers directory dlist filepath + language-c pretty process + ]; + testHaskellDepends = [ + base filepath HUnit shelly test-framework test-framework-hunit text + transformers + ]; + homepage = "https://github.com/haskell/c2hs"; + description = "C->Haskell FFI tool that gives some cross-language type safety"; + license = stdenv.lib.licenses.gpl2; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "c2hs-extra" = callPackage ({ mkDerivation, base, c2hs }: mkDerivation { @@ -35787,8 +36149,8 @@ self: { }: mkDerivation { pname = "cabal-bounds"; - version = "1.0.5"; - sha256 = "10a81b97a6d993c37778b5840be9a7a67ab47feb59cec3550e345ab5239c8e62"; + version = "1.1.0"; + sha256 = "74114ed6e439566fcb0dd466efe011c6f16defb1dba6c2345bd4184c1698e58a"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -36331,6 +36693,25 @@ self: { license = stdenv.lib.licenses.gpl3; }) {}; + "cabal-rpm_0_11_1" = callPackage + ({ mkDerivation, base, Cabal, directory, filepath, old-locale + , process, time, unix + }: + mkDerivation { + pname = "cabal-rpm"; + version = "0.11.1"; + sha256 = "db4e85d9490fe054af792d454004e8537de52c9bd506efe077a6b328440c12df"; + isLibrary = false; + isExecutable = true; + executableHaskellDepends = [ + base Cabal directory filepath old-locale process time unix + ]; + homepage = "https://github.com/juhp/cabal-rpm"; + description = "RPM packaging tool for Haskell Cabal-based packages"; + license = stdenv.lib.licenses.gpl3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "cabal-scripts" = callPackage ({ mkDerivation, base }: mkDerivation { @@ -36817,8 +37198,8 @@ self: { }: mkDerivation { pname = "cacophony"; - version = "0.9.1"; - sha256 = "cb60834c8b0571f2b2b54b6f9847960c71ffe5350c60791c439de6ba54c67c02"; + version = "0.9.2"; + sha256 = "fb66334322e6b6c1d0896f1a780724fa4624c90f8e8d5a3c7ca21ace7a040316"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -37276,8 +37657,8 @@ self: { }: mkDerivation { pname = "canteven-http"; - version = "0.1.3.0"; - sha256 = "d427d5bc77861c2a648a604443f2a5ca882b911487ac313dbb5db6b0271870d4"; + version = "0.1.4.0"; + sha256 = "46e1b58deb3c18ea9b85377466f4fbe0ad7998e0130fab1208eb8fed2343ba7f"; libraryHaskellDepends = [ base bytestring canteven-log directory exceptions filepath http-types mime-types monad-logger template-haskell text time @@ -37488,6 +37869,21 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "carbonara" = callPackage + ({ mkDerivation, base, mysql-simple, postgresql-simple, split, time + }: + mkDerivation { + pname = "carbonara"; + version = "0.0.1"; + sha256 = "76974d0c8d12e744db649a8c55e6b310ea96550d60677b79f9249c71d033bf27"; + libraryHaskellDepends = [ + base mysql-simple postgresql-simple split time + ]; + homepage = "https://github.com/szehk/Haskell-Carbonara-Library"; + description = "some spaghetti code"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "carboncopy" = callPackage ({ mkDerivation, base, bytestring, filepath, haskell98, IfElse , MissingH @@ -39358,20 +39754,6 @@ self: { }) {}; "check-email" = callPackage - ({ mkDerivation, base, bytestring, email-validate, resolv }: - mkDerivation { - pname = "check-email"; - version = "1.0"; - sha256 = "dfbba577c18ca1180d8d4b38cd0a54a6f0ca5a886e502cb83c8ab07675463cb7"; - revision = "1"; - editedCabalFile = "39f8616eeee765838400cd6754f864e9e65e8a89123327161227b6a424c20d75"; - libraryHaskellDepends = [ base bytestring email-validate ]; - librarySystemDepends = [ resolv ]; - description = "Confirm whether an email is valid and probably existant"; - license = stdenv.lib.licenses.bsd3; - }) {resolv = null;}; - - "check-email_1_0_2" = callPackage ({ mkDerivation, base, bytestring, email-validate, resolv }: mkDerivation { pname = "check-email"; @@ -39382,7 +39764,6 @@ self: { homepage = "https://github.com/qoelet/check-email#readme"; description = "Confirm whether an email is valid and probably existant"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {resolv = null;}; "check-pvp" = callPackage @@ -40233,8 +40614,8 @@ self: { }: mkDerivation { pname = "clafer"; - version = "0.4.4"; - sha256 = "285e0dc889526f37f7bcc6418699b5465c269a9e6cb17a9219405089c644f21f"; + version = "0.4.5"; + sha256 = "0b19b7dd173851200a2a55ccb491e58c6239f838d2da476fb2ba22486d3d99d2"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -40267,8 +40648,8 @@ self: { }: mkDerivation { pname = "claferIG"; - version = "0.4.4"; - sha256 = "7eecfddae7d82ba90fba1e68ab19513f5eb056ed3741f6b577b5b41d8728eeb4"; + version = "0.4.5"; + sha256 = "52369e39c556ecc20b6f426ac53ec9f346986008c612f3c08450adef125d61cb"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -40298,8 +40679,8 @@ self: { }: mkDerivation { pname = "claferwiki"; - version = "0.4.4"; - sha256 = "993d093d554939dd4570ce7d54df818b5c249f7434c90d68d89f5e537dbff028"; + version = "0.4.5"; + sha256 = "e012350a1575d7a5f2eab664ccbe79d3ca7f166004d3295142c3a9df7bbb5766"; libraryHaskellDepends = [ base clafer containers directory gitit MissingH mtl network network-uri process SHA split time transformers transformers-compat @@ -40591,38 +40972,6 @@ self: { }) {}; "classy-prelude" = callPackage - ({ mkDerivation, async, base, basic-prelude, bifunctors, bytestring - , chunked-data, containers, deepseq, dlist, exceptions, ghc-prim - , hashable, hspec, lifted-async, lifted-base, monad-unlift - , mono-traversable, mono-traversable-instances, mtl - , mutable-containers, primitive, QuickCheck, safe-exceptions, say - , semigroups, stm, stm-chans, text, time, time-locale-compat - , transformers, transformers-base, unordered-containers, vector - , vector-instances - }: - mkDerivation { - pname = "classy-prelude"; - version = "1.2.0"; - sha256 = "74ca864563ae2b6e048f86ec3be256192e81d12fbef0723d2aa2ee3d1d71fd70"; - libraryHaskellDepends = [ - async base basic-prelude bifunctors bytestring chunked-data - containers deepseq dlist exceptions ghc-prim hashable lifted-async - lifted-base monad-unlift mono-traversable - mono-traversable-instances mtl mutable-containers primitive - safe-exceptions say semigroups stm stm-chans text time - time-locale-compat transformers transformers-base - unordered-containers vector vector-instances - ]; - testHaskellDepends = [ - base containers hspec QuickCheck transformers unordered-containers - ]; - homepage = "https://github.com/snoyberg/mono-traversable"; - description = "A typeclass-based Prelude"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - - "classy-prelude_1_2_0_1" = callPackage ({ mkDerivation, async, base, basic-prelude, bifunctors, bytestring , chunked-data, containers, deepseq, dlist, exceptions, ghc-prim , hashable, hspec, lifted-async, lifted-base, monad-unlift @@ -41216,6 +41565,8 @@ self: { pname = "clist"; version = "0.1.0.0"; sha256 = "eddf07964751b51550c5197f39cc772418b0fa7d2ad6cf762af589ce9bd973cb"; + revision = "1"; + editedCabalFile = "5508b5f87701885103461d4e1b28594051e698fd6f09254cddd4b37676809d02"; libraryHaskellDepends = [ base base-unicode-symbols peano ]; homepage = "https://github.com/strake/clist.hs"; description = "Counted list"; @@ -41231,8 +41582,8 @@ self: { }: mkDerivation { pname = "clit"; - version = "0.3.1.0"; - sha256 = "1e8f6dfb1c868b979722ec855b8b75165a61bf41a210a2c29a408573c9bc8085"; + version = "0.4.0.3"; + sha256 = "de42b5f458969a651aa4b40bb47f169eefbf2195f21f31586a39e249ecbc7d6c"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -41680,8 +42031,8 @@ self: { }: mkDerivation { pname = "cmdargs"; - version = "0.10.14"; - sha256 = "38b60053c11394a1876d2744950eece66ca9e4364298c1383f247894044bce58"; + version = "0.10.15"; + sha256 = "c80306ee127532fe4f852b690da470e7f5d8e58dce7122368c7e1b5b4629a55f"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -41865,6 +42216,20 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "code-page_0_1_3" = callPackage + ({ mkDerivation, base }: + mkDerivation { + pname = "code-page"; + version = "0.1.3"; + sha256 = "e65c86600e06d85f2e2c2a9df4b3d68e2dbd3adb2df9e922a4cd744966762191"; + libraryHaskellDepends = [ base ]; + testHaskellDepends = [ base ]; + homepage = "https://github.com/RyanGlScott/code-page"; + description = "Windows code page library for Haskell"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "codec" = callPackage ({ mkDerivation, aeson, base, binary, binary-bits, bytestring , data-default-class, mtl, template-haskell, text, transformers @@ -42883,6 +43248,17 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "compactable" = callPackage + ({ mkDerivation, base, containers, transformers, vector }: + mkDerivation { + pname = "compactable"; + version = "0.1.0.1"; + sha256 = "67c806a237be7fba93da9d91b5d20c8586f647f97cb4408be8bd44173b8609c0"; + libraryHaskellDepends = [ base containers transformers vector ]; + description = "A generalization for containers that can be stripped of Nothings"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "compactmap" = callPackage ({ mkDerivation, base, containers, hspec, QuickCheck, vector }: mkDerivation { @@ -43130,6 +43506,60 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "composite-aeson" = callPackage + ({ mkDerivation, aeson, aeson-better-errors, base, basic-prelude + , composite-base, containers, contravariant, generic-deriving, lens + , profunctors, scientific, text, unordered-containers, vinyl + }: + mkDerivation { + pname = "composite-aeson"; + version = "0.1.0.0"; + sha256 = "dbefe06c854762ec1f9fe0920cd9e2373caf20c49c1cbe9c0641d8c2ce36f288"; + libraryHaskellDepends = [ + aeson aeson-better-errors base basic-prelude composite-base + containers contravariant generic-deriving lens profunctors + scientific text unordered-containers vinyl + ]; + homepage = "https://github.com/ConferHealth/composite#readme"; + description = "JSON for Vinyl/Frames records"; + license = stdenv.lib.licenses.bsd3; + }) {}; + + "composite-base" = callPackage + ({ mkDerivation, base, basic-prelude, Frames, lens + , template-haskell, text, vinyl + }: + mkDerivation { + pname = "composite-base"; + version = "0.1.0.0"; + sha256 = "18686bd5a539a5ca82be8ebc6ffb374578d9ff5334cf4959e00c1998e1cd18ea"; + libraryHaskellDepends = [ + base basic-prelude Frames lens template-haskell text vinyl + ]; + homepage = "https://github.com/ConferHealth/composite#readme"; + description = "Shared utilities for composite-* packages"; + license = stdenv.lib.licenses.bsd3; + }) {}; + + "composite-opaleye" = callPackage + ({ mkDerivation, base, basic-prelude, bytestring, composite-base + , Frames, lens, opaleye, postgresql-simple, product-profunctors + , profunctors, template-haskell, text, vinyl + }: + mkDerivation { + pname = "composite-opaleye"; + version = "0.1.0.0"; + sha256 = "1a2687c59106ebbd3d4ec0b8d9bd31f63b19d1a328a458bb05e9083c7a32008c"; + libraryHaskellDepends = [ + base basic-prelude bytestring composite-base Frames lens opaleye + postgresql-simple product-profunctors profunctors template-haskell + text vinyl + ]; + homepage = "https://github.com/ConferHealth/composite#readme"; + description = "Opaleye SQL for Frames records"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "composition" = callPackage ({ mkDerivation }: mkDerivation { @@ -43565,8 +43995,8 @@ self: { }: mkDerivation { pname = "concurrent-machines"; - version = "0.2.3.3"; - sha256 = "e5204231e35181e56b9313f6dbe83d531b3f6c3f6dfbe3a1c465e5b6b2a24924"; + version = "0.3.0"; + sha256 = "c5ef38498f89f794cf9065841bf0e865b871a14874cde2f51aad3194e61a0ad2"; libraryHaskellDepends = [ async base containers lifted-async machines monad-control semigroups time transformers transformers-base @@ -43896,8 +44326,8 @@ self: { }: mkDerivation { pname = "conduit-combinators"; - version = "1.1.0"; - sha256 = "ff1f16f24e2c186ce5d61f079b318e2f58c4bc3a4a2c8d9011d001512786335a"; + version = "1.1.1"; + sha256 = "a022e80d54d6cae017ae69e04b44fd6f57f8bac6b889e574dc09d30170ac0918"; libraryHaskellDepends = [ base base16-bytestring base64-bytestring bytestring chunked-data conduit conduit-extra filepath monad-control mono-traversable @@ -44594,8 +45024,8 @@ self: { }: mkDerivation { pname = "constrained-monads"; - version = "0.1.0.0"; - sha256 = "1822fb5f5bec60b9c7efc11b776718bcdc66399a8c34687fe6173975ec010184"; + version = "0.4.0.0"; + sha256 = "335432d74b02ada378b2815a57ba9b840fe24474e2d5c25fa2aac32c3a431cc1"; libraryHaskellDepends = [ base containers transformers ]; testHaskellDepends = [ base containers doctest QuickCheck transformers @@ -44630,6 +45060,17 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "constraint-manip" = callPackage + ({ mkDerivation, base, indextype }: + mkDerivation { + pname = "constraint-manip"; + version = "0.1.0.0"; + sha256 = "48baa31f15760a8688a00f5eacca8acbccd8c6b16895e17d08d2b26851a556c9"; + libraryHaskellDepends = [ base indextype ]; + description = "Some conviencience type functions for manipulating constraints"; + license = stdenv.lib.licenses.mit; + }) {}; + "constraints" = callPackage ({ mkDerivation, base, binary, deepseq, ghc-prim, hashable, mtl , transformers, transformers-compat @@ -44647,6 +45088,24 @@ self: { license = stdenv.lib.licenses.bsd2; }) {}; + "constraints_0_9_1" = callPackage + ({ mkDerivation, base, binary, deepseq, ghc-prim, hashable, mtl + , transformers, transformers-compat + }: + mkDerivation { + pname = "constraints"; + version = "0.9.1"; + sha256 = "276e012838861145fca65d065dd9839f7cbd71236032b557194389180a30a785"; + libraryHaskellDepends = [ + base binary deepseq ghc-prim hashable mtl transformers + transformers-compat + ]; + homepage = "http://github.com/ekmett/constraints/"; + description = "Constraint manipulation"; + license = stdenv.lib.licenses.bsd2; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "constructible" = callPackage ({ mkDerivation, arithmoi, base, binary-search, complex-generic }: mkDerivation { @@ -46010,26 +46469,6 @@ self: { }) {}; "cpphs" = callPackage - ({ mkDerivation, base, directory, old-locale, old-time, polyparse - }: - mkDerivation { - pname = "cpphs"; - version = "1.20.3"; - sha256 = "c63f0edb351f0977c2af6ad17c7164c44dc7c7499c0effe91d839fc7973dad91"; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ - base directory old-locale old-time polyparse - ]; - executableHaskellDepends = [ - base directory old-locale old-time polyparse - ]; - homepage = "http://projects.haskell.org/cpphs/"; - description = "A liberalised re-implementation of cpp, the C pre-processor"; - license = "LGPL"; - }) {}; - - "cpphs_1_20_4" = callPackage ({ mkDerivation, base, directory, filepath, old-locale, old-time , polyparse }: @@ -46048,7 +46487,6 @@ self: { homepage = "http://projects.haskell.org/cpphs/"; description = "A liberalised re-implementation of cpp, the C pre-processor"; license = "LGPL"; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "cprng-aes" = callPackage @@ -48482,8 +48920,8 @@ self: { }: mkDerivation { pname = "d-bus"; - version = "0.1.5"; - sha256 = "79a28c075e0eac6f3bb50fedd88d8454ed5f8b6737cd484e2f26fd13361b7d06"; + version = "0.1.6"; + sha256 = "16223d22697eda3d52a0e6643c2ad6d98b3d957680990403bed64878a8bc3b63"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -51084,6 +51522,8 @@ self: { pname = "dbus"; version = "0.10.12"; sha256 = "f6d7b5640eb03e9598e38b1a2b2e7af1e9d357f3f845fc9528f9750965b92d54"; + revision = "1"; + editedCabalFile = "056e9977d3cf251022d8f4013531c0dd6b62afa68719b5567756386e1503271e"; libraryHaskellDepends = [ base bytestring cereal containers libxml-sax network parsec random text transformers unix vector xml-types @@ -52509,8 +52949,8 @@ self: { }: mkDerivation { pname = "derive"; - version = "2.6.1"; - sha256 = "8544ac13c09059acd2914da86506206879e3feb375361fc5e312548c4d9b6d72"; + version = "2.6.2"; + sha256 = "2f98205548dec0b9cafb9ff39a80628798e72f693acdb9b522d23442ed791132"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -53589,15 +54029,16 @@ self: { "dictionaries" = callPackage ({ mkDerivation, attoparsec, base, binary, bytestring, containers - , data-default, directory, exceptions, filepath, text, time, zlib + , data-default, directory, exceptions, filepath, text, time + , transformers, zlib }: mkDerivation { pname = "dictionaries"; - version = "0.1.0.0"; - sha256 = "28b3ba1e9ad52ccf4f333861e22830da77ad915622fa1ffca87cff6e9716c0ab"; + version = "0.1.0.1"; + sha256 = "89712a700212f922671f3784f785ccf1e53865570fab48471b02ef409e73be35"; libraryHaskellDepends = [ attoparsec base binary bytestring containers data-default directory - exceptions filepath text time zlib + exceptions filepath text time transformers zlib ]; description = "Tools to handle StarDict dictionaries"; license = stdenv.lib.licenses.bsd3; @@ -54333,12 +54774,12 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "directory_1_3_1_0" = callPackage + "directory_1_3_1_1" = callPackage ({ mkDerivation, base, filepath, time, unix }: mkDerivation { pname = "directory"; - version = "1.3.1.0"; - sha256 = "94b0d06aba8311e3b9dc8e460d4ad5b25fdfcc361eecb8e7ad68a18f171aa7f2"; + version = "1.3.1.1"; + sha256 = "5354dd7644237d312f2a223446e0adc11a7ec36c72e1925cae11159869de8b42"; libraryHaskellDepends = [ base filepath time unix ]; testHaskellDepends = [ base filepath time unix ]; description = "Platform-agnostic library for filesystem operations"; @@ -54578,6 +55019,19 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "disjoint-set-stateful" = callPackage + ({ mkDerivation, base, hspec, primitive, ref-tf, vector }: + mkDerivation { + pname = "disjoint-set-stateful"; + version = "0.1.0.0"; + sha256 = "addb5ab47b17356cd79fd4232db23c2ef09292cfd4c1ef04f2595416df0132f1"; + libraryHaskellDepends = [ base primitive ref-tf vector ]; + testHaskellDepends = [ base hspec primitive ref-tf vector ]; + homepage = "https://github.com/clintonmead/disjoint-set-stateful"; + description = "Monadic disjoint set"; + license = stdenv.lib.licenses.mit; + }) {}; + "disjoint-sets-st" = callPackage ({ mkDerivation, array, base }: mkDerivation { @@ -54620,14 +55074,27 @@ self: { ({ mkDerivation, base, dlist }: mkDerivation { pname = "disposable"; - version = "0.1.1.0"; - sha256 = "719e8e28cfe3345c441478f9d88949767122d2708241a0e232e9fe672c662b12"; + version = "0.2.0.0"; + sha256 = "d931d76f4a6ce0596f82cc7ae608cd43ea28bae5e6b0864e632b70ac2fc1e684"; libraryHaskellDepends = [ base dlist ]; homepage = "https://github.com/louispan/disposable#readme"; description = "Allows storing different resource-releasing actions together"; license = stdenv.lib.licenses.bsd3; }) {}; + "disposable_0_2_0_1" = callPackage + ({ mkDerivation, base, dlist, ghcjs-base-stub }: + mkDerivation { + pname = "disposable"; + version = "0.2.0.1"; + sha256 = "0b033cad06890ad3aed574f7980efef238795fdf6b51707e53908397e3c9bbd3"; + libraryHaskellDepends = [ base dlist ghcjs-base-stub ]; + homepage = "https://github.com/louispan/disposable#readme"; + description = "Allows storing different resource-releasing actions together"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "dist-upload" = callPackage ({ mkDerivation, base, Cabal, directory, filepath, process }: mkDerivation { @@ -54767,31 +55234,29 @@ self: { }) {}; "distributed-process-client-server" = callPackage - ({ mkDerivation, ansi-terminal, base, binary, containers - , data-accessor, deepseq, distributed-process - , distributed-process-async, distributed-process-extras - , distributed-process-tests, fingertree, ghc-prim, hashable, HUnit - , mtl, network, network-transport, network-transport-tcp, rematch - , stm, test-framework, test-framework-hunit, time, transformers + ({ mkDerivation, ansi-terminal, base, binary, containers, deepseq + , distributed-process, distributed-process-async + , distributed-process-extras, distributed-process-systest + , exceptions, fingertree, ghc-prim, hashable, HUnit, mtl, network + , network-transport, network-transport-tcp, rematch, stm + , test-framework, test-framework-hunit, time, transformers , unordered-containers }: mkDerivation { pname = "distributed-process-client-server"; - version = "0.1.3.2"; - sha256 = "2c905624d5486b7bc8bd1a4763b139e7eb364b20467c9abddd553f9afbd3601f"; - revision = "2"; - editedCabalFile = "aedbbade08de4e7483cc9bc84e41ca9e6227a279480e025a27c78f31f1775413"; + version = "0.2.0"; + sha256 = "de26c3cfcf8c290c0ffd8f8fa330cdd85c421e237dc0ce0530ede71a58b09b15"; libraryHaskellDepends = [ - base binary containers data-accessor deepseq distributed-process - distributed-process-async distributed-process-extras fingertree - hashable mtl stm time transformers unordered-containers + base binary containers deepseq distributed-process + distributed-process-async distributed-process-extras exceptions + fingertree hashable mtl stm time transformers unordered-containers ]; testHaskellDepends = [ ansi-terminal base binary containers deepseq distributed-process distributed-process-async distributed-process-extras - distributed-process-tests fingertree ghc-prim HUnit mtl network - network-transport network-transport-tcp rematch stm test-framework - test-framework-hunit transformers + distributed-process-systest exceptions fingertree ghc-prim HUnit + mtl network network-transport network-transport-tcp rematch stm + test-framework test-framework-hunit transformers ]; homepage = "http://github.com/haskell-distributed/distributed-process-client-server"; description = "The Cloud Haskell Application Platform"; @@ -56630,12 +57095,12 @@ self: { }) {}; "drmaa" = callPackage - ({ mkDerivation, base, drmaa, inline-c, shelly, text }: + ({ mkDerivation, base, directory, drmaa, inline-c }: mkDerivation { pname = "drmaa"; - version = "0.1.1"; - sha256 = "66b095d3b94ed531e2a704fba319002e8d3b7b6f9b3f68102a4b4d0f7a048567"; - libraryHaskellDepends = [ base inline-c shelly text ]; + version = "0.2.0"; + sha256 = "e65d76b31c8041e553081f5fe500b5f3fffe7919731126a1956cc88639fdbe42"; + libraryHaskellDepends = [ base directory inline-c ]; librarySystemDepends = [ drmaa ]; description = "A minimal Haskell bindings to DRMAA C library"; license = stdenv.lib.licenses.bsd3; @@ -57259,8 +57724,8 @@ self: { ({ mkDerivation, base, primitive, vector }: mkDerivation { pname = "dynamic-mvector"; - version = "0.1.0.4"; - sha256 = "a36fc29ba4b91d52beb1f2df6ba8a837c6f112ef31358b20f5d0056f20d788a6"; + version = "0.1.0.5"; + sha256 = "22b69e25f7bdeb51dc9071e352eeed58c292ebe3c9f88e2749ce0b6a5f4d5e43"; libraryHaskellDepends = [ base primitive vector ]; homepage = "https://github.com/AndrasKovacs/dynamic-mvector"; description = "A wrapper around MVector that enables pushing, popping and extending"; @@ -57718,6 +58183,8 @@ self: { pname = "echo"; version = "0.1.3"; sha256 = "704f07310f8272d170f8ab7fb2a2c13f15d8501ef8310801e36964c8eff485ef"; + revision = "1"; + editedCabalFile = "5490be9cfbea95e14a7a68b7d055ae8d295822e0b146d2ac8285b3e5a3e3282f"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base process ]; @@ -59045,6 +59512,28 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "elsa" = callPackage + ({ mkDerivation, array, base, dequeue, directory, filepath + , hashable, json, megaparsec, mtl, tasty, tasty-hunit + , unordered-containers + }: + mkDerivation { + pname = "elsa"; + version = "0.2.0.0"; + sha256 = "79d83d3ab692b21920189ea780ab4418e06330959165b29f4d9940e1e03e64af"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + array base dequeue directory filepath hashable json megaparsec mtl + unordered-containers + ]; + executableHaskellDepends = [ base mtl ]; + testHaskellDepends = [ base directory filepath tasty tasty-hunit ]; + homepage = "http://github.com/ucsd-progsys/elsa"; + description = "A tiny language for understanding the lambda-calculus"; + license = stdenv.lib.licenses.mit; + }) {}; + "emacs-keys" = callPackage ({ mkDerivation, base, doctest, split, tasty, tasty-hspec , tasty-quickcheck, template-haskell, th-lift, xkbcommon @@ -59348,6 +59837,23 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "encode-string" = callPackage + ({ mkDerivation, base, bytestring, QuickCheck, quickcheck-instances + , text + }: + mkDerivation { + pname = "encode-string"; + version = "0.1.0.0"; + sha256 = "fb13bf53058bff828555f76421d0c0e195ea8ac0d92c6e73ce43055d680cb990"; + libraryHaskellDepends = [ base bytestring text ]; + testHaskellDepends = [ + base bytestring QuickCheck quickcheck-instances text + ]; + homepage = "https://github.com/minad/encode-string#readme"; + description = "Safe string conversion and encoding"; + license = stdenv.lib.licenses.mit; + }) {}; + "encoding" = callPackage ({ mkDerivation, array, base, binary, bytestring, containers , extensible-exceptions, ghc-prim, HaXml, mtl, regex-compat @@ -60240,6 +60746,23 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "errors_2_2_0" = callPackage + ({ mkDerivation, base, exceptions, safe, text, transformers + , transformers-compat, unexceptionalio + }: + mkDerivation { + pname = "errors"; + version = "2.2.0"; + sha256 = "fda1c9e91950d7dc4d8483e2dc65085f12de5c2819b815799b6e75846fc9617c"; + libraryHaskellDepends = [ + base exceptions safe text transformers transformers-compat + unexceptionalio + ]; + description = "Simplified error-handling"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "ersaconcat" = callPackage ({ mkDerivation, base, directory, doctest, filepath, HTTP , network-uri, process, QuickCheck, tagsoup, template-haskell @@ -60507,6 +61030,8 @@ self: { pname = "ether"; version = "0.4.0.2"; sha256 = "8b9dce4d444613dc46df988fa3a437297503e63ff29fd28113b35b98a8dcd953"; + revision = "1"; + editedCabalFile = "a876e46771d9778373b6a63d43ecb4bb88e303c420341547bfd3f9b9054d1373"; libraryHaskellDepends = [ base exceptions mmorph monad-control mtl template-haskell transformers transformers-base transformers-lift @@ -60691,15 +61216,14 @@ self: { "eve" = callPackage ({ mkDerivation, base, containers, data-default, free, hspec - , hspec-core, lens, mtl, pipes, pipes-concurrency, pipes-parse + , hspec-core, lens, mtl }: mkDerivation { pname = "eve"; - version = "0.1.0"; - sha256 = "18cc10498a3c663fed847eaa5caf910f613cca4c817e05a3e884b077b2122ed9"; + version = "0.1.7"; + sha256 = "b1d4ad466224f3cad47bce852e5c1605e3353b57adb1a4dc57591ee89e99b237"; libraryHaskellDepends = [ - base containers data-default free lens mtl pipes pipes-concurrency - pipes-parse + base containers data-default free lens mtl ]; testHaskellDepends = [ base data-default hspec hspec-core lens mtl @@ -61297,25 +61821,25 @@ self: { }) {inherit (pkgs) exif;}; "exinst" = callPackage - ({ mkDerivation, aeson, base, bytes, constraints, deepseq - , generic-random, hashable, profunctors, QuickCheck, singletons - , tasty, tasty-hunit, tasty-quickcheck + ({ mkDerivation, aeson, base, binary, bytes, bytestring, cereal + , constraints, deepseq, hashable, profunctors, QuickCheck + , singletons, tasty, tasty-hunit, tasty-quickcheck }: mkDerivation { pname = "exinst"; - version = "0.3"; - sha256 = "3edfe07ca71b4c296349661f8f2d496100d3b44ae72af8ce1ab7f76f1adddb11"; + version = "0.3.0.1"; + sha256 = "7a7351355ac5bf1f0bf1fb1028993399f7f644b661579a62bbc88853a55c796b"; libraryHaskellDepends = [ - aeson base bytes constraints deepseq hashable profunctors - QuickCheck singletons + aeson base binary bytes cereal constraints deepseq hashable + profunctors QuickCheck singletons ]; testHaskellDepends = [ - aeson base bytes constraints deepseq generic-random hashable - profunctors QuickCheck singletons tasty tasty-hunit + aeson base binary bytes bytestring cereal constraints deepseq + hashable profunctors QuickCheck singletons tasty tasty-hunit tasty-quickcheck ]; homepage = "https://github.com/k0001/exinst"; - description = "Derive instances for your existential types"; + description = "Recover instances for your existential types"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; }) {}; @@ -61758,7 +62282,7 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "extensible_0_4" = callPackage + "extensible_0_4_1" = callPackage ({ mkDerivation, base, comonad, constraints, criterion, deepseq , effin, extensible-effects, freer, ghc-prim, lens, monad-skeleton , mtl, primitive, profunctors, semigroups, tagged, template-haskell @@ -61766,8 +62290,8 @@ self: { }: mkDerivation { pname = "extensible"; - version = "0.4"; - sha256 = "f9fbd703c2ac7b2790446cb04281d3577848797d53413374e5c1987afcec3a1c"; + version = "0.4.1"; + sha256 = "4982d227fa1dc75ec7ade1ecb81d2611f35cace2bc79a9b68cbdf4305453648a"; libraryHaskellDepends = [ base comonad constraints deepseq ghc-prim monad-skeleton mtl primitive profunctors semigroups tagged template-haskell @@ -63314,22 +63838,6 @@ self: { }) {inherit (pkgs) fftw;}; "fgl" = callPackage - ({ mkDerivation, array, base, containers, deepseq, hspec - , QuickCheck, transformers - }: - mkDerivation { - pname = "fgl"; - version = "5.5.3.0"; - sha256 = "d70cd8e2694311fae0b44fe0d1b342c95706ceffd3be66767e9027dfa5597e39"; - libraryHaskellDepends = [ - array base containers deepseq transformers - ]; - testHaskellDepends = [ base containers hspec QuickCheck ]; - description = "Martin Erwig's Functional Graph Library"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "fgl_5_5_3_1" = callPackage ({ mkDerivation, array, base, containers, deepseq, hspec , microbench, QuickCheck, transformers }: @@ -63344,22 +63852,9 @@ self: { benchmarkHaskellDepends = [ base deepseq microbench ]; description = "Martin Erwig's Functional Graph Library"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "fgl-arbitrary" = callPackage - ({ mkDerivation, base, containers, fgl, hspec, QuickCheck }: - mkDerivation { - pname = "fgl-arbitrary"; - version = "0.2.0.2"; - sha256 = "501d77f1f5efd952aaf06d35fc95bfd3a9bc93906f78a363766ec74d14d50b8b"; - libraryHaskellDepends = [ base fgl QuickCheck ]; - testHaskellDepends = [ base containers fgl hspec QuickCheck ]; - description = "QuickCheck support for fgl"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "fgl-arbitrary_0_2_0_3" = callPackage ({ mkDerivation, base, containers, fgl, hspec, QuickCheck }: mkDerivation { pname = "fgl-arbitrary"; @@ -63369,7 +63864,6 @@ self: { testHaskellDepends = [ base containers fgl hspec QuickCheck ]; description = "QuickCheck support for fgl"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "fgl-extras-decompositions" = callPackage @@ -65008,8 +65502,8 @@ self: { }: mkDerivation { pname = "fltkhs"; - version = "0.5.1.3"; - sha256 = "391f97abb8acac97b82d3b8a3ee3d62e2f76b566c01be2dff8835932fd85ae29"; + version = "0.5.1.4"; + sha256 = "a512cfb0cdad3873c4457eec90c25e7e8a8042e6b98fedb50d883235a55711e3"; isLibrary = true; isExecutable = true; setupHaskellDepends = [ base Cabal directory filepath ]; @@ -66006,10 +66500,10 @@ self: { }: mkDerivation { pname = "foundation"; - version = "0.0.3"; - sha256 = "72d7f2af963d42cb7e1164b854978ad3f351175449ba2d27c6b639ffca0b75fa"; - revision = "1"; - editedCabalFile = "d3e2dc092452ec38bd2b555ecb5c5aceecb21880810c115973bf5cf2b4e0da5b"; + version = "0.0.4"; + sha256 = "a86d2383d2be673593c4862ce082bb2662ce1e2f32d5187f351d47105b95921b"; + revision = "3"; + editedCabalFile = "bd8219e3179c900cc49b70d006c8844fcda618f33867d2e8b5679fed9afd360b"; libraryHaskellDepends = [ base ghc-prim ]; testHaskellDepends = [ base mtl QuickCheck tasty tasty-hunit tasty-quickcheck @@ -68314,8 +68808,8 @@ self: { }: mkDerivation { pname = "general-games"; - version = "1.0.2"; - sha256 = "1415c6cb8a2d37322e7568ae53ffca5d658aed6e47bbbefa5c59ed88c09b384e"; + version = "1.0.3"; + sha256 = "3be96a6b56f39e6d122b57759802cd8de36210f72192a1dfee24247bdfe0c7ef"; libraryHaskellDepends = [ base monad-loops MonadRandom random random-shuffle ]; @@ -68402,6 +68896,17 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "generic-arbitrary" = callPackage + ({ mkDerivation, base, QuickCheck }: + mkDerivation { + pname = "generic-arbitrary"; + version = "0.1.0"; + sha256 = "69f30a54e7a3d0a45288778e22e6d0d03cfc3b525dfe0a663cd4f559a619bcc6"; + libraryHaskellDepends = [ base QuickCheck ]; + description = "Generic implementation for QuickCheck's Arbitrary"; + license = stdenv.lib.licenses.mit; + }) {}; + "generic-binary" = callPackage ({ mkDerivation, base, binary, bytestring, ghc-prim }: mkDerivation { @@ -68475,6 +68980,18 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "generic-enum" = callPackage + ({ mkDerivation, array, base, bytestring, hspec }: + mkDerivation { + pname = "generic-enum"; + version = "0.1.1.0"; + sha256 = "bea3687bf956cbcc4dbe24ad52a9f916f76a564f8cc046341568b176708a94d4"; + libraryHaskellDepends = [ array base bytestring ]; + testHaskellDepends = [ array base bytestring hspec ]; + description = "An Enum class that fixes some deficiences with Prelude's Enum"; + license = stdenv.lib.licenses.mit; + }) {}; + "generic-lucid-scaffold" = callPackage ({ mkDerivation, base, lucid, text }: mkDerivation { @@ -68530,24 +69047,6 @@ self: { }) {}; "generic-random" = callPackage - ({ mkDerivation, ad, base, containers, hashable, hmatrix, ieee754 - , MonadRandom, mtl, QuickCheck, transformers, unordered-containers - , vector - }: - mkDerivation { - pname = "generic-random"; - version = "0.4.0.0"; - sha256 = "68c5036f55584c5164c79a6adf6d9dc4435844fc98d206be80a1683cc4929f22"; - libraryHaskellDepends = [ - ad base containers hashable hmatrix ieee754 MonadRandom mtl - QuickCheck transformers unordered-containers vector - ]; - homepage = "http://github.com/lysxia/generic-random"; - description = "Generic random generators"; - license = stdenv.lib.licenses.mit; - }) {}; - - "generic-random_0_4_1_0" = callPackage ({ mkDerivation, base, boltzmann-samplers, QuickCheck }: mkDerivation { pname = "generic-random"; @@ -68557,7 +69056,6 @@ self: { homepage = "http://github.com/lysxia/generic-random"; description = "Generic random generators"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "generic-records" = callPackage @@ -68878,8 +69376,10 @@ self: { ({ mkDerivation, base, hspec, QuickCheck, validity }: mkDerivation { pname = "genvalidity"; - version = "0.3.1.0"; - sha256 = "fd79841970e8d29a204e8cdf540478760f2a488bde21583668a3e7d8526f588a"; + version = "0.3.2.0"; + sha256 = "1a92621a1d9f09e134891fe408cd6c17af866a80648ec53f014eed9604b9905b"; + revision = "1"; + editedCabalFile = "08fd437bc922f93c1122c58d0dca3e93befe76c800e117b729da975836ba8f26"; libraryHaskellDepends = [ base QuickCheck validity ]; testHaskellDepends = [ base hspec QuickCheck ]; homepage = "https://github.com/NorfairKing/validity#readme"; @@ -68887,14 +69387,33 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "genvalidity-bytestring" = callPackage + ({ mkDerivation, base, bytestring, genvalidity, genvalidity-hspec + , hspec, QuickCheck, validity, validity-bytestring + }: + mkDerivation { + pname = "genvalidity-bytestring"; + version = "0.0.0.1"; + sha256 = "314e531c902db8e36df9f23c8e8a9b355cabf8377ddb1b24410e25f96f806d67"; + libraryHaskellDepends = [ + base bytestring genvalidity QuickCheck validity validity-bytestring + ]; + testHaskellDepends = [ + base bytestring genvalidity genvalidity-hspec hspec QuickCheck + ]; + homepage = "https://github.com/NorfairKing/validity#readme"; + description = "GenValidity support for ByteString"; + license = stdenv.lib.licenses.mit; + }) {}; + "genvalidity-containers" = callPackage ({ mkDerivation, base, containers, genvalidity, genvalidity-hspec , hspec, QuickCheck, validity, validity-containers }: mkDerivation { pname = "genvalidity-containers"; - version = "0.2.0.0"; - sha256 = "79cccb5ac44193287e65aaf751617e213e71b012cc96e31e42428cdfd9c63ce1"; + version = "0.2.0.1"; + sha256 = "97fa168074201195a57ad36f4ae678435f2595e071f9ec259bca72eacf0eaf29"; libraryHaskellDepends = [ base containers genvalidity QuickCheck validity validity-containers ]; @@ -68908,15 +69427,15 @@ self: { }) {}; "genvalidity-hspec" = callPackage - ({ mkDerivation, base, doctest, genvalidity, hspec, hspec-core - , QuickCheck, validity + ({ mkDerivation, base, doctest, genvalidity, genvalidity-property + , hspec, hspec-core, QuickCheck, validity }: mkDerivation { pname = "genvalidity-hspec"; - version = "0.3.1.0"; - sha256 = "abead88444f51c39f59cf2b959ad0d9532f4b58b87cb9f53b6e6c0bc6f62ef5d"; + version = "0.4.0.0"; + sha256 = "4e3f5370e5945cb63a4063b9fc810384df7ce9bf9b0aa6f6f1549739897067ad"; libraryHaskellDepends = [ - base genvalidity hspec QuickCheck validity + base genvalidity genvalidity-property hspec QuickCheck validity ]; testHaskellDepends = [ base doctest genvalidity hspec hspec-core QuickCheck @@ -68934,8 +69453,8 @@ self: { }: mkDerivation { pname = "genvalidity-hspec-aeson"; - version = "0.0.1.0"; - sha256 = "58da64350fb137c8fae3a62450fe541adf66ddc4f2d42791350cb6085ac1b2b0"; + version = "0.0.1.1"; + sha256 = "78c874a190dd0a92005a1c2d8ca2b05ae6682d3486dc1d5a9feeb0daab393d37"; libraryHaskellDepends = [ aeson base bytestring deepseq genvalidity genvalidity-hspec hspec QuickCheck @@ -68955,8 +69474,8 @@ self: { }: mkDerivation { pname = "genvalidity-hspec-cereal"; - version = "0.0.0.0"; - sha256 = "1cbb1d37aed02b8aa75092b0ff7065bdd0238a02fd735a2b1e548be9e11e48de"; + version = "0.0.0.1"; + sha256 = "72da16d069acb00176f0e17844b1991c86769feb4157ba0afa204f4dfb21fd78"; libraryHaskellDepends = [ base cereal deepseq genvalidity genvalidity-hspec hspec QuickCheck ]; @@ -68973,8 +69492,8 @@ self: { }: mkDerivation { pname = "genvalidity-path"; - version = "0.1.0.0"; - sha256 = "0b955a1e244c9fa2915212447b75ec862c3677a43e8b2654e368568ef6244b38"; + version = "0.1.0.2"; + sha256 = "3dbdb8e37bfedce8f0a09a5bd3ef9d2968ee79cc1dbadb92deec231887aeebbe"; libraryHaskellDepends = [ base genvalidity path validity-path ]; testHaskellDepends = [ base genvalidity-hspec hspec path ]; homepage = "https://github.com/NorfairKing/validity#readme"; @@ -68983,14 +69502,31 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "genvalidity-property" = callPackage + ({ mkDerivation, base, directory, doctest, filepath, genvalidity + , hspec, QuickCheck, validity + }: + mkDerivation { + pname = "genvalidity-property"; + version = "0.0.0.0"; + sha256 = "5d202e8245c3658630273469730f2601414b466165da92392e6dc0c85c728f10"; + libraryHaskellDepends = [ + base genvalidity hspec QuickCheck validity + ]; + testHaskellDepends = [ base directory doctest filepath ]; + homepage = "https://github.com/NorfairKing/validity#readme"; + description = "Standard properties for functions on `Validity` types"; + license = stdenv.lib.licenses.mit; + }) {}; + "genvalidity-text" = callPackage ({ mkDerivation, array, base, genvalidity, genvalidity-hspec, hspec , QuickCheck, text, validity, validity-text }: mkDerivation { pname = "genvalidity-text"; - version = "0.3.1.0"; - sha256 = "84ca3ffc6717a1cf9c535a53e4f8451ae4878370870555bced73ea33fd724a02"; + version = "0.3.1.1"; + sha256 = "07a1a3faede82fb451a111ae7f6b2c44b67c8665369b440fa3ece9b630b4ae7a"; libraryHaskellDepends = [ array base genvalidity QuickCheck text validity validity-text ]; @@ -69009,8 +69545,8 @@ self: { }: mkDerivation { pname = "genvalidity-time"; - version = "0.0.0.0"; - sha256 = "6f0a0872e4163afbe03ebdca19cc3411ba60cfc8ff44db03cd06c66c4b974e3e"; + version = "0.0.0.1"; + sha256 = "b2afbab45a899b0827e30ea6c147f62cb2ad1b6199dd1b517016679d65b5a082"; libraryHaskellDepends = [ base genvalidity time validity-time ]; testHaskellDepends = [ base genvalidity-hspec hspec time ]; homepage = "https://github.com/NorfairKing/validity#readme"; @@ -70108,6 +70644,20 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "ghc-usage" = callPackage + ({ mkDerivation, base, containers, ghc, ghc-paths, unix }: + mkDerivation { + pname = "ghc-usage"; + version = "0.1.0.1"; + sha256 = "dddd7072f2955da4ce29fbb7d8904523fa4d3b563837432889e7e2920f09acf4"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ base containers ghc ]; + executableHaskellDepends = [ base ghc-paths unix ]; + description = "Print minimal export lists"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "ghc-vis" = callPackage ({ mkDerivation, base, cairo, containers, deepseq, fgl , ghc-heap-view, graphviz, gtk3, mtl, svgcairo, text, transformers @@ -70277,6 +70827,24 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "ghcjs-base-stub" = callPackage + ({ mkDerivation, aeson, attoparsec, base, deepseq, ghc-prim + , primitive, scientific, text, transformers, unordered-containers + , vector + }: + mkDerivation { + pname = "ghcjs-base-stub"; + version = "0.1.0.2"; + sha256 = "629089740c7fd2349b39a3899bad3692667dfd2ff6443b3e815d2bf3cad60ff5"; + libraryHaskellDepends = [ + aeson attoparsec base deepseq ghc-prim primitive scientific text + transformers unordered-containers vector + ]; + homepage = "https://github.com/louispan/javascript-stub#readme"; + description = "Allow GHCJS projects to compile under GHC and develop using intero"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "ghcjs-codemirror" = callPackage ({ mkDerivation, base }: mkDerivation { @@ -70556,8 +71124,7 @@ self: { "gi-cairo" = callPackage ({ mkDerivation, base, bytestring, Cabal, cairo, containers - , gobjectIntrospection, haskell-gi, haskell-gi-base, text - , transformers + , haskell-gi, haskell-gi-base, text, transformers }: mkDerivation { pname = "gi-cairo"; @@ -70568,9 +71135,8 @@ self: { base bytestring containers haskell-gi haskell-gi-base text transformers ]; - libraryPkgconfigDepends = [ cairo gobjectIntrospection ]; + libraryPkgconfigDepends = [ cairo ]; doHaddock = false; - preConfigure = ''export HASKELL_GI_GIR_SEARCH_PATH=${gobjectIntrospection.dev}/share/gir-1.0''; preCompileBuildDriver = '' PKG_CONFIG_PATH+=":${cairo}/lib/pkgconfig" setupCompileFlags+=" $(pkg-config --libs cairo-gobject)" @@ -70578,7 +71144,7 @@ self: { homepage = "https://github.com/haskell-gi/haskell-gi"; description = "Cairo bindings"; license = stdenv.lib.licenses.lgpl21; - }) {inherit (pkgs) cairo; inherit (pkgs) gobjectIntrospection;}; + }) {inherit (pkgs) cairo;}; "gi-gdk" = callPackage ({ mkDerivation, base, bytestring, Cabal, containers, gi-cairo @@ -70596,7 +71162,6 @@ self: { ]; libraryPkgconfigDepends = [ gtk3 ]; doHaddock = false; - preConfigure = ''export HASKELL_GI_GIR_SEARCH_PATH=${gtk3.dev}/share/gir-1.0''; homepage = "https://github.com/haskell-gi/haskell-gi"; description = "Gdk bindings"; license = stdenv.lib.licenses.lgpl21; @@ -70605,8 +71170,8 @@ self: { "gi-gdkpixbuf" = callPackage ({ mkDerivation, base, bytestring, Cabal, containers, gdk_pixbuf - , gi-gio, gi-glib, gi-gobject, gobjectIntrospection, haskell-gi - , haskell-gi-base, text, transformers + , gi-gio, gi-glib, gi-gobject, haskell-gi, haskell-gi-base, text + , transformers }: mkDerivation { pname = "gi-gdkpixbuf"; @@ -70617,22 +71182,16 @@ self: { base bytestring containers gi-gio gi-glib gi-gobject haskell-gi haskell-gi-base text transformers ]; - libraryPkgconfigDepends = [ gdk_pixbuf gobjectIntrospection ]; + libraryPkgconfigDepends = [ gdk_pixbuf ]; doHaddock = false; - preConfigure = '' - export HASKELL_GI_GIR_SEARCH_PATH=${gobjectIntrospection.dev}/share/gir-1.0:${gdk_pixbuf.dev}/share/gir-1.0 - export GI_TYPELIB_PATH=${gdk_pixbuf.out}/lib/girepository-1.0 - ''; homepage = "https://github.com/haskell-gi/haskell-gi"; description = "GdkPixbuf bindings"; license = stdenv.lib.licenses.lgpl21; - }) {inherit (pkgs) gdk_pixbuf; - inherit (pkgs) gobjectIntrospection;}; + }) {inherit (pkgs) gdk_pixbuf;}; "gi-gio" = callPackage ({ mkDerivation, base, bytestring, Cabal, containers, gi-glib - , gi-gobject, glib, gobjectIntrospection, haskell-gi - , haskell-gi-base, text, transformers + , gi-gobject, glib, haskell-gi, haskell-gi-base, text, transformers }: mkDerivation { pname = "gi-gio"; @@ -70643,13 +71202,12 @@ self: { base bytestring containers gi-glib gi-gobject haskell-gi haskell-gi-base text transformers ]; - libraryPkgconfigDepends = [ glib gobjectIntrospection ]; + libraryPkgconfigDepends = [ glib ]; doHaddock = false; - preConfigure = ''export HASKELL_GI_GIR_SEARCH_PATH=${gobjectIntrospection.dev}/share/gir-1.0''; homepage = "https://github.com/haskell-gi/haskell-gi"; description = "Gio bindings"; license = stdenv.lib.licenses.lgpl21; - }) {inherit (pkgs) glib; inherit (pkgs) gobjectIntrospection;}; + }) {inherit (pkgs) glib;}; "gi-girepository" = callPackage ({ mkDerivation, base, bytestring, Cabal, containers, gi-gobject @@ -70675,8 +71233,7 @@ self: { "gi-glib" = callPackage ({ mkDerivation, base, bytestring, Cabal, containers, glib - , gobjectIntrospection, haskell-gi, haskell-gi-base, text - , transformers + , haskell-gi, haskell-gi-base, text, transformers }: mkDerivation { pname = "gi-glib"; @@ -70687,18 +71244,16 @@ self: { base bytestring containers haskell-gi haskell-gi-base text transformers ]; - libraryPkgconfigDepends = [ glib gobjectIntrospection ]; + libraryPkgconfigDepends = [ glib ]; doHaddock = false; - preConfigure = ''export HASKELL_GI_GIR_SEARCH_PATH=${gobjectIntrospection.dev}/share/gir-1.0''; homepage = "https://github.com/haskell-gi/haskell-gi"; description = "GLib bindings"; license = stdenv.lib.licenses.lgpl21; - }) {inherit (pkgs) glib; inherit (pkgs) gobjectIntrospection;}; + }) {inherit (pkgs) glib;}; "gi-gobject" = callPackage ({ mkDerivation, base, bytestring, Cabal, containers, gi-glib, glib - , gobjectIntrospection, haskell-gi, haskell-gi-base, text - , transformers + , haskell-gi, haskell-gi-base, text, transformers }: mkDerivation { pname = "gi-gobject"; @@ -70709,13 +71264,12 @@ self: { base bytestring containers gi-glib haskell-gi haskell-gi-base text transformers ]; - libraryPkgconfigDepends = [ glib gobjectIntrospection ]; + libraryPkgconfigDepends = [ glib ]; doHaddock = false; - preConfigure = ''export HASKELL_GI_GIR_SEARCH_PATH=${gobjectIntrospection.dev}/share/gir-1.0''; homepage = "https://github.com/haskell-gi/haskell-gi"; description = "GObject bindings"; license = stdenv.lib.licenses.lgpl21; - }) {inherit (pkgs) glib; inherit (pkgs) gobjectIntrospection;}; + }) {inherit (pkgs) glib;}; "gi-gst" = callPackage ({ mkDerivation, base, bytestring, Cabal, containers, gi-glib @@ -70741,8 +71295,8 @@ self: { "gi-gstaudio" = callPackage ({ mkDerivation, base, bytestring, Cabal, containers, gi-glib - , gi-gobject, gi-gst, gi-gstbase, gobjectIntrospection - , gst_plugins_base, haskell-gi, haskell-gi-base, text, transformers + , gi-gobject, gi-gst, gi-gstbase, gst-plugins-base, haskell-gi + , haskell-gi-base, text, transformers }: mkDerivation { pname = "gi-gstaudio"; @@ -70753,19 +71307,18 @@ self: { base bytestring containers gi-glib gi-gobject gi-gst gi-gstbase haskell-gi haskell-gi-base text transformers ]; - librarySystemDepends = [ gobjectIntrospection ]; - libraryPkgconfigDepends = [ gst_plugins_base ]; + libraryPkgconfigDepends = [ gst-plugins-base ]; doHaddock = false; homepage = "https://github.com/haskell-gi/haskell-gi"; description = "GStreamerAudio bindings"; license = stdenv.lib.licenses.lgpl21; hydraPlatforms = stdenv.lib.platforms.none; - }) {inherit (pkgs) gobjectIntrospection; gst_plugins_base = null;}; + }) {inherit (pkgs.gst_all_1) gst-plugins-base;}; "gi-gstbase" = callPackage ({ mkDerivation, base, bytestring, Cabal, containers, gi-glib - , gi-gobject, gi-gst, gobjectIntrospection, gst_plugins_base - , haskell-gi, haskell-gi-base, text, transformers + , gi-gobject, gi-gst, gst-plugins-base, haskell-gi, haskell-gi-base + , text, transformers }: mkDerivation { pname = "gi-gstbase"; @@ -70776,19 +71329,18 @@ self: { base bytestring containers gi-glib gi-gobject gi-gst haskell-gi haskell-gi-base text transformers ]; - librarySystemDepends = [ gobjectIntrospection ]; - libraryPkgconfigDepends = [ gst_plugins_base ]; + libraryPkgconfigDepends = [ gst-plugins-base ]; doHaddock = false; homepage = "https://github.com/haskell-gi/haskell-gi"; description = "GStreamerBase bindings"; license = stdenv.lib.licenses.lgpl21; hydraPlatforms = stdenv.lib.platforms.none; - }) {inherit (pkgs) gobjectIntrospection; gst_plugins_base = null;}; + }) {inherit (pkgs.gst_all_1) gst-plugins-base;}; "gi-gstvideo" = callPackage ({ mkDerivation, base, bytestring, Cabal, containers, gi-glib - , gi-gobject, gi-gst, gi-gstbase, gobjectIntrospection - , gst_plugins_base, haskell-gi, haskell-gi-base, text, transformers + , gi-gobject, gi-gst, gi-gstbase, gst-plugins-base, haskell-gi + , haskell-gi-base, text, transformers }: mkDerivation { pname = "gi-gstvideo"; @@ -70799,14 +71351,13 @@ self: { base bytestring containers gi-glib gi-gobject gi-gst gi-gstbase haskell-gi haskell-gi-base text transformers ]; - librarySystemDepends = [ gobjectIntrospection ]; - libraryPkgconfigDepends = [ gst_plugins_base ]; + libraryPkgconfigDepends = [ gst-plugins-base ]; doHaddock = false; homepage = "https://github.com/haskell-gi/haskell-gi"; description = "GStreamerVideo bindings"; license = stdenv.lib.licenses.lgpl21; hydraPlatforms = stdenv.lib.platforms.none; - }) {inherit (pkgs) gobjectIntrospection; gst_plugins_base = null;}; + }) {inherit (pkgs.gst_all_1) gst-plugins-base;}; "gi-gtk" = callPackage ({ mkDerivation, base, bytestring, Cabal, containers, gi-atk @@ -70825,7 +71376,6 @@ self: { ]; libraryPkgconfigDepends = [ gtk3 ]; doHaddock = false; - preConfigure = ''export HASKELL_GI_GIR_SEARCH_PATH=${gtk3.dev}/share/gir-1.0''; homepage = "https://github.com/haskell-gi/haskell-gi"; description = "Gtk bindings"; license = stdenv.lib.licenses.lgpl21; @@ -70899,7 +71449,7 @@ self: { "gi-javascriptcore" = callPackage ({ mkDerivation, base, bytestring, Cabal, containers, haskell-gi - , haskell-gi-base, javascriptcoregtk, text, transformers, webkitgtk + , haskell-gi-base, text, transformers, webkitgtk24x }: mkDerivation { pname = "gi-javascriptcore"; @@ -70910,18 +71460,17 @@ self: { base bytestring containers haskell-gi haskell-gi-base text transformers ]; - libraryPkgconfigDepends = [ javascriptcoregtk webkitgtk ]; + libraryPkgconfigDepends = [ webkitgtk24x ]; doHaddock = false; - preConfigure = ''export HASKELL_GI_GIR_SEARCH_PATH=${webkitgtk}/share/gir-1.0''; homepage = "https://github.com/haskell-gi/haskell-gi"; description = "JavaScriptCore bindings"; license = stdenv.lib.licenses.lgpl21; hydraPlatforms = stdenv.lib.platforms.none; - }) {javascriptcoregtk = null; inherit (pkgs) webkitgtk;}; + }) {inherit (pkgs) webkitgtk24x;}; "gi-javascriptcore_4_0_11" = callPackage ({ mkDerivation, base, bytestring, Cabal, containers, haskell-gi - , haskell-gi-base, javascriptcoregtk, text, transformers, webkitgtk + , haskell-gi-base, text, transformers, webkitgtk }: mkDerivation { pname = "gi-javascriptcore"; @@ -70932,14 +71481,13 @@ self: { base bytestring containers haskell-gi haskell-gi-base text transformers ]; - libraryPkgconfigDepends = [ javascriptcoregtk webkitgtk ]; + libraryPkgconfigDepends = [ webkitgtk ]; doHaddock = false; - preConfigure = ''export HASKELL_GI_GIR_SEARCH_PATH=${webkitgtk}/share/gir-1.0''; homepage = "https://github.com/haskell-gi/haskell-gi"; description = "JavaScriptCore bindings"; license = stdenv.lib.licenses.lgpl21; hydraPlatforms = stdenv.lib.platforms.none; - }) {javascriptcoregtk = null; inherit (pkgs) webkitgtk;}; + }) {inherit (pkgs.gnome3) webkitgtk;}; "gi-notify" = callPackage ({ mkDerivation, base, bytestring, Cabal, containers, gi-gdkpixbuf @@ -70965,8 +71513,8 @@ self: { "gi-pango" = callPackage ({ mkDerivation, base, bytestring, Cabal, cairo, containers - , gi-glib, gi-gobject, gobjectIntrospection, haskell-gi - , haskell-gi-base, pango, text, transformers + , gi-glib, gi-gobject, haskell-gi, haskell-gi-base, pango, text + , transformers }: mkDerivation { pname = "gi-pango"; @@ -70977,9 +71525,8 @@ self: { base bytestring containers gi-glib gi-gobject haskell-gi haskell-gi-base text transformers ]; - libraryPkgconfigDepends = [ cairo gobjectIntrospection pango ]; + libraryPkgconfigDepends = [ cairo pango ]; doHaddock = false; - preConfigure = ''export HASKELL_GI_GIR_SEARCH_PATH=${gobjectIntrospection.dev}/share/gir-1.0''; preCompileBuildDriver = '' PKG_CONFIG_PATH+=":${cairo}/lib/pkgconfig" setupCompileFlags+=" $(pkg-config --libs cairo-gobject)" @@ -70988,14 +71535,12 @@ self: { description = "Pango bindings"; license = stdenv.lib.licenses.lgpl21; hydraPlatforms = stdenv.lib.platforms.none; - }) {inherit (pkgs) cairo; inherit (pkgs) gobjectIntrospection; - inherit (pkgs.gnome2) pango;}; + }) {inherit (pkgs) cairo; inherit (pkgs.gnome2) pango;}; "gi-pangocairo" = callPackage - ({ mkDerivation, base, bytestring, Cabal, containers, gi-cairo - , gi-glib, gi-gobject, gi-pango, gobjectIntrospection, haskell-gi - , haskell-gi-base, pango, system-cairo, system-pango, text - , transformers + ({ mkDerivation, base, bytestring, Cabal, cairo, containers + , gi-cairo, gi-glib, gi-gobject, gi-pango, haskell-gi + , haskell-gi-base, pango, text, transformers }: mkDerivation { pname = "gi-pangocairo"; @@ -71006,22 +71551,17 @@ self: { base bytestring containers gi-cairo gi-glib gi-gobject gi-pango haskell-gi haskell-gi-base text transformers ]; - libraryPkgconfigDepends = [ - gobjectIntrospection pango system-cairo system-pango - ]; + libraryPkgconfigDepends = [ cairo pango ]; doHaddock = false; - preConfigure = ''export HASKELL_GI_GIR_SEARCH_PATH=${system-pango.dev}/share/gir-1.0''; preCompileBuildDriver = '' - PKG_CONFIG_PATH+=":${system-pango.dev}/lib/pkgconfig:${system-cairo.dev}/lib/pkgconfig" - setupCompileFlags+=" $(pkg-config --libs pangocairo cairo-gobject)" + PKG_CONFIG_PATH+=":${cairo}/lib/pkgconfig" + setupCompileFlags+=" $(pkg-config --libs cairo-gobject)" ''; homepage = "https://github.com/haskell-gi/haskell-gi"; description = "PangoCairo bindings"; license = stdenv.lib.licenses.lgpl21; hydraPlatforms = stdenv.lib.platforms.none; - }) {inherit (pkgs) gobjectIntrospection; - inherit (pkgs.gnome2) pango; system-cairo = pkgs.cairo; - system-pango = pkgs.pango;}; + }) {inherit (pkgs) cairo; inherit (pkgs.gnome2) pango;}; "gi-poppler" = callPackage ({ mkDerivation, base, bytestring, Cabal, containers, gi-cairo @@ -71045,6 +71585,27 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {inherit (pkgs) poppler;}; + "gi-secret" = callPackage + ({ mkDerivation, base, bytestring, Cabal, containers, gi-gio + , gi-glib, gi-gobject, haskell-gi, haskell-gi-base, libsecret, text + , transformers + }: + mkDerivation { + pname = "gi-secret"; + version = "0.0.1"; + sha256 = "877f0d508b6bcdd46b2e2ab285de6cd96e687f3085c9b2bb7b23600834b29f9a"; + setupHaskellDepends = [ base Cabal haskell-gi ]; + libraryHaskellDepends = [ + base bytestring containers gi-gio gi-glib gi-gobject haskell-gi + haskell-gi-base text transformers + ]; + libraryPkgconfigDepends = [ libsecret ]; + doHaddock = false; + homepage = "https://github.com/haskell-gi/haskell-gi"; + description = "Libsecret bindings"; + license = stdenv.lib.licenses.lgpl21; + }) {inherit (pkgs) libsecret;}; + "gi-soup" = callPackage ({ mkDerivation, base, bytestring, Cabal, containers, gi-gio , gi-glib, gi-gobject, haskell-gi, haskell-gi-base, libsoup, text @@ -71092,7 +71653,7 @@ self: { ({ mkDerivation, base, bytestring, Cabal, containers, gi-atk , gi-cairo, gi-gdk, gi-gdkpixbuf, gi-gio, gi-glib, gi-gobject , gi-gtk, gi-javascriptcore, gi-soup, haskell-gi, haskell-gi-base - , text, transformers, webkit + , text, transformers, webkitgtk24x }: mkDerivation { pname = "gi-webkit"; @@ -71104,19 +71665,19 @@ self: { gi-gio gi-glib gi-gobject gi-gtk gi-javascriptcore gi-soup haskell-gi haskell-gi-base text transformers ]; - libraryPkgconfigDepends = [ webkit ]; + libraryPkgconfigDepends = [ webkitgtk24x ]; doHaddock = false; homepage = "https://github.com/haskell-gi/haskell-gi"; description = "WebKit bindings"; license = stdenv.lib.licenses.lgpl21; hydraPlatforms = stdenv.lib.platforms.none; - }) {webkit = null;}; + }) {inherit (pkgs) webkitgtk24x;}; "gi-webkit2" = callPackage ({ mkDerivation, base, bytestring, Cabal, containers, gi-atk , gi-cairo, gi-gdk, gi-gio, gi-glib, gi-gobject, gi-gtk , gi-javascriptcore, gi-soup, haskell-gi, haskell-gi-base, text - , transformers, webkit2gtk, webkitgtk + , transformers, webkitgtk }: mkDerivation { pname = "gi-webkit2"; @@ -71128,19 +71689,18 @@ self: { gi-gobject gi-gtk gi-javascriptcore gi-soup haskell-gi haskell-gi-base text transformers ]; - libraryPkgconfigDepends = [ webkit2gtk webkitgtk ]; + libraryPkgconfigDepends = [ webkitgtk ]; doHaddock = false; - preConfigure = ''export HASKELL_GI_GIR_SEARCH_PATH=${webkitgtk}/share/gir-1.0''; homepage = "https://github.com/haskell-gi/haskell-gi"; description = "WebKit2 bindings"; license = stdenv.lib.licenses.lgpl21; hydraPlatforms = stdenv.lib.platforms.none; - }) {webkit2gtk = null; inherit (pkgs) webkitgtk;}; + }) {inherit (pkgs.gnome3) webkitgtk;}; "gi-webkit2webextension" = callPackage ({ mkDerivation, base, bytestring, Cabal, containers, gi-gobject , gi-gtk, gi-javascriptcore, gi-soup, haskell-gi, haskell-gi-base - , text, transformers, webkit2gtk-web-extension, webkitgtk + , text, transformers, webkitgtk-web-extension }: mkDerivation { pname = "gi-webkit2webextension"; @@ -71151,14 +71711,13 @@ self: { base bytestring containers gi-gobject gi-gtk gi-javascriptcore gi-soup haskell-gi haskell-gi-base text transformers ]; - libraryPkgconfigDepends = [ webkit2gtk-web-extension webkitgtk ]; + libraryPkgconfigDepends = [ webkitgtk-web-extension ]; doHaddock = false; - preConfigure = ''export HASKELL_GI_GIR_SEARCH_PATH=${webkitgtk}/share/gir-1.0''; homepage = "https://github.com/haskell-gi/haskell-gi"; description = "WebKit2-WebExtension bindings"; license = stdenv.lib.licenses.lgpl21; hydraPlatforms = stdenv.lib.platforms.none; - }) {webkit2gtk-web-extension = null; inherit (pkgs) webkitgtk;}; + }) {webkitgtk-web-extension = null;}; "giak" = callPackage ({ mkDerivation, async, base, bytestring, Cabal, containers @@ -72256,6 +72815,23 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "gitrev_1_3_1" = callPackage + ({ mkDerivation, base, base-compat, directory, filepath, process + , template-haskell + }: + mkDerivation { + pname = "gitrev"; + version = "1.3.1"; + sha256 = "a89964db24f56727b0e7b10c98fe7c116d721d8c46f52d6e77088669aaa38332"; + libraryHaskellDepends = [ + base base-compat directory filepath process template-haskell + ]; + homepage = "https://github.com/acfoltzer/gitrev"; + description = "Compile git revision info into Haskell projects"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "gitson" = callPackage ({ mkDerivation, aeson, aeson-pretty, base, base-compat, bytestring , conduit-combinators, conduit-extra, criterion, directory, doctest @@ -72487,6 +73063,19 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "glaze_0_3_0_1" = callPackage + ({ mkDerivation, base, lens }: + mkDerivation { + pname = "glaze"; + version = "0.3.0.1"; + sha256 = "bbb184408bcf24e8c4f89a960cf7a69ab0c51e98bf84c5fa9901aae1702e22a1"; + libraryHaskellDepends = [ base lens ]; + homepage = "https://github.com/louispan/glaze#readme"; + description = "Framework for rendering things with metadata/headers and values"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "glazier" = callPackage ({ mkDerivation, base, lens, mmorph, mtl, profunctors , semigroupoids, transformers @@ -72537,6 +73126,63 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "glazier-pipes_0_1_5_1" = callPackage + ({ mkDerivation, base, glazier, mmorph, pipes, stm, stm-extras + , transformers + }: + mkDerivation { + pname = "glazier-pipes"; + version = "0.1.5.1"; + sha256 = "9d1d044a4d8641a0da09d6447298530a8a785bb3e29c0177a0b682f9bbf4d1ac"; + libraryHaskellDepends = [ + base glazier mmorph pipes stm stm-extras transformers + ]; + homepage = "https://github.com/louispan/glazier-pipes#readme"; + description = "A threaded rendering framework using glaizer and pipes"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + + "glazier-react" = callPackage + ({ mkDerivation, base, containers, deepseq, disposable, dlist, free + , ghcjs-base-stub, glazier, javascript-extras, lens, mmorph, mtl + , pipes-concurrency, profunctors, semigroupoids, stm, text + , transformers, unordered-containers + }: + mkDerivation { + pname = "glazier-react"; + version = "0.2.0.0"; + sha256 = "ab19e2b5fc513c2be8d6ea5ec361eefc6be338ec76dd081566be344b41261467"; + libraryHaskellDepends = [ + base containers deepseq disposable dlist free ghcjs-base-stub + glazier javascript-extras lens mmorph mtl pipes-concurrency + profunctors semigroupoids stm text transformers + unordered-containers + ]; + homepage = "https://github.com/louispan/glazier-react#readme"; + description = "ReactJS binding using Glazier and Pipes.Fluid"; + license = stdenv.lib.licenses.bsd3; + }) {}; + + "glazier-react-widget" = callPackage + ({ mkDerivation, base, containers, disposable, dlist, free + , ghcjs-base-stub, glazier, glazier-react, javascript-extras, lens + , mmorph, mtl, pipes-concurrency, stm, transformers + }: + mkDerivation { + pname = "glazier-react-widget"; + version = "0.2.0.0"; + sha256 = "5326958b5590c76cfee47eac0445cc66cca0a85480c6dee4c80fc736f4329fa4"; + libraryHaskellDepends = [ + base containers disposable dlist free ghcjs-base-stub glazier + glazier-react javascript-extras lens mmorph mtl pipes-concurrency + stm transformers + ]; + homepage = "https://github.com/louispan/glazier-react-widget#readme"; + description = "Generic widget library using glazier-react"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "gli" = callPackage ({ mkDerivation, aeson, attoparsec, base, bytestring, containers , friendly-time, http-client, http-client-tls, http-conduit @@ -72812,6 +73458,23 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "gloss_1_11_1_1" = callPackage + ({ mkDerivation, base, bmp, bytestring, containers, ghc-prim + , gloss-rendering, GLUT, OpenGL + }: + mkDerivation { + pname = "gloss"; + version = "1.11.1.1"; + sha256 = "14e09540ba120c4d0d9153655c35602de4657aa40ad2add693ca12f825d1d653"; + libraryHaskellDepends = [ + base bmp bytestring containers ghc-prim gloss-rendering GLUT OpenGL + ]; + homepage = "http://gloss.ouroborus.net"; + description = "Painless 2D vector graphics, animations and simulations"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "gloss-accelerate" = callPackage ({ mkDerivation, accelerate, base, gloss, gloss-rendering }: mkDerivation { @@ -72830,8 +73493,8 @@ self: { ({ mkDerivation, base, containers, ghc-prim, gloss }: mkDerivation { pname = "gloss-algorithms"; - version = "1.10.2.3"; - sha256 = "8874065cdd7184ebf0fea50543ad31de6bca8f9d264e018f9d8a458e8bdbc675"; + version = "1.11.1.1"; + sha256 = "e1a7561c87a2d105054017d1c4fd393f597ddfcf0409aad097ba7e8e7aae23f2"; libraryHaskellDepends = [ base containers ghc-prim gloss ]; homepage = "http://gloss.ouroborus.net"; description = "Data structures and algorithms for working with 2D graphics"; @@ -72872,8 +73535,8 @@ self: { }: mkDerivation { pname = "gloss-examples"; - version = "1.10.2.4"; - sha256 = "ef1adf43066757d82adc16b4bde4f19a73653b837112ca41713ad16e230cac62"; + version = "1.11.1.1"; + sha256 = "41be02978633f00d377c7d2378b2d510da343a91b634770b14cb4d834bf6bd54"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -72923,8 +73586,8 @@ self: { }: mkDerivation { pname = "gloss-raster"; - version = "1.10.2.4"; - sha256 = "f9875344822a1bbb4b937605e1b1483b25559c186db94033c97117f6148cdef5"; + version = "1.11.1.1"; + sha256 = "277897eb2646fb66e23391796ed9e92360467ddf3acac196f658203cd9787c46"; libraryHaskellDepends = [ base containers ghc-prim gloss gloss-rendering repa ]; @@ -72962,6 +73625,20 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "gloss-rendering_1_11_1_1" = callPackage + ({ mkDerivation, base, bmp, bytestring, containers, GLUT, OpenGL }: + mkDerivation { + pname = "gloss-rendering"; + version = "1.11.1.1"; + sha256 = "1f0a9a6d2124d4cbfb30821f1654d2cd9d7c1766310cf7f9009ccc9808474af4"; + libraryHaskellDepends = [ + base bmp bytestring containers GLUT OpenGL + ]; + description = "Gloss picture data types and rendering functions"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "gloss-sodium" = callPackage ({ mkDerivation, base, gloss, sodium }: mkDerivation { @@ -76171,15 +76848,16 @@ self: { }) {}; "google-maps-geocoding" = callPackage - ({ mkDerivation, aeson, base, http-client, servant, servant-client - , text + ({ mkDerivation, aeson, base, google-static-maps, http-client + , servant, servant-client, text }: mkDerivation { pname = "google-maps-geocoding"; - version = "0.1.0.1"; - sha256 = "58cd8efd50ebeaf4a5630f4548065c1e05ce6a39367d9ccaa0e1ccc67be3f531"; + version = "0.2.0.0"; + sha256 = "73a2560c6fb927d689e826cbd4ec1aba6a9f35bb3ba0b66b0d693614bfc492b3"; libraryHaskellDepends = [ - aeson base http-client servant servant-client text + aeson base google-static-maps http-client servant servant-client + text ]; homepage = "https://github.com/mpilgrem/google-maps-geocoding#readme"; description = "Google Maps Geocoding API bindings"; @@ -76253,6 +76931,24 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "google-static-maps" = callPackage + ({ mkDerivation, aeson, base, bytedump, double-conversion + , http-client, JuicyPixels, network-uri, servant, servant-client + , servant-JuicyPixels, text + }: + mkDerivation { + pname = "google-static-maps"; + version = "0.3.0.0"; + sha256 = "4344c0b1470dd2025bae93a0a9e29c43826c00a16b618513515d696eab96c196"; + libraryHaskellDepends = [ + aeson base bytedump double-conversion http-client JuicyPixels + network-uri servant servant-client servant-JuicyPixels text + ]; + homepage = "https://github.com/mpilgrem/google-static-maps#readme"; + description = "Bindings to the Google Static Maps API"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "google-translate" = callPackage ({ mkDerivation, aeson, base, bytestring, http-api-data , http-client, servant, servant-client, text, transformers @@ -77561,8 +78257,8 @@ self: { }: mkDerivation { pname = "grid"; - version = "7.8.7"; - sha256 = "5369d0ab7b98b926951e81a65a349f11ab6badd71f65555d713428664c1e017c"; + version = "7.8.8"; + sha256 = "20a93f4fc42dd2082e991eac5dce282c00511abff66e9bd02c6753a748379d9c"; libraryHaskellDepends = [ base cereal containers ]; testHaskellDepends = [ base containers QuickCheck test-framework @@ -77985,8 +78681,8 @@ self: { ({ mkDerivation, base, vector }: mkDerivation { pname = "gsl-random"; - version = "0.5.0"; - sha256 = "d2adccfe625d3cb5046ae5bb3c7a23d23697d1fc2c6a717df75f75aba2881c2e"; + version = "0.5.1"; + sha256 = "4b4e8d498b2c664c9219f6381b790f50192d77432a393d405052205d3e8d46e8"; libraryHaskellDepends = [ base vector ]; homepage = "http://github.com/patperry/hs-gsl-random"; description = "Bindings the the GSL random number generation facilities"; @@ -78062,7 +78758,7 @@ self: { "gstreamer" = callPackage ({ mkDerivation, array, base, bytestring, Cabal, directory, glib - , gst_plugins_base, gstreamer, gtk2hs-buildtools, mtl + , gst-plugins-base, gstreamer, gtk2hs-buildtools, mtl }: mkDerivation { pname = "gstreamer"; @@ -78072,12 +78768,12 @@ self: { libraryHaskellDepends = [ array base bytestring directory glib mtl ]; - libraryPkgconfigDepends = [ gst_plugins_base gstreamer ]; + libraryPkgconfigDepends = [ gst-plugins-base gstreamer ]; homepage = "http://projects.haskell.org/gtk2hs/"; description = "Binding to the GStreamer open source multimedia framework"; license = stdenv.lib.licenses.lgpl21; hydraPlatforms = stdenv.lib.platforms.none; - }) {gst_plugins_base = null; inherit (pkgs) gstreamer;}; + }) {inherit (pkgs) gst-plugins-base; inherit (pkgs) gstreamer;}; "gt-tools" = callPackage ({ mkDerivation, base, containers, extensible-exceptions, haskeline @@ -81941,8 +82637,8 @@ self: { }: mkDerivation { pname = "happstack-hsp"; - version = "7.3.7.1"; - sha256 = "bbc884e4a5ca78faf08e17799c1d037622e377915ece889674004e0e54109617"; + version = "7.3.7.2"; + sha256 = "3c5de37dc150695fda04b3143396d9030772c8a72a204f49c243b160ffa295e4"; libraryHaskellDepends = [ base bytestring happstack-server harp hsp hsx2hs mtl syb text utf8-string @@ -82065,8 +82761,8 @@ self: { }: mkDerivation { pname = "happstack-server"; - version = "7.4.6.3"; - sha256 = "6dd5f859b114bdbdde00b585800bc4b7ed821dd7bad67bb253e3602d88f5ceef"; + version = "7.4.6.4"; + sha256 = "b4c6c9503deeff37751af9ab9700158347658f28f1712933f9f1c8763b4ea1b9"; libraryHaskellDepends = [ base base64-bytestring blaze-html bytestring containers directory exceptions extensible-exceptions filepath hslogger html @@ -82752,6 +83448,33 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "hashable_1_2_6_0" = callPackage + ({ mkDerivation, base, bytestring, criterion, deepseq, ghc-prim + , HUnit, integer-gmp, QuickCheck, random, siphash, test-framework + , test-framework-hunit, test-framework-quickcheck2, text, unix + }: + mkDerivation { + pname = "hashable"; + version = "1.2.6.0"; + sha256 = "429b663c827af52f64b0f376ee6e7a990e57ec54a59107857311054ade6e0a52"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + base bytestring deepseq ghc-prim integer-gmp text + ]; + testHaskellDepends = [ + base bytestring ghc-prim HUnit QuickCheck random test-framework + test-framework-hunit test-framework-quickcheck2 text unix + ]; + benchmarkHaskellDepends = [ + base bytestring criterion ghc-prim integer-gmp siphash text + ]; + homepage = "http://github.com/tibbe/hashable"; + description = "A class for types that can be converted to a hash value"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "hashable-extras" = callPackage ({ mkDerivation, base, bifunctors, bytestring, directory, doctest , filepath, hashable, transformers, transformers-compat @@ -85625,8 +86348,8 @@ self: { }: mkDerivation { pname = "hasmin"; - version = "0.3.1.3"; - sha256 = "b5297b795fba11f2644c9211b60cf535ca8d67aea6059714e7948d8261ddc9d8"; + version = "0.3.2"; + sha256 = "2e9473b11870b5a5a585fa453d4b5873f2e3885e0927653dcd50151eb513859b"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -85641,7 +86364,7 @@ self: { attoparsec base doctest doctest-discover hspec hspec-attoparsec mtl QuickCheck text ]; - homepage = "https://github.com/contivero/hasmin/"; + homepage = "https://github.com/contivero/hasmin#readme"; description = "\"A CSS Minifier\""; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; @@ -85708,6 +86431,43 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "hasql_0_19_17_1" = callPackage + ({ mkDerivation, aeson, attoparsec, base, base-prelude, bytestring + , bytestring-tree-builder, contravariant, contravariant-extras + , criterion, data-default-class, deepseq, dlist, either, hashable + , hashtables, loch-th, mtl, network-ip, placeholders + , postgresql-binary, postgresql-libpq, profunctors, QuickCheck + , quickcheck-instances, rebase, rerebase, scientific, semigroups + , tasty, tasty-hunit, tasty-quickcheck, tasty-smallcheck, text + , time, transformers, uuid, vector + }: + mkDerivation { + pname = "hasql"; + version = "0.19.17.1"; + sha256 = "d9e9a38256637f1bebb96898a91780f1b977c737c5933903b582f2e93bd81156"; + libraryHaskellDepends = [ + aeson attoparsec base base-prelude bytestring + bytestring-tree-builder contravariant contravariant-extras + data-default-class dlist either hashable hashtables loch-th mtl + network-ip placeholders postgresql-binary postgresql-libpq + profunctors scientific semigroups text time transformers uuid + vector + ]; + testHaskellDepends = [ + data-default-class QuickCheck quickcheck-instances rebase rerebase + tasty tasty-hunit tasty-quickcheck tasty-smallcheck + ]; + benchmarkHaskellDepends = [ + base base-prelude bytestring contravariant contravariant-extras + criterion data-default-class deepseq dlist either hashable + profunctors scientific text time transformers uuid vector + ]; + homepage = "https://github.com/nikita-volkov/hasql"; + description = "An efficient PostgreSQL driver and a flexible mapping API"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "hasql-backend" = callPackage ({ mkDerivation, base, base-prelude, bytestring, either, free , list-t, text, transformers, vector @@ -86866,6 +87626,24 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "hcoord" = callPackage + ({ mkDerivation, base, data-default, HUnit, ieee754, mtl + , regex-pcre + }: + mkDerivation { + pname = "hcoord"; + version = "1.0.0.0"; + sha256 = "f5c26d445dbcc5df8a164a40ab209a9879e9c5f61fb34f839bf38e6df3be8037"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ base mtl regex-pcre ]; + executableHaskellDepends = [ base ]; + testHaskellDepends = [ base data-default HUnit ieee754 mtl ]; + homepage = "https://github.com/danfran/hcoord#readme"; + description = "Easily convert between latitude/longitude, UTM and OSGB"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "hcron" = callPackage ({ mkDerivation, base, bytestring, containers, directory, mtl , old-locale, pretty, process, random, stm, time @@ -87261,6 +88039,8 @@ self: { pname = "hdocs"; version = "0.5.1.0"; sha256 = "bb4a43b479b1731105b7c6195bff59a3763042daf1102765c4f78d075a5ba2df"; + revision = "1"; + editedCabalFile = "5be14f612b7dfcc066e9fceeac312deb162c08f043f8929b0d2649c76d4f6b0f"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -87434,24 +88214,20 @@ self: { }) {}; "heckle" = callPackage - ({ mkDerivation, base, blaze-html, directory, filepath - , optparse-applicative, optparse-generic, pandoc, pandoc-types + ({ mkDerivation, base, blaze-html, directory, pandoc, pandoc-types , process, split, tagsoup, time }: mkDerivation { pname = "heckle"; - version = "2.0.1.9"; - sha256 = "b8a14e8e80dfc0190088e8f05baf9b47c46ac72e6b8ec5f36be244087b0469ba"; + version = "2.0.2.1"; + sha256 = "964d64df847910a5db1bd126b89a658e0ef7dd01f9db7a84244ac3f2451938be"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ - base blaze-html directory filepath pandoc pandoc-types process - split tagsoup time - ]; - executableHaskellDepends = [ - base directory filepath optparse-applicative optparse-generic - process split + base blaze-html directory pandoc pandoc-types process split tagsoup + time ]; + executableHaskellDepends = [ base directory process split ]; homepage = "https://github.com/2016rshah/heckle"; description = "Jekyll in Haskell (feat. LaTeX)"; license = stdenv.lib.licenses.mit; @@ -88333,24 +89109,26 @@ self: { }) {}; "hesh" = callPackage - ({ mkDerivation, aeson, base, bytestring, Cabal, cartel, cmdtheline - , containers, cryptohash, directory, filemanip, filepath - , hackage-db, haskell-src-exts, parsec, process, template-haskell - , text, time, transformers, uniplate + ({ mkDerivation, aeson, base, bytestring, Cabal, cartel, cmdargs + , containers, cryptohash, data-default, directory, exceptions + , filemanip, filepath, hackage-db, haskell-src-exts, parsec + , process, template-haskell, text, time, transformers, uniplate + , unix }: mkDerivation { pname = "hesh"; - version = "1.5.0"; - sha256 = "1e79b396d448fd7e98c293c14efed69e65ece14a5fd77bb408b8e4d0a5a024f6"; + version = "1.11.0"; + sha256 = "4bec3fe05382272c9c089615200271f416a944035ec74cd4417269314327e0b0"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ - base filemanip parsec process template-haskell text transformers + base exceptions filemanip parsec process template-haskell text + transformers ]; executableHaskellDepends = [ - aeson base bytestring Cabal cartel cmdtheline containers cryptohash - directory filepath hackage-db haskell-src-exts parsec process text - time uniplate + aeson base bytestring Cabal cartel cmdargs containers cryptohash + data-default directory filepath hackage-db haskell-src-exts parsec + process text time uniplate unix ]; homepage = "https://github.com/jekor/hesh"; description = "the Haskell Extensible Shell: Haskell for Bash-style scripts"; @@ -88424,6 +89202,23 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "heterolist" = callPackage + ({ mkDerivation, base, constraint-manip, hspec, indextype, polydata + }: + mkDerivation { + pname = "heterolist"; + version = "0.2.0.0"; + sha256 = "f2a14a202ab78321de4e5433523dbdabe7f8c4bcaed0a31e6c281e9f092dc15d"; + libraryHaskellDepends = [ + base constraint-manip indextype polydata + ]; + testHaskellDepends = [ + base constraint-manip hspec indextype polydata + ]; + description = "A heterogeneous list type"; + license = stdenv.lib.licenses.mit; + }) {}; + "hetris" = callPackage ({ mkDerivation, array, base, hscurses, ncurses, old-time, random }: @@ -89135,8 +89930,8 @@ self: { }: mkDerivation { pname = "hgis"; - version = "0.1.1.2"; - sha256 = "fe9ba90e951533980aff909f6c53a33d2e1960ddb5eb547a4650564a0ee4bb5f"; + version = "0.1.2.0"; + sha256 = "d1a976e0e8373e9448944200b77408dabbb04fb2221232832574244bb19935cc"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -91377,8 +92172,8 @@ self: { }: mkDerivation { pname = "hmatrix-svdlibc"; - version = "0.4.0"; - sha256 = "774504e862542f90441701122638c4ce11aa94792d270045eb0f0997e6f874a2"; + version = "0.4.1"; + sha256 = "4a36946603633e0185cd2729292e6a24051f81c0b840ea63a65a75031acfd2ef"; libraryHaskellDepends = [ base hmatrix vector ]; testHaskellDepends = [ base hmatrix hspec QuickCheck vector ]; benchmarkHaskellDepends = [ base criterion hmatrix vector ]; @@ -93925,6 +94720,29 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "hriemann" = callPackage + ({ mkDerivation, base, binary, bytestring, containers, criterion + , hostname, kazura-queue, network, protocol-buffers + , protocol-buffers-descriptor, text, time, unagi-chan + }: + mkDerivation { + pname = "hriemann"; + version = "0.2.1.0"; + sha256 = "73503679ae0ef115b4e6d7fcbeb757bcbba5182572365d039a720791e7cb261b"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + base binary bytestring containers criterion hostname kazura-queue + network protocol-buffers protocol-buffers-descriptor text time + unagi-chan + ]; + executableHaskellDepends = [ base ]; + testHaskellDepends = [ base ]; + homepage = "https://github.com/shmish111/hriemann"; + description = "Initial project template from stack"; + license = stdenv.lib.licenses.mit; + }) {}; + "hruby" = callPackage ({ mkDerivation, aeson, attoparsec, base, bytestring, QuickCheck , ruby, scientific, stm, text, unordered-containers, vector @@ -94361,8 +95179,8 @@ self: { pname = "hs-pkg-config"; version = "0.2.1.0"; sha256 = "104e39324e9ece701a21bf3f428b5d0382fd8f426b65b4ef1f54ab41cc9d6227"; - revision = "1"; - editedCabalFile = "9337acf593d6f7e1d54f81886cb3736001a127e3b75ba01bd97a99d77565f784"; + revision = "2"; + editedCabalFile = "014d1b8e4375de3e7d154b6996b9e54917fde4d3d7fec917feaf262576a645ce"; libraryHaskellDepends = [ base data-default-class text ]; homepage = "https://github.com/trskop/hs-pkg-config"; description = "Create pkg-config configuration files"; @@ -94441,6 +95259,22 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "hs-server-starter" = callPackage + ({ mkDerivation, base, directory, HUnit, network, temporary, unix + }: + mkDerivation { + pname = "hs-server-starter"; + version = "0.1.0.1"; + sha256 = "6e120890191f091a76629aab51a00c309c1bf039f22e87ee0c70a30c088e380f"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ base directory network ]; + testHaskellDepends = [ base HUnit network temporary unix ]; + homepage = "https://github.com/hiratara/hs-server-starter"; + description = "Write a server supporting Server::Starter's protocol in Haskell"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "hs-twitter" = callPackage ({ mkDerivation, base, HTTP, json, mime, network, old-locale , old-time, random, utf8-string @@ -95323,6 +96157,8 @@ self: { pname = "hsdev"; version = "0.2.2.0"; sha256 = "844973b82ed0a0a7321d8106755e71db229889af4b0516e5da861bf6474bb932"; + revision = "1"; + editedCabalFile = "18e2c175baf6aa0fef8e7fcf7126e19d8df085bab6ed405bb4d55b6f98121a3b"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -96302,8 +97138,8 @@ self: { ({ mkDerivation, base, checkers, hspec }: mkDerivation { pname = "hspec-checkers"; - version = "0.1.0.1"; - sha256 = "9703ad134d1711b17301d760cebc36814c48a0e4e5712590514c93e6ec278dab"; + version = "0.1.0.2"; + sha256 = "e7db79dc527cf5b806723bbe3d511a074297976a0c7042968b9abc57f8337e99"; libraryHaskellDepends = [ base checkers hspec ]; testHaskellDepends = [ base checkers hspec ]; description = "Allows to use checkers properties from hspec"; @@ -97819,8 +98655,8 @@ self: { }: mkDerivation { pname = "html-entities"; - version = "1.1.3"; - sha256 = "6bb2ae9f6b65b5652854e78ece26d7c78e4c5eef6c7f5a75ee88e6730469bc1d"; + version = "1.1.4"; + sha256 = "0d5c21b4d6b82f85fa4ad867db99b25fb948becd37a6841391cc7dec829792c0"; libraryHaskellDepends = [ attoparsec base-prelude text unordered-containers ]; @@ -98868,6 +99704,34 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "http-reverse-proxy_0_4_3_3" = callPackage + ({ mkDerivation, async, base, blaze-builder, bytestring + , case-insensitive, conduit, conduit-extra, containers + , data-default-class, hspec, http-client, http-conduit, http-types + , lifted-base, monad-control, network, resourcet, streaming-commons + , text, transformers, wai, wai-logger, warp, word8 + }: + mkDerivation { + pname = "http-reverse-proxy"; + version = "0.4.3.3"; + sha256 = "eccfbd44f9f9f8a2a8d70dd4f9a347e4dbe39b38327271fcceeff25f0dd18b81"; + libraryHaskellDepends = [ + async base blaze-builder bytestring case-insensitive conduit + conduit-extra containers data-default-class http-client http-types + lifted-base monad-control network resourcet streaming-commons text + transformers wai wai-logger word8 + ]; + testHaskellDepends = [ + base blaze-builder bytestring conduit conduit-extra hspec + http-conduit http-types lifted-base network resourcet + streaming-commons transformers wai warp + ]; + homepage = "https://github.com/fpco/http-reverse-proxy"; + description = "Reverse proxy HTTP requests, either over raw sockets or with WAI"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "http-server" = callPackage ({ mkDerivation, base, HTTP, mime, network, network-uri, text, unix , url, utf8-string @@ -101675,8 +102539,8 @@ self: { }: mkDerivation { pname = "identifiers"; - version = "0.4.0.0"; - sha256 = "0e9504c56888e35664840027b8fa38f9cd16ef6b19adf0a1aee7a86208436552"; + version = "0.4.1.0"; + sha256 = "8ba63f3a52712f2296d8dc1737593560c38055a54f2745d3a9c465269d25b38c"; libraryHaskellDepends = [ base binary cereal containers deepseq hashable ListLike text unordered-containers @@ -101764,31 +102628,31 @@ self: { "idris" = callPackage ({ mkDerivation, aeson, annotated-wl-pprint, ansi-terminal , ansi-wl-pprint, array, async, base, base64-bytestring, binary - , blaze-html, blaze-markup, bytestring, cheapskate, containers - , deepseq, directory, filepath, fingertree, fsnotify, gmp - , haskeline, ieee754, libffi, mtl, network, optparse-applicative - , parsers, pretty, process, regex-tdfa, safe, split, tagged, tasty - , tasty-golden, tasty-rerun, terminal-size, text, time - , transformers, transformers-compat, trifecta, uniplate, unix - , unordered-containers, utf8-string, vector + , blaze-html, blaze-markup, bytestring, cheapskate, code-page + , containers, deepseq, directory, filepath, fingertree, fsnotify + , gmp, haskeline, ieee754, libffi, mtl, network + , optparse-applicative, parsers, pretty, process, regex-tdfa, safe + , split, tagged, tasty, tasty-golden, tasty-rerun, terminal-size + , text, time, transformers, transformers-compat, trifecta, uniplate + , unix, unordered-containers, utf8-string, vector , vector-binary-instances, zip-archive }: mkDerivation { pname = "idris"; - version = "0.99"; - sha256 = "f124c22a56d3547f878fdcfcddb36884bf69279411a724bb18b7829e8bdfa4e9"; + version = "0.99.1"; + sha256 = "199018612112180778da0d6b75f602848e6b8b4ce4747163a385daac44217c8a"; configureFlags = [ "-fcurses" "-fffi" "-fgmp" ]; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ aeson annotated-wl-pprint ansi-terminal ansi-wl-pprint array async base base64-bytestring binary blaze-html blaze-markup bytestring - cheapskate containers deepseq directory filepath fingertree - fsnotify haskeline ieee754 libffi mtl network optparse-applicative - parsers pretty process regex-tdfa safe split terminal-size text - time transformers transformers-compat trifecta uniplate unix - unordered-containers utf8-string vector vector-binary-instances - zip-archive + cheapskate code-page containers deepseq directory filepath + fingertree fsnotify haskeline ieee754 libffi mtl network + optparse-applicative parsers pretty process regex-tdfa safe split + terminal-size text time transformers transformers-compat trifecta + uniplate unix unordered-containers utf8-string vector + vector-binary-instances zip-archive ]; librarySystemDepends = [ gmp ]; executableHaskellDepends = [ @@ -102727,6 +103591,49 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "imprevu" = callPackage + ({ mkDerivation, aeson, base, Boolean, Cabal, containers + , DebugTraceHelpers, ghc, Imprevu, lens, monad-loops, mtl, NoTrace + , old-locale, random, safe, semigroups, shortcut, stm, time + , time-recurrence, validation + }: + mkDerivation { + pname = "imprevu"; + version = "0.1.0"; + sha256 = "38d48f6634effa51d039a880cf6fbd595f6868e637e261413caef95c65d30aa9"; + libraryHaskellDepends = [ + aeson base Boolean containers DebugTraceHelpers ghc lens + monad-loops mtl NoTrace old-locale random safe semigroups shortcut + stm time time-recurrence validation + ]; + testHaskellDepends = [ base Cabal Imprevu ]; + homepage = "http://www.nomyx.net"; + description = "Reactive programming language based on a DSL"; + license = stdenv.lib.licenses.bsd3; + broken = true; + }) {Imprevu = null;}; + + "imprevu-happstack" = callPackage + ({ mkDerivation, base, blaze-html, Cabal, containers + , DebugTraceHelpers, ghc, happstack-server, HTTP, imprevu, lens + , monad-extras, mtl, NoTrace, old-locale, reform, reform-blaze + , reform-happstack, safe, stm, text + }: + mkDerivation { + pname = "imprevu-happstack"; + version = "0.1.0"; + sha256 = "5925745029fe381ad5b13c755ac2b6b3d0f201531cfee86293406863fb64f01b"; + libraryHaskellDepends = [ + base blaze-html containers DebugTraceHelpers ghc happstack-server + HTTP imprevu lens monad-extras mtl NoTrace old-locale reform + reform-blaze reform-happstack safe stm text + ]; + testHaskellDepends = [ base Cabal ]; + homepage = "http://www.nomyx.net"; + description = "Imprevu support for Happstack"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "improve" = callPackage ({ mkDerivation, base, mtl, yices }: mkDerivation { @@ -103078,10 +103985,8 @@ self: { ({ mkDerivation, base, hspec }: mkDerivation { pname = "indextype"; - version = "0.1.0.0"; - sha256 = "7be4ceac4ac1dea5f8c47cf0ae638029d7ab62b0df6ec6d215aac4a1e9ae0498"; - revision = "2"; - editedCabalFile = "daa67f59c54d4c61f73317a1edc7ee86e59327df0eade3a8db6e348a80b8d2d5"; + version = "0.2.0.0"; + sha256 = "9b680b0a7fb25429238b00b3c0e87faad0a5f90c9bef73ab80a4726aebf397bb"; libraryHaskellDepends = [ base ]; testHaskellDepends = [ base hspec ]; description = "A series of type families and constraints for \"indexable\" types"; @@ -103489,7 +104394,7 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "inline-java_0_6_2" = callPackage + "inline-java_0_6_3" = callPackage ({ mkDerivation, base, binary, bytestring, Cabal, containers , directory, distributed-closure, filepath, ghc-heap-view, hspec , inline-c, jni, jvm, language-java, process, singletons, syb @@ -103497,8 +104402,8 @@ self: { }: mkDerivation { pname = "inline-java"; - version = "0.6.2"; - sha256 = "9c162f26c77d1030f0f5054394265aab7fded1c83df67b3ea8fe7e4bb68aa8c5"; + version = "0.6.3"; + sha256 = "a9d5742b78b22ea4190269d73e2cc6f74a5f45e150ee9582bdbb31ba966c657c"; libraryHaskellDepends = [ base binary bytestring Cabal containers directory distributed-closure filepath ghc-heap-view inline-c jni jvm @@ -104230,8 +105135,8 @@ self: { }: mkDerivation { pname = "intro"; - version = "0.1.0.8"; - sha256 = "09c570361dddf8c67572acffc7fd6c93bdfa1c8143d2f7eb9aec0ad5db4f21bf"; + version = "0.1.0.10"; + sha256 = "1c8c6c7bd6ff10eb10d26cea7a04c2a048b8128eb7fc154d931f7c17201741d9"; libraryHaskellDepends = [ base bifunctors binary bytestring containers deepseq dlist extra hashable mtl safe string-conversions tagged text transformers @@ -104248,25 +105153,25 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "intro_0_1_0_10" = callPackage + "intro_0_2_0_1" = callPackage ({ mkDerivation, base, bifunctors, binary, bytestring, containers - , deepseq, dlist, extra, hashable, lens, mtl, safe - , string-conversions, tagged, text, transformers + , deepseq, dlist, extra, hashable, lens, mtl, QuickCheck + , quickcheck-instances, safe, tagged, text, transformers , unordered-containers, writer-cps-mtl }: mkDerivation { pname = "intro"; - version = "0.1.0.10"; - sha256 = "1c8c6c7bd6ff10eb10d26cea7a04c2a048b8128eb7fc154d931f7c17201741d9"; + version = "0.2.0.1"; + sha256 = "d26082b3304e6940f6a486b0a00aa95264b4045762c3586fac4de7cbf60a4073"; libraryHaskellDepends = [ base bifunctors binary bytestring containers deepseq dlist extra - hashable mtl safe string-conversions tagged text transformers - unordered-containers writer-cps-mtl + hashable mtl safe tagged text transformers unordered-containers + writer-cps-mtl ]; testHaskellDepends = [ base bifunctors binary bytestring containers deepseq dlist extra - hashable lens mtl safe string-conversions tagged text transformers - unordered-containers writer-cps-mtl + hashable lens mtl QuickCheck quickcheck-instances safe tagged text + transformers unordered-containers writer-cps-mtl ]; homepage = "https://github.com/minad/intro#readme"; description = "\"Fixed Prelude\" - Mostly total and safe, provides Text and Monad transformers"; @@ -104386,6 +105291,30 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "invertible-hlist" = callPackage + ({ mkDerivation, base, HList, invertible }: + mkDerivation { + pname = "invertible-hlist"; + version = "0.2.0.2"; + sha256 = "c50f1f10c75476893d117c0cc4b29129e427ceaa0386e9b709b6168f269144a0"; + libraryHaskellDepends = [ base HList invertible ]; + description = "invertible functions and instances for HList"; + license = stdenv.lib.licenses.bsd3; + }) {}; + + "invertible-hxt" = callPackage + ({ mkDerivation, base, hxt, hxt-charproperties, invertible, mtl }: + mkDerivation { + pname = "invertible-hxt"; + version = "0.1"; + sha256 = "add3ba846667b933d8fd4bbe20a1f68be02716e6e047eb711b96a14975a88e94"; + libraryHaskellDepends = [ + base hxt hxt-charproperties invertible mtl + ]; + description = "invertible transformer instances for HXT Picklers"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "invertible-syntax" = callPackage ({ mkDerivation, base, partial-isomorphisms }: mkDerivation { @@ -104817,7 +105746,7 @@ self: { description = "haskell binding to ipopt and nlopt including automatic differentiation"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; - }) {inherit (pkgs) ipopt; nlopt = null;}; + }) {inherit (pkgs) ipopt; inherit (pkgs) nlopt;}; "ipprint" = callPackage ({ mkDerivation, base, haskell-src, sr-extra }: @@ -104977,25 +105906,6 @@ self: { }) {}; "irc-conduit" = callPackage - ({ mkDerivation, async, base, bytestring, conduit, conduit-extra - , connection, irc, irc-ctcp, network-conduit-tls, profunctors, text - , time, tls, transformers, x509-validation - }: - mkDerivation { - pname = "irc-conduit"; - version = "0.2.2.0"; - sha256 = "b66e058a66e9cd782f065be6b100bb80157c55d733db6691112a70e9aab13065"; - libraryHaskellDepends = [ - async base bytestring conduit conduit-extra connection irc irc-ctcp - network-conduit-tls profunctors text time tls transformers - x509-validation - ]; - homepage = "https://github.com/barrucadu/irc-conduit"; - description = "Streaming IRC message library using conduits"; - license = stdenv.lib.licenses.mit; - }) {}; - - "irc-conduit_0_2_2_1" = callPackage ({ mkDerivation, async, base, bytestring, conduit, conduit-extra , connection, irc, irc-ctcp, network-conduit-tls, profunctors, text , time, tls, transformers, x509-validation @@ -105012,7 +105922,6 @@ self: { homepage = "https://github.com/barrucadu/irc-conduit"; description = "Streaming IRC message library using conduits"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "irc-core" = callPackage @@ -105265,11 +106174,11 @@ self: { ({ mkDerivation, base, template-haskell }: mkDerivation { pname = "is"; - version = "0.2"; - sha256 = "502c962d45859050455057be9886e8944e300ef690a56605c91aca76fdcd19c6"; + version = "0.4"; + sha256 = "7f628b7fe4d1acc8f7b043cebb3da597faa83802166b3efbf08ad6ef778ee72d"; libraryHaskellDepends = [ base template-haskell ]; testHaskellDepends = [ base template-haskell ]; - description = "Pattern predicates using TH"; + description = "Generic pattern predicates"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; }) {}; @@ -105451,8 +106360,8 @@ self: { }: mkDerivation { pname = "isotope"; - version = "0.3.3.0"; - sha256 = "e08fac7483c11f37786f5f98f6f7d1e58a456d1470c3f0f35bc9326e88c1fa2e"; + version = "0.4.0.0"; + sha256 = "040dc0ab7b47f478351bdd491acb6ed7e6f5aad2845f3cf29dfdd89041129ea7"; libraryHaskellDepends = [ base containers megaparsec template-haskell th-lift ]; @@ -106377,12 +107286,14 @@ self: { }) {}; "javascript-extras" = callPackage - ({ mkDerivation, base }: + ({ mkDerivation, base, deepseq, ghcjs-base-stub, parallel, text }: mkDerivation { pname = "javascript-extras"; - version = "0.1.0.0"; - sha256 = "cf74b6c2be87ee5bc96b5ff47335a8eb2d879d7ec83bf6c83be609293f40f4be"; - libraryHaskellDepends = [ base ]; + version = "0.2.0.0"; + sha256 = "28a191b67d0047a34d1d1f7dc8c8ad03abe725a9a75319746b9eecfbf1cb96e1"; + libraryHaskellDepends = [ + base deepseq ghcjs-base-stub parallel text + ]; homepage = "https://github.com/louispan/javascript-extras#readme"; description = "Extra javascript functions when using GHCJS"; license = stdenv.lib.licenses.bsd3; @@ -107818,8 +108729,8 @@ self: { }: mkDerivation { pname = "juicy-gcode"; - version = "0.1.0.1"; - sha256 = "4393aae302e034c95e2c3cff57f432c322db7ecf21580295310648c73bc09bbf"; + version = "0.1.0.2"; + sha256 = "6088c4602591b4f9b94e17ef42a6fada27abacb1e2ddd3a666848020d3b0ca0b"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -107839,8 +108750,8 @@ self: { }: mkDerivation { pname = "jukebox"; - version = "0.2.16"; - sha256 = "5eac14b5102b5be904142843977560cddf4829182637e059cd09e7a384b7052f"; + version = "0.2.17"; + sha256 = "3952d52d54fbacfff9a001d00a7627955c9429304ca08b1f4edcde201e5ba764"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -109697,6 +110608,18 @@ self: { license = stdenv.lib.licenses.publicDomain; }) {}; + "ksystools" = callPackage + ({ mkDerivation, base, directory }: + mkDerivation { + pname = "ksystools"; + version = "0.1.0.0"; + sha256 = "61bf58d8d7464cdcd565fc80cf91b62190daff6ea3c99dad66a5da71fe586d53"; + libraryHaskellDepends = [ base directory ]; + homepage = "https://github.com/kisom/ksystools#readme"; + description = "System management tooling"; + license = stdenv.lib.licenses.mit; + }) {}; + "ktx" = callPackage ({ mkDerivation, base, bytestring, egl, glew, OpenGL }: mkDerivation { @@ -109767,8 +110690,8 @@ self: { ({ mkDerivation, base, text, time }: mkDerivation { pname = "l10n"; - version = "0.1.0.0"; - sha256 = "56f935a18248473cada2bca5cef2c5e98fbab77a02f5bb075ecdc90750de6531"; + version = "0.1.0.1"; + sha256 = "0a7032476d257981eb7c274600bef809b4a515ab162a1772a7887f0113455ca0"; libraryHaskellDepends = [ base text time ]; homepage = "https://github.com/louispan/l10n#readme"; description = "Enables providing localization as typeclass instances in separate files"; @@ -110801,14 +111724,14 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "language-c_0_6" = callPackage + "language-c_0_6_1" = callPackage ({ mkDerivation, alex, array, base, bytestring, containers , directory, filepath, happy, pretty, process, syb }: mkDerivation { pname = "language-c"; - version = "0.6"; - sha256 = "5699cd7d386ae5a583d703bbc1c83b46faa618f3e53ff7fe9a97f6c7acb36be6"; + version = "0.6.1"; + sha256 = "23cadc9d04e46490ec57f56b79ecdc2a709ebf57571345905e6e30db29fa37e8"; libraryHaskellDepends = [ array base bytestring containers directory filepath pretty process syb @@ -110861,8 +111784,8 @@ self: { }: mkDerivation { pname = "language-c-quote"; - version = "0.11.7.1"; - sha256 = "5583e92748e6b4cac01536bff86eb119e424e136e03bb3ea0d2db3217328f88c"; + version = "0.11.7.3"; + sha256 = "8e1bdc55d7c146e3d58feba03388f679933a8e033aaf15087e73d4d45e344152"; libraryHaskellDepends = [ array base bytestring containers exception-mtl exception-transformers filepath haskell-src-meta mainland-pretty @@ -110878,32 +111801,6 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "language-c-quote_0_11_7_2" = callPackage - ({ mkDerivation, alex, array, base, bytestring, containers - , exception-mtl, exception-transformers, filepath, happy - , haskell-src-meta, HUnit, mainland-pretty, mtl, srcloc, syb - , symbol, template-haskell, test-framework, test-framework-hunit - }: - mkDerivation { - pname = "language-c-quote"; - version = "0.11.7.2"; - sha256 = "5654187eaa82afe2b7ad959436b35c561fa5bc5b68af5624ab204e9db3591508"; - libraryHaskellDepends = [ - array base bytestring containers exception-mtl - exception-transformers filepath haskell-src-meta mainland-pretty - mtl srcloc syb symbol template-haskell - ]; - libraryToolDepends = [ alex happy ]; - testHaskellDepends = [ - base bytestring HUnit mainland-pretty srcloc symbol test-framework - test-framework-hunit - ]; - homepage = "http://www.drexel.edu/~mainland/"; - description = "C/CUDA/OpenCL/Objective-C quasiquoting library"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - "language-cil" = callPackage ({ mkDerivation, base, bool-extras }: mkDerivation { @@ -111434,8 +112331,8 @@ self: { }: mkDerivation { pname = "language-puppet"; - version = "1.3.5.1"; - sha256 = "4c33feba8e2b3654d25d7cb3d7a881b1f1228196db2d0335a0a83c995b5f19d4"; + version = "1.3.6"; + sha256 = "25acf7b9449999beb8b65c8f594c51171f94b074fb5a5228ce267f96f50d2be2"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -111464,7 +112361,7 @@ self: { hydraPlatforms = [ "x86_64-linux" ]; }) {}; - "language-puppet_1_3_6" = callPackage + "language-puppet_1_3_7" = callPackage ({ mkDerivation, aeson, ansi-wl-pprint, attoparsec, base , base16-bytestring, bytestring, case-insensitive, containers , cryptonite, directory, either, exceptions, filecache, formatting @@ -111478,8 +112375,8 @@ self: { }: mkDerivation { pname = "language-puppet"; - version = "1.3.6"; - sha256 = "25acf7b9449999beb8b65c8f594c51171f94b074fb5a5228ce267f96f50d2be2"; + version = "1.3.7"; + sha256 = "9b549422aed7b8a4b0d1fb1ed62e8648d2b16646c29d3736aeef1008035955ee"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -112300,8 +113197,8 @@ self: { ({ mkDerivation, base, template-haskell }: mkDerivation { pname = "leancheck"; - version = "0.6.0"; - sha256 = "15651a9e1bb9b20e805a012be57082c5e2c1f59dde51c25f9fb88299150853ed"; + version = "0.6.1"; + sha256 = "0a298956b9f26dafae56c377f3a30e48dca2f9bc91084076344ad81f54399d18"; libraryHaskellDepends = [ base template-haskell ]; testHaskellDepends = [ base template-haskell ]; homepage = "https://github.com/rudymatela/leancheck#readme"; @@ -112454,8 +113351,8 @@ self: { }: mkDerivation { pname = "legion"; - version = "0.9.0.0"; - sha256 = "a40c85edad14c4dca15d3d4ef6b3c240c5afb30a3798ab63acc43f6f1d5a08ce"; + version = "0.9.0.1"; + sha256 = "413e8097861e841555335c0c0027eb4291a6aead9bf41d8799d7626a0d9890bd"; libraryHaskellDepends = [ aeson base binary binary-conduit bytestring canteven-http conduit conduit-extra containers data-default-class data-dword directory @@ -112471,22 +113368,21 @@ self: { "legion-discovery" = callPackage ({ mkDerivation, aeson, attoparsec, base, binary, bytestring, Cabal , canteven-http, canteven-log, conduit, containers - , data-default-class, ekg, graphviz, http-types, legion - , legion-extra, monad-logger, scotty, scotty-format - , scotty-resource, SHA, text, time, transformers, wai, wai-extra - , warp + , data-default-class, ekg, graphviz, http-api-data, http-grammar + , legion, legion-extra, monad-logger, mtl, servant-server, SHA + , text, time, wai, wai-extra, warp }: mkDerivation { pname = "legion-discovery"; - version = "0.3.0.0"; - sha256 = "a5bcbbcaec065c4f833b51c05e0379bce3e1f22ca70585b63878ef57dbabfc61"; + version = "0.3.0.2"; + sha256 = "4e9b4ece222d4cc3eb0a0f14bfba1b0f9f2a517d3471d9f61936faf953f74191"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ aeson attoparsec base binary bytestring Cabal canteven-http canteven-log conduit containers data-default-class ekg graphviz - http-types legion legion-extra monad-logger scotty scotty-format - scotty-resource SHA text time transformers wai wai-extra warp + http-api-data http-grammar legion legion-extra monad-logger mtl + servant-server SHA text time wai wai-extra warp ]; executableHaskellDepends = [ base ]; testHaskellDepends = [ base ]; @@ -112498,17 +113394,16 @@ self: { "legion-discovery-client" = callPackage ({ mkDerivation, aeson, base, bytestring, Cabal, containers - , data-default-class, http-client, http-types, load-balancing - , network, resourcet, text, transformers + , http-client, http-types, load-balancing, resourcet, text + , transformers }: mkDerivation { pname = "legion-discovery-client"; - version = "0.1.0.3"; - sha256 = "4fd1c98dcade6f1251418f14537df3cffb4af814eca8074f7a06e0efdd67189b"; + version = "0.1.1.1"; + sha256 = "257150e35dddb8e67fa48dc61b740ec73e216cd59ce21bbe898c0fc3f290df24"; libraryHaskellDepends = [ - aeson base bytestring Cabal containers data-default-class - http-client http-types load-balancing network resourcet text - transformers + aeson base bytestring Cabal containers http-client http-types + load-balancing resourcet text transformers ]; testHaskellDepends = [ base ]; homepage = "https://github.com/owensmurray/legion-discovery-client#readme"; @@ -113513,25 +114408,27 @@ self: { "liblawless" = callPackage ({ mkDerivation, aeson, base, base-unicode-symbols, binary - , boomerang, bytestring, containers, containers-unicode-symbols - , contravariant, data-default, data-textual, dns, exceptions - , filepath, hjsonschema, lens, machines, managed, mtl, network - , network-ip, parsers, pathtype, protolude, QuickCheck, random - , semigroups, stm, stm-containers, temporary, test-framework + , boomerang, bytestring, concurrent-machines, containers + , containers-unicode-symbols, contravariant, data-default + , data-textual, dns, exceptions, filepath, hjsonschema, lens + , machines, managed, monad-control, mtl, network, network-ip + , parsers, pathtype, protolude, QuickCheck, random, semigroups, stm + , stm-containers, temporary, test-framework , test-framework-quickcheck2, test-framework-th, text, text-icu , text-icu-normalized, text-printer, time, transformers, zippers }: mkDerivation { pname = "liblawless"; - version = "0.17.1"; - sha256 = "dbba3ab5865c0f957daf3ead4e3f7c16a44ba2e3c4fbbe4ced429f1c88e6f397"; + version = "0.18.3"; + sha256 = "55b460995913b582f3f4df876bb9877598e7b8b27bae49fa1a2a4af4b08645d3"; libraryHaskellDepends = [ aeson base base-unicode-symbols binary boomerang bytestring - containers containers-unicode-symbols contravariant data-default - data-textual dns exceptions hjsonschema lens machines managed mtl - network network-ip parsers pathtype protolude QuickCheck random - semigroups stm stm-containers temporary text text-icu - text-icu-normalized text-printer time transformers zippers + concurrent-machines containers containers-unicode-symbols + contravariant data-default data-textual dns exceptions hjsonschema + lens machines managed monad-control mtl network network-ip parsers + pathtype protolude QuickCheck random semigroups stm stm-containers + temporary text text-icu text-icu-normalized text-printer time + transformers zippers ]; testHaskellDepends = [ aeson base binary bytestring exceptions filepath network QuickCheck @@ -115824,12 +116721,12 @@ self: { }) {}; "llvm-pretty" = callPackage - ({ mkDerivation, base, containers, monadLib, pretty }: + ({ mkDerivation, base, containers, monadLib, parsec, pretty }: mkDerivation { pname = "llvm-pretty"; - version = "0.6.0.0"; - sha256 = "f9b50885551a48624a0577c6dabaef1fc77245367d6d9afdb84d548ada328e66"; - libraryHaskellDepends = [ base containers monadLib pretty ]; + version = "0.7.1.0"; + sha256 = "5805bbb6a0408dad250eaee5ebd15bc8fbeccbca8b54fa50aa1de94ea95d2c60"; + libraryHaskellDepends = [ base containers monadLib parsec pretty ]; description = "A pretty printing library inspired by the llvm binding"; license = stdenv.lib.licenses.bsd3; }) {}; @@ -115841,8 +116738,8 @@ self: { }: mkDerivation { pname = "llvm-pretty-bc-parser"; - version = "0.3.0.1"; - sha256 = "def47c50959ae7b270987bcf53af87e07a290275bfd34f01e3d3c50b8edf1178"; + version = "0.3.2.0"; + sha256 = "198a7985b2c263427a9a216d2b4074e3ac44b5100a3b8580be926ea5c4ed1440"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -116142,8 +117039,8 @@ self: { pname = "lock-file"; version = "0.5.0.2"; sha256 = "274ecb94d0af66fed7b624fca402381d7f262f510ac7c4271037153efda49ad0"; - revision = "3"; - editedCabalFile = "565e73c14184f1760473a10e35d2a04f354dbec33abcf185d217754ad63709b6"; + revision = "4"; + editedCabalFile = "2c6bc79db0f2cdeb55396860867b462995047699a66e4b0cb31724f961ae443b"; libraryHaskellDepends = [ base data-default-class directory exceptions tagged-exception-core transformers @@ -116225,6 +117122,29 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "log_0_8" = callPackage + ({ mkDerivation, aeson, base, bloodhound, bytestring, exceptions + , http-client, http-types, log-base, log-elasticsearch + , log-postgres, process, random, tasty, tasty-hunit, text, time + , transformers + }: + mkDerivation { + pname = "log"; + version = "0.8"; + sha256 = "3c48e377d8e25cb6874c1496d8635342dc3c57843d45f1347b4fdfb110d42a52"; + libraryHaskellDepends = [ + base log-base log-elasticsearch log-postgres + ]; + testHaskellDepends = [ + aeson base bloodhound bytestring exceptions http-client http-types + process random tasty tasty-hunit text time transformers + ]; + homepage = "https://github.com/scrive/log"; + description = "Structured logging solution with multiple backends"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "log-base" = callPackage ({ mkDerivation, aeson, aeson-pretty, base, bytestring, deepseq , exceptions, monad-control, monad-time, mtl, semigroups, stm, text @@ -116244,6 +117164,26 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "log-base_0_7_1" = callPackage + ({ mkDerivation, aeson, aeson-pretty, base, bytestring, deepseq + , exceptions, monad-control, monad-time, mtl, semigroups, stm, text + , time, transformers-base, unordered-containers + }: + mkDerivation { + pname = "log-base"; + version = "0.7.1"; + sha256 = "63eb485d51edb8f76d1cf3feeab379afe19546f8e52e284db51e5ae4c690a2bf"; + libraryHaskellDepends = [ + aeson aeson-pretty base bytestring deepseq exceptions monad-control + monad-time mtl semigroups stm text time transformers-base + unordered-containers + ]; + homepage = "https://github.com/scrive/log"; + description = "Structured logging solution (base package)"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "log-domain" = callPackage ({ mkDerivation, base, binary, bytes, cereal, comonad, deepseq , directory, distributive, doctest, filepath, generic-deriving @@ -116307,6 +117247,27 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "log-elasticsearch_0_8" = callPackage + ({ mkDerivation, aeson, aeson-pretty, base, base64-bytestring + , bloodhound, bytestring, deepseq, http-client, http-client-tls + , log-base, semigroups, text, text-show, time, transformers + , unordered-containers, vector + }: + mkDerivation { + pname = "log-elasticsearch"; + version = "0.8"; + sha256 = "b63079eec72b56b5ab0078ca83609ecc0620eee3b253a6657a4df79fa8b44d95"; + libraryHaskellDepends = [ + aeson aeson-pretty base base64-bytestring bloodhound bytestring + deepseq http-client http-client-tls log-base semigroups text + text-show time transformers unordered-containers vector + ]; + homepage = "https://github.com/scrive/log"; + description = "Structured logging solution (Elasticsearch back end)"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "log-postgres" = callPackage ({ mkDerivation, aeson, aeson-pretty, base, base64-bytestring , bytestring, deepseq, hpqtypes, http-client, lifted-base, log-base @@ -116355,24 +117316,25 @@ self: { "log-warper" = callPackage ({ mkDerivation, aeson, ansi-terminal, async, base, bytestring , containers, data-default, directory, dlist, errors, exceptions - , extra, filepath, formatting, hashable, hslogger, hspec, HUnit - , lens, monad-control, monad-loops, mtl, QuickCheck, safecopy, text - , text-format, time, transformers, transformers-base, universum - , unordered-containers, yaml + , extra, filepath, formatting, hashable, hspec, HUnit, lens, mmorph + , monad-control, monad-loops, mtl, network, QuickCheck, safecopy + , text, text-format, time, transformers, transformers-base + , universum, unix, unordered-containers, yaml }: mkDerivation { pname = "log-warper"; - version = "0.5.1"; - sha256 = "8645928457c46ca217c2a9ebc75819176643552876c832ad3691a66e762798ea"; + version = "1.0.4"; + sha256 = "c2024e6a5c01d2862d05ea47273e659c3ee31afeeb2f69e67b52fec0749f0990"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ aeson ansi-terminal base bytestring containers directory dlist - errors exceptions extra filepath formatting hashable hslogger lens - monad-control monad-loops mtl safecopy text text-format time - transformers transformers-base universum unordered-containers yaml + errors exceptions extra filepath formatting hashable lens mmorph + monad-control monad-loops mtl network safecopy text text-format + time transformers transformers-base universum unix + unordered-containers yaml ]; - executableHaskellDepends = [ base exceptions hslogger text ]; + executableHaskellDepends = [ base exceptions text ]; testHaskellDepends = [ async base data-default directory filepath hspec HUnit lens QuickCheck universum unordered-containers @@ -117475,30 +118437,6 @@ self: { }) {}; "lucid" = callPackage - ({ mkDerivation, base, bifunctors, blaze-builder, bytestring - , containers, criterion, deepseq, hashable, hspec, HUnit, mmorph - , mtl, parsec, text, transformers, unordered-containers - }: - mkDerivation { - pname = "lucid"; - version = "2.9.7"; - sha256 = "a087af27ad196e3a41ccb6b954a12d384589a14b2ac55614e6a27817f65e0608"; - libraryHaskellDepends = [ - base blaze-builder bytestring containers hashable mmorph mtl text - transformers unordered-containers - ]; - testHaskellDepends = [ - base bifunctors hspec HUnit mtl parsec text - ]; - benchmarkHaskellDepends = [ - base blaze-builder bytestring criterion deepseq text - ]; - homepage = "https://github.com/chrisdone/lucid"; - description = "Clear to write, read and edit DSL for HTML"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "lucid_2_9_8_1" = callPackage ({ mkDerivation, base, bifunctors, blaze-builder, bytestring , containers, criterion, deepseq, hashable, hspec, HUnit, mmorph , mtl, parsec, text, transformers, unordered-containers @@ -117520,7 +118458,6 @@ self: { homepage = "https://github.com/chrisdone/lucid"; description = "Clear to write, read and edit DSL for HTML"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "lucid-foundation" = callPackage @@ -118021,18 +118958,18 @@ self: { }) {}; "machinecell" = callPackage - ({ mkDerivation, arrows, base, free, hspec, mtl, profunctors - , QuickCheck, semigroups, transformers + ({ mkDerivation, base, free, hspec, mtl, profunctors, QuickCheck + , semigroups, transformers }: mkDerivation { pname = "machinecell"; - version = "3.3.1"; - sha256 = "5911832fa471797e5cbc5b4c98c1078f0bad799ba8cb33dbf0e19c6fae35619c"; + version = "3.3.2"; + sha256 = "6625464ab50569d1c8bf285f7ae360ff46bd9b282fa512e77d94f19822b15f3e"; libraryHaskellDepends = [ - arrows base free mtl profunctors semigroups transformers + base free mtl profunctors semigroups transformers ]; testHaskellDepends = [ - arrows base hspec mtl profunctors QuickCheck semigroups + base hspec mtl profunctors QuickCheck semigroups ]; homepage = "http://github.com/as-capabl/machinecell"; description = "Arrow based stream transducers"; @@ -118104,8 +119041,8 @@ self: { }: mkDerivation { pname = "machines-directory"; - version = "0.2.0.10"; - sha256 = "2ee750f86d1658635095c35e94799d06a921e641bf4daa55676fd06e8e9a98a4"; + version = "0.2.1.0"; + sha256 = "849c07db6ff6cfd88348d228a7a3f8ccb16e99568230ee0d20faa5670474deb4"; libraryHaskellDepends = [ base directory filepath machines machines-io transformers ]; @@ -118243,19 +119180,19 @@ self: { }) {}; "madlang" = callPackage - ({ mkDerivation, ansi-wl-pprint, base, gitrev, hspec + ({ mkDerivation, ansi-wl-pprint, base, containers, hspec , hspec-megaparsec, lens, megaparsec, mtl, mwc-random - , optparse-generic, text + , optparse-applicative, text }: mkDerivation { pname = "madlang"; - version = "1.0.0.1"; - sha256 = "edeea8b9d3cabfaf5392fbe7ad307754e20fe8ef90294b5a846c9a7f8edb5af8"; + version = "2.0.0.1"; + sha256 = "c7723b24bb564f3a5b4a3ab5641a4264005476bf59d19d91ee074c92f5ee62bf"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ - ansi-wl-pprint base gitrev lens megaparsec mtl mwc-random - optparse-generic text + ansi-wl-pprint base containers lens megaparsec mtl mwc-random + optparse-applicative text ]; executableHaskellDepends = [ base ]; testHaskellDepends = [ @@ -118531,6 +119468,17 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "make-monofoldable-foldable" = callPackage + ({ mkDerivation, base, mono-traversable }: + mkDerivation { + pname = "make-monofoldable-foldable"; + version = "0.1.0.0"; + sha256 = "2a776a84e4bb9bee57194f844eef373767b136619436f140c26a73dadc4b9aae"; + libraryHaskellDepends = [ base mono-traversable ]; + description = "Make a MonoFoldable type into an ordinary Foldable type"; + license = stdenv.lib.licenses.mit; + }) {}; + "make-package" = callPackage ({ mkDerivation, async, base, bytestring, configurator, containers , directory, filepath, github, haskeline, lens, lens-datetime, mtl @@ -119722,22 +120670,48 @@ self: { }) {eng = null; mat = null; mx = null;}; "matplotlib" = callPackage - ({ mkDerivation, aeson, base, bytestring, process, tasty - , tasty-hunit, temporary + ({ mkDerivation, ad, aeson, base, bytestring, containers, process + , random, raw-strings-qq, split, tasty, tasty-expected-failure + , tasty-golden, tasty-hunit, temporary }: mkDerivation { pname = "matplotlib"; - version = "0.1.0.0"; - sha256 = "8001811170e201741eca52a0926c78810f451b104cc1ef055779b1b7351dee0d"; + version = "0.4.1"; + sha256 = "7a0d0ac10ff394c8ee4a673dbc6454cb5218c9189d9312a4c4af64efe255b97b"; libraryHaskellDepends = [ - aeson base bytestring process temporary + aeson base bytestring containers process temporary + ]; + testHaskellDepends = [ + ad base bytestring process random raw-strings-qq split tasty + tasty-expected-failure tasty-golden tasty-hunit temporary ]; - testHaskellDepends = [ base tasty tasty-hunit temporary ]; homepage = "https://github.com/abarbu/matplotlib-haskell"; description = "Bindings to Matplotlib; a Python plotting library"; license = stdenv.lib.licenses.bsd3; }) {}; + "matplotlib_0_4_3" = callPackage + ({ mkDerivation, ad, aeson, base, bytestring, containers, process + , random, raw-strings-qq, split, tasty, tasty-expected-failure + , tasty-golden, tasty-hunit, temporary + }: + mkDerivation { + pname = "matplotlib"; + version = "0.4.3"; + sha256 = "9491d76f4dc4237c6af73bb33c31cdc6608e1fcb8fe6fb00a94f3fceb3939873"; + libraryHaskellDepends = [ + aeson base bytestring containers process temporary + ]; + testHaskellDepends = [ + ad base bytestring process random raw-strings-qq split tasty + tasty-expected-failure tasty-golden tasty-hunit temporary + ]; + homepage = "https://github.com/abarbu/matplotlib-haskell"; + description = "Bindings to Matplotlib; a Python plotting library"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "matrices" = callPackage ({ mkDerivation, base, criterion, deepseq, primitive, tasty , tasty-hunit, tasty-quickcheck, vector @@ -120248,20 +121222,21 @@ self: { ({ mkDerivation, array, async, base, binary, bytestring, cereal , conduit, conduit-combinators, conduit-extra, containers , data-default, deepseq, hspec, lens, lifted-async, monad-control - , mtl, network, parallel, primitive, process, QuickCheck, random - , resourcet, singletons, spool, stm, streaming-commons, tagged - , template-haskell, text, time, transformers, type-spec, vector + , monad-logger, mtl, network, parallel, primitive, process + , QuickCheck, random, resourcet, singletons, spool, stm + , streaming-commons, tagged, template-haskell, text, time + , transformers, type-spec, vector }: mkDerivation { pname = "mediabus"; - version = "0.2.0.2"; - sha256 = "3dd4d11c4253eebe2ff21368222661341b64e8176171fb4be77b9ee45402f7d1"; + version = "0.3.2.1"; + sha256 = "ac1fc31e78c001a3cf58b7acec59c08b83e063414650f5995e1a590cc728045d"; libraryHaskellDepends = [ array async base bytestring cereal conduit conduit-combinators conduit-extra containers data-default deepseq lens lifted-async - monad-control mtl network parallel primitive process QuickCheck - random resourcet spool stm streaming-commons tagged text time - transformers vector + monad-control monad-logger mtl network parallel primitive process + QuickCheck random resourcet spool stm streaming-commons tagged text + time transformers vector ]; testHaskellDepends = [ array async base binary bytestring conduit conduit-combinators @@ -120275,38 +121250,66 @@ self: { hydraPlatforms = [ "x86_64-darwin" "x86_64-linux" ]; }) {}; + "mediabus-fdk-aac" = callPackage + ({ mkDerivation, base, bytestring, conduit, conduit-combinators + , containers, criterion, deepseq, fdk-aac, ghc-prim, inline-c, lens + , mediabus, monad-logger, random, resourcet, spool, tagged, text + , time, transformers, vector + }: + mkDerivation { + pname = "mediabus-fdk-aac"; + version = "0.3.2.1"; + sha256 = "197213a3645fda298d0a7ff9b123445df3464e70b9f2396f093b44119cfeba15"; + libraryHaskellDepends = [ + base bytestring conduit conduit-combinators containers deepseq + inline-c lens mediabus monad-logger random resourcet spool tagged + text time transformers vector + ]; + libraryPkgconfigDepends = [ fdk-aac ]; + testHaskellDepends = [ + base conduit deepseq ghc-prim lens mediabus monad-logger vector + ]; + benchmarkHaskellDepends = [ + base conduit criterion deepseq ghc-prim lens mediabus monad-logger + vector + ]; + homepage = "https://github.com/lindenbaum/mediabus-fdk-aac"; + description = "Mediabus plugin for the Frauenhofer ISO-14496-3 AAC FDK"; + license = stdenv.lib.licenses.bsd3; + }) {fdk-aac = null;}; + "mediabus-rtp" = callPackage ({ mkDerivation, array, async, base, binary, bytestring, cereal , conduit, conduit-combinators, conduit-extra, containers , data-default, deepseq, hspec, lens, lifted-async, mediabus - , monad-control, mtl, network, parallel, primitive, process - , QuickCheck, random, resourcet, singletons, spool, stm + , monad-control, monad-logger, mtl, network, parallel, primitive + , process, QuickCheck, random, resourcet, singletons, spool, stm , streaming-commons, tagged, template-haskell, text, time , transformers, type-spec, vector }: mkDerivation { pname = "mediabus-rtp"; - version = "0.2.0.0"; - sha256 = "f802521f6f504e1ea56a2c694a216a8b92087f21aa4d493d3c6bf11d27063d27"; + version = "0.3.2.1"; + sha256 = "05752dd0721a4620ff5810c5dcbc420cc3b3a4a0a9d10402967d937e3823624d"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ array async base bytestring cereal conduit conduit-combinators conduit-extra containers data-default deepseq lens lifted-async - mediabus monad-control mtl network parallel primitive process - QuickCheck random resourcet spool stm streaming-commons tagged text - time transformers vector + mediabus monad-control monad-logger mtl network parallel primitive + process QuickCheck random resourcet spool stm streaming-commons + tagged text time transformers vector ]; executableHaskellDepends = [ async base conduit conduit-combinators conduit-extra data-default - lens lifted-async mediabus monad-control mtl parallel QuickCheck - random stm streaming-commons tagged time vector + lens lifted-async mediabus monad-control monad-logger mtl parallel + QuickCheck random stm streaming-commons tagged time vector ]; testHaskellDepends = [ array async base binary bytestring conduit conduit-combinators conduit-extra containers data-default deepseq hspec lens mediabus - monad-control mtl QuickCheck singletons spool stm tagged - template-haskell text time transformers type-spec vector + monad-control monad-logger mtl QuickCheck singletons spool stm + tagged template-haskell text time transformers type-spec vector ]; homepage = "https://github.com/lindenbaum/mediabus-rtp"; description = "Receive and Send RTP Packets"; @@ -120410,19 +121413,20 @@ self: { }) {}; "mega-sdist" = callPackage - ({ mkDerivation, base, classy-prelude-conduit, conduit-extra - , directory, filepath, http-conduit, tar-conduit, typed-process - , yaml + ({ mkDerivation, base, bytestring, classy-prelude-conduit + , conduit-extra, directory, filepath, http-conduit, optparse-simple + , tar-conduit, temporary, typed-process, yaml }: mkDerivation { pname = "mega-sdist"; - version = "0.3.0"; - sha256 = "afbfc37f2ebbf8bbe880297f784e81a63886dc14aacb2ed921d6c63c66abbf81"; + version = "0.3.0.2"; + sha256 = "f06c0decd916515b947062beb4a981fd867a15caeaa248637cdee0a83ea5b17f"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ - base classy-prelude-conduit conduit-extra directory filepath - http-conduit tar-conduit typed-process yaml + base bytestring classy-prelude-conduit conduit-extra directory + filepath http-conduit optparse-simple tar-conduit temporary + typed-process yaml ]; homepage = "https://github.com/snoyberg/mega-sdist"; description = "Handles uploading to Hackage from mega repos"; @@ -120667,6 +121671,17 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "meminfo" = callPackage + ({ mkDerivation, attoparsec, base, bytestring, containers }: + mkDerivation { + pname = "meminfo"; + version = "0.2.0.0"; + sha256 = "7da81f784616e45ea4a3b3b0f77a8425301b4c4ba0514cbe36333492f129b3d7"; + libraryHaskellDepends = [ attoparsec base bytestring containers ]; + description = "Library for reading `/proc/meminfo`"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "memis" = callPackage ({ mkDerivation, aeson, base, blaze-html, blaze-markup, bytestring , containers, directory, filemanip, filepath, http-types @@ -120764,6 +121779,22 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "memory_0_14_2" = callPackage + ({ mkDerivation, base, bytestring, deepseq, ghc-prim, tasty + , tasty-hunit, tasty-quickcheck + }: + mkDerivation { + pname = "memory"; + version = "0.14.2"; + sha256 = "e4428c76a6da8f232d96fe12a15c130fcc808d7542c2ce21744266f3cb905012"; + libraryHaskellDepends = [ base bytestring deepseq ghc-prim ]; + testHaskellDepends = [ base tasty tasty-hunit tasty-quickcheck ]; + homepage = "https://github.com/vincenthz/hs-memory"; + description = "memory and related abstraction stuff"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "memorypool" = callPackage ({ mkDerivation, base, containers, transformers, unsafe, vector }: mkDerivation { @@ -121046,6 +122077,25 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "mezzo" = callPackage + ({ mkDerivation, base, boxes, ghc-typelits-natnormalise, HCodecs + , hspec, QuickCheck, should-not-typecheck, template-haskell + }: + mkDerivation { + pname = "mezzo"; + version = "0.2.0.2"; + sha256 = "9c0c9c1933d3f8875bcf6f85fbce269c8a224947fa9e775929b298b71763a0ac"; + libraryHaskellDepends = [ + base boxes ghc-typelits-natnormalise HCodecs template-haskell + ]; + testHaskellDepends = [ + base hspec QuickCheck should-not-typecheck + ]; + homepage = "https://github.com/DimaSamoz/mezzo"; + description = "Typesafe music composition"; + license = stdenv.lib.licenses.mit; + }) {}; + "mezzolens" = callPackage ({ mkDerivation, base, containers, mtl, transformers }: mkDerivation { @@ -121177,8 +122227,8 @@ self: { ({ mkDerivation, base }: mkDerivation { pname = "microlens"; - version = "0.4.7.0"; - sha256 = "c149874a5cf038c1dde51b79b22733116817619e5ed11c7787aadb9d8ea31e26"; + version = "0.4.8.0"; + sha256 = "aa0b12717671593f7e2cd686762fb842b22bf3e5b4559e4db8863f1d30be7af5"; libraryHaskellDepends = [ base ]; homepage = "http://github.com/aelve/microlens"; description = "A tiny lens library with no dependencies. If you're writing an app, you probably want microlens-platform, not this."; @@ -121239,8 +122289,8 @@ self: { }: mkDerivation { pname = "microlens-ghc"; - version = "0.4.7.0"; - sha256 = "ef1f68645d0f62e9f108852dd0637109625703175eb571c7f183aa3244bf0cdf"; + version = "0.4.8.0"; + sha256 = "dea1ea2fa61dea6ebb431e95b36ae4e2011ddb94ad3e0693173fd41f1858697a"; libraryHaskellDepends = [ array base bytestring containers microlens transformers ]; @@ -121271,8 +122321,8 @@ self: { }: mkDerivation { pname = "microlens-platform"; - version = "0.3.7.1"; - sha256 = "e242c6f454305e5a310f7f3b4e8b3ee00158fe7160321e27a56b47ffaa2c4493"; + version = "0.3.8.0"; + sha256 = "e31b5a10962dde72e4e7c5d6136028973116abee8d0901aa934e19193f086f84"; libraryHaskellDepends = [ base hashable microlens microlens-ghc microlens-mtl microlens-th text unordered-containers vector @@ -121712,8 +122762,8 @@ self: { }: mkDerivation { pname = "mime-mail"; - version = "0.4.13"; - sha256 = "a089fd837b77b75eb36dc1749da422820d2658d0145a378e6de32f3b30b7a440"; + version = "0.4.13.1"; + sha256 = "9481671092739dab1d963c9db0dce56a0187390fb24c9badeeded6afb5895917"; libraryHaskellDepends = [ base base64-bytestring blaze-builder bytestring filepath process random text @@ -121927,18 +122977,18 @@ self: { , http-client, http-conduit, http-types, lifted-async, lifted-base , memory, monad-control, protolude, QuickCheck, resourcet, tasty , tasty-hunit, tasty-quickcheck, tasty-smallcheck, temporary, text - , time, transformers, transformers-base, xml-conduit + , text-format, time, transformers, transformers-base, xml-conduit }: mkDerivation { pname = "minio-hs"; - version = "0.1.0"; - sha256 = "7138f31251268521dd35b143dd943f87f32c3f3b7606487b8f176e4561ddf908"; + version = "0.2.1"; + sha256 = "484b7b61d479b5377ad0894c3c45f71f8d69eaa0a11664d0ae3ac7f9685035c1"; libraryHaskellDepends = [ async base bytestring case-insensitive conduit conduit-combinators conduit-extra containers cryptonite cryptonite-conduit data-default exceptions filepath http-client http-conduit http-types lifted-async lifted-base memory monad-control protolude resourcet - text time transformers transformers-base xml-conduit + text text-format time transformers transformers-base xml-conduit ]; testHaskellDepends = [ async base bytestring case-insensitive conduit conduit-combinators @@ -121946,9 +122996,10 @@ self: { directory exceptions filepath http-client http-conduit http-types lifted-async lifted-base memory monad-control protolude QuickCheck resourcet tasty tasty-hunit tasty-quickcheck tasty-smallcheck - temporary text time transformers transformers-base xml-conduit + temporary text text-format time transformers transformers-base + xml-conduit ]; - homepage = "https://github.com/donatello/minio-hs#readme"; + homepage = "https://github.com/minio/minio-hs#readme"; description = "A Minio client library, compatible with S3 like services"; license = stdenv.lib.licenses.asl20; hydraPlatforms = stdenv.lib.platforms.none; @@ -122132,6 +123183,19 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "mintty_0_1_1" = callPackage + ({ mkDerivation, base }: + mkDerivation { + pname = "mintty"; + version = "0.1.1"; + sha256 = "c87f349f1999e8dee25f636428fc1742f50bcd2b51c9288578c60c58102e9f83"; + libraryHaskellDepends = [ base ]; + homepage = "https://github.com/RyanGlScott/mintty"; + description = "A reliable way to detect the presence of a MinTTY console on Windows"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "mios" = callPackage ({ mkDerivation, base, bytestring, ghc-prim, vector }: mkDerivation { @@ -122245,6 +123309,23 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "mixed-types-num" = callPackage + ({ mkDerivation, base, convertible, hspec, hspec-smallcheck + , QuickCheck, smallcheck + }: + mkDerivation { + pname = "mixed-types-num"; + version = "0.1.0.1"; + sha256 = "9c42ecb9382ab2848eb9b9d889ed4bee1c3b25fbfba7848b639ab146112bf78e"; + libraryHaskellDepends = [ + base convertible hspec hspec-smallcheck QuickCheck smallcheck + ]; + testHaskellDepends = [ base hspec hspec-smallcheck QuickCheck ]; + homepage = "https://github.com/michalkonecny/mixed-types-num"; + description = "Alternative Prelude with numeric and logic expressions typed bottom-up"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "mkbndl" = callPackage ({ mkDerivation, base, directory, filepath, haskell98 }: mkDerivation { @@ -122812,6 +123893,25 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "monad-classes-logging" = callPackage + ({ mkDerivation, base, ghc-prim, logging-effect, monad-classes + , tasty, tasty-hunit, transformers + }: + mkDerivation { + pname = "monad-classes-logging"; + version = "0.1.0.0"; + sha256 = "beabe968a16ccc3c0d2477b2cbe8ba9e2c23b5d7ecc99f25229958580b9fe3b1"; + libraryHaskellDepends = [ + base ghc-prim logging-effect monad-classes transformers + ]; + testHaskellDepends = [ + base logging-effect monad-classes tasty tasty-hunit transformers + ]; + homepage = "https://github.com/edwardgeorge/monad-classes-logging#readme"; + description = "monad-classes based typeclass for Ollie's logging-effect LoggingT"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "monad-codec" = callPackage ({ mkDerivation, base, binary, containers, data-lens, mtl }: mkDerivation { @@ -123088,6 +124188,29 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "monad-logger_0_3_21" = callPackage + ({ mkDerivation, base, blaze-builder, 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 + }: + mkDerivation { + pname = "monad-logger"; + version = "0.3.21"; + sha256 = "878d41b5a15e08817e0ad8675ea2f1e012747027f773df7a319e05f47828e53c"; + libraryHaskellDepends = [ + base blaze-builder 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 + ]; + homepage = "https://github.com/kazu-yamamoto/logger"; + 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 }: @@ -123350,26 +124473,6 @@ self: { }) {}; "monad-peel" = callPackage - ({ mkDerivation, base, extensible-exceptions, HUnit, test-framework - , test-framework-hunit, transformers - }: - mkDerivation { - pname = "monad-peel"; - version = "0.2.1.1"; - sha256 = "f591f54910a117bba2fc963d5502de668ece69181b605cf9db353fbcfa9fe394"; - libraryHaskellDepends = [ - base extensible-exceptions transformers - ]; - testHaskellDepends = [ - base extensible-exceptions HUnit test-framework - test-framework-hunit transformers - ]; - homepage = "http://andersk.mit.edu/haskell/monad-peel/"; - description = "Lift control operations like exception catching through monad transformers"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "monad-peel_0_2_1_2" = callPackage ({ mkDerivation, base, extensible-exceptions, HUnit, test-framework , test-framework-hunit, transformers }: @@ -123387,7 +124490,6 @@ self: { homepage = "http://andersk.mit.edu/haskell/monad-peel/"; description = "Lift control operations like exception catching through monad transformers"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "monad-primitive" = callPackage @@ -123440,18 +124542,6 @@ self: { }) {}; "monad-skeleton" = callPackage - ({ mkDerivation, base, containers, ghc-prim }: - mkDerivation { - pname = "monad-skeleton"; - version = "0.1.2.2"; - sha256 = "b1cc4f0b9e308374c76902942b8381e0af869b0915735d380f792bb11e362de3"; - libraryHaskellDepends = [ base containers ghc-prim ]; - homepage = "https://github.com/fumieval/monad-skeleton"; - description = "An undead monad"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "monad-skeleton_0_1_3" = callPackage ({ mkDerivation, base }: mkDerivation { pname = "monad-skeleton"; @@ -123461,6 +124551,18 @@ self: { homepage = "https://github.com/fumieval/monad-skeleton"; description = "Monads of program skeleta"; license = stdenv.lib.licenses.bsd3; + }) {}; + + "monad-skeleton_0_1_3_2" = callPackage + ({ mkDerivation, base }: + mkDerivation { + pname = "monad-skeleton"; + version = "0.1.3.2"; + sha256 = "2564f0a1124f0def0684cf25ad0e29de0e6b485b544590817374967045cb81b1"; + libraryHaskellDepends = [ base ]; + homepage = "https://github.com/fumieval/monad-skeleton"; + description = "Monads of program skeleta"; + license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; }) {}; @@ -124134,30 +125236,6 @@ self: { }) {}; "mono-traversable" = callPackage - ({ mkDerivation, base, bytestring, containers, criterion, foldl - , hashable, hspec, HUnit, mwc-random, QuickCheck, semigroups, split - , text, transformers, unordered-containers, vector - , vector-algorithms - }: - mkDerivation { - pname = "mono-traversable"; - version = "1.0.1.3"; - sha256 = "2861eca0d69c759b02cb7e9669b7a3f8a6b0ede2d96984cba295b69bc9c70a72"; - libraryHaskellDepends = [ - base bytestring containers hashable split text transformers - unordered-containers vector vector-algorithms - ]; - testHaskellDepends = [ - base bytestring containers foldl hspec HUnit QuickCheck semigroups - text transformers unordered-containers vector - ]; - benchmarkHaskellDepends = [ base criterion mwc-random vector ]; - homepage = "https://github.com/snoyberg/mono-traversable"; - description = "Type classes for mapping, folding, and traversing monomorphic containers"; - license = stdenv.lib.licenses.mit; - }) {}; - - "mono-traversable_1_0_2" = callPackage ({ mkDerivation, base, bytestring, containers, criterion, foldl , hashable, hspec, HUnit, mwc-random, QuickCheck, semigroups, split , text, transformers, unordered-containers, vector @@ -124179,7 +125257,6 @@ self: { homepage = "https://github.com/snoyberg/mono-traversable"; description = "Type classes for mapping, folding, and traversing monomorphic containers"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "mono-traversable-instances" = callPackage @@ -129700,6 +130777,139 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "nomyx-api" = callPackage + ({ mkDerivation, aeson, base, bytestring, containers, either + , hslogger, lens, mtl, network-uri, nomyx-core, nomyx-language + , QuickCheck, resourcet, safe, servant, servant-client + , servant-server, servant-swagger, split, stm, swagger2, text + , transformers, wai, wai-cors, wai-extra, warp, yaml + }: + mkDerivation { + pname = "nomyx-api"; + version = "0.1.0"; + sha256 = "2ed761b1bf0ecc4b9892e98d41aa458a88102217a6fcaea3b217a6bc0462a3b8"; + libraryHaskellDepends = [ + aeson base bytestring containers either hslogger lens mtl + network-uri nomyx-core nomyx-language QuickCheck resourcet safe + servant servant-client servant-server servant-swagger split stm + swagger2 text transformers wai wai-cors wai-extra warp yaml + ]; + homepage = "http://www.nomyx.net"; + description = "REST API for Nomyx"; + license = stdenv.lib.licenses.bsd3; + }) {}; + + "nomyx-core" = callPackage + ({ mkDerivation, acid-state, aeson, base, blaze-html, blaze-markup + , bytestring, Cabal, DebugTraceHelpers, deepseq, directory + , either-unwrap, exceptions, filepath, HaskellNet, HaskellNet-SSL + , hint, hint-server, hscolour, hslogger, imprevu, ixset, lens + , mime-mail, MissingH, mtl, network, nomyx-language, nomyx-library + , NoTrace, old-locale, random, safe, safecopy, shortcut, stm, tar + , template-haskell, temporary, text, time, unix, yaml + }: + mkDerivation { + pname = "nomyx-core"; + version = "1.0.0"; + sha256 = "a28504ddf5858cb710c54828cf1b9531ca7471bc4f918aab5c48a590c424b931"; + libraryHaskellDepends = [ + acid-state aeson base blaze-html blaze-markup bytestring + DebugTraceHelpers deepseq directory either-unwrap exceptions + filepath HaskellNet HaskellNet-SSL hint hint-server hscolour + hslogger imprevu ixset lens mime-mail MissingH mtl network + nomyx-language nomyx-library NoTrace old-locale random safe + safecopy shortcut stm tar template-haskell temporary text time unix + yaml + ]; + testHaskellDepends = [ base Cabal ]; + homepage = "http://www.nomyx.net"; + description = "A Nomic game in haskell"; + license = stdenv.lib.licenses.bsd3; + }) {}; + + "nomyx-language" = callPackage + ({ mkDerivation, base, Boolean, containers, DebugTraceHelpers, ghc + , imprevu, lens, monad-loops, mtl, old-locale, random, safe + , shortcut, text, time, time-recurrence + }: + mkDerivation { + pname = "nomyx-language"; + version = "1.0.0"; + sha256 = "131200f5c2b0b1893d29a697ae2e80108e0f99b3b5d20d4324cc3b2b207839bd"; + libraryHaskellDepends = [ + base Boolean containers DebugTraceHelpers ghc imprevu lens + monad-loops mtl old-locale random safe shortcut text time + time-recurrence + ]; + homepage = "http://www.nomyx.net"; + description = "Language to express rules for Nomic"; + license = stdenv.lib.licenses.bsd3; + }) {}; + + "nomyx-library" = callPackage + ({ mkDerivation, base, containers, ghc, lens, mtl, nomyx-language + , old-locale, safe, shortcut, time, time-recurrence + }: + mkDerivation { + pname = "nomyx-library"; + version = "1.0.0"; + sha256 = "14d7ce8365492bb5aa3d7581d4fe629f7f56d9bcbd26f82608e5e1dcb53a64e9"; + libraryHaskellDepends = [ + base containers ghc lens mtl nomyx-language old-locale safe + shortcut time time-recurrence + ]; + homepage = "http://www.nomyx.net"; + description = "Library of rules for Nomyx"; + license = stdenv.lib.licenses.bsd3; + }) {}; + + "nomyx-server" = callPackage + ({ mkDerivation, base, Cabal, directory, exceptions, filepath + , hslogger, imprevu, lens, mtl, network, nomyx-api, nomyx-core + , nomyx-language, nomyx-library, nomyx-web, safe, stm, time + }: + mkDerivation { + pname = "nomyx-server"; + version = "1.0.0"; + sha256 = "601a55a28842a8e4fdad53e7cdf20fd79a817a4c27978db802098b7256a95218"; + isLibrary = false; + isExecutable = true; + executableHaskellDepends = [ + base directory exceptions filepath hslogger imprevu lens mtl + network nomyx-api nomyx-core nomyx-language nomyx-library nomyx-web + safe stm time + ]; + testHaskellDepends = [ base Cabal ]; + homepage = "http://www.nomyx.net"; + description = "A Nomic game in haskell"; + license = stdenv.lib.licenses.bsd3; + }) {}; + + "nomyx-web" = callPackage + ({ mkDerivation, acid-state, base, blaze-html, blaze-markup + , bytestring, filepath, happstack-authenticate, happstack-server + , hscolour, HTTP, http-types, imprevu, imprevu-happstack, jmacro + , lens, mtl, nomyx-auth, nomyx-core, nomyx-language, old-locale + , reform, reform-blaze, reform-happstack, safe, split, stm, text + , time, web-routes, web-routes-happstack, web-routes-th + }: + mkDerivation { + pname = "nomyx-web"; + version = "1.0.0"; + sha256 = "387d235cd62d3ff11a2576a2ad2f20aff0853a2d880c7a2809f28f5dc79eacda"; + libraryHaskellDepends = [ + acid-state base blaze-html blaze-markup bytestring filepath + happstack-authenticate happstack-server hscolour HTTP http-types + imprevu imprevu-happstack jmacro lens mtl nomyx-auth nomyx-core + nomyx-language old-locale reform reform-blaze reform-happstack safe + split stm text time web-routes web-routes-happstack web-routes-th + ]; + homepage = "http://www.nomyx.net"; + description = "Web gui for Nomyx"; + license = stdenv.lib.licenses.bsd3; + broken = true; + }) {nomyx-auth = null;}; + "non-empty" = callPackage ({ mkDerivation, base, containers, deepseq, QuickCheck, utility-ht }: @@ -129887,6 +131097,21 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "normalize-imports" = callPackage + ({ mkDerivation, base, hspec }: + mkDerivation { + pname = "normalize-imports"; + version = "0.1.0"; + sha256 = "34cdd6f575cbc98419a1c31e7d8390494ea9708915811aa9d0d1d556f9945264"; + isLibrary = false; + isExecutable = true; + executableHaskellDepends = [ base ]; + testHaskellDepends = [ base hspec ]; + homepage = "https://github.com/qoelet/normalize-imports#readme"; + description = "Sort and align Haskell import statements"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "not-gloss" = callPackage ({ mkDerivation, base, binary, bmp, bytestring, GLUT, OpenGL , OpenGLRaw, spatial-math, time, vector, vector-binary-instances @@ -131378,8 +132603,8 @@ self: { }: mkDerivation { pname = "one-liner"; - version = "0.8"; - sha256 = "83831911ce829082bff57e5596bbb23947a153cd5ad6dd90f02b3152faf22ea6"; + version = "0.8.1"; + sha256 = "b9136bd0502b2fb1ec171b1cc2b8b2dff4fe3f42e8ae9e7e49306e2bb4624455"; libraryHaskellDepends = [ base bifunctors contravariant ghc-prim profunctors tagged transformers @@ -132558,7 +133783,7 @@ self: { license = stdenv.lib.licenses.mit; }) {}; - "optparse-applicative" = callPackage + "optparse-applicative_0_13_1_0" = callPackage ({ mkDerivation, ansi-wl-pprint, base, process, QuickCheck , transformers, transformers-compat }: @@ -132573,6 +133798,41 @@ self: { homepage = "https://github.com/pcapriotti/optparse-applicative"; description = "Utilities and combinators for parsing command line options"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + + "optparse-applicative" = callPackage + ({ mkDerivation, ansi-wl-pprint, base, process, QuickCheck + , transformers, transformers-compat + }: + mkDerivation { + pname = "optparse-applicative"; + version = "0.13.2.0"; + sha256 = "5c83cfce7e53f4d3b1f5d53f082e7e61959bf14e6be704c698c3ab7f1b956ca2"; + libraryHaskellDepends = [ + ansi-wl-pprint base process transformers transformers-compat + ]; + testHaskellDepends = [ base QuickCheck ]; + homepage = "https://github.com/pcapriotti/optparse-applicative"; + description = "Utilities and combinators for parsing command line options"; + license = stdenv.lib.licenses.bsd3; + }) {}; + + "optparse-applicative-simple" = callPackage + ({ mkDerivation, attoparsec, attoparsec-data, base-prelude + , optparse-applicative, rerebase, text + }: + mkDerivation { + pname = "optparse-applicative-simple"; + version = "1"; + sha256 = "8708357dbaef4aff4024342011bfc36219ad325148d707c2dad51f88aefc8f65"; + libraryHaskellDepends = [ + attoparsec base-prelude optparse-applicative text + ]; + testHaskellDepends = [ attoparsec-data rerebase ]; + homepage = "https://github.com/nikita-volkov/optparse-applicative-simple"; + description = "Simple command line interface arguments parser"; + license = stdenv.lib.licenses.mit; }) {}; "optparse-declarative" = callPackage @@ -135372,8 +136632,8 @@ self: { pname = "path"; version = "0.5.12"; sha256 = "52f0dae7e3d72d26fa62ff55de65b6697744dd0c5b96f48625cb00df1cf1055d"; - revision = "1"; - editedCabalFile = "540d42d3ea3169520a788d6771a3f907f01e5410bd87deea8bb57cb76b536ca0"; + revision = "2"; + editedCabalFile = "b4b398831f283efea1eb8dd53cb41ddf0c0fe25eab8b809f82f463a7d72496b9"; libraryHaskellDepends = [ aeson base deepseq exceptions filepath hashable template-haskell ]; @@ -135384,6 +136644,23 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "path_0_5_13" = callPackage + ({ mkDerivation, aeson, base, bytestring, deepseq, exceptions + , filepath, hashable, hspec, mtl, template-haskell + }: + mkDerivation { + pname = "path"; + version = "0.5.13"; + sha256 = "1968303e1632499890c3c760ade68e91e848cb45de552090d86e6c75b93e7d51"; + libraryHaskellDepends = [ + aeson base deepseq exceptions filepath hashable template-haskell + ]; + testHaskellDepends = [ aeson base bytestring filepath hspec mtl ]; + description = "Support for well-typed paths"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "path-extra" = callPackage ({ mkDerivation, base, exceptions, path }: mkDerivation { @@ -136467,42 +137744,6 @@ self: { }) {}; "persistent" = callPackage - ({ mkDerivation, aeson, attoparsec, base, base64-bytestring - , blaze-html, blaze-markup, bytestring, conduit, containers - , exceptions, fast-logger, hspec, http-api-data, lifted-base - , monad-control, monad-logger, mtl, old-locale, path-pieces - , resource-pool, resourcet, scientific, silently, tagged - , template-haskell, text, time, transformers, transformers-base - , unordered-containers, vector - }: - mkDerivation { - pname = "persistent"; - version = "2.6"; - sha256 = "42423362de94599581d18be644ba77181e87417087b3953daec2e8512d408e3e"; - revision = "2"; - editedCabalFile = "34e03865c3d882d04c3a03e289007cd6a8669b941b5fdac27c2628a2d976b2b6"; - libraryHaskellDepends = [ - aeson attoparsec base base64-bytestring blaze-html blaze-markup - bytestring conduit containers exceptions fast-logger http-api-data - lifted-base monad-control monad-logger mtl old-locale path-pieces - resource-pool resourcet scientific silently tagged template-haskell - text time transformers transformers-base unordered-containers - vector - ]; - testHaskellDepends = [ - aeson attoparsec base base64-bytestring blaze-html bytestring - conduit containers fast-logger hspec http-api-data lifted-base - monad-control monad-logger mtl old-locale path-pieces resource-pool - resourcet scientific tagged template-haskell text time transformers - unordered-containers vector - ]; - homepage = "http://www.yesodweb.com/book/persistent"; - description = "Type-safe, multi-backend data serialization"; - license = stdenv.lib.licenses.mit; - maintainers = with stdenv.lib.maintainers; [ psibi ]; - }) {}; - - "persistent_2_6_1" = callPackage ({ mkDerivation, aeson, attoparsec, base, base64-bytestring , blaze-html, blaze-markup, bytestring, conduit, containers , exceptions, fast-logger, hspec, http-api-data, lifted-base @@ -136533,7 +137774,6 @@ self: { homepage = "http://www.yesodweb.com/book/persistent"; description = "Type-safe, multi-backend data serialization"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; maintainers = with stdenv.lib.maintainers; [ psibi ]; }) {}; @@ -136697,28 +137937,6 @@ self: { }) {}; "persistent-mysql" = callPackage - ({ mkDerivation, aeson, base, blaze-builder, bytestring, conduit - , containers, monad-control, monad-logger, mysql, mysql-simple - , persistent, resource-pool, resourcet, text, transformers - }: - mkDerivation { - pname = "persistent-mysql"; - version = "2.6"; - sha256 = "a34c9f34feab49af156870a4c09df98d9cda54a3dd08944e3e0d326e86993be7"; - revision = "2"; - editedCabalFile = "58089479bffd093a76438ed244837a885f9b0a78fa814c92d3a6aad86ed3d206"; - libraryHaskellDepends = [ - aeson base blaze-builder bytestring conduit containers - monad-control monad-logger mysql mysql-simple persistent - resource-pool resourcet text transformers - ]; - homepage = "http://www.yesodweb.com/book/persistent"; - description = "Backend for the persistent library using MySQL database server"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - - "persistent-mysql_2_6_0_1" = callPackage ({ mkDerivation, aeson, base, blaze-builder, bytestring, conduit , containers, monad-control, monad-logger, mysql, mysql-simple , persistent, resource-pool, resourcet, text, transformers @@ -136774,27 +137992,6 @@ self: { }) {}; "persistent-postgresql" = callPackage - ({ mkDerivation, aeson, base, blaze-builder, bytestring, conduit - , containers, monad-control, monad-logger, persistent - , postgresql-libpq, postgresql-simple, resource-pool, resourcet - , text, time, transformers - }: - mkDerivation { - pname = "persistent-postgresql"; - version = "2.6"; - sha256 = "d640eecc5c8528c5ab42f08a01b74d409ca2b8e67259f477f3cd3686bc3aaae2"; - libraryHaskellDepends = [ - aeson base blaze-builder bytestring conduit containers - monad-control monad-logger persistent postgresql-libpq - postgresql-simple resource-pool resourcet text time transformers - ]; - homepage = "http://www.yesodweb.com/book/persistent"; - description = "Backend for the persistent library using postgresql"; - license = stdenv.lib.licenses.mit; - maintainers = with stdenv.lib.maintainers; [ psibi ]; - }) {}; - - "persistent-postgresql_2_6_1" = callPackage ({ mkDerivation, aeson, base, blaze-builder, bytestring, conduit , containers, monad-control, monad-logger, persistent , postgresql-libpq, postgresql-simple, resource-pool, resourcet @@ -136812,7 +138009,6 @@ self: { homepage = "http://www.yesodweb.com/book/persistent"; description = "Backend for the persistent library using postgresql"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; maintainers = with stdenv.lib.maintainers; [ psibi ]; }) {}; @@ -136910,33 +138106,6 @@ self: { }) {}; "persistent-sqlite" = callPackage - ({ mkDerivation, aeson, base, bytestring, conduit, containers - , hspec, monad-control, monad-logger, old-locale, persistent - , persistent-template, resource-pool, resourcet, temporary, text - , time, transformers - }: - mkDerivation { - pname = "persistent-sqlite"; - version = "2.6.0.1"; - sha256 = "84df1475478f8c4aa7790152c89ffca43a08a32cd933e4062cb219a023e4768c"; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ - aeson base bytestring conduit containers monad-control monad-logger - old-locale persistent resource-pool resourcet text time - transformers - ]; - testHaskellDepends = [ - base hspec persistent persistent-template temporary text time - transformers - ]; - homepage = "http://www.yesodweb.com/book/persistent"; - description = "Backend for the persistent library using sqlite3"; - license = stdenv.lib.licenses.mit; - maintainers = with stdenv.lib.maintainers; [ psibi ]; - }) {}; - - "persistent-sqlite_2_6_2" = callPackage ({ mkDerivation, aeson, base, bytestring, conduit, containers , hspec, microlens-th, monad-control, monad-logger, old-locale , persistent, persistent-template, resource-pool, resourcet @@ -136960,37 +138129,10 @@ self: { homepage = "http://www.yesodweb.com/book/persistent"; description = "Backend for the persistent library using sqlite3"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; maintainers = with stdenv.lib.maintainers; [ psibi ]; }) {}; "persistent-template" = callPackage - ({ mkDerivation, aeson, aeson-compat, base, bytestring, containers - , ghc-prim, hspec, http-api-data, monad-control, monad-logger - , path-pieces, persistent, QuickCheck, tagged, template-haskell - , text, transformers, unordered-containers - }: - mkDerivation { - pname = "persistent-template"; - version = "2.5.1.6"; - sha256 = "f88a8735173ba197f8d698a9c1fd5c649234fd60efe493f401432926a55e7b44"; - revision = "2"; - editedCabalFile = "18eae1801d9742facf54aada319dfde737a1cc758b39bb2f237a4d15c98b65c6"; - libraryHaskellDepends = [ - aeson aeson-compat base bytestring containers ghc-prim - http-api-data monad-control monad-logger path-pieces persistent - tagged template-haskell text transformers unordered-containers - ]; - testHaskellDepends = [ - aeson base bytestring hspec persistent QuickCheck text transformers - ]; - homepage = "http://www.yesodweb.com/book/persistent"; - description = "Type-safe, non-relational, multi-backend persistence"; - license = stdenv.lib.licenses.mit; - maintainers = with stdenv.lib.maintainers; [ psibi ]; - }) {}; - - "persistent-template_2_5_2" = callPackage ({ mkDerivation, aeson, aeson-compat, base, bytestring, containers , ghc-prim, hspec, http-api-data, monad-control, monad-logger , path-pieces, persistent, QuickCheck, tagged, template-haskell @@ -137011,7 +138153,6 @@ self: { homepage = "http://www.yesodweb.com/book/persistent"; description = "Type-safe, non-relational, multi-backend persistence"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; maintainers = with stdenv.lib.maintainers; [ psibi ]; }) {}; @@ -138021,10 +139162,8 @@ self: { }: mkDerivation { pname = "pipes-aeson"; - version = "0.4.1.7"; - sha256 = "c7cfb199fe3160e3b87f70017050dec94451a4cbc56d3956c91ca007ce5cb8cd"; - revision = "1"; - editedCabalFile = "7ce776e074de974988cd06b5b26062b4f5f1647c07fc2ecdd2992c482c0d286d"; + version = "0.4.1.8"; + sha256 = "350411f492fefa8d5a2554e7521d22b7ee88bacbea9d27c0d22468f6355ebe75"; libraryHaskellDepends = [ aeson attoparsec base bytestring pipes pipes-attoparsec pipes-bytestring pipes-parse transformers @@ -138062,10 +139201,8 @@ self: { }: mkDerivation { pname = "pipes-attoparsec"; - version = "0.5.1.4"; - sha256 = "fab0a84f9f81e6ae06eae85fd895f0cb8c698723cab7f33addaf5d14cd553507"; - revision = "1"; - editedCabalFile = "c90218d8e50e98ed17267f3f96a6e0382fd20c6143892470a6eeb6eda4f34edd"; + version = "0.5.1.5"; + sha256 = "fe9eb446289dbc4c4acdde39620877b885417990d9774f622fa9d1daa591cafd"; libraryHaskellDepends = [ attoparsec base bytestring pipes pipes-parse text transformers ]; @@ -138138,6 +139275,23 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "pipes-break" = callPackage + ({ mkDerivation, base, bytestring, mtl, pipes, pipes-group + , pipes-parse, QuickCheck, text + }: + mkDerivation { + pname = "pipes-break"; + version = "0.2.0.6"; + sha256 = "c75a9c0707475e9f127f2820d8b04c7858648e503454c496470c575499f098b2"; + libraryHaskellDepends = [ + base bytestring pipes pipes-group pipes-parse text + ]; + testHaskellDepends = [ base bytestring mtl pipes QuickCheck ]; + homepage = "https://github.com/mindreader/pipes-break"; + description = "Pipes to group by any delimiter (such as lines with carriage returns)"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "pipes-bytestring" = callPackage ({ mkDerivation, base, bytestring, pipes, pipes-group, pipes-parse , transformers @@ -138594,8 +139748,8 @@ self: { }: mkDerivation { pname = "pipes-lines"; - version = "1.0.3.1"; - sha256 = "6781737f9686f4e53d48eabffe8079b3cc608a4603da98ebdb34d34bf24a1efc"; + version = "1.0.3.4"; + sha256 = "41bf6e9aa081ad26d4c9ed1c309aca5e2250ad2c60dac18a9bc45fa1eb7508ae"; libraryHaskellDepends = [ base bytestring pipes pipes-group text ]; testHaskellDepends = [ base bytestring lens mtl pipes pipes-group QuickCheck @@ -139830,8 +140984,8 @@ self: { }: mkDerivation { pname = "pointfree"; - version = "1.1.1.2"; - sha256 = "5d398b4769b47918df05ef5693c182fb5d070f75414e65e7110b98f1328ba92b"; + version = "1.1.1.3"; + sha256 = "b212674cba309fa1a09a330bd33b72bb337509c848ea1d5ec2ec3bd2c480de56"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -140095,6 +141249,18 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "polydata" = callPackage + ({ mkDerivation, base, constraint-manip, hspec, indextype }: + mkDerivation { + pname = "polydata"; + version = "0.1.0.0"; + sha256 = "1e1785b31d8fac68db19771440e564cec451a7cf0d4a8ac9f3bb634b4a2db7bb"; + libraryHaskellDepends = [ base constraint-manip indextype ]; + testHaskellDepends = [ base constraint-manip hspec indextype ]; + description = "Wrap together data and it's constraints"; + license = stdenv.lib.licenses.mit; + }) {}; + "polymap" = callPackage ({ mkDerivation, base, containers }: mkDerivation { @@ -140801,6 +141967,36 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "postgresql-binary_0_10" = callPackage + ({ mkDerivation, aeson, base, base-prelude, binary-parser + , bytestring, conversion, conversion-bytestring, conversion-text + , criterion, foldl, json-ast, loch-th, network-ip, placeholders + , postgresql-libpq, QuickCheck, quickcheck-instances, rerebase + , scientific, tasty, tasty-hunit, tasty-quickcheck + , tasty-smallcheck, text, time, transformers, uuid, vector + }: + mkDerivation { + pname = "postgresql-binary"; + version = "0.10"; + sha256 = "28816184fb287ddafcd8344f4d8cdba678be2fb29f06005cc7f597ee4386e7c6"; + libraryHaskellDepends = [ + aeson base base-prelude binary-parser bytestring foldl loch-th + network-ip placeholders scientific text time transformers uuid + vector + ]; + testHaskellDepends = [ + aeson conversion conversion-bytestring conversion-text json-ast + loch-th network-ip placeholders postgresql-libpq QuickCheck + quickcheck-instances rerebase tasty tasty-hunit tasty-quickcheck + tasty-smallcheck + ]; + benchmarkHaskellDepends = [ criterion rerebase ]; + homepage = "https://github.com/nikita-volkov/postgresql-binary"; + description = "Encoders and decoders for the PostgreSQL's binary format"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "postgresql-config" = callPackage ({ mkDerivation, aeson, base, bytestring, monad-control, mtl , postgresql-simple, resource-pool, time @@ -140922,8 +142118,8 @@ self: { }: mkDerivation { pname = "postgresql-query"; - version = "3.0.1"; - sha256 = "2e9ff10732967eabc091a0f7d45a3b9777a20ae23ab3fffb8827bae646fcc1a4"; + version = "3.1.0"; + sha256 = "32fbc4c4dc73c6338bfb58c61a2f823b6b6b0113b87735748a53a3e38ca7ba87"; libraryHaskellDepends = [ aeson attoparsec base blaze-builder bytestring containers data-default either exceptions file-embed haskell-src-meta hreader @@ -140933,7 +142129,7 @@ self: { transformers-compat type-fun ]; testHaskellDepends = [ - attoparsec base derive inflections postgresql-simple QuickCheck + attoparsec base derive postgresql-simple QuickCheck quickcheck-assertions quickcheck-instances tasty tasty-hunit tasty-quickcheck tasty-th text time ]; @@ -141106,6 +142302,22 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "postgresql-syntax" = callPackage + ({ mkDerivation, base, base-prelude, bytestring, pg_query, rerebase + , text + }: + mkDerivation { + pname = "postgresql-syntax"; + version = "0.1"; + sha256 = "f3b442738809521d312fccd8fe6cfab247da2326a2a2571018f680029e44c5f4"; + libraryHaskellDepends = [ base base-prelude bytestring text ]; + librarySystemDepends = [ pg_query ]; + testHaskellDepends = [ rerebase ]; + homepage = "https://github.com/nikita-volkov/postgresql-syntax"; + description = "PostgreSQL SQL syntax utilities"; + license = stdenv.lib.licenses.mit; + }) {pg_query = null;}; + "postgresql-transactional" = callPackage ({ mkDerivation, base, monad-control, mtl, postgresql-simple }: mkDerivation { @@ -141370,30 +142582,51 @@ self: { }) {}; "powerqueue" = callPackage - ({ mkDerivation, async, base, contravariant, hspec, stm }: + ({ mkDerivation, async, base, contravariant, hspec, stm, timespan + }: mkDerivation { pname = "powerqueue"; - version = "0.1.0.0"; - sha256 = "91835dd0495cb47b5a589703e7904104e7001597f06039f87067192fcdb8254c"; - libraryHaskellDepends = [ async base contravariant ]; + version = "0.2.0.0"; + sha256 = "d9c40dd39a57689dd2efef1f561e2ca8c771e9db5fab829df06c00795fda14f6"; + libraryHaskellDepends = [ async base contravariant timespan ]; testHaskellDepends = [ async base hspec stm ]; homepage = "https://github.com/agrafix/powerqueue#readme"; description = "A flexible job queue with exchangeable backends"; license = stdenv.lib.licenses.bsd3; }) {}; + "powerqueue-distributed" = callPackage + ({ mkDerivation, async, base, bytestring, cereal, cereal-conduit + , conduit, conduit-extra, hspec, mtl, powerqueue, stm, text + , timespan + }: + mkDerivation { + pname = "powerqueue-distributed"; + version = "0.1.0.0"; + sha256 = "fb20cbbb2cae4dc8d19b16820e04c566a3a47a61bffa785e4e0eab3f7483769f"; + libraryHaskellDepends = [ + base bytestring cereal cereal-conduit conduit conduit-extra mtl + powerqueue text timespan + ]; + testHaskellDepends = [ async base hspec powerqueue stm timespan ]; + homepage = "https://github.com/agrafix/powerqueue#readme"; + description = "A distributed worker backend for powerqueu"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "powerqueue-levelmem" = callPackage ({ mkDerivation, async, base, bytestring, cereal, criterion, dlist , filepath, focus, hspec, leveldb, leveldb-haskell, list-t - , powerqueue, snappy, stm, stm-containers, temporary, unagi-chan + , powerqueue, snappy, stm, stm-containers, temporary, timespan + , unagi-chan }: mkDerivation { pname = "powerqueue-levelmem"; - version = "0.1.0.0"; - sha256 = "b23d92c0b70b06e4168f03cdfedf7d38f12c85bcf493fb8874e66bd5ddc7ee76"; + version = "0.1.1.0"; + sha256 = "941fa5e052189a89ac445b027b59b599182c76c638050143a4dcd49d7cd677b8"; libraryHaskellDepends = [ async base bytestring cereal dlist filepath focus leveldb-haskell - list-t powerqueue stm stm-containers unagi-chan + list-t powerqueue stm stm-containers timespan unagi-chan ]; testHaskellDepends = [ async base cereal hspec powerqueue temporary @@ -141408,6 +142641,20 @@ self: { license = stdenv.lib.licenses.bsd3; }) {inherit (pkgs) leveldb; inherit (pkgs) snappy;}; + "powerqueue-sqs" = callPackage + ({ mkDerivation, aws-simple, base, powerqueue, text, timespan }: + mkDerivation { + pname = "powerqueue-sqs"; + version = "0.1.0.0"; + sha256 = "dbb927967e79c83d699691cb7fd411a180a23142aeb4cd86beade92aa3e994ab"; + libraryHaskellDepends = [ + aws-simple base powerqueue text timespan + ]; + homepage = "https://github.com/agrafix/powerqueue#readme"; + description = "A Amazon SQS backend for powerqueue"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "ppm" = callPackage ({ mkDerivation, base, mtl }: mkDerivation { @@ -141466,6 +142713,19 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "pqueue_1_3_2_2" = callPackage + ({ mkDerivation, base, deepseq, QuickCheck }: + mkDerivation { + pname = "pqueue"; + version = "1.3.2.2"; + sha256 = "27b5b57945325c0fb8b8447178ae27bfe243174da2d9b1ad38639e450b515035"; + libraryHaskellDepends = [ base deepseq ]; + testHaskellDepends = [ base deepseq QuickCheck ]; + description = "Reliable, persistent, fast priority queues"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "pqueue-mtl" = callPackage ({ mkDerivation, base, containers, ghc-prim, MaybeT, mtl , stateful-mtl, uvector @@ -142466,20 +143726,21 @@ self: { }) {}; "prizm" = callPackage - ({ mkDerivation, base, QuickCheck, test-framework - , test-framework-hunit, test-framework-quickcheck2, text + ({ mkDerivation, base, convertible, HUnit, mono-traversable + , QuickCheck, test-framework, test-framework-hunit + , test-framework-quickcheck2, text }: mkDerivation { pname = "prizm"; - version = "0.3.1.2"; - sha256 = "6909454f9aa0a10aed4dfb3d4625df3a2271bed80c1a5f6922c32387228c1758"; - libraryHaskellDepends = [ base text ]; + version = "2.0.1"; + sha256 = "2f35547b8041c51890cadfd072838140f8ed808491272e77e51b2e90097106ef"; + libraryHaskellDepends = [ base convertible mono-traversable text ]; testHaskellDepends = [ - base QuickCheck test-framework test-framework-hunit - test-framework-quickcheck2 + base convertible HUnit mono-traversable QuickCheck test-framework + test-framework-hunit test-framework-quickcheck2 ]; homepage = "https://github.com/ixmatus/prizm"; - description = "Compute with colors and differenct color spaces"; + description = "Convert colors to different color spaces, interpolate colors, and transform colors"; license = stdenv.lib.licenses.bsd3; }) {}; @@ -143280,8 +144541,8 @@ self: { }: mkDerivation { pname = "propellor"; - version = "3.4.1"; - sha256 = "b5d8f9773d4f58ab68fc036dacf7368b450e0535769bb1df28e80166cd3d2116"; + version = "4.0.0"; + sha256 = "da1b4e26e28232907d351dc7e1abe7cfcef77e31b723a49da7822557472ba074"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -145022,6 +146283,23 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "qm-interpolated-string" = callPackage + ({ mkDerivation, base, bytestring, haskell-src-meta, hspec + , template-haskell, text + }: + mkDerivation { + pname = "qm-interpolated-string"; + version = "0.1.0.0"; + sha256 = "ad1dc7b40665023d553f781e2ddb67d169db6c50595cf99ff43b013495d19ef9"; + libraryHaskellDepends = [ + base bytestring haskell-src-meta template-haskell text + ]; + testHaskellDepends = [ base hspec ]; + homepage = "https://github.com/unclechu/haskell-qm-interpolated-string"; + description = "Implementation of interpolated multiline strings"; + license = stdenv.lib.licenses.publicDomain; + }) {}; + "qr-imager" = callPackage ({ mkDerivation, aeson, base, bytestring, cryptonite, directory , haskell-qrencode, hspec, jose-jwt, JuicyPixels, lens, libqrencode @@ -145692,23 +146970,6 @@ self: { }) {}; "quickcheck-special" = callPackage - ({ mkDerivation, base, bytestring, ieee754, QuickCheck, scientific - , text - }: - mkDerivation { - pname = "quickcheck-special"; - version = "0.1.0.3"; - sha256 = "8dbe5c2cdefb35880433902402110c1d9927b96d2363df8382fb6ee7e8d3e2f7"; - libraryHaskellDepends = [ - base bytestring ieee754 QuickCheck scientific text - ]; - homepage = "https://github.com/minad/quickcheck-special#readme"; - description = "Edge cases and special values for QuickCheck Arbitrary instances"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - - "quickcheck-special_0_1_0_4" = callPackage ({ mkDerivation, base, bytestring, ieee754, QuickCheck, scientific , text }: @@ -146984,21 +148245,21 @@ self: { "rasa" = callPackage ({ mkDerivation, async, base, bifunctors, containers, data-default - , free, hspec, lens, mtl, pipes, pipes-concurrency, pipes-parse - , profunctors, QuickCheck, quickcheck-instances, text, text-lens - , transformers, yi-rope + , eve, free, hspec, lens, mtl, pipes, pipes-concurrency + , pipes-parse, profunctors, QuickCheck, quickcheck-instances, text + , text-lens, transformers, yi-rope }: mkDerivation { pname = "rasa"; - version = "0.1.10"; - sha256 = "970bd5b3dfac3a8050e2daea281d15b3b1dc499824cad392225d1e4d483527e8"; + version = "0.1.12"; + sha256 = "5ae77122fd34c6c87ec9137c7d686106ee57baaef164090c55efd2d0bbe85f21"; libraryHaskellDepends = [ - async base bifunctors containers data-default free hspec lens mtl - pipes pipes-concurrency pipes-parse profunctors text text-lens + async base bifunctors containers data-default eve free hspec lens + mtl pipes pipes-concurrency pipes-parse profunctors text text-lens transformers yi-rope ]; testHaskellDepends = [ - base hspec lens QuickCheck quickcheck-instances text yi-rope + base eve hspec lens QuickCheck quickcheck-instances text yi-rope ]; homepage = "https://github.com/ChrisPenner/rasa#readme"; description = "A modular text editor"; @@ -147048,8 +148309,8 @@ self: { }: mkDerivation { pname = "rasa-ext-cmd"; - version = "0.1.2"; - sha256 = "f328cc06d7fca6ac2bb301aaa18b057b0404319dc0072963f27a90750644b3e9"; + version = "0.1.3"; + sha256 = "91c0a74068dfda1b661be2c64bc683428eb6b8ff6456841659ebe893b6fd23ac"; libraryHaskellDepends = [ base containers data-default lens rasa text ]; @@ -147065,8 +148326,8 @@ self: { }: mkDerivation { pname = "rasa-ext-cursors"; - version = "0.1.6"; - sha256 = "c1407b36255825f4708ccffb9b04cdb1cd93da417cc2c337033b10306626390e"; + version = "0.1.7"; + sha256 = "9c28c15968615731107ff8238fca5bce281f3dd2f24cfdb2f5539ff8744fec05"; libraryHaskellDepends = [ base data-default lens mtl rasa text text-lens yi-rope ]; @@ -147082,8 +148343,8 @@ self: { }: mkDerivation { pname = "rasa-ext-files"; - version = "0.1.4"; - sha256 = "d824e1eec8ce6b92453e957c10859351c23306463b08bdcdfc5d635471147957"; + version = "0.1.5"; + sha256 = "975995a63285aeac0a4366f25994f27a429fb80891b614b78105318525c8497a"; libraryHaskellDepends = [ base data-default lens mtl rasa rasa-ext-cmd rasa-ext-views text yi-rope @@ -147098,8 +148359,8 @@ self: { ({ mkDerivation, base, lens, mtl, rasa }: mkDerivation { pname = "rasa-ext-logger"; - version = "0.1.3"; - sha256 = "8648adfd280b15ddfed693bb771745de6311bcfe3fb3066fa3ce89694a12eb5d"; + version = "0.1.4"; + sha256 = "3ec3b328893895debaa4e4bdf90f9c62dd2523c3bf22d4435a078a84dd5c63f3"; libraryHaskellDepends = [ base lens mtl rasa ]; homepage = "https://github.com/ChrisPenner/rasa/"; description = "Rasa Ext for logging state/actions"; @@ -147113,8 +148374,8 @@ self: { }: mkDerivation { pname = "rasa-ext-slate"; - version = "0.1.7"; - sha256 = "6773e509862723cc02776cd05db0dea70a179433a57ab635f37124964738d312"; + version = "0.1.8"; + sha256 = "bf1741d7059a5ea39ca48624006c5ade1e9909441d2f68c6109773fd4a983484"; libraryHaskellDepends = [ base lens mtl rasa rasa-ext-logger rasa-ext-views recursion-schemes text vty yi-rope @@ -147157,8 +148418,8 @@ self: { }: mkDerivation { pname = "rasa-ext-views"; - version = "0.1.4"; - sha256 = "5542a37a779efe0e97ecbadbed2409414c99705a9298d0dfc5915f56682e11c0"; + version = "0.1.6"; + sha256 = "f46547242b5f08a6b10aea20ee0ec471d3691fc7c7cec51d4af1a0f86a6d4024"; libraryHaskellDepends = [ base bifunctors data-default lens mtl rasa recursion-schemes yi-rope @@ -147176,8 +148437,8 @@ self: { }: mkDerivation { pname = "rasa-ext-vim"; - version = "0.1.6"; - sha256 = "e97e6d096eee5f02ed022407276653ed33657f82ef708ad8095a3caf1fddb22a"; + version = "0.1.8"; + sha256 = "fe8f447e65ad88b6dd4e0f7f14aa436dc2b1940f38886aa96eae5ed55b1a7e02"; libraryHaskellDepends = [ base data-default lens mtl rasa rasa-ext-cursors rasa-ext-files rasa-ext-views text text-lens yi-rope @@ -148146,8 +149407,10 @@ self: { ({ mkDerivation, base }: mkDerivation { pname = "readcsv"; - version = "0.1"; - sha256 = "dc30c00dd05156749ff38d42eed15c73a493fc0b66b630eab256c4e359456c88"; + version = "0.1.1"; + sha256 = "de463ca78f757a19e97ea7e1764daf4652aa6311e34de3592dfac1352ae1ddb4"; + revision = "1"; + editedCabalFile = "ba0cb06393f608d7f7cc1de9797235202bc2e766478c09bd566a864d65bb8fd1"; libraryHaskellDepends = [ base ]; homepage = "https://github.com/george-steel/readcsv"; description = "Lightweight CSV parser/emitter based on ReadP"; @@ -149291,6 +150554,8 @@ self: { pname = "regex"; version = "0.5.0.0"; sha256 = "422392384ce3986d1c5627b30c8dc9dfb05fe41044820739d11da51ff1a8c27f"; + revision = "1"; + editedCabalFile = "0ace4a3d369511cdbabee677172dd1174288af160415699626829f25c8720a91"; libraryHaskellDepends = [ array base base-compat bytestring containers hashable heredoc regex-base regex-pcre-builtin regex-tdfa regex-tdfa-text @@ -149303,6 +150568,27 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "regex_0_8_0_0" = callPackage + ({ mkDerivation, array, base, base-compat, bytestring, containers + , hashable, heredoc, regex-base, regex-tdfa, regex-tdfa-text + , template-haskell, text, time, time-locale-compat, transformers + , unordered-containers + }: + mkDerivation { + pname = "regex"; + version = "0.8.0.0"; + sha256 = "6bd9c5aefde6010c0ab1fd0ed60c969b3ade609d23553221810330d287fe9062"; + libraryHaskellDepends = [ + array base base-compat bytestring containers hashable heredoc + regex-base regex-tdfa regex-tdfa-text template-haskell text time + time-locale-compat transformers unordered-containers + ]; + homepage = "http://regex.uk"; + description = "Toolkit for regex-base"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "regex-applicative" = callPackage ({ mkDerivation, base, containers, smallcheck, tasty, tasty-hunit , tasty-smallcheck, transformers @@ -149441,28 +150727,28 @@ self: { "regex-examples" = callPackage ({ mkDerivation, array, base, base-compat, bytestring, containers , directory, hashable, heredoc, http-conduit, regex, regex-base - , regex-pcre-builtin, regex-tdfa, regex-tdfa-text, shelly - , smallcheck, tasty, tasty-hunit, tasty-smallcheck + , regex-pcre-builtin, regex-tdfa, regex-tdfa-text, regex-with-pcre + , shelly, smallcheck, tasty, tasty-hunit, tasty-smallcheck , template-haskell, text, time, time-locale-compat, transformers , unordered-containers }: mkDerivation { pname = "regex-examples"; - version = "0.5.0.0"; - sha256 = "bfc94f67d1723fd833247512549aa2e0a9d18070aaf9409feaef87388a48a1bb"; + version = "0.8.0.0"; + sha256 = "0ba7b0c30259818a48952d3218b0b89bba19979f4d2882c77e752091f654dddd"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ array base base-compat bytestring containers directory hashable heredoc http-conduit regex regex-base regex-pcre-builtin regex-tdfa - regex-tdfa-text shelly smallcheck tasty tasty-hunit + regex-tdfa-text regex-with-pcre shelly smallcheck tasty tasty-hunit tasty-smallcheck template-haskell text time time-locale-compat transformers unordered-containers ]; testHaskellDepends = [ array base base-compat bytestring containers directory hashable heredoc http-conduit regex regex-base regex-pcre-builtin regex-tdfa - regex-tdfa-text shelly smallcheck tasty tasty-hunit + regex-tdfa-text regex-with-pcre shelly smallcheck tasty tasty-hunit tasty-smallcheck template-haskell text time time-locale-compat transformers unordered-containers ]; @@ -149719,6 +151005,23 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "regex-with-pcre" = callPackage + ({ mkDerivation, base, base-compat, bytestring, containers, regex + , regex-base, regex-pcre-builtin, template-haskell, transformers + }: + mkDerivation { + pname = "regex-with-pcre"; + version = "0.8.0.0"; + sha256 = "c965675df2d1b52bc9e0f1a5df0da150f47103a41494deba0ae985b2707ecd6b"; + libraryHaskellDepends = [ + base base-compat bytestring containers regex regex-base + regex-pcre-builtin template-haskell transformers + ]; + homepage = "http://regex.uk"; + description = "Toolkit for regex-base"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "regex-xmlschema" = callPackage ({ mkDerivation, base, haskell98, parsec }: mkDerivation { @@ -150111,8 +151414,8 @@ self: { }: mkDerivation { pname = "relapse"; - version = "0.1.0.1"; - sha256 = "4e6e2bb0c4c420f184c9cc928659e3bbbbce0215f2681e7641a9a6f2eb31e631"; + version = "0.1.1.1"; + sha256 = "613a385a54ba9d9fa95562121aa0ef94614fbb984b319477e2ef49512ef1a20a"; libraryHaskellDepends = [ attoparsec base bytestring ]; testHaskellDepends = [ aeson base base16-bytestring bytestring containers include-file @@ -151066,6 +152369,8 @@ self: { pname = "req"; version = "0.2.0"; sha256 = "e64e56622f1ec06df83e2c8516effa49058b4d7196c28127ab98190cc320ebbc"; + revision = "1"; + editedCabalFile = "b37d82306c1346da0bbaa129073d8cc8d7fa86df7ae938fb45de47925b8ed6b0"; libraryHaskellDepends = [ aeson authenticate-oauth base blaze-builder bytestring case-insensitive connection data-default-class http-api-data @@ -151679,30 +152984,6 @@ self: { }) {}; "rethinkdb" = callPackage - ({ mkDerivation, aeson, async, base, base64-bytestring, binary - , bytestring, containers, criterion, data-default, doctest, mtl - , network, scientific, text, time, unordered-containers - , utf8-string, vector - }: - mkDerivation { - pname = "rethinkdb"; - version = "2.2.0.8"; - sha256 = "444938d62cba4cbe8606507e3c0abd341f45fd9acf6000102f1743ddb5a0e50f"; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ - aeson base base64-bytestring binary bytestring containers - data-default mtl network scientific text time unordered-containers - utf8-string vector - ]; - testHaskellDepends = [ base doctest ]; - benchmarkHaskellDepends = [ aeson async base criterion text ]; - homepage = "http://github.com/atnnn/haskell-rethinkdb"; - description = "A driver for RethinkDB 2.2"; - license = stdenv.lib.licenses.asl20; - }) {}; - - "rethinkdb_2_2_0_9" = callPackage ({ mkDerivation, aeson, async, base, base64-bytestring, binary , bytestring, containers, criterion, data-default, doctest, mtl , network, scientific, text, time, unordered-containers @@ -151724,7 +153005,6 @@ self: { homepage = "http://github.com/atnnn/haskell-rethinkdb"; description = "A driver for RethinkDB 2.2"; license = stdenv.lib.licenses.asl20; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "rethinkdb-client-driver" = callPackage @@ -153301,29 +154581,29 @@ self: { license = stdenv.lib.licenses.publicDomain; }) {}; - "rss-conduit_0_3_0_1" = callPackage + "rss-conduit_0_3_1_0" = callPackage ({ mkDerivation, base, bytestring, conduit, conduit-combinators - , conduit-extra, containers, data-default, hlint, lens-simple - , mono-traversable, QuickCheck, quickcheck-instances, resourcet - , safe, safe-exceptions, tasty, tasty-hunit, tasty-quickcheck, text - , time, timerep, uri-bytestring, xml-conduit, xml-types + , containers, data-default, hlint, lens-simple, mono-traversable + , QuickCheck, quickcheck-instances, resourcet, safe + , safe-exceptions, tasty, tasty-hunit, tasty-quickcheck, text, time + , timerep, uri-bytestring, xml-conduit, xml-types }: mkDerivation { pname = "rss-conduit"; - version = "0.3.0.1"; - sha256 = "d30265d4e68f7563580e6dd3a2b39c0017145d111c60def1d9667fdb6ca3aae6"; + version = "0.3.1.0"; + sha256 = "3a12df089512275e3fcf590b91e13f2c821eaef09d60829c5244c3dd94eb3cc9"; libraryHaskellDepends = [ base conduit conduit-combinators containers lens-simple mono-traversable safe safe-exceptions text time timerep uri-bytestring xml-conduit xml-types ]; testHaskellDepends = [ - base bytestring conduit conduit-extra data-default hlint + base bytestring conduit conduit-combinators data-default hlint lens-simple mono-traversable QuickCheck quickcheck-instances resourcet safe-exceptions tasty tasty-hunit tasty-quickcheck text time uri-bytestring xml-conduit xml-types ]; - description = "Streaming parser/renderer for the RSS 2.0 standard."; + description = "Streaming parser/renderer for the RSS standard"; license = stdenv.lib.licenses.publicDomain; hydraPlatforms = stdenv.lib.platforms.none; }) {}; @@ -153771,8 +155051,8 @@ self: { ({ mkDerivation, base, mtl, transformers }: mkDerivation { pname = "safe-access"; - version = "0.3.1.0"; - sha256 = "936ddafc0664e4b62f11ebb6b2c3169f06c67e107a0d8f05e27896940eb4bf9f"; + version = "0.3.2.0"; + sha256 = "346c5ab460d9011f8dce0bc7481d0baa3ddb71666528eb63b607263f62af0b6c"; libraryHaskellDepends = [ base mtl transformers ]; homepage = "http://darcs.redspline.com/safe-access"; description = "A simple environment to control access to data"; @@ -153786,8 +155066,8 @@ self: { }: mkDerivation { pname = "safe-exceptions"; - version = "0.1.4.0"; - sha256 = "c52078c8457f8233a3796f84a3ae3f336f4668a013ba935e74c7218eeb9a41a6"; + version = "0.1.5.0"; + sha256 = "70efec3691b296c7af21b01b87c838b6f54a55af63429746dad1184c08cd1a19"; libraryHaskellDepends = [ base deepseq exceptions transformers ]; testHaskellDepends = [ base hspec void ]; homepage = "https://github.com/fpco/safe-exceptions#readme"; @@ -153803,6 +155083,8 @@ self: { pname = "safe-exceptions-checked"; version = "0.1.0"; sha256 = "d807552b828de308d80805f65ee41f3e25571506b10e6b28b0b81de4aec0ca3f"; + revision = "1"; + editedCabalFile = "eb73db3a495242ccc5bea2cc4aef48e91693dcd43301ea9e531f1c0aaea4d6da"; libraryHaskellDepends = [ base deepseq safe-exceptions transformers ]; @@ -153961,8 +155243,8 @@ self: { }: mkDerivation { pname = "safecopy"; - version = "0.9.2"; - sha256 = "ba666b242653d6b23fc9bc19dfa9d4367148aeb9235baf3738b91150ac9b6ed3"; + version = "0.9.3"; + sha256 = "7ec166f50363eef698c884b3495405f1705e974c8dfaf54b9374977b334f6ec8"; libraryHaskellDepends = [ array base bytestring cereal containers old-time template-haskell text time vector @@ -155952,15 +157234,17 @@ self: { }: mkDerivation { pname = "sdl2-compositor"; - version = "1.2.0.5"; - sha256 = "233b6fa622703849d4f7d69ac2202a0787b4e1048341b09767a3b5fa2e3ee255"; + version = "1.2.0.6"; + sha256 = "32face1df14f6944165365b383cf01ea15688711395def00f02d7774bd53b014"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base lens linear lrucache QuickCheck sdl2 StateVar stm text transformers ]; - testHaskellDepends = [ base Cabal hspec hspec-core QuickCheck ]; + testHaskellDepends = [ + base Cabal hspec hspec-core lrucache QuickCheck stm + ]; description = "image compositing with sdl2 - declarative style"; license = stdenv.lib.licenses.gpl3; hydraPlatforms = stdenv.lib.platforms.none; @@ -156037,6 +157321,8 @@ self: { pname = "sdl2-ttf"; version = "1.0.0"; sha256 = "349b155e0992e2e05695d380145bdb28a9a9bd6089ca03973dca6948883fe51f"; + revision = "1"; + editedCabalFile = "d7cfd13b2e073a6c23c5433e883ab04ad527bb694e9bc2caa24050335f81e004"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base sdl2 transformers ]; @@ -156120,8 +157406,8 @@ self: { ({ mkDerivation, base, bytestring, free, mtl, text }: mkDerivation { pname = "seakale"; - version = "0.2.0.0"; - sha256 = "cdbab7220b1935ef18dd78113fd87981371492d904a1e07d2911c94dcf2b2349"; + version = "0.2.1.0"; + sha256 = "421133a7081f9b107e57cb1e055cb2b71d9ccfbb63fcb13b1b447e2ca777c72f"; libraryHaskellDepends = [ base bytestring free mtl text ]; description = "Pure SQL layer on top of other libraries"; license = stdenv.lib.licenses.bsd3; @@ -156148,8 +157434,8 @@ self: { }: mkDerivation { pname = "seakale-tests"; - version = "0.1.0.1"; - sha256 = "ac54690de63000b5492d85b4009e5e6d3baab645726e06d4f099b990ce707508"; + version = "0.1.0.2"; + sha256 = "70bc6f129086ea030f260babe3c8228ee8462720a3fef72d9071c4e0795d2c29"; libraryHaskellDepends = [ base bytestring free mtl recursion-schemes seakale ]; @@ -156186,6 +157472,19 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "search-algorithms" = callPackage + ({ mkDerivation, base, containers, doctest, hspec }: + mkDerivation { + pname = "search-algorithms"; + version = "0.1.0"; + sha256 = "4c93f0a145aefccbeee9b61e56f6c79a5a29c6398a3cff962e087d08d9ab636a"; + libraryHaskellDepends = [ base containers ]; + testHaskellDepends = [ base containers doctest hspec ]; + homepage = "https://github.com/devonhollowood/search-algorithms#readme"; + description = "Common graph search algorithms"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "sec" = callPackage ({ mkDerivation, base, template-haskell }: mkDerivation { @@ -157163,8 +158462,8 @@ self: { }: mkDerivation { pname = "serokell-util"; - version = "0.1.4.0"; - sha256 = "ab37e7b6833fa3499501c82133dfd640875326c1b0ba96df3cf7b0380c2215cf"; + version = "0.1.5.0"; + sha256 = "c8dbcdf8c6650a45fa6c5bf2a95a1d754818ac2dd276a29291fa942e831bc74a"; libraryHaskellDepends = [ acid-state aeson aeson-extra ansi-terminal base base16-bytestring base64-bytestring binary binary-orphans bytestring cereal @@ -157357,8 +158656,8 @@ self: { ({ mkDerivation, base, doctest, Glob, hspec, QuickCheck, yaml }: mkDerivation { pname = "servant-auth"; - version = "0.2.6.0"; - sha256 = "ca70089cb1560dc8b990437c3eb6ff4a8cea0aba387fc7cb7ef1bd0b9f17113d"; + version = "0.2.6.1"; + sha256 = "25c5d31edca69294229bc0aaeb359e8c97f4ba2014cb95cd55265ec7cc7fad59"; libraryHaskellDepends = [ base ]; testHaskellDepends = [ base doctest Glob hspec QuickCheck yaml ]; homepage = "http://github.com/plow-technologies/servant-auth#readme"; @@ -157374,8 +158673,8 @@ self: { }: mkDerivation { pname = "servant-auth-client"; - version = "0.2.6.0"; - sha256 = "928cd5a1e546e38f76f161332ea6591f885d62c052fd8a6cee5e4e22f35e5c36"; + version = "0.2.6.1"; + sha256 = "53855164942526c019c5b88c6b3c11ee9b80200b204b083b4313016e0960775f"; libraryHaskellDepends = [ base bytestring servant servant-auth servant-client text ]; @@ -157425,8 +158724,8 @@ self: { }: mkDerivation { pname = "servant-auth-docs"; - version = "0.2.6.0"; - sha256 = "333d3fabb345a2892aa803e5e5558356a66382032693d68e762fb95dd75cb4b2"; + version = "0.2.6.1"; + sha256 = "76c6a4e9cf4979df461de017d43df6944c837aec90bc0543b17f66ee6d280d77"; libraryHaskellDepends = [ base lens servant servant-auth servant-docs text ]; @@ -157527,8 +158826,8 @@ self: { }: mkDerivation { pname = "servant-auth-server"; - version = "0.2.6.0"; - sha256 = "d78ab2c470731d2e18f19c2b45b8cc398541cda56ba947cdb032081737c55ea8"; + version = "0.2.6.1"; + sha256 = "5a850a6c011a72a5c3fea1285122fd8f295f31591a413b977385736d3fd8b877"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -157558,6 +158857,26 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "servant-auth-swagger" = callPackage + ({ mkDerivation, base, doctest, Glob, hspec, lens, QuickCheck + , servant, servant-auth, servant-swagger, swagger2, text, yaml + }: + mkDerivation { + pname = "servant-auth-swagger"; + version = "0.2.6.1"; + sha256 = "ef8001b5f9301522264ed06fdd3ef5772c23d7ae08abe8656047ba950e461a4d"; + libraryHaskellDepends = [ + base lens servant servant-auth servant-swagger swagger2 text + ]; + testHaskellDepends = [ + base doctest Glob hspec lens QuickCheck servant servant-auth + servant-swagger swagger2 text yaml + ]; + homepage = "http://github.com/plow-technologies/servant-auth#readme"; + description = "servant-swagger/servant-auth compatibility"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "servant-auth-token" = callPackage ({ mkDerivation, aeson-injector, base, bytestring, containers, mtl , pwstore-fast, servant-auth-token-api, servant-server, text, time @@ -157565,8 +158884,8 @@ self: { }: mkDerivation { pname = "servant-auth-token"; - version = "0.4.1.1"; - sha256 = "06a2f6928bd558ad6d22542bf212ac0acdb60d68febe70eab917d37812bb3e84"; + version = "0.4.2.0"; + sha256 = "4e43edd4241521b366c9a55cfd1fce1e8f9e3963037257f3552f8c946d8ed668"; libraryHaskellDepends = [ aeson-injector base bytestring containers mtl pwstore-fast servant-auth-token-api servant-server text time transformers uuid @@ -157606,8 +158925,8 @@ self: { }: mkDerivation { pname = "servant-auth-token-api"; - version = "0.4.0.1"; - sha256 = "0850d95cc86d0893069887f2e30ed0cb22eef0bdf7f82a6d28e1c51f551e3d83"; + version = "0.4.1.1"; + sha256 = "70c5ab5e1bbd3b29e9b8dcc558d08c6688fdd4fee4412ffef964454386dadfda"; libraryHaskellDepends = [ aeson aeson-injector base lens raw-strings-qq servant servant-docs servant-swagger swagger2 text @@ -157618,6 +158937,29 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "servant-auth-token-leveldb" = callPackage + ({ mkDerivation, aeson-injector, base, bytestring, concurrent-extra + , containers, exceptions, lens, leveldb-haskell, monad-control, mtl + , resourcet, safe, safecopy-store, servant-auth-token + , servant-auth-token-api, servant-server, store, text, time + , transformers, transformers-base, uuid, vector + }: + mkDerivation { + pname = "servant-auth-token-leveldb"; + version = "0.4.1.2"; + sha256 = "516fb304f56be33491f7cc1c319acb05b30e3fb24a8c971598627a948a802fb2"; + libraryHaskellDepends = [ + aeson-injector base bytestring concurrent-extra containers + exceptions lens leveldb-haskell monad-control mtl resourcet safe + safecopy-store servant-auth-token servant-auth-token-api + servant-server store text time transformers transformers-base uuid + vector + ]; + homepage = "https://github.com/ncrashed/servant-auth-token#readme"; + description = "Leveldb backend for servant-auth-token server"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "servant-auth-token-persistent" = callPackage ({ mkDerivation, aeson-injector, base, bytestring, containers , ghc-prim, monad-control, mtl, persistent, persistent-postgresql @@ -157770,8 +159112,8 @@ self: { }: mkDerivation { pname = "servant-db-postgresql"; - version = "0.2.1.0"; - sha256 = "6f3cefb7b24bf3d4e50efe84d903e79edc936b85950cc260855af4a50ac11071"; + version = "0.2.2.0"; + sha256 = "ed718a452f4981a83ec7db630659ba802ee6ca1bf88495603abc1b7517a22e80"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -157783,6 +159125,7 @@ self: { optparse-applicative postgresql-query QuickCheck quickcheck-instances servant-db text time transformers-base ]; + homepage = "https://github.com/NCrashed/servant-db-postgresql"; description = "Derive a postgres client to database API specified by servant-db"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; @@ -158060,29 +159403,6 @@ self: { }) {}; "servant-js" = callPackage - ({ mkDerivation, base, base-compat, charset, hspec - , hspec-expectations, language-ecmascript, lens, QuickCheck - , servant, servant-foreign, text - }: - mkDerivation { - pname = "servant-js"; - version = "0.9.2"; - sha256 = "ad4676667cdd72f5bafac5c2d6de710b9c0082131b72dd117026fecb0d544369"; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ - base base-compat charset lens servant servant-foreign text - ]; - testHaskellDepends = [ - base base-compat hspec hspec-expectations language-ecmascript lens - QuickCheck servant text - ]; - homepage = "http://haskell-servant.readthedocs.org/"; - description = "Automatically derive javascript functions to query servant webservices"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "servant-js_0_9_3" = callPackage ({ mkDerivation, base, base-compat, charset, hspec , hspec-expectations, language-ecmascript, lens, QuickCheck , servant, servant-foreign, text @@ -158103,7 +159423,6 @@ self: { homepage = "http://haskell-servant.readthedocs.org/"; description = "Automatically derive javascript functions to query servant webservices"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "servant-lucid" = callPackage @@ -158372,8 +159691,8 @@ self: { }: mkDerivation { pname = "servant-quickcheck"; - version = "0.0.2.2"; - sha256 = "72878553ed9d7f134bd10e11ca7eaf69ba3d341e591aa3af4c73c43c7af866c5"; + version = "0.0.2.4"; + sha256 = "628d944e9185f3c60e7711034c7535ae2772df75cace718a744aaca478cac7c9"; libraryHaskellDepends = [ aeson base base-compat bytestring case-insensitive clock data-default-class hspec http-client http-media http-types mtl @@ -159098,6 +160417,23 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "setoid" = callPackage + ({ mkDerivation, base, containers, mtl, smallcheck, tasty + , tasty-discover, tasty-hunit, tasty-quickcheck, tasty-smallcheck + }: + mkDerivation { + pname = "setoid"; + version = "0.1.0.0"; + sha256 = "165047a4ff8b20f0fbb404ee658a42c0836f354b8bc3477b86e8ee0e430a4b3c"; + libraryHaskellDepends = [ base containers ]; + testHaskellDepends = [ + base containers mtl smallcheck tasty tasty-discover tasty-hunit + tasty-quickcheck tasty-smallcheck + ]; + description = "A Haskell implementation of setoid"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "setops" = callPackage ({ mkDerivation, base, containers }: mkDerivation { @@ -159556,6 +160892,26 @@ self: { license = stdenv.lib.licenses.asl20; }) {}; + "shake-language-c_0_10_1" = callPackage + ({ mkDerivation, base, data-default-class, directory, doctest + , fclabels, hspec, process, shake, split, unordered-containers + }: + mkDerivation { + pname = "shake-language-c"; + version = "0.10.1"; + sha256 = "ca464474f7a4d4807b6cd594bc9477549f1b17feb565f0c52c7249183d640220"; + libraryHaskellDepends = [ + base data-default-class fclabels process shake split + unordered-containers + ]; + testHaskellDepends = [ base directory doctest hspec shake ]; + doCheck = false; + homepage = "https://github.com/samplecount/shake-language-c"; + description = "Utilities for cross-compiling with Shake"; + license = stdenv.lib.licenses.asl20; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "shake-minify" = callPackage ({ mkDerivation, base, bytestring, css-text, hjsmin, shake, text }: mkDerivation { @@ -159949,7 +161305,7 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "shell-conduit_4_6_0" = callPackage + "shell-conduit_4_6_1" = callPackage ({ mkDerivation, async, base, bytestring, conduit, conduit-extra , control-monad-loop, directory, filepath, hspec , hspec-expectations, monad-control, monads-tf, process, resourcet @@ -159958,8 +161314,8 @@ self: { }: mkDerivation { pname = "shell-conduit"; - version = "4.6.0"; - sha256 = "9ce6230efb78589b5b28dd82396d73afbc832bbb8213f51c28ab6c946a9a12a1"; + version = "4.6.1"; + sha256 = "86d161f8b05ae72e5464fe4ade42443d750fc9ffbd5ba98d7d5587287076ad42"; libraryHaskellDepends = [ async base bytestring conduit conduit-extra control-monad-loop directory filepath monad-control monads-tf process resourcet @@ -160257,6 +161613,19 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "shortcut" = callPackage + ({ mkDerivation, base }: + mkDerivation { + pname = "shortcut"; + version = "0.1"; + sha256 = "0a29d75028071579ad855b592cce687fc9f0ad2e78aeaec36152082db9f92ff1"; + revision = "1"; + editedCabalFile = "87266ab5d90db03edb789b97534f17901c77b435d95a6724e7832bebef00d793"; + libraryHaskellDepends = [ base ]; + homepage = "http://www.nomyx.net"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "shortcut-links" = callPackage ({ mkDerivation, base, text }: mkDerivation { @@ -160855,8 +162224,8 @@ self: { }: mkDerivation { pname = "simple-effects"; - version = "0.7.0.1"; - sha256 = "be3d3ca1fbfc2aee432190f0e737b73478116493beb176216dcad0b1a8c0bc4d"; + version = "0.7.0.2"; + sha256 = "367158bb1e97fea1bd5f61e9390bb0a50a0ad26ab11c97c16a0fdc495be17f4c"; libraryHaskellDepends = [ array base exceptions list-t monad-control MonadRandom mtl text transformers transformers-base @@ -162937,8 +164306,8 @@ self: { ({ mkDerivation, base, blaze-html, snap-core }: mkDerivation { pname = "snap-blaze"; - version = "0.2.1.4"; - sha256 = "381a8cf8f211be77b9d52c2aa6b880e7059384fe0124c69d704040b0c016302b"; + version = "0.2.1.5"; + sha256 = "b36e35bd4ba3087b3de92702e488ba6570675719243b5dbdf4eae0b819988841"; libraryHaskellDepends = [ base blaze-html snap-core ]; homepage = "http://github.com/jaspervdj/snap-blaze"; description = "blaze-html integration for Snap"; @@ -164197,6 +165566,18 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "snipcheck" = callPackage + ({ mkDerivation, base, pandoc, process }: + mkDerivation { + pname = "snipcheck"; + version = "0.1.0.0"; + sha256 = "139097708760baee65463781237f2294f74a399832283d32756a26ab05ba846c"; + libraryHaskellDepends = [ base pandoc process ]; + homepage = "https://github.com/nmattia/snipcheck#readme"; + description = "Markdown tester"; + license = stdenv.lib.licenses.mit; + }) {}; + "snippet-extractor" = callPackage ({ mkDerivation, base, parsec }: mkDerivation { @@ -164702,21 +166083,24 @@ self: { }) {}; "solr" = callPackage - ({ mkDerivation, base, base-prelude, bytestring + ({ mkDerivation, attoparsec-data, base, base-prelude, bytestring , bytestring-tree-builder, case-insensitive, contravariant - , http-client, http-response-decoder, json-encoder - , json-incremental-decoder, matcher, profunctors, semigroups, text + , http-client, http-client-tls, http-response-decoder, json-encoder + , json-incremental-decoder, managed, matcher + , optparse-applicative-simple, profunctors, semigroups, text , transformers, uri-encode }: mkDerivation { pname = "solr"; - version = "0.3.3"; - sha256 = "5703365d767023c7dd9fe5584968655f0115a5ad6b65bf28762dfeb959ed325c"; + version = "0.4.1"; + sha256 = "b9499555ee76c3a185384570b8d207f707a9dfa7d3529f06413d76fb164f4016"; libraryHaskellDepends = [ - base base-prelude bytestring bytestring-tree-builder - case-insensitive contravariant http-client http-response-decoder - json-encoder json-incremental-decoder matcher profunctors - semigroups text transformers uri-encode + attoparsec-data base base-prelude bytestring + bytestring-tree-builder case-insensitive contravariant http-client + http-client-tls http-response-decoder json-encoder + json-incremental-decoder managed matcher + optparse-applicative-simple profunctors semigroups text + transformers uri-encode ]; homepage = "https://github.com/sannsyn/solr"; description = "A minimal Solr client library"; @@ -165364,6 +166748,20 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "speculate" = callPackage + ({ mkDerivation, base, cmdargs, containers, leancheck }: + mkDerivation { + pname = "speculate"; + version = "0.2.3"; + sha256 = "d7db98c9cf05b393469f843535e3255d6f16ab3cc82244ccdb77c25a36e9a127"; + libraryHaskellDepends = [ base cmdargs containers leancheck ]; + testHaskellDepends = [ base cmdargs containers leancheck ]; + benchmarkHaskellDepends = [ base cmdargs containers leancheck ]; + homepage = "https://github.com/rudymatela/speculate#readme"; + description = "discovery of properties about Haskell functions"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "speculation" = callPackage ({ mkDerivation, base, ghc-prim, stm, transformers }: mkDerivation { @@ -166278,6 +167676,24 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "sscan" = callPackage + ({ mkDerivation, async, base, brick, directory, filepath, microlens + , microlens-th, process, temporary, text, time, vty + }: + mkDerivation { + pname = "sscan"; + version = "0.1"; + sha256 = "47fadd088d4eb2d2580491975a4d7a7d0574ddda8576192c1c4b8b369d353bfb"; + isLibrary = false; + isExecutable = true; + executableHaskellDepends = [ + async base brick directory filepath microlens microlens-th process + temporary text time vty + ]; + description = "text UI for scanning with SANE"; + license = stdenv.lib.licenses.gpl3; + }) {}; + "sscgi" = callPackage ({ mkDerivation, attoparsec, base, bytestring, case-insensitive , containers, Glob, MonadCatchIO-mtl, mtl, transformers @@ -166548,35 +167964,6 @@ self: { }) {}; "stache" = callPackage - ({ mkDerivation, aeson, base, bytestring, containers, criterion - , deepseq, directory, exceptions, file-embed, filepath, hspec - , hspec-megaparsec, megaparsec, mtl, template-haskell, text - , unordered-containers, vector, yaml - }: - mkDerivation { - pname = "stache"; - version = "0.2.0"; - sha256 = "0952d6849a297d3ef020feaeb128be4af7d25ab97fa948eb0339a7f75d0a1831"; - revision = "2"; - editedCabalFile = "4899a9a2a56b3e2524b0166f8875f7f823419c64ec1f2a74f2ff7b6010472d01"; - libraryHaskellDepends = [ - aeson base bytestring containers deepseq directory exceptions - filepath megaparsec mtl template-haskell text unordered-containers - vector - ]; - testHaskellDepends = [ - aeson base bytestring containers file-embed hspec hspec-megaparsec - megaparsec text yaml - ]; - benchmarkHaskellDepends = [ - aeson base criterion deepseq megaparsec text - ]; - homepage = "https://github.com/stackbuilders/stache"; - description = "Mustache templates for Haskell"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "stache_0_2_1" = callPackage ({ mkDerivation, aeson, base, bytestring, containers, criterion , deepseq, directory, exceptions, file-embed, filepath, hspec , hspec-megaparsec, megaparsec, mtl, template-haskell, text @@ -166601,70 +167988,67 @@ self: { homepage = "https://github.com/stackbuilders/stache"; description = "Mustache templates for Haskell"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "stack" = callPackage ({ mkDerivation, aeson, annotated-wl-pprint, ansi-terminal, async - , attoparsec, base, base-compat, base16-bytestring - , base64-bytestring, binary, binary-tagged, blaze-builder, byteable - , bytestring, Cabal, clock, conduit, conduit-extra, containers - , cryptohash, cryptohash-conduit, deepseq, directory, either - , errors, exceptions, extra, fast-logger, file-embed, filelock - , filepath, fsnotify, generic-deriving, gitrev, hashable, hastache + , attoparsec, base, base-compat, base64-bytestring, binary + , binary-tagged, blaze-builder, bytestring, Cabal, clock, conduit + , conduit-extra, containers, cryptonite, cryptonite-conduit + , deepseq, directory, either, errors, exceptions, extra + , fast-logger, file-embed, filelock, filepath, fsnotify + , generic-deriving, gitrev, hackage-security, hashable, hastache , hit, hpack, hpc, hspec, http-client, http-client-tls - , http-conduit, http-types, lifted-async, lifted-base, microlens - , monad-control, monad-logger, monad-unlift, mono-traversable, mtl - , neat-interpolation, open-browser, optparse-applicative - , optparse-simple, path, path-io, persistent, persistent-sqlite - , persistent-template, pid1, pretty, process, project-template - , QuickCheck, regex-applicative-text, resourcet, retry, safe - , safe-exceptions, semigroups, smallcheck, split, stm, store - , streaming-commons, tar, template-haskell, temporary, text - , text-binary, text-metrics, th-reify-many, time, tls, transformers - , transformers-base, unicode-transforms, unix, unix-compat - , unordered-containers, vector, vector-binary-instances, yaml - , zip-archive, zlib + , http-conduit, http-types, lifted-async, lifted-base, memory + , microlens, microlens-mtl, monad-control, monad-logger + , monad-unlift, mono-traversable, mtl, neat-interpolation + , network-uri, open-browser, optparse-applicative, optparse-simple + , path, path-io, persistent, persistent-sqlite, persistent-template + , pid1, pretty, process, project-template, QuickCheck + , regex-applicative-text, resourcet, retry, safe, safe-exceptions + , semigroups, smallcheck, split, stm, store, streaming-commons, tar + , template-haskell, temporary, text, text-binary, text-metrics + , th-reify-many, time, tls, transformers, transformers-base + , unicode-transforms, unix, unix-compat, unordered-containers + , vector, vector-binary-instances, yaml, zip-archive, zlib }: mkDerivation { pname = "stack"; - version = "1.3.2"; - sha256 = "488b9292ea605c92f6ebf79b233e8e374d857b21053051cb44b305dad8f0d3f7"; - revision = "2"; - editedCabalFile = "c15bab02b5aa26847ce94aab4bca3ac7bbd38e7e3c56039364f70bb107cb7968"; + version = "1.4.0"; + sha256 = "f10d6f031aa0e682da3e1f61fa12b9c31f1617150b0f99f691c873a0ce19e8b6"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ aeson annotated-wl-pprint ansi-terminal async attoparsec base - base-compat base16-bytestring base64-bytestring binary - binary-tagged blaze-builder byteable bytestring Cabal clock conduit - conduit-extra containers cryptohash cryptohash-conduit deepseq - directory either errors exceptions extra fast-logger file-embed - filelock filepath fsnotify generic-deriving hashable hastache hit - hpack hpc http-client http-client-tls http-conduit http-types - lifted-async lifted-base microlens monad-control monad-logger - monad-unlift mtl open-browser optparse-applicative path path-io - persistent persistent-sqlite persistent-template pid1 pretty - process project-template regex-applicative-text resourcet retry - safe safe-exceptions semigroups split stm store streaming-commons - tar template-haskell temporary text text-binary text-metrics time - tls transformers transformers-base unicode-transforms unix - unix-compat unordered-containers vector vector-binary-instances - yaml zip-archive zlib + base-compat base64-bytestring binary binary-tagged blaze-builder + bytestring Cabal clock conduit conduit-extra containers cryptonite + cryptonite-conduit deepseq directory either errors exceptions extra + fast-logger file-embed filelock filepath fsnotify generic-deriving + hackage-security hashable hastache hit hpack hpc http-client + http-client-tls http-conduit http-types lifted-async lifted-base + memory microlens microlens-mtl monad-control monad-logger + monad-unlift mtl network-uri open-browser optparse-applicative path + path-io persistent persistent-sqlite persistent-template pid1 + pretty process project-template regex-applicative-text resourcet + retry safe safe-exceptions semigroups split stm store + streaming-commons tar template-haskell temporary text text-binary + text-metrics time tls transformers transformers-base + unicode-transforms unix unix-compat unordered-containers vector + vector-binary-instances yaml zip-archive zlib ]; executableHaskellDepends = [ - base bytestring Cabal containers directory either filelock filepath - gitrev hpack http-client lifted-base microlens monad-control - monad-logger mtl optparse-applicative optparse-simple path path-io - text transformers + base bytestring Cabal conduit containers directory either filelock + filepath gitrev hpack http-client lifted-base microlens + monad-control monad-logger mtl optparse-applicative optparse-simple + path path-io split text transformers ]; testHaskellDepends = [ attoparsec base bytestring Cabal conduit conduit-extra containers - cryptohash directory exceptions filepath hspec http-client-tls - http-conduit monad-logger mono-traversable neat-interpolation path - path-io QuickCheck resourcet retry smallcheck store - template-haskell temporary text th-reify-many transformers vector - yaml + cryptonite directory exceptions filepath hashable hspec + http-client-tls http-conduit monad-logger mono-traversable + neat-interpolation optparse-applicative path path-io QuickCheck + resourcet retry smallcheck store template-haskell temporary text + th-reify-many transformers unordered-containers vector yaml ]; doCheck = false; preCheck = "export HOME=$TMPDIR"; @@ -167924,8 +169308,8 @@ self: { ({ mkDerivation, base, stm }: mkDerivation { pname = "stm-extras"; - version = "0.1.0.1"; - sha256 = "ffa81349733b1631c1bad5ce3e5d4bcd35eb76dee10e4790fa050d40cb98e9cd"; + version = "0.1.0.2"; + sha256 = "7ebcc998326e404e4935679db87e4961412b176756603adccb91bbf946618621"; libraryHaskellDepends = [ base stm ]; homepage = "https://github.com/louispan/stm-extras#readme"; description = "Extra STM functions"; @@ -168463,30 +169847,6 @@ self: { }) {}; "stratosphere" = callPackage - ({ mkDerivation, aeson, aeson-pretty, base, bytestring, directory - , hashable, hlint, lens, tasty, tasty-hspec, template-haskell, text - , unordered-containers - }: - mkDerivation { - pname = "stratosphere"; - version = "0.4.0"; - sha256 = "27c7b48ff3f78231711eab021b4a54b82b3b58e0dfa43e02b8c41a8be9c4527d"; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ - aeson aeson-pretty base bytestring hashable lens template-haskell - text unordered-containers - ]; - testHaskellDepends = [ - aeson aeson-pretty base bytestring directory hashable hlint lens - tasty tasty-hspec template-haskell text unordered-containers - ]; - homepage = "https://github.com/frontrowed/stratosphere#readme"; - description = "EDSL for AWS CloudFormation"; - license = stdenv.lib.licenses.mit; - }) {}; - - "stratosphere_0_4_1" = callPackage ({ mkDerivation, aeson, aeson-pretty, base, bytestring, directory , hashable, hlint, lens, tasty, tasty-hspec, template-haskell, text , unordered-containers @@ -168508,7 +169868,6 @@ self: { homepage = "https://github.com/frontrowed/stratosphere#readme"; description = "EDSL for AWS CloudFormation"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "stratum-tool" = callPackage @@ -168758,8 +170117,8 @@ self: { }: mkDerivation { pname = "streaming-eversion"; - version = "0.3.1.0"; - sha256 = "39bb9f601dfe578abd11933d4707f1a031669384375f2167b3da34740f1add01"; + version = "0.3.1.1"; + sha256 = "4277a6cd32bef41230f4a74cb1786c57f9bb09b3ec57edf7acdec6c9eaa1da8d"; libraryHaskellDepends = [ base foldl pipes streaming transformers ]; @@ -168894,18 +170253,21 @@ self: { }) {}; "strelka" = callPackage - ({ mkDerivation, attoparsec, base, base-prelude, base64-bytestring - , bifunctors, bytestring, hashable, http-media, mtl, semigroups - , strelka-core, text, transformers, unordered-containers + ({ mkDerivation, attoparsec, attoparsec-data, base, base-prelude + , base64-bytestring, bifunctors, bytestring + , bytestring-tree-builder, hashable, http-media, mtl, scientific + , semigroups, strelka-core, text, text-builder, time, transformers + , unordered-containers, url-decoders }: mkDerivation { pname = "strelka"; - version = "1"; - sha256 = "a29e67ccb1929d3f1455ae80472098219ec3dc58b9b5bc9534cb61869ee831d5"; + version = "2"; + sha256 = "8273953fc6d54a7e1dc2c3f23c78c8ed6f4986c5e9a46222fc7e6831b2e24432"; libraryHaskellDepends = [ - attoparsec base base-prelude base64-bytestring bifunctors - bytestring hashable http-media mtl semigroups strelka-core text - transformers unordered-containers + attoparsec attoparsec-data base base-prelude base64-bytestring + bifunctors bytestring bytestring-tree-builder hashable http-media + mtl scientific semigroups strelka-core text text-builder time + transformers unordered-containers url-decoders ]; homepage = "https://github.com/nikita-volkov/strelka"; description = "A simple, flexible and composable web-router"; @@ -168919,8 +170281,8 @@ self: { }: mkDerivation { pname = "strelka-core"; - version = "0.1"; - sha256 = "9cccd19850c9b6afd0a544041476988520b035ec519061d7b92f1f781be69221"; + version = "0.3"; + sha256 = "94794ca8b44a7407bbf0256c01cbf703250fb5b06b1d06e32468f62147b30c3c"; libraryHaskellDepends = [ base base-prelude bifunctors bytestring hashable mtl semigroups text transformers unordered-containers @@ -168936,8 +170298,8 @@ self: { }: mkDerivation { pname = "strelka-wai"; - version = "1"; - sha256 = "b30e1e4732acb5c5db772609655a23e8311a627b788dcbcf99dce8cbb3f16137"; + version = "1.0.1"; + sha256 = "8c0de42044d5df2e8c7aa3d5c62ef973be6017baf35f9f57f104ee5794427f7d"; libraryHaskellDepends = [ base base-prelude bytestring case-insensitive http-types strelka-core text unordered-containers wai warp @@ -168959,6 +170321,20 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "strict-base" = callPackage + ({ mkDerivation, base }: + mkDerivation { + pname = "strict-base"; + version = "0.4.0.0"; + sha256 = "98e3776d1f4e5752629d1b14a38017bdcac46ae95b578ce3aa136719983c455a"; + revision = "1"; + editedCabalFile = "2ff4e43cb95eedf2995558d7fc34d19362846413dd39e6aa6a5b3ea8228fef9f"; + libraryHaskellDepends = [ base ]; + homepage = "https://github.com/minad/strict-base"; + description = "Strict versions of base data types"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "strict-base-types" = callPackage ({ mkDerivation, aeson, base, bifunctors, binary, deepseq, ghc-prim , hashable, lens, QuickCheck, strict @@ -169034,8 +170410,8 @@ self: { ({ mkDerivation, base, deepseq, extensible-exceptions }: mkDerivation { pname = "strict-io"; - version = "0.2.1"; - sha256 = "ad265e5707c8badaea8b2a89457917d38ae3cf7c19ac46bac704a81ee5777700"; + version = "0.2.2"; + sha256 = "f9a9eb58e2253d9b76c41e123d3d91ca7d26dcdb30e25dedaabd2daac30d95c9"; libraryHaskellDepends = [ base deepseq extensible-exceptions ]; description = "A library wrapping standard IO modules to provide strict IO"; license = stdenv.lib.licenses.bsd3; @@ -169668,6 +171044,33 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "stutter" = callPackage + ({ mkDerivation, attoparsec, base, bytestring, conduit + , conduit-combinators, conduit-extra, mtl, optparse-applicative + , resourcet, snipcheck, tasty, tasty-ant-xml, tasty-hunit, text + }: + mkDerivation { + pname = "stutter"; + version = "0.1.0.0"; + sha256 = "a3038e5881220d46a9403f6aca06944802b124e18fc04d78b1f7b51a64a1ca11"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + attoparsec base bytestring conduit conduit-combinators + conduit-extra mtl resourcet text + ]; + executableHaskellDepends = [ + attoparsec base conduit conduit-combinators optparse-applicative + text + ]; + testHaskellDepends = [ + attoparsec base snipcheck tasty tasty-ant-xml tasty-hunit + ]; + homepage = "https://github.com/nmattia/stutter#readme"; + description = "(Stutter Text|String)-Utterer"; + license = stdenv.lib.licenses.mit; + }) {}; + "stylish-haskell" = callPackage ({ mkDerivation, aeson, base, bytestring, containers, directory , filepath, haskell-src-exts, HUnit, mtl, optparse-applicative @@ -172731,8 +174134,8 @@ self: { }: mkDerivation { pname = "tasty-ant-xml"; - version = "1.0.4"; - sha256 = "4d91c509e0e80919d96c16eaa3ee11089b7ee7c87fbe59a947d26bf0c5aef188"; + version = "1.0.5"; + sha256 = "642d440fcce4c4025b7d33ac49d2c4f017d72397f494bae0401843bb42925436"; libraryHaskellDepends = [ base containers directory filepath generic-deriving ghc-prim mtl stm tagged tasty transformers xml @@ -172742,15 +174145,15 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "tasty-ant-xml_1_0_5" = callPackage + "tasty-ant-xml_1_1_0" = callPackage ({ mkDerivation, base, containers, directory, filepath , generic-deriving, ghc-prim, mtl, stm, tagged, tasty, transformers , xml }: mkDerivation { pname = "tasty-ant-xml"; - version = "1.0.5"; - sha256 = "642d440fcce4c4025b7d33ac49d2c4f017d72397f494bae0401843bb42925436"; + version = "1.1.0"; + sha256 = "0dfdacf8b78ed897c2943d9a4aeeb56f3e33152d19062b5008a292f8bd27d0f6"; libraryHaskellDepends = [ base containers directory filepath generic-deriving ghc-prim mtl stm tagged tasty transformers xml @@ -172852,6 +174255,28 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "tasty-discover_2_0_1" = callPackage + ({ mkDerivation, base, directory, filepath, tasty, tasty-hspec + , tasty-hunit, tasty-quickcheck, tasty-smallcheck + }: + mkDerivation { + pname = "tasty-discover"; + version = "2.0.1"; + sha256 = "b4a9be2c27ee29de6ee41bf2a43abcc5f155ef263f3ae3c48d9a5a281e78242c"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ base directory filepath ]; + executableHaskellDepends = [ base directory filepath ]; + testHaskellDepends = [ + base directory filepath tasty tasty-hspec tasty-hunit + tasty-quickcheck tasty-smallcheck + ]; + homepage = "https://github.com/lwm/tasty-discover#readme"; + description = "Test discovery for the tasty framework"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "tasty-expected-failure" = callPackage ({ mkDerivation, base, tagged, tasty }: mkDerivation { @@ -173457,35 +174882,49 @@ self: { }) {}; "tdigest" = callPackage - ({ mkDerivation, base, base-compat, binary, bytes, Cabal - , cabal-doctest, Chart, Chart-diagrams, deepseq, directory, doctest - , filepath, machines, mwc-random, optparse-applicative, parallel - , reducers, semigroups, statistics, tasty, tasty-quickcheck, time - , vector, vector-algorithms + ({ mkDerivation, base, base-compat, binary, Cabal, cabal-doctest + , deepseq, doctest, reducers, semigroupoids, semigroups, tasty + , tasty-quickcheck, vector, vector-algorithms }: mkDerivation { pname = "tdigest"; - version = "0"; - sha256 = "bfadc69c58f576831b60da5c141f66eb8e0e0ed7d7b9353e04a39cb44fde37ff"; + version = "0.1"; + sha256 = "0036b3aebe6556ced3a108579846346c9123d65c9dcd09c1d44435a64e3dc54b"; setupHaskellDepends = [ base Cabal cabal-doctest ]; libraryHaskellDepends = [ - base base-compat binary deepseq reducers semigroups vector - vector-algorithms + base base-compat binary deepseq reducers semigroupoids semigroups + vector vector-algorithms ]; testHaskellDepends = [ - base base-compat binary bytes deepseq directory doctest filepath - semigroups tasty tasty-quickcheck vector vector-algorithms - ]; - benchmarkHaskellDepends = [ - base base-compat binary Chart Chart-diagrams deepseq machines - mwc-random optparse-applicative parallel semigroups statistics time - vector vector-algorithms + 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; }) {}; + "tdigest-Chart" = callPackage + ({ mkDerivation, base, base-compat, Chart, Chart-diagrams, colour + , lens, mwc-random, semigroupoids, semigroups, statistics, tdigest + , vector + }: + mkDerivation { + pname = "tdigest-Chart"; + version = "0"; + sha256 = "74a806695cba25ebc96d80944b832d3423be4175496e319a52b6efc7c5f470a7"; + libraryHaskellDepends = [ + base base-compat Chart colour lens semigroupoids semigroups tdigest + ]; + testHaskellDepends = [ + base base-compat Chart Chart-diagrams lens mwc-random statistics + tdigest vector + ]; + homepage = "https://github.com/futurice/haskell-tdigest#readme"; + description = "Chart generation from tdigest"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "tdoc" = callPackage ({ mkDerivation, base, bytestring, template-haskell, transformers , xhtml @@ -173553,8 +174992,8 @@ self: { }: mkDerivation { pname = "telegram-api"; - version = "0.6.0.2"; - sha256 = "e5a29e558d5a5930be9c7d79cb16c66499fe12d9c5ffe663f830be683d3527f7"; + version = "0.6.1.0"; + sha256 = "8eef15f861aa178b8df0766ebf45ff6badf8cf4920af8e0d1ba31f9074cf67db"; libraryHaskellDepends = [ aeson base bytestring http-api-data http-client http-media http-types mime-types mtl servant servant-client string-conversions @@ -174733,8 +176172,8 @@ self: { }: mkDerivation { pname = "texmath"; - version = "0.9.1"; - sha256 = "cafb98d25da63bdd76f75b29bf395c9e023cf46d753db9a1534e84879cb8697e"; + version = "0.9.3"; + sha256 = "541624a64a2dee55e87ce361a66fdd3c82856437b19e2a7c113a04cb7cbc8a7e"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -174844,8 +176283,8 @@ self: { }: mkDerivation { pname = "text-builder"; - version = "0.4"; - sha256 = "0931b5988b5f86fbfe9055bb4d21fa1fceaaa8b1619aa951b53921ba2b8ce0b7"; + version = "0.4.1"; + sha256 = "63b16fe4b9ad73cfa58e5dbfe493f6955742cb079ce25dd24e128c42c4fa3321"; libraryHaskellDepends = [ base base-prelude bytestring semigroups text ]; @@ -176637,7 +178076,7 @@ self: { , gi-gtk, gi-webkit2, gtk3, haskell-gi-base, http-types, lens , mime-types, mtl, network, process, random, scientific, split , tasty, tasty-quickcheck, text, transformers, unordered-containers - , utf8-string, vector, webkit2gtk, xdg-basedir, xmonad + , utf8-string, vector, webkitgtk, xdg-basedir, xmonad , xmonad-contrib }: mkDerivation { @@ -176655,7 +178094,7 @@ self: { mime-types mtl network process random scientific split text transformers unordered-containers utf8-string vector xdg-basedir ]; - executablePkgconfigDepends = [ gtk3 webkit2gtk ]; + executablePkgconfigDepends = [ gtk3 webkitgtk ]; testHaskellDepends = [ aeson base bytestring containers dbus directory filepath gi-gdk gi-gio gi-glib gi-gtk gi-webkit2 haskell-gi-base http-types lens @@ -176667,7 +178106,7 @@ self: { description = "A desktop bar based on WebKit"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; - }) {gtk3 = pkgs.gnome3.gtk; webkit2gtk = null;}; + }) {gtk3 = pkgs.gnome3.gtk; inherit (pkgs.gnome3) webkitgtk;}; "tibetan-utils" = callPackage ({ mkDerivation, base, composition, either, hspec, hspec-megaparsec @@ -176758,14 +178197,32 @@ self: { license = stdenv.lib.licenses.gpl3; }) {}; + "tidal_0_9" = callPackage + ({ mkDerivation, base, colour, containers, hashable, hosc + , mersenne-random-pure64, mtl, parsec, safe, text, time, websockets + }: + mkDerivation { + pname = "tidal"; + version = "0.9"; + sha256 = "7578110ee03cf8716cadf16a8ee25c7e963a1b9cbf7d678dc2361a03bdabac86"; + libraryHaskellDepends = [ + base colour containers hashable hosc mersenne-random-pure64 mtl + parsec safe text time websockets + ]; + homepage = "http://tidal.lurk.org/"; + description = "Pattern language for improvised music"; + license = stdenv.lib.licenses.gpl3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "tidal-midi" = callPackage ({ mkDerivation, base, containers, PortMidi, tidal, time , transformers }: mkDerivation { pname = "tidal-midi"; - version = "0.8.2"; - sha256 = "3638e4d7f853d1a73929624ec34b2364469339b0c821567cf8b46c78971c8339"; + version = "0.9"; + sha256 = "09d0d4893f73f93439c571dbb2365f80d72a41d28fecb21ad76d51c5dee4e9c0"; libraryHaskellDepends = [ base containers PortMidi tidal time transformers ]; @@ -176924,17 +178381,18 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "time_1_8" = callPackage - ({ mkDerivation, base, deepseq, QuickCheck, tasty, tasty-hunit - , tasty-quickcheck, unix + "time_1_8_0_1" = callPackage + ({ mkDerivation, base, deepseq, QuickCheck, random, tasty + , tasty-hunit, tasty-quickcheck, unix }: mkDerivation { pname = "time"; - version = "1.8"; - sha256 = "38631adfbcd176a3f62fe3b14d9e03a44cc95e1971e4eeb7d46e1018e9e59aff"; + version = "1.8.0.1"; + sha256 = "2baa9fdc280604413ecaf9761f7fd3443fe69019eec6fdc3e0333501fe701701"; libraryHaskellDepends = [ base deepseq ]; testHaskellDepends = [ - base deepseq QuickCheck tasty tasty-hunit tasty-quickcheck unix + base deepseq QuickCheck random tasty tasty-hunit tasty-quickcheck + unix ]; homepage = "https://github.com/haskell/time"; description = "A time library"; @@ -177234,8 +178692,8 @@ self: { }: mkDerivation { pname = "time-warp"; - version = "1.1.1.1"; - sha256 = "df2721daeee24eac57f2ba1f1eff4b0f87260340537cd5e3cbe8d6c27b1094fd"; + version = "1.1.1.2"; + sha256 = "35665ccf7bd1f5be2d50b5df2c29aa4431b266d2bc7a044ec93953d833129c59"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -177248,12 +178706,6 @@ self: { streaming-commons template-haskell text text-format time time-units transformers transformers-base unordered-containers ]; - executableHaskellDepends = [ - async base binary binary-conduit conduit data-default data-msgpack - exceptions formatting hspec lens log-warper MonadRandom mtl - QuickCheck random serokell-util stm text text-format time-units - transformers - ]; testHaskellDepends = [ async base data-default data-msgpack exceptions hspec lens log-warper mtl QuickCheck random serokell-util stm text text-format @@ -177946,6 +179398,37 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "tls_1_3_10" = callPackage + ({ mkDerivation, asn1-encoding, asn1-types, async, base, bytestring + , cereal, criterion, cryptonite, data-default-class, hourglass + , memory, mtl, network, QuickCheck, tasty, tasty-quickcheck + , transformers, x509, x509-store, x509-validation + }: + mkDerivation { + pname = "tls"; + version = "1.3.10"; + sha256 = "9f057d0f40dda5ce8d0f0e0f2a06087be8007c41462c6cab19774538c35e0171"; + revision = "1"; + editedCabalFile = "34c1efff5206b28c0e67bbde8ea7d3428aafb572a623b832b08928d5bb72f9be"; + libraryHaskellDepends = [ + asn1-encoding asn1-types async base bytestring cereal cryptonite + data-default-class memory mtl network transformers x509 x509-store + x509-validation + ]; + testHaskellDepends = [ + base bytestring cereal cryptonite data-default-class hourglass mtl + QuickCheck tasty tasty-quickcheck x509 x509-validation + ]; + benchmarkHaskellDepends = [ + base bytestring criterion cryptonite data-default-class hourglass + mtl QuickCheck tasty-quickcheck x509 x509-validation + ]; + homepage = "http://github.com/vincenthz/hs-tls"; + description = "TLS/SSL protocol native implementation (Server and Client)"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "tls-debug" = callPackage ({ mkDerivation, base, bytestring, cryptonite, data-default-class , network, pem, time, tls, x509, x509-store, x509-system @@ -178887,6 +180370,18 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "transformers-continue" = callPackage + ({ mkDerivation, base, transformers }: + mkDerivation { + pname = "transformers-continue"; + version = "0.0.1"; + sha256 = "bdac850adeed1a39aec13119a2a50386e36ce250cf886a001c959375265c1840"; + libraryHaskellDepends = [ base transformers ]; + homepage = "http://github.com/nhibberd/transformers-continue"; + description = "Control flow data type and monad transformer"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "transformers-convert" = callPackage ({ mkDerivation, base, data-easy, directory, either, errors , haskell-src-exts, hlint, hspec, HUnit, QuickCheck, text @@ -178947,6 +180442,8 @@ self: { pname = "transformers-lift"; version = "0.1.0.1"; sha256 = "c29d11f58fb9b2c1011c162f8f9f98cb0f2d12ca1317f40f4c88d9881840aa74"; + revision = "1"; + editedCabalFile = "dcc6d44fa2d58bcd6da22372824833aa78a5522a0d503e224ca03e428a2f664a"; libraryHaskellDepends = [ base transformers ]; description = "Ad-hoc type classes for lifting"; license = stdenv.lib.licenses.bsd3; @@ -179633,6 +181130,26 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "tsne" = callPackage + ({ mkDerivation, base, data-default, deepseq, hspec + , normaldistribution, pipes, time + }: + mkDerivation { + pname = "tsne"; + version = "1.3.0"; + sha256 = "28583af6f0e0bf218457885ab1ae9083c26135ab81d011185ca2e2cf7ca39869"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + base data-default deepseq normaldistribution pipes + ]; + executableHaskellDepends = [ base data-default pipes time ]; + testHaskellDepends = [ base data-default hspec ]; + homepage = "https://bitbucket.org/robagar/haskell-tsne"; + description = "t-SNE"; + license = "LGPL"; + }) {}; + "tsp-viz" = callPackage ({ mkDerivation, base, gloss, stm, vector }: mkDerivation { @@ -180066,6 +181583,30 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "turtle_1_3_2" = callPackage + ({ mkDerivation, ansi-wl-pprint, async, base, bytestring, clock + , criterion, directory, doctest, foldl, hostname, managed + , optional-args, optparse-applicative, process, stm, system-fileio + , system-filepath, temporary, text, time, transformers, unix + , unix-compat + }: + mkDerivation { + pname = "turtle"; + version = "1.3.2"; + sha256 = "f8163bcc08be06883964907391b88c2da0480f4764668629f4ada908319e7b5d"; + libraryHaskellDepends = [ + ansi-wl-pprint async base bytestring clock directory foldl hostname + managed optional-args optparse-applicative process stm + system-fileio system-filepath temporary text time transformers unix + unix-compat + ]; + testHaskellDepends = [ base doctest ]; + benchmarkHaskellDepends = [ base criterion text ]; + description = "Shell programming, Haskell-style"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "turtle-options" = callPackage ({ mkDerivation, base, HUnit, optional-args, parsec, text, turtle }: @@ -181300,6 +182841,27 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "typed-streams" = callPackage + ({ mkDerivation, array, base, bytestring, criterion, generic-enum + , ghc-typelits-knownnat, make-monofoldable-foldable + , mono-traversable, vector + }: + mkDerivation { + pname = "typed-streams"; + version = "0.1.0.1"; + sha256 = "046e226e18de70e34bbaeee8e652d283ab733d87b4e305dc322f9800b51a034d"; + libraryHaskellDepends = [ + array base bytestring generic-enum ghc-typelits-knownnat + make-monofoldable-foldable mono-traversable vector + ]; + testHaskellDepends = [ + array base bytestring criterion generic-enum ghc-typelits-knownnat + make-monofoldable-foldable mono-traversable vector + ]; + description = "A stream based replacement for lists"; + license = stdenv.lib.licenses.mit; + }) {}; + "typed-wire" = callPackage ({ mkDerivation, aeson, base, bytestring, containers, directory , filepath, gitrev, HTF, http-types, mtl, optparse-applicative @@ -182526,6 +184088,8 @@ self: { pname = "union"; version = "0.1.1.1"; sha256 = "819e57439061cde958467e6a52ca9f9aeac6e61c84b8ead4f8c2489995ca44f4"; + revision = "1"; + editedCabalFile = "89e02322d70363ef5425b9c6380e5f3edab21e090d97affcb39f42bcad334c0d"; libraryHaskellDepends = [ base deepseq profunctors tagged vinyl ]; benchmarkHaskellDepends = [ base criterion deepseq lens ]; description = "Extensible type-safe unions"; @@ -182941,19 +184505,19 @@ self: { }) {}; "universum" = callPackage - ({ mkDerivation, async, base, bytestring, containers, deepseq - , exceptions, ghc-prim, hashable, microlens, microlens-mtl, mtl - , safe, stm, text, text-format, transformers, unordered-containers - , utf8-string, vector + ({ mkDerivation, base, bytestring, containers, deepseq, exceptions + , ghc-prim, hashable, microlens, microlens-mtl, mtl, safe, stm + , text, text-format, transformers, type-operators + , unordered-containers, utf8-string, vector }: mkDerivation { pname = "universum"; - version = "0.2.1"; - sha256 = "e5f8c58824cbf559fb3632ff5a00190870e254262a0f4db9dfde7bc2bc423d21"; + version = "0.3"; + sha256 = "cc5b5056e4a0c930a40bb9e015c90a3adf8d15e483d6da586fcf9ea23693acb5"; libraryHaskellDepends = [ - async base bytestring containers deepseq exceptions ghc-prim - hashable microlens microlens-mtl mtl safe stm text text-format - transformers unordered-containers utf8-string vector + base bytestring containers deepseq exceptions ghc-prim hashable + microlens microlens-mtl mtl safe stm text text-format transformers + type-operators unordered-containers utf8-string vector ]; homepage = "https://github.com/serokell/universum"; description = "Custom prelude used in Serokell"; @@ -183199,6 +184763,31 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "unordered-containers_0_2_8_0" = callPackage + ({ mkDerivation, base, bytestring, ChasingBottoms, containers + , criterion, deepseq, deepseq-generics, hashable, hashmap, HUnit + , mtl, QuickCheck, random, test-framework, test-framework-hunit + , test-framework-quickcheck2 + }: + mkDerivation { + pname = "unordered-containers"; + version = "0.2.8.0"; + sha256 = "a4a188359ff28640359131061953f7dbb8258da8ecf0542db0d23f08bfa6eea8"; + libraryHaskellDepends = [ base deepseq hashable ]; + testHaskellDepends = [ + base ChasingBottoms containers hashable HUnit QuickCheck + test-framework test-framework-hunit test-framework-quickcheck2 + ]; + benchmarkHaskellDepends = [ + base bytestring containers criterion deepseq deepseq-generics + hashable hashmap mtl random + ]; + homepage = "https://github.com/tibbe/unordered-containers"; + description = "Efficient hashing-based container types"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "unordered-containers-rematch" = callPackage ({ mkDerivation, base, hashable, hspec, HUnit, rematch , unordered-containers @@ -183341,6 +184930,8 @@ self: { pname = "unsequential"; version = "0.5.2"; sha256 = "89e70fc1bcdb982cf832e20c5fe540524d885a22210b832d3e3ea7307e3c7b4a"; + revision = "1"; + editedCabalFile = "c74a7fd593a4e843d8d77e57180a71e5ed13a91fa8bfc2ea70453fc0f448f49e"; libraryHaskellDepends = [ base base-prelude dlist transformers ]; testHaskellDepends = [ attoparsec interspersed QuickCheck quickcheck-instances rebase @@ -183579,35 +185170,6 @@ self: { }) {}; "uri-bytestring" = callPackage - ({ mkDerivation, attoparsec, base, blaze-builder, bytestring - , containers, criterion, deepseq, deepseq-generics, generics-sop - , HUnit, lens-simple, network-uri, QuickCheck, quickcheck-instances - , semigroups, tasty, tasty-hunit, tasty-quickcheck - , template-haskell, th-lift-instances - }: - mkDerivation { - pname = "uri-bytestring"; - version = "0.2.3.0"; - sha256 = "50178faac44a67095602412846682040b8b72ae8af5289e73dabe2cc49a639dd"; - libraryHaskellDepends = [ - attoparsec base blaze-builder bytestring containers - template-haskell th-lift-instances - ]; - testHaskellDepends = [ - attoparsec base blaze-builder bytestring containers generics-sop - HUnit lens-simple QuickCheck quickcheck-instances semigroups tasty - tasty-hunit tasty-quickcheck - ]; - benchmarkHaskellDepends = [ - base blaze-builder bytestring criterion deepseq deepseq-generics - network-uri - ]; - homepage = "https://github.com/Soostone/uri-bytestring"; - description = "Haskell URI parsing as ByteStrings"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "uri-bytestring_0_2_3_1" = callPackage ({ mkDerivation, attoparsec, base, blaze-builder, bytestring , containers, criterion, deepseq, deepseq-generics, generics-sop , HUnit, lens-simple, network-uri, QuickCheck, quickcheck-instances @@ -183634,7 +185196,6 @@ self: { homepage = "https://github.com/Soostone/uri-bytestring"; description = "Haskell URI parsing as ByteStrings"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "uri-conduit" = callPackage @@ -183758,6 +185319,29 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "url-decoders" = callPackage + ({ mkDerivation, base, base-prelude, binary-parser, bytestring + , criterion, http-types, QuickCheck, quickcheck-instances, rerebase + , tasty, tasty-hunit, tasty-quickcheck, text, unordered-containers + }: + mkDerivation { + pname = "url-decoders"; + version = "0.2"; + sha256 = "f2ec809f09152873a7a517cf3d72cbaf68d4c180fccf63a2d5ad802af0052732"; + libraryHaskellDepends = [ + base base-prelude binary-parser bytestring text + unordered-containers + ]; + testHaskellDepends = [ + http-types QuickCheck quickcheck-instances rerebase tasty + tasty-hunit tasty-quickcheck + ]; + benchmarkHaskellDepends = [ criterion http-types rerebase ]; + homepage = "https://github.com/nikita-volkov/url-decoders"; + description = "Decoders for URL-encoding (aka Percent-encoding)"; + license = stdenv.lib.licenses.mit; + }) {}; + "url-generic" = callPackage ({ mkDerivation, base, mtl, syb }: mkDerivation { @@ -184759,8 +186343,8 @@ self: { ({ mkDerivation, base }: mkDerivation { pname = "validity"; - version = "0.3.2.0"; - sha256 = "e6ac32bfc76284be81817098be5192d91aac84ff9985b26ecd41a0cded54729e"; + version = "0.3.3.0"; + sha256 = "ff175f51fde2f2e928e284ece4564cfc98ddf16a96483445cc49baca3c845eb1"; libraryHaskellDepends = [ base ]; homepage = "https://github.com/NorfairKing/validity#readme"; description = "Validity typeclass"; @@ -184771,8 +186355,8 @@ self: { ({ mkDerivation, base, bytestring, validity }: mkDerivation { pname = "validity-bytestring"; - version = "0.1.0.0"; - sha256 = "1322e47ffd6e192b9b322799c8fd8218e3de07274b5263cbd503f280f1a5d9a3"; + version = "0.1.0.1"; + sha256 = "bc4ed52d89c54a55ab859b231d58ba999ffb80d5b197fb26eee7a8281f4ae9cf"; libraryHaskellDepends = [ base bytestring validity ]; homepage = "https://github.com/NorfairKing/validity#readme"; description = "Validity instances for bytestring"; @@ -184783,8 +186367,8 @@ self: { ({ mkDerivation, base, containers, validity }: mkDerivation { pname = "validity-containers"; - version = "0.1.0.2"; - sha256 = "22f2084de274b01e0d0dc42fc609b651b979e899123b84a8702a2fca61468cdd"; + version = "0.1.0.3"; + sha256 = "ad7104429da47cdb7701ccafa87b73e98c2cb212f9838d8600bbd5635a49458f"; libraryHaskellDepends = [ base containers validity ]; homepage = "https://github.com/NorfairKing/validity#readme"; description = "Validity instances for containers"; @@ -184795,8 +186379,8 @@ self: { ({ mkDerivation, base, filepath, path, validity }: mkDerivation { pname = "validity-path"; - version = "0.1.0.0"; - sha256 = "cb93616b60ba80dc051474f8dd0a67c605d4388a316561b29bf0d56117fb32e0"; + version = "0.1.0.1"; + sha256 = "1fd07205e1bd953e232d9722020d46181893fb21308959d0b75c718784670e57"; libraryHaskellDepends = [ base filepath path validity ]; homepage = "https://github.com/NorfairKing/validity#readme"; description = "Validity instances for Path"; @@ -184807,8 +186391,8 @@ self: { ({ mkDerivation, base, bytestring, text, validity }: mkDerivation { pname = "validity-text"; - version = "0.1.2.0"; - sha256 = "f08e3a0f3ebdfe57419dfc6eef7e119d2a6ce7b8d0948297384c73ad8de0913f"; + version = "0.1.2.1"; + sha256 = "59d58521c9cfd3c438d01e23a636053821b7d03aef8179138ac9bb8184c39d1b"; libraryHaskellDepends = [ base bytestring text validity ]; homepage = "https://github.com/NorfairKing/validity#readme"; description = "Validity instances for text"; @@ -184819,8 +186403,10 @@ self: { ({ mkDerivation, base, time, validity }: mkDerivation { pname = "validity-time"; - version = "0.0.0.0"; - sha256 = "4c061a1c238c846e2e6e9838355c9a340ffc6080fb9185b18fb3c8667178af3d"; + version = "0.0.0.1"; + sha256 = "175d75b95741323047afa14f3984bab93a20ee525e5a521a01ee94fbe8c5bb69"; + revision = "1"; + editedCabalFile = "a9f20c04242b73f552159675c78028323db8b0b0db6dabb5757538997597faf0"; libraryHaskellDepends = [ base time validity ]; homepage = "https://github.com/NorfairKing/validity#readme"; description = "Validity instances for time"; @@ -185258,15 +186844,15 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "vector_0_12_0_0" = callPackage + "vector_0_12_0_1" = callPackage ({ mkDerivation, base, deepseq, ghc-prim, HUnit, primitive , QuickCheck, random, template-haskell, test-framework , test-framework-hunit, test-framework-quickcheck2, transformers }: mkDerivation { pname = "vector"; - version = "0.12.0.0"; - sha256 = "27bf375d0efbff61acaeb75a2047afcbdac930191069a59da4a474b9bf80ec95"; + version = "0.12.0.1"; + sha256 = "b100ee79b9da2651276278cd3e0f08a3c152505cc52982beda507515af173d7b"; libraryHaskellDepends = [ base deepseq ghc-prim primitive ]; testHaskellDepends = [ base HUnit QuickCheck random template-haskell test-framework @@ -187162,8 +188748,8 @@ self: { }: mkDerivation { pname = "wai-middleware-auth"; - version = "0.1.1.0"; - sha256 = "f951faa7f3b143b36268b3c3b0250779d229490b0a4bad8722cda3ea0a60a1a1"; + version = "0.1.1.1"; + sha256 = "591a7c723aac4916eec000d81c14c593d7ffbc497fc5afe7f41affa0f6975988"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -189054,22 +190640,23 @@ self: { }) {webkit = null;}; "webkit2gtk3-javascriptcore" = callPackage - ({ mkDerivation, base, Cabal, gtk2hs-buildtools, webkit2gtk }: + ({ mkDerivation, base, Cabal, gtk2hs-buildtools, webkitgtk }: mkDerivation { pname = "webkit2gtk3-javascriptcore"; version = "0.14.2.1"; sha256 = "b24b110013f96c770a2c1683d3b35d73da31f9777dbe6e09ac704aff3ae442f8"; setupHaskellDepends = [ base Cabal gtk2hs-buildtools ]; libraryHaskellDepends = [ base ]; - libraryPkgconfigDepends = [ webkit2gtk ]; + libraryPkgconfigDepends = [ webkitgtk ]; description = "JavaScriptCore FFI from webkitgtk"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; - }) {webkit2gtk = null;}; + }) {inherit (pkgs.gnome3) webkitgtk;}; "webkitgtk3" = callPackage ({ mkDerivation, base, bytestring, Cabal, cairo, glib - , gtk2hs-buildtools, gtk3, mtl, pango, text, transformers, webkit + , gtk2hs-buildtools, gtk3, mtl, pango, text, transformers + , webkitgtk24x }: mkDerivation { pname = "webkitgtk3"; @@ -189079,26 +190666,26 @@ self: { libraryHaskellDepends = [ base bytestring cairo glib gtk3 mtl pango text transformers ]; - libraryPkgconfigDepends = [ webkit ]; + libraryPkgconfigDepends = [ webkitgtk24x ]; homepage = "http://projects.haskell.org/gtk2hs/"; description = "Binding to the Webkit library"; license = stdenv.lib.licenses.lgpl21; hydraPlatforms = stdenv.lib.platforms.none; - }) {webkit = null;}; + }) {inherit (pkgs) webkitgtk24x;}; "webkitgtk3-javascriptcore" = callPackage - ({ mkDerivation, base, Cabal, gtk2hs-buildtools, webkit }: + ({ mkDerivation, base, Cabal, gtk2hs-buildtools, webkitgtk24x }: mkDerivation { pname = "webkitgtk3-javascriptcore"; version = "0.14.2.1"; sha256 = "922080150c96c9276ea3ddd9ef19d867f5e179017b56e8fec02e2606d4cc924d"; setupHaskellDepends = [ base Cabal gtk2hs-buildtools ]; libraryHaskellDepends = [ base ]; - libraryPkgconfigDepends = [ webkit ]; + libraryPkgconfigDepends = [ webkitgtk24x ]; description = "JavaScriptCore FFI from webkitgtk"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; - }) {webkit = null;}; + }) {inherit (pkgs) webkitgtk24x;}; "webpage" = callPackage ({ mkDerivation, base, blaze-html, data-default, lucid, text }: @@ -189215,20 +190802,21 @@ self: { }) {}; "websockets-rpc" = callPackage - ({ mkDerivation, aeson, base, bytestring, containers, exceptions - , mtl, QuickCheck, quickcheck-instances, stm, tasty - , tasty-quickcheck, text, unordered-containers, wai-transformers - , websockets + ({ mkDerivation, aeson, async, base, bytestring, containers + , exceptions, mtl, QuickCheck, quickcheck-instances, stm, tasty + , tasty-quickcheck, text, transformers, unordered-containers + , wai-transformers, websockets }: mkDerivation { pname = "websockets-rpc"; - version = "0.0.0"; - sha256 = "e8a97330230f178fede76701fd2335fe18f48a124bd020c4be8120fa75ddf5bb"; + version = "0.0.2"; + sha256 = "78100b408e6e793812034ce356bdbde893f51679d7d37db8ec2b773b26cfca12"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ - aeson base bytestring containers exceptions mtl QuickCheck stm text - unordered-containers wai-transformers websockets + aeson async base bytestring containers exceptions mtl QuickCheck + stm text transformers unordered-containers wai-transformers + websockets ]; testHaskellDepends = [ aeson base QuickCheck quickcheck-instances tasty tasty-quickcheck @@ -189911,6 +191499,24 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "witherable_0_1_3_4" = callPackage + ({ mkDerivation, base, base-orphans, containers, hashable + , transformers, unordered-containers, vector + }: + mkDerivation { + pname = "witherable"; + version = "0.1.3.4"; + sha256 = "f45b124f2b7c7afd69512c09e91ebe3e3c4030caafad72fc762ba051685f0d67"; + libraryHaskellDepends = [ + base base-orphans containers hashable transformers + unordered-containers vector + ]; + homepage = "https://github.com/fumieval/witherable"; + description = "filterable traversable"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "witness" = callPackage ({ mkDerivation, base, constraints, semigroupoids, transformers }: mkDerivation { @@ -190668,8 +192274,8 @@ self: { }: mkDerivation { pname = "writer-cps-lens"; - version = "0.1.0.0"; - sha256 = "23daa611fc16cddc8b8df3436818870c34ec87795b960b3cea2a3e3c408e3448"; + version = "0.1.0.1"; + sha256 = "2d6b8b6f4f86dcb3cc75bdd25d4ab186d09c2859023f3a6ef2171576b0d306ef"; libraryHaskellDepends = [ base lens profunctors transformers writer-cps-mtl writer-cps-transformers @@ -190700,8 +192306,8 @@ self: { ({ mkDerivation, base, mmorph, writer-cps-transformers }: mkDerivation { pname = "writer-cps-morph"; - version = "0.1.0.1"; - sha256 = "bd685fa9dec074ef7d0f545f95eaf20bd0b600d2fb067f3dcfdc3a3b0e678cee"; + version = "0.1.0.2"; + sha256 = "e91d07b7dce83973c8ad8f489e161ea8092bd3c7d161f4e57cddeedd2f3fd5d8"; libraryHaskellDepends = [ base mmorph writer-cps-transformers ]; homepage = "https://github.com/louispan/writer-cps-morph#readme"; description = "MFunctor instance for CPS style WriterT and RWST"; @@ -192760,8 +194366,8 @@ self: { }: mkDerivation { pname = "xmonad-vanessa"; - version = "0.1.0.6"; - sha256 = "7abfe1bdaf7a9bbecdfa89b36b7144fe590d5b6344cc4838fb287e8f5ded52c4"; + version = "0.1.1.0"; + sha256 = "775497b9cad69caee9c96f7049b4e865783b54a7fc3d4c07a0b7745a8934f439"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -193781,30 +195387,6 @@ self: { }) {}; "yesod" = callPackage - ({ mkDerivation, aeson, base, blaze-html, blaze-markup, bytestring - , conduit, conduit-extra, data-default-class, directory - , fast-logger, monad-control, monad-logger, resourcet, semigroups - , shakespeare, streaming-commons, template-haskell, text - , transformers, unix, unordered-containers, wai, wai-extra - , wai-logger, warp, yaml, yesod-core, yesod-form, yesod-persistent - }: - mkDerivation { - pname = "yesod"; - version = "1.4.4"; - sha256 = "5f2caade2435754ff35060c3ae58390ad87650b975e83a65f8013e80ea7bea2c"; - libraryHaskellDepends = [ - aeson base blaze-html blaze-markup bytestring conduit conduit-extra - data-default-class directory fast-logger monad-control monad-logger - resourcet semigroups shakespeare streaming-commons template-haskell - text transformers unix unordered-containers wai wai-extra - wai-logger warp yaml yesod-core yesod-form yesod-persistent - ]; - homepage = "http://www.yesodweb.com/"; - description = "Creation of type-safe, RESTful web applications"; - license = stdenv.lib.licenses.mit; - }) {}; - - "yesod_1_4_5" = callPackage ({ mkDerivation, aeson, base, blaze-html, blaze-markup, bytestring , conduit, conduit-extra, data-default-class, directory , fast-logger, monad-control, monad-logger, resourcet, semigroups @@ -193826,7 +195408,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-angular" = callPackage @@ -193865,35 +195446,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, cryptohash, data-default, email-validate, file-embed - , http-client, http-conduit, http-types, lifted-base, mime-mail - , network-uri, nonce, persistent, persistent-template, random - , resourcet, safe, shakespeare, template-haskell, text, time - , transformers, unordered-containers, wai, yesod-core, yesod-form - , yesod-persistent - }: - mkDerivation { - pname = "yesod-auth"; - version = "1.4.16"; - sha256 = "a2c76409522ac276b92d31e13ffa94ae51194ffdb902a41f979d25181a5182d2"; - libraryHaskellDepends = [ - aeson authenticate base base16-bytestring base64-bytestring binary - blaze-builder blaze-html blaze-markup byteable bytestring conduit - conduit-extra containers cryptohash data-default email-validate - file-embed http-client http-conduit http-types lifted-base - mime-mail network-uri nonce persistent persistent-template random - resourcet safe shakespeare template-haskell text time transformers - 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_4_17" = callPackage ({ mkDerivation, aeson, authenticate, base, base16-bytestring , base64-bytestring, binary, blaze-builder, blaze-html , blaze-markup, byteable, bytestring, conduit, conduit-extra @@ -193920,7 +195472,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 @@ -194275,8 +195826,8 @@ self: { }: mkDerivation { pname = "yesod-bin"; - version = "1.5.1"; - sha256 = "034114dade5a23ec39ffeb9f78a04b7bd9fc0b8942b1a11118475e4c594863cd"; + version = "1.5.2.1"; + sha256 = "21e10e0f15af8505ae575103e3bad4f660a9ded28baccf275255c3f55d59ce57"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -194295,7 +195846,7 @@ self: { license = stdenv.lib.licenses.mit; }) {}; - "yesod-bin_1_5_2" = callPackage + "yesod-bin_1_5_2_2" = callPackage ({ mkDerivation, async, attoparsec, base, base64-bytestring , blaze-builder, bytestring, Cabal, conduit, conduit-extra , containers, data-default-class, deepseq, directory, file-embed @@ -194309,8 +195860,8 @@ self: { }: mkDerivation { pname = "yesod-bin"; - version = "1.5.2"; - sha256 = "b37087eb7e167c2250dd23452e8f4858190db11570e540df44809c197219439a"; + version = "1.5.2.2"; + sha256 = "313344ed5230298436500b809c294700cf251c3b5198b6d58169fe89fe6d1438"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -194428,49 +195979,6 @@ self: { }) {}; "yesod-core" = callPackage - ({ mkDerivation, aeson, async, auto-update, base, blaze-builder - , blaze-html, blaze-markup, byteable, bytestring, case-insensitive - , cereal, clientsession, conduit, conduit-extra, containers, cookie - , criterion, data-default, deepseq, deepseq-generics, directory - , exceptions, fast-logger, hspec, hspec-expectations, http-types - , HUnit, lifted-base, monad-control, monad-logger, mtl, mwc-random - , network, old-locale, parsec, path-pieces, primitive, QuickCheck - , random, resourcet, safe, semigroups, shakespeare - , streaming-commons, template-haskell, text, time, transformers - , transformers-base, unix-compat, unordered-containers, vector, wai - , wai-extra, wai-logger, warp, word8 - }: - mkDerivation { - pname = "yesod-core"; - version = "1.4.31"; - sha256 = "9a2e4c39c9ce66c2881d5da6c9a621c07492c950d935231aa7e12ed3a008d7af"; - libraryHaskellDepends = [ - aeson auto-update base blaze-builder blaze-html blaze-markup - byteable bytestring case-insensitive cereal clientsession conduit - conduit-extra containers cookie data-default deepseq - deepseq-generics directory exceptions fast-logger http-types - lifted-base monad-control monad-logger mtl mwc-random old-locale - parsec path-pieces primitive random resourcet safe semigroups - shakespeare template-haskell text time transformers - transformers-base unix-compat unordered-containers vector wai - wai-extra wai-logger warp word8 - ]; - testHaskellDepends = [ - async base blaze-builder bytestring clientsession conduit - conduit-extra containers cookie hspec hspec-expectations http-types - HUnit lifted-base mwc-random network path-pieces QuickCheck random - resourcet shakespeare streaming-commons template-haskell text - transformers wai wai-extra - ]; - benchmarkHaskellDepends = [ - base blaze-html bytestring criterion shakespeare text transformers - ]; - homepage = "http://www.yesodweb.com/"; - description = "Creation of type-safe, RESTful web applications"; - license = stdenv.lib.licenses.mit; - }) {}; - - "yesod-core_1_4_32" = callPackage ({ mkDerivation, aeson, async, auto-update, base, blaze-builder , blaze-html, blaze-markup, byteable, bytestring, case-insensitive , cereal, clientsession, conduit, conduit-extra, containers, cookie @@ -194511,7 +196019,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 @@ -194653,23 +196160,6 @@ self: { }) {}; "yesod-eventsource" = callPackage - ({ mkDerivation, base, blaze-builder, conduit, transformers, wai - , wai-eventsource, wai-extra, yesod-core - }: - mkDerivation { - pname = "yesod-eventsource"; - version = "1.4.0.1"; - sha256 = "a5ec061ca8c426c4a8179bace45edd8100de96c947b8294445aae890dd175d48"; - libraryHaskellDepends = [ - base blaze-builder conduit transformers wai wai-eventsource - wai-extra yesod-core - ]; - homepage = "http://www.yesodweb.com/"; - description = "Server-sent events support for Yesod apps"; - license = stdenv.lib.licenses.mit; - }) {}; - - "yesod-eventsource_1_4_1" = callPackage ({ mkDerivation, base, blaze-builder, conduit, transformers, wai , wai-eventsource, wai-extra, yesod-core }: @@ -194684,7 +196174,6 @@ self: { homepage = "http://www.yesodweb.com/"; description = "Server-sent events support for Yesod apps"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "yesod-examples" = callPackage @@ -194749,30 +196238,6 @@ self: { }) {}; "yesod-form" = callPackage - ({ mkDerivation, aeson, attoparsec, base, blaze-builder, blaze-html - , blaze-markup, byteable, bytestring, containers, data-default - , email-validate, hspec, network-uri, persistent, resourcet - , semigroups, shakespeare, template-haskell, text, time - , transformers, wai, xss-sanitize, yesod-core, yesod-persistent - }: - mkDerivation { - pname = "yesod-form"; - version = "1.4.10"; - sha256 = "ddeb72988e1dffb1c3766c35941520aa6ff6a8b09d6bdeb453d9c75d11ad8e43"; - libraryHaskellDepends = [ - aeson attoparsec base blaze-builder blaze-html blaze-markup - byteable bytestring containers data-default email-validate - network-uri persistent resourcet semigroups shakespeare - template-haskell text time transformers wai xss-sanitize yesod-core - yesod-persistent - ]; - testHaskellDepends = [ base hspec text time ]; - homepage = "http://www.yesodweb.com/"; - description = "Form handling support for Yesod Web Framework"; - license = stdenv.lib.licenses.mit; - }) {}; - - "yesod-form_1_4_11" = callPackage ({ mkDerivation, aeson, attoparsec, base, blaze-builder, blaze-html , blaze-markup, byteable, bytestring, containers, data-default , email-validate, hspec, network-uri, persistent, resourcet @@ -194794,7 +196259,6 @@ self: { homepage = "http://www.yesodweb.com/"; description = "Form handling support for Yesod Web Framework"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "yesod-form-json" = callPackage @@ -195102,28 +196566,6 @@ self: { }) {}; "yesod-persistent" = callPackage - ({ mkDerivation, base, blaze-builder, conduit, hspec, persistent - , persistent-sqlite, persistent-template, resource-pool, resourcet - , text, transformers, wai-extra, yesod-core - }: - mkDerivation { - pname = "yesod-persistent"; - version = "1.4.1.1"; - sha256 = "dffd2604fc37a6b518c06391c44059df96895e3b484d4de8fbff9ff0869e7551"; - libraryHaskellDepends = [ - base blaze-builder conduit persistent persistent-template - resource-pool resourcet transformers yesod-core - ]; - testHaskellDepends = [ - base blaze-builder conduit hspec persistent persistent-sqlite text - wai-extra yesod-core - ]; - homepage = "http://www.yesodweb.com/"; - description = "Some helpers for using Persistent from Yesod"; - license = stdenv.lib.licenses.mit; - }) {}; - - "yesod-persistent_1_4_2" = callPackage ({ mkDerivation, base, blaze-builder, conduit, hspec, persistent , persistent-sqlite, persistent-template, resource-pool, resourcet , text, transformers, wai-extra, yesod-core @@ -195143,7 +196585,6 @@ self: { homepage = "http://www.yesodweb.com/"; description = "Some helpers for using Persistent from Yesod"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "yesod-platform" = callPackage @@ -195528,41 +196969,6 @@ self: { }) {}; "yesod-static" = callPackage - ({ mkDerivation, async, attoparsec, base, base64-bytestring - , blaze-builder, byteable, bytestring, conduit, conduit-extra - , containers, cryptohash, cryptohash-conduit, css-text - , data-default, directory, exceptions, file-embed, filepath - , hashable, hjsmin, hspec, http-types, HUnit, mime-types, old-time - , process, resourcet, template-haskell, text, transformers - , unix-compat, unordered-containers, wai, wai-app-static, wai-extra - , yesod-core, yesod-test - }: - mkDerivation { - pname = "yesod-static"; - version = "1.5.1.1"; - sha256 = "cdb50763c4cbd2b8fcdb2b9f2f2526648e82454c62d49bfd6d165af80a192a92"; - libraryHaskellDepends = [ - async attoparsec base base64-bytestring blaze-builder byteable - bytestring conduit conduit-extra containers cryptohash - cryptohash-conduit css-text data-default directory exceptions - file-embed filepath hashable hjsmin http-types mime-types old-time - process resourcet template-haskell text transformers unix-compat - unordered-containers wai wai-app-static yesod-core - ]; - testHaskellDepends = [ - async base base64-bytestring byteable bytestring conduit - conduit-extra containers cryptohash cryptohash-conduit data-default - directory exceptions file-embed filepath hjsmin hspec http-types - HUnit mime-types old-time process resourcet template-haskell text - transformers unix-compat unordered-containers wai wai-app-static - wai-extra yesod-core yesod-test - ]; - homepage = "http://www.yesodweb.com/"; - description = "Static file serving subsite for Yesod Web Framework"; - license = stdenv.lib.licenses.mit; - }) {}; - - "yesod-static_1_5_2" = callPackage ({ mkDerivation, async, attoparsec, base, base64-bytestring , blaze-builder, byteable, bytestring, conduit, conduit-extra , containers, cryptohash, cryptohash-conduit, css-text @@ -195595,7 +197001,6 @@ self: { homepage = "http://www.yesodweb.com/"; description = "Static file serving subsite for Yesod Web Framework"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "yesod-static-angular" = callPackage @@ -195653,33 +197058,6 @@ self: { }) {}; "yesod-test" = callPackage - ({ mkDerivation, attoparsec, base, blaze-builder, blaze-html - , blaze-markup, bytestring, case-insensitive, containers, cookie - , hspec, hspec-core, html-conduit, http-types, HUnit, lifted-base - , monad-control, network, persistent, pretty-show, text, time - , transformers, wai, wai-extra, xml-conduit, xml-types, yesod-core - , yesod-form - }: - mkDerivation { - pname = "yesod-test"; - version = "1.5.4.1"; - sha256 = "36c08c34d5fef656bb3469194b77b0802c60db4120af0f6dfd2b08f4a9d9659d"; - libraryHaskellDepends = [ - attoparsec base blaze-builder blaze-html blaze-markup bytestring - case-insensitive containers cookie hspec-core html-conduit - http-types HUnit monad-control network persistent pretty-show text - time transformers wai wai-extra xml-conduit xml-types yesod-core - ]; - testHaskellDepends = [ - base bytestring containers hspec html-conduit http-types HUnit - lifted-base text wai xml-conduit yesod-core yesod-form - ]; - homepage = "http://www.yesodweb.com"; - description = "integration testing for WAI/Yesod Applications"; - license = stdenv.lib.licenses.mit; - }) {}; - - "yesod-test_1_5_5" = callPackage ({ mkDerivation, attoparsec, base, blaze-builder, blaze-html , blaze-markup, bytestring, case-insensitive, containers, cookie , hspec, hspec-core, html-conduit, http-types, HUnit, lifted-base @@ -195704,7 +197082,6 @@ self: { homepage = "http://www.yesodweb.com"; description = "integration testing for WAI/Yesod Applications"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "yesod-test-json" = callPackage @@ -195808,24 +197185,6 @@ self: { }) {}; "yesod-websockets" = callPackage - ({ mkDerivation, async, base, conduit, enclosed-exceptions - , monad-control, transformers, wai, wai-websockets, websockets - , yesod-core - }: - mkDerivation { - pname = "yesod-websockets"; - version = "0.2.5"; - sha256 = "c5f609aea82035a8bd43998f29bb2fc8547f72260dafdc9fdc44a7706975c944"; - libraryHaskellDepends = [ - async base conduit enclosed-exceptions monad-control transformers - wai wai-websockets websockets yesod-core - ]; - homepage = "https://github.com/yesodweb/yesod"; - description = "WebSockets support for Yesod"; - license = stdenv.lib.licenses.mit; - }) {}; - - "yesod-websockets_0_2_6" = callPackage ({ mkDerivation, async, base, conduit, enclosed-exceptions , monad-control, transformers, wai, wai-websockets, websockets , yesod-core @@ -195841,7 +197200,6 @@ self: { homepage = "https://github.com/yesodweb/yesod"; description = "WebSockets support for Yesod"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "yesod-websockets-extra" = callPackage @@ -196956,6 +198314,105 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "zifter" = callPackage + ({ mkDerivation, ansi-terminal, async, base, directory, exceptions + , filepath, genvalidity, genvalidity-hspec, hspec + , optparse-applicative, path, path-io, process, QuickCheck, safe + , stm, validity, validity-path + }: + mkDerivation { + pname = "zifter"; + version = "0.0.1.0"; + sha256 = "f161fdbc1db3ccfe65bb47552cabc883a7b5a99e12fb4c27015264fab7ac958a"; + libraryHaskellDepends = [ + ansi-terminal async base directory exceptions filepath + optparse-applicative path path-io process safe stm validity + validity-path + ]; + testHaskellDepends = [ + ansi-terminal base genvalidity genvalidity-hspec hspec path path-io + QuickCheck stm + ]; + homepage = "http://cs-syd.eu"; + description = "zifter"; + license = stdenv.lib.licenses.mit; + }) {}; + + "zifter-cabal" = callPackage + ({ mkDerivation, base, directory, filepath, path, path-io, process + , zifter + }: + mkDerivation { + pname = "zifter-cabal"; + version = "0.0.0.0"; + sha256 = "3ea3b662b68174f44d7e7eb2b5032d928743ecad3e7fa3a466194159c47929e4"; + libraryHaskellDepends = [ + base directory filepath path path-io process zifter + ]; + homepage = "http://cs-syd.eu"; + description = "zifter-cabal"; + license = stdenv.lib.licenses.mit; + }) {}; + + "zifter-git" = callPackage + ({ mkDerivation, base, path, process, zifter }: + mkDerivation { + pname = "zifter-git"; + version = "0.0.0.0"; + sha256 = "92440ad0ca1e4b831d988b6b2fc339e45413ec9f8824bd6b7c6d496a8f520557"; + libraryHaskellDepends = [ base path process zifter ]; + homepage = "http://cs-syd.eu"; + description = "zifter-git"; + license = stdenv.lib.licenses.mit; + }) {}; + + "zifter-hindent" = callPackage + ({ mkDerivation, base, directory, filepath, path, path-io, process + , safe, zifter + }: + mkDerivation { + pname = "zifter-hindent"; + version = "0.0.0.0"; + sha256 = "39ade41a13e0aa8b675a15cfeb34605eb4caa78f035fdd2470681c4814b16d06"; + libraryHaskellDepends = [ + base directory filepath path path-io process safe zifter + ]; + homepage = "http://cs-syd.eu"; + description = "zifter-hindent"; + license = stdenv.lib.licenses.mit; + }) {}; + + "zifter-hlint" = callPackage + ({ mkDerivation, base, filepath, hlint, path, path-io, safe, zifter + }: + mkDerivation { + pname = "zifter-hlint"; + version = "0.0.0.0"; + sha256 = "d7588cfa7dc22acc664a1438881abca0b38789e787e1014d4a9a0a320b35772f"; + libraryHaskellDepends = [ + base filepath hlint path path-io safe zifter + ]; + homepage = "http://cs-syd.eu"; + description = "zifter-hlint"; + license = stdenv.lib.licenses.mit; + }) {}; + + "zifter-stack" = callPackage + ({ mkDerivation, base, Cabal, directory, filepath, path, path-io + , process, zifter + }: + mkDerivation { + pname = "zifter-stack"; + version = "0.0.0.2"; + sha256 = "b4f1152e575692a270375ff925c01b6e11b6d63e45c60ff3a02a661da9ebaad7"; + libraryHaskellDepends = [ + base Cabal directory filepath path path-io process zifter + ]; + homepage = "http://cs-syd.eu"; + description = "zifter-stack"; + license = stdenv.lib.licenses.mit; + }) {}; + "zigbee-znet25" = callPackage ({ mkDerivation, base, bytestring, cereal, MissingH, mtl , QuickCheck, random, transformers @@ -196996,31 +198453,6 @@ self: { }) {}; "zip" = callPackage - ({ mkDerivation, base, bytestring, bzlib-conduit, case-insensitive - , cereal, conduit, conduit-extra, containers, digest, exceptions - , filepath, hspec, mtl, path, path-io, plan-b, QuickCheck - , resourcet, text, time, transformers - }: - mkDerivation { - pname = "zip"; - version = "0.1.8"; - sha256 = "3b6addaaf314df1587baf8b5e0423cbfa9fc256a09a20c70e1a746a8067370d1"; - libraryHaskellDepends = [ - base bytestring bzlib-conduit case-insensitive cereal conduit - conduit-extra containers digest exceptions filepath mtl path - path-io plan-b resourcet text time transformers - ]; - testHaskellDepends = [ - base bytestring conduit containers exceptions filepath hspec path - path-io QuickCheck text time transformers - ]; - homepage = "https://github.com/mrkkrp/zip"; - description = "Operations on zip archives"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = [ "x86_64-darwin" "x86_64-linux" ]; - }) {}; - - "zip_0_1_9" = callPackage ({ mkDerivation, base, bytestring, bzlib-conduit, case-insensitive , cereal, conduit, conduit-extra, containers, digest, exceptions , filepath, hspec, mtl, path, path-io, plan-b, QuickCheck @@ -197042,7 +198474,7 @@ self: { homepage = "https://github.com/mrkkrp/zip"; description = "Operations on zip archives"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + hydraPlatforms = [ "x86_64-darwin" "x86_64-linux" ]; }) {}; "zip-archive" = callPackage @@ -197175,6 +198607,48 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "ziptastic-client" = callPackage + ({ mkDerivation, base, base-compat, hspec, http-client + , http-client-tls, http-types, iso3166-country-codes, servant + , servant-client, text, ziptastic-core + }: + mkDerivation { + pname = "ziptastic-client"; + version = "0.3.0.1"; + sha256 = "dbe176c9a0bbb2b612fdabdde49ef92b89b5313913133b6582a170b692b0649a"; + libraryHaskellDepends = [ + base base-compat http-client iso3166-country-codes servant + servant-client text ziptastic-core + ]; + testHaskellDepends = [ + base base-compat hspec http-client http-client-tls http-types + iso3166-country-codes servant-client + ]; + homepage = "https://github.com/Ziptastic/ziptastic-haskell#readme"; + description = "A type-safe client for the Ziptastic API for doing forward and reverse geocoding"; + license = stdenv.lib.licenses.bsd3; + }) {}; + + "ziptastic-core" = callPackage + ({ mkDerivation, aeson, base, base-compat, bytestring, here, hspec + , http-api-data, iso3166-country-codes, servant, text, tz + }: + mkDerivation { + pname = "ziptastic-core"; + version = "0.2.0.1"; + sha256 = "1512fe53b08e157895d5ae449cfe3ba65c859057394fa0bd9b4158f8c4502532"; + libraryHaskellDepends = [ + aeson base base-compat bytestring http-api-data + iso3166-country-codes servant text tz + ]; + testHaskellDepends = [ + aeson base base-compat here hspec iso3166-country-codes text tz + ]; + homepage = "https://github.com/Ziptastic/ziptastic-haskell#readme"; + description = "Core Servant specification for the Ziptastic API for doing forward and reverse geocoding"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "zlib_0_5_4_2" = callPackage ({ mkDerivation, base, bytestring, zlib }: mkDerivation { From 6236cd47166a1e35ed7712e480065ec4e3ebc180 Mon Sep 17 00:00:00 2001 From: Michael Alan Dorman Date: Sun, 12 Mar 2017 18:12:35 -0400 Subject: [PATCH 22/86] pointfree: patch is no longer needed --- pkgs/development/haskell-modules/configuration-common.nix | 6 ------ 1 file changed, 6 deletions(-) diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index 85839b6492a2..1f38ebac54a9 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -824,12 +824,6 @@ self: super: { # https://github.com/xmonad/xmonad-extras/issues/3 xmonad-extras = doJailbreak super.xmonad-extras; - # https://github.com/bmillwood/pointfree/issues/21 - pointfree = appendPatch super.pointfree (pkgs.fetchpatch { - url = "https://github.com/bmillwood/pointfree/pull/22.patch"; - sha256 = "04q0b5d78ill2yrpflkphvk2y38qc50si2qff4bllp47wj42aqmp"; - }); - # https://github.com/int-e/QuickCheck-safe/issues/2 QuickCheck-safe = doJailbreak super.QuickCheck-safe; From d59fe189fd5c2c1094086e847cef3b5b7fb84a31 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Sat, 18 Mar 2017 18:36:45 +0100 Subject: [PATCH 23/86] haskell-configuration-nix: drop obsolete webkit-related overrides --- pkgs/development/haskell-modules/configuration-nix.nix | 6 ------ 1 file changed, 6 deletions(-) diff --git a/pkgs/development/haskell-modules/configuration-nix.nix b/pkgs/development/haskell-modules/configuration-nix.nix index 981a48055bcc..017f2ea7637a 100644 --- a/pkgs/development/haskell-modules/configuration-nix.nix +++ b/pkgs/development/haskell-modules/configuration-nix.nix @@ -131,8 +131,6 @@ self: super: builtins.intersectAttrs super { # Need WebkitGTK, not just webkit. webkit = super.webkit.override { webkit = pkgs.webkitgtk2; }; - webkitgtk3 = super.webkitgtk3.override { webkit = pkgs.webkitgtk24x; }; - webkitgtk3-javascriptcore = super.webkitgtk3-javascriptcore.override { webkit = pkgs.webkitgtk24x; }; websnap = super.websnap.override { webkit = pkgs.webkitgtk24x; }; hs-mesos = overrideCabal super.hs-mesos (drv: { @@ -433,10 +431,6 @@ self: super: builtins.intersectAttrs super { # This propagates this to everything depending on haskell-gi-base haskell-gi-base = addBuildDepend super.haskell-gi-base pkgs.gobjectIntrospection; - # requires webkitgtk API version 3 (webkitgtk 2.4 is the latest webkit supporting that version) - gi-javascriptcore = super.gi-javascriptcore.override { webkitgtk = pkgs.webkitgtk24x; }; - gi-webkit = super.gi-webkit.override { webkit = pkgs.webkitgtk24x; }; - # Requires gi-javascriptcore API version 4 gi-webkit2 = super.gi-webkit2.override { gi-javascriptcore = self.gi-javascriptcore_4_0_11; }; From ea80c91bd3ed42f74dee05a9d3c4866f1ba8cede Mon Sep 17 00:00:00 2001 From: Florent Becker Date: Mon, 20 Mar 2017 08:19:05 +0100 Subject: [PATCH 24/86] pijul: init at 0.3.0 (re-init) --- .../version-management/pijul/default.nix | 30 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 32 insertions(+) create mode 100644 pkgs/applications/version-management/pijul/default.nix diff --git a/pkgs/applications/version-management/pijul/default.nix b/pkgs/applications/version-management/pijul/default.nix new file mode 100644 index 000000000000..3bbb9ba1bbf6 --- /dev/null +++ b/pkgs/applications/version-management/pijul/default.nix @@ -0,0 +1,30 @@ +{ stdenv, fetchurl, rustPlatform, perl, darwin }: + +with rustPlatform; + +buildRustPackage rec { + name = "pijul-${version}"; + version = "0.3"; + + src = fetchurl { + url = "https://pijul.org/releases/${name}.tar.gz"; + sha256 = "2c7b354b4ab142ac50a85d70c80949ff864377b37727b862d103d3407e2c7818"; + }; + + sourceRoot = "pijul/pijul"; + + buildInputs = [ perl ]++ stdenv.lib.optionals stdenv.isDarwin + (with darwin.apple_sdk.frameworks; [ Security ]); + + doCheck = false; + + depsSha256 = "03bb92mn16d38l49x4p1z21k7gvq3l3ki10brr13p7yv45rwvmzc"; + + meta = with stdenv.lib; { + description = "A distributed version control system"; + homepage = https://pijul.org; + license = with licenses; [ gpl2Plus ]; + maintainers = [ maintainers.gal_bolle ]; + platforms = platforms.all; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 63821dedc2b1..3a7e73cc6f91 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -14713,6 +14713,8 @@ with pkgs; pig = callPackage ../applications/networking/cluster/pig { }; + pijul = callPackage ../applications/version-management/pijul {}; + planner = callPackage ../applications/office/planner { }; playonlinux = callPackage ../applications/misc/playonlinux { From 6c0569e3891189a62ed27dce361f5d05f650d023 Mon Sep 17 00:00:00 2001 From: Peter Hoeg Date: Mon, 20 Mar 2017 12:08:43 +0800 Subject: [PATCH 25/86] terraform: 0.9.0 -> 0.9.1 --- .../networking/cluster/terraform/default.nix | 10 +++------- pkgs/top-level/all-packages.nix | 4 ++-- 2 files changed, 5 insertions(+), 9 deletions(-) diff --git a/pkgs/applications/networking/cluster/terraform/default.nix b/pkgs/applications/networking/cluster/terraform/default.nix index 7e5a1121be91..a1bcd027f6ad 100644 --- a/pkgs/applications/networking/cluster/terraform/default.nix +++ b/pkgs/applications/networking/cluster/terraform/default.nix @@ -48,12 +48,8 @@ in rec { sha256 = "0ibgpcpvz0bmn3cw60nzsabsrxrbmmym1hv7fx6zmjxiwd68w5gb"; }; - terraform_0_9_0 = generic { - version = "0.9.0"; - sha256 = "1v96qgc6pd1bkwvkz855625xdcy7xb5lk60lg70144idqmwfjb9g"; + terraform_0_9_1 = generic { + version = "0.9.1"; + sha256 = "081p6dlvkg9mgaz49ichxzlk1ks0rxa7nvilaq8jj1gq3jvylqnh"; }; - - terraform_0_8 = terraform_0_8_8; - terraform_0_9 = terraform_0_9_0; - terraform = terraform_0_9; } diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 9fc039398556..341bb0286257 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -18095,10 +18095,10 @@ with pkgs; inherit (callPackage ../applications/networking/cluster/terraform {}) terraform_0_8_5 terraform_0_8_8 - terraform_0_9_0; + terraform_0_9_1; terraform_0_8 = terraform_0_8_8; - terraform_0_9 = terraform_0_9_0; + terraform_0_9 = terraform_0_9_1; terraform = terraform_0_8; terragrunt = callPackage ../applications/networking/cluster/terragrunt { From 20194e2696a276937bfe7b448951036831c69700 Mon Sep 17 00:00:00 2001 From: Sander van der Burg Date: Mon, 20 Mar 2017 10:42:43 +0100 Subject: [PATCH 26/86] dd-agent: bind to pymongo 2.9.1 to fix the MongoDB monitoring --- pkgs/tools/networking/dd-agent/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/tools/networking/dd-agent/default.nix b/pkgs/tools/networking/dd-agent/default.nix index ddef8a70012d..fa18e6c0ce56 100644 --- a/pkgs/tools/networking/dd-agent/default.nix +++ b/pkgs/tools/networking/dd-agent/default.nix @@ -47,7 +47,7 @@ in stdenv.mkDerivation rec { pythonPackages.ntplib pythonPackages.simplejson pythonPackages.pyyaml - pythonPackages.pymongo + pythonPackages.pymongo_2_9_1 pythonPackages.python-etcd pythonPackages.consul docker_1_10 From c031adedbac742d15478ea987a45bb33763188e5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= Date: Mon, 20 Mar 2017 10:55:52 +0100 Subject: [PATCH 27/86] hplip: 3.16.5 -> 3.16.11 fixes #24109 --- pkgs/misc/drivers/hplip/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/misc/drivers/hplip/default.nix b/pkgs/misc/drivers/hplip/default.nix index c0a6c0a9baa0..0e53bdf7f656 100644 --- a/pkgs/misc/drivers/hplip/default.nix +++ b/pkgs/misc/drivers/hplip/default.nix @@ -10,16 +10,16 @@ let name = "hplip-${version}"; - version = "3.16.5"; + version = "3.16.11"; src = fetchurl { url = "mirror://sourceforge/hplip/${name}.tar.gz"; - sha256 = "1nay65q1zmx2jxiwn66n7mlr73azacz5097gw98kqqf90dh522f6"; + sha256 = "094vkyr0rjng72m13dgr824cdl7q20x23qjxzih4w7l9njn0rqpn"; }; plugin = fetchurl { url = "http://www.openprinting.org/download/printdriver/auxfiles/HP/plugins/${name}-plugin.run"; - sha256 = "15qrcd3ndnxri6pfdfmsjyv2f3zfkig80yghs76jbsm106rp8g3q"; + sha256 = "1y3wdax2wb6kdd8bi40wl7v9s8ffyjz95bz42sjcpzzddmlhcaxg"; }; hplipState = From a3b3a7ffb18e6abd33cd30206791e0cfd29a48d4 Mon Sep 17 00:00:00 2001 From: 2chilled Date: Mon, 20 Mar 2017 11:39:53 +0100 Subject: [PATCH 28/86] rawtherapee: 5.0-r1 -> 5.0-r1 with gtk3 support (#22911) --- pkgs/applications/graphics/rawtherapee/default.nix | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/pkgs/applications/graphics/rawtherapee/default.nix b/pkgs/applications/graphics/rawtherapee/default.nix index 53fdc67cf242..97d04b036228 100644 --- a/pkgs/applications/graphics/rawtherapee/default.nix +++ b/pkgs/applications/graphics/rawtherapee/default.nix @@ -1,5 +1,5 @@ -{ stdenv, fetchFromGitHub, pkgconfig, cmake, pixman, libpthreadstubs, gtkmm2, libXau -, libXdmcp, lcms2, libiptcdata, libcanberra_gtk2, fftw, expat, pcre, libsigcxx +{ stdenv, fetchFromGitHub, pkgconfig, cmake, pixman, libpthreadstubs, gtkmm3, libXau +, libXdmcp, lcms2, libiptcdata, libcanberra_gtk3, fftw, expat, pcre, libsigcxx, wrapGAppsHook }: stdenv.mkDerivation rec { @@ -9,15 +9,17 @@ stdenv.mkDerivation rec { src = fetchFromGitHub { owner = "Beep6581"; repo = "RawTherapee"; - rev = "1077c4ba2e2dbe249884e6974c6050db8eb5e9c2"; - sha256 = "1xqmkwprk3h9nhy6q562mkjdpynyg9ff7a92sdga50k56gi0aj0s"; + rev = version + "-gtk3"; + sha256 = "06v3ir5562yg4zk9z8kc8a7sw7da88193sizjlk74gh5d3smgr4q"; }; buildInputs = [ - pkgconfig cmake pixman libpthreadstubs gtkmm2 libXau libXdmcp - lcms2 libiptcdata libcanberra_gtk2 fftw expat pcre libsigcxx + pkgconfig cmake pixman libpthreadstubs gtkmm3 libXau libXdmcp + lcms2 libiptcdata libcanberra_gtk3 fftw expat pcre libsigcxx ]; + nativeBuildInputs = [ wrapGAppsHook ]; + cmakeFlags = [ "-DPROC_TARGET_NUMBER=2" ]; From 596e10c2368afef49eeb2288637e656ed17f3057 Mon Sep 17 00:00:00 2001 From: mimadrid Date: Mon, 20 Mar 2017 11:40:32 +0100 Subject: [PATCH 29/86] yed: 3.16.2.1 -> 3.17 --- pkgs/applications/graphics/yed/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/graphics/yed/default.nix b/pkgs/applications/graphics/yed/default.nix index d97a970df2a5..9af46f5cb358 100644 --- a/pkgs/applications/graphics/yed/default.nix +++ b/pkgs/applications/graphics/yed/default.nix @@ -2,12 +2,12 @@ stdenv.mkDerivation rec { name = "yEd-${version}"; - version = "3.16.2.1"; + version = "3.17"; src = requireFile { name = "${name}.zip"; url = "https://www.yworks.com/en/products/yfiles/yed/"; - sha256 = "019qfmdifqsrc9h4g3zbn7ivdc0dzlp3isa5ixdkgdhfsdm79b27"; + sha256 = "1wk58cql90y3i5l7jlxqfjjgf26i0zrv5cn0p9npgagaw6aiw2za"; }; nativeBuildInputs = [ unzip makeWrapper ]; From 21439ef4168c3e1b363d3cba471ff2b50b195a9b Mon Sep 17 00:00:00 2001 From: Nikolay Amiantov Date: Mon, 20 Mar 2017 15:20:54 +0300 Subject: [PATCH 30/86] samba: enable parallel building --- pkgs/servers/samba/4.x.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/servers/samba/4.x.nix b/pkgs/servers/samba/4.x.nix index 51bee4f0b4c9..31867bee1055 100644 --- a/pkgs/servers/samba/4.x.nix +++ b/pkgs/servers/samba/4.x.nix @@ -66,7 +66,8 @@ stdenv.mkDerivation rec { ++ optional (!enableDomainController) "--without-ad-dc" ++ optionals (!enableLDAP) [ "--without-ldap" "--without-ads" ]; - enableParallelBuilding = true; + # To build in parallel. + buildPhase = "python buildtools/bin/waf build -j $NIX_BUILD_CORES"; # Some libraries don't have /lib/samba in RPATH but need it. # Use find -type f -executable -exec echo {} \; -exec sh -c 'ldd {} | grep "not found"' \; From 428a6ddf4f5a4715766e143457dd0db5e8169538 Mon Sep 17 00:00:00 2001 From: Eric Sagnes Date: Mon, 20 Mar 2017 21:48:38 +0900 Subject: [PATCH 31/86] albert: 0.9.4 -> 0.10.0 --- pkgs/applications/misc/albert/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/applications/misc/albert/default.nix b/pkgs/applications/misc/albert/default.nix index 986b3fe8f77c..2bbac699a3e3 100644 --- a/pkgs/applications/misc/albert/default.nix +++ b/pkgs/applications/misc/albert/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { name = "albert-${version}"; - version = "0.9.4"; + version = "0.10.0"; src = fetchFromGitHub { - owner = "manuelschneid3r"; + owner = "albertlauncher"; repo = "albert"; rev = "v${version}"; - sha256 = "131ij525rgh2j9m2vydh79wm4bs0p3x27crar9f16rqhz15gkcpl"; + sha256 = "1r8m0b6lqljy314ilpi58sdpqyb9rr502nzx3pgmx2g2xz4izsfj"; }; nativeBuildInputs = [ cmake makeQtWrapper ]; @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { ''; meta = with stdenv.lib; { - homepage = https://github.com/manuelSchneid3r/albert; + homepage = https://albertlauncher.github.io/; description = "Desktop agnostic launcher"; license = licenses.gpl3Plus; maintainers = with maintainers; [ ericsagnes ]; From 1f0ce0eaf8ca840e769615acc7581bd71268ca44 Mon Sep 17 00:00:00 2001 From: Nikolay Amiantov Date: Mon, 20 Mar 2017 16:15:38 +0300 Subject: [PATCH 32/86] makeTest: don't rely on makeWrapper not quoting newlines --- nixos/lib/testing.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/nixos/lib/testing.nix b/nixos/lib/testing.nix index c1cb5072acad..8539fef0a19d 100644 --- a/nixos/lib/testing.nix +++ b/nixos/lib/testing.nix @@ -108,16 +108,16 @@ rec { mkdir -p $out/bin echo "$testScript" > $out/test-script ln -s ${testDriver}/bin/nixos-test-driver $out/bin/ - vms="$(for i in ${toString vms}; do echo $i/bin/run-*-vm; done)" + vms=($(for i in ${toString vms}; do echo $i/bin/run-*-vm; done)) wrapProgram $out/bin/nixos-test-driver \ - --add-flags "$vms" \ + --add-flags "''${vms[*]}" \ ${lib.optionalString enableOCR "--prefix PATH : '${ocrProg}/bin'"} \ --run "testScript=\"\$(cat $out/test-script)\"" \ --set testScript '$testScript' \ --set VLANS '${toString vlans}' ln -s ${testDriver}/bin/nixos-test-driver $out/bin/nixos-run-vms wrapProgram $out/bin/nixos-run-vms \ - --add-flags "$vms" \ + --add-flags "''${vms[*]}" \ ${lib.optionalString enableOCR "--prefix PATH : '${ocrProg}/bin'"} \ --set tests 'startAll; joinAll;' \ --set VLANS '${toString vlans}' \ From f9e8ef7e6d8b9df759a9cb6f7a1c3218684331ee Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Kristoffer=20S=C3=B8holm?= Date: Mon, 20 Mar 2017 14:28:02 +0100 Subject: [PATCH 33/86] nixos/bluetooth: add extraConfig option (#23427) --- nixos/modules/services/hardware/bluetooth.nix | 29 +++++++++++++++---- pkgs/os-specific/linux/bluez/bluez5.nix | 4 +++ 2 files changed, 28 insertions(+), 5 deletions(-) diff --git a/nixos/modules/services/hardware/bluetooth.nix b/nixos/modules/services/hardware/bluetooth.nix index 71b3a93a2e0d..f1fcb4369346 100644 --- a/nixos/modules/services/hardware/bluetooth.nix +++ b/nixos/modules/services/hardware/bluetooth.nix @@ -14,12 +14,26 @@ in options = { - hardware.bluetooth.enable = mkEnableOption "support for Bluetooth."; + hardware.bluetooth = { + enable = mkEnableOption "support for Bluetooth."; - hardware.bluetooth.powerOnBoot = mkOption { - type = types.bool; - default = true; - description = "Whether to power up the default Bluetooth controller on boot."; + powerOnBoot = mkOption { + type = types.bool; + default = true; + description = "Whether to power up the default Bluetooth controller on boot."; + }; + + extraConfig = mkOption { + type = types.lines; + default = ""; + example = '' + [General] + ControllerMode = bredr + ''; + description = '' + Set additional configuration for system-wide bluetooth (/etc/bluetooth/main.conf). + ''; + }; }; }; @@ -30,6 +44,11 @@ in environment.systemPackages = [ bluez-bluetooth pkgs.openobex pkgs.obexftp ]; + environment.etc = singleton { + source = pkgs.writeText "main.conf" cfg.extraConfig; + target = "bluetooth/main.conf"; + }; + services.udev.packages = [ bluez-bluetooth ]; services.dbus.packages = [ bluez-bluetooth ]; systemd.packages = [ bluez-bluetooth ]; diff --git a/pkgs/os-specific/linux/bluez/bluez5.nix b/pkgs/os-specific/linux/bluez/bluez5.nix index 6185e22fb875..9149f6da033b 100644 --- a/pkgs/os-specific/linux/bluez/bluez5.nix +++ b/pkgs/os-specific/linux/bluez/bluez5.nix @@ -73,6 +73,10 @@ stdenv.mkDerivation rec { mkdir $out/sbin ln -s ../libexec/bluetooth/bluetoothd $out/sbin/bluetoothd ln -s ../libexec/bluetooth/obexd $out/sbin/obexd + + # Add extra configuration + mkdir $out/etc/bluetooth + ln -s /etc/bluetooth/main.conf $out/etc/bluetooth/main.conf ''; enableParallelBuilding = true; From 72de3d7d6eca340b206f487845ce9140c00871a8 Mon Sep 17 00:00:00 2001 From: Matthew Daiter Date: Mon, 20 Mar 2017 14:41:41 +0100 Subject: [PATCH 34/86] yaws: erlang R17 -> R18 --- pkgs/top-level/all-packages.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 166a0dfc16e1..f6073b15ede0 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -11096,7 +11096,7 @@ with pkgs; xwayland = callPackage ../servers/x11/xorg/xwayland.nix { }; - yaws = callPackage ../servers/http/yaws { erlang = erlangR17; }; + yaws = callPackage ../servers/http/yaws { }; zabbix = recurseIntoAttrs (callPackages ../servers/monitoring/zabbix {}); From 7b27e1c3c9b3069239b11f8c62f8ef6e95a4fb48 Mon Sep 17 00:00:00 2001 From: Franz Pletz Date: Mon, 20 Mar 2017 14:37:22 +0100 Subject: [PATCH 35/86] wireshark: 2.2.4 -> 2.2.5 for multiple CVEs Fixes: * CVE-2017-5596 * CVE-2017-5597 * CVE-2017-6467 * CVE-2017-6468 * CVE-2017-6469 * CVE-2017-6470 * CVE-2017-6471 * CVE-2017-6472 * CVE-2017-6473 * CVE-2017-6474 --- .../networking/sniffers/wireshark/default.nix | 12 +++--------- 1 file changed, 3 insertions(+), 9 deletions(-) diff --git a/pkgs/applications/networking/sniffers/wireshark/default.nix b/pkgs/applications/networking/sniffers/wireshark/default.nix index 375a948c1f20..c8880e630a6d 100644 --- a/pkgs/applications/networking/sniffers/wireshark/default.nix +++ b/pkgs/applications/networking/sniffers/wireshark/default.nix @@ -12,7 +12,7 @@ assert withQt -> !withGtk && qt5 != null; with stdenv.lib; let - version = "2.2.4"; + version = "2.2.5"; variant = if withGtk then "gtk" else if withQt then "qt" else "cli"; in stdenv.mkDerivation { @@ -20,7 +20,7 @@ in stdenv.mkDerivation { src = fetchurl { url = "http://www.wireshark.org/download/src/all-versions/wireshark-${version}.tar.bz2"; - sha256 = "049r5962yrajhhz9r4dsnx403dab50d6091y2mw298ymxqszp9s2"; + sha256 = "1j4sc3pmy8l6k41007spglcqiabjlzc7f85pn3jmjr9ksv9qipbm"; }; nativeBuildInputs = [ @@ -35,13 +35,7 @@ in stdenv.mkDerivation { ++ optionals stdenv.isLinux [ libcap libnl ] ++ optionals stdenv.isDarwin [ SystemConfiguration ApplicationServices gmp ]; - patches = [ ./wireshark-lookup-dumpcap-in-path.patch - (fetchurl { - url = "https://code.wireshark.org/review/gitweb?p=wireshark.git;a=commitdiff_plain;h=c7042bedbb3b12c5f4e19e59e52da370d4ffe62f;hp=bc2b135677110d8065ba1174f09bc7f5ba73b9e9"; - sha256 = "1m70akywf2r52lhlvzr720vl1i7ng9cqbzaiif8s81xs4g4nn2rz"; - name = "wireshark-CVE-2017-6014.patch"; - }) - ]; + patches = [ ./wireshark-lookup-dumpcap-in-path.patch ]; postInstall = optionalString (withQt || withGtk) '' ${optionalString withGtk '' From 82969c69d3b2df0215d9e46ec70323b89f0a4079 Mon Sep 17 00:00:00 2001 From: Matthew Daiter Date: Mon, 20 Mar 2017 15:01:07 +0100 Subject: [PATCH 36/86] couchdb: R16 -> R17 --- pkgs/top-level/all-packages.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index f6073b15ede0..e34a1ae29101 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -10531,7 +10531,7 @@ with pkgs; spidermonkey = spidermonkey_1_8_5; python = python27; sphinx = python27Packages.sphinx; - erlang = erlangR16; + erlang = erlangR17; }; couchdb2 = callPackage ../servers/http/couchdb/2.0.0.nix { From ed59de18b5e98f6e71a5fd8efa2ff5104353cd8b Mon Sep 17 00:00:00 2001 From: Robin Gloster Date: Mon, 20 Mar 2017 15:05:21 +0100 Subject: [PATCH 37/86] fast-neural-doodle: mark as broken --- pkgs/tools/graphics/fast-neural-doodle/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/tools/graphics/fast-neural-doodle/default.nix b/pkgs/tools/graphics/fast-neural-doodle/default.nix index 5769336693d4..5d42482b3091 100644 --- a/pkgs/tools/graphics/fast-neural-doodle/default.nix +++ b/pkgs/tools/graphics/fast-neural-doodle/default.nix @@ -58,5 +58,6 @@ stdenv.mkDerivation rec { license = stdenv.lib.licenses.mit; maintainers = [stdenv.lib.maintainers.raskin]; platforms = stdenv.lib.platforms.linux; + broken = true; }; } From d709cdd8291cdab2e3fbfc979025e1de2005d332 Mon Sep 17 00:00:00 2001 From: Thomas Tuegel Date: Mon, 20 Mar 2017 09:22:04 -0500 Subject: [PATCH 38/86] nixos/plasma5: do not set kimpanel as default IBus panel kimpanel does not show installed IBus engines or allow switching input methods. kimpanel does show configured keyboard layouts through kxkb, so I believe there is some problem communicating with IBus. No error messages are produced in the log and I have been unable to discover the cause. I have no intention of continuing to work on kimpanel at this time, so it should be disabled. The GTK+ 3-based panel provided by IBus is perfectly serviceable in the interim. --- nixos/modules/services/x11/desktop-managers/plasma5.nix | 5 ----- 1 file changed, 5 deletions(-) diff --git a/nixos/modules/services/x11/desktop-managers/plasma5.nix b/nixos/modules/services/x11/desktop-managers/plasma5.nix index bc6e728169b4..f923d86265f2 100644 --- a/nixos/modules/services/x11/desktop-managers/plasma5.nix +++ b/nixos/modules/services/x11/desktop-managers/plasma5.nix @@ -225,11 +225,6 @@ in security.pam.services.sddm.enableKwallet = true; security.pam.services.slim.enableKwallet = true; - # use kimpanel as the default IBus panel - i18n.inputMethod.ibus.panel = - lib.mkDefault - "${plasma5.plasma-desktop}/lib/libexec/kimpanel-ibus-panel"; - }) ]; From 07252dc83bac056fbca0e646228853350ef33f64 Mon Sep 17 00:00:00 2001 From: Robin Gloster Date: Mon, 20 Mar 2017 16:04:37 +0100 Subject: [PATCH 39/86] virtualbox: 5.1.14 -> 5.1.18 --- pkgs/applications/virtualization/virtualbox/default.nix | 8 ++++---- .../virtualization/virtualbox/guest-additions/default.nix | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/applications/virtualization/virtualbox/default.nix b/pkgs/applications/virtualization/virtualbox/default.nix index 14121660fa85..257c419d88cf 100644 --- a/pkgs/applications/virtualization/virtualbox/default.nix +++ b/pkgs/applications/virtualization/virtualbox/default.nix @@ -18,10 +18,10 @@ let python = python2; buildType = "release"; - extpack = "baddb7cc49224ecc1147f82d77fce2685ac39941ac9b0aac83c270dd6570ea85"; - extpackRev = 112924; - main = "8267bb026717c6e55237eb798210767d9c703cfcdf01224d9bc26f7dac9f228a"; - version = "5.1.14"; + extpack = "996f783996a597d3936fc5f1ccf56edd31ae1f8fb4d527009647d9a2c8c853cd"; + extpackRev = "114002"; + main = "7ed0959bbbd02826b86b3d5dc8348931ddfab267c31f8ed36ee53c12f5522cd9"; + version = "5.1.18"; # See https://github.com/NixOS/nixpkgs/issues/672 for details extensionPack = requireFile rec { diff --git a/pkgs/applications/virtualization/virtualbox/guest-additions/default.nix b/pkgs/applications/virtualization/virtualbox/guest-additions/default.nix index 6e58d42a1cb5..df59f3e0e2e1 100644 --- a/pkgs/applications/virtualization/virtualbox/guest-additions/default.nix +++ b/pkgs/applications/virtualization/virtualbox/guest-additions/default.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation { src = fetchurl { url = "http://download.virtualbox.org/virtualbox/${version}/VBoxGuestAdditions_${version}.iso"; - sha256 = "1b206b76050dccd3ed979307230f9ddea79551e1c0aba93faee77416733cdc8a"; + sha256 = "f2951b49f48a560fbc1afe9d135d1f3f82a3e158b9002278d05d978428adca8a"; }; KERN_DIR = "${kernel.dev}/lib/modules/*/build"; From 853d01fe4164936175854a7fdb814deda63d60ce Mon Sep 17 00:00:00 2001 From: Shea Levy Date: Mon, 20 Mar 2017 12:18:04 -0400 Subject: [PATCH 40/86] terraform: disable tests on old versions --- pkgs/applications/networking/cluster/terraform/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/applications/networking/cluster/terraform/default.nix b/pkgs/applications/networking/cluster/terraform/default.nix index a1bcd027f6ad..a91a28deba12 100644 --- a/pkgs/applications/networking/cluster/terraform/default.nix +++ b/pkgs/applications/networking/cluster/terraform/default.nix @@ -27,7 +27,7 @@ let export HOME=$TMP ''; - doCheck = true; + doCheck = builtins.compareVersions version "0.8.8" >= 0; meta = with stdenv.lib; { description = "Tool for building, changing, and versioning infrastructure"; From cd426e66b83c2f0487bca8e4b5ca157faf5d9e30 Mon Sep 17 00:00:00 2001 From: Matt McHenry Date: Sun, 19 Mar 2017 17:21:34 -0400 Subject: [PATCH 41/86] friday-juicypixels: disable tests the tarball from https://hackage.haskell.org/package/friday-juicypixels-0.1.2/friday-juicypixels-0.1.2.tar.gz does not include the test/rgba8.png file, which causes the test code to fail --- pkgs/development/haskell-modules/configuration-common.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index 8811a7b093ab..e8e573bb8319 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -282,6 +282,7 @@ self: super: { etcd = dontCheck super.etcd; fb = dontCheck super.fb; # needs credentials for Facebook fptest = dontCheck super.fptest; # http://hydra.cryp.to/build/499124/log/raw + friday-juicypixels = dontCheck super.friday-juicypixels; #tarball missing test/rgba8.png ghc-events = dontCheck super.ghc-events; # http://hydra.cryp.to/build/498226/log/raw ghc-events-parallel = dontCheck super.ghc-events-parallel; # http://hydra.cryp.to/build/496828/log/raw ghc-imported-from = dontCheck super.ghc-imported-from; From 4e5461127dd045be941d7bcf194c5794246241f5 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Mon, 20 Mar 2017 14:04:46 +0100 Subject: [PATCH 42/86] apache-httpd: Strip modules We did this for 2.2 (cc61d31902d67b94333f53a5ab5772330bbc21cc) but lost this for 2.4. This reduces the Apache closure size from 312 MiB to 102 MiB (primarily by getting rid of -dev outputs). --- pkgs/servers/http/apache-httpd/2.4.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pkgs/servers/http/apache-httpd/2.4.nix b/pkgs/servers/http/apache-httpd/2.4.nix index e9c1ec8b7242..f70d6266e8d7 100644 --- a/pkgs/servers/http/apache-httpd/2.4.nix +++ b/pkgs/servers/http/apache-httpd/2.4.nix @@ -45,6 +45,7 @@ stdenv.mkDerivation rec { preConfigure = '' configureFlags="$configureFlags --includedir=$dev/include" ''; + configureFlags = '' --with-apr=${apr.dev} --with-apr-util=${aprutil.dev} @@ -67,6 +68,8 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; + stripDebugList = "lib modules bin"; + postInstall = '' mkdir -p $doc/share/doc/httpd mv $out/manual $doc/share/doc/httpd From 96d7f35e96f5b8baa249ce1d7b237a3f34ee87ab Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Mon, 20 Mar 2017 14:19:50 +0100 Subject: [PATCH 43/86] diffoscope: Don't propagate build inputs This reduces the runtime closure size from 297 to 132 MiB. --- pkgs/tools/misc/diffoscope/default.nix | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/pkgs/tools/misc/diffoscope/default.nix b/pkgs/tools/misc/diffoscope/default.nix index 6a9763666d3b..4f0a9ba12c11 100644 --- a/pkgs/tools/misc/diffoscope/default.nix +++ b/pkgs/tools/misc/diffoscope/default.nix @@ -29,11 +29,13 @@ python3.pkgs.buildPythonApplication rec { # Still missing these tools: enjarify, otool & lipo (maybe OS X only), showttf # Also these libraries: python3-guestfs # FIXME: move xxd into a separate package so we don't have to pull in all of vim. - propagatedBuildInputs = (with python3.pkgs; [ debian libarchive-c python_magic tlsh rpm ]) ++ + buildInputs = map lib.getBin ([ acl binutils bzip2 cbfstool cdrkit cpio diffutils e2fsprogs file gettext gzip libcaca poppler_utils sng sqlite squashfsTools unzip vim xz colordiff ] ++ lib.optionals enableBloat [ colord fpc ghc gnupg1 jdk mono pdftk ]); + pythonPath = with python3.pkgs; [ debian libarchive-c python_magic tlsh rpm ]; + doCheck = false; # Calls 'mknod' in squashfs tests, which needs root postInstall = '' From 3ab897c6cf3668b96f8e02c4da7108c1d6f2ea4c Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Mon, 20 Mar 2017 14:41:25 +0100 Subject: [PATCH 44/86] gconf: Use a dev output This reduces the closure size of gconf from 225 to 63 MiB. --- pkgs/desktops/gnome-3/3.22/core/gconf/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/desktops/gnome-3/3.22/core/gconf/default.nix b/pkgs/desktops/gnome-3/3.22/core/gconf/default.nix index a4cb3e8c1464..d3b2d814b164 100644 --- a/pkgs/desktops/gnome-3/3.22/core/gconf/default.nix +++ b/pkgs/desktops/gnome-3/3.22/core/gconf/default.nix @@ -24,6 +24,8 @@ stdenv.mkDerivation rec { # ToDo: ldap reported as not found but afterwards reported as supported + outputs = [ "out" "dev" ]; + meta = with stdenv.lib; { homepage = http://projects.gnome.org/gconf/; description = "A system for storing application preferences"; From 1824832e177e440d2489333f17deca12e4e08f5a Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Mon, 20 Mar 2017 14:43:55 +0100 Subject: [PATCH 45/86] rtmpdump: Use multiple outputs This reduces the runtime closure size from 80 to 23 MiB. --- pkgs/tools/video/rtmpdump/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/tools/video/rtmpdump/default.nix b/pkgs/tools/video/rtmpdump/default.nix index 547700639bb9..4eec47e9e759 100644 --- a/pkgs/tools/video/rtmpdump/default.nix +++ b/pkgs/tools/video/rtmpdump/default.nix @@ -30,6 +30,8 @@ stdenv.mkDerivation rec { ++ optionals gnutlsSupport [ gnutls nettle ] ++ optional opensslSupport openssl; + outputs = [ "out" "dev" ]; + meta = { description = "Toolkit for RTMP streams"; homepage = http://rtmpdump.mplayerhq.hu/; From f6c73f1e37c735abb686d07449f349b796c54cf8 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Mon, 20 Mar 2017 15:04:18 +0100 Subject: [PATCH 46/86] subversion: Clean up more *.la files This removes some -dev paths from the closure of subversionClient and gitFull. --- pkgs/applications/version-management/subversion/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/version-management/subversion/default.nix b/pkgs/applications/version-management/subversion/default.nix index eddbc0e56dd6..17ff3e4b19f3 100644 --- a/pkgs/applications/version-management/subversion/default.nix +++ b/pkgs/applications/version-management/subversion/default.nix @@ -26,8 +26,8 @@ let inherit sha256; }; - # Can't do separate $lib and $bin, as libs reference bins - outputs = [ "out" "dev" "man" ]; + # Can't do separate $lib and $bin, as libs reference bins + outputs = [ "out" "dev" "man" ]; buildInputs = [ zlib apr aprutil sqlite openssl ] ++ stdenv.lib.optional httpSupport serf @@ -75,7 +75,7 @@ let mkdir -p $out/share/bash-completion/completions cp tools/client-side/bash_completion $out/share/bash-completion/completions/subversion - for f in $out/lib/*.la; do + for f in $out/lib/*.la $out/lib/python*/site-packages/*/*.la; do substituteInPlace $f \ --replace "${expat.dev}/lib" "${expat.out}/lib" \ --replace "${zlib.dev}/lib" "${zlib.out}/lib" \ From 7c60ba1d41485676d86fe4acf277878e3bcb9554 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Mon, 20 Mar 2017 15:18:56 +0100 Subject: [PATCH 47/86] ibus: Use dev output This removes glib.dev from the runtime closure, reducing its size from 357 to 253 MiB. --- pkgs/tools/inputmethods/ibus/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/tools/inputmethods/ibus/default.nix b/pkgs/tools/inputmethods/ibus/default.nix index 58afb638b470..de375ed4529d 100644 --- a/pkgs/tools/inputmethods/ibus/default.nix +++ b/pkgs/tools/inputmethods/ibus/default.nix @@ -45,6 +45,8 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ makeWrapper ]; + outputs = [ "out" "dev" ]; + preConfigure = '' # Fix hard-coded installation paths, so make does not try to overwrite our # Python installation. From 6dd5846f1bdd759b25a754b5d47d2d495b8bf39b Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Mon, 20 Mar 2017 16:24:16 +0100 Subject: [PATCH 48/86] system-config-printer: Strip binaries in $out/etc This reduces its closure size from 484 to 281 MiB. --- pkgs/tools/misc/system-config-printer/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/tools/misc/system-config-printer/default.nix b/pkgs/tools/misc/system-config-printer/default.nix index fc4a24ec355b..a828a5fc43c0 100644 --- a/pkgs/tools/misc/system-config-printer/default.nix +++ b/pkgs/tools/misc/system-config-printer/default.nix @@ -35,6 +35,8 @@ in stdenv.mkDerivation rec { "--with-systemdsystemunitdir=$(out)/etc/systemd/system" ]; + stripDebugList = "bin lib etc/udev"; + postInstall = let giTypelibPath = stdenv.lib.makeSearchPath "lib/girepository-1.0" [ gdk_pixbuf.out gtk3.out pango.out atk.out libnotify.out ]; From 5897aa771c18de45551d23dd45d0cc9f0935c6fb Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Mon, 20 Mar 2017 16:26:04 +0100 Subject: [PATCH 49/86] system-config-printer: Remove -dev paths from closure Workaround for #24128. --- pkgs/tools/misc/system-config-printer/default.nix | 5 ++--- pkgs/top-level/python-packages.nix | 2 +- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/pkgs/tools/misc/system-config-printer/default.nix b/pkgs/tools/misc/system-config-printer/default.nix index a828a5fc43c0..f1a9c4b4640a 100644 --- a/pkgs/tools/misc/system-config-printer/default.nix +++ b/pkgs/tools/misc/system-config-printer/default.nix @@ -16,8 +16,6 @@ in stdenv.mkDerivation rec { sha256 = "1vxczk22f58nbikvj47s2x1gzh6q4mbgwnf091p00h3b6nxppdgn"; }; - propagatedBuildInputs = [ pythonPackages.pycurl ]; - patches = [ ./detect_serverbindir.patch ]; buildInputs = @@ -27,7 +25,7 @@ in stdenv.mkDerivation rec { ]; pythonPath = with pythonPackages; - [ pycups pycurl dbus-python pygobject3 requests2 pycairo ]; + [ pycups pycurl dbus-python pygobject3 requests2 pycairo pythonPackages.pycurl ]; configureFlags = [ "--with-udev-rules" @@ -46,6 +44,7 @@ in stdenv.mkDerivation rec { --set GI_TYPELIB_PATH ${giTypelibPath} \ --set CUPS_DATADIR ${cups-filters}/share/cups" wrapPythonPrograms + # The program imports itself, so we need to move shell wrappers to a proper place. fixupWrapper() { mv "$out/share/system-config-printer/$2.py" \ diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index cf06f64421e1..5923b06960a6 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -20080,7 +20080,7 @@ in { sha256 = "0v5w66ir3siimfzg3kc8hfrrilwwnbxq5bvipmrpyxar0kw715vf"; }; - propagatedBuildInputs = with self; [ pkgs.curl pkgs.openssl.out ]; + buildInputs = with self; [ pkgs.curl pkgs.openssl.out ]; # error: invalid command 'test' doCheck = false; From 3ff08d6f135b670e657d913404896e75109ded27 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Mon, 20 Mar 2017 16:49:45 +0100 Subject: [PATCH 50/86] php: Strip modules This reduces the closure size from 566 to 438 MiB. --- pkgs/development/interpreters/php/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/development/interpreters/php/default.nix b/pkgs/development/interpreters/php/default.nix index 116d4adf204d..7b1379ae6d7c 100644 --- a/pkgs/development/interpreters/php/default.nix +++ b/pkgs/development/interpreters/php/default.nix @@ -306,6 +306,8 @@ let substituteInPlace configure --replace "-lstdc++" "-lc++" ''; + stripDebugList = "bin sbin lib modules"; + }); in { From b751036a747222822594e875604c0d9cdc3f798e Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Mon, 20 Mar 2017 16:56:12 +0100 Subject: [PATCH 51/86] php: Add a dev output This reduces the closure size from 438 to 174 MiB. --- pkgs/development/interpreters/php/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/development/interpreters/php/default.nix b/pkgs/development/interpreters/php/default.nix index 7b1379ae6d7c..c3f56b4c6649 100644 --- a/pkgs/development/interpreters/php/default.nix +++ b/pkgs/development/interpreters/php/default.nix @@ -308,6 +308,8 @@ let stripDebugList = "bin sbin lib modules"; + outputs = [ "out" "dev" ]; + }); in { From 7151e7488378e8b23de8623a11524139939a30fb Mon Sep 17 00:00:00 2001 From: Franz Pletz Date: Mon, 20 Mar 2017 19:05:22 +0100 Subject: [PATCH 52/86] nixos: enable nginx test cc #23279 --- nixos/release.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/nixos/release.nix b/nixos/release.nix index d5cea1fe96c8..cf7f0a63f4b2 100644 --- a/nixos/release.nix +++ b/nixos/release.nix @@ -280,6 +280,7 @@ in rec { tests.networkingProxy = callTest tests/networking-proxy.nix {}; tests.nfs3 = callTest tests/nfs.nix { version = 3; }; tests.nfs4 = callTest tests/nfs.nix { version = 4; }; + tests.nginx = callTest tests/nginx.nix { }; tests.leaps = callTest tests/leaps.nix { }; tests.nsd = callTest tests/nsd.nix {}; tests.openssh = callTest tests/openssh.nix {}; From 68c6d90417c5fc0d75c140e5e51e4f026cd6edff Mon Sep 17 00:00:00 2001 From: Philipp Steinpass Date: Mon, 20 Mar 2017 19:06:16 +0100 Subject: [PATCH 53/86] Added option and description for nix store auto-optimisation. --- nixos/modules/services/misc/nix-daemon.nix | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/nixos/modules/services/misc/nix-daemon.nix b/nixos/modules/services/misc/nix-daemon.nix index 5088c4e60691..fed646aadac4 100644 --- a/nixos/modules/services/misc/nix-daemon.nix +++ b/nixos/modules/services/misc/nix-daemon.nix @@ -46,6 +46,7 @@ let binary-caches = ${toString cfg.binaryCaches} trusted-binary-caches = ${toString cfg.trustedBinaryCaches} binary-cache-public-keys = ${toString cfg.binaryCachePublicKeys} + auto-optimise-store = ${toString cfg.autoOptimiseStore} ${optionalString cfg.requireSignedBinaryCaches '' signed-binary-caches = * ''} @@ -86,6 +87,18 @@ in ''; }; + autoOptimiseStore = mkOption { + type = types.bool; + default = false; + example = true; + description = '' + If set to true, Nix automatically detects files in the store that have + identical contents, and replaces them with hard links to a single copy. + This saves disk space. If set to false (the default), you can still run + nix-store --optimise to get rid of duplicate files. + ''; + }; + buildCores = mkOption { type = types.int; default = 1; From c13922f0120d43f491ee286fd9362dd12833b9e5 Mon Sep 17 00:00:00 2001 From: Franz Pletz Date: Mon, 20 Mar 2017 19:58:52 +0100 Subject: [PATCH 54/86] nginx: explicitly use stable version Also updates the documention of the NixOS option `services.nginx.package` that upstream recommends using the mainline version instead. Fixes #21665. --- nixos/modules/services/web-servers/nginx/default.nix | 8 +++++--- pkgs/servers/http/nginx/generic.nix | 2 +- pkgs/top-level/all-packages.nix | 4 +++- 3 files changed, 9 insertions(+), 5 deletions(-) diff --git a/nixos/modules/services/web-servers/nginx/default.nix b/nixos/modules/services/web-servers/nginx/default.nix index 548467ae7856..4e57b920a7d8 100644 --- a/nixos/modules/services/web-servers/nginx/default.nix +++ b/nixos/modules/services/web-servers/nginx/default.nix @@ -246,11 +246,13 @@ in }; package = mkOption { - default = pkgs.nginx; - defaultText = "pkgs.nginx"; + default = pkgs.nginxStable; + defaultText = "pkgs.nginxStable"; type = types.package; description = " - Nginx package to use. + Nginx package to use. This defaults to the stable version. Note + that the nginx team recommends to use the mainline version which + available in nixpkgs as nginxMainline. "; }; diff --git a/pkgs/servers/http/nginx/generic.nix b/pkgs/servers/http/nginx/generic.nix index 5d5a98ad8a8f..dfde20452723 100644 --- a/pkgs/servers/http/nginx/generic.nix +++ b/pkgs/servers/http/nginx/generic.nix @@ -62,6 +62,6 @@ stdenv.mkDerivation { homepage = http://nginx.org; license = licenses.bsd2; platforms = platforms.all; - maintainers = with maintainers; [ thoughtpolice raskin ]; + maintainers = with maintainers; [ thoughtpolice raskin fpletz ]; }; } diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 144fcbd27295..2e72eda08f5c 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -10687,7 +10687,9 @@ with pkgs; neard = callPackage ../servers/neard { }; - nginx = callPackage ../servers/http/nginx/stable.nix { + nginx = nginxStable; + + nginxStable = callPackage ../servers/http/nginx/stable.nix { # We don't use `with` statement here on purpose! # See https://github.com/NixOS/nixpkgs/pull/10474/files#r42369334 modules = [ nginxModules.rtmp nginxModules.dav nginxModules.moreheaders ]; From 315e1a23c0ae1e8d30cee4de5908ce2bd2337968 Mon Sep 17 00:00:00 2001 From: Matthias Beyer Date: Mon, 20 Mar 2017 20:41:37 +0100 Subject: [PATCH 55/86] doc: Add rust documentation (#23510) --- doc/default.nix | 4 ++ doc/languages-frameworks/index.xml | 1 + doc/languages-frameworks/rust.md | 91 ++++++++++++++++++++++++++++++ 3 files changed, 96 insertions(+) create mode 100644 doc/languages-frameworks/rust.md diff --git a/doc/default.nix b/doc/default.nix index eaf3bb8d7a89..540a209c2ac9 100644 --- a/doc/default.nix +++ b/doc/default.nix @@ -68,6 +68,10 @@ pkgs.stdenv.mkDerivation { inputFile = ../pkgs/development/r-modules/README.md; outputFile = "languages-frameworks/r.xml"; } + + toDocbook { + inputFile = ./languages-frameworks/rust.md; + outputFile = "./languages-frameworks/rust.xml"; + } + toDocbook { inputFile = ./languages-frameworks/vim.md; outputFile = "./languages-frameworks/vim.xml"; diff --git a/doc/languages-frameworks/index.xml b/doc/languages-frameworks/index.xml index 32a89860ec84..fc15d847d15f 100644 --- a/doc/languages-frameworks/index.xml +++ b/doc/languages-frameworks/index.xml @@ -27,6 +27,7 @@ such as Perl or Haskell. These are described in this chapter. + diff --git a/doc/languages-frameworks/rust.md b/doc/languages-frameworks/rust.md new file mode 100644 index 000000000000..f4370d5e7067 --- /dev/null +++ b/doc/languages-frameworks/rust.md @@ -0,0 +1,91 @@ +--- +title: Rust +author: Matthias Beyer +date: 2017-03-05 +--- + +# User's Guide to the Rust Infrastructure + +To install the rust compiler and cargo put + +``` +rustStable.rustc +rustStable.cargo +``` + +into the `environment.systemPackages` or bring them into scope with +`nix-shell -p rustStable.rustc -p rustStable.cargo`. + +There are also `rustBeta` and `rustNightly` package sets available. +These are not updated very regulary. For daily builds see +[Using the Rust nightlies overlay](#using-the-rust-nightlies-overlay) + +## Packaging Rust applications + +Rust applications are packaged by using the `buildRustPackage` helper from `rustPlatform`: + +``` +with rustPlatform; + +buildRustPackage rec { + name = "ripgrep-${version}"; + version = "0.4.0"; + + src = fetchFromGitHub { + owner = "BurntSushi"; + repo = "ripgrep"; + rev = "${version}"; + sha256 = "0y5d1n6hkw85jb3rblcxqas2fp82h3nghssa4xqrhqnz25l799pj"; + }; + + depsSha256 = "0q68qyl2h6i0qsz82z840myxlnjay8p1w5z7hfyr8fqp7wgwa9cx"; + + meta = with stdenv.lib; { + description = "A utility that combines the usability of The Silver Searcher with the raw speed of grep"; + homepage = https://github.com/BurntSushi/ripgrep; + license = with licenses; [ unlicense ]; + maintainers = [ maintainers.tailhook ]; + platforms = platforms.all; + }; +} +``` + +`buildRustPackage` requires a `depsSha256` attribute which is computed over +all crate sources of this package. Currently it is obtained by inserting a +fake checksum into the expression and building the package once. The correct +checksum can be then take from the failed build. + +To install crates with nix there is also an experimental project called +[nixcrates](https://github.com/fractalide/nixcrates). + +## Using the Rust nightlies overlay + +Mozilla provides an overlay for nixpkgs to bring a nightly version of Rust into scope. +This overlay can _also_ be used to install recent unstable or stable versions +of Rust, if desired. + +To use this overlay, clone +[nixpkgs-mozilla](https://github.com/mozilla/nixpkgs-mozilla), +and create a symbolic link to the file +[rust-overlay.nix](https://github.com/mozilla/nixpkgs-mozilla/blob/master/rust-overlay.nix) +in the `~/.config/nixpkgs/overlays` directory. + + $ git clone https://github.com/mozilla/nixpkgs-mozilla.git + $ mkdir -p ~/.config/nixpkgs/overlays + $ ln -s $(pwd)/nixpkgs-mozilla/rust-overlay.nix ~/.config/nixpkgs/overlays/rust-overlay.nix + +The latest version can be installed with the following command: + + $ nix-env -Ai nixos.rustChannels.stable.rust + +Or using the attribute with nix-shell: + + $ nix-shell -p nixos.rustChannels.stable.rust + +To install the beta or nightly channel, "stable" should be substituted by +"nightly" or "beta", or +use the function provided by this overlay to pull a version based on a +build date. + +The overlay automatically updates itself as it uses the same source as +[rustup](https://www.rustup.rs/). From 6393d433803f84e02cc340645481dcd85231083b Mon Sep 17 00:00:00 2001 From: Robin Gloster Date: Mon, 20 Mar 2017 20:47:13 +0100 Subject: [PATCH 56/86] doc: remove double space --- doc/languages-frameworks/rust.md | 2 +- pkgs/development/libraries/tclgpg/default.nix | 14 +++++++------- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/doc/languages-frameworks/rust.md b/doc/languages-frameworks/rust.md index f4370d5e7067..657e1642d2df 100644 --- a/doc/languages-frameworks/rust.md +++ b/doc/languages-frameworks/rust.md @@ -71,7 +71,7 @@ and create a symbolic link to the file in the `~/.config/nixpkgs/overlays` directory. $ git clone https://github.com/mozilla/nixpkgs-mozilla.git - $ mkdir -p ~/.config/nixpkgs/overlays + $ mkdir -p ~/.config/nixpkgs/overlays $ ln -s $(pwd)/nixpkgs-mozilla/rust-overlay.nix ~/.config/nixpkgs/overlays/rust-overlay.nix The latest version can be installed with the following command: diff --git a/pkgs/development/libraries/tclgpg/default.nix b/pkgs/development/libraries/tclgpg/default.nix index d8bea7f14e3e..e156982b6aba 100644 --- a/pkgs/development/libraries/tclgpg/default.nix +++ b/pkgs/development/libraries/tclgpg/default.nix @@ -1,13 +1,13 @@ -{ stdenv, fetchsvn, autoconf, automake, tcl, tcllib, gnupg }: +{ stdenv, fetchfossil, autoreconfHook, tcl, tcllib, gnupg }: stdenv.mkDerivation rec { name = "tclgpg-${version}"; version = "1.0pre"; - src = fetchsvn { - url = "http://tclgpg.googlecode.com/svn/trunk"; - rev = 74; - sha256 = "5207b1d246fea6d4527e8c044579dae45a2e31eeaa5633f4f97c7e7b54ec27c5"; + src = fetchfossil { + url = "https://chiselapp.com/user/sgolovan/repository/tclgpg"; + rev = "c5384e400f4a6efa"; + sha256 = "5207b1d246fea6d4527e8c044579dae45a2e31eeaa5633f4fa7c7e7b54ec27c5"; }; configureFlags = "--with-tcl=" + tcl + "/lib " @@ -16,7 +16,6 @@ stdenv.mkDerivation rec { preConfigure = '' configureFlags="--exec_prefix=$prefix $configureFlags" sed -i -e 's|dtplite|TCLLIBPATH="${tcllib}/lib/tcllib${tcllib.version}" &|' Makefile.in - autoreconf -vfi ''; prePatch = '' @@ -27,7 +26,8 @@ stdenv.mkDerivation rec { libPrefix = "gpg1.0"; }; - buildInputs = [ autoconf automake tcl tcllib ]; + nativeBuildInputs = [ autoreconfHook ]; + buildInputs = [ tcl tcllib ]; meta = { homepage = http://code.google.com/p/tclgpg/; From 88341c4d2b289eefdaa94c6390975a14f15b4fb7 Mon Sep 17 00:00:00 2001 From: Robin Gloster Date: Mon, 20 Mar 2017 20:57:36 +0100 Subject: [PATCH 57/86] Revert "doc: remove double space" This reverts commit 6393d433803f84e02cc340645481dcd85231083b. Commit added too much changes. --- doc/languages-frameworks/rust.md | 2 +- pkgs/development/libraries/tclgpg/default.nix | 14 +++++++------- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/doc/languages-frameworks/rust.md b/doc/languages-frameworks/rust.md index 657e1642d2df..f4370d5e7067 100644 --- a/doc/languages-frameworks/rust.md +++ b/doc/languages-frameworks/rust.md @@ -71,7 +71,7 @@ and create a symbolic link to the file in the `~/.config/nixpkgs/overlays` directory. $ git clone https://github.com/mozilla/nixpkgs-mozilla.git - $ mkdir -p ~/.config/nixpkgs/overlays + $ mkdir -p ~/.config/nixpkgs/overlays $ ln -s $(pwd)/nixpkgs-mozilla/rust-overlay.nix ~/.config/nixpkgs/overlays/rust-overlay.nix The latest version can be installed with the following command: diff --git a/pkgs/development/libraries/tclgpg/default.nix b/pkgs/development/libraries/tclgpg/default.nix index e156982b6aba..d8bea7f14e3e 100644 --- a/pkgs/development/libraries/tclgpg/default.nix +++ b/pkgs/development/libraries/tclgpg/default.nix @@ -1,13 +1,13 @@ -{ stdenv, fetchfossil, autoreconfHook, tcl, tcllib, gnupg }: +{ stdenv, fetchsvn, autoconf, automake, tcl, tcllib, gnupg }: stdenv.mkDerivation rec { name = "tclgpg-${version}"; version = "1.0pre"; - src = fetchfossil { - url = "https://chiselapp.com/user/sgolovan/repository/tclgpg"; - rev = "c5384e400f4a6efa"; - sha256 = "5207b1d246fea6d4527e8c044579dae45a2e31eeaa5633f4fa7c7e7b54ec27c5"; + src = fetchsvn { + url = "http://tclgpg.googlecode.com/svn/trunk"; + rev = 74; + sha256 = "5207b1d246fea6d4527e8c044579dae45a2e31eeaa5633f4f97c7e7b54ec27c5"; }; configureFlags = "--with-tcl=" + tcl + "/lib " @@ -16,6 +16,7 @@ stdenv.mkDerivation rec { preConfigure = '' configureFlags="--exec_prefix=$prefix $configureFlags" sed -i -e 's|dtplite|TCLLIBPATH="${tcllib}/lib/tcllib${tcllib.version}" &|' Makefile.in + autoreconf -vfi ''; prePatch = '' @@ -26,8 +27,7 @@ stdenv.mkDerivation rec { libPrefix = "gpg1.0"; }; - nativeBuildInputs = [ autoreconfHook ]; - buildInputs = [ tcl tcllib ]; + buildInputs = [ autoconf automake tcl tcllib ]; meta = { homepage = http://code.google.com/p/tclgpg/; From 72a5cf11ccdd0cd0fc4a335587abd38b2af7857a Mon Sep 17 00:00:00 2001 From: Robin Gloster Date: Mon, 20 Mar 2017 20:59:43 +0100 Subject: [PATCH 58/86] doc: remove double space --- doc/languages-frameworks/rust.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/doc/languages-frameworks/rust.md b/doc/languages-frameworks/rust.md index f4370d5e7067..657e1642d2df 100644 --- a/doc/languages-frameworks/rust.md +++ b/doc/languages-frameworks/rust.md @@ -71,7 +71,7 @@ and create a symbolic link to the file in the `~/.config/nixpkgs/overlays` directory. $ git clone https://github.com/mozilla/nixpkgs-mozilla.git - $ mkdir -p ~/.config/nixpkgs/overlays + $ mkdir -p ~/.config/nixpkgs/overlays $ ln -s $(pwd)/nixpkgs-mozilla/rust-overlay.nix ~/.config/nixpkgs/overlays/rust-overlay.nix The latest version can be installed with the following command: From 1c3308e9c1dcbfc939b8cfd6d4f6e7b1c4b40748 Mon Sep 17 00:00:00 2001 From: Robin Gloster Date: Mon, 20 Mar 2017 21:29:47 +0100 Subject: [PATCH 59/86] jdepend: 2.9.0 -> 2.9.1, fix build --- .../tools/analysis/jdepend/default.nix | 38 ++++++++++++------- 1 file changed, 24 insertions(+), 14 deletions(-) diff --git a/pkgs/development/tools/analysis/jdepend/default.nix b/pkgs/development/tools/analysis/jdepend/default.nix index 586e9d5cd5d3..bf1d1357f5e7 100644 --- a/pkgs/development/tools/analysis/jdepend/default.nix +++ b/pkgs/development/tools/analysis/jdepend/default.nix @@ -1,24 +1,34 @@ -{stdenv, fetchurl, unzip}: +{ stdenv, fetchFromGitHub, ant, jdk }: -stdenv.mkDerivation { - name = "jdepend-2.9"; - buildInputs = [unzip] ; +stdenv.mkDerivation rec { + name = "jdepend-${version}"; + version = "2.9.1"; - src = fetchurl { - url = http://www.clarkware.com/software/jdepend-2.9.zip ; - sha256 = "1915fk9w9mjv9i6hlkn2grv2kjqcgn4xa8278v66f1ix5wpfcb90"; + src = fetchFromGitHub { + owner = "clarkware"; + repo = "jdepend"; + rev = version; + sha256 = "1sxkgj4k4dhg8vb772pvisyzb8x0gwvlfqqir30ma4zvz3rfz60p"; }; + nativeBuildInputs = [ ant jdk ]; + buildPhase = "ant jar"; + installPhase = '' - mkdir -p $out - cp -R * $out + mkdir -p $out/bin $out/share + install dist/${name}.jar $out/share + + cat > "$out/bin/jdepend" < Date: Mon, 20 Mar 2017 16:20:37 -0500 Subject: [PATCH 60/86] bitcoin-xt: 0.11D -> 0.11F (#23581) --- pkgs/applications/altcoins/bitcoin-xt.nix | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/pkgs/applications/altcoins/bitcoin-xt.nix b/pkgs/applications/altcoins/bitcoin-xt.nix index fd2d2f35bcb4..be4ea1fd6b66 100644 --- a/pkgs/applications/altcoins/bitcoin-xt.nix +++ b/pkgs/applications/altcoins/bitcoin-xt.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, autoreconfHook, openssl, db48, boost +{ stdenv, fetchFromGitHub, pkgconfig, autoreconfHook, openssl, db48, boost , zlib, miniupnpc, qt4, utillinux, protobuf, qrencode, curl , withGui }: @@ -6,14 +6,17 @@ with stdenv.lib; stdenv.mkDerivation rec{ name = "bitcoin" + (toString (optional (!withGui) "d")) + "-xt-" + version; - version = "0.11D"; + version = "0.11F"; - src = fetchurl { - url = "https://github.com/bitcoinxt/bitcoinxt/archive/v${version}.tar.gz"; - sha256 = "09r2i88wzqaj6mh66l3ngyfkm1a0dhwm5ibalj6y55wbxm9bvd36"; + src = fetchFromGitHub { + owner = "bitcoinxt"; + repo = "bitcoinxt"; + rev = "v${version}"; + sha256 = "13s5k9mxmlbf49p5hc546x20y5dslfp6g9hi6nw5yja5bngbwr24"; }; - buildInputs = [ pkgconfig autoreconfHook openssl db48 boost zlib + nativeBuildInputs = [ pkgconfig autoreconfHook ]; + buildInputs = [ openssl db48 boost zlib miniupnpc utillinux protobuf curl ] ++ optionals withGui [ qt4 qrencode ]; From 8c0074dd9f02daffe7b11b5ce427fd899e189b09 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Benno=20F=C3=BCnfst=C3=BCck?= Date: Mon, 20 Mar 2017 22:25:10 +0100 Subject: [PATCH 61/86] drbd: fix output file location (#23541) drbd was installing files into $out/nix/store/... due to the usage of DESTDIR (setting both DESTDIR + prefix to $out will cause files to be installed into $out/$out/...) --- pkgs/os-specific/linux/drbd/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/os-specific/linux/drbd/default.nix b/pkgs/os-specific/linux/drbd/default.nix index 60615fb1e5be..ead0d41ab8d9 100644 --- a/pkgs/os-specific/linux/drbd/default.nix +++ b/pkgs/os-specific/linux/drbd/default.nix @@ -19,17 +19,17 @@ stdenv.mkDerivation rec { preConfigure = '' export PATH=${systemd.udev.bin}/sbin:$PATH - substituteInPlace user/Makefile.in --replace /sbin/ $out/sbin/ + substituteInPlace user/Makefile.in \ + --replace /sbin '$(sbindir)' substituteInPlace user/legacy/Makefile.in \ - --replace /sbin/ $out/sbin/ \ - --replace '$(DESTDIR)/lib/drbd' $out/lib/drbd + --replace '$(DESTDIR)/lib/drbd' '$(DESTDIR)$(LIBDIR)' substituteInPlace user/drbdadm_usage_cnt.c --replace /lib/drbd $out/lib/drbd substituteInPlace scripts/drbd.rules --replace /sbin/drbdadm $out/sbin/drbdadm ''; makeFlags = "SHELL=${stdenv.shell}"; - installFlags = "localstatedir=$(TMPDIR)/var sysconfdir=$(out)/etc INITDIR=$(out)/etc/init.d DESTDIR=$(out)"; + installFlags = "localstatedir=$(TMPDIR)/var sysconfdir=$(out)/etc INITDIR=$(out)/etc/init.d"; meta = { homepage = http://www.drbd.org/; From 9dfb7e42ad71c4415d3f8a638748eccbfb1f6652 Mon Sep 17 00:00:00 2001 From: Tristan Helmich Date: Sun, 26 Feb 2017 21:40:11 +0100 Subject: [PATCH 62/86] heartbeat: init at 5.2.1 --- pkgs/misc/logging/heartbeat/default.nix | 28 +++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 30 insertions(+) create mode 100644 pkgs/misc/logging/heartbeat/default.nix diff --git a/pkgs/misc/logging/heartbeat/default.nix b/pkgs/misc/logging/heartbeat/default.nix new file mode 100644 index 000000000000..905fbf5fb757 --- /dev/null +++ b/pkgs/misc/logging/heartbeat/default.nix @@ -0,0 +1,28 @@ +{ stdenv, fetchurl }: + +stdenv.mkDerivation rec { + name = "heartbeat-${version}"; + version = "5.2.1"; + + src = fetchurl { + url = "https://artifacts.elastic.co/downloads/beats/heartbeat/${name}-linux-x86_64.tar.gz"; + sha256 = "1sq3va0kbpqsjbd0bnziv2hwnp6nc2vk32hc9drjk7bhcxkp440l"; + }; + + # statically linked binary, no need to build anything + dontBuild = true; + doCheck = false; + + installPhase = '' + mkdir -p $out/bin + cp heartbeat $out/bin/ + ''; + + meta = { + description = "Lightweight shipper for uptime monitoring"; + homepage = https://www.elastic.co/products/beats; + license = stdenv.lib.licenses.asl20; + maintainers = [ stdenv.lib.maintainers.fadenb ]; + platforms = [ "x86_64-linux" ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 2e72eda08f5c..37fe947468da 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -944,6 +944,8 @@ with pkgs; gti = callPackage ../tools/misc/gti { }; + heartbeat = callPackage ../misc/logging/heartbeat { }; + heatseeker = callPackage ../tools/misc/heatseeker { }; hexio = callPackage ../development/tools/hexio { }; From 9fce67264d8709bedb4ca86ba3752ca634933dc7 Mon Sep 17 00:00:00 2001 From: Tristan Helmich Date: Sun, 26 Feb 2017 21:37:05 +0100 Subject: [PATCH 63/86] metricbeat: init at 5.2.1 --- pkgs/misc/logging/metricbeat/default.nix | 33 ++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 35 insertions(+) create mode 100644 pkgs/misc/logging/metricbeat/default.nix diff --git a/pkgs/misc/logging/metricbeat/default.nix b/pkgs/misc/logging/metricbeat/default.nix new file mode 100644 index 000000000000..c925dee7da97 --- /dev/null +++ b/pkgs/misc/logging/metricbeat/default.nix @@ -0,0 +1,33 @@ +{ stdenv, fetchurl }: + +stdenv.mkDerivation rec { + name = "metricbeat-${version}"; + version = "5.2.1"; + + src = fetchurl { + url = "https://artifacts.elastic.co/downloads/beats/metricbeat/${name}-linux-x86_64.tar.gz"; + sha256 = "0shpyqgrqiiqv9anipqms1xy0wn5n2m11fvicdzr3x1v3jygm1ds"; + }; + + # statically linked binary, no need to build anything + dontBuild = true; + doCheck = false; + + # need to patch interpreter to be able to run on NixOS + patchPhase = '' + patchelf --interpreter $(cat $NIX_CC/nix-support/dynamic-linker) metricbeat + ''; + + installPhase = '' + mkdir -p $out/bin + cp metricbeat $out/bin/ + ''; + + meta = { + description = "Lightweight shipper for metrics"; + homepage = https://www.elastic.co/products/beats; + license = stdenv.lib.licenses.asl20; + maintainers = [ stdenv.lib.maintainers.fadenb ]; + platforms = [ "x86_64-linux" ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 37fe947468da..6d1025b29f85 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -972,6 +972,8 @@ with pkgs; meson = callPackage ../development/tools/build-managers/meson { }; + metricbeat = callPackage ../misc/logging/metricbeat { }; + mp3fs = callPackage ../tools/filesystems/mp3fs { }; mpdcron = callPackage ../tools/audio/mpdcron { }; From 9fe3b0eb13405bd209527b8c2230170f229bd970 Mon Sep 17 00:00:00 2001 From: Tristan Helmich Date: Sun, 4 Dec 2016 19:59:46 +0100 Subject: [PATCH 64/86] filebeat: init at 5.2.1 --- pkgs/misc/logging/filebeat/default.nix | 28 ++++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 30 insertions(+) create mode 100644 pkgs/misc/logging/filebeat/default.nix diff --git a/pkgs/misc/logging/filebeat/default.nix b/pkgs/misc/logging/filebeat/default.nix new file mode 100644 index 000000000000..94d3c0d849f5 --- /dev/null +++ b/pkgs/misc/logging/filebeat/default.nix @@ -0,0 +1,28 @@ +{ stdenv, fetchurl }: + +stdenv.mkDerivation rec { + name = "filebeat-${version}"; + version = "5.2.1"; + + src = fetchurl { + url = "https://artifacts.elastic.co/downloads/beats/filebeat/${name}-linux-x86_64.tar.gz"; + sha256 = "0kwkd3n6jmd0mwbvk2dng8843mxyq4mfvlm3hc8d1vd2m1m9wlhi"; + }; + + # statically linked binary, no need to build anything + dontBuild = true; + doCheck = false; + + installPhase = '' + mkdir -p $out/bin + cp filebeat $out/bin/ + ''; + + meta = { + description = "Lightweight shipper for logfiles"; + homepage = https://www.elastic.co/products/beats; + license = stdenv.lib.licenses.asl20; + maintainers = [ stdenv.lib.maintainers.fadenb ]; + platforms = [ "x86_64-linux" ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 6d1025b29f85..289bfa010f61 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -902,6 +902,8 @@ with pkgs; fastJson = callPackage ../development/libraries/fastjson { }; + filebeat = callPackage ../misc/logging/filebeat { }; + filebench = callPackage ../tools/misc/filebench { }; fsmon = callPackage ../tools/misc/fsmon { }; From 8338506abe09be5135fcc29b13ac764e199c36b7 Mon Sep 17 00:00:00 2001 From: Tristan Helmich Date: Tue, 29 Nov 2016 22:07:13 +0100 Subject: [PATCH 65/86] packetbeat: init at 5.2.1 --- pkgs/misc/logging/packetbeat/default.nix | 38 ++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 40 insertions(+) create mode 100644 pkgs/misc/logging/packetbeat/default.nix diff --git a/pkgs/misc/logging/packetbeat/default.nix b/pkgs/misc/logging/packetbeat/default.nix new file mode 100644 index 000000000000..bc871a4e278e --- /dev/null +++ b/pkgs/misc/logging/packetbeat/default.nix @@ -0,0 +1,38 @@ +{ stdenv, fetchurl }: + +stdenv.mkDerivation rec { + name = "packetbeat-${version}"; + version = "5.2.1"; + + src = fetchurl { + url = "https://artifacts.elastic.co/downloads/beats/packetbeat/${name}-linux-x86_64.tar.gz"; + sha256 = "14ff466ban8pfsw750r8jkz1brczfrbcrwfhqvi5i8smfg56m9rl"; + }; + + dontBuild = true; + doCheck = false; + + # need to patch interpreter to be able to run on NixOS + patchPhase = '' + patchelf --interpreter $(cat $NIX_CC/nix-support/dynamic-linker) packetbeat + ''; + + installPhase = '' + mkdir -p $out/bin + cp packetbeat $out/bin/ + ''; + + meta = { + description = "Network packet analyzer that ships data to Elasticsearch"; + longDescription = '' + Packetbeat is an open source network packet analyzer that ships the data to Elasticsearch. + + Think of it like a distributed real-time Wireshark with a lot more analytics features. + The Packetbeat shippers sniff the traffic between your application processes, parse on the fly protocols like HTTP, MySQL, PostgreSQL, Redis or Thrift and correlate the messages into transactions. + ''; + homepage = https://www.elastic.co/products/beats; + license = stdenv.lib.licenses.asl20; + maintainers = [ stdenv.lib.maintainers.fadenb ]; + platforms = [ "x86_64-linux" ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 289bfa010f61..1e089956fdbf 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -3326,6 +3326,8 @@ with pkgs; nix = nixUnstable; }; + packetbeat = callPackage ../misc/logging/packetbeat { }; + packetdrill = callPackage ../tools/networking/packetdrill { }; pakcs = callPackage ../development/compilers/pakcs {}; From 4bfde8f5b47895af68823fc8600d230813f4473d Mon Sep 17 00:00:00 2001 From: Willi Butz Date: Mon, 20 Mar 2017 22:09:59 +0100 Subject: [PATCH 66/86] martyr: fixed build, removed build.sh, added meta (see #23253) --- pkgs/development/libraries/martyr/builder.sh | 7 ------ pkgs/development/libraries/martyr/default.nix | 25 ++++++++++++++----- 2 files changed, 19 insertions(+), 13 deletions(-) delete mode 100644 pkgs/development/libraries/martyr/builder.sh diff --git a/pkgs/development/libraries/martyr/builder.sh b/pkgs/development/libraries/martyr/builder.sh deleted file mode 100644 index 3ee7fc012d97..000000000000 --- a/pkgs/development/libraries/martyr/builder.sh +++ /dev/null @@ -1,7 +0,0 @@ -source $stdenv/setup - -mkdir -p $out -unpackPhase -cd $name -$apacheAnt/bin/ant -cp -R ./* $out diff --git a/pkgs/development/libraries/martyr/default.nix b/pkgs/development/libraries/martyr/default.nix index 7fbd44b3fa4a..3b6102715391 100644 --- a/pkgs/development/libraries/martyr/default.nix +++ b/pkgs/development/libraries/martyr/default.nix @@ -1,11 +1,24 @@ -{stdenv, fetchurl, apacheAnt}: +{stdenv, fetchurl, ant, jdk}: -stdenv.mkDerivation { - name = "martyr-0.3.9"; - builder = ./builder.sh; +stdenv.mkDerivation rec { + name = "martyr-${version}"; + version = "0.3.9"; src = fetchurl { - url = "mirror://sourceforge/martyr/martyr-0.3.9.tar.gz"; + url = "mirror://sourceforge/martyr/${name}.tar.gz"; sha256 = "1ks8j413bcby345kmq1i7av8kwjvz5vxdn1zpv0p7ywxq54i4z59"; }; - inherit stdenv apacheAnt; + + buildInputs = [ ant jdk ]; + + buildPhase = "ant"; + + installPhase = '' + mkdir -p "$out/share/java" + cp -v *.jar "$out/share/java" + ''; + + meta = { + description = "Martyr is a Java framework around the IRC protocol to allow application writers easy manipulation of the protocol and client state"; + homepage = http://martyr.sourceforge.net/; + }; } From a0d087b6fe8cf366a5b44a803f25ec350af21d97 Mon Sep 17 00:00:00 2001 From: Robin Gloster Date: Mon, 20 Mar 2017 22:54:35 +0100 Subject: [PATCH 67/86] filebeat: 5.2.1 -> 5.2.2, build from source --- pkgs/misc/logging/filebeat/default.nix | 31 ++++++++++++-------------- 1 file changed, 14 insertions(+), 17 deletions(-) diff --git a/pkgs/misc/logging/filebeat/default.nix b/pkgs/misc/logging/filebeat/default.nix index 94d3c0d849f5..c33f34c6dc4d 100644 --- a/pkgs/misc/logging/filebeat/default.nix +++ b/pkgs/misc/logging/filebeat/default.nix @@ -1,28 +1,25 @@ -{ stdenv, fetchurl }: +{ stdenv, fetchFromGitHub, buildGoPackage }: -stdenv.mkDerivation rec { +buildGoPackage rec { name = "filebeat-${version}"; - version = "5.2.1"; + version = "5.2.2"; - src = fetchurl { - url = "https://artifacts.elastic.co/downloads/beats/filebeat/${name}-linux-x86_64.tar.gz"; - sha256 = "0kwkd3n6jmd0mwbvk2dng8843mxyq4mfvlm3hc8d1vd2m1m9wlhi"; + src = fetchFromGitHub { + owner = "elastic"; + repo = "beats"; + rev = "v${version}"; + sha256 = "19hkq19xpi3c9y5g1yq77sm2d5vzybn6mxxf0s5l6sw4l98aak5q"; }; - # statically linked binary, no need to build anything - dontBuild = true; - doCheck = false; + goPackagePath = "github.com/elastic/beats"; - installPhase = '' - mkdir -p $out/bin - cp filebeat $out/bin/ - ''; + subPackages = [ "filebeat" ]; - meta = { + meta = with stdenv.lib; { description = "Lightweight shipper for logfiles"; homepage = https://www.elastic.co/products/beats; - license = stdenv.lib.licenses.asl20; - maintainers = [ stdenv.lib.maintainers.fadenb ]; - platforms = [ "x86_64-linux" ]; + license = licenses.asl20; + maintainers = [ maintainers.fadenb ]; + platforms = platforms.linux; }; } From 66d0c4b1bd2e947a95aa2795fb4a933429470219 Mon Sep 17 00:00:00 2001 From: Robin Gloster Date: Mon, 20 Mar 2017 22:54:59 +0100 Subject: [PATCH 68/86] heartbeat: 5.2.1 -> 5.2.2, build from source --- pkgs/misc/logging/heartbeat/default.nix | 31 +++++++++++-------------- 1 file changed, 14 insertions(+), 17 deletions(-) diff --git a/pkgs/misc/logging/heartbeat/default.nix b/pkgs/misc/logging/heartbeat/default.nix index 905fbf5fb757..faa558589f25 100644 --- a/pkgs/misc/logging/heartbeat/default.nix +++ b/pkgs/misc/logging/heartbeat/default.nix @@ -1,28 +1,25 @@ -{ stdenv, fetchurl }: +{ stdenv, fetchFromGitHub, buildGoPackage }: -stdenv.mkDerivation rec { +buildGoPackage rec { name = "heartbeat-${version}"; - version = "5.2.1"; + version = "5.2.2"; - src = fetchurl { - url = "https://artifacts.elastic.co/downloads/beats/heartbeat/${name}-linux-x86_64.tar.gz"; - sha256 = "1sq3va0kbpqsjbd0bnziv2hwnp6nc2vk32hc9drjk7bhcxkp440l"; + src = fetchFromGitHub { + owner = "elastic"; + repo = "beats"; + rev = "v${version}"; + sha256 = "19hkq19xpi3c9y5g1yq77sm2d5vzybn6mxxf0s5l6sw4l98aak5q"; }; - # statically linked binary, no need to build anything - dontBuild = true; - doCheck = false; + goPackagePath = "github.com/elastic/beats"; - installPhase = '' - mkdir -p $out/bin - cp heartbeat $out/bin/ - ''; + subPackages = [ "heartbeat" ]; - meta = { + meta = with stdenv.lib; { description = "Lightweight shipper for uptime monitoring"; homepage = https://www.elastic.co/products/beats; - license = stdenv.lib.licenses.asl20; - maintainers = [ stdenv.lib.maintainers.fadenb ]; - platforms = [ "x86_64-linux" ]; + license = licenses.asl20; + maintainers = [ maintainers.fadenb ]; + platforms = platforms.linux; }; } From 4d08d1aa8f44876b3c068384c5b03332aa134a29 Mon Sep 17 00:00:00 2001 From: Robin Gloster Date: Mon, 20 Mar 2017 22:55:13 +0100 Subject: [PATCH 69/86] metricbeat: 5.2.1 -> 5.2.2, build from source --- pkgs/misc/logging/metricbeat/default.nix | 36 +++++++++--------------- 1 file changed, 14 insertions(+), 22 deletions(-) diff --git a/pkgs/misc/logging/metricbeat/default.nix b/pkgs/misc/logging/metricbeat/default.nix index c925dee7da97..fcb2376a93d7 100644 --- a/pkgs/misc/logging/metricbeat/default.nix +++ b/pkgs/misc/logging/metricbeat/default.nix @@ -1,33 +1,25 @@ -{ stdenv, fetchurl }: +{ stdenv, fetchFromGitHub, buildGoPackage }: -stdenv.mkDerivation rec { +buildGoPackage rec { name = "metricbeat-${version}"; - version = "5.2.1"; + version = "5.2.2"; - src = fetchurl { - url = "https://artifacts.elastic.co/downloads/beats/metricbeat/${name}-linux-x86_64.tar.gz"; - sha256 = "0shpyqgrqiiqv9anipqms1xy0wn5n2m11fvicdzr3x1v3jygm1ds"; + src = fetchFromGitHub { + owner = "elastic"; + repo = "beats"; + rev = "v${version}"; + sha256 = "19hkq19xpi3c9y5g1yq77sm2d5vzybn6mxxf0s5l6sw4l98aak5q"; }; - # statically linked binary, no need to build anything - dontBuild = true; - doCheck = false; + goPackagePath = "github.com/elastic/beats"; - # need to patch interpreter to be able to run on NixOS - patchPhase = '' - patchelf --interpreter $(cat $NIX_CC/nix-support/dynamic-linker) metricbeat - ''; + subPackages = [ "metricbeat" ]; - installPhase = '' - mkdir -p $out/bin - cp metricbeat $out/bin/ - ''; - - meta = { + meta = with stdenv.lib; { description = "Lightweight shipper for metrics"; homepage = https://www.elastic.co/products/beats; - license = stdenv.lib.licenses.asl20; - maintainers = [ stdenv.lib.maintainers.fadenb ]; - platforms = [ "x86_64-linux" ]; + license = licenses.asl20; + maintainers = [ maintainers.fadenb ]; + platforms = platforms.linux; }; } From 10239a084f2eaf63d63228dd7d3e4473c3489dfb Mon Sep 17 00:00:00 2001 From: Robin Gloster Date: Mon, 20 Mar 2017 22:55:19 +0100 Subject: [PATCH 70/86] packetbeat: 5.2.1 -> 5.2.2, build from source --- pkgs/misc/logging/packetbeat/default.nix | 44 +++++++++++------------- 1 file changed, 21 insertions(+), 23 deletions(-) diff --git a/pkgs/misc/logging/packetbeat/default.nix b/pkgs/misc/logging/packetbeat/default.nix index bc871a4e278e..d4445bec9980 100644 --- a/pkgs/misc/logging/packetbeat/default.nix +++ b/pkgs/misc/logging/packetbeat/default.nix @@ -1,38 +1,36 @@ -{ stdenv, fetchurl }: +{ stdenv, fetchFromGitHub, buildGoPackage, libpcap }: -stdenv.mkDerivation rec { +buildGoPackage rec { name = "packetbeat-${version}"; - version = "5.2.1"; + version = "5.2.2"; - src = fetchurl { - url = "https://artifacts.elastic.co/downloads/beats/packetbeat/${name}-linux-x86_64.tar.gz"; - sha256 = "14ff466ban8pfsw750r8jkz1brczfrbcrwfhqvi5i8smfg56m9rl"; + src = fetchFromGitHub { + owner = "elastic"; + repo = "beats"; + rev = "v${version}"; + sha256 = "19hkq19xpi3c9y5g1yq77sm2d5vzybn6mxxf0s5l6sw4l98aak5q"; }; - dontBuild = true; - doCheck = false; + goPackagePath = "github.com/elastic/beats"; - # need to patch interpreter to be able to run on NixOS - patchPhase = '' - patchelf --interpreter $(cat $NIX_CC/nix-support/dynamic-linker) packetbeat - ''; + subPackages = [ "packetbeat" ]; - installPhase = '' - mkdir -p $out/bin - cp packetbeat $out/bin/ - ''; + buildInputs = [ libpcap ]; - meta = { + meta = with stdenv.lib; { description = "Network packet analyzer that ships data to Elasticsearch"; longDescription = '' - Packetbeat is an open source network packet analyzer that ships the data to Elasticsearch. + Packetbeat is an open source network packet analyzer that ships the + data to Elasticsearch. - Think of it like a distributed real-time Wireshark with a lot more analytics features. - The Packetbeat shippers sniff the traffic between your application processes, parse on the fly protocols like HTTP, MySQL, PostgreSQL, Redis or Thrift and correlate the messages into transactions. + Think of it like a distributed real-time Wireshark with a lot more + analytics features. The Packetbeat shippers sniff the traffic between + your application processes, parse on the fly protocols like HTTP, MySQL, + PostgreSQL, Redis or Thrift and correlate the messages into transactions. ''; homepage = https://www.elastic.co/products/beats; - license = stdenv.lib.licenses.asl20; - maintainers = [ stdenv.lib.maintainers.fadenb ]; - platforms = [ "x86_64-linux" ]; + license = licenses.asl20; + maintainers = [ maintainers.fadenb ]; + platforms = platforms.linux; }; } From 4a53b2eaf7400c295b298aea8600553d8e360a24 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Mon, 20 Mar 2017 23:22:28 +0100 Subject: [PATCH 71/86] crda: Add usage hint to longDescription. Reported by samae on #nixos. --- pkgs/os-specific/linux/crda/default.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/pkgs/os-specific/linux/crda/default.nix b/pkgs/os-specific/linux/crda/default.nix index ac6117cd599f..5e63524e7dcb 100644 --- a/pkgs/os-specific/linux/crda/default.nix +++ b/pkgs/os-specific/linux/crda/default.nix @@ -40,7 +40,13 @@ stdenv.mkDerivation rec { longDescription = '' CRDA acts as the udev helper for communication between the kernel and userspace for regulatory compliance. It relies on nl80211 for communication. + CRDA is intended to be run only through udev communication from the kernel. + To use it under NixOS, add + + services.udev.packages = [ pkgs.crda ]; + + to the system configuration. ''; homepage = http://drvbp1.linux-foundation.org/~mcgrof/rel-html/crda/; license = licenses.free; # "copyleft-next 0.3.0", as yet without a web site From 5e0f932de0d040c93c268f8aea601bd6b3a7bfd6 Mon Sep 17 00:00:00 2001 From: Robin Gloster Date: Mon, 20 Mar 2017 23:27:16 +0100 Subject: [PATCH 72/86] rl-notes 17.03: info on python module location closes #11567 --- nixos/doc/manual/release-notes/rl-1703.xml | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/nixos/doc/manual/release-notes/rl-1703.xml b/nixos/doc/manual/release-notes/rl-1703.xml index c03bf33de8bd..f6e8e9a4515b 100644 --- a/nixos/doc/manual/release-notes/rl-1703.xml +++ b/nixos/doc/manual/release-notes/rl-1703.xml @@ -252,7 +252,7 @@ following incompatible changes: -Other notable improvements: +Other notable changes: @@ -283,6 +283,14 @@ following incompatible changes: + + + When adding new or updating current libraries, the expressions should be put + in separate files in pkgs/development/python-modules and + called from python-packages.nix. + + + From 91debcb482b0b6b6b8ce017d3d22eefdc90092a7 Mon Sep 17 00:00:00 2001 From: Joachim Schiele Date: Tue, 21 Mar 2017 00:06:51 +0100 Subject: [PATCH 73/86] Update python.md (#23669) * Update python.md this makes it clear how to alter `attributes` by using `packageOverrides` * Update python.md * Update python.md * Update python.md * Update python.md * Update python.md * Update python.md --- doc/languages-frameworks/python.md | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) diff --git a/doc/languages-frameworks/python.md b/doc/languages-frameworks/python.md index 87b5668740d1..cbb979e87881 100644 --- a/doc/languages-frameworks/python.md +++ b/doc/languages-frameworks/python.md @@ -897,6 +897,27 @@ is executed it will attempt to download the python modules listed in requirements.txt. However these will be cached locally within the `virtualenv` folder and not downloaded again. +### How to override a Python package from `configuration.nix`? + +If you need to change a package's attribute(s) from `configuration.nix` you could do: + +```nix + nixpkgs.config.packageOverrides = superP: { + pythonPackages = superP.pythonPackages.override { + overrides = self: super: { + bepasty-server = super.bepasty-server.overrideAttrs ( oldAttrs: { + src = pkgs.fetchgit { + url = "https://github.com/bepasty/bepasty-server"; + sha256 = "9ziqshmsf0rjvdhhca55sm0x8jz76fsf2q4rwh4m6lpcf8wr0nps"; + rev = "e2516e8cf4f2afb5185337073607eb9e84a61d2d"; + }; + }); + }; + }; + }; +``` + +If you are using the `bepasty-server` package somewhere, for example in `systemPackages` or indirectly from `services.bepasty`, then a `nixos-rebuild switch` will rebuild the system but with the `bepasty-server` package using a different `src` attribute. This way one can modify `python` based software/libraries easily. Using `self` and `super` one can also alter dependencies (`buildInputs`) between the old state (`self`) and new state (`super`). ## Contributing From 818a37598cc2e5c195bc5e28049018ee91398978 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= Date: Tue, 21 Mar 2017 01:40:31 +0100 Subject: [PATCH 74/86] wireguard: 0.0.20170223 -> 0.0.20170320.1 --- pkgs/os-specific/linux/wireguard/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/wireguard/default.nix b/pkgs/os-specific/linux/wireguard/default.nix index 59b9475160ef..435653c19fdc 100644 --- a/pkgs/os-specific/linux/wireguard/default.nix +++ b/pkgs/os-specific/linux/wireguard/default.nix @@ -6,11 +6,11 @@ assert kernel != null -> stdenv.lib.versionAtLeast kernel.version "3.18"; let name = "wireguard-${version}"; - version = "0.0.20170223"; + version = "0.0.20170320.1"; src = fetchurl { url = "https://git.zx2c4.com/WireGuard/snapshot/WireGuard-${version}.tar.xz"; - sha256 = "6d2c8cd29c4f9fb404546a4749ec050739a26b4a49b5864f1dec531377c3c50d"; + sha256 = "19rcsmwcb9jp4lrfrkf1x78y4i6dcqx5p7kmcbjnbwl0nkc48vr8"; }; meta = with stdenv.lib; { From c808801937ec73e7df2e1cf671ecaecb04431eeb Mon Sep 17 00:00:00 2001 From: Robin Gloster Date: Tue, 21 Mar 2017 02:16:29 +0100 Subject: [PATCH 75/86] nix-daemon: fix autoOptimiseStore option --- nixos/modules/services/misc/nix-daemon.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/modules/services/misc/nix-daemon.nix b/nixos/modules/services/misc/nix-daemon.nix index fed646aadac4..cfb6a860178a 100644 --- a/nixos/modules/services/misc/nix-daemon.nix +++ b/nixos/modules/services/misc/nix-daemon.nix @@ -46,7 +46,7 @@ let binary-caches = ${toString cfg.binaryCaches} trusted-binary-caches = ${toString cfg.trustedBinaryCaches} binary-cache-public-keys = ${toString cfg.binaryCachePublicKeys} - auto-optimise-store = ${toString cfg.autoOptimiseStore} + auto-optimise-store = ${if cfg.autoOptimiseStore then "true" else "false"} ${optionalString cfg.requireSignedBinaryCaches '' signed-binary-caches = * ''} From 8eabb34e5f336b262e918e2398bfd04d2a6c7a59 Mon Sep 17 00:00:00 2001 From: Nikolay Amiantov Date: Tue, 21 Mar 2017 04:23:02 +0300 Subject: [PATCH 76/86] odroid-xu3-bootloader: use 1MB-capable bootloader (cherry picked from commit 7d66259a777fd1b1930eca26f08236f657529e25) --- pkgs/misc/uboot/default.nix | 2 +- pkgs/tools/misc/odroid-xu3-bootloader/default.nix | 15 +++++++++------ 2 files changed, 10 insertions(+), 7 deletions(-) diff --git a/pkgs/misc/uboot/default.nix b/pkgs/misc/uboot/default.nix index 5d9c83059c76..9e133e9f3323 100644 --- a/pkgs/misc/uboot/default.nix +++ b/pkgs/misc/uboot/default.nix @@ -86,7 +86,7 @@ in rec { ubootOdroidXU3 = buildUBoot rec { defconfig = "odroid-xu3_defconfig"; targetPlatforms = ["armv7l-linux"]; - filesToInstall = ["u-boot.bin"]; + filesToInstall = ["u-boot-dtb.bin"]; }; ubootPcduino3Nano = buildUBoot rec { diff --git a/pkgs/tools/misc/odroid-xu3-bootloader/default.nix b/pkgs/tools/misc/odroid-xu3-bootloader/default.nix index 595b0d84ff57..3cce28df4f3d 100644 --- a/pkgs/tools/misc/odroid-xu3-bootloader/default.nix +++ b/pkgs/tools/misc/odroid-xu3-bootloader/default.nix @@ -6,19 +6,22 @@ stdenv.mkDerivation { src = fetchFromGitHub { owner = "hardkernel"; repo = "u-boot"; - rev = "bbdea1841c4fbf767dcaf9d7ae8d3a46af235c4d"; - sha256 = "03rvyfj147xh83w8hlvbxix131l3nnvk8n517fdhv9nil1l8dd71"; + rev = "fe2f831fd44a4071f58a42f260164544697aa666"; + sha256 = "1h5yvawzla0vqhkk98gxcwc824bhc936bh6j77qkyspvqcw761fr"; }; buildCommand = '' - install -Dm644 -t $out/lib/sd_fuse-xu3 $src/sd_fuse/hardkernel/*.hardkernel - ln -sf ${ubootOdroidXU3}/u-boot.bin $out/lib/sd_fuse-xu3/u-boot.bin.hardkernel + install -Dm644 -t $out/lib/sd_fuse-xu3 $src/sd_fuse/hardkernel_1mb_uboot/{bl2,tzsw}.* + install -Dm644 -t $out/lib/sd_fuse-xu3 $src/sd_fuse/hardkernel/bl1.* + ln -sf ${ubootOdroidXU3}/u-boot-dtb.bin $out/lib/sd_fuse-xu3/u-boot-dtb.bin - install -Dm755 $src/sd_fuse/hardkernel/sd_fusing.sh $out/bin/sd_fuse-xu3 + install -Dm755 $src/sd_fuse/hardkernel_1mb_uboot/sd_fusing.1M.sh $out/bin/sd_fuse-xu3 sed -i \ -e '1i#!${stdenv.shell}' \ -e '1iPATH=${lib.makeBinPath [ coreutils ]}:$PATH' \ - -e "s,if=\./,if=$out/lib/sd_fuse-xu3/,g" \ + -e '/set -x/d' \ + -e 's,.\/sd_fusing\.sh,sd_fuse-xu3,g' \ + -e "s,\./,$out/lib/sd_fuse-xu3/,g" \ $out/bin/sd_fuse-xu3 ''; From 1cd8addae145ea95173f4b319e5f53c0ec6abd7f Mon Sep 17 00:00:00 2001 From: Peter Hoeg Date: Tue, 21 Mar 2017 09:39:50 +0800 Subject: [PATCH 77/86] syncthing: 0.14.24 -> 0.14.25 --- pkgs/applications/networking/syncthing/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/syncthing/default.nix b/pkgs/applications/networking/syncthing/default.nix index 2cb4f0a5922e..0f696d788552 100644 --- a/pkgs/applications/networking/syncthing/default.nix +++ b/pkgs/applications/networking/syncthing/default.nix @@ -1,14 +1,14 @@ { stdenv, lib, fetchFromGitHub, go, pkgs, removeReferencesTo }: stdenv.mkDerivation rec { - version = "0.14.24"; + version = "0.14.25"; name = "syncthing-${version}"; src = fetchFromGitHub { owner = "syncthing"; repo = "syncthing"; rev = "v${version}"; - sha256 = "15jjk49ibry7crc3sw5zg09zsm5ir0ph5c0f3acas66wd02rnvl1"; + sha256 = "1if92y32h1wp5sz2lnlw5fqibzbik7bklq850j9wcxfvr6ahck0w"; }; buildInputs = [ go removeReferencesTo ]; From 497b34cb7ca3a87fbc39140a141d075fe2f64094 Mon Sep 17 00:00:00 2001 From: Peter Hoeg Date: Tue, 21 Mar 2017 10:04:21 +0800 Subject: [PATCH 78/86] qtox: 1.8.1 -> 1.9.0 --- .../networking/instant-messengers/qtox/default.nix | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/instant-messengers/qtox/default.nix b/pkgs/applications/networking/instant-messengers/qtox/default.nix index 036d7fb3ce52..41286331eb14 100644 --- a/pkgs/applications/networking/instant-messengers/qtox/default.nix +++ b/pkgs/applications/networking/instant-messengers/qtox/default.nix @@ -6,13 +6,13 @@ stdenv.mkDerivation rec { name = "qtox-${version}"; - version = "1.8.1"; + version = "1.9.0"; src = fetchFromGitHub { owner = "tux3"; repo = "qTox"; rev = "v${version}"; - sha256 = "073kwfaw5n7vvcpwrpdbw5mlswbbwjipx7yy4a95r9z0gjljqnhq"; + sha256 = "0l008mzrs1wsv5cbzxjkv3k48lghlcdsp8blqrkihjv5gcn3psml"; }; buildInputs = [ @@ -27,6 +27,10 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake makeQtWrapper pkgconfig ]; + cmakeFlags = [ + "-DGIT_DESCRIBE=${version}" + ]; + installPhase = '' runHook preInstall From add75b63c8bd8afc0060757c1aa77ec4282add12 Mon Sep 17 00:00:00 2001 From: Eric Sagnes Date: Tue, 21 Mar 2017 12:41:22 +0900 Subject: [PATCH 79/86] j4-dmenu-desktop: 2.14 -> 2.15 (#24119) --- pkgs/applications/misc/j4-dmenu-desktop/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/misc/j4-dmenu-desktop/default.nix b/pkgs/applications/misc/j4-dmenu-desktop/default.nix index 9a60cd060f56..9896fd15b85c 100644 --- a/pkgs/applications/misc/j4-dmenu-desktop/default.nix +++ b/pkgs/applications/misc/j4-dmenu-desktop/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { name = "j4-dmenu-desktop-${version}"; - version = "2.14"; + version = "2.15"; src = fetchFromGitHub { owner = "enkore"; repo = "j4-dmenu-desktop"; rev = "r${version}"; - sha256 = "14srrkz4qx8qplgrrjv38ri4pnkxaxaq6jy89j13xhna492bq128"; + sha256 = "1yn45i3hpim2hriaqkq7wmawwsmkynvy2xgz7dg6p5r0ikw5bn1r"; }; postPatch = '' From 93005b82dc4f6e2f5372987005d7dffd2f1b3ea6 Mon Sep 17 00:00:00 2001 From: Dan Peebles Date: Tue, 21 Mar 2017 00:42:26 -0400 Subject: [PATCH 80/86] google-gflags: fix on Darwin e721905d0f7c82be94a347f022bdd238b919de9d updated to a version that added a BUILD file that breaks on case-insensitive filesystems. --- pkgs/development/libraries/google-gflags/default.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pkgs/development/libraries/google-gflags/default.nix b/pkgs/development/libraries/google-gflags/default.nix index 0f089d16eadd..1a3a16587274 100644 --- a/pkgs/development/libraries/google-gflags/default.nix +++ b/pkgs/development/libraries/google-gflags/default.nix @@ -13,6 +13,9 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake ]; + # This isn't used by the build and breaks the CMake build on case-insensitive filesystems (e.g., on Darwin) + preConfigure = "rm BUILD"; + cmakeFlags = [ "-DBUILD_SHARED_LIBS=ON" "-DBUILD_STATIC_LIBS=ON" From 7ad3fd7ca72113d2790aa223afdb9faa70e9fb7d Mon Sep 17 00:00:00 2001 From: Dan Peebles Date: Tue, 21 Mar 2017 01:00:18 -0400 Subject: [PATCH 81/86] neuron: fix on clang 3.8 and above This is in preparation for upgrading Darwin stdenv to LLVM 4 --- .../science/biology/neuron/default.nix | 41 +++++++++++-------- 1 file changed, 25 insertions(+), 16 deletions(-) diff --git a/pkgs/applications/science/biology/neuron/default.nix b/pkgs/applications/science/biology/neuron/default.nix index 5d69b1f29e73..136fba47eb78 100644 --- a/pkgs/applications/science/biology/neuron/default.nix +++ b/pkgs/applications/science/biology/neuron/default.nix @@ -1,5 +1,5 @@ -{ stdenv -, fetchurl +{ stdenv +, fetchurl , pkgconfig , automake , autoconf @@ -7,14 +7,14 @@ , ncurses , readline , which -, python ? null +, python ? null , mpi ? null }: stdenv.mkDerivation rec { name = "neuron-${version}"; version = "7.4"; - + nativeBuildInputs = [ which pkgconfig automake autoconf libtool ]; buildInputs = [ ncurses readline python mpi ]; @@ -25,23 +25,32 @@ stdenv.mkDerivation rec { patches = (stdenv.lib.optional (stdenv.isDarwin) [ ./neuron-carbon-disable.patch ]); + # With LLVM 3.8 and above, clang (really libc++) gets upset if you attempt to redefine these... + postPatch = stdenv.lib.optionalString stdenv.cc.isClang '' + substituteInPlace src/gnu/neuron_gnu_builtin.h \ + --replace 'double abs(double arg);' "" \ + --replace 'float abs(float arg);' "" \ + --replace 'short abs(short arg);' "" \ + --replace 'long abs(long arg);' "" + ''; + enableParallelBuilding = true; ## neuron install by default everything under prefix/${host_arch}/* - ## override this to support nix standard file hierarchy + ## override this to support nix standard file hierarchy ## without issues: install everything under prefix/ preConfigure = '' ./build.sh - export prefix="''${prefix} --exec-prefix=''${out}" + export prefix="''${prefix} --exec-prefix=''${out}" ''; configureFlags = with stdenv.lib; [ "--without-x" "--with-readline=${readline}" ] ++ optionals (python != null) [ "--with-nrnpython=${python.interpreter}" ] - ++ (if mpi != null then ["--with-mpi" "--with-paranrn"] + ++ (if mpi != null then ["--with-mpi" "--with-paranrn"] else ["--without-mpi"]); - - + + postInstall = stdenv.lib.optionals (python != null) [ '' ## standardise python neuron install dir if any if [[ -d $out/lib/python ]]; then @@ -49,22 +58,22 @@ stdenv.mkDerivation rec { mv ''${out}/lib/python/* ''${out}/${python.sitePackages}/ fi '']; - - propagatedBuildInputs = [ readline ncurses which libtool ]; + + propagatedBuildInputs = [ readline ncurses which libtool ]; meta = with stdenv.lib; { description = "Simulation environment for empirically-based simulations of neurons and networks of neurons"; - longDescription = "NEURON is a simulation environment for developing and exercising models of - neurons and networks of neurons. It is particularly well-suited to problems where - cable properties of cells play an important role, possibly including extracellular - potential close to the membrane), and where cell membrane properties are complex, + longDescription = "NEURON is a simulation environment for developing and exercising models of + neurons and networks of neurons. It is particularly well-suited to problems where + cable properties of cells play an important role, possibly including extracellular + potential close to the membrane), and where cell membrane properties are complex, involving many ion-specific channels, ion accumulation, and second messengers"; license = licenses.bsd3; homepage = http://www.neuron.yale.edu/neuron; maintainers = [ maintainers.adev ]; platforms = platforms.all; - }; + }; } From 2adb9f8e1bd129bc43311422b998f8ed476cece2 Mon Sep 17 00:00:00 2001 From: Markus Hauck Date: Mon, 20 Mar 2017 17:43:51 +0100 Subject: [PATCH 82/86] scalafmt: 0.6.2 -> 0.6.6 --- pkgs/development/tools/scalafmt/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/scalafmt/default.nix b/pkgs/development/tools/scalafmt/default.nix index 59a16bfc27cb..2c763072c294 100644 --- a/pkgs/development/tools/scalafmt/default.nix +++ b/pkgs/development/tools/scalafmt/default.nix @@ -1,13 +1,13 @@ { stdenv, fetchurl, unzip, jre }: stdenv.mkDerivation rec { - version = "0.6.2"; + version = "0.6.6"; baseName = "scalafmt"; name = "${baseName}-${version}"; src = fetchurl { - url = "https://github.com/olafurpg/scalafmt/releases/download/v${version}/${baseName}.tar.gz"; - sha256 = "0xafl7vmncdycapi9shxqf73nhb24llgxjd2x98irmr9bvzg844q"; + url = "https://github.com/scalameta/scalafmt/releases/download/v${version}/${baseName}.tar.gz"; + sha256 = "143g288m6xr93pavbym2y6f8gvihsf53fnzjra6ln1s39n9h205n"; }; unpackPhase = "tar xvzf $src"; From fb50cde71e3ffd149faca1a1762c245542a24875 Mon Sep 17 00:00:00 2001 From: Franz Pletz Date: Tue, 21 Mar 2017 08:27:56 +0100 Subject: [PATCH 83/86] nixos/treewide: systemd.time is in manvolume 7 cc #23396 --- nixos/modules/installer/tools/auto-upgrade.nix | 2 +- nixos/modules/programs/venus.nix | 2 +- nixos/modules/security/acme.nix | 2 +- nixos/modules/services/logging/awstats.nix | 2 +- nixos/modules/services/misc/nix-gc.nix | 2 +- nixos/modules/services/misc/nix-optimise.nix | 2 +- nixos/modules/system/boot/systemd-unit-options.nix | 6 +++--- nixos/modules/tasks/filesystems/zfs.nix | 2 +- nixos/modules/virtualisation/rkt.nix | 2 +- 9 files changed, 11 insertions(+), 11 deletions(-) diff --git a/nixos/modules/installer/tools/auto-upgrade.nix b/nixos/modules/installer/tools/auto-upgrade.nix index dfb43d1a1db9..a4d4f16d1d96 100644 --- a/nixos/modules/installer/tools/auto-upgrade.nix +++ b/nixos/modules/installer/tools/auto-upgrade.nix @@ -48,7 +48,7 @@ let cfg = config.system.autoUpgrade; in description = '' Specification (in the format described by systemd.time - 5) of the time at + 7) of the time at which the update will occur. ''; }; diff --git a/nixos/modules/programs/venus.nix b/nixos/modules/programs/venus.nix index 731ebed14c7b..110570ac3f06 100644 --- a/nixos/modules/programs/venus.nix +++ b/nixos/modules/programs/venus.nix @@ -45,7 +45,7 @@ in description = '' Specification (in the format described by systemd.time - 5) of the time at + 7) of the time at which the Venus will collect feeds. ''; }; diff --git a/nixos/modules/security/acme.nix b/nixos/modules/security/acme.nix index 78bd09441f83..703d5ddbd0e2 100644 --- a/nixos/modules/security/acme.nix +++ b/nixos/modules/security/acme.nix @@ -110,7 +110,7 @@ in description = '' Systemd calendar expression when to check for renewal. See systemd.time - 5. + 7. ''; }; diff --git a/nixos/modules/services/logging/awstats.nix b/nixos/modules/services/logging/awstats.nix index 8ab7e6acd98e..612ae06d0a79 100644 --- a/nixos/modules/services/logging/awstats.nix +++ b/nixos/modules/services/logging/awstats.nix @@ -38,7 +38,7 @@ in Specification of the time at which awstats will get updated. (in the format described by systemd.time - 5) + 7) ''; }; diff --git a/nixos/modules/services/misc/nix-gc.nix b/nixos/modules/services/misc/nix-gc.nix index 304168c65b0b..8b493041b2c9 100644 --- a/nixos/modules/services/misc/nix-gc.nix +++ b/nixos/modules/services/misc/nix-gc.nix @@ -26,7 +26,7 @@ in description = '' Specification (in the format described by systemd.time - 5) of the time at + 7) of the time at which the garbage collector will run. ''; }; diff --git a/nixos/modules/services/misc/nix-optimise.nix b/nixos/modules/services/misc/nix-optimise.nix index a76bfd9f1f19..295e7fb0ba03 100644 --- a/nixos/modules/services/misc/nix-optimise.nix +++ b/nixos/modules/services/misc/nix-optimise.nix @@ -26,7 +26,7 @@ in description = '' Specification (in the format described by systemd.time - 5) of the time at + 7) of the time at which the optimiser will run. ''; }; diff --git a/nixos/modules/system/boot/systemd-unit-options.nix b/nixos/modules/system/boot/systemd-unit-options.nix index 904e41b019fb..9be10a8283ed 100644 --- a/nixos/modules/system/boot/systemd-unit-options.nix +++ b/nixos/modules/system/boot/systemd-unit-options.nix @@ -328,7 +328,7 @@ in rec { Automatically start this unit at the given date/time, which must be in the format described in systemd.time - 5. This is equivalent + 7. This is equivalent to adding a corresponding timer unit with set to the value given here. ''; @@ -375,9 +375,9 @@ in rec { Each attribute in this set specifies an option in the [Timer] section of the unit. See systemd.timer - 5 and + 7 and systemd.time - 5 for details. + 7 for details. ''; }; diff --git a/nixos/modules/tasks/filesystems/zfs.nix b/nixos/modules/tasks/filesystems/zfs.nix index d44209cfa0b3..518fe0a97d27 100644 --- a/nixos/modules/tasks/filesystems/zfs.nix +++ b/nixos/modules/tasks/filesystems/zfs.nix @@ -234,7 +234,7 @@ in description = '' Systemd calendar expression when to scrub ZFS pools. See systemd.time - 5. + 7. ''; }; diff --git a/nixos/modules/virtualisation/rkt.nix b/nixos/modules/virtualisation/rkt.nix index c4c5cb3380e8..98be4f680c3a 100644 --- a/nixos/modules/virtualisation/rkt.nix +++ b/nixos/modules/virtualisation/rkt.nix @@ -22,7 +22,7 @@ in description = '' Specification (in the format described by systemd.time - 5) of the time at + 7) of the time at which the garbage collector will run. ''; }; From 4e749683e65588028d134628ed70eb129c3df87c Mon Sep 17 00:00:00 2001 From: volth Date: Tue, 21 Mar 2017 10:20:55 +0100 Subject: [PATCH 84/86] virt-manager: 1.4.0 -> 1.4.1 (#24149) --- pkgs/applications/virtualization/virt-manager/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/virtualization/virt-manager/default.nix b/pkgs/applications/virtualization/virt-manager/default.nix index bd003df57f85..787729d3afc9 100644 --- a/pkgs/applications/virtualization/virt-manager/default.nix +++ b/pkgs/applications/virtualization/virt-manager/default.nix @@ -9,12 +9,12 @@ with python2Packages; buildPythonApplication rec { name = "virt-manager-${version}"; - version = "1.4.0"; + version = "1.4.1"; namePrefix = ""; src = fetchurl { url = "http://virt-manager.org/download/sources/virt-manager/${name}.tar.gz"; - sha256 = "1jnawqjmcqd2db78ngx05x7cxxn3iy1sb4qfgbwcn045qh6a8cdz"; + sha256 = "0i1rkxz730vw1nqghrp189jhhp53pw81k0h71hhxmyqlkyclkig6"; }; propagatedBuildInputs = From 9c730bc40bb134aa6b0d420947a3077379aedb29 Mon Sep 17 00:00:00 2001 From: Robin Gloster Date: Tue, 21 Mar 2017 11:00:49 +0100 Subject: [PATCH 85/86] clooj: fix url --- pkgs/development/interpreters/clojure/clooj.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/interpreters/clojure/clooj.nix b/pkgs/development/interpreters/clojure/clooj.nix index 3dfb800afe10..527a5b2e5700 100644 --- a/pkgs/development/interpreters/clojure/clooj.nix +++ b/pkgs/development/interpreters/clojure/clooj.nix @@ -6,7 +6,7 @@ stdenv.mkDerivation { name = "clooj-${version}"; jar = fetchurl { - url = "http://download1492.mediafire.com/dptomdxrjaag/prkf64humftrmz3/clooj-0.4.4-standalone.jar"; + url = "http://download1492.mediafire.com/5bbi05sxgxog/prkf64humftrmz3/clooj-0.4.4-standalone.jar"; sha256 = "0hbc29bg2a86rm3sx9kvj7h7db9j0kbnrb706wsfiyk3zi3bavnd"; }; From 4263c53f668058e0f1a16ddc3703c2e3c72805fc Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Tue, 14 Feb 2017 09:55:06 +0100 Subject: [PATCH 86/86] Python changelog --- nixos/doc/manual/release-notes/rl-1703.xml | 18 +++++++++++++++++- 1 file changed, 17 insertions(+), 1 deletion(-) diff --git a/nixos/doc/manual/release-notes/rl-1703.xml b/nixos/doc/manual/release-notes/rl-1703.xml index f6e8e9a4515b..49ae296c40c8 100644 --- a/nixos/doc/manual/release-notes/rl-1703.xml +++ b/nixos/doc/manual/release-notes/rl-1703.xml @@ -273,6 +273,14 @@ following incompatible changes: + + Python 2.6 interpreter and package set have been removed. + + + + The Python 2.7 interpreter does not use modules anymore. Instead, all CPython interpreters now include the whole standard library except for `tkinter`, which is available in the Python package set. + + Python 2.7, 3.5 and 3.6 are now built deterministically and 3.4 mostly. @@ -283,9 +291,17 @@ following incompatible changes: + + The Python package sets now use a fixed-point combinator and the sets are available as attributes of the interpreters. + + + + The Python function `buildPythonPackage` has been improved and can be used to build from Setuptools source, Flit source, and precompiled Wheels. + + - When adding new or updating current libraries, the expressions should be put + When adding new or updating current Python libraries, the expressions should be put in separate files in pkgs/development/python-modules and called from python-packages.nix.