diff --git a/doc/languages-frameworks/python.section.md b/doc/languages-frameworks/python.section.md index fe02344a72c..5e10764e476 100644 --- a/doc/languages-frameworks/python.section.md +++ b/doc/languages-frameworks/python.section.md @@ -670,7 +670,7 @@ python3Packages.buildPythonApplication rec { sha256 = "035w8gqql36zlan0xjrzz9j4lh9hs0qrsgnbyw07qs7lnkvbdv9x"; }; - propagatedBuildInputs = with python3Packages; [ tornado_4 pythondaemon ]; + propagatedBuildInputs = with python3Packages; [ tornado_4 python-daemon ]; meta = with lib; { ... diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index a9116f41176..62c62ac5123 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -143,6 +143,11 @@ github = "ahmedtd"; name = "Taahir Ahmed"; }; + ahuzik = { + email = "ales.guzik@gmail.com"; + github = "alesguzik"; + name = "Ales Huzik"; + }; aij = { email = "aij+git@mrph.org"; github = "aij"; diff --git a/nixos/doc/manual/configuration/firewall.xml b/nixos/doc/manual/configuration/firewall.xml index b66adcedce6..47a19ac82c0 100644 --- a/nixos/doc/manual/configuration/firewall.xml +++ b/nixos/doc/manual/configuration/firewall.xml @@ -34,13 +34,4 @@ Similarly, UDP port ranges can be opened through . - - - Also of interest is - - = true; - - to allow the machine to respond to ping requests. (ICMPv6 pings are always - allowed.) - diff --git a/nixos/doc/manual/release-notes/rl-1903.xml b/nixos/doc/manual/release-notes/rl-1903.xml index 9c07184613e..1d9b6ecc0e2 100644 --- a/nixos/doc/manual/release-notes/rl-1903.xml +++ b/nixos/doc/manual/release-notes/rl-1903.xml @@ -152,6 +152,26 @@ has been renamed to postgresql_9_6. + + + Slurm introduces the new option + services.slurm.stateSaveLocation, + which is now set to /var/spool/slurm by default + (instead of /var/spool). + Make sure to move all files to the new directory or to set the option accordingly. + + + The slurmctld now runs as user slurm instead of root. + If you want to keep slurmctld running as root, set + services.slurm.user = root. + + + The options services.slurm.nodeName and + services.slurm.partitionName are now sets of + strings to correctly reflect that fact that each of these + options can occour more than once in the configuration. + + diff --git a/nixos/modules/config/networking.nix b/nixos/modules/config/networking.nix index 1eb6fb43604..627cce67e97 100644 --- a/nixos/modules/config/networking.nix +++ b/nixos/modules/config/networking.nix @@ -228,9 +228,6 @@ in # /etc/protocols: IP protocol numbers. "protocols".source = pkgs.iana-etc + "/etc/protocols"; - # /etc/rpc: RPC program numbers. - "rpc".source = pkgs.glibc.out + "/etc/rpc"; - # /etc/hosts: Hostname-to-IP mappings. "hosts".text = let oneToString = set: ip: ip + " " + concatStringsSep " " set.${ip}; @@ -268,6 +265,9 @@ in "resolv.conf".source = "${pkgs.systemd}/lib/systemd/resolv.conf"; } // optionalAttrs (config.services.resolved.enable && dnsmasqResolve) { "dnsmasq-resolv.conf".source = "/run/systemd/resolve/resolv.conf"; + } // optionalAttrs (pkgs.stdenv.hostPlatform.libc == "glibc") { + # /etc/rpc: RPC program numbers. + "rpc".source = pkgs.glibc.out + "/etc/rpc"; }; networking.proxy.envVars = diff --git a/nixos/modules/config/system-path.nix b/nixos/modules/config/system-path.nix index c07e19bd03c..1793dc628ed 100644 --- a/nixos/modules/config/system-path.nix +++ b/nixos/modules/config/system-path.nix @@ -19,7 +19,9 @@ let pkgs.diffutils pkgs.findutils pkgs.gawk - pkgs.glibc # for ldd, getent + pkgs.stdenv.cc.libc + pkgs.getent + pkgs.getconf pkgs.gnugrep pkgs.gnupatch pkgs.gnused diff --git a/nixos/modules/misc/ids.nix b/nixos/modules/misc/ids.nix index 5c30e512a1b..a32e4fe3f7c 100644 --- a/nixos/modules/misc/ids.nix +++ b/nixos/modules/misc/ids.nix @@ -331,6 +331,7 @@ zeronet = 304; lirc = 305; lidarr = 306; + slurm = 307; # When adding a uid, make sure it doesn't match an existing gid. And don't use uids above 399! @@ -622,6 +623,7 @@ zeronet = 304; lirc = 305; lidarr = 306; + slurm = 307; # When adding a gid, make sure it doesn't match an existing # uid. Users and groups with the same name should have equal diff --git a/nixos/modules/security/apparmor-suid.nix b/nixos/modules/security/apparmor-suid.nix index dfbf5d859ba..498c2f25d1c 100644 --- a/nixos/modules/security/apparmor-suid.nix +++ b/nixos/modules/security/apparmor-suid.nix @@ -28,7 +28,7 @@ with lib; capability setuid, network inet raw, - ${pkgs.glibc.out}/lib/*.so mr, + ${pkgs.stdenv.cc.libc.out}/lib/*.so mr, ${pkgs.libcap.lib}/lib/libcap.so* mr, ${pkgs.attr.out}/lib/libattr.so* mr, diff --git a/nixos/modules/security/dhparams.nix b/nixos/modules/security/dhparams.nix index e2b84c3e3b3..62a499ea624 100644 --- a/nixos/modules/security/dhparams.nix +++ b/nixos/modules/security/dhparams.nix @@ -170,4 +170,6 @@ in { ''; }) cfg.params; }; + + meta.maintainers = with lib.maintainers; [ ekleog ]; } diff --git a/nixos/modules/services/computing/slurm/slurm.nix b/nixos/modules/services/computing/slurm/slurm.nix index 09174ed39f5..cd481212db2 100644 --- a/nixos/modules/services/computing/slurm/slurm.nix +++ b/nixos/modules/services/computing/slurm/slurm.nix @@ -6,13 +6,18 @@ let cfg = config.services.slurm; # configuration file can be generated by http://slurm.schedmd.com/configurator.html + + defaultUser = "slurm"; + configFile = pkgs.writeTextDir "slurm.conf" '' ClusterName=${cfg.clusterName} + StateSaveLocation=${cfg.stateSaveLocation} + SlurmUser=${cfg.user} ${optionalString (cfg.controlMachine != null) ''controlMachine=${cfg.controlMachine}''} ${optionalString (cfg.controlAddr != null) ''controlAddr=${cfg.controlAddr}''} - ${optionalString (cfg.nodeName != null) ''nodeName=${cfg.nodeName}''} - ${optionalString (cfg.partitionName != null) ''partitionName=${cfg.partitionName}''} + ${toString (map (x: "NodeName=${x}\n") cfg.nodeName)} + ${toString (map (x: "PartitionName=${x}\n") cfg.partitionName)} PlugStackConfig=${plugStackConfig} ProctrackType=${cfg.procTrackType} ${cfg.extraConfig} @@ -24,12 +29,19 @@ let ${cfg.extraPlugstackConfig} ''; - cgroupConfig = pkgs.writeTextDir "cgroup.conf" '' ${cfg.extraCgroupConfig} ''; + slurmdbdConf = pkgs.writeTextDir "slurmdbd.conf" + '' + DbdHost=${cfg.dbdserver.dbdHost} + SlurmUser=${cfg.user} + StorageType=accounting_storage/mysql + ${cfg.dbdserver.extraConfig} + ''; + # slurm expects some additional config files to be # in the same directory as slurm.conf etcSlurm = pkgs.symlinkJoin { @@ -43,6 +55,8 @@ in ###### interface + meta.maintainers = [ maintainers.markuskowa ]; + options = { services.slurm = { @@ -60,6 +74,27 @@ in }; }; + dbdserver = { + enable = mkEnableOption "SlurmDBD service"; + + dbdHost = mkOption { + type = types.str; + default = config.networking.hostName; + description = '' + Hostname of the machine where slurmdbd + is running (i.e. name returned by hostname -s). + ''; + }; + + extraConfig = mkOption { + type = types.lines; + default = ""; + description = '' + Extra configuration for slurmdbd.conf + ''; + }; + }; + client = { enable = mkEnableOption "slurm client daemon"; }; @@ -116,9 +151,9 @@ in }; nodeName = mkOption { - type = types.nullOr types.str; - default = null; - example = "linux[1-32] CPUs=1 State=UNKNOWN"; + type = types.listOf types.str; + default = []; + example = literalExample ''[ "linux[1-32] CPUs=1 State=UNKNOWN" ];''; description = '' Name that SLURM uses to refer to a node (or base partition for BlueGene systems). Typically this would be the string that "/bin/hostname -s" @@ -127,9 +162,9 @@ in }; partitionName = mkOption { - type = types.nullOr types.str; - default = null; - example = "debug Nodes=linux[1-32] Default=YES MaxTime=INFINITE State=UP"; + type = types.listOf types.str; + default = []; + example = literalExample ''[ "debug Nodes=linux[1-32] Default=YES MaxTime=INFINITE State=UP" ];''; description = '' Name by which the partition may be referenced. Note that now you have to write the partition's parameters after the name. @@ -150,7 +185,7 @@ in }; procTrackType = mkOption { - type = types.string; + type = types.str; default = "proctrack/linuxproc"; description = '' Plugin to be used for process tracking on a job step basis. @@ -159,6 +194,25 @@ in ''; }; + stateSaveLocation = mkOption { + type = types.str; + default = "/var/spool/slurmctld"; + description = '' + Directory into which the Slurm controller, slurmctld, saves its state. + ''; + }; + + user = mkOption { + type = types.str; + default = defaultUser; + description = '' + Set this option when you want to run the slurmctld daemon + as something else than the default slurm user "slurm". + Note that the UID of this user needs to be the same + on all nodes. + ''; + }; + extraConfig = mkOption { default = ""; type = types.lines; @@ -184,6 +238,8 @@ in used when procTrackType=proctrack/cgroup. ''; }; + + }; }; @@ -220,12 +276,24 @@ in ''; }; - in mkIf (cfg.enableStools || cfg.client.enable || cfg.server.enable) { + in mkIf ( cfg.enableStools || + cfg.client.enable || + cfg.server.enable || + cfg.dbdserver.enable ) { environment.systemPackages = [ wrappedSlurm ]; services.munge.enable = mkDefault true; + # use a static uid as default to ensure it is the same on all nodes + users.users.slurm = mkIf (cfg.user == defaultUser) { + name = defaultUser; + group = "slurm"; + uid = config.ids.uids.slurm; + }; + + users.groups.slurm.gid = config.ids.uids.slurm; + systemd.services.slurmd = mkIf (cfg.client.enable) { path = with pkgs; [ wrappedSlurm coreutils ] ++ lib.optional cfg.enableSrunX11 slurm-spank-x11; @@ -261,6 +329,29 @@ in PIDFile = "/run/slurmctld.pid"; ExecReload = "${pkgs.coreutils}/bin/kill -HUP $MAINPID"; }; + + preStart = '' + mkdir -p ${cfg.stateSaveLocation} + chown -R ${cfg.user}:slurm ${cfg.stateSaveLocation} + ''; + }; + + systemd.services.slurmdbd = mkIf (cfg.dbdserver.enable) { + path = with pkgs; [ wrappedSlurm munge coreutils ]; + + wantedBy = [ "multi-user.target" ]; + after = [ "network.target" "munged.service" "mysql.service" ]; + requires = [ "munged.service" "mysql.service" ]; + + # slurm strips the last component off the path + environment.SLURM_CONF = "${slurmdbdConf}/slurm.conf"; + + serviceConfig = { + Type = "forking"; + ExecStart = "${cfg.package}/bin/slurmdbd"; + PIDFile = "/run/slurmdbd.pid"; + ExecReload = "${pkgs.coreutils}/bin/kill -HUP $MAINPID"; + }; }; }; diff --git a/nixos/modules/services/mail/clamsmtp.nix b/nixos/modules/services/mail/clamsmtp.nix index 8f4f39aa728..fc1267c5d28 100644 --- a/nixos/modules/services/mail/clamsmtp.nix +++ b/nixos/modules/services/mail/clamsmtp.nix @@ -176,4 +176,6 @@ in } ) cfg.instances); }; + + meta.maintainers = with lib.maintainers; [ ekleog ]; } diff --git a/nixos/modules/services/mail/dkimproxy-out.nix b/nixos/modules/services/mail/dkimproxy-out.nix index 894b88e25c1..f4ac9e47007 100644 --- a/nixos/modules/services/mail/dkimproxy-out.nix +++ b/nixos/modules/services/mail/dkimproxy-out.nix @@ -115,4 +115,6 @@ in }; }; }; + + meta.maintainers = with lib.maintainers; [ ekleog ]; } diff --git a/nixos/modules/services/networking/redsocks.nix b/nixos/modules/services/networking/redsocks.nix index a47a78f1005..8481f9debf3 100644 --- a/nixos/modules/services/networking/redsocks.nix +++ b/nixos/modules/services/networking/redsocks.nix @@ -267,4 +267,6 @@ in "ip46tables -t nat -D OUTPUT -p tcp ${redCond block} -j ${chain} 2>/dev/null || true" ) cfg.redsocks; }; + + meta.maintainers = with lib.maintainers; [ ekleog ]; } diff --git a/nixos/modules/services/x11/display-managers/lightdm-greeters/gtk.nix b/nixos/modules/services/x11/display-managers/lightdm-greeters/gtk.nix index 013956c0546..d1ee076e918 100644 --- a/nixos/modules/services/x11/display-managers/lightdm-greeters/gtk.nix +++ b/nixos/modules/services/x11/display-managers/lightdm-greeters/gtk.nix @@ -22,7 +22,7 @@ let # This wrapper ensures that we actually get themes makeWrapper ${pkgs.lightdm_gtk_greeter}/sbin/lightdm-gtk-greeter \ $out/greeter \ - --prefix PATH : "${pkgs.glibc.bin}/bin" \ + --prefix PATH : "${lib.getBin pkgs.stdenv.cc.libc}/bin" \ --set GDK_PIXBUF_MODULE_FILE "${pkgs.librsvg.out}/lib/gdk-pixbuf-2.0/2.10.0/loaders.cache" \ --set GTK_PATH "${theme}:${pkgs.gtk3.out}" \ --set GTK_EXE_PREFIX "${theme}" \ diff --git a/nixos/modules/system/activation/activation-script.nix b/nixos/modules/system/activation/activation-script.nix index b1eaf018956..0ed7c0f53eb 100644 --- a/nixos/modules/system/activation/activation-script.nix +++ b/nixos/modules/system/activation/activation-script.nix @@ -21,7 +21,7 @@ let [ coreutils gnugrep findutils - glibc # needed for getent + getent shadow nettools # needed for hostname utillinux # needed for mount and mountpoint diff --git a/nixos/modules/system/boot/stage-1.nix b/nixos/modules/system/boot/stage-1.nix index f4cf9753c0a..e7167999a6f 100644 --- a/nixos/modules/system/boot/stage-1.nix +++ b/nixos/modules/system/boot/stage-1.nix @@ -147,7 +147,7 @@ let ${config.boot.initrd.extraUtilsCommands} # Copy ld manually since it isn't detected correctly - cp -pv ${pkgs.glibc.out}/lib/ld*.so.? $out/lib + cp -pv ${pkgs.stdenv.cc.libc.out}/lib/ld*.so.? $out/lib # Copy all of the needed libraries find $out/bin $out/lib -type f | while read BIN; do diff --git a/nixos/modules/system/boot/systemd-nspawn.nix b/nixos/modules/system/boot/systemd-nspawn.nix index f4fa0969453..4f538ccdbbe 100644 --- a/nixos/modules/system/boot/systemd-nspawn.nix +++ b/nixos/modules/system/boot/systemd-nspawn.nix @@ -112,6 +112,7 @@ in { environment.etc."systemd/nspawn".source = generateUnits "nspawn" units [] []; + systemd.targets."multi-user".wants = [ "machines.target "]; }; } diff --git a/nixos/modules/virtualisation/containers.nix b/nixos/modules/virtualisation/containers.nix index 572092a2ba9..2fcc0f25425 100644 --- a/nixos/modules/virtualisation/containers.nix +++ b/nixos/modules/virtualisation/containers.nix @@ -243,6 +243,9 @@ let Restart = "on-failure"; + Slice = "machine.slice"; + Delegate = true; + # Hack: we don't want to kill systemd-nspawn, since we call # "machinectl poweroff" in preStop to shut down the # container cleanly. But systemd requires sending a signal @@ -657,6 +660,8 @@ in serviceConfig = serviceDirectives dummyConfig; }; in { + systemd.targets."multi-user".wants = [ "machines.target" ]; + systemd.services = listToAttrs (filter (x: x.value != null) ( # The generic container template used by imperative containers [{ name = "container@"; value = unit; }] @@ -680,7 +685,7 @@ in } // ( if config.autoStart then { - wantedBy = [ "multi-user.target" ]; + wantedBy = [ "machines.target" ]; wants = [ "network.target" ]; after = [ "network.target" ]; restartTriggers = [ config.path ]; diff --git a/nixos/modules/virtualisation/libvirtd.nix b/nixos/modules/virtualisation/libvirtd.nix index 3e38662f5b0..f4d7af1664a 100644 --- a/nixos/modules/virtualisation/libvirtd.nix +++ b/nixos/modules/virtualisation/libvirtd.nix @@ -196,6 +196,8 @@ in { wantedBy = [ "multi-user.target" ]; path = with pkgs; [ coreutils libvirt gawk ]; restartIfChanged = false; + + environment.ON_SHUTDOWN = "${cfg.onShutdown}"; }; systemd.sockets.virtlogd = { diff --git a/nixos/tests/ceph.nix b/nixos/tests/ceph.nix index dd45f0157b0..7408029c460 100644 --- a/nixos/tests/ceph.nix +++ b/nixos/tests/ceph.nix @@ -10,9 +10,8 @@ import ./make-test.nix ({pkgs, ...}: rec { emptyDiskImages = [ 20480 20480 ]; vlans = [ 1 ]; }; - + networking = { - firewall.allowPing = true; useDHCP = false; interfaces.eth1.ipv4.addresses = pkgs.lib.mkOverride 0 [ { address = "192.168.1.1"; prefixLength = 24; } @@ -54,7 +53,7 @@ import ./make-test.nix ({pkgs, ...}: rec { }; }; }; - + testScript = { ... }: '' startAll; @@ -83,7 +82,7 @@ import ./make-test.nix ({pkgs, ...}: rec { # Can't check ceph status until a mon is up $aio->succeed("ceph -s | grep 'mon: 1 daemons'"); - + # Start the ceph-mgr daemon, it has no deps and hardly any setup $aio->mustSucceed( "ceph auth get-or-create mgr.aio mon 'allow profile mgr' osd 'allow *' mds 'allow *' > /var/lib/ceph/mgr/ceph-aio/keyring", diff --git a/nixos/tests/cjdns.nix b/nixos/tests/cjdns.nix index ab5f8e0bcf3..e03bb988254 100644 --- a/nixos/tests/cjdns.nix +++ b/nixos/tests/cjdns.nix @@ -13,9 +13,6 @@ let # CJDNS output is incompatible with the XML log. systemd.services.cjdns.serviceConfig.StandardOutput = "null"; - #networking.firewall.enable = true; - networking.firewall.allowPing = true; - #networking.firewall.rejectPackets = true; }; in diff --git a/nixos/tests/containers-bridge.nix b/nixos/tests/containers-bridge.nix index bd8bd5dee9c..777cf9a7e7f 100644 --- a/nixos/tests/containers-bridge.nix +++ b/nixos/tests/containers-bridge.nix @@ -42,7 +42,6 @@ import ./make-test.nix ({ pkgs, ...} : { { services.httpd.enable = true; services.httpd.adminAddr = "foo@example.org"; networking.firewall.allowedTCPPorts = [ 80 ]; - networking.firewall.allowPing = true; }; }; diff --git a/nixos/tests/containers-extra_veth.nix b/nixos/tests/containers-extra_veth.nix index 8f874b3585d..b4c48afe48b 100644 --- a/nixos/tests/containers-extra_veth.nix +++ b/nixos/tests/containers-extra_veth.nix @@ -43,7 +43,6 @@ import ./make-test.nix ({ pkgs, ...} : { config = { networking.firewall.allowedTCPPorts = [ 80 ]; - networking.firewall.allowPing = true; }; }; diff --git a/nixos/tests/containers-ipv4.nix b/nixos/tests/containers-ipv4.nix index 4affe3d9d56..5f83a33b107 100644 --- a/nixos/tests/containers-ipv4.nix +++ b/nixos/tests/containers-ipv4.nix @@ -20,7 +20,6 @@ import ./make-test.nix ({ pkgs, ...} : { { services.httpd.enable = true; services.httpd.adminAddr = "foo@example.org"; networking.firewall.allowedTCPPorts = [ 80 ]; - networking.firewall.allowPing = true; system.stateVersion = "18.03"; }; }; diff --git a/nixos/tests/containers-ipv6.nix b/nixos/tests/containers-ipv6.nix index 7db389a18e7..5866e51b731 100644 --- a/nixos/tests/containers-ipv6.nix +++ b/nixos/tests/containers-ipv6.nix @@ -25,7 +25,6 @@ import ./make-test.nix ({ pkgs, ...} : { { services.httpd.enable = true; services.httpd.adminAddr = "foo@example.org"; networking.firewall.allowedTCPPorts = [ 80 ]; - networking.firewall.allowPing = true; }; }; diff --git a/nixos/tests/containers-portforward.nix b/nixos/tests/containers-portforward.nix index be83f82445e..d2dda926fc0 100644 --- a/nixos/tests/containers-portforward.nix +++ b/nixos/tests/containers-portforward.nix @@ -28,7 +28,6 @@ import ./make-test.nix ({ pkgs, ...} : { { services.httpd.enable = true; services.httpd.adminAddr = "foo@example.org"; networking.firewall.allowedTCPPorts = [ 80 ]; - networking.firewall.allowPing = true; }; }; diff --git a/nixos/tests/containers-restart_networking.nix b/nixos/tests/containers-restart_networking.nix index aeb0a6e68e2..0fb3b591e9f 100644 --- a/nixos/tests/containers-restart_networking.nix +++ b/nixos/tests/containers-restart_networking.nix @@ -10,7 +10,6 @@ let hostBridge = "br0"; config = { networking.firewall.enable = false; - networking.firewall.allowPing = true; networking.interfaces.eth0.ipv4.addresses = [ { address = "192.168.1.122"; prefixLength = 24; } ]; diff --git a/nixos/tests/nat.nix b/nixos/tests/nat.nix index 9c280fe8b5b..04b4f0f045f 100644 --- a/nixos/tests/nat.nix +++ b/nixos/tests/nat.nix @@ -11,7 +11,6 @@ import ./make-test.nix ({ pkgs, lib, withFirewall, withConntrackHelpers ? false, 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"; } @@ -33,7 +32,6 @@ import ./make-test.nix ({ pkgs, lib, withFirewall, withConntrackHelpers ? false, { pkgs, nodes, ... }: lib.mkMerge [ { virtualisation.vlans = [ 1 ]; - networking.firewall.allowPing = true; networking.defaultGateway = (pkgs.lib.head nodes.router.config.networking.interfaces.eth2.ipv4.addresses).address; } diff --git a/nixos/tests/networking.nix b/nixos/tests/networking.nix index 87a8c4c0e19..d1d4fd41dda 100644 --- a/nixos/tests/networking.nix +++ b/nixos/tests/networking.nix @@ -17,7 +17,6 @@ let networking = { useDHCP = false; useNetworkd = networkd; - firewall.allowPing = true; firewall.checkReversePath = true; firewall.allowedUDPPorts = [ 547 ]; interfaces = mkOverride 0 (listToAttrs (flip map vlanIfs (n: @@ -86,7 +85,6 @@ let virtualisation.vlans = [ 1 2 ]; networking = { useNetworkd = networkd; - firewall.allowPing = true; useDHCP = false; defaultGateway = "192.168.1.1"; interfaces.eth1.ipv4.addresses = mkOverride 0 [ @@ -139,7 +137,6 @@ let virtualisation.vlans = [ 1 2 ]; networking = { useNetworkd = networkd; - firewall.allowPing = true; useDHCP = true; interfaces.eth1 = { ipv4.addresses = mkOverride 0 [ ]; @@ -194,7 +191,6 @@ let virtualisation.vlans = [ 1 2 ]; networking = { useNetworkd = networkd; - firewall.allowPing = true; useDHCP = false; interfaces.eth1 = { ipv4.addresses = mkOverride 0 [ ]; @@ -234,7 +230,6 @@ let virtualisation.vlans = [ 1 2 ]; networking = { useNetworkd = networkd; - firewall.allowPing = true; useDHCP = false; bonds.bond = { interfaces = [ "eth1" "eth2" ]; @@ -271,7 +266,6 @@ let virtualisation.vlans = [ vlan ]; networking = { useNetworkd = networkd; - firewall.allowPing = true; useDHCP = false; interfaces.eth1.ipv4.addresses = mkOverride 0 [ { inherit address; prefixLength = 24; } ]; @@ -285,7 +279,6 @@ let virtualisation.vlans = [ 1 2 ]; networking = { useNetworkd = networkd; - firewall.allowPing = true; useDHCP = false; bridges.bridge.interfaces = [ "eth1" "eth2" ]; interfaces.eth1.ipv4.addresses = mkOverride 0 [ ]; @@ -329,7 +322,6 @@ let # reverse path filtering rules for the macvlan interface seem # to be incorrect, causing the test to fail. Disable temporarily. firewall.checkReversePath = false; - firewall.allowPing = true; useDHCP = true; macvlans.macvlan.interface = "eth1"; interfaces.eth1.ipv4.addresses = mkOverride 0 [ ]; @@ -415,7 +407,6 @@ let #virtualisation.vlans = [ 1 ]; networking = { useNetworkd = networkd; - firewall.allowPing = true; useDHCP = false; vlans.vlan = { id = 1; diff --git a/nixos/tests/quagga.nix b/nixos/tests/quagga.nix index 0ff14a21584..6aee7ea57f0 100644 --- a/nixos/tests/quagga.nix +++ b/nixos/tests/quagga.nix @@ -66,7 +66,6 @@ import ./make-test.nix ({ pkgs, ... }: virtualisation.vlans = [ 3 ]; networking.defaultGateway = ifAddr nodes.router2 "eth1"; networking.firewall.allowedTCPPorts = [ 80 ]; - networking.firewall.allowPing = true; services.httpd.enable = true; services.httpd.adminAddr = "foo@example.com"; }; diff --git a/nixos/tests/slurm.nix b/nixos/tests/slurm.nix index 60f44c3c845..7f9c266cbff 100644 --- a/nixos/tests/slurm.nix +++ b/nixos/tests/slurm.nix @@ -1,22 +1,27 @@ -import ./make-test.nix ({ ... }: -let mungekey = "mungeverryweakkeybuteasytointegratoinatest"; +import ./make-test.nix ({ lib, ... }: +let + mungekey = "mungeverryweakkeybuteasytointegratoinatest"; + slurmconfig = { controlMachine = "control"; - nodeName = '' - control - NodeName=node[1-3] CPUs=1 State=UNKNOWN + nodeName = [ "node[1-3] CPUs=1 State=UNKNOWN" ]; + partitionName = [ "debug Nodes=node[1-3] Default=YES MaxTime=INFINITE State=UP" ]; + extraConfig = '' + AccountingStorageHost=dbd + AccountingStorageType=accounting_storage/slurmdbd ''; - partitionName = "debug Nodes=node[1-3] Default=YES MaxTime=INFINITE State=UP"; }; in { name = "slurm"; + meta.maintainers = [ lib.maintainers.markuskowa ]; + nodes = let computeNode = { ...}: { - # TODO slrumd port and slurmctld port should be configurations and + # TODO slurmd port and slurmctld port should be configurations and # automatically allowed by the firewall. networking.firewall.enable = false; services.slurm = { @@ -43,6 +48,24 @@ in { } // slurmconfig; }; + dbd = + { pkgs, ... } : + { + networking.firewall.enable = false; + services.slurm.dbdserver = { + enable = true; + }; + services.mysql = { + enable = true; + package = pkgs.mysql; + ensureDatabases = [ "slurm_acct_db" ]; + ensureUsers = [{ + ensurePermissions = { "slurm_acct_db.*" = "ALL PRIVILEGES"; }; + name = "slurm"; + }]; + }; + }; + node1 = computeNode; node2 = computeNode; node3 = computeNode; @@ -54,7 +77,7 @@ in { startAll; # Set up authentification across the cluster - foreach my $node (($submit,$control,$node1,$node2,$node3)) + foreach my $node (($submit,$control,$dbd,$node1,$node2,$node3)) { $node->waitForUnit("default.target"); @@ -63,10 +86,22 @@ in { $node->succeed("chmod 0400 /etc/munge/munge.key"); $node->succeed("chown munge:munge /etc/munge/munge.key"); $node->succeed("systemctl restart munged"); - } + + $node->waitForUnit("munged"); + }; # Restart the services since they have probably failed due to the munge init # failure + subtest "can_start_slurmdbd", sub { + $dbd->succeed("systemctl restart slurmdbd"); + $dbd->waitForUnit("slurmdbd.service"); + }; + + # there needs to be an entry for the current + # cluster in the database before slurmctld is restarted + subtest "add_account", sub { + $control->succeed("sacctmgr -i add cluster default"); + }; subtest "can_start_slurmctld", sub { $control->succeed("systemctl restart slurmctld"); @@ -81,12 +116,17 @@ in { } }; - # Test that the cluster work and can distribute jobs; + # Test that the cluster works and can distribute jobs; subtest "run_distributed_command", sub { # Run `hostname` on 3 nodes of the partition (so on all the 3 nodes). # The output must contain the 3 different names $submit->succeed("srun -N 3 hostname | sort | uniq | wc -l | xargs test 3 -eq"); }; + + subtest "check_slurm_dbd", sub { + # find the srun job from above in the database + $submit->succeed("sacct | grep hostname"); + }; ''; }) diff --git a/pkgs/applications/audio/gxplugins-lv2/default.nix b/pkgs/applications/audio/gxplugins-lv2/default.nix new file mode 100644 index 00000000000..e7e4744eea2 --- /dev/null +++ b/pkgs/applications/audio/gxplugins-lv2/default.nix @@ -0,0 +1,29 @@ +{ stdenv, fetchFromGitHub, xorg, xproto, cairo, lv2, pkgconfig }: + +stdenv.mkDerivation rec { + name = "${pname}-${version}"; + pname = "GxPlugins.lv2"; + version = "0.5"; + + src = fetchFromGitHub { + owner = "brummer10"; + repo = pname; + rev = "v${version}"; + sha256 = "16r5bj7w726d9327flg530fn0bli4crkxjss7i56yhb1bsi39mbv"; + fetchSubmodules = true; + }; + + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ + xorg.libX11 xproto cairo lv2 + ]; + + installFlags = [ "INSTALL_DIR=$(out)/lib/lv2" ]; + + meta = with stdenv.lib; { + homepage = https://github.com/brummer10/GxPlugins.lv2; + description = "A set of extra lv2 plugins from the guitarix project"; + maintainers = [ maintainers.magnetophon ]; + license = licenses.gpl3; + }; +} diff --git a/pkgs/applications/audio/wolf-shaper/default.nix b/pkgs/applications/audio/wolf-shaper/default.nix new file mode 100644 index 00000000000..562fdc1be8b --- /dev/null +++ b/pkgs/applications/audio/wolf-shaper/default.nix @@ -0,0 +1,47 @@ +{ stdenv, fetchFromGitHub , libjack2, lv2, xorg, liblo, libGL, libXcursor, pkgconfig }: + +stdenv.mkDerivation rec { + name = "wolf-shaper-${version}"; + version = "0.1.6"; + + src = fetchFromGitHub { + owner = "pdesaulniers"; + repo = "wolf-shaper"; + rev = "v${version}"; + sha256 = "01h5dm1nrr0i54ancwznr7wn4vpw08dw0b69v3axy32r5j7plw6s"; + fetchSubmodules = true; + }; + + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ libjack2 lv2 xorg.libX11 liblo libGL libXcursor ]; + + makeFlags = [ + "BUILD_LV2=true" + "BUILD_DSSI=true" + "BUILD_VST2=true" + "BUILD_JACK=true" + ]; + + patchPhase = '' + patchShebangs ./dpf/utils/generate-ttl.sh + ''; + + installPhase = '' + mkdir -p $out/lib/lv2 + mkdir -p $out/lib/dssi + mkdir -p $out/lib/vst + mkdir -p $out/bin/ + cp -r bin/wolf-shaper.lv2 $out/lib/lv2/ + cp -r bin/wolf-shaper-dssi* $out/lib/dssi/ + cp -r bin/wolf-shaper-vst.so $out/lib/vst/ + cp -r bin/wolf-shaper $out/bin/ + ''; + + meta = with stdenv.lib; { + homepage = https://pdesaulniers.github.io/wolf-shaper/; + description = "Waveshaper plugin with spline-based graph editor"; + license = licenses.gpl3; + maintainers = [ maintainers.magnetophon ]; + platforms = [ "i686-linux" "x86_64-linux" ]; + }; +} diff --git a/pkgs/applications/misc/albert/default.nix b/pkgs/applications/misc/albert/default.nix index f16144f3bef..d1a62dad6c9 100644 --- a/pkgs/applications/misc/albert/default.nix +++ b/pkgs/applications/misc/albert/default.nix @@ -3,7 +3,7 @@ let pname = "albert"; - version = "0.14.21"; + version = "0.14.22"; in mkDerivation rec { name = "${pname}-${version}"; @@ -12,7 +12,7 @@ mkDerivation rec { owner = "albertlauncher"; repo = "albert"; rev = "v${version}"; - sha256 = "16nk9krn1mwr0bh57viig9hizqyp3slna0qg7s5a736nsfxy226w"; + sha256 = "0i9kss5szirmd0pzw3cm692kl9rhkan1zfywfqrjdf3i3b6914sg"; fetchSubmodules = true; }; @@ -48,7 +48,7 @@ mkDerivation rec { homepage = https://albertlauncher.github.io/; description = "Desktop agnostic launcher"; license = licenses.gpl3Plus; - maintainers = with maintainers; [ ericsagnes ]; + maintainers = with maintainers; [ ericsagnes synthetica ]; platforms = platforms.linux; }; } diff --git a/pkgs/applications/misc/hugo/default.nix b/pkgs/applications/misc/hugo/default.nix index 29b6e41a90d..22badfc8cdd 100644 --- a/pkgs/applications/misc/hugo/default.nix +++ b/pkgs/applications/misc/hugo/default.nix @@ -1,8 +1,8 @@ -{ stdenv, buildGoPackage, fetchFromGitHub, fetchpatch }: +{ stdenv, buildGoPackage, fetchFromGitHub }: buildGoPackage rec { name = "hugo-${version}"; - version = "0.49.2"; + version = "0.50"; goPackagePath = "github.com/gohugoio/hugo"; @@ -10,16 +10,9 @@ buildGoPackage rec { owner = "gohugoio"; repo = "hugo"; rev = "v${version}"; - sha256 = "0a320mv6x770vppbz0aw5ikywmy0mxqq1lhc0syp48hgg42d46is"; + sha256 = "1shrw7pxwrz9g5x9bq6k5qvhn3fqmwznadpw7i07msh97p8b3dyn"; }; - patches = [ - (fetchpatch { - url = "https://github.com/gohugoio/hugo/commit/b137ad4dbd6d14d0a9af68c044aaee61f2c87fe5.diff"; - sha256 = "0w1gpg11idqywqcpwzvx4xabn02kk8y4jmyz4h67mc3yh2dhq3ll"; - }) - ]; - goDeps = ./deps.nix; buildFlags = "-tags extended"; diff --git a/pkgs/applications/misc/hugo/deps.nix b/pkgs/applications/misc/hugo/deps.nix index 002fb6351b8..d5c24d69048 100644 --- a/pkgs/applications/misc/hugo/deps.nix +++ b/pkgs/applications/misc/hugo/deps.nix @@ -555,8 +555,8 @@ fetch = { type = "git"; url = "https://github.com/spf13/jwalterweatherman"; - rev = "4a4406e478ca"; - sha256 = "093fmmvavv84pv4q84hav7ph3fmrq87bvspjj899q0qsx37yvdr8"; + rev = "94f6ae3ed3bc"; + sha256 = "1ywmkwci5zyd88ijym6f30fj5c0k2yayxarkmnazf5ybljv50q7b"; }; } @@ -605,8 +605,8 @@ fetch = { type = "git"; url = "https://github.com/tdewolff/minify"; - rev = "v2.3.5"; - sha256 = "0x67kgjhc6mfzjhr4xmw0j3qapzhkgwwahvv5b44rb449ml2qx5m"; + rev = "v2.3.6"; + sha256 = "0p4v4ab49lm5y438k5aks06fpiagbjw2j2x7i8jaa273mkgicrbb"; }; } @@ -615,8 +615,8 @@ fetch = { type = "git"; url = "https://github.com/tdewolff/parse"; - rev = "v2.3.3"; - sha256 = "190y2jykp8qyp6y58ky1v1fvmaqjnrsr1ksbqrrspf1gpjy69i94"; + rev = "fced451e0bed"; + sha256 = "1n6wcapk8xbck2zjxd4l5cgfn1v12rr7znrdpd5y2xp1nc3739c3"; }; } @@ -625,8 +625,8 @@ fetch = { type = "git"; url = "https://github.com/tdewolff/test"; - rev = "265427085153"; - sha256 = "1h0cmsjjia92w50dzr06c5h10zd5c7snhpixqjv94wbl7dv80yp0"; + rev = "v1.0.0"; + sha256 = "10vyp4bhanzg3yl9k8zqfdrxpsmx8yc53xv4lqxfymd7jjyqgssj"; }; } diff --git a/pkgs/applications/networking/cluster/luigi/default.nix b/pkgs/applications/networking/cluster/luigi/default.nix index ced7b9882b9..35721208a6e 100644 --- a/pkgs/applications/networking/cluster/luigi/default.nix +++ b/pkgs/applications/networking/cluster/luigi/default.nix @@ -14,7 +14,7 @@ python3Packages.buildPythonApplication rec { sed -i 's/<2.2.0//' setup.py ''; - propagatedBuildInputs = with python3Packages; [ tornado_4 pythondaemon ]; + propagatedBuildInputs = with python3Packages; [ tornado_4 python-daemon ]; # Requires tox, hadoop, and google cloud doCheck = false; diff --git a/pkgs/applications/networking/modem-manager-gui/default.nix b/pkgs/applications/networking/modem-manager-gui/default.nix new file mode 100644 index 00000000000..ca8a4d0fb0c --- /dev/null +++ b/pkgs/applications/networking/modem-manager-gui/default.nix @@ -0,0 +1,50 @@ +{ stdenv, buildEnv, pkgconfig, python3, fetchhg, gtk3, glib, gdbm, gtkspell3, itstool, libappindicator-gtk3, perlPackages, glibcLocales, meson, ninja }: + +stdenv.mkDerivation rec { + name = "modem-manager-gui-${version}"; + version = "0.0.19.1"; + + src = fetchhg { + url = https://linuxonly@bitbucket.org/linuxonly/modem-manager-gui; + rev = "version ${version}"; + sha256 = "11iibh36567814h2bz41sa1072b86p1l13xyj670pwkh9k8kw8fd"; + }; + + LC_ALL = "en_US.utf-8"; + + nativeBuildInputs = [ + pkgconfig + python3 + perlPackages.Po4a + itstool + glibcLocales + meson + ninja + ]; + + buildInputs = [ + gtk3 + glib + gdbm + gtkspell3 + libappindicator-gtk3 + ]; + + postPatch = '' + patchShebangs man/manhelper.py + ''; + + meta = with stdenv.lib; { + description = "An app to send/receive SMS, make USSD requests, control mobile data usage and more"; + longDescription = '' + A simple GTK+ based GUI compatible with Modem manager, Wader and oFono + system services able to control EDGE/3G/4G broadband modem specific + functions. You can check balance of your SIM card, send or receive SMS + messages, control mobile traffic consumption and more. + ''; + homepage = https://linuxonly.ru/page/modem-manager-gui; + license = licenses.gpl3; + maintainers = with maintainers; [ ahuzik ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/applications/networking/remote/remmina/default.nix b/pkgs/applications/networking/remote/remmina/default.nix index e823977db20..81ced3e641b 100644 --- a/pkgs/applications/networking/remote/remmina/default.nix +++ b/pkgs/applications/networking/remote/remmina/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitLab, cmake, pkgconfig, wrapGAppsHook +{ stdenv, fetchFromGitLab, cmake, ninja, pkgconfig, wrapGAppsHook , glib, gtk3, gettext, libxkbfile, libX11 , freerdp, libssh, libgcrypt, gnutls, makeDesktopItem , pcre, libdbusmenu-gtk3, libappindicator-gtk3 @@ -7,24 +7,11 @@ , openssl, gsettings-desktop-schemas, json-glib # The themes here are soft dependencies; only icons are missing without them. , hicolor-icon-theme, adwaita-icon-theme -, gnomeSupport ? true, libgnome-keyring }: with stdenv.lib; -let - - desktopItem = makeDesktopItem { - name = "remmina"; - desktopName = "Remmina"; - genericName = "Remmina Remote Desktop Client"; - exec = "remmina"; - icon = "remmina"; - comment = "Connect to remote desktops"; - categories = "GTK;GNOME;X-GNOME-NetworkSettings;Network;"; - }; - -in stdenv.mkDerivation rec { +stdenv.mkDerivation { name = "remmina-${version}"; version = "1.2.32"; @@ -35,22 +22,16 @@ in stdenv.mkDerivation rec { sha256 = "15szv1xs6drxq6qyksmxcfdz516ja4zm52r4yf6hwij3fgl8qdpw"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ cmake ninja pkgconfig wrapGAppsHook ]; buildInputs = [ - cmake wrapGAppsHook gsettings-desktop-schemas + gsettings-desktop-schemas glib gtk3 gettext libxkbfile libX11 freerdp libssh libgcrypt gnutls pcre libdbusmenu-gtk3 libappindicator-gtk3 libvncserver libpthreadstubs libXdmcp libxkbcommon libsecret libsoup spice-protocol spice-gtk epoxy at-spi2-core openssl hicolor-icon-theme adwaita-icon-theme json-glib - ] - ++ optional gnomeSupport libgnome-keyring; - - preConfigure = optionalString (!gnomeSupport) '' - substituteInPlace CMakeLists.txt \ - --replace "add_subdirectory(remmina-plugins-gnome)" "" - ''; + ]; cmakeFlags = [ "-DWITH_VTE=OFF" @@ -68,13 +49,8 @@ in stdenv.mkDerivation rec { ) ''; - postInstall = '' - mkdir -pv $out/share/applications - cp ${desktopItem}/share/applications/* $out/share/applications - ''; - meta = { - license = stdenv.lib.licenses.gpl2; + license = licenses.gpl2; homepage = https://gitlab.com/Remmina/Remmina; description = "Remote desktop client written in GTK+"; maintainers = with maintainers; [ melsigl ryantm ]; diff --git a/pkgs/applications/version-management/smartgithg/default.nix b/pkgs/applications/version-management/smartgithg/default.nix index 106b66bcfec..d6ae37c3f7f 100644 --- a/pkgs/applications/version-management/smartgithg/default.nix +++ b/pkgs/applications/version-management/smartgithg/default.nix @@ -7,11 +7,11 @@ stdenv.mkDerivation rec { name = "smartgithg-${version}"; - version = "18_1_4"; + version = "18_1_5"; src = fetchurl { url = "https://www.syntevo.com/downloads/smartgit/smartgit-linux-${version}.tar.gz"; - sha256 = "18gyfcs5g7xq8fqnn1zjzx350jaynrniain0giay8sxych12p4cm"; + sha256 = "0f2aj3259jvn7n0x6m8sbwliikln9lqffd00jg75dblhxwl8adg3"; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/pkgs/build-support/build-fhs-userenv/default.nix b/pkgs/build-support/build-fhs-userenv/default.nix index c733556de45..2bad200efc4 100644 --- a/pkgs/build-support/build-fhs-userenv/default.nix +++ b/pkgs/build-support/build-fhs-userenv/default.nix @@ -28,7 +28,7 @@ in runCommand name { passthru = passthru // { env = runCommand "${name}-shell-env" { shellHook = '' - exec ${chrootenv} ${init "bash"} "$(pwd)" + exec ${chrootenv} ${init runScript} "$(pwd)" ''; } '' echo >&2 "" diff --git a/pkgs/build-support/templaterpm/nix-template-rpm.py b/pkgs/build-support/templaterpm/nix-template-rpm.py index ec3a619027e..f39595f8977 100755 --- a/pkgs/build-support/templaterpm/nix-template-rpm.py +++ b/pkgs/build-support/templaterpm/nix-template-rpm.py @@ -44,14 +44,14 @@ class SPECTemplate(object): self.key = self.getSelfKey() tmpDir = os.path.join(outputDir, self.rewriteName(self.spec.sourceHeader['name'])) - if self.translateTable != None: + if self.translateTable is not None: self.relOutputDir = self.translateTable.path(self.key,tmpDir) else: self.relOutputDir = tmpDir self.final_output_dir = os.path.normpath( self.relOutputDir ) - if self.repositoryDir != None: + if self.repositoryDir is not None: self.potential_repository_dir = os.path.normpath( os.path.join(self.repositoryDir,self.relOutputDir) ) @@ -59,7 +59,7 @@ class SPECTemplate(object): def rewriteCommands(self, string): string = string.replace('SPACER_DIR_FOR_REMOVAL/','') string = string.replace('SPACER_DIR_FOR_REMOVAL','') - string = '\n'.join(map(lambda line: ' '.join(map(lambda x: x.replace('SOURCE_DIR_SPACER/',('${./' if (self.buildRootInclude == None) else '${buildRoot}/usr/share/buildroot/SOURCES/'))+('}' if (self.buildRootInclude == None) else '') if x.startswith('SOURCE_DIR_SPACER/') else x, line.split(' '))), string.split('\n'))) + string = '\n'.join(map(lambda line: ' '.join(map(lambda x: x.replace('SOURCE_DIR_SPACER/',('${./' if (self.buildRootInclude is None) else '${buildRoot}/usr/share/buildroot/SOURCES/'))+('}' if (self.buildRootInclude is None) else '') if x.startswith('SOURCE_DIR_SPACER/') else x, line.split(' '))), string.split('\n'))) string = string.replace('\n','\n ') string = string.rstrip() return string @@ -82,7 +82,7 @@ class SPECTemplate(object): rewrite = lambda l: ''.join(camelcase(filterDoc(filterDevel(l)))) def filterPackageGroup(target): - if target == None: + if target is None: return [ rewrite(x.split('-')) for x in inputs if (not x.split('-')[0] in self.packageGroups) or (len(x.split('-')) == 1) ] elif target in self.packageGroups: return [ target + '_' + rewrite(x.split('-')[1:]) for x in inputs if (x.split('-')[0] == target) and (len(x.split('-')) > 1)] @@ -90,7 +90,7 @@ class SPECTemplate(object): raise Exception("Unknown target") return [] - if target == None: + if target is None: packages = filterPackageGroup(None) packages.sort() elif target in self.packageGroups: @@ -111,7 +111,7 @@ class SPECTemplate(object): def getBuildInputs(self,target=None): inputs = self.rewriteInputs(target,self.spec.sourceHeader['requires']) - if self.translateTable != None: + if self.translateTable is not None: return map(lambda x: self.translateTable.name(x), inputs) else: return inputs @@ -125,7 +125,7 @@ class SPECTemplate(object): return key def getSelf(self): - if self.translateTable != None: + if self.translateTable is not None: return self.translateTable.name(self.key) else: return self.key @@ -161,7 +161,7 @@ class SPECTemplate(object): facts["sha256"].append(sha256) patches = [source for (source, _, flag) in self.spec.sources if flag==2] - if self.buildRootInclude == None: + if self.buildRootInclude is None: facts["patches"] = map(lambda x: './'+x, patches) else: facts["patches"] = map(lambda x: '"${buildRoot}/usr/share/buildroot/SOURCES/'+x+'"', reversed(patches)) @@ -292,7 +292,7 @@ class SPECTemplate(object): if not os.path.exists(self.final_output_dir): os.makedirs(self.final_output_dir) - if self.inputDir != None: + if self.inputDir is not None: self.copySources(self.inputDir, self.final_output_dir) self.copyPatches(self.inputDir, self.final_output_dir) @@ -334,19 +334,19 @@ class NixTemplate(object): url = re.match(r'^\s*url\s*=\s*"?(.*?)"?\s*;\s*$', line) sha256 = re.match(r'^\s*sha256\s*=\s*"(.*?)"\s*;\s*$', line) patches = re.match(r'^\s*patches\s*=\s*(\[.*?\])\s*;\s*$', line) - if name != None and self.original["name"] == None: + if name is not None and self.original["name"] is None: self.original["name"] = name.group(1) self.matchedLines[n] = "name" - if version != None and self.original["version"] == None: + if version is not None and self.original["version"] is None: self.original["version"] = version.group(1) self.matchedLines[n] = "version" - if url != None and self.original["url"] == None: + if url is not None and self.original["url"] is None: self.original["url"] = url.group(1) self.matchedLines[n] = "url" - if sha256 != None and self.original["sha256"] == None: + if sha256 is not None and self.original["sha256"] is None: self.original["sha256"] = sha256.group(1) self.matchedLines[n] = "sha256" - if patches != None and self.original["patches"] == None: + if patches is not None and self.original["patches"] is None: self.original["patches"] = patches.group(1) self.matchedLines[n] = "patches" @@ -355,7 +355,7 @@ class NixTemplate(object): nixTemplateFile = open(os.path.normpath(self.nixfile),'r') nixOutFile = open(os.path.normpath(nixOut),'w') for (n,line) in enumerate(nixTemplateFile): - if self.matchedLines.has_key(n) and self.update[self.matchedLines[n]] != None: + if self.matchedLines.has_key(n) and self.update[self.matchedLines[n]] is not None: nixOutFile.write(line.replace(self.original[self.matchedLines[n]], self.update[self.matchedLines[n]], 1)) else: nixOutFile.write(line) @@ -383,14 +383,14 @@ class TranslationTable(object): def update(self, key, path, name=None): self.tablePath[key] = path - if name != None: + if name is not None: self.tableName[key] = name def readTable(self, tableFile): with file(tableFile, 'r') as infile: for line in infile: match = re.match(r'^(.+?)\s+(.+?)\s+(.+?)\s*$', line) - if match != None: + if match is not None: if not self.tablePath.has_key(match.group(1)): self.tablePath[match.group(1)] = match.group(2) if not self.tableName.has_key(match.group(1)): @@ -449,7 +449,7 @@ if __name__ == "__main__": nameMap = {} newTable = TranslationTable() - if args.translate != None: + if args.translate is not None: table = TranslationTable() table.readTable(args.translate) newTable.readTable(args.translate) @@ -461,7 +461,7 @@ if __name__ == "__main__": sys.stderr.write("INFO: generate nix file from: %s\n" % specPath) spec = SPECTemplate(specPath, args.output, args.inputSources, args.buildRoot, table, args.repository, allPackagesDir, args.maintainer) - if args.repository != None: + if args.repository is not None: if os.path.exists(os.path.join(spec.potential_repository_dir,'default.nix')): nixTemplate = NixTemplate(os.path.join(spec.potential_repository_dir,'default.nix')) nixTemplate.loadUpdate(spec.facts) @@ -470,12 +470,12 @@ if __name__ == "__main__": nixTemplate.generateUpdated(os.path.join(spec.final_output_dir,'default.nix')) else: sys.stderr.write("WARNING: Repository does not contain template: %s\n" % os.path.join(spec.potential_repository_dir,'default.nix')) - if args.buildRoot == None: + if args.buildRoot is None: spec.generateCombined() else: buildRootContent[spec.key] = spec.generateSplit() else: - if args.buildRoot == None: + if args.buildRoot is None: spec.generateCombined() else: buildRootContent[spec.key] = spec.generateSplit() @@ -486,7 +486,7 @@ if __name__ == "__main__": except Exception, e: sys.stderr.write("ERROR: %s failed with:\n%s\n%s\n" % (specPath,e.message,traceback.format_exc())) - if args.translateOut != None: + if args.translateOut is not None: if not os.path.exists(os.path.dirname(os.path.normpath(args.translateOut))): os.makedirs(os.path.dirname(os.path.normpath(args.translateOut))) newTable.writeTable(args.translateOut) @@ -502,7 +502,7 @@ if __name__ == "__main__": allPackagesFile.write( '\n\n'.join(map(lambda x: x.callPackage(), map(lambda x: nameMap[x], sortedSpecs))) ) allPackagesFile.close() - if args.buildRoot != None: + if args.buildRoot is not None: buildRootFilename = os.path.normpath( args.buildRoot ) if not os.path.exists(os.path.dirname(buildRootFilename)): os.makedirs(os.path.dirname(buildRootFilename)) diff --git a/pkgs/desktops/xfce4-13/xfce4-terminal/default.nix b/pkgs/desktops/xfce4-13/xfce4-terminal/default.nix index 5ee6e338ea4..6bc88ee7661 100644 --- a/pkgs/desktops/xfce4-13/xfce4-terminal/default.nix +++ b/pkgs/desktops/xfce4-13/xfce4-terminal/default.nix @@ -1,4 +1,4 @@ -{ mkXfceDerivation, gtk3, libxfce4ui, vte }: +{ mkXfceDerivation, gtk3, libxfce4ui, wrapGAppsHook, vte }: mkXfceDerivation rec { category = "apps"; @@ -8,6 +8,7 @@ mkXfceDerivation rec { sha256 = "1s1dq560icg602jjb2ja58x7hxg4ikp3jrrf74v3qgi0ir950k2y"; buildInputs = [ gtk3 libxfce4ui vte ]; + nativeBuildInputs = [ wrapGAppsHook ]; meta = { description = "A modern terminal emulator"; diff --git a/pkgs/development/compilers/ocaml/4.07.nix b/pkgs/development/compilers/ocaml/4.07.nix index 19b9626f4e8..c1952f30ba6 100644 --- a/pkgs/development/compilers/ocaml/4.07.nix +++ b/pkgs/development/compilers/ocaml/4.07.nix @@ -1,8 +1,8 @@ import ./generic.nix { major_version = "4"; minor_version = "07"; - patch_version = "0"; - sha256 = "03wzkzv6w4rdiiva20g5amz0n4x75swpjl8d80468p6zm8hgfnzl"; + patch_version = "1"; + sha256 = "1f07hgj5k45cylj1q3k5mk8yi02cwzx849b1fwnwia8xlcfqpr6z"; # If the executable is stripped it does not work dontStrip = true; diff --git a/pkgs/development/haskell-modules/configuration-ghc-8.6.x.nix b/pkgs/development/haskell-modules/configuration-ghc-8.6.x.nix index 61f188aeddb..b9277727650 100644 --- a/pkgs/development/haskell-modules/configuration-ghc-8.6.x.nix +++ b/pkgs/development/haskell-modules/configuration-ghc-8.6.x.nix @@ -99,31 +99,16 @@ self: super: { # https://github.com/bmillwood/haskell-src-meta/pull/80 haskell-src-meta = doJailbreak super.haskell-src-meta; - # The official 1.12 release is broken and unmaintained. - polyparse = appendPatch (overrideCabal super.polyparse (drv: { editedCabalFile = null; })) (pkgs.fetchpatch { - url = https://github.com/bergmark/polyparse/commit/8a69ee7e57db798c106d8b56dce05b1dfc4fed37.patch; - sha256 = "11r73wx1w6bfrkrnk6r9k7rfzp6qrvkdikb2by37ld06c0w6nn57"; - }); - # https://github.com/skogsbaer/HTF/issues/69 HTF = markBrokenVersion "0.13.2.4" super.HTF; # https://github.com/jgm/skylighting/issues/55 skylighting-core = dontCheck super.skylighting-core; - # https://github.com/joelburget/easytest/issues/12 - easytest = appendPatch super.easytest (pkgs.fetchpatch { - url = https://github.com/joelburget/easytest/pull/13.patch; - sha256 = "0gnsgga8x2yxyg27pya6rhmxfsxf167vsi4xdj98fn8v0j7zz1v1"; - }); - # https://github.com/jgm/pandoc/issues/4974 pandoc = doJailbreak super.pandoc_2_3_1; # Break out of "yaml >=0.10.4.0 && <0.11". stack = doJailbreak super.stack; - # https://github.com/vimus/libmpd-haskell/issues/109 - xmobar = disableCabalFlag (super.xmobar.override { libmpd = null; }) "with_mpd"; - } diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml index b5f5e1f3675..1b85a564e31 100644 --- a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml +++ b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml @@ -45,7 +45,7 @@ default-package-overrides: - base-compat-batteries ==0.10.1 # Newer versions don't work in LTS-12.x - cassava-megaparsec < 2 - # LTS Haskell 12.14 + # LTS Haskell 12.16 - abstract-deque ==0.3 - abstract-deque-tests ==0.3 - abstract-par ==0.3.3 @@ -180,7 +180,7 @@ default-package-overrides: - amazonka-xray ==1.6.0 - amqp ==0.18.1 - annotated-wl-pprint ==0.7.0 - - ansi-terminal ==0.8.1 + - ansi-terminal ==0.8.2 - ansi-wl-pprint ==0.6.8.2 - ANum ==0.2.0.2 - api-field-json-th ==0.1.0.2 @@ -436,7 +436,7 @@ default-package-overrides: - concurrency ==1.6.1.0 - concurrent-extra ==0.7.0.12 - concurrent-output ==1.10.7 - - concurrent-split ==0.0.1 + - concurrent-split ==0.0.1.1 - concurrent-supply ==0.1.8 - cond ==0.4.1.1 - conduit ==1.3.1 @@ -552,7 +552,7 @@ default-package-overrides: - data-serializer ==0.3.4 - datasets ==0.2.5 - data-textual ==0.3.0.2 - - data-tree-print ==0.1.0.1 + - data-tree-print ==0.1.0.2 - dataurl ==0.1.0.0 - DAV ==1.3.2 - dawg-ord ==0.5.1.0 @@ -638,7 +638,7 @@ default-package-overrides: - dyre ==0.8.12 - Earley ==0.12.1.0 - easy-file ==0.2.2 - - easytest ==0.2 + - easytest ==0.2.1 - Ebnf2ps ==1.0.15 - echo ==0.1.3 - ed25519 ==0.0.5.0 @@ -880,6 +880,12 @@ default-package-overrides: - greskell-core ==0.1.2.4 - greskell-websocket ==0.1.1.2 - groom ==0.1.2.1 + - groundhog ==0.9.0 + - groundhog-inspector ==0.9.0 + - groundhog-mysql ==0.9.0 + - groundhog-postgresql ==0.9.0.1 + - groundhog-sqlite ==0.9.0 + - groundhog-th ==0.9.0.1 - groups ==0.4.1.0 - gtk ==0.14.10 - gtk2hs-buildtools ==0.13.4.0 @@ -896,7 +902,7 @@ default-package-overrides: - hamtsolo ==1.0.3 - HandsomeSoup ==0.4.2 - handwriting ==0.1.0.3 - - hapistrano ==0.3.6.1 + - hapistrano ==0.3.7.0 - happstack-server ==7.5.1.1 - happy ==1.19.9 - hasbolt ==0.1.3.0 @@ -1004,8 +1010,8 @@ default-package-overrides: - hsdns ==1.7.1 - hsebaysdk ==0.4.0.0 - hsemail ==2 - - HSet ==0.0.1 - hset ==2.2.0 + - HSet ==0.0.1 - hsexif ==0.6.1.6 - hs-functors ==0.1.3.0 - hs-GeoIP ==0.3 @@ -1248,7 +1254,7 @@ default-package-overrides: - libffi ==0.1 - libgit ==0.3.1 - libgraph ==1.14 - - libmpd ==0.9.0.8 + - libmpd ==0.9.0.9 - libxml-sax ==0.7.5 - LibZip ==1.0.1 - lifted-async ==0.10.0.3 @@ -1523,7 +1529,7 @@ default-package-overrides: - palette ==0.3.0.1 - pandoc ==2.2.1 - pandoc-citeproc ==0.14.8 - - pandoc-types ==1.17.5.2 + - pandoc-types ==1.17.5.4 - pango ==0.13.5.0 - papillon ==0.1.0.6 - parallel ==3.2.2.0 @@ -1746,7 +1752,7 @@ default-package-overrides: - require ==0.2.1 - req-url-extra ==0.1.0.0 - reroute ==0.5.0.0 - - resolv ==0.1.1.1 + - resolv ==0.1.1.2 - resource-pool ==0.2.3.2 - resourcet ==1.2.2 - rest-stringmap ==0.2.0.7 @@ -1785,8 +1791,8 @@ default-package-overrides: - sandman ==0.2.0.1 - say ==0.1.0.1 - sbp ==2.3.17 - - SCalendar ==1.1.0 - scalendar ==1.2.0 + - SCalendar ==1.1.0 - scalpel ==0.5.1 - scalpel-core ==0.5.1 - scanner ==0.2 @@ -1952,7 +1958,7 @@ default-package-overrides: - storable-record ==0.0.4 - storable-tuple ==0.0.3.3 - storablevector ==0.2.13 - - store ==0.5.0 + - store ==0.5.0.1 - store-core ==0.4.4 - Strafunski-StrategyLib ==5.0.1.0 - stratosphere ==0.24.4 @@ -2042,7 +2048,7 @@ default-package-overrides: - test-framework-th ==0.2.4 - testing-feat ==1.1.0.0 - testing-type-modifiers ==0.1.0.1 - - texmath ==0.11.1.1 + - texmath ==0.11.1.2 - text ==1.2.3.1 - text-binary ==0.2.1.1 - text-builder ==0.5.4.3 @@ -2133,7 +2139,7 @@ default-package-overrides: - type-level-kv-list ==1.1.0 - type-level-numbers ==0.1.1.1 - typelits-witnesses ==0.3.0.3 - - typenums ==0.1.2 + - typenums ==0.1.2.1 - type-of-html ==1.4.0.1 - type-of-html-static ==0.1.0.2 - type-operators ==0.1.0.4 @@ -2580,6 +2586,7 @@ dont-distribute-packages: fltkhs-demos: [ i686-linux, x86_64-linux, x86_64-darwin ] fltkhs-fluid-demos: [ i686-linux, x86_64-linux, x86_64-darwin ] fltkhs-hello-world: [ i686-linux, x86_64-linux, x86_64-darwin ] + fltkhs-themes: [ i686-linux, x86_64-linux, x86_64-darwin ] ghcjs-dom-hello: [ i686-linux, x86_64-linux, x86_64-darwin ] ghcjs-dom-webkit: [ i686-linux, x86_64-linux, x86_64-darwin ] gi-javascriptcore: [ i686-linux, x86_64-linux, x86_64-darwin ] diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix index fe488d0447e..bb6e6da1e0c 100644 --- a/pkgs/development/haskell-modules/hackage-packages.nix +++ b/pkgs/development/haskell-modules/hackage-packages.nix @@ -766,6 +766,50 @@ self: { maintainers = with stdenv.lib.maintainers; [ abbradar ]; }) {inherit (pkgs) emacs;}; + "Agda_2_5_4_2" = callPackage + ({ mkDerivation, alex, array, async, base, binary, blaze-html + , boxes, bytestring, Cabal, containers, data-hash, deepseq + , directory, EdisonCore, edit-distance, emacs, equivalence + , filemanip, filepath, geniplate-mirror, gitrev, happy, hashable + , hashtables, haskeline, ieee754, mtl, murmur-hash, pretty, process + , regex-tdfa, stm, strict, template-haskell, text, time + , transformers, unordered-containers, uri-encode, zlib + }: + mkDerivation { + pname = "Agda"; + version = "2.5.4.2"; + sha256 = "07wvawpfjhx3gw2w53v27ncv1bl0kkx08wkm6wzxldbslkcasign"; + isLibrary = true; + isExecutable = true; + enableSeparateDataOutput = true; + setupHaskellDepends = [ base Cabal filemanip filepath process ]; + libraryHaskellDepends = [ + array async base binary blaze-html boxes bytestring containers + data-hash deepseq directory EdisonCore edit-distance equivalence + filepath geniplate-mirror gitrev hashable hashtables haskeline + ieee754 mtl murmur-hash pretty process regex-tdfa stm strict + template-haskell text time transformers unordered-containers + uri-encode zlib + ]; + libraryToolDepends = [ alex happy ]; + executableHaskellDepends = [ base directory filepath process ]; + executableToolDepends = [ emacs ]; + postInstall = '' + files=("$data/share/ghc-"*"/"*"-ghc-"*"/Agda-"*"/lib/prim/Agda/"{Primitive.agda,Builtin"/"*.agda}) + for f in "''${files[@]}" ; do + $out/bin/agda $f + done + for f in "''${files[@]}" ; do + $out/bin/agda -c --no-main $f + done + $out/bin/agda-mode compile + ''; + description = "A dependently typed functional programming language and proof assistant"; + license = "unknown"; + hydraPlatforms = stdenv.lib.platforms.none; + maintainers = with stdenv.lib.maintainers; [ abbradar ]; + }) {inherit (pkgs) emacs;}; + "Agda-executable" = callPackage ({ mkDerivation, Agda, base }: mkDerivation { @@ -8951,10 +8995,8 @@ self: { }: mkDerivation { pname = "HaXml"; - version = "1.25.4"; - sha256 = "1d8xq37h627im5harybhsn08qjdaf6vskldm03cqbfjmr2w6fx6p"; - revision = "1"; - editedCabalFile = "1vnil3xdyhr48f0nxcaljbl1k5ibg5g5gghvrhykg447b0jvp922"; + version = "1.25.5"; + sha256 = "0d8jbiv53r3ndg76r3937idqdg34nhmb99vj087i73hjnv21mifb"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -10226,8 +10268,8 @@ self: { ({ mkDerivation, base, mtl, QuickCheck, Stream }: mkDerivation { pname = "IOSpec"; - version = "0.3"; - sha256 = "0dwl2nx8fisl1syggwd3060wa50lj5nl9312x4q7pq153cxjppyy"; + version = "0.3.1"; + sha256 = "1xfhsj8r2gf9wynsihls255qqwqj8vrjyn56rk60xvm27ya4f1d3"; libraryHaskellDepends = [ base mtl QuickCheck Stream ]; description = "A pure specification of the IO monad"; license = stdenv.lib.licenses.bsd3; @@ -12290,6 +12332,32 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "MissingH_1_4_0_1" = callPackage + ({ mkDerivation, array, base, containers, directory + , errorcall-eq-instance, filepath, hslogger, HUnit, mtl, network + , old-locale, old-time, parsec, process, QuickCheck, random + , regex-compat, testpack, time, unix + }: + mkDerivation { + pname = "MissingH"; + version = "1.4.0.1"; + sha256 = "0wcvgrmav480w7nf4bl14yi0jq2yzanysxwzwas9hpb28vyjlgr8"; + revision = "1"; + editedCabalFile = "04syc14nz11fay6fm6nlixyflrfhpg4jiyxx6mnxrl6asd3cl989"; + libraryHaskellDepends = [ + array base containers directory filepath hslogger HUnit mtl network + old-locale old-time parsec process random regex-compat time unix + ]; + testHaskellDepends = [ + array base containers directory errorcall-eq-instance filepath + hslogger HUnit mtl network old-locale old-time parsec process + QuickCheck random regex-compat testpack time unix + ]; + description = "Large utility library"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "MissingH" = callPackage ({ mkDerivation, array, base, containers, directory , errorcall-eq-instance, filepath, hslogger, HUnit, mtl, network @@ -15071,12 +15139,12 @@ self: { }) {}; "QuickCheck-safe" = callPackage - ({ mkDerivation, base, QuickCheck }: + ({ mkDerivation, base, containers, QuickCheck }: mkDerivation { pname = "QuickCheck-safe"; - version = "0.1.0.4"; - sha256 = "0ixizi0cshqqczm86rnibas8zygf8i29l3i0jivvb81zi89rscl7"; - libraryHaskellDepends = [ base QuickCheck ]; + version = "0.1.0.5"; + sha256 = "0l8wp2np4mlbybzwcz8g4r9d8c65yljnvizs3g1rvig4b65j283l"; + libraryHaskellDepends = [ base containers QuickCheck ]; description = "Safe reimplementation of QuickCheck's core"; license = stdenv.lib.licenses.mit; }) {}; @@ -18650,8 +18718,8 @@ self: { }: mkDerivation { pname = "Villefort"; - version = "0.1.2.16"; - sha256 = "00ngq1i7f1sqksfl9cg1qzhp4fxv9h6mmjfljj3cahcw50h4al64"; + version = "0.1.2.17"; + sha256 = "17ga54kclbcr6vpiy6q5yws9535j9sg6isqggx05kz3hsa7nllbz"; isLibrary = true; isExecutable = true; enableSeparateDataOutput = true; @@ -22167,8 +22235,8 @@ self: { }: mkDerivation { pname = "aeson-schema"; - version = "0.4.1.2"; - sha256 = "1afw0kf39myh4yqkkz8z1a7ji02j2iy7j66ch06pglvp5hzyi9dk"; + version = "0.4.1.3"; + sha256 = "17w0hih9l7x9r14s2mxywjzysm00f6bz6rqsgknvv9injakpscn3"; enableSeparateDataOutput = true; libraryHaskellDepends = [ aeson attoparsec base bytestring containers fail ghc-prim mtl @@ -26876,8 +26944,8 @@ self: { pname = "ansi-pretty"; version = "0.1.2.1"; sha256 = "1ill2dlzbxn97smkzdqcjfx9z3fw7pgwvz6w36d92n8p7zwik23h"; - revision = "5"; - editedCabalFile = "18vg7p8ymwk3kfhvg8cn8vq574x52n8a2c7ihrg4jg1gdsdrn0vi"; + revision = "6"; + editedCabalFile = "1j2iyzf61wmwdrb8i3xynins7shjv89y4028sy13rfywsbqpjg4s"; libraryHaskellDepends = [ aeson ansi-wl-pprint array base bytestring containers generics-sop nats scientific semigroups tagged text time unordered-containers @@ -26891,8 +26959,8 @@ self: { ({ mkDerivation, base, colour }: mkDerivation { pname = "ansi-terminal"; - version = "0.8.1"; - sha256 = "1fm489l5mnlyb6bidq7vxz5asvhshmxz38f0lijgj0z7yyzqpwwy"; + version = "0.8.2"; + sha256 = "147ss9wz03ww6ypbv6yh5vi1wfrfcaqm8r6nxh50vnp7254359wh"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base colour ]; @@ -27331,7 +27399,7 @@ self: { description = "Bindings to libaosd, a library for Cairo-based on-screen displays"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; - }) {libaosd = null;}; + }) {inherit (pkgs) libaosd;}; "ap-reflect" = callPackage ({ mkDerivation, base }: @@ -28961,6 +29029,23 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "arraylist" = callPackage + ({ mkDerivation, base, hashable, initialize, MonadRandom, primitive + , smallcheck, tasty, tasty-smallcheck + }: + mkDerivation { + pname = "arraylist"; + version = "0.1.0.0"; + sha256 = "1swvn9k7j2pwcln4znzrszgwgdi4f26q9qlaz2fi8jixc089v91g"; + libraryHaskellDepends = [ base initialize primitive ]; + testHaskellDepends = [ + base hashable MonadRandom primitive smallcheck tasty + tasty-smallcheck + ]; + description = "Memory-efficient ArrayList implementation"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "arrow-extras" = callPackage ({ mkDerivation, base }: mkDerivation { @@ -29123,10 +29208,8 @@ self: { }: mkDerivation { pname = "ascii"; - version = "0.0.5.1"; - sha256 = "06z63pr5g1wcsyii3pr8svz23cl9n4srspbkvby595pxfcbzkirn"; - revision = "1"; - editedCabalFile = "1v8pgvhl47c4sf226pg175wydw5a60lssz0876haqkqm5h7bjm7g"; + version = "0.0.5.2"; + sha256 = "1kbf6iml4nvkzf78xqvxy67469vznd05ig8aprq7zx5vr9njliby"; libraryHaskellDepends = [ base blaze-builder bytestring case-insensitive hashable semigroups text @@ -29571,8 +29654,8 @@ self: { ({ mkDerivation, base, Cabal, directory, filepath }: mkDerivation { pname = "asset-bundle"; - version = "0.1.0.0"; - sha256 = "0fdl3dgnc5q9mv8w5g3qrhyprqhbyp4jrr5gimf9xzd67fwsnf86"; + version = "0.1.0.1"; + sha256 = "0wf0xnf4ljihzvbz8pkaiqwhvp00bwnyx0334s4757z6lsc2hsrw"; libraryHaskellDepends = [ base Cabal directory filepath ]; description = "A build-time Cabal library that bundles executables with assets"; license = stdenv.lib.licenses.bsd3; @@ -30348,16 +30431,16 @@ self: { "ats-pkg" = callPackage ({ mkDerivation, ansi-wl-pprint, base, binary, bytestring, bzlib - , Cabal, cli-setup, composition-prelude, containers, cpphs - , dependency, dhall, directory, file-embed, filemanip, filepath - , http-client, http-client-tls, lzma, microlens, mtl - , optparse-applicative, parallel-io, process, shake, shake-ats - , shake-c, shake-ext, tar, temporary, text, unix, zip-archive, zlib + , Cabal, cli-setup, composition-prelude, containers, dependency + , dhall, directory, file-embed, filemanip, filepath, http-client + , http-client-tls, lzma, microlens, mtl, optparse-applicative + , parallel-io, process, shake, shake-ats, shake-c, shake-ext, tar + , temporary, text, unix, zip-archive, zlib }: mkDerivation { pname = "ats-pkg"; - version = "3.2.2.3"; - sha256 = "111lwv4461ij5z8z9n0kyvqcrjk0x5yjajfc3wyc3lklgc6ccjva"; + version = "3.2.3.0"; + sha256 = "0yirmngvkmkxdbhh3r6b1j9385hhwnqpr6mmw9kf50axd7czx421"; isLibrary = true; isExecutable = true; enableSeparateDataOutput = true; @@ -30368,7 +30451,6 @@ self: { microlens mtl parallel-io process shake shake-ats shake-c shake-ext tar text unix zip-archive zlib ]; - libraryToolDepends = [ cpphs ]; executableHaskellDepends = [ base bytestring cli-setup dependency directory microlens optparse-applicative parallel-io shake shake-ats temporary text @@ -31381,20 +31463,18 @@ self: { "avers-server" = callPackage ({ mkDerivation, aeson, avers, avers-api, base, base64-bytestring , bytestring, bytestring-conversion, containers, cookie, cryptonite - , http-types, memory, mtl, resource-pool, rethinkdb-client-driver - , servant, servant-server, stm, text, time, transformers, wai - , wai-websockets, websockets + , http-types, memory, mtl, resource-pool, servant, servant-server + , stm, text, time, transformers, wai, wai-websockets, websockets }: mkDerivation { pname = "avers-server"; - version = "0.1.0"; - sha256 = "0m809p50l1bfhnmbwl3ncav8lz7xh38yakqa35z65afb6k1g900z"; + version = "0.1.0.1"; + sha256 = "13jic248m2307r84acv4b4xlh7pvx4kxm6gp0nhvz1ds0bbrdkdy"; libraryHaskellDepends = [ aeson avers avers-api base base64-bytestring bytestring bytestring-conversion containers cookie cryptonite http-types - memory mtl resource-pool rethinkdb-client-driver servant - servant-server stm text time transformers wai wai-websockets - websockets + memory mtl resource-pool servant servant-server stm text time + transformers wai wai-websockets websockets ]; description = "Server implementation of the Avers API"; license = stdenv.lib.licenses.mit; @@ -32227,25 +32307,22 @@ self: { }: mkDerivation { pname = "axel"; - version = "0.0.6"; - sha256 = "17601gv4rjdxmg2qqp2y9b5lk9ia0z1izhympmwf6zs7wkjs6fyh"; - revision = "2"; - editedCabalFile = "12m24klalqxpglh9slhr65sxqd4dsqcaz2abmw29cki0cz6x29dp"; + version = "0.0.8"; + sha256 = "16fkrc87yirzha3fgdcbidi7k9xkmb5y5w1i4i10rlikhszfr2b9"; isLibrary = true; isExecutable = true; enableSeparateDataOutput = true; libraryHaskellDepends = [ base bytestring directory filepath freer-simple haskell-src-exts lens lens-aeson optparse-applicative parsec process regex-pcre - singletons strict text typed-process vector yaml + singletons strict template-haskell text typed-process vector yaml ]; executableHaskellDepends = [ base freer-simple optparse-applicative ]; testHaskellDepends = [ base bytestring filepath freer-simple hedgehog lens split tasty - tasty-discover tasty-golden tasty-hedgehog tasty-hspec - template-haskell transformers + tasty-discover tasty-golden tasty-hedgehog tasty-hspec transformers ]; testToolDepends = [ tasty-discover ]; description = "The Axel programming language"; @@ -32404,8 +32481,8 @@ self: { pname = "b-tree"; version = "0.1.3"; sha256 = "0r1bgcjsykd9qzzr6chxw8bfnmvk32p9663j6h11wmq6nq7nrlkb"; - revision = "2"; - editedCabalFile = "04is4fc308f1achbdxvqq9rg4v8c02f1w88wysp318dbhhmwgggh"; + revision = "3"; + editedCabalFile = "1i9qadxdq215j6dimyrmdkzl3d95l4gb65d2visf8rq1jfmdz62n"; libraryHaskellDepends = [ base binary bytestring containers directory errors exceptions filepath lens mmap mtl pipes pipes-interleave transformers vector @@ -33484,6 +33561,8 @@ self: { pname = "basic-sop"; version = "0.2.0.2"; sha256 = "0cd5zlv3w3r99ck5cz43kppand0n9vx26g4d4fqqcmvjxk8zwhy7"; + revision = "1"; + editedCabalFile = "0rvhcbywgpidnq1vg79a9scq6hraqdyv67j63vyidm0q20ml5mpv"; libraryHaskellDepends = [ base deepseq generics-sop QuickCheck text ]; @@ -34050,20 +34129,18 @@ self: { }) {}; "bed-and-breakfast" = callPackage - ({ mkDerivation, array, base, binary, deepseq, QuickCheck + ({ mkDerivation, array, base, binary, cpphs, deepseq, QuickCheck , template-haskell }: mkDerivation { pname = "bed-and-breakfast"; - version = "0.4.3"; - sha256 = "0183770vkb5r9srxqr3fa4s601g10bx07b05hjr3b3nvc0ab9f6z"; - revision = "1"; - editedCabalFile = "0kqdmq6y2fgbknx2lsn1jx2g2n7yizdpzn6wvnnvjaqi945yvyry"; + version = "0.5"; + sha256 = "0dj1vvb9j55psp6yra72wk0k3k6ggvarmzj7zjgr8z3npv5mqmar"; libraryHaskellDepends = [ - array base binary deepseq template-haskell + array base binary cpphs deepseq template-haskell ]; testHaskellDepends = [ base QuickCheck ]; - description = "Efficient Matrix operations in 100% Haskell"; + description = "Efficient Matrix and Vector operations in 100% Haskell"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; }) {}; @@ -34186,8 +34263,8 @@ self: { }: mkDerivation { pname = "bench-show"; - version = "0.2.1"; - sha256 = "1afx5vck4b57r6kanr5g46rk5n8hf9vw4vg2sfqgdb3fhc9979g5"; + version = "0.2.2"; + sha256 = "12fi59j9a98n4q6gjvjsf0hjc2rsy33b7kzjiqxy5wzh8isciaa4"; libraryHaskellDepends = [ ansi-wl-pprint base Chart Chart-diagrams csv directory filepath mwc-random split statistics transformers vector @@ -35247,6 +35324,8 @@ self: { pname = "binary-tagged"; version = "0.1.5.1"; sha256 = "196msm7v0r41d7gx8aghl0c1gvir60sf0w9sfpcz2dq9akzqzjvh"; + revision = "1"; + editedCabalFile = "1z612d3wbrlywcx96lc52svi9b2s6nskdnwnwm3d5mylcqaqckcx"; libraryHaskellDepends = [ aeson array base base16-bytestring binary bytestring containers generics-sop hashable scientific SHA tagged text time @@ -37134,6 +37213,8 @@ self: { pname = "bitwise"; version = "1.0.0.1"; sha256 = "03xyzdkyb99gvm9g5chl07rqbnm7qrxba7wgmrfmal0rkwm0ibkn"; + revision = "1"; + editedCabalFile = "1h6dbjmznd3pvz7j5f8xwaaxxhx57fxszli2k430wcn65bc9y0zs"; libraryHaskellDepends = [ array base bytestring ]; testHaskellDepends = [ base QuickCheck ]; benchmarkHaskellDepends = [ array base bytestring criterion ]; @@ -37165,13 +37246,15 @@ self: { }) {}; "bizzlelude" = callPackage - ({ mkDerivation, base-noprelude, containers, directory, text }: + ({ mkDerivation, base-noprelude, containers, directory, regexpr + , text + }: mkDerivation { pname = "bizzlelude"; - version = "1.2.0"; - sha256 = "1yqp46blrllx5irn1vvvx1v2n06pdfdfmhcng8hvs7q43fcsfgcr"; + version = "1.5.0"; + sha256 = "1mjy5hlszj85wvxwr7fza5wa004xjcg434kwzxzjmmlcvkgh2ybr"; libraryHaskellDepends = [ - base-noprelude containers directory text + base-noprelude containers directory regexpr text ]; description = "A lousy Prelude replacement by a lousy dude"; license = stdenv.lib.licenses.bsd3; @@ -38777,8 +38860,8 @@ self: { pname = "boring"; version = "0.1"; sha256 = "0r263cc8bdwsaw33x96fgd8npsma9a2ffv6mfz9z72d7qclhimkk"; - revision = "1"; - editedCabalFile = "0hdvr4rkkj2mapqha335rhncfmrw70qzjmfis2w9l4iqx617fv9m"; + revision = "2"; + editedCabalFile = "1jxaby4cagbhii194x9x0j75ms1v5bm14sx7d19zz3844mh9qyci"; libraryHaskellDepends = [ adjunctions base base-compat constraints fin generics-sop streams tagged transformers transformers-compat vec @@ -39207,6 +39290,8 @@ self: { pname = "brick"; version = "0.41.2"; sha256 = "04b4gyzb0c66idl19k0v3g9z48bcii728ivbpvm8zjkzq2m2hqix"; + revision = "1"; + editedCabalFile = "00z07bkarxqv517aq95gib864z9mrq9j86zh6jdxybf2v4fwh04s"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -39797,6 +39882,20 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "btrfs_0_2_0_0" = callPackage + ({ mkDerivation, base, bytestring, time, unix }: + mkDerivation { + pname = "btrfs"; + version = "0.2.0.0"; + sha256 = "1h56yb4a3i1c452splxj06c8harrcws2pg86rx7jz6b804ncrzr2"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ base bytestring time unix ]; + description = "Bindings to the btrfs API"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "buchhaltung" = callPackage ({ mkDerivation, aeson, ansi-wl-pprint, array, async, base, boxes , bytestring, cassava, containers, data-default, Decimal, deepseq @@ -41402,8 +41501,8 @@ self: { }: mkDerivation { pname = "cabal-debian"; - version = "4.38.1"; - sha256 = "1sniyy2pappjjhvw1bma593gxdcjlg3j2afx8jgb70h6cbl3769n"; + version = "4.38.2"; + sha256 = "1hr2y1jymi835pwm17z4fc0r58fkx3h8vxb03qp4fiadily0lg3s"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -42016,10 +42115,8 @@ self: { ({ mkDerivation, base, Cabal, QuickCheck }: mkDerivation { pname = "cabal-test-quickcheck"; - version = "0.1.8.1"; - sha256 = "0r5fd670a5ch0lzw7wsxp6k06wzi64wvjbiy8zyfl7brmjnbh8gn"; - revision = "1"; - editedCabalFile = "1rq6l86sndcv8nb5nl9rki2kmblrarj9cbra0i6kixa5n1wbcmv6"; + version = "0.1.8.2"; + sha256 = "04fdfxvgp518x7n6d74l92qh67z94pay4wldy8dv4n51zhkgk8bf"; libraryHaskellDepends = [ base Cabal QuickCheck ]; description = "QuickCheck for Cabal"; license = stdenv.lib.licenses.mit; @@ -42509,10 +42606,8 @@ self: { }: mkDerivation { pname = "cacophony"; - version = "0.10.0"; - sha256 = "1hjxzpbnp5qzbjl9m0hyvlr7yflfgxr5kqbviamhpgc0lj5igizv"; - revision = "2"; - editedCabalFile = "0w7nq4c5i89vmslxhvzw8299gig2wrr0ayddqjk5dxghmmly3hdw"; + version = "0.10.1"; + sha256 = "1w9v04mdyzvwndqfb8my9a82b51avgwfnl6g7w89xj37ax9ariaj"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -42968,6 +43063,26 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "canonical-json" = callPackage + ({ mkDerivation, aeson, base, bytestring, containers, parsec + , pretty, QuickCheck, tasty, tasty-quickcheck, unordered-containers + , vector + }: + mkDerivation { + pname = "canonical-json"; + version = "0.5.0.1"; + sha256 = "1r52f69afsnl6kmn0h2rl6wp21jjain4kz6123a1haacfm2f2hwj"; + libraryHaskellDepends = [ + base bytestring containers parsec pretty + ]; + testHaskellDepends = [ + aeson base bytestring QuickCheck tasty tasty-quickcheck + unordered-containers vector + ]; + description = "Canonical JSON for signing and hashing JSON values"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "canteven-config" = callPackage ({ mkDerivation, base, unix, yaml }: mkDerivation { @@ -43179,6 +43294,8 @@ self: { pname = "capnp"; version = "0.3.0.0"; sha256 = "17i7m168bqp57m5lb04sbfh2amc1sicv2jajkl61jb1gsidwdkrz"; + revision = "1"; + editedCabalFile = "0faisbw98h1zjsqja57c0xac6hhnhb4sghzh9a3225pp8wxnbjr7"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -47213,8 +47330,8 @@ self: { }: mkDerivation { pname = "clckwrks"; - version = "0.24.0.7"; - sha256 = "1czalrr7y3526jb4cgi8bghxghqwsjwkfhm5vb4q19xzqg3kjqwy"; + version = "0.24.0.8"; + sha256 = "1csiak0i3aaz56f64509w49q4j21cb10zlxdx8lyhbm8aikva0n1"; enableSeparateDataOutput = true; setupHaskellDepends = [ base Cabal ]; libraryHaskellDepends = [ @@ -47385,8 +47502,8 @@ self: { }: mkDerivation { pname = "clckwrks-plugin-page"; - version = "0.4.3.12"; - sha256 = "0xndx7843laiha1n8xscq13dv6x6fv098v1cdmmzx7qnvfvhhlxj"; + version = "0.4.3.13"; + sha256 = "0fkfsi9hv0hv4zbv2znb0v30z5qvifgmz9875868va0830nv3ibh"; setupHaskellDepends = [ base Cabal ]; libraryHaskellDepends = [ acid-state aeson attoparsec base clckwrks containers directory @@ -49568,19 +49685,21 @@ self: { }) {}; "combinat" = callPackage - ({ mkDerivation, array, base, containers, QuickCheck, random - , test-framework, test-framework-quickcheck2, transformers + ({ mkDerivation, array, base, containers, QuickCheck, random, tasty + , tasty-hunit, tasty-quickcheck, test-framework + , test-framework-quickcheck2, transformers }: mkDerivation { pname = "combinat"; - version = "0.2.8.2"; - sha256 = "0i7hk8518ixwxvxgy9xbf9hcyfpvmcfgz5m3wbxzcj5ry4rnnhnh"; + version = "0.2.9.0"; + sha256 = "1y617qyhqh2k6d51j94c0xnj54i7b86d87n0j12idxlkaiv4j5sw"; libraryHaskellDepends = [ array base containers random transformers ]; testHaskellDepends = [ - array base containers QuickCheck random test-framework - test-framework-quickcheck2 transformers + array base containers QuickCheck random tasty tasty-hunit + tasty-quickcheck test-framework test-framework-quickcheck2 + transformers ]; description = "Generate and manipulate various combinatorial objects"; license = stdenv.lib.licenses.bsd3; @@ -49707,15 +49826,16 @@ self: { }) {}; "comfort-array" = callPackage - ({ mkDerivation, base, guarded-allocation, QuickCheck, transformers - , utility-ht + ({ mkDerivation, base, guarded-allocation, primitive, QuickCheck + , storable-record, transformers, utility-ht }: mkDerivation { pname = "comfort-array"; - version = "0.1.1"; - sha256 = "0kmqb7mcanx3n597nm8p6g76nc4v5smkl5srjmb2757fb3w68xmk"; + version = "0.1.2"; + sha256 = "1rc8gfgjid10wajjk5pp1vmm8wc2apr5qcr2w41pwk25m554iyz1"; libraryHaskellDepends = [ - base guarded-allocation QuickCheck transformers utility-ht + base guarded-allocation primitive QuickCheck storable-record + transformers utility-ht ]; testHaskellDepends = [ base QuickCheck ]; description = "Arrays where the index type is a function of the shape type"; @@ -50267,8 +50387,8 @@ self: { pname = "complex-generic"; version = "0.1.1.1"; sha256 = "03wb599difj0qm1dpzgxdymq3bql69qmkdk5fspcyc19nnd5qlqz"; - revision = "2"; - editedCabalFile = "160lw045p7j5vm4j2sqqfpnfgkxkil2kwjnmi7x6am03gfi9g9kw"; + revision = "3"; + editedCabalFile = "0vm0i25bib0bzlw7fw209pqn3963y5hx0vkri049q4v7y0qld8k9"; libraryHaskellDepends = [ base template-haskell ]; description = "complex numbers with non-mandatory RealFloat"; license = stdenv.lib.licenses.bsd3; @@ -50548,12 +50668,12 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "composition-prelude_2_0_0_0" = callPackage + "composition-prelude_2_0_1_0" = callPackage ({ mkDerivation, base }: mkDerivation { pname = "composition-prelude"; - version = "2.0.0.0"; - sha256 = "0kz0jr5pfy6d1pm8sbxzrp0h7bnaljspggmzz382p6xp4npr6pg5"; + version = "2.0.1.0"; + sha256 = "027fzappyma8hqqkqka21af937h57fdaq8ni73skxa03pcflwqmc"; libraryHaskellDepends = [ base ]; description = "Higher-order function combinators"; license = stdenv.lib.licenses.bsd3; @@ -50790,8 +50910,8 @@ self: { }: mkDerivation { pname = "concraft"; - version = "0.14.1"; - sha256 = "0v7han8ps1ysxi929clkbx0c0vjd6dyxxhfp8q5k2jx58blwzxyg"; + version = "0.14.2"; + sha256 = "151cp99iah0fd50fkizidcla7f1kvb0jwgl1cj3j6f25j21894dy"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -50837,8 +50957,8 @@ self: { }: mkDerivation { pname = "concraft-pl"; - version = "2.1.1"; - sha256 = "1fznivcsgyjhb62jzk9a3wsv8rmynr7y7473ldbqypkjgy2rmvf2"; + version = "2.4.0"; + sha256 = "0gc50aadzryy1a8mj85i4afgip34w6pk4s2kqsn10910634lmy6h"; isLibrary = true; isExecutable = true; enableSeparateDataOutput = true; @@ -51158,8 +51278,8 @@ self: { ({ mkDerivation, base }: mkDerivation { pname = "concurrent-split"; - version = "0.0.1"; - sha256 = "1rxq0l513mldz7rlpmpac7n6mipk4lciv58h77h0zypixy73qyb0"; + version = "0.0.1.1"; + sha256 = "0i9gak7q3ay8g1kzq7dg0bs36bg88n7kwy3h1r6jrni7mz7jh05f"; libraryHaskellDepends = [ base ]; description = "MVars and Channels with distinguished input and output side"; license = stdenv.lib.licenses.bsd3; @@ -51818,8 +51938,8 @@ self: { }: mkDerivation { pname = "confcrypt"; - version = "0.1.0.2"; - sha256 = "0iw47xz34f2dljsq6hm75046sy7wmzj4ndgfh9h3x4iixs5vidfw"; + version = "0.1.0.3"; + sha256 = "0fj40m3yncrwb3z2dznvls17v40xm1kh0i4ig16mpb9qj7ww8chl"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -52026,6 +52146,8 @@ self: { pname = "config-value-getopt"; version = "0.1.1.0"; sha256 = "0ypg8wl17vqdqsk1gpaba11v63xmqysfp4cd4ii8zha7pfmlhb4c"; + revision = "1"; + editedCabalFile = "1vdm5pgql8cggdkqxhc2z0cg2s7xayghdm51k0m3lx9396f5pxm8"; libraryHaskellDepends = [ base config-value text ]; description = "Interface between config-value and System.GetOpt"; license = stdenv.lib.licenses.mit; @@ -54857,8 +54979,8 @@ self: { }: mkDerivation { pname = "crf-chain1-constrained"; - version = "0.5.0"; - sha256 = "194mcafkf23lifmx2n2hnvsaxl0mfdl9zgl9awigddwxvpxsrmjq"; + version = "0.6.0"; + sha256 = "0yzwvzknn0qd8d2b0fqk1lznz8fplv6gx8x5hlmhqmi2f625yav7"; libraryHaskellDepends = [ array base binary containers data-lens data-memocombinators logfloat monad-codec parallel pedestrian-dag random sgd vector @@ -54894,8 +55016,8 @@ self: { }: mkDerivation { pname = "crf-chain2-tiers"; - version = "0.5.0"; - sha256 = "1gwfkvs9lc7ni68n2mxrqx0haawnc8dwx0b73q7a75ysx538f84x"; + version = "0.6.0"; + sha256 = "14vn96vq7ck9xs1gnjmsxi6hr8mlpa6vbr53v2v4lmbav29jqrhr"; libraryHaskellDepends = [ array base binary comonad containers data-lens data-memocombinators logfloat monad-codec parallel pedestrian-dag sgd vector @@ -56497,6 +56619,29 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "cuckoo-filter" = callPackage + ({ mkDerivation, aeson, base, cereal, containers, criterion + , hashable, QuickCheck, random, tasty, tasty-hunit + , tasty-quickcheck + }: + mkDerivation { + pname = "cuckoo-filter"; + version = "0.1.0.2"; + sha256 = "16ql9qvf1qsbnk1wxy3d5iqyk0kyx9w27vq284gr34yqd18dpvk5"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ aeson base cereal containers hashable ]; + executableHaskellDepends = [ + aeson base cereal containers criterion hashable random + ]; + testHaskellDepends = [ + aeson base cereal containers hashable QuickCheck tasty tasty-hunit + tasty-quickcheck + ]; + description = "Pure and impure Cuckoo Filter"; + license = stdenv.lib.licenses.mit; + }) {}; + "cuda" = callPackage ({ mkDerivation, base, bytestring, c2hs, Cabal, directory, filepath , pretty, template-haskell, uuid-types @@ -57115,8 +57260,8 @@ self: { ({ mkDerivation, base, doctest, template-haskell }: mkDerivation { pname = "d10"; - version = "0.1.0.0"; - sha256 = "0ymhfarhsryqw0h6nksz9ki640b3xa1613k40hp85mk4rqir0zjq"; + version = "0.2.1.0"; + sha256 = "0dbz1lil7qm0qnn1y5kakh6nyyc3jkv00125vfp9nk2n25yckb9z"; libraryHaskellDepends = [ base template-haskell ]; testHaskellDepends = [ base doctest ]; description = "Digits 0-9"; @@ -59289,8 +59434,8 @@ self: { ({ mkDerivation, base, pretty, syb }: mkDerivation { pname = "data-tree-print"; - version = "0.1.0.1"; - sha256 = "1zh1akyf8vvsqq39vrbn95v5md5in9fvzmz2jz79adh3w5wc5j6f"; + version = "0.1.0.2"; + sha256 = "00jh37anim8qsn553467gmfhajcz1c61zrgh1ypkqsll0gc29vy3"; libraryHaskellDepends = [ base pretty syb ]; description = "Print Data instances as a nested tree"; license = stdenv.lib.licenses.bsd3; @@ -60634,8 +60779,8 @@ self: { ({ mkDerivation, base, singletons }: mkDerivation { pname = "decidable"; - version = "0.1.2.0"; - sha256 = "1dgxkwdazqdlnc6pvqwkx531xajl4ygjm5315dz9ilacgbbl2qss"; + version = "0.1.4.0"; + sha256 = "07cw2jhvii3prsbczxpmq7g492wc89yxp77ivs01gp3bl7m25cky"; libraryHaskellDepends = [ base singletons ]; description = "Combinators for manipulating dependently-typed predicates"; license = stdenv.lib.licenses.bsd3; @@ -65978,6 +66123,58 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "docusign-base" = callPackage + ({ mkDerivation, aeson, base, bytestring, data-default, http-media + , lens, servant, servant-client, text + }: + mkDerivation { + pname = "docusign-base"; + version = "0.0.1"; + sha256 = "1qh1g8nyj606x0vapv6m07dhm4s3g5z17g1i4wk5bj63vxvms528"; + libraryHaskellDepends = [ + aeson base bytestring data-default http-media lens servant + servant-client text + ]; + description = "Low-level bindings to the DocuSign API"; + license = stdenv.lib.licenses.bsd3; + }) {}; + + "docusign-client" = callPackage + ({ mkDerivation, aeson, base, base64-bytestring, bytestring + , data-default, docusign-base, exceptions, http-client + , http-client-tls, http-types, servant-client, text, uuid + }: + mkDerivation { + pname = "docusign-client"; + version = "0.0.1"; + sha256 = "1vyb7n08vqjmc18adbs6ck01q5440a0r99ahb566v427mr9hcydg"; + libraryHaskellDepends = [ + aeson base base64-bytestring bytestring data-default docusign-base + exceptions http-client http-client-tls http-types servant-client + text uuid + ]; + description = "Client bindings for the DocuSign API"; + license = stdenv.lib.licenses.bsd3; + }) {}; + + "docusign-example" = callPackage + ({ mkDerivation, base, bytestring, docusign-base, docusign-client + , exceptions, filepath, optparse-generic, text, uuid + }: + mkDerivation { + pname = "docusign-example"; + version = "0.1.0.0"; + sha256 = "0fhyzmgdjq5rds0p0gifwg6pfsq17yyhj4nwvi6zpgzmww4vya21"; + isLibrary = false; + isExecutable = true; + executableHaskellDepends = [ + base bytestring docusign-base docusign-client exceptions filepath + optparse-generic text uuid + ]; + description = "DocuSign examples"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "docvim" = callPackage ({ mkDerivation, base, bytestring, containers, deepseq, directory , dlist, filepath, hlint, lens, mtl, optparse-applicative, parsec @@ -68004,8 +68201,8 @@ self: { }: mkDerivation { pname = "easytest"; - version = "0.2"; - sha256 = "1sd9w5p6z9mmvxid6svmnh7h43r32mrcqilb8k7kiy36ln3n8j0b"; + version = "0.2.1"; + sha256 = "0gdyawzlw6d15yz7ji599xjgfr0g7l1iq11ffr4aw3j6g3dc6m8i"; libraryHaskellDepends = [ async base call-stack containers mtl random stm text transformers ]; @@ -68920,8 +69117,8 @@ self: { pname = "ekg-core"; version = "0.1.1.4"; sha256 = "0dz9iv6viya7b5nx9gxj9g0d1k155pvb7i59azf9272wl369mn36"; - revision = "2"; - editedCabalFile = "1jky0jf6ajan5zmb46d6p4lv7293kc5gw1bcq5av733g10cwrbdk"; + revision = "3"; + editedCabalFile = "1s3545x9w01rrwzchb4f91ck0n6dc7gf0zwkryqx1b2c95ni5qa8"; libraryHaskellDepends = [ base containers ghc-prim text unordered-containers ]; @@ -70223,8 +70420,8 @@ self: { }: mkDerivation { pname = "entwine"; - version = "0.0.1"; - sha256 = "08yy72lgc8cg12hbz51q06zx7fslhhnk0rjjszba8aj0qbrj8yr4"; + version = "0.0.2"; + sha256 = "08y5vxg6q5f7dakclap86i68if18srzl6q3a9hg7qyrrq6jlyv63"; libraryHaskellDepends = [ async base containers exceptions monad-loops SafeSemaphore stm text time transformers transformers-either @@ -70259,6 +70456,17 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "enum-types" = callPackage + ({ mkDerivation, base }: + mkDerivation { + pname = "enum-types"; + version = "0.1.0.0"; + sha256 = "18qiq6nnnd1c5lkvjafsqd4ypa4xpmx99diq82dz5wy2h95ci2ri"; + libraryHaskellDepends = [ base ]; + description = "small enum types"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "enumerable" = callPackage ({ mkDerivation, base, control-monad-omega, tagged }: mkDerivation { @@ -70502,6 +70710,27 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "envstatus" = callPackage + ({ mkDerivation, base, ConfigFile, mtl, parsec, process, PyF, tasty + , tasty-hspec, unix + }: + mkDerivation { + pname = "envstatus"; + version = "1.0.2"; + sha256 = "1wdvhlmqwzwxv0y3n8xhw5yjy158c7xgiyd0p2zhjghws2p1jvp5"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + base ConfigFile mtl parsec process unix + ]; + executableHaskellDepends = [ base ]; + testHaskellDepends = [ + base ConfigFile parsec PyF tasty tasty-hspec + ]; + description = "Display efficiently the state of the local environment"; + license = stdenv.lib.licenses.mit; + }) {}; + "envy" = callPackage ({ mkDerivation, base, bytestring, containers, hspec, mtl , QuickCheck, quickcheck-instances, text, time, transformers @@ -72528,8 +72757,8 @@ self: { }: mkDerivation { pname = "exhaustive"; - version = "1.1.6"; - sha256 = "00gdgr9xqzy14sqx31j4afljvfc4ar2jrzmwpp3z6ybfq1saw7vk"; + version = "1.1.7"; + sha256 = "02kv3vv7gz8lqwm5iz4nddyzxp17cgsb6j12lc5kf51l481vpb1z"; libraryHaskellDepends = [ base generics-sop template-haskell transformers ]; @@ -72833,8 +73062,8 @@ self: { pname = "exp-extended"; version = "0.1.1.2"; sha256 = "0ymfnwq103n1paj6wl2cj6szi5nx2h2j1azy3wy4kkw6sk07m00r"; - revision = "2"; - editedCabalFile = "050v0c9l9gi1bxpqbfcl2j9mdiv7xdh1mdfwymxcgpjydv60xwh0"; + revision = "3"; + editedCabalFile = "0gd1jwhhj5qjvfysvrm41zywx3cq6n131ym2x94z68cpswdmv0qn"; libraryHaskellDepends = [ base compensated log-domain ]; description = "floating point with extended exponent range"; license = stdenv.lib.licenses.bsd3; @@ -73318,13 +73547,16 @@ self: { }: mkDerivation { pname = "extensible-effects-concurrent"; - version = "0.6.2"; - sha256 = "11cqk78c0lfsa8mkq7ymxsral0g24p1im4r1ndqsf7rxczjmc37c"; + version = "0.8"; + sha256 = "17xag4qcdgv7fihyigmi48kf4mb9f3dbxqlh7a7s1xqdfh9l6mc2"; + isLibrary = true; + isExecutable = true; libraryHaskellDepends = [ base containers data-default deepseq directory extensible-effects filepath lens logging-effect monad-control mtl parallel process QuickCheck random stm tagged time transformers ]; + executableHaskellDepends = [ base extensible-effects ]; testHaskellDepends = [ base containers deepseq extensible-effects HUnit lens QuickCheck stm tasty tasty-discover tasty-hunit @@ -77275,21 +77507,21 @@ self: { "fltkhs" = callPackage ({ mkDerivation, base, bytestring, c2hs, Cabal, directory, filepath - , mtl, parsec, text + , mtl, parsec, pkg-config, text, vector }: mkDerivation { pname = "fltkhs"; - version = "0.5.4.5"; - sha256 = "17iqpnn0zgwifb937kllkfyz8qf37da90z8iyay348gy3siwjxic"; + version = "0.6.0.0"; + sha256 = "1cbyp8rq9yzx6jrw68dbprkdyd8pkdqbxx08wajyg7bfks6j39cb"; isLibrary = true; isExecutable = true; setupHaskellDepends = [ base Cabal directory filepath ]; - libraryHaskellDepends = [ base bytestring text ]; - libraryToolDepends = [ c2hs ]; + libraryHaskellDepends = [ base bytestring text vector ]; + libraryToolDepends = [ c2hs pkg-config ]; executableHaskellDepends = [ base directory filepath mtl parsec ]; description = "FLTK bindings"; license = stdenv.lib.licenses.mit; - }) {}; + }) {pkg-config = null;}; "fltkhs-demos" = callPackage ({ mkDerivation, base, bytestring, directory, fltkhs, process, stm @@ -77349,6 +77581,24 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "fltkhs-themes" = callPackage + ({ mkDerivation, base, bytestring, Cabal, fltkhs, fontconfig + , load-font, text, vector + }: + mkDerivation { + pname = "fltkhs-themes"; + version = "0.1.0.1"; + sha256 = "03awhraincinrqr1zzb9c64mkb391isw3gb87csa1dkqk846wij6"; + enableSeparateDataOutput = true; + setupHaskellDepends = [ base Cabal ]; + libraryHaskellDepends = [ + base bytestring fltkhs load-font text vector + ]; + librarySystemDepends = [ fontconfig ]; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {inherit (pkgs) fontconfig;}; + "fluent-logger" = callPackage ({ mkDerivation, attoparsec, base, bytestring, cereal , cereal-conduit, conduit, conduit-extra, containers, criterion @@ -77540,10 +77790,8 @@ self: { }: mkDerivation { pname = "fmt"; - version = "0.6"; - sha256 = "14hk6ra8j1zzw7ibimj207mi1xl5pmln6kyz0y66j4bg1r8invsy"; - revision = "1"; - editedCabalFile = "0xmi4qxq12qfj4ry1ifb0za7jdlvj65v16bzdqi8r7p1xrxy5cki"; + version = "0.6.1"; + sha256 = "1c6a0nrm90drs13s1hry9xs8j7dx37j21f7kllpx5s240nqy4c6c"; libraryHaskellDepends = [ base base64-bytestring bytestring containers formatting microlens text time time-locale-compat @@ -79289,6 +79537,32 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "freer-simple_1_2_0_0" = callPackage + ({ mkDerivation, base, criterion, extensible-effects, free, mtl + , natural-transformation, QuickCheck, tasty, tasty-hunit + , tasty-quickcheck, template-haskell, transformers-base + }: + mkDerivation { + pname = "freer-simple"; + version = "1.2.0.0"; + sha256 = "1z0f0m03szzcy1s6msqdlaj266dq0bkkwlwcr7p28xv7lj6gxgdb"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + base natural-transformation template-haskell transformers-base + ]; + executableHaskellDepends = [ base ]; + testHaskellDepends = [ + base QuickCheck tasty tasty-hunit tasty-quickcheck + ]; + benchmarkHaskellDepends = [ + base criterion extensible-effects free mtl + ]; + description = "Implementation of a friendly effect system for Haskell"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "freesect" = callPackage ({ mkDerivation, array, base, cpphs, directory, mtl, parallel , pretty, random, syb @@ -80487,6 +80761,19 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "fused-effects" = callPackage + ({ mkDerivation, base, deepseq, doctest, hspec, MonadRandom, random + }: + mkDerivation { + pname = "fused-effects"; + version = "0.1.1.0"; + sha256 = "1wcrixfpz0q93xskb90p8a2jypsghbpgwn4fjy6k1ad4ihxn19hl"; + libraryHaskellDepends = [ base deepseq MonadRandom random ]; + testHaskellDepends = [ base doctest hspec ]; + description = "A fast, flexible, fused effect system"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "fusion" = callPackage ({ mkDerivation, base, directory, doctest, filepath, pipes-safe , transformers, void @@ -80502,6 +80789,62 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "futhark" = callPackage + ({ mkDerivation, aeson, alex, ansi-terminal, array, base + , bifunctors, binary, blaze-html, bytestring, containers + , data-binary-ieee754, directory, directory-tree, dlist, extra + , file-embed, filepath, free, gitrev, happy, haskeline, http-client + , http-client-tls, http-conduit, HUnit, language-c-quote + , mainland-pretty, markdown, megaparsec, mtl, neat-interpolation + , parallel, parser-combinators, process, process-extras, QuickCheck + , random, raw-strings-qq, regex-tdfa, srcloc, tasty, tasty-hunit + , tasty-quickcheck, template-haskell, temporary, text + , th-lift-instances, time, transformers, vector + , vector-binary-instances, versions, zip-archive, zlib + }: + mkDerivation { + pname = "futhark"; + version = "0.7.4"; + sha256 = "1qjcza0i0y6qalyim5kclz3x4lj667d4d4y2amk3sn4qbgaibajs"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + ansi-terminal array base bifunctors binary blaze-html bytestring + containers data-binary-ieee754 directory directory-tree dlist extra + file-embed filepath free gitrev http-client http-client-tls + http-conduit language-c-quote mainland-pretty markdown megaparsec + mtl neat-interpolation parallel parser-combinators process + process-extras raw-strings-qq regex-tdfa srcloc template-haskell + text th-lift-instances time transformers vector + vector-binary-instances versions zip-archive zlib + ]; + libraryToolDepends = [ alex happy ]; + executableHaskellDepends = [ + aeson ansi-terminal array base bifunctors binary blaze-html + bytestring containers data-binary-ieee754 directory directory-tree + dlist extra file-embed filepath free gitrev haskeline http-client + http-client-tls http-conduit language-c-quote mainland-pretty + markdown megaparsec mtl neat-interpolation parallel + parser-combinators process process-extras random raw-strings-qq + regex-tdfa srcloc template-haskell temporary text th-lift-instances + time transformers vector vector-binary-instances versions + zip-archive zlib + ]; + testHaskellDepends = [ + ansi-terminal array base bifunctors binary blaze-html bytestring + containers data-binary-ieee754 directory directory-tree dlist extra + file-embed filepath free gitrev http-client http-client-tls + http-conduit HUnit language-c-quote mainland-pretty markdown + megaparsec mtl neat-interpolation parallel parser-combinators + process process-extras QuickCheck raw-strings-qq regex-tdfa srcloc + tasty tasty-hunit tasty-quickcheck template-haskell text + th-lift-instances time transformers vector vector-binary-instances + versions zip-archive zlib + ]; + description = "An optimising compiler for a functional, array-oriented language"; + license = stdenv.lib.licenses.isc; + }) {}; + "futun" = callPackage ({ mkDerivation, base, bytestring, network, unix }: mkDerivation { @@ -81949,14 +82292,14 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "generics-sop_0_4_0_0" = callPackage + "generics-sop_0_4_0_1" = callPackage ({ mkDerivation, base, criterion, deepseq, ghc-prim, sop-core , template-haskell }: mkDerivation { pname = "generics-sop"; - version = "0.4.0.0"; - sha256 = "0blx09k173qgaghqnsvz6v2r6san1kn62k5c57wilya94l1996ra"; + version = "0.4.0.1"; + sha256 = "160knr2phnzh2gldfv954lz029jzc7y8kz5xpmbf4z3vb5ngm6fw"; libraryHaskellDepends = [ base ghc-prim sop-core template-haskell ]; @@ -81975,8 +82318,8 @@ self: { pname = "generics-sop-lens"; version = "0.1.2.1"; sha256 = "0p2ji955hy9r6c1wmiziga9pbbli24my3vmx19gf4i8db36d8jaf"; - revision = "5"; - editedCabalFile = "1q6953xi46qvbknaq2j8x2zqmk2q1mmf8xczjyib3abxz0rp3608"; + revision = "6"; + editedCabalFile = "0j4j3kk2nsl5n5gp0vrzqdc5y9ly31b4nvhq0bpgcpzibvik7ssw"; libraryHaskellDepends = [ base generics-sop lens ]; description = "Lenses for types in generics-sop"; license = stdenv.lib.licenses.bsd3; @@ -83181,8 +83524,8 @@ self: { }: mkDerivation { pname = "ghc-events"; - version = "0.8.0"; - sha256 = "1wdxap20wh8sdaqnpsk463mihg6v3va786zb1amgzrcjpsv49is5"; + version = "0.8.0.1"; + sha256 = "1658lr4av48y8m0p5fs3sjxkkbdkwdf6m02byzw69gqg3xzz1i99"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -83265,15 +83608,15 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "ghc-exactprint_0_5_8_1" = callPackage + "ghc-exactprint_0_5_8_2" = callPackage ({ mkDerivation, base, bytestring, containers, Diff, directory , filemanip, filepath, free, ghc, ghc-boot, ghc-paths, HUnit, mtl , silently, syb }: mkDerivation { pname = "ghc-exactprint"; - version = "0.5.8.1"; - sha256 = "1qjl137f4lpadkgdyfjnkkga8vqyw0x27plpyw57aqhc8qmcylhh"; + version = "0.5.8.2"; + sha256 = "18wlhvgpbk7ym1vbi8fkdwbjhcplgr7zcqm328yi4v7rilbxw7cn"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -84904,6 +85247,24 @@ self: { license = stdenv.lib.licenses.lgpl21; }) {}; + "gi-gtk-hs_0_3_6_3" = callPackage + ({ mkDerivation, base, base-compat, containers, gi-gdk + , gi-gdkpixbuf, gi-glib, gi-gobject, gi-gtk, haskell-gi-base, mtl + , text, transformers + }: + mkDerivation { + pname = "gi-gtk-hs"; + version = "0.3.6.3"; + sha256 = "0xnrssnfaz57akrkgpf1cm3d4lg3cmlh0b8yp6w9pdsbp0lld2ay"; + libraryHaskellDepends = [ + base base-compat containers gi-gdk gi-gdkpixbuf gi-glib gi-gobject + gi-gtk haskell-gi-base mtl text transformers + ]; + description = "A wrapper for gi-gtk, adding a few more idiomatic API parts on top"; + license = stdenv.lib.licenses.lgpl21; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "gi-gtkosxapplication" = callPackage ({ mkDerivation, base, bytestring, Cabal, containers, gi-gdkpixbuf , gi-gobject, gi-gtk, gtk-mac-integration-gtk3, haskell-gi @@ -84968,6 +85329,27 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {inherit (pkgs.gnome3) webkitgtk;}; + "gi-javascriptcore_4_0_16" = callPackage + ({ mkDerivation, base, bytestring, Cabal, containers, gi-glib + , gi-gobject, haskell-gi, haskell-gi-base, haskell-gi-overloading + , text, transformers, webkitgtk + }: + mkDerivation { + pname = "gi-javascriptcore"; + version = "4.0.16"; + sha256 = "0kihq9sp42k2k9j8qrwgja62i5pzwhc1z1yy6h19n56aikddfc2z"; + setupHaskellDepends = [ base Cabal haskell-gi ]; + libraryHaskellDepends = [ + base bytestring containers gi-glib gi-gobject haskell-gi + haskell-gi-base haskell-gi-overloading text transformers + ]; + libraryPkgconfigDepends = [ webkitgtk ]; + doHaddock = false; + description = "JavaScriptCore bindings"; + license = stdenv.lib.licenses.lgpl21; + hydraPlatforms = stdenv.lib.platforms.none; + }) {inherit (pkgs.gnome3) webkitgtk;}; + "gi-notify" = callPackage ({ mkDerivation, base, bytestring, Cabal, containers, gi-gdkpixbuf , gi-glib, gi-gobject, haskell-gi, haskell-gi-base @@ -85318,18 +85700,19 @@ self: { }) {}; "gingersnap" = callPackage - ({ mkDerivation, aeson, base, bytestring, http-types - , postgresql-simple, resource-pool, snap-core + ({ mkDerivation, aeson, base, bytestring, deepseq, http-types + , postgresql-simple, resource-pool, snap-core, text, transformers + , unordered-containers }: mkDerivation { pname = "gingersnap"; - version = "0.1.1.0"; - sha256 = "0aqb9ikh21q13mnwf6vcg6chv73vphyag62zhkd4mkhbnlpr816i"; + version = "0.2.2.3"; + sha256 = "1w1ip80w9bc5gj0ws6cvk37648267b4fqmh81h2khn7qhdah74k7"; libraryHaskellDepends = [ - aeson base bytestring http-types postgresql-simple resource-pool - snap-core + aeson base bytestring deepseq http-types postgresql-simple + resource-pool snap-core text transformers unordered-containers ]; - description = "snap-core + aeson + postgresql-simple = delicious"; + description = "Tools for consistent and safe JSON APIs with snap-core and postgresql-simple"; license = stdenv.lib.licenses.bsd3; }) {}; @@ -90570,8 +90953,8 @@ self: { ({ mkDerivation, base, containers, json, text }: mkDerivation { pname = "graphql-w-persistent"; - version = "0.1.0.4"; - sha256 = "1ivdh8l6snb2d3g1f7fb46fd9fz6ib2i94b1596pmp38hryl8in0"; + version = "0.1.0.7"; + sha256 = "13fbx5vzg2fq9883hdf8djbc47lyia6n4sshwz3dhg5bjpni7l1x"; libraryHaskellDepends = [ base containers json text ]; description = "Haskell GraphQL query parser-interpreter-data processor"; license = stdenv.lib.licenses.isc; @@ -91554,8 +91937,8 @@ self: { }: mkDerivation { pname = "gssapi-wai"; - version = "0.1.2.2"; - sha256 = "1fkgsdc4nkxwkhnz3b8rz6zx8jq6325mgniy5h5s3cr7k0kwnv0s"; + version = "0.1.2.3"; + sha256 = "08c47zwy4wh1cga5l4brg7dm5nkl7xcsq2rvwdzvmzzxyfg3nnr7"; libraryHaskellDepends = [ base base64-bytestring bytestring case-insensitive gssapi http-types vault wai wai-extra @@ -93543,8 +93926,8 @@ self: { }: mkDerivation { pname = "hackage-whatsnew"; - version = "0.1.1"; - sha256 = "140qsl0aqw2zg246inijifvcddmirba613as0hrg11hkd52f6fhr"; + version = "0.1.2"; + sha256 = "19nk01jqfirvr8c3wy6pacq32v5lzxi735r8i6d23d0vwjfmqxnk"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -94005,8 +94388,8 @@ self: { }: mkDerivation { pname = "hadolint"; - version = "1.13.0"; - sha256 = "1z5qaxslshd1adkhqcpx8m8fs8d3dw4vwbwvsqcpm7gis63qhbqg"; + version = "1.14.0"; + sha256 = "0cypqvl04fd0gdakl2kf087fjy6qw968isx2hmli5z5gza18hl0b"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -95403,24 +95786,27 @@ self: { "hapistrano" = callPackage ({ mkDerivation, aeson, async, base, directory, filepath , formatting, gitrev, hspec, mtl, optparse-applicative, path - , path-io, process, stm, temporary, time, transformers, yaml + , path-io, process, QuickCheck, stm, temporary, time, transformers + , yaml }: mkDerivation { pname = "hapistrano"; - version = "0.3.6.1"; - sha256 = "0g0i0n952zjvysjrsp4srhqgrq5fyy7kdinixsxazpccf01f229y"; + version = "0.3.7.0"; + sha256 = "16d1y3dwbvj76b1yyghvwi4f7wak1dv6l07ymknrbi42ks0w9041"; isLibrary = true; isExecutable = true; enableSeparateDataOutput = true; libraryHaskellDepends = [ - base filepath formatting gitrev mtl path process time transformers + aeson base filepath formatting gitrev mtl path process time + transformers ]; executableHaskellDepends = [ aeson async base formatting gitrev optparse-applicative path path-io stm yaml ]; testHaskellDepends = [ - base directory filepath hspec mtl path path-io process temporary + base directory filepath hspec mtl path path-io process QuickCheck + temporary ]; description = "A deployment library for Haskell applications"; license = stdenv.lib.licenses.mit; @@ -97937,7 +98323,7 @@ self: { license = stdenv.lib.licenses.mit; }) {}; - "haskell-lsp_0_8_0_0" = callPackage + "haskell-lsp_0_8_0_1" = callPackage ({ mkDerivation, aeson, base, bytestring, containers, data-default , directory, filepath, hashable, haskell-lsp-types, hslogger, hspec , lens, mtl, network-uri, parsec, sorted-list, stm, text, time @@ -97945,8 +98331,8 @@ self: { }: mkDerivation { pname = "haskell-lsp"; - version = "0.8.0.0"; - sha256 = "04mihj4538pys6v4m3dwijfzcpsv52jizm416rnnwc88gr8q6wkk"; + version = "0.8.0.1"; + sha256 = "1lvrqxp6v5xvha88l8r6n86ydvlszzxmi7fazvjxz4bixy9zvw8q"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -98005,15 +98391,15 @@ self: { license = stdenv.lib.licenses.mit; }) {}; - "haskell-lsp-types_0_8_0_0" = callPackage + "haskell-lsp-types_0_8_0_1" = callPackage ({ mkDerivation, aeson, base, bytestring, data-default, filepath , hashable, lens, network-uri, scientific, text , unordered-containers }: mkDerivation { pname = "haskell-lsp-types"; - version = "0.8.0.0"; - sha256 = "11dm7v9rvfig6m40m0np7cs5cfaawwpw67c445dz15vls5pri71n"; + version = "0.8.0.1"; + sha256 = "0czh6fqrzzp5xkawwiia5n437pmch41rnkp166lpvglfqg4gx8y8"; libraryHaskellDepends = [ aeson base bytestring data-default filepath hashable lens network-uri scientific text unordered-containers @@ -98571,6 +98957,8 @@ self: { pname = "haskell-src-meta"; version = "0.8.0.3"; sha256 = "08jq156zv4m0fjq6712n99c1jwxnpa6kj6sq8ch0r1l0a1ay6ww4"; + revision = "2"; + editedCabalFile = "0dp5v0yd0wgijzaggr22glgjswpa65hy84h8awdzd9d78g2fjz6c"; libraryHaskellDepends = [ base haskell-src-exts pretty syb template-haskell th-orphans ]; @@ -99832,8 +100220,8 @@ self: { }: mkDerivation { pname = "haskoin-node"; - version = "0.9.2"; - sha256 = "1aiqhw7fk6h70ps5svbhhhk577ai0rqk6s4bm00ii4yhnbdrdk60"; + version = "0.9.3"; + sha256 = "149k9b11c0dj3qqdbinwqnjxy8bxmc4bk65lfxpic2zy26n46k7q"; libraryHaskellDepends = [ base bytestring cereal conduit conduit-extra data-default hashable haskoin-core monad-logger mtl network nqe random resourcet @@ -99895,31 +100283,34 @@ self: { }) {}; "haskoin-store" = callPackage - ({ mkDerivation, aeson, base, bytestring, cereal, conduit - , containers, directory, filepath, haskoin-core, haskoin-node - , hspec, http-types, monad-logger, mtl, network, nqe - , optparse-applicative, random, rocksdb-haskell, rocksdb-query - , scotty, string-conversions, text, time, transformers, unliftio + ({ mkDerivation, aeson, base, binary, bytestring, cereal, conduit + , containers, data-default, directory, filepath, hashable + , haskoin-core, haskoin-node, hspec, http-types, monad-logger, mtl + , network, nqe, optparse-applicative, random, rocksdb-haskell + , rocksdb-query, scotty, string-conversions, text, time + , transformers, unliftio, unordered-containers }: mkDerivation { pname = "haskoin-store"; - version = "0.2.3"; - sha256 = "0ywfmqdwvw07gx4a413i0ffsgrq2gfjgpw8a6f78h6idiw69shkw"; + version = "0.4.2"; + sha256 = "0fjp566icp76dqhivl9jn3s3k2fvxmjysj4rpmrvwfyzb7snlqvp"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ - aeson base bytestring cereal conduit containers haskoin-core - haskoin-node monad-logger mtl network nqe random rocksdb-haskell - rocksdb-query string-conversions text time transformers unliftio + aeson base bytestring cereal conduit containers data-default + hashable haskoin-core haskoin-node monad-logger mtl network nqe + random rocksdb-haskell rocksdb-query string-conversions text time + transformers unliftio unordered-containers ]; executableHaskellDepends = [ - aeson base bytestring conduit directory filepath haskoin-core - haskoin-node http-types monad-logger nqe optparse-applicative - rocksdb-haskell scotty string-conversions text unliftio + aeson base binary bytestring cereal conduit data-default directory + filepath haskoin-core haskoin-node http-types monad-logger nqe + optparse-applicative rocksdb-haskell scotty string-conversions text + transformers unliftio unordered-containers ]; testHaskellDepends = [ - base haskoin-core haskoin-node hspec monad-logger mtl nqe - rocksdb-haskell unliftio + base data-default haskoin-core haskoin-node hspec monad-logger mtl + nqe rocksdb-haskell transformers unliftio unordered-containers ]; description = "Storage and index for Bitcoin and Bitcoin Cash"; license = stdenv.lib.licenses.publicDomain; @@ -100165,6 +100556,33 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "hasktorch-codegen" = callPackage + ({ mkDerivation, base, containers, directory, hashable, hspec + , hspec-discover, megaparsec, optparse-applicative, pretty-show + , QuickCheck, text, unordered-containers + }: + mkDerivation { + pname = "hasktorch-codegen"; + version = "0.0.1.0"; + sha256 = "0s48myr8k96kb0mwvfcc9h5razp8y5k8dk987hfg101h2nfz5k10"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + base containers directory hashable megaparsec pretty-show text + unordered-containers + ]; + executableHaskellDepends = [ + base optparse-applicative pretty-show + ]; + testHaskellDepends = [ + base containers hspec hspec-discover megaparsec pretty-show + QuickCheck text + ]; + testToolDepends = [ hspec-discover ]; + description = "Code generation tools for Hasktorch"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "haskus-binary" = callPackage ({ mkDerivation, base, bytestring, cereal, criterion, haskus-utils , mtl, QuickCheck, tasty, tasty-quickcheck @@ -100213,8 +100631,8 @@ self: { }: mkDerivation { pname = "haskus-utils"; - version = "1.0"; - sha256 = "1pfjarir86c2sxjh8l0jc7z5acsz8slcwb7imjdxf3dsdiy8swwd"; + version = "1.1"; + sha256 = "1grbj23545b7wxxyc4rra681k9c8xg36swlql3rgcr15m61fm647"; libraryHaskellDepends = [ base containers extra file-embed haskus-utils-data haskus-utils-types haskus-utils-variant list-t mtl @@ -100233,8 +100651,8 @@ self: { }: mkDerivation { pname = "haskus-utils-data"; - version = "1.0"; - sha256 = "007ykjinkxr9kdrk7hl81zndpan60b5l51m32nlj2xv2pjm326z4"; + version = "1.1"; + sha256 = "1001apph6i956rkb6dpfhg8cgk870s44jgaaiv8ccxivkv45y7di"; libraryHaskellDepends = [ base containers extra haskus-utils-types mtl recursion-schemes transformers @@ -100247,23 +100665,26 @@ self: { ({ mkDerivation, base }: mkDerivation { pname = "haskus-utils-types"; - version = "1.0"; - sha256 = "1rxnaw53vfmi3gv8h7j6vw4y4xxnqzwaaasd6x22fm7fzc5q64vf"; + version = "1.1"; + sha256 = "1fihf61z5078l73a08fvm5qb67dr3yc32nhgakkldd0fbh7clyrz"; libraryHaskellDepends = [ base ]; description = "Haskus utility modules"; license = stdenv.lib.licenses.bsd3; }) {}; "haskus-utils-variant" = callPackage - ({ mkDerivation, base, haskus-utils-data, haskus-utils-types }: + ({ mkDerivation, base, haskus-utils-data, haskus-utils-types, tasty + , tasty-quickcheck, template-haskell + }: mkDerivation { pname = "haskus-utils-variant"; - version = "1.0"; - sha256 = "1kkqngvzifxps0hhp49syh2w4an3y4s4nvp3qbh3p00h9dw3hmsn"; + version = "2.0.1"; + sha256 = "1rg4m1iq2fnnjxd6vbxsqnv21h8rnqisvxxfhns7hc167aydfwwp"; libraryHaskellDepends = [ - base haskus-utils-data haskus-utils-types + base haskus-utils-data haskus-utils-types template-haskell ]; - description = "Haskus utility modules"; + testHaskellDepends = [ base tasty tasty-quickcheck ]; + description = "Variant and EADT"; license = stdenv.lib.licenses.bsd3; }) {}; @@ -102727,17 +103148,18 @@ self: { "heist" = callPackage ({ mkDerivation, aeson, attoparsec, base, bifunctors, blaze-builder - , blaze-html, bytestring, containers, criterion, directory - , directory-tree, dlist, filepath, hashable, HUnit, lens - , lifted-base, map-syntax, monad-control, mtl, process, QuickCheck - , random, statistics, test-framework, test-framework-hunit - , test-framework-quickcheck2, text, time, transformers - , transformers-base, unordered-containers, vector, xmlhtml + , blaze-html, bytestring, containers, criterion + , criterion-measurement, directory, directory-tree, dlist, filepath + , hashable, HUnit, lens, lifted-base, map-syntax, monad-control + , mtl, process, QuickCheck, random, statistics, test-framework + , test-framework-hunit, test-framework-quickcheck2, text, time + , transformers, transformers-base, unordered-containers, vector + , xmlhtml }: mkDerivation { pname = "heist"; - version = "1.1"; - sha256 = "15hdq3i041ph0ry6f9dn6vx2w9hzgkvi9db4p6cy6czwbp53kjbq"; + version = "1.1.0.1"; + sha256 = "1j4h9fwny4hl2m5lgsd257lvm9057fb0hmnaqjw8a9k4hyx7hmqq"; libraryHaskellDepends = [ aeson attoparsec base blaze-builder blaze-html bytestring containers directory directory-tree dlist filepath hashable @@ -102754,10 +103176,11 @@ self: { ]; benchmarkHaskellDepends = [ aeson attoparsec base blaze-builder blaze-html bytestring - containers criterion directory directory-tree dlist filepath - hashable HUnit lifted-base map-syntax monad-control mtl process - random statistics test-framework test-framework-hunit text time - transformers transformers-base unordered-containers vector xmlhtml + containers criterion criterion-measurement directory directory-tree + dlist filepath hashable HUnit lifted-base map-syntax monad-control + mtl process random statistics test-framework test-framework-hunit + text time transformers transformers-base unordered-containers + vector xmlhtml ]; description = "An Haskell template system supporting both HTML5 and XML"; license = stdenv.lib.licenses.bsd3; @@ -103599,8 +104022,8 @@ self: { }: mkDerivation { pname = "hevm"; - version = "0.17"; - sha256 = "0xp28mm3wxyj3win37nvrjdywkrfzm4l0j441q88bd35vr25yi2k"; + version = "0.21"; + sha256 = "0h3d1b2xdd59d3rl1a9ng1hz2hr3g6n1dpak0a4namjlcfxvwwhd"; isLibrary = true; isExecutable = true; enableSeparateDataOutput = true; @@ -104453,8 +104876,8 @@ self: { pname = "hgmp"; version = "0.1.1"; sha256 = "1hisbcpz47x2lbqf8vzwis7qw7xhvx22lv7dcyhm9vsmsh5741dr"; - revision = "2"; - editedCabalFile = "0v318nifmgqq5jg1d5q0jspfgyqp7cfnkz3ikqaz9xjg8inzl8mr"; + revision = "3"; + editedCabalFile = "0z2xbqzyrgm9apy3xl353wgwhbnc3hdb1giw2j6fyvv705fmpb62"; libraryHaskellDepends = [ base ghc-prim integer-gmp ]; testHaskellDepends = [ base QuickCheck ]; description = "Haskell interface to GMP"; @@ -106005,8 +106428,8 @@ self: { }: mkDerivation { pname = "hjugement"; - version = "2.0.0.20180903"; - sha256 = "0zvgabj0myn5ssfpj8l50z0jwcrqkfsixdhg1wq916y8ay7yi71n"; + version = "2.0.0.20181030"; + sha256 = "063d484ns520prgvb2b1szq33wx569fgbgrzvfrgpfcznra638fi"; libraryHaskellDepends = [ base containers hashable unordered-containers ]; @@ -107470,8 +107893,8 @@ self: { }: mkDerivation { pname = "hoauth2"; - version = "1.7.2"; - sha256 = "0klkgr11p8m03ksrad59pqs0czp6hrgmzxynng4zirbmz643plvf"; + version = "1.8.0"; + sha256 = "02pirdgq1l638n126qj6sccfkjc6scxl53m584fxq79gfdwarx2q"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -109144,26 +109567,33 @@ self: { }) {}; "hpack-dhall" = callPackage - ({ mkDerivation, aeson, base, dhall, dhall-json, hpack, hspec - , interpolate, megaparsec, mockery, text, transformers + ({ mkDerivation, aeson, aeson-pretty, base, bytestring, Cabal + , dhall, dhall-json, Diff, filepath, hpack, megaparsec, microlens + , optparse-applicative, prettyprinter, tasty, tasty-golden, text + , transformers, utf8-string, yaml }: mkDerivation { pname = "hpack-dhall"; - version = "0.3.0"; - sha256 = "0dplb37npz47cxya1c3dnj6bjcnprjph83yifb08a5qf6vnhcjyh"; - revision = "3"; - editedCabalFile = "1paz90nmir7hrwp9yf2aair14gyiw8ql7f9vj2ry8r7q00xbpfv2"; - isLibrary = false; + version = "0.4.0"; + sha256 = "04bjhfc5xqkvp58y28cifsq58l2rbc8xa7ywvzmk9hvw7acbixca"; + isLibrary = true; isExecutable = true; + libraryHaskellDepends = [ + aeson aeson-pretty base bytestring dhall dhall-json filepath hpack + megaparsec microlens prettyprinter text transformers yaml + ]; executableHaskellDepends = [ - aeson base dhall dhall-json hpack megaparsec text transformers + aeson aeson-pretty base bytestring dhall dhall-json filepath hpack + megaparsec microlens optparse-applicative prettyprinter text + transformers yaml ]; testHaskellDepends = [ - aeson base dhall dhall-json hpack hspec interpolate megaparsec - mockery text transformers + aeson aeson-pretty base bytestring Cabal dhall dhall-json Diff + filepath hpack megaparsec microlens prettyprinter tasty + tasty-golden text transformers utf8-string yaml ]; - description = "Dhall support for Hpack"; - license = stdenv.lib.licenses.publicDomain; + description = "hpack's dhalling"; + license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; }) {}; @@ -110630,18 +111060,17 @@ self: { "hs2ats" = callPackage ({ mkDerivation, ansi-wl-pprint, base, casing, composition-prelude - , cpphs, criterion, deepseq, haskell-src-exts, hspec - , hspec-dirstream, language-ats, microlens, optparse-generic - , system-filepath + , criterion, deepseq, haskell-src-exts, hspec, hspec-dirstream + , language-ats, microlens, optparse-generic, system-filepath }: mkDerivation { pname = "hs2ats"; - version = "0.3.0.4"; - sha256 = "1mqm4yblv22368v01xq59ppi4ifjpqlswfirm6n42ckb47xhmy09"; + version = "0.4.0.0"; + sha256 = "1564xybdqli5i3096xmccy6z0xgm5yvfmjmz60r9ny3h54ahlj7r"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ - ansi-wl-pprint base casing composition-prelude cpphs deepseq + ansi-wl-pprint base casing composition-prelude deepseq haskell-src-exts language-ats microlens ]; executableHaskellDepends = [ base optparse-generic ]; @@ -110716,6 +111145,18 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "hsPID" = callPackage + ({ mkDerivation, base, HUnit, lens }: + mkDerivation { + pname = "hsPID"; + version = "0.1"; + sha256 = "16ks8pvpd0rcw11zinzlldv21i6mbcbrnnq3j9z3vmcjpd25wzim"; + libraryHaskellDepends = [ base lens ]; + testHaskellDepends = [ base HUnit lens ]; + description = "PID control loop"; + license = stdenv.lib.licenses.lgpl3; + }) {}; + "hsSqlite3" = callPackage ({ mkDerivation, base, bindings-sqlite3, bytestring, mtl , utf8-string @@ -111908,6 +112349,24 @@ self: { license = stdenv.lib.licenses.isc; }) {}; + "hsinstall_2_1" = callPackage + ({ mkDerivation, base, Cabal, directory, filepath, heredoc, process + }: + mkDerivation { + pname = "hsinstall"; + version = "2.1"; + sha256 = "1azbzkslszq9pw4h91mp1zr6g6ad2haaf3g5146naf1f456z9zjg"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ base directory filepath ]; + executableHaskellDepends = [ + base Cabal directory filepath heredoc process + ]; + description = "Install Haskell software"; + license = stdenv.lib.licenses.isc; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "hskeleton" = callPackage ({ mkDerivation, base, Cabal }: mkDerivation { @@ -115002,6 +115461,26 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "http-client-openssl_0_3_0_0" = callPackage + ({ mkDerivation, base, bytestring, HsOpenSSL, hspec, http-client + , http-types, network + }: + mkDerivation { + pname = "http-client-openssl"; + version = "0.3.0.0"; + sha256 = "0y7d1bp045mj1lnbd74a1v4viv5g5awivdhbycq75hnvqf2n50vl"; + libraryHaskellDepends = [ + base bytestring HsOpenSSL http-client network + ]; + testHaskellDepends = [ + base HsOpenSSL hspec http-client http-types + ]; + doCheck = false; + description = "http-client backend using the OpenSSL library"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "http-client-request-modifiers" = callPackage ({ mkDerivation, base, bytestring, exceptions, http-client , http-media, http-types, network, network-uri @@ -115766,16 +116245,45 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "http2_1_6_4" = callPackage + ({ mkDerivation, aeson, aeson-pretty, array, base, bytestring + , case-insensitive, containers, criterion, directory, doctest + , filepath, Glob, heaps, hex, hspec, mwc-random, network-byte-order + , psqueues, stm, text, unordered-containers, vector, word8 + }: + mkDerivation { + pname = "http2"; + version = "1.6.4"; + sha256 = "0rhy7z67bmbb15kxq9fmpgvqmc3npsbf1ym04cg07ymq9ihxvjig"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + array base bytestring case-insensitive containers + network-byte-order psqueues stm + ]; + testHaskellDepends = [ + aeson aeson-pretty array base bytestring case-insensitive + containers directory doctest filepath Glob hex hspec + network-byte-order psqueues stm text unordered-containers vector + word8 + ]; + benchmarkHaskellDepends = [ + array base bytestring case-insensitive containers criterion heaps + mwc-random network-byte-order psqueues stm + ]; + description = "HTTP/2 library including frames, priority queues and HPACK"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "http2-client" = callPackage ({ mkDerivation, async, base, bytestring, containers, deepseq , http2, network, stm, time, tls }: mkDerivation { pname = "http2-client"; - version = "0.8.0.1"; - sha256 = "055x0cscrd0idfda4ak48dagkmqkgj1zg29mz4yxrdj9vp2n0xd3"; - revision = "1"; - editedCabalFile = "190dhnj34b9xnpf6d3lj5a1fr90k2dy1l1i8505mp49lxzdvzkgc"; + version = "0.8.0.2"; + sha256 = "16m4amw7xq7psvxix76z7g1dvllkfs9pzpnig5rfhbgfvbf5pydw"; libraryHaskellDepends = [ async base bytestring containers deepseq http2 network stm time tls ]; @@ -115790,8 +116298,8 @@ self: { }: mkDerivation { pname = "http2-client-exe"; - version = "0.1.0.0"; - sha256 = "0i8rnq01dlnj7yzf64b7g7cshzsbxc668m9fhc97x3hbdr7b0iad"; + version = "0.1.0.1"; + sha256 = "1z1y52253dybliwplybwd71a1ssmma34zcylv54aj6x7grrj37hm"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -116801,14 +117309,14 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "hw-ip_0_4_1" = callPackage + "hw-ip_0_4_2" = callPackage ({ mkDerivation, attoparsec, base, generic-lens, hedgehog, hspec , hw-bits, hw-hspec-hedgehog, text }: mkDerivation { pname = "hw-ip"; - version = "0.4.1"; - sha256 = "0kql3qvav2r0fsppiqa40s95938gfzkal5bkli3rhjiknj3vhbg7"; + version = "0.4.2"; + sha256 = "1jcfj75hlg7szvknw6v13barvcilldzh76jv1rnfyscrfhpdkd2s"; libraryHaskellDepends = [ attoparsec base generic-lens hw-bits text ]; @@ -117216,6 +117724,32 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "hw-streams" = callPackage + ({ mkDerivation, base, bytestring, criterion, directory, exceptions + , ghc-prim, hedgehog, hspec, hw-bits, hw-hspec-hedgehog, hw-prim + , mmap, primitive, QuickCheck, semigroups, transformers, vector + }: + mkDerivation { + pname = "hw-streams"; + version = "0.0.0.4"; + sha256 = "08dmcbvw3z53plzgq5z3pa9ns9rjj0xs9rx70pyfrqrrc2f98hwi"; + libraryHaskellDepends = [ + base bytestring ghc-prim hw-bits hw-prim mmap primitive semigroups + transformers vector + ]; + testHaskellDepends = [ + base bytestring directory exceptions ghc-prim hedgehog hspec + hw-bits hw-hspec-hedgehog hw-prim mmap primitive QuickCheck + semigroups transformers vector + ]; + benchmarkHaskellDepends = [ + base bytestring criterion ghc-prim hw-bits hw-prim mmap primitive + semigroups transformers vector + ]; + description = "Primitive functions and data types"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "hw-string-parse" = callPackage ({ mkDerivation, base, bytestring, hspec, QuickCheck, vector }: mkDerivation { @@ -118992,8 +119526,8 @@ self: { }: mkDerivation { pname = "idris"; - version = "1.3.0"; - sha256 = "1w5i2z88li4niykwc6yrgxgfp25ll6ih95cip0ri7d8i7ik03c48"; + version = "1.3.1"; + sha256 = "0fn9h58l592j72njwma1ia48h8h87wi2rjqfxs7j2lfmvgfv18fi"; configureFlags = [ "-fcurses" "-fexeconly" "-fffi" "-fgmp" ]; isLibrary = true; isExecutable = true; @@ -120855,6 +121389,17 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "initialize" = callPackage + ({ mkDerivation, base }: + mkDerivation { + pname = "initialize"; + version = "0.1.1.0"; + sha256 = "0k3bl5adj512bzqysapnggvf6fmi0hs3mvxkymsh9af7gan8y504"; + libraryHaskellDepends = [ base ]; + description = "Initialization and Deinitialization of 'Storable' values"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "inj" = callPackage ({ mkDerivation }: mkDerivation { @@ -120980,8 +121525,8 @@ self: { }: mkDerivation { pname = "inline-c-cpp"; - version = "0.2.2.1"; - sha256 = "1rk7fmpkmxw9hhwr8df29kadnf0ybnwj64ggdbnsdrpfyhnkisci"; + version = "0.3.0.1"; + sha256 = "00q4f2rv6ny5cnfyfdwqvmngw2w40jfs5zb1x7zs574w4l31g701"; libraryHaskellDepends = [ base inline-c safe-exceptions template-haskell ]; @@ -124566,6 +125111,18 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "jmonkey" = callPackage + ({ mkDerivation, base, casing, free, jmacro }: + mkDerivation { + pname = "jmonkey"; + version = "0.1.0.1"; + sha256 = "1yhmhaa8ykjv3xivd7v10q3zw3pvgf45jk5wsbrr95s2p806n5nf"; + libraryHaskellDepends = [ base casing free jmacro ]; + testHaskellDepends = [ base casing free jmacro ]; + description = "Jmonkey is very restricted but handy EDSL for JavaScript"; + license = stdenv.lib.licenses.mit; + }) {}; + "jni" = callPackage ({ mkDerivation, base, bytestring, choice, constraints, containers , cpphs, deepseq, inline-c, jdk, singletons @@ -125477,8 +126034,8 @@ self: { pname = "json-rpc-client"; version = "0.2.5.0"; sha256 = "177lrw5m9dxdk6mcay0f92rwyih8q7znwb8m6da6r3zsn30gajak"; - revision = "8"; - editedCabalFile = "04dqdn9gdw5xgkm4cnzsph57xcjc01rm1fdfwcfdzg71mbyf8f7y"; + revision = "9"; + editedCabalFile = "04b65m8lhk2g2d5x5i637ff3wkgvf4z6dhn5x1pizsj9y3aq35zm"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -125523,8 +126080,8 @@ self: { pname = "json-rpc-server"; version = "0.2.6.0"; sha256 = "1xfcxbwri9a5p3xxbc4kvr1kqdnm4c1axd8kgb8dglabffbrk7hn"; - revision = "5"; - editedCabalFile = "0hvkfbgg3jbgs0d2jp5djhpd2qp3q9hs5cr4ds93bc9nyncymyq9"; + revision = "6"; + editedCabalFile = "1rfabr679pk605v141gm0ynbp3l6x87s3ip3wa49lwnpab495mxs"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -125571,8 +126128,8 @@ self: { pname = "json-sop"; version = "0.2.0.3"; sha256 = "0ay2cymy4aar23cixcyqam91bs9x4z0vqiw2k0nvgy9nyqfz2r9h"; - revision = "1"; - editedCabalFile = "1bvmfl6fqdr8fklv8zai5jgzlnv1jf9xy8i656lfz1ys95q9yr48"; + revision = "2"; + editedCabalFile = "1lclvvcfvicr05v2nf1xkf21qry2g2bqjhd7gfhza89d571aq3gp"; libraryHaskellDepends = [ aeson base generics-sop lens-sop tagged text time transformers unordered-containers vector @@ -127791,6 +128348,28 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "kind-apply" = callPackage + ({ mkDerivation, base }: + mkDerivation { + pname = "kind-apply"; + version = "0.1.0.0"; + sha256 = "0n2picf38cxfgsi76372h6d25s5kvc32qw7514b2i4ald6qh8aip"; + libraryHaskellDepends = [ base ]; + description = "Utilities to work with lists of types"; + license = stdenv.lib.licenses.bsd3; + }) {}; + + "kind-generics" = callPackage + ({ mkDerivation, base, kind-apply }: + mkDerivation { + pname = "kind-generics"; + version = "0.1.0.0"; + sha256 = "1h6pb14b75lphlxzz7q08ihvg2phh082sx6a2zpdk5gwh8qzihpg"; + libraryHaskellDepends = [ base kind-apply ]; + description = "Generic programming in GHC style for arbitrary kinds and GADTs"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "kinds" = callPackage ({ mkDerivation, base }: mkDerivation { @@ -128657,8 +129236,8 @@ self: { }: mkDerivation { pname = "lambdabot"; - version = "5.1.0.2"; - sha256 = "1nzjlxyzrri8zw67flqn1arz10mgbmyglhvf6pg4r8w78iwg5nk3"; + version = "5.1.0.4"; + sha256 = "1pywangzqf85pqhh5sn10vpk0wrd7ff5p29jrsi6sxdz5lyb7svk"; isLibrary = false; isExecutable = true; enableSeparateDataOutput = true; @@ -128682,8 +129261,8 @@ self: { }: mkDerivation { pname = "lambdabot-core"; - version = "5.1.0.2"; - sha256 = "1n0cqkbiadc169vq7pj5zwvi3yay6db60q8pdk4kci0s9clz4161"; + version = "5.1.0.4"; + sha256 = "1cnp0w47fp0s1zlyb0d90xj5ynwfmlnzm5inc5lhbichwgqcwfzk"; libraryHaskellDepends = [ base binary bytestring containers dependent-map dependent-sum dependent-sum-template directory edit-distance filepath haskeline @@ -128708,8 +129287,8 @@ self: { }: mkDerivation { pname = "lambdabot-haskell-plugins"; - version = "5.1.0.3"; - sha256 = "1hka7kb2j5nqzv9jljjyylfyrf5z3hsfp2sfgv95y5qsr2b6g96a"; + version = "5.1.0.4"; + sha256 = "19fl14c1j7p9qaf26g1qkmxvmw9r7hvxqmp9jxmmwbp7xlc3664v"; libraryHaskellDepends = [ array arrows base bytestring containers data-memocombinators directory filepath haskell-src-exts-simple hoogle HTTP IOSpec @@ -128729,8 +129308,8 @@ self: { }: mkDerivation { pname = "lambdabot-irc-plugins"; - version = "5.1.0.1"; - sha256 = "1axixb6q5j7vs93q9d3n5v7l57nvnbjpry1ww8vaqlm71m1z4l2f"; + version = "5.1.0.4"; + sha256 = "0kscksdqjysk9amxwb1xjh475pbwq22mf9as5kqwn72c8s75ngaf"; libraryHaskellDepends = [ base bytestring containers directory filepath lambdabot-core lifted-base mtl network SafeSemaphore split time @@ -128749,8 +129328,8 @@ self: { }: mkDerivation { pname = "lambdabot-misc-plugins"; - version = "5.1.0.1"; - sha256 = "1bg15z7k21l0dwnkvprxvx5jcvs5igl8fqffg11y7h0r74f4yhks"; + version = "5.1.0.4"; + sha256 = "169grwgg5x63qhls16c7xd0p78da38r275mar27il78az7qfgn8d"; libraryHaskellDepends = [ base bytestring containers filepath hstatsd lambdabot-core lifted-base mtl network network-uri parsec process random random-fu @@ -128769,8 +129348,8 @@ self: { }: mkDerivation { pname = "lambdabot-novelty-plugins"; - version = "5.1.0.1"; - sha256 = "1ispnp12i2f8fcs11nay3mww8sa6dwx7lkl6d6gc9cfhzgwih6gi"; + version = "5.1.0.4"; + sha256 = "1m6n0asp8pn12wif5jv0nvjipzgh7mzzxa17j4mzd7mdqi4dma7z"; libraryHaskellDepends = [ base binary brainfuck bytestring containers dice directory lambdabot-core misfortune process random-fu regex-tdfa unlambda @@ -128786,8 +129365,8 @@ self: { }: mkDerivation { pname = "lambdabot-reference-plugins"; - version = "5.1.0.1"; - sha256 = "0s5923hsl1pzyayi4954livp4rsgx84slwpnr7mq8nhfsdxm84wp"; + version = "5.1.0.4"; + sha256 = "0qavp784p5qdb2plhhgk1idrjxcazzn4a94pg8syymb24fzjvm1w"; libraryHaskellDepends = [ base bytestring containers HTTP lambdabot-core mtl network network-uri oeis process regex-tdfa split tagsoup utf8-string @@ -128802,8 +129381,8 @@ self: { }: mkDerivation { pname = "lambdabot-social-plugins"; - version = "5.1.0.1"; - sha256 = "1p46qyb2x7h37xs9y69k1mc5v84rwvkrgkdwkl4cw6pmnkmjnl42"; + version = "5.1.0.4"; + sha256 = "0kjjsnrrsrcdvkn75dsbw7afx8y87i36i6lk54hs6cg88zndailz"; libraryHaskellDepends = [ base binary bytestring containers lambdabot-core mtl split time ]; @@ -128815,8 +129394,8 @@ self: { ({ mkDerivation, base, oeis, QuickCheck, QuickCheck-safe }: mkDerivation { pname = "lambdabot-trusted"; - version = "5.1.0.1"; - sha256 = "11qvpxgv4xbs8iw0lix8mdj174dzj0gwgny7vgvs4vd9pi37sb7r"; + version = "5.1.0.4"; + sha256 = "1mlyhxc93d3466xhxqlyzg1c8988spzbyk4d5l0c05l1m0xlq77j"; libraryHaskellDepends = [ base oeis QuickCheck QuickCheck-safe ]; description = "Lambdabot trusted code"; license = "GPL"; @@ -129355,6 +129934,8 @@ self: { pname = "language-c-quote"; version = "0.12.2"; sha256 = "15c6rdj91768jf8lqzf4fkbi8k6kz9gch5w81x6qzy2l256rncgb"; + revision = "1"; + editedCabalFile = "099w1lln1vm000sf06wrmq6gya5sx2w4flrlwqz2c8wwvv8c9j9h"; libraryHaskellDepends = [ array base bytestring containers exception-mtl exception-transformers filepath haskell-src-meta mainland-pretty @@ -129453,15 +130034,15 @@ self: { license = stdenv.lib.licenses.gpl3; }) {}; - "language-docker_7_0_0" = callPackage + "language-docker_8_0_0" = callPackage ({ mkDerivation, base, bytestring, containers, directory, filepath , free, Glob, hspec, HUnit, megaparsec, mtl, prettyprinter, process , QuickCheck, split, template-haskell, text, th-lift, time }: mkDerivation { pname = "language-docker"; - version = "7.0.0"; - sha256 = "0c63la3739fbcf50vy1cp245fk7x723gviyykd3dmggm1jwgm515"; + version = "8.0.0"; + sha256 = "00zryknsc0717ysq8g1ip5dm70v8b33lfrscbzpdcw5dd2j32k7n"; libraryHaskellDepends = [ base bytestring containers free megaparsec mtl prettyprinter split template-haskell text th-lift time @@ -131171,6 +131752,17 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "leancheck-enum-instances" = callPackage + ({ mkDerivation, base, enum-types, leancheck }: + mkDerivation { + pname = "leancheck-enum-instances"; + version = "0.1.0.0"; + sha256 = "0l14npnkwdr3vcdjv2b20a0g3cka0nd93cm6hrq16dcphm1ckaj1"; + libraryHaskellDepends = [ base enum-types leancheck ]; + description = "listable instances for small enum types"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "leankit-api" = callPackage ({ mkDerivation, aeson, base, bytestring, colour, curl, split }: mkDerivation { @@ -131801,6 +132393,8 @@ self: { pname = "lens-sop"; version = "0.2.0.2"; sha256 = "16bd95cwqiprz55s5272mv6wiw5pmv6mvihviiwbdbilhq400s3z"; + revision = "1"; + editedCabalFile = "0k7xdwj64kd56kjh7ghjwm79rjwjqxlw5nwzwj0cq5q56vb340jm"; libraryHaskellDepends = [ base fclabels generics-sop transformers ]; @@ -131862,6 +132456,17 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "lens-typelevel" = callPackage + ({ mkDerivation, base, singletons }: + mkDerivation { + pname = "lens-typelevel"; + version = "0.1.1.0"; + sha256 = "0lsdp6rgacsa13fppa2dfn2nz8cdrvj5clmlshzrv1h0423hfgbp"; + libraryHaskellDepends = [ base singletons ]; + description = "Type-level lenses using singletons"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "lens-utils" = callPackage ({ mkDerivation, aeson, base, containers, data-default, lens , monoid, split, template-haskell @@ -131924,8 +132529,8 @@ self: { }: mkDerivation { pname = "lentil"; - version = "1.0.11.3"; - sha256 = "0kb9fydcv0skp94bhvhbqggam8vrq2wv5iradxmggaf41h0ly123"; + version = "1.1.0.0"; + sha256 = "0qw6nvhlczqywwzinsj0x5p2xw8490bbizl2lmj48dr71mndxdz0"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -132573,8 +133178,8 @@ self: { }: mkDerivation { pname = "libmpd"; - version = "0.9.0.8"; - sha256 = "0kpdj4ciwrfd6vmr60y7c276h5z2r40avs26a0x8s51rbr00lasq"; + version = "0.9.0.9"; + sha256 = "1931m23iqb4wddpdidm4ph746zpaw41kkjzmb074j7yyfpk7x1jv"; libraryHaskellDepends = [ attoparsec base bytestring containers data-default-class filepath mtl network old-locale text time utf8-string @@ -135055,6 +135660,8 @@ self: { pname = "llvm-hs"; version = "7.0.1"; sha256 = "1ghgmmks22ra6ivhwhy65yj9ihr51lbhwdghm52pna5f14brhlyy"; + revision = "1"; + editedCabalFile = "0nxyjcnsph4mlyxqy47m67ayd4mnpxx3agy5vx7f4v74bg4xx44a"; setupHaskellDepends = [ base Cabal containers ]; libraryHaskellDepends = [ array attoparsec base bytestring containers exceptions llvm-hs-pure @@ -136448,6 +137055,8 @@ self: { pname = "long-double"; version = "0.1"; sha256 = "072yfv1kv83k8qc9apks2czr9p6znk46bbbjmsdbcpzyb8byh64j"; + revision = "1"; + editedCabalFile = "12vmzzrxgb4yqf9axf1fildl4m0dfm3zqxk4vg6k6m5qi6haz1yn"; libraryHaskellDepends = [ base integer-gmp ]; description = "FFI bindings for C long double"; license = stdenv.lib.licenses.bsd3; @@ -137910,8 +138519,8 @@ self: { }: mkDerivation { pname = "magic-wormhole"; - version = "0.1.0"; - sha256 = "0lkwnbr76chiakc7j51pm23q15q26l3xqglg1rj5blwybkymg29x"; + version = "0.2.1"; + sha256 = "1wdn5nykn4wqb65xdhkpy8gpz216a5wi3nngadf58c7acym60gyx"; isLibrary = true; isExecutable = true; enableSeparateDataOutput = true; @@ -138204,6 +138813,8 @@ self: { pname = "mainland-pretty"; version = "0.7"; sha256 = "1xzavchbp345a63i24hs8632l3xk0c1pxqd32b2i6615cp9pnxqi"; + revision = "1"; + editedCabalFile = "1apyqnbcsbjfkqc1d6mk74pxl12130r6ijwhj555gddls9g0qdf3"; libraryHaskellDepends = [ base containers srcloc text transformers ]; @@ -140205,8 +140816,8 @@ self: { pname = "mcm"; version = "0.6.5.0"; sha256 = "1vf54aziyybxyc9bwnn57pfcjmgli2hjjd2kzij8vy2g64ipip9m"; - revision = "1"; - editedCabalFile = "1anhhrl8a627y7vfvcmiwbfjiyvglwrqcim1gc6zycqidyqq22pq"; + revision = "2"; + editedCabalFile = "0xgnh356qwc1zdailqr3m6hbv7q5gc36ycqfz31z6l5kphmbblsc"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -141399,6 +142010,54 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "metar" = callPackage + ({ mkDerivation, base, checkers, deriving-compat, HTTP, lens + , network-uri, QuickCheck, semigroupoids, semigroups, tagsoup + , tagsoup-selection, tasty, tasty-hunit, tasty-quickcheck + , transformers + }: + mkDerivation { + pname = "metar"; + version = "0.0.2"; + sha256 = "1iaqjzy1a7hkvcni6ijkwwcsb433j3gkx9f7z8ng1yhlbcr9a556"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + base deriving-compat HTTP lens network-uri semigroupoids semigroups + tagsoup tagsoup-selection transformers + ]; + executableHaskellDepends = [ base ]; + testHaskellDepends = [ + base checkers lens QuickCheck tasty tasty-hunit tasty-quickcheck + ]; + description = "Australian METAR"; + license = stdenv.lib.licenses.bsd3; + }) {}; + + "metar-http" = callPackage + ({ mkDerivation, base, checkers, http-types, lens, metar + , network-uri, QuickCheck, semigroupoids, semigroups, tasty + , tasty-hunit, tasty-quickcheck, text, transformers, utf8-string + , wai, warp + }: + mkDerivation { + pname = "metar-http"; + version = "0.0.1"; + sha256 = "0xpi9x1c05py659a94ldksn3z5xz9ws069gp1swam1fllg8xbxj6"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + base http-types lens metar network-uri semigroupoids semigroups + text transformers utf8-string wai warp + ]; + executableHaskellDepends = [ base ]; + testHaskellDepends = [ + base checkers lens QuickCheck tasty tasty-hunit tasty-quickcheck + ]; + description = "HTTP for METAR"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "metric" = callPackage ({ mkDerivation, base, data-default, edit-distance, hmatrix , QuickCheck, test-framework, test-framework-quickcheck2, vector @@ -145900,8 +146559,8 @@ self: { }: mkDerivation { pname = "mpi-hs"; - version = "0.3.0.0"; - sha256 = "1a8vlsrpvgyzq4p0qa90l4ck3v9a0pncy9bmmn6kjf6j2wa5j9qx"; + version = "0.3.1.0"; + sha256 = "1ka212z51ga82fwjj6jz6aiidn4fyvf0b5p9xma67fnv9a7cs4v2"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base bytestring monad-loops store ]; @@ -146972,10 +147631,8 @@ self: { ({ mkDerivation, base, containers, deepseq, doctest, Glob }: mkDerivation { pname = "multiset"; - version = "0.3.4"; - sha256 = "0kdmf0ba946pxq1m8q0x5bk2my2fd5frhaw3cj2i3x88nc9f0ycp"; - revision = "1"; - editedCabalFile = "0m7xk2217a5zpwb1hwp5j5r6yzlf0f4lmlnln2lb9bqihjl3j9x8"; + version = "0.3.4.1"; + sha256 = "05iynv54mgfwil7l81ni8mrhhb5vz3fdls13vm2m3dnwqgp7vzxh"; libraryHaskellDepends = [ base containers deepseq ]; testHaskellDepends = [ base doctest Glob ]; description = "The Data.MultiSet container type"; @@ -148100,6 +148757,30 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "mysql-haskell_0_8_4_1" = callPackage + ({ mkDerivation, base, binary, binary-ieee754, binary-parsers + , blaze-textual, bytestring, bytestring-lexing, cryptonite + , io-streams, memory, monad-loops, network, scientific, tasty + , tasty-hunit, tcp-streams, text, time, tls, vector, wire-streams + , word24 + }: + mkDerivation { + pname = "mysql-haskell"; + version = "0.8.4.1"; + sha256 = "0m3kqm5ldy47gv0gbh3sxv2zm4kmszw96r5sar5bzb3v9jvmz94x"; + libraryHaskellDepends = [ + base binary binary-ieee754 binary-parsers blaze-textual bytestring + bytestring-lexing cryptonite io-streams memory monad-loops network + scientific tcp-streams text time tls vector wire-streams word24 + ]; + testHaskellDepends = [ + base bytestring io-streams tasty tasty-hunit text time vector + ]; + description = "pure haskell MySQL driver"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "mysql-haskell-nem" = callPackage ({ mkDerivation, base, bytestring, io-streams, mysql-haskell , scientific, text, time @@ -150082,6 +150763,18 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "network-byte-order" = callPackage + ({ mkDerivation, base, bytestring, doctest }: + mkDerivation { + pname = "network-byte-order"; + version = "0.0.0.0"; + sha256 = "0wfy57ip87ksppggpz26grk4w144yld95mf2y0c6mhcs1l8z3div"; + libraryHaskellDepends = [ base bytestring ]; + testHaskellDepends = [ base bytestring doctest ]; + description = "Network byte order utilities"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "network-bytestring" = callPackage ({ mkDerivation, base, bytestring, network, unix }: mkDerivation { @@ -150098,8 +150791,8 @@ self: { ({ mkDerivation, base, bytestring, network, text, time, vector }: mkDerivation { pname = "network-carbon"; - version = "1.0.13"; - sha256 = "06cc62fns07flmsl9gbdicmqqg5icmy3m4n0nvp2xqjk1ax8ws39"; + version = "1.0.14"; + sha256 = "1jrmda71gkcpppzv8s44kms4vz4zj7yb67wyr882s2b4hcf4il5b"; libraryHaskellDepends = [ base bytestring network text time vector ]; @@ -151198,8 +151891,8 @@ self: { }: mkDerivation { pname = "ngx-export-tools"; - version = "0.1.2.0"; - sha256 = "0vkcgj8y4jh63nwh0djxfjvkbpa66zpf32y5912lwj7xf6rm769q"; + version = "0.2.1.0"; + sha256 = "1xavggdab7khi8isvrcf85xlrxhy852fb2ccj7jhmdnfmqzbzyyq"; libraryHaskellDepends = [ aeson base binary bytestring ngx-export safe template-haskell ]; @@ -151434,18 +152127,18 @@ self: { }) {}; "nix-deploy" = callPackage - ({ mkDerivation, base, neat-interpolation, optparse-applicative - , optparse-generic, text, turtle + ({ mkDerivation, base, bytestring, neat-interpolation + , optparse-applicative, optparse-generic, text, turtle }: mkDerivation { pname = "nix-deploy"; - version = "1.0.2"; - sha256 = "07cirn4gaaarw5va128f63jp2q7jlghmg4kclya4fvapx963qbya"; + version = "1.0.3"; + sha256 = "0anhmc9g9k40nwj87f24hq4wnj6mkli36dzhzdpa0p3cpg7sh2kh"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ - base neat-interpolation optparse-applicative optparse-generic text - turtle + base bytestring neat-interpolation optparse-applicative + optparse-generic text turtle ]; description = "Deploy Nix-built software to a NixOS machine"; license = stdenv.lib.licenses.asl20; @@ -153011,16 +153704,18 @@ self: { "nuxeo" = callPackage ({ mkDerivation, attoparsec, base, bytestring, conduit - , conduit-extra, text, time + , conduit-extra, optparse-applicative, text, time }: mkDerivation { pname = "nuxeo"; - version = "0.2.0.3"; - sha256 = "1assz03rv0vdbgl2ihcr7sbx7ifsv7m2mp6lg2jgy5h0ghnlwzcd"; + version = "0.3.0.2"; + sha256 = "1h0asiqlffy0wy76q2dz7id6nzsid5nqkmsy1mxdl77zm3d9id4f"; + isLibrary = true; + isExecutable = true; libraryHaskellDepends = [ attoparsec base bytestring conduit conduit-extra text time ]; - description = "Nuxeo"; + executableHaskellDepends = [ base optparse-applicative text ]; license = stdenv.lib.licenses.bsd3; }) {}; @@ -154181,20 +154876,21 @@ self: { ({ mkDerivation, aeson, base, base16-bytestring, bytestring , case-insensitive, containers, contravariant, dotenv, hspec , hspec-discover, multiset, postgresql-simple, pretty - , product-profunctors, profunctors, QuickCheck, semigroups, text - , time, time-locale-compat, transformers, uuid, void + , product-profunctors, profunctors, QuickCheck, scientific + , semigroups, text, time, time-locale-compat, transformers, uuid + , void }: mkDerivation { pname = "opaleye"; - version = "0.6.1.0"; - sha256 = "0vjiwpdrff4nrs5ww8q3j77ysrq0if20yfk4gy182lr7nzhhwz0l"; - revision = "2"; - editedCabalFile = "07yn6xzynvjz9p6mv9kzh1sz05dqqsmihznba8s9q36lixlslyag"; + version = "0.6.7003.1"; + sha256 = "1lj4vz1526l11b0mc5y7j9sxf7v6kkzl8c1jymvb1vrqj2qkgxsx"; + revision = "1"; + editedCabalFile = "0nwyz9s81hfziwy7a18gpi0663xy6cfc6fl4vx8a1vkwdyfcjjli"; libraryHaskellDepends = [ aeson base base16-bytestring bytestring case-insensitive contravariant postgresql-simple pretty product-profunctors - profunctors semigroups text time time-locale-compat transformers - uuid void + profunctors scientific semigroups text time time-locale-compat + transformers uuid void ]; testHaskellDepends = [ aeson base containers contravariant dotenv hspec hspec-discover @@ -156935,6 +157631,8 @@ self: { pname = "pandoc-pyplot"; version = "1.0.2.0"; sha256 = "0q6qj45g8d95z86lqkwpxw7c929x7q68611602mp2ip31dib11xc"; + revision = "1"; + editedCabalFile = "0zmvgzqhb4cggsr3m5xw1lhcns586jq5b0s9fhpwq1c3c6k5nq96"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -156985,8 +157683,8 @@ self: { }: mkDerivation { pname = "pandoc-types"; - version = "1.17.5.2"; - sha256 = "0hppl6drhl4xqav35jybji8g8cpy336mqkp0zb66kdsjya9inpqb"; + version = "1.17.5.4"; + sha256 = "09wk2zskr0r2llsyif3s0x7vix05l1ya7qacsmmkrlhba5naib1j"; libraryHaskellDepends = [ aeson base bytestring containers deepseq ghc-prim QuickCheck syb transformers @@ -157000,30 +157698,6 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "pandoc-types_1_17_5_3" = callPackage - ({ mkDerivation, aeson, base, bytestring, containers, criterion - , deepseq, ghc-prim, HUnit, QuickCheck, string-qq, syb - , test-framework, test-framework-hunit, test-framework-quickcheck2 - , transformers - }: - mkDerivation { - pname = "pandoc-types"; - version = "1.17.5.3"; - sha256 = "1yrbad67jz8mgdyhl2hvah42g31iwnbvldp16jw87v96y0cbdl72"; - libraryHaskellDepends = [ - aeson base bytestring containers deepseq ghc-prim QuickCheck syb - transformers - ]; - testHaskellDepends = [ - aeson base bytestring containers HUnit QuickCheck string-qq syb - test-framework test-framework-hunit test-framework-quickcheck2 - ]; - benchmarkHaskellDepends = [ base criterion ]; - description = "Types for representing a structured document"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - "pandoc-unlit" = callPackage ({ mkDerivation, base, pandoc }: mkDerivation { @@ -157683,8 +158357,8 @@ self: { pname = "parallel-io"; version = "0.3.3"; sha256 = "0i86x3bf8pjlg6mdg1zg5lcrjpg75pbqs2mrgrbp4z4bkcmw051s"; - revision = "1"; - editedCabalFile = "1vlb2x1ghih4l64031rmh7h643c3knh5r5mwilf7g8izb58ypvkm"; + revision = "2"; + editedCabalFile = "0mggzni708nzxlsjbibdzf03s3b5lnqj2zi1hnbh1rd4j4jr07ym"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -158672,8 +159346,8 @@ self: { }: mkDerivation { pname = "patat"; - version = "0.8.0.0"; - sha256 = "1xbddlc73b0sgd02vxkbhra04wz77q0dn1937k6aq5l1vx663i81"; + version = "0.8.1.1"; + sha256 = "19nnf08szakwivm7zqv85hr0vwpflpk455373a3hwhcjgkzdfy19"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -160195,6 +160869,25 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "persist" = callPackage + ({ mkDerivation, array, base, bytestring, containers, ghc-prim + , QuickCheck, test-framework, test-framework-quickcheck2, text + }: + mkDerivation { + pname = "persist"; + version = "0.1"; + sha256 = "0akiy8qrx71nj8l80hc7llxy7vnpcvjg01dhk499pl5mjaiqz2sq"; + libraryHaskellDepends = [ + array base bytestring containers ghc-prim text + ]; + testHaskellDepends = [ + base bytestring QuickCheck test-framework + test-framework-quickcheck2 text + ]; + description = "Minimal serialization library with focus on performance"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "persist2er" = callPackage ({ mkDerivation, base, optparse-applicative, persistent, text }: mkDerivation { @@ -162759,6 +163452,8 @@ self: { pname = "pipes-lzma"; version = "0.1.1.2"; sha256 = "0wx23wf1vr8d2nyapxgmpn1jk53hjbla1xss714vkmar7am37vrc"; + revision = "1"; + editedCabalFile = "13nyh3qqv3baifya0vwnnqh1yvr3k2yjrhjq7apigq0s584iyrka"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base bytestring lzma pipes ]; @@ -164607,6 +165302,18 @@ self: { license = "LGPL"; }) {}; + "polyparse_1_12_1" = callPackage + ({ mkDerivation, base, bytestring, text }: + mkDerivation { + pname = "polyparse"; + version = "1.12.1"; + sha256 = "19fs18g7fvfdkm9zy28cgighjcxfa6mcpqgyp6whmsjkb3h393fx"; + libraryHaskellDepends = [ base bytestring text ]; + description = "A variety of alternative parser combinator libraries"; + license = "LGPL"; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "polyseq" = callPackage ({ mkDerivation, array, base, bytestring, cgi, containers , free-theorems, haskell-src, mtl, network, old-locale, old-time @@ -166999,14 +167706,14 @@ self: { license = stdenv.lib.licenses.mit; }) {}; - "pretty-show_1_8_2" = callPackage + "pretty-show_1_9_1" = callPackage ({ mkDerivation, array, base, filepath, ghc-prim, happy , haskell-lexer, pretty, text }: mkDerivation { pname = "pretty-show"; - version = "1.8.2"; - sha256 = "1fc431kr87hpk3rmdpbdiwsq0iyvh61hjwi4w0cp6zyasx8cg91a"; + version = "1.9.1"; + sha256 = "0b5diwdkfb2wi6q872fjjnrvysgww7c8nhq55bvccp50n9vs4jhz"; isLibrary = true; isExecutable = true; enableSeparateDataOutput = true; @@ -171635,6 +172342,17 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "quickcheck-enum-instances" = callPackage + ({ mkDerivation, base, enum-types, QuickCheck }: + mkDerivation { + pname = "quickcheck-enum-instances"; + version = "0.1.0.0"; + sha256 = "117lpk15z288ad1bzakwf1z0jcdm7w5c0584lzwpgkmgqr3jgzdc"; + libraryHaskellDepends = [ base enum-types QuickCheck ]; + description = "arbitrary instances for small enum types"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "quickcheck-instances" = callPackage ({ mkDerivation, array, base, base-compat, bytestring , case-insensitive, containers, hashable, old-time, QuickCheck @@ -178053,10 +178771,8 @@ self: { }: mkDerivation { pname = "resolv"; - version = "0.1.1.1"; - sha256 = "0wh7wj56l3f2bylz563g5g04a4nydj8acv60hpwa7k3mn792xca9"; - revision = "3"; - editedCabalFile = "0r1i7zrnynqxd3nzq4cz9648s3dmj29w63mcip57620d0fimyghm"; + version = "0.1.1.2"; + sha256 = "0wczdy3vmpfcfwjn1m95bygc5d83m97xxmavhdvy5ayn8c402fp4"; libraryHaskellDepends = [ base base16-bytestring binary bytestring containers ]; @@ -178064,7 +178780,7 @@ self: { base bytestring directory filepath tasty tasty-hunit ]; description = "Domain Name Service (DNS) lookup via the libresolv standard library routines"; - license = stdenv.lib.licenses.gpl3; + license = stdenv.lib.licenses.gpl2; }) {}; "resolve" = callPackage @@ -180306,6 +181022,23 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "rounded" = callPackage + ({ mkDerivation, base, ghc-prim, gmp, hgmp, long-double, mpfr + , reflection, singletons + }: + mkDerivation { + pname = "rounded"; + version = "0.1"; + sha256 = "02xlc369yi8wvf41z4d3291i63rcryl0yjp0k5lkn3c2f0k5w244"; + libraryHaskellDepends = [ + base ghc-prim hgmp long-double reflection singletons + ]; + librarySystemDepends = [ gmp mpfr ]; + testHaskellDepends = [ base long-double ]; + description = "Correctly-rounded arbitrary-precision floating-point arithmetic"; + license = "LGPL"; + }) {inherit (pkgs) gmp; inherit (pkgs) mpfr;}; + "rounding" = callPackage ({ mkDerivation, array, base, numeric-extras }: mkDerivation { @@ -182111,6 +182844,24 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "sandi_0_4_3" = callPackage + ({ mkDerivation, base, bytestring, conduit, criterion, exceptions + , tasty, tasty-hunit, tasty-quickcheck, tasty-th + }: + mkDerivation { + pname = "sandi"; + version = "0.4.3"; + sha256 = "0ji1zn9nkh8rdm0m9zpxdnz5zw0q0qypzyp2k9fn6j9v08r17p3n"; + libraryHaskellDepends = [ base bytestring conduit exceptions ]; + testHaskellDepends = [ + base bytestring tasty tasty-hunit tasty-quickcheck tasty-th + ]; + benchmarkHaskellDepends = [ base bytestring criterion ]; + description = "Data encoding library"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "sandlib" = callPackage ({ mkDerivation, base }: mkDerivation { @@ -183387,6 +184138,18 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "scotty-path-normalizer" = callPackage + ({ mkDerivation, base, bytestring, doctest, scotty, text, wai }: + mkDerivation { + pname = "scotty-path-normalizer"; + version = "0.1.0.0"; + sha256 = "1hv95q3ikf25d9kxzr48fxb2x1331c24n3q5nb47qa7866gy2f4q"; + libraryHaskellDepends = [ base bytestring scotty text wai ]; + testHaskellDepends = [ base doctest ]; + description = "Redirect to a normalized path"; + license = stdenv.lib.licenses.mit; + }) {}; + "scotty-resource" = callPackage ({ mkDerivation, base, containers, http-types, scotty, text , transformers, wai @@ -184200,8 +184963,8 @@ self: { }: mkDerivation { pname = "secp256k1-haskell"; - version = "0.1.3"; - sha256 = "0wdxz8vmk5yfhjrwpynk1zpmvgl1rnwz7zvkx7g7pxxvz3z8rpbz"; + version = "0.1.4"; + sha256 = "1vfbn0fvrbk4hmfhsm8gj3yxyijzfdqlywwir64zrafla4yry73l"; libraryHaskellDepends = [ base base16-bytestring bytestring cereal entropy hashable QuickCheck string-conversions @@ -185072,8 +185835,8 @@ self: { ({ mkDerivation, base, mtl, transformers }: mkDerivation { pname = "seqid"; - version = "0.5.3"; - sha256 = "1wc7a66k42njc0zv0cp4ycfv7jbcqyf77j9m6fikhdppbvn3cbn4"; + version = "0.6.0"; + sha256 = "1zm1zmzp3i60wb17ghr4rp5ljlhvsblll69x2ibjk7kh5icvwfqc"; libraryHaskellDepends = [ base mtl transformers ]; description = "Sequence ID production and consumption"; license = stdenv.lib.licenses.bsd3; @@ -185095,8 +185858,8 @@ self: { ({ mkDerivation, base, io-streams, seqid }: mkDerivation { pname = "seqid-streams"; - version = "0.6.3"; - sha256 = "1wmi4iqh6q45cm1s9ml2yi5b34m8cj7y5a0aicjfsc8nyy0pq48r"; + version = "0.7.0"; + sha256 = "0z80cclvzkr6dg81n96dpan9a7285rlq9nmchiy4raxsjw4cza58"; libraryHaskellDepends = [ base io-streams seqid ]; description = "Sequence ID IO-Streams"; license = stdenv.lib.licenses.bsd3; @@ -185452,6 +186215,8 @@ self: { pname = "servant-JuicyPixels"; version = "0.3.0.4"; sha256 = "10crrcrxap7751wifbc28kr1kv0rjvrx3wlnkajgv3xpr05g00kv"; + revision = "1"; + editedCabalFile = "185ym0ac6gx7f98pd92ykc1ib305lswzjzvykly4ij9vk85jn0ax"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -185921,8 +186686,8 @@ self: { pname = "servant-client"; version = "0.14"; sha256 = "0jr2057y7vp6d2jcnisawkajinnqm68h024crh929r9fdka0p1n6"; - revision = "2"; - editedCabalFile = "087ja0xbwm1yg38i5pc26fxsjx4pfdcgqmw0h1lvf0z1alz8rq05"; + revision = "3"; + editedCabalFile = "1rjjqxyyf51bjq8li8yilng5pjd9a5n3d8zniqmfw3hys6dz8n8g"; libraryHaskellDepends = [ base base-compat bytestring containers exceptions http-client http-media http-types monad-control mtl semigroupoids @@ -185951,8 +186716,8 @@ self: { pname = "servant-client-core"; version = "0.14.1"; sha256 = "0qfpakwl6yj6l2br9wa9zs0v7nzmj4bngspw6p536swx39npnkn2"; - revision = "1"; - editedCabalFile = "04xr6zpslw7pyzxp22qd8k2w9azc3pds5gplnwni12waqahf410i"; + revision = "2"; + editedCabalFile = "02pvrccfwvvy53gma56jcqnbia3pm1pncyghdkjp519bwff9iwvb"; libraryHaskellDepends = [ base base-compat base64-bytestring bytestring containers exceptions free generics-sop http-api-data http-media http-types network-uri @@ -186356,8 +187121,8 @@ self: { }: mkDerivation { pname = "servant-http2-client"; - version = "0.1.0.1"; - sha256 = "0jlbczbgbkjx4hai24csnd07r074s36g5hbpizhdxiqr3dcjk8pw"; + version = "0.1.0.2"; + sha256 = "0rjzc1dyj0njmh590ays5ma6243240qakrjgzi9qinvkgb7lzad2"; libraryHaskellDepends = [ base binary bytestring case-insensitive containers exceptions http-media http-types http2 http2-client mtl servant-client-core @@ -186441,8 +187206,8 @@ self: { }: mkDerivation { pname = "servant-kotlin"; - version = "0.1.1.2"; - sha256 = "1ad1n1yp6b125fa5gjjnbksnjqf714jf9d8cvxrvpwkl9lxn9ppb"; + version = "0.1.1.3"; + sha256 = "07adjx1smqg5x87dklgknlmkavns2axmhqw97fk0jnp99rb1rpb2"; libraryHaskellDepends = [ base containers directory formatting lens servant servant-foreign text time wl-pprint-text @@ -186784,10 +187549,8 @@ self: { }: mkDerivation { pname = "servant-quickcheck"; - version = "0.0.7.2"; - sha256 = "0zsf68c44yijmgkcd2qmcwz9p0kiix6dzhk3g4ifz60s6kv3jfbh"; - revision = "1"; - editedCabalFile = "1slgq8q0hmh904ssn5sfmi6mbpd3vkqvc59m3g9kfgzf5j70py2h"; + version = "0.0.7.3"; + sha256 = "0d904xfw5q7qcwkp5n7v18drc1idssvfwic2ksfmqlxisnxmyp5r"; libraryHaskellDepends = [ aeson base base-compat-batteries bytestring case-insensitive clock data-default-class hspec http-client http-media http-types mtl @@ -187498,7 +188261,7 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "serverless-haskell_0_7_5" = callPackage + "serverless-haskell_0_8_1" = callPackage ({ mkDerivation, aeson, aeson-casing, aeson-extra, amazonka-core , amazonka-kinesis, amazonka-s3, base, bytestring, case-insensitive , hspec, hspec-discover, http-types, iproute, lens, raw-strings-qq @@ -187506,8 +188269,8 @@ self: { }: mkDerivation { pname = "serverless-haskell"; - version = "0.7.5"; - sha256 = "13l5day4dlwyykwx17v2znyh0ck1paaxjzzawnjklcjzk1rzj0i3"; + version = "0.8.1"; + sha256 = "1s5i2l57s0crpk3lysdw0v7kvfx567bhl0v5i18mdsa331bifcpd"; libraryHaskellDepends = [ aeson aeson-casing aeson-extra amazonka-core amazonka-kinesis amazonka-s3 base bytestring case-insensitive http-types iproute @@ -188435,10 +189198,8 @@ self: { }: mkDerivation { pname = "shake-ats"; - version = "1.10.0.1"; - sha256 = "1p95r4ksfrb4hs9v75iq9iz565qz43k3cw63sz32nphqn204dbxz"; - revision = "1"; - editedCabalFile = "0x23r58i4yhf9rcaxfdy09nr93cpkr0cmxrwcn11hgcr1nkzaa0d"; + version = "1.10.1.0"; + sha256 = "1b5mbb3azjn2wwagciayd5lyb6jd2siwn1l9ispnqrkrh1bqgzb5"; libraryHaskellDepends = [ base binary dependency directory hs2ats language-ats microlens shake shake-c shake-cabal shake-ext text @@ -189055,8 +189816,8 @@ self: { ({ mkDerivation, base, containers, text, unix }: mkDerivation { pname = "shell-monad"; - version = "0.6.5"; - sha256 = "0vg2g65km3i963scyj7fn17g562wg0mh88syxqrf7favnljid1bk"; + version = "0.6.6"; + sha256 = "1z3anvjcix25i2zzwnln2hnpzacwiss95xhyc0mclc33v0j5k038"; libraryHaskellDepends = [ base containers text unix ]; description = "shell monad"; license = stdenv.lib.licenses.bsd3; @@ -189928,6 +190689,22 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "simple-affine-space" = callPackage + ({ mkDerivation, base, deepseq, directory, filepath, hlint, process + , regex-posix + }: + mkDerivation { + pname = "simple-affine-space"; + version = "0.1"; + sha256 = "02cy4vnl3fy18dsfxazh60bqgk5c1gw2x460x6i1fb5qysw7q8nh"; + libraryHaskellDepends = [ base deepseq ]; + testHaskellDepends = [ + base directory filepath hlint process regex-posix + ]; + description = "A simple library for affine and vector spaces"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "simple-atom" = callPackage ({ mkDerivation, base, containers, deepseq }: mkDerivation { @@ -189987,6 +190764,18 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "simple-cmd_0_1_2" = callPackage + ({ mkDerivation, base, directory, filepath, process }: + mkDerivation { + pname = "simple-cmd"; + version = "0.1.2"; + sha256 = "10jdyl1ghzczxw5bi8s1694fla42s1aknmj5grxndidwzf95b8g6"; + libraryHaskellDepends = [ base directory filepath process ]; + description = "Simple String-based process commands"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "simple-conduit" = callPackage ({ mkDerivation, base, bifunctors, bytestring, CC-delcont , chunked-data, conduit, conduit-combinators, conduit-extra @@ -190467,8 +191256,8 @@ self: { ({ mkDerivation, base, process }: mkDerivation { pname = "simple-smt"; - version = "0.9.1"; - sha256 = "13dg61jdgby49lpdb53anrg39wn8dwgvg6jpn8vh0y8rf2zilq9b"; + version = "0.9.3"; + sha256 = "17v8zpiiha8kyb4xbrqdnfibf1dwzf9lbhxj9kffvl948ygxdp8x"; libraryHaskellDepends = [ base process ]; description = "A simple way to interact with an SMT solver process"; license = stdenv.lib.licenses.bsd3; @@ -190623,6 +191412,24 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "simple-vec3_0_4_0_9" = callPackage + ({ mkDerivation, base, criterion, doctest, doctest-driver-gen + , QuickCheck, tasty, tasty-quickcheck, vector + }: + mkDerivation { + pname = "simple-vec3"; + version = "0.4.0.9"; + sha256 = "1rx4nifv75lpxrdgq6x3a61d56qp0ln9rhf2d10l2ds049dlq0pz"; + libraryHaskellDepends = [ base QuickCheck vector ]; + testHaskellDepends = [ + base doctest doctest-driver-gen tasty tasty-quickcheck + ]; + benchmarkHaskellDepends = [ base criterion vector ]; + description = "Three-dimensional vectors of doubles with basic operations"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "simple-zipper" = callPackage ({ mkDerivation, base, hspec, lens }: mkDerivation { @@ -190840,10 +191647,10 @@ self: { ({ mkDerivation, base, containers }: mkDerivation { pname = "simtreelo"; - version = "0.1.1.3"; - sha256 = "148j6z8rxqaiwfjgxz780fy8w8xv8a8gwida61lfir677jlkwgh9"; + version = "0.1.1.4"; + sha256 = "0a8414006gdya8b4dw38251kim3x2i5g7m03ga479ialghralrc8"; libraryHaskellDepends = [ base containers ]; - description = "Loader for data organized in a tree"; + description = "Load data organized in a tree"; license = stdenv.lib.licenses.gpl3; }) {}; @@ -191104,8 +191911,8 @@ self: { }: mkDerivation { pname = "sitepipe"; - version = "0.3.0.1"; - sha256 = "1iv0ndllixwn9vj7gqavv1ymfxfxqm4xqqzxqf1y8qiq240b3j6l"; + version = "0.3.0.2"; + sha256 = "0f26sqpf8rjrbpk6q9hp0q705hhmhyp71jyj5w9jgq6mnj34rxy8"; libraryHaskellDepends = [ aeson base bytestring containers directory exceptions filepath Glob lens lens-aeson megaparsec MissingH mtl mustache @@ -191644,8 +192451,8 @@ self: { }: mkDerivation { pname = "slate"; - version = "0.11.0.0"; - sha256 = "0y6l3cjlh0hkc3nch7fwvxpv2i5r9qv6r1kdi3savi0vp0dvgdy8"; + version = "0.12.0.0"; + sha256 = "01qi6k9gcz6y8x8hlvsmm2irfvcsbdqqvzg5kgf2x02idmh9zy1a"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -192550,8 +193357,8 @@ self: { pname = "snap-core"; version = "1.0.3.2"; sha256 = "136q7l4hd5yn5hb507q1ziqx124ma1lkzh5dx0n150p8dx3rhhsc"; - revision = "2"; - editedCabalFile = "0m0rjsgv0lkd0y9ragn478ibw98c9iys4mrj26x8ihasdnzgkqxq"; + revision = "3"; + editedCabalFile = "0wlhn33r7c9g7j23y006ddq9d87lkmianvvfrbl8jd8mvjvj2gfa"; libraryHaskellDepends = [ attoparsec base bytestring bytestring-builder case-insensitive containers directory filepath hashable HUnit io-streams lifted-base @@ -192628,8 +193435,8 @@ self: { }: mkDerivation { pname = "snap-extras"; - version = "0.12.2.0"; - sha256 = "18d1gfpk2gzvaidb6l13y64540hfyqk5hw6gpx7z495ay1dafdzr"; + version = "0.12.2.1"; + sha256 = "0mzvw49v6i77ysdlxfrdva5kn0vj9p5h2br6qlwvhdwqq8269gqp"; isLibrary = true; isExecutable = true; enableSeparateDataOutput = true; @@ -192754,8 +193561,8 @@ self: { pname = "snap-server"; version = "1.1.0.0"; sha256 = "0vvw9n8xs272qdlrf3dxhnva41zh3awi7pf022rrjj75lj8a77i4"; - revision = "2"; - editedCabalFile = "03jmxbz9bf0yr3vzf3xa7ajbz3q9i6cn7bzqan4vy5f26c0n6xld"; + revision = "3"; + editedCabalFile = "0a9d3nqb5rvgm25nak68lp6yj9m6cwhbgdbg5l7ib5i2czcg7yjh"; configureFlags = [ "-fopenssl" ]; isLibrary = true; isExecutable = true; @@ -195011,14 +195818,21 @@ self: { }) {}; "spdx" = callPackage - ({ mkDerivation, base, tasty, tasty-quickcheck, transformers }: + ({ mkDerivation, base, base-compat, Cabal, containers, QuickCheck + , tasty, tasty-quickcheck, transformers + }: mkDerivation { pname = "spdx"; - version = "0.2.2.0"; - sha256 = "1jxxivxlhzjx4idy69qhqqv37sspqhk3f3i93mydzn8cyhn87aqp"; - libraryHaskellDepends = [ base transformers ]; - testHaskellDepends = [ base tasty tasty-quickcheck ]; - description = "SPDX license expression language"; + version = "1"; + sha256 = "1vw6pqj86slgzgbrd6kmsn5xlbxln0cys9qxxa47ypfy4spxmfkd"; + libraryHaskellDepends = [ base Cabal containers transformers ]; + testHaskellDepends = [ + base base-compat Cabal tasty tasty-quickcheck + ]; + benchmarkHaskellDepends = [ + base base-compat Cabal QuickCheck tasty-quickcheck + ]; + description = "SPDX license expression language, Extras"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; }) {}; @@ -197916,6 +198730,29 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "statsdi" = callPackage + ({ mkDerivation, base, bytestring, dequeue, ether, hashable, hspec + , network, random, stm, tasty, tasty-hspec, template-haskell, time + , transformers, transformers-lift, unordered-containers + }: + mkDerivation { + pname = "statsdi"; + version = "0.2.0.0"; + sha256 = "1gbaxrvn8ilrj808hplqlibawy9kdmfb5pc2yzzdghmcsjys24g1"; + revision = "1"; + editedCabalFile = "02kf7pigkvqsm720l8rn6m3gdjqrdhli5yijsjf8n11mj6k8xrk0"; + libraryHaskellDepends = [ + base bytestring dequeue ether hashable network random stm + template-haskell time transformers transformers-lift + unordered-containers + ]; + testHaskellDepends = [ + base bytestring hspec network stm tasty tasty-hspec time + ]; + description = "A lovely [Dog]StatsD implementation"; + license = stdenv.lib.licenses.mit; + }) {}; + "status-notifier-item" = callPackage ({ mkDerivation, base, bytestring, containers, dbus, dbus-hslogger , filepath, hslogger, lens, network, optparse-applicative, spool @@ -198790,57 +199627,6 @@ self: { }) {}; "store" = callPackage - ({ mkDerivation, array, async, base, base-orphans - , base64-bytestring, bifunctors, bytestring, cereal, cereal-vector - , containers, contravariant, criterion, cryptohash, deepseq - , directory, filepath, free, ghc-prim, hashable, hspec - , hspec-smallcheck, integer-gmp, lifted-base, monad-control - , mono-traversable, network, primitive, resourcet, safe, semigroups - , smallcheck, store-core, syb, template-haskell, text, th-lift - , th-lift-instances, th-orphans, th-reify-many, th-utilities, time - , transformers, unordered-containers, vector - , vector-binary-instances, void, weigh - }: - mkDerivation { - pname = "store"; - version = "0.5.0"; - sha256 = "1ivr2pvfja2plhp625wjv9lbd47vmydp33f31ljwdyzqik2j7vij"; - libraryHaskellDepends = [ - array async base base-orphans base64-bytestring bifunctors - bytestring containers contravariant cryptohash deepseq directory - filepath free ghc-prim hashable hspec hspec-smallcheck integer-gmp - lifted-base monad-control mono-traversable network primitive - resourcet safe semigroups smallcheck store-core syb - template-haskell text th-lift th-lift-instances th-orphans - th-reify-many th-utilities time transformers unordered-containers - vector void - ]; - testHaskellDepends = [ - array async base base-orphans base64-bytestring bifunctors - bytestring cereal cereal-vector containers contravariant criterion - cryptohash deepseq directory filepath free ghc-prim hashable hspec - hspec-smallcheck integer-gmp lifted-base monad-control - mono-traversable network primitive resourcet safe semigroups - smallcheck store-core syb template-haskell text th-lift - th-lift-instances th-orphans th-reify-many th-utilities time - transformers unordered-containers vector vector-binary-instances - void weigh - ]; - benchmarkHaskellDepends = [ - array async base base-orphans base64-bytestring bifunctors - bytestring containers contravariant criterion cryptohash deepseq - directory filepath free ghc-prim hashable hspec hspec-smallcheck - integer-gmp lifted-base monad-control mono-traversable network - primitive resourcet safe semigroups smallcheck store-core syb - template-haskell text th-lift th-lift-instances th-orphans - th-reify-many th-utilities time transformers unordered-containers - vector void - ]; - description = "Fast binary serialization"; - license = stdenv.lib.licenses.mit; - }) {}; - - "store_0_5_0_1" = callPackage ({ mkDerivation, array, async, base, base-orphans , base64-bytestring, bifunctors, bytestring, cereal, cereal-vector , clock, containers, contravariant, criterion, cryptohash, deepseq @@ -198889,7 +199675,6 @@ self: { ]; description = "Fast binary serialization"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "store-core" = callPackage @@ -198970,15 +199755,15 @@ self: { license = stdenv.lib.licenses.mit; }) {}; - "stratosphere_0_26_1" = callPackage + "stratosphere_0_26_2" = callPackage ({ mkDerivation, aeson, aeson-pretty, base, bytestring, containers , hashable, hspec, hspec-discover, lens, template-haskell, text , unordered-containers }: mkDerivation { pname = "stratosphere"; - version = "0.26.1"; - sha256 = "0npmnj71gaf61gcxi772h4sgsz68j5jk7v5z3bjc120z7vc1a22v"; + version = "0.26.2"; + sha256 = "0f4vqll4bfwrf6hysdnh1gkjl79qcs1pwn3p6224xlqzmajb9hc5"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -199429,8 +200214,8 @@ self: { }: mkDerivation { pname = "streaming-fft"; - version = "0.1.0.0"; - sha256 = "1qphhbap1va897ghcr8v4d3nnpcb4w0b422d24isz8rg138m99wi"; + version = "0.1.0.1"; + sha256 = "1bs0wqcns0nn62rw04a1574qakqhflxhsybchf9pzig0gyrj4538"; libraryHaskellDepends = [ base contiguous-fft ghc-prim prim-instances primitive streaming ]; @@ -199666,7 +200451,7 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "streamly_0_5_1" = callPackage + "streamly_0_5_2" = callPackage ({ mkDerivation, atomic-primops, base, clock, containers, deepseq , exceptions, gauge, ghc-prim, heaps, hspec, lockfree-queue , monad-control, mtl, QuickCheck, random, transformers @@ -199674,8 +200459,8 @@ self: { }: mkDerivation { pname = "streamly"; - version = "0.5.1"; - sha256 = "04hc87jwcfpbwydm75ic3rz87m76s39aysi14m514nib87xprbji"; + version = "0.5.2"; + sha256 = "1pla9356yhf6zv2yz4mh8g1dslzdkkych4jrjyi4rw66frvw0jg6"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -200458,8 +201243,8 @@ self: { }: mkDerivation { pname = "structured-cli"; - version = "2.0.0.1"; - sha256 = "1xgf49pd1dm80qp1h14f2nyqv71axrijrd8k66jmmqkczf24jah2"; + version = "2.2.0.0"; + sha256 = "1ia9xbbshzx0p69i8gq3y88qbg60cks52kb6hxm2ylkm7jnzgxzj"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -201152,28 +201937,27 @@ self: { "super-user-spark" = callPackage ({ mkDerivation, aeson, aeson-pretty, base, bytestring, directory , filepath, genvalidity, genvalidity-hspec, genvalidity-hspec-aeson - , genvalidity-path, hashable, hspec, hspec-core, HUnit, iostring - , mtl, optparse-applicative, parsec, path, path-io, process - , QuickCheck, text, transformers, unix, validity, validity-path + , genvalidity-path, hashable, hspec, hspec-core, mtl + , optparse-applicative, parsec, path, path-io, process, QuickCheck + , text, transformers, unix, validity, validity-path }: mkDerivation { pname = "super-user-spark"; - version = "0.4.0.0"; - sha256 = "1yk0kkp9rj63m7vqvki7zs3l8r5da8as7hpw1l6qk2gf74lpkfdy"; + version = "0.4.0.1"; + sha256 = "0pxkvc1vjarh4p5rqnai6nlsqxv9as8jvqs2vpywl1525nsfyvy5"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ - aeson aeson-pretty base bytestring directory filepath hashable - iostring mtl optparse-applicative parsec path path-io process text - unix validity validity-path + aeson aeson-pretty base bytestring directory filepath hashable mtl + optparse-applicative parsec path path-io process text unix validity + validity-path ]; executableHaskellDepends = [ base ]; testHaskellDepends = [ aeson aeson-pretty base bytestring directory filepath genvalidity genvalidity-hspec genvalidity-hspec-aeson genvalidity-path hashable - hspec hspec-core HUnit iostring mtl optparse-applicative parsec - path path-io process QuickCheck text transformers unix validity - validity-path + hspec hspec-core mtl optparse-applicative parsec path path-io + process QuickCheck text transformers unix validity validity-path ]; description = "Configure your dotfile deployment with a DSL"; license = stdenv.lib.licenses.mit; @@ -201825,8 +202609,8 @@ self: { pname = "swagger2"; version = "2.3.0.1"; sha256 = "1l8piv2phl8kq3rgna8wld80b569vazqk2ll1rgs5iakm42lxr1f"; - revision = "1"; - editedCabalFile = "12w7bsld9wp2nm61vwdwb6ndjd3g99i0g4hjr32mrycmf41yvs1a"; + revision = "2"; + editedCabalFile = "0dfxf47mzzb5rmln2smsk0qx53kj1lc3a087r52g2rzz6971zivb"; setupHaskellDepends = [ base Cabal cabal-doctest ]; libraryHaskellDepends = [ aeson base base-compat-batteries bytestring containers generics-sop @@ -201970,8 +202754,8 @@ self: { }: mkDerivation { pname = "sws"; - version = "0.4.2.0"; - sha256 = "0bwfpw348g167a195f8g4cp3h553hkanm6s67bairhn8qprh8az4"; + version = "0.4.3.0"; + sha256 = "0zwh7az9pgsgvx9wbjnz8lzy2v8lrkkwv3h72jfy5sj50xylrzbr"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -202214,8 +202998,8 @@ self: { pname = "symbol"; version = "0.2.4"; sha256 = "0cc8kdm68pirb0s7n46v0yvw5b718qf7qip40jkg5q3c3xsafx6h"; - revision = "1"; - editedCabalFile = "01ab7600ja88wfvg9x8zmxksw44j9klmm71y9zmig7qxs1qslb25"; + revision = "2"; + editedCabalFile = "0jdbaap11pkgb6m98v57k7qnx62pqxy7pa2i7293ywa4q305qgm1"; libraryHaskellDepends = [ base containers deepseq ]; description = "A 'Symbol' type for fast symbol comparison"; license = stdenv.lib.licenses.bsd3; @@ -204578,6 +205362,8 @@ self: { pname = "tasty-hedgehog-coverage"; version = "0.1.0.0"; sha256 = "1d2hnhkpk71k0xjw63jsn6fa4ih01xqn4dgdbflp6yrs0zw6p95c"; + revision = "1"; + editedCabalFile = "1p3d9w24q39fnljv9m5a8anpv3j3cvazbca4d3hqrjx5w06ik42f"; libraryHaskellDepends = [ base containers hedgehog mtl tagged tasty tasty-hedgehog text transformers wl-pprint-annotated @@ -206011,8 +206797,8 @@ self: { }: mkDerivation { pname = "term-rewriting"; - version = "0.3"; - sha256 = "03y5s9c9n1mnij3yh5z4c69isg5cbpwczj5sjjvajqaaqf6xy5f3"; + version = "0.3.0.1"; + sha256 = "0fa2yqdhw93r7byx47z050sq2yc0arfsvwnzl4jp1vyhdzarfwqd"; libraryHaskellDepends = [ ansi-wl-pprint array base containers mtl multiset parsec union-find-array @@ -206889,10 +207675,8 @@ self: { }: mkDerivation { pname = "texmath"; - version = "0.11.1.1"; - sha256 = "1syvyiw84as79c76mssw1p4d3lrnghnwdyy4ip1w48qd07fadxf6"; - revision = "1"; - editedCabalFile = "0740lpg42r0wdj9hm9gvnzrjka9mqpkzazx2s3qnliiigy39zk96"; + version = "0.11.1.2"; + sha256 = "1wac48qlcwrfm5j1yng27929iqnj2x0zkj7ffrwkj3rchf0i4grp"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -211193,24 +211977,21 @@ self: { }) {}; "toodles" = callPackage - ({ mkDerivation, aeson, base, blaze-html, bytestring, cmdargs - , directory, filepath, http-types, megaparsec, MissingH - , regex-posix, servant, servant-blaze, servant-server, strict, text - , transformers, wai, warp, yaml + ({ mkDerivation, aeson, base, blaze-html, cmdargs, directory + , megaparsec, MissingH, regex-posix, servant, servant-blaze + , servant-server, strict, text, wai, warp, yaml }: mkDerivation { pname = "toodles"; - version = "0.1.0.9"; - sha256 = "01gjxd4pclilm19iw7nkr23pmyavd7d9k0wa1c63hwhdzm1591f7"; - revision = "3"; - editedCabalFile = "08zadf5r79dpw9g0hg6lsnyvcnpprzb9d0lfs67kpyigm5ih9w8w"; + version = "0.1.0.16"; + sha256 = "1xr9cl69v5m08d44xgprlpk9j5j2lby84lzcp3fjzlvfdnnx0q72"; isLibrary = false; isExecutable = true; enableSeparateDataOutput = true; executableHaskellDepends = [ - aeson base blaze-html bytestring cmdargs directory filepath - http-types megaparsec MissingH regex-posix servant servant-blaze - servant-server strict text transformers wai warp yaml + aeson base blaze-html cmdargs directory megaparsec MissingH + regex-posix servant servant-blaze servant-server strict text wai + warp yaml ]; description = "Manage the TODO entries in your code"; license = stdenv.lib.licenses.mit; @@ -211743,8 +212524,10 @@ self: { }: mkDerivation { pname = "traildb"; - version = "0.1.4.0"; - sha256 = "1qp3m8vfjy9kim9jikhxplyp6c21scj18n9qnb0pfd0hpjyigd9b"; + version = "0.1.4.1"; + sha256 = "1h3pscbxjl3cpcxbch4ydiv6y5j54k99v8kq61jv01gv1vjisd2r"; + isLibrary = true; + isExecutable = true; libraryHaskellDepends = [ base bytestring containers directory exceptions primitive profunctors text time transformers unix vector @@ -212413,8 +213196,8 @@ self: { pname = "tree-diff"; version = "0.0.1"; sha256 = "049v44c520jy3icxlnrvbdblh3mjmvd7m6qmkzxbzkf02x63xqmz"; - revision = "5"; - editedCabalFile = "1rj2n9d6mmk6zijnlc0q72s2qs8hhwhf25gpqqswaiqhbbh7gxi2"; + revision = "6"; + editedCabalFile = "1wyhygrpqphxzzwlrk6nl4h5xbyx6zi0y34i1nxvsy726fl5idai"; libraryHaskellDepends = [ aeson ansi-terminal ansi-wl-pprint base base-compat bytestring containers generics-sop hashable MemoTrie parsec parsers pretty @@ -215024,8 +215807,8 @@ self: { ({ mkDerivation, base, hspec, QuickCheck }: mkDerivation { pname = "typenums"; - version = "0.1.2"; - sha256 = "1729iws0m6xr8y5aqcrxv4br1ihvly6fagkkgfp9kj71a5jzaw7l"; + version = "0.1.2.1"; + sha256 = "06wrsvbddv2ga7k39954697jnclb5r6g4m95pr0fmv34ws1y1d66"; libraryHaskellDepends = [ base ]; testHaskellDepends = [ base hspec QuickCheck ]; description = "Type level numbers using existing Nat functionality"; @@ -223807,6 +224590,40 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "web3_0_8_1_0" = callPackage + ({ mkDerivation, aeson, async, base, basement, bytestring, cereal + , cryptonite, data-default, exceptions, generics-sop, hspec + , hspec-contrib, hspec-discover, hspec-expectations, http-client + , http-client-tls, machines, memory, microlens, microlens-aeson + , microlens-mtl, microlens-th, mtl, OneTuple, parsec, random + , relapse, secp256k1-haskell, split, stm, tagged, template-haskell + , text, time, transformers, vinyl + }: + mkDerivation { + pname = "web3"; + version = "0.8.1.0"; + sha256 = "0aliq3iblnlz7waswzprb8z28v82sjq8qpc2bbcyknmpp52p2r26"; + libraryHaskellDepends = [ + aeson async base basement bytestring cereal cryptonite data-default + exceptions generics-sop http-client http-client-tls machines memory + microlens microlens-aeson microlens-mtl microlens-th mtl OneTuple + parsec relapse secp256k1-haskell tagged template-haskell text + transformers vinyl + ]; + testHaskellDepends = [ + aeson async base basement bytestring cereal cryptonite data-default + exceptions generics-sop hspec hspec-contrib hspec-discover + hspec-expectations http-client http-client-tls machines memory + microlens microlens-aeson microlens-mtl microlens-th mtl OneTuple + parsec random relapse secp256k1-haskell split stm tagged + template-haskell text time transformers vinyl + ]; + testToolDepends = [ hspec-discover ]; + description = "Ethereum API for Haskell"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "webapi" = callPackage ({ mkDerivation, aeson, base, binary, blaze-builder, bytestring , bytestring-lexing, bytestring-trie, case-insensitive, containers @@ -224934,14 +225751,12 @@ self: { ({ mkDerivation, base, bytestring, deepseq, dnsapi }: mkDerivation { pname = "windns"; - version = "0.1.0.0"; - sha256 = "1hphwmwc1182p5aqjswcgqjbilm91rv5svjqhd93cqq599gg8q0c"; - revision = "3"; - editedCabalFile = "0j6gqyvhv7hxm5n249nrv0d9r41qb0yc4qdrzkjgs6lchndi6mrp"; + version = "0.1.0.1"; + sha256 = "016d1cf51jqvhbzlf5kbizv4l4dymradac1420rl47q2k5faczq8"; libraryHaskellDepends = [ base bytestring deepseq ]; librarySystemDepends = [ dnsapi ]; - description = "Domain Name Service (DNS) lookup via the Windows dnsapi standard library"; - license = stdenv.lib.licenses.gpl3; + description = "Domain Name Service (DNS) lookup via the /dnsapi.dll standard library"; + license = stdenv.lib.licenses.gpl2; hydraPlatforms = stdenv.lib.platforms.none; }) {dnsapi = null;}; @@ -226126,6 +226941,21 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "writer-cps-exceptions" = callPackage + ({ mkDerivation, base, exceptions, transformers + , writer-cps-transformers + }: + mkDerivation { + pname = "writer-cps-exceptions"; + version = "0.1.0.0"; + sha256 = "1s44h5d0f847w3j65frvjq2g6khz2ipsch109qnq5h2vcbgxid4v"; + libraryHaskellDepends = [ + base exceptions transformers writer-cps-transformers + ]; + description = "Control.Monad.Catch instances for the stricter CPS WriterT and RWST"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "writer-cps-full" = callPackage ({ mkDerivation, base, writer-cps-lens, writer-cps-morph , writer-cps-mtl, writer-cps-transformers @@ -228120,8 +228950,8 @@ self: { pname = "xmlhtml"; version = "0.2.5.2"; sha256 = "1p2v1cj9jjwbqyb0fyv2201zd7ljz5d46qg5kwy7rz2bchbqd0b4"; - revision = "1"; - editedCabalFile = "15lvbvdcagnqr62wfs3zz9xlcv553jr4ixbl50fsaxhkvlnymk45"; + revision = "2"; + editedCabalFile = "1d7q7acdv72zbbqq2n0swf3ia3lz1zplni6q5r97sp2w1a3xm6hf"; libraryHaskellDepends = [ base blaze-builder blaze-html blaze-markup bytestring bytestring-builder containers parsec text unordered-containers @@ -229434,6 +230264,19 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "yampa-gloss" = callPackage + ({ mkDerivation, base, gloss, Yampa }: + mkDerivation { + pname = "yampa-gloss"; + version = "0.1.0.0"; + sha256 = "1h9x76swrq64add2v6935542gh5l5rpf5nqdy1nl2q78ksk6r04g"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ base gloss Yampa ]; + description = "A GLOSS backend for Yampa"; + license = stdenv.lib.licenses.mit; + }) {}; + "yampa-glut" = callPackage ({ mkDerivation, base, GLUT, newtype, OpenGL, vector-space , Yampa-core @@ -229477,8 +230320,8 @@ self: { }: mkDerivation { pname = "yampa-test"; - version = "0.1.0.0"; - sha256 = "1d69qa8dzwsj6pawlg88vwv1r2ig2vnx11zbaq0pbl5hczfnknpd"; + version = "0.1.1"; + sha256 = "1qc1aic4apml5akq056i5c460x12hf613r1zkisshjm0na4gx5mb"; libraryHaskellDepends = [ base normaldistribution QuickCheck Yampa ]; @@ -231450,6 +232293,23 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "yesod-recaptcha2_0_3_0" = callPackage + ({ mkDerivation, aeson, base, classy-prelude, http-conduit + , yesod-auth, yesod-core, yesod-form + }: + mkDerivation { + pname = "yesod-recaptcha2"; + version = "0.3.0"; + sha256 = "12bgj16vfmvk6ri55wmx444njhlmf11v4cins8c1a6isjk8alhhc"; + libraryHaskellDepends = [ + aeson base classy-prelude http-conduit yesod-auth yesod-core + yesod-form + ]; + description = "yesod recaptcha2"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "yesod-routes" = callPackage ({ mkDerivation, base, bytestring, containers, hspec, HUnit , path-pieces, template-haskell, text, vector @@ -232541,6 +233401,17 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "yoda" = callPackage + ({ mkDerivation, base }: + mkDerivation { + pname = "yoda"; + version = "0.1.0.0"; + sha256 = "1p8zvxf63fbj2dpp3pa9awq1jc0makyka42j1aqsljfp08nx4pzn"; + libraryHaskellDepends = [ base ]; + description = "Parser combinators for young padawans"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "yoga" = callPackage ({ mkDerivation, base, bindings-DSL, ieee754 }: mkDerivation { diff --git a/pkgs/development/haskell-modules/lib.nix b/pkgs/development/haskell-modules/lib.nix index f4ebe549c50..942163ea209 100644 --- a/pkgs/development/haskell-modules/lib.nix +++ b/pkgs/development/haskell-modules/lib.nix @@ -354,4 +354,19 @@ rec { in builtins.listToAttrs (map toKeyVal haskellPaths); + + # Modify a Haskell package to add completion scripts for the given executable + # produced by it. These completion scripts will be picked up automatically if + # the resulting derivation is installed, e.g. by `nix-env -i`. + addOptparseApplicativeCompletionScripts = exeName: pkg: overrideCabal pkg (drv: { + postInstall = (drv.postInstall or "") + '' + bashCompDir="$out/share/bash-completion/completions" + zshCompDir="$out/share/zsh/vendor-completions" + fishCompDir="$out/share/fish/vendor_completions.d" + mkdir -p "$bashCompDir" "$zshCompDir" "$fishCompDir" + "$out/bin/${exeName}" --bash-completion-script "$out/bin/${exeName}" >"$bashCompDir/${exeName}" + "$out/bin/${exeName}" --zsh-completion-script "$out/bin/${exeName}" >"$zshCompDir/_${exeName}" + "$out/bin/${exeName}" --fish-completion-script "$out/bin/${exeName}" >"$fishCompDir/${exeName}.fish" + ''; + }); } diff --git a/pkgs/development/libraries/bamf/default.nix b/pkgs/development/libraries/bamf/default.nix index 0a2badea7cb..3fcdbca34f5 100644 --- a/pkgs/development/libraries/bamf/default.nix +++ b/pkgs/development/libraries/bamf/default.nix @@ -1,54 +1,66 @@ -{ stdenv, fetchurl, libgtop, libwnck3, glib, vala, pkgconfig -, libstartup_notification, gobjectIntrospection, gtk-doc +{ stdenv, autoconf, automake, libtool, gnome3, which, fetchgit, libgtop, libwnck3, glib, vala, pkgconfig +, libstartup_notification, gobjectIntrospection, gtk-doc, docbook_xsl , xorgserver, dbus, python2 }: stdenv.mkDerivation rec { - pname = "bamf"; - version = "0.5.3"; - name = "${pname}-${version}"; + name = "bamf-2018-02-07"; outputs = [ "out" "dev" "devdoc" ]; - src = fetchurl { - url = "https://launchpad.net/${pname}/0.5/${version}/+download/${name}.tar.gz"; - sha256 = "051vib8ndp09ph5bfwkgmzda94varzjafwxf6lqx7z1s8rd7n39l"; + src = fetchgit { + url = https://git.launchpad.net/~unity-team/bamf; + rev = "0.5.3+18.04.20180207.2-0ubuntu1"; + sha256 = "0hvbgzi0mzzzvcamd9mi1ykbk2l6zxffspyk5fpik8bij56nhzym"; }; nativeBuildInputs = [ - pkgconfig - gtk-doc + autoconf + automake + docbook_xsl + gnome3.gnome-common gobjectIntrospection + gtk-doc + libtool + pkgconfig vala + which # Tests - xorgserver + python2 + python2.pkgs.libxslt + python2.pkgs.libxml2 dbus - (python2.withPackages (pkgs: with pkgs; [ libxslt libxml2 ])) + xorgserver ]; buildInputs = [ - libgtop - libwnck3 - libstartup_notification glib + libgtop + libstartup_notification + libwnck3 ]; # Fix hard-coded path # https://bugs.launchpad.net/bamf/+bug/1780557 postPatch = '' - substituteInPlace data/Makefile.in \ + substituteInPlace data/Makefile.am \ --replace '/usr/lib/systemd/user' '@prefix@/lib/systemd/user' ''; configureFlags = [ "--enable-headless-tests" + "--enable-gtk-doc" ]; # fix paths makeFlags = [ - "INTROSPECTION_GIRDIR=$(dev)/share/gir-1.0/" - "INTROSPECTION_TYPELIBDIR=$(out)/lib/girepository-1.0" + "INTROSPECTION_GIRDIR=${placeholder ''dev''}/share/gir-1.0/" + "INTROSPECTION_TYPELIBDIR=${placeholder ''out''}/lib/girepository-1.0" ]; + preConfigure = '' + ./autogen.sh + ''; + # TODO: Requires /etc/machine-id doCheck = false; diff --git a/pkgs/development/libraries/fstrcmp/default.nix b/pkgs/development/libraries/fstrcmp/default.nix new file mode 100644 index 00000000000..68f3c9d0ee5 --- /dev/null +++ b/pkgs/development/libraries/fstrcmp/default.nix @@ -0,0 +1,31 @@ +{ stdenv, fetchzip, libtool, ghostscript, groff }: + +stdenv.mkDerivation rec { + name = "fstrcmp-${version}"; + version = "0.7"; + + src = fetchzip { + url = "https://sourceforge.net/projects/fstrcmp/files/fstrcmp/${version}/fstrcmp-${version}.D001.tar.gz"; + sha256 = "0yg3y3k0wz50gmhgigfi2dx725w1gc8snb95ih7vpcnj6kabgz9a"; + }; + + outputs = [ "out" "dev" "doc" "man" "devman" ]; + + nativeBuildInputs = [ libtool ghostscript groff ]; + + enableParallelBuilding = true; + + meta = with stdenv.lib; { + description = "Make fuzzy comparisons of strings and byte arrays"; + longDescription = '' + The fstrcmp project provides a library that is used to make fuzzy + comparisons of strings and byte arrays, including multi-byte character + strings. + ''; + homepage = http://fstrcmp.sourceforge.net/; + downloadPage = https://sourceforge.net/projects/fstrcmp/; + license = licenses.gpl3; + maintainers = [ maintainers.sephalon ]; + platforms = platforms.unix; + }; +} diff --git a/pkgs/development/libraries/jemalloc/common.nix b/pkgs/development/libraries/jemalloc/common.nix index d8866ae3ff8..593f4411f19 100644 --- a/pkgs/development/libraries/jemalloc/common.nix +++ b/pkgs/development/libraries/jemalloc/common.nix @@ -12,11 +12,7 @@ stdenv.mkDerivation (rec { # By default, jemalloc puts a je_ prefix onto all its symbols on OSX, which # then stops downstream builds (mariadb in particular) from detecting it. This # option should remove the prefix and give us a working jemalloc. - configureFlags = stdenv.lib.optional stdenv.isDarwin "--with-jemalloc-prefix=" - # jemalloc is unable to correctly detect transparent hugepage support on - # ARM (https://github.com/jemalloc/jemalloc/issues/526), and the default - # kernel ARMv6/7 kernel does not enable it, so we explicitly disable support - ++ stdenv.lib.optional stdenv.isAarch32 "--disable-thp"; + configureFlags = stdenv.lib.optional stdenv.isDarwin "--with-jemalloc-prefix="; doCheck = true; enableParallelBuilding = true; diff --git a/pkgs/development/libraries/jemalloc/default.nix b/pkgs/development/libraries/jemalloc/default.nix index 40c06cbffdf..8cb7c1f9673 100644 --- a/pkgs/development/libraries/jemalloc/default.nix +++ b/pkgs/development/libraries/jemalloc/default.nix @@ -1,10 +1,6 @@ { stdenv, fetchurl, fetchpatch }: import ./common.nix { inherit stdenv fetchurl; - version = "5.0.1"; - sha256 = "4814781d395b0ef093b21a08e8e6e0bd3dab8762f9935bbfb71679b0dea7c3e9"; - patches = stdenv.lib.optional stdenv.isAarch64 (fetchpatch { - url = "https://patch-diff.githubusercontent.com/raw/jemalloc/jemalloc/pull/1035.patch"; - sha256 = "02y0q3dp253bipxv4r954nqipbjbj92p6ww9bx5bk3d8pa81wkqq"; - }); + version = "5.1.0"; + sha256 = "0s3jpcyhzia8d4k0xyc67is78kg416p9yc3c2f9w6fhhqqffd5jk"; } diff --git a/pkgs/development/mobile/androidenv/addon.xml b/pkgs/development/mobile/androidenv/addon.xml index 1bc1d110db1..68792038d00 100644 --- a/pkgs/development/mobile/androidenv/addon.xml +++ b/pkgs/development/mobile/androidenv/addon.xml @@ -1,6 +1,6 @@ - + Terms and Conditions This is the Android Software Development Kit License Agreement @@ -35,7 +35,7 @@ This is the Android Software Development Kit License Agreement 3.3 You agree that Google or third parties own all legal right, title and interest in and to the SDK, including any Intellectual Property Rights that subsist in the SDK. "Intellectual Property Rights" means any and all rights under patent law, copyright law, trade secret law, trademark law, and any and all other proprietary rights. Google reserves all rights not expressly granted to you. -3.4 You may not use the SDK for any purpose not expressly permitted by the License Agreement. Except to the extent required by applicable third party licenses, you may not: (a) copy (except for backup purposes), modify, adapt, redistribute, decompile, reverse engineer, disassemble, or create derivative works of the SDK or any part of the SDK; or (b) load any part of the SDK onto a mobile handset or any other hardware device except a personal computer, combine any part of the SDK with other software, or distribute any software or device incorporating a part of the SDK. +3.4 You may not use the SDK for any purpose not expressly permitted by the License Agreement. Except to the extent required by applicable third party licenses, you may not copy (except for backup purposes), modify, adapt, redistribute, decompile, reverse engineer, disassemble, or create derivative works of the SDK or any part of the SDK. 3.5 Use, reproduction and distribution of components of the SDK licensed under an open source software license are governed solely by the terms of that open source software license and not the License Agreement. @@ -587,7 +587,7 @@ THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS& 3 - + 34908058 1f92abf3a76be66ae8032257fc7620acbd2b2e3a google_apis-3-r03.zip @@ -614,7 +614,7 @@ THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS& 2 - + 42435735 9b6e86d8568558de4d606a7debc4f6049608dbd0 google_apis-4_r02.zip @@ -641,7 +641,7 @@ THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS& 1 - + 49123776 46eaeb56b645ee7ffa24ede8fa17f3df70db0503 google_apis-5_r01.zip @@ -668,7 +668,7 @@ THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS& 1 - + 53382941 5ff545d96e031e09580a6cf55713015c7d4936b2 google_apis-6_r01.zip @@ -695,7 +695,7 @@ THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS& 1 - + 53691339 2e7f91e0fe34fef7f58aeced973c6ae52361b5ac google_apis-7_r01.zip @@ -722,7 +722,7 @@ THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS& 2 - + 59505020 3079958e7ec87222cac1e6b27bc471b27bf2c352 google_apis-8_r02.zip @@ -749,7 +749,7 @@ THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS& 2 - + 63401546 78664645a1e9accea4430814f8694291a7f1ea5d google_apis-9_r02.zip @@ -776,7 +776,7 @@ THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS& 2 - + 65781578 cc0711857c881fa7534f90cf8cc09b8fe985484d google_apis-10_r02.zip @@ -807,7 +807,7 @@ THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS& 1 - + 83477179 5eab5e81addee9f3576d456d205208314b5146a5 google_apis-11_r01.zip @@ -834,7 +834,7 @@ THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS& 1 - + 86099835 e9999f4fa978812174dfeceec0721c793a636e5d google_apis-12_r01.zip @@ -865,7 +865,7 @@ THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS& 1 - + 88615525 3b153edd211c27dc736c893c658418a4f9041417 google_apis-13_r01.zip @@ -896,7 +896,7 @@ THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS& 2 - + 106533714 f8eb4d96ad0492b4c0db2d7e4f1a1a3836664d39 google_apis-14_r02.zip @@ -925,7 +925,7 @@ THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS& 3 - + 106624396 d0d2bf26805eb271693570a1aaec33e7dc3f45e9 google_apis-15_r03.zip @@ -958,7 +958,7 @@ THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS& 4 - + 127341982 ee6acf1b01020bfa8a8e24725dbc4478bee5e792 google_apis-16_r04.zip @@ -991,7 +991,7 @@ THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS& 4 - + 137231243 a076be0677f38df8ca5536b44dfb411a0c808c4f google_apis-17_r04.zip @@ -1024,7 +1024,7 @@ THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS& 4 - + 143195183 6109603409debdd40854d4d4a92eaf8481462c8b google_apis-18_r04.zip @@ -1057,7 +1057,7 @@ THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS& 20 - + 147081 5b933abe830b2f25b4c0f171d45e9e0651e56311 google_apis-19_r20.zip @@ -1090,7 +1090,7 @@ THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS& 1 - + 154865 31361c2868f27343ee917fbd259c1463821b6145 google_apis-24_r1.zip @@ -1123,7 +1123,7 @@ THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS& 1 - + 154871 550e83eea9513ab11c44919ac6da54b36084a9f3 google_apis-25_r1.zip @@ -1156,7 +1156,7 @@ THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS& 1 - + 179499 66a754efb24e9bb07cc51648426443c7586c9d4a google_apis-21_r01.zip @@ -1189,7 +1189,7 @@ THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS& 1 - + 179259 5def0f42160cba8acff51b9c0c7e8be313de84f5 google_apis-22_r01.zip @@ -1222,7 +1222,7 @@ THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS& 1 - + 179900 04c5cc1a7c88967250ebba9561d81e24104167db google_apis-23_r01.zip @@ -1256,7 +1256,7 @@ THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS& 2 - + 78266751 92128a12e7e8b0fb5bac59153d7779b717e7b840 google_tv-12_r02.zip @@ -1278,7 +1278,7 @@ THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS& 1 - + 87721879 b73f7c66011ac8180b44aa4e83b8d78c66ea9a09 google_tv-13_r01.zip @@ -1303,7 +1303,7 @@ THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS& - + 355529608 a0d22beacc106a6977321f2b07d692ce4979e96a android_m2repository_r47.zip @@ -1323,7 +1323,7 @@ THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS& - + 215426029 05086add9e3a0eb1b67111108d7757a4337c3f10 google_m2repository_gms_v11_3_rc05_wear_2_0_5.zip @@ -1343,7 +1343,7 @@ THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS& - + 75109 355e8dc304a92a5616db235af8ee7bd554356254 market_licensing-r02.zip @@ -1364,7 +1364,7 @@ THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS& - + 110201 5305399dc1a56814e86b8459ce24871916f78b8c market_apk_expansion-r03.zip @@ -1386,7 +1386,7 @@ THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS& - + 5265389 92558dbc380bba3d55d0ec181167fb05ce7c79d9 google_play_services_3265130_r12.zip @@ -1401,16 +1401,16 @@ THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS& google_play_services_froyo - + - 44 + 49 - - 13796755 - d2bb583a3f62b068d448df10544c1852d910526f - google_play_services_v12_1_rc11.zip + + 15456884 + f95bf19634e2ab0430923247fe2c50246432d2e9 + google_play_services_v16_1_rc09.zip @@ -1428,7 +1428,7 @@ THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS& - + 8682859 dc8a2ed2fbd7246d4caf9ab10ffe7749dc35d1cc usb_driver_r11-windows.zip @@ -1443,28 +1443,6 @@ THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS& Google USB Driver usb_driver - - - - 5 - - - - - 436654 - bd2ac5ce7127070ac3229003eb69cfb806628ac9 - play_billing_r05.zip - - - - google - Google Inc. - Google Play Billing files and sample code - http://developer.android.com/google/play/billing/index.html - Google Play Billing Library - play_billing - market_billing - @@ -1473,7 +1451,7 @@ THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS& - + 704512 0102859d9575baa0bf4fd5eb422af2ad0fe6cb82 GoogleAdMobAdsSdkAndroid-6.4.1.zip @@ -1495,7 +1473,7 @@ THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS& - + 211432 dc14026bf0ce78315cb5dd00552607de0894de83 GoogleAnalyticsAndroid_2.0beta5.zip @@ -1516,7 +1494,7 @@ THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS& - + 4055193 13f3a3b2670a5fc04a7342861644be9a01b07e38 webdriver_r02.zip @@ -1538,7 +1516,7 @@ THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS& - + 5901400 ad066fd0dc7fc99d8aadac09c65a3c2519fbc7bf gcm_r03.zip @@ -1559,7 +1537,7 @@ THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS& - + 2167286 4fb5344e34e8faab4db18af07dace44c50db26a7 simulator_r01.zip @@ -1581,21 +1559,21 @@ THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS& - + 1346009 202a6e1b3009a0eb815f8c672d2d5b3717de6169 desktop-head-unit-linux_r01.1.zip linux - + 2375533 8179cbb3914493ebc5eb65b731cba061582f2e84 desktop-head-unit-macosx_r01.1.zip macosx - + 2691901 99c4a7172d73673552119347bc24c58b47da177b desktop-head-unit-windows_r01.1.zip @@ -1611,26 +1589,26 @@ THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS& auto - + 1 - 0 + 5 0 - - 450468876 - 50074a0f0312ee1d0d81d2cddc3d84a8a9e97a53 - aiasdk-1.0.0.zip + + 33351418 + 6c282b9c686e819fe7f5ac8f2249d2479acb63b4 + iasdk-1.5.0-1538000167.zip google Google Inc. - Android Instant Apps Development SDK - https://developer.android.com/topic/instant-apps/index.html - Instant Apps Development SDK + Google Play Instant Development SDK + https://developer.android.com/topic/google-play-instant/ + Google Play Instant Development SDK instantapps diff --git a/pkgs/development/mobile/androidenv/addons.nix b/pkgs/development/mobile/androidenv/addons.nix index ab5d570a327..1a8e2d32a4b 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_v12_1_rc11.zip; - sha1 = "d2bb583a3f62b068d448df10544c1852d910526f"; + url = https://dl.google.com/android/repository/google_play_services_v16_1_rc09.zip; + sha1 = "f95bf19634e2ab0430923247fe2c50246432d2e9"; }; meta = { description = "Google Play services client library and sample code"; @@ -308,8 +308,8 @@ in instant_apps = buildGoogleApis { name = "instant_apps_sdk"; src = fetchurl { - url = https://dl.google.com/android/repository/aiasdk-1.0.0.zip; - sha1 = "50074a0f0312ee1d0d81d2cddc3d84a8a9e97a53"; + url = https://dl.google.com/android/repository/iasdk-1.5.0-1538000167.zip; + sha1 = "6c282b9c686e819fe7f5ac8f2249d2479acb63b4"; }; meta = { description = "Android Instant Apps Development SDK"; @@ -317,4 +317,5 @@ in }; }; + } diff --git a/pkgs/development/mobile/androidenv/androidndk.nix b/pkgs/development/mobile/androidenv/androidndk.nix index 072a6dc3168..23ae4378dc6 100644 --- a/pkgs/development/mobile/androidenv/androidndk.nix +++ b/pkgs/development/mobile/androidenv/androidndk.nix @@ -89,6 +89,16 @@ let do wrapProgram "$(pwd)/$i" --prefix PATH : "${runtime_paths}" done + + ${stdenv.lib.optionalString (stdenv.hostPlatform.system == "x86_64-linux") '' + for i in ${pkg_path}/prebuilt/linux-x86_64/bin/* + do + if ! isELF $i; then continue; fi + patchelf --set-interpreter ${stdenv.cc.libc.out}/lib/ld-linux-x86-64.so.2 $i + patchelf --set-rpath ${stdenv.cc.cc.lib}/lib64 $i + done + ''} + # make some executables available in PATH mkdir -pv ${bin_path} for i in \ diff --git a/pkgs/development/mobile/androidenv/androidsdk.nix b/pkgs/development/mobile/androidenv/androidsdk.nix index 5f61f25d54e..a463adaf731 100644 --- a/pkgs/development/mobile/androidenv/androidsdk.nix +++ b/pkgs/development/mobile/androidenv/androidsdk.nix @@ -4,10 +4,18 @@ , freetype, fontconfig, glib, gtk2, atk, file, jdk, coreutils, libpulseaudio, dbus , zlib, glxinfo, xkeyboardconfig , includeSources +, licenseAccepted }: -{ platformVersions, abiVersions, useGoogleAPIs, useExtraSupportLibs ? false +{ platformVersions, abiVersions, useGoogleAPIs, buildToolsVersions ? [], useExtraSupportLibs ? false , useGooglePlayServices ? false, useInstantApps ? false }: +if !licenseAccepted then throw '' + You must accept the Android Software Development Kit License Agreement at + https://developer.android.com/studio/terms + by setting nixpkgs config option 'android_sdk.accept_license = true;' + '' +else assert licenseAccepted; + let inherit (stdenv.lib) makeLibraryPath; googleRepository = let version = "gms_v9_rc41_wear_2_0_rc6"; @@ -20,16 +28,16 @@ in stdenv.mkDerivation rec { name = "android-sdk-${version}"; - version = "25.2.5"; + version = "26.1.1"; src = if (stdenv.hostPlatform.system == "i686-linux" || stdenv.hostPlatform.system == "x86_64-linux") then fetchurl { - url = "https://dl.google.com/android/repository/tools_r${version}-linux.zip"; - sha256 = "0gnk49pkwy4m0nqwm1xnf3w4mfpi9w0kk7841xlawpwbkj0icxap"; + url = "https://dl.google.com/android/repository/sdk-tools-linux-4333796.zip"; + sha256 = "1yfy0qqxz1ixpsci1pizls1nrncmi8p16wcb9rimdn4q3mdfxzwj"; } else if stdenv.hostPlatform.system == "x86_64-darwin" then fetchurl { - url = "http://dl.google.com/android/repository/tools_r${version}-macosx.zip"; - sha256 = "0yg7wjmyw70xsh8k4hgbqb5rilam2a94yc8dwbh7fjwqcmpxgwqb"; + url = "https://dl.google.com/android/repository/sdk-tools-darwin-4333796.zip"; + sha256 = "0gl5c30m40kx0vvrpbaa8cw8wq2vb89r14hgzb1df4qgpic97cpc"; } else throw "platform not ${stdenv.hostPlatform.system} supported!"; @@ -39,7 +47,7 @@ stdenv.mkDerivation rec { unpackFile $src cd tools - for f in android traceview draw9patch hierarchyviewer monitor ddms screenshot2 uiautomatorviewer monkeyrunner jobb lint + for f in monitor bin/monkeyrunner bin/uiautomatorviewer do sed -i -e "s|/bin/ls|${coreutils}/bin/ls|" "$f" done @@ -54,24 +62,6 @@ stdenv.mkDerivation rec { patchelf --set-rpath ${stdenv_32bit.cc.cc.lib}/lib $i done - ${stdenv.lib.optionalString (stdenv.hostPlatform.system == "x86_64-linux") '' - for i in bin64/{mkfs.ext4,fsck.ext4,e2fsck,tune2fs,resize2fs} - do - patchelf --set-interpreter ${stdenv.cc.libc.out}/lib/ld-linux-x86-64.so.2 $i - patchelf --set-rpath ${stdenv.cc.cc.lib}/lib64 $i - done - ''} - - ${stdenv.lib.optionalString (stdenv.hostPlatform.system == "x86_64-linux") '' - # We must also patch the 64-bit emulator instances, if needed - - for i in emulator emulator64-arm emulator64-mips emulator64-x86 emulator64-crash-service emulator-check qemu/linux-x86_64/qemu-system-* - do - patchelf --set-interpreter ${stdenv.cc.libc.out}/lib/ld-linux-x86-64.so.2 $i - patchelf --set-rpath ${stdenv.cc.cc.lib}/lib64 $i - done - ''} - # The following scripts used SWT and wants to dynamically load some GTK+ stuff. # Creating these wrappers ensure that they can be found: @@ -79,22 +69,18 @@ stdenv.mkDerivation rec { --prefix PATH : ${jdk}/bin \ --prefix LD_LIBRARY_PATH : ${makeLibraryPath [ glib gtk2 libXtst ]} - wrapProgram `pwd`/uiautomatorviewer \ - --prefix PATH : ${jdk}/bin \ - --prefix LD_LIBRARY_PATH : ${stdenv.lib.makeLibraryPath [ glib gtk2 libXtst ]} - - wrapProgram `pwd`/hierarchyviewer \ + wrapProgram `pwd`/bin/uiautomatorviewer \ --prefix PATH : ${jdk}/bin \ --prefix LD_LIBRARY_PATH : ${stdenv.lib.makeLibraryPath [ glib gtk2 libXtst ]} # The emulators need additional libraries, which are dynamically loaded => let's wrap them ${stdenv.lib.optionalString (stdenv.hostPlatform.system == "x86_64-linux") '' - for i in emulator emulator64-arm emulator64-mips emulator64-x86 emulator64-crash-service + for i in emulator emulator-check do wrapProgram `pwd`/$i \ --prefix PATH : ${stdenv.lib.makeBinPath [ file glxinfo ]} \ - --suffix LD_LIBRARY_PATH : `pwd`/lib64:`pwd`/lib64/qt/lib:${makeLibraryPath [ stdenv.cc.cc libX11 libxcb libXau libXdmcp libXext libGLU_combined alsaLib zlib libpulseaudio dbus.lib ]} \ + --suffix LD_LIBRARY_PATH : `pwd`/lib:${makeLibraryPath [ stdenv.cc.cc libX11 libxcb libXau libXdmcp libXext libGLU_combined alsaLib zlib libpulseaudio dbus.lib ]} \ --suffix QT_XKB_CONFIG_ROOT : ${xkeyboardconfig}/share/X11/xkb done ''} @@ -134,9 +120,17 @@ stdenv.mkDerivation rec { cd .. ln -s ${platformTools}/platform-tools - ln -s ${buildTools}/build-tools ln -s ${support}/support + mkdir -p build-tools + cd build-tools + + ${stdenv.lib.concatMapStrings + (v: "ln -s ${builtins.getAttr "v${builtins.replaceStrings ["."] ["_"] v}" buildTools}/build-tools/*") + (if (builtins.length buildToolsVersions) == 0 then platformVersions else buildToolsVersions)} + + cd .. + # Symlink required Google API add-ons mkdir -p add-ons @@ -245,6 +239,14 @@ stdenv.mkDerivation rec { fi done + for i in $out/libexec/tools/bin/* + do + if [ ! -d $i ] && [ -x $i ] + then + ln -sf $i $out/bin/$(basename $i) + fi + done + for i in $out/libexec/platform-tools/* do if [ ! -d $i ] && [ -x $i ] @@ -260,6 +262,11 @@ stdenv.mkDerivation rec { ln -sf $i $out/bin/$(basename $i) fi done + + wrapProgram $out/bin/sdkmanager \ + --set JAVA_HOME ${jdk} + + yes | ANDROID_SDK_HOME=$(mktemp -d) $out/bin/sdkmanager --licenses || true ''; buildInputs = [ unzip makeWrapper ]; diff --git a/pkgs/development/mobile/androidenv/build-tools-srcs-linux.nix b/pkgs/development/mobile/androidenv/build-tools-srcs-linux.nix new file mode 100644 index 00000000000..3c2960755e7 --- /dev/null +++ b/pkgs/development/mobile/androidenv/build-tools-srcs-linux.nix @@ -0,0 +1,376 @@ + +# This file is generated from generate-tools.sh. DO NOT EDIT. +# Execute generate-tools.sh or fetch.sh to update the file. +{ fetchurl }: + +{ + + v17 = { + version = "17.0.0"; + src = fetchurl { + url = https://dl.google.com/android/repository/build-tools_r17-linux.zip; + sha1 = "2c2872bc3806aabf16a12e3959c2183ddc866e6d"; + }; + }; + + v18_0_1 = { + version = "18.0.1"; + src = fetchurl { + url = https://dl.google.com/android/repository/build-tools_r18.0.1-linux.zip; + sha1 = "f11618492b0d2270c332325d45d752d3656a9640"; + }; + }; + + v18_1_0 = { + version = "18.1.0"; + src = fetchurl { + url = https://dl.google.com/android/repository/build-tools_r18.1-linux.zip; + sha1 = "f314a0599e51397f0886fe888b50dd98f2f050d8"; + }; + }; + + v18_1_1 = { + version = "18.1.1"; + src = fetchurl { + url = https://dl.google.com/android/repository/build-tools_r18.1.1-linux.zip; + sha1 = "68c9acbfc0cec2d51b19efaed39831a17055d998"; + }; + }; + + v19 = { + version = "19.0.0"; + src = fetchurl { + url = https://dl.google.com/android/repository/build-tools_r19-linux.zip; + sha1 = "55c1a6cf632e7d346f0002b275ec41fd3137fd83"; + }; + }; + + v19_0_1 = { + version = "19.0.1"; + src = fetchurl { + url = https://dl.google.com/android/repository/build-tools_r19.0.1-linux.zip; + sha1 = "18d2312dc4368858914213087f4e61445aca4517"; + }; + }; + + v19_0_2 = { + version = "19.0.2"; + src = fetchurl { + url = https://dl.google.com/android/repository/build-tools_r19.0.2-linux.zip; + sha1 = "a03a6bdea0091aea32e1b35b90a7294c9f04e3dd"; + }; + }; + + v19_0_3 = { + version = "19.0.3"; + src = fetchurl { + url = https://dl.google.com/android/repository/build-tools_r19.0.3-linux.zip; + sha1 = "c2d6055478e9d2d4fba476ee85f99181ddd1160c"; + }; + }; + + v19_1_0 = { + version = "19.1.0"; + src = fetchurl { + url = https://dl.google.com/android/repository/build-tools_r19.1-linux.zip; + sha1 = "1ff20ac15fa47a75d00346ec12f180d531b3ca89"; + }; + }; + + v20 = { + version = "20.0.0"; + src = fetchurl { + url = https://dl.google.com/android/repository/build-tools_r20-linux.zip; + sha1 = "b688905526a5584d1327a662d871a635ff502758"; + }; + }; + + v21 = { + version = "21.0.0"; + src = fetchurl { + url = https://dl.google.com/android/repository/build-tools_r21-linux.zip; + sha1 = "4933328fdeecbd554a29528f254f4993468e1cf4"; + }; + }; + + v21_0_1 = { + version = "21.0.1"; + src = fetchurl { + url = https://dl.google.com/android/repository/build-tools_r21.0.1-linux.zip; + sha1 = "e573069eea3e5255e7a65bedeb767f4fd0a5f49a"; + }; + }; + + v21_0_2 = { + version = "21.0.2"; + src = fetchurl { + url = https://dl.google.com/android/repository/build-tools_r21.0.2-linux.zip; + sha1 = "e1236ab8897b62b57414adcf04c132567b2612a5"; + }; + }; + + v21_1_0 = { + version = "21.1.0"; + src = fetchurl { + url = https://dl.google.com/android/repository/build-tools_r21.1-linux.zip; + sha1 = "b7455e543784d52a8925f960bc880493ed1478cb"; + }; + }; + + v21_1_1 = { + version = "21.1.1"; + src = fetchurl { + url = https://dl.google.com/android/repository/build-tools_r21.1.1-linux.zip; + sha1 = "1c712ee3a1ba5a8b0548f9c32f17d4a0ddfd727d"; + }; + }; + + v21_1_2 = { + version = "21.1.2"; + src = fetchurl { + url = https://dl.google.com/android/repository/build-tools_r21.1.2-linux.zip; + sha1 = "5e35259843bf2926113a38368b08458735479658"; + }; + }; + + v22 = { + version = "22.0.0"; + src = fetchurl { + url = https://dl.google.com/android/repository/build-tools_r22-linux.zip; + sha1 = "a8a1619dd090e44fac957bce6842e62abf87965b"; + }; + }; + + v22_0_1 = { + version = "22.0.1"; + src = fetchurl { + url = https://dl.google.com/android/repository/build-tools_r22.0.1-linux.zip; + sha1 = "da8b9c5c3ede39298e6cf0283c000c2ee9029646"; + }; + }; + + v23 = { + version = "23.0.0"; + src = fetchurl { + url = https://dl.google.com/android/repository/build-tools_r23-linux.zip; + sha1 = "c1d6209212b01469f80fa804e0c1d39a06bc9060"; + }; + }; + + v23_0_1 = { + version = "23.0.1"; + src = fetchurl { + url = https://dl.google.com/android/repository/build-tools_r23.0.1-linux.zip; + sha1 = "b6ba7c399d5fa487d95289d8832e4ad943aed556"; + }; + }; + + v23_0_2 = { + version = "23.0.2"; + src = fetchurl { + url = https://dl.google.com/android/repository/build-tools_r23.0.2-linux.zip; + sha1 = "8a9f2b37f6fcf7a9fa784dc21aeaeb41bbb9f2c3"; + }; + }; + + v23_0_3 = { + version = "23.0.3"; + src = fetchurl { + url = https://dl.google.com/android/repository/build-tools_r23.0.3-linux.zip; + sha1 = "368f2600feac7e9b511b82f53d1f2240ae4a91a3"; + }; + }; + + v24 = { + version = "24.0.0"; + src = fetchurl { + url = https://dl.google.com/android/repository/build-tools_r24-linux.zip; + sha1 = "c6271c4d78a5612ea6c7150688bcd5b7313de8d1"; + }; + }; + + v24_0_1 = { + version = "24.0.1"; + src = fetchurl { + url = https://dl.google.com/android/repository/build-tools_r24.0.1-linux.zip; + sha1 = "84f18c392919a074fcbb9b1d967984e6b2fef8b4"; + }; + }; + + v24_0_2 = { + version = "24.0.2"; + src = fetchurl { + url = https://dl.google.com/android/repository/build-tools_r24.0.2-linux.zip; + sha1 = "f199a7a788c3fefbed102eea34d6007737b803cf"; + }; + }; + + v24_0_3 = { + version = "24.0.3"; + src = fetchurl { + url = https://dl.google.com/android/repository/build-tools_r24.0.3-linux.zip; + sha1 = "9e8cc49d66e03fa1a8ecc1ac3e58f1324f5da304"; + }; + }; + + v25 = { + version = "25.0.0"; + src = fetchurl { + url = https://dl.google.com/android/repository/build-tools_r25-linux.zip; + sha1 = "f2bbda60403e75cabd0f238598c3b4dfca56ea44"; + }; + }; + + v25_0_1 = { + version = "25.0.1"; + src = fetchurl { + url = https://dl.google.com/android/repository/build-tools_r25.0.1-linux.zip; + sha1 = "ff063d252ab750d339f5947d06ff782836f22bac"; + }; + }; + + v25_0_2 = { + version = "25.0.2"; + src = fetchurl { + url = https://dl.google.com/android/repository/build-tools_r25.0.2-linux.zip; + sha1 = "ff953c0177e317618fda40516f3e9d95fd43c7ae"; + }; + }; + + v25_0_3 = { + version = "25.0.3"; + src = fetchurl { + url = https://dl.google.com/android/repository/build-tools_r25.0.3-linux.zip; + sha1 = "db95f3a0ae376534d4d69f4cdb6fad20649f3509"; + }; + }; + + v26 = { + version = "26.0.0"; + src = fetchurl { + url = https://dl.google.com/android/repository/build-tools_r26-linux.zip; + sha1 = "1cbe72929876f8a872ab1f1b1040a9f720261f59"; + }; + }; + + v26_rc1 = { + version = "26.0.0-rc1"; + src = fetchurl { + url = https://dl.google.com/android/repository/build-tools_r26-rc1-linux.zip; + sha1 = "8cd6388dc96db2d7a49d06159cf990d3bbc78d04"; + }; + }; + + v26_rc2 = { + version = "26.0.0-rc2"; + src = fetchurl { + url = https://dl.google.com/android/repository/build-tools_r26-rc2-linux.zip; + sha1 = "629bbd8d2e415bf64871fb0b4c0540fd6d0347a0"; + }; + }; + + v26_0_1 = { + version = "26.0.1"; + src = fetchurl { + url = https://dl.google.com/android/repository/build-tools_r26.0.1-linux.zip; + sha1 = "5378c2c78091b414d0eac40a6bd37f2faa31a365"; + }; + }; + + v26_0_2 = { + version = "26.0.2"; + src = fetchurl { + url = https://dl.google.com/android/repository/build-tools_r26.0.2-linux.zip; + sha1 = "5b2b7b66c7bf2151f2af183b5b50a17808850592"; + }; + }; + + v26_0_3 = { + version = "26.0.3"; + src = fetchurl { + url = https://dl.google.com/android/repository/build-tools_r26.0.3-linux.zip; + sha1 = "8a2e6c1bcd845844523a68aa17e5442f0dce328c"; + }; + }; + + v27 = { + version = "27.0.0"; + src = fetchurl { + url = https://dl.google.com/android/repository/build-tools_r27-linux.zip; + sha1 = "28542332ba97cf4a08c3eddfcf5edd70e3cf1260"; + }; + }; + + v27_0_1 = { + version = "27.0.1"; + src = fetchurl { + url = https://dl.google.com/android/repository/build-tools_r27.0.1-linux.zip; + sha1 = "7f4eedb1077ef948b848040dcd15de9e8a759f4a"; + }; + }; + + v27_0_2 = { + version = "27.0.2"; + src = fetchurl { + url = https://dl.google.com/android/repository/build-tools_r27.0.2-linux.zip; + sha1 = "b687ddf6be84f11607871138aad32cf857d0b837"; + }; + }; + + v27_0_3 = { + version = "27.0.3"; + src = fetchurl { + url = https://dl.google.com/android/repository/build-tools_r27.0.3-linux.zip; + sha1 = "d85e7a6320eddffe7eeace3437605079dac938ca"; + }; + }; + + v28 = { + version = "28.0.0"; + src = fetchurl { + url = https://dl.google.com/android/repository/build-tools_r28-linux.zip; + sha1 = "d9f8a754d833ccd334f56fcc6089c5925cd82abb"; + }; + }; + + v28_rc1 = { + version = "28.0.0-rc1"; + src = fetchurl { + url = https://dl.google.com/android/repository/build-tools_r28-rc1-linux.zip; + sha1 = "1601977fae25fd478bcfaa0481ca5ea3c609d840"; + }; + }; + + v28_rc2 = { + version = "28.0.0-rc2"; + src = fetchurl { + url = https://dl.google.com/android/repository/build-tools_r28-rc2-linux.zip; + sha1 = "efe9c0dde0646a07544c864276390ca6e96b24dc"; + }; + }; + + v28_0_1 = { + version = "28.0.1"; + src = fetchurl { + url = https://dl.google.com/android/repository/build-tools_r28.0.1-linux.zip; + sha1 = "ee70dfa1fccb58b37cebc9544830511f36a137a0"; + }; + }; + + v28_0_2 = { + version = "28.0.2"; + src = fetchurl { + url = https://dl.google.com/android/repository/build-tools_r28.0.2-linux.zip; + sha1 = "b4492209810a3fd48deaa982f9852fef12433d55"; + }; + }; + + v28_0_3 = { + version = "28.0.3"; + src = fetchurl { + url = https://dl.google.com/android/repository/build-tools_r28.0.3-linux.zip; + sha1 = "ea6f2f7103cd9da9ff0bdf6e37fbbba548fa4165"; + }; + }; + +} diff --git a/pkgs/development/mobile/androidenv/build-tools-srcs-macosx.nix b/pkgs/development/mobile/androidenv/build-tools-srcs-macosx.nix new file mode 100644 index 00000000000..1e15aa7c873 --- /dev/null +++ b/pkgs/development/mobile/androidenv/build-tools-srcs-macosx.nix @@ -0,0 +1,376 @@ + +# This file is generated from generate-tools.sh. DO NOT EDIT. +# Execute generate-tools.sh or fetch.sh to update the file. +{ fetchurl }: + +{ + + v17 = { + version = "17.0.0"; + src = fetchurl { + url = https://dl.google.com/android/repository/build-tools_r17-macosx.zip; + sha1 = "602ee709be9dbb8f179b1e4075148a57f9419930"; + }; + }; + + v18_0_1 = { + version = "18.0.1"; + src = fetchurl { + url = https://dl.google.com/android/repository/build-tools_r18.0.1-macosx.zip; + sha1 = "d84f5692fb44d60fc53e5b2507cebf9f24626902"; + }; + }; + + v18_1_0 = { + version = "18.1.0"; + src = fetchurl { + url = https://dl.google.com/android/repository/build-tools_r18.1-macosx.zip; + sha1 = "16ddb299b8b43063e5bb3387ec17147c5053dfd8"; + }; + }; + + v18_1_1 = { + version = "18.1.1"; + src = fetchurl { + url = https://dl.google.com/android/repository/build-tools_r18.1.1-macosx.zip; + sha1 = "a9d9d37f6ddf859e57abc78802a77aaa166e48d4"; + }; + }; + + v19 = { + version = "19.0.0"; + src = fetchurl { + url = https://dl.google.com/android/repository/build-tools_r19-macosx.zip; + sha1 = "86ec1c12db1bc446b7bcaefc5cc14eb361044e90"; + }; + }; + + v19_0_1 = { + version = "19.0.1"; + src = fetchurl { + url = https://dl.google.com/android/repository/build-tools_r19.0.1-macosx.zip; + sha1 = "efaf50fb19a3edb8d03efbff76f89a249ad2920b"; + }; + }; + + v19_0_2 = { + version = "19.0.2"; + src = fetchurl { + url = https://dl.google.com/android/repository/build-tools_r19.0.2-macosx.zip; + sha1 = "145bc43065d45f756d99d87329d899052b9a9288"; + }; + }; + + v19_0_3 = { + version = "19.0.3"; + src = fetchurl { + url = https://dl.google.com/android/repository/build-tools_r19.0.3-macosx.zip; + sha1 = "651cf8754373b2d52e7f6aab2c52eabffe4e9ea4"; + }; + }; + + v19_1_0 = { + version = "19.1.0"; + src = fetchurl { + url = https://dl.google.com/android/repository/build-tools_r19.1-macosx.zip; + sha1 = "0d11aae3417de1efb4b9a0e0a7855904a61bcec1"; + }; + }; + + v20 = { + version = "20.0.0"; + src = fetchurl { + url = https://dl.google.com/android/repository/build-tools_r20-macosx.zip; + sha1 = "1240f629411c108a714c4ddd756937c7fab93f83"; + }; + }; + + v21 = { + version = "21.0.0"; + src = fetchurl { + url = https://dl.google.com/android/repository/build-tools_r21-macosx.zip; + sha1 = "9bef7989b51436bd4e5114d8a0330359f077cbfa"; + }; + }; + + v21_0_1 = { + version = "21.0.1"; + src = fetchurl { + url = https://dl.google.com/android/repository/build-tools_r21.0.1-macosx.zip; + sha1 = "b60c8f9b810c980abafa04896706f3911be1ade7"; + }; + }; + + v21_0_2 = { + version = "21.0.2"; + src = fetchurl { + url = https://dl.google.com/android/repository/build-tools_r21.0.2-macosx.zip; + sha1 = "f17471c154058f3734729ef3cc363399b1cd3de1"; + }; + }; + + v21_1_0 = { + version = "21.1.0"; + src = fetchurl { + url = https://dl.google.com/android/repository/build-tools_r21.1-macosx.zip; + sha1 = "df619356c2359aa5eacdd48699d15b335d9bd246"; + }; + }; + + v21_1_1 = { + version = "21.1.1"; + src = fetchurl { + url = https://dl.google.com/android/repository/build-tools_r21.1.1-macosx.zip; + sha1 = "836a146eab0504aa9387a5132e986fe7c7381571"; + }; + }; + + v21_1_2 = { + version = "21.1.2"; + src = fetchurl { + url = https://dl.google.com/android/repository/build-tools_r21.1.2-macosx.zip; + sha1 = "e7c906b4ba0eea93b32ba36c610dbd6b204bff48"; + }; + }; + + v22 = { + version = "22.0.0"; + src = fetchurl { + url = https://dl.google.com/android/repository/build-tools_r22-macosx.zip; + sha1 = "af95429b24088d704bc5db9bd606e34ac1b82c0d"; + }; + }; + + v22_0_1 = { + version = "22.0.1"; + src = fetchurl { + url = https://dl.google.com/android/repository/build-tools_r22.0.1-macosx.zip; + sha1 = "53dad7f608e01d53b17176ba11165acbfccc5bbf"; + }; + }; + + v23 = { + version = "23.0.0"; + src = fetchurl { + url = https://dl.google.com/android/repository/build-tools_r23-macosx.zip; + sha1 = "90ba6e716f7703a236cd44b2e71c5ff430855a03"; + }; + }; + + v23_0_1 = { + version = "23.0.1"; + src = fetchurl { + url = https://dl.google.com/android/repository/build-tools_r23.0.1-macosx.zip; + sha1 = "d96ec1522721e9a179ae2c591c99f75d31d39718"; + }; + }; + + v23_0_2 = { + version = "23.0.2"; + src = fetchurl { + url = https://dl.google.com/android/repository/build-tools_r23.0.2-macosx.zip; + sha1 = "482c4cbceef8ff58aefd92d8155a38610158fdaf"; + }; + }; + + v23_0_3 = { + version = "23.0.3"; + src = fetchurl { + url = https://dl.google.com/android/repository/build-tools_r23.0.3-macosx.zip; + sha1 = "fbc98cd303fd15a31d472de6c03bd707829f00b0"; + }; + }; + + v24 = { + version = "24.0.0"; + src = fetchurl { + url = https://dl.google.com/android/repository/build-tools_r24-macosx.zip; + sha1 = "97fc4ed442f23989cc488d02c1d1de9bdde241de"; + }; + }; + + v24_0_1 = { + version = "24.0.1"; + src = fetchurl { + url = https://dl.google.com/android/repository/build-tools_r24.0.1-macosx.zip; + sha1 = "5c6457fcdfa07724fb086d8ff4e8316fc0742848"; + }; + }; + + v24_0_2 = { + version = "24.0.2"; + src = fetchurl { + url = https://dl.google.com/android/repository/build-tools_r24.0.2-macosx.zip; + sha1 = "8bb8fc575477491d5957de743089df412de55cda"; + }; + }; + + v24_0_3 = { + version = "24.0.3"; + src = fetchurl { + url = https://dl.google.com/android/repository/build-tools_r24.0.3-macosx.zip; + sha1 = "a01c15f1b105c34595681075e1895d58b3fff48c"; + }; + }; + + v25 = { + version = "25.0.0"; + src = fetchurl { + url = https://dl.google.com/android/repository/build-tools_r25-macosx.zip; + sha1 = "273c5c29a65cbed00e44f3aa470bbd7dce556606"; + }; + }; + + v25_0_1 = { + version = "25.0.1"; + src = fetchurl { + url = https://dl.google.com/android/repository/build-tools_r25.0.1-macosx.zip; + sha1 = "7bf7f22d7d48ef20b6ab0e3d7a2912e5c088340f"; + }; + }; + + v25_0_2 = { + version = "25.0.2"; + src = fetchurl { + url = https://dl.google.com/android/repository/build-tools_r25.0.2-macosx.zip; + sha1 = "12a5204bb3b6e39437535469fde7ddf42da46b16"; + }; + }; + + v25_0_3 = { + version = "25.0.3"; + src = fetchurl { + url = https://dl.google.com/android/repository/build-tools_r25.0.3-macosx.zip; + sha1 = "160d2fefb5ce68e443427fc30a793a703b63e26e"; + }; + }; + + v26 = { + version = "26.0.0"; + src = fetchurl { + url = https://dl.google.com/android/repository/build-tools_r26-macosx.zip; + sha1 = "d01a1aeca03747245f1f5936b3cb01759c66d086"; + }; + }; + + v26_rc1 = { + version = "26.0.0-rc1"; + src = fetchurl { + url = https://dl.google.com/android/repository/build-tools_r26-rc1-macosx.zip; + sha1 = "5c5a1de7d5f4f000d36ae349229fe0be846d6137"; + }; + }; + + v26_rc2 = { + version = "26.0.0-rc2"; + src = fetchurl { + url = https://dl.google.com/android/repository/build-tools_r26-rc2-macosx.zip; + sha1 = "cb1eb738a1f7003025af267a9b8cc2d259533c70"; + }; + }; + + v26_0_1 = { + version = "26.0.1"; + src = fetchurl { + url = https://dl.google.com/android/repository/build-tools_r26.0.1-macosx.zip; + sha1 = "cbde59de198916b390777dd0227921bfa2120832"; + }; + }; + + v26_0_2 = { + version = "26.0.2"; + src = fetchurl { + url = https://dl.google.com/android/repository/build-tools_r26.0.2-macosx.zip; + sha1 = "d9ed7c7f149ce38be5dc08979aea8acec1459ca0"; + }; + }; + + v26_0_3 = { + version = "26.0.3"; + src = fetchurl { + url = https://dl.google.com/android/repository/build-tools_r26.0.3-macosx.zip; + sha1 = "5bb90ed935d99e5bc90686f43b852e68c5ad40df"; + }; + }; + + v27 = { + version = "27.0.0"; + src = fetchurl { + url = https://dl.google.com/android/repository/build-tools_r27-macosx.zip; + sha1 = "fb4e8d7e6b8d29a77090e34024077a80458d5ae1"; + }; + }; + + v27_0_1 = { + version = "27.0.1"; + src = fetchurl { + url = https://dl.google.com/android/repository/build-tools_r27.0.1-macosx.zip; + sha1 = "1edd07bfdbadd95652d093040e16d858f7489594"; + }; + }; + + v27_0_2 = { + version = "27.0.2"; + src = fetchurl { + url = https://dl.google.com/android/repository/build-tools_r27.0.2-macosx.zip; + sha1 = "6d5d9cf2a47877f273f4b742b19e712a051a31be"; + }; + }; + + v27_0_3 = { + version = "27.0.3"; + src = fetchurl { + url = https://dl.google.com/android/repository/build-tools_r27.0.3-macosx.zip; + sha1 = "61d9fb18790c68d66ff73bf1e7ad56bc1f1eef2d"; + }; + }; + + v28 = { + version = "28.0.0"; + src = fetchurl { + url = https://dl.google.com/android/repository/build-tools_r28-macosx.zip; + sha1 = "72088d32d1d82cc3c2cf7cf6618b6130c0c84ade"; + }; + }; + + v28_rc1 = { + version = "28.0.0-rc1"; + src = fetchurl { + url = https://dl.google.com/android/repository/build-tools_r28-rc1-macosx.zip; + sha1 = "2c77821967a2330b7b227072d0b1c02ef19fe2fc"; + }; + }; + + v28_rc2 = { + version = "28.0.0-rc2"; + src = fetchurl { + url = https://dl.google.com/android/repository/build-tools_r28-rc2-macosx.zip; + sha1 = "0d0314b353589feb10e528b44c5a685b6658d797"; + }; + }; + + v28_0_1 = { + version = "28.0.1"; + src = fetchurl { + url = https://dl.google.com/android/repository/build-tools_r28.0.1-macosx.zip; + sha1 = "aeef42ad953f1630dd6f5d71eefdc0b825211462"; + }; + }; + + v28_0_2 = { + version = "28.0.2"; + src = fetchurl { + url = https://dl.google.com/android/repository/build-tools_r28.0.2-macosx.zip; + sha1 = "c10dd5a7825578622fb362a8a34f76eb3ba0c0a9"; + }; + }; + + v28_0_3 = { + version = "28.0.3"; + src = fetchurl { + url = https://dl.google.com/android/repository/build-tools_r28.0.3-macosx.zip; + sha1 = "f8c333a2991b1ab05a671bc6248b78e00edcd83a"; + }; + }; + +} diff --git a/pkgs/development/mobile/androidenv/build-tools.nix b/pkgs/development/mobile/androidenv/build-tools.nix index 85e604bd3f4..b362dc2dca5 100644 --- a/pkgs/development/mobile/androidenv/build-tools.nix +++ b/pkgs/development/mobile/androidenv/build-tools.nix @@ -1,56 +1,53 @@ -{stdenv, stdenv_32bit, fetchurl, unzip, zlib_32bit, ncurses_32bit, file, zlib, ncurses}: +{stdenv, lib, stdenv_32bit, fetchurl, unzip, zlib_32bit, ncurses_32bit, file, zlib, ncurses, coreutils, buildToolsSources}: -stdenv.mkDerivation rec { - version = "26.0.2"; - name = "android-build-tools-r${version}"; - src = if (stdenv.hostPlatform.system == "i686-linux" || stdenv.hostPlatform.system == "x86_64-linux") - then fetchurl { - url = "https://dl.google.com/android/repository/build-tools_r${version}-linux.zip"; - sha256 = "1kii880bwhjkc343zwx1ysxyisxhczrwhphnxbwsgi45mjgq8lm7"; - } - else if stdenv.hostPlatform.system == "x86_64-darwin" then fetchurl { - url = "https://dl.google.com/android/repository/build-tools_r${version}-macosx.zip"; - sha256 = "1x0ycprl6hgsm23kck5ind7x00hzydc5k3h3ch4a13407xbpvzvx"; - } - else throw "System ${stdenv.hostPlatform.system} not supported!"; +let buildBuildTools = name: { version, src }: + stdenv.mkDerivation rec { + inherit version src; + name = "android-build-tools-r${version}"; + buildCommand = '' + mkdir -p $out/build-tools + cd $out/build-tools + unzip $src + mv android-* ${version} - buildCommand = '' - mkdir -p $out/build-tools - cd $out/build-tools - unzip $src - mv android-* ${version} + cd ${version} - ${stdenv.lib.optionalString (stdenv.hostPlatform.system == "i686-linux" || stdenv.hostPlatform.system == "x86_64-linux") - '' - cd ${version} + for f in $(grep -Rl /bin/ls .); do + sed -i -e "s|/bin/ls|${coreutils}/bin/ls|" "$f" + done - ln -s ${ncurses.out}/lib/libncurses.so.5 `pwd`/lib64/libtinfo.so.5 + ${stdenv.lib.optionalString (stdenv.hostPlatform.system == "i686-linux" || stdenv.hostPlatform.system == "x86_64-linux") + '' - find . -type f -print0 | while IFS= read -r -d "" file - do - type=$(file "$file") - ## Patch 64-bit binaries - if grep -q "ELF 64-bit" <<< "$type" - then - if grep -q "interpreter" <<< "$type" + ln -s ${ncurses.out}/lib/libncurses.so.5 `pwd`/lib64/libtinfo.so.5 + + find . -type f -print0 | while IFS= read -r -d "" file + do + type=$(file "$file") + ## Patch 64-bit binaries + if grep -q "ELF 64-bit" <<< "$type" then - patchelf --set-interpreter ${stdenv.cc.libc.out}/lib/ld-linux-x86-64.so.2 "$file" - fi - patchelf --set-rpath `pwd`/lib64:${stdenv.cc.cc.lib.out}/lib:${zlib.out}/lib:${ncurses.out}/lib "$file" - ## Patch 32-bit binaries - elif grep -q "ELF 32-bit" <<< "$type" - then - if grep -q "interpreter" <<< "$type" + if grep -q "interpreter" <<< "$type" + then + patchelf --set-interpreter ${stdenv.cc.libc.out}/lib/ld-linux-x86-64.so.2 "$file" + fi + patchelf --set-rpath `pwd`/lib64:${stdenv.cc.cc.lib.out}/lib:${zlib.out}/lib:${ncurses.out}/lib "$file" + ## Patch 32-bit binaries + elif grep -q "ELF 32-bit" <<< "$type" then - patchelf --set-interpreter ${stdenv_32bit.cc.libc.out}/lib/ld-linux.so.2 "$file" + if grep -q "interpreter" <<< "$type" + then + patchelf --set-interpreter ${stdenv_32bit.cc.libc.out}/lib/ld-linux.so.2 "$file" + fi + patchelf --set-rpath ${stdenv_32bit.cc.cc.lib.out}/lib:${zlib_32bit.out}/lib:${ncurses_32bit.out}/lib "$file" fi - patchelf --set-rpath ${stdenv_32bit.cc.cc.lib.out}/lib:${zlib_32bit.out}/lib:${ncurses_32bit.out}/lib "$file" - fi - done - ''} + done + ''} - patchShebangs . - ''; + patchShebangs . + ''; - buildInputs = [ unzip file ]; -} + buildInputs = [ unzip file ]; + }; +in + lib.mapAttrs buildBuildTools buildToolsSources diff --git a/pkgs/development/mobile/androidenv/default.nix b/pkgs/development/mobile/androidenv/default.nix index 1f61be9440b..9058da1c50a 100644 --- a/pkgs/development/mobile/androidenv/default.nix +++ b/pkgs/development/mobile/androidenv/default.nix @@ -1,5 +1,5 @@ { buildPackages, pkgs, pkgs_i686, targetPackages -, includeSources ? true +, includeSources ? true, licenseAccepted ? false }: # TODO: use callPackage instead of import to avoid so many inherits @@ -9,8 +9,19 @@ rec { inherit buildPackages pkgs; }; + buildToolsSources = let + system = pkgs.stdenv.hostPlatform.system; + path = if (system == "i686-linux" || system == "x86_64-linux") + then ./build-tools-srcs-linux.nix + else if system == "x86_64-darwin" + then ./build-tools-srcs-macosx.nix + else throw "System: ${system} not supported!"; + in + import path { inherit (pkgs) fetchurl; }; + buildTools = import ./build-tools.nix { - inherit (pkgs) stdenv fetchurl unzip zlib file; + inherit (pkgs) stdenv lib fetchurl unzip zlib file coreutils; + inherit buildToolsSources; stdenv_32bit = pkgs_i686.stdenv; zlib_32bit = pkgs_i686.zlib; ncurses_32bit = pkgs_i686.ncurses5; @@ -57,7 +68,7 @@ rec { inherit platformTools buildTools support supportRepository platforms sysimages - addons sources includeSources; + addons sources includeSources licenseAccepted; stdenv_32bit = pkgs_i686.stdenv; }; @@ -222,7 +233,37 @@ rec { useInstantApps = true; }; - androidsdk_latest = androidsdk_8_0; + androidsdk_8_1 = androidsdk { + platformVersions = [ "27" ]; + abiVersions = [ "x86" "x86_64"]; + useGoogleAPIs = true; + }; + + androidsdk_8_1_extras = androidsdk { + platformVersions = [ "27" ]; + abiVersions = [ "x86" "x86_64"]; + useGoogleAPIs = true; + useExtraSupportLibs = true; + useGooglePlayServices = true; + useInstantApps = true; + }; + + androidsdk_9_0 = androidsdk { + platformVersions = [ "28" ]; + abiVersions = [ "x86" "x86_64"]; + useGoogleAPIs = true; + }; + + androidsdk_9_0_extras = androidsdk { + platformVersions = [ "28" ]; + abiVersions = [ "x86" "x86_64"]; + useGoogleAPIs = true; + useExtraSupportLibs = true; + useGooglePlayServices = true; + useInstantApps = true; + }; + + androidsdk_latest = androidsdk_9_0; androidndk_10e = pkgs.callPackage ./androidndk.nix { inherit (buildPackages) diff --git a/pkgs/development/mobile/androidenv/fetch.sh b/pkgs/development/mobile/androidenv/fetch.sh index 2edbe6bf489..ef15e8eaeda 100755 --- a/pkgs/development/mobile/androidenv/fetch.sh +++ b/pkgs/development/mobile/androidenv/fetch.sh @@ -1,8 +1,5 @@ #! /usr/bin/env nix-shell -#! nix-shell -i bash --pure -p androidsdk curl libxslt - -# this shows a list of available xmls -android list sdk | grep 'Parse XML:' | cut -f8- -d\ # | xargs -n 1 curl -O +#! nix-shell -i bash --pure -p curl libxslt # we skip the intel addons, as they are Windows+osX only # we skip the default sys-img (arm?) because it is empty @@ -14,3 +11,4 @@ curl -o sys-img.xml https://dl.google.com/android/repository/sys-img/andro ./generate-platforms.sh ./generate-sysimages.sh ./generate-sources.sh +./generate-tools.sh diff --git a/pkgs/development/mobile/androidenv/generate-tools.sh b/pkgs/development/mobile/androidenv/generate-tools.sh new file mode 100755 index 00000000000..5799894fd45 --- /dev/null +++ b/pkgs/development/mobile/androidenv/generate-tools.sh @@ -0,0 +1,4 @@ +#!/bin/sh -e + +xsltproc --stringparam os linux generate-tools.xsl repository-11.xml > build-tools-srcs-linux.nix +xsltproc --stringparam os macosx generate-tools.xsl repository-11.xml > build-tools-srcs-macosx.nix diff --git a/pkgs/development/mobile/androidenv/generate-tools.xsl b/pkgs/development/mobile/androidenv/generate-tools.xsl new file mode 100644 index 00000000000..814bad12988 --- /dev/null +++ b/pkgs/development/mobile/androidenv/generate-tools.xsl @@ -0,0 +1,43 @@ + + + + + + + + + + + + + + + https://dl.google.com/android/repository/ + + + + + + +# This file is generated from generate-tools.sh. DO NOT EDIT. +# Execute generate-tools.sh or fetch.sh to update the file. +{ fetchurl }: + +{ + + + + + + v___rc = { + version = "..-rc"; + src = fetchurl { + url = ; + sha1 = ""; + }; + }; + +} + + diff --git a/pkgs/development/mobile/androidenv/platforms-linux.nix b/pkgs/development/mobile/androidenv/platforms-linux.nix index e24a9c43160..dbb295f8cf5 100644 --- a/pkgs/development/mobile/androidenv/platforms-linux.nix +++ b/pkgs/development/mobile/androidenv/platforms-linux.nix @@ -316,4 +316,28 @@ in }; }; + platform_27 = buildPlatform { + name = "android-platform-8.1.0"; + src = fetchurl { + url = https://dl.google.com/android/repository/platform-27_r03.zip; + sha1 = "35f747e7e70b2d16e0e4246876be28d15ea1c353"; + }; + meta = { + description = "Android SDK Platform 27"; + homepage = http://developer.android.com/sdk/; + }; + }; + + platform_28 = buildPlatform { + name = "android-platform-9"; + src = fetchurl { + url = https://dl.google.com/android/repository/platform-28_r06.zip; + sha1 = "9a4e52b1d55bd2e24216b150aafae2503d3efba6"; + }; + meta = { + description = "Android SDK Platform 28"; + homepage = http://developer.android.com/sdk/; + }; + }; + } diff --git a/pkgs/development/mobile/androidenv/platforms-macosx.nix b/pkgs/development/mobile/androidenv/platforms-macosx.nix index 3775872514c..30ed94e516a 100644 --- a/pkgs/development/mobile/androidenv/platforms-macosx.nix +++ b/pkgs/development/mobile/androidenv/platforms-macosx.nix @@ -316,4 +316,28 @@ in }; }; + platform_27 = buildPlatform { + name = "android-platform-8.1.0"; + src = fetchurl { + url = https://dl.google.com/android/repository/platform-27_r03.zip; + sha1 = "35f747e7e70b2d16e0e4246876be28d15ea1c353"; + }; + meta = { + description = "Android SDK Platform 27"; + homepage = http://developer.android.com/sdk/; + }; + }; + + platform_28 = buildPlatform { + name = "android-platform-9"; + src = fetchurl { + url = https://dl.google.com/android/repository/platform-28_r06.zip; + sha1 = "9a4e52b1d55bd2e24216b150aafae2503d3efba6"; + }; + meta = { + description = "Android SDK Platform 28"; + homepage = http://developer.android.com/sdk/; + }; + }; + } diff --git a/pkgs/development/mobile/androidenv/repository-11.xml b/pkgs/development/mobile/androidenv/repository-11.xml index 3924d6ddd3b..45ad16be57b 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. --> - + Terms and Conditions This is the Android Software Development Kit License Agreement @@ -50,7 +50,7 @@ This is the Android Software Development Kit License Agreement 3.3 You agree that Google or third parties own all legal right, title and interest in and to the SDK, including any Intellectual Property Rights that subsist in the SDK. "Intellectual Property Rights" means any and all rights under patent law, copyright law, trade secret law, trademark law, and any and all other proprietary rights. Google reserves all rights not expressly granted to you. -3.4 You may not use the SDK for any purpose not expressly permitted by the License Agreement. Except to the extent required by applicable third party licenses, you may not: (a) copy (except for backup purposes), modify, adapt, redistribute, decompile, reverse engineer, disassemble, or create derivative works of the SDK or any part of the SDK; or (b) load any part of the SDK onto a mobile handset or any other hardware device except a personal computer, combine any part of the SDK with other software, or distribute any software or device incorporating a part of the SDK. +3.4 You may not use the SDK for any purpose not expressly permitted by the License Agreement. Except to the extent required by applicable third party licenses, you may not copy (except for backup purposes), modify, adapt, redistribute, decompile, reverse engineer, disassemble, or create derivative works of the SDK or any part of the SDK. 3.5 Use, reproduction and distribution of components of the SDK licensed under an open source software license are governed solely by the terms of that open source software license and not the License Agreement. @@ -296,45 +296,93 @@ This is the Android SDK Preview License Agreement (the "License Agreement&q June 2014. - + NDK - 15 + 18 - - 960251267 - ea4b5d76475db84745aa8828000d009625fc1f98 - android-ndk-r15c-darwin-x86_64.zip + + 542911996 + 98cb9909aa8c2dab32db188bbdc3ac6207e09440 + android-ndk-r18b-darwin-x86_64.zip macosx 64 - - 974976754 - 0bf02d4e8b85fd770fd7b9b2cdec57f9441f27a2 - android-ndk-r15c-linux-x86_64.zip + + 557038702 + 500679655da3a86aecf67007e8ab230ea9b4dd7b + android-ndk-r18b-linux-x86_64.zip linux 64 - - 784778144 - f2e47121feb73ec34ced5e947cbf1adc6b56246e - android-ndk-r15c-windows-x86.zip + + 504605336 + 4b8b6a4edc0fa967b429c1d6d25adf69acc28803 + android-ndk-r18b-windows-x86.zip windows 32 - - 849733996 - 970bb2496de0eada74674bb1b06d79165f725696 - android-ndk-r15c-windows-x86_64.zip + + 522489470 + 6b6d4138aaaad7166679fdfa4780e177f95cee6f + android-ndk-r18b-windows-x86_64.zip windows 64 + + + 9 + 28 + Android SDK Platform 28 + 6 + + + + 75565084 + 9a4e52b1d55bd2e24216b150aafae2503d3efba6 + platform-28_r06.zip + + + + + 22 + + http://developer.android.com/sdk/ + + 15 + 1 + + + + + 8.1.0 + 27 + Android SDK Platform 27 + 3 + + + + 65635348 + 35f747e7e70b2d16e0e4246876be28d15ea1c353 + platform-27_r03.zip + + + + + 22 + + http://developer.android.com/sdk/ + + 15 + 1 + + 8.0.0 @@ -343,7 +391,7 @@ June 2014. 2 - + 63623734 e4ae5d7aa557a3c827135838ee400da8443ac4ef platform-26_r02.zip @@ -367,7 +415,7 @@ June 2014. 3 - + 85424763 00c2c5765e8988504be10a1eb66ed71fcdbd7fe8 platform-25_r03.zip @@ -391,7 +439,7 @@ June 2014. 2 - + 82648154 8912da3d4bfe7a9f28f0e5ce92d3a8dc96342aee platform-24_r02.zip @@ -415,7 +463,7 @@ June 2014. 3 - + 70433421 027fede3de6aa1649115bbd0bffff30ccd51c9a0 platform-23_r03.zip @@ -439,7 +487,7 @@ June 2014. 2 - + 66852371 5d1bd10fea962b216a0dece1247070164760a9fc android-22_r02.zip @@ -463,7 +511,7 @@ June 2014. 2 - + 65897960 53536556059bb29ae82f414fd2e14bc335a4eb4c android-21_r02.zip @@ -487,7 +535,7 @@ June 2014. 2 - + 63567784 a9251f8a3f313ab05834a07a963000927637e01d android-20_r02.zip @@ -511,7 +559,7 @@ June 2014. 4 - + 63871092 2ff20d89e68f2f5390981342e009db5a2d456aaa android-19_r04.zip @@ -535,7 +583,7 @@ June 2014. 3 - + 57771739 e6b09b3505754cbbeb4a5622008b907262ee91cb android-18_r03.zip @@ -559,7 +607,7 @@ June 2014. 3 - + 57030216 dbe14101c06e6cdb34e300393e64e64f8c92168a android-17_r03.zip @@ -583,7 +631,7 @@ June 2014. 5 - + 48128695 12a5ce6235a76bc30f62c26bda1b680e336abd07 android-16_r05.zip @@ -607,7 +655,7 @@ June 2014. 5 - + 44533475 69ab4c443b37184b2883af1fd38cc20cbeffd0f3 android-15_r05.zip @@ -631,7 +679,7 @@ June 2014. 4 - + 46038082 d4f1d8fbca25225b5f0e7a0adf0d39c3d6e60b3c android-14_r04.zip @@ -652,7 +700,7 @@ June 2014. 1 - + 108426536 6189a500a8c44ae73a439604363de93591163cd9 android-3.2_r01.zip @@ -675,7 +723,7 @@ June 2014. 3 - + 106472351 4a50a6679cd95bb68bb5fc032e754cd7c5e2b1bf android-3.1_r03.zip @@ -698,7 +746,7 @@ June 2014. 2 - + 104513908 2c7d4bd13f276e76f6bbd87315fe27aba351dd37 android-3.0_r02.zip @@ -721,7 +769,7 @@ June 2014. 2 - + 85470907 887e37783ec32f541ea33c2c649dda648e8e6fb3 android-2.3.3_r02.zip @@ -744,7 +792,7 @@ June 2014. 2 - + 78732563 209f8a7a8b2cb093fce858b8b55fed3ba5206773 android-2.3.1_r02.zip @@ -767,7 +815,7 @@ June 2014. 3 - + 74652366 231262c63eefdff8fd0386e9ccfefeb27a8f9202 android-2.2_r03.zip @@ -790,7 +838,7 @@ June 2014. 3 - + 70142829 5ce51b023ac19f8738500b1007a1da5de2349a1e android-2.1_r03.zip @@ -814,21 +862,21 @@ June 2014. 1 - + 79192618 ce2c971dce352aa28af06bda92a070116aa5ae1a android-2.0.1_r01-linux.zip linux - + 79035527 c3096f80d75a6fc8cb38ef8a18aec920e53d42c0 android-2.0.1_r01-macosx.zip macosx - + 80385601 255781ebe4509d9707d0e77edda2815e2bc216e6 android-2.0.1_r01-windows.zip @@ -853,21 +901,21 @@ June 2014. 1 - + 75095268 be9be6a99ca32875c96ec7f91160ca9fce7e3c7d android-2.0_r01-linux.zip linux - + 74956356 2a866d0870dbba18e0503cd41e5fae988a21b314 android-2.0_r01-macosx.zip macosx - + 76288040 aeb623217ff88b87216d6eb7dbc846ed53f68f57 android-2.0_r01-windows.zip @@ -892,21 +940,21 @@ June 2014. 3 - + 63454485 483ed088e45bbdf3444baaf9250c8b02e5383cb0 android-1.6_r03-linux.zip linux - + 62418496 bdafad44f5df9f127979bdb21a1fdd87ee3cd625 android-1.6_r03-macosx.zip macosx - + 64654625 ce0b5e4ffaf12ca4fd07c2da71a8a1ab4a03dc22 android-1.6_r03-windows.zip @@ -931,21 +979,21 @@ June 2014. 4 - + 53348669 5c134b7df5f4b8bd5b61ba93bdaebada8fa3468c android-1.5_r04-linux.zip linux - + 52440607 d3a67c2369afa48b6c3c7624de5031c262018d1e android-1.5_r04-macosx.zip macosx - + 54624370 5bb106d2e40d481edd337b0833093843e15fe49a android-1.5_r04-windows.zip @@ -970,21 +1018,21 @@ June 2014. 1 - + 45476658 c054d25c9b4c6251fa49c2f9c54336998679d3fe android-1.1_r1-linux.zip linux - + 45584305 e21dbcff45b7356657449ebb3c7e941be2bb5ebe android-1.1_r1-macosx.zip macosx - + 46828615 a4060f29ed39fc929c302836d488998c53c3002e android-1.1_r1-windows.zip @@ -1000,13 +1048,55 @@ June 2014. 4 + + + 28 + 1 + + + + 42552241 + 5610e0c24235ee3fa343c899ddd551be30315255 + sources-28_r01.zip + + + + + + + 27 + 1 + + + + 36997618 + 7b714670561d08f54751af42aca929867b806596 + sources-27_r01.zip + + + + + + + 26 + 1 + + + + 35138547 + 2af701ee3223d580409288540b1d06932fd8f9b9 + sources-26_r01.zip + + + + 25 1 - + 30822685 bbc72efd1a9bad87cc507e308f0d29aad438c52c sources-25_r01.zip @@ -1020,7 +1110,7 @@ June 2014. 1 - + 30270410 6b96115830a83d654479f32ce4b724ca9011148b sources-24_r01.zip @@ -1034,7 +1124,7 @@ June 2014. 1 - + 31771965 b0f15da2762b42f543c5e364c2b15b198cc99cc2 sources-23_r01.zip @@ -1048,7 +1138,7 @@ June 2014. 1 - + 28861236 98320e13976d11597a4a730a8d203ac9a03ed5a6 sources-22_r01.zip @@ -1062,7 +1152,7 @@ June 2014. 1 - + 28274751 137a5044915d32bea297a8c1552684802bbc2e25 sources-21_r01.zip @@ -1076,7 +1166,7 @@ June 2014. 1 - + 23367603 8da3e40f2625f9f7ef38b7e403f49f67226c0d76 sources-20_r01.zip @@ -1090,7 +1180,7 @@ June 2014. 2 - + 21819439 433a1d043ef77561571250e94cb7a0ef24a202e7 sources-19_r02.zip @@ -1104,7 +1194,7 @@ June 2014. 1 - + 20226735 8b49fdf7433f4881a2bfb559b5dd05d8ec65fb78 sources-18_r01.zip @@ -1118,7 +1208,7 @@ June 2014. 1 - + 18976816 6f1f18cd2d2b1852d7f6892df9cee3823349d43a sources-17_r01.zip @@ -1132,7 +1222,7 @@ June 2014. 2 - + 17876720 0f83c14ed333c45d962279ab5d6bc98a0269ef84 sources-16_r02.zip @@ -1146,7 +1236,7 @@ June 2014. 2 - + 16468746 e5992a5747c9590783fbbdd700337bf0c9f6b1fa sources-15_r02.zip @@ -1161,7 +1251,7 @@ June 2014. 1 - + 16152383 eaf4ed7dcac46e68516a1b4aa5b0d9e5a39a7555 sources-14_r01.zip @@ -1169,6 +1259,392 @@ June 2014. + + + + 28 + 0 + 3 + + + + + 57830695 + ea6f2f7103cd9da9ff0bdf6e37fbbba548fa4165 + build-tools_r28.0.3-linux.zip + linux + + + + 57133581 + f8c333a2991b1ab05a671bc6248b78e00edcd83a + build-tools_r28.0.3-macosx.zip + macosx + + + + 58393729 + 05bd35bb48d11c848da2b393c6f864eb609aacba + build-tools_r28.0.3-windows.zip + windows + + + + + + + + 28 + 0 + 2 + + + + + 57754663 + b4492209810a3fd48deaa982f9852fef12433d55 + build-tools_r28.0.2-linux.zip + linux + + + + 57057554 + c10dd5a7825578622fb362a8a34f76eb3ba0c0a9 + build-tools_r28.0.2-macosx.zip + macosx + + + + 58317692 + e9c570c568a0c2a32e88ee3204279019ebefd949 + build-tools_r28.0.2-windows.zip + windows + + + + + + + + 28 + 0 + 1 + + + + + 57610954 + ee70dfa1fccb58b37cebc9544830511f36a137a0 + build-tools_r28.0.1-linux.zip + linux + + + + 56913869 + aeef42ad953f1630dd6f5d71eefdc0b825211462 + build-tools_r28.0.1-macosx.zip + macosx + + + + 58173989 + 29c6342835734be25b9e458ab3fad5750ad6a355 + build-tools_r28.0.1-windows.zip + windows + + + + + + + + 28 + 0 + 0 + + + + + 37157769 + d9f8a754d833ccd334f56fcc6089c5925cd82abb + build-tools_r28-linux.zip + linux + + + + 36458977 + 72088d32d1d82cc3c2cf7cf6618b6130c0c84ade + build-tools_r28-macosx.zip + macosx + + + + 37718995 + d4b0638a877ed570e07876264e69fdbd86409610 + build-tools_r28-windows.zip + windows + + + + + + + + 28 + 0 + 0 + 2 + + + + + 37151124 + efe9c0dde0646a07544c864276390ca6e96b24dc + build-tools_r28-rc2-linux.zip + linux + + + + 36449480 + 0d0314b353589feb10e528b44c5a685b6658d797 + build-tools_r28-rc2-macosx.zip + macosx + + + + 37716459 + a94bfb52b4ec74b95c116236c3e382e923cad6c4 + build-tools_r28-rc2-windows.zip + windows + + + + + + + + 28 + 0 + 0 + 1 + + + + + 38703535 + 1601977fae25fd478bcfaa0481ca5ea3c609d840 + build-tools_r28-rc1-linux.zip + linux + + + + 38004795 + 2c77821967a2330b7b227072d0b1c02ef19fe2fc + build-tools_r28-rc1-macosx.zip + macosx + + + + 39273232 + fbf46c33d1268f6532911707b2a05033fd5c5b41 + build-tools_r28-rc1-windows.zip + windows + + + + + + + + 27 + 0 + 3 + + + + + 54478554 + d85e7a6320eddffe7eeace3437605079dac938ca + build-tools_r27.0.3-linux.zip + linux + + + + 53867966 + 61d9fb18790c68d66ff73bf1e7ad56bc1f1eef2d + build-tools_r27.0.3-macosx.zip + macosx + + + + 55194255 + 0df61e11713a2838d2cc9a911219dddf5e6a2749 + build-tools_r27.0.3-windows.zip + windows + + + + + + + + 27 + 0 + 2 + + + + + 54458153 + b687ddf6be84f11607871138aad32cf857d0b837 + build-tools_r27.0.2-linux.zip + linux + + + + 53846615 + 6d5d9cf2a47877f273f4b742b19e712a051a31be + build-tools_r27.0.2-macosx.zip + macosx + + + + 55173070 + b80466c13b75e3ebf3c546964f40775db5898b2a + build-tools_r27.0.2-windows.zip + windows + + + + + + + + 27 + 0 + 1 + + + + + 54450260 + 7f4eedb1077ef948b848040dcd15de9e8a759f4a + build-tools_r27.0.1-linux.zip + linux + + + + 53838762 + 1edd07bfdbadd95652d093040e16d858f7489594 + build-tools_r27.0.1-macosx.zip + macosx + + + + 55171114 + 18109db020c6d088d0157d1df201d31bc6970875 + build-tools_r27.0.1-windows.zip + windows + + + + + + + + 27 + 0 + 0 + + + + + 54441725 + 28542332ba97cf4a08c3eddfcf5edd70e3cf1260 + build-tools_r27-linux.zip + linux + + + + 53831513 + fb4e8d7e6b8d29a77090e34024077a80458d5ae1 + build-tools_r27-macosx.zip + macosx + + + + 55163097 + 4f1df22a6d99261d2160d624b81445da0a027dbe + build-tools_r27-windows.zip + windows + + + + + + + + 26 + 0 + 3 + + + + + 54449983 + 8a2e6c1bcd845844523a68aa17e5442f0dce328c + build-tools_r26.0.3-linux.zip + linux + + + + 53839758 + 5bb90ed935d99e5bc90686f43b852e68c5ad40df + build-tools_r26.0.3-macosx.zip + macosx + + + + 55170919 + 460e511a9616b4661cc8dba0102d9d990ae60160 + build-tools_r26.0.3-windows.zip + windows + + + + + + + + 26 + 0 + 2 + + + + + 54440678 + 5b2b7b66c7bf2151f2af183b5b50a17808850592 + build-tools_r26.0.2-linux.zip + linux + + + + 53830573 + d9ed7c7f149ce38be5dc08979aea8acec1459ca0 + build-tools_r26.0.2-macosx.zip + macosx + + + + 55161474 + 39ca02d3faa49859cd9d1bc0adc2f331017b699b + build-tools_r26.0.2-windows.zip + windows + + + + @@ -1178,21 +1654,21 @@ June 2014. - + 54113329 5378c2c78091b414d0eac40a6bd37f2faa31a365 build-tools_r26.0.1-linux.zip linux - + 53266653 cbde59de198916b390777dd0227921bfa2120832 build-tools_r26.0.1-macosx.zip macosx - + 54936185 02494c80ffbe65bfff0aaa7463c9692693327b7d build-tools_r26.0.1-windows.zip @@ -1210,21 +1686,21 @@ June 2014. - + 53854197 1cbe72929876f8a872ab1f1b1040a9f720261f59 build-tools_r26-linux.zip linux - + 53010814 d01a1aeca03747245f1f5936b3cb01759c66d086 build-tools_r26-macosx.zip macosx - + 54681641 896ebd31117c09db220f7a3116cc0e5121c78b9d build-tools_r26-windows.zip @@ -1243,21 +1719,21 @@ June 2014. - + 53847560 629bbd8d2e415bf64871fb0b4c0540fd6d0347a0 build-tools_r26-rc2-linux.zip linux - + 53003874 cb1eb738a1f7003025af267a9b8cc2d259533c70 build-tools_r26-rc2-macosx.zip macosx - + 54678375 ddaba77db0557a98f6330fbd579ad0bd12cbb152 build-tools_r26-rc2-windows.zip @@ -1276,21 +1752,21 @@ June 2014. - + 53648603 8cd6388dc96db2d7a49d06159cf990d3bbc78d04 build-tools_r26-rc1-linux.zip linux - + 52821129 5c5a1de7d5f4f000d36ae349229fe0be846d6137 build-tools_r26-rc1-macosx.zip macosx - + 54379108 43c2ddad3b67a5c33712ae14331a60673e69be91 build-tools_r26-rc1-windows.zip @@ -1308,21 +1784,21 @@ June 2014. - + 50757258 db95f3a0ae376534d4d69f4cdb6fad20649f3509 build-tools_r25.0.3-linux.zip linux - + 50545085 160d2fefb5ce68e443427fc30a793a703b63e26e build-tools_r25.0.3-macosx.zip macosx - + 51337442 1edcb109ae5133aebfed573cf0bc84e0c353c28d build-tools_r25.0.3-windows.zip @@ -1340,21 +1816,21 @@ June 2014. - + 49880329 ff953c0177e317618fda40516f3e9d95fd43c7ae build-tools_r25.0.2-linux.zip linux - + 49667185 12a5204bb3b6e39437535469fde7ddf42da46b16 build-tools_r25.0.2-macosx.zip macosx - + 50458908 2fee3c0704d6ecc480570450d8b8069b2c4a2dd4 build-tools_r25.0.2-windows.zip @@ -1372,21 +1848,21 @@ June 2014. - + 49880178 ff063d252ab750d339f5947d06ff782836f22bac build-tools_r25.0.1-linux.zip linux - + 49667353 7bf7f22d7d48ef20b6ab0e3d7a2912e5c088340f build-tools_r25.0.1-macosx.zip macosx - + 50458759 c6c61393565ccf46349e7f44511e5db7c1c6169d build-tools_r25.0.1-windows.zip @@ -1404,21 +1880,21 @@ June 2014. - + 49872921 f2bbda60403e75cabd0f238598c3b4dfca56ea44 build-tools_r25-linux.zip linux - + 49659466 273c5c29a65cbed00e44f3aa470bbd7dce556606 build-tools_r25-macosx.zip macosx - + 50451378 f9258f2308ff8b62cfc4513d40cb961612d07b6a build-tools_r25-windows.zip @@ -1436,21 +1912,21 @@ June 2014. - + 49779151 9e8cc49d66e03fa1a8ecc1ac3e58f1324f5da304 build-tools_r24.0.3-linux.zip linux - + 49568967 a01c15f1b105c34595681075e1895d58b3fff48c build-tools_r24.0.3-macosx.zip macosx - + 50354788 8b960d693fd4163caeb8dc5f5f5f80b10987089c build-tools_r24.0.3-windows.zip @@ -1468,21 +1944,21 @@ June 2014. - + 48936295 f199a7a788c3fefbed102eea34d6007737b803cf build-tools_r24.0.2-linux.zip linux - + 48726190 8bb8fc575477491d5957de743089df412de55cda build-tools_r24.0.2-macosx.zip macosx - + 49512513 09586a1f1c39bcfa7db5205c9a07837247deb67e build-tools_r24.0.2-windows.zip @@ -1500,21 +1976,21 @@ June 2014. - + 48936286 84f18c392919a074fcbb9b1d967984e6b2fef8b4 build-tools_r24.0.1-linux.zip linux - + 48726085 5c6457fcdfa07724fb086d8ff4e8316fc0742848 build-tools_r24.0.1-macosx.zip macosx - + 49511883 ac4a7cea42c3ef74d7fbf1b992fad311c550034e build-tools_r24.0.1-windows.zip @@ -1532,21 +2008,21 @@ June 2014. - + 48960919 c6271c4d78a5612ea6c7150688bcd5b7313de8d1 build-tools_r24-linux.zip linux - + 48747930 97fc4ed442f23989cc488d02c1d1de9bdde241de build-tools_r24-macosx.zip macosx - + 49535326 dc61b9e5b451a0c3ec42ae2b1ce27c4d3c8da9f7 build-tools_r24-windows.zip @@ -1564,21 +2040,21 @@ June 2014. - + 39071201 8a9f2b37f6fcf7a9fa784dc21aeaeb41bbb9f2c3 build-tools_r23.0.2-linux.zip linux - + 38060914 482c4cbceef8ff58aefd92d8155a38610158fdaf build-tools_r23.0.2-macosx.zip macosx - + 38217626 fc3a92c744d3ba0a16ccb5d2b41eea5974ce0a96 build-tools_r23.0.2-windows.zip @@ -1596,21 +2072,21 @@ June 2014. - + 40733174 368f2600feac7e9b511b82f53d1f2240ae4a91a3 build-tools_r23.0.3-linux.zip linux - + 39679533 fbc98cd303fd15a31d472de6c03bd707829f00b0 build-tools_r23.0.3-macosx.zip macosx - + 39869945 c6d8266c6a3243c8f1e41b786c0e3cee4c781263 build-tools_r23.0.3-windows.zip @@ -1628,21 +2104,21 @@ June 2014. - + 39069295 b6ba7c399d5fa487d95289d8832e4ad943aed556 build-tools_r23.0.1-linux.zip linux - + 38059328 d96ec1522721e9a179ae2c591c99f75d31d39718 build-tools_r23.0.1-macosx.zip macosx - + 38558889 cc1d37231d228f7a6f130e1f8d8c940052f0f8ab build-tools_r23.0.1-windows.zip @@ -1661,21 +2137,21 @@ June 2014. - + 39080519 c1d6209212b01469f80fa804e0c1d39a06bc9060 build-tools_r23-linux.zip linux - + 38070540 90ba6e716f7703a236cd44b2e71c5ff430855a03 build-tools_r23-macosx.zip macosx - + 38570715 3874948f35f2f8946597679cc6e9151449f23b5d build-tools_r23-windows.zip @@ -1693,21 +2169,21 @@ June 2014. - + 33104577 da8b9c5c3ede39298e6cf0283c000c2ee9029646 build-tools_r22.0.1-linux.zip linux - + 33646102 53dad7f608e01d53b17176ba11165acbfccc5bbf build-tools_r22.0.1-macosx.zip macosx - + 33254137 61d8cbe069d9e0a57872a83e5e5abe164b7d52cf build-tools_r22.0.1-windows.zip @@ -1726,21 +2202,21 @@ June 2014. - + 33104280 a8a1619dd090e44fac957bce6842e62abf87965b build-tools_r22-linux.zip linux - + 33646090 af95429b24088d704bc5db9bd606e34ac1b82c0d build-tools_r22-macosx.zip macosx - + 33254114 08fcca41e81b172bd9f570963b90d3a84929e043 build-tools_r22-windows.zip @@ -1758,21 +2234,21 @@ June 2014. - + 32637678 5e35259843bf2926113a38368b08458735479658 build-tools_r21.1.2-linux.zip linux - + 33152878 e7c906b4ba0eea93b32ba36c610dbd6b204bff48 build-tools_r21.1.2-macosx.zip macosx - + 32792587 1d944759c47f60e634d2b8a1f3a4259be2f8d652 build-tools_r21.1.2-windows.zip @@ -1791,21 +2267,21 @@ June 2014. - + 32642454 1c712ee3a1ba5a8b0548f9c32f17d4a0ddfd727d build-tools_r21.1.1-linux.zip linux - + 33157676 836a146eab0504aa9387a5132e986fe7c7381571 build-tools_r21.1.1-macosx.zip macosx - + 32797356 53fc4201237f899d5cd92f0b76ad41fb89da188b build-tools_r21.1.1-windows.zip @@ -1824,21 +2300,21 @@ June 2014. - + 32642820 b7455e543784d52a8925f960bc880493ed1478cb build-tools_r21.1-linux.zip linux - + 33158159 df619356c2359aa5eacdd48699d15b335d9bd246 build-tools_r21.1-macosx.zip macosx - + 32797810 c79d63ac6b713a1e326ad4dae43f2ee76708a2f4 build-tools_r21.1-windows.zip @@ -1857,21 +2333,21 @@ June 2014. - + 22153122 e1236ab8897b62b57414adcf04c132567b2612a5 build-tools_r21.0.2-linux.zip linux - + 22668597 f17471c154058f3734729ef3cc363399b1cd3de1 build-tools_r21.0.2-macosx.zip macosx - + 22306371 37496141b23cbe633167927b7abe6e22d9f1a1c1 build-tools_r21.0.2-windows.zip @@ -1890,21 +2366,21 @@ June 2014. - + 22153013 e573069eea3e5255e7a65bedeb767f4fd0a5f49a build-tools_r21.0.1-linux.zip linux - + 22668616 b60c8f9b810c980abafa04896706f3911be1ade7 build-tools_r21.0.1-macosx.zip macosx - + 22306243 d68e7e6fd7a48c8759aa41d713c9d4f0e4c1c1df build-tools_r21.0.1-windows.zip @@ -1923,21 +2399,21 @@ June 2014. - + 22153145 4933328fdeecbd554a29528f254f4993468e1cf4 build-tools_r21-linux.zip linux - + 22668456 9bef7989b51436bd4e5114d8a0330359f077cbfa build-tools_r21-macosx.zip macosx - + 22306371 5bc8fd399bc0135a9bc91eec78ddc5af4f54bf32 build-tools_r21-windows.zip @@ -1955,21 +2431,21 @@ June 2014. - + 21445463 b688905526a5584d1327a662d871a635ff502758 build-tools_r20-linux.zip linux - + 21650508 1240f629411c108a714c4ddd756937c7fab93f83 build-tools_r20-macosx.zip macosx - + 20828006 cf20720e452b642d5eb59dabe05c0c729b36ec75 build-tools_r20-windows.zip @@ -1987,21 +2463,21 @@ June 2014. - + 21490972 1ff20ac15fa47a75d00346ec12f180d531b3ca89 build-tools_r19.1-linux.zip linux - + 21590160 0d11aae3417de1efb4b9a0e0a7855904a61bcec1 build-tools_r19.1-macosx.zip macosx - + 20812533 13b367fbdbff8132cb4356f716e8dc8a8df745c5 build-tools_r19.1-windows.zip @@ -2020,21 +2496,21 @@ June 2014. - + 21462150 c2d6055478e9d2d4fba476ee85f99181ddd1160c build-tools_r19.0.3-linux.zip linux - + 21563992 651cf8754373b2d52e7f6aab2c52eabffe4e9ea4 build-tools_r19.0.3-macosx.zip macosx - + 20730715 cb46b433b67a0a6910ff00db84be8b527ea3102f build-tools_r19.0.3-windows.zip @@ -2053,21 +2529,21 @@ June 2014. - + 21352552 a03a6bdea0091aea32e1b35b90a7294c9f04e3dd build-tools_r19.0.2-linux.zip linux - + 21453726 145bc43065d45f756d99d87329d899052b9a9288 build-tools_r19.0.2-macosx.zip macosx - + 20621117 af664672d0d709c9ae30937b1062317d3ade7f95 build-tools_r19.0.2-windows.zip @@ -2086,21 +2562,21 @@ June 2014. - + 21229048 18d2312dc4368858914213087f4e61445aca4517 build-tools_r19.0.1-linux.zip linux - + 21450597 efaf50fb19a3edb8d03efbff76f89a249ad2920b build-tools_r19.0.1-macosx.zip macosx - + 20500648 5ef422bac5b28f4ced108319ed4a6bc7050a6234 build-tools_r19.0.1-windows.zip @@ -2119,21 +2595,21 @@ June 2014. - + 21339943 55c1a6cf632e7d346f0002b275ec41fd3137fd83 build-tools_r19-linux.zip linux - + 21441270 86ec1c12db1bc446b7bcaefc5cc14eb361044e90 build-tools_r19-macosx.zip macosx - + 20611447 6edf505c20f5ece9c48fa0aff9a90488f9654d52 build-tools_r19-windows.zip @@ -2152,21 +2628,21 @@ June 2014. - + 20229760 68c9acbfc0cec2d51b19efaed39831a17055d998 build-tools_r18.1.1-linux.zip linux - + 20452157 a9d9d37f6ddf859e57abc78802a77aaa166e48d4 build-tools_r18.1.1-macosx.zip macosx - + 19660000 c4605066e2f851387ea70bc1442b1968bd7b4a15 build-tools_r18.1.1-windows.zip @@ -2185,21 +2661,21 @@ June 2014. - + 20229298 f314a0599e51397f0886fe888b50dd98f2f050d8 build-tools_r18.1-linux.zip linux - + 20451524 16ddb299b8b43063e5bb3387ec17147c5053dfd8 build-tools_r18.1-macosx.zip macosx - + 19659547 3a9810fc8559ab03c09378f07531e8cae2f1db30 build-tools_r18.1-windows.zip @@ -2218,21 +2694,21 @@ June 2014. - + 16627330 f11618492b0d2270c332325d45d752d3656a9640 build-tools_r18.0.1-linux.zip linux - + 16633121 d84f5692fb44d60fc53e5b2507cebf9f24626902 build-tools_r18.0.1-macosx.zip macosx - + 15413527 a6c2afd0b6289d589351956d2f5212b37014ca7d build-tools_r18.0.1-windows.zip @@ -2251,21 +2727,21 @@ June 2014. - + 11696007 2c2872bc3806aabf16a12e3959c2183ddc866e6d build-tools_r17-linux.zip linux - + 12208114 602ee709be9dbb8f179b1e4075148a57f9419930 build-tools_r17-macosx.zip macosx - + 11004914 899897d327b0bad492d3a40d3db4d96119c15bc0 build-tools_r17-windows.zip @@ -2275,32 +2751,32 @@ June 2014. - + - 26 + 28 0 - 0 + 1 - - 7771750 - e75b6137dc444f777eb02f44a6d9819b3aabff82 - platform-tools_r26.0.0-darwin.zip + + 6848749 + ed1edad4a48c27655ce98d0a5821e7296e9de145 + platform-tools_r28.0.1-darwin.zip macosx - - 7859155 - 00de8a6631405b617c10f68cd11ff2e1cd528e23 - platform-tools_r26.0.0-linux.zip + + 6843966 + 74ff83bc203f01c4f04bd9316ab5a2573f023fd1 + platform-tools_r28.0.1-linux.zip linux - - 7511554 - a4128ebc3d1b6372d981810920e3fa01637f891a - platform-tools_r26.0.0-windows.zip + + 6183783 + 5a44d10d41725aa718c71b6e44bc2dea6f1a7f49 + platform-tools_r28.0.1-windows.zip windows @@ -2315,21 +2791,21 @@ June 2014. - + 277894900 72df3aa1988c0a9003ccdfd7a13a7b8bd0f47fc1 tools_r25.2.5-linux.zip linux - + 200529982 d2168d963ac5b616e3d3ddaf21511d084baf3659 tools_r25.2.5-macosx.zip macosx - + 306785944 a7f7ebeae1c8d8f62d3a8466e9c81baee7cc31ca tools_r25.2.5-windows.zip @@ -2347,7 +2823,7 @@ June 2014. 1 - + 419477967 eef58238949ee9544876cb3e002f2d58e4ee7b5d docs-24_r01.zip diff --git a/pkgs/development/mobile/androidenv/sources.nix b/pkgs/development/mobile/androidenv/sources.nix index e4fe3cf0ff5..cca132e2774 100644 --- a/pkgs/development/mobile/androidenv/sources.nix +++ b/pkgs/development/mobile/androidenv/sources.nix @@ -148,4 +148,37 @@ in }; }; + source_26 = buildSource { + name = "android-source-26"; + src = fetchurl { + url = https://dl.google.com/android/repository/sources-26_r01.zip; + sha1 = "2af701ee3223d580409288540b1d06932fd8f9b9"; + }; + meta = { + description = "Source code for Android API 26"; + }; + }; + + source_27 = buildSource { + name = "android-source-27"; + src = fetchurl { + url = https://dl.google.com/android/repository/sources-27_r01.zip; + sha1 = "7b714670561d08f54751af42aca929867b806596"; + }; + meta = { + description = "Source code for Android API 27"; + }; + }; + + source_28 = buildSource { + name = "android-source-28"; + src = fetchurl { + url = https://dl.google.com/android/repository/sources-28_r01.zip; + sha1 = "5610e0c24235ee3fa343c899ddd551be30315255"; + }; + meta = { + description = "Source code for Android API 28"; + }; + }; + } diff --git a/pkgs/development/mobile/androidenv/sys-img.xml b/pkgs/development/mobile/androidenv/sys-img.xml index 2a720918c23..d7c8dd9de9b 100644 --- a/pkgs/development/mobile/androidenv/sys-img.xml +++ b/pkgs/development/mobile/androidenv/sys-img.xml @@ -1,6 +1,6 @@ - + Terms and Conditions This is the Android Software Development Kit License Agreement @@ -35,7 +35,7 @@ This is the Android Software Development Kit License Agreement 3.3 You agree that Google or third parties own all legal right, title and interest in and to the SDK, including any Intellectual Property Rights that subsist in the SDK. "Intellectual Property Rights" means any and all rights under patent law, copyright law, trade secret law, trademark law, and any and all other proprietary rights. Google reserves all rights not expressly granted to you. -3.4 You may not use the SDK for any purpose not expressly permitted by the License Agreement. Except to the extent required by applicable third party licenses, you may not: (a) copy (except for backup purposes), modify, adapt, redistribute, decompile, reverse engineer, disassemble, or create derivative works of the SDK or any part of the SDK; or (b) load any part of the SDK onto a mobile handset or any other hardware device except a personal computer, combine any part of the SDK with other software, or distribute any software or device incorporating a part of the SDK. +3.4 You may not use the SDK for any purpose not expressly permitted by the License Agreement. Except to the extent required by applicable third party licenses, you may not copy (except for backup purposes), modify, adapt, redistribute, decompile, reverse engineer, disassemble, or create derivative works of the SDK or any part of the SDK. 3.5 Use, reproduction and distribution of components of the SDK licensed under an open source software license are governed solely by the terms of that open source software license and not the License Agreement. @@ -411,7 +411,7 @@ ANY PRE-RELEASE MATERIALS ARE NON-QUALIFIED AND, AS SUCH, ARE PROVIDED “AS IS 4 - + 67918042 54680383118eb5c95a11e1cc2a14aa572c86ee69 armv7-10_r04.zip @@ -428,7 +428,7 @@ ANY PRE-RELEASE MATERIALS ARE NON-QUALIFIED AND, AS SUCH, ARE PROVIDED “AS IS 2 - + 99621822 d8991b0c06b18d7d6ed4169d67460ee1add6661b sysimg_armv7a-14_r02.zip @@ -445,7 +445,7 @@ ANY PRE-RELEASE MATERIALS ARE NON-QUALIFIED AND, AS SUCH, ARE PROVIDED “AS IS 4 - + 102079727 363223bd62f5afc0b2bd760b54ce9d26b31eacf1 armeabi-v7a-15_r04.zip @@ -462,7 +462,7 @@ ANY PRE-RELEASE MATERIALS ARE NON-QUALIFIED AND, AS SUCH, ARE PROVIDED “AS IS 4 - + 112608076 39c093ea755098f0ee79f607be7df9e54ba4943f sysimg_armv7a-16_r04.zip @@ -479,7 +479,7 @@ ANY PRE-RELEASE MATERIALS ARE NON-QUALIFIED AND, AS SUCH, ARE PROVIDED “AS IS 5 - + 124238679 7460e8110f4a87f9644f1bdb5511a66872d50fd9 armeabi-v7a-17_r05.zip @@ -496,7 +496,7 @@ ANY PRE-RELEASE MATERIALS ARE NON-QUALIFIED AND, AS SUCH, ARE PROVIDED “AS IS 4 - + 130394401 0bf34ecf4ddd53f6b1b7fe7dfa12f2887c17e642 armeabi-v7a-18_r04.zip @@ -513,7 +513,7 @@ ANY PRE-RELEASE MATERIALS ARE NON-QUALIFIED AND, AS SUCH, ARE PROVIDED “AS IS 5 - + 159871567 d1a5fd4f2e1c013c3d3d9bfe7e9db908c3ed56fa armeabi-v7a-19_r05.zip @@ -530,7 +530,7 @@ ANY PRE-RELEASE MATERIALS ARE NON-QUALIFIED AND, AS SUCH, ARE PROVIDED “AS IS 4 - + 187163871 8c606f81306564b65e41303d2603e4c42ded0d10 armeabi-v7a-21_r04.zip @@ -547,7 +547,7 @@ ANY PRE-RELEASE MATERIALS ARE NON-QUALIFIED AND, AS SUCH, ARE PROVIDED “AS IS 2 - + 194596267 2114ec015dbf3a16cbcb4f63e8a84a1b206a07a1 armeabi-v7a-22_r02.zip @@ -564,7 +564,7 @@ ANY PRE-RELEASE MATERIALS ARE NON-QUALIFIED AND, AS SUCH, ARE PROVIDED “AS IS 6 - + 238333358 7cf2ad756e54a3acfd81064b63cb0cb9dff2798d armeabi-v7a-23_r06.zip @@ -582,7 +582,7 @@ ANY PRE-RELEASE MATERIALS ARE NON-QUALIFIED AND, AS SUCH, ARE PROVIDED “AS IS 7 - + 283677512 3454546b4eed2d6c3dd06d47757d6da9f4176033 armeabi-v7a-24_r07.zip @@ -599,7 +599,7 @@ ANY PRE-RELEASE MATERIALS ARE NON-QUALIFIED AND, AS SUCH, ARE PROVIDED “AS IS 7 - + 384556503 e8ab2e49e4efe4b064232b33b5eeaded61437d7f arm64-v8a-24_r07.zip @@ -609,23 +609,6 @@ ANY PRE-RELEASE MATERIALS ARE NON-QUALIFIED AND, AS SUCH, ARE PROVIDED “AS IS arm64-v8a default - - - 15 - MIPS System Image - 1 - - - - 117503178 - a753bb4a6783124dad726c500ce9aec9d2c1b2d9 - sysimg_mips-15_r01.zip - - - - mips - default - 16 @@ -633,7 +616,7 @@ ANY PRE-RELEASE MATERIALS ARE NON-QUALIFIED AND, AS SUCH, ARE PROVIDED “AS IS 1 - + 122482530 67943c54fb3943943ffeb05fdd39c0b753681f6e sysimg_mips-16_r04.zip @@ -650,7 +633,7 @@ ANY PRE-RELEASE MATERIALS ARE NON-QUALIFIED AND, AS SUCH, ARE PROVIDED “AS IS 1 - + 131781761 f0c6e153bd584c29e51b5c9723cfbf30f996a05d sysimg_mips-17_r01.zip @@ -667,7 +650,7 @@ ANY PRE-RELEASE MATERIALS ARE NON-QUALIFIED AND, AS SUCH, ARE PROVIDED “AS IS 4 - + 75382637 655ffc5cc89dd45a3aca154b254009016e473aeb x86-10_r04.zip @@ -684,7 +667,7 @@ ANY PRE-RELEASE MATERIALS ARE NON-QUALIFIED AND, AS SUCH, ARE PROVIDED “AS IS 4 - + 115324561 e45c728b64881c0e86529a8f7ea9c103a3cd14c1 x86-15_r04.zip @@ -695,16 +678,16 @@ ANY PRE-RELEASE MATERIALS ARE NON-QUALIFIED AND, AS SUCH, ARE PROVIDED “AS IS default - + 16 Intel x86 Atom System Image - 5 + 6 - - 134339698 - 7ea16da3a8fdb880b1b290190fcc1bde2821c1e0 - x86-16_r05.zip + + 134926152 + bf1bf8c5591346118d2235da1ad20e7be8a3e9cd + x86-16_r06.zip @@ -712,16 +695,16 @@ ANY PRE-RELEASE MATERIALS ARE NON-QUALIFIED AND, AS SUCH, ARE PROVIDED “AS IS default - + 17 Intel x86 Atom System Image - 3 + 4 - - 142951842 - eb30274460ff0d61f3ed37862b567811bebd8270 - x86-17_r03.zip + + 143278662 + 03c6d022ab2dcbbcf655d78ba5ccb0431cadcaec + x86-17_r04.zip @@ -735,7 +718,7 @@ ANY PRE-RELEASE MATERIALS ARE NON-QUALIFIED AND, AS SUCH, ARE PROVIDED “AS IS 3 - + 149657535 03a0cb23465c3de15215934a1dbc9715b56e9458 x86-18_r03.zip @@ -752,7 +735,7 @@ ANY PRE-RELEASE MATERIALS ARE NON-QUALIFIED AND, AS SUCH, ARE PROVIDED “AS IS 6 - + 185886274 2ac82153aae97f7eae4c5a0761224fe04321d03d x86-19_r06.zip @@ -769,7 +752,7 @@ ANY PRE-RELEASE MATERIALS ARE NON-QUALIFIED AND, AS SUCH, ARE PROVIDED “AS IS 5 - + 208212529 00f0eb0a1003efe3316347f762e20a85d8749cff x86-21_r05.zip @@ -786,7 +769,7 @@ ANY PRE-RELEASE MATERIALS ARE NON-QUALIFIED AND, AS SUCH, ARE PROVIDED “AS IS 6 - + 214268954 e33e2a6cc3f1cc56b2019dbef3917d2eeb26f54e x86-22_r06.zip @@ -803,7 +786,7 @@ ANY PRE-RELEASE MATERIALS ARE NON-QUALIFIED AND, AS SUCH, ARE PROVIDED “AS IS 10 - + 260804863 f6c3e3dd7bd951454795aa75c3a145fd05ac25bb x86-23_r10.zip @@ -820,7 +803,7 @@ ANY PRE-RELEASE MATERIALS ARE NON-QUALIFIED AND, AS SUCH, ARE PROVIDED “AS IS 8 - + 313489224 c1cae7634b0216c0b5990f2c144eb8ca948e3511 x86-24_r08.zip @@ -830,6 +813,77 @@ ANY PRE-RELEASE MATERIALS ARE NON-QUALIFIED AND, AS SUCH, ARE PROVIDED “AS IS x86 default + + + 25 + Intel x86 Atom System Image + 1 + + + + 316695942 + 78ce7eb1387d598685633b9f7cbb300c3d3aeb5f + x86-25_r01.zip + + + + x86 + default + + + + 26 + Intel x86 Atom System Image + 1 + + + + 350195807 + e613d6e0da668e30daf547f3c6627a6352846f90 + x86-26_r01.zip + + + + x86 + default + Default Android System Image + + + + 27 + Intel x86 Atom System Image + 1 + + + + 360984187 + 4ec990fac7b62958decd12e18a4cd389dfe7c582 + x86-27_r01.zip + + + + x86 + default + Default Android System Image + + + + 28 + Intel x86 Atom System Image + 4 + + + + 437320152 + ce03c42d80c0fc6dc47f6455dbee7aa275d02780 + x86-28_r04.zip + + + + x86 + default + Default Android System Image + 21 @@ -837,7 +891,7 @@ ANY PRE-RELEASE MATERIALS ARE NON-QUALIFIED AND, AS SUCH, ARE PROVIDED “AS IS 5 - + 292623982 9078a095825a69e5e215713f0866c83cef65a342 x86_64-21_r05.zip @@ -854,7 +908,7 @@ ANY PRE-RELEASE MATERIALS ARE NON-QUALIFIED AND, AS SUCH, ARE PROVIDED “AS IS 6 - + 299976630 5db3b27f78cd9c4c5092b1cad5a5dd479fb5b2e4 x86_64-22_r06.zip @@ -871,7 +925,7 @@ ANY PRE-RELEASE MATERIALS ARE NON-QUALIFIED AND, AS SUCH, ARE PROVIDED “AS IS 10 - + 365009313 7cbc291483ca07dc67b71268c5f08a5755f50f51 x86_64-23_r10.zip @@ -888,7 +942,7 @@ ANY PRE-RELEASE MATERIALS ARE NON-QUALIFIED AND, AS SUCH, ARE PROVIDED “AS IS 8 - + 419261998 f6559e1949a5879f31a9662f4f0e50ad60181684 x86_64-24_r08.zip @@ -898,4 +952,75 @@ ANY PRE-RELEASE MATERIALS ARE NON-QUALIFIED AND, AS SUCH, ARE PROVIDED “AS IS x86_64 default + + + 25 + Intel x86 Atom_64 System Image + 1 + + + + 422702097 + 7093d7b39216020226ff430a3b7b81c94d31ad37 + x86_64-25_r01.zip + + + + x86_64 + default + + + + 26 + Intel x86 Atom_64 System Image + 1 + + + + 474178332 + 432f149c048bffce7f9de526ec65b336daf7a0a3 + x86_64-26_r01.zip + + + + x86_64 + default + Default Android System Image + + + + 27 + Intel x86 Atom_64 System Image + 1 + + + + 491675204 + 2878261011a59ca3de29dc5b457a495fdb268d60 + x86_64-27_r01.zip + + + + x86_64 + default + Default Android System Image + + + + 28 + Intel x86 Atom_64 System Image + 4 + + + + 564792723 + d47a85c8f4e9fd57df97814ad8884eeb0f3a0ef0 + x86_64-28_r04.zip + + + + x86_64 + default + Default Android System Image + diff --git a/pkgs/development/mobile/androidenv/sysimages.nix b/pkgs/development/mobile/androidenv/sysimages.nix index c5d075d6307..0ad09a02556 100644 --- a/pkgs/development/mobile/androidenv/sysimages.nix +++ b/pkgs/development/mobile/androidenv/sysimages.nix @@ -47,14 +47,6 @@ in }; }; - sysimg_mips_15 = buildSystemImage { - name = "sysimg-mips-15"; - src = fetchurl { - url = https://dl.google.com/android/repository/sys-img/android/sysimg_mips-15_r01.zip; - sha1 = "a753bb4a6783124dad726c500ce9aec9d2c1b2d9"; - }; - }; - sysimg_x86_15 = buildSystemImage { name = "sysimg-x86-15"; src = fetchurl { @@ -82,8 +74,8 @@ in sysimg_x86_16 = buildSystemImage { name = "sysimg-x86-16"; src = fetchurl { - url = https://dl.google.com/android/repository/sys-img/android/x86-16_r05.zip; - sha1 = "7ea16da3a8fdb880b1b290190fcc1bde2821c1e0"; + url = https://dl.google.com/android/repository/sys-img/android/x86-16_r06.zip; + sha1 = "bf1bf8c5591346118d2235da1ad20e7be8a3e9cd"; }; }; @@ -106,8 +98,8 @@ in sysimg_x86_17 = buildSystemImage { name = "sysimg-x86-17"; src = fetchurl { - url = https://dl.google.com/android/repository/sys-img/android/x86-17_r03.zip; - sha1 = "eb30274460ff0d61f3ed37862b567811bebd8270"; + url = https://dl.google.com/android/repository/sys-img/android/x86-17_r04.zip; + sha1 = "03c6d022ab2dcbbcf655d78ba5ccb0431cadcaec"; }; }; @@ -250,17 +242,64 @@ in sysimg_x86_25 = buildSystemImage { name = "sysimg-x86-25"; src = fetchurl { - url = https://dl.google.com/android/repository/sys-img/android/x86-25_r03.zip; - sha1 = "7dd19cfee4e43a1f60e0f5f058404d92d9544b33"; + url = https://dl.google.com/android/repository/sys-img/android/x86-25_r01.zip; + sha1 = "78ce7eb1387d598685633b9f7cbb300c3d3aeb5f"; }; }; sysimg_x86_64_25 = buildSystemImage { name = "sysimg-x86_64-25"; src = fetchurl { - url = https://dl.google.com/android/repository/sys-img/android/x86_64-25_r03.zip; - sha1 = "4593ee04811df21c339f3374fc5917843db06f8d"; + url = https://dl.google.com/android/repository/sys-img/android/x86_64-25_r01.zip; + sha1 = "7093d7b39216020226ff430a3b7b81c94d31ad37"; + }; + }; + + sysimg_x86_26 = buildSystemImage { + name = "sysimg-x86-26"; + src = fetchurl { + url = https://dl.google.com/android/repository/sys-img/android/x86-26_r01.zip; + sha1 = "e613d6e0da668e30daf547f3c6627a6352846f90"; + }; + }; + + sysimg_x86_64_26 = buildSystemImage { + name = "sysimg-x86_64-26"; + src = fetchurl { + url = https://dl.google.com/android/repository/sys-img/android/x86_64-26_r01.zip; + sha1 = "432f149c048bffce7f9de526ec65b336daf7a0a3"; + }; + }; + + sysimg_x86_27 = buildSystemImage { + name = "sysimg-x86-27"; + src = fetchurl { + url = https://dl.google.com/android/repository/sys-img/android/x86-27_r01.zip; + sha1 = "4ec990fac7b62958decd12e18a4cd389dfe7c582"; + }; + }; + + sysimg_x86_64_27 = buildSystemImage { + name = "sysimg-x86_64-27"; + src = fetchurl { + url = https://dl.google.com/android/repository/sys-img/android/x86_64-27_r01.zip; + sha1 = "2878261011a59ca3de29dc5b457a495fdb268d60"; + }; + }; + + sysimg_x86_28 = buildSystemImage { + name = "sysimg-x86-28"; + src = fetchurl { + url = https://dl.google.com/android/repository/sys-img/android/x86-28_r04.zip; + sha1 = "ce03c42d80c0fc6dc47f6455dbee7aa275d02780"; + }; + }; + + sysimg_x86_64_28 = buildSystemImage { + name = "sysimg-x86_64-28"; + src = fetchurl { + url = https://dl.google.com/android/repository/sys-img/android/x86_64-28_r04.zip; + sha1 = "d47a85c8f4e9fd57df97814ad8884eeb0f3a0ef0"; }; }; } - diff --git a/pkgs/development/python-modules/atomman/default.nix b/pkgs/development/python-modules/atomman/default.nix new file mode 100644 index 00000000000..ce4408b8441 --- /dev/null +++ b/pkgs/development/python-modules/atomman/default.nix @@ -0,0 +1,40 @@ +{ stdenv +, buildPythonPackage +, fetchPypi +, xmltodict +, datamodeldict +, numpy +, matplotlib +, scipy +, pandas +, cython +, numericalunits +, pytest +}: + +buildPythonPackage rec { + version = "1.2.3"; + pname = "atomman"; + + src = fetchPypi { + inherit pname version; + sha256 = "9eb6acc5497263cfa89be8d0f383a9a69f0726b4ac6798c1b1d96f26705ec09c"; + }; + + checkInputs = [ pytest ]; + propagatedBuildInputs = [ xmltodict datamodeldict numpy matplotlib scipy pandas cython numericalunits ]; + + # tests not included with Pypi release + doCheck = false; + + checkPhase = '' + py.test tests + ''; + + meta = with stdenv.lib; { + homepage = https://github.com/usnistgov/atomman/; + description = "Atomistic Manipulation Toolkit"; + license = licenses.mit; + maintainers = [ maintainers.costrouc ]; + }; +} diff --git a/pkgs/development/python-modules/beancount/default.nix b/pkgs/development/python-modules/beancount/default.nix index 1a005d9e42d..e023c721b0e 100644 --- a/pkgs/development/python-modules/beancount/default.nix +++ b/pkgs/development/python-modules/beancount/default.nix @@ -1,7 +1,7 @@ { stdenv, buildPythonPackage, fetchPypi, isPy3k , beautifulsoup4, bottle, chardet, dateutil , google_api_python_client, lxml, ply, python_magic -, nose, requests }: +, pytest, requests }: buildPythonPackage rec { version = "2.1.3"; @@ -14,13 +14,8 @@ buildPythonPackage rec { sha256 = "4b7b0d3633c82ca88d3cb3d31ad2fd2e45a42401cfa94eaa1cb938ffece34f22"; }; - checkInputs = [ nose ]; - - # Automatic tests cannot be run because it needs to import some local modules for tests. + # No tests in archive doCheck = false; - checkPhase = '' - nosetests - ''; propagatedBuildInputs = [ beautifulsoup4 @@ -32,6 +27,9 @@ buildPythonPackage rec { ply python_magic requests + # pytest really is a runtime dependency + # https://bitbucket.org/blais/beancount/commits/554e13057551951e113835196770847c788dd592 + pytest ]; meta = { diff --git a/pkgs/development/python-modules/coilmq/default.nix b/pkgs/development/python-modules/coilmq/default.nix index 11d39e411ce..90eb1edc2cd 100644 --- a/pkgs/development/python-modules/coilmq/default.nix +++ b/pkgs/development/python-modules/coilmq/default.nix @@ -1,5 +1,5 @@ { stdenv, buildPythonPackage, fetchPypi -, stompclient, pythondaemon, redis, pid, pytest, six, click, coverage +, stompclient, python-daemon, redis, pid, pytest, six, click, coverage , sqlalchemy }: buildPythonPackage rec { @@ -11,7 +11,7 @@ buildPythonPackage rec { sha256 = "4cbfeb5ed2459df14902c1380157be6267702b1271682924cd316ccad8a29d1d"; }; - propagatedBuildInputs = [ stompclient pythondaemon redis pid ]; + propagatedBuildInputs = [ stompclient python-daemon redis pid ]; buildInputs = [ pytest six click coverage sqlalchemy ]; # The teste data is not included in the distribution diff --git a/pkgs/development/python-modules/datamodeldict/default.nix b/pkgs/development/python-modules/datamodeldict/default.nix new file mode 100644 index 00000000000..9aac803ccae --- /dev/null +++ b/pkgs/development/python-modules/datamodeldict/default.nix @@ -0,0 +1,27 @@ +{ stdenv +, buildPythonPackage +, fetchPypi +, xmltodict +}: + +buildPythonPackage rec { + version = "0.9.4"; + pname = "DataModelDict"; + + src = fetchPypi { + inherit pname version; + sha256 = "97d8e999e000cf69c48e57b1a72eb45a27d83576a38c6cd8550c230b018be7af"; + }; + + propagatedBuildInputs = [ xmltodict ]; + + # no tests + doCheck = false; + + meta = with stdenv.lib; { + homepage = https://github.com/usnistgov/DataModelDict/; + description = "Class allowing for data models equivalently represented as Python dictionaries, JSON, and XML"; + license = licenses.mit; + maintainers = [ maintainers.costrouc ]; + }; +} diff --git a/pkgs/development/python-modules/gplaycli/default.nix b/pkgs/development/python-modules/gplaycli/default.nix index 0a882693408..0c7fa8db01c 100644 --- a/pkgs/development/python-modules/gplaycli/default.nix +++ b/pkgs/development/python-modules/gplaycli/default.nix @@ -4,18 +4,18 @@ buildPythonPackage rec { pname = "gplaycli"; - version = "3.21"; + version = "3.25"; src = fetchFromGitHub { owner = "matlink"; repo = "gplaycli"; rev = version; - sha256 = "1r5nzi9yzswam0866gypjcvv3f1rw13jwx9s49chp8byxy1dyrs2"; + sha256 = "1rygx5cg4b1vwpkiaq6jcpbc1ly7cspslv3sy7x8n8ba61ryq6h4"; }; - disabled = !isPy3k; + disabled = !isPy3k; - propagatedBuildInputs = [ libffi pyasn1 clint ndg-httpsclient protobuf requests args gpapi pyaxmlparser ]; + propagatedBuildInputs = [ libffi pyasn1 clint ndg-httpsclient protobuf requests args gpapi pyaxmlparser ]; meta = with stdenv.lib; { homepage = https://github.com/matlink/gplaycli; diff --git a/pkgs/development/python-modules/libagent/default.nix b/pkgs/development/python-modules/libagent/default.nix index f70d538bb8d..f9395886040 100644 --- a/pkgs/development/python-modules/libagent/default.nix +++ b/pkgs/development/python-modules/libagent/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchPypi, buildPythonPackage, ed25519, ecdsa , semver, mnemonic, unidecode, mock, pytest , backports-shutil-which, ConfigArgParse, - pythondaemon, pymsgbox }: + python-daemon, pymsgbox }: buildPythonPackage rec { pname = "libagent"; @@ -12,7 +12,7 @@ buildPythonPackage rec { }; propagatedBuildInputs = [ unidecode backports-shutil-which ConfigArgParse - pythondaemon pymsgbox ecdsa ed25519 mnemonic semver ]; + python-daemon pymsgbox ecdsa ed25519 mnemonic semver ]; checkInputs = [ mock pytest ]; diff --git a/pkgs/development/python-modules/nbxmpp/default.nix b/pkgs/development/python-modules/nbxmpp/default.nix index 696796740f8..888e1de6aa5 100644 --- a/pkgs/development/python-modules/nbxmpp/default.nix +++ b/pkgs/development/python-modules/nbxmpp/default.nix @@ -2,7 +2,7 @@ let pname = "nbxmpp"; - version = "0.6.6"; + version = "0.6.8"; name = "${pname}-${version}"; in buildPythonPackage rec { inherit pname version; @@ -11,7 +11,7 @@ in buildPythonPackage rec { name = "${name}.tar.bz2"; url = "https://dev.gajim.org/gajim/python-nbxmpp/repository/archive.tar.bz2?" + "ref=${name}"; - sha256 = "10n7z613p00q15dplsvdrz11s9yq26jy2qack6nd8k7fivfhlcmz"; + sha256 = "09zrqz01j45kvayfscd66avkrnn237lbjg9li5hjhyw92h6hkkc4"; }; propagatedBuildInputs = [ pyopenssl ]; diff --git a/pkgs/development/python-modules/numericalunits/default.nix b/pkgs/development/python-modules/numericalunits/default.nix new file mode 100644 index 00000000000..1212bf0039c --- /dev/null +++ b/pkgs/development/python-modules/numericalunits/default.nix @@ -0,0 +1,24 @@ +{ stdenv +, buildPythonPackage +, fetchPypi +}: + +buildPythonPackage rec { + version = "1.16"; + pname = "numericalunits"; + + src = fetchPypi { + inherit pname version; + sha256 = "71ae8e236c7a223bccefffb670dca68be476dd63b7b9009641fc64099455da25"; + }; + + # no tests + doCheck = false; + + meta = with stdenv.lib; { + homepage = http://pypi.python.org/pypi/numericalunits; + description = "A package that lets you define quantities with unit"; + license = licenses.mit; + maintainers = [ maintainers.costrouc ]; + }; +} diff --git a/pkgs/development/python-modules/pyzmq/default.nix b/pkgs/development/python-modules/pyzmq/default.nix index 31b08d0a9e0..71243ef6f76 100644 --- a/pkgs/development/python-modules/pyzmq/default.nix +++ b/pkgs/development/python-modules/pyzmq/default.nix @@ -2,7 +2,7 @@ , fetchPypi , pytest , tornado -, zeromq3 +, zeromq , py , python }: @@ -17,7 +17,7 @@ buildPythonPackage rec { }; checkInputs = [ pytest tornado ]; - buildInputs = [ zeromq3]; + buildInputs = [ zeromq ]; propagatedBuildInputs = [ py ]; # test_socket.py seems to be hanging diff --git a/pkgs/development/python-modules/salmon-mail/default.nix b/pkgs/development/python-modules/salmon-mail/default.nix index b278d26b5dd..9486899c606 100644 --- a/pkgs/development/python-modules/salmon-mail/default.nix +++ b/pkgs/development/python-modules/salmon-mail/default.nix @@ -1,5 +1,5 @@ { stdenv, buildPythonPackage, fetchPypi, nose, dnspython -, chardet, lmtpd, pythondaemon, six, jinja2, mock }: +, chardet, lmtpd, python-daemon, six, jinja2, mock }: buildPythonPackage rec { pname = "salmon-mail"; @@ -11,7 +11,7 @@ buildPythonPackage rec { }; checkInputs = [ nose jinja2 mock ]; - propagatedBuildInputs = [ chardet dnspython lmtpd pythondaemon six ]; + propagatedBuildInputs = [ chardet dnspython lmtpd python-daemon six ]; # The tests use salmon executable installed by salmon itself so we need to add # that to PATH diff --git a/pkgs/development/tools/apktool/default.nix b/pkgs/development/tools/apktool/default.nix index 42deae45a25..17b0265fddd 100644 --- a/pkgs/development/tools/apktool/default.nix +++ b/pkgs/development/tools/apktool/default.nix @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { mkdir -p "$out/bin" makeWrapper "${jre}/bin/java" "$out/bin/apktool" \ --add-flags "-jar $out/libexec/apktool/apktool.jar" \ - --prefix PATH : "${buildTools}/build-tools/25.0.1/" + --prefix PATH : "${buildTools.v25_0_1}/build-tools/25.0.1/" ''; meta = with stdenv.lib; { diff --git a/pkgs/development/tools/cppclean/default.nix b/pkgs/development/tools/cppclean/default.nix new file mode 100644 index 00000000000..96fe07a7799 --- /dev/null +++ b/pkgs/development/tools/cppclean/default.nix @@ -0,0 +1,31 @@ +{ stdenv, lib, fetchFromGitHub, python3Packages }: + +with python3Packages; + +buildPythonApplication rec { + name = "cppclean-unstable-${version}"; + version = "2018-05-12"; + + src = fetchFromGitHub { + owner = "myint"; + repo = "cppclean"; + rev = "e7da41eca5e1fd2bd1dddd6655e50128bb96dc28"; + sha256 = "0pymh6r7y19bwcypfkmgwyixrx36pmz338jd83yrjflsbjlriqm4"; + }; + + postUnpack = '' + patchShebangs . + ''; + + checkPhase = '' + ./test.bash + ''; + + meta = with stdenv.lib; { + description = "Finds problems in C++ source that slow development of large code bases"; + homepage = https://github.com/myint/cppclean; + license = licenses.asl20; + maintainers = with maintainers; [ nthorne ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/development/tools/global-platform-pro/default.nix b/pkgs/development/tools/global-platform-pro/default.nix index ab32216de80..9841e7900cd 100644 --- a/pkgs/development/tools/global-platform-pro/default.nix +++ b/pkgs/development/tools/global-platform-pro/default.nix @@ -62,6 +62,7 @@ stdenv.mkDerivation rec { ''; homepage = https://github.com/martinpaljak/GlobalPlatformPro; license = with licenses; [ lgpl3 ]; + maintainers = with maintainers; [ ekleog ]; platforms = platforms.all; }; } diff --git a/pkgs/development/tools/misc/strace/default.nix b/pkgs/development/tools/misc/strace/default.nix index 33a46e16a3a..e2022156870 100644 --- a/pkgs/development/tools/misc/strace/default.nix +++ b/pkgs/development/tools/misc/strace/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "strace-${version}"; - version = "4.24"; + version = "4.25"; src = fetchurl { url = "https://strace.io/files/${version}/${name}.tar.xz"; - sha256 = "0d061cdzk6a1822ds4wpqxg10ny27mi4i9zjmnsbz8nz3vy5jkhz"; + sha256 = "00f7zagfh3np5gwi0z7hi7zjd7s5nixcaq7z78n87dvhakkgi1fn"; }; depsBuildBuild = [ buildPackages.stdenv.cc ]; diff --git a/pkgs/misc/vscode-extensions/cpptools/default.nix b/pkgs/misc/vscode-extensions/cpptools/default.nix index 55e126d64a5..539d03d66fe 100644 --- a/pkgs/misc/vscode-extensions/cpptools/default.nix +++ b/pkgs/misc/vscode-extensions/cpptools/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchzip, vscode-utils, jq, mono46, clang-tools, writeScript +{ stdenv, fetchzip, vscode-utils, jq, mono, clang-tools, writeScript , gdbUseFixed ? true, gdb # The gdb default setting will be fixed to specified. Use version from `PATH` otherwise. }: @@ -59,7 +59,7 @@ let export PATH=''${PATH}''${PATH:+:}${gdb}/bin '' else ""} - ${mono46}/bin/mono $BIN_DIR/bin/OpenDebugAD7.exe $* + ${mono}/bin/mono $BIN_DIR/bin/OpenDebugAD7.exe $* ''; in diff --git a/pkgs/tools/misc/youtube-dl/default.nix b/pkgs/tools/misc/youtube-dl/default.nix index 9de0f850d49..8c08ee65805 100644 --- a/pkgs/tools/misc/youtube-dl/default.nix +++ b/pkgs/tools/misc/youtube-dl/default.nix @@ -16,11 +16,14 @@ buildPythonPackage rec { pname = "youtube-dl"; - version = "2018.10.05"; + # The websites youtube-dl deals with are a very moving target. That means that + # downloads break constantly. Because of that, updates should always be backported + # to the latest stable release. + version = "2018.10.29"; src = fetchurl { url = "https://yt-dl.org/downloads/${version}/${pname}-${version}.tar.gz"; - sha256 = "1iq02kwxdgh07bf0w0fvbsjbdshs4kja35gy8m70ji9cj10l1mbw"; + sha256 = "1ndkkpnmjdyz5gjjmvaf18761lxa2c0kypicm9bpqpaj7sdr9s27"; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/pkgs/tools/typesetting/tex/texlive/combine.nix b/pkgs/tools/typesetting/tex/texlive/combine.nix index f76b71ced3c..ea292674819 100644 --- a/pkgs/tools/typesetting/tex/texlive/combine.nix +++ b/pkgs/tools/typesetting/tex/texlive/combine.nix @@ -218,8 +218,29 @@ in buildEnv { ln -sv "$(realpath $s)" "$out/bin/$tName" # wrapped below done ) + '' + + # A hacky way to provide repstopdf + # * Copy is done to have a correct "$0" so that epstopdf enables the restricted mode + # * ./bin/repstopdf needs to be a symlink to be processed by wrapBin + '' + if [[ -e ./bin/epstopdf ]]; then + cp $(realpath ./bin/epstopdf) ./share/texmf/scripts/repstopdf + ln -s "$out"/share/texmf/scripts/repstopdf ./bin/repstopdf + fi + '' + + # finish up the wrappers + '' rm "$out"/bin/*-sys wrapBin + '' + + # Perform a small test to verify that the restricted mode get enabled when + # needed (detected by checking if it disallows --gscmd) + '' + if [[ -e ./bin/epstopdf ]]; then + echo "Testing restricted mode for {,r}epstopdf" + ! (epstopdf --gscmd echo /dev/null 2>&1 || true) | grep forbidden + (repstopdf --gscmd echo /dev/null 2>&1 || true) | grep forbidden + fi '' + # TODO: a context trigger https://www.preining.info/blog/2015/06/debian-tex-live-2015-the-new-layout/ # http://wiki.contextgarden.net/ConTeXt_Standalone#Unix-like_platforms_.28Linux.2FMacOS_X.2FFreeBSD.2FSolaris.29 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 5689301d8be..9ceb1b7dc63 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -770,6 +770,7 @@ with pkgs; androidenv = callPackage ../development/mobile/androidenv { pkgs_i686 = pkgsi686Linux; + licenseAccepted = (config.android_sdk.accept_license or false); }; inherit (androidenv) androidndk; @@ -1029,10 +1030,10 @@ with pkgs; cue2pops = callPackage ../tools/cd-dvd/cue2pops { }; - cabal2nix = haskell.lib.overrideCabal haskellPackages.cabal2nix (drv: { + cabal2nix = haskell.lib.overrideCabal (haskell.lib.addOptparseApplicativeCompletionScripts "cabal2nix" haskellPackages.cabal2nix) (drv: { isLibrary = false; enableSharedExecutables = false; - executableToolDepends = [ makeWrapper ]; + executableToolDepends = (drv.executableToolDepends or []) ++ [ makeWrapper ]; postInstall = '' exe=$out/libexec/${drv.pname}-${drv.version}/${drv.pname} install -D $out/bin/${drv.pname} $exe @@ -1040,11 +1041,7 @@ with pkgs; makeWrapper $exe $out/bin/${drv.pname} \ --prefix PATH ":" "${nix}/bin" \ --prefix PATH ":" "${nix-prefetch-scripts}/bin" - mkdir -p $out/share/{bash-completion/completions,zsh/vendor-completions,fish/completions} - $exe --bash-completion-script $exe >$out/share/bash-completion/completions/${drv.pname} - $exe --zsh-completion-script $exe >$out/share/zsh/vendor-completions/_${drv.pname} - $exe --fish-completion-script $exe >$out/share/fish/completions/${drv.pname}.fish - ''; + '' + (drv.postInstall or ""); }); stack2nix = with haskell.lib; overrideCabal (justStaticExecutables haskellPackages.stack2nix) (drv: { @@ -1179,6 +1176,8 @@ with pkgs; coursier = callPackage ../development/tools/coursier {}; + cppclean = callPackage ../development/tools/cppclean {}; + cri-tools = callPackage ../tools/virtualization/cri-tools {}; crip = callPackage ../applications/audio/crip { }; @@ -4156,6 +4155,8 @@ with pkgs; modemmanager = callPackage ../tools/networking/modem-manager {}; + modem-manager-gui = callPackage ../applications/networking/modem-manager-gui {}; + modsecurity_standalone = callPackage ../tools/security/modsecurity { }; molly-guard = callPackage ../os-specific/linux/molly-guard { }; @@ -6187,6 +6188,8 @@ with pkgs; wol = callPackage ../tools/networking/wol { }; + wolf-shaper = callPackage ../applications/audio/wolf-shaper { }; + wring = nodePackages.wring; wrk = callPackage ../tools/networking/wrk { }; @@ -9542,6 +9545,8 @@ with pkgs; frog = self.languageMachines.frog; + fstrcmp = callPackage ../development/libraries/fstrcmp { }; + fstrm = callPackage ../development/libraries/fstrm { }; cfitsio = callPackage ../development/libraries/cfitsio { }; @@ -17153,6 +17158,8 @@ with pkgs; gxmessage = callPackage ../applications/misc/gxmessage { }; + gxplugins-lv2 = callPackage ../applications/audio/gxplugins-lv2 { }; + hackrf = callPackage ../applications/misc/hackrf { }; hakuneko = callPackage ../tools/misc/hakuneko { }; diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 88ee4131c20..cd4edf945f1 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -12484,7 +12484,8 @@ let export PERL_MB_OPT="--install_base=$out --prefix=$out" substituteInPlace Po4aBuilder.pm --replace "\$self->install_sets(\$self->installdirs)->{'bindoc'}" "'$out/share/man/man1'" ''; - buildPhase = "perl Build.PL --install_base=$out; ./Build build"; + + buildPhase = "perl Build.PL --install_base=$out --install_path=\"lib=$out/${perl.libPrefix}\"; ./Build build"; installPhase = "./Build install"; checkPhase = '' export SGML_CATALOG_FILES=${pkgs.docbook_sgml_dtd_41}/sgml/dtd/docbook-4.1/docbook.cat diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index b2cff4940c1..eb69c554de8 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -212,6 +212,8 @@ in { aws-adfs = callPackage ../development/python-modules/aws-adfs { }; + atomman = callPackage ../development/python-modules/atomman { }; + # packages defined elsewhere amazon_kclpy = callPackage ../development/python-modules/amazon_kclpy { }; @@ -284,6 +286,8 @@ in { btchip = callPackage ../development/python-modules/btchip { }; + datamodeldict = callPackage ../development/python-modules/datamodeldict { }; + dbf = callPackage ../development/python-modules/dbf { }; dbfread = callPackage ../development/python-modules/dbfread { }; @@ -428,6 +432,8 @@ in { nvchecker = callPackage ../development/python-modules/nvchecker { }; + numericalunits = callPackage ../development/python-modules/numericalunits { }; + oauthenticator = callPackage ../development/python-modules/oauthenticator { }; ordered-set = callPackage ../development/python-modules/ordered-set { }; @@ -6554,7 +6560,7 @@ in { }; in if isPy3k then py3 else py2; - pythondaemon = callPackage ../development/python-modules/python-daemon { }; + python-daemon = callPackage ../development/python-modules/python-daemon { }; sympy = callPackage ../development/python-modules/sympy { };