diff options
53 files changed, 1740 insertions, 1520 deletions
diff --git a/doc/package-notes.xml b/doc/package-notes.xml index 2d6c87c3d07..1fccfd5d329 100644 --- a/doc/package-notes.xml +++ b/doc/package-notes.xml @@ -713,7 +713,7 @@ the <literal>inotify.py</literal> script in weechat-scripts requires D-Bus or libnotify, and the <literal>fish.py</literal> script requires pycrypto. To use these scripts, use the <literal>python</literal> plugin's <literal>withPackages</literal> attribute: -<programlisting>weechat.override {configure = {availablePlugins, ...}: { +<programlisting>weechat.override { configure = {availablePlugins, ...}: { plugins = with availablePlugins; [ (python.withPackages (ps: with ps; [ pycrypto python-dbus ])) ]; @@ -721,5 +721,15 @@ plugin's <literal>withPackages</literal> attribute: } </programlisting> </para> +<para> +In order to also keep all default plugins installed, it is possible to use +the following method: +<programlisting>weechat.override { configure = { availablePlugins, ... }: { + plugins = builtins.attrValues (availablePlugins // { + python = availablePlugins.python.withPackages (ps: with ps; [ pycrypto python-dbus ]); + }); +}; } +</programlisting> +</para> </section> </chapter> diff --git a/nixos/lib/make-system-tarball.nix b/nixos/lib/make-system-tarball.nix index a2a0340a6bd..92539235be7 100644 --- a/nixos/lib/make-system-tarball.nix +++ b/nixos/lib/make-system-tarball.nix @@ -1,4 +1,4 @@ -{ stdenv, perl, xz, pathsFromGraph +{ stdenv, perl, pixz, pathsFromGraph , # The file name of the resulting tarball fileName ? "nixos-system-${stdenv.system}" @@ -21,14 +21,20 @@ # Extra tar arguments , extraArgs ? "" + # Command used for compression +, compressCommand ? "pixz" + # Extension for the compressed tarball +, compressionExtension ? ".xz" + # extra inputs, like the compressor to use +, extraInputs ? [ pixz ] }: stdenv.mkDerivation { name = "tarball"; builder = ./make-system-tarball.sh; - buildInputs = [perl xz]; + buildInputs = [ perl ] ++ extraInputs; - inherit fileName pathsFromGraph extraArgs extraCommands; + inherit fileName pathsFromGraph extraArgs extraCommands compressCommand; # !!! should use XML. sources = map (x: x.source) contents; @@ -41,4 +47,6 @@ stdenv.mkDerivation { # For obtaining the closure of `storeContents'. exportReferencesGraph = map (x: [("closure-" + baseNameOf x.object) x.object]) storeContents; + + extension = compressionExtension; } diff --git a/nixos/lib/make-system-tarball.sh b/nixos/lib/make-system-tarball.sh index 73a009d8488..1a52a284a25 100644 --- a/nixos/lib/make-system-tarball.sh +++ b/nixos/lib/make-system-tarball.sh @@ -1,5 +1,4 @@ source $stdenv/setup -set -x sources_=($sources) targets_=($targets) @@ -54,8 +53,8 @@ mkdir -p $out/tarball rm env-vars -tar --sort=name --mtime='@1' --owner=0 --group=0 --numeric-owner -cvJf $out/tarball/$fileName.tar.xz * $extraArgs +time tar --sort=name --mtime='@1' --owner=0 --group=0 --numeric-owner -c * $extraArgs | $compressCommand > $out/tarball/$fileName.tar${extension} mkdir -p $out/nix-support echo $system > $out/nix-support/system -echo "file system-tarball $out/tarball/$fileName.tar.xz" > $out/nix-support/hydra-build-products +echo "file system-tarball $out/tarball/$fileName.tar${extension}" > $out/nix-support/hydra-build-products diff --git a/nixos/modules/profiles/docker-container.nix b/nixos/modules/profiles/docker-container.nix index 433492b9613..7031d7d1d59 100644 --- a/nixos/modules/profiles/docker-container.nix +++ b/nixos/modules/profiles/docker-container.nix @@ -14,9 +14,7 @@ in { ]; # Create the tarball - system.build.tarball = import ../../lib/make-system-tarball.nix { - inherit (pkgs) stdenv perl xz pathsFromGraph; - + system.build.tarball = pkgs.callPackage ../../lib/make-system-tarball.nix { contents = []; extraArgs = "--owner=0"; diff --git a/nixos/modules/services/misc/nix-daemon.nix b/nixos/modules/services/misc/nix-daemon.nix index ea964fd68e4..f2d34560a71 100644 --- a/nixos/modules/services/misc/nix-daemon.nix +++ b/nixos/modules/services/misc/nix-daemon.nix @@ -439,17 +439,18 @@ in services.xserver.displayManager.hiddenUsers = map ({ name, ... }: name) nixbldUsers; + # FIXME: use systemd-tmpfiles to create Nix directories. system.activationScripts.nix = stringAfter [ "etc" "users" ] '' # Nix initialisation. - mkdir -m 0755 -p \ + install -m 0755 -d \ /nix/var/nix/gcroots \ /nix/var/nix/temproots \ /nix/var/nix/userpool \ /nix/var/nix/profiles \ /nix/var/nix/db \ /nix/var/log/nix/drvs - mkdir -m 1777 -p \ + install -m 1777 -d \ /nix/var/nix/gcroots/per-user \ /nix/var/nix/profiles/per-user \ /nix/var/nix/gcroots/tmp diff --git a/nixos/modules/services/networking/dhcpd.nix b/nixos/modules/services/networking/dhcpd.nix index 2eac6dfec5b..fd7e317eee9 100644 --- a/nixos/modules/services/networking/dhcpd.nix +++ b/nixos/modules/services/networking/dhcpd.nix @@ -36,6 +36,7 @@ let preStart = '' mkdir -m 755 -p ${cfg.stateDir} + chown dhcpd:nogroup ${cfg.stateDir} touch ${cfg.stateDir}/dhcpd.leases ''; diff --git a/nixos/modules/services/torrent/transmission.nix b/nixos/modules/services/torrent/transmission.nix index 4911a64c95d..1cf85af2a06 100644 --- a/nixos/modules/services/torrent/transmission.nix +++ b/nixos/modules/services/torrent/transmission.nix @@ -59,8 +59,8 @@ in time the service starts). String values must be quoted, integer and boolean values must not. - See https://trac.transmissionbt.com/wiki/EditConfigFiles for - documentation. + See https://github.com/transmission/transmission/wiki/Editing-Configuration-Files + for documentation. ''; }; diff --git a/nixos/modules/system/boot/stage-2-init.sh b/nixos/modules/system/boot/stage-2-init.sh index 9d2c580d62a..b83012dfda7 100644 --- a/nixos/modules/system/boot/stage-2-init.sh +++ b/nixos/modules/system/boot/stage-2-init.sh @@ -43,7 +43,7 @@ if [ ! -e /proc/1 ]; then local options="$3" local fsType="$4" - mkdir -m 0755 -p "$mountPoint" + install -m 0755 -d "$mountPoint" mount -n -t "$fsType" -o "$options" "$device" "$mountPoint" } source @earlyMountScript@ @@ -71,7 +71,7 @@ fi # Provide a /etc/mtab. -mkdir -m 0755 -p /etc +install -m 0755 -d /etc test -e /etc/fstab || touch /etc/fstab # to shut up mount rm -f /etc/mtab* # not that we care about stale locks ln -s /proc/mounts /etc/mtab @@ -79,8 +79,8 @@ ln -s /proc/mounts /etc/mtab # More special file systems, initialise required directories. [ -e /proc/bus/usb ] && mount -t usbfs usbfs /proc/bus/usb # UML doesn't have USB by default -mkdir -m 01777 -p /tmp -mkdir -m 0755 -p /var/{log,lib,db} /nix/var /etc/nixos/ \ +install -m 01777 -d /tmp +install -m 0755 -d /var/{log,lib,db} /nix/var /etc/nixos/ \ /run/lock /home /bin # for the /bin/sh symlink diff --git a/nixos/modules/tasks/network-interfaces.nix b/nixos/modules/tasks/network-interfaces.nix index a2d2eb1c311..14f9b956751 100644 --- a/nixos/modules/tasks/network-interfaces.nix +++ b/nixos/modules/tasks/network-interfaces.nix @@ -62,35 +62,6 @@ let then mapAttrsToList (n: v: v//{_iName=n;}) (filterAttrs (n: _: n==device) interfaces) ++ mapAttrsToList (n: v: v//{_iName=n;}) (filterAttrs (n: _: n!=device) interfaces) else mapAttrsToList (n: v: v // {_iName = n;}) interfaces; - # udev script that configures a physical wlan device and adds virtual interfaces - wlanDeviceUdevScript = device: interfaceList: pkgs.writeScript "wlan-${device}-udev-script" '' - #!${pkgs.runtimeShell} - - # Change the wireless phy device to a predictable name. - if [ -e "/sys/class/net/${device}/phy80211/name" ]; then - ${pkgs.iw}/bin/iw phy `${pkgs.coreutils}/bin/cat /sys/class/net/${device}/phy80211/name` set name ${device} || true - fi - - # Crate new, virtual interfaces and configure them at the same time - ${flip concatMapStrings (drop 1 interfaceList) (i: '' - ${pkgs.iw}/bin/iw dev ${device} interface add ${i._iName} type ${i.type} \ - ${optionalString (i.type == "mesh" && i.meshID != null) "mesh_id ${i.meshID}"} \ - ${optionalString (i.type == "monitor" && i.flags != null) "flags ${i.flags}"} \ - ${optionalString (i.type == "managed" && i.fourAddr != null) "4addr ${if i.fourAddr then "on" else "off"}"} \ - ${optionalString (i.mac != null) "addr ${i.mac}"} - '')} - - # Reconfigure and rename the default interface that already exists - ${flip concatMapStrings (take 1 interfaceList) (i: '' - ${pkgs.iw}/bin/iw dev ${device} set type ${i.type} - ${optionalString (i.type == "mesh" && i.meshID != null) "${pkgs.iw}/bin/iw dev ${device} set meshid ${i.meshID}"} - ${optionalString (i.type == "monitor" && i.flags != null) "${pkgs.iw}/bin/iw dev ${device} set monitor ${i.flags}"} - ${optionalString (i.type == "managed" && i.fourAddr != null) "${pkgs.iw}/bin/iw dev ${device} set 4addr ${if i.fourAddr then "on" else "off"}"} - ${optionalString (i.mac != null) "${pkgs.iproute}/bin/ip link set dev ${device} address ${i.mac}"} - ${optionalString (device != i._iName) "${pkgs.iproute}/bin/ip link set dev ${device} name ${i._iName}"} - '')} - ''; - # We must escape interfaces due to the systemd interpretation subsystemDevice = interface: "sys-subsystem-net-devices-${escapeSystemdPath interface}.device"; diff --git a/nixos/tests/openldap.nix b/nixos/tests/openldap.nix index 1bef867c57b..1eaf87a8eaa 100644 --- a/nixos/tests/openldap.nix +++ b/nixos/tests/openldap.nix @@ -1,5 +1,5 @@ import ./make-test.nix { - name = "dovecot"; + name = "openldap"; machine = { pkgs, ... }: { services.openldap = { diff --git a/pkgs/applications/misc/rofi/default.nix b/pkgs/applications/misc/rofi/default.nix index f291060a10f..7da721e9f37 100644 --- a/pkgs/applications/misc/rofi/default.nix +++ b/pkgs/applications/misc/rofi/default.nix @@ -5,10 +5,10 @@ stdenv.mkDerivation rec { version = "1.5.1"; - name = "rofi-${version}"; + name = "rofi-unwrapped-${version}"; src = fetchurl { - url = "https://github.com/DaveDavenport/rofi/releases/download/${version}/${name}.tar.gz"; + url = "https://github.com/DaveDavenport/rofi/releases/download/${version}/rofi-${version}.tar.gz"; sha256 = "1dc33zf33z38jcxb0lxpyd31waalpf6d4cd9z5f9m5qphdk1g679"; }; @@ -36,7 +36,7 @@ stdenv.mkDerivation rec { description = "Window switcher, run dialog and dmenu replacement"; homepage = https://davedavenport.github.io/rofi; license = licenses.mit; - maintainers = with maintainers; [ mbakke garbas ]; + maintainers = with maintainers; [ mbakke garbas ma27 ]; platforms = with platforms; unix; }; } diff --git a/pkgs/applications/misc/rofi/wrapper.nix b/pkgs/applications/misc/rofi/wrapper.nix new file mode 100644 index 00000000000..44c6f892bf5 --- /dev/null +++ b/pkgs/applications/misc/rofi/wrapper.nix @@ -0,0 +1,17 @@ +{ stdenv, rofi-unwrapped, makeWrapper, theme ? null, lib }: + +stdenv.mkDerivation { + name = "rofi-${rofi-unwrapped.version}"; + buildInputs = [ makeWrapper ]; + preferLocalBuild = true; + passthru = { unwrapped = rofi-unwrapped; }; + buildCommand = '' + mkdir -p $out/bin + ln -s ${rofi-unwrapped}/bin/rofi $out/bin/rofi + ${lib.optionalString (theme != null) ''wrapProgram $out/bin/rofi --add-flags "-theme ${theme}"''} + ''; + + meta = rofi-unwrapped.meta // { + priority = (rofi-unwrapped.meta.priority or 0) - 1; + }; +} diff --git a/pkgs/applications/networking/cluster/kubernetes/default.nix b/pkgs/applications/networking/cluster/kubernetes/default.nix index 7f03831ff1d..2b555435327 100644 --- a/pkgs/applications/networking/cluster/kubernetes/default.nix +++ b/pkgs/applications/networking/cluster/kubernetes/default.nix @@ -63,7 +63,7 @@ stdenv.mkDerivation rec { ''; installPhase = '' - mkdir -p "$out/bin" "$out/share/bash-completion/completions" "$man/share/man" "$pause/bin" + mkdir -p "$out/bin" "$out/share/bash-completion/completions" "$out/share/zsh/site-functions" "$man/share/man" "$pause/bin" cp _output/local/go/bin/* "$out/bin/" cp build/pause/pause "$pause/bin/pause" @@ -74,6 +74,7 @@ stdenv.mkDerivation rec { wrapProgram $out/bin/kube-addons --set "KUBECTL_BIN" "$out/bin/kubectl" $out/bin/kubectl completion bash > $out/share/bash-completion/completions/kubectl + $out/bin/kubectl completion zsh > $out/share/zsh/site-functions/_kubectl ''; preFixup = '' diff --git a/pkgs/applications/networking/irc/weechat/default.nix b/pkgs/applications/networking/irc/weechat/default.nix index cfed44c997a..b2ea28f0cf8 100644 --- a/pkgs/applications/networking/irc/weechat/default.nix +++ b/pkgs/applications/networking/irc/weechat/default.nix @@ -72,6 +72,11 @@ let meta = { homepage = http://www.weechat.org/; description = "A fast, light and extensible chat client"; + longDescription = '' + You can find more documentation as to how to customize this package + (eg. adding python modules for scripts that would require them, etc.) + on https://nixos.org/nixpkgs/manual/#sec-weechat . + ''; license = stdenv.lib.licenses.gpl3; maintainers = with stdenv.lib.maintainers; [ lovek323 garbas the-kenny lheckemann ]; platforms = stdenv.lib.platforms.unix; @@ -117,4 +122,7 @@ in if configure == null then weechat else export WEECHAT_EXTRA_LIBDIR=${pluginsDir} ${lib.concatMapStringsSep "\n" (p: lib.optionalString (p ? extraEnv) p.extraEnv) plugins} exec ${weechat}/bin/weechat "$@" - '') // { unwrapped = weechat; } + '') // { + unwrapped = weechat; + meta = weechat.meta; + } diff --git a/pkgs/data/fonts/tex-gyre-math/default.nix b/pkgs/data/fonts/tex-gyre-math/default.nix index e99e0bfb342..3f9726ee094 100644 --- a/pkgs/data/fonts/tex-gyre-math/default.nix +++ b/pkgs/data/fonts/tex-gyre-math/default.nix @@ -1,4 +1,4 @@ -{ variant, stdenv, fetchzip }: +{ stdenv, fetchzip }: let variants = { @@ -27,40 +27,43 @@ let outputHash = "0pa433cgshlypbyrrlp3qq0wg972rngcp37pr8pxdfshgz13q1mm"; }; }; - current = variants."${variant}"; - dotless_version = builtins.replaceStrings ["."] [""] current.version; -in stdenv.mkDerivation rec { - name = "tex-gyre-${variant}-math-${current.version}"; - version = "${current.version}"; - src = fetchzip { - url = "www.gust.org.pl/projects/e-foundry/tg-math/download/texgyre${variant}-math-${dotless_version}.zip"; - sha256 = current.sha256; - }; + mkVariant = variant: current: + let dotless_version = builtins.replaceStrings ["."] [""] current.version; in + stdenv.mkDerivation rec { + name = "tex-gyre-${variant}-math-${current.version}"; + version = "${current.version}"; - installPhase = '' - mkdir -p $out/share/fonts/opentype/ - mkdir -p $out/share/doc/${name}/ - cp -v opentype/*.otf $out/share/fonts/opentype/ - cp -v doc/*.txt $out/share/doc/${name}/ - ''; + src = fetchzip { + url = "www.gust.org.pl/projects/e-foundry/tg-math/download/texgyre${variant}-math-${dotless_version}.zip"; + sha256 = current.sha256; + }; - outputHashAlgo = "sha256"; - outputHashMode = "recursive"; - outputHash = current.outputHash; + installPhase = '' + mkdir -p $out/share/fonts/opentype/ + mkdir -p $out/share/doc/${name}/ + cp -v opentype/*.otf $out/share/fonts/opentype/ + cp -v doc/*.txt $out/share/doc/${name}/ + ''; - meta = with stdenv.lib; { - longDescription = '' - TeX Gyre ${current.displayName} Math is a math companion for the TeX Gyre - ${current.displayName} family of fonts (see - http://www.gust.org.pl/projects/e-foundry/tex-gyre/) in the OpenType format. - ''; - homepage = http://www.gust.org.pl/projects/e-foundry/tg-math; - # "The TeX Gyre Math fonts are licensed under the GUST Font License (GFL), - # which is a free license, legally equivalent to the LaTeX Project Public - # License (LPPL), version 1.3c or later." - GUST website - license = licenses.lppl13c; - maintainers = with maintainers; [ siddharthist ]; - platforms = platforms.all; - }; -} + outputHashAlgo = "sha256"; + outputHashMode = "recursive"; + outputHash = current.outputHash; + + meta = with stdenv.lib; { + longDescription = '' + TeX Gyre ${current.displayName} Math is a math companion for the TeX Gyre + ${current.displayName} family of fonts (see + http://www.gust.org.pl/projects/e-foundry/tex-gyre/) in the OpenType format. + ''; + homepage = http://www.gust.org.pl/projects/e-foundry/tg-math; + # "The TeX Gyre Math fonts are licensed under the GUST Font License (GFL), + # which is a free license, legally equivalent to the LaTeX Project Public + # License (LPPL), version 1.3c or later." - GUST website + license = licenses.lppl13c; + maintainers = with maintainers; [ siddharthist ]; + platforms = platforms.all; + }; + }; +in + stdenv.lib.mapAttrs mkVariant variants diff --git a/pkgs/desktops/lxqt/base/libqtxdg/default.nix b/pkgs/desktops/lxqt/base/libqtxdg/default.nix index 966566db7c8..7938e4fd9a1 100644 --- a/pkgs/desktops/lxqt/base/libqtxdg/default.nix +++ b/pkgs/desktops/lxqt/base/libqtxdg/default.nix @@ -16,7 +16,11 @@ stdenv.mkDerivation rec { buildInputs = [ qt5.qtbase qt5.qtsvg ]; preConfigure = '' - cmakeFlags+=" -DQTXDGX_ICONENGINEPLUGIN_INSTALL_PATH=$out/$qtPluginPrefix" + cmakeFlagsArray+=( + "-DQTXDGX_ICONENGINEPLUGIN_INSTALL_PATH=$out/$qtPluginPrefix" + "-DCMAKE_INSTALL_INCLUDEDIR=include" + "-DCMAKE_INSTALL_LIBDIR=lib" + ) ''; meta = with stdenv.lib; { diff --git a/pkgs/development/compilers/gambit/build.nix b/pkgs/development/compilers/gambit/build.nix new file mode 100644 index 00000000000..202e5525422 --- /dev/null +++ b/pkgs/development/compilers/gambit/build.nix @@ -0,0 +1,70 @@ +{ stdenv, git, openssl, autoconf, pkgs, makeStaticLibraries, version, git-version, SRC }: + +stdenv.mkDerivation rec { + name = "gambit-${version}"; + src = SRC; + + bootstrap = import ./bootstrap.nix ( pkgs ); + + # Use makeStaticLibraries to enable creation of statically linked binaries + buildInputs = [ git autoconf bootstrap openssl (makeStaticLibraries openssl)]; + + configurePhase = '' + options=( + --prefix=$out + --enable-single-host + --enable-c-opt=-O2 + --enable-gcc-opts + --enable-shared + --enable-absolute-shared-libs # Yes, NixOS will want an absolute path, and fix it. + --enable-poll + --enable-openssl + --enable-default-runtime-options="f8,-8,t8" # Default to UTF-8 for source and all I/O + #--enable-debug # Nope: enables plenty of good stuff, but also the costly console.log + + #--enable-multiple-versions # Nope, NixOS already does version multiplexing + #--enable-guide + #--enable-track-scheme + #--enable-high-res-timing + #--enable-max-processors=4 + #--enable-multiple-vms + #--enable-dynamic-tls + #--enable-multiple-vms + #--enable-multiple-threaded-vms ## when SMP branch is merged in + #--enable-thread-system=posix ## default when --enable-multiple-vms is on. + #--enable-profile + #--enable-coverage + #--enable-inline-jumps + #--enable-char-size=1" ; default is 4 + ) + ./configure ''${options[@]} + ''; + + buildPhase = '' + # Make bootstrap compiler, from release bootstrap + mkdir -p boot && + cp -rp ${bootstrap}/. boot/. && + chmod -R u+w boot && + cd boot && + cp ../gsc/makefile.in ../gsc/*.scm gsc && # */ + ./configure && + for i in lib gsi gsc ; do (cd $i ; make ) ; done && + cd .. && + cp boot/gsc/gsc gsc-boot && + + # Now use the bootstrap compiler to build the real thing! + make -j2 from-scratch + ''; + + doCheck = true; + + meta = { + description = "Optimizing Scheme to C compiler"; + homepage = "http://gambitscheme.org"; + license = stdenv.lib.licenses.lgpl2; + # NB regarding platforms: only actually tested on Linux, *should* work everywhere, + # but *might* need adaptation e.g. on macOS. + platforms = stdenv.lib.platforms.unix; + maintainers = with stdenv.lib.maintainers; [ thoughtpolice raskin fare ]; + }; +} diff --git a/pkgs/development/compilers/gambit/default.nix b/pkgs/development/compilers/gambit/default.nix index 83e02b14708..0996d0c3078 100644 --- a/pkgs/development/compilers/gambit/default.nix +++ b/pkgs/development/compilers/gambit/default.nix @@ -1,75 +1,13 @@ -{ stdenv, fetchurl, fetchgit, git, openssl, autoconf, pkgs, makeStaticLibraries }: +{ callPackage, fetchgit }: -# TODO: distinct packages for gambit-release and gambit-devel - -stdenv.mkDerivation rec { - name = "gambit-${version}"; +callPackage ./build.nix { version = "4.8.9"; - bootstrap = import ./bootstrap.nix ( pkgs ); + # TODO: for next version, prefer the unpatched tarball for the stable/default gambit. + git-version = "4.8.9-8-g793679bd"; - src = fetchgit { + SRC = fetchgit { url = "https://github.com/feeley/gambit.git"; rev = "dd54a71dfc0bd09813592f1645d755867a02195d"; sha256 = "120kg73k39gshrwas8a3xcrxgnq1c7ww92wgy4d3mmrwy3j9nzzc"; }; - - # Use makeStaticLibraries to enable creation of statically linked binaries - buildInputs = [ git autoconf bootstrap openssl (makeStaticLibraries openssl)]; - - configurePhase = '' - options=( - --prefix=$out - --enable-single-host - --enable-c-opt=-O2 - --enable-gcc-opts - --enable-shared - --enable-absolute-shared-libs # Yes, NixOS will want an absolute path, and fix it. - --enable-poll - --enable-openssl - --enable-default-runtime-options="f8,-8,t8" # Default to UTF-8 for source and all I/O - #--enable-debug # Nope: enables plenty of good stuff, but also the costly console.log - - #--enable-multiple-versions # Nope, NixOS already does version multiplexing - #--enable-guide - #--enable-track-scheme - #--enable-high-res-timing - #--enable-max-processors=4 - #--enable-multiple-vms - #--enable-dynamic-tls - #--enable-multiple-vms - #--enable-multiple-threaded-vms ## when SMP branch is merged in - #--enable-thread-system=posix ## default when --enable-multiple-vms is on. - #--enable-profile - #--enable-coverage - #--enable-inline-jumps - #--enable-char-size=1" ; default is 4 - ) - ./configure ''${options[@]} - ''; - - buildPhase = '' - # Make bootstrap compiler, from release bootstrap - mkdir -p boot && - cp -rp ${bootstrap}/. boot/. && - chmod -R u+w boot && - cd boot && - cp ../gsc/makefile.in ../gsc/*.scm gsc && # */ - ./configure && - for i in lib gsi gsc ; do (cd $i ; make ) ; done && - cd .. && - cp boot/gsc/gsc gsc-boot && - - # Now use the bootstrap compiler to build the real thing! - make -j2 from-scratch - ''; - - doCheck = true; - - meta = { - description = "Optimizing Scheme to C compiler"; - homepage = "http://gambitscheme.org"; - license = stdenv.lib.licenses.lgpl2; - platforms = stdenv.lib.platforms.unix; - maintainers = with stdenv.lib.maintainers; [ thoughtpolice raskin fare ]; - }; } diff --git a/pkgs/development/compilers/gambit/unstable.nix b/pkgs/development/compilers/gambit/unstable.nix new file mode 100644 index 00000000000..f98fd5ca935 --- /dev/null +++ b/pkgs/development/compilers/gambit/unstable.nix @@ -0,0 +1,11 @@ +{ callPackage, fetchgit }: + +callPackage ./build.nix { + version = "unstable-2018-03-26"; + git-version = "4.8.9-8-g793679bd"; + SRC = fetchgit { + url = "https://github.com/feeley/gambit.git"; + rev = "793679bd57eb6275cb06e6570b05f4a78df61bf9"; + sha256 = "0bippvmrc8vcaa6ka3mhzfgkagb6a1616g7nxk0i0wapxai5cngj"; + }; +} diff --git a/pkgs/development/compilers/gerbil/build.nix b/pkgs/development/compilers/gerbil/build.nix new file mode 100644 index 00000000000..5609de15d4c --- /dev/null +++ b/pkgs/development/compilers/gerbil/build.nix @@ -0,0 +1,88 @@ +{ stdenv, lib, makeStaticLibraries, + coreutils, rsync, bash, + openssl, zlib, sqlite, libxml2, libyaml, mysql, lmdb, leveldb, postgresql, + version, git-version, GAMBIT, SRC }: + +# TODO: distinct packages for gerbil-release and gerbil-devel +# TODO: make static compilation work + +stdenv.mkDerivation rec { + name = "gerbil-${version}"; + src = SRC; + + # Use makeStaticLibraries to enable creation of statically linked binaries + buildInputs_libraries = [ openssl zlib sqlite libxml2 libyaml mysql.connector-c lmdb leveldb postgresql ]; + buildInputs_staticLibraries = map makeStaticLibraries buildInputs_libraries; + + buildInputs = [ GAMBIT coreutils rsync bash ] + ++ buildInputs_libraries ++ buildInputs_staticLibraries; + + NIX_CFLAGS_COMPILE = [ "-I${mysql.connector-c}/include/mysql" "-L${mysql.connector-c}/lib/mysql" ]; + + postPatch = '' + echo '(define (gerbil-version-string) "v${git-version}")' > src/gerbil/runtime/gx-version.scm + + patchShebangs . + + find . -type f -executable -print0 | while IFS= read -r -d ''$'\0' f; do + substituteInPlace "$f" --replace '#!/usr/bin/env' '#!${coreutils}/bin/env' + done + + cat > etc/gerbil_static_libraries.sh <<EOF +#OPENSSL_LIBCRYPTO=${makeStaticLibraries openssl}/lib/libcrypto.a # MISSING! +#OPENSSL_LIBSSL=${makeStaticLibraries openssl}/lib/libssl.a # MISSING! +ZLIB=${makeStaticLibraries zlib}/lib/libz.a +# SQLITE=${makeStaticLibraries sqlite}/lib/sqlite.a # MISSING! +# LIBXML2=${makeStaticLibraries libxml2}/lib/libxml2.a # MISSING! +# YAML=${makeStaticLibraries libyaml}/lib/libyaml.a # MISSING! +MYSQL=${makeStaticLibraries mysql.connector-c}/lib/mariadb/libmariadb.a +# LMDB=${makeStaticLibraries lmdb}/lib/mysql/libmysqlclient_r.a # MISSING! +LEVELDB=${makeStaticLibraries lmdb}/lib/libleveldb.a +EOF + ''; + + buildPhase = '' + runHook preBuild + + # Enable all optional libraries + substituteInPlace "src/std/build-features.ss" --replace '#f' '#t' + + # gxprof testing uses $HOME/.cache/gerbil/gxc + export HOME=$$PWD + + # Build, replacing make by build.sh + ( cd src && sh build.sh ) + + runHook postBuild + ''; + + installPhase = '' + runHook preInstall + mkdir -p $out/ + cp -fa bin lib etc doc $out/ + + cat > $out/bin/gxi <<EOF +#!${bash}/bin/bash -e +export GERBIL_HOME=$out +case "\$1" in -:*) GSIOPTIONS=\$1 ; shift ;; esac +if [[ \$# = 0 ]] ; then + exec ${GAMBIT}/bin/gsi \$GSIOPTIONS \$GERBIL_HOME/lib/gxi-init \$GERBIL_HOME/lib/gxi-interactive - ; +else + exec ${GAMBIT}/bin/gsi \$GSIOPTIONS \$GERBIL_HOME/lib/gxi-init "\$@" +fi +EOF + runHook postInstall + ''; + + dontStrip = true; + + meta = { + description = "Gerbil Scheme"; + homepage = "https://github.com/vyzo/gerbil"; + license = stdenv.lib.licenses.lgpl2; + # NB regarding platforms: only actually tested on Linux, *should* work everywhere, + # but *might* need adaptation e.g. on macOS. Please report success and/or failure to fare. + platforms = stdenv.lib.platforms.unix; + maintainers = with stdenv.lib.maintainers; [ fare ]; + }; +} diff --git a/pkgs/development/compilers/gerbil/default.nix b/pkgs/development/compilers/gerbil/default.nix index 555dbbfe460..eaab0e71d3b 100644 --- a/pkgs/development/compilers/gerbil/default.nix +++ b/pkgs/development/compilers/gerbil/default.nix @@ -1,91 +1,11 @@ -{ stdenv, lib, fetchurl, fetchgit, makeStaticLibraries, gambit, - coreutils, rsync, bash, - openssl, zlib, sqlite, libxml2, libyaml, mysql, lmdb, leveldb, postgresql }: - -# TODO: distinct packages for gerbil-release and gerbil-devel -# TODO: make static compilation work - -stdenv.mkDerivation rec { - name = "gerbil-${version}"; +{ callPackage, fetchurl, gambit }: +callPackage ./build.nix { version = "0.12-RELEASE"; - src = fetchgit { - url = "https://github.com/vyzo/gerbil.git"; - rev = "5618892d7939e1cb4ef5247912e0bc1ec99f6b52"; - sha256 = "0b2valahf5k81r4sp6y12d44fb286p92s7k6dphij0kmvg0dp818"; - }; - - # Use makeStaticLibraries to enable creation of statically linked binaries - buildInputs_libraries = [ openssl zlib sqlite libxml2 libyaml mysql.connector-c lmdb leveldb postgresql ]; - buildInputs_staticLibraries = map makeStaticLibraries buildInputs_libraries; - - buildInputs = [ gambit coreutils rsync bash ] - ++ buildInputs_libraries ++ buildInputs_staticLibraries; - - NIX_CFLAGS_COMPILE = [ "-I${mysql.connector-c}/include/mysql" "-L${mysql.connector-c}/lib/mysql" ]; - - postPatch = '' - echo '(define (gerbil-version-string) "v${version}")' > src/gerbil/runtime/gx-version.scm - - patchShebangs . - - find . -type f -executable -print0 | while IFS= read -r -d ''$'\0' f; do - substituteInPlace "$f" --replace '#!/usr/bin/env' '#!${coreutils}/bin/env' - done - - cat > etc/gerbil_static_libraries.sh <<EOF -#OPENSSL_LIBCRYPTO=${makeStaticLibraries openssl}/lib/libcrypto.a # MISSING! -#OPENSSL_LIBSSL=${makeStaticLibraries openssl}/lib/libssl.a # MISSING! -ZLIB=${makeStaticLibraries zlib}/lib/libz.a -# SQLITE=${makeStaticLibraries sqlite}/lib/sqlite.a # MISSING! -# LIBXML2=${makeStaticLibraries libxml2}/lib/libxml2.a # MISSING! -# YAML=${makeStaticLibraries libyaml}/lib/libyaml.a # MISSING! -MYSQL=${makeStaticLibraries mysql.connector-c}/lib/mariadb/libmariadb.a -# LMDB=${makeStaticLibraries lmdb}/lib/mysql/libmysqlclient_r.a # MISSING! -LEVELDB=${makeStaticLibraries lmdb}/lib/libleveldb.a -EOF - ''; - - buildPhase = '' - runHook preBuild - - # Enable all optional libraries - substituteInPlace "src/std/build-features.ss" --replace '#f' '#t' - - # gxprof testing uses $HOME/.cache/gerbil/gxc - export HOME=$$PWD - - # Build, replacing make by build.sh - ( cd src && sh build.sh ) - - runHook postBuild - ''; - - installPhase = '' - runHook preInstall - mkdir -p $out/ - cp -fa bin lib etc doc $out/ - - cat > $out/bin/gxi <<EOF -#!${bash}/bin/bash -e -export GERBIL_HOME=$out -case "\$1" in -:*) GSIOPTIONS=\$1 ; shift ;; esac -if [[ \$# = 0 ]] ; then - exec ${gambit}/bin/gsi \$GSIOPTIONS \$GERBIL_HOME/lib/gxi-init \$GERBIL_HOME/lib/gxi-interactive - ; -else - exec ${gambit}/bin/gsi \$GSIOPTIONS \$GERBIL_HOME/lib/gxi-init "\$@" -fi -EOF - runHook postInstall - ''; - - dontStrip = true; - - meta = { - description = "Gerbil Scheme"; - homepage = "https://github.com/vyzo/gerbil"; - license = stdenv.lib.licenses.lgpl2; - platforms = stdenv.lib.platforms.unix; - maintainers = with stdenv.lib.maintainers; [ fare ]; + git-version = "0.12"; + GAMBIT = gambit; + SRC = fetchurl { + url = "https://github.com/vyzo/gerbil/archive/v0.12.tar.gz"; + sha256 = "0nigr3mgrzai57q2jqac8f39zj8rcmic3277ynyzlgm8hhps71pq"; }; } diff --git a/pkgs/development/compilers/gerbil/unstable.nix b/pkgs/development/compilers/gerbil/unstable.nix new file mode 100644 index 00000000000..ec36f42d86e --- /dev/null +++ b/pkgs/development/compilers/gerbil/unstable.nix @@ -0,0 +1,12 @@ +{ callPackage, fetchgit, gambit-unstable }: + +callPackage ./build.nix { + version = "unstable-2018-04-03"; + git-version = "0.13-DEV-357-ge61318dc"; + GAMBIT = gambit-unstable; + SRC = fetchgit { + url = "https://github.com/vyzo/gerbil.git"; + rev = "e61318dcaa3a9c843e2cf259e67851f240e4beda"; + sha256 = "1xd7yxiramifdxgp6b3s24z6nkkmy5h4a6pkchvy4w358qv1vqin"; + }; +} diff --git a/pkgs/development/compilers/ghc/8.4.2.nix b/pkgs/development/compilers/ghc/8.4.2.nix new file mode 100644 index 00000000000..e381c411925 --- /dev/null +++ b/pkgs/development/compilers/ghc/8.4.2.nix @@ -0,0 +1,193 @@ +{ stdenv, targetPackages +, buildPlatform, hostPlatform, targetPlatform + +# build-tools +, bootPkgs, alex, happy +, autoconf, automake, coreutils, fetchgit, fetchpatch, perl, python3 + +, libffi, libiconv ? null, ncurses + +, useLLVM ? !targetPlatform.isx86 +, # LLVM is conceptually a run-time-only depedendency, but for + # non-x86, we need LLVM to bootstrap later stages, so it becomes a + # build-time dependency too. + buildLlvmPackages, llvmPackages + +, # If enabled, GHC will be built with the GPL-free but slower integer-simple + # library instead of the faster but GPLed integer-gmp library. + enableIntegerSimple ? false, gmp ? null, m4 + +, # If enabled, use -fPIC when compiling static libs. + enableRelocatedStaticLibs ? targetPlatform != hostPlatform + +, # Whether to build dynamic libs for the standard library (on the target + # platform). Static libs are always built. + enableShared ? true + +, version ? "8.4.2" +}: + +assert !enableIntegerSimple -> gmp != null; + +let + inherit (bootPkgs) ghc; + + # TODO(@Ericson2314) Make unconditional + targetPrefix = stdenv.lib.optionalString + (targetPlatform != hostPlatform) + "${targetPlatform.config}-"; + + buildMK = '' + DYNAMIC_GHC_PROGRAMS = ${if enableShared then "YES" else "NO"} + '' + stdenv.lib.optionalString enableIntegerSimple '' + INTEGER_LIBRARY = integer-simple + '' + stdenv.lib.optionalString (targetPlatform != hostPlatform) '' + BuildFlavour = perf-cross + Stage1Only = YES + HADDOCK_DOCS = NO + BUILD_SPHINX_HTML = NO + BUILD_SPHINX_PDF = NO + '' + stdenv.lib.optionalString enableRelocatedStaticLibs '' + GhcLibHcOpts += -fPIC + GhcRtsHcOpts += -fPIC + ''; + + # Splicer will pull out correct variations + libDeps = platform: [ ncurses ] + ++ stdenv.lib.optional (!enableIntegerSimple) gmp + ++ stdenv.lib.optional (platform.libc != "glibc") libiconv; + + toolsForTarget = + if hostPlatform == buildPlatform then + [ targetPackages.stdenv.cc ] ++ stdenv.lib.optional useLLVM llvmPackages.llvm + else assert targetPlatform == hostPlatform; # build != host == target + [ stdenv.cc ] ++ stdenv.lib.optional useLLVM buildLlvmPackages.llvm; + + targetCC = builtins.head toolsForTarget; + +in +stdenv.mkDerivation rec { + inherit version; + inherit (src) rev; + name = "${targetPrefix}ghc-${version}"; + + src = fetchgit { + url = "git://git.haskell.org/ghc.git"; + rev = "6d7eecff7948ad77854f834f55b4d4f942276ad3"; + sha256 = "0aqy5x0b6qxhyvxw1q9pssf1xvhbyviglqkjrx4gvhbr3nax3wxp"; + }; + + enableParallelBuilding = true; + + outputs = [ "out" "doc" ]; + + postPatch = "patchShebangs ."; + + # GHC is a bit confused on its cross terminology. + preConfigure = '' + for env in $(env | grep '^TARGET_' | sed -E 's|\+?=.*||'); do + export "''${env#TARGET_}=''${!env}" + done + # GHC is a bit confused on its cross terminology, as these would normally be + # the *host* tools. + export CC="${targetCC}/bin/${targetCC.targetPrefix}cc" + export CXX="${targetCC}/bin/${targetCC.targetPrefix}cxx" + # Use gold to work around https://sourceware.org/bugzilla/show_bug.cgi?id=16177 + export LD="${targetCC.bintools}/bin/${targetCC.bintools.targetPrefix}ld${stdenv.lib.optionalString targetPlatform.isArm ".gold"}" + export AS="${targetCC.bintools.bintools}/bin/${targetCC.bintools.targetPrefix}as" + export AR="${targetCC.bintools.bintools}/bin/${targetCC.bintools.targetPrefix}ar" + export NM="${targetCC.bintools.bintools}/bin/${targetCC.bintools.targetPrefix}nm" + export RANLIB="${targetCC.bintools.bintools}/bin/${targetCC.bintools.targetPrefix}ranlib" + export READELF="${targetCC.bintools.bintools}/bin/${targetCC.bintools.targetPrefix}readelf" + export STRIP="${targetCC.bintools.bintools}/bin/${targetCC.bintools.targetPrefix}strip" + + echo -n "${buildMK}" > mk/build.mk + echo ${version} >VERSION + echo ${src.rev} >GIT_COMMIT_ID + ./boot + sed -i -e 's|-isysroot /Developer/SDKs/MacOSX10.5.sdk||' configure + '' + stdenv.lib.optionalString (!stdenv.isDarwin) '' + export NIX_LDFLAGS+=" -rpath $out/lib/ghc-${version}" + '' + stdenv.lib.optionalString stdenv.isDarwin '' + export NIX_LDFLAGS+=" -no_dtrace_dof" + ''; + + # TODO(@Ericson2314): Always pass "--target" and always prefix. + configurePlatforms = [ "build" "host" ] + ++ stdenv.lib.optional (targetPlatform != hostPlatform) "target"; + # `--with` flags for libraries needed for RTS linker + configureFlags = [ + "--datadir=$doc/share/doc/ghc" + "--with-curses-includes=${ncurses.dev}/include" "--with-curses-libraries=${ncurses.out}/lib" + ] ++ stdenv.lib.optional (targetPlatform == hostPlatform && ! enableIntegerSimple) [ + "--with-gmp-includes=${gmp.dev}/include" "--with-gmp-libraries=${gmp.out}/lib" + ] ++ stdenv.lib.optional (targetPlatform == hostPlatform && hostPlatform.libc != "glibc") [ + "--with-iconv-includes=${libiconv}/include" "--with-iconv-libraries=${libiconv}/lib" + ] ++ stdenv.lib.optionals (targetPlatform != hostPlatform) [ + "--enable-bootstrap-with-devel-snapshot" + ] ++ stdenv.lib.optionals (targetPlatform.isArm) [ + "CFLAGS=-fuse-ld=gold" + "CONF_GCC_LINKER_OPTS_STAGE1=-fuse-ld=gold" + "CONF_GCC_LINKER_OPTS_STAGE2=-fuse-ld=gold" + ] ++ stdenv.lib.optionals (targetPlatform.isDarwin && targetPlatform.isAarch64) [ + # fix for iOS: https://www.reddit.com/r/haskell/comments/4ttdz1/building_an_osxi386_to_iosarm64_cross_compiler/d5qvd67/ + "--disable-large-address-space" + ]; + + # Hack to make sure we never to the relaxation `$PATH` and hooks support for + # compatability. This will be replaced with something clearer in a future + # masss-rebuild. + crossConfig = true; + + nativeBuildInputs = [ ghc perl autoconf automake m4 happy alex python3 ]; + + # For building runtime libs + depsBuildTarget = toolsForTarget; + + buildInputs = libDeps hostPlatform; + + propagatedBuildInputs = [ targetPackages.stdenv.cc ] + ++ stdenv.lib.optional useLLVM llvmPackages.llvm; + + depsTargetTarget = map stdenv.lib.getDev (libDeps targetPlatform); + depsTargetTargetPropagated = map (stdenv.lib.getOutput "out") (libDeps targetPlatform); + + # required, because otherwise all symbols from HSffi.o are stripped, and + # that in turn causes GHCi to abort + stripDebugFlags = [ "-S" ] ++ stdenv.lib.optional (!targetPlatform.isDarwin) "--keep-file-symbols"; + + checkTarget = "test"; + + # zsh and other shells are smart about `{ghc}` but bash isn't, and doesn't + # treat that as a unary `{x,y,z,..}` repetition. + postInstall = '' + paxmark m $out/lib/${name}/bin/${if targetPlatform != hostPlatform then "ghc" else "{ghc,haddock}"} + + # Install the bash completion file. + install -D -m 444 utils/completion/ghc.bash $out/share/bash-completion/completions/${targetPrefix}ghc + + # Patch scripts to include "readelf" and "cat" in $PATH. + for i in "$out/bin/"*; do + test ! -h $i || continue + egrep --quiet '^#!' <(head -n 1 $i) || continue + sed -i -e '2i export PATH="$PATH:${stdenv.lib.makeBinPath [ targetPackages.stdenv.cc.bintools coreutils ]}"' $i + done + ''; + + passthru = { + inherit bootPkgs targetPrefix; + + inherit llvmPackages; + + # Our Cabal compiler name + haskellCompilerName = "ghc-8.4.2"; + }; + + meta = { + homepage = http://haskell.org/ghc; + description = "The Glasgow Haskell Compiler"; + maintainers = with stdenv.lib.maintainers; [ marcweber andres peti ]; + inherit (ghc.meta) license platforms; + }; + +} diff --git a/pkgs/development/compilers/glslang/default.nix b/pkgs/development/compilers/glslang/default.nix index 151f42a7aa7..ca1e2f54df9 100644 --- a/pkgs/development/compilers/glslang/default.nix +++ b/pkgs/development/compilers/glslang/default.nix @@ -1,21 +1,35 @@ -{ stdenv, fetchFromGitHub, cmake, bison }: +{ stdenv, fetchFromGitHub, cmake, bison, spirv-tools, jq }: stdenv.mkDerivation rec { name = "glslang-git-${version}"; - version = "2017-08-31"; + version = "2018-02-05"; # `vulkan-loader` requires a specific version of `glslang` as specified in # `<vulkan-loader-repo>/external_revisions/glslang_revision`. src = fetchFromGitHub { owner = "KhronosGroup"; repo = "glslang"; - rev = "3a21c880500eac21cdf79bef5b80f970a55ac6af"; - sha256 = "1i15m17r0acmzjrkybris2rgw15il05a4w5h7vhhsiyngcvajcyn"; + rev = "2651ccaec8"; + sha256 = "0x5x5i07n9g809rzf5jgw70mmwck31ishdmxnmi0wxx737jjqwaq"; }; - buildInputs = [ cmake bison ]; + buildInputs = [ cmake bison jq ] ++ spirv-tools.buildInputs; enableParallelBuilding = true; + patchPhase = '' + cp --no-preserve=mode -r "${spirv-tools.src}" External/spirv-tools + ln -s "${spirv-tools.headers}" External/spirv-tools/external/spirv-headers + ''; + + preConfigure = '' + HEADERS_COMMIT=$(jq -r < known_good.json '.commits|map(select(.name=="spirv-tools/external/spirv-headers"))[0].commit') + TOOLS_COMMIT=$(jq -r < known_good.json '.commits|map(select(.name=="spirv-tools"))[0].commit') + if [ "$HEADERS_COMMIT" != "${spirv-tools.headers.rev}" ] || [ "$TOOLS_COMMIT" != "${spirv-tools.src.rev}" ]; then + echo "ERROR: spirv-tools commits do not match expected versions"; + exit 1; + fi + ''; + meta = with stdenv.lib; { inherit (src.meta) homepage; description = "Khronos reference front-end for GLSL and ESSL"; diff --git a/pkgs/development/compilers/go/1.10.nix b/pkgs/development/compilers/go/1.10.nix index 145f6a17978..173d7a32fdc 100644 --- a/pkgs/development/compilers/go/1.10.nix +++ b/pkgs/development/compilers/go/1.10.nix @@ -25,13 +25,13 @@ in stdenv.mkDerivation rec { name = "go-${version}"; - version = "1.10"; + version = "1.10.1"; src = fetchFromGitHub { owner = "golang"; repo = "go"; rev = "go${version}"; - sha256 = "1dzs1mz3zxgg1qyi2lrlxdz1lsvazxvmj9cb69pgqnwjlh3jpw0l"; + sha256 = "1wqwy52ibb343a4v7b9q26xa6r5jk4khfxd90wbpcayws8cxly8m"; }; # perl is used for testing go vet diff --git a/pkgs/development/compilers/go/1.9.nix b/pkgs/development/compilers/go/1.9.nix index c866212170c..631e61c2305 100644 --- a/pkgs/development/compilers/go/1.9.nix +++ b/pkgs/development/compilers/go/1.9.nix @@ -25,13 +25,13 @@ in stdenv.mkDerivation rec { name = "go-${version}"; - version = "1.9.4"; + version = "1.9.5"; src = fetchFromGitHub { owner = "golang"; repo = "go"; rev = "go${version}"; - sha256 = "15d9lfiy1cjfz6nqnig5884ykqckx58cynd1bva1xna7bwcwwp2r"; + sha256 = "15dx1b71xv7b265gqk9nv02pirggpw7d83apikhrza2qkj64ydd0"; }; # perl is used for testing go vet diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index 7326941d075..6b4c56ab6c5 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -35,10 +35,8 @@ self: super: { # Use the latest version of the Cabal library. cabal-install = super.cabal-install.overrideScope (self: super: { Cabal = self.Cabal_2_2_0_1; }); - # Use the latest version, which supports Cabal 2.2.x. Unfortunately, the test - # suite depends on old versions of tasty and QuickCheck. - hackage-security = self.hackage-security_0_5_3_0; - hackage-security_0_5_3_0 = dontCheck super.hackage-security_0_5_3_0; + # The test suite depends on old versions of tasty and QuickCheck. + hackage-security = dontCheck super.hackage-security; # Link statically to avoid runtime dependency on GHC. jailbreak-cabal = disableSharedExecutables super.jailbreak-cabal; @@ -1019,4 +1017,10 @@ self: super: { # was fixed in spdx master (4288df6e4b7840eb94d825dcd446b42fef25ef56) spdx = dontCheck super.spdx; + # The test suite does not know how to find the 'alex' binary. + alex = overrideCabal super.alex (drv: { + testSystemDepends = (drv.testSystemDepends or []) ++ [pkgs.which]; + preCheck = ''export PATH="$PWD/dist/build/alex:$PATH"''; + }); + } diff --git a/pkgs/development/haskell-modules/configuration-ghc-8.4.x.nix b/pkgs/development/haskell-modules/configuration-ghc-8.4.x.nix index 1ce1f2dd6dc..7538c369741 100644 --- a/pkgs/development/haskell-modules/configuration-ghc-8.4.x.nix +++ b/pkgs/development/haskell-modules/configuration-ghc-8.4.x.nix @@ -584,7 +584,6 @@ self: super: { # Older versions don't compile. brick = self.brick_0_36; - data-inttrie = self.data-inttrie_0_1_4; HaTeX = self.HaTeX_3_19_0_0; matrix = self.matrix_0_3_6_1; pandoc = self.pandoc_2_1_3; diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml index 29f6d4bd957..82dab3ac0a8 100644 --- a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml +++ b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml @@ -38,7 +38,7 @@ core-packages: - ghcjs-base-0 default-package-overrides: - # LTS Haskell 11.2 + # LTS Haskell 11.3 - abstract-deque ==0.3 - abstract-deque-tests ==0.3 - abstract-par ==0.3.3 @@ -81,7 +81,7 @@ default-package-overrides: - airship ==0.9.3 - alarmclock ==0.4.0.3 - alerts ==0.1.0.0 - - alex ==3.2.3 + - alex ==3.2.4 - algebra ==4.3.1 - algebraic-graphs ==0.0.5 - alsa-core ==0.5.0.1 @@ -141,7 +141,7 @@ default-package-overrides: - avwx ==0.3.0.2 - axiom ==0.4.6 - b9 ==0.5.41 - - backprop ==0.1.3.0 + - backprop ==0.1.5.0 - bank-holidays-england ==0.1.0.6 - barrier ==0.1.1 - base16-bytestring ==0.1.1.6 @@ -219,7 +219,7 @@ default-package-overrides: - Boolean ==0.2.4 - boolean-like ==0.1.1.0 - boolsimplifier ==0.1.8 - - boomerang ==1.4.5.3 + - boomerang ==1.4.5.5 - bordacount ==0.1.0.0 - both ==0.1.1.0 - bound ==2.0.1 @@ -257,7 +257,7 @@ default-package-overrides: - Cabal ==2.0.1.1 - cabal-doctest ==1.0.6 - cabal-file-th ==0.2.4 - - cabal-rpm ==0.12.1 + - cabal-rpm ==0.12.2 - cabal-toolkit ==0.0.5 - cache ==0.1.0.1 - cairo ==0.13.4.2 @@ -378,7 +378,7 @@ default-package-overrides: - convertible ==1.1.1.0 - cookie ==0.4.4 - countable ==1.0 - - country ==0.1.4 + - country ==0.1.5 - courier ==0.1.1.5 - cpphs ==1.20.8 - cprng-aes ==0.6.1 @@ -449,7 +449,7 @@ default-package-overrides: - data-fix ==0.2.0 - data-has ==0.3.0.0 - data-hash ==0.2.0.1 - - data-inttrie ==0.1.2 + - data-inttrie ==0.1.4 - data-lens-light ==0.1.2.2 - data-memocombinators ==0.5.1 - data-msgpack ==0.0.11 @@ -519,7 +519,7 @@ default-package-overrides: - doctemplates ==0.2.2.1 - doctest ==0.13.0 - doctest-discover ==0.1.0.7 - - doctest-driver-gen ==0.2.0.1 + - doctest-driver-gen ==0.2.0.2 - do-list ==1.0.1 - dom-parser ==3.0.0 - dotenv ==0.5.2.4 @@ -596,7 +596,7 @@ default-package-overrides: - exceptional ==0.3.0.0 - exception-mtl ==0.4.0.1 - exceptions ==0.8.3 - - exception-transformers ==0.4.0.5 + - exception-transformers ==0.4.0.6 - executable-hash ==0.2.0.4 - executable-path ==0.0.3.1 - exhaustive ==1.1.5 @@ -623,7 +623,7 @@ default-package-overrides: - FenwickTree ==0.1.2.1 - fft ==0.1.8.6 - fgl ==5.6.0.0 - - filecache ==0.3.1 + - filecache ==0.3.2 - file-embed ==0.0.10.1 - filelock ==0.1.1.2 - filemanip ==0.3.6.3 @@ -632,7 +632,7 @@ default-package-overrides: - filter-logger ==0.6.0.0 - FindBin ==0.0.5 - find-clumpiness ==0.2.3.1 - - fingertree ==0.1.3.1 + - fingertree ==0.1.4.1 - fingertree-psqueue ==0.3 - finite-typelits ==0.1.3.0 - fitspec ==0.4.4 @@ -792,18 +792,18 @@ default-package-overrides: - H ==0.9.0.1 - h2c ==1.0.0 - hackage-db ==2.0 - - hackage-security ==0.5.2.2 + - hackage-security ==0.5.3.0 - haddock-library ==1.4.5 - hailgun ==0.4.1.6 - hailgun-simple ==0.1.0.0 - - hakyll ==4.12.0.1 + - hakyll ==4.12.1.0 - half ==0.2.2.3 - hamilton ==0.1.0.2 - HandsomeSoup ==0.4.2 - handwriting ==0.1.0.3 - hapistrano ==0.3.5.3 - happstack-jmacro ==7.0.12 - - happstack-server ==7.5.0.1 + - happstack-server ==7.5.1 - happstack-server-tls ==7.1.6.5 - happy ==1.19.9 - hasbolt ==0.1.3.0 @@ -834,7 +834,7 @@ default-package-overrides: - haskell-tools-refactor ==1.0.1.2 - haskell-tools-rewrite ==1.0.1.1 - haskintex ==0.8.0.0 - - hasmin ==1.0.1 + - hasmin ==1.0.2 - hasql ==1.1.1 - hasql-migration ==0.1.3 - hasql-optparse-applicative ==0.3 @@ -892,7 +892,7 @@ default-package-overrides: - hlibgit2 ==0.18.0.16 - hlibsass ==0.1.6.1 - hmatrix ==0.18.2.0 - - hmatrix-backprop ==0.1.0.0 + - hmatrix-backprop ==0.1.2.0 - hmatrix-gsl ==0.18.2.0 - hmatrix-gsl-stats ==0.4.1.7 - hmatrix-morpheus ==0.1.1.1 @@ -914,7 +914,7 @@ default-package-overrides: - hpc-coveralls ==1.0.10 - HPDF ==1.4.10 - hpio ==0.9.0.5 - - hpp ==0.5.1 + - hpp ==0.5.2 - hpqtypes ==1.5.2.0 - hquantlib ==0.0.4.0 - hreader ==1.1.0 @@ -927,8 +927,8 @@ default-package-overrides: - hsdns ==1.7.1 - hsebaysdk ==0.4.0.0 - hsemail ==2 - - hset ==2.2.0 - HSet ==0.0.1 + - hset ==2.2.0 - hsexif ==0.6.1.5 - hs-GeoIP ==0.3 - hsignal ==0.2.7.5 @@ -978,7 +978,7 @@ default-package-overrides: - HTTP ==4000.3.11 - http2 ==1.6.3 - http-api-data ==0.3.7.2 - - http-client ==0.5.11 + - http-client ==0.5.12 - http-client-openssl ==0.2.1.1 - http-client-tls ==0.3.5.3 - http-common ==0.8.2.0 @@ -1001,7 +1001,7 @@ default-package-overrides: - hweblib ==0.6.3 - hw-excess ==0.2.0.0 - hw-fingertree ==0.1.0.1 - - hw-fingertree-strict ==0.1.0.2 + - hw-fingertree-strict ==0.1.0.3 - hw-hedgehog ==0.1.0.1 - hw-hspec-hedgehog ==0.1.0.2 - hw-int ==0.0.0.3 @@ -1014,7 +1014,7 @@ default-package-overrides: - hw-rankselect-base ==0.2.0.2 - hw-string-parse ==0.0.0.4 - hw-succinct ==0.1.0.1 - - hw-xml ==0.1.0.1 + - hw-xml ==0.1.0.3 - hxt ==9.3.1.16 - hxt-charproperties ==9.2.0.1 - hxt-css ==0.1.0.3 @@ -1111,7 +1111,7 @@ default-package-overrides: - json-builder ==0.3 - json-rpc-generic ==0.2.1.3 - json-schema ==0.7.4.1 - - json-stream ==0.4.2.0 + - json-stream ==0.4.2.2 - JuicyPixels ==3.2.9.5 - JuicyPixels-extra ==0.3.0 - JuicyPixels-scale-dct ==0.1.1.2 @@ -1234,7 +1234,7 @@ default-package-overrides: - mandrill ==0.5.3.3 - mapquest-api ==0.3.1 - map-syntax ==0.2.0.2 - - markdown ==0.1.17 + - markdown ==0.1.17.1 - markdown-unlit ==0.5.0 - markov-chain ==0.0.3.4 - markup ==4.0.4 @@ -1301,13 +1301,13 @@ default-package-overrides: - moesocks ==1.0.0.44 - mole ==0.0.6 - monad-control ==1.0.2.3 - - monad-control-aligned ==0.0.1 + - monad-control-aligned ==0.0.1.1 - monad-coroutine ==0.9.0.4 - monad-extras ==0.6.0 - monadic-arrays ==0.2.2 - monad-journal ==0.8.1 - monadloc ==0.7.1 - - monad-logger ==0.3.28.2 + - monad-logger ==0.3.28.3 - monad-logger-json ==0.1.0.0 - monad-logger-prefix ==0.1.9 - monad-logger-syslog ==0.1.4.0 @@ -1374,17 +1374,17 @@ default-package-overrides: - netlib-ffi ==0.0.1 - netpbm ==1.0.2 - nettle ==0.2.0 - - netwire ==5.0.2 + - netwire ==5.0.3 - netwire-input ==0.0.7 - netwire-input-glfw ==0.0.8 - - network ==2.6.3.4 + - network ==2.6.3.5 - network-anonymous-i2p ==0.10.0 - network-anonymous-tor ==0.11.0 - network-attoparsec ==0.12.2 - network-carbon ==1.0.11 - network-conduit-tls ==1.3.0 - network-house ==0.1.0.2 - - network-info ==0.2.0.9 + - network-info ==0.2.0.10 - network-ip ==0.3.0.2 - network-multicast ==0.2.0 - Network-NineP ==0.4.2 @@ -1442,7 +1442,7 @@ default-package-overrides: - openexr-write ==0.1.0.1 - OpenGL ==3.0.2.1 - OpenGLRaw ==3.2.7.0 - - openpgp-asciiarmor ==0.1 + - openpgp-asciiarmor ==0.1.1 - opensource ==0.1.0.0 - openssl-streams ==1.2.1.3 - open-witness ==0.4.0.1 @@ -1501,7 +1501,7 @@ default-package-overrides: - pem ==0.2.4 - perf ==0.3.1.1 - perfect-hash-generator ==0.2.0.6 - - persistable-record ==0.6.0.2 + - persistable-record ==0.6.0.3 - persistable-types-HDBC-pg ==0.0.1.5 - persistent ==2.8.1 - persistent-mongoDB ==2.8.0 @@ -1555,7 +1555,7 @@ default-package-overrides: - pomaps ==0.0.0.3 - pooled-io ==0.0.2.1 - PortMidi ==0.1.6.1 - - posix-paths ==0.2.1.3 + - posix-paths ==0.2.1.4 - postgresql-binary ==0.12.1 - postgresql-libpq ==0.9.4.1 - postgresql-schema ==0.1.14 @@ -1564,7 +1564,7 @@ default-package-overrides: - postgresql-simple-queue ==1.0.1 - postgresql-simple-url ==0.2.1.0 - postgresql-transactional ==1.1.1 - - postgresql-typed ==0.5.2 + - postgresql-typed ==0.5.3.0 - post-mess-age ==0.2.1.0 - pptable ==0.2.0.0 - pqueue ==1.4.1.1 @@ -1613,7 +1613,7 @@ default-package-overrides: - proto-lens-arbitrary ==0.1.1.1 - proto-lens-descriptors ==0.2.2.0 - proto-lens-optparse ==0.1.1.0 - - protolude ==0.2.1 + - protolude ==0.2.2 - proxied ==0.3 - psql-helpers ==0.1.0.0 - PSQueue ==1.1 @@ -1658,7 +1658,7 @@ default-package-overrides: - rank1dynamic ==0.4.0 - rank2classes ==1.0.2 - rank-product ==0.2.0.1 - - Rasterific ==0.7.2.3 + - Rasterific ==0.7.3 - rasterific-svg ==0.3.3.1 - ratel ==1.0.3 - ratel-wai ==1.0.2 @@ -1682,7 +1682,7 @@ default-package-overrides: - ref-fd ==0.4.0.1 - refined ==0.1.2.1 - reflection ==2.1.3 - - reform ==0.2.7.1 + - reform ==0.2.7.2 - reform-blaze ==0.2.4.3 - reform-hamlet ==0.0.5.3 - reform-happstack ==0.2.5.2 @@ -1716,8 +1716,8 @@ default-package-overrides: - resourcet ==1.2.0 - rest-core ==0.39 - rest-snap ==0.3.0.0 - - rest-stringmap ==0.2.0.6 - - rest-types ==1.14.1.1 + - rest-stringmap ==0.2.0.7 + - rest-types ==1.14.1.2 - result ==0.2.6.0 - rethinkdb-client-driver ==0.0.25 - retry ==0.7.6.2 @@ -1842,7 +1842,7 @@ default-package-overrides: - skein ==1.0.9.4 - skeletons ==0.4.0 - skylighting ==0.6 - - slack-web ==0.2.0.3 + - slack-web ==0.2.0.4 - slave-thread ==1.0.2 - slug ==0.1.7 - smallcheck ==1.1.3.1 @@ -1883,10 +1883,10 @@ default-package-overrides: - Spock-lucid ==0.4.0.1 - Spock-worker ==0.3.1.0 - spreadsheet ==0.1.3.7 - - sqlite-simple ==0.4.14.0 + - sqlite-simple ==0.4.15.0 - sql-words ==0.1.5.1 - squeal-postgresql ==0.1.1.4 - - srcloc ==0.5.1.1 + - srcloc ==0.5.1.2 - stache ==1.2.1 - stack-type ==0.1.0.0 - starter ==0.2.1 @@ -1922,7 +1922,7 @@ default-package-overrides: - streaming ==0.2.1.0 - streaming-bytestring ==0.1.5 - streaming-commons ==0.1.19 - - streamly ==0.1.1 + - streamly ==0.1.2 - streamproc ==1.6.2 - streams ==3.3 - strict ==0.3.2 @@ -1950,7 +1950,7 @@ default-package-overrides: - swagger2 ==2.2.1 - swish ==0.9.2.1 - syb ==0.7 - - syb-with-class ==0.6.1.8 + - syb-with-class ==0.6.1.9 - symbol ==0.2.4 - symengine ==0.1.2.0 - sysinfo ==0.1.1 @@ -2068,7 +2068,7 @@ default-package-overrides: - timespan ==0.3.0.0 - timezone-olson ==0.1.9 - timezone-series ==0.1.9 - - tinylog ==0.14.0 + - tinylog ==0.14.1 - tinytemplate ==0.1.2.0 - titlecase ==1.0.1 - tldr ==0.3.0 @@ -2112,8 +2112,8 @@ default-package-overrides: - type-level-integers ==0.0.1 - type-level-kv-list ==1.1.0 - type-level-numbers ==0.1.1.1 - - typelits-witnesses ==0.3.0.1 - - type-of-html ==1.3.3.0 + - typelits-witnesses ==0.3.0.2 + - type-of-html ==1.3.3.2 - type-operators ==0.1.0.4 - type-spec ==0.3.0.1 - typography-geometry ==1.0.0.1 @@ -2249,13 +2249,13 @@ default-package-overrides: - web-routes-boomerang ==0.28.4.2 - web-routes-happstack ==0.23.11 - web-routes-hsp ==0.24.6.1 - - web-routes-th ==0.22.6.2 + - web-routes-th ==0.22.6.3 - web-routes-wai ==0.24.3.1 - webrtc-vad ==0.1.0.3 - websockets ==0.12.4.0 - websockets-rpc ==0.6.0 - websockets-simple ==0.0.6.3 - - websockets-snap ==0.10.2.4 + - websockets-snap ==0.10.2.5 - weigh ==0.0.7 - wide-word ==0.1.0.6 - wikicfp-scraper ==0.1.0.9 @@ -2304,7 +2304,7 @@ default-package-overrides: - xenstore ==0.1.1 - xhtml ==3000.2.2 - xls ==0.1.1 - - xlsx ==0.7.1 + - xlsx ==0.7.2 - xlsx-tabular ==0.2.2.1 - xml ==1.3.14 - xml-basic ==0.1.3 @@ -2328,7 +2328,7 @@ default-package-overrides: - xturtle ==0.2.0.0 - xxhash ==0.0.2 - xxhash-ffi ==0.2.0.0 - - yaml ==0.8.28 + - yaml ==0.8.29 - Yampa ==0.10.7 - YampaSynth ==0.2 - yeshql ==3.0.1.3 diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix index c2cd6279c23..ae6a334de81 100644 --- a/pkgs/development/haskell-modules/hackage-packages.nix +++ b/pkgs/development/haskell-modules/hackage-packages.nix @@ -5215,6 +5215,8 @@ self: { pname = "FPretty"; version = "1.1"; sha256 = "0hpbm11z95wfh0i1dp2c35maksnz0zxpz9vbxq6f5c13x4i03b5q"; + revision = "1"; + editedCabalFile = "0d6mjr7b37f5bgjijjgx4x4fgfmkbhksphzkaf0p5jyzxp45fasc"; libraryHaskellDepends = [ base containers ]; homepage = "http://www.cs.kent.ac.uk/~oc/pretty.html"; description = "Efficient simple pretty printing combinators"; @@ -8711,6 +8713,40 @@ self: { license = "LGPL"; }) {}; + "HTF_0_13_2_4" = callPackage + ({ mkDerivation, aeson, aeson-pretty, array, base + , base64-bytestring, bytestring, containers, cpphs, Diff, directory + , filepath, haskell-src, HUnit, lifted-base, monad-control, mtl + , old-time, pretty, process, QuickCheck, random, regex-compat + , template-haskell, temporary, text, time, unix + , unordered-containers, vector, xmlgen + }: + mkDerivation { + pname = "HTF"; + version = "0.13.2.4"; + sha256 = "1xibrzs465hg9snwvl6gp6hll6g6c7m8s2ckk8vkfg386pywmi9n"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + aeson array base base64-bytestring bytestring containers cpphs Diff + directory haskell-src HUnit lifted-base monad-control mtl old-time + pretty process QuickCheck random regex-compat text time unix vector + xmlgen + ]; + executableHaskellDepends = [ + array base cpphs directory HUnit mtl old-time random text + ]; + testHaskellDepends = [ + aeson aeson-pretty base bytestring directory filepath HUnit mtl + process random regex-compat template-haskell temporary text + unordered-containers + ]; + homepage = "https://github.com/skogsbaer/HTF/"; + description = "The Haskell Test Framework"; + license = stdenv.lib.licenses.lgpl21; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "HTTP" = callPackage ({ mkDerivation, array, base, bytestring, case-insensitive, conduit , conduit-extra, deepseq, http-types, httpd-shed, HUnit, mtl @@ -13791,6 +13827,8 @@ self: { pname = "OneTuple"; version = "0.2.1"; sha256 = "1x52b68zh3k9lnps5s87kzan7dzvqp6mrwgayjq15w9dv6v78vsb"; + revision = "1"; + editedCabalFile = "1kb7f21n9vwwrk4kipqdwdqs94k34zai6yy0kgdn22zi442yicjh"; libraryHaskellDepends = [ base ]; description = "Singleton Tuple"; license = stdenv.lib.licenses.bsd3; @@ -15716,23 +15754,6 @@ self: { }: mkDerivation { pname = "Rasterific"; - version = "0.7.2.3"; - sha256 = "1imsk1dv5dksicnhmnzz5ldq84plbcg4qlwccsqvb6jg9j5vf6v6"; - libraryHaskellDepends = [ - base bytestring containers dlist FontyFruity free JuicyPixels mtl - primitive transformers vector vector-algorithms - ]; - description = "A pure haskell drawing engine"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "Rasterific_0_7_3" = callPackage - ({ mkDerivation, base, bytestring, containers, dlist, FontyFruity - , free, JuicyPixels, mtl, primitive, transformers, vector - , vector-algorithms - }: - mkDerivation { - pname = "Rasterific"; version = "0.7.3"; sha256 = "0y92h3mjsr1vjcxc06lh1lvszicf53l1bzdaci5mjb5gmiq8f2px"; libraryHaskellDepends = [ @@ -15741,7 +15762,6 @@ self: { ]; description = "A pure haskell drawing engine"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "ReadArgs" = callPackage @@ -20311,6 +20331,34 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "accelerate_1_2_0_0" = callPackage + ({ mkDerivation, ansi-terminal, ansi-wl-pprint, base, base-orphans + , bytestring, Cabal, cabal-doctest, constraints, containers + , cryptonite, deepseq, directory, doctest, exceptions, filepath + , ghc-prim, half, hashable, hashtables, hedgehog, lens, mtl, tasty + , tasty-expected-failure, tasty-hedgehog, tasty-hunit + , template-haskell, terminal-size, transformers, unique, unix + , unordered-containers, vector + }: + mkDerivation { + pname = "accelerate"; + version = "1.2.0.0"; + sha256 = "0y8wx09smrcxkyyklrf4lrilqasbmaw1w1ga9y110bqgywkw4pmj"; + setupHaskellDepends = [ base Cabal cabal-doctest ]; + libraryHaskellDepends = [ + ansi-terminal ansi-wl-pprint base base-orphans bytestring + constraints containers cryptonite deepseq directory exceptions + filepath ghc-prim half hashable hashtables hedgehog lens mtl tasty + tasty-expected-failure tasty-hedgehog tasty-hunit template-haskell + terminal-size transformers unique unix unordered-containers vector + ]; + testHaskellDepends = [ base doctest ]; + homepage = "https://github.com/AccelerateHS/accelerate/"; + description = "An embedded language for accelerated array processing"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "accelerate-arithmetic" = callPackage ({ mkDerivation, accelerate, accelerate-utility, base, QuickCheck , utility-ht @@ -20631,6 +20679,28 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "accelerate-llvm_1_2_0_0" = callPackage + ({ mkDerivation, abstract-deque, accelerate, base, bytestring + , chaselev-deque, containers, data-default-class, deepseq + , directory, dlist, exceptions, filepath, llvm-hs, llvm-hs-pure + , mtl, mwc-random, primitive, template-haskell + , unordered-containers, vector + }: + mkDerivation { + pname = "accelerate-llvm"; + version = "1.2.0.0"; + sha256 = "110zfxqi0lkhg7pk42qvd87qn442r6z264zj7q46jf8ia60l2cdq"; + libraryHaskellDepends = [ + abstract-deque accelerate base bytestring chaselev-deque containers + data-default-class deepseq directory dlist exceptions filepath + llvm-hs llvm-hs-pure mtl mwc-random primitive template-haskell + unordered-containers vector + ]; + description = "Accelerate backend component generating LLVM IR"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "accelerate-llvm-native" = callPackage ({ mkDerivation, accelerate, accelerate-llvm, base, bytestring , c2hs, Cabal, cereal, containers, directory, dlist, fclabels @@ -20653,6 +20723,28 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "accelerate-llvm-native_1_2_0_0" = callPackage + ({ mkDerivation, accelerate, accelerate-llvm, base, bytestring + , c2hs, Cabal, cereal, containers, directory, dlist, filepath, ghc + , ghc-prim, hashable, libffi, llvm-hs, llvm-hs-pure, mtl + , template-haskell, time, unique, unix, vector + }: + mkDerivation { + pname = "accelerate-llvm-native"; + version = "1.2.0.0"; + sha256 = "089j8ic6ns6656a55byiilrj9jvs535jvx4f2m8x1qhgz9q968vb"; + libraryHaskellDepends = [ + accelerate accelerate-llvm base bytestring Cabal cereal containers + directory dlist filepath ghc ghc-prim hashable libffi llvm-hs + llvm-hs-pure mtl template-haskell time unique unix vector + ]; + libraryToolDepends = [ c2hs ]; + testHaskellDepends = [ accelerate base ]; + description = "Accelerate backend for multicore CPUs"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "accelerate-llvm-ptx" = callPackage ({ mkDerivation, accelerate, accelerate-llvm, base, bytestring , containers, cuda, deepseq, directory, dlist, fclabels, file-embed @@ -20674,6 +20766,27 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "accelerate-llvm-ptx_1_2_0_0" = callPackage + ({ mkDerivation, accelerate, accelerate-llvm, base, bytestring + , containers, cuda, deepseq, directory, dlist, file-embed, filepath + , hashable, llvm-hs, llvm-hs-pure, mtl, nvvm, pretty, process + , template-haskell, time, unordered-containers + }: + mkDerivation { + pname = "accelerate-llvm-ptx"; + version = "1.2.0.0"; + sha256 = "1rh0kq10mwn4zd8f5sp19pah2hmmcansaqqssz79183znzfiviz5"; + libraryHaskellDepends = [ + accelerate accelerate-llvm base bytestring containers cuda deepseq + directory dlist file-embed filepath hashable llvm-hs llvm-hs-pure + mtl nvvm pretty process template-haskell time unordered-containers + ]; + testHaskellDepends = [ accelerate base ]; + description = "Accelerate backend for NVIDIA GPUs"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "accelerate-random" = callPackage ({ mkDerivation, accelerate, base, mwc-random }: mkDerivation { @@ -22053,6 +22166,25 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "aeson-diff-generic" = callPackage + ({ mkDerivation, aeson, aeson-diff, base, base-compat, bytestring + , containers, dlist, hashable, scientific, tagged, template-haskell + , text, th-abstraction, time, unordered-containers, uuid-types + , vector + }: + mkDerivation { + pname = "aeson-diff-generic"; + version = "0.0.2"; + sha256 = "0dm2rzww9rc6l3ql42px96fpsfjvw9g0w13j0y02dq33qb0w7a1v"; + libraryHaskellDepends = [ + aeson aeson-diff base base-compat bytestring containers dlist + hashable scientific tagged template-haskell text th-abstraction + time unordered-containers uuid-types vector + ]; + description = "Apply a json-patch to any haskell datatype"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "aeson-extra" = callPackage ({ mkDerivation, aeson, aeson-compat, attoparsec , attoparsec-iso8601, base, base-compat, bytestring, containers @@ -23278,26 +23410,6 @@ self: { "alex" = callPackage ({ mkDerivation, array, base, containers, directory, happy, process - , QuickCheck - }: - mkDerivation { - pname = "alex"; - version = "3.2.3"; - sha256 = "0bi1cs9b8ir33h1fl6x2xw4ymygapqbr713ridpf7rmk2wa7jqqs"; - isLibrary = false; - isExecutable = true; - executableHaskellDepends = [ - array base containers directory QuickCheck - ]; - executableToolDepends = [ happy ]; - testHaskellDepends = [ base process ]; - homepage = "http://www.haskell.org/alex/"; - description = "Alex is a tool for generating lexical analysers in Haskell"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "alex_3_2_4" = callPackage - ({ mkDerivation, array, base, containers, directory, happy, process }: mkDerivation { pname = "alex"; @@ -23312,7 +23424,6 @@ self: { homepage = "http://www.haskell.org/alex/"; description = "Alex is a tool for generating lexical analysers in Haskell"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "alex-meta" = callPackage @@ -23519,6 +23630,29 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "algebraic-graphs_0_1_1" = callPackage + ({ mkDerivation, array, base, base-compat, base-orphans, containers + , criterion, deepseq, extra, QuickCheck + }: + mkDerivation { + pname = "algebraic-graphs"; + version = "0.1.1"; + sha256 = "085yb222gh5chlpa4xylvf1wfnsdhrm1fha4jvj5bsjlx9kyr4ah"; + libraryHaskellDepends = [ + array base base-compat containers deepseq + ]; + testHaskellDepends = [ + base base-compat base-orphans containers extra QuickCheck + ]; + benchmarkHaskellDepends = [ + base base-compat containers criterion + ]; + homepage = "https://github.com/snowleopard/alga"; + description = "A library for algebraic graph construction and transformation"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "algebraic-prelude" = callPackage ({ mkDerivation, algebra, base, basic-prelude, lens, semigroups }: mkDerivation { @@ -23970,6 +24104,31 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "alto" = callPackage + ({ mkDerivation, aeson, base, base64-bytestring, bytestring + , containers, cryptohash-sha256, directory, exceptions, filepath + , lens, list-tries, MonadRandom, mtl, random, random-string, scrypt + , servant-server, text, warp + }: + mkDerivation { + pname = "alto"; + version = "0"; + sha256 = "0515cghmkrw5szbnafwp3mqglrg5c44cbly8jnvk9z9gf9kdr26k"; + revision = "1"; + editedCabalFile = "0vxcy55zx70ibws59d1n5p86awrhb83xb06yw6iz0hkp7cwk52i2"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + aeson base base64-bytestring bytestring containers + cryptohash-sha256 directory exceptions filepath lens list-tries + MonadRandom mtl random random-string scrypt servant-server text + ]; + executableHaskellDepends = [ base warp ]; + homepage = "https://oss.xkcd.com/"; + description = "Implement a menu experience fit for web users"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "alure" = callPackage ({ mkDerivation, alure, base, OpenAL }: mkDerivation { @@ -30004,11 +30163,10 @@ self: { }: mkDerivation { pname = "ats-format"; - version = "0.2.0.22"; - sha256 = "19x2pa6fb1k343b4c07xwyc879kfwya1kll0bp59paza1bqhhnnk"; + version = "0.2.0.25"; + sha256 = "0p5pg2ix0ppan0cz4b0pk16ihfcnvqwb8g93k4bh7d304ca5xdk4"; isLibrary = false; isExecutable = true; - enableSeparateDataOutput = true; setupHaskellDepends = [ base Cabal cli-setup ]; executableHaskellDepends = [ ansi-wl-pprint base directory file-embed htoml-megaparsec @@ -30029,8 +30187,8 @@ self: { }: mkDerivation { pname = "ats-pkg"; - version = "2.8.0.8"; - sha256 = "1rc5xcsfgax25kndmghfpr2sh6f6kr5mz358vb8pzlvhcg5q8svr"; + version = "2.9.0.2"; + sha256 = "02j6118i48mrw41c2pj8yc5xkvyw97fw0g1hpvplmy40djjd0qah"; isLibrary = true; isExecutable = true; setupHaskellDepends = [ base Cabal cli-setup ]; @@ -31059,8 +31217,8 @@ self: { }: mkDerivation { pname = "avro"; - version = "0.2.1.0"; - sha256 = "07gqi33aadb9c94b19z1166ayyi0s95ykda77l53vc2al43sa3bl"; + version = "0.2.1.1"; + sha256 = "1y70ir44kg5awgf3x1sl584ag9ddw0mhgqniwar6lgry2ag4vz9f"; libraryHaskellDepends = [ aeson array base base16-bytestring binary bytestring containers data-binary-ieee754 entropy fail hashable mtl pure-zlib scientific @@ -31072,7 +31230,7 @@ self: { QuickCheck scientific semigroups tagged template-haskell text transformers unordered-containers vector ]; - homepage = "https://github.com/haskell-works/hw-haskell-avro.git"; + homepage = "https://github.com/GaloisInc/avro.git"; description = "Avro serialization support for Haskell"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; @@ -32043,28 +32201,6 @@ self: { }: mkDerivation { pname = "backprop"; - version = "0.1.3.0"; - sha256 = "0x1vp48dl0dlq1bwaq0fy9k472rpx571i7klrhnwnqf6nb52mh1w"; - libraryHaskellDepends = [ - base deepseq microlens primitive reflection transformers - type-combinators vector - ]; - benchmarkHaskellDepends = [ - base bifunctors criterion deepseq directory hmatrix lens mnist-idx - mwc-random time transformers vector - ]; - homepage = "https://github.com/mstksg/backprop#readme"; - description = "Heterogeneous automatic differentation (backpropagation)"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "backprop_0_1_5_0" = callPackage - ({ mkDerivation, base, bifunctors, criterion, deepseq, directory - , hmatrix, lens, microlens, mnist-idx, mwc-random, primitive - , reflection, time, transformers, type-combinators, vector - }: - mkDerivation { - pname = "backprop"; version = "0.1.5.0"; sha256 = "0b99krw1l574bcqxck1bqj5sb0slbm24hd85finv3v725ddy8k7f"; libraryHaskellDepends = [ @@ -32078,7 +32214,6 @@ self: { homepage = "https://github.com/mstksg/backprop#readme"; description = "Heterogeneous automatic differentation (backpropagation)"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "backtracking-exceptions" = callPackage @@ -33081,8 +33216,8 @@ self: { ({ mkDerivation, base, battleplace, servant, servant-client }: mkDerivation { pname = "battleplace-api"; - version = "0.1.0.0"; - sha256 = "0hy1y5n064i7g2zknvj7yl7zw3bljqjrfr2sg68cmk9gkd854rlw"; + version = "0.1.0.1"; + sha256 = "1pi1vcniyrpq1xfrizhvgw7xbrc332649zg4jl1fjbqn4l4xqrlg"; libraryHaskellDepends = [ base battleplace servant servant-client ]; @@ -33777,6 +33912,27 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "betris" = callPackage + ({ mkDerivation, base, containers, lens, linear, random, stm + , stm-chans, vty + }: + mkDerivation { + pname = "betris"; + version = "0.1.0.0"; + sha256 = "1qn326s4xydvvgmrhqi48cc2pl9b3mp7swc82qk59gj7cx4dx222"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + base containers lens linear random stm stm-chans vty + ]; + executableHaskellDepends = [ + base containers lens linear random stm stm-chans vty + ]; + homepage = "https://github.com/mlang/betris#readme"; + description = "Braille friendly vertical version of tetris"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "between" = callPackage ({ mkDerivation, base }: mkDerivation { @@ -33879,6 +34035,27 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "bhoogle_0_1_2_6" = callPackage + ({ mkDerivation, base, brick, bytestring, containers, directory + , filepath, hoogle, lens, process, protolude, text, time, vector + , vty + }: + mkDerivation { + pname = "bhoogle"; + version = "0.1.2.6"; + sha256 = "0p6zh1rh80hzrm36w6d5hr6qjkfc71cr96dk9shrndnxlp8vlxsn"; + isLibrary = false; + isExecutable = true; + executableHaskellDepends = [ + base brick bytestring containers directory filepath hoogle lens + process protolude text time vector vty + ]; + homepage = "https://github.com/andrevdm/bhoogle#readme"; + description = "Simple terminal GUI for local hoogle"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "bibdb" = callPackage ({ mkDerivation, alex, array, async, base, bibtex, bytestring , containers, curl, download-curl, filepath, happy, microlens @@ -36849,6 +37026,24 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "blas-carray_0_0_1_1" = callPackage + ({ mkDerivation, base, blas-ffi, carray, netlib-carray, netlib-ffi + , storable-complex, transformers + }: + mkDerivation { + pname = "blas-carray"; + version = "0.0.1.1"; + sha256 = "0ijzcdrbfb9w3vs4g96p30h7ilh9s05ij8n0prinmr1ngmvipbdx"; + libraryHaskellDepends = [ + base blas-ffi carray netlib-carray netlib-ffi storable-complex + transformers + ]; + homepage = "http://hub.darcs.net/thielema/blas-carray/"; + description = "Auto-generated interface to Fortran BLAS via CArrays"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "blas-ffi" = callPackage ({ mkDerivation, base, blas, netlib-ffi }: mkDerivation { @@ -36863,6 +37058,20 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {inherit (pkgs) blas;}; + "blas-ffi_0_0_1_1" = callPackage + ({ mkDerivation, base, blas, netlib-ffi }: + mkDerivation { + pname = "blas-ffi"; + version = "0.0.1.1"; + sha256 = "0dphqcnnka0ahfgdnshm8r3bd6r5wbpln9kksa6y09yi2nnqh3gf"; + libraryHaskellDepends = [ base netlib-ffi ]; + libraryPkgconfigDepends = [ blas ]; + homepage = "http://hub.darcs.net/thielema/blas-ffi/"; + description = "Auto-generated interface to Fortran BLAS"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {inherit (pkgs) blas;}; + "blas-hs" = callPackage ({ mkDerivation, base, blas, storable-complex, vector }: mkDerivation { @@ -37769,8 +37978,26 @@ self: { pname = "boltzmann-samplers"; version = "0.1.0.0"; sha256 = "0gw8d4xrwr9xs9k7dflm12xpkn6k0yn41myvzqzj4c6bhdd0c1sp"; - revision = "1"; - editedCabalFile = "00va7bagszricicai4jckyka8azgw6gly9ps5kabnsyv5znylfr0"; + revision = "2"; + editedCabalFile = "0mmjxyy9pxrrxdrpkl06c2dk980b4z6pvkg5zj3fl56avg3l4q26"; + libraryHaskellDepends = [ + ad base containers hashable hmatrix ieee754 MonadRandom mtl + QuickCheck transformers unordered-containers vector + ]; + homepage = "https://github.com/Lysxia/boltzmann-samplers#readme"; + description = "Uniform random generators"; + license = stdenv.lib.licenses.mit; + }) {}; + + "boltzmann-samplers_0_1_1_0" = callPackage + ({ mkDerivation, ad, base, containers, hashable, hmatrix, ieee754 + , MonadRandom, mtl, QuickCheck, transformers, unordered-containers + , vector + }: + mkDerivation { + pname = "boltzmann-samplers"; + version = "0.1.1.0"; + sha256 = "13l7ml35hm0i2rgw419n7xp2zp58pafm6gmmik3jgbmhfwgkwz6y"; libraryHaskellDepends = [ ad base containers hashable hmatrix ieee754 MonadRandom mtl QuickCheck transformers unordered-containers vector @@ -37778,6 +38005,7 @@ self: { homepage = "https://github.com/Lysxia/boltzmann-samplers#readme"; description = "Uniform random generators"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "bond" = callPackage @@ -38092,17 +38320,6 @@ self: { }) {}; "boomerang" = callPackage - ({ mkDerivation, base, mtl, template-haskell, text }: - mkDerivation { - pname = "boomerang"; - version = "1.4.5.3"; - sha256 = "124k13x5wzjy2qlbdgixncgr5l7cxw4glq1hjb8hyk8vfvgs6qfl"; - libraryHaskellDepends = [ base mtl template-haskell text ]; - description = "Library for invertible parsing and printing"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "boomerang_1_4_5_5" = callPackage ({ mkDerivation, base, mtl, semigroups, template-haskell, text }: mkDerivation { pname = "boomerang"; @@ -38113,7 +38330,6 @@ self: { ]; description = "Library for invertible parsing and printing"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "boomslang" = callPackage @@ -40199,6 +40415,8 @@ self: { pname = "bytestring-trie"; version = "0.2.4.1"; sha256 = "0qqklrvdcprchnl4bxr6w7zf6k5gncincl3kysm34gd04sszxr1g"; + revision = "1"; + editedCabalFile = "0f56pb1k1va7bs9rpn0b8hclxhn5pcjln857k50myhyzrwz8qg7r"; libraryHaskellDepends = [ base binary bytestring ]; homepage = "http://code.haskell.org/~wren/"; description = "An efficient finite map from (byte)strings to values"; @@ -41131,25 +41349,6 @@ self: { }: mkDerivation { pname = "cabal-rpm"; - version = "0.12.1"; - sha256 = "0avp7prkzp522mpqnn60xmsqqp10zhp1phhlj14qzp4162772fss"; - isLibrary = false; - isExecutable = true; - executableHaskellDepends = [ - base bytestring Cabal directory filepath http-client - http-client-tls http-conduit process time unix - ]; - homepage = "https://github.com/juhp/cabal-rpm"; - description = "RPM packaging tool for Haskell Cabal-based packages"; - license = stdenv.lib.licenses.gpl3; - }) {}; - - "cabal-rpm_0_12_2" = callPackage - ({ mkDerivation, base, bytestring, Cabal, directory, filepath - , http-client, http-client-tls, http-conduit, process, time, unix - }: - mkDerivation { - pname = "cabal-rpm"; version = "0.12.2"; sha256 = "00i3v62ys6fhq2rnw9q2hhc2h54v8my14ll746vpma2gfdy90y1c"; isLibrary = false; @@ -41161,7 +41360,6 @@ self: { homepage = "https://github.com/juhp/cabal-rpm"; description = "RPM packaging tool for Haskell Cabal-based packages"; license = stdenv.lib.licenses.gpl3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "cabal-scripts" = callPackage @@ -42813,6 +43011,19 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "casing_0_1_3_0" = callPackage + ({ mkDerivation, base, split, tasty, tasty-hunit }: + mkDerivation { + pname = "casing"; + version = "0.1.3.0"; + sha256 = "08cklvgm2c2519c4xm22mxfkjmizky8j64a98cqgdgz9rl6ryq9m"; + libraryHaskellDepends = [ base split ]; + testHaskellDepends = [ base tasty tasty-hunit ]; + description = "Convert between various source code casing conventions"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "casr-logbook" = callPackage ({ mkDerivation, base, containers, digit, directory, doctest , filepath, lens, lucid, QuickCheck, template-haskell, text, time @@ -46870,18 +47081,18 @@ self: { "closed" = callPackage ({ mkDerivation, aeson, base, cassava, deepseq, hashable, hspec - , markdown-unlit, QuickCheck, vector + , markdown-unlit, persistent, QuickCheck, text, vector }: mkDerivation { pname = "closed"; - version = "0.1.0"; - sha256 = "0x87s852xfsyxnwj88kw38wmpzrj52hd7r87xx73r4ffv0lp6kh4"; + version = "0.2.0"; + sha256 = "0762acn2dik98hp4bvlyvwfy1jfzb4i6ri9pnxa07risain1qc3s"; libraryHaskellDepends = [ - aeson base cassava deepseq hashable QuickCheck + aeson base cassava deepseq hashable persistent QuickCheck text ]; testHaskellDepends = [ - aeson base cassava deepseq hashable hspec markdown-unlit QuickCheck - vector + aeson base cassava deepseq hashable hspec markdown-unlit persistent + QuickCheck text vector ]; homepage = "https://github.com/frontrowed/closed#readme"; description = "Integers bounded by a closed interval"; @@ -48526,6 +48737,26 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "combinat-compat" = callPackage + ({ mkDerivation, array, base, containers, QuickCheck, random + , test-framework, test-framework-quickcheck2, transformers + }: + mkDerivation { + pname = "combinat-compat"; + version = "0.2.8.2"; + sha256 = "0mh5f8vmbwnib1qv9vvp45gwwj6942l1jhxnglq9i4za40k1r8ff"; + libraryHaskellDepends = [ + array base containers random transformers + ]; + testHaskellDepends = [ + array base containers QuickCheck random test-framework + test-framework-quickcheck2 transformers + ]; + homepage = "http://code.haskell.org/~bkomuves/"; + description = "Generate and manipulate various combinatorial objects"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "combinat-diagrams" = callPackage ({ mkDerivation, array, base, colour, combinat, containers , diagrams-core, diagrams-lib, linear, transformers @@ -48638,8 +48869,8 @@ self: { ({ mkDerivation, base, utility-ht }: mkDerivation { pname = "comfort-array"; - version = "0.0"; - sha256 = "0mkfw2f56idh1nnmgamgazwzip6c4pmxsiaijs8k69ggzi2fb8bx"; + version = "0.0.1"; + sha256 = "1nbnnhmfbsiq31damx998sm7hz127mdqbnzzybz00962bmlmvp72"; libraryHaskellDepends = [ base utility-ht ]; homepage = "http://hub.darcs.net/thielema/comfort-array/"; description = "Arrays where the index type is a function of the shape type"; @@ -52650,26 +52881,6 @@ self: { }: mkDerivation { pname = "country"; - version = "0.1.4"; - sha256 = "027i4ncnsyii41wfndn369xmlbkp4vvcrx7m7cdb07n4wlcpz0bl"; - revision = "1"; - editedCabalFile = "0sjzrld5qa2wn66zgf25w5h41179mcmsjvndn1j8kl20bfsiwhvh"; - libraryHaskellDepends = [ - aeson attoparsec base bytestring ghc-prim hashable primitive - scientific text unordered-containers - ]; - testHaskellDepends = [ base ]; - homepage = "https://github.com/andrewthad/country#readme"; - description = "Country data type and functions"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "country_0_1_5" = callPackage - ({ mkDerivation, aeson, attoparsec, base, bytestring, ghc-prim - , hashable, primitive, scientific, text, unordered-containers - }: - mkDerivation { - pname = "country"; version = "0.1.5"; sha256 = "0shp4kq8bibfwrjldz8akghgm3n2lq00dybxnq4grmbl5phj3a9s"; libraryHaskellDepends = [ @@ -52680,7 +52891,6 @@ self: { homepage = "https://github.com/andrewthad/country#readme"; description = "Country data type and functions"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "country-codes" = callPackage @@ -57306,25 +57516,12 @@ self: { ({ mkDerivation, base }: mkDerivation { pname = "data-inttrie"; - version = "0.1.2"; - sha256 = "1y8xbwy1cdfrswlbr029hlyj3cbsfvayxh4kklsdzbrwgnnygnld"; - libraryHaskellDepends = [ base ]; - homepage = "http://github.com/luqui/data-inttrie"; - description = "A lazy, infinite trie of integers"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "data-inttrie_0_1_4" = callPackage - ({ mkDerivation, base }: - mkDerivation { - pname = "data-inttrie"; version = "0.1.4"; sha256 = "0m5xww8zvsa0whxl89wndpbdz9p5n03q3h3a904nqrxh966psfkb"; libraryHaskellDepends = [ base ]; homepage = "https://github.com/luqui/data-inttrie"; description = "A simple lazy, infinite trie from integers"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "data-ivar" = callPackage @@ -60176,6 +60373,19 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "deque_0_2_1" = callPackage + ({ mkDerivation, base }: + mkDerivation { + pname = "deque"; + version = "0.2.1"; + sha256 = "0r1jabz5jamm79nrbwjnajzzn77fkhqbjfnmkahg293761z1k781"; + libraryHaskellDepends = [ base ]; + homepage = "https://github.com/nikita-volkov/deque"; + description = "Double-ended queue"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "dequeue" = callPackage ({ mkDerivation, base, Cabal, cabal-test-quickcheck, QuickCheck , safe @@ -64220,23 +64430,6 @@ self: { ({ mkDerivation, base, doctest }: mkDerivation { pname = "doctest-driver-gen"; - version = "0.2.0.1"; - sha256 = "0snlfs2cmra11q2xhgwrbjxazr5dhq84vx5n13491545iknhg0ld"; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ base doctest ]; - executableHaskellDepends = [ base ]; - testHaskellDepends = [ base doctest ]; - homepage = "https://github.com/Hexirp/doctest-driver-gen#readme"; - description = "Generate driver file for doctest's cabal integration"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - - "doctest-driver-gen_0_2_0_2" = callPackage - ({ mkDerivation, base, doctest }: - mkDerivation { - pname = "doctest-driver-gen"; version = "0.2.0.2"; sha256 = "0yil9va8l4q1wp6zz6w699103ym54fw03vsigzj12iql6y06cxxl"; isLibrary = true; @@ -69099,6 +69292,27 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "error-context" = callPackage + ({ mkDerivation, base, exceptions, monad-logger, mtl, resourcet + , safe-exceptions, tasty, tasty-hunit, text, unliftio-core + }: + mkDerivation { + pname = "error-context"; + version = "0.1.2.0"; + sha256 = "0p07lvwa7rvrrlsyx3qjnh5q8z4p0r9nspgi03qwmi8vjkhy0pr8"; + libraryHaskellDepends = [ + base exceptions monad-logger mtl resourcet safe-exceptions text + unliftio-core + ]; + testHaskellDepends = [ + base exceptions monad-logger mtl resourcet safe-exceptions tasty + tasty-hunit text unliftio-core + ]; + homepage = "https://github.com/mtesseract/error-context#readme"; + description = "Provides API for enriching errors with contexts"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "error-continuations" = callPackage ({ mkDerivation, base, either, mtl, transformers }: mkDerivation { @@ -70536,26 +70750,6 @@ self: { }: mkDerivation { pname = "exception-transformers"; - version = "0.4.0.5"; - sha256 = "12q8c64kg2ksz90ld32m6n811c54syhwihnj2fd7blf2qsmalk2n"; - libraryHaskellDepends = [ - base stm transformers transformers-compat - ]; - testHaskellDepends = [ - base HUnit test-framework test-framework-hunit transformers - transformers-compat - ]; - description = "Type classes and monads for unchecked extensible exceptions"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - - "exception-transformers_0_4_0_6" = callPackage - ({ mkDerivation, base, HUnit, stm, test-framework - , test-framework-hunit, transformers, transformers-compat - }: - mkDerivation { - pname = "exception-transformers"; version = "0.4.0.6"; sha256 = "0abxwkq28wasy06njhaibf8cki9hifk5rjck6r3izbnswjcdn65m"; libraryHaskellDepends = [ @@ -71862,10 +72056,8 @@ self: { }: mkDerivation { pname = "fast-arithmetic"; - version = "0.3.3.3"; - sha256 = "1wm4s2xx3r3bjrkby4dddkc274pqvaa3q94j14pj8hayja6hd6ci"; - revision = "1"; - editedCabalFile = "13x505dg6iz3iipkr15hdz105b6kgygccdwspj400b16lzld9vz2"; + version = "0.3.3.4"; + sha256 = "176qm6d9rqq85cbpq6n0fmqwvyi529ml6z346k9a1mfpzi85w3xy"; setupHaskellDepends = [ ats-pkg base Cabal ]; libraryHaskellDepends = [ base composition-prelude gmpint ]; librarySystemDepends = [ numbertheory ]; @@ -73528,26 +73720,6 @@ self: { }: mkDerivation { pname = "filecache"; - version = "0.3.1"; - sha256 = "199npfbnnbf01ygwj559ikz51bfz23pggnvgdmj2azscbd80mbq7"; - libraryHaskellDepends = [ - base containers directory exceptions filepath fsnotify mtl stm - strict-base-types time - ]; - testHaskellDepends = [ - base containers directory filepath hspec stm temporary - ]; - homepage = "http://lpuppet.banquise.net/"; - description = "A cache system associating values to files"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "filecache_0_3_2" = callPackage - ({ mkDerivation, base, containers, directory, exceptions, filepath - , fsnotify, hspec, mtl, stm, strict-base-types, temporary, time - }: - mkDerivation { - pname = "filecache"; version = "0.3.2"; sha256 = "1ddpji3293hrhw7rgl7b41prhffjsb7rgf5x2ijjbiblnzwazr42"; libraryHaskellDepends = [ @@ -73560,7 +73732,6 @@ self: { homepage = "http://lpuppet.banquise.net/"; description = "A cache system associating values to files"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "filediff" = callPackage @@ -73961,23 +74132,6 @@ self: { }: mkDerivation { pname = "fingertree"; - version = "0.1.3.1"; - sha256 = "08wqzrjdndd7svkil1wr964w4d7zay04nlg7dyzw7wm4d3d3ak4p"; - libraryHaskellDepends = [ base ]; - testHaskellDepends = [ - base HUnit QuickCheck test-framework test-framework-hunit - test-framework-quickcheck2 - ]; - description = "Generic finger-tree structure, with example instances"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "fingertree_0_1_4_1" = callPackage - ({ mkDerivation, base, HUnit, QuickCheck, test-framework - , test-framework-hunit, test-framework-quickcheck2 - }: - mkDerivation { - pname = "fingertree"; version = "0.1.4.1"; sha256 = "192fyzv0pn1437wdpqg1l80rswkk4rw3w61r4bq7dhv354bdqy4p"; libraryHaskellDepends = [ base ]; @@ -73987,7 +74141,6 @@ self: { ]; description = "Generic finger-tree structure, with example instances"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "fingertree-psqueue" = callPackage @@ -75634,6 +75787,27 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "fold-debounce-conduit_0_2_0_1" = callPackage + ({ mkDerivation, base, conduit, fold-debounce, hspec, resourcet + , stm, transformers, transformers-base + }: + mkDerivation { + pname = "fold-debounce-conduit"; + version = "0.2.0.1"; + sha256 = "02shx123yd9g9y8n9aj6ai6yrlcb7zjqyhvw530kw68ailnl762z"; + libraryHaskellDepends = [ + base conduit fold-debounce resourcet stm transformers + transformers-base + ]; + testHaskellDepends = [ + base conduit hspec resourcet stm transformers + ]; + homepage = "https://github.com/debug-ito/fold-debounce-conduit"; + description = "Regulate input traffic from conduit Source with Control.FoldDebounce"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "foldl" = callPackage ({ mkDerivation, base, bytestring, comonad, containers , contravariant, criterion, hashable, mwc-random, primitive @@ -76793,29 +76967,6 @@ self: { license = stdenv.lib.licenses.mit; }) {}; - "free_4_12_4" = callPackage - ({ mkDerivation, base, bifunctors, comonad, containers - , distributive, exceptions, mtl, prelude-extras, profunctors - , semigroupoids, semigroups, template-haskell, transformers - , transformers-compat - }: - mkDerivation { - pname = "free"; - version = "4.12.4"; - sha256 = "1147s393442xf4gkpbq0rd1p286vmykgx85mxhk5d1c7wfm4bzn9"; - revision = "2"; - editedCabalFile = "0gmib9bmswrqhl47cp5b871v9f44v9yidzxpljkszy49y9qdf560"; - libraryHaskellDepends = [ - base bifunctors comonad containers distributive exceptions mtl - prelude-extras profunctors semigroupoids semigroups - template-haskell transformers transformers-compat - ]; - homepage = "http://github.com/ekmett/free/"; - description = "Monads for free"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - "free" = callPackage ({ mkDerivation, base, bifunctors, comonad, containers , distributive, exceptions, mtl, profunctors, semigroupoids @@ -80750,20 +80901,20 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "ghc_8_2_1" = callPackage + "ghc_8_4_1" = callPackage ({ mkDerivation, alex, array, base, binary, bytestring, containers , deepseq, directory, filepath, ghc-boot, ghc-boot-th, ghci, happy - , hoopl, hpc, process, template-haskell, terminfo, time - , transformers, unix + , hpc, process, template-haskell, terminfo, time, transformers + , unix }: mkDerivation { pname = "ghc"; - version = "8.2.1"; - sha256 = "0b87bj9n2zsi0v9s5ssf5b9c4y4lji7jbxp9j8s93hb95zlmzq17"; + version = "8.4.1"; + sha256 = "1axvba6vd13bf9z45jffv05r3jy5n5pxly59r8s5pxh369188076"; libraryHaskellDepends = [ array base binary bytestring containers deepseq directory filepath - ghc-boot ghc-boot-th ghci hoopl hpc process template-haskell - terminfo time transformers unix + ghc-boot ghc-boot-th ghci hpc process template-haskell terminfo + time transformers unix ]; libraryToolDepends = [ alex happy ]; homepage = "http://www.haskell.org/ghc/"; @@ -81366,12 +81517,12 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "ghc-prim_0_5_1_1" = callPackage + "ghc-prim_0_5_2_0" = callPackage ({ mkDerivation, rts }: mkDerivation { pname = "ghc-prim"; - version = "0.5.1.1"; - sha256 = "1dkl0l891min86jpndcah8dx7i3ssnaj6yf2ghxplp8619bmqhb2"; + version = "0.5.2.0"; + sha256 = "1ccvzkw3v4xlj7g126wwlc5rvd480hbv1pcq2rfb85k77rzi6bjr"; libraryHaskellDepends = [ rts ]; description = "GHC primitives"; license = stdenv.lib.licenses.bsd3; @@ -89455,17 +89606,17 @@ self: { }) {}; "gtk-traymanager" = callPackage - ({ mkDerivation, base, glib, gtk, gtk2, x11 }: + ({ mkDerivation, base, glib, gtk3, x11 }: mkDerivation { pname = "gtk-traymanager"; - version = "0.1.6"; - sha256 = "0hind14k37823jsa9dg2r6bfj7d6y1m70xn8mcr610rhakazac6b"; - libraryHaskellDepends = [ base glib gtk ]; - libraryPkgconfigDepends = [ gtk2 x11 ]; + version = "1.0.0"; + sha256 = "1sg2f8pmnh2xrnra8dx46q9jfy32dlbrmk2hamam8g3i5qsvd0f7"; + libraryHaskellDepends = [ base glib gtk3 ]; + libraryPkgconfigDepends = [ x11 ]; homepage = "http://github.com/travitch/gtk-traymanager"; description = "A wrapper around the eggtraymanager library for Linux system trays"; license = stdenv.lib.licenses.lgpl21; - }) {gtk2 = pkgs.gnome2.gtk; inherit (pkgs) x11;}; + }) {inherit (pkgs) x11;}; "gtk2hs-buildtools" = callPackage ({ mkDerivation, alex, array, base, Cabal, containers, directory @@ -91121,35 +91272,6 @@ self: { "hackage-security" = callPackage ({ mkDerivation, base, base16-bytestring, base64-bytestring , bytestring, Cabal, containers, cryptohash-sha256, directory - , ed25519, filepath, ghc-prim, HUnit, mtl, network, network-uri - , parsec, pretty, QuickCheck, tar, tasty, tasty-hunit - , tasty-quickcheck, template-haskell, temporary, time, transformers - , zlib - }: - mkDerivation { - pname = "hackage-security"; - version = "0.5.2.2"; - sha256 = "0h9wag599x9ysdrgwa643phmpb1xiiwhyh2dix67fji6a5w86yjh"; - revision = "5"; - editedCabalFile = "0f1ml7dvwk4xrz3gsf133n67cbxzf0sz5frxfsx9i79x1yrg9zdj"; - libraryHaskellDepends = [ - base base16-bytestring base64-bytestring bytestring Cabal - containers cryptohash-sha256 directory ed25519 filepath ghc-prim - mtl network network-uri parsec pretty tar template-haskell time - transformers zlib - ]; - testHaskellDepends = [ - base bytestring Cabal containers HUnit network-uri QuickCheck tar - tasty tasty-hunit tasty-quickcheck temporary time zlib - ]; - homepage = "https://github.com/well-typed/hackage-security"; - description = "Hackage security library"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "hackage-security_0_5_3_0" = callPackage - ({ mkDerivation, base, base16-bytestring, base64-bytestring - , bytestring, Cabal, containers, cryptohash-sha256, directory , ed25519, filepath, ghc-prim, mtl, network, network-uri, parsec , pretty, QuickCheck, tar, tasty, tasty-hunit, tasty-quickcheck , template-haskell, temporary, time, transformers, zlib @@ -91171,7 +91293,6 @@ self: { homepage = "https://github.com/haskell/hackage-security"; description = "Hackage security library"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "hackage-security-HTTP" = callPackage @@ -92209,50 +92330,6 @@ self: { ({ mkDerivation, base, binary, blaze-html, blaze-markup, bytestring , containers, cryptohash, data-default, deepseq, directory , file-embed, filepath, fsnotify, http-conduit, http-types - , lrucache, mtl, network, network-uri, optparse-applicative, pandoc - , pandoc-citeproc, parsec, process, QuickCheck, random, regex-base - , regex-tdfa, resourcet, scientific, tagsoup, tasty, tasty-hunit - , tasty-quickcheck, text, time, time-locale-compat - , unordered-containers, utillinux, vector, wai, wai-app-static - , warp, yaml - }: - mkDerivation { - pname = "hakyll"; - version = "4.12.0.1"; - sha256 = "07alx008dg4q2ygwqf854r1nyizac0i3frkk23lzsfpzrbi784r0"; - isLibrary = true; - isExecutable = true; - enableSeparateDataOutput = true; - libraryHaskellDepends = [ - base binary blaze-html blaze-markup bytestring containers - cryptohash data-default deepseq directory file-embed filepath - fsnotify http-conduit http-types lrucache mtl network network-uri - optparse-applicative pandoc pandoc-citeproc parsec process random - regex-base regex-tdfa resourcet scientific tagsoup text time - time-locale-compat unordered-containers vector wai wai-app-static - warp yaml - ]; - executableHaskellDepends = [ base directory filepath ]; - testHaskellDepends = [ - base binary blaze-html blaze-markup bytestring containers - cryptohash data-default deepseq directory filepath fsnotify - http-conduit http-types lrucache mtl network network-uri - optparse-applicative pandoc pandoc-citeproc parsec process - QuickCheck random regex-base regex-tdfa resourcet scientific - tagsoup tasty tasty-hunit tasty-quickcheck text time - time-locale-compat unordered-containers vector wai wai-app-static - warp yaml - ]; - testToolDepends = [ utillinux ]; - homepage = "http://jaspervdj.be/hakyll"; - description = "A static website compiler library"; - license = stdenv.lib.licenses.bsd3; - }) {inherit (pkgs) utillinux;}; - - "hakyll_4_12_1_0" = callPackage - ({ mkDerivation, base, binary, blaze-html, blaze-markup, bytestring - , containers, cryptohash, data-default, deepseq, directory - , file-embed, filepath, fsnotify, http-conduit, http-types , lrucache, mtl, network-uri, optparse-applicative, pandoc , pandoc-citeproc, parsec, process, QuickCheck, random, regex-tdfa , resourcet, scientific, tagsoup, tasty, tasty-hunit @@ -92285,7 +92362,6 @@ self: { homepage = "http://jaspervdj.be/hakyll"; description = "A static website compiler library"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {inherit (pkgs) utillinux;}; "hakyll-R" = callPackage @@ -93775,35 +93851,6 @@ self: { ({ mkDerivation, base, base64-bytestring, blaze-html, bytestring , containers, directory, exceptions, extensible-exceptions , filepath, hslogger, html, HUnit, monad-control, mtl, network - , network-uri, old-locale, parsec, process, sendfile, syb - , system-filepath, template-haskell, text, threads, time - , time-compat, transformers, transformers-base, transformers-compat - , unix, utf8-string, xhtml, zlib - }: - mkDerivation { - pname = "happstack-server"; - version = "7.5.0.1"; - sha256 = "05cb20rj4qys7r5kkbvjnm4bknfzwanf4r4yk1jq7a71x2sgcxc0"; - libraryHaskellDepends = [ - base base64-bytestring blaze-html bytestring containers directory - exceptions extensible-exceptions filepath hslogger html - monad-control mtl network network-uri old-locale parsec process - sendfile syb system-filepath template-haskell text threads time - time-compat transformers transformers-base transformers-compat unix - utf8-string xhtml zlib - ]; - testHaskellDepends = [ - base bytestring containers HUnit parsec zlib - ]; - homepage = "http://happstack.com"; - description = "Web related tools and services"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "happstack-server_7_5_1" = callPackage - ({ mkDerivation, base, base64-bytestring, blaze-html, bytestring - , containers, directory, exceptions, extensible-exceptions - , filepath, hslogger, html, HUnit, monad-control, mtl, network , network-uri, old-locale, parsec, process, semigroups, sendfile , syb, system-filepath, template-haskell, text, threads, time , time-compat, transformers, transformers-base, transformers-compat @@ -93827,7 +93874,6 @@ self: { homepage = "http://happstack.com"; description = "Web related tools and services"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "happstack-server-tls" = callPackage @@ -98032,38 +98078,6 @@ self: { }) {}; "hasmin" = callPackage - ({ mkDerivation, attoparsec, base, bifunctors, bytestring - , containers, criterion, directory, doctest, doctest-discover - , gitrev, hopfli, hspec, hspec-attoparsec, matrix, mtl, numbers - , optparse-applicative, parsers, QuickCheck, text - }: - mkDerivation { - pname = "hasmin"; - version = "1.0.1"; - sha256 = "1h5ygl9qmzmbhqfb58hhm2zw850dqfkp4b8cp3bhsnangg4lgbjk"; - revision = "3"; - editedCabalFile = "0v410xlx9riyhzxbqi2fx8qnw9i3k9cc6q24f0cz2ympl86f4019"; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ - attoparsec base bifunctors containers matrix mtl numbers parsers - text - ]; - executableHaskellDepends = [ - base bytestring gitrev hopfli optparse-applicative text - ]; - testHaskellDepends = [ - attoparsec base doctest doctest-discover hspec hspec-attoparsec mtl - QuickCheck text - ]; - benchmarkHaskellDepends = [ base criterion directory text ]; - homepage = "https://github.com/contivero/hasmin#readme"; - description = "CSS Minifier"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - - "hasmin_1_0_2" = callPackage ({ mkDerivation, attoparsec, base, bytestring, containers , criterion, directory, doctest, doctest-discover, gitrev, hopfli , hspec, hspec-attoparsec, matrix, mtl, numbers @@ -100431,8 +100445,8 @@ self: { pname = "heist"; version = "1.0.1.2"; sha256 = "0kpn5c3j7d42l12axd05hglhxqc4y7l0rz57lcqh3yznjl7mzv71"; - revision = "2"; - editedCabalFile = "0nyxym4jqkcxx0rim7vzfgr1hhmcgvgi3pann4192ahhsail8b2d"; + revision = "3"; + editedCabalFile = "0siqhy0svk9lfi8rx7lhjhjihrmjk6plvyjnhhyhvyakmycggqpc"; libraryHaskellDepends = [ aeson attoparsec base blaze-builder blaze-html bytestring containers directory directory-tree dlist filepath hashable @@ -101046,14 +101060,14 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "herms_1_8_2_1" = callPackage + "herms_1_8_2_2" = callPackage ({ mkDerivation, ansi-terminal, base, brick, directory, microlens , microlens-th, optparse-applicative, semigroups, split, vty }: mkDerivation { pname = "herms"; - version = "1.8.2.1"; - sha256 = "0njp1jsz4clb6qyz00xrpw7av4109gx5wd4h180q794vi8xw6v4j"; + version = "1.8.2.2"; + sha256 = "0x6h1l9kikjqzyyxa23y9df6bdw529cr07g74qc2qbdbg39713zq"; isLibrary = false; isExecutable = true; enableSeparateDataOutput = true; @@ -102890,9 +102904,12 @@ self: { pname = "hinduce-classifier-decisiontree"; version = "0.0.0.1"; sha256 = "1hdz4lbbpy2yc5j7chkagjvslsakmv3hbz2s7lpz0isfq7ls9idl"; + revision = "1"; + editedCabalFile = "16zh2f474ga3s1jzg58hv6q103gdxb3kl25g2cj0k14jxr4k15a2"; libraryHaskellDepends = [ base convertible hinduce-classifier hinduce-missingh layout ]; + homepage = "https://github.com/roberth/hinduce-classifier-decisiontree#readme"; description = "Decision Tree Classifiers for hInduce"; license = stdenv.lib.licenses.bsd3; }) {}; @@ -103893,10 +103910,8 @@ self: { }: mkDerivation { pname = "hledger-iadd"; - version = "1.3.2"; - sha256 = "1n21i1hqqrzd3fdrq6cclf8bfginwl4bhjy16vxfh9ba644920xf"; - revision = "1"; - editedCabalFile = "068fxn694km5sjbmmbhgaw512cxdv3m0kgjkaj8lbvpk5hnkd60b"; + version = "1.3.3"; + sha256 = "0fm5y2qyrg661q7y23f5abg78rbwz4jqkvlar8ns8wz9qwbml0ix"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -104397,30 +104412,6 @@ self: { }: mkDerivation { pname = "hmatrix-backprop"; - version = "0.1.0.0"; - sha256 = "088spv7149788iwda2pyf6fc9i40vq4dfziqldgxjrnngxw9z8iv"; - libraryHaskellDepends = [ - ANum backprop base ghc-typelits-knownnat ghc-typelits-natnormalise - hmatrix hmatrix-vector-sized microlens vector vector-sized - ]; - testHaskellDepends = [ - backprop base finite-typelits hedgehog hmatrix hmatrix-vector-sized - microlens microlens-platform vector-sized - ]; - homepage = "https://github.com/mstksg/hmatrix-backprop#readme"; - description = "hmatrix operations lifted for backprop"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - - "hmatrix-backprop_0_1_2_0" = callPackage - ({ mkDerivation, ANum, backprop, base, finite-typelits - , ghc-typelits-knownnat, ghc-typelits-natnormalise, hedgehog - , hmatrix, hmatrix-vector-sized, microlens, microlens-platform - , vector, vector-sized - }: - mkDerivation { - pname = "hmatrix-backprop"; version = "0.1.2.0"; sha256 = "0lrdy5zxl8kvzfsgb4i5lqvdaqpnwixgjnjsvkm89fw6ms86bqac"; libraryHaskellDepends = [ @@ -107139,6 +107130,37 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "hpio_0_9_0_6" = callPackage + ({ mkDerivation, async, base, bytestring, containers, directory + , doctest, exceptions, filepath, hspec, monad-control, monad-logger + , mtl, optparse-applicative, protolude, QuickCheck, text + , transformers, transformers-base, unix, unix-bytestring + }: + mkDerivation { + pname = "hpio"; + version = "0.9.0.6"; + sha256 = "07443kb6w1kwcg78j8jaffb5pblv9si7bvsmlg4dbm32m4wd66xx"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + base bytestring containers directory exceptions filepath + monad-control monad-logger mtl protolude QuickCheck text + transformers transformers-base unix unix-bytestring + ]; + executableHaskellDepends = [ + async base exceptions mtl optparse-applicative protolude text + transformers + ]; + testHaskellDepends = [ + base containers directory doctest exceptions filepath hspec + protolude QuickCheck + ]; + homepage = "https://github.com/quixoftic/hpio#readme"; + description = "Monads for GPIO in Haskell"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "hplayground" = callPackage ({ mkDerivation, base, containers, data-default, haste-compiler , haste-perch, monads-tf, transformers @@ -107199,27 +107221,6 @@ self: { }: mkDerivation { pname = "hpp"; - version = "0.5.1"; - sha256 = "0bdx85k9c9cb5wkp91fi1sb0dahg6f4fknyddfh92wcywa485q9b"; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ - base bytestring bytestring-trie directory filepath ghc-prim time - transformers - ]; - executableHaskellDepends = [ base directory filepath time ]; - testHaskellDepends = [ base bytestring transformers ]; - homepage = "https://github.com/acowley/hpp"; - description = "A Haskell pre-processor"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "hpp_0_5_2" = callPackage - ({ mkDerivation, base, bytestring, bytestring-trie, directory - , filepath, ghc-prim, time, transformers - }: - mkDerivation { - pname = "hpp"; version = "0.5.2"; sha256 = "1r1sas1rcxcra4q3vjw3qmiv0xc4j263m7p93y6bwm1fvpxlkvcc"; isLibrary = true; @@ -107233,7 +107234,6 @@ self: { homepage = "https://github.com/acowley/hpp"; description = "A Haskell pre-processor"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "hpqtypes" = callPackage @@ -108318,8 +108318,8 @@ self: { }: mkDerivation { pname = "hs2ats"; - version = "0.2.1.10"; - sha256 = "0cvp4l3w06yccdcbfhcbaazan9sfz72jd866w90gx7aibwqg2zsy"; + version = "0.3.0.0"; + sha256 = "1s92riisihcqim6hy4sa4z3dhk92dp2iyn32j0jl0qlpzdlbj4cp"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -108455,21 +108455,22 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "hsass_0_6_0" = callPackage + "hsass_0_7_0" = callPackage ({ mkDerivation, base, bytestring, data-default-class, filepath - , hlibsass, hspec, hspec-discover, monad-loops, temporary + , hlibsass, hspec, hspec-discover, monad-loops, temporary, text , transformers }: mkDerivation { pname = "hsass"; - version = "0.6.0"; - sha256 = "14wvgcp9skdqag16fvbbkfmimpxbm9y2hh9g6alacxasan8qjn6j"; + version = "0.7.0"; + sha256 = "0mqsj1jm37pqc1vwjs5y5mh4sfhdyclp1vdr7q5nq2a3pa3qwxbk"; libraryHaskellDepends = [ base bytestring data-default-class filepath hlibsass monad-loops transformers ]; testHaskellDepends = [ base bytestring data-default-class hspec hspec-discover temporary + text ]; homepage = "https://github.com/jakubfijalkowski/hsass"; description = "Integrating Sass into Haskell applications"; @@ -112280,8 +112281,8 @@ self: { }: mkDerivation { pname = "htoml-megaparsec"; - version = "1.1.0.1"; - sha256 = "10bgm0dqi2hni9sxjri2i7imfwqfi750pwwrpbghdvyfxrivfcpy"; + version = "1.1.0.2"; + sha256 = "0w59c20d4g64lldd6xfs82di56dbixmh6win6x80ddb1m0y9iaxd"; libraryHaskellDepends = [ base composition-prelude containers deepseq megaparsec mtl old-locale text time unordered-containers vector @@ -112476,34 +112477,6 @@ self: { }: mkDerivation { pname = "http-client"; - version = "0.5.11"; - sha256 = "0mjm2d77i82jazq0602v34m5xiyxc15680zx6ay9ncspr7rhd6wp"; - libraryHaskellDepends = [ - array base blaze-builder bytestring case-insensitive containers - cookie deepseq exceptions filepath ghc-prim http-types memory - mime-types network network-uri random stm streaming-commons text - time transformers - ]; - testHaskellDepends = [ - async base blaze-builder bytestring case-insensitive containers - deepseq directory hspec http-types monad-control network - network-uri streaming-commons text time transformers zlib - ]; - doCheck = false; - homepage = "https://github.com/snoyberg/http-client"; - description = "An HTTP client engine"; - license = stdenv.lib.licenses.mit; - }) {}; - - "http-client_0_5_12" = callPackage - ({ mkDerivation, array, async, base, blaze-builder, bytestring - , case-insensitive, containers, cookie, deepseq, directory - , exceptions, filepath, ghc-prim, hspec, http-types, memory - , mime-types, monad-control, network, network-uri, random, stm - , streaming-commons, text, time, transformers, zlib - }: - mkDerivation { - pname = "http-client"; version = "0.5.12"; sha256 = "1m4c4zyl8y3i8bzyrgqv9kcjqzj17rwnf49dvn6745bn8kiyq6v0"; libraryHaskellDepends = [ @@ -112521,7 +112494,6 @@ self: { homepage = "https://github.com/snoyberg/http-client"; description = "An HTTP client engine"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "http-client-auth" = callPackage @@ -114262,25 +114234,6 @@ self: { }) {}; "hw-fingertree-strict" = callPackage - ({ mkDerivation, base, hedgehog, hspec, HUnit, hw-hspec-hedgehog - , QuickCheck, test-framework, test-framework-hunit - , test-framework-quickcheck2 - }: - mkDerivation { - pname = "hw-fingertree-strict"; - version = "0.1.0.2"; - sha256 = "1ixkzdis47ic76g8cvwnigcr49256jbcpvqdrr6y8a7cvdvd41fv"; - libraryHaskellDepends = [ base ]; - testHaskellDepends = [ - base hedgehog hspec HUnit hw-hspec-hedgehog QuickCheck - test-framework test-framework-hunit test-framework-quickcheck2 - ]; - homepage = "https://github.com/haskell-works/hw-fingertree-strict#readme"; - description = "Generic strict finger-tree structure"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "hw-fingertree-strict_0_1_0_3" = callPackage ({ mkDerivation, base, deepseq, hedgehog, hspec, HUnit , hw-hspec-hedgehog, QuickCheck, test-framework , test-framework-hunit, test-framework-quickcheck2 @@ -114297,7 +114250,6 @@ self: { homepage = "https://github.com/haskell-works/hw-fingertree-strict#readme"; description = "Generic strict finger-tree structure"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "hw-hedgehog" = callPackage @@ -114631,6 +114583,31 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "hw-rankselect-base_0_3_0_0" = callPackage + ({ mkDerivation, base, bits-extra, criterion, hedgehog, hspec + , hw-bits, hw-hedgehog, hw-hspec-hedgehog, hw-int, hw-prim + , hw-string-parse, QuickCheck, safe, vector + }: + mkDerivation { + pname = "hw-rankselect-base"; + version = "0.3.0.0"; + sha256 = "19gclmljps2nplfqch26grzagvsraafr4540s6x19x2m58aa3m7g"; + libraryHaskellDepends = [ + base bits-extra hw-bits hw-int hw-prim hw-string-parse safe vector + ]; + testHaskellDepends = [ + base bits-extra hedgehog hspec hw-bits hw-hedgehog + hw-hspec-hedgehog hw-prim QuickCheck vector + ]; + benchmarkHaskellDepends = [ + base bits-extra criterion hw-bits hw-prim vector + ]; + homepage = "http://github.com/haskell-works/hw-rankselect-base#readme"; + description = "Rank-select base"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "hw-string-parse" = callPackage ({ mkDerivation, base, bytestring, hspec, QuickCheck, vector }: mkDerivation { @@ -114680,45 +114657,6 @@ self: { "hw-xml" = callPackage ({ mkDerivation, ansi-wl-pprint, array, attoparsec, base - , bytestring, cereal, conduit, containers, criterion, ghc-prim - , hspec, hw-balancedparens, hw-bits, hw-conduit, hw-parser, hw-prim - , hw-rankselect, hw-rankselect-base, lens, mmap, mtl, QuickCheck - , resourcet, transformers, vector, word8 - }: - mkDerivation { - pname = "hw-xml"; - version = "0.1.0.1"; - sha256 = "0fhf0l6zpmrj76gkhbym8ds9dg270y22hdpqxrg11gxyrdymdnbd"; - isLibrary = true; - isExecutable = true; - enableSeparateDataOutput = true; - libraryHaskellDepends = [ - ansi-wl-pprint array attoparsec base bytestring cereal conduit - containers ghc-prim hw-balancedparens hw-bits hw-conduit hw-parser - hw-prim hw-rankselect hw-rankselect-base lens mtl resourcet - transformers vector word8 - ]; - executableHaskellDepends = [ - base bytestring hw-balancedparens hw-bits hw-prim hw-rankselect - vector - ]; - testHaskellDepends = [ - attoparsec base bytestring conduit hspec hw-balancedparens hw-bits - hw-conduit hw-prim hw-rankselect hw-rankselect-base QuickCheck - vector - ]; - benchmarkHaskellDepends = [ - base bytestring conduit criterion hw-balancedparens hw-bits - hw-conduit hw-prim mmap resourcet vector - ]; - homepage = "http://github.com/haskell-works/hw-xml#readme"; - description = "Conduits for tokenizing streams"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - - "hw-xml_0_1_0_3" = callPackage - ({ mkDerivation, ansi-wl-pprint, array, attoparsec, base , bytestring, cereal, conduit, containers, criterion, deepseq , ghc-prim, hspec, hw-balancedparens, hw-bits, hw-conduit , hw-parser, hw-prim, hw-rankselect, hw-rankselect-base, lens, mmap @@ -118828,10 +118766,8 @@ self: { }: mkDerivation { pname = "int-cast"; - version = "0.1.2.0"; - sha256 = "0gfx3pg0n1jyn8z2q804iyc24ahi41sjr3h7v5ivzc3g57vi1ykb"; - revision = "2"; - editedCabalFile = "14i728sy9y38zjm9xcjqyg9jjnayzdpzplpff2cdpc9jk596fmcs"; + version = "0.2.0.0"; + sha256 = "0s8rqm5d9f4y2sskajsw8ff7q8xp52vwqa18m6bajldp11m9a1p0"; libraryHaskellDepends = [ base ]; testHaskellDepends = [ base QuickCheck test-framework test-framework-quickcheck2 @@ -120517,8 +120453,8 @@ self: { }: mkDerivation { pname = "iso8583-bitmaps"; - version = "0.1.0.0"; - sha256 = "0w6m8ygpy1g95zvmbzq9402rxh4dj48i5bhcdzc4s0kig239gzqd"; + version = "0.1.1.0"; + sha256 = "04i557469q2ablwmlwg35jazh7mpd1cgbrzl02xbvn4xbg7n2fcr"; libraryHaskellDepends = [ base binary bytestring containers parsec syb template-haskell th-lift @@ -122921,8 +122857,29 @@ self: { }: mkDerivation { pname = "json-stream"; - version = "0.4.2.0"; - sha256 = "06y8q95vyavcbvq5z4zh50jn3djhlj1xq7yv8dns7gxfc5fvdndy"; + version = "0.4.2.2"; + sha256 = "14savrbhxb7pxxphfhh6z5fh5xqfxrnk9j7g0268dl2hpnzx4rvh"; + libraryHaskellDepends = [ + aeson base bytestring scientific text unordered-containers vector + ]; + testHaskellDepends = [ + aeson base bytestring directory hspec QuickCheck quickcheck-unicode + scientific text unordered-containers vector + ]; + homepage = "https://github.com/ondrap/json-stream"; + description = "Incremental applicative JSON parser"; + license = stdenv.lib.licenses.bsd3; + }) {}; + + "json-stream_0_4_2_3" = callPackage + ({ mkDerivation, aeson, base, bytestring, directory, hspec + , QuickCheck, quickcheck-unicode, scientific, text + , unordered-containers, vector + }: + mkDerivation { + pname = "json-stream"; + version = "0.4.2.3"; + sha256 = "0ijic6vfrpykzy7j3li94fjmaj1vclvp0in1ymb5z5whvljlynw7"; libraryHaskellDepends = [ aeson base bytestring scientific text unordered-containers vector ]; @@ -122933,6 +122890,7 @@ self: { homepage = "https://github.com/ondrap/json-stream"; description = "Incremental applicative JSON parser"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "json-togo" = callPackage @@ -126741,6 +126699,32 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "language-c-quote_0_12_2" = callPackage + ({ mkDerivation, alex, array, base, bytestring, containers + , exception-mtl, exception-transformers, filepath, happy + , haskell-src-meta, HUnit, mainland-pretty, mtl, srcloc, syb + , symbol, template-haskell, test-framework, test-framework-hunit + }: + mkDerivation { + pname = "language-c-quote"; + version = "0.12.2"; + sha256 = "15c6rdj91768jf8lqzf4fkbi8k6kz9gch5w81x6qzy2l256rncgb"; + libraryHaskellDepends = [ + array base bytestring containers exception-mtl + exception-transformers filepath haskell-src-meta mainland-pretty + mtl srcloc syb symbol template-haskell + ]; + libraryToolDepends = [ alex happy ]; + testHaskellDepends = [ + base bytestring HUnit mainland-pretty srcloc symbol test-framework + test-framework-hunit + ]; + homepage = "https://github.com/mainland/language-c-quote"; + description = "C/CUDA/OpenCL/Objective-C quasiquoting library"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "language-cil" = callPackage ({ mkDerivation, base, bool-extras }: mkDerivation { @@ -127675,8 +127659,8 @@ self: { }: mkDerivation { pname = "lapack"; - version = "0.0"; - sha256 = "04g5w3gdq4x7vkaw6x36xad7hjmah3iynqnp6xncac31ykkmbwgl"; + version = "0.1"; + sha256 = "195v3jpz5n5vksa8svqng1kwc629ds2kd1p55f6npz2q2j6k8lac"; libraryHaskellDepends = [ base blas-ffi comfort-array lapack-ffi netlib-ffi non-empty transformers utility-ht @@ -127705,6 +127689,24 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "lapack-carray_0_0_2" = callPackage + ({ mkDerivation, base, carray, lapack-ffi, netlib-carray + , netlib-ffi, storable-complex, transformers + }: + mkDerivation { + pname = "lapack-carray"; + version = "0.0.2"; + sha256 = "1dr4mbhc5y21mbnksyi530rsvckfp4mclhhig2rjhx3b06cksfna"; + libraryHaskellDepends = [ + base carray lapack-ffi netlib-carray netlib-ffi storable-complex + transformers + ]; + homepage = "http://hub.darcs.net/thielema/lapack-carray/"; + description = "Auto-generated interface to Fortran LAPACK via CArrays"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "lapack-ffi" = callPackage ({ mkDerivation, base, liblapack, netlib-ffi }: mkDerivation { @@ -127719,6 +127721,20 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {inherit (pkgs) liblapack;}; + "lapack-ffi_0_0_2" = callPackage + ({ mkDerivation, base, liblapack, netlib-ffi }: + mkDerivation { + pname = "lapack-ffi"; + version = "0.0.2"; + sha256 = "11759avf0kzkqy4s24kn556j93l10x28njpg6h14y915pdl35dyl"; + libraryHaskellDepends = [ base netlib-ffi ]; + libraryPkgconfigDepends = [ liblapack ]; + homepage = "http://hub.darcs.net/thielema/lapack-ffi/"; + description = "Auto-generated interface to Fortran LAPACK"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {inherit (pkgs) liblapack;}; + "lapack-ffi-tools" = callPackage ({ mkDerivation, base, bytestring, cassava, containers , explicit-exception, filepath, non-empty, optparse-applicative @@ -135085,21 +135101,21 @@ self: { , composition-prelude, containers, criterion, directory, file-embed , hspec, hspec-megaparsec, http-client, http-client-tls, megaparsec , MonadRandom, mtl, optparse-applicative, random-shuffle - , recursion-schemes, recursion-schemes-ext, tar, template-haskell - , text, th-lift-instances, titlecase, zip-archive, zlib + , recursion-schemes, tar, template-haskell, text, th-lift-instances + , titlecase, zip-archive, zlib }: mkDerivation { pname = "madlang"; - version = "4.0.2.0"; - sha256 = "1syq92bxbyf5nxywpm1prds9ki63a601v55cjba1dalv3z2zh6n6"; + version = "4.0.2.2"; + sha256 = "1g02ky5a1fy9g8sp1i3r7m1gjkajza3npj8dqr0chfxkm8ki6hfx"; isLibrary = true; isExecutable = true; setupHaskellDepends = [ base Cabal cli-setup ]; libraryHaskellDepends = [ ansi-wl-pprint base binary composition-prelude containers directory file-embed http-client http-client-tls megaparsec MonadRandom mtl - random-shuffle recursion-schemes recursion-schemes-ext tar - template-haskell text th-lift-instances titlecase zip-archive zlib + random-shuffle recursion-schemes tar template-haskell text + th-lift-instances titlecase zip-archive zlib ]; executableHaskellDepends = [ base directory megaparsec optparse-applicative text @@ -135381,6 +135397,21 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "mainland-pretty_0_7" = callPackage + ({ mkDerivation, base, containers, srcloc, text, transformers }: + mkDerivation { + pname = "mainland-pretty"; + version = "0.7"; + sha256 = "1xzavchbp345a63i24hs8632l3xk0c1pxqd32b2i6615cp9pnxqi"; + libraryHaskellDepends = [ + base containers srcloc text transformers + ]; + homepage = "https://github.com/mainland/mainland-pretty"; + description = "Pretty printing designed for printing source code"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "majordomo" = callPackage ({ mkDerivation, base, bytestring, cmdargs, monad-loops, old-locale , threads, time, unix, zeromq-haskell @@ -136113,6 +136144,23 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "map-syntax_0_3" = callPackage + ({ mkDerivation, base, containers, deepseq, hspec, HUnit, mtl + , QuickCheck, transformers + }: + mkDerivation { + pname = "map-syntax"; + version = "0.3"; + sha256 = "0b3ddi998saw5gi5r4bjbpid03rxlifn08zv15wf0b90ambhcc4k"; + libraryHaskellDepends = [ base containers mtl ]; + testHaskellDepends = [ + base containers deepseq hspec HUnit mtl QuickCheck transformers + ]; + description = "Syntax sugar for defining maps"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "mappy" = callPackage ({ mkDerivation, ansi-terminal, base, containers, directory , haskeline, hspec, parsec, QuickCheck @@ -136196,30 +136244,6 @@ self: { }: mkDerivation { pname = "markdown"; - version = "0.1.17"; - sha256 = "11bcbhrlfddjlifrab46qywbrabxcf8hg1zp26l17dlxs3nm681w"; - libraryHaskellDepends = [ - attoparsec base blaze-html blaze-markup conduit conduit-extra - containers data-default text transformers xml-conduit xml-types - xss-sanitize - ]; - testHaskellDepends = [ - base blaze-html call-stack conduit conduit-extra containers - directory filepath hspec text transformers - ]; - homepage = "https://github.com/snoyberg/markdown"; - description = "Convert Markdown to HTML, with XSS protection"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "markdown_0_1_17_1" = callPackage - ({ mkDerivation, attoparsec, base, blaze-html, blaze-markup - , call-stack, conduit, conduit-extra, containers, data-default - , directory, filepath, hspec, text, transformers, xml-conduit - , xml-types, xss-sanitize - }: - mkDerivation { - pname = "markdown"; version = "0.1.17.1"; sha256 = "0n1vcw0vmhpgsmyxxafc82r2kp27g081zwx9md96zj5x5642vxz1"; libraryHaskellDepends = [ @@ -136234,7 +136258,6 @@ self: { homepage = "https://github.com/snoyberg/markdown"; description = "Convert Markdown to HTML, with XSS protection"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "markdown-kate" = callPackage @@ -137880,8 +137903,8 @@ self: { }: mkDerivation { pname = "mellon-core"; - version = "0.8.0.6"; - sha256 = "07dhbqw0x7vbwzkhf1wh083h4b8xrw8sv75db2s72zgjrh8igpfm"; + version = "0.8.0.7"; + sha256 = "1nlqqkmm4163260zgl9cqxrd47iy3fpdyhd52y79c2cr1mqjw39q"; libraryHaskellDepends = [ async base mtl protolude time transformers ]; @@ -137898,8 +137921,8 @@ self: { ({ mkDerivation, base, hpio, mellon-core, protolude }: mkDerivation { pname = "mellon-gpio"; - version = "0.8.0.6"; - sha256 = "08mr37wmg1paigbhs1wv7rpdxkhy2jiba8nd22rg1lhscc04k7g1"; + version = "0.8.0.7"; + sha256 = "0hg878il0d31lfqwkb3rsd7gxbhs5cb1sxgc3rwdv70fdg63iirp"; libraryHaskellDepends = [ base hpio mellon-core protolude ]; homepage = "https://github.com/quixoftic/mellon#readme"; description = "GPIO support for mellon"; @@ -137911,34 +137934,37 @@ self: { , exceptions, hpio, hspec, hspec-wai, http-client, http-client-tls , http-types, lens, lucid, mellon-core, mellon-gpio, mtl, network , optparse-applicative, protolude, QuickCheck, quickcheck-instances - , servant, servant-client, servant-docs, servant-lucid - , servant-server, servant-swagger, servant-swagger-ui, swagger2 - , text, time, transformers, wai, wai-extra, warp + , servant, servant-client, servant-client-core, servant-docs + , servant-lucid, servant-server, servant-swagger + , servant-swagger-ui, swagger2, text, time, transformers, wai + , wai-extra, warp }: mkDerivation { pname = "mellon-web"; - version = "0.8.0.6"; - sha256 = "0hfb2gkfn9kdg8a5n6l8c7jky8d4545qqlpdzl2qv63500nr4wz3"; + version = "0.8.0.7"; + sha256 = "1m3ch98i8wzhi7g2c2l9klp0a3xcqfwfbq6ad6grl43v8fh1q737"; isLibrary = true; isExecutable = true; enableSeparateDataOutput = true; libraryHaskellDepends = [ aeson aeson-pretty base bytestring http-client http-types lens - lucid mellon-core protolude servant servant-client servant-docs - servant-lucid servant-server servant-swagger servant-swagger-ui - swagger2 text time transformers wai warp + lucid mellon-core protolude servant servant-client + servant-client-core servant-docs servant-lucid servant-server + servant-swagger servant-swagger-ui swagger2 text time transformers + wai warp ]; executableHaskellDepends = [ base bytestring exceptions hpio http-client http-client-tls http-types mellon-core mellon-gpio mtl network optparse-applicative - protolude servant-client time transformers warp + protolude servant-client servant-client-core time transformers warp ]; testHaskellDepends = [ aeson aeson-pretty base bytestring doctest hspec hspec-wai http-client http-types lens lucid mellon-core network protolude - QuickCheck quickcheck-instances servant servant-client servant-docs - servant-lucid servant-server servant-swagger servant-swagger-ui - swagger2 text time transformers wai wai-extra warp + QuickCheck quickcheck-instances servant servant-client + servant-client-core servant-docs servant-lucid servant-server + servant-swagger servant-swagger-ui swagger2 text time transformers + wai wai-extra warp ]; homepage = "https://github.com/quixoftic/mellon#readme"; description = "A REST web service for Mellon controllers"; @@ -140409,6 +140435,31 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "modify-fasta_0_8_3_0" = callPackage + ({ mkDerivation, base, containers, fasta, mtl, optparse-applicative + , pipes, pipes-text, regex-tdfa, regex-tdfa-text, semigroups, split + , text, text-show, transformers + }: + mkDerivation { + pname = "modify-fasta"; + version = "0.8.3.0"; + sha256 = "1hvn55c0cg4h2980ia28b2n2r9p7p0rqyfr5wvkkqyhz4si7dp9r"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + base containers fasta regex-tdfa regex-tdfa-text split text + text-show + ]; + executableHaskellDepends = [ + base containers fasta mtl optparse-applicative pipes pipes-text + semigroups split text transformers + ]; + homepage = "https://github.com/GregorySchwartz/modify-fasta"; + description = "Modify fasta (and CLIP) files in several optional ways"; + license = stdenv.lib.licenses.gpl3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "modsplit" = callPackage ({ mkDerivation, base, directory, filepath, haskell98, mtl , utf8-string @@ -140663,8 +140714,8 @@ self: { }: mkDerivation { pname = "monad-abort-fd"; - version = "0.6.2"; - sha256 = "0lnqzilm1y5v0p9p7n5qbgcqq1r39fdj7n8i5dy9ygi35p5qw93h"; + version = "0.7"; + sha256 = "0w1v39n93zg6i22qx312m6z8pc35im3whp5sb13wfvj2ws0nl1z7"; libraryHaskellDepends = [ base mtl stm transformers transformers-abort transformers-base transformers-compat @@ -140816,22 +140867,6 @@ self: { }: mkDerivation { pname = "monad-control-aligned"; - version = "0.0.1"; - sha256 = "11s226d80dbzq7as6ik077hg82swfj2svlk662l32sc9y03m3dyx"; - libraryHaskellDepends = [ - base stm transformers transformers-base transformers-compat - ]; - homepage = "https://github.com/athanclark/monad-control#readme"; - description = "Just like monad-control, except less efficient, and the monadic state terms are all * -> *"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "monad-control-aligned_0_0_1_1" = callPackage - ({ mkDerivation, base, stm, transformers, transformers-base - , transformers-compat - }: - mkDerivation { - pname = "monad-control-aligned"; version = "0.0.1.1"; sha256 = "1xhiw1g0p8zljhy8yz43ljnwhhqn6dwxqi06mdsfji365p9qzrs4"; libraryHaskellDepends = [ @@ -140840,7 +140875,6 @@ self: { homepage = "https://github.com/athanclark/monad-control#readme"; description = "Just like monad-control, except less efficient, and the monadic state terms are all * -> *"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "monad-coroutine" = callPackage @@ -140916,8 +140950,8 @@ self: { }: mkDerivation { pname = "monad-finally"; - version = "0.1.1"; - sha256 = "0f2bb8l00vqsswsckc6zgnzl372jg1w7c1zgpcj8fq8bnvia23hb"; + version = "0.1.2"; + sha256 = "1vg9mg748frf63l428wsdjdbf25pphjqixdslvlwgvf8d1ayl2xz"; libraryHaskellDepends = [ base monad-abort-fd monad-control transformers transformers-abort transformers-base transformers-compat @@ -141101,30 +141135,6 @@ self: { }: mkDerivation { pname = "monad-logger"; - version = "0.3.28.2"; - sha256 = "1dqrsqpqw4qfyida4j0z6dffds4sj7j282x4ir6wrq9j7nmns4yx"; - revision = "1"; - editedCabalFile = "1mk69zg6bbh0420ndf5f0qgsdzy11mn0pdcqgyna4r0pqkzflc0i"; - libraryHaskellDepends = [ - base bytestring conduit conduit-extra exceptions fast-logger - lifted-base monad-control monad-loops mtl resourcet stm stm-chans - template-haskell text transformers transformers-base - transformers-compat unliftio-core - ]; - homepage = "https://github.com/kazu-yamamoto/logger"; - description = "A class of monads which can log messages"; - license = stdenv.lib.licenses.mit; - }) {}; - - "monad-logger_0_3_28_3" = callPackage - ({ mkDerivation, base, bytestring, conduit, conduit-extra - , exceptions, fast-logger, lifted-base, monad-control, monad-loops - , mtl, resourcet, stm, stm-chans, template-haskell, text - , transformers, transformers-base, transformers-compat - , unliftio-core - }: - mkDerivation { - pname = "monad-logger"; version = "0.3.28.3"; sha256 = "11v5014zqp1sl801wc39yyix8m30vrf3ibas28bcdjyfrbhhvskp"; libraryHaskellDepends = [ @@ -141136,7 +141146,6 @@ self: { homepage = "https://github.com/kazu-yamamoto/logger"; description = "A class of monads which can log messages"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "monad-logger-json" = callPackage @@ -141643,11 +141652,11 @@ self: { ({ mkDerivation, base, mtl }: mkDerivation { pname = "monad-supply"; - version = "0.6"; - sha256 = "1gg4r7fwaq2fa0lz8pz301mk3q16xpbs7qv54hhggxrv3i1h33ir"; + version = "0.7"; + sha256 = "1786rj4n0rrjpp07gn2y8vwpf6ijkjaim1q34rq7lvbjx1fhr2z5"; libraryHaskellDepends = [ base mtl ]; description = "Stateful supply monad"; - license = "unknown"; + license = stdenv.lib.licenses.mit; }) {}; "monad-task" = callPackage @@ -141677,6 +141686,20 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "monad-time_0_3_0_0" = callPackage + ({ mkDerivation, base, mtl, time }: + mkDerivation { + pname = "monad-time"; + version = "0.3.0.0"; + sha256 = "0adl246zrj2ryxx9b0a0c0d5gia1am21k0i0m3k2dwivhypdyq81"; + libraryHaskellDepends = [ base mtl time ]; + testHaskellDepends = [ base mtl time ]; + homepage = "https://github.com/scrive/monad-time"; + description = "Type class for monads which carry the notion of the current time"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "monad-timing" = callPackage ({ mkDerivation, base, containers, exceptions, hlint, hspec , monad-control, mtl, time, transformers, transformers-base @@ -146459,6 +146482,19 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "netlib-carray_0_0_1_1" = callPackage + ({ mkDerivation, base, carray, netlib-ffi, transformers }: + mkDerivation { + pname = "netlib-carray"; + version = "0.0.1.1"; + sha256 = "1vxyffhpayyxwak36b9i7gw35gz61ym9lxnhk45l0h4js3v05iwv"; + libraryHaskellDepends = [ base carray netlib-ffi transformers ]; + homepage = "http://hub.darcs.net/thielema/netlib-carray/"; + description = "Helper modules for CArray wrappers to BLAS and LAPACK"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "netlib-ffi" = callPackage ({ mkDerivation, base, storable-complex, transformers }: mkDerivation { @@ -146471,6 +146507,19 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "netlib-ffi_0_1" = callPackage + ({ mkDerivation, base, storable-complex, transformers }: + mkDerivation { + pname = "netlib-ffi"; + version = "0.1"; + sha256 = "0ckwa5r8fx2j7qb5phy6gm3xbg9crr9amglcicdxgnzgjd8aap2h"; + libraryHaskellDepends = [ base storable-complex transformers ]; + homepage = "http://hub.darcs.net/thielema/netlib-ffi/"; + description = "Helper modules for FFI to BLAS and LAPACK"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "netlines" = callPackage ({ mkDerivation, base, bytestring, contstuff, enumerator, HTF , random, text, time @@ -146707,23 +146756,6 @@ self: { }: mkDerivation { pname = "netwire"; - version = "5.0.2"; - sha256 = "10yd28himql3gkilxzwky3d87k2nva43vmb7s5ayaqicchchyyad"; - libraryHaskellDepends = [ - base containers deepseq parallel profunctors random semigroups time - transformers - ]; - homepage = "https://github.com/esoeylemez/netwire"; - description = "Functional reactive programming library"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "netwire_5_0_3" = callPackage - ({ mkDerivation, base, containers, deepseq, parallel, profunctors - , random, semigroups, time, transformers - }: - mkDerivation { - pname = "netwire"; version = "5.0.3"; sha256 = "0bi2xyipz11vsai4wghdrh5yywzl0bkinfpmh0qdp77y7qlygpgi"; libraryHaskellDepends = [ @@ -146733,7 +146765,6 @@ self: { homepage = "https://github.com/esoeylemez/netwire"; description = "Functional reactive programming library"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "netwire-input" = callPackage @@ -146824,24 +146855,6 @@ self: { }) {}; "network" = callPackage - ({ mkDerivation, base, bytestring, directory, doctest, HUnit - , test-framework, test-framework-hunit, unix - }: - mkDerivation { - pname = "network"; - version = "2.6.3.4"; - sha256 = "1yswp78fg7i1w1inn6p07vhz7lmfs33niavxhq60z6yv0qx2c3dw"; - libraryHaskellDepends = [ base bytestring unix ]; - testHaskellDepends = [ - base bytestring directory doctest HUnit test-framework - test-framework-hunit - ]; - homepage = "https://github.com/haskell/network"; - description = "Low-level networking interface"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "network_2_6_3_5" = callPackage ({ mkDerivation, base, bytestring, doctest, hspec, HUnit, unix }: mkDerivation { pname = "network"; @@ -146852,7 +146865,6 @@ self: { homepage = "https://github.com/haskell/network"; description = "Low-level networking interface"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "network-address" = callPackage @@ -147227,25 +147239,12 @@ self: { ({ mkDerivation, base }: mkDerivation { pname = "network-info"; - version = "0.2.0.9"; - sha256 = "0rmajccwhkf0p4inb8jjj0dzsksgn663w90km00xvf4mq3pkjab3"; - libraryHaskellDepends = [ base ]; - homepage = "http://github.com/jystic/network-info"; - description = "Access the local computer's basic network configuration"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "network-info_0_2_0_10" = callPackage - ({ mkDerivation, base }: - mkDerivation { - pname = "network-info"; version = "0.2.0.10"; sha256 = "0anmgzcpnz7nw3n6vq0r25m1s9l2svpwi83wza0lzkrlbnbzd02n"; libraryHaskellDepends = [ base ]; homepage = "http://github.com/jystic/network-info"; description = "Access the local computer's basic network configuration"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "network-interfacerequest" = callPackage @@ -150454,8 +150453,8 @@ self: { }: mkDerivation { pname = "odbc"; - version = "0.0.2"; - sha256 = "005g8vdxs9gdh5n4dlsjcfdxx2ry5x02fbjd5w814l3k7fynbq5b"; + version = "0.0.4"; + sha256 = "1fh8yqdycna3if5dd55qc6hic70nwy71vjy2yflzvpjpqkdd8qz6"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -151618,26 +151617,6 @@ self: { }) {}; "openpgp-asciiarmor" = callPackage - ({ mkDerivation, attoparsec, base, base64-bytestring, bytestring - , cereal, HUnit, test-framework, test-framework-hunit - }: - mkDerivation { - pname = "openpgp-asciiarmor"; - version = "0.1"; - sha256 = "1xrv0n7n1n8izvxvqm8wmj6mkn5l6wcq18bxs9zd1q5riynmmm2w"; - libraryHaskellDepends = [ - attoparsec base base64-bytestring bytestring cereal - ]; - testHaskellDepends = [ - attoparsec base base64-bytestring bytestring cereal HUnit - test-framework test-framework-hunit - ]; - homepage = "http://floss.scru.org/openpgp-asciiarmor"; - description = "OpenPGP (RFC4880) ASCII Armor codec"; - license = "unknown"; - }) {}; - - "openpgp-asciiarmor_0_1_1" = callPackage ({ mkDerivation, attoparsec, base, base64-bytestring, binary , bytestring, criterion, tasty, tasty-hunit }: @@ -151656,7 +151635,6 @@ self: { homepage = "http://floss.scru.org/openpgp-asciiarmor"; description = "OpenPGP (RFC4880) ASCII Armor codec"; license = stdenv.lib.licenses.isc; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "openpgp-crypto-api" = callPackage @@ -157096,25 +157074,6 @@ self: { }: mkDerivation { pname = "persistable-record"; - version = "0.6.0.2"; - sha256 = "1sj2izz8ppam28qcja02jj6fx7khdjmnr4xn2yglbxyzs91fjg44"; - libraryHaskellDepends = [ - array base containers dlist names-th product-isomorphic - template-haskell th-data-compat transformers - ]; - testHaskellDepends = [ base quickcheck-simple ]; - homepage = "http://khibino.github.io/haskell-relational-record/"; - description = "Binding between SQL database values and haskell records"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "persistable-record_0_6_0_3" = callPackage - ({ mkDerivation, array, base, containers, dlist, names-th - , product-isomorphic, quickcheck-simple, template-haskell - , th-data-compat, transformers - }: - mkDerivation { - pname = "persistable-record"; version = "0.6.0.3"; sha256 = "12arj395b1famyy0hxp394ci2y3mkly68i82a26p67g5dpmdm466"; libraryHaskellDepends = [ @@ -157125,7 +157084,6 @@ self: { homepage = "http://khibino.github.io/haskell-relational-record/"; description = "Binding between SQL database values and haskell records"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "persistable-types-HDBC-pg" = callPackage @@ -157997,6 +157955,8 @@ self: { pname = "pgdl"; version = "10.10"; sha256 = "0wqj7i4shdcy80aiib0dkp3y6ccilqq4g3p8bvndh4vl3cyd2pwv"; + revision = "1"; + editedCabalFile = "17d525qv26y15zbc7kl0vdxfi7n1v1g8v9r821a96dd49zkccsck"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -160503,8 +160463,8 @@ self: { }: mkDerivation { pname = "ploton"; - version = "1.1.2.0"; - sha256 = "11a4kij1bz38bklaanlsyzwdvps7v9c0c8w4yblmxxdwxwdfvi6g"; + version = "1.1.3.0"; + sha256 = "1bq2qnzlms6j6hl7d728h5mc672h0lpbxcxfh2bz327nhhqid3hn"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -161803,8 +161763,27 @@ self: { }: mkDerivation { pname = "posix-paths"; - version = "0.2.1.3"; - sha256 = "1z5brmqraz2smpgbp3ldd9da0cz78glc8bfc5l6842qgc588iljp"; + version = "0.2.1.4"; + sha256 = "0axaq7249nmg17b0qx9374xhgb7wzfdaa6pkriq218h4jnfiq1r6"; + libraryHaskellDepends = [ base bytestring unix ]; + testHaskellDepends = [ + base bytestring doctest HUnit QuickCheck unix + ]; + benchmarkHaskellDepends = [ + base bytestring criterion directory filepath process unix + ]; + description = "POSIX filepath/directory functionality"; + license = stdenv.lib.licenses.bsd3; + }) {}; + + "posix-paths_0_2_1_5" = callPackage + ({ mkDerivation, base, bytestring, criterion, directory, doctest + , filepath, HUnit, process, QuickCheck, unix + }: + mkDerivation { + pname = "posix-paths"; + version = "0.2.1.5"; + sha256 = "1pyi25gz2r3pc64f1i5awyp3mg5w74ik9wh5s9i9hs7bfmkjk1as"; libraryHaskellDepends = [ base bytestring unix ]; testHaskellDepends = [ base bytestring doctest HUnit QuickCheck unix @@ -161814,6 +161793,7 @@ self: { ]; description = "POSIX filepath/directory functionality"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "posix-pty" = callPackage @@ -162420,31 +162400,6 @@ self: { }: mkDerivation { pname = "postgresql-typed"; - version = "0.5.2"; - sha256 = "0ws9xmh199jsvdmxjxkhm59j05ljfsrf16xchkbxqd8p1pg8786c"; - libraryHaskellDepends = [ - aeson array attoparsec base binary bytestring containers cryptonite - haskell-src-meta HDBC memory network old-locale postgresql-binary - scientific template-haskell text time utf8-string uuid - ]; - testHaskellDepends = [ - base bytestring containers convertible HDBC HUnit network - QuickCheck time - ]; - homepage = "https://github.com/dylex/postgresql-typed"; - description = "PostgreSQL interface with compile-time SQL type checking, optional HDBC backend"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - - "postgresql-typed_0_5_3_0" = callPackage - ({ mkDerivation, aeson, array, attoparsec, base, binary, bytestring - , containers, convertible, cryptonite, haskell-src-meta, HDBC - , HUnit, memory, network, old-locale, postgresql-binary, QuickCheck - , scientific, template-haskell, text, time, utf8-string, uuid - }: - mkDerivation { - pname = "postgresql-typed"; version = "0.5.3.0"; sha256 = "0apq662lhkjc1xl4alpz20yz20x6mf3gz6li7wb86sp94441rh5k"; libraryHaskellDepends = [ @@ -162723,8 +162678,8 @@ self: { }: mkDerivation { pname = "potoki-hasql"; - version = "1.1.0.1"; - sha256 = "0prm47qw591nm47b42jznhgvy49w6zpiwhrkxgh3jy9y0xnqr81b"; + version = "1.2"; + sha256 = "1viq19rycrm8zdwj3anqam45hlmdlh9wqji3xf120nk8ffqnwks1"; libraryHaskellDepends = [ base bytestring hasql potoki potoki-core profunctors text vector ]; @@ -165731,26 +165686,6 @@ self: { "protolude" = callPackage ({ mkDerivation, array, async, base, bytestring, containers - , deepseq, ghc-prim, hashable, mtl, mtl-compat, safe, stm, text - , transformers, transformers-compat - }: - mkDerivation { - pname = "protolude"; - version = "0.2.1"; - sha256 = "1r2baxx6q4z75sswirlqsnyynk4i7amfmpzajggh31fbz13hxgxx"; - revision = "2"; - editedCabalFile = "03w9051jdbldbid9iyvibdhxdr73cawrvp9qdsc0czxix5ggfr75"; - libraryHaskellDepends = [ - array async base bytestring containers deepseq ghc-prim hashable - mtl mtl-compat safe stm text transformers transformers-compat - ]; - homepage = "https://github.com/sdiehl/protolude"; - description = "A small prelude"; - license = stdenv.lib.licenses.mit; - }) {}; - - "protolude_0_2_2" = callPackage - ({ mkDerivation, array, async, base, bytestring, containers , deepseq, ghc-prim, hashable, mtl, mtl-compat, stm, text , transformers, transformers-compat }: @@ -165765,7 +165700,6 @@ self: { homepage = "https://github.com/sdiehl/protolude"; description = "A small prelude"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "protolude-lifted" = callPackage @@ -172038,18 +171972,6 @@ self: { }) {}; "reform" = callPackage - ({ mkDerivation, base, containers, mtl, text }: - mkDerivation { - pname = "reform"; - version = "0.2.7.1"; - sha256 = "0c4jh64rszp9rk62kh8nqyhafnbi5vm9lmc2rx7fx237j24j3gjr"; - libraryHaskellDepends = [ base containers mtl text ]; - homepage = "http://www.happstack.com/"; - description = "reform is a type-safe HTML form generation and validation library"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "reform_0_2_7_2" = callPackage ({ mkDerivation, base, containers, mtl, semigroups, text }: mkDerivation { pname = "reform"; @@ -172059,7 +171981,6 @@ self: { homepage = "http://www.happstack.com/"; description = "reform is a type-safe HTML form generation and validation library"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "reform-blaze" = callPackage @@ -174520,8 +174441,8 @@ self: { }: mkDerivation { pname = "rest-client"; - version = "0.5.2.2"; - sha256 = "1qmyvsz3mp6ps7g7w75kqdvk1r7mm9cspwi8b29hdhp1vr3nwhng"; + version = "0.5.2.3"; + sha256 = "1c4p68n3vb5w5xv0ha5bfq73qkcaqkyz0srfdn27pipy2s1h6p22"; libraryHaskellDepends = [ aeson-utils base bytestring case-insensitive data-default exceptions http-client http-conduit http-types hxt hxt-pickle-utils @@ -174562,7 +174483,7 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "rest-core_0_39_0_1" = callPackage + "rest-core_0_39_0_2" = callPackage ({ mkDerivation, aeson, aeson-utils, base, base-compat, bytestring , case-insensitive, errors, fclabels, HUnit, hxt, hxt-pickle-utils , json-schema, mtl, mtl-compat, multipart, random, rest-stringmap @@ -174572,8 +174493,8 @@ self: { }: mkDerivation { pname = "rest-core"; - version = "0.39.0.1"; - sha256 = "12lps738sfcv3fi1dwa12gazgqpwh6gal9k1m4106a62vxlp2a2v"; + version = "0.39.0.2"; + sha256 = "0vr538sp8i5qwgd91bzvq9fxv939imxck6358xfzlgrk6x89cr1z"; libraryHaskellDepends = [ aeson aeson-utils base base-compat bytestring case-insensitive errors fclabels hxt hxt-pickle-utils json-schema mtl mtl-compat @@ -174624,8 +174545,8 @@ self: { }: mkDerivation { pname = "rest-gen"; - version = "0.20.0.2"; - sha256 = "1hi4p6x3zrvf2q9rls0qfwm37xvil28xz5wg22bqk225a3b929n8"; + version = "0.20.0.3"; + sha256 = "1kd8i5kqjsdc3pl5gpg3i3lhy807qd6x4gxc86hr9a8kkv7y7hfn"; enableSeparateDataOutput = true; libraryHaskellDepends = [ aeson base base-compat blaze-html Cabal code-builder directory @@ -174683,24 +174604,6 @@ self: { }: mkDerivation { pname = "rest-stringmap"; - version = "0.2.0.6"; - sha256 = "0jjj0yam4d4w36lnxk0ci7ylb9ya48y0ag3b54k9ikyg0hps7rb6"; - revision = "7"; - editedCabalFile = "14jqqpxxs7vkrf6syycrg2ymh79gl83z13kq261alw5gy8yjnszv"; - libraryHaskellDepends = [ - aeson base containers hashable hxt json-schema tostring - unordered-containers - ]; - description = "Maps with stringy keys that can be transcoded to JSON and XML"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "rest-stringmap_0_2_0_7" = callPackage - ({ mkDerivation, aeson, base, containers, hashable, hxt - , json-schema, tostring, unordered-containers - }: - mkDerivation { - pname = "rest-stringmap"; version = "0.2.0.7"; sha256 = "0l2l46c1mqpxq7hi37vjhaihfyapifjaxbzyi1bdhjkybx7n9m32"; libraryHaskellDepends = [ @@ -174709,7 +174612,6 @@ self: { ]; description = "Maps with stringy keys that can be transcoded to JSON and XML"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "rest-types" = callPackage @@ -174719,25 +174621,6 @@ self: { }: mkDerivation { pname = "rest-types"; - version = "1.14.1.1"; - sha256 = "16lnwd7rwjb67sqklrwl40bq4h8qhp3wj1893y4vs85fpdjqxq5p"; - revision = "4"; - editedCabalFile = "04s5xcjycbw9fqhmpx0kmy5wmkpgcs84vam68w428rb7y64099mb"; - libraryHaskellDepends = [ - aeson base base-compat case-insensitive generic-aeson - generic-xmlpickler hxt json-schema rest-stringmap text uuid - ]; - description = "Silk Rest Framework Types"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "rest-types_1_14_1_2" = callPackage - ({ mkDerivation, aeson, base, base-compat, case-insensitive - , generic-aeson, generic-xmlpickler, hxt, json-schema - , rest-stringmap, text, uuid - }: - mkDerivation { - pname = "rest-types"; version = "1.14.1.2"; sha256 = "0cjxnb4zvj7iafgy9h4wq8817wkm1mvas45xcb9346kwd3yqgvmy"; libraryHaskellDepends = [ @@ -174746,7 +174629,6 @@ self: { ]; description = "Silk Rest Framework Types"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "rest-wai" = callPackage @@ -175938,8 +175820,8 @@ self: { }: mkDerivation { pname = "robots-txt"; - version = "0.4.1.4"; - sha256 = "18dkha42dcxl9f9771wpkji11m12v139wnscb47bm7s693w7p4nc"; + version = "0.4.1.5"; + sha256 = "025dm3rv4cpig8j02yzkr7xinzfcqmfiaaj8x5kzjw8mgcb1qpn3"; libraryHaskellDepends = [ attoparsec base bytestring old-locale time ]; @@ -176631,6 +176513,32 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "rowdy" = callPackage + ({ mkDerivation, base, containers, dlist, hspec, mtl }: + mkDerivation { + pname = "rowdy"; + version = "0.0.1.0"; + sha256 = "19nafk4zmhx76j0qzg1d5kh6mnzwnr5x3kvvxi56x24kfmvrq5qq"; + libraryHaskellDepends = [ base containers dlist mtl ]; + testHaskellDepends = [ base containers dlist hspec mtl ]; + homepage = "https://github.com/parsonsmatt/rowdy#readme"; + description = "An EDSL for web application routes"; + license = stdenv.lib.licenses.bsd3; + }) {}; + + "rowdy-yesod" = callPackage + ({ mkDerivation, base, hspec, rowdy, yesod-core }: + mkDerivation { + pname = "rowdy-yesod"; + version = "0.0.1.0"; + sha256 = "17k9bbxwpmxpswkmax6jrlcfrp6qhgdkjixsp4d6rn7mj676010g"; + libraryHaskellDepends = [ base rowdy yesod-core ]; + testHaskellDepends = [ base hspec rowdy yesod-core ]; + homepage = "https://github.com/parsonsmatt/rowdy#readme"; + description = "An EDSL for web application routes"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "rowrecord" = callPackage ({ mkDerivation, base, containers, template-haskell }: mkDerivation { @@ -180238,6 +180146,24 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "selda_0_2_0_0" = callPackage + ({ mkDerivation, base, bytestring, exceptions, hashable, mtl + , psqueues, text, time, unordered-containers + }: + mkDerivation { + pname = "selda"; + version = "0.2.0.0"; + sha256 = "1l9ad4d1m0ylfihg0hpfxanxil09c658jl1bmgzn8268akqay9nj"; + libraryHaskellDepends = [ + base bytestring exceptions hashable mtl psqueues text time + unordered-containers + ]; + homepage = "https://selda.link"; + description = "Multi-backend, high-level EDSL for interacting with SQL databases"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "selda-postgresql" = callPackage ({ mkDerivation, base, bytestring, exceptions, postgresql-libpq , selda, text @@ -180246,6 +180172,8 @@ self: { pname = "selda-postgresql"; version = "0.1.7.2"; sha256 = "06z5zrika018433p5l011wxc308zw7l9ilnkgwcykagsnmai4y7z"; + revision = "1"; + editedCabalFile = "08f2xdfpmbwhrwkjaqfmd9k25c3xn3p477d7a1mnnn7kf7328782"; libraryHaskellDepends = [ base bytestring exceptions postgresql-libpq selda text ]; @@ -180262,8 +180190,8 @@ self: { pname = "selda-sqlite"; version = "0.1.6.0"; sha256 = "1473igqgjs5282rykqj1zg7420mfh3sbqy74nx1cwbm82j8shyy6"; - revision = "1"; - editedCabalFile = "0yf1n9iaaafnllkb2yi38ncyd3q062g4p7ln9ypb6h8gcym8s8m1"; + revision = "2"; + editedCabalFile = "198pg9i0lfx3fwf7b7cw0x5kial6vbf0dqwh18jnh7na3pyn1jr6"; libraryHaskellDepends = [ base direct-sqlite directory exceptions selda text ]; @@ -181918,6 +181846,28 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "servant-elm_0_5_0_0" = callPackage + ({ mkDerivation, aeson, base, Diff, elm-export, hspec, HUnit, lens + , servant, servant-foreign, text, wl-pprint-text + }: + mkDerivation { + pname = "servant-elm"; + version = "0.5.0.0"; + sha256 = "0l5rjml46qbnq4p3d7zjk8zl9gnpz8m5n6n8yf8kgy89ybm6xnfr"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + base elm-export lens servant servant-foreign text wl-pprint-text + ]; + testHaskellDepends = [ + aeson base Diff elm-export hspec HUnit servant text + ]; + homepage = "http://github.com/mattjbray/servant-elm#readme"; + description = "Automatically derive Elm functions to query servant webservices"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "servant-examples" = callPackage ({ mkDerivation, aeson, base, bytestring, directory, either , http-types, js-jquery, lucid, random, servant, servant-client @@ -182831,6 +182781,37 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "servant-tracing" = callPackage + ({ mkDerivation, aeson, async, base, bytestring, bytestring-lexing + , containers, hashable, http-api-data, http-client, HUnit + , lifted-base, monad-control, mtl, QuickCheck, random, servant + , servant-server, tasty, tasty-hunit, tasty-quickcheck, text, time + , transformers, unordered-containers, wai, warp + }: + mkDerivation { + pname = "servant-tracing"; + version = "0.1.0.0"; + sha256 = "0wpybm1vl1bh3sj3vam8y40a0sjrx2ys761jyqrj2dnqymk8xc10"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + aeson async base bytestring bytestring-lexing containers hashable + http-api-data http-client lifted-base monad-control mtl random + servant servant-server text time unordered-containers wai + ]; + executableHaskellDepends = [ + async base bytestring containers http-client lifted-base + monad-control mtl servant servant-server text transformers wai warp + ]; + testHaskellDepends = [ + aeson base containers http-api-data HUnit monad-control mtl + QuickCheck tasty tasty-hunit tasty-quickcheck text time + transformers + ]; + homepage = "https://github.com/ChrisCoffey/servant-tracing#readme"; + license = stdenv.lib.licenses.mit; + }) {}; + "servant-websockets" = callPackage ({ mkDerivation, aeson, async, base, bytestring, conduit , exceptions, resourcet, servant-server, text, wai, wai-websockets @@ -183913,8 +183894,8 @@ self: { }: mkDerivation { pname = "shake-ats"; - version = "1.6.0.1"; - sha256 = "1ik6nzabvzhly0pc5gyp83gh5mg8z8y56vdm8895dkx5cx5zlfgs"; + version = "1.6.0.2"; + sha256 = "0imvw9bivp2dzs4086c481w7ss7z8dvphn0l163dkyzxdw8xgkzl"; libraryHaskellDepends = [ base binary dependency directory hashable hs2ats language-ats microlens microlens-th shake shake-ext text @@ -183948,8 +183929,8 @@ self: { }: mkDerivation { pname = "shake-ext"; - version = "2.8.0.0"; - sha256 = "1w4nkvrvyhig0902rfp92yag11h96ds18p0rxh9p9lmkbmr17r6w"; + version = "2.9.0.1"; + sha256 = "1znql8sddxm8xxzhz4ibhvc29ni345airily5ky51vq6qbs0g4r2"; libraryHaskellDepends = [ base Cabal composition-prelude directory shake template-haskell ]; @@ -186529,8 +186510,8 @@ self: { pname = "size-based"; version = "0.1.0.0"; sha256 = "1h791s39nr057w5f2fr4v7p1czw9jm0dk5qrhr26qyw97j4ysngx"; - revision = "1"; - editedCabalFile = "089942604ikg40v4nl25c4j856bylmmm06py4k2spz3y2z4k49rb"; + revision = "2"; + editedCabalFile = "1p4iglrrl5s47cxn520saiszw5wwr4x1kn9xbgn7awz29mv7pmd2"; libraryHaskellDepends = [ base dictionary-sharing template-haskell testing-type-modifiers ]; @@ -186983,31 +186964,6 @@ self: { }: mkDerivation { pname = "slack-web"; - version = "0.2.0.3"; - sha256 = "1zxs697fmcgwrbrkzh7qgmrxcc6l75m1p300zinzqxvxv3zvk5l6"; - libraryHaskellDepends = [ - aeson base containers errors http-api-data http-client - http-client-tls megaparsec mtl servant servant-client - servant-client-core text time transformers - ]; - testHaskellDepends = [ - aeson base containers errors hspec http-api-data megaparsec text - time - ]; - homepage = "https://github.com/jpvillaisaza/slack-web"; - description = "Bindings for the Slack web API"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - - "slack-web_0_2_0_4" = callPackage - ({ mkDerivation, aeson, base, containers, errors, hspec - , http-api-data, http-client, http-client-tls, megaparsec, mtl - , servant, servant-client, servant-client-core, text, time - , transformers - }: - mkDerivation { - pname = "slack-web"; version = "0.2.0.4"; sha256 = "1wbqz6shqm39ivmw7k2pwslaygxf4rxxbkiczxzpvd29y5pm81ah"; libraryHaskellDepends = [ @@ -191405,29 +191361,6 @@ self: { "sqlite-simple" = callPackage ({ mkDerivation, attoparsec, base, base16-bytestring, blaze-builder , blaze-textual, bytestring, containers, direct-sqlite, HUnit, Only - , text, time, transformers - }: - mkDerivation { - pname = "sqlite-simple"; - version = "0.4.14.0"; - sha256 = "0zx4fdv6larfyj6m1d4livb5cqdx10yi06yd6px2n0wnxcmvdyj9"; - revision = "1"; - editedCabalFile = "12ig3spsw8x30xazlp2p8hn4k4xznglsmjl3nkr3fgmmkqffl2mm"; - libraryHaskellDepends = [ - attoparsec base blaze-builder blaze-textual bytestring containers - direct-sqlite Only text time transformers - ]; - testHaskellDepends = [ - base base16-bytestring bytestring direct-sqlite HUnit text time - ]; - homepage = "http://github.com/nurpax/sqlite-simple"; - description = "Mid-Level SQLite client library"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "sqlite-simple_0_4_15_0" = callPackage - ({ mkDerivation, attoparsec, base, base16-bytestring, blaze-builder - , blaze-textual, bytestring, containers, direct-sqlite, HUnit, Only , semigroups, text, time, transformers }: mkDerivation { @@ -191444,7 +191377,6 @@ self: { homepage = "http://github.com/nurpax/sqlite-simple"; description = "Mid-Level SQLite client library"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "sqlite-simple-errors" = callPackage @@ -191638,25 +191570,12 @@ self: { ({ mkDerivation, base }: mkDerivation { pname = "srcloc"; - version = "0.5.1.1"; - sha256 = "05qsyrpzbbawpnfmq8v1rr36kvnycarlr3v91hmbj33vk73acj1i"; - libraryHaskellDepends = [ base ]; - homepage = "https://github.com/mainland/srcloc"; - description = "Data types for managing source code locations"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "srcloc_0_5_1_2" = callPackage - ({ mkDerivation, base }: - mkDerivation { - pname = "srcloc"; version = "0.5.1.2"; sha256 = "0vn0zqsk191ghh2993hls05hp7kvnskaafnfrrqhfbmpdg7dp7h6"; libraryHaskellDepends = [ base ]; homepage = "https://github.com/mainland/srcloc"; description = "Data types for managing source code locations"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "srec" = callPackage @@ -192938,8 +192857,8 @@ self: { pname = "statestack"; version = "0.2.0.5"; sha256 = "0rjzx9iy5mx5igir6gvslznnx3gpxlb1xy1n8h4cn54cn3wxrspl"; - revision = "1"; - editedCabalFile = "0kf1jdhdv9fiwlbn2915sg39x23lfxlyp2qb7jkrvx8p8v2sam7i"; + revision = "2"; + editedCabalFile = "0c10cv107ls0wm7gs3gvknd8a1gqvrkk97frn8lp1ch697mz44rp"; libraryHaskellDepends = [ base mtl transformers transformers-compat ]; @@ -193253,6 +193172,29 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "status-notifier-item" = callPackage + ({ mkDerivation, base, bytestring, containers, dbus, filepath + , hslogger, lens, mtl, network, optparse-applicative, spool + , template-haskell, transformers, vector + }: + mkDerivation { + pname = "status-notifier-item"; + version = "0.1.0.0"; + sha256 = "1g1gf3anqrg8mfdyjvymk5wlg0h4pfc0pv4wlw5phk6r93dxah1n"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + base bytestring containers dbus filepath hslogger lens mtl network + spool template-haskell transformers vector + ]; + executableHaskellDepends = [ + base dbus hslogger optparse-applicative + ]; + homepage = "https://github.com/IvanMalison/status-notifier-item#readme"; + description = "A wrapper over the StatusNotifierItem/libappindicator dbus specification"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "statvfs" = callPackage ({ mkDerivation, base }: mkDerivation { @@ -194802,28 +194744,6 @@ self: { }: mkDerivation { pname = "streamly"; - version = "0.1.1"; - sha256 = "1zblhnn2rjsmbdliihsghwl6rv7g0bcdh3d10xx8c4x420hwg2f6"; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ - atomic-primops base containers exceptions lifted-base - lockfree-queue monad-control mtl stm transformers transformers-base - ]; - testHaskellDepends = [ base containers hspec ]; - benchmarkHaskellDepends = [ atomic-primops base criterion mtl ]; - homepage = "https://github.com/composewell/streamly"; - description = "Beautiful Streaming, Concurrent and Reactive Composition"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "streamly_0_1_2" = callPackage - ({ mkDerivation, atomic-primops, base, containers, criterion - , exceptions, hspec, lifted-base, lockfree-queue, monad-control - , mtl, stm, transformers, transformers-base - }: - mkDerivation { - pname = "streamly"; version = "0.1.2"; sha256 = "1axqac7zi2b87q91hxv75dpk4pfd4d4fcvsna7cjgkhkdvvjarzp"; isLibrary = true; @@ -194837,7 +194757,6 @@ self: { homepage = "https://github.com/composewell/streamly"; description = "Beautiful Streaming, Concurrent and Reactive Composition"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "streamproc" = callPackage @@ -195809,8 +195728,8 @@ self: { }: mkDerivation { pname = "stylish-cabal"; - version = "0.4.0.0"; - sha256 = "1357yrnzyc7rhd98dz33m84yckzs2djrlv8dmh5a2p97s31gcp03"; + version = "0.4.0.1"; + sha256 = "00jwq35dr60c9gjwy8hg3i8b39gxknr92mrz21657gazl90cxy4z"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -197065,21 +196984,6 @@ self: { }: mkDerivation { pname = "syb-with-class"; - version = "0.6.1.8"; - sha256 = "01b187jhhfp77l4zgks5gszkn9jmgjc44mw9yympw1fsfskljiz3"; - libraryHaskellDepends = [ - array base bytestring containers template-haskell - ]; - description = "Scrap Your Boilerplate With Class"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "syb-with-class_0_6_1_9" = callPackage - ({ mkDerivation, array, base, bytestring, containers - , template-haskell - }: - mkDerivation { - pname = "syb-with-class"; version = "0.6.1.9"; sha256 = "1apvvzzc19lbchmbginmhxzcrvrcg76dvdgsk51pxrnr4glnva86"; libraryHaskellDepends = [ @@ -197087,7 +196991,6 @@ self: { ]; description = "Scrap Your Boilerplate With Class"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "syb-with-class-instances-text" = callPackage @@ -198528,36 +198431,37 @@ self: { }) {}; "taffybar" = callPackage - ({ mkDerivation, base, cairo, containers, dbus, dyre - , enclosed-exceptions, filepath, gtk, gtk-traymanager, gtk2 - , HStringTemplate, HTTP, mtl, network, network-uri, old-locale - , parsec, process, safe, split, stm, text, time, time-locale-compat - , transformers, utf8-string, X11, xdg-basedir, xmonad - , xmonad-contrib + ({ mkDerivation, alsa-mixer, base, cairo, ConfigFile, containers + , dbus, directory, dyre, either, enclosed-exceptions, filepath + , glib, gtk-traymanager, gtk3, HStringTemplate, HTTP, mtl, multimap + , network, network-uri, old-locale, parsec, process, rate-limit + , safe, split, stm, text, time, time-locale-compat, time-units + , transformers, tuple, unix, utf8-string, X11, xdg-basedir, xml + , xml-helpers, xmonad, xmonad-contrib }: mkDerivation { pname = "taffybar"; - version = "0.4.6"; - sha256 = "1xfaw32yq17a6wm6gzvpdnpabxfnskwbs541h1kk1lvrkm31h2b2"; + version = "1.0.0"; + sha256 = "1n2hxryh8l1ym498ckba1nf9533zpsxscvbriiwxixdr27mgk6zy"; isLibrary = true; isExecutable = true; enableSeparateDataOutput = true; libraryHaskellDepends = [ - base cairo containers dbus dyre enclosed-exceptions filepath gtk - gtk-traymanager HStringTemplate HTTP mtl network network-uri - old-locale parsec process safe split stm text time - time-locale-compat transformers utf8-string X11 xdg-basedir xmonad - xmonad-contrib + alsa-mixer base cairo ConfigFile containers dbus directory dyre + either enclosed-exceptions filepath glib gtk-traymanager gtk3 + HStringTemplate HTTP mtl multimap network network-uri old-locale + parsec process rate-limit safe split stm text time + time-locale-compat time-units transformers tuple unix utf8-string + X11 xdg-basedir xml xml-helpers xmonad xmonad-contrib ]; - libraryPkgconfigDepends = [ gtk2 ]; executableHaskellDepends = [ - base dyre filepath gtk safe xdg-basedir + base containers directory dyre filepath glib gtk3 mtl safe split + utf8-string X11 xdg-basedir ]; - executablePkgconfigDepends = [ gtk2 ]; homepage = "http://github.com/travitch/taffybar"; description = "A desktop bar similar to xmobar, but with more GUI"; license = stdenv.lib.licenses.bsd3; - }) {gtk2 = pkgs.gnome2.gtk;}; + }) {}; "tag-bits" = callPackage ({ mkDerivation, base, ghc-prim }: @@ -203277,6 +203181,8 @@ self: { pname = "th-orphans"; version = "0.13.5"; sha256 = "1b9599vyn0wjwbq7b7n0w25s3wbihdxr958hscfpwc8lg55lsr4m"; + revision = "1"; + editedCabalFile = "1rgsrnh0qvlriz0c2c3q8wbb3ykby8d3lli0j553ml3n1sn9k4zv"; libraryHaskellDepends = [ base mtl template-haskell th-lift th-lift-instances th-reify-many ]; @@ -205312,24 +205218,6 @@ self: { }: mkDerivation { pname = "tinylog"; - version = "0.14.0"; - sha256 = "1skk59sxz2n96nv8vbc9yxla8m2jkj3ll8z5m0v78w0ih0bmcbrj"; - libraryHaskellDepends = [ - base bytestring containers double-conversion fast-logger text - transformers unix-time - ]; - benchmarkHaskellDepends = [ base bytestring criterion ]; - homepage = "https://gitlab.com/twittner/tinylog/"; - description = "Simplistic logging using fast-logger"; - license = stdenv.lib.licenses.mpl20; - }) {}; - - "tinylog_0_14_1" = callPackage - ({ mkDerivation, base, bytestring, containers, criterion - , double-conversion, fast-logger, text, transformers, unix-time - }: - mkDerivation { - pname = "tinylog"; version = "0.14.1"; sha256 = "01yz41l45qmc878gzhbchzkvr4ha2cfmvvjv31hwivgwgl8rcgni"; libraryHaskellDepends = [ @@ -205340,7 +205228,6 @@ self: { homepage = "https://gitlab.com/twittner/tinylog/"; description = "Simplistic logging using fast-logger"; license = stdenv.lib.licenses.mpl20; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "tinytemplate" = callPackage @@ -208404,22 +208291,24 @@ self: { ({ mkDerivation, aeson, ansi-wl-pprint, authenticate-oauth, base , bytestring, composition-prelude, containers, criterion , data-default, directory, extra, hspec, htoml-megaparsec - , http-client, http-client-tls, http-types, lens, megaparsec + , http-client, http-client-tls, http-types, megaparsec, microlens , optparse-applicative, split, text, unordered-containers }: mkDerivation { pname = "tweet-hs"; - version = "1.0.1.35"; - sha256 = "1rg7yn5072dr8kpd5m3c4p1brq9sbs2npvvyqkjpvfxsbyziblw7"; + version = "1.0.1.36"; + sha256 = "1gmp1936cmz42vf8m3622pjf6gb9c2pi8z0jfki1di9m1p1lbr53"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ aeson ansi-wl-pprint authenticate-oauth base bytestring - composition-prelude containers data-default directory extra - htoml-megaparsec http-client http-client-tls http-types lens - megaparsec optparse-applicative split text unordered-containers + composition-prelude containers data-default extra htoml-megaparsec + http-client http-client-tls http-types megaparsec microlens split + text unordered-containers + ]; + executableHaskellDepends = [ + base bytestring directory optparse-applicative ]; - executableHaskellDepends = [ base ]; testHaskellDepends = [ base hspec ]; benchmarkHaskellDepends = [ base bytestring criterion megaparsec ]; homepage = "https://github.com/vmchale/command-line-tweeter#readme"; @@ -209469,40 +209358,42 @@ self: { }) {}; "type-of-html" = callPackage - ({ mkDerivation, base, blaze-html, bytestring, criterion - , double-conversion, ghc-prim, hspec, QuickCheck, text + ({ mkDerivation, base, blaze-html, bytestring, criterion, deepseq + , double-conversion, ghc-prim, hspec, QuickCheck, random, text + , weigh }: mkDerivation { pname = "type-of-html"; - version = "1.3.3.0"; - sha256 = "0q3r2imr63nv7l08w6q850xqak4gwzvk43qv1vq8x9qwdaf1nisv"; + version = "1.3.3.2"; + sha256 = "0ah3j0r1yrqyrsg9blg0yxffjrikrlvi77d1cq368qmx3rnn5rnh"; libraryHaskellDepends = [ base bytestring double-conversion ghc-prim text ]; testHaskellDepends = [ base hspec QuickCheck ]; benchmarkHaskellDepends = [ - base blaze-html bytestring criterion QuickCheck text + base blaze-html bytestring criterion deepseq random text weigh ]; homepage = "https://github.com/knupfer/type-of-html"; description = "High performance type driven html generation"; license = stdenv.lib.licenses.bsd3; }) {}; - "type-of-html_1_3_3_2" = callPackage + "type-of-html_1_3_4_0" = callPackage ({ mkDerivation, base, blaze-html, bytestring, criterion, deepseq - , double-conversion, ghc-prim, hspec, QuickCheck, random, text - , weigh + , double-conversion, ghc, ghc-paths, ghc-prim, hspec, QuickCheck + , random, temporary, text, weigh }: mkDerivation { pname = "type-of-html"; - version = "1.3.3.2"; - sha256 = "0ah3j0r1yrqyrsg9blg0yxffjrikrlvi77d1cq368qmx3rnn5rnh"; + version = "1.3.4.0"; + sha256 = "11drppw8xl3wzjj5qks8mqrbl83yrj7c4r01s06v38bc319g8ksf"; libraryHaskellDepends = [ base bytestring double-conversion ghc-prim text ]; testHaskellDepends = [ base hspec QuickCheck ]; benchmarkHaskellDepends = [ - base blaze-html bytestring criterion deepseq random text weigh + base blaze-html bytestring criterion deepseq ghc ghc-paths random + temporary text weigh ]; homepage = "https://github.com/knupfer/type-of-html"; description = "High performance type driven html generation"; @@ -209913,22 +209804,6 @@ self: { }: mkDerivation { pname = "typelits-witnesses"; - version = "0.3.0.1"; - sha256 = "0d2537dwz5kiq81amrj2v00bvlwjfkidlz45g1h96zv78mlw1l7c"; - libraryHaskellDepends = [ - base base-compat constraints reflection transformers - ]; - homepage = "https://github.com/mstksg/typelits-witnesses"; - description = "Existential witnesses, singletons, and classes for operations on GHC TypeLits"; - license = stdenv.lib.licenses.mit; - }) {}; - - "typelits-witnesses_0_3_0_2" = callPackage - ({ mkDerivation, base, base-compat, constraints, reflection - , transformers - }: - mkDerivation { - pname = "typelits-witnesses"; version = "0.3.0.2"; sha256 = "0k76ir1c6ga44cj3qmjcsnikzz2nnb2kyzkcirb3ila7yfgwc9kf"; libraryHaskellDepends = [ @@ -209937,7 +209812,6 @@ self: { homepage = "https://github.com/mstksg/typelits-witnesses"; description = "Existential witnesses, singletons, and classes for operations on GHC TypeLits"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "typeof" = callPackage @@ -214532,8 +214406,8 @@ self: { ({ mkDerivation, base, random, vector }: mkDerivation { pname = "vector-shuffling"; - version = "1"; - sha256 = "19brlcbxha2mpmciabjw1npdi2xcpvfhd8wjn2ssfcdl0pd2n2ln"; + version = "1.1"; + sha256 = "04kpp7529jd4avhprfxdy6nfikx3d3ans0knhz3lspms4iky068i"; libraryHaskellDepends = [ base random vector ]; homepage = "https://github.com/metrix-ai/vector-shuffling"; description = "Algorithms for vector shuffling"; @@ -214710,6 +214584,37 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "vectortiles_1_4_0" = callPackage + ({ mkDerivation, base, bytestring, containers, criterion, deepseq + , hashable, hex, microlens, microlens-platform, mtl + , protocol-buffers, protocol-buffers-descriptor, tasty, tasty-hunit + , text, transformers, unordered-containers, vector + }: + mkDerivation { + pname = "vectortiles"; + version = "1.4.0"; + sha256 = "1h0mx5sl379486panyxpanld8qrlhak9knhz7jzqqv7is3rw8g1r"; + libraryHaskellDepends = [ + base bytestring containers deepseq hashable mtl protocol-buffers + protocol-buffers-descriptor text transformers unordered-containers + vector + ]; + testHaskellDepends = [ + base bytestring containers hashable hex mtl protocol-buffers + protocol-buffers-descriptor tasty tasty-hunit text + unordered-containers vector + ]; + benchmarkHaskellDepends = [ + base bytestring containers criterion hashable microlens + microlens-platform mtl protocol-buffers protocol-buffers-descriptor + text unordered-containers vector + ]; + homepage = "https://github.com/fosskers/vectortiles"; + description = "GIS Vector Tiles, as defined by Mapbox"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "verbalexpressions" = callPackage ({ mkDerivation, base, regex-pcre }: mkDerivation { @@ -214918,8 +214823,8 @@ self: { }: mkDerivation { pname = "viewprof"; - version = "0.0.0.15"; - sha256 = "10ihmdba4rbji13lihmxf2yw77nii63k4mz6a0d03lzcw2bppr1a"; + version = "0.0.0.16"; + sha256 = "123dqm0rardrvvvrj8sjjs9z8yysk9qzwvrs3skqzxrq5pffyarp"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -218194,23 +218099,6 @@ self: { }: mkDerivation { pname = "web-routes-th"; - version = "0.22.6.2"; - sha256 = "1j661bdl5nb7a02gvsi89dybzaczjynp3d6kxnrgc4jc41rwbgj8"; - libraryHaskellDepends = [ - base parsec split template-haskell text web-routes - ]; - testHaskellDepends = [ base hspec HUnit QuickCheck web-routes ]; - homepage = "https://github.com/happstack/web-routes-th"; - description = "Support for deriving PathInfo using Template Haskell"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "web-routes-th_0_22_6_3" = callPackage - ({ mkDerivation, base, hspec, HUnit, parsec, QuickCheck, split - , template-haskell, text, web-routes - }: - mkDerivation { - pname = "web-routes-th"; version = "0.22.6.3"; sha256 = "1zamjbvjxryc43wac95cdavbq4czjlfx5kgxykadx8sw63vfnk4x"; libraryHaskellDepends = [ @@ -218220,7 +218108,6 @@ self: { homepage = "https://github.com/happstack/web-routes-th"; description = "Support for deriving PathInfo using Template Haskell"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "web-routes-transformers" = callPackage @@ -218844,22 +218731,6 @@ self: { }: mkDerivation { pname = "websockets-snap"; - version = "0.10.2.4"; - sha256 = "003np9jn7ja1p9vays6sk7kmia1bhqjhsz53jy0k2na6fx7rnk99"; - libraryHaskellDepends = [ - base bytestring bytestring-builder io-streams mtl snap-core - snap-server websockets - ]; - description = "Snap integration for the websockets library"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "websockets-snap_0_10_2_5" = callPackage - ({ mkDerivation, base, bytestring, bytestring-builder, io-streams - , mtl, snap-core, snap-server, websockets - }: - mkDerivation { - pname = "websockets-snap"; version = "0.10.2.5"; sha256 = "14kxk6x5pygxlyn6421lkmc3lld5r545zq5qx6098mgn6bg2yknj"; libraryHaskellDepends = [ @@ -218868,7 +218739,6 @@ self: { ]; description = "Snap integration for the websockets library"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "webwire" = callPackage @@ -221132,6 +221002,8 @@ self: { pname = "x509"; version = "1.7.3"; sha256 = "0mkk29g32fs70bqkikg83v45h9jig9c8aail3mrdqwxpkfa0yx21"; + revision = "1"; + editedCabalFile = "06zzirygvzp0ssdg9blipdwmd0b41p4gxh3ldai7ngjyjsdclwsx"; libraryHaskellDepends = [ asn1-encoding asn1-parse asn1-types base bytestring containers cryptonite hourglass memory mtl pem @@ -221210,6 +221082,8 @@ self: { pname = "x509-validation"; version = "1.6.10"; sha256 = "1ms51scawldgyfcim5a2qlgyn3rnrclyh205d6djaa1569vrs73n"; + revision = "1"; + editedCabalFile = "1isap8v1gh31q4pj3gn155ya8nd1da0a5a3cryqh4yhf0ivbwl0w"; libraryHaskellDepends = [ asn1-encoding asn1-types base bytestring containers cryptonite data-default-class hourglass memory mtl pem x509 x509-store @@ -221799,36 +221673,6 @@ self: { }: mkDerivation { pname = "xlsx"; - version = "0.7.1"; - sha256 = "029frrwin3qx9kdh4i32yfyp1nlacr5zsv9msp5x63k2xyw7p0fh"; - libraryHaskellDepends = [ - attoparsec base base64-bytestring binary-search bytestring conduit - containers data-default deepseq errors extra filepath lens mtl - network-uri old-locale safe text time transformers vector xeno - xml-conduit zip-archive zlib - ]; - testHaskellDepends = [ - base bytestring containers Diff groom lens mtl raw-strings-qq - smallcheck tasty tasty-hunit tasty-smallcheck text time vector - xml-conduit - ]; - benchmarkHaskellDepends = [ base bytestring criterion ]; - homepage = "https://github.com/qrilka/xlsx"; - description = "Simple and incomplete Excel file parser/writer"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - - "xlsx_0_7_2" = callPackage - ({ mkDerivation, attoparsec, base, base64-bytestring, binary-search - , bytestring, conduit, containers, criterion, data-default, deepseq - , Diff, errors, extra, filepath, groom, lens, mtl, network-uri - , old-locale, raw-strings-qq, safe, smallcheck, tasty, tasty-hunit - , tasty-smallcheck, text, time, transformers, vector, xeno - , xml-conduit, zip-archive, zlib - }: - mkDerivation { - pname = "xlsx"; version = "0.7.2"; sha256 = "00qigyz4nc23abawapxhw0sgmj9c5qplkkvyv6xxffanx9kh8mmj"; libraryHaskellDepends = [ @@ -223550,40 +223394,10 @@ self: { }: mkDerivation { pname = "yaml"; - version = "0.8.28"; - sha256 = "0swgkzkfrwj0ac7lssn8rnrdfmh3lcsdn5fbq2iwv55di6jbc0pp"; - revision = "1"; - editedCabalFile = "0f8vb5v0xfpsc02zqh9pzgv4fir93sgijk342lz5k872gscfjn62"; - configureFlags = [ "-fsystem-libyaml" ]; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ - aeson attoparsec base bytestring conduit containers directory - filepath resourcet scientific semigroups template-haskell text - transformers unordered-containers vector - ]; - libraryPkgconfigDepends = [ libyaml ]; - executableHaskellDepends = [ aeson base bytestring ]; - testHaskellDepends = [ - aeson base base-compat bytestring conduit directory hspec HUnit - mockery resourcet temporary text transformers unordered-containers - vector - ]; - homepage = "http://github.com/snoyberg/yaml/"; - description = "Support for parsing and rendering YAML documents"; - license = stdenv.lib.licenses.bsd3; - }) {inherit (pkgs) libyaml;}; - - "yaml_0_8_29" = callPackage - ({ mkDerivation, aeson, attoparsec, base, base-compat, bytestring - , conduit, containers, directory, filepath, hspec, HUnit, libyaml - , mockery, resourcet, scientific, semigroups, template-haskell - , temporary, text, transformers, unordered-containers, vector - }: - mkDerivation { - pname = "yaml"; version = "0.8.29"; sha256 = "0x0gs80cq83i65b7g1xg6dvggkxlxhn1qs3py63c4wsjsplmyphs"; + revision = "1"; + editedCabalFile = "0hxmf36ydqr0gdwiagp57df7fxwhfy99r6s7mj861m8rflha0dks"; configureFlags = [ "-fsystem-libyaml" ]; isLibrary = true; isExecutable = true; @@ -223601,7 +223415,6 @@ self: { homepage = "http://github.com/snoyberg/yaml/"; description = "Support for parsing and rendering YAML documents"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {inherit (pkgs) libyaml;}; "yaml-combinators" = callPackage diff --git a/pkgs/development/libraries/dlib/default.nix b/pkgs/development/libraries/dlib/default.nix index d3e2f6c9c98..53ec9949f17 100644 --- a/pkgs/development/libraries/dlib/default.nix +++ b/pkgs/development/libraries/dlib/default.nix @@ -3,14 +3,14 @@ }: stdenv.mkDerivation rec { - version = "19.10"; + version = "19.9"; name = "dlib-${version}"; src = fetchFromGitHub { owner = "davisking"; repo = "dlib"; rev ="v${version}"; - sha256 = "0sgxblf4n33b8wgblyblmrkwydvy1yh7fzll1b6c4zgkz675w0m5"; + sha256 = "0lc54r928j9dg7f2wn25m887z24d31wrc14v2hn6aknp1z084lrc"; }; postPatch = '' diff --git a/pkgs/development/libraries/gsl/default.nix b/pkgs/development/libraries/gsl/default.nix index afd6391d719..f1eed726eb2 100644 --- a/pkgs/development/libraries/gsl/default.nix +++ b/pkgs/development/libraries/gsl/default.nix @@ -13,7 +13,8 @@ stdenv.mkDerivation rec { ./disable-fma.patch # http://lists.gnu.org/archive/html/bug-gsl/2011-11/msg00019.html ]; - doCheck = stdenv.system != "i686-linux"; # https://lists.gnu.org/archive/html/bug-gsl/2015-11/msg00012.html + # https://lists.gnu.org/archive/html/bug-gsl/2015-11/msg00012.html + doCheck = stdenv.system != "i686-linux" && stdenv.system != "aarch64-linux"; meta = { description = "The GNU Scientific Library, a large numerical library"; diff --git a/pkgs/development/libraries/lightstep-tracer-cpp/default.nix b/pkgs/development/libraries/lightstep-tracer-cpp/default.nix index f5660e93d79..f2a8d75a9cb 100644 --- a/pkgs/development/libraries/lightstep-tracer-cpp/default.nix +++ b/pkgs/development/libraries/lightstep-tracer-cpp/default.nix @@ -48,5 +48,6 @@ stdenv.mkDerivation rec { license = licenses.mit; platforms = platforms.linux; maintainers = with maintainers; [ cstrahan ]; + broken = true; # 2018-02-16 }; } diff --git a/pkgs/development/libraries/rocksdb/default.nix b/pkgs/development/libraries/rocksdb/default.nix index fc8a18cfc38..0951c113e3f 100644 --- a/pkgs/development/libraries/rocksdb/default.nix +++ b/pkgs/development/libraries/rocksdb/default.nix @@ -28,7 +28,7 @@ stdenv.mkDerivation rec { rev = "v${version}"; sha256 = "19d8i8map8qz639mhflmxc0w9gp78fvkq1l46y5s6b5imwh0w7xq"; }; - + nativeBuildInputs = [ which perl ]; buildInputs = [ snappy google-gflags zlib bzip2 lz4 malloc fixDarwinDylibNames ]; @@ -43,13 +43,13 @@ stdenv.mkDerivation rec { CMAKE_CXX_FLAGS = "-std=gnu++11"; JEMALLOC_LIB = stdenv.lib.optionalString (malloc == jemalloc) "-ljemalloc"; - ${if enableLite then "LIBNAME" else null} = "librocksdb_lite"; + LIBNAME = "librocksdb${stdenv.lib.optionalString enableLite "_lite"}"; ${if enableLite then "CXXFLAGS" else null} = "-DROCKSDB_LITE=1"; - + buildAndInstallFlags = [ "USE_RTTI=1" "DEBUG_LEVEL=0" - "DISABLE_WARNING_AS_ERROR=1" + "DISABLE_WARNING_AS_ERROR=1" ]; buildFlags = buildAndInstallFlags ++ [ @@ -68,7 +68,7 @@ stdenv.mkDerivation rec { echo "BUILD CONFIGURATION FOR SANITY CHECKING" cat make_config.mk mkdir -pv $static/lib/ - mv -vi $out/lib/librocksdb.a $static/lib/ + mv -vi $out/lib/${LIBNAME}.a $static/lib/ ''; enableParallelBuilding = true; @@ -77,7 +77,7 @@ stdenv.mkDerivation rec { homepage = http://rocksdb.org; description = "A library that provides an embeddable, persistent key-value store for fast storage"; license = licenses.bsd3; - platforms = platforms.x86_64 ++ platforms.aarch64; + platforms = platforms.x86_64; maintainers = with maintainers; [ adev wkennington ]; }; } diff --git a/pkgs/development/libraries/vulkan-loader/default.nix b/pkgs/development/libraries/vulkan-loader/default.nix index 4bc64203051..2b0d765efc8 100644 --- a/pkgs/development/libraries/vulkan-loader/default.nix +++ b/pkgs/development/libraries/vulkan-loader/default.nix @@ -3,12 +3,12 @@ libXext, wayland, libGL, makeWrapper }: let - version = "1.0.61.1"; + version = "1.1.70.0"; src = fetchFromGitHub { owner = "KhronosGroup"; repo = "Vulkan-LoaderAndValidationLayers"; rev = "sdk-${version}"; - sha256 = "043kw6wnrpdplnb40x6n9rgf3gygsn9jiv91y458sydbhalfr945"; + sha256 = "1a7xwl65bi03l4zbjq54qkxjb8kb4m78qvw8bas5alhf9v6i6yqp"; }; in @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ makeWrapper pkgconfig ]; buildInputs = [ cmake git python3 python3Packages.lxml - glslang spirv-tools x11 libxcb libXrandr libXext wayland + glslang x11 libxcb libXrandr libXext wayland ]; enableParallelBuilding = true; @@ -28,13 +28,18 @@ stdenv.mkDerivation rec { ]; outputs = [ "out" "dev" "demos" ]; + patches = [ ./rev-file.patch ]; + + postUnpack = '' + # Hack so a version header can be generated. Relies on ./rev-file.patch to work. + mkdir -p "$sourceRoot/external/glslang/External" + echo "${spirv-tools.src.rev}" > "$sourceRoot/external/glslang/External/spirv-tools" + ''; preConfigure = '' checkRev() { [ "$2" = $(cat "external_revisions/$1_revision") ] || (echo "ERROR: dependency $1 is revision $2 but should be revision" $(cat "external_revisions/$1_revision") && exit 1) } - checkRev spirv-tools "${spirv-tools.src.rev}" - checkRev spirv-headers "${spirv-tools.headers.rev}" checkRev glslang "${glslang.src.rev}" ''; diff --git a/pkgs/development/libraries/vulkan-loader/rev-file.patch b/pkgs/development/libraries/vulkan-loader/rev-file.patch new file mode 100644 index 00000000000..e8f9f92c8ea --- /dev/null +++ b/pkgs/development/libraries/vulkan-loader/rev-file.patch @@ -0,0 +1,21 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index c9f73ce96..d14ffeed9 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -339,13 +339,13 @@ macro(run_vk_xml_generate dependency output) + endmacro() + + # Define macro used for generating header files containing commit IDs for external dependencies +-macro(run_external_revision_generate source_dir symbol_name output) ++macro(run_external_revision_generate rev_file symbol_name output) + add_custom_command(OUTPUT ${output} + # NOTE: If you modify this call to use --rev_file instead of --git_dir (to read the commit ID from a file instead of + # parsing from a Git repository), you probably also want to add the revision file to the list of DEPENDS on the + # subsequent line (to ensure that the script is re-run when the revision file is modified). +- COMMAND ${PYTHON_CMD} ${SCRIPTS_DIR}/external_revision_generator.py --git_dir ${source_dir} -s ${symbol_name} -o ${output} +- DEPENDS ${SCRIPTS_DIR}/external_revision_generator.py ${source_dir}/.git/HEAD ${source_dir}/.git/index ++ COMMAND ${PYTHON_CMD} ${SCRIPTS_DIR}/external_revision_generator.py --rev_file ${rev_file} -s ${symbol_name} -o ${output} ++ DEPENDS ${SCRIPTS_DIR}/external_revision_generator.py ${rev_file} + ) + endmacro() + diff --git a/pkgs/development/python-modules/face_recognition/default.nix b/pkgs/development/python-modules/face_recognition/default.nix index 3b9a2c15b6e..d1d8e8535a4 100644 --- a/pkgs/development/python-modules/face_recognition/default.nix +++ b/pkgs/development/python-modules/face_recognition/default.nix @@ -1,23 +1,23 @@ { buildPythonPackage, fetchFromGitHub, pillow, click, dlib, numpy -, face_recognition_models, scipy, stdenv, flake8, tox, pytest, glibcLocales +, face_recognition_models, stdenv, flake8, tox, pytest, glibcLocales }: buildPythonPackage rec { pname = "face_recognition"; - version = "1.2.1"; + version = "1.2.2"; src = fetchFromGitHub { repo = pname; owner = "ageitgey"; - rev = "fe421d4acd76e8a19098e942b7bd9c3bbef6ebc4"; # no tags available in Git, pure revs are pushed to pypi - sha256 = "0wv5qxkg7xv1cr43zhhbixaqgj08xw2l7yvwl8g3fb2kdxyndw1c"; + rev = "v${version}"; + sha256 = "17jnyr80j1p74gyvh1jabvwd3zsxvip2y7cjhh2g6gsjv2dpvrjv"; }; postPatch = '' substituteInPlace setup.py --replace "flake8==2.6.0" "flake8" ''; - propagatedBuildInputs = [ pillow click dlib numpy face_recognition_models scipy ]; + propagatedBuildInputs = [ pillow click dlib numpy face_recognition_models ]; checkInputs = [ flake8 tox pytest glibcLocales ]; checkPhase = '' diff --git a/pkgs/development/tools/build-managers/doit/default.nix b/pkgs/development/tools/build-managers/doit/default.nix index aeeb4dbd779..e6ec8c2a80c 100644 --- a/pkgs/development/tools/build-managers/doit/default.nix +++ b/pkgs/development/tools/build-managers/doit/default.nix @@ -3,14 +3,14 @@ let name = "doit"; - version = "0.31.0"; + version = "0.31.1"; in python3Packages.buildPythonApplication { name = "${name}-${version}"; src = fetchurl { url = "mirror://pypi/d/${name}/${name}-${version}.tar.gz"; - sha256 = "0v1yr04bfqnz3sp261np3zhf0y1b3a1daxc83iq308lscf39fdgx"; + sha256 = "1spm8vfjh4kvalaj0i2ggbdln1yy5k68d8mfwfnpqlzxxx4ikl5s"; }; buildInputs = with python3Packages; [ mock pytest ]; diff --git a/pkgs/development/tools/gron/default.nix b/pkgs/development/tools/gron/default.nix new file mode 100644 index 00000000000..59f7360df2a --- /dev/null +++ b/pkgs/development/tools/gron/default.nix @@ -0,0 +1,32 @@ +{ stdenv, buildGoPackage, fetchFromGitHub }: + +buildGoPackage rec { + name = "gron-${version}"; + version = "0.5.1"; + + owner = "tomnomnom"; + repo = "gron"; + goPackagePath = "github.com/${owner}/${repo}"; + + src = fetchFromGitHub { + inherit owner repo; + rev = "v${version}"; + sha256 = "1s688ynjddchviwbiggnfbw28s4wsff2941f4b1q1j7mfak7iym2"; + }; + + goDeps = ./deps.nix; + + meta = with stdenv.lib; { + description = "Make JSON greppable!"; + longDescription = '' + gron transforms JSON into discrete assignments to make it easier to grep + for what you want and see the absolute 'path' to it. It eases the + exploration of APIs that return large blobs of JSON but have terrible + documentation. + ''; + homepage = "https://github.com/tomnomnom/gron"; + license = licenses.mit; + maintainers = [ maintainers.fgaz ]; + platforms = with platforms; linux ++ darwin; + }; +} diff --git a/pkgs/development/tools/gron/deps.nix b/pkgs/development/tools/gron/deps.nix new file mode 100644 index 00000000000..c5b1feb888a --- /dev/null +++ b/pkgs/development/tools/gron/deps.nix @@ -0,0 +1,35 @@ +[ + rec { + owner = "fatih"; + repo = "color"; + goPackagePath = "github.com/${owner}/${repo}"; + fetch = { + type = "git"; + url = "https://github.com/${owner}/${repo}"; + rev = "v1.6.0"; + sha256 = "0k1v9dkhrxiqhg48yqkwzpd7x40xx38gv2pgknswbsy4r8w644i7"; + }; + } + rec { + owner = "nwidger"; + repo = "jsoncolor"; + goPackagePath = "github.com/${owner}/${repo}"; + fetch = { + type = "git"; + url = "https://github.com/${owner}/${repo}"; + rev = "75a6de4340e59be95f0884b9cebdda246e0fdf40"; + sha256 = "0aiv42xijrqgrxfx6pfyrndpwqv8i1qwsk190jdczyjxlnki2nki"; + }; + } + rec { + owner = "pkg"; + repo = "errors"; + goPackagePath = "github.com/${owner}/${repo}"; + fetch = { + type = "git"; + url = "https://github.com/${owner}/${repo}"; + rev = "v0.8.0"; + sha256 = "001i6n71ghp2l6kdl3qq1v2vmghcz3kicv9a5wgcihrzigm75pp5"; + }; + } +] diff --git a/pkgs/development/tools/jl/default.nix b/pkgs/development/tools/jl/default.nix new file mode 100644 index 00000000000..ea621428458 --- /dev/null +++ b/pkgs/development/tools/jl/default.nix @@ -0,0 +1,28 @@ +{ mkDerivation, fetchFromGitHub +, aeson, aeson-pretty, attoparsec, base, bytestring, conduit, conduit-extra +, containers, exceptions, mtl, optparse-simple, parsec, scientific, stdenv +, text, unordered-containers, vector +}: +mkDerivation rec { + pname = "jl"; + version = "0.0.4"; + src = fetchFromGitHub { + owner = "chrisdone"; + repo = "jl"; + rev = "v${version}"; + sha256 = "0wsdfj4m729q0kjpkn0ywpncdhvpvvprd4rh45vcg6kjw20krm3r"; + }; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + aeson attoparsec base bytestring containers exceptions mtl parsec + scientific text unordered-containers vector + ]; + executableHaskellDepends = [ + aeson aeson-pretty base bytestring conduit conduit-extra containers + mtl optparse-simple text vector + ]; + license = stdenv.lib.licenses.bsd3; + description = "Functional sed for JSON"; + maintainers = with stdenv.lib.maintainers; [ fgaz ]; +} diff --git a/pkgs/development/tools/spirv-tools/default.nix b/pkgs/development/tools/spirv-tools/default.nix index fc6bf1921e2..35e0d276101 100644 --- a/pkgs/development/tools/spirv-tools/default.nix +++ b/pkgs/development/tools/spirv-tools/default.nix @@ -3,19 +3,18 @@ let spirv_sources = { - # `vulkan-loader` requires a specific version of `spirv-tools` and `spirv-headers` as specified in - # `<vulkan-loader-repo>/external_revisions/spirv-tools_revision`. + # `glslang` requires a specific version of `spirv-tools` and `spirv-headers` as specified in `known-good.json`. tools = fetchFromGitHub { owner = "KhronosGroup"; repo = "SPIRV-Tools"; - rev = "7e2d26c77b606b21af839b37fd21381c4a669f23"; - sha256 = "1nlzj081v1xdyfz30nfs8hfcnqd072fra127h46gav179f04kss2"; + rev = "9e19fc0f31ceaf1f6bc907dbf17dcfded85f2ce8"; + sha256 = "1zpwznq0fyvkzs5h9nnkr7g6svr0w8z6zx62xgnss17c2a5cz0lk"; }; headers = fetchFromGitHub { owner = "KhronosGroup"; repo = "SPIRV-Headers"; - rev = "2bb92e6fe2c6aa410152fc6c63443f452acb1a65"; - sha256 = "1rgjd7kpa7xpbwpzd6m3f6yq44s9xn5ddhz135213pxwbi5c0c26"; + rev = "ce309203d7eceaf908bea8862c27f3e0749f7d00"; + sha256 = "1sv1iy2d46sg7r3xy591db6fn9h78wd079yvfa87vwmwsdkhiqhm"; }; }; @@ -23,7 +22,7 @@ in stdenv.mkDerivation rec { name = "spirv-tools-${version}"; - version = "2017-09-01"; + version = "2018-02-05"; src = spirv_sources.tools; patchPhase = ''ln -sv ${spirv_sources.headers} external/spirv-headers''; diff --git a/pkgs/games/factorio/default.nix b/pkgs/games/factorio/default.nix index b3319bae973..2cc63e9ecde 100644 --- a/pkgs/games/factorio/default.nix +++ b/pkgs/games/factorio/default.nix @@ -19,15 +19,15 @@ let binDists = { x86_64-linux = let bdist = bdistForArch { inUrl = "linux64"; inTar = "x64"; }; in { alpha = { - stable = bdist { sha256 = "1i25q8x80qdpmf00lvml67gyklrfvmr4gfyakrx954bq8giiy4ll"; fetcher = authenticatedFetch; }; - experimental = bdist { sha256 = "0s7cn5xhzwn793bmvlhlmibhbxdpfmpnpn33k5a4hdprc5gc27rg"; version = "0.16.24"; fetcher = authenticatedFetch; }; + stable = bdist { sha256 = "0gxa8wh0py4l1ym57sfq792kfh00khi0f9ykjlmjqqkdksyxgddf"; fetcher = authenticatedFetch; }; + experimental = bdist { sha256 = "1iy3k9zrw3za9mabf89lfl8i20xfij66ih5vngz5xfyy99mwxiy6"; version = "0.16.35"; fetcher = authenticatedFetch; }; }; headless = { - stable = bdist { sha256 = "0v5sypz1q6x6hi6k5cyi06f9ld0cky80l0z64psd3v2ax9hyyh8h"; }; - experimental = bdist { sha256 = "1ff4yjybiqr5kw583hmxkbrbxa3haj4bkjj8sx811c3s269gspi2"; version = "0.16.24"; }; + stable = bdist { sha256 = "0n2j86af41dkbsyyy5lawjpdd7c0lvfdwxpwbj1m8v470i1g8zq4"; }; + experimental = bdist { sha256 = "0x4miyva1lmiyv3lb4savdlycia1kzw6bri4qj9b2jmyw1dr8x8h"; version = "0.16.35"; }; }; demo = { - stable = bdist { sha256 = "0aca8gks7wl7yi821bcca16c94zcc41agin5j0vfz500i0sngzzw"; version = "0.15.36"; }; + stable = bdist { sha256 = "1z04rdlcxnfwami0l5nm292w4ydfhr1s6rcl8hxrsa73d4xk5lch"; version = "0.16.36"; }; experimental = bdist { }; }; }; @@ -49,7 +49,7 @@ let actual = binDists.${stdenv.system}.${releaseType}.${branch} or (throw "Factorio: unsupported platform"); bdistForArch = arch: { sha256 ? null - , version ? "0.15.40" + , version ? "0.16.36" , fetcher ? fetchurl , nameMut ? x: x }: diff --git a/pkgs/misc/cups/filters.nix b/pkgs/misc/cups/filters.nix index d3d59b20531..287451d338d 100644 --- a/pkgs/misc/cups/filters.nix +++ b/pkgs/misc/cups/filters.nix @@ -62,6 +62,5 @@ in stdenv.mkDerivation rec { description = "Backends, filters, and other software that was once part of the core CUPS distribution but is no longer maintained by Apple Inc"; license = stdenv.lib.licenses.gpl2; platforms = stdenv.lib.platforms.linux; - maintainers = with stdenv.lib.maintainers; [ layus ]; }; } diff --git a/pkgs/os-specific/darwin/apple-sdk/frameworks.nix b/pkgs/os-specific/darwin/apple-sdk/frameworks.nix index 081f713d054..f8c424089f0 100644 --- a/pkgs/os-specific/darwin/apple-sdk/frameworks.nix +++ b/pkgs/os-specific/darwin/apple-sdk/frameworks.nix @@ -14,7 +14,6 @@ with frameworks; with libs; { AppKitScripting = []; AppleScriptKit = []; AppleScriptObjC = []; - AppleShareClientCore = [ CoreServices ]; AudioToolbox = [ AudioUnit CoreAudio CF CoreMIDI ]; AudioUnit = [ Carbon CoreAudio CF ]; AudioVideoBridging = [ Foundation ]; @@ -84,12 +83,10 @@ with frameworks; with libs; { PCSC = [ CoreData ]; PreferencePanes = []; PubSub = []; - Python = [ ApplicationServices ]; QTKit = [ CoreMediaIO CoreMedia MediaToolbox QuickTime VideoToolbox ]; QuickLook = [ ApplicationServices CF ]; QuickTime = [ ApplicationServices AudioUnit Carbon CoreAudio CoreServices OpenGL QuartzCore ]; Ruby = []; - RubyCocoa = []; SceneKit = []; ScreenSaver = []; Scripting = []; @@ -105,11 +102,9 @@ with frameworks; with libs; { SystemConfiguration = [ CF Security ]; TWAIN = [ Carbon ]; Tcl = []; - Tk = [ ApplicationServices Carbon X11 ]; VideoDecodeAcceleration = [ CF CoreVideo ]; VideoToolbox = [ CF CoreMedia CoreVideo ]; WebKit = [ ApplicationServices Carbon JavaScriptCore OpenGL ]; - X11 = []; # used by Tk, should this exist? # Umbrellas Accelerate = [ CoreWLAN IOBluetooth ]; diff --git a/pkgs/os-specific/linux/firmware/firmware-linux-nonfree/default.nix b/pkgs/os-specific/linux/firmware/firmware-linux-nonfree/default.nix index 206787ecb8b..724498b960c 100644 --- a/pkgs/os-specific/linux/firmware/firmware-linux-nonfree/default.nix +++ b/pkgs/os-specific/linux/firmware/firmware-linux-nonfree/default.nix @@ -6,7 +6,8 @@ stdenv.mkDerivation rec { src = fetchgit { url = "https://git.kernel.org/pub/scm/linux/kernel/git/firmware/linux-firmware.git"; - sha256 = "1gh5a2km33jj151j3q7mgkjzzhaaxlqxbb53n4ff46q658gv0wma"; + rev = "8c1e439c967a50f0698d61aafdba3841aff10db0"; + sha256 = "110vxgahyx5dvylqrxsm5cmx4a32cl2zchvm6cgc270jz75fg7wd"; }; preInstall = '' diff --git a/pkgs/os-specific/linux/spl/default.nix b/pkgs/os-specific/linux/spl/default.nix index 9460ee46c0f..e7139d17ace 100644 --- a/pkgs/os-specific/linux/spl/default.nix +++ b/pkgs/os-specific/linux/spl/default.nix @@ -66,9 +66,9 @@ in }; splUnstable = common { - version = "2018-01-24"; - rev = "23602fdb39e1254c669707ec9d2d0e6bcdbf1771"; - sha256 = "09py2dwj77f6s2qcnkwdslg5nxb3hq2bq39zpxpm6msqyifhl69h"; + version = "2018-03-09"; + rev = "43983eb2024ec6b3280e6e06a6fb621ee3bb2a41"; + sha256 = "00h7z30hzxd09cfa44w7yv7zympvdwzdximfgjvpa1layzppjpsh"; }; splLegacyCrypto = common { diff --git a/pkgs/os-specific/linux/zfs/default.nix b/pkgs/os-specific/linux/zfs/default.nix index aac1576261d..bf02044a8c4 100644 --- a/pkgs/os-specific/linux/zfs/default.nix +++ b/pkgs/os-specific/linux/zfs/default.nix @@ -161,21 +161,21 @@ in { inherit spl; }; - zfsUnstable = common { + zfsUnstable = common rec { # comment/uncomment if breaking kernel versions are known incompatibleKernelVersion = null; # this package should point to a version / git revision compatible with the latest kernel release - version = "2018-02-02"; + version = "2018-04-04"; - rev = "fbd42542686af053f0d162ec4630ffd4fff1cc30"; - sha256 = "0qzkwnnk7kz1hwvcaqlpzi5yspfhhmd2alklc07k056ddzbx52qb"; + rev = "1724eb62debfaa48f5861660615d49a994945d94"; + sha256 = "1adnmpn7b8zi5rq9r71flwx237vbysss1wywbck8407mcnrfaxzf"; isUnstable = true; extraPatches = [ (fetchpatch { - url = "https://github.com/Mic92/zfs/compare/fbd42542686af053f0d162ec4630ffd4fff1cc30...nixos-zfs-2018-02-02.patch"; - sha256 = "05wqwjm9648x60vkwxbp8l6z1q73r2a5l2ni28i2f4pla8s3ahln"; + url = "https://github.com/Mic92/zfs/compare/${rev}...nixos-zfs-2018-02-02.patch"; + sha256 = "1gqmgqi39qhk5kbbvidh8f2xqq25vj58i9x0wjqvcx6a71qj49ch"; }) ]; diff --git a/pkgs/servers/nosql/arangodb/default.nix b/pkgs/servers/nosql/arangodb/default.nix index 75ba1f6a940..9d1e6213665 100644 --- a/pkgs/servers/nosql/arangodb/default.nix +++ b/pkgs/servers/nosql/arangodb/default.nix @@ -3,14 +3,14 @@ let in stdenv.mkDerivation rec { - version = "3.3.4"; + version = "3.3.5"; name = "arangodb-${version}"; src = fetchFromGitHub { repo = "arangodb"; owner = "arangodb"; rev = "v${version}"; - sha256 = "0gfjmva043f9nhqjpa0qy2cdbz84z7b1c2wgcy77i3wnskicy0pc"; + sha256 = "1015fi47m0j71l6wmp7n06qk0x2h3337sjqxfyan5dnnb0himzb6"; }; buildInputs = [ diff --git a/pkgs/tools/misc/xburst-tools/default.nix b/pkgs/tools/misc/xburst-tools/default.nix index c64ae609bcb..6b63e2f55a2 100644 --- a/pkgs/tools/misc/xburst-tools/default.nix +++ b/pkgs/tools/misc/xburst-tools/default.nix @@ -22,6 +22,8 @@ stdenv.mkDerivation { "--enable-firmware CROSS_COMPILE=${crossPrefix}-" else ""; + hardeningDisable = [ "pic" "stackprotector" ]; + # Not to strip cross build binaries (this is for the gcc-cross-wrapper) dontCrossStrip = true; diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index bf3aa8c75ff..70d40fa9d98 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -212,6 +212,10 @@ mapAliases (rec { telepathy_qt = telepathy-qt; # added 2018-02-25 telepathy_qt5 = libsForQt5.telepathy; # added 2015-12-19 telepathy_salut = telepathy-salut; # added 2018-02-25 + tex-gyre-bonum-math = tex-gyre-math.bonum; # added 2018-04-03 + tex-gyre-pagella-math = tex-gyre-math.pagella; # added 2018-04-03 + tex-gyre-schola-math = tex-gyre-math.schola; # added 2018-04-03 + tex-gyre-termes-math = tex-gyre-math.termes; # added 2018-04-03 tftp_hpa = tftp-hpa; # added 2015-04-03 transmission_gtk = transmission-gtk; # added 2018-01-06 transmission_remote_gtk = transmission-remote-gtk; # added 2018-01-06 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 073596951ef..e4de5a8b058 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -612,7 +612,7 @@ with pkgs; container-linux-config-transpiler = callPackage ../development/tools/container-linux-config-transpiler { }; cconv = callPackage ../tools/text/cconv { }; - + chkcrontab = callPackage ../tools/admin/chkcrontab { }; djmount = callPackage ../tools/filesystems/djmount { }; @@ -2667,6 +2667,8 @@ with pkgs; inherit (xorg) libXdmcp; }; + gron = callPackage ../development/tools/gron { }; + groonga = callPackage ../servers/search/groonga { }; grub = callPackage_i686 ../tools/misc/grub { @@ -3090,6 +3092,8 @@ with pkgs; jing = self.jing-trang; jing-trang = callPackage ../tools/text/xml/jing-trang { }; + jl = haskellPackages.callPackage ../development/tools/jl { }; + jmespath = callPackage ../development/tools/jmespath { }; jmtpfs = callPackage ../tools/filesystems/jmtpfs { }; @@ -5966,7 +5970,9 @@ with pkgs; fpc = callPackage ../development/compilers/fpc { }; gambit = callPackage ../development/compilers/gambit { }; + gambit-unstable = callPackage ../development/compilers/gambit/unstable.nix { }; gerbil = callPackage ../development/compilers/gerbil { }; + gerbil-unstable = callPackage ../development/compilers/gerbil/unstable.nix { }; gccFun = callPackage ../development/compilers/gcc/7; gcc = gcc7; @@ -14539,15 +14545,9 @@ with pkgs; terminus_font_ttf = callPackage ../data/fonts/terminus-font-ttf { }; - tex-gyre = callPackage ../data/fonts/tex-gyre { }; - - tex-gyre-bonum-math = callPackage ../data/fonts/tex-gyre-math { variant = "bonum"; }; + tex-gyre = callPackages ../data/fonts/tex-gyre { }; - tex-gyre-pagella-math = callPackage ../data/fonts/tex-gyre-math { variant = "pagella"; }; - - tex-gyre-schola-math = callPackage ../data/fonts/tex-gyre-math { variant = "schola"; }; - - tex-gyre-termes-math = callPackage ../data/fonts/tex-gyre-math { variant = "termes"; }; + tex-gyre-math = callPackages ../data/fonts/tex-gyre-math { }; tipa = callPackage ../data/fonts/tipa { }; @@ -17497,7 +17497,8 @@ with pkgs; rkt = callPackage ../applications/virtualization/rkt { }; - rofi = callPackage ../applications/misc/rofi { }; + rofi-unwrapped = callPackage ../applications/misc/rofi { }; + rofi = callPackage ../applications/misc/rofi/wrapper.nix { }; rofi-pass = callPackage ../tools/security/pass/rofi-pass.nix { }; @@ -18925,6 +18926,8 @@ with pkgs; factorio-headless = callPackage ../games/factorio { releaseType = "headless"; }; + factorio-headless-experimental = callPackage ../games/factorio { releaseType = "headless"; experimental = true; }; + factorio-demo = callPackage ../games/factorio { releaseType = "demo"; }; factorio-mods = callPackage ../games/factorio/mods.nix { }; diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix index 56d5aada81b..f9cd2eb9433 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -67,6 +67,12 @@ in rec { buildLlvmPackages = buildPackages.llvmPackages_5; llvmPackages = pkgs.llvmPackages_5; }; + ghc842 = callPackage ../development/compilers/ghc/8.4.2.nix rec { + bootPkgs = packages.ghc821Binary; + inherit (bootPkgs) alex happy; + buildLlvmPackages = buildPackages.llvmPackages_5; + llvmPackages = pkgs.llvmPackages_5; + }; ghcHEAD = callPackage ../development/compilers/ghc/head.nix rec { bootPkgs = packages.ghc821Binary; inherit (bootPkgs) alex happy; @@ -128,6 +134,11 @@ in rec { ghc = bh.compiler.ghc841; compilerConfig = callPackage ../development/haskell-modules/configuration-ghc-8.4.x.nix { }; }; + ghc842 = callPackage ../development/haskell-modules { + buildHaskellPackages = bh.packages.ghc842; + ghc = bh.compiler.ghc842; + compilerConfig = callPackage ../development/haskell-modules/configuration-ghc-8.4.x.nix { }; + }; ghcHEAD = callPackage ../development/haskell-modules { buildHaskellPackages = bh.packages.ghcHEAD; ghc = bh.compiler.ghcHEAD; |