diff options
| author | Vladimír Čunát <vcunat@gmail.com> | 2017-08-06 10:03:25 +0200 |
|---|---|---|
| committer | Vladimír Čunát <vcunat@gmail.com> | 2017-08-06 10:03:25 +0200 |
| commit | f779df87b1aa3c7f55258bbe93fc450ffd00296a (patch) | |
| tree | 8f99b674d689f483981d4ef49643f9056732707a | |
| parent | 8fcb0703634aae35501e0e21315fd18ae18da673 (diff) | |
| parent | e619ace733fee725da5a1b84e5cce68d610ba35e (diff) | |
| download | nixpkgs-f779df87b1aa3c7f55258bbe93fc450ffd00296a.tar nixpkgs-f779df87b1aa3c7f55258bbe93fc450ffd00296a.tar.gz nixpkgs-f779df87b1aa3c7f55258bbe93fc450ffd00296a.tar.bz2 nixpkgs-f779df87b1aa3c7f55258bbe93fc450ffd00296a.tar.lz nixpkgs-f779df87b1aa3c7f55258bbe93fc450ffd00296a.tar.xz nixpkgs-f779df87b1aa3c7f55258bbe93fc450ffd00296a.tar.zst nixpkgs-f779df87b1aa3c7f55258bbe93fc450ffd00296a.zip | |
Merge branch 'master' into staging
Let's drop i686-linux here as well.
215 files changed, 6988 insertions, 2139 deletions
diff --git a/doc/functions.xml b/doc/functions.xml index 4a9015602af..52bdf13eba9 100644 --- a/doc/functions.xml +++ b/doc/functions.xml @@ -358,8 +358,8 @@ <para> <varname>pkgs.dockerTools</varname> is a set of functions for creating and manipulating Docker images according to the - <link xlink:href="https://github.com/docker/docker/blob/master/image/spec/v1.md#docker-image-specification-v100"> - Docker Image Specification v1.0.0 + <link xlink:href="https://github.com/moby/moby/blob/master/image/spec/v1.2.md#docker-image-specification-v120"> + Docker Image Specification v1.2.0 </link>. Docker itself is not used to perform any of the operations done by these functions. </para> @@ -493,8 +493,8 @@ <varname>config</varname> is used to specify the configuration of the containers that will be started off the built image in Docker. The available options are listed in the - <link xlink:href="https://github.com/docker/docker/blob/master/image/spec/v1.md#container-runconfig-field-descriptions"> - Docker Image Specification v1.0.0 + <link xlink:href="https://github.com/moby/moby/blob/master/image/spec/v1.2.md#image-json-field-descriptions"> + Docker Image Specification v1.2.0 </link>. </para> </callout> diff --git a/lib/maintainers.nix b/lib/maintainers.nix index e5286fa995e..048d8c4760e 100644 --- a/lib/maintainers.nix +++ b/lib/maintainers.nix @@ -215,6 +215,7 @@ gilligan = "Tobias Pflug <tobias.pflug@gmail.com>"; giogadi = "Luis G. Torres <lgtorres42@gmail.com>"; gleber = "Gleb Peregud <gleber.p@gmail.com>"; + glenns = "Glenn Searby <glenn.searby@gmail.com>"; globin = "Robin Gloster <mail@glob.in>"; gnidorah = "Alex Ivanov <yourbestfriend@opmbx.org>"; goibhniu = "Cillian de Róiste <cillian.deroiste@gmail.com>"; @@ -314,6 +315,7 @@ lihop = "Leroy Hopson <nixos@leroy.geek.nz>"; linquize = "Linquize <linquize@yahoo.com.hk>"; linus = "Linus Arver <linusarver@gmail.com>"; + lluchs = "Lukas Werling <lukas.werling@gmail.com>"; lnl7 = "Daiderd Jordan <daiderd@gmail.com>"; loskutov = "Ignat Loskutov <ignat.loskutov@gmail.com>"; lovek323 = "Jason O'Conal <jason@oconal.id.au>"; @@ -377,6 +379,7 @@ MostAwesomeDude = "Corbin Simpson <cds@corbinsimpson.com>"; mounium = "Katona László <muoniurn@gmail.com>"; MP2E = "Cray Elliott <MP2E@archlinux.us>"; + mpcsh = "Mark Cohen <m@mpc.sh>"; mpscholten = "Marc Scholten <marc@mpscholten.de>"; mpsyco = "Francis St-Amour <fr.st-amour@gmail.com>"; msackman = "Matthew Sackman <matthew@wellquite.org>"; @@ -510,6 +513,7 @@ samuelrivas = "Samuel Rivas <samuelrivas@gmail.com>"; sander = "Sander van der Burg <s.vanderburg@tudelft.nl>"; sargon = "Daniel Ehlers <danielehlers@mindeye.net>"; + sauyon = "Sauyon Lee <s@uyon.co>"; schmitthenner = "Fabian Schmitthenner <development@schmitthenner.eu>"; schneefux = "schneefux <schneefux+nixos_pkg@schneefux.xyz>"; schristo = "Scott Christopher <schristopher@konputa.com>"; @@ -631,6 +635,7 @@ zauberpony = "Elmar Athmer <elmar@athmer.org>"; zef = "Zef Hemel <zef@zef.me>"; zimbatm = "zimbatm <zimbatm@zimbatm.com>"; + Zimmi48 = "Théo Zimmermann <theo.zimmermann@univ-paris-diderot.fr>"; zohl = "Al Zohali <zohl@fmap.me>"; zoomulator = "Kim Simmons <zoomulator@gmail.com>"; zraexy = "David Mell <zraexy@gmail.com>"; diff --git a/nixos/doc/manual/man-nixos-option.xml b/nixos/doc/manual/man-nixos-option.xml index 6be8bc780f1..d2b2d5b7965 100644 --- a/nixos/doc/manual/man-nixos-option.xml +++ b/nixos/doc/manual/man-nixos-option.xml @@ -17,11 +17,16 @@ <refsynopsisdiv> <cmdsynopsis> <command>nixos-option</command> - <arg choice='plain'><replaceable>option.name</replaceable></arg> + <arg> + <option>-I</option> + <replaceable>path</replaceable> + </arg> + <arg><option>--verbose</option></arg> + <arg><option>--xml</option></arg> + <arg choice="plain"><replaceable>option.name</replaceable></arg> </cmdsynopsis> </refsynopsisdiv> - <refsection><title>Description</title> <para>This command evaluates the configuration specified in @@ -33,6 +38,45 @@ attributes contained in the attribute set.</para> </refsection> +<refsection><title>Options</title> + +<para>This command accepts the following options:</para> + +<variablelist> + + <varlistentry> + <term><option>-I</option> <replaceable>path</replaceable></term> + <listitem> + <para> + This option is passed to the underlying + <command>nix-instantiate</command> invocation. + </para> + </listitem> + </varlistentry> + + <varlistentry> + <term><option>--verbose</option></term> + <listitem> + <para> + This option enables verbose mode, which currently is just + the Bash <command>set</command> <option>-x</option> debug mode. + </para> + </listitem> + </varlistentry> + + <varlistentry> + <term><option>--xml</option></term> + <listitem> + <para> + This option causes the output to be rendered as XML. + </para> + </listitem> + </varlistentry> + +</variablelist> + +</refsection> + <refsection><title>Environment</title> <variablelist> diff --git a/nixos/doc/manual/release-notes/rl-1709.xml b/nixos/doc/manual/release-notes/rl-1709.xml index 77ee9052fe5..2046081cc2f 100644 --- a/nixos/doc/manual/release-notes/rl-1709.xml +++ b/nixos/doc/manual/release-notes/rl-1709.xml @@ -130,6 +130,30 @@ rmdir /var/lib/ipfs/.ipfs instead. Refer to the description of the options for more details. </para> </listitem> + <listitem> + <para> + <literal>tlsdate</literal> package and module were removed. This is due to the project + being dead and not building with openssl 1.1. + </para> + </listitem> + <listitem> + <para> + <literal>wvdial</literal> package and module were removed. This is due to the project + being dead and not building with openssl 1.1. + </para> + </listitem> + <listitem> + <para> + <literal>cc-wrapper</literal>'s setup-hook now exports a number of + environment variables corresponding to binutils binaries, + (e.g. <envar>LD</envar>, <envar>STRIP</envar>, <envar>RANLIB</envar>, + etc). This is done to prevent packages' build systems guessing, which is + harder to predict, especially when cross-compiling. However, some packages + have broken due to this—their build systems either not supporting, or + claiming to support without adequate testing, taking such environment + variables as parameters. + </para> + </listitem> </itemizedlist> <para>Other notable improvements:</para> diff --git a/nixos/modules/config/nsswitch.nix b/nixos/modules/config/nsswitch.nix index 16c43a99ad5..97278238dcd 100644 --- a/nixos/modules/config/nsswitch.nix +++ b/nixos/modules/config/nsswitch.nix @@ -28,7 +28,8 @@ let passwdArray = [ "files" ] ++ optional sssd "sss" ++ optionals ldap [ "ldap" ] - ++ optionals mymachines [ "mymachines" ]; + ++ optionals mymachines [ "mymachines" ] + ++ [ "systemd" ]; shadowArray = [ "files" ] ++ optional sssd "sss" diff --git a/nixos/modules/config/pulseaudio.nix b/nixos/modules/config/pulseaudio.nix index b12ef2fe861..8b9c3570476 100644 --- a/nixos/modules/config/pulseaudio.nix +++ b/nixos/modules/config/pulseaudio.nix @@ -224,7 +224,7 @@ in { # Allow PulseAudio to get realtime priority using rtkit. security.rtkit.enable = true; - systemd.packages = [ cfg.package ]; + systemd.packages = [ overriddenPackage ]; }) (mkIf hasZeroconf { diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix index e7dea5cb9da..6062bf623e7 100644 --- a/nixos/modules/module-list.nix +++ b/nixos/modules/module-list.nix @@ -105,7 +105,6 @@ ./programs/venus.nix ./programs/vim.nix ./programs/wireshark.nix - ./programs/wvdial.nix ./programs/xfs_quota.nix ./programs/xonsh.nix ./programs/zsh/oh-my-zsh.nix @@ -517,7 +516,6 @@ ./services/networking/teamspeak3.nix ./services/networking/tinc.nix ./services/networking/tftpd.nix - ./services/networking/tlsdated.nix ./services/networking/tox-bootstrapd.nix ./services/networking/toxvpn.nix ./services/networking/tvheadend.nix diff --git a/nixos/modules/programs/gnupg.nix b/nixos/modules/programs/gnupg.nix index 8af55f38992..addc9dcca87 100644 --- a/nixos/modules/programs/gnupg.nix +++ b/nixos/modules/programs/gnupg.nix @@ -92,7 +92,7 @@ in ''); assertions = [ - { assertion = cfg.agent.enableSSHSupport && !config.programs.ssh.startAgent; + { assertion = cfg.agent.enableSSHSupport -> !config.programs.ssh.startAgent; message = "You can't use ssh-agent and GnuPG agent with SSH support enabled at the same time!"; } ]; diff --git a/nixos/modules/programs/wvdial.nix b/nixos/modules/programs/wvdial.nix deleted file mode 100644 index 1ed929ed4af..00000000000 --- a/nixos/modules/programs/wvdial.nix +++ /dev/null @@ -1,71 +0,0 @@ -# Global configuration for wvdial. - -{ config, lib, pkgs, ... }: - -with lib; - -let - - configFile = '' - [Dialer Defaults] - PPPD PATH = ${pkgs.ppp}/sbin/pppd - ${config.environment.wvdial.dialerDefaults} - ''; - - cfg = config.environment.wvdial; - -in -{ - ###### interface - - options = { - - environment.wvdial = { - - dialerDefaults = mkOption { - default = ""; - type = types.str; - example = ''Init1 = AT+CGDCONT=1,"IP","internet.t-mobile"''; - description = '' - Contents of the "Dialer Defaults" section of - <filename>/etc/wvdial.conf</filename>. - ''; - }; - - pppDefaults = mkOption { - default = '' - noipdefault - usepeerdns - defaultroute - persist - noauth - ''; - type = types.str; - description = "Default ppp settings for wvdial."; - }; - - }; - - }; - - ###### implementation - - config = mkIf (cfg.dialerDefaults != "") { - - environment = { - - etc = - [ - { source = pkgs.writeText "wvdial.conf" configFile; - target = "wvdial.conf"; - } - { source = pkgs.writeText "wvdial" cfg.pppDefaults; - target = "ppp/peers/wvdial"; - } - ]; - - }; - - }; - -} diff --git a/nixos/modules/services/networking/avahi-daemon.nix b/nixos/modules/services/networking/avahi-daemon.nix index f4d0fc822de..9ccdacb20e9 100644 --- a/nixos/modules/services/networking/avahi-daemon.nix +++ b/nixos/modules/services/networking/avahi-daemon.nix @@ -22,6 +22,7 @@ let ${optionalString (interfaces!=null) "allow-interfaces=${concatStringsSep "," interfaces}"} ${optionalString (domainName!=null) "domain-name=${domainName}"} allow-point-to-point=${yesNo allowPointToPoint} + ${optionalString (cacheEntriesMax!=null) "cache-entries-max=${toString cacheEntriesMax}"} [wide-area] enable-wide-area=${yesNo wideArea} @@ -166,6 +167,15 @@ in ''; }; + cacheEntriesMax = mkOption { + default = null; + type = types.nullOr types.int; + description = '' + Number of resource records to be cached per interface. Use 0 to + disable caching. Avahi daemon defaults to 4096 if not set. + ''; + }; + }; }; diff --git a/nixos/modules/services/networking/nat.nix b/nixos/modules/services/networking/nat.nix index 08ba2fdb164..366bb2ed7a8 100644 --- a/nixos/modules/services/networking/nat.nix +++ b/nixos/modules/services/networking/nat.nix @@ -48,7 +48,7 @@ let # NAT from external ports to internal ports. ${concatMapStrings (fwd: '' iptables -w -t nat -A nixos-nat-pre \ - -i ${cfg.externalInterface} -p tcp \ + -i ${cfg.externalInterface} -p ${fwd.proto} \ --dport ${builtins.toString fwd.sourcePort} \ -j DNAT --to-destination ${fwd.destination} '') cfg.forwardPorts} @@ -133,12 +133,19 @@ in destination = mkOption { type = types.str; example = "10.0.0.1:80"; - description = "Forward tcp connection to destination ip:port"; + description = "Forward connection to destination ip:port"; + }; + + proto = mkOption { + type = types.str; + default = "tcp"; + example = "udp"; + description = "Protocol of forwarded connection"; }; }; }); default = []; - example = [ { sourcePort = 8080; destination = "10.0.0.1:80"; } ]; + example = [ { sourcePort = 8080; destination = "10.0.0.1:80"; proto = "tcp"; } ]; description = '' List of forwarded ports from the external interface to @@ -151,38 +158,41 @@ in ###### implementation - config = mkIf config.networking.nat.enable { + config = mkMerge [ + { networking.firewall.extraCommands = mkBefore flushNat; } + (mkIf config.networking.nat.enable { - environment.systemPackages = [ pkgs.iptables ]; + environment.systemPackages = [ pkgs.iptables ]; - boot = { - kernelModules = [ "nf_nat_ftp" ]; - kernel.sysctl = { - "net.ipv4.conf.all.forwarding" = mkOverride 99 true; - "net.ipv4.conf.default.forwarding" = mkOverride 99 true; + boot = { + kernelModules = [ "nf_nat_ftp" ]; + kernel.sysctl = { + "net.ipv4.conf.all.forwarding" = mkOverride 99 true; + "net.ipv4.conf.default.forwarding" = mkOverride 99 true; + }; }; - }; - networking.firewall = mkIf config.networking.firewall.enable { - extraCommands = mkMerge [ (mkBefore flushNat) setupNat ]; - extraStopCommands = flushNat; - }; + networking.firewall = mkIf config.networking.firewall.enable { + extraCommands = setupNat; + extraStopCommands = flushNat; + }; - systemd.services = mkIf (!config.networking.firewall.enable) { nat = { - description = "Network Address Translation"; - wantedBy = [ "network.target" ]; - after = [ "network-pre.target" "systemd-modules-load.service" ]; - path = [ pkgs.iptables ]; - unitConfig.ConditionCapability = "CAP_NET_ADMIN"; + systemd.services = mkIf (!config.networking.firewall.enable) { nat = { + description = "Network Address Translation"; + wantedBy = [ "network.target" ]; + after = [ "network-pre.target" "systemd-modules-load.service" ]; + path = [ pkgs.iptables ]; + unitConfig.ConditionCapability = "CAP_NET_ADMIN"; - serviceConfig = { - Type = "oneshot"; - RemainAfterExit = true; - }; + serviceConfig = { + Type = "oneshot"; + RemainAfterExit = true; + }; - script = flushNat + setupNat; + script = flushNat + setupNat; - postStop = flushNat; - }; }; - }; + postStop = flushNat; + }; }; + }) + ]; } diff --git a/nixos/modules/services/networking/tlsdated.nix b/nixos/modules/services/networking/tlsdated.nix deleted file mode 100644 index 757cce28760..00000000000 --- a/nixos/modules/services/networking/tlsdated.nix +++ /dev/null @@ -1,111 +0,0 @@ -{ config, lib, pkgs, ... }: - -with lib; - -let - inherit (pkgs) coreutils tlsdate; - - cfg = config.services.tlsdated; -in - -{ - - ###### interface - - options = { - - services.tlsdated = { - - enable = mkOption { - type = types.bool; - default = false; - description = '' - Enable tlsdated daemon. - ''; - }; - - extraOptions = mkOption { - type = types.string; - default = ""; - description = '' - Additional command line arguments to pass to tlsdated. - ''; - }; - - sources = mkOption { - type = types.listOf (types.submodule { - options = { - host = mkOption { - type = types.string; - description = '' - Remote hostname. - ''; - }; - port = mkOption { - type = types.int; - description = '' - Remote port. - ''; - }; - proxy = mkOption { - type = types.nullOr types.string; - default = null; - description = '' - The proxy argument expects HTTP, SOCKS4A or SOCKS5 formatted as followed: - - http://127.0.0.1:8118 - socks4a://127.0.0.1:9050 - socks5://127.0.0.1:9050 - - The proxy support should not leak DNS requests and is suitable for use with Tor. - ''; - }; - }; - }); - default = [ - { - host = "encrypted.google.com"; - port = 443; - proxy = null; - } - ]; - description = '' - You can list one or more sources to fetch time from. - ''; - }; - - }; - - }; - - ###### implementation - - config = mkIf cfg.enable { - - # Make tools such as tlsdate available in the system path - environment.systemPackages = [ tlsdate ]; - - systemd.services.tlsdated = { - description = "tlsdated daemon"; - wantedBy = [ "multi-user.target" ]; - serviceConfig = { - # XXX because pkgs.tlsdate is compiled to run as nobody:nogroup, we - # hard-code base-path to /tmp and use PrivateTmp. - ExecStart = "${tlsdate}/bin/tlsdated -f ${pkgs.writeText "tlsdated.confg" '' - base-path /tmp - - ${concatMapStrings (src: '' - source - host ${src.host} - port ${toString src.port} - proxy ${if src.proxy == null then "none" else src.proxy} - end - '') cfg.sources} - ''} ${cfg.extraOptions}"; - PrivateTmp = "yes"; - }; - }; - - }; - -} diff --git a/nixos/modules/services/networking/unifi.nix b/nixos/modules/services/networking/unifi.nix index a8cff638d3b..8e5f0bfc070 100644 --- a/nixos/modules/services/networking/unifi.nix +++ b/nixos/modules/services/networking/unifi.nix @@ -3,7 +3,12 @@ with lib; let cfg = config.services.unifi; stateDir = "/var/lib/unifi"; - cmd = "@${pkgs.jre}/bin/java java -jar ${stateDir}/lib/ace.jar"; + cmd = '' + @${pkgs.jre}/bin/java java \ + ${optionalString (cfg.initialJavaHeapSize != null) "-Xms${(toString cfg.initialJavaHeapSize)}m"} \ + ${optionalString (cfg.maximumJavaHeapSize != null) "-Xmx${(toString cfg.maximumJavaHeapSize)}m"} \ + -jar ${stateDir}/lib/ace.jar + ''; mountPoints = [ { what = "${pkgs.unifi}/dl"; @@ -58,6 +63,26 @@ in ''; }; + services.unifi.initialJavaHeapSize = mkOption { + type = types.nullOr types.int; + default = null; + example = 1024; + description = '' + Set the initial heap size for the JVM in MB. If this option isn't set, the + JVM will decide this value at runtime. + ''; + }; + + services.unifi.maximumJavaHeapSize = mkOption { + type = types.nullOr types.int; + default = null; + example = 4096; + description = '' + Set the maximimum heap size for the JVM in MB. If this option isn't set, the + JVM will decide this value at runtime. + ''; + }; + }; config = mkIf cfg.enable { @@ -121,8 +146,8 @@ in serviceConfig = { Type = "simple"; - ExecStart = "${cmd} start"; - ExecStop = "${cmd} stop"; + ExecStart = "${(removeSuffix "\n" cmd)} start"; + ExecStop = "${(removeSuffix "\n" cmd)} stop"; User = "unifi"; PermissionsStartOnly = true; UMask = "0077"; diff --git a/nixos/modules/services/web-apps/atlassian/confluence.nix b/nixos/modules/services/web-apps/atlassian/confluence.nix index c1d7d4ea06d..2344b9922d0 100644 --- a/nixos/modules/services/web-apps/atlassian/confluence.nix +++ b/nixos/modules/services/web-apps/atlassian/confluence.nix @@ -6,7 +6,22 @@ let cfg = config.services.confluence; - pkg = pkgs.atlassian-confluence; + pkg = pkgs.atlassian-confluence.override (optionalAttrs cfg.sso.enable { + enableSSO = cfg.sso.enable; + crowdProperties = '' + application.name ${cfg.sso.applicationName} + application.password ${cfg.sso.applicationPassword} + application.login.url ${cfg.sso.crowd}/console/ + + crowd.server.url ${cfg.sso.crowd}/services/ + crowd.base.url ${cfg.sso.crowd}/ + + session.isauthenticated session.isauthenticated + session.tokenkey session.tokenkey + session.validationinterval ${toString cfg.sso.validationInterval} + session.lastvalidation session.lastvalidation + ''; + }); in @@ -76,6 +91,42 @@ in }; }; + sso = { + enable = mkEnableOption "SSO with Atlassian Crowd"; + + crowd = mkOption { + type = types.str; + example = "http://localhost:8095/crowd"; + description = "Crowd Base URL without trailing slash"; + }; + + applicationName = mkOption { + type = types.str; + example = "jira"; + description = "Exact name of this Confluence instance in Crowd"; + }; + + applicationPassword = mkOption { + type = types.str; + description = "Application password of this Confluence instance in Crowd"; + }; + + validationInterval = mkOption { + type = types.int; + default = 2; + example = 0; + description = '' + Set to 0, if you want authentication checks to occur on each + request. Otherwise set to the number of minutes between request + to validate if the user is logged in or out of the Crowd SSO + server. Setting this value to 1 or higher will increase the + performance of Crowd's integration. + ''; + }; + }; + + + jrePackage = let jreSwitch = unfree: free: if config.nixpkgs.config.allowUnfree or false then unfree else free; in mkOption { diff --git a/nixos/modules/services/web-apps/atlassian/jira.nix b/nixos/modules/services/web-apps/atlassian/jira.nix index 0ab94d95eee..19b6a8d3085 100644 --- a/nixos/modules/services/web-apps/atlassian/jira.nix +++ b/nixos/modules/services/web-apps/atlassian/jira.nix @@ -6,7 +6,22 @@ let cfg = config.services.jira; - pkg = pkgs.atlassian-jira; + pkg = pkgs.atlassian-jira.override { + enableSSO = cfg.sso.enable; + crowdProperties = '' + application.name ${cfg.sso.applicationName} + application.password ${cfg.sso.applicationPassword} + application.login.url ${cfg.sso.crowd}/console/ + + crowd.server.url ${cfg.sso.crowd}/services/ + crowd.base.url ${cfg.sso.crowd}/ + + session.isauthenticated session.isauthenticated + session.tokenkey session.tokenkey + session.validationinterval ${toString cfg.sso.validationInterval} + session.lastvalidation session.lastvalidation + ''; + }; in @@ -82,6 +97,40 @@ in }; }; + sso = { + enable = mkEnableOption "SSO with Atlassian Crowd"; + + crowd = mkOption { + type = types.str; + example = "http://localhost:8095/crowd"; + description = "Crowd Base URL without trailing slash"; + }; + + applicationName = mkOption { + type = types.str; + example = "jira"; + description = "Exact name of this JIRA instance in Crowd"; + }; + + applicationPassword = mkOption { + type = types.str; + description = "Application password of this JIRA instance in Crowd"; + }; + + validationInterval = mkOption { + type = types.int; + default = 2; + example = 0; + description = '' + Set to 0, if you want authentication checks to occur on each + request. Otherwise set to the number of minutes between request + to validate if the user is logged in or out of the Crowd SSO + server. Setting this value to 1 or higher will increase the + performance of Crowd's integration. + ''; + }; + }; + jrePackage = let jreSwitch = unfree: free: if config.nixpkgs.config.allowUnfree or false then unfree else free; in mkOption { diff --git a/nixos/modules/services/web-servers/nginx/default.nix b/nixos/modules/services/web-servers/nginx/default.nix index 2310912d0fd..2f691b0e9df 100644 --- a/nixos/modules/services/web-servers/nginx/default.nix +++ b/nixos/modules/services/web-servers/nginx/default.nix @@ -36,6 +36,11 @@ let http { include ${cfg.package}/conf/mime.types; include ${cfg.package}/conf/fastcgi.conf; + include ${cfg.package}/conf/uwsgi_params; + + ${optionalString (cfg.resolver.addresses != []) '' + resolver ${toString cfg.resolver.addresses} ${optionalString (cfg.resolver.valid != "") "valid=${cfg.resolver.valid}"}; + ''} ${optionalString (cfg.recommendedOptimisation) '' # optimisation @@ -116,6 +121,7 @@ let http { include ${cfg.package}/conf/mime.types; include ${cfg.package}/conf/fastcgi.conf; + include ${cfg.package}/conf/uwsgi_params; ${cfg.httpConfig} }''} @@ -383,6 +389,32 @@ in description = "Path to DH parameters file."; }; + resolver = mkOption { + type = types.submodule { + options = { + addresses = mkOption { + type = types.listOf types.str; + default = []; + example = literalExample ''[ "[::1]" "127.0.0.1:5353" ]''; + description = "List of resolvers to use"; + }; + valid = mkOption { + type = types.str; + default = ""; + example = "30s"; + description = '' + By default, nginx caches answers using the TTL value of a response. + An optional valid parameter allows overriding it + ''; + }; + }; + }; + description = '' + Configures name servers used to resolve names of upstream servers into addresses + ''; + default = {}; + }; + virtualHosts = mkOption { type = types.attrsOf (types.submodule (import ./vhost-options.nix { inherit config lib; diff --git a/nixos/modules/services/x11/desktop-managers/gnome3.nix b/nixos/modules/services/x11/desktop-managers/gnome3.nix index c043884f8e0..2434aa1654a 100644 --- a/nixos/modules/services/x11/desktop-managers/gnome3.nix +++ b/nixos/modules/services/x11/desktop-managers/gnome3.nix @@ -176,7 +176,7 @@ in { services.xserver.updateDbusEnvironment = true; - environment.variables.GIO_EXTRA_MODULES = [ "${gnome3.dconf}/lib/gio/modules" + environment.variables.GIO_EXTRA_MODULES = [ "${lib.getLib gnome3.dconf}/lib/gio/modules" "${gnome3.glib_networking.out}/lib/gio/modules" "${gnome3.gvfs}/lib/gio/modules" ]; environment.systemPackages = gnome3.corePackages ++ cfg.sessionPath diff --git a/nixos/modules/system/activation/top-level.nix b/nixos/modules/system/activation/top-level.nix index e9897cc01b6..67cb2264e3f 100644 --- a/nixos/modules/system/activation/top-level.nix +++ b/nixos/modules/system/activation/top-level.nix @@ -141,6 +141,7 @@ in system.build = mkOption { internal = true; default = {}; + type = types.attrs; description = '' Attribute set of derivations used to setup the system. ''; diff --git a/nixos/modules/system/boot/systemd.nix b/nixos/modules/system/boot/systemd.nix index 46761fdc0e9..d12d0a06f44 100644 --- a/nixos/modules/system/boot/systemd.nix +++ b/nixos/modules/system/boot/systemd.nix @@ -593,7 +593,7 @@ in services.logind.extraConfig = mkOption { default = ""; type = types.lines; - example = "HandleLidSwitch=ignore"; + example = "IdleAction=lock"; description = '' Extra config options for systemd-logind. See man logind.conf for available options. diff --git a/nixos/modules/virtualisation/xen-dom0.nix b/nixos/modules/virtualisation/xen-dom0.nix index 5239652d407..c7656bc309c 100644 --- a/nixos/modules/virtualisation/xen-dom0.nix +++ b/nixos/modules/virtualisation/xen-dom0.nix @@ -16,6 +16,7 @@ in virtualisation.xen.enable = mkOption { default = false; + type = types.bool; description = '' Setting this option enables the Xen hypervisor, a diff --git a/nixos/release-combined.nix b/nixos/release-combined.nix index ecbd317cb9a..26e689a7c92 100644 --- a/nixos/release-combined.nix +++ b/nixos/release-combined.nix @@ -4,7 +4,8 @@ { nixpkgs ? { outPath = ./..; revCount = 56789; shortRev = "gfedcba"; } , stableBranch ? false -, supportedSystems ? [ "x86_64-linux" "i686-linux" ] +, supportedSystems ? [ "x86_64-linux" ] +, limitedSupportedSystems ? [ "i686-linux" ] }: let @@ -19,10 +20,16 @@ let else pkgs.lib.mapAttrs (n: v: removeMaintainers v) set else set; + allSupportedNixpkgs = builtins.removeAttrs (removeMaintainers (import ../pkgs/top-level/release.nix { + supportedSystems = supportedSystems ++ limitedSupportedSystems; + nixpkgs = nixpkgsSrc; + })) [ "unstable" ]; + in rec { nixos = removeMaintainers (import ./release.nix { - inherit stableBranch supportedSystems; + inherit stableBranch; + supportedSystems = supportedSystems ++ limitedSupportedSystems; nixpkgs = nixpkgsSrc; }); @@ -38,8 +45,11 @@ in rec { maintainers = [ pkgs.lib.maintainers.eelco ]; }; constituents = - let all = x: map (system: x.${system}) supportedSystems; in - [ nixos.channel + let + all = x: map (system: x.${system}) + (supportedSystems ++ limitedSupportedSystems); + in [ + nixos.channel (all nixos.dummy) (all nixos.manual) @@ -106,8 +116,8 @@ in rec { (all nixos.tests.xfce) nixpkgs.tarball - (all nixpkgs.emacs) - (all nixpkgs.jdk) + (all allSupportedNixpkgs.emacs) + (all allSupportedNixpkgs.jdk) ]; }); diff --git a/nixos/release.nix b/nixos/release.nix index 0dbdadf9781..9604da5a4d7 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" ] +, supportedSystems ? [ "x86_64-linux" ] }: with import ../lib; diff --git a/nixos/tests/nat.nix b/nixos/tests/nat.nix index 74e20bff8d8..a12b7645bc2 100644 --- a/nixos/tests/nat.nix +++ b/nixos/tests/nat.nix @@ -6,6 +6,20 @@ import ./make-test.nix ({ pkgs, lib, withFirewall, withConntrackHelpers ? false, ... }: let unit = if withFirewall then "firewall" else "nat"; + + routerBase = + lib.mkMerge [ + { virtualisation.vlans = [ 2 1 ]; + networking.firewall.enable = withFirewall; + networking.firewall.allowPing = true; + networking.nat.internalIPs = [ "192.168.1.0/24" ]; + networking.nat.externalInterface = "eth1"; + } + (lib.optionalAttrs withConntrackHelpers { + networking.firewall.connectionTrackingModules = [ "ftp" ]; + networking.firewall.autoLoadConntrackHelpers = true; + }) + ]; in { name = "nat" + (if withFirewall then "WithFirewall" else "Standalone") @@ -30,20 +44,16 @@ import ./make-test.nix ({ pkgs, lib, withFirewall, withConntrackHelpers ? false, ]; router = - { config, pkgs, ... }: - lib.mkMerge [ - { virtualisation.vlans = [ 2 1 ]; - networking.firewall.enable = withFirewall; - networking.firewall.allowPing = true; - networking.nat.enable = true; - networking.nat.internalIPs = [ "192.168.1.0/24" ]; - networking.nat.externalInterface = "eth1"; - } - (lib.optionalAttrs withConntrackHelpers { - networking.firewall.connectionTrackingModules = [ "ftp" ]; - networking.firewall.autoLoadConntrackHelpers = true; - }) - ]; + { config, pkgs, ... }: lib.mkMerge [ + routerBase + { networking.nat.enable = true; } + ]; + + routerDummyNoNat = + { config, pkgs, ... }: lib.mkMerge [ + routerBase + { networking.nat.enable = false; } + ]; server = { config, pkgs, ... }: @@ -57,9 +67,13 @@ import ./make-test.nix ({ pkgs, lib, withFirewall, withConntrackHelpers ? false, }; testScript = - { nodes, ... }: - '' - startAll; + { nodes, ... }: let + routerDummyNoNatClosure = nodes.routerDummyNoNat.config.system.build.toplevel; + routerClosure = nodes.router.config.system.build.toplevel; + in '' + $client->start; + $router->start; + $server->start; # The router should have access to the server. $server->waitForUnit("network.target"); @@ -87,13 +101,18 @@ import ./make-test.nix ({ pkgs, lib, withFirewall, withConntrackHelpers ? false, $router->succeed("ping -c 1 client >&2"); # If we turn off NAT, the client shouldn't be able to reach the server. - $router->succeed("iptables -t nat -D PREROUTING -j nixos-nat-pre"); - $router->succeed("iptables -t nat -D POSTROUTING -j nixos-nat-post"); + $router->succeed("${routerDummyNoNatClosure}/bin/switch-to-configuration test 2>&1"); $client->fail("curl --fail --connect-timeout 5 http://server/ >&2"); $client->fail("ping -c 1 server >&2"); # And make sure that reloading the NAT job works. - $router->succeed("systemctl restart ${unit}"); + $router->succeed("${routerClosure}/bin/switch-to-configuration test 2>&1"); + # FIXME: this should not be necessary, but nat.service is not started because + # network.target is not triggered + # (https://github.com/NixOS/nixpkgs/issues/16230#issuecomment-226408359) + ${lib.optionalString (!withFirewall) '' + $router->succeed("systemctl start nat.service"); + ''} $client->succeed("curl --fail http://server/ >&2"); $client->succeed("ping -c 1 server >&2"); ''; diff --git a/pkgs/applications/audio/a2jmidid/default.nix b/pkgs/applications/audio/a2jmidid/default.nix index ddd34f1bfeb..efb69d4c481 100644 --- a/pkgs/applications/audio/a2jmidid/default.nix +++ b/pkgs/applications/audio/a2jmidid/default.nix @@ -8,8 +8,8 @@ in stdenv.mkDerivation rec { version = "8"; src = fetchurl { - url = "http://download.gna.org/a2jmidid/${name}.tar.bz2"; - sha256 = "0pzm0qk5ilqhwz74pydg1jwrds27vm47185dakdrxidb5bv3b5ia"; + url = "http://repo.or.cz/a2jmidid.git/snapshot/7383d268c4bfe85df9f10df6351677659211d1ca.tar.gz"; + sha256 = "06dgf5655znbvrd7fhrv8msv6zw8vk0hjqglcqkh90960mnnmwz7"; }; buildInputs = [ makeWrapper pkgconfig alsaLib dbus libjack2 python dbus-python ]; @@ -24,7 +24,6 @@ in stdenv.mkDerivation rec { ''; meta = with stdenv.lib; { - homepage = http://home.gna.org/a2jmidid; description = "Daemon for exposing legacy ALSA sequencer applications in JACK MIDI system"; license = licenses.gpl2; maintainers = [ maintainers.goibhniu ]; diff --git a/pkgs/applications/audio/audio-recorder/default.nix b/pkgs/applications/audio/audio-recorder/default.nix index e6addd6c4fd..283d4c7d493 100644 --- a/pkgs/applications/audio/audio-recorder/default.nix +++ b/pkgs/applications/audio/audio-recorder/default.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { patches = [ ./icon-names.diff ]; buildInputs = with gst_all_1; [ - glib dbus gtk3 librsvg libdbusmenu-gtk3 libappindicator-gtk3 gnome3.dconf + glib dbus gtk3 librsvg libdbusmenu-gtk3 libappindicator-gtk3 (stdenv.lib.getLib gnome3.dconf) gstreamer gst-plugins-base gst-plugins-good gst-plugins-bad gst-plugins-ugly gst-libav ] ++ optional pulseaudioSupport libpulseaudio; @@ -36,7 +36,7 @@ stdenv.mkDerivation rec { preFixup = '' gappsWrapperArgs+=('--prefix XDG_DATA_DIRS : "$out/share:$XDG_ICON_DIRS:$GSETTINGS_SCHEMAS_PATH"' '--prefix GST_PLUGIN_SYSTEM_PATH_1_0 : "$GST_PLUGIN_SYSTEM_PATH_1_0"' - '--prefix GIO_EXTRA_MODULES : "${gnome3.dconf}/lib/gio/modules"') + '--prefix GIO_EXTRA_MODULES : "${stdenv.lib.getLib gnome3.dconf}/lib/gio/modules"') ''; meta = with stdenv.lib; { diff --git a/pkgs/applications/audio/bitwig-studio/default.nix b/pkgs/applications/audio/bitwig-studio/default.nix index af0d2bbd0e9..c597e42eaa6 100644 --- a/pkgs/applications/audio/bitwig-studio/default.nix +++ b/pkgs/applications/audio/bitwig-studio/default.nix @@ -6,11 +6,11 @@ stdenv.mkDerivation rec { name = "bitwig-studio-${version}"; - version = "2.0"; + version = "2.1.3"; src = fetchurl { url = "https://downloads.bitwig.com/stable/${version}/bitwig-studio-${version}.deb"; - sha256 = "1m7wdr0f9xi9s7q8vd66hy7fj1k0j3y5ln2yqbjwr76r9g6gkzas"; + sha256 = "0blfw7dayl1wzys11mdixlkbr1p1d5rnwrvim1hblfpnw2zmlslb"; }; nativeBuildInputs = [ dpkg makeWrapper ]; @@ -80,6 +80,9 @@ stdenv.mkDerivation rec { ln -s $out/libexec/bitwig-studio $out/bin/bitwig-studio cp -r usr/share $out/share + substitute usr/share/applications/bitwig-studio.desktop \ + $out/share/applications/bitwig-studio.desktop \ + --replace /usr/bin/bitwig-studio $out/bin/bitwig-studio ''; meta = with stdenv.lib; { diff --git a/pkgs/applications/audio/clementine/clementine-1.2.1-include-paths.patch b/pkgs/applications/audio/clementine/clementine-1.2.1-include-paths.patch deleted file mode 100644 index 4c17846b99d..00000000000 --- a/pkgs/applications/audio/clementine/clementine-1.2.1-include-paths.patch +++ /dev/null @@ -1,14 +0,0 @@ -diff -ur clementine-1.2.1-a/CMakeLists.txt clementine-1.2.1-b/CMakeLists.txt ---- clementine-1.2.1-a/CMakeLists.txt 2013-11-25 15:16:24.000000000 -0600 -+++ clementine-1.2.1-b/CMakeLists.txt 2013-12-30 17:01:48.470011058 -0600 -@@ -158,6 +158,10 @@ - include_directories(${TAGLIB_INCLUDE_DIRS}) - include_directories(${QJSON_INCLUDE_DIRS}) - include_directories(${GSTREAMER_INCLUDE_DIRS}) -+include_directories(${GSTREAMER_APP_INCLUDE_DIRS}) -+include_directories(${GSTREAMER_BASE_INCLUDE_DIRS}) -+include_directories(${GSTREAMER_CDDA_INCLUDE_DIRS}) -+include_directories(${GSTREAMER_TAG_INCLUDE_DIRS}) - include_directories(${GLIB_INCLUDE_DIRS}) - include_directories(${GLIBCONFIG_INCLUDE_DIRS}) - include_directories(${LIBXML_INCLUDE_DIRS}) diff --git a/pkgs/applications/audio/clementine/clementine-dbus-namespace.patch b/pkgs/applications/audio/clementine/clementine-dbus-namespace.patch deleted file mode 100644 index 2240debd0e4..00000000000 --- a/pkgs/applications/audio/clementine/clementine-dbus-namespace.patch +++ /dev/null @@ -1,36 +0,0 @@ -From ec580cb815c16ec1ab43a469d5af7d51d8d03082 Mon Sep 17 00:00:00 2001 -From: Chocobozzz <florian.chocobo@gmail.com> -Date: Wed, 16 Jul 2014 15:57:25 +0200 -Subject: [PATCH] No namespaces for DBus interfaces. Fixes #4401 - ---- - src/CMakeLists.txt | 9 ++++----- - 1 file changed, 4 insertions(+), 5 deletions(-) - -diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt -index 650fa74..775b0a5 100644 ---- a/src/CMakeLists.txt -+++ b/src/CMakeLists.txt -@@ -892,11 +892,6 @@ optional_source(LINUX SOURCES widgets/osd_x11.cpp) - if(HAVE_DBUS) - file(MAKE_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/dbus) - -- # Hack to get it to generate interfaces without namespaces - required -- # because otherwise org::freedesktop::UDisks and -- # org::freedesktop::UDisks::Device conflict. -- list(APPEND QT_DBUSXML2CPP_EXECUTABLE -N) -- - # MPRIS DBUS interfaces - qt4_add_dbus_adaptor(SOURCES - dbus/org.freedesktop.MediaPlayer.player.xml -@@ -964,6 +959,10 @@ if(HAVE_DBUS) - - # DeviceKit DBUS interfaces - if(HAVE_DEVICEKIT) -+ set_source_files_properties(dbus/org.freedesktop.UDisks.xml -+ PROPERTIES NO_NAMESPACE dbus/udisks) -+ set_source_files_properties(dbus/org.freedesktop.UDisks.Device.xml -+ PROPERTIES NO_NAMESPACE dbus/udisksdevice) - qt4_add_dbus_interface(SOURCES - dbus/org.freedesktop.UDisks.xml - dbus/udisks) diff --git a/pkgs/applications/audio/clementine/clementine-spotify-blob-remove-from-build.patch b/pkgs/applications/audio/clementine/clementine-spotify-blob-remove-from-build.patch new file mode 100644 index 00000000000..226536a13ba --- /dev/null +++ b/pkgs/applications/audio/clementine/clementine-spotify-blob-remove-from-build.patch @@ -0,0 +1,21 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 23070d9..83b6772 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -275,8 +275,6 @@ optional_component(LIBPULSE ON "Pulse audio integration" + optional_component(VISUALISATIONS ON "Visualisations") + + if(NOT HAVE_SPOTIFY_BLOB AND NOT CRYPTOPP_FOUND) +- message(FATAL_ERROR "Either crypto++ must be available or the non-GPL Spotify " +- "code must be compiled in") + elseif(CRYPTOPP_FOUND) + set(HAVE_CRYPTOPP ON) + set(HAVE_SPOTIFY_DOWNLOADER ON) +@@ -434,7 +432,6 @@ if(HAVE_BREAKPAD) + endif(HAVE_BREAKPAD) + + if(HAVE_SPOTIFY_BLOB) +- add_subdirectory(ext/clementine-spotifyblob) + endif(HAVE_SPOTIFY_BLOB) + + if(HAVE_MOODBAR) diff --git a/pkgs/applications/audio/clementine/clementine-spotify-blob.patch b/pkgs/applications/audio/clementine/clementine-spotify-blob.patch index d41720c9021..344fc31d70d 100644 --- a/pkgs/applications/audio/clementine/clementine-spotify-blob.patch +++ b/pkgs/applications/audio/clementine/clementine-spotify-blob.patch @@ -1,25 +1,13 @@ -From d9ebe7ec09a48b1ea505ccc33686b72642f083f4 Mon Sep 17 00:00:00 2001 -From: Thomas Tuegel <ttuegel@gmail.com> -Date: Mon, 4 May 2015 19:59:38 -0500 -Subject: [PATCH] Runtime selection of Spotify blob - ---- - src/internet/spotifyservice.cpp | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/src/internet/spotifyservice.cpp b/src/internet/spotifyservice.cpp -index 543744e..d987a36 100644 ---- a/src/internet/spotifyservice.cpp -+++ b/src/internet/spotifyservice.cpp -@@ -65,7 +65,7 @@ SpotifyService::SpotifyService(Application* app, InternetModel* parent) +diff --git a/src/internet/spotify/spotifyservice.cpp b/src/internet/spotify/spotifyservice.cpp +index 88c7383..6e0893c 100644 +--- a/src/internet/spotify/spotifyservice.cpp ++++ b/src/internet/spotify/spotifyservice.cpp +@@ -94,7 +94,7 @@ SpotifyService::SpotifyService(Application* app, InternetModel* parent) system_blob_path_ = QCoreApplication::applicationDirPath() + - "/../PlugIns/clementine-spotifyblob"; + "/../PlugIns/clementine-spotifyblob"; #else - system_blob_path_ = QCoreApplication::applicationDirPath() + + system_blob_path_ = qgetenv("CLEMENTINE_SPOTIFYBLOB") + - "/clementine-spotifyblob" CMAKE_EXECUTABLE_SUFFIX; + "/clementine-spotifyblob" CMAKE_EXECUTABLE_SUFFIX; #endif --- -2.3.6 - diff --git a/pkgs/applications/audio/clementine/default.nix b/pkgs/applications/audio/clementine/default.nix index c6e587b88a3..5b0d285f82d 100644 --- a/pkgs/applications/audio/clementine/default.nix +++ b/pkgs/applications/audio/clementine/default.nix @@ -1,7 +1,7 @@ -{ stdenv, fetchurl, boost, cmake, gettext, gstreamer, gst-plugins-base -, liblastfm, qt4, taglib, fftw, glew, qjson, sqlite, libgpod, libplist -, usbmuxd, libmtp, gvfs, libcdio, libspotify, protobuf, qca2, pkgconfig -, sparsehash, config, makeWrapper, runCommand, gst_plugins }: +{ stdenv, fetchurl, boost, cmake, chromaprint, gettext, gst_all_1, liblastfm +, qt4, taglib, fftw, glew, qjson, sqlite, libgpod, libplist, usbmuxd, libmtp +, libpulseaudio, gvfs, libcdio, libechonest, libspotify, pcre, protobuf +, qca2, pkgconfig, sparsehash, config, makeWrapper, runCommand, gst_plugins }: let withSpotify = config.clementine.spotify or false; @@ -10,31 +10,36 @@ let withCD = config.clementine.cd or true; withCloud = config.clementine.cloud or true; - version = "1.2.3"; + version = "1.3.1"; exeName = "clementine"; src = fetchurl { - url = https://github.com/clementine-player/Clementine/archive/1.2.3.tar.gz; - sha256 = "1gx1109i4pylz6x7gvp4rdzc6dvh0w6in6hfbygw01d08l26bxbx"; + url = https://github.com/clementine-player/Clementine/archive/1.3.1.tar.gz; + sha256 = "0z7k73wyz54c3020lb6x2dgw0vz4ri7wcl3vs03qdj5pk8d971gq"; }; patches = [ - ./clementine-1.2.1-include-paths.patch - ./clementine-dbus-namespace.patch ./clementine-spotify-blob.patch + # Required so as to avoid adding libspotify as a build dependency (as it is + # unfree and thus would prevent us from having a free package). + ./clementine-spotify-blob-remove-from-build.patch ]; buildInputs = [ boost cmake + chromaprint fftw gettext glew - gst-plugins-base - gstreamer + gst_all_1.gst-plugins-base + gst_all_1.gstreamer gvfs + libechonest liblastfm + libpulseaudio + pcre pkgconfig protobuf qca2 @@ -71,7 +76,12 @@ let blob = stdenv.mkDerivation { name = "clementine-blob-${version}"; # Use the same patches and sources as Clementine - inherit patches src; + inherit src; + + patches = [ + ./clementine-spotify-blob.patch + ]; + buildInputs = buildInputs ++ [ libspotify ]; # Only build and install the Spotify blob preBuild = '' @@ -119,7 +129,7 @@ runCommand "clementine-${version}" mkdir -p $out/bin makeWrapper "$free/bin/${exeName}" "$out/bin/${exeName}" \ ${optionalString withSpotify "--set CLEMENTINE_SPOTIFYBLOB \"$blob/libexec/clementine\""} \ - --prefix GST_PLUGIN_SYSTEM_PATH : "$GST_PLUGIN_SYSTEM_PATH" + --prefix GST_PLUGIN_SYSTEM_PATH_1_0 : "$GST_PLUGIN_SYSTEM_PATH_1_0" mkdir -p $out/share for dir in applications icons kde4; do diff --git a/pkgs/applications/audio/drumgizmo/default.nix b/pkgs/applications/audio/drumgizmo/default.nix index 7a2e2a6da45..c42d290c599 100644 --- a/pkgs/applications/audio/drumgizmo/default.nix +++ b/pkgs/applications/audio/drumgizmo/default.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "An LV2 sample based drum plugin"; - homepage = http://www.drumgizmo.org; + homepage = https://www.drumgizmo.org; license = licenses.lgpl3; platforms = platforms.linux; maintainers = [ maintainers.goibhniu maintainers.nico202 ]; diff --git a/pkgs/applications/audio/easytag/default.nix b/pkgs/applications/audio/easytag/default.nix index 4b357f0c590..f9c9dc2faef 100644 --- a/pkgs/applications/audio/easytag/default.nix +++ b/pkgs/applications/audio/easytag/default.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { preFixup = '' wrapProgram $out/bin/easytag \ --prefix XDG_DATA_DIRS : "$XDG_ICON_DIRS:$GSETTINGS_SCHEMAS_PATH:$out/share" \ - --prefix GIO_EXTRA_MODULES : "${gnome3.dconf}/lib/gio/modules" + --prefix GIO_EXTRA_MODULES : "${stdenv.lib.getLib gnome3.dconf}/lib/gio/modules" ''; NIX_LDFLAGS = "-lid3tag -lz"; @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ makeWrapper pkgconfig intltool ]; buildInputs = [ gtk3 glib libid3tag id3lib taglib libvorbis libogg flac - itstool libxml2 gsettings_desktop_schemas gnome3.defaultIconTheme gnome3.dconf + itstool libxml2 gsettings_desktop_schemas gnome3.defaultIconTheme (stdenv.lib.getLib gnome3.dconf) ]; meta = with stdenv.lib; { diff --git a/pkgs/applications/audio/mixxx/default.nix b/pkgs/applications/audio/mixxx/default.nix index d7cdfcf0d08..33265e1b3e8 100644 --- a/pkgs/applications/audio/mixxx/default.nix +++ b/pkgs/applications/audio/mixxx/default.nix @@ -40,7 +40,7 @@ stdenv.mkDerivation rec { ''; meta = with stdenv.lib; { - homepage = http://mixxx.org; + homepage = https://mixxx.org; description = "Digital DJ mixing software"; license = licenses.gpl2Plus; maintainers = [ maintainers.aszlig maintainers.goibhniu ]; diff --git a/pkgs/applications/audio/sound-juicer/default.nix b/pkgs/applications/audio/sound-juicer/default.nix index 02a97dde4e2..ba550580cba 100644 --- a/pkgs/applications/audio/sound-juicer/default.nix +++ b/pkgs/applications/audio/sound-juicer/default.nix @@ -17,7 +17,7 @@ in stdenv.mkDerivation rec { buildInputs = [ pkgconfig gtk3 intltool itstool libxml2 brasero libcanberra_gtk3 gnome3.gsettings_desktop_schemas libmusicbrainz5 libdiscid isocodes - makeWrapper gnome3.dconf + makeWrapper (stdenv.lib.getLib gnome3.dconf) gst_all_1.gstreamer gst_all_1.gst-plugins-base gst_all_1.gst-plugins-good gst_all_1.gst-plugins-bad gst_all_1.gst-libav @@ -28,7 +28,7 @@ in stdenv.mkDerivation rec { wrapProgram "$f" \ --prefix XDG_DATA_DIRS : "${gnome3.gnome_themes_standard}/share:$XDG_ICON_DIRS:$GSETTINGS_SCHEMAS_PATH" \ --prefix GST_PLUGIN_SYSTEM_PATH_1_0 : "$GST_PLUGIN_SYSTEM_PATH_1_0" \ - --prefix GIO_EXTRA_MODULES : "${gnome3.dconf}/lib/gio/modules" + --prefix GIO_EXTRA_MODULES : "${stdenv.lib.getLib gnome3.dconf}/lib/gio/modules" done ''; diff --git a/pkgs/applications/editors/jetbrains/default.nix b/pkgs/applications/editors/jetbrains/default.nix index 50ecdc1d499..186f9d2c23b 100644 --- a/pkgs/applications/editors/jetbrains/default.nix +++ b/pkgs/applications/editors/jetbrains/default.nix @@ -268,12 +268,12 @@ in idea-community = buildIdea rec { name = "idea-community-${version}"; - version = "2017.2"; + version = "2017.2.1"; description = "Integrated Development Environment (IDE) by Jetbrains, community edition"; license = stdenv.lib.licenses.asl20; src = fetchurl { url = "https://download.jetbrains.com/idea/ideaIC-${version}.tar.gz"; - sha256 = "0z5abj41f5l9ilznr34lm4fsivrl2yjdxb2kdcis5abij6zl0g3f"; + sha256 = "1z8gp209jpjzvllnrpxzmbhgaxkklxw8nkm3g2drb7nal2hhs113"; }; wmClass = "jetbrains-idea-ce"; update-channel = "IDEA_Release"; diff --git a/pkgs/applications/graphics/processing/default.nix b/pkgs/applications/graphics/processing/default.nix index a66e9163142..12ff5c77240 100644 --- a/pkgs/applications/graphics/processing/default.nix +++ b/pkgs/applications/graphics/processing/default.nix @@ -31,7 +31,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "A language and IDE for electronic arts"; - homepage = http://processing.org; + homepage = https://processing.org; license = licenses.gpl2Plus; maintainers = [ maintainers.goibhniu ]; platforms = platforms.linux; diff --git a/pkgs/applications/misc/bashSnippets/default.nix b/pkgs/applications/misc/bashSnippets/default.nix index 542450080fe..acd5ae7dd73 100644 --- a/pkgs/applications/misc/bashSnippets/default.nix +++ b/pkgs/applications/misc/bashSnippets/default.nix @@ -1,10 +1,9 @@ { stdenv, lib, fetchFromGitHub, makeWrapper -, curl, netcat, mpv, python, bind, iproute, bc, gitMinimal }: +, curl, netcat, python, bind, iproute, bc, gitMinimal }: let - version = "1.12.0"; + version = "1.17.3"; deps = lib.makeBinPath [ curl - mpv python bind.dnsutils iproute @@ -19,7 +18,7 @@ stdenv.mkDerivation { owner = "alexanderepstein"; repo = "Bash-Snippets"; rev = "v${version}"; - sha256 = "0kx2a8z3jbmmardw9z8fpghbw5mrbz4knb3wdihq35iarcbrddrg"; + sha256 = "1xdjk8bjh7l6h7gdqrra1dh4wdq89wmd0jsirsvqa3bmcsb2wz1r"; }; buildInputs = [ makeWrapper ]; @@ -32,7 +31,7 @@ stdenv.mkDerivation { dontBuild = true; installPhase = '' - mkdir -p "$out"/bin "$out"/man/man1 + mkdir -p "$out"/bin "$out"/share/man/man1 ./install.sh all for file in "$out"/bin/*; do wrapProgram "$file" --prefix PATH : "${deps}" diff --git a/pkgs/applications/misc/blender/default.nix b/pkgs/applications/misc/blender/default.nix index 335d0031b32..b831924d9cd 100644 --- a/pkgs/applications/misc/blender/default.nix +++ b/pkgs/applications/misc/blender/default.nix @@ -69,7 +69,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "3D Creation/Animation/Publishing System"; - homepage = http://www.blender.org; + homepage = https://www.blender.org; # They comment two licenses: GPLv2 and Blender License, but they # say: "We've decided to cancel the BL offering for an indefinite period." license = licenses.gpl2Plus; diff --git a/pkgs/applications/misc/finalterm/default.nix b/pkgs/applications/misc/finalterm/default.nix index 65e515dbb83..add46f8871d 100644 --- a/pkgs/applications/misc/finalterm/default.nix +++ b/pkgs/applications/misc/finalterm/default.nix @@ -42,7 +42,7 @@ stdenv.mkDerivation { postFixup = '' wrapProgram "$out/bin/finalterm" \ --prefix GI_TYPELIB_PATH : "$GI_TYPELIB_PATH" \ - --prefix GIO_EXTRA_MODULES : "${gnome3.dconf}/lib/gio/modules" \ + --prefix GIO_EXTRA_MODULES : "${getLib gnome3.dconf}/lib/gio/modules" \ --prefix XDG_DATA_DIRS : "${gnome3.defaultIconTheme}/share:${gnome3.gtk.out}/share:$out/share:$GSETTINGS_SCHEMAS_PATH" ''; diff --git a/pkgs/applications/misc/hackrf/default.nix b/pkgs/applications/misc/hackrf/default.nix index e92cd4cdacc..1b8257ca5e5 100644 --- a/pkgs/applications/misc/hackrf/default.nix +++ b/pkgs/applications/misc/hackrf/default.nix @@ -1,23 +1,25 @@ -{ stdenv, fetchgit, cmake, pkgconfig, libusb }: +{ stdenv, fetchgit, cmake, pkgconfig, libusb, fftwSinglePrec }: stdenv.mkDerivation rec { name = "hackrf-${version}"; - version = "2015.07.2"; + version = "2017.02.1"; src = fetchgit { url = "git://github.com/mossmann/hackrf"; rev = "refs/tags/v${version}"; - sha256 = "1mn11yz6hbkmvrbxj5vnp78m5dsny96821a9ffpvbdcwx3s2p23m"; + sha256 = "16hd61icvzaciv7s9jpgm9c8q6m4mwvj97gxrb20sc65p5gjb7hv"; }; buildInputs = [ - cmake pkgconfig libusb + cmake pkgconfig libusb fftwSinglePrec ]; - + + cmakeFlags = [ "-DUDEV_RULES_GROUP=plugdev" "-DUDEV_RULES_PATH=lib/udev/rules.d" ]; + preConfigure = '' - cd host + cd host ''; - + meta = with stdenv.lib; { description = "An open source SDR platform"; homepage = http://greatscottgadgets.com/hackrf/; diff --git a/pkgs/applications/misc/mupdf/default.nix b/pkgs/applications/misc/mupdf/default.nix index a3e5f99eef6..914dc335145 100644 --- a/pkgs/applications/misc/mupdf/default.nix +++ b/pkgs/applications/misc/mupdf/default.nix @@ -33,7 +33,7 @@ stdenv.mkDerivation rec { preConfigure = '' # Don't remove mujs because upstream version is incompatible - rm -rf thirdparty/{curl,freetype,glfw,harfbuzz,jbig2dec,jpeg,openjpeg,zlib} + rm -rf thirdparty/{curl,freetype,glfw,harfbuzz,jbig2dec,libjpeg,openjpeg,zlib} ''; postInstall = '' diff --git a/pkgs/applications/misc/ola/default.nix b/pkgs/applications/misc/ola/default.nix new file mode 100644 index 00000000000..b6d2a1cd20b --- /dev/null +++ b/pkgs/applications/misc/ola/default.nix @@ -0,0 +1,29 @@ +{ stdenv, fetchFromGitHub, autoreconfHook, bison, flex, pkgconfig +, libuuid, cppunit, protobuf, zlib, avahi, libmicrohttpd +, perl, python3, python3Packages +}: + +stdenv.mkDerivation rec { + name = "ola-${version}"; + version = "0.10.4"; + + src = fetchFromGitHub { + owner = "OpenLightingProject"; + repo = "ola"; + rev = version; + sha256 = "1skb3dwpmsfdr8mp3rs80jmsr1bf78270d9bnd8h0pv8bkb8zvim"; + }; + + nativeBuildInputs = [ autoreconfHook bison flex pkgconfig perl ]; + buildInputs = [ libuuid cppunit protobuf zlib avahi libmicrohttpd python3 ]; + propagatedBuildInputs = with python3Packages; [ protobuf3_2 numpy ]; + + configureFlags = [ "--enable-python-libs" ]; + + meta = with stdenv.lib; { + description = "A framework for controlling entertainment lighting equipment."; + maintainers = [ maintainers.globin ]; + licenses = with licenses; [ lgpl21 gpl2Plus ]; + platforms = platforms.all; + }; +} diff --git a/pkgs/applications/misc/qlcplus/default.nix b/pkgs/applications/misc/qlcplus/default.nix new file mode 100644 index 00000000000..60a8cf2c6cd --- /dev/null +++ b/pkgs/applications/misc/qlcplus/default.nix @@ -0,0 +1,38 @@ +{ stdenv, mkDerivation, fetchFromGitHub, qmake, pkgconfig, udev +, qtmultimedia, qtscript, alsaLib, ola, libftdi1, libusb +, libsndfile, libmad +}: + +mkDerivation rec { + name = "qlcplus-${version}"; + version = "4.11.0"; + + src = fetchFromGitHub { + owner = "mcallegari"; + repo = "qlcplus"; + rev = "QLC+_${version}"; + sha256 = "0a45ww341yjx9k54j5s8b5wj83rgbwxkdvgy0v5jbbdf9m78ifrg"; + }; + + nativeBuildInputs = [ qmake pkgconfig ]; + buildInputs = [ + udev qtmultimedia qtscript alsaLib ola libftdi1 libusb libsndfile libmad + ]; + + qmakeFlags = [ "INSTALLROOT=$(out)" ]; + + postPatch = '' + patchShebangs . + sed -i -e '/unix:!macx:INSTALLROOT += \/usr/d' \ + -e "s@\$\$LIBSDIR/qt4/plugins@''${qtPluginPrefix}@" \ + -e "s@/etc/udev/rules.d@''${out}/lib/udev@" \ + variables.pri + ''; + + meta = with stdenv.lib; { + description = "A free and cross-platform software to control DMX or analog lighting systems like moving heads, dimmers, scanners etc."; + maintainers = [ maintainers.globin ]; + license = licenses.asl20; + platforms = platforms.all; + }; +} diff --git a/pkgs/applications/misc/synergy/default.nix b/pkgs/applications/misc/synergy/default.nix index 6c02a51367e..89d493bcd01 100644 --- a/pkgs/applications/misc/synergy/default.nix +++ b/pkgs/applications/misc/synergy/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, cmake, xlibsWrapper, libX11, libXi, libXtst, libXrandr +{ stdenv, fetchFromGitHub, fetchpatch, cmake, xlibsWrapper, libX11, libXi, libXtst, libXrandr , xinput, curl, openssl, unzip }: with stdenv.lib; @@ -14,6 +14,8 @@ stdenv.mkDerivation rec { sha256 = "0ksgr9hkf09h54572p7k7b9zkfhcdb2g2d5x7ixxn028y8i3jyp3"; }; + patches = [ ./openssl-1.1.patch ]; + postPatch = '' ${unzip}/bin/unzip -d ext/gmock-1.6.0 ext/gmock-1.6.0.zip ${unzip}/bin/unzip -d ext/gtest-1.6.0 ext/gtest-1.6.0.zip diff --git a/pkgs/applications/misc/synergy/openssl-1.1.patch b/pkgs/applications/misc/synergy/openssl-1.1.patch new file mode 100644 index 00000000000..56dc6112844 --- /dev/null +++ b/pkgs/applications/misc/synergy/openssl-1.1.patch @@ -0,0 +1,18 @@ +--- a/src/lib/net/SecureSocket.cpp 2017-07-22 19:33:22.442645291 +0200 ++++ b/src/lib/net/SecureSocket.cpp 2017-07-22 19:36:25.632595581 +0200 +@@ -805,9 +805,14 @@ + showCipherStackDesc(sStack); + } + ++#if OPENSSL_VERSION_NUMBER < 0x10100000L + // m_ssl->m_ssl->session->ciphers is not forward compatable, In future release +- // of OpenSSL, it's not visible, need to use SSL_get_client_ciphers() instead ++ // of OpenSSL, it's not visible + STACK_OF(SSL_CIPHER) * cStack = m_ssl->m_ssl->session->ciphers; ++#else ++ // Use SSL_get_client_ciphers() for newer versions ++ STACK_OF(SSL_CIPHER) * cStack = SSL_get_client_ciphers(m_ssl->m_ssl); ++#endif + if (cStack == NULL) { + LOG((CLOG_DEBUG1 "remote cipher list not available")); + } diff --git a/pkgs/applications/misc/vanitygen/default.nix b/pkgs/applications/misc/vanitygen/default.nix deleted file mode 100644 index 462b6d0e57b..00000000000 --- a/pkgs/applications/misc/vanitygen/default.nix +++ /dev/null @@ -1,39 +0,0 @@ -{ fetchgit, stdenv, openssl, pcre }: - -stdenv.mkDerivation rec { - version = "0.21"; - name = "vanitygen-${version}"; - - src = fetchgit { - url = "https://github.com/samr7/vanitygen"; - rev = "refs/tags/${version}"; - sha256 = "1vzfv74hhiyrrpvjca8paydx1ashgbgn5plzrx4swyzxy1xkamah"; - }; - - buildInputs = [ openssl pcre ]; - - installPhase = '' - mkdir -p $out/bin - cp vanitygen $out/bin - cp keyconv $out/bin/vanitygen-keyconv - ''; - - meta = { - description = "Bitcoin vanity address generator"; - longDescription= '' - Vanitygen can search for exact prefixes or regular expression - matches, so you can generate Bitcoin addresses that starts - with the needed mnemonic. - - Vanitygen can generate regular bitcoin addresses, namecoin - addresses, and testnet addresses. - - When searching for exact prefixes, vanitygen will ensure that - the prefix is possible, will provide a difficulty estimate, - and will run about 30% faster. - ''; - homepage = https://github.com/samr7/vanitygen; - license = stdenv.lib.licenses.agpl3; - platforms = stdenv.lib.platforms.all; - }; -} diff --git a/pkgs/applications/networking/browsers/dwb/default.nix b/pkgs/applications/networking/browsers/dwb/default.nix index bd5f757738d..0aacbd2565b 100644 --- a/pkgs/applications/networking/browsers/dwb/default.nix +++ b/pkgs/applications/networking/browsers/dwb/default.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation { preFixup='' wrapProgram "$out/bin/dwb" \ - --prefix GIO_EXTRA_MODULES : "${glib_networking.out}/lib/gio/modules:${dconf}/lib/gio/modules" \ + --prefix GIO_EXTRA_MODULES : "${glib_networking.out}/lib/gio/modules:${stdenv.lib.getLib dconf}/lib/gio/modules" \ --prefix XDG_DATA_DIRS : "$GSETTINGS_SCHEMAS_PATH:$out/share" wrapProgram "$out/bin/dwbem" \ --prefix GIO_EXTRA_MODULES : "${glib_networking.out}/lib/gio/modules" diff --git a/pkgs/applications/networking/browsers/vivaldi/default.nix b/pkgs/applications/networking/browsers/vivaldi/default.nix index 749fc855788..d5006eec3ab 100644 --- a/pkgs/applications/networking/browsers/vivaldi/default.nix +++ b/pkgs/applications/networking/browsers/vivaldi/default.nix @@ -6,17 +6,18 @@ , gstreamer, gst-plugins-base, libxml2 , glib, gtk3, pango, gdk_pixbuf, cairo, atk, gnome3 , nss, nspr -, patchelf +, patchelf, makeWrapper +, proprietaryCodecs ? true, vivaldi-ffmpeg-codecs ? null }: stdenv.mkDerivation rec { name = "${product}-${version}"; product = "vivaldi"; - version = "1.10.867.38-1"; + version = "1.10.867.48-1"; src = fetchurl { url = "https://downloads.vivaldi.com/stable/${product}-stable_${version}_amd64.deb"; - sha256 = "1h3iygzvw3rb5kmn0pam6gqy9baq6l630yllff1vnvychdg8d9vi"; + sha256 = "1han45swvv0y2i2kg7xhml1wj5zyrf2c2hc5b07kqsjkfg9iz1lc"; }; unpackPhase = '' @@ -24,7 +25,7 @@ stdenv.mkDerivation rec { tar -xvf data.tar.xz ''; - nativeBuildInputs = [ patchelf ]; + nativeBuildInputs = [ patchelf makeWrapper ]; buildInputs = [ stdenv.cc.cc stdenv.cc.libc zlib libX11 libXt libXext libSM libICE libxcb @@ -32,7 +33,7 @@ stdenv.mkDerivation rec { atk alsaLib dbus_libs cups gtk3 gdk_pixbuf libexif ffmpeg systemd freetype fontconfig libXrender libuuid expat glib nss nspr gstreamer libxml2 gst-plugins-base pango cairo gnome3.gconf - ]; + ] ++ stdenv.lib.optional proprietaryCodecs vivaldi-ffmpeg-codecs; libPath = stdenv.lib.makeLibraryPath buildInputs + stdenv.lib.optionalString (stdenv.is64bit) @@ -45,6 +46,10 @@ stdenv.mkDerivation rec { --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \ --set-rpath "${libPath}" \ opt/vivaldi/vivaldi-bin + '' + stdenv.lib.optionalString proprietaryCodecs '' + sed -i '/^VIVALDI_FFMPEG_FOUND/ a \ + checkffmpeg "${vivaldi-ffmpeg-codecs}/lib/libffmpeg.so"' opt/vivaldi/vivaldi + '' + '' echo "Finished patching Vivaldi binaries" ''; @@ -67,6 +72,8 @@ stdenv.mkDerivation rec { "$out"/opt/vivaldi/product_logo_''${d}.png \ "$out"/share/icons/hicolor/''${d}x''${d}/apps/vivaldi.png done + wrapProgram "$out/bin/vivaldi" \ + --suffix XDG_DATA_DIRS : ${gtk3}/share/gsettings-schemas/${gtk3.name}/ ''; meta = with stdenv.lib; { diff --git a/pkgs/applications/networking/browsers/vivaldi/ffmpeg-codecs.nix b/pkgs/applications/networking/browsers/vivaldi/ffmpeg-codecs.nix new file mode 100644 index 00000000000..fb10e2b6c83 --- /dev/null +++ b/pkgs/applications/networking/browsers/vivaldi/ffmpeg-codecs.nix @@ -0,0 +1,51 @@ +{ stdenv, fetchurl, fetchpatch +, dbus_glib, gtk2, gtk3, libexif, libpulseaudio, libXScrnSaver, ninja, nss +, pciutils, pkgconfig, python2, xdg_utils +}: + +stdenv.mkDerivation rec { + name = "${product}-${version}"; + product = "vivaldi-ffmpeg-codecs"; + version = "59.0.3071.104"; + + src = fetchurl { + url = "https://commondatastorage.googleapis.com/chromium-browser-official/chromium-${version}.tar.xz"; + sha512 = "419cf5bafa80f190cd301c2933502351929c1ef1d5cfedc720ce6762674a0e6af3b4246a8f92e0c29743420338b056061d4e7f9f4a4066a5bdd4d2ee8db3ddbf"; + }; + + buildInputs = [ ]; + + nativeBuildInputs = [ + dbus_glib gtk2 gtk3 libexif libpulseaudio libXScrnSaver ninja nss pciutils pkgconfig + python2 xdg_utils + ]; + + configurePhase = '' + runHook preConfigure + + local args="ffmpeg_branding=\"ChromeOS\" proprietary_codecs=true enable_hevc_demuxing=true use_gconf=false use_gio=false use_gnome_keyring=false use_kerberos=false use_cups=false use_sysroot=false use_gold=false linux_use_bundled_binutils=false fatal_linker_warnings=false treat_warnings_as_errors=false is_clang=false is_component_build=true is_debug=false symbol_level=0" + python tools/gn/bootstrap/bootstrap.py -v -s --no-clean --gn-gen-args "$args" + out/Release/gn gen out/Release -v --args="$args" + + runHook postConfigure + ''; + + buildPhase = '' + ninja -C out/Release -v libffmpeg.so + ''; + + dontStrip = true; + + installPhase = '' + mkdir -p "$out/lib" + cp out/Release/libffmpeg.so "$out/lib/libffmpeg.so" + ''; + + meta = with stdenv.lib; { + description = "Additional support for proprietary codecs for Vivaldi"; + homepage = "https://ffmpeg.org/"; + license = licenses.lgpl21; + maintainers = with maintainers; [ lluchs ]; + platforms = [ "x86_64-linux" ]; + }; +} diff --git a/pkgs/applications/networking/browsers/vivaldi/update.sh b/pkgs/applications/networking/browsers/vivaldi/update.sh new file mode 100755 index 00000000000..6ef6206c4f4 --- /dev/null +++ b/pkgs/applications/networking/browsers/vivaldi/update.sh @@ -0,0 +1,38 @@ +#!/usr/bin/env nix-shell +#!nix-shell -i bash -p libarchive curl common-updater-scripts + +set -eu -o pipefail + +cd "$(dirname "${BASH_SOURCE[0]}")" +root=../../../../.. +export NIXPKGS_ALLOW_UNFREE=1 + +version() { + (cd "$root" && nix-instantiate --eval --strict -A "$1.version" | tr -d '"') +} + +vivaldi_version_old=$(version vivaldi) +vivaldi_version=$(curl -sS https://vivaldi.com/download/ | sed -rne 's/.*vivaldi-stable_([0-9]+\.[0-9]+\.[0-9]+\.[0-9]+-[0-9]+)_amd64\.deb.*/\1/p') + +if [[ "$vivaldi_version" = "$vivaldi_version_old" ]]; then + echo "nothing to do, vivaldi $vivaldi_version is current" + exit +fi + +# Download vivaldi and save hash and file path. +url="https://downloads.vivaldi.com/stable/vivaldi-stable_${vivaldi_version}_amd64.deb" +mapfile -t prefetch < <(nix-prefetch-url --print-path "$url") +hash=${prefetch[0]} +path=${prefetch[1]} + +echo "vivaldi: $vivaldi_version_old -> $vivaldi_version" +(cd "$root" && update-source-version vivaldi "$vivaldi_version" "$hash") + +# Check vivaldi-ffmpeg-codecs version. +chromium_version_old=$(version vivaldi-ffmpeg-codecs) +chromium_version=$(bsdtar xOf "$path" data.tar.xz | bsdtar xOf - ./opt/vivaldi/vivaldi-bin | strings | grep -A2 -i '^chrome\/' | grep '^[0-9]\+\.[0-9]\+\.[1-9][0-9]\+\.[0-9]\+') + +if [[ "$chromium_version" != "$chromium_version_old" ]]; then + echo "vivaldi-ffmpeg-codecs: $chromium_version_old -> $chromium_version" + (cd "$root" && update-source-version vivaldi-ffmpeg-codecs "$chromium_version") +fi diff --git a/pkgs/applications/networking/cluster/terraform/default.nix b/pkgs/applications/networking/cluster/terraform/default.nix index 92b043cfdbd..a04cbed9610 100644 --- a/pkgs/applications/networking/cluster/terraform/default.nix +++ b/pkgs/applications/networking/cluster/terraform/default.nix @@ -54,4 +54,16 @@ in { # checks are failing again doCheck = false; }; + + terraform_0_10_0 = generic { + version = "0.10.0"; + sha256 = "1z6pmyfh4z5w8k2j46ancc0m9lsiq6d0m56nxj1kawb3n5q9dgds"; + # remove debugging and the -dev postfix in the version + preBuild = '' + buildFlagsArray=( + -ldflags + "-X github.com/hashicorp/terraform/terraform.VersionPrerelease= -s -w" + ) + ''; + }; } diff --git a/pkgs/applications/networking/dropbox/default.nix b/pkgs/applications/networking/dropbox/default.nix index e97bdd906c5..af4ec08ff00 100644 --- a/pkgs/applications/networking/dropbox/default.nix +++ b/pkgs/applications/networking/dropbox/default.nix @@ -24,11 +24,11 @@ let # NOTE: When updating, please also update in current stable, # as older versions stop working - version = "30.4.22"; + version = "31.4.25"; sha256 = { - "x86_64-linux" = "0qc99j6hpd1k5bmvcll3rjglksrjw0mw2nrwj3s3kh55j6fy8a0r"; - "i686-linux" = "0zyl1q76cpwly4k7h4klnyrv50nyxi2wpz5sii1a00jbmr7snhab"; + "x86_64-linux" = "02qla89gf7zawfk0kxd3xzr7vb91khj3p83bvh456ap51h0z5wzv"; + "i686-linux" = "0sfh24qyc91q6ssn8lrzfdsv4jjy0hvgizcq3y3fk46zaa7jjxr2"; }."${stdenv.system}" or (throw "system ${stdenv.system} not supported"); arch = diff --git a/pkgs/applications/networking/gns3/gui.nix b/pkgs/applications/networking/gns3/gui.nix new file mode 100644 index 00000000000..284c4f8cee1 --- /dev/null +++ b/pkgs/applications/networking/gns3/gui.nix @@ -0,0 +1,34 @@ +{ stdenv, python34Packages, fetchFromGitHub }: + +# TODO: Python 3.6 was failing +python34Packages.buildPythonPackage rec { + name = "${pname}-${version}"; + pname = "gns3-gui"; + version = "2.0.3"; + + src = fetchFromGitHub { + owner = "GNS3"; + repo = pname; + rev = "v${version}"; + sha256 = "10qp6430md8d0h2wamgfaq7pai59mqmcw6sw3i1gvb20m0avvsvb"; + }; + + propagatedBuildInputs = with python34Packages; [ + raven psutil jsonschema # tox for check + # Runtime dependencies + sip pyqt5 + ]; + + doCheck = false; # Failing + + meta = with stdenv.lib; { + description = "Graphical Network Simulator"; + #longDescription = '' + # ... + #''; + homepage = "https://www.gns3.com/"; + license = licenses.gpl3Plus; + platforms = platforms.linux; + maintainers = with maintainers; [ primeos ]; + }; +} diff --git a/pkgs/applications/networking/instant-messengers/gale/default.nix b/pkgs/applications/networking/instant-messengers/gale/default.nix deleted file mode 100644 index 014ea093336..00000000000 --- a/pkgs/applications/networking/instant-messengers/gale/default.nix +++ /dev/null @@ -1,31 +0,0 @@ -{ stdenv, fetchFromGitHub, adns, boehmgc, openssl, automake, m4, autoconf -, libtool, pkgconfig }: - -stdenv.mkDerivation { - name = "gale-1.1happy"; - - src = fetchFromGitHub { - owner = "grawity"; - repo = "gale"; - rev = "b34a67288e8bd6f0b51b60abb704858172a3665c"; - sha256 = "19mcisxxqx70m059rqwv7wpmp94fgyckzjwywpmdqd7iwvppnsqf"; - }; - - nativeBuildInputs = [ m4 libtool automake autoconf ]; - buildInputs = [ boehmgc openssl adns pkgconfig ]; - - patches = [ ./gale-install.in.patch ]; - - preConfigure = '' - substituteInPlace configure.ac --replace \$\{sysconfdir\} /etc - ./bootstrap - ''; - configureArgs = [ "--sysconfdir=/etc" ]; - - meta = with stdenv.lib; { - homepage = http://gale.org/; - description = "Chat/messaging system (server and client)"; - platforms = platforms.all; - license = licenses.gpl2Plus; - }; -} diff --git a/pkgs/applications/networking/instant-messengers/gale/gale-install.in.patch b/pkgs/applications/networking/instant-messengers/gale/gale-install.in.patch deleted file mode 100644 index 33e3e09a96d..00000000000 --- a/pkgs/applications/networking/instant-messengers/gale/gale-install.in.patch +++ /dev/null @@ -1,339 +0,0 @@ -diff --git a/gale-install.in b/gale-install.in -index 50e8ad8..eec0ed2 100644 ---- a/gale-install.in -+++ b/gale-install.in -@@ -29,22 +29,78 @@ testkey_stdin() { - gkinfo -x 2>/dev/null | qgrep "^Public key: <$1>" - } - --if [ -n "$GALE_SYS_DIR" ]; then -- SYS_DIR="$GALE_SYS_DIR" --elif [ -n "$sysconfdir" ]; then -- SYS_DIR="$sysconfdir/gale" -+INST_SYS_DIR="$sysconfdir/gale" -+ -+if [ `id -u` -eq 0 ]; then -+ is_root=yes -+ SYS_DIR=/etc/gale -+else -+ is_root=no -+ SYS_DIR="$HOME/.gale" -+fi -+ -+if [ -f /etc/NIXOS ]; then -+ is_nixos=yes -+else -+ is_nixos=no -+fi -+ -+if [ -u /run/wrappers/bin/gksign ]; then -+ cat <<EOM -+ -+Gale appears to have already been set up via the NixOS module system (check -+/etc/nixos/configuration.nix). -+ -+EOM -+ -+ exit 0 -+fi -+ -+if [ $is_root = yes ]; then -+ cat <<EOM -+ -+You are running gale-install as root, so I'm going to assume you want to set up -+Gale for system-wide use. Unfortunately, Gale expects to be able to run the -+"gksign" program via setuid, and we can't change gksign's permissions once it's -+already been installed because the Nix store is immutable by design. -+ -+EOM -+ -+ if [ $is_nixos = no ]; then -+ cat <<EOM -+ -+This isn't a NixOS system. Gale can only be installed for a single user on -+non-NixOS systems. If you want a system-wide installation, you'll have to -+install Gale the old-fashioned way. Sorry. -+ -+EOM -+ -+ exit 1 -+ fi -+ cat <<EOM -+ -+This script will generate a domain key for you, and after you get it signed, you -+can finish the setup process by configuring Gale via the NixOS module system -+(i.e. /etc/nixos/configuration.nix). -+ -+EOM -+ - else -- echo "Error: cannot locate Gale system configuration directory." -- exit 1 -+ cat <<EOM -+ -+Hi. You are running gale-install as a normal user, so I'm going to assume you -+want to set up Gale for your own (i.e. non-system-wide) use. -+ -+EOM -+ - fi - --CONF="$SYS_DIR/conf" - umask 022 --PATH="$bindir:$sbindir:$PATH:/usr/ucb" -+PATH="$bindir:$sbindir:$PATH" - export PATH - --if [ -f "$CONF" ]; then -- exec 3<"$CONF" -+if [ -n "$SYS_DIR" ] && [ -f "$SYS_DIR/conf" ]; then -+ exec 3<"$SYS_DIR/conf" - - while read var value <&3 ; do - case "$var" in -@@ -58,52 +114,14 @@ if [ -f "$CONF" ]; then - exec 3<&- - fi - --USER="`whoami`" --if [ -z "$USER" ]; then -- echo "Error: cannot determine your username." -- exit 1 --fi -- --# ----------------------------------------------------------------------------- --# check directory structure -- --if [ ! -d "$SYS_DIR" ]; then -- echo "Error: Invalid SYS_DIR: \"$SYS_DIR\"." -- exit 1 --fi -- - # ----------------------------------------------------------------------------- --# get settings for important variables: user, domain, server -+# get settings for important variables: domain, server - --[ -n "$CONF_GALE_USER" ] && GALE_USER="$CONF_GALE_USER" - [ -n "$CONF_GALE_DOMAIN" ] && GALE_DOMAIN="$CONF_GALE_DOMAIN" - [ -n "$CONF_GALE_SERVER" ] && GALE_SERVER="$CONF_GALE_SERVER" - --if [ -z "$GALE_USER" ]; then --cat << EOM -- --Hi. You need to denote a user to own the Gale domain secret key. You must --trust this user with Gale authentication for your domain; the "gksign" program --will run as this user. I recommend using a special "gale" user; if you don't --have administrative privileges here, you'll probably have to use your own --account. I do not recommend the use of "root". -- --No harm done if you stop this script now to set up such a user. -- --EOM -- -- printf "Enter the Gale username: " -- read GALE_USER -- if [ -z "$GALE_USER" ]; then -- echo "Error: Invalid username or no home dir: \"$GALE_USER\"." -- exit 1 -- fi --else -- echo "Using \"$GALE_USER\" as the Gale owner." --fi -- - if [ -z "$GALE_DOMAIN" ] ; then --cat << EOM -+ cat << EOM - - You need to identify the name of your Gale domain for two purposes: - -@@ -140,97 +158,56 @@ else - fi - - # ----------------------------------------------------------------------------- --# create configuration file -- --if [ ! -f "$CONF" ]; then --cat > "$CONF" <<EOM --# $CONF -- created by Gale installer; edit to suit. --EOM -+# create configuration file (if this is a single-user setup) -+ -+if [ $is_root = no ]; then -+ CONF="$SYS_DIR/conf" -+ -+ if [ ! -d "$SYS_DIR" ]; then -+ run mkdir -m 0700 -p "$SYS_DIR" -+ run mkdir -m 0700 -p "$SYS_DIR/auth" -+ run mkdir -m 0755 -p "$SYS_DIR/auth/trusted" -+ run cp -f "$INST_SYS_DIR/auth/trusted/ROOT" "$SYS_DIR/auth/trusted" -+ run mkdir -m 0700 -p "$SYS_DIR/auth/private" -+ run mkdir -p "$SYS_DIR/auth/local" "$SYS_DIR/auth/cache" -+ fi - --cat <<EOM -+ if [ ! -f "$CONF" ]; then -+ cat <<EOM - - *** Creating "$CONF". - Examine and edit this file to your taste and local needs. - If you want to recreate it from scratch, remove it and re-run this. --EOM --fi -- --[ -n "$CONF_GALE_USER" ] || cat >> "$CONF" <<EOM - --# The user who owns the domain secret key. (Used in installation and upgrade) --GALE_USER $GALE_USER - EOM - --[ -n "$CONF_GALE_DOMAIN" ] || cat >> "$CONF" << EOM -+ cat > "$CONF" <<EOF -+# $CONF -- created by Gale installer; edit to suit. - - # The authentication domain to use. (Mandatory) - GALE_DOMAIN $GALE_DOMAIN --EOM -- --# ----------------------------------------------------------------------------- --# make gksign setuid -+EOF - --gksign="$sbindir/gksign" --readlink="`which readlink 2>/dev/null`" --[ -x "$readlink" ] && gksignlink="`"$readlink" "$gksign" 2>/dev/null`" --[ -f "$gksignlink" ] && gksign="$gksignlink" -- --echo "" --if copy chown "$GALE_USER" "$gksign" ; then -- : --else -- echo "*** We need to chown $GALE_USER '$gksign'." -- echo " Please run this script as a user that can do so," -- echo " or do so yourself and re-run this script." -- exit 1 -+ fi - fi --run chmod 4755 "$gksign" - --# ----------------------------------------------------------------------------- --# create a domain, if necessary -+if [ $is_root = no ]; then -+ GALE_SYS_DIR="$SYS_DIR" -+ export GALE_SYS_DIR - --echo "" --if test -u "$gksign" || copy chmod u+s "$gksign" ; then -- : -+ testkey "$GALE_DOMAIN" && exit 0 -+ echo "*** You lack a signed key for your domain, \"$GALE_DOMAIN\"." -+ GALE="$SYS_DIR" - else -- echo "*** We need to chmod u+s '$gksign'." -- echo " Please run this script as a user that can do so," -- echo " or do so yourself and re-run this script." -- exit 1 --fi -- --testkey "$GALE_DOMAIN" && exit 0 --echo "*** You lack a signed key for your domain, \"$GALE_DOMAIN\"." -- --if [ "x$GALE_USER" != "x$USER" ]; then --cat <<EOM --Become user "$GALE_USER" (you are now "$USER") and run this script again --to create a new domain; contact your domain administrator if you wish to --become part of an existing domain. --EOM -- exit 1 --fi -- --if [ -z "$HOME" ]; then -- cd -- HOME="`pwd`" -- echo "Warning: \$HOME not set, assuming \"$HOME\"." --fi -- --GALE="$HOME/.gale" --mkdir -p "$GALE" --if [ ! -w "$GALE" ]; then -- echo "Error: Cannot create \"$GALE\"." -- exit 1 -+ GALE="`pwd`" - fi - - unsigned="$GALE/$GALE_DOMAIN.unsigned" - signer="`echo "$GALE_DOMAIN" | sed 's%^[^.@:/]*[.@:/]%%'`" - [ -z "$signer" ] && signer="ROOT" - --if [ -f "$unsigned" ]; then -- --cat << EOM -+if [ $is_root = no ] && [ -f "$unsigned" ]; then -+ cat << EOM - - Okay, so we've already been here. Last time, I created the file - "$unsigned" for you to have signed. -@@ -275,16 +252,12 @@ EOM - exit 1 - fi - --cat << EOM -- --The domain should be properly configured now. Assuming users can access a --version of "gksign" setuid to "$GALE_USER" (this user), they should be --able to start running clients and generating IDs for themselves. -+ cat << EOM - --The installation process is complete! -+The domain should be properly configured now. The installation process is -+complete! - - EOM -- - exit 0 - fi - -@@ -300,7 +273,10 @@ printf "Enter the description: " - read descr - - echo "We will generate the key now. Have patience." --gkgen -r "$GALE/auth/private/$GALE_DOMAIN.gpri" \ -+if [ $is_root = no ]; then -+ install_gpri=auth/private/ -+fi -+gkgen -r "$GALE/${install_gpri}$GALE_DOMAIN.gpri" \ - -u "$unsigned" "$GALE_DOMAIN" /"$descr" || exit 1 - - cat << EOM -@@ -311,8 +284,29 @@ the owner of the "$signer" domain through appropriate means. - Take care to preseve the file's binary data; you may need to uuencode it. - - Assuming they trust you with your subdomain, they should pass the key through --"gksign" as a filter, returning the signed output to you. When you have this --signed key file available, re-run this script, and we will move on to the --next step. -+"gksign" as a filter, returning the signed output to you. -+ -+EOM -+ -+if [ $is_nixos = yes ]; then -+ cat <<EOM -+ -+When you have this signed key file available, you can finish the setup process -+by placing the private key and signed public key in a directory (they will be -+copied) and setting "services.gale.keyPath" in /etc/nixos/configuration.nix. - - EOM -+else -+ cat <<EOM -+ -+When you have this signed key file available, re-run this script, and we will -+move on to the next step. -+ -+*** IMPORTANT *** -+You must set GALE_SYS_DIR="$GALE_SYS_DIR" in your environment before re-running -+this script and before running any Gale programs once setup is finished! Make -+sure to set it now, and consider setting it via your shell initialization files -+so that you don't forget to do it next login. -+ -+EOM -+fi diff --git a/pkgs/applications/networking/instant-messengers/telepathy/idle/default.nix b/pkgs/applications/networking/instant-messengers/telepathy/idle/default.nix index c29c6def2f6..05ea0fda835 100644 --- a/pkgs/applications/networking/instant-messengers/telepathy/idle/default.nix +++ b/pkgs/applications/networking/instant-messengers/telepathy/idle/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, glib, pkgconfig, dbus_glib, telepathy_glib, libxslt }: +{ stdenv, fetchurl, glib, gnome3, pkgconfig, dbus_glib, telepathy_glib, libxslt, makeWrapper }: stdenv.mkDerivation rec { pname = "telepathy-idle"; @@ -10,7 +10,12 @@ stdenv.mkDerivation rec { sha256 = "1argdzbif1vdmwp5vqbgkadq9ancjmgdm2ncp0qfckni715ss4rh"; }; - buildInputs = [ pkgconfig glib telepathy_glib dbus_glib libxslt telepathy_glib.python ]; + buildInputs = [ pkgconfig glib telepathy_glib dbus_glib libxslt telepathy_glib.python (stdenv.lib.getLib gnome3.dconf) makeWrapper ]; + + preFixup = '' + wrapProgram "$out/libexec/telepathy-idle" \ + --prefix GIO_EXTRA_MODULES : "${stdenv.lib.getLib gnome3.dconf}/lib/gio/modules" + ''; meta = { description = "IRC connection manager for the Telepathy framework"; diff --git a/pkgs/applications/networking/instant-messengers/telepathy/logger/default.nix b/pkgs/applications/networking/instant-messengers/telepathy/logger/default.nix index 4cf0d2a0449..37d5ea2e17b 100644 --- a/pkgs/applications/networking/instant-messengers/telepathy/logger/default.nix +++ b/pkgs/applications/networking/instant-messengers/telepathy/logger/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, dbus_glib, libxml2, sqlite, telepathy_glib, pkgconfig -, intltool, libxslt, gobjectIntrospection, dbus_libs }: +, gnome3, makeWrapper, intltool, libxslt, gobjectIntrospection, dbus_libs }: stdenv.mkDerivation rec { project = "telepathy-logger"; @@ -12,13 +12,19 @@ stdenv.mkDerivation rec { NIX_CFLAGS_COMPILE = "-I${dbus_glib.dev}/include/dbus-1.0 -I${dbus_libs.dev}/include/dbus-1.0"; - buildInputs = [ dbus_glib libxml2 sqlite telepathy_glib pkgconfig intltool - gobjectIntrospection dbus_libs telepathy_glib.python ]; + buildInputs = [ dbus_glib libxml2 sqlite telepathy_glib pkgconfig intltool makeWrapper + gobjectIntrospection dbus_libs telepathy_glib.python (stdenv.lib.getLib gnome3.dconf) ]; nativeBuildInputs = [ libxslt ]; configureFlags = "--enable-call"; + preFixup = '' + wrapProgram "$out/libexec/telepathy-logger" \ + --prefix GIO_EXTRA_MODULES : "${stdenv.lib.getLib gnome3.dconf}/lib/gio/modules" \ + --prefix XDG_DATA_DIRS : "$GSETTINGS_SCHEMAS_PATH" + ''; + meta = { description = "Logger service for Telepathy framework"; homepage = http://telepathy.freedesktop.org/wiki/Logger ; diff --git a/pkgs/applications/networking/instant-messengers/telepathy/mission-control/default.nix b/pkgs/applications/networking/instant-messengers/telepathy/mission-control/default.nix index a8fc9477707..87ae0210bda 100644 --- a/pkgs/applications/networking/instant-messengers/telepathy/mission-control/default.nix +++ b/pkgs/applications/networking/instant-messengers/telepathy/mission-control/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, telepathy_glib, libxslt, makeWrapper, upower }: +{ stdenv, fetchurl, pkgconfig, gnome3, telepathy_glib, libxslt, makeWrapper, upower }: stdenv.mkDerivation rec { name = "${pname}-5.16.3"; @@ -18,6 +18,7 @@ stdenv.mkDerivation rec { preFixup = '' wrapProgram "$out/libexec/mission-control-5" \ + --prefix GIO_EXTRA_MODULES : "${stdenv.lib.getLib gnome3.dconf}/lib/gio/modules" \ --prefix XDG_DATA_DIRS : "$GSETTINGS_SCHEMAS_PATH" ''; diff --git a/pkgs/applications/networking/instant-messengers/zoom-us/default.nix b/pkgs/applications/networking/instant-messengers/zoom-us/default.nix index d77cf347e5a..91c77fc9d7c 100644 --- a/pkgs/applications/networking/instant-messengers/zoom-us/default.nix +++ b/pkgs/applications/networking/instant-messengers/zoom-us/default.nix @@ -4,11 +4,11 @@ let - version = "2.0.91373.0502"; + version = "2.0.98253.0707"; srcs = { x86_64-linux = fetchurl { url = "https://zoom.us/client/${version}/zoom_x86_64.tar.xz"; - sha256 = "0gcbfsvybkvnyklm82irgz19x3jl0hz9bwf2l9jga188057pfj7a"; + sha256 = "1znw7459pzfl2jzmj9akfwq3z10sndfb1swdr1p3rrjpiwqh3p7r"; }; }; @@ -75,13 +75,12 @@ in stdenv.mkDerivation { #paxmark m $packagePath/QtWebEngineProcess # is this what dtzWill talked about? # RUNPATH set via patchelf is used only for half of libraries (why?), so wrap it - wrapProgram $packagePath/zoom \ + makeWrapper $packagePath/zoom $out/bin/zoom-us \ --prefix LD_LIBRARY_PATH : "$packagePath:$libPath" \ --prefix LD_PRELOAD : "${libv4l}/lib/v4l1compat.so" \ --set QT_PLUGIN_PATH "$packagePath/platforms" \ --set QT_XKB_CONFIG_ROOT "${xorg.xkeyboardconfig}/share/X11/xkb" \ --set QTCOMPOSE "${xorg.libX11.out}/share/X11/locale" - ln -s "$packagePath/zoom" "$out/bin/zoom-us" cat > $packagePath/qt.conf <<EOF [Paths] @@ -92,10 +91,10 @@ in stdenv.mkDerivation { ''; meta = { - homepage = http://zoom.us; + homepage = https://zoom.us/; description = "zoom.us video conferencing application"; license = stdenv.lib.licenses.unfree; - platforms = stdenv.lib.platforms.linux; + platforms = builtins.attrNames srcs; maintainers = with stdenv.lib.maintainers; [ danbst ]; }; diff --git a/pkgs/applications/networking/irc/bip/default.nix b/pkgs/applications/networking/irc/bip/default.nix index e391f0074c5..a79df085e6b 100644 --- a/pkgs/applications/networking/irc/bip/default.nix +++ b/pkgs/applications/networking/irc/bip/default.nix @@ -1,45 +1,37 @@ -{ stdenv, fetchurl, bison, flex, autoconf, automake, openssl }: +{ stdenv, fetchurl, fetchpatch, bison, flex, autoconf, automake, openssl }: -let - - version = "0.8.9"; - sha256 = "0q942g9lyd8pjvqimv547n6vik5759r9npw3ws3bdj4ixxqhz59w"; - - # fetches patches from a gentoo mirror - fetchPatch = - { file, sha256 }: - fetchurl { - url = "mirror://gentoo/../gentoo-portage/net-irc/bip/files/${file}"; - inherit sha256; - }; - -in stdenv.mkDerivation { +stdenv.mkDerivation rec { name = "bip-${version}"; + version = "0.8.9"; # fetch sources from debian, because the creator's website provides # the files only via https but with an untrusted certificate. src = fetchurl { url = "mirror://debian/pool/main/b/bip/bip_${version}.orig.tar.gz"; - inherit sha256; + sha256 = "0q942g9lyd8pjvqimv547n6vik5759r9npw3ws3bdj4ixxqhz59w"; }; + buildInputs = [ bison flex autoconf automake openssl ]; + # includes an important security patch - patches = map fetchPatch [ - { file = "bip-freenode.patch"; - sha256 = "a67e582f89cc6a32d5bb48c7e8ceb647b889808c2c8798ae3eb27d88869b892f"; - } + patches = [ + (fetchpatch { + url = "mirror://gentoo/../gentoo-portage/net-irc/bip/files/bip-freenode.patch"; + sha256 = "05qy7a62p16f5knrsdv2lkhc07al18qq32ciq3k4r0lq1wbahj2y"; + }) + (fetchpatch { + url = "https://projects.duckcorp.org/projects/bip/repository/revisions/39414f8ff9df63c8bc2e4eee34f09f829a5bf8f5/diff/src/connection.c?format=diff"; + sha256 = "1hvg58vci6invh0z19wf04jjvnm8w6f6v4c4nk1j5hc3ymxdp1rb"; + }) ]; NIX_CFLAGS_COMPILE = "-Wno-error=unused-result"; - buildInputs = [ bison flex autoconf automake openssl ]; - meta = { description = "An IRC proxy (bouncer)"; homepage = http://bip.milkypond.org/; license = stdenv.lib.licenses.gpl2; - downloadPage= "https://projects.duckcorp.org/projects/bip/files"; - inherit version; + downloadPage = "https://projects.duckcorp.org/projects/bip/files"; platforms = stdenv.lib.platforms.linux; }; } diff --git a/pkgs/applications/networking/irc/epic5/default.nix b/pkgs/applications/networking/irc/epic5/default.nix index 8b30f6391a0..0b52515228b 100644 --- a/pkgs/applications/networking/irc/epic5/default.nix +++ b/pkgs/applications/networking/irc/epic5/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, openssl, ncurses, libiconv, tcl, coreutils }: +{ stdenv, fetchurl, openssl, ncurses, libiconv, tcl, coreutils, fetchpatch }: stdenv.mkDerivation rec { name = "epic5-${version}"; @@ -13,6 +13,13 @@ stdenv.mkDerivation rec { buildInputs = [ openssl ncurses ] ++ stdenv.lib.optionals stdenv.isDarwin [ libiconv tcl ]; + patches = [ + (fetchpatch { + url = "https://sources.debian.net/data/main/e/epic5/2.0.1-1/debian/patches/openssl-1.1.patch"; + sha256 = "03bpsyv1sr5icajs2qkdvv8nnn6rz6yvvj7pgiq8gz9sbp6siyfv"; + }) + ]; + configureFlags = [ "--disable-debug" "--with-ipv6" ]; postConfigure = '' diff --git a/pkgs/applications/networking/p2p/eiskaltdcpp/default.nix b/pkgs/applications/networking/p2p/eiskaltdcpp/default.nix index 6b6f66e24d0..8c7958ecaaa 100644 --- a/pkgs/applications/networking/p2p/eiskaltdcpp/default.nix +++ b/pkgs/applications/networking/p2p/eiskaltdcpp/default.nix @@ -1,15 +1,42 @@ -{ stdenv, fetchurl, cmake, pkgconfig, qt4, boost, bzip2, libX11, pcre-cpp, libidn, lua5, miniupnpc, aspell, gettext }: +{ stdenv, fetchFromGitHub, cmake, pkgconfig, qt4, boost, bzip2, libX11 +, fetchpatch, pcre-cpp, libidn, lua5, miniupnpc, aspell, gettext }: stdenv.mkDerivation rec { - name = "eiskaltdcpp-2.2.9"; + name = "eiskaltdcpp-${version}"; + version = "2.2.10"; - src = fetchurl { - url = "https://eiskaltdc.googlecode.com/files/${name}.tar.xz"; - sha256 = "3d9170645450f9cb0a605278b8646fec2110b9637910d86fd27cf245cbe24eaf"; + src = fetchFromGitHub { + owner = "eiskaltdcpp"; + repo = "eiskaltdcpp"; + rev = "v${version}"; + sha256 = "1mqz0g69njmlghcra3izarjxbxi1jrhiwn4ww94b8jv8xb9cv682"; }; buildInputs = [ cmake pkgconfig qt4 boost bzip2 libX11 pcre-cpp libidn lua5 miniupnpc aspell gettext ]; + patches = [ + (fetchpatch { + url = "https://github.com/eiskaltdcpp/eiskaltdcpp/commit/3b7b56bd7060b426b1f1bfded392ae6853644e2e.patch"; + sha256 = "1rqjdsvirn3ks9w9qn893fb73mz84xm04wl13fvsvj8p42i5cjas"; + }) + (fetchpatch { + url = "https://github.com/eiskaltdcpp/eiskaltdcpp/commit/bb9eb364a943fe2a67b3ea52ec6a3f9e911f07dc.patch"; + sha256 = "1hjhf9a9j4z8v24g5qh5mcg3n0540lbn85y7kvxsh3khc5v3cywx"; + }) + (fetchpatch { + url = "https://github.com/eiskaltdcpp/eiskaltdcpp/commit/ef4426f1f9a8255e335b0862234e6cc28befef5e.patch"; + sha256 = "13j018c499n4b5as2n39ws64yj0cf4fskxbqab309vmnjkirxv6x"; + }) + (fetchpatch { + url = "https://github.com/eiskaltdcpp/eiskaltdcpp/commit/a9c136c8707280d0eeb66be6b289d9718287c55c.patch"; + sha256 = "0w8v4mbrzk7pmzc475ff96mzzwlh8a0p62kk7p829m5yqdwj4sc9"; + }) + (fetchpatch { + url = "https://github.com/eiskaltdcpp/eiskaltdcpp/commit/3b9c502ff5c98856d4f8fdb7ed3c6ef34448bfb7.patch"; + sha256 = "0fjwaq0wd9a164k5ysdjy89hx0ixnxc6q7cvyn1ba28snm0pgxb8"; + }) + ]; + cmakeFlags = '' -DUSE_ASPELL=ON -DUSE_QT_QML=ON diff --git a/pkgs/applications/networking/p2p/ldcpp/default.nix b/pkgs/applications/networking/p2p/ldcpp/default.nix deleted file mode 100644 index b540ffd0967..00000000000 --- a/pkgs/applications/networking/p2p/ldcpp/default.nix +++ /dev/null @@ -1,29 +0,0 @@ -{ stdenv, fetchurl, scons, pkgconfig, gtk2, bzip2, libglade, openssl -, libX11, boost, zlib, libnotify }: - -stdenv.mkDerivation rec { - name = "ldcpp-1.1.0"; - src = fetchurl { - url = http://launchpad.net/linuxdcpp/1.1/1.1.0/+download/linuxdcpp-1.1.0.tar.bz2; - sha256 = "12i92hirmwryl1qy0n3jfrpziwzb82f61xca9jcjwyilx502f0b6"; - }; - buildInputs = [ scons pkgconfig gtk2 bzip2 libglade openssl libX11 boost libnotify ]; - - installPhase = '' - export NIX_LDFLAGS="$NIX_LDFLAGS -lX11"; - - touch gettext xgettext msgfmt msgcat - chmod +x gettext xgettext msgfmt msgcat - export PATH=$PATH:$PWD - - mkdir -p $out - scons PREFIX=$out - scons PREFIX=$out install - ''; - - meta = { - description = "Direct Connect client"; - license = stdenv.lib.licenses.gpl2; - platforms = stdenv.lib.platforms.linux; - }; -} diff --git a/pkgs/applications/networking/p2p/retroshare/0.6.nix b/pkgs/applications/networking/p2p/retroshare/0.6.nix deleted file mode 100644 index 4b881445323..00000000000 --- a/pkgs/applications/networking/p2p/retroshare/0.6.nix +++ /dev/null @@ -1,62 +0,0 @@ -{ stdenv, fetchFromGitHub, cmake, qt4, qmake4Hook, libupnp, gpgme, gnome3, glib, libssh, pkgconfig, protobuf, bzip2 -, libXScrnSaver, speex, curl, libxml2, libxslt, sqlcipher, libmicrohttpd, opencv }: - -stdenv.mkDerivation { - name = "retroshare-0.6-git-fabc3a3"; - - src = fetchFromGitHub { - owner = "RetroShare"; - repo = "RetroShare"; - rev = "fabc3a398536565efe77fb1b1ef37bd484dc7d4a"; - sha256 = "189qndkfq9kgv3qi3wx8ivla4j8fxr4iv7c8y9rjrjaz8jwdkn5x"; - }; - - NIX_CFLAGS_COMPILE = [ "-I${glib.dev}/include/glib-2.0" "-I${glib.dev}/lib/glib-2.0/include" "-I${libxml2.dev}/include/libxml2" "-I${sqlcipher}/include/sqlcipher" ]; - - patchPhase = '' - # Fix build error - sed -i 's/UpnpString_get_String(es_event->PublisherUrl)/es_event->PublisherUrl/' \ - libretroshare/src/upnp/UPnPBase.cpp - # Extensions get installed - sed -i "s,/usr/lib/retroshare/extensions6/,$out/share/retroshare," \ - libretroshare/src/rsserver/rsinit.cc - # Where to find the bootstrap DHT bdboot.txt - sed -i "s,/usr/share/RetroShare,$out/share/retroshare," \ - libretroshare/src/rsserver/rsaccounts.cc - ''; - - # sed -i "s,LIBS +=.*sqlcipher.*,LIBS += -lsqlcipher," \ - # retroshare-gui/src/retroshare-gui.pro \ - # retroshare-nogui/src/retroshare-nogui.pro - - buildInputs = [ speex qt4 libupnp gpgme gnome3.libgnome_keyring glib libssh pkgconfig qmake4Hook - protobuf bzip2 libXScrnSaver curl libxml2 libxslt sqlcipher libmicrohttpd opencv ]; - - preConfigure = '' - qmakeFlags="$qmakeFlags DESTDIR=$out" - ''; - - # gui/settings/PluginsPage.h:25:28: fatal error: ui_PluginsPage.h: No such file or directory - enableParallelBuilding = false; - - postInstall = '' - mkdir -p $out/bin - mv $out/retroshare-nogui $out/bin - mv $out/RetroShare $out/bin - - # plugins - mkdir -p $out/share/retroshare - mv $out/lib* $out/share/retroshare - - # BT DHT bootstrap - cp libbitdht/src/bitdht/bdboot.txt $out/share/retroshare - ''; - - meta = with stdenv.lib; { - description = ""; - homepage = http://retroshare.sourceforge.net/; - #license = licenses.bsd2; - platforms = platforms.linux; - maintainers = [ maintainers.domenkozar ]; - }; -} diff --git a/pkgs/applications/networking/p2p/retroshare/default.nix b/pkgs/applications/networking/p2p/retroshare/default.nix index cb6dad20ce0..0d7a41735ea 100644 --- a/pkgs/applications/networking/p2p/retroshare/default.nix +++ b/pkgs/applications/networking/p2p/retroshare/default.nix @@ -1,40 +1,44 @@ -{ stdenv, fetchurl, cmake, qt4, qmake4Hook, libupnp, gpgme, gnome3, glib, libssh, pkgconfig, protobuf, bzip2 -, libXScrnSaver, speex, curl, libxml2, libxslt }: - -stdenv.mkDerivation { - name = "retroshare-0.5.5c"; - - src = fetchurl { - url = mirror://sourceforge/project/retroshare/RetroShare/0.5.5c/retroshare_0.5.5-0.7068.tar.gz; - sha256 = "0l2n4pr1hq66q6qa073hrdx3s3d7iw54z8ay1zy82zhk2rwhsavp"; +{ stdenv, fetchFromGitHub, cmake, libupnp, gpgme, gnome3, glib, libssh, pkgconfig, protobuf, bzip2 +, libXScrnSaver, speex, curl, libxml2, libxslt, sqlcipher, libmicrohttpd, opencv, qmake, ffmpeg +, qtmultimedia, qtx11extras, qttools }: + +stdenv.mkDerivation rec { + name = "retroshare-${version}"; + version = "0.6.2"; + + src = fetchFromGitHub { + owner = "RetroShare"; + repo = "RetroShare"; + rev = "v${version}"; + sha256 = "0hly2x87wdvqzzwf3wjzi7092bj8fk4xs6302rkm8gp9bkkmiiw8"; }; - NIX_CFLAGS_COMPILE = [ "-I${glib.dev}/include/glib-2.0" "-I${glib.dev}/lib/glib-2.0/include" "-I${libxml2.dev}/include/libxml2" ]; + # NIX_CFLAGS_COMPILE = [ "-I${glib.dev}/include/glib-2.0" "-I${glib.dev}/lib/glib-2.0/include" "-I${libxml2.dev}/include/libxml2" "-I${sqlcipher}/include/sqlcipher" ]; patchPhase = '' + # Fix build error sed -i 's/UpnpString_get_String(es_event->PublisherUrl)/es_event->PublisherUrl/' \ libretroshare/src/upnp/UPnPBase.cpp - # Extensions get installed - sed -i "s,/usr/lib/retroshare/extensions/,$out/share/retroshare," \ - libretroshare/src/rsserver/rsinit.cc - # For bdboot.txt - sed -i "s,/usr/share/RetroShare,$out/share/retroshare," \ - libretroshare/src/rsserver/rsinit.cc ''; - buildInputs = [ speex qt4 qmake4Hook libupnp gpgme gnome3.libgnome_keyring glib libssh pkgconfig - protobuf bzip2 libXScrnSaver curl libxml2 libxslt ]; - - sourceRoot = "retroshare-0.5.5/src"; + nativeBuildInputs = [ pkgconfig qmake ]; + buildInputs = [ + speex libupnp gpgme gnome3.libgnome_keyring glib libssh qtmultimedia qtx11extras qttools + protobuf bzip2 libXScrnSaver curl libxml2 libxslt sqlcipher libmicrohttpd opencv ffmpeg + ]; preConfigure = '' qmakeFlags="$qmakeFlags DESTDIR=$out" ''; + # gui/settings/PluginsPage.h:25:28: fatal error: ui_PluginsPage.h: No such file or directory + enableParallelBuilding = false; + postInstall = '' mkdir -p $out/bin - mv $out/retroshare-nogui $out/bin - mv $out/RetroShare $out/bin + mv $out/RetroShare06-nogui $out/bin/RetroShare-nogui + mv $out/RetroShare06 $out/bin/Retroshare + ln -s $out/bin/RetroShare-nogui $out/bin/retroshare-nogui # plugins mkdir -p $out/share/retroshare @@ -47,7 +51,7 @@ stdenv.mkDerivation { meta = with stdenv.lib; { description = ""; homepage = http://retroshare.sourceforge.net/; - #license = licenses.bsd2; + license = licenses.gpl2Plus; platforms = platforms.linux; maintainers = [ maintainers.domenkozar ]; }; diff --git a/pkgs/applications/networking/umurmur/default.nix b/pkgs/applications/networking/umurmur/default.nix index 19a077d1589..550445f7306 100644 --- a/pkgs/applications/networking/umurmur/default.nix +++ b/pkgs/applications/networking/umurmur/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { name = "umurmur-${version}"; - version = "0.2.16a"; + version = "0.2.17"; src = fetchFromGitHub { - owner = "fatbob313"; + owner = "umurmur"; repo = "umurmur"; rev = version; - sha256 = "1xv1knrivy2i0ggwrczw60y0ayww9df9k6sif7klgzq556xk47d1"; + sha256 = "074px4ygmv4ydy2pqwxwnz17f0hfswqkz5kc9qfz0iby3h5i3fyl"; }; buildInputs = [ autoreconfHook openssl protobufc libconfig ]; @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Minimalistic Murmur (Mumble server)"; license = licenses.bsd3; - homepage = http://code.google.com/p/umurmur/; + homepage = https://github.com/umurmur/umurmur; platforms = platforms.all; }; } diff --git a/pkgs/applications/office/gnucash/2.6.nix b/pkgs/applications/office/gnucash/2.6.nix index ef824f57a35..50daf38978a 100644 --- a/pkgs/applications/office/gnucash/2.6.nix +++ b/pkgs/applications/office/gnucash/2.6.nix @@ -71,7 +71,7 @@ stdenv.mkDerivation rec { --prefix PERL5LIB ":" "$PERL5LIB" \ --set GCONF_CONFIG_SOURCE 'xml::~/.gconf' \ --prefix XDG_DATA_DIRS : "$GSETTINGS_SCHEMAS_PATH:$out/share/gsettings-schemas/${name}" \ - --prefix GIO_EXTRA_MODULES : "${dconf}/lib/gio/modules" \ + --prefix GIO_EXTRA_MODULES : "${stdenv.lib.getLib dconf}/lib/gio/modules" \ --prefix PATH ":" "$out/bin:${stdenv.lib.makeBinPath [ perl gconf ]}" done diff --git a/pkgs/applications/science/logic/coq/default.nix b/pkgs/applications/science/logic/coq/default.nix index f93856e90e1..9620140dde4 100644 --- a/pkgs/applications/science/logic/coq/default.nix +++ b/pkgs/applications/science/logic/coq/default.nix @@ -9,7 +9,7 @@ , ocamlPackages, ncurses , buildIde ? true , csdp ? null -, version ? "8.6" +, version ? "8.6.1" }: let @@ -18,9 +18,10 @@ let "8.5pl2" = "0wyywia0darak2zmc5v0ra9rn0b9whwdfiahralm8v5za499s8w3"; "8.5pl3" = "0fyk2a4fpifibq8y8jhx1891k55qnsnlygglch64sva0bph94nrh"; "8.6" = "1pw1xvy1657l1k69wrb911iqqflzhhp8wwsjvihbgc72r3skqg3f"; + "8.6.1" = "17cg2c40y9lskkiqfhngavp8yw3shpqgkpihh30xx0rlhn9amy1j"; }."${version}"; coq-version = builtins.substring 0 3 version; - camlp5 = ocamlPackages.camlp5_transitional; + camlp5 = ocamlPackages.camlp5_strict; ideFlags = if buildIde then "-lablgtkdir ${ocamlPackages.lablgtk}/lib/ocaml/*/site-lib/lablgtk2 -coqide opt" else ""; csdpPatch = if csdp != null then '' substituteInPlace plugins/micromega/sos.ml --replace "; csdp" "; ${csdp}/bin/csdp" @@ -132,7 +133,7 @@ self = stdenv.mkDerivation { homepage = http://coq.inria.fr; license = licenses.lgpl21; branch = coq-version; - maintainers = with maintainers; [ roconnor thoughtpolice vbgl ]; + maintainers = with maintainers; [ roconnor thoughtpolice vbgl Zimmi48 ]; platforms = platforms.unix; }; }; in self diff --git a/pkgs/applications/science/math/maxima/default.nix b/pkgs/applications/science/math/maxima/default.nix index 0ba1212567f..8a84ed78b78 100644 --- a/pkgs/applications/science/math/maxima/default.nix +++ b/pkgs/applications/science/math/maxima/default.nix @@ -4,7 +4,7 @@ tk ? null, gnuplot ? null, ecl ? null, ecl-fasl ? false let name = "maxima"; - version = "5.39.0"; + version = "5.40.0"; searchPath = stdenv.lib.makeBinPath @@ -15,7 +15,7 @@ stdenv.mkDerivation ({ src = fetchurl { url = "mirror://sourceforge/${name}/${name}-${version}.tar.gz"; - sha256 = "1cvignn5y6qzrby6qb885yc8zdcdqdr1d50vcvc3gapw2f0gk3zm"; + sha256 = "15pp35ayglv723bjbqc60gcdv2bm54s6pywsm4i4cwbjsf64dzkl"; }; buildInputs = stdenv.lib.filter (x: x != null) diff --git a/pkgs/applications/version-management/git-and-tools/git/default.nix b/pkgs/applications/version-management/git-and-tools/git/default.nix index aa8ab008403..0b93ae1f203 100644 --- a/pkgs/applications/version-management/git-and-tools/git/default.nix +++ b/pkgs/applications/version-management/git-and-tools/git/default.nix @@ -12,7 +12,7 @@ }: let - version = "2.13.4"; + version = "2.14.0"; svn = subversionClient.override { perlBindings = true; }; in @@ -21,7 +21,7 @@ stdenv.mkDerivation { src = fetchurl { url = "https://www.kernel.org/pub/software/scm/git/git-${version}.tar.xz"; - sha256 = "1nmg0n9l5ix876iqhcyhdnmiy7ihv0ybdijf1lssch6ja8m5j6ip"; + sha256 = "0xarcp0m7jbncic0g3ahz8l2d6b27h0g9ndgrhy9abkx61m6wgpr"; }; hardeningDisable = [ "format" ]; diff --git a/pkgs/applications/version-management/git-lfs/default.nix b/pkgs/applications/version-management/git-lfs/default.nix index 6543f40c4da..bf089a03fa0 100644 --- a/pkgs/applications/version-management/git-lfs/default.nix +++ b/pkgs/applications/version-management/git-lfs/default.nix @@ -2,8 +2,8 @@ buildGoPackage rec { name = "git-lfs-${version}"; - version = "2.0.2"; - rev = "85e2aec4d949517b4a7a53e4f745689331952b6c"; + version = "2.2.1"; + rev = "621d1f821f73efcedc829dda43fd9c1fcf07c6ab"; goPackagePath = "github.com/git-lfs/git-lfs"; @@ -11,7 +11,7 @@ buildGoPackage rec { inherit rev; owner = "git-lfs"; repo = "git-lfs"; - sha256 = "0cvs17rd4qgaqj9vz6pwx9y3ni8c99gzykc3as92x37962nmq5cy"; + sha256 = "00wc4gjs4yy2qld1m4yar37jkw9fdi2h8xp25hy2y80cnyiafn7s"; }; preBuild = '' diff --git a/pkgs/applications/video/key-mon/default.nix b/pkgs/applications/video/key-mon/default.nix index b36b539176e..bc6cd015b86 100644 --- a/pkgs/applications/video/key-mon/default.nix +++ b/pkgs/applications/video/key-mon/default.nix @@ -6,7 +6,7 @@ pythonPackages.buildPythonApplication rec { namePrefix = ""; src = fetchurl { - url = "http://key-mon.googlecode.com/files/${name}.tar.gz"; + url = "https://storage.googleapis.com/google-code-archive-downloads/v2/code.google.com/key-mon/${name}.tar.gz"; sha256 = "1liz0dxcqmchbnl1xhlxkqm3gh76wz9jxdxn9pa7dy77fnrjkl5q"; }; @@ -20,7 +20,7 @@ pythonPackages.buildPythonApplication rec { ''; meta = with stdenv.lib; { - homepage = http://code.google.com/p/key-mon; + homepage = https://code.google.com/archive/p/key-mon; description = "Utility to show live keyboard and mouse status for teaching and screencasts"; license = licenses.asl20; maintainers = [ maintainers.goibhniu ]; diff --git a/pkgs/applications/video/mpv/default.nix b/pkgs/applications/video/mpv/default.nix index d21a8ab6dcc..27ce61eec6d 100644 --- a/pkgs/applications/video/mpv/default.nix +++ b/pkgs/applications/video/mpv/default.nix @@ -73,11 +73,11 @@ assert drmSupport -> available libdrm; let # Purity: Waf is normally downloaded by bootstrap.py, but # for purity reasons this behavior should be avoided. - wafVersion = "1.8.12"; + wafVersion = "1.9.8"; waf = fetchurl { urls = [ "http://waf.io/waf-${wafVersion}" "http://www.freehackers.org/~tnagy/release/waf-${wafVersion}" ]; - sha256 = "12y9c352zwliw0zk9jm2lhynsjcf5jy0k1qch1c1av8hnbm2pgq1"; + sha256 = "1gsd3zza1wixv2vhvq3inp4vb71i41a1kbwqnwixhnvdmcmw8z8n"; }; in stdenv.mkDerivation rec { name = "mpv-${version}"; diff --git a/pkgs/applications/video/shotcut/default.nix b/pkgs/applications/video/shotcut/default.nix index 4ca31916965..72dbf87fdef 100644 --- a/pkgs/applications/video/shotcut/default.nix +++ b/pkgs/applications/video/shotcut/default.nix @@ -45,7 +45,7 @@ stdenv.mkDerivation rec { nixpkgs maintainer(s). If you wish to report any bugs upstream, please use the official build from shotcut.org instead. ''; - homepage = http://shotcut.org; + homepage = https://shotcut.org; license = licenses.gpl3; maintainers = [ maintainers.goibhniu ]; platforms = platforms.linux; diff --git a/pkgs/applications/virtualization/docker/default.nix b/pkgs/applications/virtualization/docker/default.nix index c42b2a098f7..74feae05b41 100644 --- a/pkgs/applications/virtualization/docker/default.nix +++ b/pkgs/applications/virtualization/docker/default.nix @@ -173,8 +173,8 @@ rec { version = "17.06.0-ce"; rev = "02c1d876176546b5f069dae758d6a7d2ead6bd48"; # git commit sha256 = "0wrg4ygcq4c7f2bwa7pgc7y33idg0hijavx40588jaglz4k8sqpm"; - runcRev = "992a5be178a62e026f4069f443c6164912adbf09"; - runcSha256 = "0ylkbn5rprw5cgxazvrwj7balikpfm8vlybwdbfpwnsqk3gc6p8k"; + runcRev = "2d41c047c83e09a6d61d464906feb2a2f3c52aa4"; + runcSha256 = "0v5iv29ck6lkxvxh7a56gfrlgfs0bjvjhrq3p6qqv9qjzv825byq"; containerdRev = "cfb82a876ecc11b5ca0977d1733adbe58599088a"; containerdSha256 = "0rix0mv203fn3rcxmpqdpb54l1a0paqplg2xgldpd943qi1rm552"; tiniRev = "949e6facb77383876aeff8a6944dde66b3089574"; diff --git a/pkgs/applications/virtualization/rkt/default.nix b/pkgs/applications/virtualization/rkt/default.nix index 885ffde8a50..a23537847a1 100644 --- a/pkgs/applications/virtualization/rkt/default.nix +++ b/pkgs/applications/virtualization/rkt/default.nix @@ -12,7 +12,7 @@ let stage1Dir = "lib/rkt/stage1-images"; in stdenv.mkDerivation rec { - version = "1.28.0"; + version = "1.28.1"; name = "rkt-${version}"; BUILDDIR="build-${name}"; @@ -20,7 +20,7 @@ in stdenv.mkDerivation rec { owner = "coreos"; repo = "rkt"; rev = "v${version}"; - sha256 = "08bzi44rs4g8cxb44pxh7ln85zhkhmi40r8mb73kibnnzd008vg3"; + sha256 = "1xn2cz30gq0500gmp5aml03hmk066fq9i04jizb5sc0j41fmsgja"; }; stage1BaseImage = fetchurl { diff --git a/pkgs/applications/window-managers/jwm/default.nix b/pkgs/applications/window-managers/jwm/default.nix index 892fe7ba4e7..83c4e6828e1 100644 --- a/pkgs/applications/window-managers/jwm/default.nix +++ b/pkgs/applications/window-managers/jwm/default.nix @@ -5,13 +5,13 @@ stdenv.mkDerivation rec { name = "jwm-${version}"; - version = "1600"; + version = "1621"; src = fetchFromGitHub { owner = "joewing"; repo = "jwm"; rev = "s${version}"; - sha256 = "0rfb67r6g873alvcbn9531415qlfmvfrdfm4xrsyhdgdwj7dv5kv"; + sha256 = "1cxi9yd3wwzhh06f6myk15cav7ayvzxdaxhvqb3570nwj21zlnsm"; }; nativeBuildInputs = [ pkgconfig automake autoconf libtool gettext which ]; diff --git a/pkgs/build-support/cc-wrapper/default.nix b/pkgs/build-support/cc-wrapper/default.nix index 09d1d4cd681..e0cc1fc2669 100644 --- a/pkgs/build-support/cc-wrapper/default.nix +++ b/pkgs/build-support/cc-wrapper/default.nix @@ -12,6 +12,7 @@ , isGNU ? false, isClang ? cc.isClang or false, gnugrep ? null , buildPackages ? {}, hostPlatform, targetPlatform , runCommand ? null +, useMacosReexportHack ? false }: with stdenv.lib; @@ -278,7 +279,15 @@ stdenv.mkDerivation { ln -s $ldPath/${prefix}as $out/bin/${prefix}as fi - wrap ${prefix}ld ${preWrap ./ld-wrapper.sh} ''${ld:-$ldPath/${prefix}ld} + '' + (if !useMacosReexportHack then '' + wrap ${prefix}ld ${./ld-wrapper.sh} ''${ld:-$ldPath/${prefix}ld} + '' else '' + export binPrefix=${prefix} + ldInner="${prefix}ld-reexport-delegate" + wrap "$ldInner" ${./macos-sierra-reexport-hack.bash} ''${ld:-$ldPath/${prefix}ld} + wrap "${prefix}ld" ${./ld-wrapper.sh} "$out/bin/$ldInner" + unset ldInner + '') + '' if [ -e ${binutils_bin}/bin/${prefix}ld.gold ]; then wrap ${prefix}ld.gold ${preWrap ./ld-wrapper.sh} ${binutils_bin}/bin/${prefix}ld.gold @@ -386,5 +395,7 @@ stdenv.mkDerivation { { description = stdenv.lib.attrByPath ["meta" "description"] "System C compiler" cc_ + " (wrapper script)"; - }; + } // optionalAttrs useMacosReexportHack { + platforms = stdenv.lib.platforms.darwin; + }; } diff --git a/pkgs/build-support/cc-wrapper/macos-sierra-reexport-hack.bash b/pkgs/build-support/cc-wrapper/macos-sierra-reexport-hack.bash new file mode 100644 index 00000000000..b7aa7ea5c09 --- /dev/null +++ b/pkgs/build-support/cc-wrapper/macos-sierra-reexport-hack.bash @@ -0,0 +1,106 @@ +#! @shell@ + +set -eu -o pipefail + +path_backup="$PATH" +if [ -n "@coreutils_bin@" ]; then + PATH="@coreutils_bin@/bin" +fi + +declare -r recurThreshold=300 + +declare overflowCount=0 +for ((n=0; n < $#; ++n)); do + case "${!n}" in + -l*) let overflowCount+=1 ;; + -reexport-l*) let overflowCount+=1 ;; + *) ;; + esac +done + +declare -a allArgs=() + +if (( "$overflowCount" <= "$recurThreshold" )); then + allArgs=("$@") +else + declare -a childrenLookup=() childrenLink=() + + while (( $# )); do + case "$1" in + -L/*) + childrenLookup+=("$1") + allArgs+=("$1") + ;; + -L) + echo "cctools LD does not support '-L foo' or '-l foo'" >&2 + exit 1 + ;; + -l) + echo "cctools LD does not support '-L foo' or '-l foo'" >&2 + exit 1 + ;; + -lazy_library | -lazy_framework | -lto_library) + # We aren't linking any "azy_library", "to_library", etc. + allArgs+=("$1") + ;; + -lazy-l | -weak-l) allArgs+=("$1") ;; + # We can't so easily prevent header issues from these. + -lSystem) allArgs+=("$1") ;; + # Special case as indirection seems like a bad idea for something + # so fundamental. Can be removed for simplicity. + -l?* | -reexport-l?*) childrenLink+=("$1") ;; + *) allArgs+=("$1") ;; + esac + + shift + done + + declare n=0 + while (( $n < "${#childrenLink[@]}" )); do + if [[ "${childrenLink[n]}" = -l* ]]; then + childrenLink[n]="-reexport${childrenLink[n]}" + fi + let ++n + done + unset n + + declare -r outputNameLibless=$(basename $( \ + if [[ -z "${outputName:+isUndefined}" ]]; then + echo unnamed + elif [[ "${outputName:0:3}" = lib ]]; then + echo "${outputName:3}" + else + echo "${outputName}" + fi)) + declare -ra children=("$outputNameLibless-reexport-delegate-0" \ + "$outputNameLibless-reexport-delegate-1") + + mkdir -p "$out/lib" + + PATH="$PATH:@out@/bin" + + symbolBloatObject=$outputNameLibless-symbol-hack.o + if [[ ! -e $symbolBloatObject ]]; then + printf '.private_extern _______child_hack_foo\nchild_hack_foo:\n' \ + | @binPrefix@as -- -o $symbolBloatObject + fi + + # first half of libs + @binPrefix@ld -macosx_version_min $MACOSX_DEPLOYMENT_TARGET -arch x86_64 -dylib \ + -o "$out/lib/lib${children[0]}.dylib" \ + -install_name "$out/lib/lib${children[0]}.dylib" \ + "${childrenLookup[@]}" "$symbolBloatObject" \ + "${childrenLink[@]:0:$((${#childrenLink[@]} / 2 ))}" + + # second half of libs + @binPrefix@ld -macosx_version_min $MACOSX_DEPLOYMENT_TARGET -arch x86_64 -dylib \ + -o "$out/lib/lib${children[1]}.dylib" \ + -install_name "$out/lib/lib${children[1]}.dylib" \ + "${childrenLookup[@]}" "$symbolBloatObject" \ + "${childrenLink[@]:$((${#childrenLink[@]} / 2 ))}" + + allArgs+=("-L$out/lib" "-l${children[0]}" "-l${children[1]}") +fi + +PATH="$path_backup" +exec @prog@ "${allArgs[@]}" diff --git a/pkgs/build-support/docker/default.nix b/pkgs/build-support/docker/default.nix index 160c3f85977..17d7f2da035 100644 --- a/pkgs/build-support/docker/default.nix +++ b/pkgs/build-support/docker/default.nix @@ -497,16 +497,23 @@ rec { # Use the temp folder we've been working on to create a new image. mv temp image/$layerID - # Create image configuration file (used by registry v2) by using - # the configuration of the last layer - SHA_ARRAY=$(find ./ -name layer.tar | xargs sha256sum | cut -d" " -f1 | xargs -I{} echo -n '"sha256:{}" ' | sed 's/" "/","/g' | awk '{ print "["$1"]" }') - jq ". + {\"rootfs\": {\"diff_ids\": $SHA_ARRAY, \"type\": \"layers\"}}" image/$layerID/json > config.json - CONFIG_SHA=$(sha256sum config.json | cut -d ' ' -f1) - mv config.json image/$CONFIG_SHA.json - - # Create image manifest - LAYER_PATHS=$(find image/ -name layer.tar -printf '"%P" ' | sed 's/" "/","/g') - jq -n "[{\"Config\":\"$CONFIG_SHA.json\",\"RepoTags\":[\"$imageName:$imageTag\"],\"Layers\":[$LAYER_PATHS]}]" > image/manifest.json + # Create image json and image manifest + imageJson=$(cat ${baseJson} | jq ". + {\"rootfs\": {\"diff_ids\": [], \"type\": \"layers\"}}") + manifestJson=$(jq -n "[{\"RepoTags\":[\"$imageName:$imageTag\"]}]") + currentID=$layerID + while [[ -n "$currentID" ]]; do + layerChecksum=$(sha256sum image/$currentID/layer.tar | cut -d ' ' -f1) + imageJson=$(echo "$imageJson" | jq ".history |= [{\"created\": \"${created}\"}] + .") + imageJson=$(echo "$imageJson" | jq ".rootfs.diff_ids |= [\"sha256:$layerChecksum\"] + .") + manifestJson=$(echo "$manifestJson" | jq ".[0].Layers |= [\"$currentID/layer.tar\"] + .") + + currentID=$(cat image/$currentID/json | (jshon -e parent -u 2>/dev/null || true)) + done + + imageJsonChecksum=$(echo "$imageJson" | sha256sum | cut -d ' ' -f1) + echo "$imageJson" > "image/$imageJsonChecksum.json" + manifestJson=$(echo "$manifestJson" | jq ".[0].Config = \"$imageJsonChecksum.json\"") + echo "$manifestJson" > image/manifest.json # Store the json under the name image/repositories. jshon -n object \ diff --git a/pkgs/build-support/emacs/wrapper.nix b/pkgs/build-support/emacs/wrapper.nix index e41b1fd6a21..bd733f1b9ba 100644 --- a/pkgs/build-support/emacs/wrapper.nix +++ b/pkgs/build-support/emacs/wrapper.nix @@ -80,7 +80,8 @@ stdenv.mkDerivation { linkPath "$1" "share/emacs/site-lisp" "share/emacs/site-lisp" } - for pkg in $requires; do + # Iterate over the array of inputs (avoiding nix's own interpolation) + for pkg in "''${requires[@]}"; do linkEmacsPackage $pkg done diff --git a/pkgs/data/fonts/junicode/default.nix b/pkgs/data/fonts/junicode/default.nix index 875d63ee8ce..a8b6c8853f3 100644 --- a/pkgs/data/fonts/junicode/default.nix +++ b/pkgs/data/fonts/junicode/default.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation { meta = { homepage = http://junicode.sourceforge.net/; - description = "A Unicode font"; + description = "A Unicode font for medievalists"; platforms = stdenv.lib.platforms.unix; }; } diff --git a/pkgs/data/fonts/lohit-fonts/default.nix b/pkgs/data/fonts/lohit-fonts/default.nix index c0454bc2730..12c4f67666d 100644 --- a/pkgs/data/fonts/lohit-fonts/default.nix +++ b/pkgs/data/fonts/lohit-fonts/default.nix @@ -1,28 +1,28 @@ { stdenv, fetchurl, lib }: let fonts = { - assamese = { version = "2.91.3" ; sha256 = "0kbdvi8f7vbvsain9zmnj9h43a6bmdkhk5c2wzg15100w7wf6lpq"; }; - bengali = { version = "2.91.3" ; sha256 = "1wdd2dkqaflf6nm5yc7llkfxin6g0zb2sbcd5g2xbrl0gwwcmkij"; }; - devanagari = { version = "2.95.2" ; sha256 = "1ss0j0pcfrg1vsypnm0042y4bn7b84mi6lbfsvr6rs89lb5swvn2"; }; - gujarati = { version = "2.92.2-and-4.2.2" ; sha256 = "1i27yjhn3x31a89x1hjs6rskdwp2kh0hibq1xiz3rgqil2m0jar6"; }; - gurmukhi = { version = "2.91.0" ; sha256 = "0z8a30mnyhlfvqhnggfk0369hqg779ihqyhcmpxj0sf9dmb1i0mj"; }; # renamed from Punjabi - kannada = { version = "2.5.3" ; sha256 = "1x9fb5z1bwmfi0y1fdnzizzjxhbxp272wxznx36063kjf25bb9pi"; }; - malayalam = { version = "2.92.0" ; sha256 = "1syv1irxh5xl0z0d5kwankhlmi7s2dg4wpp58nq0mkd3rhm5q8qw"; }; - marathi = { version = "2.94.0" ; sha256 = "0y9sca6gbfbafv52v0n2r1xfs8rg6zmqs4vp9sjfc1c6yqhzagl4"; }; - nepali = { version = "2.94.0" ; sha256 = "0c56141rpxc30581i3gisg8kfaadxhqjhgshni6g7a7rn6l4dx17"; }; - odia = { version = "2.91.0" ; sha256 = "15iz9kdf9k5m8wcn2iqlqjm758ac3hvnk93va6kac06frxnhw9lp"; }; # renamed from Oriya - tamil-classical = { version = "2.5.3" ; sha256 = "0ci4gk8qhhysjza69nncgmqmal8s4n8829icamvlzbmjdd4s2pij"; }; - tamil = { version = "2.91.1" ; sha256 = "1ir6kjl48apwk41xbpj0x458k108s7i61yzpkfhqcy1fkcr7cngj"; }; - telugu = { version = "2.5.4" ; sha256 = "06gdba7690y20l7nsi8fnnimim5hlq7hik0mpk2fzw4w39hjybk9"; }; + assamese = { label = "Assamese"; version = "2.91.3" ; sha256 = "0kbdvi8f7vbvsain9zmnj9h43a6bmdkhk5c2wzg15100w7wf6lpq"; }; + bengali = { label = "Bengali"; version = "2.91.3" ; sha256 = "1wdd2dkqaflf6nm5yc7llkfxin6g0zb2sbcd5g2xbrl0gwwcmkij"; }; + devanagari = { label = "Devanagari script"; version = "2.95.2" ; sha256 = "1ss0j0pcfrg1vsypnm0042y4bn7b84mi6lbfsvr6rs89lb5swvn2"; }; + gujarati = { label = "Gujarati"; version = "2.92.2-and-4.2.2" ; sha256 = "1i27yjhn3x31a89x1hjs6rskdwp2kh0hibq1xiz3rgqil2m0jar6"; }; + gurmukhi = { label = "Gurmukhi script"; version = "2.91.0" ; sha256 = "0z8a30mnyhlfvqhnggfk0369hqg779ihqyhcmpxj0sf9dmb1i0mj"; }; # renamed from Punjabi + kannada = { label = "Kannada"; version = "2.5.3" ; sha256 = "1x9fb5z1bwmfi0y1fdnzizzjxhbxp272wxznx36063kjf25bb9pi"; }; + malayalam = { label = "Malayalam"; version = "2.92.0" ; sha256 = "1syv1irxh5xl0z0d5kwankhlmi7s2dg4wpp58nq0mkd3rhm5q8qw"; }; + marathi = { label = "Marathi"; version = "2.94.0" ; sha256 = "0y9sca6gbfbafv52v0n2r1xfs8rg6zmqs4vp9sjfc1c6yqhzagl4"; }; + nepali = { label = "Nepali"; version = "2.94.0" ; sha256 = "0c56141rpxc30581i3gisg8kfaadxhqjhgshni6g7a7rn6l4dx17"; }; + odia = { label = "Odia"; version = "2.91.0" ; sha256 = "15iz9kdf9k5m8wcn2iqlqjm758ac3hvnk93va6kac06frxnhw9lp"; }; # renamed from Oriya + tamil-classical = { label = "Classical Tamil"; version = "2.5.3" ; sha256 = "0ci4gk8qhhysjza69nncgmqmal8s4n8829icamvlzbmjdd4s2pij"; }; + tamil = { label = "Tamil"; version = "2.91.1" ; sha256 = "1ir6kjl48apwk41xbpj0x458k108s7i61yzpkfhqcy1fkcr7cngj"; }; + telugu = { label = "Telugu"; version = "2.5.4" ; sha256 = "06gdba7690y20l7nsi8fnnimim5hlq7hik0mpk2fzw4w39hjybk9"; }; }; gplfonts = { # GPL fonts removed from later releases - kashmiri = { version = "2.4.3" ; sha256 = "0ax8xzv4pz17jnsjdklawncsm2qn7176wbxykswygpzdd5lr0gg9"; }; - konkani = { version = "2.4.3" ; sha256 = "03zc27z26a60aaggrqx4d6l0jgggciq8p83v6vgg0k6l3apvcp45"; }; - maithili = { version = "2.4.3" ; sha256 = "0aqwnhq1namvvb77f2vssahixqf4xay7ja4q8qc312wxkajdqh4a"; }; - sindhi = { version = "2.4.3" ; sha256 = "00imfbn01yc2g5zdyydks9w3ndkawr66l9qk2idlvw3yz3sw2kf1"; }; + kashmiri = { label = "Kashmiri"; version = "2.4.3" ; sha256 = "0ax8xzv4pz17jnsjdklawncsm2qn7176wbxykswygpzdd5lr0gg9"; }; + konkani = { label = "Konkani"; version = "2.4.3" ; sha256 = "03zc27z26a60aaggrqx4d6l0jgggciq8p83v6vgg0k6l3apvcp45"; }; + maithili = { label = "Maithili"; version = "2.4.3" ; sha256 = "0aqwnhq1namvvb77f2vssahixqf4xay7ja4q8qc312wxkajdqh4a"; }; + sindhi = { label = "Sindhi"; version = "2.4.3" ; sha256 = "00imfbn01yc2g5zdyydks9w3ndkawr66l9qk2idlvw3yz3sw2kf1"; }; }; - mkpkg = license: name: {version, sha256}: + mkpkg = license: name: {label, version, sha256}: stdenv.mkDerivation { name = "lohit-${name}-${version}"; @@ -44,6 +44,7 @@ let meta = { inherit license; + description = "Free and open source fonts for Indian languages (" + label + ")"; homepage = https://fedorahosted.org/lohit/; maintainers = [ lib.maintainers.mathnerd314 lib.maintainers.ttuegel ]; # Set a non-zero priority to allow easy overriding of the diff --git a/pkgs/data/fonts/material-icons/default.nix b/pkgs/data/fonts/material-icons/default.nix new file mode 100644 index 00000000000..ea44c9c79b1 --- /dev/null +++ b/pkgs/data/fonts/material-icons/default.nix @@ -0,0 +1,26 @@ +{ stdenv, fetchFromGitHub }: + +stdenv.mkDerivation rec { + name = "material-icons-${version}"; + version = "3.0.1"; + + src = fetchFromGitHub { + owner = "google"; + repo = "material-design-icons"; + rev = "${version}"; + sha256 = "17q5brcqyyc8gbjdgpv38p89s60cwxjlwy2ljnrvas5cj0s62np0"; + }; + + buildCommand = '' + mkdir -p $out/share/fonts/truetype + cp $src/iconfont/*.ttf $out/share/fonts/truetype + ''; + + meta = with stdenv.lib; { + description = "System status icons by Google, featuring material design"; + homepage = https://material.io/icons; + license = licenses.asl20; + platforms = platforms.all; + maintainers = with maintainers; [ mpcsh ]; + }; +} diff --git a/pkgs/desktops/gnome-3/3.22/apps/evolution/default.nix b/pkgs/desktops/gnome-3/3.22/apps/evolution/default.nix index c802f9636eb..8da7fab9037 100644 --- a/pkgs/desktops/gnome-3/3.22/apps/evolution/default.nix +++ b/pkgs/desktops/gnome-3/3.22/apps/evolution/default.nix @@ -2,7 +2,7 @@ , pkgconfig, gtk3, glib, libnotify, gtkspell3 , wrapGAppsHook, itstool, shared_mime_info, libical, db, gcr, sqlite , gnome3, librsvg, gdk_pixbuf, libsecret, nss, nspr, icu, libtool -, libcanberra_gtk3, bogofilter, gst_all_1, procps, p11_kit, dconf, openldap}: +, libcanberra_gtk3, bogofilter, gst_all_1, procps, p11_kit, openldap}: let majVer = gnome3.version; @@ -23,7 +23,7 @@ in stdenv.mkDerivation rec { libcanberra_gtk3 bogofilter gnome3.libgdata sqlite gst_all_1.gstreamer gst_all_1.gst-plugins-base p11_kit nss nspr libnotify procps highlight gnome3.libgweather - gnome3.gsettings_desktop_schemas dconf + gnome3.gsettings_desktop_schemas gnome3.libgnome_keyring gnome3.glib_networking openldap ]; nativeBuildInputs = [ pkgconfig wrapGAppsHook ]; diff --git a/pkgs/desktops/gnome-3/3.22/apps/seahorse/default.nix b/pkgs/desktops/gnome-3/3.22/apps/seahorse/default.nix index e59df06f8a0..58d5a5b8cdc 100644 --- a/pkgs/desktops/gnome-3/3.22/apps/seahorse/default.nix +++ b/pkgs/desktops/gnome-3/3.22/apps/seahorse/default.nix @@ -1,6 +1,6 @@ { stdenv, intltool, fetchurl, vala_0_32 , pkgconfig, gtk3, glib -, makeWrapper, itstool, gnupg, libsoup +, wrapGAppsHook, itstool, gnupg, libsoup , gnome3, librsvg, gdk_pixbuf, gpgme , libsecret, avahi, p11_kit, openssh }: @@ -14,15 +14,15 @@ stdenv.mkDerivation rec { NIX_CFLAGS_COMPILE = "-I${gnome3.glib.dev}/include/gio-unix-2.0"; buildInputs = [ pkgconfig gtk3 glib intltool itstool gnome3.gcr - gnome3.gsettings_desktop_schemas makeWrapper gnupg + gnome3.gsettings_desktop_schemas wrapGAppsHook gnupg gdk_pixbuf gnome3.defaultIconTheme librsvg gpgme - libsecret avahi libsoup p11_kit vala_0_32 gnome3.gcr + libsecret avahi libsoup p11_kit vala_0_32 openssh ]; preFixup = '' - wrapProgram "$out/bin/seahorse" \ - --set GDK_PIXBUF_MODULE_FILE "$GDK_PIXBUF_MODULE_FILE" \ - --prefix XDG_DATA_DIRS : "${gnome3.gnome_themes_standard}/share:$XDG_ICON_DIRS:$GSETTINGS_SCHEMAS_PATH" + gappsWrapperArgs+=( + --prefix XDG_DATA_DIRS : "${gnome3.gnome_themes_standard}/share" + ) ''; meta = with stdenv.lib; { diff --git a/pkgs/desktops/gnome-3/3.22/core/evolution-data-server/default.nix b/pkgs/desktops/gnome-3/3.22/core/evolution-data-server/default.nix index b67795ea59c..a8c3f724b85 100644 --- a/pkgs/desktops/gnome-3/3.22/core/evolution-data-server/default.nix +++ b/pkgs/desktops/gnome-3/3.22/core/evolution-data-server/default.nix @@ -1,4 +1,4 @@ -{ fetchurl, stdenv, pkgconfig, gnome3, python +{ fetchurl, stdenv, pkgconfig, gnome3, python, dconf , intltool, libsoup, libxml2, libsecret, icu, sqlite , p11_kit, db, nspr, nss, libical, gperf, makeWrapper, valaSupport ? true, vala_0_32 }: @@ -6,7 +6,7 @@ stdenv.mkDerivation rec { inherit (import ./src.nix fetchurl) name src; buildInputs = with gnome3; - [ pkgconfig glib python intltool libsoup libxml2 gtk gnome_online_accounts + [ pkgconfig glib python intltool libsoup libxml2 gtk gnome_online_accounts (stdenv.lib.getLib dconf) gcr p11_kit libgweather libgdata gperf makeWrapper icu sqlite gsettings_desktop_schemas ] ++ stdenv.lib.optional valaSupport vala_0_32; @@ -20,7 +20,9 @@ stdenv.mkDerivation rec { preFixup = '' for f in "$out/libexec/"*; do - wrapProgram "$f" --prefix XDG_DATA_DIRS : "$GSETTINGS_SCHEMAS_PATH" + wrapProgram "$f" \ + --prefix XDG_DATA_DIRS : "$GSETTINGS_SCHEMAS_PATH" \ + --prefix GIO_EXTRA_MODULES : "${stdenv.lib.getLib dconf}/lib/gio/modules" done ''; diff --git a/pkgs/desktops/gnome-3/3.22/core/gnome-contacts/default.nix b/pkgs/desktops/gnome-3/3.22/core/gnome-contacts/default.nix index 8097cf32ba6..34cea5141ba 100644 --- a/pkgs/desktops/gnome-3/3.22/core/gnome-contacts/default.nix +++ b/pkgs/desktops/gnome-3/3.22/core/gnome-contacts/default.nix @@ -1,7 +1,7 @@ { stdenv, intltool, fetchurl, evolution_data_server, db , pkgconfig, gtk3, glib, libsecret , libchamplain, clutter_gtk, geocode_glib -, bash, makeWrapper, itstool, folks, libnotify, libxml2 +, bash, wrapGAppsHook, itstool, folks, libnotify, libxml2 , gnome3, librsvg, gdk_pixbuf, file, telepathy_glib, nspr, nss , libsoup, vala_0_32, dbus_glib, automake115x, autoconf }: @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { ''; buildInputs = [ pkgconfig gtk3 glib intltool itstool evolution_data_server - gnome3.gsettings_desktop_schemas makeWrapper file libnotify + gnome3.gsettings_desktop_schemas wrapGAppsHook file libnotify folks gnome3.gnome_desktop telepathy_glib libsecret dbus_glib libxml2 libsoup gnome3.gnome_online_accounts nspr nss gdk_pixbuf gnome3.defaultIconTheme librsvg @@ -26,11 +26,9 @@ stdenv.mkDerivation rec { vala_0_32 automake115x autoconf db ]; preFixup = '' - for f in "$out/bin/gnome-contacts" "$out/libexec/gnome-contacts-search-provider"; do - wrapProgram $f \ - --set GDK_PIXBUF_MODULE_FILE "$GDK_PIXBUF_MODULE_FILE" \ - --prefix XDG_DATA_DIRS : "${gnome3.gnome_themes_standard}/share:$out/share:$XDG_ICON_DIRS:$GSETTINGS_SCHEMAS_PATH" - done + gappsWrapperArgs+=( + --prefix XDG_DATA_DIRS : "${gnome3.gnome_themes_standard}/share" + ) ''; patches = [ ./gio_unix.patch ]; diff --git a/pkgs/desktops/gnome-3/3.22/core/gnome-control-center/default.nix b/pkgs/desktops/gnome-3/3.22/core/gnome-control-center/default.nix index 23d32cdbac3..b116c2902da 100644 --- a/pkgs/desktops/gnome-3/3.22/core/gnome-control-center/default.nix +++ b/pkgs/desktops/gnome-3/3.22/core/gnome-control-center/default.nix @@ -39,6 +39,9 @@ stdenv.mkDerivation rec { ''; preFixup = with gnome3; '' + gappsWrapperArgs+=( + --prefix XDG_DATA_DIRS : "${gnome3.gnome_themes_standard}/share:${sound-theme-freedesktop}/share" + ) for i in $out/share/applications/*; do substituteInPlace $i --replace "gnome-control-center" "$out/bin/gnome-control-center" done diff --git a/pkgs/desktops/gnome-3/3.22/core/gnome-font-viewer/default.nix b/pkgs/desktops/gnome-3/3.22/core/gnome-font-viewer/default.nix index d0ec2307a85..16d7151ea09 100644 --- a/pkgs/desktops/gnome-3/3.22/core/gnome-font-viewer/default.nix +++ b/pkgs/desktops/gnome-3/3.22/core/gnome-font-viewer/default.nix @@ -1,6 +1,6 @@ { stdenv, intltool, fetchurl , pkgconfig, gtk3, glib -, bash, makeWrapper, itstool +, bash, wrapGAppsHook, itstool , gnome3, librsvg, gdk_pixbuf }: stdenv.mkDerivation rec { @@ -14,12 +14,12 @@ stdenv.mkDerivation rec { buildInputs = [ pkgconfig gtk3 glib intltool itstool gnome3.gnome_desktop gdk_pixbuf gnome3.defaultIconTheme librsvg - gnome3.gsettings_desktop_schemas makeWrapper ]; + gnome3.gsettings_desktop_schemas wrapGAppsHook ]; preFixup = '' - wrapProgram "$out/bin/gnome-font-viewer" \ - --set GDK_PIXBUF_MODULE_FILE "$GDK_PIXBUF_MODULE_FILE" \ - --prefix XDG_DATA_DIRS : "${gnome3.gnome_themes_standard}/share:$out/share:$XDG_ICON_DIRS:$GSETTINGS_SCHEMAS_PATH" + gappsWrapperArgs+=( + --prefix XDG_DATA_DIRS : "${gnome3.gnome_themes_standard}/share" + ) ''; meta = with stdenv.lib; { diff --git a/pkgs/desktops/gnome-3/3.22/core/gnome-screenshot/default.nix b/pkgs/desktops/gnome-3/3.22/core/gnome-screenshot/default.nix index 29ebe8b0ca6..7daf9a7a310 100644 --- a/pkgs/desktops/gnome-3/3.22/core/gnome-screenshot/default.nix +++ b/pkgs/desktops/gnome-3/3.22/core/gnome-screenshot/default.nix @@ -1,5 +1,5 @@ { stdenv, intltool, fetchurl, pkgconfig, libcanberra_gtk3 -, bash, gtk3, glib, makeWrapper +, bash, gtk3, glib, wrapGAppsHook , itstool, gnome3, librsvg, gdk_pixbuf }: stdenv.mkDerivation rec { @@ -13,12 +13,12 @@ stdenv.mkDerivation rec { propagatedBuildInputs = [ gdk_pixbuf gnome3.defaultIconTheme librsvg ]; buildInputs = [ bash pkgconfig gtk3 glib intltool itstool libcanberra_gtk3 - gnome3.gsettings_desktop_schemas makeWrapper ]; + gnome3.gsettings_desktop_schemas wrapGAppsHook ]; preFixup = '' - wrapProgram "$out/bin/gnome-screenshot" \ - --set GDK_PIXBUF_MODULE_FILE "$GDK_PIXBUF_MODULE_FILE" \ - --prefix XDG_DATA_DIRS : "${gtk3.out}/share:${gnome3.gnome_themes_standard}/share:$out/share:$XDG_ICON_DIRS:$GSETTINGS_SCHEMAS_PATH" + gappsWrapperArgs+=( + --prefix XDG_DATA_DIRS : "${gtk3.out}/share:${gnome3.gnome_themes_standard}/share" + ) ''; meta = with stdenv.lib; { diff --git a/pkgs/desktops/gnome-3/3.22/core/gnome-shell/default.nix b/pkgs/desktops/gnome-3/3.22/core/gnome-shell/default.nix index 8f77b7e5e3b..2ce3f9e3927 100644 --- a/pkgs/desktops/gnome-3/3.22/core/gnome-shell/default.nix +++ b/pkgs/desktops/gnome-3/3.22/core/gnome-shell/default.nix @@ -26,7 +26,7 @@ in stdenv.mkDerivation rec { libgweather # not declared at build time, but typelib is needed at runtime gnome3.gnome-clocks # schemas needed at_spi2_core upower ibus gnome_desktop telepathy_logger gnome3.gnome_settings_daemon - pythonEnv gobjectIntrospection ]; + pythonEnv gobjectIntrospection (stdenv.lib.getLib dconf) ]; installFlags = [ "keysdir=$(out)/share/gnome-control-center/keybindings" ]; @@ -39,11 +39,13 @@ in stdenv.mkDerivation rec { wrapProgram "$out/bin/gnome-shell" \ --prefix PATH : "${unzip}/bin" \ --prefix GI_TYPELIB_PATH : "$GI_TYPELIB_PATH" \ + --prefix GIO_EXTRA_MODULES : "${stdenv.lib.getLib dconf}/lib/gio/modules" \ --set GDK_PIXBUF_MODULE_FILE "$GDK_PIXBUF_MODULE_FILE" \ --prefix XDG_DATA_DIRS : "${gnome_themes_standard}/share:$out/share:$XDG_ICON_DIRS" \ --suffix XDG_DATA_DIRS : "$GSETTINGS_SCHEMAS_PATH" wrapProgram "$out/libexec/gnome-shell-calendar-server" \ + --prefix GIO_EXTRA_MODULES : "${stdenv.lib.getLib dconf}/lib/gio/modules" \ --prefix XDG_DATA_DIRS : "${evolution_data_server}/share:$out/share:$XDG_ICON_DIRS:$GSETTINGS_SCHEMAS_PATH" echo "${unzip}/bin" > $out/${passthru.mozillaPlugin}/extra-bin-path diff --git a/pkgs/desktops/gnome-3/3.22/core/gnome-system-log/default.nix b/pkgs/desktops/gnome-3/3.22/core/gnome-system-log/default.nix index 50ee229cfa4..aa6f48ac420 100644 --- a/pkgs/desktops/gnome-3/3.22/core/gnome-system-log/default.nix +++ b/pkgs/desktops/gnome-3/3.22/core/gnome-system-log/default.nix @@ -1,5 +1,5 @@ { stdenv, intltool, fetchurl, pkgconfig -, bash, gtk3, glib, makeWrapper +, bash, gtk3, glib, wrapGAppsHook , itstool, gnome3, librsvg, gdk_pixbuf, libxml2 }: stdenv.mkDerivation rec { @@ -18,12 +18,12 @@ stdenv.mkDerivation rec { propagatedBuildInputs = [ gdk_pixbuf gnome3.defaultIconTheme librsvg ]; buildInputs = [ bash pkgconfig gtk3 glib intltool itstool - gnome3.gsettings_desktop_schemas makeWrapper libxml2 ]; + gnome3.gsettings_desktop_schemas wrapGAppsHook libxml2 ]; preFixup = '' - wrapProgram "$out/bin/gnome-system-log" \ - --set GDK_PIXBUF_MODULE_FILE "$GDK_PIXBUF_MODULE_FILE" \ - --prefix XDG_DATA_DIRS : "${gtk3.out}/share:${gnome3.gnome_themes_standard}/share:$out/share:$XDG_ICON_DIRS:$GSETTINGS_SCHEMAS_PATH" + gappsWrapperArgs+=( + --prefix XDG_DATA_DIRS : "${gtk3.out}/share:${gnome3.gnome_themes_standard}/share" + ) ''; meta = with stdenv.lib; { diff --git a/pkgs/desktops/gnome-3/3.22/core/gnome-system-monitor/default.nix b/pkgs/desktops/gnome-3/3.22/core/gnome-system-monitor/default.nix index bdbdefecf22..8c3bf86edcf 100644 --- a/pkgs/desktops/gnome-3/3.22/core/gnome-system-monitor/default.nix +++ b/pkgs/desktops/gnome-3/3.22/core/gnome-system-monitor/default.nix @@ -1,5 +1,5 @@ { stdenv, intltool, fetchurl, pkgconfig, gtkmm3, libxml2 -, bash, gtk3, glib, makeWrapper +, bash, gtk3, glib, wrapGAppsHook , itstool, gnome3, librsvg, gdk_pixbuf, libgtop }: stdenv.mkDerivation rec { @@ -10,14 +10,14 @@ stdenv.mkDerivation rec { propagatedUserEnvPkgs = [ gnome3.gnome_themes_standard ]; buildInputs = [ bash pkgconfig gtk3 glib intltool itstool libxml2 - gtkmm3 libgtop makeWrapper + gtkmm3 libgtop wrapGAppsHook gdk_pixbuf gnome3.defaultIconTheme librsvg gnome3.gsettings_desktop_schemas ]; preFixup = '' - wrapProgram "$out/bin/gnome-system-monitor" \ - --set GDK_PIXBUF_MODULE_FILE "$GDK_PIXBUF_MODULE_FILE" \ - --prefix XDG_DATA_DIRS : "${gnome3.gnome_themes_standard}/share:$out/share:$XDG_ICON_DIRS:$GSETTINGS_SCHEMAS_PATH" + gappsWrapperArgs+=( + --prefix XDG_DATA_DIRS : "${gtk3.out}/share:${gnome3.gnome_themes_standard}/share" + ) ''; enableParallelBuilding = true; diff --git a/pkgs/desktops/gnome-3/3.22/core/tracker/default.nix b/pkgs/desktops/gnome-3/3.22/core/tracker/default.nix index 72ebd543e90..b086e386059 100644 --- a/pkgs/desktops/gnome-3/3.22/core/tracker/default.nix +++ b/pkgs/desktops/gnome-3/3.22/core/tracker/default.nix @@ -1,6 +1,6 @@ { stdenv, intltool, fetchurl, libxml2, upower , pkgconfig, gtk3, glib -, bash, makeWrapper, itstool, vala_0_32, sqlite, libxslt +, bash, wrapGAppsHook, itstool, vala_0_32, sqlite, libxslt , gnome3, librsvg, gdk_pixbuf, file, libnotify , evolution_data_server, gst_all_1, poppler , icu, taglib, libjpeg, libtiff, giflib, libcue @@ -19,8 +19,8 @@ stdenv.mkDerivation rec { buildInputs = [ vala_0_32 pkgconfig gtk3 glib intltool itstool libxml2 bzip2 gnome3.totem-pl-parser libxslt - gnome3.gsettings_desktop_schemas makeWrapper file - gdk_pixbuf gnome3.defaultIconTheme librsvg sqlite + gnome3.gsettings_desktop_schemas wrapGAppsHook + file gdk_pixbuf gnome3.defaultIconTheme librsvg sqlite upower libnotify evolution_data_server gnome3.libgee gst_all_1.gstreamer gst_all_1.gst-plugins-base flac poppler icu taglib libjpeg libtiff giflib libvorbis @@ -31,11 +31,9 @@ stdenv.mkDerivation rec { ''; preFixup = '' - for f in $out/bin/* $out/libexec/*; do - wrapProgram $f \ - --set GDK_PIXBUF_MODULE_FILE "$GDK_PIXBUF_MODULE_FILE" \ - --prefix XDG_DATA_DIRS : "${gnome3.gnome_themes_standard}/share:$out/share:$XDG_ICON_DIRS:$GSETTINGS_SCHEMAS_PATH" - done + gappsWrapperArgs+=( + --prefix XDG_DATA_DIRS : "${gnome3.gnome_themes_standard}/share" + ) ''; meta = with stdenv.lib; { diff --git a/pkgs/desktops/gnome-3/3.22/default.nix b/pkgs/desktops/gnome-3/3.22/default.nix index e79b66bdedf..1944cc98cfb 100644 --- a/pkgs/desktops/gnome-3/3.22/default.nix +++ b/pkgs/desktops/gnome-3/3.22/default.nix @@ -14,7 +14,7 @@ let callPackage = pkgs.newScope self; version = "3.22"; - maintainers = with pkgs.lib.maintainers; [ lethalman jgeerds ]; + maintainers = with pkgs.lib.maintainers; [ lethalman ]; corePackages = with gnome3; [ pkgs.desktop_file_utils pkgs.ibus diff --git a/pkgs/desktops/xfce/applications/mousepad.nix b/pkgs/desktops/xfce/applications/mousepad.nix index 475b48343a5..c15ab310f47 100644 --- a/pkgs/desktops/xfce/applications/mousepad.nix +++ b/pkgs/desktops/xfce/applications/mousepad.nix @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { preFixup = '' wrapProgram "$out/bin/mousepad" \ --prefix XDG_DATA_DIRS : "$GSETTINGS_SCHEMAS_PATH:${gtksourceview}/share" \ - --prefix GIO_EXTRA_MODULES : "${dconf}/lib/gio/modules" + --prefix GIO_EXTRA_MODULES : "${stdenv.lib.getLib dconf}/lib/gio/modules" ''; meta = { diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index 2d0d0ec101d..c3670613387 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -9,9 +9,9 @@ # # See comment at the top of configuration-nix.nix for more information about this # distinction. -{ pkgs }: +{ pkgs, haskellLib }: -with import ./lib.nix { inherit pkgs; }; +with haskellLib; self: super: { @@ -720,7 +720,7 @@ self: super: { owner = "haskell-servant"; repo = "servant"; rev = "v${ver}"; - sha256 = "09kjinnarf9q9l8irs46gcrai8bprq39n8pj43bmdv47hl38csa0"; + sha256 = "0bwd5dy3crn08dijn06dr3mdsww98kqxfp8v5mvrdws5glvcxdsg"; }}/doc"; buildInputs = with pkgs.pythonPackages; [ sphinx recommonmark sphinx_rtd_theme ]; makeFlags = "html"; diff --git a/pkgs/development/haskell-modules/configuration-ghc-6.12.x.nix b/pkgs/development/haskell-modules/configuration-ghc-6.12.x.nix index 6be7ae16572..387754d674e 100644 --- a/pkgs/development/haskell-modules/configuration-ghc-6.12.x.nix +++ b/pkgs/development/haskell-modules/configuration-ghc-6.12.x.nix @@ -1,6 +1,6 @@ -{ pkgs }: +{ pkgs, haskellLib }: -with import ./lib.nix { inherit pkgs; }; +with haskellLib; self: super: { diff --git a/pkgs/development/haskell-modules/configuration-ghc-7.0.x.nix b/pkgs/development/haskell-modules/configuration-ghc-7.0.x.nix index c2a7e001405..3edbc0d398b 100644 --- a/pkgs/development/haskell-modules/configuration-ghc-7.0.x.nix +++ b/pkgs/development/haskell-modules/configuration-ghc-7.0.x.nix @@ -1,6 +1,6 @@ -{ pkgs }: +{ pkgs, haskellLib }: -with import ./lib.nix { inherit pkgs; }; +with haskellLib; self: super: { diff --git a/pkgs/development/haskell-modules/configuration-ghc-7.10.x.nix b/pkgs/development/haskell-modules/configuration-ghc-7.10.x.nix index 7f561133b64..4a09b142d2e 100644 --- a/pkgs/development/haskell-modules/configuration-ghc-7.10.x.nix +++ b/pkgs/development/haskell-modules/configuration-ghc-7.10.x.nix @@ -1,6 +1,6 @@ -{ pkgs }: +{ pkgs, haskellLib }: -with import ./lib.nix { inherit pkgs; }; +with haskellLib; self: super: { diff --git a/pkgs/development/haskell-modules/configuration-ghc-7.2.x.nix b/pkgs/development/haskell-modules/configuration-ghc-7.2.x.nix index 911fb8640f4..75e0c9c0bcb 100644 --- a/pkgs/development/haskell-modules/configuration-ghc-7.2.x.nix +++ b/pkgs/development/haskell-modules/configuration-ghc-7.2.x.nix @@ -1,6 +1,6 @@ -{ pkgs }: +{ pkgs, haskellLib }: -with import ./lib.nix { inherit pkgs; }; +with haskellLib; self: super: { diff --git a/pkgs/development/haskell-modules/configuration-ghc-7.4.x.nix b/pkgs/development/haskell-modules/configuration-ghc-7.4.x.nix index 8a6d22bcc7e..1b15f4f105b 100644 --- a/pkgs/development/haskell-modules/configuration-ghc-7.4.x.nix +++ b/pkgs/development/haskell-modules/configuration-ghc-7.4.x.nix @@ -1,6 +1,6 @@ -{ pkgs }: +{ pkgs, haskellLib }: -with import ./lib.nix { inherit pkgs; }; +with haskellLib; self: super: { diff --git a/pkgs/development/haskell-modules/configuration-ghc-7.6.x.nix b/pkgs/development/haskell-modules/configuration-ghc-7.6.x.nix index 43ec45bf821..a096dc9ce8c 100644 --- a/pkgs/development/haskell-modules/configuration-ghc-7.6.x.nix +++ b/pkgs/development/haskell-modules/configuration-ghc-7.6.x.nix @@ -1,6 +1,6 @@ -{ pkgs }: +{ pkgs, haskellLib }: -with import ./lib.nix { inherit pkgs; }; +with haskellLib; self: super: { diff --git a/pkgs/development/haskell-modules/configuration-ghc-7.8.x.nix b/pkgs/development/haskell-modules/configuration-ghc-7.8.x.nix index a97cbfde4fc..f82bcb4e646 100644 --- a/pkgs/development/haskell-modules/configuration-ghc-7.8.x.nix +++ b/pkgs/development/haskell-modules/configuration-ghc-7.8.x.nix @@ -1,6 +1,6 @@ -{ pkgs }: +{ pkgs, haskellLib }: -with import ./lib.nix { inherit pkgs; }; +with haskellLib; self: super: { diff --git a/pkgs/development/haskell-modules/configuration-ghc-8.0.x.nix b/pkgs/development/haskell-modules/configuration-ghc-8.0.x.nix index bc72ec031ad..a24d2bcd4c1 100644 --- a/pkgs/development/haskell-modules/configuration-ghc-8.0.x.nix +++ b/pkgs/development/haskell-modules/configuration-ghc-8.0.x.nix @@ -1,6 +1,6 @@ -{ pkgs }: +{ pkgs, haskellLib }: -with import ./lib.nix { inherit pkgs; }; +with haskellLib; self: super: { diff --git a/pkgs/development/haskell-modules/configuration-ghc-8.2.x.nix b/pkgs/development/haskell-modules/configuration-ghc-8.2.x.nix index 6f4ced675b3..d1e22d881c3 100644 --- a/pkgs/development/haskell-modules/configuration-ghc-8.2.x.nix +++ b/pkgs/development/haskell-modules/configuration-ghc-8.2.x.nix @@ -1,6 +1,6 @@ -{ pkgs }: +{ pkgs, haskellLib }: -with import ./lib.nix { inherit pkgs; }; +with haskellLib; self: super: { diff --git a/pkgs/development/haskell-modules/configuration-ghc-head.nix b/pkgs/development/haskell-modules/configuration-ghc-head.nix index 6a9d15d402e..4b7fc3d8360 100644 --- a/pkgs/development/haskell-modules/configuration-ghc-head.nix +++ b/pkgs/development/haskell-modules/configuration-ghc-head.nix @@ -1,6 +1,6 @@ -{ pkgs }: +{ pkgs, haskellLib }: -with import ./lib.nix { inherit pkgs; }; +with haskellLib; self: super: { diff --git a/pkgs/development/haskell-modules/configuration-ghcjs.nix b/pkgs/development/haskell-modules/configuration-ghcjs.nix index 7efb75c3329..0f17f5ce707 100644 --- a/pkgs/development/haskell-modules/configuration-ghcjs.nix +++ b/pkgs/development/haskell-modules/configuration-ghcjs.nix @@ -2,14 +2,14 @@ # # Please insert new packages *alphabetically* # in the OTHER PACKAGES section. -{ pkgs }: +{ pkgs, haskellLib }: let removeLibraryHaskellDepends = pnames: depends: builtins.filter (e: !(builtins.elem (e.pname or "") pnames)) depends; in -with import ./lib.nix { inherit pkgs; }; +with haskellLib; self: super: diff --git a/pkgs/development/haskell-modules/configuration-halvm-2.4.0.nix b/pkgs/development/haskell-modules/configuration-halvm-2.4.0.nix index cd7857e23de..be90794f58d 100644 --- a/pkgs/development/haskell-modules/configuration-halvm-2.4.0.nix +++ b/pkgs/development/haskell-modules/configuration-halvm-2.4.0.nix @@ -1,6 +1,6 @@ -{ pkgs }: +{ pkgs, haskellLib }: -with import ./lib.nix { inherit pkgs; }; +with haskellLib; self: super: { diff --git a/pkgs/development/haskell-modules/configuration-nix.nix b/pkgs/development/haskell-modules/configuration-nix.nix index 7b9dbcdaa79..4dce5d59d4a 100644 --- a/pkgs/development/haskell-modules/configuration-nix.nix +++ b/pkgs/development/haskell-modules/configuration-nix.nix @@ -25,9 +25,9 @@ # * enabling/disabling certain features in packages # # If you have an override of this kind, see configuration-common.nix instead. -{ pkgs }: +{ pkgs, haskellLib }: -with import ./lib.nix { inherit pkgs; }; +with haskellLib; # All of the overrides in this set should look like: # diff --git a/pkgs/development/haskell-modules/default.nix b/pkgs/development/haskell-modules/default.nix index 32fa46f111d..1658ce79393 100644 --- a/pkgs/development/haskell-modules/default.nix +++ b/pkgs/development/haskell-modules/default.nix @@ -1,4 +1,4 @@ -{ pkgs, stdenv, ghc, all-cabal-hashes +{ pkgs, stdenv, lib, haskellLib, ghc, all-cabal-hashes , compilerConfig ? (self: super: {}) , packageSetConfig ? (self: super: {}) , overrides ? (self: super: {}) @@ -9,16 +9,16 @@ let - inherit (stdenv.lib) extends makeExtensible; - inherit (import ./lib.nix { inherit pkgs; }) overrideCabal makePackageSet; + inherit (lib) extends makeExtensible; + inherit (haskellLib) overrideCabal makePackageSet; - haskellPackages = makePackageSet { + haskellPackages = pkgs.callPackage makePackageSet { package-set = initialPackages; - inherit ghc extensible-self; + inherit stdenv haskellLib ghc extensible-self; }; - commonConfiguration = configurationCommon { inherit pkgs; }; - nixConfiguration = configurationNix { inherit pkgs; }; + commonConfiguration = configurationCommon { inherit pkgs haskellLib; }; + nixConfiguration = configurationNix { inherit pkgs haskellLib; }; extensible-self = makeExtensible (extends overrides diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix index f5b5e42f065..3b2d9594d98 100644 --- a/pkgs/development/haskell-modules/hackage-packages.nix +++ b/pkgs/development/haskell-modules/hackage-packages.nix @@ -3552,6 +3552,30 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "DOH" = callPackage + ({ mkDerivation, aeson, aeson-casing, base, bytestring, containers + , filepath, http-client, http-client-tls, http-types + , interpolatedstring-perl6, lens, mtl, QuickCheck + , quickcheck-instances, text, time, unordered-containers, uri + }: + mkDerivation { + pname = "DOH"; + version = "0.1.1.1"; + sha256 = "14wj5jdj0s3ygxqz46622j241hxz0h5apmnq7w407xk590c74z64"; + libraryHaskellDepends = [ + aeson aeson-casing base bytestring containers filepath http-client + http-client-tls http-types lens mtl text time unordered-containers + uri + ]; + testHaskellDepends = [ + aeson aeson-casing base bytestring containers filepath http-client + http-client-tls http-types interpolatedstring-perl6 lens mtl + QuickCheck quickcheck-instances text time unordered-containers uri + ]; + description = "Complete API bindings for DigitalOcean API V2"; + license = stdenv.lib.licenses.mit; + }) {}; + "DOM" = callPackage ({ mkDerivation, base, mtl, WebBits }: mkDerivation { @@ -4580,6 +4604,30 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "Earley_0_12_0_1" = callPackage + ({ mkDerivation, base, criterion, deepseq, ListLike, parsec + , QuickCheck, tasty, tasty-hunit, tasty-quickcheck + , unordered-containers + }: + mkDerivation { + pname = "Earley"; + version = "0.12.0.1"; + sha256 = "1cfmarpbldayhdynahw5gkxspsgi4kkjcybisk4kzhdj40yaj9pw"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ base ListLike ]; + executableHaskellDepends = [ base unordered-containers ]; + testHaskellDepends = [ + base QuickCheck tasty tasty-hunit tasty-quickcheck + ]; + benchmarkHaskellDepends = [ + base criterion deepseq ListLike parsec + ]; + description = "Parsing all context-free grammars using Earley's algorithm"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "Ebnf2ps" = callPackage ({ mkDerivation, array, base, containers, directory, happy , old-time, unix @@ -5705,6 +5753,32 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "Frames_0_2_1" = callPackage + ({ mkDerivation, base, criterion, directory, ghc-prim, hspec, htoml + , HUnit, pipes, pretty, primitive, readable, regex-applicative + , template-haskell, temporary, text, transformers + , unordered-containers, vector, vinyl + }: + mkDerivation { + pname = "Frames"; + version = "0.2.1"; + sha256 = "1mj2s4afj5wlpg3893j2nd5z98vcxqxi83s1z82lknaq6i7n805q"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + base ghc-prim pipes primitive readable template-haskell text + transformers vector vinyl + ]; + testHaskellDepends = [ + base directory hspec htoml HUnit pipes pretty regex-applicative + template-haskell temporary text unordered-containers + ]; + benchmarkHaskellDepends = [ base criterion pipes transformers ]; + description = "Data frames For working with tabular data files"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "Frank" = callPackage ({ mkDerivation, base, mtl, newtype, she, void }: mkDerivation { @@ -6118,8 +6192,8 @@ self: { }: mkDerivation { pname = "Gamgine"; - version = "0.5.1"; - sha256 = "07srdid5354y2za3hc76j2rjb84y77vjaz8gdhlp7qnbmfsnqipd"; + version = "0.5.2"; + sha256 = "0kry2ni9ba3sf2dpsjz0dq4dwnbgjicr1lwl7q4r8w6my94gkas0"; enableSeparateDataOutput = true; libraryHaskellDepends = [ array base bytestring composition cpphs data-lens directory @@ -9176,6 +9250,24 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "HaskellNet-SSL_0_3_4_0" = callPackage + ({ mkDerivation, base, bytestring, connection, data-default + , HaskellNet, network, tls + }: + mkDerivation { + pname = "HaskellNet-SSL"; + version = "0.3.4.0"; + sha256 = "03q48g4gzmhjl4a5wwn0q3man8s44pn028a0fidjpmfmgxa95bl3"; + enableSeparateDataOutput = true; + libraryHaskellDepends = [ + base bytestring connection data-default HaskellNet network tls + ]; + homepage = "https://github.com/dpwright/HaskellNet-SSL"; + description = "Helpers to connect to SSL/TLS mail servers with HaskellNet"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "HaskellTorrent" = callPackage ({ mkDerivation, base, bytestring, cereal, cml, containers , directory, hopenssl, hslogger, HTTP, HUnit, mtl, network, parsec @@ -10635,6 +10727,8 @@ self: { pname = "JuicyPixels-scale-dct"; version = "0.1.1.2"; sha256 = "15py0slh1jij8wrd68q0fqs9yarnabr470xm04i92904a809vgcs"; + revision = "1"; + editedCabalFile = "08myhf2912c5hd7hhiq58lsylfpj2zwhak5kmhhcffc7zsvhcl24"; libraryHaskellDepends = [ base base-compat carray fft JuicyPixels ]; @@ -11220,17 +11314,20 @@ self: { }) {}; "Lazy-Pbkdf2" = callPackage - ({ mkDerivation, base, base16-bytestring, binary, bytestring - , cryptonite, memory + ({ mkDerivation, base, base16-bytestring, binary, byteable + , bytestring, criterion, cryptonite, memory }: mkDerivation { pname = "Lazy-Pbkdf2"; - version = "2.1.2"; - sha256 = "18x1md6ljxksqfp2336bk8l7fhw2rgafa0kqg8x1lskml9xkjfca"; + version = "3.0.0"; + sha256 = "0rcbsjypr4k5s8jsw1wchl9y3v7b9nvy92046hvzah69rd2hcqj1"; libraryHaskellDepends = [ base binary bytestring ]; testHaskellDepends = [ base base16-bytestring binary bytestring cryptonite memory ]; + benchmarkHaskellDepends = [ + base binary byteable bytestring criterion cryptonite memory + ]; description = "Lazy PBKDF2 generator"; license = stdenv.lib.licenses.mit; }) {}; @@ -15726,8 +15823,8 @@ self: { ({ mkDerivation, base, containers, ghc, ghc-paths }: mkDerivation { pname = "SSTG"; - version = "0.1.0.8"; - sha256 = "1qnjskpwf4zxzcf443qq31zm7rc6p4ch46p1mh19vm4hq2bnkcfl"; + version = "0.1.1.2"; + sha256 = "1vf5c5k6b5nww2acm0r17imcpsl2p6xbg4qqzwdalpj7xhd3bvi9"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base containers ghc ghc-paths ]; @@ -20706,26 +20803,28 @@ self: { }) {}; "activehs" = callPackage - ({ mkDerivation, activehs-base, array, base, blaze-html, bytestring - , cmdargs, containers, data-pprint, deepseq, dia-base - , dia-functions, directory, filepath, haskell-src-exts - , highlighting-kate, hint, hoogle, mtl, old-locale, old-time - , pandoc, process, pureMD5, QuickCheck, simple-reflect, snap-core - , snap-server, split, syb, text, time, utf8-string, xhtml + ({ mkDerivation, activehs-base, array, base, blaze-html + , blaze-markup, bytestring, cmdargs, containers, data-pprint + , deepseq, dia-base, dia-functions, directory, exceptions, filepath + , haskell-src-exts, highlighting-kate, hint, hoogle, mtl + , old-locale, old-time, pandoc, process, pureMD5, QuickCheck + , simple-reflect, snap-core, snap-server, split, syb, text, time + , utf8-string, xhtml }: mkDerivation { pname = "activehs"; - version = "0.3.1"; - sha256 = "03za0c24a22fy28mcm173r0cca6fk60jikp0pp817mrq6gpv62hc"; + version = "0.3.2"; + sha256 = "0n5bb5bdigf3b0016ljv5r3bki3fq6j5dv7csvkdq7pdvghzw3gp"; isLibrary = false; isExecutable = true; enableSeparateDataOutput = true; executableHaskellDepends = [ - activehs-base array base blaze-html bytestring cmdargs containers - data-pprint deepseq dia-base dia-functions directory filepath - haskell-src-exts highlighting-kate hint hoogle mtl old-locale - old-time pandoc process pureMD5 QuickCheck simple-reflect snap-core - snap-server split syb text time utf8-string xhtml + activehs-base array base blaze-html blaze-markup bytestring cmdargs + containers data-pprint deepseq dia-base dia-functions directory + exceptions filepath haskell-src-exts highlighting-kate hint hoogle + mtl old-locale old-time pandoc process pureMD5 QuickCheck + simple-reflect snap-core snap-server split syb text time + utf8-string xhtml ]; description = "Haskell code presentation tool"; license = stdenv.lib.licenses.bsd3; @@ -20738,6 +20837,8 @@ self: { pname = "activehs-base"; version = "0.3.0.4"; sha256 = "0gmixyawdl0kk351k8n5g7k3cfxv1qlbish750kv5kip6xc1dmcj"; + revision = "1"; + editedCabalFile = "1v2sw9n9kiqc7cy0v1923ld645dykmk57bgdrgdgfv6qkfp6ghdd"; libraryHaskellDepends = [ base QuickCheck ]; description = "Basic definitions for activehs"; license = stdenv.lib.licenses.bsd3; @@ -20794,6 +20895,28 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "ad_4_3_4" = callPackage + ({ mkDerivation, array, base, Cabal, cabal-doctest, comonad + , containers, criterion, data-reify, directory, doctest, erf + , filepath, free, nats, reflection, transformers + }: + mkDerivation { + pname = "ad"; + version = "4.3.4"; + sha256 = "0r3qixsj624q5c88xlr444fn7z5c36m32ciyxz732lngg06pvwdz"; + setupHaskellDepends = [ base Cabal cabal-doctest ]; + libraryHaskellDepends = [ + array base comonad containers data-reify erf free nats reflection + transformers + ]; + testHaskellDepends = [ base directory doctest filepath ]; + benchmarkHaskellDepends = [ base criterion erf ]; + homepage = "http://github.com/ekmett/ad"; + description = "Automatic Differentiation"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "adaptive-containers" = callPackage ({ mkDerivation, base }: mkDerivation { @@ -21410,18 +21533,18 @@ self: { "aeson-flowtyped" = callPackage ({ mkDerivation, aeson, base, containers, free, recursion-schemes , reflection, scientific, tasty, tasty-hunit, text, time - , unordered-containers, vector, wl-pprint + , transformers, unordered-containers, vector, wl-pprint }: mkDerivation { pname = "aeson-flowtyped"; - version = "0.7.5"; - sha256 = "1hhg3fai44i506d7iphi8xl2lzqr14rbc1f96wc3gayyv96ia8az"; + version = "0.9.0"; + sha256 = "1j593x15bm8b4l59cbzgcg6vgwibjfa4nilsj6dl1y8cfbqwj4aa"; libraryHaskellDepends = [ aeson base containers free recursion-schemes reflection scientific - text time unordered-containers vector wl-pprint + text time transformers unordered-containers vector wl-pprint ]; testHaskellDepends = [ - aeson base recursion-schemes tasty tasty-hunit text + aeson base containers recursion-schemes tasty tasty-hunit text unordered-containers vector ]; homepage = "https://github.com/mikeplus64/aeson-flowtyped#readme"; @@ -22398,6 +22521,21 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "alarmclock_0_4_0_3" = callPackage + ({ mkDerivation, async, base, clock, stm, time, unbounded-delays }: + mkDerivation { + pname = "alarmclock"; + version = "0.4.0.3"; + sha256 = "0phgcmji4jrmyia6w05wqllrdl2hnsyxfkbh68dlgi7gn0c5nvxn"; + libraryHaskellDepends = [ + async base clock stm time unbounded-delays + ]; + homepage = "https://bitbucket.org/davecturner/alarmclock"; + description = "Wake up and perform an action at a certain time"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "alea" = callPackage ({ mkDerivation, base, optparse-applicative, random, text }: mkDerivation { @@ -22637,6 +22775,23 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "algebraic-graphs_0_0_5" = callPackage + ({ mkDerivation, array, base, containers, criterion, extra + , QuickCheck + }: + mkDerivation { + pname = "algebraic-graphs"; + version = "0.0.5"; + sha256 = "046507r77wn4f6grxzrh2n90rnllp1inhdvn4fg9ki36k5qgqyzx"; + libraryHaskellDepends = [ array base containers ]; + testHaskellDepends = [ base containers extra QuickCheck ]; + benchmarkHaskellDepends = [ base containers criterion ]; + homepage = "https://github.com/snowleopard/alga"; + description = "A library for algebraic graph construction and transformation"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "algebraic-prelude" = callPackage ({ mkDerivation, algebra, base, basic-prelude, lens, semigroups }: mkDerivation { @@ -26412,6 +26567,30 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "approximate_0_3_1" = callPackage + ({ mkDerivation, base, binary, bytes, Cabal, cabal-doctest, cereal + , comonad, deepseq, directory, doctest, filepath, ghc-prim + , hashable, lens, log-domain, pointed, safecopy, semigroupoids + , semigroups, simple-reflect, vector + }: + mkDerivation { + pname = "approximate"; + version = "0.3.1"; + sha256 = "18ifmp1c2km3ssp51m94vxqzx7yx6c21ychp7ajnhgg7v4bgfdyq"; + setupHaskellDepends = [ base Cabal cabal-doctest ]; + libraryHaskellDepends = [ + base binary bytes cereal comonad deepseq ghc-prim hashable lens + log-domain pointed safecopy semigroupoids semigroups vector + ]; + testHaskellDepends = [ + base directory doctest filepath semigroups simple-reflect + ]; + homepage = "http://github.com/analytics/approximate/"; + description = "Approximate discrete values and numbers"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "approximate-equality" = callPackage ({ mkDerivation, base, type-level-natural-number }: mkDerivation { @@ -28143,6 +28322,19 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "atomic-primops_0_8_1" = callPackage + ({ mkDerivation, base, ghc-prim, primitive }: + mkDerivation { + pname = "atomic-primops"; + version = "0.8.1"; + sha256 = "0zqbx0sfgl0hi8bqavvwjxsczayxrhwjqxymaawrvn44xr9g35c1"; + libraryHaskellDepends = [ base ghc-prim primitive ]; + homepage = "https://github.com/rrnewton/haskell-lockfree/wiki"; + description = "A safe approach to CAS and other atomic ops in Haskell"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "atomic-primops-foreign" = callPackage ({ mkDerivation, base, bits-atomic, HUnit, test-framework , test-framework-hunit, time @@ -28336,6 +28528,36 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "attoparsec_0_13_2_0" = callPackage + ({ mkDerivation, array, base, bytestring, case-insensitive + , containers, criterion, deepseq, directory, filepath, ghc-prim + , http-types, parsec, QuickCheck, quickcheck-unicode, scientific + , tasty, tasty-quickcheck, text, transformers, unordered-containers + , vector + }: + mkDerivation { + pname = "attoparsec"; + version = "0.13.2.0"; + sha256 = "1wrwj359r0kgrcc2kw1yl9cpvkihhq0qm3i12kw39707s6m2x0pd"; + libraryHaskellDepends = [ + array base bytestring containers deepseq scientific text + transformers + ]; + testHaskellDepends = [ + array base bytestring deepseq QuickCheck quickcheck-unicode + scientific tasty tasty-quickcheck text transformers vector + ]; + benchmarkHaskellDepends = [ + array base bytestring case-insensitive containers criterion deepseq + directory filepath ghc-prim http-types parsec scientific text + transformers unordered-containers vector + ]; + homepage = "https://github.com/bos/attoparsec"; + description = "Fast combinator parsing for bytestrings and text"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "attoparsec-arff" = callPackage ({ mkDerivation, attoparsec, base, bytestring }: mkDerivation { @@ -30342,6 +30564,20 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "bank-holidays-england_0_1_0_6" = callPackage + ({ mkDerivation, base, containers, hspec, QuickCheck, time }: + mkDerivation { + pname = "bank-holidays-england"; + version = "0.1.0.6"; + sha256 = "1arlyjaaq8df2q121r9lc23wacn02ncdx5b7s8yszp6szx5jivap"; + libraryHaskellDepends = [ base containers time ]; + testHaskellDepends = [ base containers hspec QuickCheck time ]; + homepage = "https://bitbucket.org/davecturner/bank-holidays-england"; + description = "Calculation of bank holidays in England and Wales"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "banwords" = callPackage ({ mkDerivation, attoparsec, base, bytestring, data-default, HUnit , test-framework, test-framework-hunit, text, vector @@ -32272,6 +32508,17 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "binary-serialise-cbor" = callPackage + ({ mkDerivation, base, bytestring, cborg, serialise }: + mkDerivation { + pname = "binary-serialise-cbor"; + version = "0.1.1.0"; + sha256 = "0wrf9skl99aalf9pbb8a43i80r8vimn6vih4sidw615cw3k4yapg"; + libraryHaskellDepends = [ base bytestring cborg serialise ]; + description = "Yet Another Binary Serialisation Library (compatibility shim)"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "binary-shared" = callPackage ({ mkDerivation, base, binary, bytestring, containers, mtl }: mkDerivation { @@ -32391,6 +32638,8 @@ self: { pname = "binary-typed"; version = "1.0"; sha256 = "02ans3vny69qfsmwlgri7v31rpff0h3mdp2zpikclay50a471ww5"; + revision = "1"; + editedCabalFile = "1jnmdi3bnyiyvqlmgh5k8cdcbnl594yq3wrs6cjipw0ik06ar0y2"; libraryHaskellDepends = [ base binary bytestring murmur-hash ]; testHaskellDepends = [ base binary bytestring tasty tasty-hunit tasty-quickcheck @@ -33906,6 +34155,8 @@ self: { pname = "bits"; version = "0.5.1"; sha256 = "14ww8zcyis6kfli28bb9i5dmmj7k1j1dlzpwnfrkzd8kp5xmazk5"; + revision = "1"; + editedCabalFile = "06gsbm787kanng2p37sfkpzh9s630bcxgncayn3alxk3y5q5yi7l"; setupHaskellDepends = [ base Cabal cabal-doctest ]; libraryHaskellDepends = [ base bytes mtl transformers ]; testHaskellDepends = [ base doctest ]; @@ -35425,6 +35676,20 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "bookkeeping_0_2_1_4" = callPackage + ({ mkDerivation, base, dlist, doctest, Glob, mtl, text, time }: + mkDerivation { + pname = "bookkeeping"; + version = "0.2.1.4"; + sha256 = "1r17x9a5fapqn8ldvyr19l5g5qfxmvzqc5d3rp6rjg60r7k98hpz"; + libraryHaskellDepends = [ base dlist mtl text time ]; + testHaskellDepends = [ base doctest Glob ]; + homepage = "https://github.com/arowM/haskell-bookkeeping#readme"; + description = "A module for bookkeeping by double entry"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "bookkeeping-jp" = callPackage ({ mkDerivation, base, bookkeeping, doctest, Glob, mono-traversable , text, time @@ -35745,6 +36010,31 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "bound_2_0_1" = callPackage + ({ mkDerivation, base, bifunctors, binary, bytes, Cabal + , cabal-doctest, cereal, comonad, deepseq, deriving-compat, doctest + , functor-classes-compat, hashable, mmorph, profunctors + , template-haskell, transformers, transformers-compat, vector, void + }: + mkDerivation { + pname = "bound"; + version = "2.0.1"; + sha256 = "0xmvkwambzmji1czxipl9cms5l3v98765b9spmb3wn5n6dpj0ji9"; + setupHaskellDepends = [ base Cabal cabal-doctest ]; + libraryHaskellDepends = [ + base bifunctors binary bytes cereal comonad deepseq hashable mmorph + profunctors template-haskell transformers transformers-compat + ]; + testHaskellDepends = [ + base deriving-compat doctest functor-classes-compat transformers + transformers-compat vector void + ]; + homepage = "http://github.com/ekmett/bound/"; + description = "Making de Bruijn Succ Less"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "bound-gen" = callPackage ({ mkDerivation, base, bound, monad-gen, mtl }: mkDerivation { @@ -36743,8 +37033,8 @@ self: { }: mkDerivation { pname = "butcher"; - version = "1.1.0.0"; - sha256 = "0z80gkx1b69742a784d95864rf9kqww702xcg9hfl8ra1ah45d96"; + version = "1.1.0.1"; + sha256 = "0j2qknsgq11nc3n0hjx9ck76014sg7if0d75vjjsw1kjlr3rykn5"; libraryHaskellDepends = [ base bifunctors containers deque either extra free microlens microlens-th mtl multistate pretty transformers unsafe void @@ -36878,6 +37168,8 @@ self: { pname = "bytes"; version = "0.15.3"; sha256 = "0kfdw1c13y3kxc1s9nzyavrv1ccipzrmqlwmigj3gnwjcjvddp6q"; + revision = "1"; + editedCabalFile = "1fnv8vlbv8m5k9n5rik6pq693n0nfi9bkx2d8f7y5vvfly5bbkpw"; setupHaskellDepends = [ base Cabal cabal-doctest ]; libraryHaskellDepends = [ base binary bytestring cereal containers hashable mtl scientific @@ -37599,8 +37891,8 @@ self: { }: mkDerivation { pname = "cabal-bounds"; - version = "1.1.0"; - sha256 = "12p5k0b4q66lbcsc59nvn7pnvwf627hfyrnl1p5nymirwkb4w4bl"; + version = "1.2.0"; + sha256 = "1lbkfz5sw292br1zcki2r3qpzc1q5hk3h40xkbbhflqmw3m1h0fj"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -37623,8 +37915,8 @@ self: { }: mkDerivation { pname = "cabal-cargs"; - version = "0.7.11"; - sha256 = "0xvjnl59zx424wyqcknzsma467a8bgg9588smqifk3qa390l838n"; + version = "0.7.12"; + sha256 = "18d0sky1h4n41j4hib34ji51jh3ikm68gdc60qv361i7pwrmi1mk"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -38172,6 +38464,25 @@ self: { license = stdenv.lib.licenses.gpl3; }) {}; + "cabal-rpm_0_11_2" = callPackage + ({ mkDerivation, base, Cabal, directory, filepath, old-locale + , process, time, unix + }: + mkDerivation { + pname = "cabal-rpm"; + version = "0.11.2"; + sha256 = "18k9dbjz97d6nhnjjr0xqs7z49qcisia3l9h0rg58s5xqkjvzq89"; + 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 { @@ -38685,6 +38996,8 @@ self: { pname = "cacophony"; version = "0.10.0"; sha256 = "1hjxzpbnp5qzbjl9m0hyvlr7yflfgxr5kqbviamhpgc0lj5igizv"; + revision = "1"; + editedCabalFile = "0j73lknyxlj5zs36sjm3z1z4azqi2zzm5aas6c635k6bqpn4wac6"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -40140,6 +40453,18 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "cast" = callPackage + ({ mkDerivation, base }: + mkDerivation { + pname = "cast"; + version = "0.1.0.2"; + sha256 = "14dwsy80v1k0d9ksxb83h5lrz311d3nsgzcxxvivcdj4jzjlbm94"; + libraryHaskellDepends = [ base ]; + homepage = "https://github.com/haskell-patterns/cast#readme"; + description = "Abstact cast pattern"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "castle" = callPackage ({ mkDerivation, base, containers, optparse-applicative, shelly , system-fileio, system-filepath, text @@ -40372,6 +40697,61 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "cbor-tool" = callPackage + ({ mkDerivation, aeson, aeson-pretty, base, bytestring, cborg + , cborg-json, filepath, scientific, text, unordered-containers + , vector + }: + mkDerivation { + pname = "cbor-tool"; + version = "0.1.0.0"; + sha256 = "1jx51l75hm76fsk9wsc7jhqg857n77s8xb8bcjbkr698qwfbf14m"; + isLibrary = false; + isExecutable = true; + executableHaskellDepends = [ + aeson aeson-pretty base bytestring cborg cborg-json filepath + scientific text unordered-containers vector + ]; + homepage = "https://github.com/well-typed/cborg"; + description = "A tool for manipulating CBOR"; + license = stdenv.lib.licenses.bsd3; + }) {}; + + "cborg" = callPackage + ({ mkDerivation, array, base, bytestring, containers, ghc-prim + , half, integer-gmp, primitive, text + }: + mkDerivation { + pname = "cborg"; + version = "0.1.1.0"; + sha256 = "120ljrwm15zl49nlsn9wb702sb97d2p300mzbpx8wxr2zdzlffpj"; + revision = "1"; + editedCabalFile = "0qqg1gfjf869ynrh20fbrpfhjf2yh6v3i5s6w327sirbhw9ajk6v"; + libraryHaskellDepends = [ + array base bytestring containers ghc-prim half integer-gmp + primitive text + ]; + description = "Concise Binary Object Representation"; + license = stdenv.lib.licenses.bsd3; + }) {}; + + "cborg-json" = callPackage + ({ mkDerivation, aeson, aeson-pretty, base, cborg, scientific, text + , unordered-containers, vector + }: + mkDerivation { + pname = "cborg-json"; + version = "0.1.0.0"; + sha256 = "1dx7ap8ks8g3c68jdkni958v2g04swphfi0nkyjznyz0dl6vs9mz"; + libraryHaskellDepends = [ + aeson aeson-pretty base cborg scientific text unordered-containers + vector + ]; + homepage = "https://github.com/well-typed/cborg"; + description = "A library for encoding JSON as CBOR"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "cci" = callPackage ({ mkDerivation, base, binary, bytestring, cci, cmdargs, containers , filepath, mtl, pretty, process, random, time @@ -41272,12 +41652,18 @@ self: { }: mkDerivation { pname = "chatwork"; - version = "0.1.1.0"; - sha256 = "0xslzn94qhzidayv0nd8rfm9jvfi38dygvwd1lj7vwjgd4yrxy1m"; + version = "0.1.1.1"; + sha256 = "0b4pa4hbx8a4cs2yhad0kwm784w5vra858ixmjfk5jis5xxq279x"; + isLibrary = true; + isExecutable = true; libraryHaskellDepends = [ aeson aeson-casing base bytestring connection data-default-class http-api-data http-client http-client-tls http-types req text ]; + executableHaskellDepends = [ + aeson aeson-casing base bytestring connection data-default-class + http-api-data http-client http-client-tls http-types req text + ]; testHaskellDepends = [ aeson aeson-casing base bytestring connection data-default-class hspec http-api-data http-client http-client-tls http-types req @@ -41314,6 +41700,27 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "cheapskate_0_1_1" = callPackage + ({ mkDerivation, base, blaze-html, bytestring, containers + , data-default, deepseq, mtl, syb, text, uniplate, xss-sanitize + }: + mkDerivation { + pname = "cheapskate"; + version = "0.1.1"; + sha256 = "1hiqi7h76shjzs2zj0j8g6wnq2hbiq1hmfafdazr97fba2zl2432"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + base blaze-html containers data-default deepseq mtl syb text + uniplate xss-sanitize + ]; + executableHaskellDepends = [ base blaze-html bytestring text ]; + homepage = "http://github.com/jgm/cheapskate"; + description = "Experimental markdown processor"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "cheapskate-highlight" = callPackage ({ mkDerivation, base, blaze-html, cheapskate, highlighting-kate , text @@ -44794,6 +45201,25 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "columbia" = callPackage + ({ mkDerivation, array, base, bytestring, containers, contravariant + , data-endian, directory, filelock, invariant, mmap, mmorph + , monad-loops, mtl, parallel, pointless-haskell, syb-with-class + , transformers + }: + mkDerivation { + pname = "columbia"; + version = "0.1.0.2"; + sha256 = "152f43s2dm81amag28kav9a1gfyg97rxhd2dm3ivip98j8p1d6j0"; + libraryHaskellDepends = [ + array base bytestring containers contravariant data-endian + directory filelock invariant mmap mmorph monad-loops mtl parallel + pointless-haskell syb-with-class transformers + ]; + description = "Enhanced serialization for media that support seeking"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "com" = callPackage ({ mkDerivation }: mkDerivation { @@ -45102,6 +45528,27 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "comonad_5_0_2" = callPackage + ({ mkDerivation, base, Cabal, cabal-doctest, containers + , contravariant, distributive, doctest, semigroups, tagged + , transformers, transformers-compat + }: + mkDerivation { + pname = "comonad"; + version = "5.0.2"; + sha256 = "115pai560rllsmym76bj787kwz5xx19y8bl6262005nddqwzxc0v"; + setupHaskellDepends = [ base Cabal cabal-doctest ]; + libraryHaskellDepends = [ + base containers contravariant distributive semigroups tagged + transformers transformers-compat + ]; + testHaskellDepends = [ base doctest ]; + homepage = "http://github.com/ekmett/comonad/"; + description = "Comonads"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "comonad-extras" = callPackage ({ mkDerivation, array, base, comonad, containers, distributive , semigroupoids, transformers @@ -45412,6 +45859,30 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "compensated_0_7_2" = callPackage + ({ mkDerivation, base, bifunctors, binary, bytes, Cabal + , cabal-doctest, cereal, comonad, deepseq, distributive, doctest + , generic-deriving, hashable, lens, log-domain, safecopy + , semigroupoids, semigroups, simple-reflect, vector + }: + mkDerivation { + pname = "compensated"; + version = "0.7.2"; + sha256 = "1qna4g1zcc89r1ambswrq65pql6k6g3dv0ivlgnhswl6lm3vzyf7"; + setupHaskellDepends = [ base Cabal cabal-doctest ]; + libraryHaskellDepends = [ + base bifunctors binary bytes cereal comonad deepseq distributive + hashable lens log-domain safecopy semigroupoids semigroups vector + ]; + testHaskellDepends = [ + base doctest generic-deriving semigroups simple-reflect + ]; + homepage = "http://github.com/analytics/compensated/"; + description = "Compensated floating-point arithmetic"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "competition" = callPackage ({ mkDerivation, base, filepath, parsec }: mkDerivation { @@ -45563,8 +46034,8 @@ self: { }: mkDerivation { pname = "composite-aeson"; - version = "0.4.2.0"; - sha256 = "06zaji95znvy5v9qmyczdncqgdmp2jkibqimchziayjs1vcmb8bg"; + version = "0.5.0.0"; + sha256 = "1h8kn3isnxx1qqd50h5af8rk9i88nfb7iiqjfy1kwszvjq6qap3p"; libraryHaskellDepends = [ aeson aeson-better-errors base composite-base containers contravariant generic-deriving hashable lens mmorph mtl profunctors @@ -45589,8 +46060,8 @@ self: { }: mkDerivation { pname = "composite-aeson-refined"; - version = "0.4.2.0"; - sha256 = "1zzqrjvlk6yy2zsx1v325mbwl9qjjwj6qvc42y61acag9n08asv5"; + version = "0.5.0.0"; + sha256 = "0s09qmr6rjkm28jz78cg9bz1zqhv0mlp7g5wpy9c7cblwz5wf4qd"; libraryHaskellDepends = [ aeson-better-errors base composite-aeson mtl refined ]; @@ -45607,8 +46078,8 @@ self: { }: mkDerivation { pname = "composite-base"; - version = "0.4.2.0"; - sha256 = "0mfz7xpkl3lxg3pfk83mba7kb9phpcc4cnvimpphfcbwpzx8qcqw"; + version = "0.5.0.0"; + sha256 = "18fqmawlh5i4j04vj5kfqhb7cqlzfvv9326fqs3m4yzwh7zrmiqk"; libraryHaskellDepends = [ base exceptions lens monad-control mtl profunctors template-haskell text transformers transformers-base vinyl @@ -45629,8 +46100,8 @@ self: { }: mkDerivation { pname = "composite-ekg"; - version = "0.4.2.0"; - sha256 = "06lb5djs1w9gby7f192wssxwbik2lpigzsfv25z5pchf8iab4f9d"; + version = "0.5.0.0"; + sha256 = "0q74j2jnzdj79srziz1ldpjs4xcysjr1dp9b8fsg4bghwfnkc7sc"; libraryHaskellDepends = [ base composite-base ekg ekg-core lens text vinyl ]; @@ -45641,18 +46112,23 @@ self: { }) {}; "composite-opaleye" = callPackage - ({ mkDerivation, base, bytestring, composite-base, lens, opaleye - , postgresql-simple, product-profunctors, profunctors - , template-haskell, text, vinyl + ({ mkDerivation, base, bytestring, composite-base, hspec, lens + , opaleye, postgresql-simple, product-profunctors, profunctors + , QuickCheck, template-haskell, text, vinyl }: mkDerivation { pname = "composite-opaleye"; - version = "0.4.2.0"; - sha256 = "0id817bwss3haskvfpn86bqsva8a0ahwbgbzh5zbyiwc5vqksnkx"; + version = "0.5.0.0"; + sha256 = "0s9nf2nyz7knpcx0x1y0ck8x1cjxdmsdrc1nvqyb1264lkd863cj"; libraryHaskellDepends = [ base bytestring composite-base lens opaleye postgresql-simple product-profunctors profunctors template-haskell text vinyl ]; + testHaskellDepends = [ + base bytestring composite-base hspec lens opaleye postgresql-simple + product-profunctors profunctors QuickCheck template-haskell text + vinyl + ]; homepage = "https://github.com/ConferHealth/composite#readme"; description = "Opaleye SQL for Frames records"; license = stdenv.lib.licenses.bsd3; @@ -45968,34 +46444,42 @@ self: { }) {}; "concrete-haskell" = callPackage - ({ mkDerivation, base, bytestring, bzlib, containers, directory - , filepath, hashable, megaparsec, mtl, network, optparse-generic - , path-io, process, QuickCheck, scientific, tar, text, thrift, time - , unordered-containers, uuid, vector, zip, zlib + ({ mkDerivation, base, binary, bytestring, bzlib + , concrete-haskell-autogen, containers, directory, filepath + , hashable, megaparsec, monad-extras, mtl, network + , optparse-generic, path, path-io, process, QuickCheck, scientific + , tar, text, thrift, time, unordered-containers, uuid, vector, zip + , zlib }: mkDerivation { pname = "concrete-haskell"; - version = "0.1.0.11"; - sha256 = "12kvwxngsnh3lhp1q415ga8apkadfb8cxzvrlmlvrjdk6p5aczza"; + version = "0.1.0.13"; + sha256 = "1vhwph94v6wspfk4bxafv9zq0l6x5s3lz7rrz9xc99pqwz3dhj2l"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ - base bytestring bzlib containers directory filepath hashable - megaparsec mtl network optparse-generic path-io process QuickCheck - scientific tar text thrift time unordered-containers uuid vector - zip zlib + base binary bytestring bzlib concrete-haskell-autogen containers + directory filepath hashable megaparsec monad-extras mtl network + optparse-generic path path-io process QuickCheck scientific tar + text thrift time unordered-containers uuid vector zip zlib ]; executableHaskellDepends = [ - base bytestring bzlib containers directory filepath hashable - megaparsec mtl network optparse-generic path-io process QuickCheck - scientific tar text thrift time unordered-containers uuid vector - zip zlib + base binary bytestring bzlib concrete-haskell-autogen containers + directory filepath hashable megaparsec monad-extras mtl network + optparse-generic path path-io process QuickCheck scientific tar + text thrift time unordered-containers uuid vector zip zlib ]; testHaskellDepends = [ - base bytestring bzlib containers directory filepath hashable - megaparsec mtl network optparse-generic path-io process QuickCheck - scientific tar text thrift time unordered-containers uuid vector - zip zlib + base binary bytestring bzlib concrete-haskell-autogen containers + directory filepath hashable megaparsec monad-extras mtl network + optparse-generic path path-io process QuickCheck scientific tar + text thrift time unordered-containers uuid vector zip zlib + ]; + benchmarkHaskellDepends = [ + base binary bytestring bzlib concrete-haskell-autogen containers + directory filepath hashable megaparsec monad-extras mtl network + optparse-generic path path-io process QuickCheck scientific tar + text thrift time unordered-containers uuid vector zip zlib ]; homepage = "https://github.com/hltcoe"; description = "Library for the Concrete data format"; @@ -46091,21 +46575,22 @@ self: { "concurrent-dns-cache" = callPackage ({ mkDerivation, array, async, base, bytestring, containers, dns - , hashable, hspec, iproute, network, stm, time + , hspec, iproute, lifted-base, monad-control, network, psqueues + , stm, time, transformers }: mkDerivation { pname = "concurrent-dns-cache"; - version = "0.0.1"; - sha256 = "0awba7ar4iky211psq5d44snd5j75ddvl6klalriic4i5w41dhv2"; + version = "0.1.0"; + sha256 = "0bi3mlv2gi8adgh8zmh51idrnbsap15f2kybligccf9b6pcvpljr"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ - array async base bytestring containers dns hashable iproute network - stm time + array async base bytestring containers dns iproute lifted-base + monad-control network psqueues stm time transformers ]; executableHaskellDepends = [ - array async base bytestring containers dns hashable iproute network - stm time + array async base bytestring containers dns iproute lifted-base + monad-control network psqueues stm time transformers ]; testHaskellDepends = [ async base dns hspec ]; description = "Concurrent DNS cache"; @@ -47005,8 +47490,8 @@ self: { }: mkDerivation { pname = "confsolve"; - version = "0.5.5"; - sha256 = "0wwrjrjp3biai2sg8aylqbw7nv2sd41xnqy6826i2knmjj3inqrg"; + version = "0.5.6"; + sha256 = "0bsribar35vrq1q22nijxgnymkbrfa49vyvfa60ink8wj7q47jzp"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -49928,8 +50413,8 @@ self: { pname = "crypto-enigma"; version = "0.0.2.8"; sha256 = "0dz8qr4afl360vc8mhcxsqm48y4pf1rvwxhzbvsgwhwjscvass3q"; - revision = "1"; - editedCabalFile = "0zm90nv4asr28pbwl2x96hbr50v0d4y3zjsmlz80gsm7cqj6hz3s"; + revision = "4"; + editedCabalFile = "1rvcphwavb3ns46fankpdlkz8rwl3rn591zlkmx0zdy3vygpwsfg"; libraryHaskellDepends = [ base containers MissingH mtl split ]; testHaskellDepends = [ base HUnit QuickCheck ]; homepage = "https://github.com/orome/crypto-enigma-hs"; @@ -51018,6 +51503,30 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "cue-sheet_1_0_0" = callPackage + ({ mkDerivation, base, bytestring, containers, data-default-class + , exceptions, hspec, hspec-megaparsec, megaparsec, mtl, QuickCheck + , text + }: + mkDerivation { + pname = "cue-sheet"; + version = "1.0.0"; + sha256 = "05fj4iqg0ixrs8076p9jcl5my0qx4hgzcprnaymfkkr0n9x06sz1"; + enableSeparateDataOutput = true; + libraryHaskellDepends = [ + base bytestring containers data-default-class exceptions megaparsec + mtl QuickCheck text + ]; + testHaskellDepends = [ + base bytestring exceptions hspec hspec-megaparsec megaparsec + QuickCheck text + ]; + homepage = "https://github.com/mrkkrp/cue-sheet"; + description = "Support for construction, rendering, and parsing of CUE sheets"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "cufft" = callPackage ({ mkDerivation, base, c2hs, Cabal, cuda, directory, filepath , template-haskell @@ -51315,6 +51824,8 @@ self: { pname = "czipwith"; version = "1.0.0.0"; sha256 = "1q9cgig8zvycbfryb1ax35yq1x66qpc6a91qijbbfk1zsw7sz8j5"; + revision = "1"; + editedCabalFile = "1vz6nrmxhl2rrwcg16dpp09q64pk9z9j0ka97lqhxdzpvqm0fg88"; libraryHaskellDepends = [ base template-haskell ]; testHaskellDepends = [ base transformers ]; homepage = "https://github.com/lspitzner/czipwith/"; @@ -52024,6 +52535,22 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "data-accessor-template_0_2_1_14" = callPackage + ({ mkDerivation, base, data-accessor, template-haskell, utility-ht + }: + mkDerivation { + pname = "data-accessor-template"; + version = "0.2.1.14"; + sha256 = "0r8vb3z40172jy17w131ydg5v1pvi121rgwxyq0cgxx0zwzhnvy4"; + libraryHaskellDepends = [ + base data-accessor template-haskell utility-ht + ]; + homepage = "http://www.haskell.org/haskellwiki/Record_access"; + description = "Utilities for accessing and manipulating fields of records"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "data-accessor-transformers" = callPackage ({ mkDerivation, base, data-accessor, transformers }: mkDerivation { @@ -52473,6 +53000,25 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "data-diverse_0_9_0_0" = callPackage + ({ mkDerivation, base, containers, criterion, deepseq, ghc-prim + , hspec, tagged + }: + mkDerivation { + pname = "data-diverse"; + version = "0.9.0.0"; + sha256 = "0mx348pl32jycbcdhb9p199hzqg8yrh8ckw85vvgxg5n4251nd9p"; + libraryHaskellDepends = [ + base containers deepseq ghc-prim tagged + ]; + testHaskellDepends = [ base hspec tagged ]; + benchmarkHaskellDepends = [ base criterion ]; + homepage = "https://github.com/louispan/data-diverse#readme"; + description = "Extensible records and polymorphic variants"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "data-diverse-lens" = callPackage ({ mkDerivation, base, data-diverse, hspec, lens, tagged }: mkDerivation { @@ -52709,8 +53255,8 @@ self: { ({ mkDerivation, base, template-haskell }: mkDerivation { pname = "data-flags"; - version = "0.0.3.3"; - sha256 = "1aps6v8kl168k211gm96mm7i07zkmm5j9j4kl7wwaicblpb91qx1"; + version = "0.0.3.4"; + sha256 = "183h2dzqrp9wl4sg59sijlhqw5pgi10xgw7cx8vz1s86rkia3hj8"; libraryHaskellDepends = [ base template-haskell ]; homepage = "https://github.com/mvv/data-flags"; description = "A package for working with bit masks and flags in general"; @@ -53190,6 +53736,8 @@ self: { pname = "data-pprint"; version = "0.2.4.1"; sha256 = "10qg7sa64l7sjm6f9xx00nqddmxccj4h1apv4wwqhh8y7vlal1hc"; + revision = "1"; + editedCabalFile = "0gk2x4z7m0816gq6p22y5y8r1iydi4154xbn474i9nsbk56kp2by"; libraryHaskellDepends = [ base deepseq mtl parallel pretty time ]; description = "Prettyprint and compare Data values"; license = stdenv.lib.licenses.bsd3; @@ -53449,8 +53997,8 @@ self: { }: mkDerivation { pname = "data-sword"; - version = "0.2.0.1"; - sha256 = "1l84ygal3zr9s8g8jshckgn922fjn06n9191v5k4hj2sa798wd6j"; + version = "0.2.0.2"; + sha256 = "1m14vxfx5raiy5b6w3602hkqywc0gj4yv38mjbwncbic86g6rgn2"; libraryHaskellDepends = [ base data-bword hashable template-haskell ]; @@ -53526,6 +54074,8 @@ self: { pname = "data-tree-print"; version = "0.1.0.0"; sha256 = "0dymdf7bv98f0xkdm49yxdn5nlbp7ahrfsadx69wzy8si537fnk5"; + revision = "1"; + editedCabalFile = "0ilk496yh0fdw2qisappr91d1s4xwl6hqaf2bnv3l7ah4qv74436"; libraryHaskellDepends = [ base pretty syb ]; homepage = "https://github.com/lspitzner/data-tree-print"; description = "Print Data instances as a nested tree"; @@ -53722,13 +54272,13 @@ self: { }: mkDerivation { pname = "datasets"; - version = "0.2.4"; - sha256 = "1l5djdv1fvqymkc5q10zwzhjwphxpw1wpr5d8rqf3z2kym3k0h2r"; + version = "0.2.5"; + sha256 = "1fpxk5wv12wyb1zr35mhinkbkmczgzny2903lszjn41n149kk4cs"; libraryHaskellDepends = [ aeson attoparsec base bytestring cassava directory file-embed filepath hashable microlens stringsearch text time vector wreq ]; - homepage = "https://github.com/filopodia/open/datasets"; + homepage = "https://github.com/diffusionkinetics/open/datasets"; description = "Classical data sets for statistics and machine learning"; license = stdenv.lib.licenses.mit; }) {}; @@ -53887,8 +54437,8 @@ self: { ({ mkDerivation, base, hspec, postgresql-simple, text }: mkDerivation { pname = "dbcleaner"; - version = "0.1.1"; - sha256 = "1n4al0fd577ldvaxca6nz181lp0b29z4slrjldx3m51nkxy1ficc"; + version = "0.1.2"; + sha256 = "0ida0rqx66b5sajic1y2k89mlx9039s3m8xalqadsybij29yfmjr"; libraryHaskellDepends = [ base postgresql-simple text ]; testHaskellDepends = [ base hspec postgresql-simple text ]; description = "Clean database tables automatically around hspec tests"; @@ -55516,6 +56066,28 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "derive_2_6_3" = callPackage + ({ mkDerivation, base, bytestring, containers, directory, filepath + , haskell-src-exts, pretty, process, syb, template-haskell + , transformers, uniplate + }: + mkDerivation { + pname = "derive"; + version = "2.6.3"; + sha256 = "06m3m1jsvms1nvgm6b83p28ma61h8ldagl7a3fsjp8hswpr0hgpj"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + base bytestring containers directory filepath haskell-src-exts + pretty process syb template-haskell transformers uniplate + ]; + executableHaskellDepends = [ base ]; + homepage = "https://github.com/ndmitchell/derive#readme"; + description = "A program and library to derive instances for data types"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "derive-IG" = callPackage ({ mkDerivation, base, instant-generics, template-haskell }: mkDerivation { @@ -56047,6 +56619,8 @@ self: { pname = "dia-base"; version = "0.1.1.4"; sha256 = "09lyzl0ppgk7izmsb3hq86dfmyb31w866h582vazpphbyvrbpihz"; + revision = "1"; + editedCabalFile = "0jp6vxj2m984dl7gnphs7119zxs8pplhq73nnicvbhjcliixyl6w"; libraryHaskellDepends = [ base deepseq ]; description = "An EDSL for teaching Haskell with diagrams - data types"; license = stdenv.lib.licenses.bsd3; @@ -56060,6 +56634,8 @@ self: { pname = "dia-functions"; version = "0.2.1.5"; sha256 = "1q9jywy6rmh5wkd8z5rw9rkilbh9jxd4py2w4xxqz93rzz2gzy5g"; + revision = "1"; + editedCabalFile = "0zyg7mrnp8qp9v0hm1188n4xqp223g6wqdnz43dw3dchqs2qpwbx"; libraryHaskellDepends = [ base containers data-pprint deepseq dia-base mtl xhtml ]; @@ -56715,6 +57291,35 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "dictionaries_0_2_0_3" = callPackage + ({ mkDerivation, attoparsec, base, binary, bytestring, containers + , criterion, data-default, deepseq, directory, exceptions, filepath + , hspec, QuickCheck, random, random-shuffle, tagged, text, time + , transformers, zlib + }: + mkDerivation { + pname = "dictionaries"; + version = "0.2.0.3"; + sha256 = "0a8d20vfd5gcxrfhsa0530fnzb9fqh47qsjbyhf7pnh0f0p0qbi6"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + attoparsec base binary bytestring containers data-default deepseq + directory exceptions filepath tagged text time transformers zlib + ]; + executableHaskellDepends = [ + base bytestring containers criterion deepseq directory exceptions + filepath random random-shuffle tagged text transformers + ]; + testHaskellDepends = [ + base bytestring containers directory filepath hspec QuickCheck + random tagged text time + ]; + description = "Tools to handle StarDict dictionaries"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "dictionary-sharing" = callPackage ({ mkDerivation, base, containers }: mkDerivation { @@ -58527,6 +59132,26 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "distributive_0_5_3" = callPackage + ({ mkDerivation, base, base-orphans, Cabal, cabal-doctest, doctest + , generic-deriving, hspec, tagged, transformers + , transformers-compat + }: + mkDerivation { + pname = "distributive"; + version = "0.5.3"; + sha256 = "0y566r97sfyvhsmd4yxiz4ns2mqgwf5bdbp56wgxl6wlkidq0wwi"; + setupHaskellDepends = [ base Cabal cabal-doctest ]; + libraryHaskellDepends = [ + base base-orphans tagged transformers transformers-compat + ]; + testHaskellDepends = [ base doctest generic-deriving hspec ]; + homepage = "http://github.com/ekmett/distributive/"; + description = "Distributive functors -- Dual to Traversable"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "diversity" = callPackage ({ mkDerivation, base, containers, data-ordlist, fasta , math-functions, MonadRandom, optparse-applicative, parsec, pipes @@ -58701,6 +59326,31 @@ self: { pname = "dlist-nonempty"; version = "0.1"; sha256 = "13nkf2kgm8pd1vicd2lm2z99m04bs65pm1kjn4k4a2259h3hd0m8"; + revision = "1"; + editedCabalFile = "1nvxf1dyqvanx7vfr4q7li2jj5vr543lc2fkkwajsm0z75vcibz4"; + libraryHaskellDepends = [ + base base-compat deepseq dlist semigroupoids + ]; + testHaskellDepends = [ + base Cabal QuickCheck quickcheck-instances + ]; + benchmarkHaskellDepends = [ + base base-compat criterion dlist dlist-instances + ]; + homepage = "https://github.com/phadej/dlist-nonempty"; + description = "Non-empty difference lists"; + license = stdenv.lib.licenses.bsd3; + }) {}; + + "dlist-nonempty_0_1_1" = callPackage + ({ mkDerivation, base, base-compat, Cabal, criterion, deepseq + , dlist, dlist-instances, QuickCheck, quickcheck-instances + , semigroupoids + }: + mkDerivation { + pname = "dlist-nonempty"; + version = "0.1.1"; + sha256 = "0csbspdy43pzvasb5mhs5pz2f49ws78pi253cx7pp84wjx6ads20"; libraryHaskellDepends = [ base base-compat deepseq dlist semigroupoids ]; @@ -58713,6 +59363,7 @@ self: { homepage = "https://github.com/phadej/dlist-nonempty"; description = "Non-empty difference lists"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "dmc" = callPackage @@ -59119,34 +59770,6 @@ self: { license = stdenv.lib.licenses.mit; }) {}; - "doctest_0_12_0" = callPackage - ({ mkDerivation, base, base-compat, code-page, deepseq, directory - , filepath, ghc, ghc-paths, hspec, HUnit, mockery, process - , QuickCheck, setenv, silently, stringbuilder, syb, transformers - , with-location - }: - mkDerivation { - pname = "doctest"; - version = "0.12.0"; - sha256 = "13h549cpgcvb7c54c7wif28g5wak84dxc3ais0hlqhzk1q6la91a"; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ - base base-compat code-page deepseq directory filepath ghc ghc-paths - process syb transformers - ]; - executableHaskellDepends = [ base ]; - testHaskellDepends = [ - base base-compat code-page deepseq directory filepath ghc ghc-paths - hspec HUnit mockery process QuickCheck setenv silently - stringbuilder syb transformers with-location - ]; - homepage = "https://github.com/sol/doctest#readme"; - description = "Test interactive Haskell examples"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - "doctest-discover" = callPackage ({ mkDerivation, aeson, base, bytestring, directory, doctest , filepath @@ -60816,6 +61439,22 @@ self: { license = stdenv.lib.licenses.gpl2; }) {}; + "dynamic-state_0_3" = callPackage + ({ mkDerivation, base, binary, bytestring, hashable + , unordered-containers + }: + mkDerivation { + pname = "dynamic-state"; + version = "0.3"; + sha256 = "0aa97yv9p0mw1g7nk5jaayfl70bkp2i4kcybvp4a30gr12dpjqmv"; + libraryHaskellDepends = [ + base binary bytestring hashable unordered-containers + ]; + description = "Optionally serializable dynamic state keyed by type"; + license = stdenv.lib.licenses.gpl2; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "dynamodb-simple" = callPackage ({ mkDerivation, aeson, amazonka, amazonka-core, amazonka-dynamodb , base, bytestring, conduit, containers, double-conversion @@ -61870,6 +62509,28 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "ekg_0_4_0_14" = callPackage + ({ mkDerivation, aeson, base, bytestring, ekg-core, ekg-json + , filepath, network, snap-core, snap-server, text, time + , transformers, unordered-containers + }: + mkDerivation { + pname = "ekg"; + version = "0.4.0.14"; + sha256 = "1n0l5lpkgkln9jmwwx2p2m2mbm7pr66w7lggj0yw4ay7ipjxjrrd"; + revision = "1"; + editedCabalFile = "152b4w3qld6jmwir3a06h6sc1girahla8cc1y2g23bwv6nnhxapp"; + enableSeparateDataOutput = true; + libraryHaskellDepends = [ + aeson base bytestring ekg-core ekg-json filepath network snap-core + snap-server text time transformers unordered-containers + ]; + homepage = "https://github.com/tibbe/ekg"; + description = "Remote monitoring of processes"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "ekg-bosun" = callPackage ({ mkDerivation, aeson, base, ekg-core, http-client, lens, network , network-uri, old-locale, text, time, unordered-containers, vector @@ -61944,6 +62605,24 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "ekg-core_0_1_1_2" = callPackage + ({ mkDerivation, base, containers, ghc-prim, text + , unordered-containers + }: + mkDerivation { + pname = "ekg-core"; + version = "0.1.1.2"; + sha256 = "01gqg5lpn67gc2rsvil4k54c1w9cz9avyxzlvmi2baxbrpj7isrm"; + libraryHaskellDepends = [ + base containers ghc-prim text unordered-containers + ]; + benchmarkHaskellDepends = [ base ]; + homepage = "https://github.com/tibbe/ekg-core"; + description = "Tracking of system metrics"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "ekg-elastic" = callPackage ({ mkDerivation, aeson, base, bytestring, ekg-core, hostname , http-client, lens, text, time, unordered-containers, wreq @@ -62010,6 +62689,22 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "ekg-json_0_1_0_6" = callPackage + ({ mkDerivation, aeson, base, ekg-core, text, unordered-containers + }: + mkDerivation { + pname = "ekg-json"; + version = "0.1.0.6"; + sha256 = "0iyx0ix4dcyhh9xg4ia1lm7x2q0iffswnr33khfg9fr81am80shy"; + libraryHaskellDepends = [ + aeson base ekg-core text unordered-containers + ]; + homepage = "https://github.com/tibbe/ekg-json"; + description = "JSON encoding of ekg metrics"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "ekg-log" = callPackage ({ mkDerivation, aeson, base, bytestring, directory, ekg-core , fast-logger, filepath, text, time, unix, unordered-containers @@ -62104,6 +62799,23 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "ekg-statsd_0_2_1_1" = callPackage + ({ mkDerivation, base, bytestring, ekg-core, network, text, time + , unordered-containers + }: + mkDerivation { + pname = "ekg-statsd"; + version = "0.2.1.1"; + sha256 = "1r0x26aqj0nbdl9nrj26xsb5np20bg6mihams394a0c41pv85j6k"; + libraryHaskellDepends = [ + base bytestring ekg-core network text time unordered-containers + ]; + homepage = "https://github.com/tibbe/ekg-statsd"; + description = "Push metrics to statsd"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "ekg-wai" = callPackage ({ mkDerivation, aeson, base, bytestring, ekg-core, ekg-json , filepath, http-types, network, text, time, transformers @@ -62728,6 +63440,24 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "email-validate_2_3_1" = callPackage + ({ mkDerivation, attoparsec, base, bytestring, doctest, hspec + , QuickCheck, template-haskell + }: + mkDerivation { + pname = "email-validate"; + version = "2.3.1"; + sha256 = "0fzbaxshhlg97pm66yjhz7fxxq9j1m3k0sqslzngh36r8aw9l66j"; + libraryHaskellDepends = [ + attoparsec base bytestring template-haskell + ]; + testHaskellDepends = [ base bytestring doctest hspec QuickCheck ]; + homepage = "https://github.com/Porges/email-validate-hs"; + description = "Email address validation"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "email-validate-json" = callPackage ({ mkDerivation, aeson, base, email-validate, text }: mkDerivation { @@ -62955,17 +63685,22 @@ self: { }) {}; "encoding" = callPackage - ({ mkDerivation, array, base, binary, bytestring, containers - , extensible-exceptions, ghc-prim, HaXml, mtl, regex-compat + ({ mkDerivation, array, base, binary, bytestring, Cabal, containers + , extensible-exceptions, filepath, ghc-prim, HaXml, HUnit, mtl + , QuickCheck, regex-compat }: mkDerivation { pname = "encoding"; - version = "0.8.1"; - sha256 = "1fddj2m3xv8zfz6bmgks3ynib6hk7bzq2j3bsazr71m769a9hvyr"; + version = "0.8.2"; + sha256 = "1lfh5pyc4f73870xz6dydksp5nspnzbkj4fvinhwdknhc5ii8353"; + setupHaskellDepends = [ + base Cabal containers filepath ghc-prim HaXml + ]; libraryHaskellDepends = [ array base binary bytestring containers extensible-exceptions - ghc-prim HaXml mtl regex-compat + ghc-prim mtl regex-compat ]; + testHaskellDepends = [ base bytestring HUnit QuickCheck ]; homepage = "http://code.haskell.org/encoding/"; description = "A library for various character encodings"; license = stdenv.lib.licenses.bsd3; @@ -63928,6 +64663,34 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "ersatz_0_4_1" = callPackage + ({ mkDerivation, array, attoparsec, base, bytestring, Cabal + , cabal-doctest, containers, data-default, directory, doctest + , filepath, lens, mtl, parsec, process, temporary, transformers + , unordered-containers + }: + mkDerivation { + pname = "ersatz"; + version = "0.4.1"; + sha256 = "0na9i2jc5assjis12pfpi08ykf90b79ydsvv1lqsbgsbij9w2w91"; + isLibrary = true; + isExecutable = true; + enableSeparateDataOutput = true; + setupHaskellDepends = [ base Cabal cabal-doctest ]; + libraryHaskellDepends = [ + array attoparsec base bytestring containers data-default lens mtl + process temporary transformers unordered-containers + ]; + executableHaskellDepends = [ + array base containers lens mtl parsec + ]; + testHaskellDepends = [ array base directory doctest filepath mtl ]; + homepage = "http://github.com/ekmett/ersatz"; + description = "A monad for expressing SAT or QSAT problems using observable sharing"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "ersatz-toysat" = callPackage ({ mkDerivation, array, base, containers, ersatz, toysolver , transformers @@ -64589,6 +65352,30 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "eventful-core_0_2_0" = callPackage + ({ mkDerivation, aeson, base, containers, contravariant, hspec + , http-api-data, HUnit, path-pieces, sum-type-boilerplate + , template-haskell, text, transformers, uuid + }: + mkDerivation { + pname = "eventful-core"; + version = "0.2.0"; + sha256 = "06chbjrxfxk0fr9lgdic6bmylnv3kz398l9drqr85r6qk1s5xxg0"; + libraryHaskellDepends = [ + aeson base containers contravariant http-api-data path-pieces + sum-type-boilerplate template-haskell text transformers uuid + ]; + testHaskellDepends = [ + aeson base containers contravariant hspec http-api-data HUnit + path-pieces sum-type-boilerplate template-haskell text transformers + uuid + ]; + homepage = "https://github.com/jdreaver/eventful#readme"; + description = "Core module for eventful"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "eventful-dynamodb" = callPackage ({ mkDerivation, aeson, amazonka, amazonka-dynamodb, base , bytestring, conduit, eventful-core, eventful-test-helpers, hlint @@ -64615,6 +65402,31 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "eventful-dynamodb_0_2_0" = callPackage + ({ mkDerivation, aeson, amazonka, amazonka-dynamodb, base + , bytestring, conduit, eventful-core, eventful-test-helpers, hspec + , HUnit, lens, QuickCheck, quickcheck-instances, safe, text + , unordered-containers, vector + }: + mkDerivation { + pname = "eventful-dynamodb"; + version = "0.2.0"; + sha256 = "17ip1dr1jqrzy0hg5yjnv4a8qkgsab02jcbswlxfd3q7xx3d473b"; + libraryHaskellDepends = [ + aeson amazonka amazonka-dynamodb base bytestring conduit + eventful-core lens safe text unordered-containers vector + ]; + testHaskellDepends = [ + aeson amazonka amazonka-dynamodb base bytestring conduit + eventful-core eventful-test-helpers hspec HUnit lens QuickCheck + quickcheck-instances safe text unordered-containers vector + ]; + homepage = "https://github.com/jdreaver/eventful#readme"; + description = "Library for eventful DynamoDB event stores"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "eventful-memory" = callPackage ({ mkDerivation, base, containers, eventful-core , eventful-test-helpers, hlint, hspec, HUnit, mtl, safe, stm @@ -64635,6 +65447,27 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "eventful-memory_0_2_0" = callPackage + ({ mkDerivation, base, containers, eventful-core + , eventful-test-helpers, hspec, HUnit, mtl, safe, stm + }: + mkDerivation { + pname = "eventful-memory"; + version = "0.2.0"; + sha256 = "1fdd2z13lnk1zxhylriwblz96x90v4504abrj9rfbi732853wz3a"; + libraryHaskellDepends = [ + base containers eventful-core mtl safe stm + ]; + testHaskellDepends = [ + base containers eventful-core eventful-test-helpers hspec HUnit mtl + safe stm + ]; + homepage = "https://github.com/jdreaver/eventful#readme"; + description = "In-memory implementations for eventful"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "eventful-postgresql" = callPackage ({ mkDerivation, aeson, base, bytestring, eventful-core , eventful-sql-common, eventful-test-helpers, hlint, hspec, HUnit @@ -64659,6 +65492,30 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "eventful-postgresql_0_2_0" = callPackage + ({ mkDerivation, aeson, base, bytestring, eventful-core + , eventful-sql-common, eventful-test-helpers, hspec, HUnit, mtl + , persistent, persistent-postgresql, text + }: + mkDerivation { + pname = "eventful-postgresql"; + version = "0.2.0"; + sha256 = "05syf8ychcnyl4q1q3afn4nqp4sw38y4c3p97b1h5gdanbsnis3b"; + libraryHaskellDepends = [ + aeson base bytestring eventful-core eventful-sql-common mtl + persistent text + ]; + testHaskellDepends = [ + aeson base bytestring eventful-core eventful-sql-common + eventful-test-helpers hspec HUnit mtl persistent + persistent-postgresql text + ]; + homepage = "https://github.com/jdreaver/eventful#readme"; + description = "Postgres implementations for eventful"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "eventful-sql-common" = callPackage ({ mkDerivation, aeson, base, bytestring, eventful-core, mtl , persistent, persistent-template, text, uuid @@ -64676,6 +65533,24 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "eventful-sql-common_0_2_0" = callPackage + ({ mkDerivation, aeson, base, bytestring, eventful-core, mtl + , persistent, persistent-template, text, uuid + }: + mkDerivation { + pname = "eventful-sql-common"; + version = "0.2.0"; + sha256 = "1g5f6rvb14hi81dby2hdcq444zhv2vl76ql4lsrh9gdmpf6a2vm4"; + libraryHaskellDepends = [ + aeson base bytestring eventful-core mtl persistent + persistent-template text uuid + ]; + homepage = "https://github.com/jdreaver/eventful#readme"; + description = "Common library for SQL event stores"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "eventful-sqlite" = callPackage ({ mkDerivation, aeson, base, bytestring, eventful-core , eventful-sql-common, eventful-test-helpers, hlint, hspec, HUnit @@ -64699,6 +65574,30 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "eventful-sqlite_0_2_0" = callPackage + ({ mkDerivation, aeson, base, bytestring, eventful-core + , eventful-sql-common, eventful-test-helpers, hspec, HUnit, mtl + , persistent, persistent-sqlite, text, uuid + }: + mkDerivation { + pname = "eventful-sqlite"; + version = "0.2.0"; + sha256 = "1vyz8401n63gqwgl1fa9dw1ar1dgki4hy6ably8lh2hzpl7fmfy0"; + libraryHaskellDepends = [ + aeson base bytestring eventful-core eventful-sql-common mtl + persistent text uuid + ]; + testHaskellDepends = [ + aeson base bytestring eventful-core eventful-sql-common + eventful-test-helpers hspec HUnit mtl persistent persistent-sqlite + text uuid + ]; + homepage = "https://github.com/jdreaver/eventful#readme"; + description = "SQLite implementations for eventful"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "eventful-test-helpers" = callPackage ({ mkDerivation, aeson, aeson-casing, base, eventful-core, extra , hspec, monad-logger, text @@ -64715,6 +65614,23 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "eventful-test-helpers_0_2_0" = callPackage + ({ mkDerivation, aeson, aeson-casing, base, eventful-core, extra + , hspec, monad-logger, text + }: + mkDerivation { + pname = "eventful-test-helpers"; + version = "0.2.0"; + sha256 = "1q5z9rf5hxwpsyvm28hfnkr72zfsg7h5kz648bass9irvq69v7x9"; + libraryHaskellDepends = [ + aeson aeson-casing base eventful-core extra hspec monad-logger text + ]; + homepage = "https://github.com/jdreaver/eventful#readme"; + description = "Common module used for eventful tests"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "eventloop" = callPackage ({ mkDerivation, aeson, base, bytestring, concurrent-utilities , deepseq, network, stm, suspend, text, timers, websockets @@ -65189,8 +66105,8 @@ self: { pname = "exference"; version = "1.6.0.0"; sha256 = "1lnalnsn3zjcwhl8p1035ckjgp4kpjv6kfai4dqqji2rpbm1sgrh"; - revision = "3"; - editedCabalFile = "0mnc09lgfhpnwp0llvbr24xbszgr56k9nnjcww67khag74md7yg3"; + revision = "4"; + editedCabalFile = "1yrc2p8p48cx8qjpyvfqpbvs8dcv2m5k5x89s04jk9ic26wdwk9k"; isLibrary = true; isExecutable = true; enableSeparateDataOutput = true; @@ -65917,6 +66833,21 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "extrapolate" = callPackage + ({ mkDerivation, base, leancheck, speculate, template-haskell }: + mkDerivation { + pname = "extrapolate"; + version = "0.0.1"; + sha256 = "07yh1w3vbhrb621nbwp7zvjj92b16i6jc69qflzvp8jn9w7f71h5"; + libraryHaskellDepends = [ + base leancheck speculate template-haskell + ]; + testHaskellDepends = [ base leancheck speculate template-haskell ]; + homepage = "https://github.com/rudymatela/extrapolate#readme"; + description = "generalize counter-examples of test properties"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "ez-couch" = callPackage ({ mkDerivation, aeson, attoparsec, attoparsec-conduit, base , blaze-builder, bytestring, classy-prelude, classy-prelude-conduit @@ -66448,18 +67379,18 @@ self: { "fastparser" = callPackage ({ mkDerivation, base, bytestring, bytestring-lexing, containers - , microlens, thyme, vector-space + , criterion, kan-extensions, microlens, thyme, transformers + , vector-space }: mkDerivation { pname = "fastparser"; - version = "0.3.0"; - sha256 = "1dg7nsyn2qrf37x1512kzxhg2ldwkfngsy0jc4y2szd37i4iqqb4"; - revision = "1"; - editedCabalFile = "1qg6bbar66qxhnh3mdv41m9zrvggwnjszzr42z9x4gybx6anqzfi"; + version = "0.3.0.1"; + sha256 = "05ag040bw5ca05yl9l4nqdmsh9my1b2jnf5qc9kbwk5i8zqkfv15"; libraryHaskellDepends = [ - base bytestring bytestring-lexing containers microlens thyme - vector-space + base bytestring bytestring-lexing containers kan-extensions + microlens thyme transformers vector-space ]; + benchmarkHaskellDepends = [ base bytestring criterion ]; homepage = "https://github.com/bartavelle/fastparser#readme"; description = "A fast, but bare bones, bytestring parser combinators library"; license = stdenv.lib.licenses.bsd3; @@ -69096,6 +70027,20 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "flow_1_0_8" = callPackage + ({ mkDerivation, base, doctest, QuickCheck, template-haskell }: + mkDerivation { + pname = "flow"; + version = "1.0.8"; + sha256 = "13cfwc67r38kx30yixizcifcgijm7ak2swr3qikdb44fjm5y0zas"; + libraryHaskellDepends = [ base ]; + testHaskellDepends = [ base doctest QuickCheck template-haskell ]; + homepage = "https://github.com/tfausak/flow#readme"; + description = "Write more understandable Haskell"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "flow-er" = callPackage ({ mkDerivation, base, doctest, flow, QuickCheck }: mkDerivation { @@ -69275,8 +70220,8 @@ self: { }: mkDerivation { pname = "fltkhs"; - version = "0.5.3.4"; - sha256 = "066czbpbjk893q3npghmz94w9pqd0k89p8xxrmgd4g8gqqr1fii6"; + version = "0.5.3.5"; + sha256 = "1p2vmnyydq5f888q26gni1y4bpmhn3m4hr6123aq4d5zhy1x9cyv"; isLibrary = true; isExecutable = true; setupHaskellDepends = [ base Cabal directory filepath ]; @@ -69516,6 +70461,19 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "focus_0_1_5_2" = callPackage + ({ mkDerivation, base }: + mkDerivation { + pname = "focus"; + version = "0.1.5.2"; + sha256 = "1dswf4l7d6z3rrv1d00fr3vcpawnvxhj3q741fh62s5wq948v662"; + libraryHaskellDepends = [ base ]; + homepage = "https://github.com/nikita-volkov/focus"; + description = "A general abstraction for manipulating elements of container data structures"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "fold-debounce" = callPackage ({ mkDerivation, base, data-default-class, hspec, stm, stm-delay , time @@ -69712,6 +70670,33 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "folds_0_7_4" = callPackage + ({ mkDerivation, adjunctions, base, bifunctors, bytestring, Cabal + , cabal-doctest, comonad, constraints, contravariant, data-reify + , deepseq, directory, distributive, doctest, filepath, lens, mtl + , pointed, profunctors, reflection, semigroupoids, semigroups + , transformers, unordered-containers, vector + }: + mkDerivation { + pname = "folds"; + version = "0.7.4"; + sha256 = "0wj5fd3icj05w3lziv4rmqahsh42kzckxybjacyvwb45kiy6yvjw"; + configureFlags = [ "-f-test-hlint" ]; + setupHaskellDepends = [ base Cabal cabal-doctest ]; + libraryHaskellDepends = [ + adjunctions base bifunctors comonad constraints contravariant + data-reify distributive lens mtl pointed profunctors reflection + semigroupoids transformers unordered-containers vector + ]; + testHaskellDepends = [ + base bytestring deepseq directory doctest filepath mtl semigroups + ]; + homepage = "http://github.com/ekmett/folds"; + description = "Beautiful Folding"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "folds-common" = callPackage ({ mkDerivation, base, containers, folds, tasty, tasty-quickcheck }: @@ -70248,6 +71233,18 @@ self: { license = stdenv.lib.licenses.asl20; }) {}; + "forward-chan" = callPackage + ({ mkDerivation, base, SafeSemaphore, stm, unagi-chan }: + mkDerivation { + pname = "forward-chan"; + version = "0.0.0.0"; + sha256 = "0q11h91mlbaflxl35sya5r4h9r5d18v5ib0hplrzcnsgwchdcd3f"; + libraryHaskellDepends = [ base SafeSemaphore stm unagi-chan ]; + homepage = "http://github.com/mmirman/forward-chan"; + description = "Concurrent channels with a forwarding primitive"; + license = stdenv.lib.licenses.asl20; + }) {}; + "foscam-directory" = callPackage ({ mkDerivation, base, directory, doctest, filepath , foscam-filename, lens, pretty, QuickCheck, template-haskell @@ -72420,8 +73417,8 @@ self: { }: mkDerivation { pname = "gc"; - version = "0.0.1"; - sha256 = "15jz191njpd1jfx2x2xvqpvsz81mifspj37xhgqsxlk6vb2a3xb1"; + version = "0.0.2"; + sha256 = "03637njk3pqbqvng7zf370ykykm3nnsxvmp09qcfp6iihz45mk1r"; setupHaskellDepends = [ base Cabal cabal-doctest ]; libraryHaskellDepends = [ base ]; testHaskellDepends = [ @@ -72981,12 +73978,18 @@ self: { }) {}; "generic-lens" = callPackage - ({ mkDerivation, base }: + ({ mkDerivation, base, criterion, deepseq, hspec, lens, profunctors + , QuickCheck + }: mkDerivation { pname = "generic-lens"; - version = "0.2.0.0"; - sha256 = "05p53pqx0an32zdjj9x7dj4l04yh0p8rww32i8hh2ymg3h616apl"; - libraryHaskellDepends = [ base ]; + version = "0.3.0.0"; + sha256 = "0zsxf8v8j1dw0x913iin69r01mynmzyxnq778wqh5id7lz8fb69s"; + libraryHaskellDepends = [ base profunctors ]; + testHaskellDepends = [ base hspec QuickCheck ]; + benchmarkHaskellDepends = [ + base criterion deepseq lens QuickCheck + ]; homepage = "https://github.com/kcsongor/generic-lens"; description = "Generic data-structure operations exposed as lenses"; license = stdenv.lib.licenses.bsd3; @@ -73444,6 +74447,29 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "genvalidity-aeson" = callPackage + ({ mkDerivation, aeson, base, genvalidity, genvalidity-hspec + , genvalidity-scientific, genvalidity-text + , genvalidity-unordered-containers, genvalidity-vector, hspec + , QuickCheck, validity, validity-aeson + }: + mkDerivation { + pname = "genvalidity-aeson"; + version = "0.0.0.0"; + sha256 = "0pb84fg17vwmy95naaw1bl77pjvs9rzwgqnp8p0abh04qr9bxgh2"; + libraryHaskellDepends = [ + aeson base genvalidity genvalidity-scientific genvalidity-text + genvalidity-unordered-containers genvalidity-vector QuickCheck + validity validity-aeson + ]; + testHaskellDepends = [ + aeson base genvalidity genvalidity-hspec hspec + ]; + homepage = "https://github.com/NorfairKing/validity#readme"; + description = "GenValidity support for aeson"; + license = stdenv.lib.licenses.mit; + }) {}; + "genvalidity-bytestring" = callPackage ({ mkDerivation, base, bytestring, genvalidity, genvalidity-hspec , hspec, QuickCheck, validity, validity-bytestring @@ -73616,6 +74642,25 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "genvalidity-scientific" = callPackage + ({ mkDerivation, base, genvalidity, genvalidity-hspec, hspec + , QuickCheck, scientific, validity, validity-scientific + }: + mkDerivation { + pname = "genvalidity-scientific"; + version = "0.0.0.0"; + sha256 = "1s4gca2nkfhs5yzp0xnjy0fbadg4bphfd533z8zachh2ycwi69kh"; + libraryHaskellDepends = [ + base genvalidity QuickCheck scientific validity validity-scientific + ]; + testHaskellDepends = [ + base genvalidity genvalidity-hspec hspec QuickCheck scientific + ]; + homepage = "https://github.com/NorfairKing/validity#readme"; + description = "GenValidity support for Scientific"; + license = stdenv.lib.licenses.mit; + }) {}; + "genvalidity-text" = callPackage ({ mkDerivation, array, base, genvalidity, genvalidity-hspec, hspec , QuickCheck, text, validity, validity-text @@ -73654,6 +74699,46 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "genvalidity-unordered-containers" = callPackage + ({ mkDerivation, base, genvalidity, genvalidity-hspec, hashable + , hspec, QuickCheck, unordered-containers, validity + , validity-unordered-containers + }: + mkDerivation { + pname = "genvalidity-unordered-containers"; + version = "0.0.0.0"; + sha256 = "1yvav983wq3rff5k9fpjw6m8hsn3jxymfqklw4vc5m0g5v4al8f9"; + libraryHaskellDepends = [ + base genvalidity hashable QuickCheck unordered-containers validity + validity-unordered-containers + ]; + testHaskellDepends = [ + base genvalidity genvalidity-hspec hspec unordered-containers + ]; + homepage = "https://github.com/NorfairKing/validity#readme"; + description = "GenValidity support for unordered-containers"; + license = stdenv.lib.licenses.mit; + }) {}; + + "genvalidity-vector" = callPackage + ({ mkDerivation, base, genvalidity, genvalidity-hspec, hspec + , QuickCheck, validity, validity-vector, vector + }: + mkDerivation { + pname = "genvalidity-vector"; + version = "0.0.0.0"; + sha256 = "032dkx4wzla7aap31122f0cw31h8f5j36dq7xmvd2q9ssrcr39h7"; + libraryHaskellDepends = [ + base genvalidity QuickCheck validity validity-vector vector + ]; + testHaskellDepends = [ + base genvalidity genvalidity-hspec hspec vector + ]; + homepage = "https://github.com/NorfairKing/validity#readme"; + description = "GenValidity support for vector"; + license = stdenv.lib.licenses.mit; + }) {}; + "geo-resolver" = callPackage ({ mkDerivation, aeson, base, base64-bytestring, blaze-builder , bytestring, http-conduit, http-types, HUnit, QuickCheck @@ -74552,6 +75637,30 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "ghc-prof_1_4_0_2" = callPackage + ({ mkDerivation, attoparsec, base, containers, directory, filepath + , process, scientific, tasty, tasty-hunit, temporary, text, time + }: + mkDerivation { + pname = "ghc-prof"; + version = "1.4.0.2"; + sha256 = "0qcz4283gm9hxnqx462rdn1r3q9jmad19b3y8n0z4lsrpfziynq1"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + attoparsec base containers scientific text time + ]; + executableHaskellDepends = [ base containers scientific text ]; + testHaskellDepends = [ + attoparsec base containers directory filepath process tasty + tasty-hunit temporary text + ]; + homepage = "https://github.com/maoe/ghc-prof"; + description = "Library for parsing GHC time and allocation profiling reports"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "ghc-prof-flamegraph" = callPackage ({ mkDerivation, base }: mkDerivation { @@ -75263,6 +76372,28 @@ self: { license = stdenv.lib.licenses.lgpl21; }) {inherit (pkgs) atk;}; + "gi-atk_2_0_14" = callPackage + ({ mkDerivation, atk, base, bytestring, Cabal, containers, gi-glib + , gi-gobject, haskell-gi, haskell-gi-base, haskell-gi-overloading + , text, transformers + }: + mkDerivation { + pname = "gi-atk"; + version = "2.0.14"; + sha256 = "0fp5shf2hilziw4rlzbc2hzf43b2gi1cwm3vlr2ggdkw29ic0c7m"; + setupHaskellDepends = [ base Cabal haskell-gi ]; + libraryHaskellDepends = [ + base bytestring containers gi-glib gi-gobject haskell-gi + haskell-gi-base haskell-gi-overloading text transformers + ]; + libraryPkgconfigDepends = [ atk ]; + doHaddock = false; + homepage = "https://github.com/haskell-gi/haskell-gi"; + description = "Atk bindings"; + license = stdenv.lib.licenses.lgpl21; + hydraPlatforms = stdenv.lib.platforms.none; + }) {inherit (pkgs) atk;}; + "gi-cairo" = callPackage ({ mkDerivation, base, bytestring, Cabal, cairo, containers , haskell-gi, haskell-gi-base, text, transformers @@ -75287,6 +76418,32 @@ self: { license = stdenv.lib.licenses.lgpl21; }) {inherit (pkgs) cairo;}; + "gi-cairo_1_0_14" = callPackage + ({ mkDerivation, base, bytestring, Cabal, cairo, containers + , haskell-gi, haskell-gi-base, haskell-gi-overloading, text + , transformers + }: + mkDerivation { + pname = "gi-cairo"; + version = "1.0.14"; + sha256 = "0414qhjgh94pvkxrrcnkxg8hac35ykrqnhr5nrn63l66wigp1fxb"; + setupHaskellDepends = [ base Cabal haskell-gi ]; + libraryHaskellDepends = [ + base bytestring containers haskell-gi haskell-gi-base + haskell-gi-overloading text transformers + ]; + libraryPkgconfigDepends = [ cairo ]; + doHaddock = false; + preCompileBuildDriver = '' + PKG_CONFIG_PATH+=":${cairo}/lib/pkgconfig" + setupCompileFlags+=" $(pkg-config --libs cairo-gobject)" + ''; + homepage = "https://github.com/haskell-gi/haskell-gi"; + description = "Cairo bindings"; + license = stdenv.lib.licenses.lgpl21; + hydraPlatforms = stdenv.lib.platforms.none; + }) {inherit (pkgs) cairo;}; + "gi-gdk" = callPackage ({ mkDerivation, base, bytestring, Cabal, containers, gi-cairo , gi-gdkpixbuf, gi-gio, gi-glib, gi-gobject, gi-pango, gtk3 @@ -75309,6 +76466,30 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {gtk3 = pkgs.gnome3.gtk;}; + "gi-gdk_3_0_14" = callPackage + ({ mkDerivation, base, bytestring, Cabal, containers, gi-cairo + , gi-gdkpixbuf, gi-gio, gi-glib, gi-gobject, gi-pango, gtk3 + , haskell-gi, haskell-gi-base, haskell-gi-overloading, text + , transformers + }: + mkDerivation { + pname = "gi-gdk"; + version = "3.0.14"; + sha256 = "0ds8h0sjl4jf8y5vjfl18gsbarhy6pxl6if7nd4lqaznbribw4jl"; + setupHaskellDepends = [ base Cabal haskell-gi ]; + libraryHaskellDepends = [ + base bytestring containers gi-cairo gi-gdkpixbuf gi-gio gi-glib + gi-gobject gi-pango haskell-gi haskell-gi-base + haskell-gi-overloading text transformers + ]; + libraryPkgconfigDepends = [ gtk3 ]; + doHaddock = false; + homepage = "https://github.com/haskell-gi/haskell-gi"; + description = "Gdk bindings"; + license = stdenv.lib.licenses.lgpl21; + hydraPlatforms = stdenv.lib.platforms.none; + }) {gtk3 = pkgs.gnome3.gtk;}; + "gi-gdkpixbuf" = callPackage ({ mkDerivation, base, bytestring, Cabal, containers, gdk_pixbuf , gi-gio, gi-glib, gi-gobject, haskell-gi, haskell-gi-base, text @@ -75330,6 +76511,28 @@ self: { license = stdenv.lib.licenses.lgpl21; }) {inherit (pkgs) gdk_pixbuf;}; + "gi-gdkpixbuf_2_0_14" = callPackage + ({ mkDerivation, base, bytestring, Cabal, containers, gdk_pixbuf + , gi-gio, gi-glib, gi-gobject, haskell-gi, haskell-gi-base + , haskell-gi-overloading, text, transformers + }: + mkDerivation { + pname = "gi-gdkpixbuf"; + version = "2.0.14"; + sha256 = "1p8sksyg9jrva2mm0ipqxv10df0hnmzmiv2rs05ayl1ris366h2q"; + setupHaskellDepends = [ base Cabal haskell-gi ]; + libraryHaskellDepends = [ + base bytestring containers gi-gio gi-glib gi-gobject haskell-gi + haskell-gi-base haskell-gi-overloading text transformers + ]; + libraryPkgconfigDepends = [ gdk_pixbuf ]; + doHaddock = false; + homepage = "https://github.com/haskell-gi/haskell-gi"; + description = "GdkPixbuf bindings"; + license = stdenv.lib.licenses.lgpl21; + hydraPlatforms = stdenv.lib.platforms.none; + }) {inherit (pkgs) gdk_pixbuf;}; + "gi-gio" = callPackage ({ mkDerivation, base, bytestring, Cabal, containers, gi-glib , gi-gobject, glib, haskell-gi, haskell-gi-base, text, transformers @@ -75350,19 +76553,41 @@ self: { license = stdenv.lib.licenses.lgpl21; }) {inherit (pkgs) glib;}; + "gi-gio_2_0_14" = callPackage + ({ mkDerivation, base, bytestring, Cabal, containers, gi-glib + , gi-gobject, glib, haskell-gi, haskell-gi-base + , haskell-gi-overloading, text, transformers + }: + mkDerivation { + pname = "gi-gio"; + version = "2.0.14"; + sha256 = "0dwy8zd66b04jbn0g7c5n511nl2xxjvchzf56bmw8cfcm384r66d"; + setupHaskellDepends = [ base Cabal haskell-gi ]; + libraryHaskellDepends = [ + base bytestring containers gi-glib gi-gobject haskell-gi + haskell-gi-base haskell-gi-overloading text transformers + ]; + libraryPkgconfigDepends = [ glib ]; + doHaddock = false; + homepage = "https://github.com/haskell-gi/haskell-gi"; + description = "Gio bindings"; + license = stdenv.lib.licenses.lgpl21; + hydraPlatforms = stdenv.lib.platforms.none; + }) {inherit (pkgs) glib;}; + "gi-girepository" = callPackage ({ mkDerivation, base, bytestring, Cabal, containers, gi-gobject - , gobjectIntrospection, haskell-gi, haskell-gi-base, text - , transformers + , gobjectIntrospection, haskell-gi, haskell-gi-base + , haskell-gi-overloading, text, transformers }: mkDerivation { pname = "gi-girepository"; - version = "1.0.12"; - sha256 = "1fbyr65pc1i264f0cn43g1cbdzkvc5m0cdd997m2sx77nlc481m8"; + version = "1.0.14"; + sha256 = "1pains4g8a4yxacggx6jama3d1rdky684kcm758m6kiigsplkfkp"; setupHaskellDepends = [ base Cabal haskell-gi ]; libraryHaskellDepends = [ base bytestring containers gi-gobject haskell-gi haskell-gi-base - text transformers + haskell-gi-overloading text transformers ]; libraryPkgconfigDepends = [ gobjectIntrospection ]; doHaddock = false; @@ -75392,6 +76617,28 @@ self: { license = stdenv.lib.licenses.lgpl21; }) {inherit (pkgs) glib;}; + "gi-glib_2_0_14" = callPackage + ({ mkDerivation, base, bytestring, Cabal, containers, glib + , haskell-gi, haskell-gi-base, haskell-gi-overloading, text + , transformers + }: + mkDerivation { + pname = "gi-glib"; + version = "2.0.14"; + sha256 = "09bmrrppbjcy90f66qdhsj2hz3x7ci80mrdgryajzqrin4zs7aqx"; + setupHaskellDepends = [ base Cabal haskell-gi ]; + libraryHaskellDepends = [ + base bytestring containers haskell-gi haskell-gi-base + haskell-gi-overloading text transformers + ]; + libraryPkgconfigDepends = [ glib ]; + doHaddock = false; + homepage = "https://github.com/haskell-gi/haskell-gi"; + description = "GLib bindings"; + license = stdenv.lib.licenses.lgpl21; + hydraPlatforms = stdenv.lib.platforms.none; + }) {inherit (pkgs) glib;}; + "gi-gobject" = callPackage ({ mkDerivation, base, bytestring, Cabal, containers, gi-glib, glib , haskell-gi, haskell-gi-base, text, transformers @@ -75412,19 +76659,41 @@ self: { license = stdenv.lib.licenses.lgpl21; }) {inherit (pkgs) glib;}; + "gi-gobject_2_0_14" = callPackage + ({ mkDerivation, base, bytestring, Cabal, containers, gi-glib, glib + , haskell-gi, haskell-gi-base, haskell-gi-overloading, text + , transformers + }: + mkDerivation { + pname = "gi-gobject"; + version = "2.0.14"; + sha256 = "12w4fph341b6gxp6bd6xnrc4cs8bxhwkz33z4ndlkrb75a0289lg"; + setupHaskellDepends = [ base Cabal haskell-gi ]; + libraryHaskellDepends = [ + base bytestring containers gi-glib haskell-gi haskell-gi-base + haskell-gi-overloading text transformers + ]; + libraryPkgconfigDepends = [ glib ]; + doHaddock = false; + homepage = "https://github.com/haskell-gi/haskell-gi"; + description = "GObject bindings"; + license = stdenv.lib.licenses.lgpl21; + hydraPlatforms = stdenv.lib.platforms.none; + }) {inherit (pkgs) glib;}; + "gi-gst" = callPackage ({ mkDerivation, base, bytestring, Cabal, containers, gi-glib - , gi-gobject, gstreamer, haskell-gi, haskell-gi-base, text - , transformers + , gi-gobject, gstreamer, haskell-gi, haskell-gi-base + , haskell-gi-overloading, text, transformers }: mkDerivation { pname = "gi-gst"; - version = "1.0.12"; - sha256 = "08131f3smycwdpgpx2gkyb3aq3hi1g9gr4zx3isqi2pff7z2qrnb"; + version = "1.0.14"; + sha256 = "1yjimqcaqq9ah9nkyd1rq0bvs2sp4vbicfw6d5d0s6pcavqzxhpg"; setupHaskellDepends = [ base Cabal haskell-gi ]; libraryHaskellDepends = [ base bytestring containers gi-glib gi-gobject haskell-gi - haskell-gi-base text transformers + haskell-gi-base haskell-gi-overloading text transformers ]; libraryPkgconfigDepends = [ gstreamer ]; doHaddock = false; @@ -75437,16 +76706,16 @@ self: { "gi-gstaudio" = callPackage ({ mkDerivation, base, bytestring, Cabal, containers, gi-glib , gi-gobject, gi-gst, gi-gstbase, gst-plugins-base, haskell-gi - , haskell-gi-base, text, transformers + , haskell-gi-base, haskell-gi-overloading, text, transformers }: mkDerivation { pname = "gi-gstaudio"; - version = "1.0.12"; - sha256 = "1aidn8kc3i81hdh1xpiyv0nh4n0ncwdfyigv5n64jdf9j7faqp3z"; + version = "1.0.14"; + sha256 = "1l3cldq3i5anb8cmwya33gfpwj9njbhk3f40nz0772sa29j4311h"; setupHaskellDepends = [ base Cabal haskell-gi ]; libraryHaskellDepends = [ base bytestring containers gi-glib gi-gobject gi-gst gi-gstbase - haskell-gi haskell-gi-base text transformers + haskell-gi haskell-gi-base haskell-gi-overloading text transformers ]; libraryPkgconfigDepends = [ gst-plugins-base ]; doHaddock = false; @@ -75459,16 +76728,16 @@ self: { "gi-gstbase" = callPackage ({ mkDerivation, base, bytestring, Cabal, containers, gi-glib , gi-gobject, gi-gst, gst-plugins-base, haskell-gi, haskell-gi-base - , text, transformers + , haskell-gi-overloading, text, transformers }: mkDerivation { pname = "gi-gstbase"; - version = "1.0.13"; - sha256 = "1s3x30d65yl908hwy67mb9a7c55lrypiaxjq13j7fhl99clppy6b"; + version = "1.0.15"; + sha256 = "1gb7q5gxdrpblc8xfbrvv4072vfz910v3fg0h38ixda8p30fh30j"; setupHaskellDepends = [ base Cabal haskell-gi ]; libraryHaskellDepends = [ base bytestring containers gi-glib gi-gobject gi-gst haskell-gi - haskell-gi-base text transformers + haskell-gi-base haskell-gi-overloading text transformers ]; libraryPkgconfigDepends = [ gst-plugins-base ]; doHaddock = false; @@ -75481,17 +76750,18 @@ self: { "gi-gstpbutils" = callPackage ({ mkDerivation, base, bytestring, Cabal, containers, gi-glib , gi-gobject, gi-gst, gi-gstaudio, gi-gsttag, gi-gstvideo - , gstreamer-pbutils, haskell-gi, haskell-gi-base, text - , transformers + , gstreamer-pbutils, haskell-gi, haskell-gi-base + , haskell-gi-overloading, text, transformers }: mkDerivation { pname = "gi-gstpbutils"; - version = "1.0.12"; - sha256 = "1skbvijcnjd2nqic2q2ggqfbz1amrxpy7gkbmvsgv4qzxgywsyv3"; + version = "1.0.14"; + sha256 = "0pjjxqsfrl06v88mz3aacwy5812i752m4h979gw1qn8h431kgg4y"; setupHaskellDepends = [ base Cabal haskell-gi ]; libraryHaskellDepends = [ base bytestring containers gi-glib gi-gobject gi-gst gi-gstaudio - gi-gsttag gi-gstvideo haskell-gi haskell-gi-base text transformers + gi-gsttag gi-gstvideo haskell-gi haskell-gi-base + haskell-gi-overloading text transformers ]; libraryPkgconfigDepends = [ gstreamer-pbutils ]; doHaddock = false; @@ -75504,16 +76774,16 @@ self: { "gi-gsttag" = callPackage ({ mkDerivation, base, bytestring, Cabal, containers, gi-glib , gi-gobject, gi-gst, gi-gstbase, gstreamer-tag, haskell-gi - , haskell-gi-base, text, transformers + , haskell-gi-base, haskell-gi-overloading, text, transformers }: mkDerivation { pname = "gi-gsttag"; - version = "1.0.12"; - sha256 = "1xn4aav9gz08wakgsspm385iv7gvd9v1xkisgnl64lwlgah7rkh2"; + version = "1.0.14"; + sha256 = "056wbkkjds3gk2x0wm4abskpqqw5f8gyhwscl3ih5j90w78d0a28"; setupHaskellDepends = [ base Cabal haskell-gi ]; libraryHaskellDepends = [ base bytestring containers gi-glib gi-gobject gi-gst gi-gstbase - haskell-gi haskell-gi-base text transformers + haskell-gi haskell-gi-base haskell-gi-overloading text transformers ]; libraryPkgconfigDepends = [ gstreamer-tag ]; doHaddock = false; @@ -75526,16 +76796,16 @@ self: { "gi-gstvideo" = callPackage ({ mkDerivation, base, bytestring, Cabal, containers, gi-glib , gi-gobject, gi-gst, gi-gstbase, gst-plugins-base, haskell-gi - , haskell-gi-base, text, transformers + , haskell-gi-base, haskell-gi-overloading, text, transformers }: mkDerivation { pname = "gi-gstvideo"; - version = "1.0.12"; - sha256 = "0vi9c6bbqdl0x58nykmqyiffdvcs2mcgnd02kdpb2a7x2plfnvxs"; + version = "1.0.14"; + sha256 = "1hr20yf43zgcmpmygca5vdn1qb2fhhqqbh8s24kwjfy7bwl8zly1"; setupHaskellDepends = [ base Cabal haskell-gi ]; libraryHaskellDepends = [ base bytestring containers gi-glib gi-gobject gi-gst gi-gstbase - haskell-gi haskell-gi-base text transformers + haskell-gi haskell-gi-base haskell-gi-overloading text transformers ]; libraryPkgconfigDepends = [ gst-plugins-base ]; doHaddock = false; @@ -75568,6 +76838,30 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {gtk3 = pkgs.gnome3.gtk;}; + "gi-gtk_3_0_17" = callPackage + ({ mkDerivation, base, bytestring, Cabal, containers, gi-atk + , gi-cairo, gi-gdk, gi-gdkpixbuf, gi-gio, gi-glib, gi-gobject + , gi-pango, gtk3, haskell-gi, haskell-gi-base + , haskell-gi-overloading, text, transformers + }: + mkDerivation { + pname = "gi-gtk"; + version = "3.0.17"; + sha256 = "1rplvhn3lbss66yps6jrhd9f9m6znj8ybss0rpik3dxwgmac3rw3"; + setupHaskellDepends = [ base Cabal haskell-gi ]; + libraryHaskellDepends = [ + base bytestring containers gi-atk gi-cairo gi-gdk gi-gdkpixbuf + gi-gio gi-glib gi-gobject gi-pango haskell-gi haskell-gi-base + haskell-gi-overloading text transformers + ]; + libraryPkgconfigDepends = [ gtk3 ]; + doHaddock = false; + homepage = "https://github.com/haskell-gi/haskell-gi"; + description = "Gtk bindings"; + license = stdenv.lib.licenses.lgpl21; + hydraPlatforms = stdenv.lib.platforms.none; + }) {gtk3 = pkgs.gnome3.gtk;}; + "gi-gtk-hs" = callPackage ({ mkDerivation, base, base-compat, containers, gi-gdk , gi-gdkpixbuf, gi-glib, gi-gobject, gi-gtk, haskell-gi-base, mtl @@ -75590,16 +76884,16 @@ self: { "gi-gtkosxapplication" = callPackage ({ mkDerivation, base, bytestring, Cabal, containers, gi-gdkpixbuf , gi-gobject, gi-gtk, gtk-mac-integration-gtk3, haskell-gi - , haskell-gi-base, text, transformers + , haskell-gi-base, haskell-gi-overloading, text, transformers }: mkDerivation { pname = "gi-gtkosxapplication"; - version = "2.0.12"; - sha256 = "0agqq13nc73c8m0cbk0c3gx5jdgmwv6kzpmiai33qyhyva7jn2jx"; + version = "2.0.14"; + sha256 = "1hx01rr99kw8ja1py7s8fzzxy7psaarsyk9g773rijf25xq4b53f"; setupHaskellDepends = [ base Cabal haskell-gi ]; libraryHaskellDepends = [ base bytestring containers gi-gdkpixbuf gi-gobject gi-gtk - haskell-gi haskell-gi-base text transformers + haskell-gi haskell-gi-base haskell-gi-overloading text transformers ]; libraryPkgconfigDepends = [ gtk-mac-integration-gtk3 ]; doHaddock = false; @@ -75613,17 +76907,17 @@ self: { ({ mkDerivation, base, bytestring, Cabal, containers, gi-atk , gi-cairo, gi-gdk, gi-gdkpixbuf, gi-gio, gi-glib, gi-gobject , gi-gtk, gi-pango, gtksourceview3, haskell-gi, haskell-gi-base - , text, transformers + , haskell-gi-overloading, text, transformers }: mkDerivation { pname = "gi-gtksource"; - version = "3.0.13"; - sha256 = "0fg6pzrs1r43gfcsmah7rm3p03pry84nryjv1p0ckd5g083pln6z"; + version = "3.0.15"; + sha256 = "09vfxh75wbg3012mbzy39bczlvwyxndiy9wqmhwvhgh3iq0yk2fd"; setupHaskellDepends = [ base Cabal haskell-gi ]; libraryHaskellDepends = [ base bytestring containers gi-atk gi-cairo gi-gdk gi-gdkpixbuf gi-gio gi-glib gi-gobject gi-gtk gi-pango haskell-gi - haskell-gi-base text transformers + haskell-gi-base haskell-gi-overloading text transformers ]; libraryPkgconfigDepends = [ gtksourceview3 ]; doHaddock = false; @@ -75654,18 +76948,19 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {inherit (pkgs) webkitgtk24x-gtk3;}; - "gi-javascriptcore_4_0_12" = callPackage + "gi-javascriptcore_4_0_14" = callPackage ({ mkDerivation, base, bytestring, Cabal, containers, haskell-gi - , haskell-gi-base, text, transformers, webkitgtk + , haskell-gi-base, haskell-gi-overloading, text, transformers + , webkitgtk }: mkDerivation { pname = "gi-javascriptcore"; - version = "4.0.12"; - sha256 = "1wwpapn0w461njr13raws2i7aazkrsw1254aim0a2lc6h0xapbg3"; + version = "4.0.14"; + sha256 = "00mlnzdi6syay6dl20xz3s32bxsl32gwjhv3y1lbfzmzj7i7f914"; setupHaskellDepends = [ base Cabal haskell-gi ]; libraryHaskellDepends = [ - base bytestring containers haskell-gi haskell-gi-base text - transformers + base bytestring containers haskell-gi haskell-gi-base + haskell-gi-overloading text transformers ]; libraryPkgconfigDepends = [ webkitgtk ]; doHaddock = false; @@ -75677,17 +76972,17 @@ self: { "gi-notify" = callPackage ({ mkDerivation, base, bytestring, Cabal, containers, gi-gdkpixbuf - , gi-glib, gi-gobject, haskell-gi, haskell-gi-base, libnotify, text - , transformers + , gi-glib, gi-gobject, haskell-gi, haskell-gi-base + , haskell-gi-overloading, libnotify, text, transformers }: mkDerivation { pname = "gi-notify"; - version = "0.7.12"; - sha256 = "0rc9frrg43blwsxpjyqjrrrjgq10p1hpnfrp1vd6jq3prbh0pp36"; + version = "0.7.14"; + sha256 = "12ahyx3pn2pf63n22pa8qkwgh36yrdza2hw3n6khqws814g2f0ay"; setupHaskellDepends = [ base Cabal haskell-gi ]; libraryHaskellDepends = [ base bytestring containers gi-gdkpixbuf gi-glib gi-gobject - haskell-gi haskell-gi-base text transformers + haskell-gi haskell-gi-base haskell-gi-overloading text transformers ]; libraryPkgconfigDepends = [ libnotify ]; doHaddock = false; @@ -75699,17 +76994,17 @@ self: { "gi-ostree" = callPackage ({ mkDerivation, base, bytestring, Cabal, containers, gi-gio - , gi-glib, gi-gobject, haskell-gi, haskell-gi-base, ostree, text - , transformers + , gi-glib, gi-gobject, haskell-gi, haskell-gi-base + , haskell-gi-overloading, ostree, text, transformers }: mkDerivation { pname = "gi-ostree"; - version = "1.0.3"; - sha256 = "0b9x7w6v8w62wbvwc2p3fk5q2mar7db9ch1a0idf8s667jhmzdfj"; + version = "1.0.5"; + sha256 = "1w9x0jn2k8wny7925zw2lsmvs18i6j15ijizr515brqff3gyi5fs"; setupHaskellDepends = [ base Cabal haskell-gi ]; libraryHaskellDepends = [ base bytestring containers gi-gio gi-glib gi-gobject haskell-gi - haskell-gi-base text transformers + haskell-gi-base haskell-gi-overloading text transformers ]; libraryPkgconfigDepends = [ ostree ]; doHaddock = false; @@ -75745,19 +77040,46 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {inherit (pkgs) cairo; inherit (pkgs.gnome2) pango;}; + "gi-pango_1_0_15" = callPackage + ({ mkDerivation, base, bytestring, Cabal, cairo, containers + , gi-glib, gi-gobject, haskell-gi, haskell-gi-base + , haskell-gi-overloading, pango, text, transformers + }: + mkDerivation { + pname = "gi-pango"; + version = "1.0.15"; + sha256 = "0ymwbbm5ga31fj6i2mc75743ndqfb7p900576yv5y2p9d8cgp5j1"; + setupHaskellDepends = [ base Cabal haskell-gi ]; + libraryHaskellDepends = [ + base bytestring containers gi-glib gi-gobject haskell-gi + haskell-gi-base haskell-gi-overloading text transformers + ]; + libraryPkgconfigDepends = [ cairo pango ]; + doHaddock = false; + preCompileBuildDriver = '' + PKG_CONFIG_PATH+=":${cairo}/lib/pkgconfig" + setupCompileFlags+=" $(pkg-config --libs cairo-gobject)" + ''; + homepage = "https://github.com/haskell-gi/haskell-gi"; + description = "Pango bindings"; + license = stdenv.lib.licenses.lgpl21; + hydraPlatforms = stdenv.lib.platforms.none; + }) {inherit (pkgs) cairo; inherit (pkgs.gnome2) pango;}; + "gi-pangocairo" = callPackage ({ mkDerivation, base, bytestring, Cabal, cairo, containers , gi-cairo, gi-glib, gi-gobject, gi-pango, haskell-gi - , haskell-gi-base, pango, text, transformers + , haskell-gi-base, haskell-gi-overloading, pango, text + , transformers }: mkDerivation { pname = "gi-pangocairo"; - version = "1.0.13"; - sha256 = "0gs9cpd1a8imkqcd995hp6kjk6v8ai6mlqc9rm5jv0hvicjr948g"; + version = "1.0.15"; + sha256 = "0vy5fg2867dda19myyjbkxnrrbwgp3n7yqnfwqc67m5n8ziha2sb"; setupHaskellDepends = [ base Cabal haskell-gi ]; libraryHaskellDepends = [ base bytestring containers gi-cairo gi-glib gi-gobject gi-pango - haskell-gi haskell-gi-base text transformers + haskell-gi haskell-gi-base haskell-gi-overloading text transformers ]; libraryPkgconfigDepends = [ cairo pango ]; doHaddock = false; @@ -75773,17 +77095,17 @@ self: { "gi-poppler" = callPackage ({ mkDerivation, base, bytestring, Cabal, containers, gi-cairo - , gi-gio, gi-glib, gi-gobject, haskell-gi, haskell-gi-base, poppler - , text, transformers + , gi-gio, gi-glib, gi-gobject, haskell-gi, haskell-gi-base + , haskell-gi-overloading, poppler, text, transformers }: mkDerivation { pname = "gi-poppler"; - version = "0.18.12"; - sha256 = "04dza9hh8bbn5i6qhk5140ii5nxd9xpz6xfcfd8a08r0bsav35zp"; + version = "0.18.14"; + sha256 = "03dgkaqiy7y808x7g1xmmns1m19xc94f4kg0vjhyb1f1xr7k7hzj"; setupHaskellDepends = [ base Cabal haskell-gi ]; libraryHaskellDepends = [ base bytestring containers gi-cairo gi-gio gi-glib gi-gobject - haskell-gi haskell-gi-base text transformers + haskell-gi haskell-gi-base haskell-gi-overloading text transformers ]; libraryPkgconfigDepends = [ poppler ]; doHaddock = false; @@ -75795,17 +77117,17 @@ self: { "gi-secret" = callPackage ({ mkDerivation, base, bytestring, Cabal, containers, gi-gio - , gi-glib, gi-gobject, haskell-gi, haskell-gi-base, libsecret, text - , transformers + , gi-glib, gi-gobject, haskell-gi, haskell-gi-base + , haskell-gi-overloading, libsecret, text, transformers }: mkDerivation { pname = "gi-secret"; - version = "0.0.2"; - sha256 = "18f2nyx79bk9mixmi5xbzmvylb4q1gxgqzynl2y77zhd3q3fcgzc"; + version = "0.0.4"; + sha256 = "12kvdnxvsaj4mljkjhnma7n0d6qav6k9a4laca881ww50hdbwid2"; setupHaskellDepends = [ base Cabal haskell-gi ]; libraryHaskellDepends = [ base bytestring containers gi-gio gi-glib gi-gobject haskell-gi - haskell-gi-base text transformers + haskell-gi-base haskell-gi-overloading text transformers ]; libraryPkgconfigDepends = [ libsecret ]; doHaddock = false; @@ -75835,19 +77157,42 @@ self: { license = stdenv.lib.licenses.lgpl21; }) {inherit (pkgs.gnome2) libsoup;}; + "gi-soup_2_4_14" = callPackage + ({ mkDerivation, base, bytestring, Cabal, containers, gi-gio + , gi-glib, gi-gobject, haskell-gi, haskell-gi-base + , haskell-gi-overloading, libsoup, text, transformers + }: + mkDerivation { + pname = "gi-soup"; + version = "2.4.14"; + sha256 = "1z0cxhyadampjdibsrvqi6rw3kmcvq0q3mf4gk33ss2xb0f86m75"; + setupHaskellDepends = [ base Cabal haskell-gi ]; + libraryHaskellDepends = [ + base bytestring containers gi-gio gi-glib gi-gobject haskell-gi + haskell-gi-base haskell-gi-overloading text transformers + ]; + libraryPkgconfigDepends = [ libsoup ]; + doHaddock = false; + homepage = "https://github.com/haskell-gi/haskell-gi"; + description = "Libsoup bindings"; + license = stdenv.lib.licenses.lgpl21; + hydraPlatforms = stdenv.lib.platforms.none; + }) {inherit (pkgs.gnome2) libsoup;}; + "gi-vte" = callPackage ({ mkDerivation, base, bytestring, Cabal, containers, gi-atk , gi-gdk, gi-gio, gi-glib, gi-gobject, gi-gtk, gi-pango, haskell-gi - , haskell-gi-base, text, transformers, vte + , haskell-gi-base, haskell-gi-overloading, text, transformers, vte }: mkDerivation { pname = "gi-vte"; - version = "2.91.14"; - sha256 = "1xvv91q99918rbbkk3q2vy8sg22dh835ih51mibmz994r4pgh82s"; + version = "2.91.16"; + sha256 = "0gv1ab2an6gfk83d5ryjpfz92rwrll2jyl41i48ql6fagbxx0n18"; setupHaskellDepends = [ base Cabal haskell-gi ]; libraryHaskellDepends = [ base bytestring containers gi-atk gi-gdk gi-gio gi-glib gi-gobject - gi-gtk gi-pango haskell-gi haskell-gi-base text transformers + gi-gtk gi-pango haskell-gi haskell-gi-base haskell-gi-overloading + text transformers ]; libraryPkgconfigDepends = [ vte ]; doHaddock = false; @@ -75881,21 +77226,45 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {inherit (pkgs) webkitgtk24x-gtk3;}; + "gi-webkit_3_0_14" = callPackage + ({ 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 + , haskell-gi-overloading, text, transformers, webkitgtk24x-gtk3 + }: + mkDerivation { + pname = "gi-webkit"; + version = "3.0.14"; + sha256 = "006jja6hr7bsqff2yxgzjrdnhbccym32fcr9vd7dscyj4wqw1ng1"; + setupHaskellDepends = [ base Cabal haskell-gi ]; + libraryHaskellDepends = [ + base bytestring 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 haskell-gi-overloading text transformers + ]; + libraryPkgconfigDepends = [ webkitgtk24x-gtk3 ]; + doHaddock = false; + homepage = "https://github.com/haskell-gi/haskell-gi"; + description = "WebKit bindings"; + license = stdenv.lib.licenses.lgpl21; + hydraPlatforms = stdenv.lib.platforms.none; + }) {inherit (pkgs) webkitgtk24x-gtk3;}; + "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, webkitgtk + , gi-javascriptcore, gi-soup, haskell-gi, haskell-gi-base + , haskell-gi-overloading, text, transformers, webkitgtk }: mkDerivation { pname = "gi-webkit2"; - version = "4.0.12"; - sha256 = "1c392g4gk8mzrkr6d4rw6nbriyqc41nzl8svwpg0xa2bwpakz33z"; + version = "4.0.14"; + sha256 = "15r5kq0vq5gc4rsi0icw2f5zbqjw7kgdwpa3fbzn6jx7xmbl39kp"; setupHaskellDepends = [ base Cabal haskell-gi ]; libraryHaskellDepends = [ base bytestring 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 + haskell-gi-base haskell-gi-overloading text transformers ]; libraryPkgconfigDepends = [ webkitgtk ]; doHaddock = false; @@ -75908,16 +77277,18 @@ self: { "gi-webkit2webextension" = callPackage ({ mkDerivation, base, bytestring, Cabal, containers, gi-gobject , gi-gtk, gi-javascriptcore, gi-soup, haskell-gi, haskell-gi-base - , text, transformers, webkitgtk-web-extension + , haskell-gi-overloading, text, transformers + , webkitgtk-web-extension }: mkDerivation { pname = "gi-webkit2webextension"; - version = "4.0.12"; - sha256 = "0xyaxm0b9kijzpxf3dn0x6s9k0shkj7la7nyc4f5a04nkndv0gsi"; + version = "4.0.14"; + sha256 = "098p54q8rrfd9syzh10q5rcb70lihjkwx7amj7s5y8wix38f372k"; setupHaskellDepends = [ base Cabal haskell-gi ]; libraryHaskellDepends = [ base bytestring containers gi-gobject gi-gtk gi-javascriptcore - gi-soup haskell-gi haskell-gi-base text transformers + gi-soup haskell-gi haskell-gi-base haskell-gi-overloading text + transformers ]; libraryPkgconfigDepends = [ webkitgtk-web-extension ]; doHaddock = false; @@ -78089,6 +79460,28 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "gnuplot_0_5_4_2" = callPackage + ({ mkDerivation, array, base, containers, data-accessor + , data-accessor-transformers, deepseq, filepath, process, temporary + , time, transformers, utility-ht + }: + mkDerivation { + pname = "gnuplot"; + version = "0.5.4.2"; + sha256 = "0s7z8a7cqnmfrs551wyqaj557hslhkw401z35nfb7shx6wrdvpq5"; + isLibrary = true; + isExecutable = true; + enableSeparateDataOutput = true; + libraryHaskellDepends = [ + array base containers data-accessor data-accessor-transformers + deepseq filepath process temporary time transformers utility-ht + ]; + homepage = "http://www.haskell.org/haskellwiki/Gnuplot"; + description = "2D and 3D plots using gnuplot"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "gnutls" = callPackage ({ mkDerivation, base, bytestring, gnutls, monads-tf, transformers }: @@ -79841,8 +81234,8 @@ self: { }: mkDerivation { pname = "google-translate"; - version = "0.4"; - sha256 = "0aa9prwp3sdai75dbywsq4qb96crz9dk6dkp7vl7ixbl2q1zxldc"; + version = "0.4.1"; + sha256 = "0xpi3qss2cnv0dxgiwffzk6isgfgb95hfd5j62vc5jkjgkyzfqxn"; libraryHaskellDepends = [ aeson base bytestring http-api-data http-client servant servant-client text transformers @@ -80145,6 +81538,23 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "gotta-go-fast" = callPackage + ({ mkDerivation, base, brick, cmdargs, directory, random, time, vty + }: + mkDerivation { + pname = "gotta-go-fast"; + version = "0.1.2.0"; + sha256 = "124zk4zcfpr72xgck104n338p9aid9p1q89vcs7h16zvhai3bc4f"; + isLibrary = false; + isExecutable = true; + executableHaskellDepends = [ + base brick cmdargs directory random time vty + ]; + homepage = "https://github.com/hot-leaf-juice/gotta-go-fast"; + description = "A command line utility for practicing typing"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "gpah" = callPackage ({ mkDerivation, base, bytestring, Cabal, cmdargs, containers, csv , deepseq, directory, filepath, haskell-src-exts, hint, HTTP @@ -81432,6 +82842,31 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "groundhog-inspector_0_8_0_2" = callPackage + ({ mkDerivation, aeson-pretty, base, bytestring, cmdargs + , containers, groundhog, groundhog-sqlite, groundhog-th, mtl + , regex-compat, syb, template-haskell, text, time, transformers + }: + mkDerivation { + pname = "groundhog-inspector"; + version = "0.8.0.2"; + sha256 = "1wbsx0qjbhliglwk4yhh44ra54i34cypvki9zvw28khpc8mxdfmz"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + aeson-pretty base bytestring containers groundhog groundhog-th + regex-compat syb template-haskell text time transformers + ]; + executableHaskellDepends = [ + base bytestring cmdargs containers groundhog groundhog-sqlite + groundhog-th mtl + ]; + homepage = "http://github.com/lykahb/groundhog"; + description = "Type-safe datatype-database mapping library"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "groundhog-mysql" = callPackage ({ mkDerivation, base, bytestring, containers, groundhog , monad-control, monad-logger, mysql, mysql-simple, resource-pool @@ -83950,6 +85385,8 @@ self: { pname = "haddock-api"; version = "2.17.4"; sha256 = "00fn6pzgg8xjbaw12d76jdqh2dbc5xy7miyz0x6kidvvar7i35ss"; + revision = "1"; + editedCabalFile = "0saa5ksmvxyvwi2nrzh7m4ha1kwh31pkpa79yrppvw7sm39klpyw"; enableSeparateDataOutput = true; libraryHaskellDepends = [ array base bytestring Cabal containers deepseq directory filepath @@ -83970,6 +85407,8 @@ self: { pname = "haddock-api"; version = "2.18.1"; sha256 = "1q0nf86h6b466yd3bhng8sklm0kqc8bak4k6d4dcc57j3wf2gak8"; + revision = "1"; + editedCabalFile = "0ncxba7bppgap3vaxv07cyq2q4wsb860xv83znj4dgksvr64xl7y"; enableSeparateDataOutput = true; libraryHaskellDepends = [ array base bytestring Cabal containers deepseq directory filepath @@ -84037,14 +85476,14 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "haddock-library_1_4_4" = callPackage + "haddock-library_1_4_5" = callPackage ({ mkDerivation, attoparsec, base, base-compat, bytestring, deepseq , hspec, QuickCheck, transformers }: mkDerivation { pname = "haddock-library"; - version = "1.4.4"; - sha256 = "0dx5hawfanglhkj5nqq1dwr2j1v35p0syz30xvdk8gld8rif06p9"; + version = "1.4.5"; + sha256 = "0dmpxj6fgv9js90cxlf4yhrclh8kwmn8dm4llwhiyzmiddanjjy9"; libraryHaskellDepends = [ attoparsec base bytestring transformers ]; @@ -84306,6 +85745,26 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "hailgun_0_4_1_5" = callPackage + ({ mkDerivation, aeson, base, bytestring, email-validate + , exceptions, filepath, http-client, http-client-tls, http-types + , tagsoup, text, time, transformers + }: + mkDerivation { + pname = "hailgun"; + version = "0.4.1.5"; + sha256 = "0hi9a8aa10n14ipk4g8ksrf175z92kkwk0d9n3qzn835fkj5kkyr"; + libraryHaskellDepends = [ + aeson base bytestring email-validate exceptions filepath + http-client http-client-tls http-types tagsoup text time + transformers + ]; + homepage = "https://bitbucket.org/robertmassaioli/hailgun"; + description = "Mailgun REST api interface for Haskell"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "hailgun-send" = callPackage ({ mkDerivation, base, bytestring, configurator, hailgun, text }: mkDerivation { @@ -87380,6 +88839,22 @@ self: { broken = true; }) {booleanlist = null;}; + "haskell-conll" = callPackage + ({ mkDerivation, base, containers, lens, pretty-show, protolude + , split, text + }: + mkDerivation { + pname = "haskell-conll"; + version = "0.1.0.1"; + sha256 = "09lgj70lk2xh75rq4gdmfacmb465r0xn03v8cnk82bx52c7jwiga"; + libraryHaskellDepends = [ + base containers lens pretty-show protolude split text + ]; + homepage = "https://github.com/mgajda/haskell-conll#readme"; + description = "Core Types for NLP"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "haskell-course-preludes" = callPackage ({ mkDerivation, base, deepseq }: mkDerivation { @@ -87596,6 +89071,34 @@ self: { license = stdenv.lib.licenses.lgpl21; }) {inherit (pkgs) glib; inherit (pkgs) gobjectIntrospection;}; + "haskell-gi_0_20_3" = callPackage + ({ mkDerivation, attoparsec, base, bytestring, Cabal, containers + , directory, doctest, filepath, glib, gobjectIntrospection + , haskell-gi-base, mtl, pretty-show, process, regex-tdfa, safe + , text, transformers, xdg-basedir, xml-conduit + }: + mkDerivation { + pname = "haskell-gi"; + version = "0.20.3"; + sha256 = "0429dz3dn9l9nbrx8cd18j3f34cp6cc8zxb34jsvfpvdmafjin8q"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + attoparsec base bytestring Cabal containers directory filepath + haskell-gi-base mtl pretty-show process regex-tdfa safe text + transformers xdg-basedir xml-conduit + ]; + libraryPkgconfigDepends = [ glib gobjectIntrospection ]; + executableHaskellDepends = [ + base containers directory filepath haskell-gi-base pretty-show text + ]; + testHaskellDepends = [ base doctest ]; + homepage = "https://github.com/haskell-gi/haskell-gi"; + description = "Generate Haskell bindings for GObject Introspection capable libraries"; + license = stdenv.lib.licenses.lgpl21; + hydraPlatforms = stdenv.lib.platforms.none; + }) {inherit (pkgs) glib; inherit (pkgs) gobjectIntrospection;}; + "haskell-gi-base" = callPackage ({ mkDerivation, base, bytestring, containers, glib, text }: mkDerivation { @@ -87609,6 +89112,32 @@ self: { license = stdenv.lib.licenses.lgpl21; }) {inherit (pkgs) glib;}; + "haskell-gi-base_0_20_4" = callPackage + ({ mkDerivation, base, bytestring, containers, glib, text }: + mkDerivation { + pname = "haskell-gi-base"; + version = "0.20.4"; + sha256 = "00kpn7rxg91im26109q1m3g6hyp8v46v50j3dddz002sj2zycifq"; + libraryHaskellDepends = [ base bytestring containers text ]; + libraryPkgconfigDepends = [ glib ]; + homepage = "https://github.com/haskell-gi/haskell-gi-base"; + description = "Foundation for libraries generated by haskell-gi"; + license = stdenv.lib.licenses.lgpl21; + hydraPlatforms = stdenv.lib.platforms.none; + }) {inherit (pkgs) glib;}; + + "haskell-gi-overloading" = callPackage + ({ mkDerivation }: + mkDerivation { + pname = "haskell-gi-overloading"; + version = "1.0"; + sha256 = "0ak8f79ia9zlk94zr02sq8bqi5n5pd8ria8w1dj3adcdvpw9gmry"; + doHaddock = false; + homepage = "https://github.com/haskell-gi/haskell-gi"; + description = "Overloading support for haskell-gi"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "haskell-go-checkers" = callPackage ({ mkDerivation, base, containers, gloss }: mkDerivation { @@ -88294,6 +89823,23 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "haskell-tools-ast_0_8_1_0" = callPackage + ({ mkDerivation, base, ghc, mtl, references, template-haskell + , uniplate + }: + mkDerivation { + pname = "haskell-tools-ast"; + version = "0.8.1.0"; + sha256 = "0ryny34zlbyy15m18f5539gaqwghbk1msz5ijv3x04n1c87vj7h4"; + libraryHaskellDepends = [ + base ghc mtl references template-haskell uniplate + ]; + homepage = "https://github.com/nboldi/haskell-tools"; + description = "Haskell AST for efficient tooling"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "haskell-tools-ast-fromghc" = callPackage ({ mkDerivation, base, bytestring, containers, ghc , haskell-tools-ast, mtl, references, safe, split, template-haskell @@ -88367,6 +89913,25 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "haskell-tools-backend-ghc_0_8_1_0" = callPackage + ({ mkDerivation, base, bytestring, containers, ghc, ghc-boot-th + , haskell-tools-ast, mtl, references, safe, split, template-haskell + , transformers, uniplate + }: + mkDerivation { + pname = "haskell-tools-backend-ghc"; + version = "0.8.1.0"; + sha256 = "1abbqgv43rbkwabnhm0p7i39sgiq952hg5xy7bc8g3jbnaallaaf"; + libraryHaskellDepends = [ + base bytestring containers ghc ghc-boot-th haskell-tools-ast mtl + references safe split template-haskell transformers uniplate + ]; + homepage = "https://github.com/nboldi/haskell-tools"; + description = "Creating the Haskell-Tools AST from GHC's representations"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "haskell-tools-cli" = callPackage ({ mkDerivation, aeson, base, bytestring, containers, criterion , directory, filepath, ghc, ghc-paths, haskell-tools-ast @@ -88425,6 +89990,34 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "haskell-tools-daemon_0_8_1_0" = callPackage + ({ mkDerivation, aeson, base, bytestring, containers, Diff + , directory, filepath, ghc, ghc-paths, haskell-tools-ast + , haskell-tools-prettyprint, haskell-tools-refactor, HUnit, mtl + , network, process, references, split, strict, tasty, tasty-hunit + }: + mkDerivation { + pname = "haskell-tools-daemon"; + version = "0.8.1.0"; + sha256 = "1h5xh235b68kfjq8hkrmr0zhj6csaslm7qwkaqs3ygxkkrq152ic"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + aeson base bytestring containers Diff directory filepath ghc + ghc-paths haskell-tools-ast haskell-tools-prettyprint + haskell-tools-refactor mtl network process references split strict + ]; + executableHaskellDepends = [ base ]; + testHaskellDepends = [ + aeson base bytestring directory filepath ghc HUnit network process + tasty tasty-hunit + ]; + homepage = "https://github.com/haskell-tools/haskell-tools"; + description = "Background process for Haskell-tools refactor that editors can connect to"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "haskell-tools-debug" = callPackage ({ mkDerivation, base, filepath, ghc, ghc-paths, haskell-tools-ast , haskell-tools-backend-ghc, haskell-tools-prettyprint @@ -88448,6 +90041,29 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "haskell-tools-debug_0_8_1_0" = callPackage + ({ mkDerivation, base, filepath, ghc, ghc-paths, haskell-tools-ast + , haskell-tools-backend-ghc, haskell-tools-prettyprint + , haskell-tools-refactor, references, template-haskell + }: + mkDerivation { + pname = "haskell-tools-debug"; + version = "0.8.1.0"; + sha256 = "1c6apmv2x4wrjh22nm7v151hy4r2sksrbcwin80dc8ya4zc3fqr6"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + base filepath ghc ghc-paths haskell-tools-ast + haskell-tools-backend-ghc haskell-tools-prettyprint + haskell-tools-refactor references template-haskell + ]; + executableHaskellDepends = [ base ]; + homepage = "https://github.com/haskell-tools/haskell-tools"; + description = "Debugging Tools for Haskell-tools"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "haskell-tools-demo" = callPackage ({ mkDerivation, aeson, base, bytestring, containers, directory , filepath, ghc, ghc-paths, haskell-tools-ast @@ -88479,6 +90095,37 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "haskell-tools-demo_0_8_1_0" = callPackage + ({ mkDerivation, aeson, base, bytestring, containers, directory + , filepath, ghc, ghc-paths, haskell-tools-ast + , haskell-tools-backend-ghc, haskell-tools-prettyprint + , haskell-tools-refactor, http-types, HUnit, mtl, network + , references, tasty, tasty-hunit, transformers, wai, wai-websockets + , warp, websockets + }: + mkDerivation { + pname = "haskell-tools-demo"; + version = "0.8.1.0"; + sha256 = "011p9xdqgr93qxwvhcf8k2xr2ycgfjf0d60g8yfgjkgy9zx6fsma"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + aeson base bytestring containers directory filepath ghc ghc-paths + haskell-tools-ast haskell-tools-backend-ghc + haskell-tools-prettyprint haskell-tools-refactor http-types mtl + references transformers wai wai-websockets warp websockets + ]; + executableHaskellDepends = [ base ]; + testHaskellDepends = [ + aeson base bytestring directory filepath HUnit network tasty + tasty-hunit websockets + ]; + homepage = "https://github.com/haskell-tools/haskell-tools"; + description = "A web-based demo for Haskell-tools Refactor"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "haskell-tools-prettyprint" = callPackage ({ mkDerivation, base, containers, ghc, haskell-tools-ast, mtl , references, split, text, uniplate @@ -88497,6 +90144,24 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "haskell-tools-prettyprint_0_8_1_0" = callPackage + ({ mkDerivation, base, containers, ghc, haskell-tools-ast, mtl + , references, split, text, uniplate + }: + mkDerivation { + pname = "haskell-tools-prettyprint"; + version = "0.8.1.0"; + sha256 = "1zcxg6drw3zfc93awmamhh8mqfyrp1pyrnk137yc0dz4293z9rdw"; + libraryHaskellDepends = [ + base containers ghc haskell-tools-ast mtl references split text + uniplate + ]; + homepage = "https://github.com/haskell-tools/haskell-tools"; + description = "Pretty printing of Haskell-Tools AST"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "haskell-tools-refactor" = callPackage ({ mkDerivation, base, Cabal, containers, directory, either , filepath, ghc, ghc-paths, haskell-tools-ast @@ -88528,6 +90193,37 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "haskell-tools-refactor_0_8_1_0" = callPackage + ({ mkDerivation, base, Cabal, containers, directory, either + , filepath, ghc, ghc-paths, haskell-tools-ast + , haskell-tools-backend-ghc, haskell-tools-prettyprint + , haskell-tools-rewrite, mtl, old-time, polyparse, references + , split, tasty, tasty-hunit, template-haskell, time, transformers + , uniplate + }: + mkDerivation { + pname = "haskell-tools-refactor"; + version = "0.8.1.0"; + sha256 = "04jx9qq04krk8wk7v5b6xv7gi8cd1sgzwraw916a11cgn0p52grr"; + libraryHaskellDepends = [ + base Cabal containers directory filepath ghc ghc-paths + haskell-tools-ast haskell-tools-backend-ghc + haskell-tools-prettyprint haskell-tools-rewrite mtl references + split template-haskell transformers uniplate + ]; + testHaskellDepends = [ + base Cabal containers directory either filepath ghc ghc-paths + haskell-tools-ast haskell-tools-backend-ghc + haskell-tools-prettyprint haskell-tools-rewrite mtl old-time + polyparse references split tasty tasty-hunit template-haskell time + transformers uniplate + ]; + homepage = "https://github.com/haskell-tools/haskell-tools"; + description = "Refactoring Tool for Haskell"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "haskell-tools-rewrite" = callPackage ({ mkDerivation, base, containers, directory, filepath, ghc , haskell-tools-ast, haskell-tools-prettyprint, mtl, references @@ -88551,6 +90247,29 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "haskell-tools-rewrite_0_8_1_0" = callPackage + ({ mkDerivation, base, containers, directory, filepath, ghc + , haskell-tools-ast, haskell-tools-prettyprint, mtl, references + , tasty, tasty-hunit + }: + mkDerivation { + pname = "haskell-tools-rewrite"; + version = "0.8.1.0"; + sha256 = "1ckn103f5jg3yqpf2ki8n62a663hj5q2zyd5mzx6n4nlkr47bc57"; + libraryHaskellDepends = [ + base containers ghc haskell-tools-ast haskell-tools-prettyprint mtl + references + ]; + testHaskellDepends = [ + base directory filepath haskell-tools-ast haskell-tools-prettyprint + tasty tasty-hunit + ]; + homepage = "https://github.com/haskell-tools/haskell-tools"; + description = "Facilities for generating new parts of the Haskell-Tools AST"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "haskell-tor" = callPackage ({ mkDerivation, array, asn1-encoding, asn1-types, async , attoparsec, base, base64-bytestring, binary, bytestring, cereal @@ -89801,6 +91520,37 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "hasmin_0_3_2_3" = callPackage + ({ mkDerivation, attoparsec, base, bytestring, containers + , criterion, directory, doctest, doctest-discover, gitrev, hopfli + , hspec, hspec-attoparsec, matrix, mtl, numbers + , optparse-applicative, parsers, QuickCheck, text + }: + mkDerivation { + pname = "hasmin"; + version = "0.3.2.3"; + sha256 = "0qk551j27rc36gmrfdhlvz3kzn8yj8alzc2n86jgyx480gj354gg"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + attoparsec base bytestring containers matrix mtl numbers parsers + text + ]; + executableHaskellDepends = [ + attoparsec base bytestring containers gitrev hopfli matrix mtl + numbers optparse-applicative parsers text + ]; + testHaskellDepends = [ + attoparsec base doctest doctest-discover hspec hspec-attoparsec mtl + QuickCheck text + ]; + benchmarkHaskellDepends = [ base criterion directory text ]; + homepage = "https://github.com/contivero/hasmin#readme"; + description = "CSS Minifier"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "hasparql-client" = callPackage ({ mkDerivation, base, HTTP, monads-fd, network, xml }: mkDerivation { @@ -89861,6 +91611,36 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "hasql_0_19_18_1" = callPackage + ({ mkDerivation, attoparsec, base, base-prelude, bug, bytestring + , bytestring-strict-builder, contravariant, contravariant-extras + , criterion, data-default-class, dlist, either, hashable + , hashtables, loch-th, mtl, placeholders, postgresql-binary + , postgresql-libpq, profunctors, QuickCheck, quickcheck-instances + , rebase, rerebase, semigroups, tasty, tasty-hunit + , tasty-quickcheck, tasty-smallcheck, text, transformers, vector + }: + mkDerivation { + pname = "hasql"; + version = "0.19.18.1"; + sha256 = "1cmr3l9gb639spqdw8if1da23qhlifr4jyxgfmy61l81mm42zjfb"; + libraryHaskellDepends = [ + attoparsec base base-prelude bytestring bytestring-strict-builder + contravariant contravariant-extras data-default-class dlist either + hashable hashtables loch-th mtl placeholders postgresql-binary + postgresql-libpq profunctors semigroups text transformers vector + ]; + testHaskellDepends = [ + bug data-default-class QuickCheck quickcheck-instances rebase + rerebase tasty tasty-hunit tasty-quickcheck tasty-smallcheck + ]; + benchmarkHaskellDepends = [ bug criterion rerebase ]; + 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 @@ -91648,6 +93428,23 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "heaps_0_3_5" = callPackage + ({ mkDerivation, base, Cabal, cabal-doctest, directory, doctest + , filepath + }: + mkDerivation { + pname = "heaps"; + version = "0.3.5"; + sha256 = "1p1nsglsf8hric63cn3n1iw1nlbiv3lgk3n5gq0znajj7j7s64qv"; + setupHaskellDepends = [ base Cabal cabal-doctest ]; + libraryHaskellDepends = [ base ]; + testHaskellDepends = [ base directory doctest filepath ]; + homepage = "http://github.com/ekmett/heaps/"; + description = "Asymptotically optimal Brodal/Okasaki heaps"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "heapsort" = callPackage ({ mkDerivation, array, base, QuickCheck }: mkDerivation { @@ -95211,21 +97008,21 @@ self: { "hledger-iadd" = callPackage ({ mkDerivation, base, brick, containers, directory, free , hledger-lib, hspec, megaparsec, microlens, microlens-th - , optparse-applicative, QuickCheck, text, text-format, text-zipper - , time, transformers, unordered-containers, vector, vty - , xdg-basedir + , optparse-applicative, QuickCheck, semigroups, text, text-format + , text-zipper, time, transformers, unordered-containers, vector + , vty, xdg-basedir }: mkDerivation { pname = "hledger-iadd"; - version = "1.2.3"; - sha256 = "1y2j2aiidp3y92wpx8wmr9r4wibg2cn0lws4s7ljrl6ghh57n4vq"; + version = "1.2.4"; + sha256 = "17bzjmdcirf32fic6sx246x30p02gnq0c50bia0lq088hdfxn6yr"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base brick containers directory free hledger-lib megaparsec - microlens microlens-th optparse-applicative text text-format - text-zipper time transformers unordered-containers vector vty - xdg-basedir + microlens microlens-th optparse-applicative semigroups text + text-format text-zipper time transformers unordered-containers + vector vty xdg-basedir ]; executableHaskellDepends = [ base brick directory free hledger-lib megaparsec microlens @@ -96977,8 +98774,8 @@ self: { }: mkDerivation { pname = "hoogle"; - version = "5.0.12"; - sha256 = "024knipmwl75gq56phjwpa61gzac8alw46k6lcgfg7v9dglz2dqx"; + version = "5.0.13"; + sha256 = "1wxdzkifgm3bnpzr45sf49dyqwnb8bnc5wmqbv5yhxv19gmjk8kn"; isLibrary = true; isExecutable = true; enableSeparateDataOutput = true; @@ -98159,6 +99956,27 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "hpp_0_4_1" = callPackage + ({ mkDerivation, base, bytestring, bytestring-trie, directory + , filepath, ghc-prim, time, transformers + }: + mkDerivation { + pname = "hpp"; + version = "0.4.1"; + sha256 = "0va60lvxgy52i064i62hln7kca55xk5f494khiax74bsn8iin7pq"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + base bytestring bytestring-trie directory filepath ghc-prim time + transformers + ]; + executableHaskellDepends = [ base directory filepath time ]; + homepage = "https://github.com/acowley/hpp"; + description = "A Haskell pre-processor"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "hpqtypes" = callPackage ({ mkDerivation, aeson, base, bytestring, containers , data-default-class, exceptions, HUnit, lifted-base, monad-control @@ -100244,6 +102062,26 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "hsexif_0_6_1_2" = callPackage + ({ mkDerivation, base, binary, bytestring, containers, hspec, HUnit + , iconv, text, time + }: + mkDerivation { + pname = "hsexif"; + version = "0.6.1.2"; + sha256 = "1i6h4gpjlrb9jadm52ygs9i1430lik2kljv86bpq6wz9zmq25d0s"; + libraryHaskellDepends = [ + base binary bytestring containers iconv text time + ]; + testHaskellDepends = [ + base binary bytestring containers hspec HUnit iconv text time + ]; + homepage = "https://github.com/emmanueltouzery/hsexif"; + description = "EXIF handling library in pure Haskell"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "hsfacter" = callPackage ({ mkDerivation, base, containers, language-puppet, text }: mkDerivation { @@ -100404,8 +102242,8 @@ self: { }: mkDerivation { pname = "hsimport"; - version = "0.8.3"; - sha256 = "1hfhni85518hqvq3gzllc2mj83z1fwqlsfh2ida5pn8lg2j9ix2b"; + version = "0.8.4"; + sha256 = "1xngy3qnk6nr0yvvkq7cqay0kkhnp0v4ah27w8r5v3q4malraa1l"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -102655,15 +104493,17 @@ self: { }) {}; "html-entities" = callPackage - ({ mkDerivation, attoparsec, base, base-prelude, directory, doctest - , filepath, text, unordered-containers + ({ mkDerivation, attoparsec, base, base-prelude, Cabal + , cabal-doctest, directory, doctest, filepath, text + , unordered-containers }: mkDerivation { pname = "html-entities"; - version = "1.1.4"; - sha256 = "1h4jjy1fqzfcj49q99iprnz4ifaznacxnryq9bx8abxqsss22p0d"; + version = "1.1.4.1"; + sha256 = "1x6z5fv1sdhdmhwd10kwahvjjkhrza3dm7xzk9ypfkkmyi1piwpi"; + setupHaskellDepends = [ base Cabal cabal-doctest ]; libraryHaskellDepends = [ - attoparsec base-prelude text unordered-containers + attoparsec base base-prelude text unordered-containers ]; testHaskellDepends = [ base base-prelude directory doctest filepath @@ -104657,6 +106497,19 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "hw-hedgehog" = callPackage + ({ mkDerivation, base, hedgehog, vector }: + mkDerivation { + pname = "hw-hedgehog"; + version = "0.1.0.1"; + sha256 = "0fngvmx60a3z1sl798ghvfzya5dgi1mfln8p1vkqapcgfjh7w5r6"; + libraryHaskellDepends = [ base hedgehog vector ]; + testHaskellDepends = [ base ]; + homepage = "https://github.com/githubuser/hw-hedgehog#readme"; + description = "Extra hedgehog functionality"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "hw-hspec-hedgehog" = callPackage ({ mkDerivation, base, call-stack, hedgehog, hspec, HUnit }: mkDerivation { @@ -106067,6 +107920,33 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "hyperloglog_0_4_2" = callPackage + ({ mkDerivation, approximate, base, binary, bits, bytes, Cabal + , cabal-doctest, cereal, cereal-vector, comonad, deepseq, directory + , distributive, doctest, filepath, generic-deriving, hashable, lens + , reflection, safecopy, semigroupoids, semigroups, simple-reflect + , siphash, tagged, vector + }: + mkDerivation { + pname = "hyperloglog"; + version = "0.4.2"; + sha256 = "0j0hbzpap3f92kvywsxjahxmqrdj51275jdv0h7f9lf9qby3rf7m"; + setupHaskellDepends = [ base Cabal cabal-doctest ]; + libraryHaskellDepends = [ + approximate base binary bits bytes cereal cereal-vector comonad + deepseq distributive hashable lens reflection safecopy + semigroupoids semigroups siphash tagged vector + ]; + testHaskellDepends = [ + base directory doctest filepath generic-deriving semigroups + simple-reflect + ]; + homepage = "http://github.com/analytics/hyperloglog"; + description = "An approximate streaming (constant space) unique object counter"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "hyperloglogplus" = callPackage ({ mkDerivation, base, bits, containers, HUnit, murmur-hash , semigroups, tasty, tasty-hunit, vector @@ -106122,6 +108002,8 @@ self: { pname = "hyphenation"; version = "0.7"; sha256 = "0l1yvfdkkgba91pzncy399hv65pdipb9p78v2j9g0sdkmb1anq9s"; + revision = "1"; + editedCabalFile = "0r3a79cg3dabcm4px3vq26hc5yj4sagws4fa3ic00d28qb6y4b4w"; enableSeparateDataOutput = true; setupHaskellDepends = [ base Cabal cabal-doctest ]; libraryHaskellDepends = [ @@ -106741,6 +108623,51 @@ self: { license = stdenv.lib.licenses.bsd3; }) {inherit (pkgs) gmp;}; + "idris_1_1_0" = callPackage + ({ mkDerivation, aeson, annotated-wl-pprint, ansi-terminal + , ansi-wl-pprint, array, async, base, base64-bytestring, binary + , 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 = "1.1.0"; + sha256 = "1d68jz9irqcya90a1s3hvn955lqq3zd64y5d7mkx84r1gsxsmskk"; + configureFlags = [ "-fcurses" "-fffi" "-fgmp" ]; + isLibrary = true; + isExecutable = true; + enableSeparateDataOutput = true; + libraryHaskellDepends = [ + aeson annotated-wl-pprint ansi-terminal ansi-wl-pprint array async + base base64-bytestring binary blaze-html blaze-markup bytestring + 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 = [ + base directory filepath haskeline transformers + ]; + testHaskellDepends = [ + base bytestring containers directory filepath haskeline + optparse-applicative process tagged tasty tasty-golden tasty-rerun + time transformers + ]; + homepage = "http://www.idris-lang.org/"; + description = "Functional Programming Language with Dependent Types"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {inherit (pkgs) gmp;}; + "ieee" = callPackage ({ mkDerivation, base }: mkDerivation { @@ -107232,6 +109159,21 @@ self: { license = stdenv.lib.licenses.publicDomain; }) {}; + "ihs_0_1_0_1" = callPackage + ({ mkDerivation, base, process }: + mkDerivation { + pname = "ihs"; + version = "0.1.0.1"; + sha256 = "0q7wa5pgf4ga7pmjwjxacqmdbhqricsv9xkzfrcg314lag8wvdgb"; + isLibrary = false; + isExecutable = true; + executableHaskellDepends = [ base process ]; + homepage = "https://github.com/minad/ihs"; + description = "Interpolated Haskell"; + license = stdenv.lib.licenses.publicDomain; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "ihttp" = callPackage ({ mkDerivation, attoparsec, base, bytestring, containers , contstuff, enumerator, netlines, network @@ -109260,6 +111202,26 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "intervals_0_8_1" = callPackage + ({ mkDerivation, array, base, Cabal, cabal-doctest, directory + , distributive, doctest, filepath, ghc-prim, QuickCheck + , template-haskell + }: + mkDerivation { + pname = "intervals"; + version = "0.8.1"; + sha256 = "00vyxf3ba9d7aas3npfapr53w71fslgh69fczjb25axr66fvzqww"; + setupHaskellDepends = [ base Cabal cabal-doctest ]; + libraryHaskellDepends = [ array base distributive ghc-prim ]; + testHaskellDepends = [ + base directory doctest filepath QuickCheck template-haskell + ]; + homepage = "http://github.com/ekmett/intervals"; + description = "Interval Arithmetic"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "intricacy" = callPackage ({ mkDerivation, array, base, binary, bytestring, containers , crypto-api, crypto-pubkey-types, cryptohash, directory, filepath @@ -109411,6 +111373,30 @@ self: { license = stdenv.lib.licenses.bsd2; }) {}; + "invariant_0_4_3" = callPackage + ({ mkDerivation, array, base, bifunctors, comonad, containers + , contravariant, ghc-prim, hspec, profunctors, QuickCheck + , semigroups, StateVar, stm, tagged, template-haskell + , th-abstraction, transformers, transformers-compat + , unordered-containers + }: + mkDerivation { + pname = "invariant"; + version = "0.4.3"; + sha256 = "17nfm5w6hp4ajg7gslvdvzj4nkds8zk8yp1zi6pi6lax71613rz0"; + libraryHaskellDepends = [ + array base bifunctors comonad containers contravariant ghc-prim + profunctors semigroups StateVar stm tagged template-haskell + th-abstraction transformers transformers-compat + unordered-containers + ]; + testHaskellDepends = [ base hspec QuickCheck template-haskell ]; + homepage = "https://github.com/nfrisby/invariant-functors"; + description = "Haskell98 invariant functors"; + license = stdenv.lib.licenses.bsd2; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "invertible" = callPackage ({ mkDerivation, base, haskell-src-meta, invariant, lens , partial-isomorphisms, QuickCheck, semigroupoids, template-haskell @@ -110065,6 +112051,26 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "irc-client_0_4_4_3" = callPackage + ({ mkDerivation, base, bytestring, conduit, connection, irc-conduit + , irc-ctcp, network-conduit-tls, old-locale, stm, stm-conduit, text + , time, tls, transformers, x509, x509-store, x509-validation + }: + mkDerivation { + pname = "irc-client"; + version = "0.4.4.3"; + sha256 = "0m85swb00hkpj13rk413vd7zxwsqps20kqnjwzwi14288awigjd1"; + libraryHaskellDepends = [ + base bytestring conduit connection irc-conduit irc-ctcp + network-conduit-tls old-locale stm stm-conduit text time tls + transformers x509 x509-store x509-validation + ]; + homepage = "https://github.com/barrucadu/irc-client"; + description = "An IRC client library"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "irc-colors" = callPackage ({ mkDerivation, base, text }: mkDerivation { @@ -110095,6 +112101,26 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "irc-conduit_0_2_2_2" = 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.2"; + sha256 = "0glgq9wbx0i42ry7ribp8r54lsx39qjvvd9dhx1cnv5bb5jwihas"; + 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; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "irc-core" = callPackage ({ mkDerivation, attoparsec, base, base64-bytestring, bytestring , hashable, HUnit, primitive, text, time, vector @@ -112945,6 +114971,38 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "jsons-to-schema" = callPackage + ({ mkDerivation, aeson, aeson-pretty, base, bytestring, conduit + , conduit-combinators, containers, Glob, hjsonschema, hspec + , neat-interpolation, optparse-applicative, protolude, QuickCheck + , quickcheck-instances, safe, scientific, semigroups, text + , uniplate, unordered-containers, vector + }: + mkDerivation { + pname = "jsons-to-schema"; + version = "0.1.0.0"; + sha256 = "0agnvc8x2yvl2m0lz5hcflmi44gscyb349zn0xbrlk9arq7ha8nc"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + aeson aeson-pretty base bytestring containers hjsonschema protolude + QuickCheck safe scientific semigroups text unordered-containers + vector + ]; + executableHaskellDepends = [ + base bytestring conduit conduit-combinators Glob hjsonschema + optparse-applicative protolude + ]; + testHaskellDepends = [ + aeson aeson-pretty base bytestring containers hjsonschema hspec + neat-interpolation protolude QuickCheck quickcheck-instances + scientific text uniplate unordered-containers vector + ]; + homepage = "https://github.com/garetht/jsons-to-schema/README.md"; + description = "JSON to JSON Schema"; + license = stdenv.lib.licenses.mit; + }) {}; + "jsonschema-gen" = callPackage ({ mkDerivation, aeson, base, bytestring, containers, process , scientific, tagged, text, time, unordered-containers, vector @@ -113187,6 +115245,18 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "justified-containers" = callPackage + ({ mkDerivation, base, containers }: + mkDerivation { + pname = "justified-containers"; + version = "0.1.1.1"; + sha256 = "1grihhshn1dprg6cll742bdqkywnlz8zzcyf2m49kbpyzrcaywqg"; + libraryHaskellDepends = [ base containers ]; + homepage = "https://github.com/matt-noonan/justified-containers"; + description = "Keyed container types with type-checked proofs of key presence"; + license = stdenv.lib.licenses.bsd2; + }) {}; + "jvm" = callPackage ({ mkDerivation, base, bytestring, choice, criterion , distributed-closure, hspec, jni, singletons, template-haskell @@ -116159,8 +118229,8 @@ self: { }: mkDerivation { pname = "language-c-inline"; - version = "0.7.10.0"; - sha256 = "152bh73gr6a7iahi2vsn2z4vjgbk2rd5qsmrd5wc7jrb67485n6i"; + version = "0.7.11.0"; + sha256 = "1f31yk4h507d3gl0crjrjxhc2c313i8l04sacw79m2vyvy7fqrzw"; libraryHaskellDepends = [ array base containers filepath language-c-quote mainland-pretty template-haskell @@ -116681,22 +118751,22 @@ self: { , cabal-doctest, containers, deepseq, doctest, flow, ghc , haddock-api, haddock-library, hashable, intern, lens, megaparsec , monad-mock, mtl, optparse-generic, QuickCheck - , quickcheck-instances, smallcheck, system-filepath, tasty - , tasty-html, tasty-hunit, tasty-lens, tasty-quickcheck + , quickcheck-instances, semigroups, smallcheck, system-filepath + , tasty, tasty-html, tasty-hunit, tasty-lens, tasty-quickcheck , tasty-smallcheck, template-haskell, text, transformers, turtle , unordered-containers, versions }: mkDerivation { pname = "language-ninja"; - version = "0.1.0"; - sha256 = "1bqf61q8mzglf1f3y2khy2vw4k3kfc0qd0rw984jyfxk10wqr27d"; + version = "0.2.0"; + sha256 = "08lzkvq0v3b8grji7gcfg2m714xql85k18b5wg3h0nh38wkh6m8d"; isLibrary = true; isExecutable = true; setupHaskellDepends = [ base Cabal cabal-doctest ]; libraryHaskellDepends = [ aeson base bytestring containers deepseq flow hashable intern lens - megaparsec mtl QuickCheck quickcheck-instances smallcheck - system-filepath text transformers unordered-containers versions + megaparsec mtl QuickCheck semigroups smallcheck system-filepath + text transformers unordered-containers versions ]; executableHaskellDepends = [ aeson aeson-pretty base flow lens mtl optparse-generic text @@ -116705,8 +118775,8 @@ self: { testHaskellDepends = [ aeson base bytestring cabal-doctest containers doctest flow ghc haddock-api haddock-library hashable lens monad-mock mtl QuickCheck - quickcheck-instances smallcheck system-filepath tasty tasty-html - tasty-hunit tasty-lens tasty-quickcheck tasty-smallcheck + quickcheck-instances semigroups smallcheck system-filepath tasty + tasty-html tasty-hunit tasty-lens tasty-quickcheck tasty-smallcheck template-haskell text transformers turtle unordered-containers versions ]; @@ -116838,6 +118908,51 @@ self: { hydraPlatforms = [ "x86_64-linux" ]; }) {}; + "language-puppet_1_3_9" = callPackage + ({ mkDerivation, aeson, ansi-wl-pprint, attoparsec, base + , base16-bytestring, bytestring, case-insensitive, containers + , cryptonite, directory, exceptions, filecache, formatting, Glob + , hashable, hruby, hslogger, hspec, hspec-megaparsec, http-api-data + , http-client, HUnit, lens, lens-aeson, megaparsec, memory, mtl + , operational, optparse-applicative, parallel-io, parsec + , pcre-utils, process, random, regex-pcre-builtin, scientific + , semigroups, servant, servant-client, split, stm + , strict-base-types, temporary, text, time, transformers, unix + , unordered-containers, vector, yaml + }: + mkDerivation { + pname = "language-puppet"; + version = "1.3.9"; + sha256 = "13sap5qqpinbn0cvi38kbvlny0vp1pi4xjvx8kjjwkrl30av2rx8"; + isLibrary = true; + isExecutable = true; + enableSeparateDataOutput = true; + libraryHaskellDepends = [ + aeson ansi-wl-pprint attoparsec base base16-bytestring bytestring + case-insensitive containers cryptonite directory exceptions + filecache formatting hashable hruby hslogger hspec http-api-data + http-client lens lens-aeson megaparsec memory mtl operational + parsec pcre-utils process random regex-pcre-builtin scientific + semigroups servant servant-client split stm strict-base-types text + time transformers unix unordered-containers vector yaml + ]; + executableHaskellDepends = [ + aeson base bytestring containers Glob hslogger http-client lens + megaparsec mtl optparse-applicative parallel-io regex-pcre-builtin + servant-client strict-base-types text transformers + unordered-containers vector yaml + ]; + testHaskellDepends = [ + ansi-wl-pprint base Glob hslogger hspec hspec-megaparsec HUnit lens + megaparsec mtl scientific strict-base-types temporary text + transformers unix unordered-containers vector + ]; + homepage = "http://lpuppet.banquise.net/"; + description = "Tools to parse and evaluate the Puppet DSL"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "language-python" = callPackage ({ mkDerivation, alex, array, base, containers, happy, monads-tf , pretty, transformers, utf8-string @@ -116911,8 +119026,8 @@ self: { }: mkDerivation { pname = "language-sally"; - version = "0.1.1.0"; - sha256 = "10ddikcavh7ppmm5issii7mv9nagrs0841cngz3alfw0sw6bw47v"; + version = "0.1.2.0"; + sha256 = "053lswpcscsx74lyfjm6g5yzckfd5fc2bvj34ps8470d8dhbphkb"; libraryHaskellDepends = [ ansi-wl-pprint base bytestring containers text ]; @@ -117769,12 +119884,12 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "leapseconds-announced_2017_1" = callPackage + "leapseconds-announced_2017_1_0_1" = callPackage ({ mkDerivation, base, QuickCheck, time }: mkDerivation { pname = "leapseconds-announced"; - version = "2017.1"; - sha256 = "06gn0y1nkg2wr3rnfm7f5drjfjxgaq16qayanhhdy59hdpfim70g"; + version = "2017.1.0.1"; + sha256 = "1mm8j994106gyx9p3widkydczn8wcj79m2kiymg9fjkhmxyb4fyd"; libraryHaskellDepends = [ base time ]; testHaskellDepends = [ base QuickCheck time ]; homepage = "https://github.com/bjornbm/leapseconds-announced"; @@ -118136,6 +120251,27 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "lens-action_0_2_2" = callPackage + ({ mkDerivation, base, Cabal, cabal-doctest, comonad, contravariant + , directory, doctest, filepath, lens, mtl, profunctors + , semigroupoids, semigroups, transformers + }: + mkDerivation { + pname = "lens-action"; + version = "0.2.2"; + sha256 = "1skhczbl774sb0202b8allm96b67wqsl5fd7jdr9i6a20hyx1gqr"; + setupHaskellDepends = [ base Cabal cabal-doctest ]; + libraryHaskellDepends = [ + base comonad contravariant lens mtl profunctors semigroupoids + semigroups transformers + ]; + testHaskellDepends = [ base directory doctest filepath ]; + homepage = "http://github.com/ekmett/lens-action/"; + description = "Monadic Getters and Folds"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "lens-aeson" = callPackage ({ mkDerivation, aeson, attoparsec, base, bytestring, Cabal , cabal-doctest, doctest, generic-deriving, lens, scientific @@ -118158,6 +120294,29 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "lens-aeson_1_0_2" = callPackage + ({ mkDerivation, aeson, attoparsec, base, bytestring, Cabal + , cabal-doctest, doctest, generic-deriving, lens, scientific + , semigroups, simple-reflect, text, unordered-containers, vector + }: + mkDerivation { + pname = "lens-aeson"; + version = "1.0.2"; + sha256 = "1k028ycmhz7mnjlrap88fqix4nmmpyy6b88m16kv77d3r8sz04a3"; + setupHaskellDepends = [ base Cabal cabal-doctest ]; + libraryHaskellDepends = [ + aeson attoparsec base bytestring lens scientific text + unordered-containers vector + ]; + testHaskellDepends = [ + base doctest generic-deriving semigroups simple-reflect + ]; + homepage = "http://github.com/lens/lens-aeson/"; + description = "Law-abiding lenses for aeson"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "lens-datetime" = callPackage ({ mkDerivation, base, lens, time }: mkDerivation { @@ -118220,6 +120379,19 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "lens-labels_0_1_0_2" = callPackage + ({ mkDerivation, base, ghc-prim }: + mkDerivation { + pname = "lens-labels"; + version = "0.1.0.2"; + sha256 = "11pwdqnjd0gybjrfz79fbd9vdwcimkzqqr91zy6hswlylp42dvq1"; + libraryHaskellDepends = [ base ghc-prim ]; + homepage = "https://github.com/google/proto-lens"; + description = "Integration of lenses with OverloadedLabels"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "lens-prelude" = callPackage ({ mkDerivation, array, base, bytestring, containers, contravariant , either, hashable, lens, mtl, text, time, transformers @@ -118331,8 +120503,8 @@ self: { ({ mkDerivation, base, doctest, lens }: mkDerivation { pname = "lens-tutorial"; - version = "1.0.2"; - sha256 = "1dg1s44gqip77bqb76f8yyq9x20rhicdw2y2mlamzczvkgv3h9pg"; + version = "1.0.3"; + sha256 = "1x6lbmylfp1gbik32ssfq643nmkhvhliryz70fsvcmscscm0chxp"; libraryHaskellDepends = [ base lens ]; testHaskellDepends = [ base doctest ]; description = "Tutorial for the lens library"; @@ -119222,13 +121394,13 @@ self: { }: mkDerivation { pname = "libravatar"; - version = "0.4"; - sha256 = "0b0zyavlxmh0qcfiksyshrhxrnynz3wwbg13vd64gs0i9abdxjij"; + version = "0.4.0.1"; + sha256 = "0ki2xw3m0iq4n25ylv8am26j8s517v1l6b6avca6ymgn5qxq79kp"; libraryHaskellDepends = [ base bytestring cryptonite data-default-class dns memory random text uri-bytestring url ]; - homepage = "http://rel4tion.org/projects/libravatar/"; + homepage = "https://rel4.seek-together.space/projects/libravatar/"; description = "Use Libravatar, the decentralized avatar delivery service"; license = stdenv.lib.licenses.publicDomain; }) {}; @@ -119921,6 +122093,36 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "linear_1_20_7" = callPackage + ({ mkDerivation, adjunctions, base, base-orphans, binary, bytes + , bytestring, Cabal, cabal-doctest, cereal, containers, deepseq + , distributive, doctest, ghc-prim, hashable, HUnit, lens + , reflection, semigroupoids, semigroups, simple-reflect, tagged + , template-haskell, test-framework, test-framework-hunit + , transformers, transformers-compat, unordered-containers, vector + , void + }: + mkDerivation { + pname = "linear"; + version = "1.20.7"; + sha256 = "1dna0zf4qwqwvslz0nkkfclvbflfvf10qydnjsi20wijilkbd22b"; + setupHaskellDepends = [ base Cabal cabal-doctest ]; + libraryHaskellDepends = [ + adjunctions base base-orphans binary bytes cereal containers + deepseq distributive ghc-prim hashable lens reflection + semigroupoids semigroups tagged template-haskell transformers + transformers-compat unordered-containers vector void + ]; + testHaskellDepends = [ + base binary bytestring deepseq doctest HUnit lens reflection + simple-reflect test-framework test-framework-hunit vector + ]; + homepage = "http://github.com/ekmett/linear/"; + description = "Linear Algebra"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "linear-accelerate" = callPackage ({ mkDerivation, accelerate, base, Cabal, cabal-doctest , distributive, doctest, lens, linear @@ -119939,6 +122141,25 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "linear-accelerate_0_4_1" = callPackage + ({ mkDerivation, accelerate, base, Cabal, cabal-doctest + , distributive, doctest, lens, linear + }: + mkDerivation { + pname = "linear-accelerate"; + version = "0.4.1"; + sha256 = "1hhmn446ggm66r3aibg8dyc923lw68fmkb1y8q37jsw13s1lkdlp"; + setupHaskellDepends = [ base Cabal cabal-doctest ]; + libraryHaskellDepends = [ + accelerate base distributive lens linear + ]; + testHaskellDepends = [ base doctest ]; + homepage = "http://github.com/ekmett/linear-accelerate/"; + description = "Lifting linear vector spaces into Accelerate"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "linear-algebra-cblas" = callPackage ({ mkDerivation, base, ieee754, QuickCheck, storable-complex , test-framework, test-framework-quickcheck2, vector @@ -120807,6 +123028,25 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "list-t_1_0_0_1" = callPackage + ({ mkDerivation, base, base-prelude, HTF, mmorph, monad-control + , mtl, mtl-prelude, transformers, transformers-base + }: + mkDerivation { + pname = "list-t"; + version = "1.0.0.1"; + sha256 = "00gpz0fn91cj3chf13r1y83y5ifwj4b55j1c0zc2ss9yffrjjjaa"; + libraryHaskellDepends = [ + base base-prelude mmorph monad-control mtl transformers + transformers-base + ]; + testHaskellDepends = [ base-prelude HTF mmorph mtl-prelude ]; + homepage = "https://github.com/nikita-volkov/list-t"; + description = "ListT done right"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "list-t-attoparsec" = callPackage ({ mkDerivation, attoparsec, base-prelude, either, hspec, list-t , list-t-text, text, transformers @@ -121570,6 +123810,22 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "lmdb-simple" = callPackage + ({ mkDerivation, base, bytestring, criterion, hspec, lmdb + , QuickCheck, serialise + }: + mkDerivation { + pname = "lmdb-simple"; + version = "0.3.0.0"; + sha256 = "1sin30ddq206f86br9snidskn02m4s6wwaaylvpmxzhay40b2f6i"; + libraryHaskellDepends = [ base bytestring lmdb serialise ]; + testHaskellDepends = [ base hspec QuickCheck ]; + benchmarkHaskellDepends = [ base criterion ]; + homepage = "https://github.com/verement/lmdb-simple#readme"; + description = "Simple API for LMDB"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "lmonad" = callPackage ({ mkDerivation, base, containers, exceptions, HUnit, monad-control , transformers, transformers-base @@ -121926,6 +124182,30 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "log-domain_0_11_2" = callPackage + ({ mkDerivation, base, binary, bytes, Cabal, cabal-doctest, cereal + , comonad, deepseq, distributive, doctest, generic-deriving + , hashable, safecopy, semigroupoids, semigroups, simple-reflect + , vector + }: + mkDerivation { + pname = "log-domain"; + version = "0.11.2"; + sha256 = "0cywq1zv57p30419hdg6s7srd14g6r2kixnk8gmj72h0rx7fc2cd"; + setupHaskellDepends = [ base Cabal cabal-doctest ]; + libraryHaskellDepends = [ + base binary bytes cereal comonad deepseq distributive hashable + safecopy semigroupoids semigroups vector + ]; + testHaskellDepends = [ + base doctest generic-deriving semigroups simple-reflect + ]; + homepage = "http://github.com/ekmett/log-domain/"; + description = "Log-domain arithmetic"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "log-effect" = callPackage ({ mkDerivation, base, bytestring, extensible-effects, fast-logger , time @@ -122804,8 +125084,8 @@ self: { }: mkDerivation { pname = "loup"; - version = "0.0.13"; - sha256 = "03ibb8ddrd7k9mhb8axg3jrbrn68kwi94sz7wnxr21ixiz2cb122"; + version = "0.0.14"; + sha256 = "0j700rms8g1k8lz2anwh9j6pq8f4yqxmcvkn1ssxx2k5dvbq7q80"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -123721,6 +126001,32 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "machines_0_6_3" = callPackage + ({ mkDerivation, adjunctions, base, Cabal, cabal-doctest, comonad + , conduit, conduit-combinators, containers, criterion, distributive + , doctest, mtl, pipes, pointed, profunctors, semigroupoids + , semigroups, transformers, transformers-compat, void + }: + mkDerivation { + pname = "machines"; + version = "0.6.3"; + sha256 = "1kxypm26xxd30979yrg94pnaaj3yfn180ri3y4z2xsm2m5iyiliz"; + setupHaskellDepends = [ base Cabal cabal-doctest ]; + libraryHaskellDepends = [ + adjunctions base comonad containers distributive mtl pointed + profunctors semigroupoids semigroups transformers + transformers-compat void + ]; + testHaskellDepends = [ base doctest ]; + benchmarkHaskellDepends = [ + base conduit conduit-combinators criterion mtl pipes + ]; + homepage = "http://github.com/ekmett/machines/"; + description = "Networked stream transducers"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "machines-amazonka" = callPackage ({ mkDerivation, amazonka, amazonka-autoscaling, amazonka-core , amazonka-ec2, amazonka-s3, amazonka-sts, base @@ -125586,8 +127892,8 @@ self: { }: mkDerivation { pname = "matterhorn"; - version = "40000.0.0"; - sha256 = "1cr4mnqqdwf137v4r6mgc7p1b20hm4pdvm6qs61zrhlgimy9zmln"; + version = "40000.0.1"; + sha256 = "08khf3s38gvxn5w6jv21h0zc1g6p3ddjs8lbzziyh416w0qq9b9y"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -125619,8 +127925,8 @@ self: { }: mkDerivation { pname = "mattermost-api"; - version = "40000.0.0"; - sha256 = "0c2c09hmq8n44na0i20hqj57cv5wr9yy4apvhdn0xvgfs155wgp9"; + version = "40000.0.1"; + sha256 = "0phykn8h08yprmpds92cp6snraxg66hbh553b8da5v47dn06y8mv"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -125646,8 +127952,8 @@ self: { }: mkDerivation { pname = "mattermost-api-qc"; - version = "40000.0.0"; - sha256 = "0pnwzay7w9jmdrq26sj3in127c5dywbzhwi12vcf09q4mi43zqwb"; + version = "40000.0.1"; + sha256 = "0444m1349gpyffpjlvf9faz4sia5kfsry9q174n6b60ch85w1ilg"; libraryHaskellDepends = [ base containers mattermost-api QuickCheck text time ]; @@ -126413,7 +128719,7 @@ self: { license = stdenv.lib.licenses.bsd2; }) {}; - "megaparsec_6_0_1" = callPackage + "megaparsec_6_0_2" = callPackage ({ mkDerivation, base, bytestring, case-insensitive, containers , criterion, deepseq, hspec, hspec-expectations, mtl , parser-combinators, QuickCheck, scientific, text, transformers @@ -126421,8 +128727,8 @@ self: { }: mkDerivation { pname = "megaparsec"; - version = "6.0.1"; - sha256 = "1cj6ibzcvdq24k94xbx6fw2wxzh3dvxv9q2yapbdhimkx632g88w"; + version = "6.0.2"; + sha256 = "0j056smq8k0pal765vanjzg51aw7wxv0qihsipirb6d7ik03didf"; libraryHaskellDepends = [ base bytestring case-insensitive containers deepseq mtl parser-combinators scientific text transformers @@ -126814,6 +129120,8 @@ self: { pname = "memorypool"; version = "0.1.0.0"; sha256 = "0w3ssdffsnaxgs8a22sbclsyss4bvmzhb6bww252dcrgpcmn1dkh"; + revision = "1"; + editedCabalFile = "1jv5zba8jldkic64dmrafq45dwaa0ayc2ihvbg0ff87n5i3sh5z0"; libraryHaskellDepends = [ base containers transformers unsafe vector ]; @@ -127744,8 +130052,8 @@ self: { }: mkDerivation { pname = "mikrokosmos"; - version = "0.3.0"; - sha256 = "1qr0m4iy1xyprw714nrdpkxlr6lmvsb6f9d8m4z13z03njnz4vm6"; + version = "0.5.0"; + sha256 = "04hm0bz3hhxb11x1cfk129sv8x9dqjyvbagpr250cha47wws3sal"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -128408,6 +130716,25 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "mixed-types-num_0_3_0_1" = callPackage + ({ mkDerivation, base, convertible, hspec, hspec-smallcheck + , QuickCheck, smallcheck, template-haskell + }: + mkDerivation { + pname = "mixed-types-num"; + version = "0.3.0.1"; + sha256 = "00qvb1himrrdpasfc44bblydgc1hmhnbfmcprq6yzdz7lb1f8x6x"; + libraryHaskellDepends = [ + base convertible hspec hspec-smallcheck QuickCheck smallcheck + template-haskell + ]; + 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; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "mkbndl" = callPackage ({ mkDerivation, base, directory, filepath, haskell98 }: mkDerivation { @@ -129243,8 +131570,8 @@ self: { pname = "monad-http"; version = "0.1.0.0"; sha256 = "14ki66l60la1mmm544vvzn930liaygj6zrql10nr192shf3v0cx3"; - revision = "4"; - editedCabalFile = "00xzkxsqz34gc8vf1zanrmqszkbfigcl7dz1xwhab4p55lddvhhl"; + revision = "5"; + editedCabalFile = "1w12fd8jy7infcgahlg9zim518vvb2g3j0s2w6qdql86i629xjdg"; libraryHaskellDepends = [ base base-compat bytestring exceptions http-client http-client-tls http-types monad-logger monadcryptorandom MonadRandom mtl text @@ -129543,8 +131870,8 @@ self: { }: mkDerivation { pname = "monad-mock"; - version = "0.1.1.1"; - sha256 = "1ja9s1z4y1vrk01bgav83cj95hzp8mrwil74b7lmc4fmdmr7a5y3"; + version = "0.1.1.2"; + sha256 = "029c8jcw7y3hd1llvfnm85fwxvfh7mlhr7dxnfsx6x8zq1qda12f"; libraryHaskellDepends = [ base constraints exceptions haskell-src-exts haskell-src-meta monad-control mtl template-haskell th-orphans transformers-base @@ -130469,6 +132796,31 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "mono-traversable_1_0_2_1" = 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.2.1"; + sha256 = "0smirpwika7d5a98h20jr9jqg41n7vqfy7k31crmn449qfig9ljf"; + 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; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "mono-traversable-instances" = callPackage ({ mkDerivation, base, comonad, containers, dlist, dlist-instances , mono-traversable, semigroupoids, semigroups, transformers @@ -130610,6 +132962,23 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "monoidal-containers_0_3_0_2" = callPackage + ({ mkDerivation, base, containers, deepseq, hashable, lens, newtype + , unordered-containers + }: + mkDerivation { + pname = "monoidal-containers"; + version = "0.3.0.2"; + sha256 = "1ivjf0wi77kf07jq6q8mf01bi8zr29qjkvsi2sqpm34kl7hlhsij"; + libraryHaskellDepends = [ + base containers deepseq hashable lens newtype unordered-containers + ]; + homepage = "http://github.com/bgamari/monoidal-containers"; + description = "Containers with monoidal accumulation"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "monoidplus" = callPackage ({ mkDerivation, base, contravariant, semigroups, transformers }: mkDerivation { @@ -132079,6 +134448,26 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "multistate_0_7_1_2" = callPackage + ({ mkDerivation, base, hspec, monad-control, mtl, tagged + , transformers, transformers-base + }: + mkDerivation { + pname = "multistate"; + version = "0.7.1.2"; + sha256 = "1mcl0gp2l9wvscq942mz6p0pwlaf4i8li9kp20bp608kahy332ci"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + base monad-control mtl tagged transformers transformers-base + ]; + testHaskellDepends = [ base hspec transformers ]; + homepage = "https://github.com/lspitzner/multistate"; + description = "like mtl's ReaderT / WriterT / StateT, but more than one contained value/type"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "multivariant" = callPackage ({ mkDerivation, base, containers, free, HUnit, invertible , MonadRandom, profunctors, QuickCheck, semigroupoids, tasty @@ -135013,6 +137402,29 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "network-ip_0_3_0_2" = callPackage + ({ mkDerivation, base, data-default-class, data-dword, data-endian + , data-serializer, data-textual, hashable, parsers, tasty + , tasty-quickcheck, text-printer, type-hint + }: + mkDerivation { + pname = "network-ip"; + version = "0.3.0.2"; + sha256 = "1zjy232pamkd3977cyaq5w5r6ksbpqpgzzlds15zrahjccirs9gf"; + libraryHaskellDepends = [ + base data-default-class data-dword data-endian data-serializer + data-textual hashable parsers text-printer type-hint + ]; + testHaskellDepends = [ + base data-dword data-textual parsers tasty tasty-quickcheck + text-printer + ]; + homepage = "https://github.com/mvv/network-ip"; + description = "Internet Protocol data structures"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "network-metrics" = callPackage ({ mkDerivation, base, binary, bytestring, data-default, network , random, time @@ -136539,6 +138951,20 @@ self: { license = "GPL"; }) {}; + "non-negative_0_1_1_2" = callPackage + ({ mkDerivation, base, QuickCheck, utility-ht }: + mkDerivation { + pname = "non-negative"; + version = "0.1.1.2"; + sha256 = "1y5ayazrbw614g61ihilm8vn468dia1cphvsxwm8s0x3iw9gljs6"; + libraryHaskellDepends = [ base QuickCheck utility-ht ]; + testHaskellDepends = [ base QuickCheck utility-ht ]; + homepage = "http://code.haskell.org/~thielema/non-negative/"; + description = "Non-negative numbers"; + license = "GPL"; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "nonce" = callPackage ({ mkDerivation, base, base64-bytestring, bytestring, entropy, text , transformers @@ -137458,6 +139884,46 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "nvim-hs_0_2_4" = callPackage + ({ mkDerivation, ansi-wl-pprint, base, bytestring, cereal + , cereal-conduit, conduit, conduit-extra, containers, data-default + , deepseq, directory, dyre, exceptions, filepath, foreign-store + , hslogger, hspec, hspec-discover, HUnit, lifted-base, megaparsec + , messagepack, monad-control, mtl, network, optparse-applicative + , process, QuickCheck, resourcet, setenv, stm, streaming-commons + , template-haskell, text, time, time-locale-compat, transformers + , transformers-base, utf8-string + }: + mkDerivation { + pname = "nvim-hs"; + version = "0.2.4"; + sha256 = "16zfaps34r6dbjrvrj1a08sndv8nxqhnwy4vgl1flnc6q6xbi7f5"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + ansi-wl-pprint base bytestring cereal cereal-conduit conduit + conduit-extra containers data-default deepseq directory dyre + exceptions filepath foreign-store hslogger lifted-base megaparsec + messagepack monad-control mtl network optparse-applicative process + resourcet setenv stm streaming-commons template-haskell text time + time-locale-compat transformers transformers-base utf8-string + ]; + executableHaskellDepends = [ base data-default ]; + testHaskellDepends = [ + ansi-wl-pprint base bytestring cereal cereal-conduit conduit + conduit-extra containers data-default directory dyre exceptions + filepath foreign-store hslogger hspec hspec-discover HUnit + lifted-base megaparsec messagepack mtl network optparse-applicative + process QuickCheck resourcet setenv stm streaming-commons + template-haskell text time time-locale-compat transformers + transformers-base utf8-string + ]; + homepage = "https://github.com/neovimhaskell/nvim-hs"; + description = "Haskell plugin backend for neovim"; + license = stdenv.lib.licenses.asl20; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "nvim-hs-contrib" = callPackage ({ mkDerivation, ansi-wl-pprint, base, bytestring, data-default , directory, exceptions, filepath, hspec, hspec-discover @@ -137802,6 +140268,30 @@ self: { hydraPlatforms = [ "x86_64-darwin" "x86_64-linux" ]; }) {}; + "octane_0_20_1" = callPackage + ({ mkDerivation, aeson, base, bimap, binary, bytestring, containers + , data-default-class, file-embed, http-client, http-client-tls + , overloaded-records, rattletrap, text + }: + mkDerivation { + pname = "octane"; + version = "0.20.1"; + sha256 = "0gaynwg4r5rjdbppcs0cdqq7fbl51y8bqm149bynkgwrbgs4dbfm"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + aeson base bimap binary bytestring containers data-default-class + file-embed overloaded-records rattletrap text + ]; + executableHaskellDepends = [ + aeson base binary bytestring http-client http-client-tls + ]; + homepage = "https://github.com/tfausak/octane#readme"; + description = "Parse Rocket League replays"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "octohat" = callPackage ({ mkDerivation, aeson, base, base-compat, base16-bytestring , base64-bytestring, bytestring, containers, cryptohash, dotenv @@ -138410,7 +140900,7 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "opaleye_0_5_3_1" = callPackage + "opaleye_0_5_4_0" = callPackage ({ mkDerivation, aeson, attoparsec, base, base16-bytestring , bytestring, case-insensitive, containers, contravariant, dotenv , hspec, hspec-discover, multiset, postgresql-simple, pretty @@ -138419,8 +140909,8 @@ self: { }: mkDerivation { pname = "opaleye"; - version = "0.5.3.1"; - sha256 = "0hgkvvl3pn9bhiy21jxmcvvbzbsywpavwxcmvcwwnkkcdv679rvx"; + version = "0.5.4.0"; + sha256 = "0dyvaci8dpd5rnr40ib1al2mw2ivza02wbsdz1m5qc7hn30374yv"; libraryHaskellDepends = [ aeson attoparsec base base16-bytestring bytestring case-insensitive contravariant postgresql-simple pretty product-profunctors @@ -140611,6 +143101,20 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "pagination_0_2_1" = callPackage + ({ mkDerivation, base, deepseq, exceptions, hspec, QuickCheck }: + mkDerivation { + pname = "pagination"; + version = "0.2.1"; + sha256 = "0g90xg5nfrwkrrmsfca5d2xf9y8md6pgh91zjk0dl2l3kvkbmp48"; + libraryHaskellDepends = [ base deepseq exceptions ]; + testHaskellDepends = [ base exceptions hspec QuickCheck ]; + homepage = "https://github.com/mrkkrp/pagination"; + description = "Framework-agnostic pagination boilerplate"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "pagure-hook-receiver" = callPackage ({ mkDerivation, base, containers, scotty, shelly, text , transformers, unix @@ -140815,6 +143319,8 @@ self: { pname = "pandoc-crossref"; version = "0.2.5.0"; sha256 = "14c4nbibx4qbi7pvycaf3q12hpj4s02wdg5pl23z2b4f8jz3pnfl"; + revision = "1"; + editedCabalFile = "1l1nbijrw2brj9b849agm9cyzn9iwn25kmj1m2xyyyyd1bk95nqr"; isLibrary = true; isExecutable = true; enableSeparateDataOutput = true; @@ -142204,6 +144710,19 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "parser-combinators_0_2_0" = callPackage + ({ mkDerivation, base }: + mkDerivation { + pname = "parser-combinators"; + version = "0.2.0"; + sha256 = "1gz3kh56471924y12vvmrc5w4bx85a53qrp2j8fp33nn78bvx8v8"; + libraryHaskellDepends = [ base ]; + homepage = "https://github.com/mrkkrp/parser-combinators"; + description = "Lightweight package providing commonly useful parser combinators"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "parser-helper" = callPackage ({ mkDerivation, aeson, base, bytestring, haskell-src-exts, text }: mkDerivation { @@ -142282,6 +144801,31 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "parsers_0_12_6" = callPackage + ({ mkDerivation, attoparsec, base, base-orphans, bytestring, Cabal + , cabal-doctest, charset, containers, directory, doctest, filepath + , mtl, parsec, QuickCheck, quickcheck-instances, scientific, text + , transformers, unordered-containers + }: + mkDerivation { + pname = "parsers"; + version = "0.12.6"; + sha256 = "1jyffc1i9vihhxk5r69qmrnhsjsw2g7r0yxh3svvy1wrcz1vfcik"; + setupHaskellDepends = [ base Cabal cabal-doctest ]; + libraryHaskellDepends = [ + attoparsec base base-orphans charset containers mtl parsec + scientific text transformers unordered-containers + ]; + testHaskellDepends = [ + attoparsec base bytestring containers directory doctest filepath + parsec QuickCheck quickcheck-instances + ]; + homepage = "http://github.com/ekmett/parsers/"; + description = "Parsing combinators"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "parsestar" = callPackage ({ mkDerivation, array, base, binary, bytestring, bytestring-mmap , bytestring-nums, bytestring-show, containers, deepseq, derive @@ -142675,20 +145219,20 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "path-io_1_3_2" = callPackage + "path-io_1_3_3" = callPackage ({ mkDerivation, base, containers, directory, dlist, exceptions , filepath, hspec, path, temporary, time, transformers, unix-compat }: mkDerivation { pname = "path-io"; - version = "1.3.2"; - sha256 = "031y6dypf6wnwx7fnjyvn2sb5y1lxfibx0jnwc19h93harm3lfyp"; + version = "1.3.3"; + sha256 = "1g9m3qliqjk1img894wsb89diym5zrq51qkkrwhz4sbm9a8hbv1a"; libraryHaskellDepends = [ base containers directory dlist exceptions filepath path temporary time transformers unix-compat ]; testHaskellDepends = [ - base exceptions hspec path transformers unix-compat + base directory exceptions hspec path transformers unix-compat ]; homepage = "https://github.com/mrkkrp/path-io"; description = "Interface to ‘directory’ package for users of ‘path’"; @@ -143170,6 +145714,24 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "pcre-utils_0_1_8_1_1" = callPackage + ({ mkDerivation, array, attoparsec, base, bytestring, HUnit, mtl + , regex-pcre-builtin, vector + }: + mkDerivation { + pname = "pcre-utils"; + version = "0.1.8.1.1"; + sha256 = "1x3db1hab0qwpw9m4564x86qibzg8jl6cj2k88jii3ihcg580ahz"; + libraryHaskellDepends = [ + array attoparsec base bytestring mtl regex-pcre-builtin vector + ]; + testHaskellDepends = [ base bytestring HUnit regex-pcre-builtin ]; + homepage = "https://github.com/bartavelle/pcre-utils"; + description = "Perl-like substitute and split for PCRE regexps"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "pdf-slave" = callPackage ({ mkDerivation, aeson, base, base64-bytestring, bytestring , containers, directory, exceptions, haskintex, HaTeX @@ -143362,8 +145924,8 @@ self: { }: mkDerivation { pname = "pdfname"; - version = "0.2"; - sha256 = "18ihz3vir5py6fbkqdnh8yjvsgjwavb7g601abdihrrp2p255lpn"; + version = "0.3"; + sha256 = "01xy5rg2n1x2fpqwhnbrmxqqma40zxr8ac0mv06qnyidyggrsggz"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -144897,19 +147459,20 @@ self: { }) {}; "phone-numbers" = callPackage - ({ mkDerivation, base, bytestring, phonenumber }: + ({ mkDerivation, base, bytestring, c2hs, phonenumber, protobuf }: mkDerivation { pname = "phone-numbers"; - version = "0.1.0"; - sha256 = "10afhnlphgyxsmkv576c5gf5b78d3j2qs46s2crlgfav1y9crv0f"; + version = "0.1.1"; + sha256 = "09b5qp7c059wah6wddn71hk6ciijj07qylxh3xcff0qyvjqd18ya"; libraryHaskellDepends = [ base bytestring ]; - librarySystemDepends = [ phonenumber ]; + librarySystemDepends = [ phonenumber protobuf ]; + libraryToolDepends = [ c2hs ]; testHaskellDepends = [ base bytestring ]; homepage = "https://github.com/christian-marie/phone-numbers"; description = "Haskell bindings to the libphonenumber library"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; - }) {phonenumber = null;}; + }) {phonenumber = null; inherit (pkgs) protobuf;}; "phone-push" = callPackage ({ mkDerivation, base, base16-bytestring, binary, bytestring @@ -145627,6 +148190,8 @@ self: { pname = "pipes-cacophony"; version = "0.5.0"; sha256 = "1p6vb1abyzifczn537iabd87g2x7mnhvr4sx1j6ay51zvvn5vh20"; + revision = "1"; + editedCabalFile = "1qv6h09y5pca3agkmn12lg9vlbm5j8s3dnrn98w9agj62jrvymzm"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base bytestring cacophony pipes ]; @@ -147009,6 +149574,31 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "plot-light_0_2_6" = callPackage + ({ mkDerivation, attoparsec, attoparsec-time, base, blaze-svg + , colour, hspec, mtl, palette, QuickCheck, scientific, text, time + }: + mkDerivation { + pname = "plot-light"; + version = "0.2.6"; + sha256 = "1zwf3gmimbpzji9dyn5a93pc07ymcp6xc48zfq5lxchajnilchwc"; + isLibrary = true; + isExecutable = true; + enableSeparateDataOutput = true; + libraryHaskellDepends = [ + attoparsec base blaze-svg colour mtl palette scientific text time + ]; + executableHaskellDepends = [ + attoparsec attoparsec-time base blaze-svg colour palette scientific + text time + ]; + testHaskellDepends = [ base hspec QuickCheck ]; + homepage = "https://github.com/ocramz/plot-light"; + description = "A lightweight plotting library, exporting to SVG"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "plotfont" = callPackage ({ mkDerivation, base, containers, tasty, tasty-hunit }: mkDerivation { @@ -148655,6 +151245,31 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "postgresql-simple-migration_0_1_10_1" = callPackage + ({ mkDerivation, base, base64-bytestring, bytestring, cryptohash + , directory, hspec, postgresql-simple, text, time + }: + mkDerivation { + pname = "postgresql-simple-migration"; + version = "0.1.10.1"; + sha256 = "0g7xf0cl6ld7qs94qsv67rxln4hpibgy7jfgvbaq1br6pwa1w68s"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + base base64-bytestring bytestring cryptohash directory + postgresql-simple time + ]; + executableHaskellDepends = [ + base base64-bytestring bytestring cryptohash directory + postgresql-simple text time + ]; + testHaskellDepends = [ base bytestring hspec postgresql-simple ]; + homepage = "https://github.com/ameingast/postgresql-simple-migration"; + description = "PostgreSQL Schema Migrations"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "postgresql-simple-opts" = callPackage ({ mkDerivation, base, bytestring, data-default, either, hspec , optparse-applicative, optparse-generic, postgresql-simple @@ -148898,25 +151513,25 @@ self: { "postgrest-ws" = callPackage ({ mkDerivation, aeson, ansi-wl-pprint, auto-update, base - , base64-bytestring, bytestring, configurator, containers, either - , hasql, hasql-pool, heredoc, hspec, hspec-wai, hspec-wai-json - , http-types, jwt, lens, lens-aeson, optparse-applicative - , postgresql-libpq, protolude, retry, stm, stm-containers - , stringsearch, text, time, transformers, unix + , base64-bytestring, bytestring, configurator, containers + , contravariant, either, hasql, hasql-pool, heredoc, hspec + , hspec-wai, hspec-wai-json, http-types, jwt, lens, lens-aeson + , optparse-applicative, postgresql-libpq, protolude, retry, stm + , stm-containers, stringsearch, text, time, transformers, unix , unordered-containers, wai, wai-app-static, wai-extra , wai-websockets, warp, websockets }: mkDerivation { pname = "postgrest-ws"; - version = "0.3.3.0"; - sha256 = "0w1hgn0lg6p3zc5n43d2wqr18kwvbvvhp8al3ggf3jjx04sn3sih"; + version = "0.4.0.0"; + sha256 = "0wimvx66lzp0p5apymbxcj5f4d10wx8n7gpqslkvwi7c09p453l6"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ - aeson base bytestring either hasql hasql-pool http-types jwt lens - lens-aeson postgresql-libpq protolude retry stm stm-containers - stringsearch text time unordered-containers wai wai-websockets - websockets + aeson base bytestring contravariant either hasql hasql-pool + http-types jwt lens lens-aeson postgresql-libpq protolude retry stm + stm-containers stringsearch text time unordered-containers wai + wai-websockets websockets ]; executableHaskellDepends = [ ansi-wl-pprint auto-update base base64-bytestring bytestring @@ -149223,6 +151838,19 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "pqueue_1_3_2_3" = callPackage + ({ mkDerivation, base, deepseq, QuickCheck }: + mkDerivation { + pname = "pqueue"; + version = "1.3.2.3"; + sha256 = "062l0vm4yymlm7vahczczpm29awgaksv0sdy532g7jlspi78nara"; + 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 @@ -149290,8 +151918,8 @@ self: { }: mkDerivation { pname = "preamble"; - version = "0.0.47"; - sha256 = "1qjlw42xyynbwp72s2xx9kavvbqj13y603fpwf27hvab2ypyyg8w"; + version = "0.0.48"; + sha256 = "14gdi3md3mr12dp9hi83bqzis9x90bf0cqknrzdi2xfb9wb1jdl5"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -149793,12 +152421,18 @@ self: { }) {}; "pretty-compact" = callPackage - ({ mkDerivation, base, containers }: + ({ mkDerivation, aeson, base, base-compat, bytestring, containers + , criterion, deepseq, pretty, text, unordered-containers, wl-pprint + }: mkDerivation { pname = "pretty-compact"; - version = "2.0"; - sha256 = "09nyx24b15qgk6cn71m05q56kfcvm2582wywf8b9d1h0k4bhic0k"; - libraryHaskellDepends = [ base containers ]; + version = "2.1"; + sha256 = "0723zp6577vwfrhr2hnn439hc90h6qh6sgrshywhd5yks673vgf5"; + libraryHaskellDepends = [ base base-compat containers ]; + benchmarkHaskellDepends = [ + aeson base base-compat bytestring criterion deepseq pretty text + unordered-containers wl-pprint + ]; description = "Pretty-printing library"; license = "GPL"; }) {}; @@ -149966,8 +152600,8 @@ self: { pname = "prettyprinter"; version = "1.1"; sha256 = "0bksn65rvnc0f59mfzhyl9yaccfh5ap6jxj1r477izlnkfs0k03y"; - revision = "2"; - editedCabalFile = "0gfxgc3jrnxa54arih1ys1qbswyx7waxp06ib8ifd3rw64yjn16j"; + revision = "3"; + editedCabalFile = "0y6qhf5bxbwxpy4xma05h806mxfn52kvf5f29r1hdpm2xlcab5hx"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base text ]; @@ -150820,6 +153454,24 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "profunctors_5_2_1" = callPackage + ({ mkDerivation, base, base-orphans, bifunctors, comonad + , contravariant, distributive, tagged, transformers + }: + mkDerivation { + pname = "profunctors"; + version = "5.2.1"; + sha256 = "0pcwjp813d3mrzb7qf7dzkspf85xnfj1m2snhjgnvwx6vw07w877"; + libraryHaskellDepends = [ + base base-orphans bifunctors comonad contravariant distributive + tagged transformers + ]; + homepage = "http://github.com/ekmett/profunctors/"; + description = "Profunctors"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "progress" = callPackage ({ mkDerivation, base, time }: mkDerivation { @@ -151230,8 +153882,8 @@ self: { }: mkDerivation { pname = "propellor"; - version = "4.6.1"; - sha256 = "1j8768v7al7fxvg8z71pd7lq89qcdkpmnnmz1f2y8zfjw8mcn7wp"; + version = "4.7.6"; + sha256 = "0nqhhgrcjq8zbnvarrgn2ijk7pmyb2blzh1896jxij828zq9rddd"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -151363,6 +154015,25 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "proto-lens_0_2_2_0" = callPackage + ({ mkDerivation, attoparsec, base, bytestring, containers + , data-default-class, lens-family, parsec, pretty, text + , transformers, void + }: + mkDerivation { + pname = "proto-lens"; + version = "0.2.2.0"; + sha256 = "173sz83pw237qp037j6spy055ghayinfjg5m4p4mvgmjnnzpw1cj"; + libraryHaskellDepends = [ + attoparsec base bytestring containers data-default-class + lens-family parsec pretty text transformers void + ]; + homepage = "https://github.com/google/proto-lens"; + description = "A lens-based implementation of protocol buffers in Haskell"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "proto-lens-arbitrary" = callPackage ({ mkDerivation, base, bytestring, containers, lens-family , proto-lens, QuickCheck, text @@ -151380,6 +154051,23 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "proto-lens-arbitrary_0_1_1_1" = callPackage + ({ mkDerivation, base, bytestring, containers, lens-family + , proto-lens, QuickCheck, text + }: + mkDerivation { + pname = "proto-lens-arbitrary"; + version = "0.1.1.1"; + sha256 = "1jdp2axwvmdifssqq1i4ik1dv7zn0sdvj6jy45bi0nxyr5mqzhlm"; + libraryHaskellDepends = [ + base bytestring containers lens-family proto-lens QuickCheck text + ]; + homepage = "https://github.com/google/proto-lens"; + description = "Arbitrary instances for proto-lens"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "proto-lens-combinators" = callPackage ({ mkDerivation, base, Cabal, data-default-class, HUnit , lens-family, lens-family-core, proto-lens, proto-lens-protoc @@ -151404,6 +154092,30 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "proto-lens-combinators_0_1_0_8" = callPackage + ({ mkDerivation, base, Cabal, data-default-class, HUnit + , lens-family, lens-family-core, proto-lens, proto-lens-protoc + , test-framework, test-framework-hunit, transformers + }: + mkDerivation { + pname = "proto-lens-combinators"; + version = "0.1.0.8"; + sha256 = "0byz61d1xd1khksvh170q7a7qvziigxf76ngcsd650fahqaardzz"; + setupHaskellDepends = [ base Cabal proto-lens-protoc ]; + libraryHaskellDepends = [ + base data-default-class lens-family proto-lens proto-lens-protoc + transformers + ]; + testHaskellDepends = [ + base HUnit lens-family lens-family-core proto-lens + proto-lens-protoc test-framework test-framework-hunit + ]; + homepage = "https://github.com/google/proto-lens"; + description = "Utilities functions to proto-lens"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "proto-lens-descriptors" = callPackage ({ mkDerivation, base, bytestring, containers, data-default-class , lens-family, lens-labels, proto-lens, text @@ -151420,6 +154132,23 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "proto-lens-descriptors_0_2_2_0" = callPackage + ({ mkDerivation, base, bytestring, containers, data-default-class + , lens-family, lens-labels, proto-lens, text + }: + mkDerivation { + pname = "proto-lens-descriptors"; + version = "0.2.2.0"; + sha256 = "1vjvr931ylnmpclizbrhqsx0x5jbmcbir0s53zpvm0f0vnwlwgqb"; + libraryHaskellDepends = [ + base bytestring containers data-default-class lens-family + lens-labels proto-lens text + ]; + description = "Protocol buffers for describing the definitions of messages"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "proto-lens-optparse" = callPackage ({ mkDerivation, base, optparse-applicative, proto-lens, text }: mkDerivation { @@ -151435,6 +154164,21 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "proto-lens-optparse_0_1_0_4" = callPackage + ({ mkDerivation, base, optparse-applicative, proto-lens, text }: + mkDerivation { + pname = "proto-lens-optparse"; + version = "0.1.0.4"; + sha256 = "1wywg2jzc35483qlqxy1a4ms6v6cb08d10z4pgwb50ljv5hqlwwb"; + libraryHaskellDepends = [ + base optparse-applicative proto-lens text + ]; + homepage = "https://github.com/google/proto-lens"; + description = "Adapting proto-lens to optparse-applicative ReadMs"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "proto-lens-protobuf-types" = callPackage ({ mkDerivation, base, Cabal, proto-lens-protoc }: mkDerivation { @@ -151449,6 +154193,24 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "proto-lens-protobuf-types_0_2_2_0" = callPackage + ({ mkDerivation, base, Cabal, lens-family, proto-lens + , proto-lens-protoc, text + }: + mkDerivation { + pname = "proto-lens-protobuf-types"; + version = "0.2.2.0"; + sha256 = "0b6n7qwyxql7966accdg0ms5mmxygjy1jx31j5bgdpkdayz4hf72"; + setupHaskellDepends = [ base Cabal proto-lens-protoc ]; + libraryHaskellDepends = [ + base lens-family proto-lens proto-lens-protoc text + ]; + homepage = "https://github.com/google/proto-lens"; + description = "Basic protocol buffer message types"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "proto-lens-protoc" = callPackage ({ mkDerivation, base, bytestring, Cabal, containers , data-default-class, directory, filepath, haskell-src-exts @@ -151475,6 +154237,32 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "proto-lens-protoc_0_2_2_0" = callPackage + ({ mkDerivation, base, bytestring, Cabal, containers + , data-default-class, directory, filepath, haskell-src-exts + , lens-family, lens-labels, process, proto-lens + , proto-lens-descriptors, text + }: + mkDerivation { + pname = "proto-lens-protoc"; + version = "0.2.2.0"; + sha256 = "1h6rlgk36a5wbcqwqs5n53rh37alcj0l5yq666gcawda0zwb0ys2"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + base bytestring Cabal containers data-default-class directory + filepath haskell-src-exts lens-family lens-labels process + proto-lens proto-lens-descriptors text + ]; + executableHaskellDepends = [ + base bytestring containers data-default-class filepath + haskell-src-exts lens-family proto-lens proto-lens-descriptors text + ]; + description = "Protocol buffer compiler for the proto-lens library"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "protobuf" = callPackage ({ mkDerivation, base, base-orphans, bytestring, cereal, containers , data-binary-ieee754, deepseq, hex, HUnit, mtl, QuickCheck, tagged @@ -152539,8 +155327,8 @@ self: { }: mkDerivation { pname = "pushbullet-types"; - version = "0.2.0.0"; - sha256 = "1r57l48xzfraa85lrkx9i8dmlrjicavz0fxr8l6c28iisj6db8js"; + version = "0.4.0.0"; + sha256 = "0fds6lhkmyfs8hrnaq29fbglcmampa4n8j93x1jkynxbp1in66z6"; libraryHaskellDepends = [ aeson base http-api-data microlens microlens-th scientific text time unordered-containers @@ -152590,6 +155378,29 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "pusher-http-haskell_1_3_0_0" = callPackage + ({ mkDerivation, aeson, base, base16-bytestring, bytestring + , cryptohash, hashable, hspec, http-client, http-types, QuickCheck + , text, time, transformers, unordered-containers + }: + mkDerivation { + pname = "pusher-http-haskell"; + version = "1.3.0.0"; + sha256 = "1pppzhr6507y1fl2w3w876bhwbbm5mvss4qfavrbhzi9ycqk2hrp"; + libraryHaskellDepends = [ + aeson base base16-bytestring bytestring cryptohash hashable + http-client http-types text time transformers unordered-containers + ]; + testHaskellDepends = [ + aeson base bytestring hspec http-client http-types QuickCheck text + transformers unordered-containers + ]; + homepage = "https://github.com/pusher-community/pusher-http-haskell"; + description = "Haskell client library for the Pusher HTTP API"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "pusher-ws" = callPackage ({ mkDerivation, aeson, base, bytestring, containers, deepseq , hashable, http-conduit, lens, lens-aeson, network, scientific @@ -152750,28 +155561,26 @@ self: { "pvss" = callPackage ({ mkDerivation, base, binary, bytestring, cryptonite - , cryptonite-openssl, deepseq, hourglass, integer-gmp, memory - , tasty, tasty-quickcheck + , cryptonite-openssl, deepseq, foundation, hourglass, integer-gmp + , memory, tasty, tasty-quickcheck, vector }: mkDerivation { pname = "pvss"; - version = "0.1"; - sha256 = "16gwq23d7p34n23ydi82lxz7cjvwdc684s36915fb2hm8k60n57s"; - revision = "1"; - editedCabalFile = "03nx4w2b6i2wn4x4ggbizc4k9y5bkjq4ihli5ln8bs60slz84srd"; + version = "0.2.0"; + sha256 = "130249k3gly9msd8x514qlq0gjqi60hjps2176j83ifa0d818h74"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base binary bytestring cryptonite cryptonite-openssl deepseq - integer-gmp memory + foundation integer-gmp memory ]; executableHaskellDepends = [ - base cryptonite deepseq hourglass memory + base cryptonite deepseq hourglass memory vector ]; testHaskellDepends = [ base cryptonite tasty tasty-quickcheck ]; homepage = "https://github.com/input-output-hk/pvss-haskell#readme"; description = "Public Verifiable Secret Sharing"; - license = stdenv.lib.licenses.bsd3; + license = stdenv.lib.licenses.mit; }) {}; "pwstore-cli" = callPackage @@ -155400,6 +158209,26 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "ratel_0_3_5" = callPackage + ({ mkDerivation, aeson, base, bytestring, case-insensitive + , containers, filepath, http-client, http-client-tls, http-types + , tasty, tasty-hspec, text, uuid + }: + mkDerivation { + pname = "ratel"; + version = "0.3.5"; + sha256 = "0mw59q5wbj5mbhznqd4szc5ps7d1r7gf490vdjqfblb5sqncy510"; + libraryHaskellDepends = [ + aeson base bytestring case-insensitive containers http-client + http-client-tls http-types text uuid + ]; + testHaskellDepends = [ base filepath tasty tasty-hspec ]; + homepage = "https://github.com/tfausak/ratel#readme"; + description = "Notify Honeybadger about exceptions"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "ratel-wai" = callPackage ({ mkDerivation, base, bytestring, case-insensitive, containers , http-client, ratel, wai @@ -155416,6 +158245,23 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "ratel-wai_0_3_1" = callPackage + ({ mkDerivation, base, bytestring, case-insensitive, containers + , http-client, ratel, wai + }: + mkDerivation { + pname = "ratel-wai"; + version = "0.3.1"; + sha256 = "13p5ny1x752l9xqiyxdxvjfjqggsb0g9hpqqcmdr828lvr9qxi6s"; + libraryHaskellDepends = [ + base bytestring case-insensitive containers http-client ratel wai + ]; + homepage = "https://github.com/tfausak/ratel-wai#readme"; + description = "Notify Honeybadger about exceptions via a WAI middleware"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "rating-systems" = callPackage ({ mkDerivation, base }: mkDerivation { @@ -155714,8 +158560,8 @@ self: { }: mkDerivation { pname = "rcu"; - version = "0.2"; - sha256 = "0i88w7yg1q6fbkqfkvmnxxg9wg90sxv6c0shb8hvx0afz1mfhrz3"; + version = "0.2.1"; + sha256 = "114w0nhlcg6wd9v6xg0ax74y5xbwb408b37hdkra863xr7dibdp0"; isLibrary = true; isExecutable = true; setupHaskellDepends = [ base Cabal cabal-doctest ]; @@ -156464,6 +159310,29 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "rebase_1_1" = callPackage + ({ mkDerivation, base, base-prelude, bifunctors, bytestring + , containers, contravariant, contravariant-extras, deepseq, dlist + , either, fail, hashable, mtl, profunctors, scientific + , semigroupoids, semigroups, stm, text, time, transformers + , unordered-containers, uuid, vector, void + }: + mkDerivation { + pname = "rebase"; + version = "1.1"; + sha256 = "1qkhnpcc4g2vd6jmbf3b6psqkan6hyawqzrwzqdd931hsb02l6ia"; + libraryHaskellDepends = [ + base base-prelude bifunctors bytestring containers contravariant + contravariant-extras deepseq dlist either fail hashable mtl + profunctors scientific semigroupoids semigroups stm text time + transformers unordered-containers uuid vector void + ]; + homepage = "https://github.com/nikita-volkov/rebase"; + description = "A more progressive alternative to the \"base\" package"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "rebindable" = callPackage ({ mkDerivation, base, data-default-class, indexed }: mkDerivation { @@ -157071,6 +159940,30 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "references_0_3_2_2" = callPackage + ({ mkDerivation, array, base, containers, directory, either + , filepath, HUnit, instance-control, lens, mtl, template-haskell + , text, transformers, uniplate + }: + mkDerivation { + pname = "references"; + version = "0.3.2.2"; + sha256 = "1p7ygqdycx1zm4fpilb7db0g66kyss50fddkc007812y2ih4vary"; + libraryHaskellDepends = [ + array base containers directory either filepath instance-control + mtl template-haskell text transformers uniplate + ]; + testHaskellDepends = [ + array base containers directory either filepath HUnit + instance-control lens mtl template-haskell text transformers + uniplate + ]; + homepage = "https://github.com/lazac/references"; + description = "Selectors for reading and updating data"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "refh" = callPackage ({ mkDerivation, base, clippard, cmdargs, directory, filepath , haskheap, network @@ -159429,14 +162322,14 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "req-conduit_0_2_0" = callPackage + "req-conduit_0_2_1" = callPackage ({ mkDerivation, base, bytestring, conduit, conduit-extra, hspec , http-client, req, resourcet, temporary, transformers, weigh }: mkDerivation { pname = "req-conduit"; - version = "0.2.0"; - sha256 = "0yf5lmmf3fv4lfxyrk0kpzk8p0pzhfany05d7ny8l11mr99grpwg"; + version = "0.2.1"; + sha256 = "1f3nbmdmkr68i5nm3527s06w9crdgn9jrkzam2fgcg8qp6q73q4c"; libraryHaskellDepends = [ base bytestring conduit http-client req resourcet transformers ]; @@ -159497,6 +162390,19 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "rerebase_1_1" = callPackage + ({ mkDerivation, rebase }: + mkDerivation { + pname = "rerebase"; + version = "1.1"; + sha256 = "17x606gm0mfy7xgfy1dby8gxs4jzspnrlchv1d93rjqklr2wsyyv"; + libraryHaskellDepends = [ rebase ]; + homepage = "https://github.com/nikita-volkov/rerebase"; + description = "Reexports from \"base\" with a bunch of other standard libraries"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "reroute" = callPackage ({ mkDerivation, base, criterion, deepseq, graph-core, hashable , hspec, http-api-data, hvect, mtl, random, regex-compat, text @@ -162556,6 +165462,29 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "safeio_0_0_3_0" = callPackage + ({ mkDerivation, base, bytestring, conduit, conduit-combinators + , directory, filepath, HUnit, resourcet, test-framework + , test-framework-hunit, test-framework-th, unix + }: + mkDerivation { + pname = "safeio"; + version = "0.0.3.0"; + sha256 = "0rknn8rlxyj32a0vrx0wjfma9w0zhs3vg1jyksn71drxch7jvwqs"; + libraryHaskellDepends = [ + base bytestring conduit conduit-combinators directory filepath + resourcet unix + ]; + testHaskellDepends = [ + base bytestring conduit conduit-combinators directory filepath + HUnit resourcet test-framework test-framework-hunit + test-framework-th unix + ]; + description = "Write output to disk atomically"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "safepath" = callPackage ({ mkDerivation, base, doctest, text, validity }: mkDerivation { @@ -163261,8 +166190,8 @@ self: { }: mkDerivation { pname = "sbv"; - version = "7.0"; - sha256 = "1jqgzqhmcx015ja8nwpswq6akw9vrabmhhf709vfirgd9q8pgnjc"; + version = "7.1"; + sha256 = "0gxx84b7dzhymizwna8fzaaz2gimzch650jk1xssn5da2gqfan7g"; enableSeparateDataOutput = true; libraryHaskellDepends = [ array async base containers crackNum data-binary-ieee754 deepseq @@ -163287,8 +166216,8 @@ self: { }: mkDerivation { pname = "sbvPlugin"; - version = "0.9"; - sha256 = "01fxnyi3jw952v7hlmf0isp88kv99jg6jll74cz2b04c461w1fhv"; + version = "0.10"; + sha256 = "0yvvwkhvdfhy1i09br6ci8m4nchmmvn83glnqxd8s2zdmhmxsr54"; libraryHaskellDepends = [ base containers ghc ghc-prim mtl sbv template-haskell ]; @@ -165004,6 +167933,24 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "selda_0_1_10_0" = callPackage + ({ mkDerivation, base, bytestring, exceptions, hashable, mtl + , psqueues, text, time, unordered-containers + }: + mkDerivation { + pname = "selda"; + version = "0.1.10.0"; + sha256 = "107wj74yxw5nz6pzvn9k6inn5x4vcrjv80416a2kr8nl25x1ixgs"; + libraryHaskellDepends = [ + base bytestring exceptions hashable mtl psqueues text time + unordered-containers + ]; + homepage = "https://selda.link"; + description = "Type-safe, high-level EDSL for interacting with relational databases"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "selda-postgresql" = callPackage ({ mkDerivation, base, bytestring, exceptions, postgresql-libpq , selda, text @@ -165020,6 +167967,23 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "selda-postgresql_0_1_6_0" = callPackage + ({ mkDerivation, base, bytestring, exceptions, postgresql-libpq + , selda, text + }: + mkDerivation { + pname = "selda-postgresql"; + version = "0.1.6.0"; + sha256 = "0zf77mavhxn64mag6cgf6xch54qknl1yhack5nylf5xlwhpmrgsx"; + libraryHaskellDepends = [ + base bytestring exceptions postgresql-libpq selda text + ]; + homepage = "https://github.com/valderman/selda"; + description = "PostgreSQL backend for the Selda database EDSL"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "selda-sqlite" = callPackage ({ mkDerivation, base, direct-sqlite, directory, exceptions, selda , text @@ -165036,6 +168000,23 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "selda-sqlite_0_1_6_0" = callPackage + ({ mkDerivation, base, direct-sqlite, directory, exceptions, selda + , text + }: + mkDerivation { + pname = "selda-sqlite"; + version = "0.1.6.0"; + sha256 = "1473igqgjs5282rykqj1zg7420mfh3sbqy74nx1cwbm82j8shyy6"; + libraryHaskellDepends = [ + base direct-sqlite directory exceptions selda text + ]; + homepage = "https://github.com/valderman/selda"; + description = "SQLite backend for the Selda database EDSL"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "select" = callPackage ({ mkDerivation, base }: mkDerivation { @@ -165219,6 +168200,29 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "semigroupoids_5_2_1" = callPackage + ({ mkDerivation, base, base-orphans, bifunctors, Cabal + , cabal-doctest, comonad, containers, contravariant, distributive + , doctest, hashable, semigroups, tagged, transformers + , transformers-compat, unordered-containers + }: + mkDerivation { + pname = "semigroupoids"; + version = "5.2.1"; + sha256 = "006jys6kvckkmbnhf4jc51sh64hamkz464mr8ciiakybrfvixr3r"; + setupHaskellDepends = [ base Cabal cabal-doctest ]; + libraryHaskellDepends = [ + base base-orphans bifunctors comonad containers contravariant + distributive hashable semigroups tagged transformers + transformers-compat unordered-containers + ]; + testHaskellDepends = [ base doctest ]; + homepage = "http://github.com/ekmett/semigroupoids"; + description = "Semigroupoids: Category sans id"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "semigroupoids-syntax" = callPackage ({ mkDerivation, base, comonad, containers, contravariant , directory, distributive, doctest, filepath, QuickCheck @@ -165798,6 +168802,39 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "serialise" = callPackage + ({ mkDerivation, aeson, array, base, base16-bytestring + , base64-bytestring, binary, bytestring, cborg, cereal + , cereal-vector, containers, criterion, deepseq, directory + , filepath, ghc-prim, half, hashable, old-locale, pretty, primitive + , QuickCheck, quickcheck-instances, scientific, store, tar, tasty + , tasty-hunit, tasty-quickcheck, text, time, unordered-containers + , vector, zlib + }: + mkDerivation { + pname = "serialise"; + version = "0.1.0.0"; + sha256 = "1a28rhnhfgpkpgr9a5c5fvpfj28mfx716kb6rlhziwkm1y675iw3"; + libraryHaskellDepends = [ + array base bytestring cborg containers ghc-prim half hashable + old-locale primitive text time unordered-containers vector + ]; + testHaskellDepends = [ + aeson array base base16-bytestring base64-bytestring binary + bytestring cborg containers deepseq directory filepath ghc-prim + half hashable QuickCheck quickcheck-instances scientific tasty + tasty-hunit tasty-quickcheck text time unordered-containers vector + ]; + benchmarkHaskellDepends = [ + aeson array base binary bytestring cborg cereal cereal-vector + containers criterion deepseq directory filepath ghc-prim half + old-locale pretty store tar text time vector zlib + ]; + homepage = "https://github.com/well-typed/cborg"; + description = "A binary serialisation library for Haskell values"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "serialize-instances" = callPackage ({ mkDerivation, base, cereal, hashable, semigroups , unordered-containers @@ -165832,8 +168869,8 @@ self: { ({ mkDerivation, acid-state, aeson, aeson-extra, ansi-terminal , base, base16-bytestring, base64-bytestring, binary , binary-orphans, bytestring, cereal, cereal-vector, clock - , containers, data-msgpack, deepseq, directory, either, exceptions - , extra, filepath, formatting, hashable, hspec, lens, log-warper + , containers, deepseq, directory, either, exceptions, extra + , filepath, formatting, hashable, hspec, lens, log-warper , monad-control, mtl, optparse-applicative, parsec, QuickCheck , quickcheck-instances, safecopy, scientific, semigroups, stm , template-haskell, text, text-format, time-units, transformers @@ -165841,20 +168878,20 @@ self: { }: mkDerivation { pname = "serokell-util"; - version = "0.1.5.3"; - sha256 = "05iwdmwq6fg4bq1nmmi19dax3rnjjxwbn6l5ff9fbs794qzmb704"; + version = "0.2.0.0"; + sha256 = "13jna9mpi4dlw7hrdp2cv1p145hbri5a7ch3ly8a4j4apnx2s4qc"; libraryHaskellDepends = [ acid-state aeson aeson-extra ansi-terminal base base16-bytestring base64-bytestring binary binary-orphans bytestring cereal - cereal-vector clock containers data-msgpack deepseq directory - either exceptions extra filepath formatting hashable lens - log-warper monad-control mtl optparse-applicative parsec QuickCheck - quickcheck-instances safecopy scientific semigroups stm - template-haskell text text-format time-units transformers universum - unordered-containers vector yaml + cereal-vector clock containers deepseq directory either exceptions + extra filepath formatting hashable lens log-warper monad-control + mtl optparse-applicative parsec QuickCheck quickcheck-instances + safecopy scientific semigroups stm template-haskell text + text-format time-units transformers universum unordered-containers + vector yaml ]; testHaskellDepends = [ - aeson base binary bytestring cereal data-msgpack hspec QuickCheck + aeson base binary bytestring cereal hspec QuickCheck quickcheck-instances safecopy scientific text text-format unordered-containers vector ]; @@ -166995,8 +170032,8 @@ self: { }: mkDerivation { pname = "servant-pushbullet-client"; - version = "0.2.0.0"; - sha256 = "1701mcr99hg4zlsh95ri4nrx1iws1ns2f9gi55dzbyay429czlfg"; + version = "0.4.0.0"; + sha256 = "0v2mkriwh7lara66w02kkzwlnr5y8ahb6djpsnhvch1asa5klsnk"; libraryHaskellDepends = [ aeson base http-api-data http-client http-client-tls microlens microlens-th pushbullet-types scientific servant servant-client @@ -167112,6 +170149,22 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "servant-ruby_0_3_0_0" = callPackage + ({ mkDerivation, base, casing, doctest, lens, QuickCheck + , servant-foreign, text + }: + mkDerivation { + pname = "servant-ruby"; + version = "0.3.0.0"; + sha256 = "14azm41iwj09ra8yyr0xvpirw8yxl3bs1fhgnpkk3538dz6n005s"; + libraryHaskellDepends = [ base casing lens servant-foreign text ]; + testHaskellDepends = [ base doctest QuickCheck ]; + homepage = "https://github.com/joneshf/servant-ruby#readme"; + description = "Generate a Ruby client from a Servant API with Net::HTTP"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "servant-scotty" = callPackage ({ mkDerivation, aeson, base, http-types, scotty, servant , servant-response, text, transformers @@ -168457,14 +171510,18 @@ self: { }) {}; "shakers" = callPackage - ({ mkDerivation, base, basic-prelude, directory, shake }: + ({ mkDerivation, base, basic-prelude, deepseq, directory + , regex-compat, shake + }: mkDerivation { pname = "shakers"; - version = "0.0.27"; - sha256 = "0mlh6vzq7gdpyxm05y36fwjx0vjhbkk23qn2ajvc28l6d6d3p5ym"; + version = "0.0.30"; + sha256 = "0yy820lwl890p96d61n8h7wm6g9ykgldjm29yrp60kzxfjbicpnc"; isLibrary = true; isExecutable = true; - libraryHaskellDepends = [ base basic-prelude directory shake ]; + libraryHaskellDepends = [ + base basic-prelude deepseq directory regex-compat shake + ]; executableHaskellDepends = [ base ]; homepage = "https://github.com/swift-nav/shakers"; description = "Shake helpers"; @@ -170568,15 +173625,15 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "singletons_2_3" = callPackage + "singletons_2_3_1" = callPackage ({ mkDerivation, base, Cabal, containers, directory, filepath, mtl , process, syb, tasty, tasty-golden, template-haskell, text , th-desugar }: mkDerivation { pname = "singletons"; - version = "2.3"; - sha256 = "022747kp55yf2hzsqk03wcbmvqn47nbvhiqjam06c9hkcj3gixf5"; + version = "2.3.1"; + sha256 = "1i5fmz2fqk3ijcv38ig1wmbjlva5r4imlwgindir63nmhpgy93fa"; libraryHaskellDepends = [ base containers mtl syb template-haskell text th-desugar ]; @@ -171867,8 +174924,8 @@ self: { pname = "snap"; version = "1.0.0.1"; sha256 = "1f1d69900rdvsi323cc23pfgacmvgclbdaw57lfi54s7830icgr9"; - revision = "4"; - editedCabalFile = "1bcfw4g6wqkssp0l7n6115d513y70b8zb7cdz5hrlaxyq5pah6hk"; + revision = "5"; + editedCabalFile = "0kka00b4xvskfcfva1zvbd7sp2sa5mplvgaihcagjsim96124bsp"; libraryHaskellDepends = [ aeson attoparsec base bytestring cereal clientsession configurator containers directory directory-tree dlist filepath hashable heist @@ -174063,6 +177120,25 @@ self: { license = "GPL"; }) {}; + "sox_0_2_2_7" = callPackage + ({ mkDerivation, base, containers, explicit-exception + , extensible-exceptions, process, sample-frame, transformers, unix + , utility-ht + }: + mkDerivation { + pname = "sox"; + version = "0.2.2.7"; + sha256 = "1z6jqrn7n66583pf5gafblh50j82s72w1mx31rj0ii8x70lggkbx"; + libraryHaskellDepends = [ + base containers explicit-exception extensible-exceptions process + sample-frame transformers unix utility-ht + ]; + homepage = "http://www.haskell.org/haskellwiki/Sox"; + description = "Play, write, read, convert audio signals using Sox"; + license = "GPL"; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "soxlib" = callPackage ({ mkDerivation, base, bytestring, containers, explicit-exception , extensible-exceptions, sample-frame, sox, storablevector @@ -176579,6 +179655,25 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "stateWriter_0_2_8_2" = callPackage + ({ mkDerivation, base, containers, criterion, deepseq, dlist, free + , hspec, lens, mtl, QuickCheck, transformers, vector + }: + mkDerivation { + pname = "stateWriter"; + version = "0.2.8.2"; + sha256 = "1y8580n66hif4pp2b6gsqssafcqf1vysf63209i2rcjr0dsgnjgz"; + libraryHaskellDepends = [ base mtl transformers ]; + testHaskellDepends = [ base free hspec mtl QuickCheck ]; + benchmarkHaskellDepends = [ + base containers criterion deepseq dlist lens mtl transformers + vector + ]; + description = "A faster variant of the RWS monad transformers"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "statechart" = callPackage ({ mkDerivation, base, polyparse }: mkDerivation { @@ -176914,8 +180009,8 @@ self: { }: mkDerivation { pname = "staversion"; - version = "0.2.1.0"; - sha256 = "120w7kpgv2nsp7c36w1w6aglfh8sx72b3gmhrg5g790596f81797"; + version = "0.2.1.2"; + sha256 = "01ag624x240ybnapc49vcsiw5kz4n1v3csn1572phdav6dlpap35"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -177659,6 +180754,31 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "storablevector_0_2_12_1" = callPackage + ({ mkDerivation, base, bytestring, deepseq, non-negative + , QuickCheck, random, sample-frame, syb, transformers, unsafe + , utility-ht + }: + mkDerivation { + pname = "storablevector"; + version = "0.2.12.1"; + sha256 = "0y855kfwksrxspd18ppj7x1zyhbi3ackf4p01wsjal84b8ml1qd2"; + libraryHaskellDepends = [ + base deepseq non-negative QuickCheck syb transformers unsafe + utility-ht + ]; + testHaskellDepends = [ + base bytestring QuickCheck random utility-ht + ]; + benchmarkHaskellDepends = [ + base deepseq sample-frame unsafe utility-ht + ]; + homepage = "http://www.haskell.org/haskellwiki/Storable_Vector"; + description = "Fast, packed, strict storable arrays with a list interface like ByteString"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "storablevector-carray" = callPackage ({ mkDerivation, base, carray, storablevector, utility-ht }: mkDerivation { @@ -177808,15 +180928,15 @@ self: { license = stdenv.lib.licenses.mit; }) {}; - "stratosphere_0_7_1" = callPackage - ({ mkDerivation, aeson, aeson-pretty, base, bytestring, directory - , hashable, hlint, hspec, hspec-discover, lens, template-haskell - , text, unordered-containers + "stratosphere_0_8_0" = callPackage + ({ mkDerivation, aeson, aeson-pretty, base, bytestring, hashable + , hspec, hspec-discover, lens, template-haskell, text + , unordered-containers }: mkDerivation { pname = "stratosphere"; - version = "0.7.1"; - sha256 = "1zmchhyfgjgnckpydn8jd8rz4wyiv5ddqi3i4c0hygf4g5swz2nz"; + version = "0.8.0"; + sha256 = "0wv4anpxf6fmhhyw38wb7s3jbbhyn9vvhs912kls786gxs8xdlg5"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -177828,8 +180948,8 @@ self: { text unordered-containers ]; testHaskellDepends = [ - aeson aeson-pretty base bytestring directory hashable hlint hspec - hspec-discover lens template-haskell text unordered-containers + aeson aeson-pretty base bytestring hashable hspec hspec-discover + lens template-haskell text unordered-containers ]; homepage = "https://github.com/frontrowed/stratosphere#readme"; description = "EDSL for AWS CloudFormation"; @@ -178866,8 +181986,8 @@ self: { }: mkDerivation { pname = "stripe-core"; - version = "2.2.1"; - sha256 = "0vbc6ddp15yh7ddz9rrr7cmdqb9b5xzl4lh2h2sqf7wy8yldd58w"; + version = "2.2.2"; + sha256 = "1w2f5ynilzdzszga468lcy4fzl8cm2i9mcvb7hzzpg2gjykbi55s"; libraryHaskellDepends = [ aeson base bytestring mtl text time transformers unordered-containers @@ -178881,8 +182001,8 @@ self: { ({ mkDerivation, base, stripe-core, stripe-http-streams }: mkDerivation { pname = "stripe-haskell"; - version = "2.2.1"; - sha256 = "1gyhms7vhmqj9fjs8lfa022r9h43c5m0y5cz5xfbx3v71id9kq5a"; + version = "2.2.2"; + sha256 = "08jksi6swwb15sib5y5ms0m4k6m24v7xg4zany34x2zbas30qlp4"; libraryHaskellDepends = [ base stripe-core stripe-http-streams ]; homepage = "https://github.com/dmjio/stripe"; description = "Stripe API for Haskell"; @@ -178896,8 +182016,8 @@ self: { }: mkDerivation { pname = "stripe-http-streams"; - version = "2.2.1"; - sha256 = "0qk6jys2ijg9fy22rhg58ahj4c3mzfcjmpk7rfh09q3y2vrg1rsx"; + version = "2.2.2"; + sha256 = "1s6rj46m2pmcvagwm02z2qf4z4b44y14kjdi397b6s4cva7sdf84"; libraryHaskellDepends = [ aeson base bytestring HsOpenSSL http-streams io-streams stripe-core text @@ -178918,8 +182038,8 @@ self: { }: mkDerivation { pname = "stripe-tests"; - version = "2.2.1"; - sha256 = "1sg3gixaar1lcipdyzlcgcnfsc9vdip49zpfzh7a6pcw242vcw71"; + version = "2.2.2"; + sha256 = "1jccj0ic1v1vpdp3s8vb0a5w2rzr1zcqm6xqkjf1012ljxkvdq3f"; libraryHaskellDepends = [ aeson base bytestring free hspec hspec-core mtl random stripe-core text time transformers unordered-containers @@ -178963,6 +182083,26 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "strive_3_0_4" = callPackage + ({ mkDerivation, aeson, base, bytestring, data-default, gpolyline + , http-client, http-client-tls, http-types, markdown-unlit + , template-haskell, text, time, transformers + }: + mkDerivation { + pname = "strive"; + version = "3.0.4"; + sha256 = "0bd2zq2v9fl97vadzs78h9v5ib4a7laqlqxaqgfk5y6hh42yvcyk"; + libraryHaskellDepends = [ + aeson base bytestring data-default gpolyline http-client + http-client-tls http-types template-haskell text time transformers + ]; + testHaskellDepends = [ base bytestring markdown-unlit time ]; + homepage = "https://github.com/tfausak/strive#readme"; + description = "A client for the Strava V3 API"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "strptime" = callPackage ({ mkDerivation, base, bytestring, text, time }: mkDerivation { @@ -178981,8 +182121,8 @@ self: { }: mkDerivation { pname = "structs"; - version = "0.1"; - sha256 = "0haghcp365rfmh53hpkv4xydc2yfyai45r053q60lspd7gj202hz"; + version = "0.1.1"; + sha256 = "0hdajhvd6i81dchdyd42fa17pm53jd7g3irqjfardbbmjx0sqq6z"; setupHaskellDepends = [ base Cabal cabal-doctest ]; libraryHaskellDepends = [ base deepseq ghc-prim primitive template-haskell @@ -179488,6 +182628,20 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "sum-type-boilerplate_0_1_1" = callPackage + ({ mkDerivation, base, hspec, template-haskell }: + mkDerivation { + pname = "sum-type-boilerplate"; + version = "0.1.1"; + sha256 = "17xby0mqdsbax0afrfr3p8c6cj5r94byy8gprgyrmq84qqadls9i"; + libraryHaskellDepends = [ base template-haskell ]; + testHaskellDepends = [ base hspec template-haskell ]; + homepage = "https://github.com/jdreaver/sum-type-boilerplate#readme"; + description = "Library for reducing the boilerplate involved with sum types"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "sump" = callPackage ({ mkDerivation, base, bytestring, data-default, lens, serialport , transformers, vector @@ -180716,6 +183870,25 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "syntaxnet-haskell" = callPackage + ({ mkDerivation, aeson, base, bytestring, cassava, containers + , data-default, haskell-conll, hspec, lens, protolude, safe, split + , text, text-format, vector + }: + mkDerivation { + pname = "syntaxnet-haskell"; + version = "0.1.1.0"; + sha256 = "0lcgn91kbsjkpnbw7fczqsjmzvhrx5fixhgzjzmjaiwndw09b5z5"; + libraryHaskellDepends = [ + aeson base bytestring cassava containers data-default haskell-conll + lens protolude safe split text text-format vector + ]; + testHaskellDepends = [ aeson base cassava haskell-conll hspec ]; + homepage = "https://github.com/mgajda/syntaxnet-haskell#readme"; + description = "Working with Google's SyntaxNet output files - CoNLL, Tree"; + license = stdenv.lib.licenses.mit; + }) {}; + "synthesizer" = callPackage ({ mkDerivation, array, base, binary, bytestring, containers , directory, event-list, filepath, gnuplot, non-negative @@ -180798,6 +183971,39 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "synthesizer-core_0_8_1_1" = callPackage + ({ mkDerivation, array, base, binary, bytestring, containers + , deepseq, directory, event-list, explicit-exception, filepath + , non-empty, non-negative, numeric-prelude, numeric-quest, old-time + , process, QuickCheck, random, sample-frame-np, sox + , storable-record, storable-tuple, storablevector, timeit + , transformers, utility-ht + }: + mkDerivation { + pname = "synthesizer-core"; + version = "0.8.1.1"; + sha256 = "0drh5lmia3bvmdc7f7zl8y3ls43dl7mvb11383k49xlh0adlllka"; + libraryHaskellDepends = [ + array base binary bytestring containers deepseq event-list + explicit-exception filepath non-empty non-negative numeric-prelude + numeric-quest process QuickCheck random sample-frame-np sox + storable-record storable-tuple storablevector transformers + utility-ht + ]; + testHaskellDepends = [ + base containers event-list non-empty non-negative numeric-prelude + QuickCheck random storable-tuple storablevector utility-ht + ]; + benchmarkHaskellDepends = [ + array base binary bytestring directory numeric-prelude old-time + storable-tuple storablevector timeit utility-ht + ]; + homepage = "http://www.haskell.org/haskellwiki/Synthesizer"; + description = "Audio signal processing coded in Haskell: Low level part"; + license = "GPL"; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "synthesizer-dimensional" = callPackage ({ mkDerivation, base, bytestring, event-list, non-negative , numeric-prelude, random, sox, storable-record, storablevector @@ -181013,6 +184219,20 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "system-extra" = callPackage + ({ mkDerivation, base, bytestring, directory, hspec, process + , QuickCheck + }: + mkDerivation { + pname = "system-extra"; + version = "0.1.0"; + sha256 = "0x4xikvlj61r0sl8b98nccijkp99jalz0qkc6z5l48p81bj3qrl1"; + libraryHaskellDepends = [ base bytestring directory process ]; + testHaskellDepends = [ base hspec QuickCheck ]; + description = "A bunch of system utilities used by other projects"; + license = stdenv.lib.licenses.mit; + }) {}; + "system-fileio" = callPackage ({ mkDerivation, base, bytestring, chell, system-filepath , temporary, text, time, transformers, unix @@ -181063,12 +184283,12 @@ self: { }) {}; "system-info" = callPackage - ({ mkDerivation, base, process, regex }: + ({ mkDerivation, base, process, regex, regex-with-pcre }: mkDerivation { pname = "system-info"; - version = "0.1.0.7"; - sha256 = "0nj490pjlzvsjnxpfkg63x7makhh0y6difqm9iysrqf37qnir5zx"; - libraryHaskellDepends = [ base process regex ]; + version = "0.1.0.8"; + sha256 = "0pv4f5yrzybm2r1zi02ranq1ag1akkpzzc8w3qjpwliv2ahy4516"; + libraryHaskellDepends = [ base process regex regex-with-pcre ]; testHaskellDepends = [ base ]; homepage = "https://github.com/ChaosGroup/system-info"; description = "Get information about CPUs, memory, etc"; @@ -181693,6 +184913,20 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "tagged-binary_0_2_0_1" = callPackage + ({ mkDerivation, base, base-compat, binary, bytestring, pureMD5 }: + mkDerivation { + pname = "tagged-binary"; + version = "0.2.0.1"; + sha256 = "0nv41x5ijw5wdb2nyfgxyspbgmk9qisp32fs1izzp3c3jl4smkvj"; + libraryHaskellDepends = [ + base base-compat binary bytestring pureMD5 + ]; + description = "Provides tools for serializing data tagged with type information"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "tagged-exception-core" = callPackage ({ mkDerivation, base, exceptions, mmorph, mtl, transformers }: mkDerivation { @@ -182883,6 +186117,23 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "tasty-stats_0_2_0_3" = callPackage + ({ mkDerivation, base, containers, directory, process, stm, tagged + , tasty, time + }: + mkDerivation { + pname = "tasty-stats"; + version = "0.2.0.3"; + sha256 = "1jyywffrs270rvf8k9zc82b7fqqv6x1czk6qlbi6sq9z1wgs5w1b"; + libraryHaskellDepends = [ + base containers directory process stm tagged tasty time + ]; + homepage = "https://github.com/minad/tasty-stats#readme"; + description = "Collect statistics of your Tasty testsuite in a CSV file"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "tasty-tap" = callPackage ({ mkDerivation, base, containers, directory, stm, tasty , tasty-golden, tasty-hunit @@ -185145,8 +188396,8 @@ self: { }: mkDerivation { pname = "text-lips"; - version = "0.1"; - sha256 = "0cwrbl8d2dpiz9q8vvrl04vpdiiw4gx0cv1rmlk4zryn3ja38y8n"; + version = "0.1.0.1"; + sha256 = "1sm7sy11yc2rfjrpq5in7fqv3gh7zcfli8vw4b2mdlh6nxrh7k89"; libraryHaskellDepends = [ base containers parsers text text-loc transformers ]; @@ -185844,6 +189095,22 @@ self: { license = stdenv.lib.licenses.isc; }) {}; + "th-abstraction_0_2_4_0" = callPackage + ({ mkDerivation, base, containers, ghc-prim, template-haskell }: + mkDerivation { + pname = "th-abstraction"; + version = "0.2.4.0"; + sha256 = "0d2dwf0szxw2vxhdir5xvkgl49qwnm15c7m0a4r7fc1qrnwyvf8r"; + libraryHaskellDepends = [ + base containers ghc-prim template-haskell + ]; + testHaskellDepends = [ base containers template-haskell ]; + homepage = "https://github.com/glguy/th-abstraction"; + description = "Nicer interface for reified information about data types"; + license = stdenv.lib.licenses.isc; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "th-alpha" = callPackage ({ mkDerivation, base, containers, derive, mmorph, mtl, tasty , tasty-hunit, tasty-quickcheck, template-haskell, th-desugar @@ -186068,12 +189335,17 @@ self: { }) {}; "th-kinds" = callPackage - ({ mkDerivation, base, containers, mtl, template-haskell }: + ({ mkDerivation, base, containers, mtl, template-haskell + , th-orphans + }: mkDerivation { pname = "th-kinds"; - version = "0.1.1"; - sha256 = "0d8n0wnygdyi9qhkr7418f0227r3dcjwvmfhpw0kslryz0vqyf5b"; - libraryHaskellDepends = [ base containers mtl template-haskell ]; + version = "0.2"; + sha256 = "1jajj3fmhwvkla5ngvg6qb3hl2hmhgj6c1ldnz79b66ys62m6fs6"; + libraryHaskellDepends = [ + base containers mtl template-haskell th-orphans + ]; + homepage = "https://github.com/ddssff/th-kinds"; description = "Automated kind inference in Template Haskell"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; @@ -186244,11 +189516,27 @@ self: { pname = "th-to-exp"; version = "0.0.1.0"; sha256 = "0mmz37jlkzpw47gsjzfr182kiwwdwxdl19bpiw28m944m75ksa1h"; + revision = "1"; + editedCabalFile = "0lnknwrvaj8q2i68g09rakg8rdyi5860xia5p5jb2r1z0ggwbbwi"; + libraryHaskellDepends = [ base template-haskell ]; + testHaskellDepends = [ base hspec template-haskell ]; + homepage = "https://github.com/lexi-lambda/th-to-exp#readme"; + description = "Provides a way to persist data from compile-time to runtime"; + license = stdenv.lib.licenses.isc; + }) {}; + + "th-to-exp_0_0_1_1" = callPackage + ({ mkDerivation, base, hspec, template-haskell }: + mkDerivation { + pname = "th-to-exp"; + version = "0.0.1.1"; + sha256 = "09aqjrvgarygcbry01f6kmwbf7lzsbravmwz4277jdzdhwwj2zw6"; libraryHaskellDepends = [ base template-haskell ]; testHaskellDepends = [ base hspec template-haskell ]; homepage = "https://github.com/lexi-lambda/th-to-exp#readme"; description = "Provides a way to persist data from compile-time to runtime"; license = stdenv.lib.licenses.isc; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "th-traced" = callPackage @@ -186722,6 +190010,26 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "threepenny-editors_0_5_1" = callPackage + ({ mkDerivation, base, bifunctors, casing, containers, data-default + , generics-sop, lens, profunctors, threepenny-gui + }: + mkDerivation { + pname = "threepenny-editors"; + version = "0.5.1"; + sha256 = "07vg5xzrw7ll5kvbgi2masgbzicp0gfvzm7yrxhdkchdrlkrp1cv"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + base bifunctors casing containers data-default generics-sop lens + profunctors threepenny-gui + ]; + homepage = "https://github.com/pepeiborra/threepenny-editors"; + description = "Composable algebraic editors"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "threepenny-gui" = callPackage ({ mkDerivation, aeson, async, base, bytestring, containers , data-default, deepseq, exceptions, filepath, hashable @@ -188312,6 +191620,36 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "tls_1_4_0" = 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.4.0"; + sha256 = "1fhpyimmvhwfv6k4k00rlnc5lmk9bw3sckmfsdkv20q4cjb0hac3"; + libraryHaskellDepends = [ + asn1-encoding asn1-types async base bytestring cereal cryptonite + data-default-class memory mtl network transformers x509 x509-store + x509-validation + ]; + testHaskellDepends = [ + asn1-types base bytestring cereal cryptonite data-default-class + hourglass mtl QuickCheck tasty tasty-quickcheck x509 + x509-validation + ]; + benchmarkHaskellDepends = [ + asn1-types 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 @@ -188332,6 +191670,27 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "tls-debug_0_4_5" = callPackage + ({ mkDerivation, base, bytestring, cryptonite, data-default-class + , network, pem, time, tls, x509, x509-store, x509-system + , x509-validation + }: + mkDerivation { + pname = "tls-debug"; + version = "0.4.5"; + sha256 = "16zb4dray3l6sdckixyd2a5hbf6s0svy5f5bfffq48zr7f3c8id3"; + isLibrary = false; + isExecutable = true; + executableHaskellDepends = [ + base bytestring cryptonite data-default-class network pem time tls + x509 x509-store x509-system x509-validation + ]; + homepage = "http://github.com/vincenthz/hs-tls"; + description = "Set of programs for TLS testing and debugging"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "tls-extra" = callPackage ({ mkDerivation, base, bytestring, certificate, cipher-aes , cipher-rc4, crypto-pubkey, crypto-random, cryptohash, mtl @@ -188359,6 +191718,8 @@ self: { pname = "tls-session-manager"; version = "0.0.0.1"; sha256 = "0bqv6wh771j7n8qqsh02v8c4byybfkr1027k6cz03mszvnz1q9k8"; + revision = "1"; + editedCabalFile = "0hnhxfqmvkkhf37rr2ir52xyd59070jjm6s6al0alsanid2m4p01"; libraryHaskellDepends = [ auto-update base clock psqueues tls ]; description = "In-memory TLS session manager"; license = stdenv.lib.licenses.bsd3; @@ -189043,23 +192404,25 @@ self: { }) {}; "tpb" = callPackage - ({ mkDerivation, aeson, ansi-wl-pprint, base, boxes, bytestring - , directory, filepath, free, http-client, http-client-tls - , libnotify, microlens, mtl, optparse-applicative, pushbullet-types - , servant, servant-client, servant-pushbullet-client, text, time + ({ mkDerivation, aeson, ansi-wl-pprint, async, base, boxes + , bytestring, containers, directory, filepath, free, http-client + , http-client-tls, libnotify, microlens, mtl, optparse-applicative + , pushbullet-types, servant, servant-client + , servant-pushbullet-client, servant-server, text, time, wai, warp , websockets, wuss }: mkDerivation { pname = "tpb"; - version = "0.1.1.1"; - sha256 = "0w2wzv52lmnp80amwrzmxm3lacvp03wpkcx1i9f9b1qr060h6v41"; + version = "0.4.0.0"; + sha256 = "0d90vbyma5yhai0nlxa035pibn928jak879wbs6xx9ssyshcfwgy"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ - aeson ansi-wl-pprint base boxes bytestring directory filepath free - http-client http-client-tls libnotify microlens mtl - optparse-applicative pushbullet-types servant servant-client - servant-pushbullet-client text time websockets wuss + aeson ansi-wl-pprint async base boxes bytestring containers + directory filepath free http-client http-client-tls libnotify + microlens mtl optparse-applicative pushbullet-types servant + servant-client servant-pushbullet-client servant-server text time + wai warp websockets wuss ]; description = "Applications for interacting with the Pushbullet API"; license = stdenv.lib.licenses.gpl3; @@ -190010,7 +193373,7 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "trifecta_1_7" = callPackage + "trifecta_1_7_1" = callPackage ({ mkDerivation, ansi-terminal, ansi-wl-pprint, array, base , blaze-builder, blaze-html, blaze-markup, bytestring, Cabal , cabal-doctest, charset, comonad, containers, deepseq, doctest @@ -190020,8 +193383,8 @@ self: { }: mkDerivation { pname = "trifecta"; - version = "1.7"; - sha256 = "0hsm6k0af5hrx768kq4nww56x7hmvp993659asck6r00i9gyk0pq"; + version = "1.7.1"; + sha256 = "1fnf3riihg3nglrwl9sy093ppklgnjz4shc1p2184m30ckwmk945"; setupHaskellDepends = [ base Cabal cabal-doctest ]; libraryHaskellDepends = [ ansi-terminal ansi-wl-pprint array base blaze-builder blaze-html @@ -193345,6 +196708,29 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "unicode-transforms_0_3_3" = callPackage + ({ mkDerivation, base, bitarray, bytestring, criterion, deepseq + , filepath, getopt-generics, optparse-applicative, path, path-io + , QuickCheck, split, text + }: + mkDerivation { + pname = "unicode-transforms"; + version = "0.3.3"; + sha256 = "04ga6dhsz9x279w3ik2sjphgmr8s6y0wd0bpg37ymn5mxp68lx2r"; + libraryHaskellDepends = [ base bitarray bytestring text ]; + testHaskellDepends = [ + base deepseq getopt-generics QuickCheck split text + ]; + benchmarkHaskellDepends = [ + base criterion deepseq filepath optparse-applicative path path-io + text + ]; + homepage = "http://github.com/harendra-kumar/unicode-transforms"; + description = "Unicode normalization"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "unicoder" = callPackage ({ mkDerivation, attoparsec, base, data-default, directory , filepath, text, twitch @@ -193436,8 +196822,8 @@ self: { pname = "union"; version = "0.1.1.1"; sha256 = "1x24raarjj62z3afmf443kkcdslskz554sky8rcfkkb1j11mg7l1"; - revision = "1"; - editedCabalFile = "03ac6fnvqhlzngyaz5qd14gb5niybw73iimr4mafyqq3swi27q49"; + revision = "2"; + editedCabalFile = "0wxjv55bbjknyfn9489s77b22r31qwab6v16687mfj24a1cliad8"; libraryHaskellDepends = [ base deepseq profunctors tagged vinyl ]; benchmarkHaskellDepends = [ base criterion deepseq lens ]; description = "Extensible type-safe unions"; @@ -193861,8 +197247,8 @@ self: { }: mkDerivation { pname = "universum"; - version = "0.5"; - sha256 = "0i444yzxn4g8khjj8m2n4507qwvdvsypsb4qkylkz23214c6qax4"; + version = "0.5.1"; + sha256 = "1fqf9xqapzff8105p9ya65qjy6b1vmg9gvcm37gzv1i3bz7c7z8l"; libraryHaskellDepends = [ base bytestring containers deepseq exceptions ghc-prim hashable microlens microlens-mtl mtl safe stm text text-format transformers @@ -193904,8 +197290,8 @@ self: { pname = "unix-compat"; version = "0.4.3.1"; sha256 = "09vykw89x981fywy0w1pci2v8zy3ajyjwh9z2n610vjacmd1v03j"; - revision = "1"; - editedCabalFile = "02li6r77ingmhd2887qkrj4rrkl7w86bz5kjqix875ib6aji86bc"; + revision = "2"; + editedCabalFile = "0b5jicn8nm53yxxzwlvfcv4xp5rrqp98x5wwqh234wn9x44z54d2"; libraryHaskellDepends = [ base unix ]; homepage = "http://github.com/jystic/unix-compat"; description = "Portable POSIX-compatibility layer"; @@ -195667,6 +199053,31 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "vado_0_0_9" = callPackage + ({ mkDerivation, attoparsec, base, directory, filepath, process + , QuickCheck, text + }: + mkDerivation { + pname = "vado"; + version = "0.0.9"; + sha256 = "0y48niwv78xydjnz26rfja509blp0km279mypr2yzwm0xdif3s2s"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + attoparsec base directory filepath process text + ]; + executableHaskellDepends = [ + attoparsec base directory filepath process text + ]; + testHaskellDepends = [ + attoparsec base directory filepath process QuickCheck text + ]; + homepage = "https://github.com/hamishmack/vado"; + description = "Runs commands on remote machines using ssh"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "valid-names" = callPackage ({ mkDerivation, base, containers, MonadRandom }: mkDerivation { @@ -195808,6 +199219,23 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "validity-aeson" = callPackage + ({ mkDerivation, aeson, base, validity, validity-scientific + , validity-text, validity-unordered-containers, validity-vector + }: + mkDerivation { + pname = "validity-aeson"; + version = "0.0.0.0"; + sha256 = "1a7yh87vlngd4f6j5al7zrfy5pkgfgpbjr00fbpaqk56z87328nh"; + libraryHaskellDepends = [ + aeson base validity validity-scientific validity-text + validity-unordered-containers validity-vector + ]; + homepage = "https://github.com/NorfairKing/validity#readme"; + description = "Validity instances for aeson"; + license = stdenv.lib.licenses.mit; + }) {}; + "validity-bytestring" = callPackage ({ mkDerivation, base, bytestring, validity }: mkDerivation { @@ -195844,6 +199272,18 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "validity-scientific" = callPackage + ({ mkDerivation, base, scientific, validity }: + mkDerivation { + pname = "validity-scientific"; + version = "0.0.0.0"; + sha256 = "1k68lp33z0w1ari6i2wdcgypv9viynya5bi8bqs7ybic7h7cs3i5"; + libraryHaskellDepends = [ base scientific validity ]; + homepage = "https://github.com/NorfairKing/validity#readme"; + description = "Validity instances for scientific"; + license = stdenv.lib.licenses.mit; + }) {}; + "validity-text" = callPackage ({ mkDerivation, base, bytestring, text, validity }: mkDerivation { @@ -195870,6 +199310,32 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "validity-unordered-containers" = callPackage + ({ mkDerivation, base, hashable, unordered-containers, validity }: + mkDerivation { + pname = "validity-unordered-containers"; + version = "0.0.0.0"; + sha256 = "162xv4mip8awj214gdybhp2m3skjs0pg10gf9abj3h017wf046vd"; + libraryHaskellDepends = [ + base hashable unordered-containers validity + ]; + homepage = "https://github.com/NorfairKing/validity#readme"; + description = "Validity instances for unordered-containers"; + license = stdenv.lib.licenses.mit; + }) {}; + + "validity-vector" = callPackage + ({ mkDerivation, base, hashable, validity, vector }: + mkDerivation { + pname = "validity-vector"; + version = "0.0.0.0"; + sha256 = "0iz3qxk73k4ci337h4y9n94vahs9pfl060pdkx4bkg9wpar6fqr1"; + libraryHaskellDepends = [ base hashable validity vector ]; + homepage = "https://github.com/NorfairKing/validity#readme"; + description = "Validity instances for vector"; + license = stdenv.lib.licenses.mit; + }) {}; + "value-supply" = callPackage ({ mkDerivation, base }: mkDerivation { @@ -196611,6 +200077,18 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "vector-space_0_11" = callPackage + ({ mkDerivation, base, Boolean, MemoTrie, NumInstances }: + mkDerivation { + pname = "vector-space"; + version = "0.11"; + sha256 = "154d09f2a27ph38xgfdwg65bif9rgb9k92avgfjrylk649zpwi4h"; + libraryHaskellDepends = [ base Boolean MemoTrie NumInstances ]; + description = "Vector & affine spaces, linear maps, and derivatives"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "vector-space-map" = callPackage ({ mkDerivation, base, containers, doctest, vector-space }: mkDerivation { @@ -196951,6 +200429,26 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "viewprof_0_0_0_7" = callPackage + ({ mkDerivation, base, brick, containers, ghc-prof, lens + , scientific, text, vector, vector-algorithms, vty + }: + mkDerivation { + pname = "viewprof"; + version = "0.0.0.7"; + sha256 = "11q6p9faav8j6s8qqhvdij6jzd3v3pbgm5q94ksrn5sr2h4p10k8"; + isLibrary = false; + isExecutable = true; + executableHaskellDepends = [ + base brick containers ghc-prof lens scientific text vector + vector-algorithms vty + ]; + homepage = "https://github.com/maoe/viewprof"; + description = "Text-based interactive GHC .prof viewer"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "views" = callPackage ({ mkDerivation, base, mtl }: mkDerivation { @@ -197098,6 +200596,27 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "vinyl_0_6_0" = callPackage + ({ mkDerivation, base, criterion, doctest, ghc-prim, hspec, lens + , linear, mwc-random, primitive, should-not-typecheck, singletons + , vector + }: + mkDerivation { + pname = "vinyl"; + version = "0.6.0"; + sha256 = "1gig8ki9v4spxy4x8irhfvjb55shsd9a7a9g37v2r0hfl6k3yc4b"; + libraryHaskellDepends = [ base ghc-prim ]; + testHaskellDepends = [ + base doctest hspec lens should-not-typecheck singletons + ]; + benchmarkHaskellDepends = [ + base criterion lens linear mwc-random primitive vector + ]; + description = "Extensible Records"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "vinyl-gl" = callPackage ({ mkDerivation, base, containers, GLUtil, HUnit, linear, OpenGL , tagged, test-framework, test-framework-hunit, transformers @@ -197105,8 +200624,8 @@ self: { }: mkDerivation { pname = "vinyl-gl"; - version = "0.3.0.1"; - sha256 = "182ipz8znzk5fi7mpy3m1nbsyqq54p8y0hqycnnbmaxqsmhy6z5a"; + version = "0.3.1"; + sha256 = "0rnwsz9ad7sxpk68qfmav05d6pkv8w2wg7ax31v090nd9bgwhv6a"; libraryHaskellDepends = [ base containers GLUtil linear OpenGL tagged transformers vector vinyl @@ -198861,6 +202380,26 @@ self: { license = stdenv.lib.licenses.mpl20; }) {}; + "wai-route_0_3_1_2" = callPackage + ({ mkDerivation, base, bytestring, http-types, mtl, QuickCheck + , tasty, tasty-quickcheck, unordered-containers, wai + }: + mkDerivation { + pname = "wai-route"; + version = "0.3.1.2"; + sha256 = "1biiq5p8aa7icsafslgnnnv5n43v7gizz69y1snyxph5n0n7sl81"; + libraryHaskellDepends = [ + base bytestring http-types unordered-containers wai + ]; + testHaskellDepends = [ + base bytestring http-types mtl QuickCheck tasty tasty-quickcheck + wai + ]; + description = "Minimalistic, efficient routing for WAI"; + license = stdenv.lib.licenses.mpl20; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "wai-router" = callPackage ({ mkDerivation, base, text, wai }: mkDerivation { @@ -200457,7 +203996,7 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "websockets_0_12_1_0" = callPackage + "websockets_0_12_2_0" = callPackage ({ mkDerivation, attoparsec, base, base64-bytestring, binary , blaze-builder, bytestring, case-insensitive, containers , criterion, entropy, HUnit, network, QuickCheck, random, SHA @@ -200466,10 +204005,8 @@ self: { }: mkDerivation { pname = "websockets"; - version = "0.12.1.0"; - sha256 = "04c0bjzdz1l3n7hkfqhrxd16csnrlya2vjh96sgj9k6gwzj2cbsp"; - revision = "1"; - editedCabalFile = "1qnly23vdg76jm54d68jc7ssvlghkx4vi05a0vpmj4mi7b7mnxvq"; + version = "0.12.2.0"; + sha256 = "1jjb3qp6kniddn7jf4vv25v3fqainiclw0f3iyk4shq49clllki1"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -201587,8 +205124,8 @@ self: { }: mkDerivation { pname = "wolf"; - version = "0.3.24"; - sha256 = "13992gn3myjpdkmc4v2d1s2kmmsjzw8xzibs3iprlk72vacp70ja"; + version = "0.3.25"; + sha256 = "1sd087mf1gr9glx8fa775fp1zf8jyka1cfcqb6jn682bl021xz7p"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -201647,8 +205184,8 @@ self: { ({ mkDerivation, base, hspec, text }: mkDerivation { pname = "word-wrap"; - version = "0.1"; - sha256 = "1znkvh6nzx64v5kbfvr06r85idazxjx9qsbqgidrr5vnz0wccj76"; + version = "0.1.2"; + sha256 = "0bpjylmfy8dkqgyrngllvplqfrnljz6c8p8mqsim1xy8fikmqp21"; libraryHaskellDepends = [ base text ]; testHaskellDepends = [ base hspec ]; homepage = "https://github.com/jtdaugherty/word-wrap/"; @@ -201689,6 +205226,20 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "word8_0_1_3" = callPackage + ({ mkDerivation, base, bytestring, criterion, hspec }: + mkDerivation { + pname = "word8"; + version = "0.1.3"; + sha256 = "12jx7f13d2h1djq4fh4dyrab61sm49mj1w61j3rzp2vjfm696c16"; + libraryHaskellDepends = [ base ]; + testHaskellDepends = [ base hspec ]; + benchmarkHaskellDepends = [ base bytestring criterion ]; + description = "Word8 library"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "wordchoice" = callPackage ({ mkDerivation, base, bytestring, Chart, Chart-diagrams , containers, criterion, Glob, lens, optparse-applicative, pandoc @@ -202712,6 +206263,30 @@ self: { pname = "x509"; version = "1.7.1"; sha256 = "0rz4z1gna5pqhvicsvfgvf7lk2f924hqvkzjapq4727gq6q6crgr"; + revision = "1"; + editedCabalFile = "0hmq9gb6c2cid7kpblxax631mcqxj3p2j8br4n1fqn1jdp832y8v"; + libraryHaskellDepends = [ + asn1-encoding asn1-parse asn1-types base bytestring containers + cryptonite hourglass memory mtl pem + ]; + testHaskellDepends = [ + asn1-types base bytestring cryptonite hourglass mtl tasty + tasty-quickcheck + ]; + homepage = "http://github.com/vincenthz/hs-certificate"; + description = "X509 reader and writer"; + license = stdenv.lib.licenses.bsd3; + }) {}; + + "x509_1_7_2" = callPackage + ({ mkDerivation, asn1-encoding, asn1-parse, asn1-types, base + , bytestring, containers, cryptonite, hourglass, memory, mtl, pem + , tasty, tasty-quickcheck + }: + mkDerivation { + pname = "x509"; + version = "1.7.2"; + sha256 = "0yyfw07bw73gkh93z653lnncc30wj3g3rf26cwxjpyxvwalia0yw"; libraryHaskellDepends = [ asn1-encoding asn1-parse asn1-types base bytestring containers cryptonite hourglass memory mtl pem @@ -202723,6 +206298,7 @@ self: { homepage = "http://github.com/vincenthz/hs-certificate"; description = "X509 reader and writer"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "x509-store" = callPackage @@ -202742,6 +206318,26 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "x509-store_1_6_4" = callPackage + ({ mkDerivation, asn1-encoding, asn1-types, base, bytestring + , containers, cryptonite, directory, filepath, mtl, pem, tasty + , tasty-hunit, x509 + }: + mkDerivation { + pname = "x509-store"; + version = "1.6.4"; + sha256 = "089hpq1qbn19rbrvi91pn3v6681dkbm5hmkvg6cwqr868cj4yn79"; + libraryHaskellDepends = [ + asn1-encoding asn1-types base bytestring containers cryptonite + directory filepath mtl pem x509 + ]; + testHaskellDepends = [ base bytestring tasty tasty-hunit x509 ]; + homepage = "http://github.com/vincenthz/hs-certificate"; + description = "X.509 collection accessing and storing methods"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "x509-system" = callPackage ({ mkDerivation, base, bytestring, containers, directory, filepath , mtl, pem, process, x509, x509-store @@ -202759,6 +206355,24 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "x509-system_1_6_6" = callPackage + ({ mkDerivation, base, bytestring, containers, directory, filepath + , mtl, pem, process, x509, x509-store + }: + mkDerivation { + pname = "x509-system"; + version = "1.6.6"; + sha256 = "06a4m9c7vlr9nhp9gmqbb46arf0yj1dkdm4nip03hzy67spdmp20"; + libraryHaskellDepends = [ + base bytestring containers directory filepath mtl pem process x509 + x509-store + ]; + homepage = "http://github.com/vincenthz/hs-certificate"; + description = "Handle per-operating-system X.509 accessors and storage"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "x509-util" = callPackage ({ mkDerivation, asn1-encoding, asn1-types, base, bytestring , cryptonite, directory, hourglass, pem, x509, x509-store @@ -202766,8 +206380,8 @@ self: { }: mkDerivation { pname = "x509-util"; - version = "1.6.3"; - sha256 = "1ca68z6jvsf7xx1qx44k2cic3ijv44ah738rx755gdxx056s49sz"; + version = "1.6.4"; + sha256 = "0qv33r1p1mdl8yskl0hzy3s989y929lk2q23i9qb9fb6w63g6nfb"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -202803,6 +206417,30 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "x509-validation_1_6_9" = callPackage + ({ mkDerivation, asn1-encoding, asn1-types, base, byteable + , bytestring, containers, cryptonite, data-default-class, hourglass + , memory, mtl, pem, tasty, tasty-hunit, x509, x509-store + }: + mkDerivation { + pname = "x509-validation"; + version = "1.6.9"; + sha256 = "005m5jxjz5cx3lriayv4a17xa19qc2qxw7kz2f9wvj7hgjnwww44"; + libraryHaskellDepends = [ + asn1-encoding asn1-types base byteable bytestring containers + cryptonite data-default-class hourglass memory mtl pem x509 + x509-store + ]; + testHaskellDepends = [ + asn1-encoding asn1-types base bytestring cryptonite + data-default-class hourglass tasty tasty-hunit x509 x509-store + ]; + homepage = "http://github.com/vincenthz/hs-certificate"; + description = "X.509 Certificate and CRL validation"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "x86-64bit" = callPackage ({ mkDerivation, base, deepseq, monads-tf, QuickCheck, tardis , vector @@ -205912,6 +209550,41 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "yesod-bin_1_5_2_4" = callPackage + ({ mkDerivation, async, attoparsec, base, base64-bytestring + , blaze-builder, bytestring, Cabal, conduit, conduit-extra + , containers, data-default-class, deepseq, directory, file-embed + , filepath, fsnotify, http-client, http-client-tls + , http-reverse-proxy, http-types, lifted-base, network + , optparse-applicative, parsec, process, project-template + , resourcet, safe-exceptions, say, shakespeare, split, stm + , streaming-commons, tar, template-haskell, text, time + , transformers, transformers-compat, typed-process, unix-compat + , unordered-containers, wai, wai-extra, warp, warp-tls, yaml, zlib + }: + mkDerivation { + pname = "yesod-bin"; + version = "1.5.2.4"; + sha256 = "0kgrhpz2g9pj8llf9akbvjv1w76y82pk2pqm4hpqaaj6219pzznm"; + isLibrary = false; + isExecutable = true; + executableHaskellDepends = [ + async attoparsec base base64-bytestring blaze-builder bytestring + Cabal conduit conduit-extra containers data-default-class deepseq + directory file-embed filepath fsnotify http-client http-client-tls + http-reverse-proxy http-types lifted-base network + optparse-applicative parsec process project-template resourcet + safe-exceptions say shakespeare split stm streaming-commons tar + template-haskell text time transformers transformers-compat + typed-process unix-compat unordered-containers wai wai-extra warp + warp-tls yaml zlib + ]; + homepage = "http://www.yesodweb.com/"; + description = "The yesod helper executable"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "yesod-bootstrap" = callPackage ({ mkDerivation, base, blaze-html, blaze-markup, bootstrap-types , shakespeare, text, transformers, yesod-core, yesod-elements @@ -206326,6 +209999,19 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "yesod-form-bootstrap4_0_1_0_1" = callPackage + ({ mkDerivation, base, classy-prelude-yesod, yesod-form }: + mkDerivation { + pname = "yesod-form-bootstrap4"; + version = "0.1.0.1"; + sha256 = "0z555456ryfgs3ir0h139cfap61hmshywbd8wq7xsc4kf52yl44a"; + libraryHaskellDepends = [ base classy-prelude-yesod yesod-form ]; + homepage = "https://github.com/ncaq/yesod-form-bootstrap4.git#readme"; + description = "renderBootstrap4"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "yesod-form-json" = callPackage ({ mkDerivation, aeson, base, bytestring, containers, text , unordered-containers, yesod-core, yesod-form @@ -206359,6 +210045,24 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "yesod-form-richtext_0_1_0_2" = callPackage + ({ mkDerivation, base, blaze-builder, blaze-html, shakespeare, text + , xss-sanitize, yesod-core, yesod-form + }: + mkDerivation { + pname = "yesod-form-richtext"; + version = "0.1.0.2"; + sha256 = "0im3yfy0sdx60hn5cynh8pxp1fq2f64xgaizhxk0rd824i34lycn"; + libraryHaskellDepends = [ + base blaze-builder blaze-html shakespeare text xss-sanitize + yesod-core yesod-form + ]; + homepage = "http://github.com/geraldus/yesod-form-richtext#readme"; + description = "Various rich-text WYSIWYG editors for Yesod forms"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "yesod-gitrepo" = callPackage ({ mkDerivation, base, directory, enclosed-exceptions, http-types , lifted-base, process, temporary, text, wai, yesod-core @@ -207398,8 +211102,8 @@ self: { }: mkDerivation { pname = "yi"; - version = "0.14.0"; - sha256 = "0hdwcsv8yy1dfb2grj1haix1by8lp63mvi4vws733q2q9p9yrali"; + version = "0.14.1"; + sha256 = "0l42knqinklyavsg4ygrdikziflal0x2l4j218rrq7yvr5qll4n5"; configureFlags = [ "-fpango" "-fvty" ]; isLibrary = false; isExecutable = true; @@ -207477,14 +211181,58 @@ self: { license = stdenv.lib.licenses.gpl2; }) {}; + "yi-core_0_14_1" = callPackage + ({ mkDerivation, array, attoparsec, base, binary, bytestring + , containers, criterion, data-default, deepseq, directory, dlist + , dynamic-state, filepath, hashable, ListLike, microlens-platform + , mtl, old-locale, oo-prototypes, parsec, pointedlist, process + , process-extras, quickcheck-text, semigroups, split, tasty + , tasty-hunit, tasty-quickcheck, text, text-icu, time + , transformers-base, unix, unix-compat, unordered-containers + , xdg-basedir, yi-language, yi-rope + }: + mkDerivation { + pname = "yi-core"; + version = "0.14.1"; + sha256 = "0lhx476whdsz9f6p996p12ys3vi7rz14rb3rgfw0qi12czc61hav"; + libraryHaskellDepends = [ + array attoparsec base binary bytestring containers data-default + directory dlist dynamic-state filepath hashable ListLike + microlens-platform mtl old-locale oo-prototypes parsec pointedlist + process process-extras semigroups split text text-icu time + transformers-base unix unix-compat unordered-containers xdg-basedir + yi-language yi-rope + ]; + testHaskellDepends = [ + array attoparsec base binary bytestring containers data-default + directory dlist dynamic-state filepath hashable ListLike + microlens-platform mtl old-locale oo-prototypes parsec pointedlist + process process-extras quickcheck-text split tasty tasty-hunit + tasty-quickcheck text text-icu time transformers-base unix + unix-compat unordered-containers xdg-basedir yi-language yi-rope + ]; + benchmarkHaskellDepends = [ + array attoparsec base binary bytestring containers criterion + data-default deepseq directory dlist dynamic-state filepath + hashable ListLike microlens-platform mtl old-locale oo-prototypes + parsec pointedlist process process-extras split text text-icu time + transformers-base unix unix-compat unordered-containers xdg-basedir + yi-language yi-rope + ]; + homepage = "https://github.com/yi-editor/yi#readme"; + description = "Yi editor core library"; + license = stdenv.lib.licenses.gpl2; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "yi-dynamic-configuration" = callPackage ({ mkDerivation, base, dyre, microlens-platform, mtl, text , transformers-base, yi-core, yi-rope }: mkDerivation { pname = "yi-dynamic-configuration"; - version = "0.14.0"; - sha256 = "06gad5vi55hjbb5ifvkprnbbpd68n2y0sbjm0z0x0zaqg2srjmls"; + version = "0.14.1"; + sha256 = "0dpkp554s8hk09x74krix34g0iw2p77xqp23xrpcsn2yrd38i0bw"; libraryHaskellDepends = [ base dyre microlens-platform mtl text transformers-base yi-core yi-rope @@ -207514,8 +211262,8 @@ self: { }: mkDerivation { pname = "yi-frontend-pango"; - version = "0.14.0"; - sha256 = "0zwpy1lbkw8lkxk4p162xs181n9xsp9x8h6yknklqd79lnxs4zd5"; + version = "0.14.1"; + sha256 = "1rppsmwinczvjlji38cwz11g3h1xzqdjxvz7pimbzfsbccl2wjj3"; enableSeparateDataOutput = true; libraryHaskellDepends = [ base containers filepath glib gtk microlens-platform mtl @@ -207545,6 +211293,25 @@ self: { license = stdenv.lib.licenses.gpl2; }) {}; + "yi-frontend-vty_0_14_1" = callPackage + ({ mkDerivation, base, containers, data-default, dlist + , microlens-platform, pointedlist, stm, text, vty, yi-core + , yi-language, yi-rope + }: + mkDerivation { + pname = "yi-frontend-vty"; + version = "0.14.1"; + sha256 = "1ahiq7pf5dm6r6x7zpkrn9dbdqf4p1wr8g1zlffjncywk81h34f3"; + libraryHaskellDepends = [ + base containers data-default dlist microlens-platform pointedlist + stm text vty yi-core yi-language yi-rope + ]; + homepage = "https://github.com/yi-editor/yi#readme"; + description = "Vty frontend for Yi editor"; + license = stdenv.lib.licenses.gpl2; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "yi-fuzzy-open" = callPackage ({ mkDerivation, base, binary, containers, data-default, directory , filepath, mtl, text, transformers-base, vector, yi-core @@ -207563,6 +211330,25 @@ self: { license = stdenv.lib.licenses.gpl2; }) {}; + "yi-fuzzy-open_0_14_1" = callPackage + ({ mkDerivation, base, binary, containers, data-default, directory + , filepath, mtl, text, transformers-base, vector, yi-core + , yi-language, yi-rope + }: + mkDerivation { + pname = "yi-fuzzy-open"; + version = "0.14.1"; + sha256 = "0qj8dlxdmsbas68zzmb99m5kw5jwp2vfj983s66a379z23zrg7wx"; + libraryHaskellDepends = [ + base binary containers data-default directory filepath mtl text + transformers-base vector yi-core yi-language yi-rope + ]; + homepage = "https://github.com/yi-editor/yi#readme"; + description = "Fuzzy open plugin for yi"; + license = stdenv.lib.licenses.gpl2; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "yi-gtk" = callPackage ({ mkDerivation }: mkDerivation { @@ -207592,6 +211378,24 @@ self: { license = stdenv.lib.licenses.gpl2; }) {}; + "yi-ireader_0_14_1" = callPackage + ({ mkDerivation, base, binary, bytestring, containers, data-default + , microlens-platform, text, yi-core, yi-language, yi-rope + }: + mkDerivation { + pname = "yi-ireader"; + version = "0.14.1"; + sha256 = "0r10g7gw889snclv0jdrg8k6db9hm9zlkaxqvm7f22fj1ddb5kbi"; + libraryHaskellDepends = [ + base binary bytestring containers data-default microlens-platform + text yi-core yi-language yi-rope + ]; + homepage = "https://github.com/yi-editor/yi#readme"; + description = "Yi editor incremental reader"; + license = stdenv.lib.licenses.gpl2; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "yi-keymap-cua" = callPackage ({ mkDerivation, base, microlens-platform, text, yi-core , yi-keymap-emacs, yi-rope @@ -207609,6 +211413,23 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "yi-keymap-cua_0_14_1" = callPackage + ({ mkDerivation, base, microlens-platform, text, yi-core + , yi-keymap-emacs, yi-rope + }: + mkDerivation { + pname = "yi-keymap-cua"; + version = "0.14.1"; + sha256 = "1s1nh2h1v4zhgklhzlzix1plfg1z458yhl6y77xbq5r81ammpr5v"; + libraryHaskellDepends = [ + base microlens-platform text yi-core yi-keymap-emacs yi-rope + ]; + homepage = "https://github.com/yi-editor/yi#readme"; + description = "Cua keymap for Yi editor"; + license = stdenv.lib.licenses.gpl2; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "yi-keymap-emacs" = callPackage ({ mkDerivation, base, containers, filepath, Hclip , microlens-platform, mtl, oo-prototypes, semigroups, text @@ -207629,6 +211450,26 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "yi-keymap-emacs_0_14_1" = callPackage + ({ mkDerivation, base, containers, filepath, Hclip + , microlens-platform, mtl, oo-prototypes, semigroups, text + , transformers-base, yi-core, yi-language, yi-misc-modes, yi-rope + }: + mkDerivation { + pname = "yi-keymap-emacs"; + version = "0.14.1"; + sha256 = "17fx1vhj4sdgbvih6ha6jqp74bfq0bcxilxlgm1vwlcafvc2vyfl"; + libraryHaskellDepends = [ + base containers filepath Hclip microlens-platform mtl oo-prototypes + semigroups text transformers-base yi-core yi-language yi-misc-modes + yi-rope + ]; + homepage = "https://github.com/yi-editor/yi#readme"; + description = "Emacs keymap for Yi editor"; + license = stdenv.lib.licenses.gpl2; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "yi-keymap-vim" = callPackage ({ mkDerivation, attoparsec, base, binary, containers, data-default , directory, filepath, Hclip, microlens-platform, mtl @@ -207659,6 +211500,36 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "yi-keymap-vim_0_14_1" = callPackage + ({ mkDerivation, attoparsec, base, binary, containers, data-default + , directory, filepath, Hclip, microlens-platform, mtl + , oo-prototypes, pointedlist, QuickCheck, safe, semigroups, tasty + , tasty-hunit, tasty-quickcheck, text, transformers-base + , unordered-containers, yi-core, yi-language, yi-rope + }: + mkDerivation { + pname = "yi-keymap-vim"; + version = "0.14.1"; + sha256 = "19wdfhsvzy90jm9pskla40q94kvil5hvmx9r6a2frsbqjlbjk5ja"; + enableSeparateDataOutput = true; + libraryHaskellDepends = [ + attoparsec base binary containers data-default directory filepath + Hclip microlens-platform mtl oo-prototypes pointedlist safe + semigroups text transformers-base unordered-containers yi-core + yi-language yi-rope + ]; + testHaskellDepends = [ + attoparsec base binary containers data-default directory filepath + Hclip microlens-platform mtl oo-prototypes pointedlist QuickCheck + safe semigroups tasty tasty-hunit tasty-quickcheck text + transformers-base unordered-containers yi-core yi-language yi-rope + ]; + homepage = "https://github.com/yi-editor/yi#readme"; + description = "Vim keymap for Yi editor"; + license = stdenv.lib.licenses.gpl2; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "yi-language" = callPackage ({ mkDerivation, alex, array, base, binary, containers , data-default, hashable, microlens-platform, oo-prototypes @@ -207687,6 +211558,35 @@ self: { license = stdenv.lib.licenses.gpl2; }) {}; + "yi-language_0_14_1" = callPackage + ({ mkDerivation, alex, array, base, binary, containers + , data-default, hashable, microlens-platform, oo-prototypes + , pointedlist, regex-base, regex-tdfa, tasty, tasty-hspec + , tasty-quickcheck, template-haskell, transformers-base + , unordered-containers + }: + mkDerivation { + pname = "yi-language"; + version = "0.14.1"; + sha256 = "1miszrvls06k5q78w5aswc7z5pbq8b1qvdxkhnfp0zw0vbs7wmgm"; + libraryHaskellDepends = [ + array base binary containers data-default hashable + microlens-platform oo-prototypes pointedlist regex-base regex-tdfa + template-haskell transformers-base unordered-containers + ]; + libraryToolDepends = [ alex ]; + testHaskellDepends = [ + array base binary containers data-default hashable + microlens-platform pointedlist regex-base regex-tdfa tasty + tasty-hspec tasty-quickcheck template-haskell transformers-base + unordered-containers + ]; + homepage = "https://github.com/yi-editor/yi#readme"; + description = "Collection of language-related Yi libraries"; + license = stdenv.lib.licenses.gpl2; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "yi-misc-modes" = callPackage ({ mkDerivation, alex, array, base, binary, data-default, filepath , microlens-platform, semigroups, text, yi-core, yi-language @@ -207707,6 +211607,26 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "yi-misc-modes_0_14_1" = callPackage + ({ mkDerivation, alex, array, base, binary, data-default, filepath + , microlens-platform, semigroups, text, yi-core, yi-language + , yi-rope + }: + mkDerivation { + pname = "yi-misc-modes"; + version = "0.14.1"; + sha256 = "1ivpp0yyyvybs05h6i4x4jgdpakwis5wvj9bp8273bskw128sw1c"; + libraryHaskellDepends = [ + array base binary data-default filepath microlens-platform + semigroups text yi-core yi-language yi-rope + ]; + libraryToolDepends = [ alex ]; + homepage = "https://github.com/yi-editor/yi#readme"; + description = "Yi editor miscellaneous modes"; + license = stdenv.lib.licenses.gpl2; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "yi-mode-haskell" = callPackage ({ mkDerivation, alex, array, base, binary, data-default, filepath , microlens-platform, text, yi-core, yi-language, yi-rope @@ -207726,6 +211646,25 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "yi-mode-haskell_0_14_1" = callPackage + ({ mkDerivation, alex, array, base, binary, data-default, filepath + , microlens-platform, text, yi-core, yi-language, yi-rope + }: + mkDerivation { + pname = "yi-mode-haskell"; + version = "0.14.1"; + sha256 = "1z119jwpdj2i4dxvl7imhlpxjd03mxxxnvcha5jp3rxjlbsdp7zs"; + libraryHaskellDepends = [ + array base binary data-default filepath microlens-platform text + yi-core yi-language yi-rope + ]; + libraryToolDepends = [ alex ]; + homepage = "https://github.com/yi-editor/yi#readme"; + description = "Yi editor haskell mode"; + license = stdenv.lib.licenses.gpl2; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "yi-mode-javascript" = callPackage ({ mkDerivation, alex, array, base, binary, data-default, dlist , filepath, microlens-platform, mtl, text, yi-core, yi-language @@ -207746,6 +211685,26 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "yi-mode-javascript_0_14_1" = callPackage + ({ mkDerivation, alex, array, base, binary, data-default, dlist + , filepath, microlens-platform, mtl, text, yi-core, yi-language + , yi-rope + }: + mkDerivation { + pname = "yi-mode-javascript"; + version = "0.14.1"; + sha256 = "182bs6pnn2v2vvp0vl4sjpfdqcas1d35zf7ky00dyz9g24h8l2f5"; + libraryHaskellDepends = [ + array base binary data-default dlist filepath microlens-platform + mtl text yi-core yi-language yi-rope + ]; + libraryToolDepends = [ alex ]; + homepage = "https://github.com/yi-editor/yi#readme"; + description = "Yi editor javascript mode"; + license = stdenv.lib.licenses.gpl2; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "yi-monokai" = callPackage ({ mkDerivation, base, yi }: mkDerivation { @@ -207801,6 +211760,28 @@ self: { license = stdenv.lib.licenses.gpl2; }) {}; + "yi-snippet_0_14_1" = callPackage + ({ mkDerivation, base, binary, containers, data-default, free + , microlens-platform, mtl, tasty-hunit, tasty-th, text, vector + , yi-core, yi-rope + }: + mkDerivation { + pname = "yi-snippet"; + version = "0.14.1"; + sha256 = "14319na0hn21qrkkcfrqh5qvlx10f7462m466hhpfhq7rka8b28h"; + libraryHaskellDepends = [ + base binary containers data-default free microlens-platform mtl + text vector yi-core yi-rope + ]; + testHaskellDepends = [ + base containers tasty-hunit tasty-th yi-rope + ]; + homepage = "https://github.com/yi-editor/yi#readme"; + description = "Snippet support for yi"; + license = stdenv.lib.licenses.gpl2; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "yi-solarized" = callPackage ({ mkDerivation, base, yi }: mkDerivation { @@ -208036,6 +212017,21 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "youtube_0_2_1_1" = callPackage + ({ mkDerivation, base, bytestring, process, utility-ht }: + mkDerivation { + pname = "youtube"; + version = "0.2.1.1"; + sha256 = "098fhkyw70sxb58bj9hbshg12j57s23qrv9r1r7m13rxbxw6lf9f"; + isLibrary = false; + isExecutable = true; + enableSeparateDataOutput = true; + executableHaskellDepends = [ base bytestring process utility-ht ]; + description = "Upload video to YouTube via YouTube API"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "yql" = callPackage ({ mkDerivation, aeson, base, base64-bytestring, bytestring , containers, cryptohash, data-default, ecma262, exceptions @@ -208812,6 +212808,24 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "zippers_0_2_4" = callPackage + ({ mkDerivation, base, Cabal, cabal-doctest, criterion, doctest + , lens, profunctors, semigroupoids + }: + mkDerivation { + pname = "zippers"; + version = "0.2.4"; + sha256 = "1nzjs1s0lb0gr0n2qib4pdp24k7q707261n8icxzg81f0c04yafb"; + setupHaskellDepends = [ base Cabal cabal-doctest ]; + libraryHaskellDepends = [ base lens profunctors semigroupoids ]; + testHaskellDepends = [ base doctest ]; + benchmarkHaskellDepends = [ base criterion lens ]; + homepage = "http://github.com/ekmett/zippers/"; + description = "Traversal based zippers"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "zippo" = callPackage ({ mkDerivation, base, mtl, yall }: mkDerivation { diff --git a/pkgs/development/haskell-modules/lib.nix b/pkgs/development/haskell-modules/lib.nix index 30d82d3efc9..c67b61acd78 100644 --- a/pkgs/development/haskell-modules/lib.nix +++ b/pkgs/development/haskell-modules/lib.nix @@ -1,7 +1,9 @@ -{ pkgs }: +# TODO(@Ericson2314): Remove `pkgs` param, which is only used for +# `buildStackProject` and `justStaticExecutables` +{ pkgs, lib }: rec { - makePackageSet = pkgs.callPackage ./make-package-set.nix {}; + makePackageSet = import ./make-package-set.nix; overrideCabal = drv: f: (drv.override (args: args // { mkDerivation = drv: (args.mkDerivation drv).override f; @@ -25,7 +27,7 @@ rec { dontDistribute = drv: overrideCabal drv (drv: { hydraPlatforms = []; }); appendConfigureFlag = drv: x: overrideCabal drv (drv: { configureFlags = (drv.configureFlags or []) ++ [x]; }); - removeConfigureFlag = drv: x: overrideCabal drv (drv: { configureFlags = pkgs.stdenv.lib.remove x (drv.configureFlags or []); }); + removeConfigureFlag = drv: x: overrideCabal drv (drv: { configureFlags = lib.remove x (drv.configureFlags or []); }); addBuildTool = drv: x: addBuildTools drv [x]; addBuildTools = drv: xs: overrideCabal drv (drv: { buildTools = (drv.buildTools or []) ++ xs; }); @@ -71,7 +73,7 @@ rec { disableHardening = drv: flags: overrideCabal drv (drv: { hardeningDisable = flags; }); - sdistTarball = pkg: pkgs.lib.overrideDerivation pkg (drv: { + sdistTarball = pkg: lib.overrideDerivation pkg (drv: { name = "${drv.pname}-source-${drv.version}"; buildPhase = "./Setup sdist"; haddockPhase = ":"; @@ -89,12 +91,11 @@ rec { isLibrary = false; doHaddock = false; postFixup = "rm -rf $out/lib $out/nix-support $out/share/doc"; - } // (if pkgs.stdenv.isDarwin then { + } // lib.optionalAttrs (pkgs.hostPlatform.isDarwin) { configureFlags = (drv.configureFlags or []) ++ ["--ghc-option=-optl=-dead_strip"]; - } else {}) - ); + }); - buildFromSdist = pkg: pkgs.lib.overrideDerivation pkg (drv: { + buildFromSdist = pkg: lib.overrideDerivation pkg (drv: { unpackPhase = let src = sdistTarball pkg; tarname = "${pkg.pname}-${pkg.version}"; in '' echo "Source tarball is at ${src}/${tarname}.tar.gz" tar xf ${src}/${tarname}.tar.gz diff --git a/pkgs/development/haskell-modules/make-package-set.nix b/pkgs/development/haskell-modules/make-package-set.nix index 6ed8d0864ca..87f3a04ebf5 100644 --- a/pkgs/development/haskell-modules/make-package-set.nix +++ b/pkgs/development/haskell-modules/make-package-set.nix @@ -1,20 +1,34 @@ # This expression takes a file like `hackage-packages.nix` and constructs # a full package set out of that. -# required dependencies: -{ pkgs, stdenv, all-cabal-hashes }: +{ # package-set used for non-haskell dependencies (all of nixpkgs) + pkgs -# arguments: -# * ghc package to use -# * package-set: a function that takes { pkgs, stdenv, callPackage } as first arg and `self` as second -# * extensible-self: the final, fully overriden package set usable with the nixpkgs fixpoint overriding functionality -{ ghc, package-set, extensible-self }: +, # stdenv to use for building haskell packages + stdenv + +, haskellLib + +, # hashes for downloading Hackage packages + all-cabal-hashes + +, # compiler to use + ghc + +, # A function that takes `{ pkgs, stdenv, callPackage }` as the first arg and `self` + # as second, and returns a set of haskell packages + package-set + +, # The final, fully overriden package set usable with the nixpkgs fixpoint + # overriding functionality + extensible-self +}: # return value: a function from self to the package set self: let inherit (stdenv.lib) fix' extends makeOverridable; - inherit (import ./lib.nix { inherit pkgs; }) overrideCabal; + inherit (haskellLib) overrideCabal; mkDerivationImpl = pkgs.callPackage ./generic-builder.nix { inherit stdenv; diff --git a/pkgs/development/libraries/aws-sdk-cpp/default.nix b/pkgs/development/libraries/aws-sdk-cpp/default.nix index 9f97b18b4d7..fe06bcfab6d 100644 --- a/pkgs/development/libraries/aws-sdk-cpp/default.nix +++ b/pkgs/development/libraries/aws-sdk-cpp/default.nix @@ -14,13 +14,13 @@ let else throw "Unsupported system!"; in stdenv.mkDerivation rec { name = "aws-sdk-cpp-${version}"; - version = "1.0.153"; + version = "1.1.18"; src = fetchFromGitHub { owner = "awslabs"; repo = "aws-sdk-cpp"; rev = version; - sha256 = "0mglg9a6klmsam8r9va7y5x2s8xylhljwcg93sr8152rvhxnjv08"; + sha256 = "1i85zpns3gj5by45ppg4rfk9csix8mjazpyj6dqic40b2wshnw8c"; }; # FIXME: might be nice to put different APIs in different outputs diff --git a/pkgs/development/libraries/backward-cpp/default.nix b/pkgs/development/libraries/backward-cpp/default.nix new file mode 100644 index 00000000000..42621a1792c --- /dev/null +++ b/pkgs/development/libraries/backward-cpp/default.nix @@ -0,0 +1,30 @@ +{ stdenv, lib, fetchFromGitHub }: + +stdenv.mkDerivation rec { + name = "backward-${version}"; + version = "1.3"; + + src = fetchFromGitHub { + owner = "bombela"; + repo = "backward-cpp"; + rev = "v${version}"; + sha256 = "1nx77qamal53rq8qxsjzax6ljawb345a1v3cqmfwa0hx26srxcln"; + }; + + installPhase = '' + runHook preInstall + + mkdir -p $out/include + cp backward.hpp $out/include + + runHook postInstall + ''; + + meta = with lib; { + description = "Beautiful stack trace pretty printer for C++"; + homepage = "https://github.com/bombela/backward-cpp"; + license = licenses.mit; + platforms = platforms.linux; + maintainers = with maintainers; [ cstrahan ]; + }; +} diff --git a/pkgs/development/libraries/boringssl/default.nix b/pkgs/development/libraries/boringssl/default.nix index 3a537821298..ff48ffe67f0 100644 --- a/pkgs/development/libraries/boringssl/default.nix +++ b/pkgs/development/libraries/boringssl/default.nix @@ -1,13 +1,14 @@ { stdenv, fetchgit, cmake, perl, go }: +# reference: https://boringssl.googlesource.com/boringssl/+/2661/BUILDING.md stdenv.mkDerivation rec { name = "boringssl-${version}"; - version = "2016-03-08"; + version = "2017-02-23"; src = fetchgit { url = "https://boringssl.googlesource.com/boringssl"; - rev = "bfb38b1a3c5e37d43188bbd02365a87bebc8d122"; - sha256 = "0bm7vqg3bk716xmw2af99p44zizfhknq9z3cphf7klfdrr7ibqm5"; + rev = "be2ee342d3781ddb954f91f8a7e660c6f59e87e5"; + sha256 = "022zq7wlkhrg6al7drr3555lam3zw5bb10ylf9mznp83s854f975"; }; buildInputs = [ cmake perl go ]; @@ -17,8 +18,12 @@ stdenv.mkDerivation rec { installPhase = '' mkdir -p $out/bin $out/include $out/lib - mv tool/bssl $out/bin - mv ssl/libssl.a $out/lib + mv tool/bssl $out/bin + + mv ssl/libssl.a $out/lib + mv crypto/libcrypto.a $out/lib + mv decrepit/libdecrepit.a $out/lib + mv ../include/openssl $out/include ''; diff --git a/pkgs/development/libraries/ccnx/default.nix b/pkgs/development/libraries/ccnx/default.nix deleted file mode 100644 index 4634a80ade6..00000000000 --- a/pkgs/development/libraries/ccnx/default.nix +++ /dev/null @@ -1,38 +0,0 @@ -{ stdenv, fetchurl, openssl, expat, libpcap }: -let - version = "0.8.2"; -in -stdenv.mkDerivation { - name = "ccnx-${version}"; - src = fetchurl { - url = "https://github.com/ProjectCCNx/ccnx/archive/ccnx-${version}.tar.gz"; - sha256 = "1jyk7i8529821aassxbvzlxnvl5ly0na1qcn3v1jpxhdd0qqpg00"; - }; - buildInputs = [ openssl expat libpcap ]; - preConfigure = '' - mkdir -p $out/include - mkdir -p $out/lib - mkdir -p $out/bin - substituteInPlace csrc/configure --replace "/usr/local" $out --replace "/usr/bin/env sh" "/bin/sh" - ''; - meta = with stdenv.lib; { - homepage = http://www.ccnx.org/; - description = "A Named Data Neworking (NDN) or Content Centric Networking (CCN) abstraction"; - longDescription = '' - To address the Internet’s modern-day requirements with a better - fitting model, PARC has created a new networking architecture - called Content-Centric Networking (CCN), which operates by addressing - and delivering Content Objects directly by Name instead of merely - addressing network end-points. In addition, the CCN security model - explicitly secures individual Content Objects rather than securing - the connection or “pipe”. Named and secured content resides in - distributed caches automatically populated on demand or selectively - pre-populated. When requested by name, CCN delivers named content to - the user from the nearest cache, thereby traversing fewer network hops, - eliminating redundant requests, and consuming less resources overall. - ''; - license = licenses.gpl2; - platforms = stdenv.lib.platforms.unix; - maintainers = [ maintainers.sjmackenzie ]; - }; -} diff --git a/pkgs/development/libraries/exosip/3.x.nix b/pkgs/development/libraries/exosip/3.x.nix deleted file mode 100644 index aa55a7f0d1d..00000000000 --- a/pkgs/development/libraries/exosip/3.x.nix +++ /dev/null @@ -1,18 +0,0 @@ -{stdenv, fetchurl, libosip, openssl, pkgconfig }: - -stdenv.mkDerivation rec { - version = "3.6.0"; - src = fetchurl { - url = "mirror://savannah/exosip/libeXosip2-${version}.tar.gz"; - sha256 = "0r1mj8x5991bgwf03bx1ajn5kbbmw1136jabw2pn7dls9h41mnli"; - }; - name = "libexosip2-${version}"; - - buildInputs = [ libosip openssl pkgconfig ]; - - meta = { - license = stdenv.lib.licenses.gpl2Plus; - description = "Library that hides the complexity of using the SIP protocol"; - platforms = stdenv.lib.platforms.linux; - }; -} diff --git a/pkgs/development/libraries/gvfs/default.nix b/pkgs/development/libraries/gvfs/default.nix index f225f34c336..11c3134e10b 100644 --- a/pkgs/development/libraries/gvfs/default.nix +++ b/pkgs/development/libraries/gvfs/default.nix @@ -32,9 +32,12 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; - # ToDo: one probably should specify schemas for samba and others here preFixup = '' - wrapProgram $out/libexec/gvfsd --prefix XDG_DATA_DIRS : "$GSETTINGS_SCHEMAS_PATH" + for f in $out/libexec/*; do + wrapProgram $f \ + ${stdenv.lib.optionalString gnomeSupport "--prefix GIO_EXTRA_MODULES : \"${stdenv.lib.getLib gnome.dconf}/lib/gio/modules\""} \ + --prefix XDG_DATA_DIRS : "$GSETTINGS_SCHEMAS_PATH" + done ''; meta = with stdenv.lib; { diff --git a/pkgs/development/libraries/indicator-application/gtk2.nix b/pkgs/development/libraries/indicator-application/gtk2.nix index cbc66dd6ae6..b4fea7c1fa4 100644 --- a/pkgs/development/libraries/indicator-application/gtk2.nix +++ b/pkgs/development/libraries/indicator-application/gtk2.nix @@ -26,8 +26,10 @@ stdenv.mkDerivation rec { --replace 'DBUSSERVICEDIR=`$PKG_CONFIG --variable=session_bus_services_dir dbus-1`' \ "DBUSSERVICEDIR=$out/share/dbus-1/services" autoconf - substituteInPlace {configure,ltmain.sh,m4/libtool.m4} \ - --replace /usr/bin/file ${file}/bin/file + for f in {configure,ltmain.sh,m4/libtool.m4}; do + substituteInPlace $f \ + --replace /usr/bin/file ${file}/bin/file + done substituteInPlace src/Makefile.in \ --replace 'applicationlibdir = $(INDICATORDIR)' "applicationlibdir = $out/lib" ''; diff --git a/pkgs/development/libraries/indicator-application/gtk3.nix b/pkgs/development/libraries/indicator-application/gtk3.nix index 778997e5674..03afd6f1e87 100644 --- a/pkgs/development/libraries/indicator-application/gtk3.nix +++ b/pkgs/development/libraries/indicator-application/gtk3.nix @@ -28,8 +28,10 @@ stdenv.mkDerivation rec { --replace 'DBUSSERVICEDIR=`$PKG_CONFIG --variable=session_bus_services_dir dbus-1`' \ "DBUSSERVICEDIR=$out/share/dbus-1/services" autoconf - substituteInPlace {configure,ltmain.sh,m4/libtool.m4} \ - --replace /usr/bin/file ${file}/bin/file + for f in {configure,ltmain.sh,m4/libtool.m4}; do + substituteInPlace $f \ + --replace /usr/bin/file ${file}/bin/file + done substituteInPlace src/Makefile.in \ --replace 'applicationlibdir = $(INDICATORDIR)' "applicationlibdir = $out/lib" ''; diff --git a/pkgs/development/libraries/libappindicator/default.nix b/pkgs/development/libraries/libappindicator/default.nix index 8f005d6a5a4..3a26dd407e4 100644 --- a/pkgs/development/libraries/libappindicator/default.nix +++ b/pkgs/development/libraries/libappindicator/default.nix @@ -43,8 +43,10 @@ in stdenv.mkDerivation rec { substituteInPlace configure.ac \ --replace '=codegendir pygtk-2.0' '=codegendir pygobject-2.0' autoconf - substituteInPlace {configure,ltmain.sh,m4/libtool.m4} \ - --replace /usr/bin/file ${file}/bin/file + for f in {configure,ltmain.sh,m4/libtool.m4}; do + substituteInPlace $f \ + --replace /usr/bin/file ${file}/bin/file + done ''; configureFlags = [ diff --git a/pkgs/development/libraries/libdbusmenu/default.nix b/pkgs/development/libraries/libdbusmenu/default.nix index 5d697489638..96e9c0624f2 100644 --- a/pkgs/development/libraries/libdbusmenu/default.nix +++ b/pkgs/development/libraries/libdbusmenu/default.nix @@ -26,8 +26,10 @@ stdenv.mkDerivation rec { ] ++ optional (gtkVersion != null) (if gtkVersion == "2" then gtk2 else gtk3); postPatch = '' - substituteInPlace {configure,ltmain.sh,m4/libtool.m4} \ - --replace /usr/bin/file ${file}/bin/file + for f in {configure,ltmain.sh,m4/libtool.m4}; do + substituteInPlace $f \ + --replace /usr/bin/file ${file}/bin/file + done ''; # https://projects.archlinux.org/svntogit/community.git/tree/trunk/PKGBUILD?h=packages/libdbusmenu diff --git a/pkgs/development/libraries/libevent/default.nix b/pkgs/development/libraries/libevent/default.nix index d2ba84bb5dd..6fa0caa97e9 100644 --- a/pkgs/development/libraries/libevent/default.nix +++ b/pkgs/development/libraries/libevent/default.nix @@ -1,28 +1,14 @@ { stdenv, fetchurl, openssl, findutils }: -let version = "2.0.22"; in -stdenv.mkDerivation { +stdenv.mkDerivation rec { name = "libevent-${version}"; + version = "2.1.8"; src = fetchurl { url = "https://github.com/libevent/libevent/releases/download/release-${version}-stable/libevent-${version}-stable.tar.gz"; - sha256 = "18qz9qfwrkakmazdlwxvjmw8p76g70n3faikwvdwznns1agw9hki"; + sha256 = "1hhxnxlr0fsdv7bdmzsnhdz16fxf3jg2r6vyljcl3kj6pflcap4n"; }; - prePatch = let - # https://lwn.net/Vulnerabilities/714581/ - debian = fetchurl { - url = "http://http.debian.net/debian/pool/main/libe/libevent/" - + "libevent_2.0.21-stable-3.debian.tar.xz"; - sha256 = "0b2syswiq3cvfbdvi4lbca15c31lilxnahax4a4b4qxi5fcab7h5"; - }; - in '' - tar xf '${debian}' - patches="$patches $(cat debian/patches/series | grep -v '^$\|^#' \ - | grep -v '^20d6d445.patch' \ - | grep -v '^dh-autoreconf' | sed 's|^|debian/patches/|')" - ''; - # libevent_openssl is moved into its own output, so that openssl isn't present # in the default closure. outputs = [ "out" "dev" "openssl" ]; diff --git a/pkgs/development/libraries/libevhtp/default.nix b/pkgs/development/libraries/libevhtp/default.nix deleted file mode 100644 index fb92d6aa4ca..00000000000 --- a/pkgs/development/libraries/libevhtp/default.nix +++ /dev/null @@ -1,25 +0,0 @@ -{ stdenv, fetchFromGitHub, cmake, openssl, libevent }: - -stdenv.mkDerivation rec { - name = "libevhtp-${version}"; - version = "1.2.11"; - - src = fetchFromGitHub { - owner = "ellzey"; - repo = "libevhtp"; - rev = version; - sha256 = "1rlxdp8w4alcy5ryr7pmw5wi6hv7d64885wwbk1zxhvi64s4x4rg"; - }; - - buildInputs = [ cmake openssl libevent ]; - - buildPhase = "cmake"; - - meta = with stdenv.lib; { - description = "A more flexible replacement for libevent's httpd API"; - homepage = https://github.com/ellzey/libevhtp; - license = licenses.bsd3; - maintainers = with maintainers; [ edwtjo ]; - platforms = platforms.linux; - }; -} diff --git a/pkgs/development/libraries/libgnurl/default.nix b/pkgs/development/libraries/libgnurl/default.nix index 2495c1505f0..e46da4dc9fb 100644 --- a/pkgs/development/libraries/libgnurl/default.nix +++ b/pkgs/development/libraries/libgnurl/default.nix @@ -1,15 +1,17 @@ -{ stdenv, fetchurl, perl, zlib, gnutls, gss, openssl, libssh2, libidn, libpsl, openldap }: +{ stdenv, fetchurl, autoreconfHook, perl, zlib, gnutls, gss, openssl +, libssh2, libidn, libpsl, openldap }: stdenv.mkDerivation rec { - version = "7.48.0"; + version = "7.54.1"; name = "libgnurl-${version}"; src = fetchurl { - url = "https://gnunet.org/sites/default/files/gnurl-7_48_0.tar.bz2"; - sha256 = "14gch4rdibrc8qs4mijsczxvl45dsclf234g17dk6c8nc2s4bm0a"; + url = "https://gnunet.org/sites/default/files/gnurl-${version}.tar.bz2"; + sha256 = "0szbj352h95sgc9kbx9wzkgjksmg3g5k6cvlc7hz3wrbdh5gb0a4"; }; + nativeBuildInputs = [ autoreconfHook ]; buildInputs = [ perl gnutls gss openssl zlib libidn libssh2 libpsl openldap ]; preConfigure = '' diff --git a/pkgs/development/libraries/libindicate/default.nix b/pkgs/development/libraries/libindicate/default.nix index ba1f8913501..9f75f17caee 100644 --- a/pkgs/development/libraries/libindicate/default.nix +++ b/pkgs/development/libraries/libindicate/default.nix @@ -38,8 +38,10 @@ in stdenv.mkDerivation rec { --replace '=codegendir pygtk-2.0' '=codegendir pygobject-2.0' \ --replace 'pyglib-2.0-python$PYTHON_VERSION' 'pyglib-2.0-python' autoconf - substituteInPlace {configure,ltmain.sh,m4/libtool.m4} \ - --replace /usr/bin/file ${file}/bin/file + for f in {configure,ltmain.sh,m4/libtool.m4}; do + substituteInPlace $f \ + --replace /usr/bin/file ${file}/bin/file + done ''; configureFlags = [ diff --git a/pkgs/development/libraries/libindicator/default.nix b/pkgs/development/libraries/libindicator/default.nix index 1ebdcb365af..67936fecdf4 100644 --- a/pkgs/development/libraries/libindicator/default.nix +++ b/pkgs/development/libraries/libindicator/default.nix @@ -22,8 +22,10 @@ stdenv.mkDerivation rec { postPatch = '' substituteInPlace configure \ --replace 'LIBINDICATOR_LIBS+="$LIBM"' 'LIBINDICATOR_LIBS+=" $LIBM"' - substituteInPlace {build-aux/ltmain.sh,configure,m4/libtool.m4} \ - --replace /usr/bin/file ${file}/bin/file + for f in {build-aux/ltmain.sh,configure,m4/libtool.m4}; do + substituteInPlace $f\ + --replace /usr/bin/file ${file}/bin/file + done ''; configureFlags = [ diff --git a/pkgs/development/libraries/libmsn/default.nix b/pkgs/development/libraries/libmsn/default.nix deleted file mode 100644 index 703c5e36b8b..00000000000 --- a/pkgs/development/libraries/libmsn/default.nix +++ /dev/null @@ -1,15 +0,0 @@ -{stdenv, fetchurl, cmake, openssl}: - -stdenv.mkDerivation rec { - name = "libmsn-4.2.1"; - src = fetchurl { - url = "mirror://sourceforge/libmsn/${name}.tar.bz2"; - sha256 = "338369c7455b123e84b9a7a858ac0ed2b1dc32e6529f460fdc01d28869a20fde"; - }; - patches = [ ./fix-ftbfs-gcc4.7.diff ]; - buildInputs = [ cmake openssl ]; - - meta = { - platforms = stdenv.lib.platforms.unix; - }; -} diff --git a/pkgs/development/libraries/libmsn/fix-ftbfs-gcc4.7.diff b/pkgs/development/libraries/libmsn/fix-ftbfs-gcc4.7.diff deleted file mode 100644 index 46aeab31c84..00000000000 --- a/pkgs/development/libraries/libmsn/fix-ftbfs-gcc4.7.diff +++ /dev/null @@ -1,16 +0,0 @@ -Fix g++ 4.7 build failure - -Kudos to Matthias Klose for the patch - -Index: libmsn-4.2/msn/util.cpp -=================================================================== ---- libmsn-4.2.orig/msn/util.cpp 2009-07-22 19:57:10.000000000 +0000 -+++ libmsn-4.2/msn/util.cpp 2012-04-16 20:52:18.068767213 +0000 -@@ -25,6 +25,7 @@ - #include <msn/util.h> - #include <sstream> - #include <errno.h> -+#include <unistd.h> - #include <cctype> - #include <fstream> - #include <openssl/rand.h> diff --git a/pkgs/development/libraries/lightstep-tracer-cpp/default.nix b/pkgs/development/libraries/lightstep-tracer-cpp/default.nix new file mode 100644 index 00000000000..e13796229ce --- /dev/null +++ b/pkgs/development/libraries/lightstep-tracer-cpp/default.nix @@ -0,0 +1,52 @@ +{ stdenv, lib, fetchFromGitHub, pkgconfig, protobuf3_2, automake +, autoreconfHook, zlib +, enableGrpc ? false +}: + +let + # be sure to use the right revision based on the submodule! + common = + fetchFromGitHub { + owner = "lightstep"; + repo = "lightstep-tracer-common"; + rev = "fe1f65f4a221746f9fffe8bf544c81d4e1b8aded"; + sha256 = "1qqpjxfrjmhnhs15nhbfv28fsgzi57vmfabxlzc99j4vl78h5iln"; + }; + +in + +stdenv.mkDerivation rec { + name = "lightstep-tracer-cpp-${version}"; + version = "0.36"; + + src = fetchFromGitHub { + owner = "lightstep"; + repo = "lightstep-tracer-cpp"; + rev = "v0_36"; + sha256 = "1sfj91bn7gw7fga7xawag076c8j9l7kiwhm4x3zh17qhycmaqq16"; + }; + + postUnpack = '' + cp -r ${common}/* $sourceRoot/lightstep-tracer-common + ''; + + preConfigure = lib.optionalString (!enableGrpc) '' + configureFlagsArray+=("--disable-grpc") + ''; + + nativeBuildInputs = [ + pkgconfig automake autoreconfHook + ]; + + buildInputs = [ + protobuf3_2 zlib + ]; + + meta = with lib; { + description = "Distributed tracing system built on top of the OpenTracing standard"; + homepage = "http://lightstep.com/"; + license = licenses.mit; + platforms = platforms.linux; + maintainers = with maintainers; [ cstrahan ]; + }; +} diff --git a/pkgs/development/libraries/mlt/default.nix b/pkgs/development/libraries/mlt/default.nix index 15a62f26414..168b94495a9 100644 --- a/pkgs/development/libraries/mlt/default.nix +++ b/pkgs/development/libraries/mlt/default.nix @@ -41,7 +41,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Open source multimedia framework, designed for television broadcasting"; - homepage = http://www.mltframework.org/; + homepage = https://www.mltframework.org; license = licenses.gpl3; maintainers = [ maintainers.tohl ]; platforms = platforms.linux; diff --git a/pkgs/development/libraries/movit/default.nix b/pkgs/development/libraries/movit/default.nix index 907e628b767..fa765a6b107 100644 --- a/pkgs/development/libraries/movit/default.nix +++ b/pkgs/development/libraries/movit/default.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "High-performance, high-quality video filters for the GPU"; - homepage = http://movits.sesse.net; + homepage = http://movit.sesse.net; license = licenses.gpl2Plus; maintainers = [ maintainers.goibhniu ]; platforms = platforms.linux; diff --git a/pkgs/development/libraries/rapidjson/default.nix b/pkgs/development/libraries/rapidjson/default.nix new file mode 100644 index 00000000000..5e9a11d4251 --- /dev/null +++ b/pkgs/development/libraries/rapidjson/default.nix @@ -0,0 +1,23 @@ +{ stdenv, lib, fetchFromGitHub, pkgconfig, cmake }: + +stdenv.mkDerivation rec { + name = "rapidjson-${version}"; + version = "1.1.0"; + + src = fetchFromGitHub { + owner = "miloyip"; + repo = "rapidjson"; + rev = "v${version}"; + sha256 = "1jixgb8w97l9gdh3inihz7avz7i770gy2j2irvvlyrq3wi41f5ab"; + }; + + nativeBuildInputs = [ pkgconfig cmake ]; + + meta = with lib; { + description = "Fast JSON parser/generator for C++ with both SAX/DOM style API"; + homepage = "http://rapidjson.org/"; + license = licenses.mit; + platforms = platforms.linux; + maintainers = with maintainers; [ cstrahan ]; + }; +} diff --git a/pkgs/development/libraries/spdlog/default.nix b/pkgs/development/libraries/spdlog/default.nix index 1c3952e7adf..a47eabe5d8d 100644 --- a/pkgs/development/libraries/spdlog/default.nix +++ b/pkgs/development/libraries/spdlog/default.nix @@ -2,14 +2,13 @@ stdenv.mkDerivation rec { name = "spdlog-${version}"; - version = stdenv.lib.strings.substring 0 7 rev; - rev = "292bdc5eb4929f183c78d2c67082b715306f81c9"; + version = "0.13.0"; src = fetchFromGitHub { owner = "gabime"; repo = "spdlog"; - inherit rev; - sha256 = "1b6b0c81a8hisaibqlzj5mrk3snrfl8p5sqa056q2f02i62zksbn"; + rev = "v${version}"; + sha256 = "0pfagrkq6afpkl269vbi1fd6ckakzpr5b5cbapb8rr7hgsrilxza"; }; buildInputs = [ cmake ]; diff --git a/pkgs/development/libraries/sqlite/sqlite3_analyzer.nix b/pkgs/development/libraries/sqlite/sqlite3_analyzer.nix index e5fffc076f7..f6a96df3eb6 100644 --- a/pkgs/development/libraries/sqlite/sqlite3_analyzer.nix +++ b/pkgs/development/libraries/sqlite/sqlite3_analyzer.nix @@ -1,11 +1,11 @@ { lib, stdenv, fetchurl, unzip, tcl }: stdenv.mkDerivation { - name = "sqlite3_analyzer-3.19.2"; + name = "sqlite3_analyzer-3.20.0"; src = fetchurl { - url = "https://www.sqlite.org/2017/sqlite-src-3190200.zip"; - sha256 = "1hdbs41mdyyy641gix87pllsd29p8dim7gj4qvmiyfra2q5kg749"; + url = "https://www.sqlite.org/2017/sqlite-src-3200000.zip"; + sha256 = "1vjbc5i95wildrdfzalrsgai1ziz4m4gbah4wm8qc4jxm1vqwdab"; }; nativeBuildInputs = [ unzip ]; diff --git a/pkgs/development/libraries/wvstreams/compile.patch b/pkgs/development/libraries/wvstreams/compile.patch deleted file mode 100644 index c71e7396e91..00000000000 --- a/pkgs/development/libraries/wvstreams/compile.patch +++ /dev/null @@ -1,43 +0,0 @@ -Debian's patch to build with fresher GCC - -Index: wvstreams-4.6.1/crypto/wvx509.cc -=================================================================== ---- wvstreams-4.6.1.orig/crypto/wvx509.cc 2011-05-20 00:02:38.119136584 +0200 -+++ wvstreams-4.6.1/crypto/wvx509.cc 2011-05-20 00:02:26.035136589 +0200 -@@ -1157,7 +1157,7 @@ - - if (ext) - { -- X509V3_EXT_METHOD *method = X509V3_EXT_get(ext); -+ X509V3_EXT_METHOD *method = (X509V3_EXT_METHOD *)X509V3_EXT_get(ext); - if (!method) - { - WvDynBuf buf; -Index: wvstreams-4.6.1/ipstreams/wvunixdgsocket.cc -=================================================================== ---- wvstreams-4.6.1.orig/ipstreams/wvunixdgsocket.cc 2011-05-20 00:02:38.391136584 +0200 -+++ wvstreams-4.6.1/ipstreams/wvunixdgsocket.cc 2011-05-20 00:02:35.283136585 +0200 -@@ -1,8 +1,6 @@ - #include "wvunixdgsocket.h" --#ifdef MACOS - #include <sys/types.h> - #include <sys/stat.h> --#endif - - WvUnixDGSocket::WvUnixDGSocket(WvStringParm filename, bool _server, int perms) - : socketfile(filename) -Index: wvstreams-4.6.1/streams/wvatomicfile.cc -=================================================================== ---- wvstreams-4.6.1.orig/streams/wvatomicfile.cc 2011-05-20 00:02:38.223136584 +0200 -+++ wvstreams-4.6.1/streams/wvatomicfile.cc 2011-05-20 00:02:31.619136587 +0200 -@@ -10,10 +10,7 @@ - #include "wvatomicfile.h" - #include "wvfileutils.h" - #include "wvstrutils.h" -- --#ifdef MACOS - #include <sys/stat.h> --#endif - - WvAtomicFile::WvAtomicFile(WvStringParm filename, int flags, mode_t create_mode) - : tmp_file(WvString::null) diff --git a/pkgs/development/libraries/wvstreams/default.nix b/pkgs/development/libraries/wvstreams/default.nix deleted file mode 100644 index ecfc9b88a0e..00000000000 --- a/pkgs/development/libraries/wvstreams/default.nix +++ /dev/null @@ -1,28 +0,0 @@ -{ stdenv, fetchurl, qt4, dbus, zlib, openssl, readline, perl }: - -stdenv.mkDerivation { - name = "wvstreams-4.6.1"; - - src = fetchurl { - url = http://wvstreams.googlecode.com/files/wvstreams-4.6.1.tar.gz; - sha256 = "0cvnq3mvh886gmxh0km858aqhx30hpyrfpg1dh6ara9sz3xza0w4"; - }; - - patches = [ ./compile.patch ]; - - preConfigure = '' - find -type f | xargs sed -i 's@/bin/bash@bash@g' - - sed -e '1i#include <unistd.h>' -i $(find . -name '*.c' -o -name '*.cc') - ''; - - buildInputs = [ qt4 dbus zlib openssl readline perl ]; - - meta = { - description = "Network programming library in C++"; - homepage = http://alumnit.ca/wiki/index.php?page=WvStreams; - license = "LGPL"; - maintainers = [ stdenv.lib.maintainers.marcweber ]; - platforms = stdenv.lib.platforms.linux; - }; -} diff --git a/pkgs/development/mobile/androidenv/addon.xml b/pkgs/development/mobile/androidenv/addon.xml index d9b47826648..05b54542033 100644 --- a/pkgs/development/mobile/androidenv/addon.xml +++ b/pkgs/development/mobile/androidenv/addon.xml @@ -1,6 +1,6 @@ <?xml version="1.0" ?> <sdk:sdk-addon xmlns:sdk="http://schemas.android.com/sdk/android/addon/7" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> - <!--Generated on 2017-06-07 21:05:03.785544 with ADRT.--> + <!--Generated on 2017-07-26 17:22:37.387749 with ADRT.--> <sdk:license id="android-sdk-license" type="text">Terms and Conditions This is the Android Software Development Kit License Agreement @@ -1317,16 +1317,16 @@ THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS& <sdk:path>m2repository</sdk:path> </sdk:extra> <sdk:extra> - <!--Generated from bid:158324354, branch:perforce--> + <!--Generated from bid:163087974, branch:perforce--> <sdk:revision> - <sdk:major>53</sdk:major> + <sdk:major>57</sdk:major> </sdk:revision> <sdk:archives> <sdk:archive> - <!--Built on: Wed Jun 7 15:15:19 2017.--> - <sdk:size>194148491</sdk:size> - <sdk:checksum type="sha1">9008082eb1e6ff5a78d32a1fed6915f266fc5013</sdk:checksum> - <sdk:url>google_m2repository_gms_v11_1_rc16_wear_2_0_3_rc1.zip</sdk:url> + <!--Built on: Tue Jul 25 14:44:09 2017.--> + <sdk:size>214565802</sdk:size> + <sdk:checksum type="sha1">4bc48d6d4d39944cf2b061e3f618cd9d447c75bb</sdk:checksum> + <sdk:url>google_m2repository_gms_v11_3_rc05_wear_2_0_4.zip</sdk:url> </sdk:archive> </sdk:archives> <sdk:uses-license ref="android-sdk-license"/> @@ -1401,16 +1401,16 @@ THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS& <sdk:path>google_play_services_froyo</sdk:path> </sdk:extra> <sdk:extra> - <!--Generated from bid:158051086, branch:perforce--> + <!--Generated from bid:163088463, branch:perforce--> <sdk:revision> - <sdk:major>41</sdk:major> + <sdk:major>43</sdk:major> </sdk:revision> <sdk:archives> <sdk:archive> - <!--Built on: Tue Jun 6 11:50:00 2017.--> - <sdk:size>13165315</sdk:size> - <sdk:checksum type="sha1">55be81c50041f6a8f62947418f74f683369c971f</sdk:checksum> - <sdk:url>google_play_services_v11_rc16.zip</sdk:url> + <!--Built on: Tue Jul 25 14:44:00 2017.--> + <sdk:size>21391284</sdk:size> + <sdk:checksum type="sha1">6b072d5b96fb8726405d363ccdbb4d26bec0b54f</sdk:checksum> + <sdk:url>google_play_services_v11_3_rc05.zip</sdk:url> </sdk:archive> </sdk:archives> <sdk:uses-license ref="android-sdk-license"/> diff --git a/pkgs/development/mobile/androidenv/addons.nix b/pkgs/development/mobile/androidenv/addons.nix index 06be6515ee5..71ce2c3d079 100644 --- a/pkgs/development/mobile/androidenv/addons.nix +++ b/pkgs/development/mobile/androidenv/addons.nix @@ -296,8 +296,8 @@ in google_play_services = buildGoogleApis { name = "google_play_services"; src = fetchurl { - url = https://dl.google.com/android/repository/google_play_services_v11_rc16.zip; - sha1 = "55be81c50041f6a8f62947418f74f683369c971f"; + url = https://dl.google.com/android/repository/google_play_services_v11_3_rc05.zip; + sha1 = "6b072d5b96fb8726405d363ccdbb4d26bec0b54f"; }; meta = { description = "Google Play services client library and sample code"; diff --git a/pkgs/development/mobile/androidenv/androidsdk.nix b/pkgs/development/mobile/androidenv/androidsdk.nix index 7587fb3e0c4..7c4792f560d 100644 --- a/pkgs/development/mobile/androidenv/androidsdk.nix +++ b/pkgs/development/mobile/androidenv/androidsdk.nix @@ -11,16 +11,16 @@ let inherit (stdenv.lib) makeLibraryPath; in stdenv.mkDerivation rec { name = "android-sdk-${version}"; - version = "25.2.3"; + version = "25.2.5"; src = if (stdenv.system == "i686-linux" || stdenv.system == "x86_64-linux") then fetchurl { url = "http://dl.google.com/android/repository/tools_r${version}-linux.zip"; - sha256 = "0q5m8lqhj07c6izhc0b0d73820ma0flvrj30ckznss4s9swvqd8v"; + sha256 = "0gnk49pkwy4m0nqwm1xnf3w4mfpi9w0kk7841xlawpwbkj0icxap"; } else if stdenv.system == "x86_64-darwin" then fetchurl { url = "http://dl.google.com/android/repository/tools_r${version}-macosx.zip"; - sha256 = "1ihxd2a37ald3sdd04i4yk85prw81h6gnch0bmq65cbsrba48dar"; + sha256 = "0yg7wjmyw70xsh8k4hgbqb5rilam2a94yc8dwbh7fjwqcmpxgwqb"; } else throw "platform not ${stdenv.system} supported!"; diff --git a/pkgs/development/mobile/androidenv/build-tools.nix b/pkgs/development/mobile/androidenv/build-tools.nix index c09d643146b..c09fd614270 100644 --- a/pkgs/development/mobile/androidenv/build-tools.nix +++ b/pkgs/development/mobile/androidenv/build-tools.nix @@ -1,16 +1,16 @@ {stdenv, stdenv_32bit, fetchurl, unzip, zlib_32bit, ncurses_32bit, file, zlib, ncurses}: stdenv.mkDerivation rec { - version = "25.0.1"; + version = "26.0.1"; name = "android-build-tools-r${version}"; src = if (stdenv.system == "i686-linux" || stdenv.system == "x86_64-linux") then fetchurl { url = "https://dl.google.com/android/repository/build-tools_r${version}-linux.zip"; - sha256 = "0kyrazmcckikn6jiz9hwy6nlqjssf95h5iq7alswg1mryl04w6v7"; + sha256 = "1sp0ir1d88ffw0gz78zlbvnxalz02fsaxwdcvjfynanylwjpyqf8"; } else if stdenv.system == "x86_64-darwin" then fetchurl { url = "https://dl.google.com/android/repository/build-tools_r${version}-macosx.zip"; - sha256 = "116i5xxbwz229m9z98n6bfkjk2xf3kbhdnqhbbnaagjsjzqdirki"; + sha256 = "1ns6c8361l18s3a5x0jc2m3qr06glsb6ak7csrrw6dkzlv8cj5dk"; } else throw "System ${stdenv.system} not supported!"; diff --git a/pkgs/development/mobile/androidenv/default.nix b/pkgs/development/mobile/androidenv/default.nix index a233333986a..56c810dfc54 100644 --- a/pkgs/development/mobile/androidenv/default.nix +++ b/pkgs/development/mobile/androidenv/default.nix @@ -195,6 +195,20 @@ rec { useGooglePlayServices = true; }; + androidsdk_8_0 = androidsdk { + platformVersions = [ "26" ]; + abiVersions = [ "x86" "x86_64"]; + useGoogleAPIs = true; + }; + + androidsdk_8_0_extras = androidsdk { + platformVersions = [ "26" ]; + abiVersions = [ "x86" "x86_64"]; + useGoogleAPIs = true; + useExtraSupportLibs = true; + useGooglePlayServices = true; + }; + androidndk = import ./androidndk.nix { inherit (pkgs) stdenv fetchurl zlib ncurses p7zip lib makeWrapper; inherit (pkgs) coreutils file findutils gawk gnugrep gnused jdk which; diff --git a/pkgs/development/mobile/androidenv/platform-tools.nix b/pkgs/development/mobile/androidenv/platform-tools.nix index 6205b98eee1..bc99837d27a 100644 --- a/pkgs/development/mobile/androidenv/platform-tools.nix +++ b/pkgs/development/mobile/androidenv/platform-tools.nix @@ -1,16 +1,16 @@ {stdenv, zlib, fetchurl, unzip}: stdenv.mkDerivation rec { - version = "25.0.1"; + version = "26.0.0"; name = "android-platform-tools-r${version}"; src = if (stdenv.system == "i686-linux" || stdenv.system == "x86_64-linux") then fetchurl { url = "https://dl.google.com/android/repository/platform-tools_r${version}-linux.zip"; - sha256 = "0r8ix3jjqpk6wyxm8f6az9r4z5a1lnb3b9hzh8ay4ayidwhn8isx"; + sha256 = "02z5fxxdwd6359wmqdag9vvszdq49sm78cvfskqap18xa83q484h"; } else if stdenv.system == "x86_64-darwin" then fetchurl { - url = "https://dl.google.com/android/repository/platform-tools_r${version}-macosx.zip"; - sha256 = "18pzwpr6fbxlw782j65clwz9kvdgvb04jpr2z12bbwyd8wqc4yln"; + url = "https://dl.google.com/android/repository/platform-tools_r${version}-darwin.zip"; + sha256 = "13mcyi9l0mmmjr056z1i3rhpb4641iv0a5ky7ij0v8hwsb5r5lwq"; } else throw "System ${stdenv.system} not supported!"; diff --git a/pkgs/development/mobile/androidenv/platforms-linux.nix b/pkgs/development/mobile/androidenv/platforms-linux.nix index 1caa6cebb14..e24a9c43160 100644 --- a/pkgs/development/mobile/androidenv/platforms-linux.nix +++ b/pkgs/development/mobile/androidenv/platforms-linux.nix @@ -307,8 +307,8 @@ in platform_26 = buildPlatform { name = "android-platform-8.0.0"; src = fetchurl { - url = https://dl.google.com/android/repository/platform-26_r01.zip; - sha1 = "33a4f9788bfd7123e712906b2d7e5d54a729e14a"; + url = https://dl.google.com/android/repository/platform-26_r02.zip; + sha1 = "e4ae5d7aa557a3c827135838ee400da8443ac4ef"; }; meta = { description = "Android SDK Platform 26"; diff --git a/pkgs/development/mobile/androidenv/platforms-macosx.nix b/pkgs/development/mobile/androidenv/platforms-macosx.nix index a4903cd0d40..3775872514c 100644 --- a/pkgs/development/mobile/androidenv/platforms-macosx.nix +++ b/pkgs/development/mobile/androidenv/platforms-macosx.nix @@ -307,8 +307,8 @@ in platform_26 = buildPlatform { name = "android-platform-8.0.0"; src = fetchurl { - url = https://dl.google.com/android/repository/platform-26_r01.zip; - sha1 = "33a4f9788bfd7123e712906b2d7e5d54a729e14a"; + url = https://dl.google.com/android/repository/platform-26_r02.zip; + sha1 = "e4ae5d7aa557a3c827135838ee400da8443ac4ef"; }; meta = { description = "Android SDK Platform 26"; diff --git a/pkgs/development/mobile/androidenv/repository-11.xml b/pkgs/development/mobile/androidenv/repository-11.xml index 9f46af93a88..6d2c87178a6 100644 --- a/pkgs/development/mobile/androidenv/repository-11.xml +++ b/pkgs/development/mobile/androidenv/repository-11.xml @@ -15,7 +15,7 @@ * limitations under the License. --> <sdk:sdk-repository xmlns:sdk="http://schemas.android.com/sdk/android/repository/11" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> - <!--Generated on 2017-06-07 21:04:43.441919 with ADRT.--> + <!--Generated on 2017-07-26 17:22:12.162164 with ADRT.--> <sdk:license id="android-sdk-license" type="text">Terms and Conditions This is the Android Software Development Kit License Agreement @@ -296,39 +296,39 @@ This is the Android SDK Preview License Agreement (the "License Agreement&q June 2014.</sdk:license> <sdk:ndk> - <!--Generated from bid:4075724, branch:aosp-ndk-r15-release--> + <!--Generated from bid:4119039, branch:aosp-ndk-r15-release--> <sdk:description>NDK</sdk:description> <sdk:revision>15</sdk:revision> <sdk:archives> <sdk:archive> - <!--Built on: Wed Jun 7 14:50:43 2017.--> - <sdk:size>959176682</sdk:size> - <sdk:checksum type="sha1">9dd0ff18d177ec75797b021a3ebd294362e8a41e</sdk:checksum> - <sdk:url>android-ndk-r15-darwin-x86_64.zip</sdk:url> + <!--Built on: Wed Jun 21 12:06:49 2017.--> + <sdk:size>959321525</sdk:size> + <sdk:checksum type="sha1">05e3eec7e9ce1d09bb5401b41cf778a2ec19c819</sdk:checksum> + <sdk:url>android-ndk-r15b-darwin-x86_64.zip</sdk:url> <sdk:host-os>macosx</sdk:host-os> <sdk:host-bits>64</sdk:host-bits> </sdk:archive> <sdk:archive> - <!--Built on: Wed Jun 7 14:51:08 2017.--> - <sdk:size>973898016</sdk:size> - <sdk:checksum type="sha1">32b3115357ed798a8a48d7d589ffcb901693c745</sdk:checksum> - <sdk:url>android-ndk-r15-linux-x86_64.zip</sdk:url> + <!--Built on: Wed Jun 21 12:07:17 2017.--> + <sdk:size>974035125</sdk:size> + <sdk:checksum type="sha1">2690d416e54f88f7fa52d0dcb5f539056a357b3b</sdk:checksum> + <sdk:url>android-ndk-r15b-linux-x86_64.zip</sdk:url> <sdk:host-os>linux</sdk:host-os> <sdk:host-bits>64</sdk:host-bits> </sdk:archive> <sdk:archive> - <!--Built on: Wed Jun 7 14:49:52 2017.--> - <sdk:size>783705009</sdk:size> - <sdk:checksum type="sha1">bf869b624f6d4778065d5d4703815b0c689069e1</sdk:checksum> - <sdk:url>android-ndk-r15-windows-x86.zip</sdk:url> + <!--Built on: Wed Jun 21 12:05:55 2017.--> + <sdk:size>783838327</sdk:size> + <sdk:checksum type="sha1">74e45891d0cc99b077b3951aeba87d9c91df20a8</sdk:checksum> + <sdk:url>android-ndk-r15b-windows-x86.zip</sdk:url> <sdk:host-os>windows</sdk:host-os> <sdk:host-bits>32</sdk:host-bits> </sdk:archive> <sdk:archive> - <!--Built on: Wed Jun 7 14:50:17 2017.--> - <sdk:size>848657615</sdk:size> - <sdk:checksum type="sha1">45d310443ceb5ff19a0dde139ee9b3404908c178</sdk:checksum> - <sdk:url>android-ndk-r15-windows-x86_64.zip</sdk:url> + <!--Built on: Wed Jun 21 12:06:20 2017.--> + <sdk:size>848796389</sdk:size> + <sdk:checksum type="sha1">126a1cd8985132c0383ab96579feed09ba402e22</sdk:checksum> + <sdk:url>android-ndk-r15b-windows-x86_64.zip</sdk:url> <sdk:host-os>windows</sdk:host-os> <sdk:host-bits>64</sdk:host-bits> </sdk:archive> @@ -336,17 +336,17 @@ June 2014.</sdk:license> <sdk:uses-license ref="android-sdk-license"/> </sdk:ndk> <sdk:platform> - <!--Generated from bid:4062713, branch:git_oc-preview3-sdk--> + <!--Generated from bid:4187382, branch:git_oc-release--> <sdk:version>8.0.0</sdk:version> <sdk:api-level>26</sdk:api-level> <sdk:description>Android SDK Platform 26</sdk:description> - <sdk:revision>1</sdk:revision> + <sdk:revision>2</sdk:revision> <sdk:archives> <sdk:archive> - <!--Built on: Fri Jun 2 13:22:35 2017.--> - <sdk:size>63467872</sdk:size> - <sdk:checksum type="sha1">33a4f9788bfd7123e712906b2d7e5d54a729e14a</sdk:checksum> - <sdk:url>platform-26_r01.zip</sdk:url> + <!--Built on: Tue Jul 18 10:38:38 2017.--> + <sdk:size>63623734</sdk:size> + <sdk:checksum type="sha1">e4ae5d7aa557a3c827135838ee400da8443ac4ef</sdk:checksum> + <sdk:url>platform-26_r02.zip</sdk:url> </sdk:archive> </sdk:archives> <sdk:uses-license ref="android-sdk-license"/> @@ -1170,6 +1170,38 @@ June 2014.</sdk:license> <sdk:uses-license ref="android-sdk-license"/> </sdk:source> <sdk:build-tool> + <!--Generated from bid:4187382, branch:git_oc-release--> + <sdk:revision> + <sdk:major>26</sdk:major> + <sdk:minor>0</sdk:minor> + <sdk:micro>1</sdk:micro> + </sdk:revision> + <sdk:archives> + <sdk:archive> + <!--Built on: Tue Jul 18 10:38:26 2017.--> + <sdk:size>54113329</sdk:size> + <sdk:checksum type="sha1">5378c2c78091b414d0eac40a6bd37f2faa31a365</sdk:checksum> + <sdk:url>build-tools_r26.0.1-linux.zip</sdk:url> + <sdk:host-os>linux</sdk:host-os> + </sdk:archive> + <sdk:archive> + <!--Built on: Tue Jul 18 10:38:23 2017.--> + <sdk:size>53266653</sdk:size> + <sdk:checksum type="sha1">cbde59de198916b390777dd0227921bfa2120832</sdk:checksum> + <sdk:url>build-tools_r26.0.1-macosx.zip</sdk:url> + <sdk:host-os>macosx</sdk:host-os> + </sdk:archive> + <sdk:archive> + <!--Built on: Tue Jul 18 10:38:21 2017.--> + <sdk:size>54936185</sdk:size> + <sdk:checksum type="sha1">02494c80ffbe65bfff0aaa7463c9692693327b7d</sdk:checksum> + <sdk:url>build-tools_r26.0.1-windows.zip</sdk:url> + <sdk:host-os>windows</sdk:host-os> + </sdk:archive> + </sdk:archives> + <sdk:uses-license ref="android-sdk-license"/> + </sdk:build-tool> + <sdk:build-tool> <!--Generated from bid:4062713, branch:git_oc-preview3-sdk--> <sdk:revision> <sdk:major>26</sdk:major> diff --git a/pkgs/development/mobile/androidenv/support-repository.nix b/pkgs/development/mobile/androidenv/support-repository.nix index 84ebee5a75f..55c1b60e965 100644 --- a/pkgs/development/mobile/androidenv/support-repository.nix +++ b/pkgs/development/mobile/androidenv/support-repository.nix @@ -1,11 +1,11 @@ {stdenv, fetchurl, unzip}: stdenv.mkDerivation rec { - version = "40"; + version = "47"; name = "android-support-repository-r${version}"; src = fetchurl { url = "http://dl.google.com/android/repository/android_m2repository_r${version}.zip"; - sha1 = "782e7233f18c890463e8602571d304e680ce354c"; + sha256 = "1l13a6myff6i8x99h1ky2j5sglwy8wc0rsbxfcbif375vh41iyd3"; }; buildCommand = '' diff --git a/pkgs/development/mobile/androidenv/sys-img.xml b/pkgs/development/mobile/androidenv/sys-img.xml index 8ea0cfb5b80..06754b25076 100644 --- a/pkgs/development/mobile/androidenv/sys-img.xml +++ b/pkgs/development/mobile/androidenv/sys-img.xml @@ -1,6 +1,6 @@ <?xml version="1.0" ?> <sdk:sdk-sys-img xmlns:sdk="http://schemas.android.com/sdk/android/sys-img/3" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> - <!--Generated on 2017-06-07 21:04:43.770481 with ADRT.--> + <!--Generated on 2017-07-26 17:22:12.517198 with ADRT.--> <sdk:license id="android-sdk-license" type="text">Terms and Conditions This is the Android Software Development Kit License Agreement @@ -746,16 +746,16 @@ ANY PRE-RELEASE MATERIALS ARE NON-QUALIFIED AND, AS SUCH, ARE PROVIDED “AS IS <sdk:tag-id>default</sdk:tag-id> </sdk:system-image> <sdk:system-image> - <!--Generated from bid:3462041, branch:git_klp-emu-release--> + <!--Generated from bid:4174703, branch:git_klp-emu-release--> <sdk:api-level>19</sdk:api-level> <sdk:description>Intel x86 Atom System Image</sdk:description> - <sdk:revision>5</sdk:revision> + <sdk:revision>6</sdk:revision> <sdk:archives> <sdk:archive> - <!--Built on: Thu Nov 10 17:21:38 2016.--> - <sdk:size>183968605</sdk:size> - <sdk:checksum type="sha1">1d98426467580abfd03c724c5344450f5d0df379</sdk:checksum> - <sdk:url>x86-19_r05.zip</sdk:url> + <!--Built on: Thu Jul 13 12:41:20 2017.--> + <sdk:size>185886274</sdk:size> + <sdk:checksum type="sha1">2ac82153aae97f7eae4c5a0761224fe04321d03d</sdk:checksum> + <sdk:url>x86-19_r06.zip</sdk:url> </sdk:archive> </sdk:archives> <sdk:uses-license ref="android-sdk-license"/> @@ -763,16 +763,16 @@ ANY PRE-RELEASE MATERIALS ARE NON-QUALIFIED AND, AS SUCH, ARE PROVIDED “AS IS <sdk:tag-id>default</sdk:tag-id> </sdk:system-image> <sdk:system-image> - <!--Generated from bid:3079185, branch:git_lmp-emu-release--> + <!--Generated from bid:4174711, branch:git_lmp-emu-release--> <sdk:api-level>21</sdk:api-level> <sdk:description>Intel x86 Atom System Image</sdk:description> - <sdk:revision>4</sdk:revision> + <sdk:revision>5</sdk:revision> <sdk:archives> <sdk:archive> - <!--Built on: Fri Sep 16 16:12:20 2016.--> - <sdk:size>206305926</sdk:size> - <sdk:checksum type="sha1">c7732f45c931c0eaa064e57e8c054bce86c30e54</sdk:checksum> - <sdk:url>x86-21_r04.zip</sdk:url> + <!--Built on: Thu Jul 13 12:42:18 2017.--> + <sdk:size>208212529</sdk:size> + <sdk:checksum type="sha1">00f0eb0a1003efe3316347f762e20a85d8749cff</sdk:checksum> + <sdk:url>x86-21_r05.zip</sdk:url> </sdk:archive> </sdk:archives> <sdk:uses-license ref="android-sdk-license"/> @@ -780,16 +780,16 @@ ANY PRE-RELEASE MATERIALS ARE NON-QUALIFIED AND, AS SUCH, ARE PROVIDED “AS IS <sdk:tag-id>default</sdk:tag-id> </sdk:system-image> <sdk:system-image> - <!--Generated from bid:3079158, branch:git_lmp-mr1-emu-release--> + <!--Generated from bid:4174727, branch:git_lmp-mr1-emu-release--> <sdk:api-level>22</sdk:api-level> <sdk:description>Intel x86 Atom System Image</sdk:description> - <sdk:revision>5</sdk:revision> + <sdk:revision>6</sdk:revision> <sdk:archives> <sdk:archive> - <!--Built on: Fri Sep 16 16:12:40 2016.--> - <sdk:size>212327460</sdk:size> - <sdk:checksum type="sha1">7e2c93891ea9efec07dccccf6b9ab051a014dbdf</sdk:checksum> - <sdk:url>x86-22_r05.zip</sdk:url> + <!--Built on: Thu Jul 13 12:43:18 2017.--> + <sdk:size>214268954</sdk:size> + <sdk:checksum type="sha1">e33e2a6cc3f1cc56b2019dbef3917d2eeb26f54e</sdk:checksum> + <sdk:url>x86-22_r06.zip</sdk:url> </sdk:archive> </sdk:archives> <sdk:uses-license ref="android-sdk-license"/> @@ -797,16 +797,16 @@ ANY PRE-RELEASE MATERIALS ARE NON-QUALIFIED AND, AS SUCH, ARE PROVIDED “AS IS <sdk:tag-id>default</sdk:tag-id> </sdk:system-image> <sdk:system-image> - <!--Generated from bid:3079352, branch:git_mnc-emu-release--> + <!--Generated from bid:4174734, branch:git_mnc-emu-release--> <sdk:api-level>23</sdk:api-level> <sdk:description>Intel x86 Atom System Image</sdk:description> - <sdk:revision>9</sdk:revision> + <sdk:revision>10</sdk:revision> <sdk:archives> <sdk:archive> - <!--Built on: Fri Sep 16 16:13:52 2016.--> - <sdk:size>260241399</sdk:size> - <sdk:checksum type="sha1">d7ee1118a73eb5c3e803d4dd3b96a124ac909ee1</sdk:checksum> - <sdk:url>x86-23_r09.zip</sdk:url> + <!--Built on: Thu Jul 13 12:44:25 2017.--> + <sdk:size>260804863</sdk:size> + <sdk:checksum type="sha1">f6c3e3dd7bd951454795aa75c3a145fd05ac25bb</sdk:checksum> + <sdk:url>x86-23_r10.zip</sdk:url> </sdk:archive> </sdk:archives> <sdk:uses-license ref="android-sdk-license"/> @@ -814,16 +814,16 @@ ANY PRE-RELEASE MATERIALS ARE NON-QUALIFIED AND, AS SUCH, ARE PROVIDED “AS IS <sdk:tag-id>default</sdk:tag-id> </sdk:system-image> <sdk:system-image> - <!--Generated from bid:3245079, branch:git_nyc-emu-release--> + <!--Generated from bid:4174735, branch:git_nyc-emu-release--> <sdk:api-level>24</sdk:api-level> <sdk:description>Intel x86 Atom System Image</sdk:description> - <sdk:revision>7</sdk:revision> + <sdk:revision>8</sdk:revision> <sdk:archives> <sdk:archive> - <!--Built on: Tue Sep 6 08:29:27 2016.--> - <sdk:size>302213276</sdk:size> - <sdk:checksum type="sha1">566fdee283a907854bfa3c174265bc31f396eabd</sdk:checksum> - <sdk:url>x86-24_r07.zip</sdk:url> + <!--Built on: Thu Jul 13 12:45:47 2017.--> + <sdk:size>313489224</sdk:size> + <sdk:checksum type="sha1">c1cae7634b0216c0b5990f2c144eb8ca948e3511</sdk:checksum> + <sdk:url>x86-24_r08.zip</sdk:url> </sdk:archive> </sdk:archives> <sdk:uses-license ref="android-sdk-license"/> @@ -831,16 +831,16 @@ ANY PRE-RELEASE MATERIALS ARE NON-QUALIFIED AND, AS SUCH, ARE PROVIDED “AS IS <sdk:tag-id>default</sdk:tag-id> </sdk:system-image> <sdk:system-image> - <!--Generated from bid:3079185, branch:git_lmp-emu-release--> + <!--Generated from bid:4174711, branch:git_lmp-emu-release--> <sdk:api-level>21</sdk:api-level> <sdk:description>Intel x86 Atom_64 System Image</sdk:description> - <sdk:revision>4</sdk:revision> + <sdk:revision>5</sdk:revision> <sdk:archives> <sdk:archive> - <!--Built on: Fri Sep 16 16:08:22 2016.--> - <sdk:size>290608820</sdk:size> - <sdk:checksum type="sha1">9b2d64a69a72fa596c386899a742a404308f2c92</sdk:checksum> - <sdk:url>x86_64-21_r04.zip</sdk:url> + <!--Built on: Thu Jul 13 12:46:57 2017.--> + <sdk:size>292623982</sdk:size> + <sdk:checksum type="sha1">9078a095825a69e5e215713f0866c83cef65a342</sdk:checksum> + <sdk:url>x86_64-21_r05.zip</sdk:url> </sdk:archive> </sdk:archives> <sdk:uses-license ref="android-sdk-license"/> @@ -848,16 +848,16 @@ ANY PRE-RELEASE MATERIALS ARE NON-QUALIFIED AND, AS SUCH, ARE PROVIDED “AS IS <sdk:tag-id>default</sdk:tag-id> </sdk:system-image> <sdk:system-image> - <!--Generated from bid:3079158, branch:git_lmp_mr1-emu-release--> + <!--Generated from bid:4174727, branch:git_lmp-mr1-emu-release--> <sdk:api-level>22</sdk:api-level> <sdk:description>Intel x86 Atom_64 System Image</sdk:description> - <sdk:revision>5</sdk:revision> + <sdk:revision>6</sdk:revision> <sdk:archives> <sdk:archive> - <!--Built on: Fri Sep 16 16:08:46 2016.--> - <sdk:size>297850561</sdk:size> - <sdk:checksum type="sha1">99d1d6c77e92284b4210640edf6c81eceb28520d</sdk:checksum> - <sdk:url>x86_64-22_r05.zip</sdk:url> + <!--Built on: Thu Jul 13 12:48:15 2017.--> + <sdk:size>299976630</sdk:size> + <sdk:checksum type="sha1">5db3b27f78cd9c4c5092b1cad5a5dd479fb5b2e4</sdk:checksum> + <sdk:url>x86_64-22_r06.zip</sdk:url> </sdk:archive> </sdk:archives> <sdk:uses-license ref="android-sdk-license"/> @@ -865,16 +865,16 @@ ANY PRE-RELEASE MATERIALS ARE NON-QUALIFIED AND, AS SUCH, ARE PROVIDED “AS IS <sdk:tag-id>default</sdk:tag-id> </sdk:system-image> <sdk:system-image> - <!--Generated from bid:3079352, branch:git_mnc-emu-release--> + <!--Generated from bid:4174734, branch:git_mnc-emu-release--> <sdk:api-level>23</sdk:api-level> <sdk:description>Intel x86 Atom_64 System Image</sdk:description> - <sdk:revision>9</sdk:revision> + <sdk:revision>10</sdk:revision> <sdk:archives> <sdk:archive> - <!--Built on: Fri Sep 16 16:09:15 2016.--> - <sdk:size>363794271</sdk:size> - <sdk:checksum type="sha1">84cc076eacec043c8e88382c6ab391b0cd5c0695</sdk:checksum> - <sdk:url>x86_64-23_r09.zip</sdk:url> + <!--Built on: Thu Jul 13 12:49:37 2017.--> + <sdk:size>365009313</sdk:size> + <sdk:checksum type="sha1">7cbc291483ca07dc67b71268c5f08a5755f50f51</sdk:checksum> + <sdk:url>x86_64-23_r10.zip</sdk:url> </sdk:archive> </sdk:archives> <sdk:uses-license ref="android-sdk-license"/> @@ -882,16 +882,16 @@ ANY PRE-RELEASE MATERIALS ARE NON-QUALIFIED AND, AS SUCH, ARE PROVIDED “AS IS <sdk:tag-id>default</sdk:tag-id> </sdk:system-image> <sdk:system-image> - <!--Generated from bid:3245079, branch:git_nyc-emu-release--> + <!--Generated from bid:4174735, branch:git_nyc-emu-release--> <sdk:api-level>24</sdk:api-level> <sdk:description>Intel x86 Atom_64 System Image</sdk:description> - <sdk:revision>7</sdk:revision> + <sdk:revision>8</sdk:revision> <sdk:archives> <sdk:archive> - <!--Built on: Tue Sep 6 08:29:51 2016.--> - <sdk:size>407148033</sdk:size> - <sdk:checksum type="sha1">a379932395ced0a8f572b39c396d86e08827a9ba</sdk:checksum> - <sdk:url>x86_64-24_r07.zip</sdk:url> + <!--Built on: Thu Jul 13 12:51:15 2017.--> + <sdk:size>419261998</sdk:size> + <sdk:checksum type="sha1">f6559e1949a5879f31a9662f4f0e50ad60181684</sdk:checksum> + <sdk:url>x86_64-24_r08.zip</sdk:url> </sdk:archive> </sdk:archives> <sdk:uses-license ref="android-sdk-license"/> diff --git a/pkgs/development/mobile/androidenv/sysimages.nix b/pkgs/development/mobile/androidenv/sysimages.nix index 89c48e5fb59..c5d075d6307 100644 --- a/pkgs/development/mobile/androidenv/sysimages.nix +++ b/pkgs/development/mobile/androidenv/sysimages.nix @@ -138,8 +138,8 @@ in sysimg_x86_19 = buildSystemImage { name = "sysimg-x86-19"; src = fetchurl { - url = https://dl.google.com/android/repository/sys-img/android/x86-19_r05.zip; - sha1 = "1d98426467580abfd03c724c5344450f5d0df379"; + url = https://dl.google.com/android/repository/sys-img/android/x86-19_r06.zip; + sha1 = "2ac82153aae97f7eae4c5a0761224fe04321d03d"; }; }; @@ -154,16 +154,16 @@ in sysimg_x86_21 = buildSystemImage { name = "sysimg-x86-21"; src = fetchurl { - url = https://dl.google.com/android/repository/sys-img/android/x86-21_r04.zip; - sha1 = "c7732f45c931c0eaa064e57e8c054bce86c30e54"; + url = https://dl.google.com/android/repository/sys-img/android/x86-21_r05.zip; + sha1 = "00f0eb0a1003efe3316347f762e20a85d8749cff"; }; }; sysimg_x86_64_21 = buildSystemImage { name = "sysimg-x86_64-21"; src = fetchurl { - url = https://dl.google.com/android/repository/sys-img/android/x86_64-21_r04.zip; - sha1 = "9b2d64a69a72fa596c386899a742a404308f2c92"; + url = https://dl.google.com/android/repository/sys-img/android/x86_64-21_r05.zip; + sha1 = "9078a095825a69e5e215713f0866c83cef65a342"; }; }; @@ -178,16 +178,16 @@ in sysimg_x86_22 = buildSystemImage { name = "sysimg-x86-22"; src = fetchurl { - url = https://dl.google.com/android/repository/sys-img/android/x86-22_r05.zip; - sha1 = "7e2c93891ea9efec07dccccf6b9ab051a014dbdf"; + url = https://dl.google.com/android/repository/sys-img/android/x86-22_r06.zip; + sha1 = "e33e2a6cc3f1cc56b2019dbef3917d2eeb26f54e"; }; }; sysimg_x86_64_22 = buildSystemImage { name = "sysimg-x86_64-22"; src = fetchurl { - url = https://dl.google.com/android/repository/sys-img/android/x86_64-22_r05.zip; - sha1 = "99d1d6c77e92284b4210640edf6c81eceb28520d"; + url = https://dl.google.com/android/repository/sys-img/android/x86_64-22_r06.zip; + sha1 = "5db3b27f78cd9c4c5092b1cad5a5dd479fb5b2e4"; }; }; @@ -202,16 +202,16 @@ in sysimg_x86_23 = buildSystemImage { name = "sysimg-x86-23"; src = fetchurl { - url = https://dl.google.com/android/repository/sys-img/android/x86-23_r09.zip; - sha1 = "d7ee1118a73eb5c3e803d4dd3b96a124ac909ee1"; + url = https://dl.google.com/android/repository/sys-img/android/x86-23_r10.zip; + sha1 = "f6c3e3dd7bd951454795aa75c3a145fd05ac25bb"; }; }; sysimg_x86_64_23 = buildSystemImage { name = "sysimg-x86_64-23"; src = fetchurl { - url = https://dl.google.com/android/repository/sys-img/android/x86_64-23_r09.zip; - sha1 = "84cc076eacec043c8e88382c6ab391b0cd5c0695"; + url = https://dl.google.com/android/repository/sys-img/android/x86_64-23_r10.zip; + sha1 = "7cbc291483ca07dc67b71268c5f08a5755f50f51"; }; }; @@ -234,16 +234,16 @@ in sysimg_x86_24 = buildSystemImage { name = "sysimg-x86-24"; src = fetchurl { - url = https://dl.google.com/android/repository/sys-img/android/x86-24_r07.zip; - sha1 = "566fdee283a907854bfa3c174265bc31f396eabd"; + url = https://dl.google.com/android/repository/sys-img/android/x86-24_r08.zip; + sha1 = "c1cae7634b0216c0b5990f2c144eb8ca948e3511"; }; }; sysimg_x86_64_24 = buildSystemImage { name = "sysimg-x86_64-24"; src = fetchurl { - url = https://dl.google.com/android/repository/sys-img/android/x86_64-24_r07.zip; - sha1 = "a379932395ced0a8f572b39c396d86e08827a9ba"; + url = https://dl.google.com/android/repository/sys-img/android/x86_64-24_r08.zip; + sha1 = "f6559e1949a5879f31a9662f4f0e50ad60181684"; }; }; @@ -263,4 +263,4 @@ in }; }; } - + diff --git a/pkgs/development/ocaml-modules/cryptokit/default.nix b/pkgs/development/ocaml-modules/cryptokit/default.nix index 58fbc813362..41214624427 100644 --- a/pkgs/development/ocaml-modules/cryptokit/default.nix +++ b/pkgs/development/ocaml-modules/cryptokit/default.nix @@ -5,9 +5,9 @@ assert stdenv.lib.versionAtLeast ocaml.version "3.12"; let param = if stdenv.lib.versionAtLeast ocaml.version "4.02" then { - version = "1.11"; - url = http://forge.ocamlcore.org/frs/download.php/1618/cryptokit-1.11.tar.gz; - sha256 = "1c1vn15lf2b5a8nfa2v2brxm7bwby540nf6q0vkndgkq5qcw96j8"; + version = "1.13"; + url = https://github.com/xavierleroy/cryptokit/archive/release113.tar.gz; + sha256 = "1f4jjnp2a911nqw0hbijyv9vygkk6kw5zx75qs49hfm3by6ij8rq"; inherit zarith; } else { version = "1.10"; diff --git a/pkgs/development/ocaml-modules/git/default.nix b/pkgs/development/ocaml-modules/git/default.nix index 13b85c0c570..e3b4b4333e1 100644 --- a/pkgs/development/ocaml-modules/git/default.nix +++ b/pkgs/development/ocaml-modules/git/default.nix @@ -3,14 +3,14 @@ }: stdenv.mkDerivation rec { - version = "1.11.0"; + version = "1.11.1"; name = "ocaml${ocaml.version}-git-${version}"; src = fetchFromGitHub { owner = "mirage"; repo = "ocaml-git"; rev = version; - sha256 = "1gsvp783g4jb54ccvvpyjpxjmp0pjvlq0cicygk4z4rxs0crd6kw"; + sha256 = "04az2bpbhgdhh7y6pagqx4wf3jbmqrm8w20dgimpbj5h3hnak744"; }; buildInputs = [ ocaml findlib jbuilder ]; diff --git a/pkgs/development/ocaml-modules/ocamlnet/default.nix b/pkgs/development/ocaml-modules/ocamlnet/default.nix index fc7640cc0c9..82747b7a876 100644 --- a/pkgs/development/ocaml-modules/ocamlnet/default.nix +++ b/pkgs/development/ocaml-modules/ocamlnet/default.nix @@ -40,5 +40,6 @@ stdenv.mkDerivation { maintainers = [ stdenv.lib.maintainers.z77z ]; + broken = stdenv.lib.versionAtLeast ocaml.version "4.05"; }; } diff --git a/pkgs/development/ocaml-modules/ppx_deriving/default.nix b/pkgs/development/ocaml-modules/ppx_deriving/default.nix index a1255b2dbc1..57a423a8037 100644 --- a/pkgs/development/ocaml-modules/ppx_deriving/default.nix +++ b/pkgs/development/ocaml-modules/ppx_deriving/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildOcaml, fetchzip +{ stdenv, buildOcaml, ocaml, fetchzip , cppo, ppx_tools, result, ounit }: @@ -25,5 +25,6 @@ buildOcaml rec { description = "deriving is a library simplifying type-driven code generation on OCaml >=4.02."; maintainers = [ maintainers.maurer ]; license = licenses.mit; + broken = versionAtLeast ocaml.version "4.05"; }; } diff --git a/pkgs/development/ocaml-modules/process/default.nix b/pkgs/development/ocaml-modules/process/default.nix new file mode 100644 index 00000000000..92fb1837803 --- /dev/null +++ b/pkgs/development/ocaml-modules/process/default.nix @@ -0,0 +1,25 @@ +{ stdenv, fetchFromGitHub, ocaml, findlib, ocamlbuild }: + +stdenv.mkDerivation rec { + name = "ocaml${ocaml.version}-process-${version}"; + version = "0.2.1"; + + src = fetchFromGitHub { + owner = "dsheets"; + repo = "ocaml-process"; + rev = version; + sha256 = "0m1ldah5r9gcq09d9jh8lhvr77910dygx5m309k1jm60ah9mdcab"; + }; + + buildInputs = [ ocaml findlib ocamlbuild ]; + + createFindlibDestdir = true; + + meta = { + description = "Easy process control in OCaml"; + license = stdenv.lib.licenses.isc; + maintainers = [ stdenv.lib.maintainers.vbgl ]; + inherit (src.meta) homepage; + inherit (ocaml.meta) platforms; + }; +} diff --git a/pkgs/development/ocaml-modules/wasm/default.nix b/pkgs/development/ocaml-modules/wasm/default.nix new file mode 100644 index 00000000000..03ea4a29330 --- /dev/null +++ b/pkgs/development/ocaml-modules/wasm/default.nix @@ -0,0 +1,31 @@ +{ stdenv, fetchFromGitHub, ocaml, findlib, ocamlbuild }: + +if !stdenv.lib.versionAtLeast ocaml.version "4.02" +then throw "wasm is not available for OCaml ${ocaml.version}" +else + +stdenv.mkDerivation rec { + name = "ocaml${ocaml.version}-wasm-${version}"; + version = "0.13"; + + src = fetchFromGitHub { + owner = "WebAssembly"; + repo = "spec"; + rev = "v${version}"; + sha256 = "0l67w1dmhgzrhmw3pw2w35h54imax0zdpa9yyqppzzbagxgn87kn"; + }; + + buildInputs = [ ocaml findlib ocamlbuild ]; + + makeFlags = [ "-C" "interpreter" ]; + + createFindlibDestdir = true; + + meta = { + description = "An OCaml library to read and write Web Assembly (wasm) files and manipulate their AST"; + license = stdenv.lib.licenses.asl20; + maintainers = [ stdenv.lib.maintainers.vbgl ]; + inherit (src.meta) homepage; + inherit (ocaml.meta) platforms; + }; +} diff --git a/pkgs/development/python-modules/linode-api/default.nix b/pkgs/development/python-modules/linode-api/default.nix new file mode 100644 index 00000000000..a89596828f6 --- /dev/null +++ b/pkgs/development/python-modules/linode-api/default.nix @@ -0,0 +1,38 @@ +{ stdenv, + buildPythonPackage, + fetchPypi, + isPy3k, + pythonOlder, + lib, + requests, + future, + enum34 }: + +buildPythonPackage rec { + pname = "linode-api"; + version = "4.1.1b2"; # NOTE: this is a beta, and the API may change in future versions. + name = "${pname}-${version}"; + + disabled = (pythonOlder "2.7"); + + propagatedBuildInputs = [ requests future ] + ++ stdenv.lib.optionals (pythonOlder "3.4") [ enum34 ]; + + postPatch = (stdenv.lib.optionalString (!pythonOlder "3.4") '' + sed -i -e '/"enum34",/d' setup.py + ''); + + doCheck = false; # This library does not have any tests at this point. + + src = fetchPypi { + inherit pname version; + sha256 = "1lfqsll3wv1wzn98ymmcbw0yawj8ab3mxniws6kaxf99jd4a0xp4"; + }; + + meta = { + homepage = "https://github.com/linode/python-linode-api"; + description = "The official python library for the Linode API v4 in python."; + license = lib.licenses.bsd3; + maintainers = with lib.maintainers; [ glenns ]; + }; +} diff --git a/pkgs/development/tools/cucumber/Gemfile b/pkgs/development/tools/cucumber/Gemfile new file mode 100644 index 00000000000..f738129eca4 --- /dev/null +++ b/pkgs/development/tools/cucumber/Gemfile @@ -0,0 +1,2 @@ +source 'https://rubygems.org' +gem 'cucumber' diff --git a/pkgs/development/tools/cucumber/Gemfile.lock b/pkgs/development/tools/cucumber/Gemfile.lock new file mode 100644 index 00000000000..10c1235ae25 --- /dev/null +++ b/pkgs/development/tools/cucumber/Gemfile.lock @@ -0,0 +1,28 @@ +GEM + remote: https://rubygems.org/ + specs: + builder (3.2.3) + cucumber (2.4.0) + builder (>= 2.1.2) + cucumber-core (~> 1.5.0) + cucumber-wire (~> 0.0.1) + diff-lcs (>= 1.1.3) + gherkin (~> 4.0) + multi_json (>= 1.7.5, < 2.0) + multi_test (>= 0.1.2) + cucumber-core (1.5.0) + gherkin (~> 4.0) + cucumber-wire (0.0.1) + diff-lcs (1.3) + gherkin (4.1.3) + multi_json (1.12.1) + multi_test (0.1.2) + +PLATFORMS + ruby + +DEPENDENCIES + cucumber + +BUNDLED WITH + 1.14.4 diff --git a/pkgs/development/tools/cucumber/default.nix b/pkgs/development/tools/cucumber/default.nix new file mode 100644 index 00000000000..d4ca66c70d7 --- /dev/null +++ b/pkgs/development/tools/cucumber/default.nix @@ -0,0 +1,19 @@ +{ lib, bundlerEnv, ruby }: + +bundlerEnv rec { + name = "cucumber-${version}"; + + version = (import gemset).cucumber.version; + inherit ruby; + # expects Gemfile, Gemfile.lock and gemset.nix in the same directory + gemfile = ./Gemfile; + lockfile = ./Gemfile.lock; + gemset = ./gemset.nix; + + meta = with lib; { + description = "A tool for executable specifications"; + homepage = https://cucumber.io/; + license = with licenses; mit; + platforms = platforms.unix; + }; +} diff --git a/pkgs/development/tools/cucumber/gemset.nix b/pkgs/development/tools/cucumber/gemset.nix new file mode 100644 index 00000000000..07a80592dda --- /dev/null +++ b/pkgs/development/tools/cucumber/gemset.nix @@ -0,0 +1,66 @@ +{ + builder = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0qibi5s67lpdv1wgcj66wcymcr04q6j4mzws6a479n0mlrmh5wr1"; + type = "gem"; + }; + version = "3.2.3"; + }; + cucumber = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1k4j31a93r0zhvyq2mm2k8irppbvkzbsg44r3mf023959v18fzih"; + type = "gem"; + }; + version = "2.4.0"; + }; + cucumber-core = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0qj2fsqvp94nggnikbnrfvnmzr1pl6ifmdsxj69kdw1kkab30jjr"; + type = "gem"; + }; + version = "1.5.0"; + }; + cucumber-wire = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "09ymvqb0sbw2if1nxg8rcj33sf0va88ancq5nmp8g01dfwzwma2f"; + type = "gem"; + }; + version = "0.0.1"; + }; + diff-lcs = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "18w22bjz424gzafv6nzv98h0aqkwz3d9xhm7cbr1wfbyas8zayza"; + type = "gem"; + }; + version = "1.3"; + }; + gherkin = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1d18r8mf2qyd9jbq9xxvca8adyysdzvwdy8v9c2s5hrd6p02kg79"; + type = "gem"; + }; + version = "4.1.3"; + }; + multi_json = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1wpc23ls6v2xbk3l1qncsbz16npvmw8p0b38l8czdzri18mp51xk"; + type = "gem"; + }; + version = "1.12.1"; + }; + multi_test = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1sx356q81plr67hg16jfwz9hcqvnk03bd9n75pmdw8pfxjfy1yxd"; + type = "gem"; + }; + version = "0.1.2"; + }; +} \ No newline at end of file diff --git a/pkgs/development/tools/glslviewer/default.nix b/pkgs/development/tools/glslviewer/default.nix new file mode 100644 index 00000000000..1cca6a096fe --- /dev/null +++ b/pkgs/development/tools/glslviewer/default.nix @@ -0,0 +1,36 @@ +{ stdenv, fetchFromGitHub, glfw, pkgconfig, libXrandr, libXdamage, + libXext, libXrender, libXinerama, libXcursor, libXxf86vm, libXi, + libX11, mesa_glu }: + +stdenv.mkDerivation rec { + name = "glslviewer-${version}"; + version = "1.2"; + + src = fetchFromGitHub { + owner = "patriciogonzalezvivo"; + repo = "glslViewer"; + rev = version; + sha256 = "05ya821l2pd58anyx21mgmlm2bv78rz8cnbvqw4d9pfhq40z9psw"; + }; + + # Makefile has /usr/local/bin hard-coded for 'make install' + preConfigure = '' + sed s,/usr/local,$out, -i Makefile + ''; + + preInstall = '' + mkdir -p $out/bin + ''; + + buildInputs = [ glfw mesa_glu pkgconfig glfw libXrandr libXdamage + libXext libXrender libXinerama libXcursor libXxf86vm + libXi libX11 ]; + + meta = with stdenv.lib; { + description = "Live GLSL coding renderer"; + homepage = http://patriciogonzalezvivo.com/2015/glslViewer/; + license = licenses.bsd3; + platforms = platforms.linux ++ platforms.darwin; + maintainers = [ maintainers.hodapp ]; + }; +} diff --git a/pkgs/development/tools/haskell/lambdabot/default.nix b/pkgs/development/tools/haskell/lambdabot/default.nix index 85d4bfc93b6..7282fb4970e 100644 --- a/pkgs/development/tools/haskell/lambdabot/default.nix +++ b/pkgs/development/tools/haskell/lambdabot/default.nix @@ -1,4 +1,4 @@ -{ lib, haskell-lib, fetchpatch, makeWrapper, haskellPackages +{ lib, haskellLib, fetchpatch, makeWrapper, haskellPackages , mueval , withDjinn ? true , aspell ? null @@ -25,7 +25,7 @@ let allPkgs = pkgs: mueval.defaultPkgs pkgs ++ [ pkgs.lambdabot-trusted ] ++ pac modulesStr = lib.replaceChars ["\n"] [" "] modules; configStr = lib.replaceChars ["\n"] [" "] configuration; -in haskell-lib.overrideCabal haskellPackages.lambdabot (self: { +in haskellLib.overrideCabal haskellPackages.lambdabot (self: { patches = (self.patches or []) ++ [ ./custom-config.patch ]; postPatch = (self.postPatch or "") + '' substituteInPlace src/Main.hs \ diff --git a/pkgs/development/tools/irony-server/default.nix b/pkgs/development/tools/irony-server/default.nix index ac5495b98d9..0dcb74b803d 100644 --- a/pkgs/development/tools/irony-server/default.nix +++ b/pkgs/development/tools/irony-server/default.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { description = "The server part of irony."; homepage = "https://melpa.org/#/irony"; maintainers = [ stdenv.lib.maintainers.deepfire ]; - platforms = stdenv.lib.platforms.linux; + platforms = stdenv.lib.platforms.unix; license = stdenv.lib.licenses.free; }; } diff --git a/pkgs/development/tools/misc/intltool/default.nix b/pkgs/development/tools/misc/intltool/default.nix index 3c5dacb6f65..537541e37bb 100644 --- a/pkgs/development/tools/misc/intltool/default.nix +++ b/pkgs/development/tools/misc/intltool/default.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { patches = [(fetchpatch { name = "perl-5.22.patch"; url = "https://anonscm.debian.org/viewvc/pkg-gnome/desktop/unstable/intltool" - + "/debian/patches/perl5.22-regex-fixes.patch?revision=47258&view=co"; + + "/debian/patches/perl5.22-regex-fixes?revision=47258&view=co&pathrev=47258"; sha256 = "17clqczb9fky7hp8czxa0fy82b5478irvz4f3fnans3sqxl95hx3"; })]; diff --git a/pkgs/development/tools/ocaml/obelisk/default.nix b/pkgs/development/tools/ocaml/obelisk/default.nix new file mode 100644 index 00000000000..1ec0fef49d3 --- /dev/null +++ b/pkgs/development/tools/ocaml/obelisk/default.nix @@ -0,0 +1,24 @@ +{ stdenv, fetchFromGitHub, ocamlPackages }: + +stdenv.mkDerivation rec { + name = "obelisk-${version}"; + version = "0.2.0"; + src = fetchFromGitHub { + owner = "Lelio-Brun"; + repo = "Obelisk"; + rev = "v${version}"; + sha256 = "0kbadib53x7mzqri9asd8fmhl4xfgk4ajgzd7rlq3irf2j3bmcqp"; + }; + + buildInputs = with ocamlPackages; [ ocaml findlib ocamlbuild menhir ]; + + installFlags = [ "BINDIR=$(out)/bin" ]; + + meta = { + description = "A simple tool which produces pretty-printed output from a Menhir parser file (.mly)"; + license = stdenv.lib.licenses.mit; + maintainers = [ stdenv.lib.maintainers.vbgl ]; + inherit (src.meta) homepage; + inherit (ocamlPackages.ocaml.meta) platforms; + }; +} diff --git a/pkgs/development/tools/packer/default.nix b/pkgs/development/tools/packer/default.nix index 40501a78b1e..e1b52102907 100644 --- a/pkgs/development/tools/packer/default.nix +++ b/pkgs/development/tools/packer/default.nix @@ -14,6 +14,8 @@ buildGoPackage rec { sha256 = "1bd0rv93pxlv58c0x1d4dsjq4pg5qwrm2p7qw83pca7izlncgvfr"; }; + goDeps = ./deps.nix; + meta = with stdenv.lib; { description = "A tool for creating identical machine images for multiple platforms from a single source configuration"; homepage = http://www.packer.io; diff --git a/pkgs/development/tools/packer/deps.nix b/pkgs/development/tools/packer/deps.nix new file mode 100644 index 00000000000..544facda015 --- /dev/null +++ b/pkgs/development/tools/packer/deps.nix @@ -0,0 +1,11 @@ +[ + { + goPackagePath = "github.com/hashicorp/packer"; + fetch = { + type = "git"; + url = "https://github.com/hashicorp/packer"; + rev = "07decf99adc272a386e3a013846248810d9aa690"; + sha256 = "17rrzrlr48spadb9fymn1a0blqggs2mfmqbwfxs0pnw66mhd0fzz"; + }; + } +] diff --git a/pkgs/development/tools/selenium/chromedriver/default.nix b/pkgs/development/tools/selenium/chromedriver/default.nix index 26e820517c0..bdf71f7d218 100644 --- a/pkgs/development/tools/selenium/chromedriver/default.nix +++ b/pkgs/development/tools/selenium/chromedriver/default.nix @@ -52,7 +52,7 @@ stdenv.mkDerivation rec { ''; meta = with stdenv.lib; { - homepage = http://code.google.com/p/chromedriver/; + homepage = https://sites.google.com/a/chromium.org/chromedriver; description = "A WebDriver server for running Selenium tests on Chrome"; license = licenses.bsd3; maintainers = [ maintainers.goibhniu ]; diff --git a/pkgs/development/tools/wiggle/default.nix b/pkgs/development/tools/wiggle/default.nix index 5a97eb09e4b..ffa6d4aac0c 100644 --- a/pkgs/development/tools/wiggle/default.nix +++ b/pkgs/development/tools/wiggle/default.nix @@ -13,6 +13,7 @@ stdenv.mkDerivation { configurePhase = '' makeFlagsArray=( CFLAGS="-I. -O3" + STRIP="-s" INSTALL="install" BINDIR="$out/bin" MANDIR="$out/share/man" diff --git a/pkgs/development/web/nodejs/v7.nix b/pkgs/development/web/nodejs/v7.nix deleted file mode 100644 index 86d4fed8eab..00000000000 --- a/pkgs/development/web/nodejs/v7.nix +++ /dev/null @@ -1,21 +0,0 @@ -{ stdenv, fetchurl, openssl, python2, zlib, libuv, v8, utillinux, http-parser -, pkgconfig, runCommand, which, libtool, fetchpatch -, callPackage -, darwin ? null -, enableNpm ? true -}@args: - -let - nodejs = import ./nodejs.nix args; - baseName = if enableNpm then "nodejs" else "nodejs-slim"; -in - stdenv.mkDerivation (nodejs // rec { - version = "7.10.1"; - name = "${baseName}-${version}"; - src = fetchurl { - url = "https://nodejs.org/download/release/v${version}/node-v${version}.tar.xz"; - sha256 = "654db852149a1cc59ece68ec573b0486907e8febe8353cee097dd29ea5a56cfa"; - }; - - patches = stdenv.lib.optionals stdenv.isDarwin [ ./no-xcode-v7.patch ]; - }) diff --git a/pkgs/games/bsdgames/default.nix b/pkgs/games/bsdgames/default.nix index 34d767bf310..ef30a3d350c 100644 --- a/pkgs/games/bsdgames/default.nix +++ b/pkgs/games/bsdgames/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl, ncurses, openssl, flex, bison, less, miscfiles}: +{ stdenv, fetchurl, ncurses, openssl, flex, bison, less, miscfiles }: stdenv.mkDerivation { name = "bsd-games-2.17"; @@ -19,6 +19,8 @@ stdenv.mkDerivation { hardeningDisable = [ "format" ]; + makeFlags = [ "STRIP=" ]; + preConfigure = '' cat > config.params << EOF bsd_games_cfg_man6dir=$out/share/man/man6 diff --git a/pkgs/misc/drivers/gutenprint/default.nix b/pkgs/misc/drivers/gutenprint/default.nix index e53ddf7143b..430a5348398 100644 --- a/pkgs/misc/drivers/gutenprint/default.nix +++ b/pkgs/misc/drivers/gutenprint/default.nix @@ -6,11 +6,11 @@ }: stdenv.mkDerivation rec { - name = "gutenprint-5.2.11"; + name = "gutenprint-5.2.13"; src = fetchurl { url = "mirror://sourceforge/gimp-print/${name}.tar.bz2"; - sha256 = "1yadw96rgp1z0jv1wxrz6cds36nb693w3xlv596xw9r5w394r8y1"; + sha256 = "0hi7s0y59306p4kp06sankfa57k2805khbknkvl9d036hdfp9afr"; }; nativeBuildInputs = [ makeWrapper pkgconfig ]; diff --git a/pkgs/misc/themes/numix-sx/default.nix b/pkgs/misc/themes/numix-sx/default.nix new file mode 100644 index 00000000000..a56f67b8df4 --- /dev/null +++ b/pkgs/misc/themes/numix-sx/default.nix @@ -0,0 +1,30 @@ +{ stdenv, fetchurl, gtk-engine-murrine }: + +stdenv.mkDerivation rec { + version = "2017-04-24"; + name = "numix-sx-gtk-theme-${version}"; + + src = fetchurl { + url = "https://dl.opendesktop.org/api/files/download/id/1493077417/Numix-SX.tar.xz"; + sha256 = "7e1983924b2d90e89eddb3da8f4c43dc1326fe138fd191c8212c7904dcd618b0"; + }; + + buildInputs = [ gtk-engine-murrine ]; + + dontBuild = true; + + sourceRoot = "."; + + installPhase = '' + install -dm 755 "$out/share/themes/" + cp -dr --no-preserve='ownership' Numix-SX-{Dark,FullDark,Light} "$out/share/themes/" + ''; + + meta = { + description = "Gray variation of Numix theme"; + homepage = https://www.gnome-look.org/p/1117412/; + license = stdenv.lib.licenses.gpl3Plus; + platforms = stdenv.lib.platforms.all; + maintainers = [ stdenv.lib.maintainers.sauyon ]; + }; +} diff --git a/pkgs/os-specific/linux/kernel/common-config.nix b/pkgs/os-specific/linux/kernel/common-config.nix index 9700373c852..5e2b1d610e7 100644 --- a/pkgs/os-specific/linux/kernel/common-config.nix +++ b/pkgs/os-specific/linux/kernel/common-config.nix @@ -167,6 +167,7 @@ with stdenv.lib; BONDING m NET_L3_MASTER_DEV? y NET_FOU_IP_TUNNELS? y + IP_NF_TARGET_REDIRECT m # Wireless networking. CFG80211_WEXT? y # Without it, ipw2200 drivers don't build diff --git a/pkgs/os-specific/linux/wpa_supplicant/default.nix b/pkgs/os-specific/linux/wpa_supplicant/default.nix index 1cac0911b24..1530d20667e 100644 --- a/pkgs/os-specific/linux/wpa_supplicant/default.nix +++ b/pkgs/os-specific/linux/wpa_supplicant/default.nix @@ -47,6 +47,7 @@ stdenv.mkDerivation rec { CONFIG_HS20=y CONFIG_P2P=y CONFIG_TDLS=y + CONFIG_BGSCAN_SIMPLE=y '' + optionalString (pcsclite != null) '' CONFIG_EAP_SIM=y CONFIG_EAP_AKA=y diff --git a/pkgs/os-specific/linux/wvdial/default.nix b/pkgs/os-specific/linux/wvdial/default.nix deleted file mode 100644 index 7decd42b376..00000000000 --- a/pkgs/os-specific/linux/wvdial/default.nix +++ /dev/null @@ -1,29 +0,0 @@ -{ stdenv, fetchurl, wvstreams, pkgconfig }: - -stdenv.mkDerivation rec { - name = "wvdial-1.61"; - - src = fetchurl { - url = "http://wvstreams.googlecode.com/files/${name}.tar.gz"; - sha256 = "0mzcrv8mc60gbdrixc9k8ammbslvjb9x2cs50yf1jq67aabapzsg"; - }; - - buildInputs = [ wvstreams pkgconfig ]; - - preConfigure = '' - find -type f | xargs sed -i 's@/bin/bash@bash@g' - export makeFlags="prefix=$out" - # not sure about this line - sed -i 's@/etc/ppp/peers@$out/etc/ppp/peers@' Makefile.in - - sed -e '1i#include <unistd.h>' -i $(find . -name '*.cc') - ''; - - meta = { - description = "A dialer that automatically recognises the modem"; - homepage = http://alumnit.ca/wiki/index.php?page=WvDial; - license = "LGPL"; - maintainers = [ stdenv.lib.maintainers.marcweber ]; - platforms = stdenv.lib.platforms.linux; - }; -} diff --git a/pkgs/servers/atlassian/confluence.nix b/pkgs/servers/atlassian/confluence.nix index 3c1cdda8361..ea8d2651836 100644 --- a/pkgs/servers/atlassian/confluence.nix +++ b/pkgs/servers/atlassian/confluence.nix @@ -1,4 +1,7 @@ -{ stdenv, fetchurl }: +{ stdenv, lib, fetchurl +, enableSSO ? false +, crowdProperties ? null +}: stdenv.mkDerivation rec { name = "atlassian-confluence-${version}"; @@ -19,6 +22,14 @@ stdenv.mkDerivation rec { rm -r logs; ln -sf /run/confluence/logs/ . rm -r work; ln -sf /run/confluence/work/ . rm -r temp; ln -sf /run/confluence/temp/ . + '' + lib.optionalString enableSSO '' + substituteInPlace confluence/WEB-INF/classes/seraph-config.xml \ + --replace com.atlassian.confluence.user.ConfluenceAuthenticator\ + com.atlassian.confluence.user.ConfluenceCrowdSSOAuthenticator + '' + lib.optionalString (crowdProperties != null) '' + cat <<EOF > confluence/WEB-INF/classes/crowd.properties + ${crowdProperties} + EOF ''; installPhase = '' diff --git a/pkgs/servers/atlassian/jira.nix b/pkgs/servers/atlassian/jira.nix index bd044975f22..0013286c03c 100644 --- a/pkgs/servers/atlassian/jira.nix +++ b/pkgs/servers/atlassian/jira.nix @@ -1,4 +1,7 @@ -{ stdenv, fetchurl }: +{ stdenv, lib, fetchurl +, enableSSO ? false +, crowdProperties ? null +}: stdenv.mkDerivation rec { name = "atlassian-jira-${version}"; @@ -17,6 +20,14 @@ stdenv.mkDerivation rec { rm -r logs; ln -sf /run/atlassian-jira/logs/ . rm -r work; ln -sf /run/atlassian-jira/work/ . rm -r temp; ln -sf /run/atlassian-jira/temp/ . + '' + lib.optionalString enableSSO '' + substituteInPlace atlassian-jira/WEB-INF/classes/seraph-config.xml \ + --replace com.atlassian.jira.security.login.JiraSeraphAuthenticator \ + com.atlassian.jira.security.login.SSOSeraphAuthenticator + '' + lib.optionalString (crowdProperties != null) '' + cat <<EOF > atlassian-jira/WEB-INF/classes/crowd.properties + ${crowdProperties} + EOF ''; installPhase = '' diff --git a/pkgs/servers/http/yaws/default.nix b/pkgs/servers/http/yaws/default.nix index 871b3524f42..67172edfd36 100644 --- a/pkgs/servers/http/yaws/default.nix +++ b/pkgs/servers/http/yaws/default.nix @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "A high performance HTTP 1.1 server in Erlang"; - homepage = http://http://yaws.hyber.org; + homepage = http://yaws.hyber.org; license = licenses.bsd2; platforms = platforms.linux; maintainers = with maintainers; [ goibhniu the-kenny ]; diff --git a/pkgs/servers/monitoring/prometheus/openvpn-exporter-deps.nix b/pkgs/servers/monitoring/prometheus/openvpn-exporter-deps.nix new file mode 100644 index 00000000000..93aae1b867e --- /dev/null +++ b/pkgs/servers/monitoring/prometheus/openvpn-exporter-deps.nix @@ -0,0 +1,66 @@ +# This file was generated by https://github.com/kamilchm/go2nix v1.2.1 +[ + { + goPackagePath = "github.com/beorn7/perks"; + fetch = { + type = "git"; + url = "https://github.com/beorn7/perks"; + rev = "4c0e84591b9aa9e6dcfdf3e020114cd81f89d5f9"; + sha256 = "1hrybsql68xw57brzj805xx2mghydpdiysv3gbhr7f5wlxj2514y"; + }; + } + { + goPackagePath = "github.com/golang/protobuf"; + fetch = { + type = "git"; + url = "https://github.com/golang/protobuf"; + rev = "748d386b5c1ea99658fd69fe9f03991ce86a90c1"; + sha256 = "0xm0is6sj6r634vrfx85ir0gd9h1xxk25fgc5z07zrjp19f5wqp5"; + }; + } + { + goPackagePath = "github.com/matttproud/golang_protobuf_extensions"; + fetch = { + type = "git"; + url = "https://github.com/matttproud/golang_protobuf_extensions"; + rev = "c12348ce28de40eed0136aa2b644d0ee0650e56c"; + sha256 = "1d0c1isd2lk9pnfq2nk0aih356j30k3h1gi2w0ixsivi5csl7jya"; + }; + } + { + goPackagePath = "github.com/prometheus/client_golang"; + fetch = { + type = "git"; + url = "https://github.com/prometheus/client_golang"; + rev = "94ff84a9a6ebb5e6eb9172897c221a64df3443bc"; + sha256 = "188xwc13ml51i29fhp8bz4a7ncmk0lvdw3nnwr56k2l36pp1swil"; + }; + } + { + goPackagePath = "github.com/prometheus/client_model"; + fetch = { + type = "git"; + url = "https://github.com/prometheus/client_model"; + rev = "6f3806018612930941127f2a7c6c453ba2c527d2"; + sha256 = "1413ibprinxhni51p0755dp57r9wvbw7xgj9nmdaxmhzlqhc86j4"; + }; + } + { + goPackagePath = "github.com/prometheus/common"; + fetch = { + type = "git"; + url = "https://github.com/prometheus/common"; + rev = "3e6a7635bac6573d43f49f97b47eb9bda195dba8"; + sha256 = "1q4nwm9lf4jd90z08s6gz8j1zzrk2jn9vpw49xdb8mwxmhv13xgm"; + }; + } + { + goPackagePath = "github.com/prometheus/procfs"; + fetch = { + type = "git"; + url = "https://github.com/prometheus/procfs"; + rev = "e645f4e5aaa8506fc71d6edbc5c4ff02c04c46f2"; + sha256 = "18hwygbawbqilz7h8fl25xpbciwalkslb4igqn4cr9d8sqp7d3np"; + }; + } +] diff --git a/pkgs/servers/monitoring/prometheus/openvpn-exporter.nix b/pkgs/servers/monitoring/prometheus/openvpn-exporter.nix new file mode 100644 index 00000000000..eac962f7560 --- /dev/null +++ b/pkgs/servers/monitoring/prometheus/openvpn-exporter.nix @@ -0,0 +1,25 @@ +{ stdenv, buildGoPackage, fetchFromGitHub }: + +buildGoPackage rec { + name = "openvpn_exporter-unstable-${version}"; + version = "2017-05-15"; + rev = "a2a179a222144fa9a10030367045f075375a2803"; + + goPackagePath = "github.com/kumina/openvpn_exporter"; + + src = fetchFromGitHub { + owner = "kumina"; + repo = "openvpn_exporter"; + inherit rev; + sha256 = "1cjx7ascf532a20wwzrsx3qqs6dr04jyf700s3jvlvhhhx43l8m4"; + }; + + goDeps = ./openvpn-exporter-deps.nix; + + meta = with stdenv.lib; { + inherit (src.meta) homepage; + description = "Prometheus exporter for OpenVPN"; + license = licenses.asl20; + maintainers = with maintainers; [ fpletz ]; + }; +} diff --git a/pkgs/servers/monitoring/prometheus/snmp-exporter.nix b/pkgs/servers/monitoring/prometheus/snmp-exporter.nix index a52e1abad87..6915877ef4f 100644 --- a/pkgs/servers/monitoring/prometheus/snmp-exporter.nix +++ b/pkgs/servers/monitoring/prometheus/snmp-exporter.nix @@ -1,8 +1,8 @@ -{ stdenv, lib, go, buildGoPackage, fetchFromGitHub }: +{ stdenv, lib, go, buildGoPackage, fetchFromGitHub, net_snmp }: buildGoPackage rec { name = "snmp_exporter-${version}"; - version = "0.1.0"; + version = "0.3.0"; rev = "v${version}"; goPackagePath = "github.com/prometheus/snmp_exporter"; @@ -11,9 +11,11 @@ buildGoPackage rec { inherit rev; owner = "prometheus"; repo = "snmp_exporter"; - sha256 = "1faa1gla5nqkhf1kq60v22bcph41qix3dn9db0w0fh2pkxpdxvrp"; + sha256 = "1cklsi3cpalmnp0qjkgb7xbgbkr014hk2z54gfynzvzqjmsbxk6a"; }; + buildInputs = [ net_snmp ]; + doCheck = true; meta = with stdenv.lib; { diff --git a/pkgs/servers/sql/mariadb/default.nix b/pkgs/servers/sql/mariadb/default.nix index 1356915c1fa..3ede229931e 100644 --- a/pkgs/servers/sql/mariadb/default.nix +++ b/pkgs/servers/sql/mariadb/default.nix @@ -15,11 +15,11 @@ mariadb = everything // { }; common = rec { # attributes common to both builds - version = "10.1.21"; + version = "10.1.25"; src = fetchurl { url = "https://downloads.mariadb.org/f/mariadb-${version}/source/mariadb-${version}.tar.gz/from/http%3A//ftp.hosteurope.de/mirror/archive.mariadb.org/?serve"; - sha256 = "144lcm5awcf0k6a7saqfr4p2kg8r5wbdhdm4cmn2m8hyg1an70as"; + sha256 = "1mm0n8sl6grajk5rbrx55333laz5dg2abyl8mlsn7h8vdymfq1bj"; name = "mariadb-${version}.tar.gz"; }; diff --git a/pkgs/servers/varnish/default.nix b/pkgs/servers/varnish/default.nix index 01dec302081..82bbe048e43 100644 --- a/pkgs/servers/varnish/default.nix +++ b/pkgs/servers/varnish/default.nix @@ -2,12 +2,12 @@ , python, pythonPackages, makeWrapper }: stdenv.mkDerivation rec { - version = "5.1.2"; + version = "5.1.3"; name = "varnish-${version}"; src = fetchurl { url = "http://repo.varnish-cache.org/source/${name}.tar.gz"; - sha256 = "1qzwljdwp830l41nw4ils9hxly077zqn6wzhhmy8m516gq9min1r"; + sha256 = "0km50hzjzi1kq85lr3hq519nrp261wb91ixq48vhyd41llycjfbl"; }; nativeBuildInputs = [ pkgconfig ]; diff --git a/pkgs/servers/x11/xorg/default.nix b/pkgs/servers/x11/xorg/default.nix index eb08986e702..7c052d8ef49 100644 --- a/pkgs/servers/x11/xorg/default.nix +++ b/pkgs/servers/x11/xorg/default.nix @@ -1821,7 +1821,6 @@ let }; buildInputs = [pkgconfig dri2proto dri3proto fontsproto libdrm libpng udev libpciaccess presentproto randrproto renderproto libX11 xcbutil libxcb libXcursor libXdamage libXext xextproto xf86driproto libXfixes xorgserver xproto libXrandr libXrender libxshmfence libXtst libXvMC ]; meta.platforms = stdenv.lib.platforms.unix; - configureFlags = "--with-default-dri=3"; }) // {inherit dri2proto dri3proto fontsproto libdrm libpng udev libpciaccess presentproto randrproto renderproto libX11 xcbutil libxcb libXcursor libXdamage libXext xextproto xf86driproto libXfixes xorgserver xproto libXrandr libXrender libxshmfence libXtst libXvMC ;}; xf86videomach64 = (mkDerivation "xf86videomach64" { diff --git a/pkgs/servers/x11/xorg/overrides.nix b/pkgs/servers/x11/xorg/overrides.nix index 09f75b436da..8317bd7ce6f 100644 --- a/pkgs/servers/x11/xorg/overrides.nix +++ b/pkgs/servers/x11/xorg/overrides.nix @@ -565,8 +565,9 @@ in }; xf86videointel = attrs: attrs // { - buildInputs = attrs.buildInputs ++ [xorg.libXfixes]; + buildInputs = attrs.buildInputs ++ [xorg.libXfixes xorg.libXScrnSaver xorg.pixman]; nativeBuildInputs = [args.autoreconfHook xorg.utilmacros]; + configureFlags = "--with-default-dri=3 --enable-tools"; }; xf86videoxgi = attrs: attrs // { diff --git a/pkgs/stdenv/darwin/default.nix b/pkgs/stdenv/darwin/default.nix index cac33a1bebb..74dcf2f009b 100644 --- a/pkgs/stdenv/darwin/default.nix +++ b/pkgs/stdenv/darwin/default.nix @@ -305,7 +305,7 @@ in rec { initialPath = import ../common-path.nix { inherit pkgs; }; shell = "${pkgs.bash}/bin/bash"; - cc = import ../../build-support/cc-wrapper { + cc = lib.callPackageWith {} ../../build-support/cc-wrapper { inherit (pkgs) stdenv; inherit shell; nativeTools = false; diff --git a/pkgs/test/macos-sierra-shared/default.nix b/pkgs/test/macos-sierra-shared/default.nix new file mode 100644 index 00000000000..51e8ae53736 --- /dev/null +++ b/pkgs/test/macos-sierra-shared/default.nix @@ -0,0 +1,89 @@ +{ lib, clangStdenv, clang-sierraHack-stdenv, stdenvNoCC }: + +let + makeBigExe = stdenv: prefix: rec { + + count = 500; + + sillyLibs = lib.genList (i: stdenv.mkDerivation rec { + name = "${prefix}-fluff-${toString i}"; + unpackPhase = '' + src=$PWD + cat << 'EOF' > ${name}.c + unsigned int asdf_${toString i}(void) { + return ${toString i}; + } + EOF + ''; + buildPhase = '' + $CC -std=c99 -shared ${name}.c -o lib${name}.dylib -Wl,-install_name,$out/lib/lib${name}.dylib + ''; + installPhase = '' + mkdir -p "$out/lib" + mv lib${name}.dylib "$out/lib" + ''; + meta.platforms = lib.platforms.darwin; + }) count; + + finalExe = stdenv.mkDerivation rec { + name = "${prefix}-final-asdf"; + unpackPhase = '' + src=$PWD + cat << 'EOF' > main.cxx + + #include <cstdlib> + #include <iostream> + + ${toString (lib.genList (i: "extern \"C\" unsigned int asdf_${toString i}(void); ") count)} + + unsigned int (*funs[])(void) = { + ${toString (lib.genList (i: "asdf_${toString i},") count)} + }; + + int main(int argc, char **argv) { + bool ret; + unsigned int i = 0; + for (auto f : funs) { + if (f() != i++) { + std::cerr << "Failed to get expected response from function #" << i << std::endl; + return EXIT_FAILURE; + } + } + return EXIT_SUCCESS; + } + EOF + ''; + buildPhase = '' + $CXX -std=c++11 main.cxx ${toString (map (x: "-l${x.name}") sillyLibs)} -o ${prefix}-asdf + ''; + buildInputs = sillyLibs; + installPhase = '' + mkdir -p "$out/bin" + mv ${prefix}-asdf "$out/bin" + ''; + meta.platforms = lib.platforms.darwin; + }; + + }; + + good = makeBigExe clang-sierraHack-stdenv "good"; + + bad = makeBigExe clangStdenv "bad"; + +in stdenvNoCC.mkDerivation { + name = "macos-sierra-shared-test"; + buildInputs = [ good.finalExe bad.finalExe ]; + # TODO(@Ericson2314): Be impure or require exact MacOS version of builder? + buildCommand = '' + if bad-asdf + then echo "bad-asdf can succeed on non-sierra, OK" >&2 + else echo "bad-asdf should fail on sierra, OK" >&2 + fi + + # Must succeed on all supported MacOS versions + good-asdf + + touch $out + ''; + meta.platforms = lib.platforms.darwin; +} diff --git a/pkgs/tools/backup/flockit/default.nix b/pkgs/tools/backup/flockit/default.nix new file mode 100644 index 00000000000..e569d9b6d59 --- /dev/null +++ b/pkgs/tools/backup/flockit/default.nix @@ -0,0 +1,51 @@ +{ stdenv, fetchFromGitHub }: + +stdenv.mkDerivation rec { + name = "flockit-${version}"; + version = "2012-08-11"; + + src = fetchFromGitHub { + owner = "smerritt"; + repo = "flockit"; + rev = "5c2b2092f8edcc8e3e2eb6ef66c968675dbfa686"; + sha256 = "0vajck9q2677gpn9a4flkyz7mw69ql1647cjwqh834nrcr2b5164"; + }; + + installPhase = '' + mkdir -p $out/lib $out/bin + cp ./libflockit.so $out/lib + + (cat <<EOI + #!/bin/sh + env LD_PRELOAD="$out/lib/libflockit.so" FLOCKIT_FILE_PREFIX=\$1 \''${@:2} + EOI + ) > $out/bin/flockit + chmod +x $out/bin/flockit + ''; + + meta = with stdenv.lib; { + description = "LD_PRELOAD shim to add file locking to programs that don't do it (I'm looking at you, rsync!)"; + longDescription = '' + This library and tool exists solely because rsync doesn't have file locking. + + It's not used like a normal library; you don't link against it, and you + don't have to patch your source code to use it. It's inserted between your + program and its libraries by use of LD_PRELOAD. + + For example: + + $ env LD_PRELOAD=$(nix-build -A pkgs.flockit)/lib/libflockit.so FLOCKIT_FILE_PREFIX=test rsync SRC DEST + + Besides the library a handy executable is provided which can simplify the above to: + + $ $(nix-build -A pkgs.flockit)/bin/flockit test rsync SRC DEST + + Also see the following blog post: + https://www.swiftstack.com/blog/2012/08/15/old-school-monkeypatching/ + ''; + homepage = https://github.com/smerritt/flockit; + license = licenses.asl20; + platforms = platforms.linux; + maintainers = [ maintainers.basvandijk ]; + }; +} diff --git a/pkgs/tools/backup/restic/default.nix b/pkgs/tools/backup/restic/default.nix index 8f918dda59b..bc5755628d2 100644 --- a/pkgs/tools/backup/restic/default.nix +++ b/pkgs/tools/backup/restic/default.nix @@ -2,7 +2,7 @@ buildGoPackage rec { name = "restic-${version}"; - version = "0.7.0"; + version = "0.7.1"; goPackagePath = "github.com/restic/restic"; @@ -10,7 +10,7 @@ buildGoPackage rec { owner = "restic"; repo = "restic"; rev = "v${version}"; - sha256 = "1whzzma2c199i604qy1a807zhi8qgri1r9bbxl5l7wlfh7x0n6sd"; + sha256 = "07614wp0b6kjl8lq3qir271g0s2h8wvpdh43wsz1k6bip60nmqbf"; }; buildPhase = '' @@ -26,7 +26,7 @@ buildGoPackage rec { meta = with stdenv.lib; { homepage = https://restic.github.io; description = "A backup program that is fast, efficient and secure"; - platforms = platforms.linux; + platforms = platforms.linux ++ platforms.darwin; license = licenses.bsd2; maintainers = [ maintainers.mbrgm ]; }; diff --git a/pkgs/tools/filesystems/irods/default.nix b/pkgs/tools/filesystems/irods/default.nix index db69fa64c84..b5f178d59fc 100644 --- a/pkgs/tools/filesystems/irods/default.nix +++ b/pkgs/tools/filesystems/irods/default.nix @@ -13,13 +13,13 @@ in rec { # irods: libs and server package irods = stdenv.mkDerivation (common // rec { - version = "4.2.0"; + version = "4.2.1"; prefix = "irods"; name = "${prefix}-${version}"; src = fetchurl { url = "https://github.com/irods/irods/releases/download/${version}/irods-${version}.tar.gz"; - sha256 = "b5c0d7209219629da139058ce462a237ecc22ad4dae613413a428961e4ff9d3e"; + sha256 = "07yj5g1mwra4sankhqx967mk4z28kc40rir5cb85x23ljql74abq"; }; # Patches: diff --git a/pkgs/tools/inputmethods/ibus/wrapper.nix b/pkgs/tools/inputmethods/ibus/wrapper.nix index f38705cc9d1..13035698827 100644 --- a/pkgs/tools/inputmethods/ibus/wrapper.nix +++ b/pkgs/tools/inputmethods/ibus/wrapper.nix @@ -25,7 +25,7 @@ let wrapProgram "$out/bin/$prog" \ --set GDK_PIXBUF_MODULE_FILE ${librsvg.out}/lib/gdk-pixbuf-2.0/2.10.0/loaders.cache \ --prefix GI_TYPELIB_PATH : "$GI_TYPELIB_PATH:$out/lib/girepository-1.0" \ - --prefix GIO_EXTRA_MODULES : "${dconf}/lib/gio/modules" \ + --prefix GIO_EXTRA_MODULES : "${stdenv.lib.getLib dconf}/lib/gio/modules" \ --set IBUS_COMPONENT_PATH "$out/share/ibus/component/" \ --set IBUS_DATAROOTDIR "$out/share" \ --set IBUS_LIBEXECDIR "$out/libexec" \ @@ -44,7 +44,7 @@ let wrapProgram "$out/bin/$prog" \ --set GDK_PIXBUF_MODULE_FILE ${librsvg.out}/lib/gdk-pixbuf-2.0/2.10.0/loaders.cache \ --prefix GI_TYPELIB_PATH : "$GI_TYPELIB_PATH:$out/lib/girepository-1.0" \ - --prefix GIO_EXTRA_MODULES : "${dconf}/lib/gio/modules" \ + --prefix GIO_EXTRA_MODULES : "${stdenv.lib.getLib dconf}/lib/gio/modules" \ --set IBUS_COMPONENT_PATH "$out/share/ibus/component/" \ --set IBUS_DATAROOTDIR "$out/share" \ --set IBUS_LIBEXECDIR "$out/libexec" \ diff --git a/pkgs/tools/misc/fzf/default.nix b/pkgs/tools/misc/fzf/default.nix index 11bc0ef4d11..5bf42fae9ea 100644 --- a/pkgs/tools/misc/fzf/default.nix +++ b/pkgs/tools/misc/fzf/default.nix @@ -2,7 +2,7 @@ buildGoPackage rec { name = "fzf-${version}"; - version = "0.16.10"; + version = "0.16.11"; rev = "${version}"; goPackagePath = "github.com/junegunn/fzf"; @@ -11,7 +11,7 @@ buildGoPackage rec { inherit rev; owner = "junegunn"; repo = "fzf"; - sha256 = "0c9c9x2pim5g2jwy6jkdws2s7b1mw2qlnba1q46a1izswm7ljfq7"; + sha256 = "1jm7v482ad85l627k7a265p2clzy2yk88hqqbjsihi53mj8agxa0"; }; outputs = [ "bin" "out" "man" ]; diff --git a/pkgs/tools/misc/ttfautohint/default.nix b/pkgs/tools/misc/ttfautohint/default.nix index 1042c5794bd..c302bd15c41 100644 --- a/pkgs/tools/misc/ttfautohint/default.nix +++ b/pkgs/tools/misc/ttfautohint/default.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { new font where all glyphs are bytecode hinted using the information given by FreeType’s auto-hinting module. ''; - homepage = http://www.freetype.org/ttfautohint/; + homepage = https://www.freetype.org/ttfautohint; license = licenses.gpl2Plus; # or the FreeType License (BSD + advertising clause) maintainers = with maintainers; [ goibhniu ndowens ]; platforms = platforms.linux; diff --git a/pkgs/tools/networking/envoy/default.nix b/pkgs/tools/networking/envoy/default.nix new file mode 100644 index 00000000000..79a24ea1f8d --- /dev/null +++ b/pkgs/tools/networking/envoy/default.nix @@ -0,0 +1,303 @@ +{ stdenv, lib, fetchFromGitHub, pkgconfig, bazel, c-ares, backward-cpp +, libevent, gtest, gperftools, http-parser, lightstep-tracer-cpp +, nghttp2, protobuf3_2, tclap, rapidjson, spdlog, boringssl, buildEnv +}: + +let + protobuf_bzl = + fetchFromGitHub { + owner = "htuch"; + repo = "protobuf"; + rev = "d490587268931da78c942a6372ef57bb53db80da"; + sha256 = "100494s66xclw88bdnpb6d386vgw0gwz90sni37q7fqmi9w99z6v"; + }; + + # Based on ci/prebuilt/BUILD + # + # The paths have been fixed up, and the static archives have been replaced + # with dynamic libraries where presently possible. + # + # At the moment, this doesn't _need_ to be a map that we dynamically create a + # BUILD file from (we could instead just include the contents directly); + # however, this sets us up to be ready if we (or upstream) decide to split + # things into multiple bazel repos, instead of one. + ccTargets = { + ares = { + pkg = c-ares; + srcs = ''["lib/libcares.so"]''; + hdrs = ''glob(["include/ares*.h"])''; + includes = ''["include"]''; + }; + + backward = { + pkg = backward-cpp; + hdrs = ''["include/backward.hpp"]''; + includes = ''["include"]''; + }; + + crypto = { + pkg = boringssl; + srcs = ''["lib/libcrypto.a"]''; + hdrs = ''glob(["include/openssl/**/*.h"])''; + includes = ''["include"]''; + }; + + event = { + pkg = libevent; + srcs = ''["lib/libevent.so"]''; + hdrs = ''glob(["include/event2/**/*.h"])''; + includes = ''["include"]''; + }; + + event_pthreads = { + pkg = libevent; + srcs = ''["lib/libevent_pthreads.so"]''; + deps = ''[":event"]''; + }; + + googletest = { + pkg = gtest; + srcs = ''[ "lib/libgmock.so", "lib/libgtest.so" ]''; + hdrs = ''glob(["include/gmock/**/*.h", "include/gtest/**/*.h"])''; + includes = ''["include"]''; + }; + + http_parser = { + pkg = http-parser; + srcs = ''["lib/libhttp_parser.so"]''; + hdrs = ''glob(["include/http_parser.h"])''; + includes = ''["include"]''; + }; + + lightstep = { + pkg = lightstep-tracer-cpp; + srcs = ''["lib/liblightstep_core_cxx11.a"]''; + hdrs = ''glob([ "include/lightstep/**/*.h", "include/mapbox_variant/**/*.hpp" ]) + [ "include/collector.pb.h", "include/lightstep_carrier.pb.h" ]''; + includes = ''["include"]''; + deps = ''[":protobuf"]''; + }; + + nghttp2 = { + pkg = nghttp2; + srcs = ''["lib/libnghttp2.so"]''; + hdrs = ''glob(["include/nghttp2/**/*.h"])''; + includes = ''["include"]''; + }; + + protobuf = { + pkg = protobuf3_2; + srcs = ''glob(["lib/libproto*.so"])''; + hdrs = ''glob(["include/google/protobuf/**/*.h"])''; + includes = ''["include"]''; + }; + + rapidjson = { + pkg = rapidjson; + hdrs = ''glob(["include/rapidjson/**/*.h"])''; + includes = ''["include"]''; + }; + + spdlog = { + pkg = spdlog; + name = "spdlog"; + hdrs = ''glob([ "include/spdlog/**/*.cc", "include/spdlog/**/*.h" ])''; + includes = ''["include"]''; + }; + + ssl = { + pkg = boringssl; + srcs = ''["lib/libssl.a"]''; + deps = ''[":crypto"]''; + }; + + tclap = { + pkg = tclap; + hdrs = ''glob(["include/tclap/**/*.h"])''; + includes = ''["include"]''; + }; + + tcmalloc_and_profiler = { + pkg = gperftools; + srcs = ''["lib/libtcmalloc_and_profiler.so"]''; + hdrs = ''glob(["include/gperftools/**/*.h"])''; + strip_include_prefix = ''"include"''; + }; + }; + + # Generate the BUILD file. + buildFile = + let field = name: attrs: + if attrs ? "${name}" then " ${name} = ${attrs.${name}},\n" else ""; + in + '' + licenses(["notice"]) # Apache 2 + + package(default_visibility = ["//visibility:public"]) + + '' + + lib.concatStringsSep "\n\n" ( + lib.mapAttrsToList (name: value: + "cc_library(\n" + + " name = \"${name}\",\n" + + field "srcs" value + + field "hdrs" value + + field "deps" value + + field "includes" value + + field "strip_include_prefix" value + + ")" + ) ccTargets + ) + '' + + filegroup( + name = "protoc", + srcs = ["bin/protoc"], + ) + ''; + + workspaceFile = + '' + workspace(name = "nix") + + load("//bazel:repositories.bzl", "envoy_dependencies") + load("//bazel:cc_configure.bzl", "cc_configure") + + new_local_repository( + name = "nix_envoy_deps", + path = "${repoEnv}", + build_file = "nix_envoy_deps.BUILD" + ) + + envoy_dependencies( + path = "@nix_envoy_deps//", + skip_protobuf_bzl = True, + ) + + new_local_repository( + name = "protobuf_bzl", + path = "${protobuf_bzl}", + # We only want protobuf.bzl, so don't support building out of this repo. + build_file_content = "", + ) + + cc_configure() + ''; + + # The tree we'll use for our new_local_repository in our generated WORKSPACE. + repoEnv = buildEnv { + name = "repo-env"; + paths = lib.concatMap (p: + lib.unique [(lib.getBin p) (lib.getLib p) (lib.getDev p)] + ) allDeps; + }; + + rpath = stdenv.lib.makeLibraryPath (allDeps ++ [ stdenv.cc.cc ]); + + allDeps = [ + c-ares + backward-cpp + libevent + gtest + gperftools + http-parser + lightstep-tracer-cpp + nghttp2 + protobuf3_2 + tclap + rapidjson + spdlog + boringssl + ]; + + # Envoy checks at runtime that the git sha is valid, + # so we really can't avoid putting some sort of sha here. + rev = "3afc7712a04907ffd25ed497626639febfe65735"; + +in + +stdenv.mkDerivation rec { + name = "envoy-${version}"; + version = "1.3.0"; + + src = fetchFromGitHub { + owner = "lyft"; + repo = "envoy"; + rev = "v${version}"; + sha256 = "0j1c9lyvncyhiq3kyhx91ckcjd2h68x56js7xb6ni6bzxinv6zb6"; + }; + + nativeBuildInputs = [ + pkgconfig bazel + ]; + + buildInputs = allDeps; + + patches = [ ./nixos.patch ]; + + hardeningDisable = "all"; + dontPatchELF = true; + dontStrip = true; + + # set up our workspace, + # and prevent an error where bazel/get_workspace_status tries to determine the + # version by invoking git. + postUnpack = '' + cat <<'EOF' > $sourceRoot/WORKSPACE + ${workspaceFile} + EOF + + cat <<'EOF' > $sourceRoot/nix_envoy_deps.BUILD + ${buildFile} + EOF + + cat <<'EOF' > $sourceRoot/bazel/get_workspace_status + #!${stdenv.shell} + echo "BUILD_SCM_REVISION ${rev}" + echo "BUILD_SCM_STATUS Modified" + EOF + ''; + + buildPhase = '' + runHook preBuild + + mkdir .home + export HOME=$PWD/.home + + BAZEL_OPTIONS="--package_path %workspace%:$PWD" + BAZEL_BUILD_OPTIONS="\ + --strategy=Genrule=standalone \ + --spawn_strategy=standalone \ + --verbose_failures \ + $BAZEL_OPTIONS \ + --action_env=HOME \ + --action_env=PYTHONUSERBASE \ + --show_task_finish" + + bazel \ + --batch \ + build \ + -s --verbose_failures \ + --experimental_ui \ + $BAZEL_BUILD_OPTIONS \ + -c opt \ + //source/exe:envoy-static + + exe=bazel-bin/source/exe/envoy-static + chmod +w $exe + patchelf --set-rpath ${rpath} $exe + + runHook postBuild + ''; + + installPhase = '' + mkdir -p $out/bin + mv $exe $out/bin/envoy + ''; + + meta = with lib; { + description = "L7 proxy and communication bus designed for large modern service oriented architectures"; + homepage = "https://lyft.github.io/envoy/"; + license = licenses.asl20; + platforms = platforms.linux; + maintainers = with maintainers; [ cstrahan ]; + }; +} diff --git a/pkgs/tools/networking/envoy/nixos.patch b/pkgs/tools/networking/envoy/nixos.patch new file mode 100644 index 00000000000..04b63a2dde9 --- /dev/null +++ b/pkgs/tools/networking/envoy/nixos.patch @@ -0,0 +1,41 @@ +diff --git a/bazel/cc_configure.bzl b/bazel/cc_configure.bzl +index 8a7a69c4f..75526520c 100644 +--- a/bazel/cc_configure.bzl ++++ b/bazel/cc_configure.bzl +@@ -292,6 +292,8 @@ def _crosstool_content(repository_ctx, cc, cpu_value, darwin): + "-fstack-protector", + # All warnings are enabled. Maybe enable -Werror as well? + "-Wall", ++ ++ "-Wno-error=strict-aliasing" + # Enable a few more warnings that aren't part of -Wall. + ] + (["-Wthread-safety", "-Wself-assign"] if darwin else [ + "-B" + str(repository_ctx.path(cc).dirname), +@@ -365,10 +367,6 @@ def _opt_content(darwin): + # Profile first and / or use FDO if you need better performance than this. + "-O2", + +- # Security hardening on by default. +- # Conservative choice; -D_FORTIFY_SOURCE=2 may be unsafe in some cases. +- "-D_FORTIFY_SOURCE=1", +- + # Disable assertions + "-DNDEBUG", + +diff --git a/bazel/envoy_build_system.bzl b/bazel/envoy_build_system.bzl +index f17671035..7938047bd 100644 +--- a/bazel/envoy_build_system.bzl ++++ b/bazel/envoy_build_system.bzl +@@ -131,11 +131,9 @@ def envoy_cc_binary(name, + # --build-id and avoid doing the following. + '-Wl,--build-id=md5', + '-Wl,--hash-style=gnu', +- "-static-libstdc++", +- "-static-libgcc", + ], + testonly = testonly, +- linkstatic = 1, ++ linkstatic = 0, + visibility = visibility, + malloc = tcmalloc_external_dep(repository), + # See above comment on MD5 hash, this is another "force MD5 stamps" to make sure our diff --git a/pkgs/tools/networking/kea/default.nix b/pkgs/tools/networking/kea/default.nix index 8a474812e19..e1829bcaf7d 100644 --- a/pkgs/tools/networking/kea/default.nix +++ b/pkgs/tools/networking/kea/default.nix @@ -14,8 +14,8 @@ stdenv.mkDerivation rec { patches = [ ./dont-create-var.patch ]; postPatch = '' - substituteInPlace ./src/bin/keactrl/Makefile.am '@sysconfdir@' "$out/etc" - substituteInPlace ./src/bin/keactrl/Makefile.am '@(sysconfdir)@' "$out/etc" + substituteInPlace ./src/bin/keactrl/Makefile.am --replace '@sysconfdir@' "$out/etc" + substituteInPlace ./src/bin/keactrl/Makefile.am --replace '@(sysconfdir)@' "$out/etc" ''; configureFlags = [ diff --git a/pkgs/tools/networking/privoxy/default.nix b/pkgs/tools/networking/privoxy/default.nix index 12744456cc4..48a803268be 100644 --- a/pkgs/tools/networking/privoxy/default.nix +++ b/pkgs/tools/networking/privoxy/default.nix @@ -15,6 +15,8 @@ stdenv.mkDerivation rec{ nativeBuildInputs = [ autoreconfHook w3m man ]; buildInputs = [ zlib pcre ]; + makeFlags = [ "STRIP="]; + postInstall = '' rm -rf $out/var ''; diff --git a/pkgs/tools/networking/tlsdate/default.nix b/pkgs/tools/networking/tlsdate/default.nix deleted file mode 100644 index efea10eaa4d..00000000000 --- a/pkgs/tools/networking/tlsdate/default.nix +++ /dev/null @@ -1,51 +0,0 @@ -{ stdenv, fetchFromGitHub, fetchpatch -, autoconf -, automake -, libevent -, libtool -, pkgconfig -, openssl -}: - -stdenv.mkDerivation rec { - version = "0.0.13"; - name = "tlsdate-${version}"; - - src = fetchFromGitHub { - owner = "ioerror"; - repo = "tlsdate"; - rev = name; - sha256 = "0w3v63qmbhpqlxjsvf4k3zp90k6mdzi8cdpgshan9iphy1f44xgl"; - }; - - patches = [ - (fetchpatch { - name = "tlsdate-no_sslv3.patch"; - url = "https://github.com/ioerror/tlsdate/commit/f9d3cba7536d1679e98172ccbddad32bc9ae490c.patch"; - sha256 = "0prv46vxvb4paxaswmc6ix0kd5sp0552i5msdldnhg9fysbac8s0"; - }) - ]; - - buildInputs = [ - autoconf - automake - libevent - libtool - pkgconfig - openssl - ]; - - preConfigure = '' - export COMPILE_DATE=0 - ./autogen.sh - ''; - - doCheck = true; - - meta = with stdenv.lib; { - description = "Secure parasitic rdate replacement"; - homepage = https://github.com/ioerror/tlsdate; - maintainers = with maintainers; [ tv fpletz ]; - platforms = platforms.allBut platforms.darwin; - }; -} diff --git a/pkgs/tools/networking/uget/default.nix b/pkgs/tools/networking/uget/default.nix index b5119bc594b..d3877260450 100644 --- a/pkgs/tools/networking/uget/default.nix +++ b/pkgs/tools/networking/uget/default.nix @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { buildInputs = [ openssl curl libnotify gstreamer gst-plugins-base gst-plugins-good - gnome3.gtk gnome3.dconf + gnome3.gtk (stdenv.lib.getLib gnome3.dconf) ] ++ (stdenv.lib.optional (aria2 != null) aria2); @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { ${stdenv.lib.optionalString (aria2 != null) ''--suffix PATH : "${aria2}/bin"''} \ --prefix XDG_DATA_DIRS : "$out/share:$GSETTINGS_SCHEMAS_PATH" \ --prefix GST_PLUGIN_SYSTEM_PATH : "$GST_PLUGIN_SYSTEM_PATH" \ - --prefix GIO_EXTRA_MODULES : "${gnome3.dconf}/lib/gio/modules" + --prefix GIO_EXTRA_MODULES : "${stdenv.lib.getLib gnome3.dconf}/lib/gio/modules" ''; meta = with stdenv.lib; { diff --git a/pkgs/tools/security/tor/default.nix b/pkgs/tools/security/tor/default.nix index 2555aeccea4..62438d1843b 100644 --- a/pkgs/tools/security/tor/default.nix +++ b/pkgs/tools/security/tor/default.nix @@ -3,11 +3,11 @@ }: stdenv.mkDerivation rec { - name = "tor-0.3.0.9"; + name = "tor-0.3.0.10"; src = fetchurl { url = "https://dist.torproject.org/${name}.tar.gz"; - sha256 = "0hhyb1wil8japynqnm07r1f67w3wdnafdg9amzlrrcfcyq5qim28"; + sha256 = "1cas30wk4bhcivi6l9dj7wwlz6pc2jj883x1vijax3b8l54nx3ls"; }; outputs = [ "out" "geoip" ]; diff --git a/pkgs/tools/system/facter/default.nix b/pkgs/tools/system/facter/default.nix index b66cd7d6112..55bf93608e8 100644 --- a/pkgs/tools/system/facter/default.nix +++ b/pkgs/tools/system/facter/default.nix @@ -2,15 +2,18 @@ stdenv.mkDerivation rec { name = "facter-${version}"; - version = "3.6.4"; + version = "3.6.6"; src = fetchFromGitHub { - sha256 = "177mmg5a4s4q2p76df4z6c51nfnr73qya1pvvj6fcs1gld01xjr6"; + sha256 = "07jphvwfmvrq28f8k15k16kz090zvb11nn6bd895fz5axag01ins"; rev = version; repo = "facter"; owner = "puppetlabs"; }; + CXXFLAGS = "-fpermissive"; + NIX_CFLAGS_COMPILE = "-Wno-error"; + cmakeFlags = [ "-DFACTER_RUBY=${ruby}/lib/libruby.so" ]; # since we cant expand $out in cmakeFlags @@ -18,6 +21,8 @@ stdenv.mkDerivation rec { buildInputs = [ boost cmake cpp-hocon curl leatherman libyamlcpp openssl ruby utillinux ]; + enableParallelBuilding = true; + meta = with stdenv.lib; { homepage = https://github.com/puppetlabs/facter; description = "A system inventory tool"; diff --git a/pkgs/tools/system/journalbeat/default.nix b/pkgs/tools/system/journalbeat/default.nix index 4b8ea62219e..de4687a6a57 100644 --- a/pkgs/tools/system/journalbeat/default.nix +++ b/pkgs/tools/system/journalbeat/default.nix @@ -7,7 +7,7 @@ let in buildGoPackage rec { name = "journalbeat-${version}"; - version = "5.4.1"; + version = "5.5.0"; goPackagePath = "github.com/mheese/journalbeat"; @@ -22,7 +22,7 @@ in buildGoPackage rec { owner = "mheese"; repo = "journalbeat"; rev = "v${version}"; - sha256 = "14mhx3gqg19ljcr07ahbry9k5hkbj2mjji4qsjrbc7jknis6frz4"; + sha256 = "134n1kg6nx5yycn2cyldiayaqm8zps94hz4zfz9klp2jzq68m35y"; }; meta = with lib; { diff --git a/pkgs/tools/system/logrotate/default.nix b/pkgs/tools/system/logrotate/default.nix index af7e4543579..1c8b386fc8c 100644 --- a/pkgs/tools/system/logrotate/default.nix +++ b/pkgs/tools/system/logrotate/default.nix @@ -1,23 +1,28 @@ -{ stdenv, fetchurl, gzip, popt }: +{ stdenv, fetchFromGitHub, mailutils, gzip, popt, autoreconfHook }: stdenv.mkDerivation rec { - name = "logrotate-3.9.1"; + name = "logrotate-${version}"; + version = "3.12.3"; - src = fetchurl { - url = "https://fedorahosted.org/releases/l/o/logrotate/${name}.tar.gz"; - sha256 = "0i95qnacv5wf7kfkcpi38ys3i14fr01ifhm8b4ari04c53inj9q2"; + src = fetchFromGitHub { + owner = "logrotate"; + repo = "logrotate"; + rev = version; + sha256 = "04ygb709fj4ai8m2f1c6imzcmkdvr3ib5zf5qw2lif4fsb30jvyi"; }; # Logrotate wants to access the 'mail' program; to be done. patchPhase = '' sed -i -e 's,[a-z/]\+gzip,${gzip}/bin/gzip,' \ - -e 's,[a-z/]\+gunzip,${gzip}/bin/gunzip,' config.h + -e 's,[a-z/]\+gunzip,${gzip}/bin/gunzip,' \ + -e 's,[a-z/]\+mail,${mailutils}/bin/mail,' configure.ac ''; - preBuild = '' - makeFlags="BASEDIR=$out" + autoreconfPhase = '' + ./autogen.sh ''; + nativeBuildInputs = [ autoreconfHook ]; buildInputs = [ popt ]; meta = { @@ -27,5 +32,4 @@ stdenv.mkDerivation rec { maintainers = [ stdenv.lib.maintainers.viric ]; platforms = stdenv.lib.platforms.all; }; - } diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 6dd9427c2ce..62e293b3c08 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -611,9 +611,9 @@ with pkgs; inherit (androidenv) androidndk; - androidsdk = androidenv.androidsdk_7_1_1; + androidsdk = androidenv.androidsdk_8_0; - androidsdk_extras = self.androidenv.androidsdk_7_1_1_extras; + androidsdk_extras = self.androidenv.androidsdk_8_0_extras; arc-theme = callPackage ../misc/themes/arc { }; @@ -898,6 +898,8 @@ with pkgs; crudini = callPackage ../tools/misc/crudini { }; + cucumber = callPackage ../development/tools/cucumber {}; + daemontools = callPackage ../tools/admin/daemontools { }; dale = callPackage ../development/compilers/dale { }; @@ -1051,6 +1053,8 @@ with pkgs; glock = callPackage ../development/tools/glock { }; + glslviewer = callPackage ../development/tools/glslviewer { }; + gmic = callPackage ../tools/graphics/gmic { }; goa = callPackage ../development/tools/goa { }; @@ -1334,7 +1338,8 @@ with pkgs; clementine = callPackage ../applications/audio/clementine { boost = boost155; - gst_plugins = [ gst-plugins-base gst-plugins-good gst-plugins-ugly gst-ffmpeg ]; + gst_plugins = + with gst_all_1; [ gst-plugins-base gst-plugins-good gst-plugins-ugly ]; }; clementineFree = clementine.free; @@ -1816,6 +1821,8 @@ with pkgs; entr = callPackage ../tools/misc/entr { }; + envoy = callPackage ../tools/networking/envoy { }; + eot_utilities = callPackage ../tools/misc/eot-utilities { }; eplot = callPackage ../tools/graphics/eplot { }; @@ -2897,15 +2904,6 @@ with pkgs; enableNpm = false; }; - nodejs-7_x = callPackage ../development/web/nodejs/v7.nix { - libtool = darwin.cctools; - }; - - nodejs-slim-7_x = callPackage ../development/web/nodejs/v7.nix { - libtool = darwin.cctools; - enableNpm = false; - }; - nodejs-8_x = callPackage ../development/web/nodejs/v8.nix { libtool = darwin.cctools; }; @@ -2962,8 +2960,6 @@ with pkgs; libevdev = callPackage ../development/libraries/libevdev { }; - libevhtp = callPackage ../development/libraries/libevhtp { }; - libfann = callPackage ../development/libraries/libfann { }; libircclient = callPackage ../development/libraries/libircclient { }; @@ -3505,6 +3501,8 @@ with pkgs; oh-my-zsh = callPackage ../shells/oh-my-zsh { }; + ola = callPackage ../applications/misc/ola { }; + opencc = callPackage ../tools/text/opencc { }; opencl-info = callPackage ../tools/system/opencl-info { }; @@ -3906,7 +3904,9 @@ with pkgs; qarte = callPackage ../applications/video/qarte { }; - qnial = callPackage ../development/interpreters/qnial {}; + qlcplus = libsForQt5.callPackage ../applications/misc/qlcplus { }; + + qnial = callPackage ../development/interpreters/qnial { }; ocz-ssd-guru = callPackage ../tools/misc/ocz-ssd-guru { }; @@ -4472,8 +4472,6 @@ with pkgs; tiny8086 = callPackage ../applications/virtualization/8086tiny { }; - tlsdate = callPackage ../tools/networking/tlsdate { }; - tldr = callPackage ../tools/misc/tldr { }; tlspool = callPackage ../tools/networking/tlspool { }; @@ -5182,6 +5180,11 @@ with pkgs; clang = llvmPackages.clang; + clang-sierraHack = clang.override { + name = "clang-wrapper-with-reexport-hack"; + useMacosReexportHack = true; + }; + clang_4 = llvmPackages_4.clang; clang_39 = llvmPackages_39.clang; clang_38 = llvmPackages_38.clang; @@ -5209,6 +5212,7 @@ with pkgs; #Use this instead of stdenv to build with clang clangStdenv = if stdenv.isDarwin then stdenv else lowPrio llvmPackages.stdenv; + clang-sierraHack-stdenv = overrideCC stdenv clang-sierraHack; libcxxStdenv = lowPrio llvmPackages.libcxxStdenv; clean = callPackage ../development/compilers/clean { }; @@ -5219,13 +5223,10 @@ with pkgs; cmucl_binary = callPackage_i686 ../development/compilers/cmucl/binary.nix { }; - compcert = callPackage ../development/compilers/compcert (( - if system == "x86_64-linux" - then { tools = pkgsi686Linux.stdenv.cc; } - else {} - ) // { - coq = coq_8_6; - }); + compcert = callPackage ../development/compilers/compcert { + # Pin the version of coq used in compcert to 8.6 until the next release + coq = callPackage ../applications/science/logic/coq { version = "8.6"; }; + }; # Users installing via `nix-env` will likely be using the REPL, @@ -7103,6 +7104,10 @@ with pkgs; noweb = callPackage ../development/tools/literate-programming/noweb { }; nuweb = callPackage ../development/tools/literate-programming/nuweb { tex = texlive.combined.scheme-small; }; + obelisk = callPackage ../development/tools/ocaml/obelisk { + ocamlPackages = ocaml-ng.ocamlPackages_4_03; + }; + obuild = callPackage ../development/tools/ocaml/obuild { }; omake = callPackage ../development/tools/ocaml/omake { @@ -7469,6 +7474,8 @@ with pkgs; babl = callPackage ../development/libraries/babl { }; + backward-cpp = callPackage ../development/libraries/backward-cpp { }; + bctoolbox = callPackage ../development/libraries/bctoolbox { mbedtls = mbedtls_1_3; }; @@ -7517,8 +7524,6 @@ with pkgs; capnproto = callPackage ../development/libraries/capnproto { }; - ccnx = callPackage ../development/libraries/ccnx { }; - ndn-cxx = callPackage ../development/libraries/ndn-cxx { }; cddlib = callPackage ../development/libraries/cddlib {}; @@ -8033,6 +8038,8 @@ with pkgs; # A GMP fork mpir = callPackage ../development/libraries/mpir {}; + gns3-gui = callPackage ../applications/networking/gns3/gui.nix { }; + gobjectIntrospection = callPackage ../development/libraries/gobject-introspection { nixStoreDir = config.nix.storeDir or builtins.storeDir; inherit (darwin) cctools; @@ -8749,10 +8756,6 @@ with pkgs; libexosip = callPackage ../development/libraries/exosip {}; - libexosip_3 = callPackage ../development/libraries/exosip/3.x.nix { - libosip = libosip_3; - }; - libextractor = callPackage ../development/libraries/libextractor { libmpeg2 = mpeg2dec; }; @@ -9031,8 +9034,6 @@ with pkgs; libmrss = callPackage ../development/libraries/libmrss { }; - libmsn = callPackage ../development/libraries/libmsn { }; - libmspack = callPackage ../development/libraries/libmspack { }; libmusicbrainz2 = callPackage ../development/libraries/libmusicbrainz/2.x.nix { }; @@ -9379,6 +9380,8 @@ with pkgs; lightlocker = callPackage ../misc/screensavers/light-locker { }; + lightstep-tracer-cpp = callPackage ../development/libraries/lightstep-tracer-cpp { }; + linenoise = callPackage ../development/libraries/linenoise { }; linenoise-ng = callPackage ../development/libraries/linenoise-ng { }; @@ -10061,6 +10064,8 @@ with pkgs; rabbitmq-java-client = callPackage ../development/libraries/rabbitmq-java-client {}; + rapidjson = callPackage ../development/libraries/rapidjson {}; + raul = callPackage ../development/libraries/audio/raul { }; readline = readline6; @@ -10077,7 +10082,7 @@ with pkgs; readosm = callPackage ../development/libraries/readosm { }; lambdabot = callPackage ../development/tools/haskell/lambdabot { - haskell-lib = haskell.lib; + haskellLib = haskell.lib; }; lambda-mod-zsh-theme = callPackage ../shells/lambda-mod-zsh-theme/default.nix { }; @@ -10573,8 +10578,6 @@ with pkgs; wt = callPackage ../development/libraries/wt { }; - wvstreams = callPackage ../development/libraries/wvstreams { }; - wxGTK = wxGTK28; wxGTK28 = callPackage ../development/libraries/wxwidgets/2.8 { @@ -11430,6 +11433,7 @@ with pkgs; prometheus-mysqld-exporter = callPackage ../servers/monitoring/prometheus/mysqld-exporter.nix { }; prometheus-nginx-exporter = callPackage ../servers/monitoring/prometheus/nginx-exporter.nix { }; prometheus-node-exporter = callPackage ../servers/monitoring/prometheus/node-exporter.nix { }; + prometheus-openvpn-exporter = callPackage ../servers/monitoring/prometheus/openvpn-exporter.nix { }; prometheus-pushgateway = callPackage ../servers/monitoring/prometheus/pushgateway.nix { }; prometheus-snmp-exporter = callPackage ../servers/monitoring/prometheus/snmp-exporter.nix { }; prometheus-statsd-bridge = callPackage ../servers/monitoring/prometheus/statsd-bridge.nix { }; @@ -13034,6 +13038,8 @@ with pkgs; man-pages = callPackage ../data/documentation/man-pages { }; + material-icons = callPackage ../data/fonts/material-icons { }; + meslo-lg = callPackage ../data/fonts/meslo-lg {}; miscfiles = callPackage ../data/misc/miscfiles { }; @@ -14180,7 +14186,7 @@ with pkgs; gnuradio-osmosdr = callPackage ../applications/misc/gnuradio-osmosdr { }; - goldendict = libsForQt56.callPackage ../applications/misc/goldendict { }; + goldendict = libsForQt5.callPackage ../applications/misc/goldendict { }; inherit (ocamlPackages) google-drive-ocamlfuse; @@ -14240,8 +14246,6 @@ with pkgs; wireshark-qt = wireshark-cli.override { withQt = true; }; wireshark = wireshark-qt; - wvdial = callPackage ../os-specific/linux/wvdial { }; - fbida = callPackage ../applications/graphics/fbida { }; fdupes = callPackage ../tools/misc/fdupes { }; @@ -14961,10 +14965,6 @@ with pkgs; lci = callPackage ../applications/science/logic/lci {}; - ldcpp = callPackage ../applications/networking/p2p/ldcpp { - inherit (gnome2) libglade; - }; - lemonbar = callPackage ../applications/window-managers/lemonbar { }; lemonbar-xft = callPackage ../applications/window-managers/lemonbar/xft.nix { }; @@ -15527,6 +15527,8 @@ with pkgs; vivaldi = callPackage ../applications/networking/browsers/vivaldi {}; + vivaldi-ffmpeg-codecs = callPackage ../applications/networking/browsers/vivaldi/ffmpeg-codecs.nix {}; + openmpt123 = callPackage ../applications/audio/openmpt123 {}; opusfile = callPackage ../applications/audio/opusfile { }; @@ -15888,9 +15890,8 @@ with pkgs; remotebox = callPackage ../applications/virtualization/remotebox { }; - retroshare = callPackage ../applications/networking/p2p/retroshare { }; - - retroshare06 = lowPrio (callPackage ../applications/networking/p2p/retroshare/0.6.nix { }); + retroshare = libsForQt5.callPackage ../applications/networking/p2p/retroshare { }; + retroshare06 = retroshare; ricochet = libsForQt56.callPackage ../applications/networking/instant-messengers/ricochet { }; @@ -16431,8 +16432,6 @@ with pkgs; utox = callPackage ../applications/networking/instant-messengers/utox { }; - vanitygen = callPackage ../applications/misc/vanitygen { }; - vanubi = callPackage ../applications/editors/vanubi { }; vbindiff = callPackage ../applications/editors/vbindiff { }; @@ -17805,6 +17804,8 @@ with pkgs; numix-gtk-theme = callPackage ../misc/themes/numix { }; + numix-sx-gtk-theme = callPackage ../misc/themes/numix-sx { }; + theme-vertex = callPackage ../misc/themes/vertex { }; rox-filer = callPackage ../desktops/rox/rox-filer { @@ -18326,7 +18327,6 @@ with pkgs; geogebra = callPackage ../applications/science/math/geogebra { }; maxima = callPackage ../applications/science/math/maxima { - sbcl = sbcl_1_3_12; ecl = null; }; maxima-ecl = callPackage ../applications/science/math/maxima { @@ -18605,6 +18605,8 @@ with pkgs; flat-plat = callPackage ../misc/themes/flat-plat { }; + flockit = callPackage ../tools/backup/flockit { }; + foldingathome = callPackage ../misc/foldingathome { }; foo2zjs = callPackage ../misc/drivers/foo2zjs {}; @@ -18615,8 +18617,6 @@ with pkgs; gajim = callPackage ../applications/networking/instant-messengers/gajim { }; - gale = callPackage ../applications/networking/instant-messengers/gale { }; - gammu = callPackage ../applications/misc/gammu { }; gensgs = callPackage_i686 ../misc/emulators/gens-gs { }; @@ -18908,10 +18908,12 @@ with pkgs; inherit (callPackage ../applications/networking/cluster/terraform {}) terraform_0_8_5 terraform_0_8_8 - terraform_0_9_11; + terraform_0_9_11 + terraform_0_10_0; terraform_0_8 = terraform_0_8_8; terraform_0_9 = terraform_0_9_11; + terraform_0_10 = terraform_0_10_0; terraform = terraform_0_9; terraform-inventory = callPackage ../applications/networking/cluster/terraform-inventory {}; @@ -19242,4 +19244,9 @@ with pkgs; houdini = callPackage ../applications/misc/houdini {}; xtermcontrol = callPackage ../applications/misc/xtermcontrol {}; + + # `recurseIntoAttrs` for sake of hydra, not nix-env + tests = recurseIntoAttrs { + macOSSierraShared = callPackage ../test/macos-sierra-shared {}; + }; } diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix index 099e45f1022..81a32e1219f 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -1,24 +1,32 @@ -{ pkgs, callPackage, stdenv, buildPlatform, targetPlatform }: +{ pkgs, lib, newScope, stdenv, buildPlatform, targetPlatform }: -let # These are attributes in compiler and packages that don't support integer-simple. - integerSimpleExcludes = [ - "ghc6102Binary" - "ghc704Binary" - "ghc742Binary" - "ghc6104" - "ghc6123" - "ghc704" - "ghc763" - "ghcjs" - "ghcjsHEAD" - "ghcCross" - "jhc" - "uhc" - "integer-simple" - ]; -in rec { +let + # These are attributes in compiler and packages that don't support integer-simple. + integerSimpleExcludes = [ + "ghc6102Binary" + "ghc704Binary" + "ghc742Binary" + "ghc6104" + "ghc6123" + "ghc704" + "ghc763" + "ghcjs" + "ghcjsHEAD" + "ghcCross" + "jhc" + "uhc" + "integer-simple" + ]; + + haskellLib = import ../development/haskell-modules/lib.nix { + inherit (pkgs) lib; + inherit pkgs; + }; - lib = import ../development/haskell-modules/lib.nix { inherit pkgs; }; + callPackage = newScope { inherit haskellLib; }; + +in rec { + lib = haskellLib; compiler = { diff --git a/pkgs/top-level/ocaml-packages.nix b/pkgs/top-level/ocaml-packages.nix index bc5253328cf..492b22c0552 100644 --- a/pkgs/top-level/ocaml-packages.nix +++ b/pkgs/top-level/ocaml-packages.nix @@ -552,6 +552,8 @@ let ppx_tools_versioned = callPackage ../development/ocaml-modules/ppx_tools_versioned { }; + process = callPackage ../development/ocaml-modules/process { }; + ptmap = callPackage ../development/ocaml-modules/ptmap { }; pycaml = callPackage ../development/ocaml-modules/pycaml { }; @@ -610,6 +612,8 @@ let vg = callPackage ../development/ocaml-modules/vg { }; + wasm = callPackage ../development/ocaml-modules/wasm { }; + x509 = callPackage ../development/ocaml-modules/x509 { }; xmlm = callPackage ../development/ocaml-modules/xmlm { }; diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 156be853ceb..8601f266186 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -14183,12 +14183,13 @@ let self = _self // overrides; _self = with self; { }; TextBibTeX = buildPerlModule rec { - name = "Text-BibTeX-0.72"; + name = "Text-BibTeX-0.81"; buildInputs = [ ConfigAutoConf ExtUtilsLibBuilder ]; src = fetchurl { url = "mirror://cpan/authors/id/A/AM/AMBS/${name}.tar.gz"; - sha256 = "0vfnj9ygdjympc8hsf38nc4a1lq45qbq7v6z6mrnfgr3k198b6gw"; + sha256 = "0dig1zlglm8rwm8fhnz087lx6gixj9jx10kxn1fx3swdkfblhsmf"; }; + perlPreHook = "export LD=gcc"; meta = { description = "Interface to read and parse BibTeX files"; license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index f0fd99d1774..1764b4b743b 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -8229,11 +8229,11 @@ in { }; raven = buildPythonPackage rec { - name = "raven-3.4.1"; + name = "raven-6.1.0"; src = pkgs.fetchurl { url = "mirror://pypi/r/raven/${name}.tar.gz"; - sha256 = "c27e40ab3ccf37f30a9f77acb4917370d9341e25abda8e94b9bd48c7127f7d48"; + sha256 = "1158fsjjl8byzl9nw52jhhdssjl6n7l0hjaxm5hdi69v2zxvzjh2"; }; # way too many dependencies to run tests @@ -8241,7 +8241,7 @@ in { doCheck = false; meta = { - maintainers = with maintainers; [ domenkozar ]; + maintainers = with maintainers; [ primeos ]; }; }; @@ -10200,7 +10200,7 @@ in { }; patchPhase = '' - substituteInPlace dialog.py ":/bin:/usr/bin" ":$out/bin" + substituteInPlace dialog.py --replace ":/bin:/usr/bin" ":$out/bin" ''; meta = with stdenv.lib; { @@ -12240,6 +12240,8 @@ in { }; }; + linode-api = callPackage ../development/python-modules/linode-api { }; + livereload = buildPythonPackage rec { name = "livereload-${version}"; version = "2.5.0"; diff --git a/pkgs/top-level/release-small.nix b/pkgs/top-level/release-small.nix index f329f2460d7..40218a2b702 100644 --- a/pkgs/top-level/release-small.nix +++ b/pkgs/top-level/release-small.nix @@ -2,7 +2,7 @@ the load on Hydra when testing the `stdenv-updates' branch. */ { nixpkgs ? { outPath = (import ../../lib).cleanSource ../..; revCount = 1234; shortRev = "abcdef"; } -, supportedSystems ? [ "x86_64-linux" "i686-linux" "x86_64-darwin" ] +, supportedSystems ? [ "x86_64-linux" "x86_64-darwin" ] }: with import ./release-lib.nix { inherit supportedSystems; }; diff --git a/pkgs/top-level/release.nix b/pkgs/top-level/release.nix index be57b40fca6..3b45035d114 100644 --- a/pkgs/top-level/release.nix +++ b/pkgs/top-level/release.nix @@ -8,20 +8,23 @@ $ nix-build pkgs/top-level/release.nix -A coreutils.x86_64-linux */ - { nixpkgs ? { outPath = (import ../../lib).cleanSource ../..; revCount = 1234; shortRev = "abcdef"; } , officialRelease ? false -, # The platforms for which we build Nixpkgs. - supportedSystems ? [ "x86_64-linux" "i686-linux" "x86_64-darwin" "aarch64-linux" ] -, # Strip most of attributes when evaluating to spare memory usage - scrubJobs ? true -, # Attributes passed to nixpkgs. Don't build packages marked as unfree. - nixpkgsArgs ? { config = { allowUnfree = false; inHydra = true; }; } + # The platforms for which we build Nixpkgs. +, supportedSystems ? [ "x86_64-linux" "x86_64-darwin" "aarchh64-linux" ] +, limitedSupportedSystems ? [ "i686-linux" ] + # Strip most of attributes when evaluating to spare memory usage +, scrubJobs ? true + # Attributes passed to nixpkgs. Don't build packages marked as unfree. +, nixpkgsArgs ? { config = { allowUnfree = false; inHydra = true; }; } }: with import ./release-lib.nix { inherit supportedSystems scrubJobs nixpkgsArgs; }; let + + systemsWithAnySupport = supportedSystems ++ limitedSupportedSystems; + jobs = { tarball = import ./make-tarball.nix { inherit pkgs nixpkgs officialRelease; }; @@ -42,6 +45,7 @@ let jobs.python.x86_64-darwin jobs.rustc.x86_64-darwin jobs.go.x86_64-darwin + jobs.tests.macOSSierraShared.x86_64-darwin ]; }; @@ -54,43 +58,36 @@ let jobs.manual jobs.lib-tests jobs.stdenv.x86_64-linux - jobs.stdenv.i686-linux jobs.stdenv.x86_64-darwin jobs.linux.x86_64-linux - jobs.linux.i686-linux jobs.python.x86_64-linux - jobs.python.i686-linux jobs.python.x86_64-darwin jobs.python3.x86_64-linux - jobs.python3.i686-linux jobs.python3.x86_64-darwin # Many developers use nix-repl jobs.nix-repl.x86_64-linux - jobs.nix-repl.i686-linux jobs.nix-repl.x86_64-darwin # Needed by travis-ci to test PRs - jobs.nox.i686-linux jobs.nox.x86_64-linux jobs.nox.x86_64-darwin # Ensure that X11/GTK+ are in order. jobs.thunderbird.x86_64-linux - jobs.thunderbird.i686-linux # Ensure that basic stuff works on darwin jobs.git.x86_64-darwin jobs.mysql.x86_64-darwin jobs.vim.x86_64-darwin ] ++ lib.collect lib.isDerivation jobs.stdenvBootstrapTools; }; - } // (lib.optionalAttrs (builtins.elem "i686-linux" supportedSystems) { + } // (lib.optionalAttrs (builtins.elem "i686-linux" systemsWithAnySupport) { stdenvBootstrapTools.i686-linux = { inherit (import ../stdenv/linux/make-bootstrap-tools.nix { system = "i686-linux"; }) dist test; }; - }) // (lib.optionalAttrs (builtins.elem "x86_64-linux" supportedSystems) { + }) // (lib.optionalAttrs (builtins.elem "x86_64-linux" systemsWithAnySupport) { stdenvBootstrapTools.x86_64-linux = { inherit (import ../stdenv/linux/make-bootstrap-tools.nix { system = "x86_64-linux"; }) dist test; }; - }) // (lib.optionalAttrs (builtins.elem "aarch64-linux" supportedSystems) { + }) // (lib.optionalAttrs (builtins.elem "aarch64-linux" systemsWithAnySupport) { stdenvBootstrapTools.aarch64-linux = { inherit (import ../stdenv/linux/make-bootstrap-tools.nix { system = "aarch64-linux"; }) dist test; }; - }) // (lib.optionalAttrs (builtins.elem "x86_64-darwin" supportedSystems) { + }) // (lib.optionalAttrs (builtins.elem "x86_64-darwin" systemsWithAnySupport) { stdenvBootstrapTools.x86_64-darwin = let bootstrap = import ../stdenv/darwin/make-bootstrap-tools.nix { system = "x86_64-darwin"; }; @@ -129,6 +126,8 @@ let scikitlearn = unix; }; + # hack around broken eval of non-linux packages for now. + tests.macOSSierraShared = darwin; } )); in jobs |