diff options
125 files changed, 3339 insertions, 1237 deletions
diff --git a/doc/languages-frameworks/python.section.md b/doc/languages-frameworks/python.section.md index 6b59b767652a..b72616a75658 100644 --- a/doc/languages-frameworks/python.section.md +++ b/doc/languages-frameworks/python.section.md @@ -205,7 +205,7 @@ buildPythonPackage rec { license = licenses.bsd3; maintainers = with maintainers; [ fridh ]; }; -}; +} ``` What happens here? The function `buildPythonPackage` is called and as argument diff --git a/lib/licenses.nix b/lib/licenses.nix index d285ba2ea0aa..53a84999bc83 100644 --- a/lib/licenses.nix +++ b/lib/licenses.nix @@ -145,6 +145,12 @@ lib.mapAttrs (n: v: v // { shortName = n; }) rec { free = false; }; + cc-by-nc-30 = spdx { + spdxId = "CC-BY-NC-3.0"; + fullName = "Creative Commons Attribution Non Commercial 3.0 Unported"; + free = false; + }; + cc-by-nc-40 = spdx { spdxId = "CC-BY-NC-4.0"; fullName = "Creative Commons Attribution Non Commercial 4.0 International"; diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 4e9bdebe43f6..921000bd71ee 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -3218,6 +3218,11 @@ github = "mogria"; name = "Mogria"; }; + monsieurp = { + email = "monsieurp@gentoo.org"; + github = "monsieurp"; + name = "Patrice Clement"; + }; montag451 = { email = "montag451@laposte.net"; github = "montag451"; diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix index 9e589258ee0b..fca4a20eee63 100644 --- a/nixos/modules/module-list.nix +++ b/nixos/modules/module-list.nix @@ -686,6 +686,7 @@ ./services/networking/vsftpd.nix ./services/networking/wakeonlan.nix ./services/networking/websockify.nix + ./services/networking/wg-quick.nix ./services/networking/wicd.nix ./services/networking/wireguard.nix ./services/networking/wpa_supplicant.nix diff --git a/nixos/modules/services/misc/packagekit.nix b/nixos/modules/services/misc/packagekit.nix index bce21e8acff3..325c4e84e0d8 100644 --- a/nixos/modules/services/misc/packagekit.nix +++ b/nixos/modules/services/misc/packagekit.nix @@ -7,18 +7,19 @@ let cfg = config.services.packagekit; packagekitConf = '' -[Daemon] -KeepCache=false - ''; + [Daemon] + DefaultBackend=${cfg.backend} + KeepCache=false + ''; vendorConf = '' -[PackagesNotFound] -DefaultUrl=https://github.com/NixOS/nixpkgs -CodecUrl=https://github.com/NixOS/nixpkgs -HardwareUrl=https://github.com/NixOS/nixpkgs -FontUrl=https://github.com/NixOS/nixpkgs -MimeUrl=https://github.com/NixOS/nixpkgs - ''; + [PackagesNotFound] + DefaultUrl=https://github.com/NixOS/nixpkgs + CodecUrl=https://github.com/NixOS/nixpkgs + HardwareUrl=https://github.com/NixOS/nixpkgs + FontUrl=https://github.com/NixOS/nixpkgs + MimeUrl=https://github.com/NixOS/nixpkgs + ''; in @@ -33,26 +34,32 @@ in installing software. Software utilizing PackageKit can install software regardless of the package manager. ''; - }; + # TODO: integrate with PolicyKit if the nix backend matures to the point + # where it will require elevated permissions + backend = mkOption { + type = types.enum [ "test_nop" ]; + default = "test_nop"; + description = '' + PackageKit supports multiple different backends and <literal>auto</literal> which + should do the right thing. + </para> + <para> + On NixOS however, we do not have a backend compatible with nix 2.0 + (refer to <link xlink:href="https://github.com/NixOS/nix/issues/233">this issue</link> so we have to force + it to <literal>test_nop</literal> for now. + ''; + }; + }; }; config = mkIf cfg.enable { - services.dbus.packages = [ pkgs.packagekit ]; + services.dbus.packages = with pkgs; [ packagekit ]; - systemd.services.packagekit = { - description = "PackageKit Daemon"; - wantedBy = [ "multi-user.target" ]; - serviceConfig.ExecStart = "${pkgs.packagekit}/libexec/packagekitd"; - serviceConfig.User = "root"; - serviceConfig.BusName = "org.freedesktop.PackageKit"; - serviceConfig.Type = "dbus"; - }; + systemd.packages = with pkgs; [ packagekit ]; environment.etc."PackageKit/PackageKit.conf".text = packagekitConf; environment.etc."PackageKit/Vendor.conf".text = vendorConf; - }; - } diff --git a/nixos/modules/services/misc/plex.nix b/nixos/modules/services/misc/plex.nix index fce9b29011f1..7efadf1b9bb1 100644 --- a/nixos/modules/services/misc/plex.nix +++ b/nixos/modules/services/misc/plex.nix @@ -10,35 +10,38 @@ in services.plex = { enable = mkEnableOption "Plex Media Server"; - # FIXME: In order for this config option to work, symlinks in the Plex - # package in the Nix store have to be changed to point to this directory. dataDir = mkOption { type = types.str; default = "/var/lib/plex"; - description = "The directory where Plex stores its data files."; + description = '' + The directory where Plex stores its data files. + ''; }; openFirewall = mkOption { type = types.bool; default = false; description = '' - Open ports in the firewall for the media server + Open ports in the firewall for the media server. ''; }; user = mkOption { type = types.str; default = "plex"; - description = "User account under which Plex runs."; + description = '' + User account under which Plex runs. + ''; }; group = mkOption { type = types.str; default = "plex"; - description = "Group under which Plex runs."; + description = '' + Group under which Plex runs. + ''; }; - managePlugins = mkOption { type = types.bool; default = true; @@ -80,73 +83,48 @@ in description = "Plex Media Server"; after = [ "network.target" ]; wantedBy = [ "multi-user.target" ]; - preStart = '' - test -d "${cfg.dataDir}/Plex Media Server" || { - echo "Creating initial Plex data directory in \"${cfg.dataDir}\"." - mkdir -p "${cfg.dataDir}/Plex Media Server" - chown -R ${cfg.user}:${cfg.group} "${cfg.dataDir}" - } - - # Copy the database skeleton files to /var/lib/plex/.skeleton - # See the the Nix expression for Plex's package for more information on - # why this is done. - install --owner ${cfg.user} --group ${cfg.group} -d "${cfg.dataDir}/.skeleton" - for db in "com.plexapp.plugins.library.db"; do - if [ ! -e "${cfg.dataDir}/.skeleton/$db" ]; then - cp "${cfg.package}/usr/lib/plexmediaserver/Resources/base_$db" "${cfg.dataDir}/.skeleton/$db" - fi - chmod u+w "${cfg.dataDir}/.skeleton/$db" - chown ${cfg.user}:${cfg.group} "${cfg.dataDir}/.skeleton/$db" - done - - # If managePlugins is enabled, setup symlinks for plugins. - ${optionalString cfg.managePlugins '' - echo "Preparing plugin directory." - PLUGINDIR="${cfg.dataDir}/Plex Media Server/Plug-ins" - test -d "$PLUGINDIR" || { - mkdir -p "$PLUGINDIR"; - chown ${cfg.user}:${cfg.group} "$PLUGINDIR"; - } - - echo "Removing old symlinks." - # First, remove all of the symlinks in the directory. - for f in `ls "$PLUGINDIR/"`; do - if [[ -L "$PLUGINDIR/$f" ]]; then - echo "Removing plugin symlink $PLUGINDIR/$f." - rm "$PLUGINDIR/$f" - fi - done - - echo "Symlinking plugins." - for path in ${toString cfg.extraPlugins}; do - dest="$PLUGINDIR/$(basename $path)" - if [[ ! -d "$path" ]]; then - echo "Error symlinking plugin from $path: no such directory." - elif [[ -d "$dest" || -L "$dest" ]]; then - echo "Error symlinking plugin from $path to $dest: file or directory already exists." - else - echo "Symlinking plugin at $path..." - ln -s "$path" "$dest" - fi - done - ''} - ''; + serviceConfig = { Type = "simple"; User = cfg.user; Group = cfg.group; - PermissionsStartOnly = "true"; - ExecStart = "\"${cfg.package}/usr/lib/plexmediaserver/Plex Media Server\""; + + # Run the pre-start script with full permissions (the "!" prefix) so it + # can create the data directory if necessary. + ExecStartPre = let + preStartScript = pkgs.writeScript "plex-run-prestart" '' + #!${pkgs.bash}/bin/bash + + # Create data directory if it doesn't exist + if ! test -d "$PLEX_DATADIR"; then + echo "Creating initial Plex data directory in: $PLEX_DATADIR" + install -d -m 0755 -o "${cfg.user}" -g "${cfg.group}" "$PLEX_DATADIR" + fi + ''; + in + "!${preStartScript}"; + + ExecStart = "${cfg.package}/bin/plexmediaserver"; KillSignal = "SIGQUIT"; Restart = "on-failure"; }; + environment = { - PLEX_MEDIA_SERVER_APPLICATION_SUPPORT_DIR=cfg.dataDir; - PLEX_MEDIA_SERVER_HOME="${cfg.package}/usr/lib/plexmediaserver"; + # Configuration for our FHS userenv script + PLEX_DATADIR=cfg.dataDir; + PLEX_PLUGINS=concatMapStringsSep ":" builtins.toString cfg.extraPlugins; + + # The following variables should be set by the FHS userenv script: + # PLEX_MEDIA_SERVER_APPLICATION_SUPPORT_DIR + # PLEX_MEDIA_SERVER_HOME + + # Allow access to GPU acceleration; the Plex LD_LIBRARY_PATH is added + # by the FHS userenv script. + LD_LIBRARY_PATH="/run/opengl-driver/lib"; + PLEX_MEDIA_SERVER_MAX_PLUGIN_PROCS="6"; PLEX_MEDIA_SERVER_TMPDIR="/tmp"; PLEX_MEDIA_SERVER_USE_SYSLOG="true"; - LD_LIBRARY_PATH="/run/opengl-driver/lib:${cfg.package}/usr/lib/plexmediaserver/lib"; LC_ALL="en_US.UTF-8"; LANG="en_US.UTF-8"; }; diff --git a/nixos/modules/services/networking/wg-quick.nix b/nixos/modules/services/networking/wg-quick.nix new file mode 100644 index 000000000000..b770d47d269e --- /dev/null +++ b/nixos/modules/services/networking/wg-quick.nix @@ -0,0 +1,312 @@ +{ config, lib, pkgs, ... }: + +with lib; +let + cfg = config.networking.wg-quick; + + kernel = config.boot.kernelPackages; + + # interface options + + interfaceOpts = { ... }: { + options = { + address = mkOption { + example = [ "192.168.2.1/24" ]; + default = []; + type = with types; listOf str; + description = "The IP addresses of the interface."; + }; + + dns = mkOption { + example = [ "192.168.2.2" ]; + default = []; + type = with types; listOf str; + description = "The IP addresses of DNS servers to configure."; + }; + + privateKey = mkOption { + example = "yAnz5TF+lXXJte14tji3zlMNq+hd2rYUIgJBgB3fBmk="; + type = with types; nullOr str; + default = null; + description = '' + Base64 private key generated by wg genkey. + + Warning: Consider using privateKeyFile instead if you do not + want to store the key in the world-readable Nix store. + ''; + }; + + privateKeyFile = mkOption { + example = "/private/wireguard_key"; + type = with types; nullOr str; + default = null; + description = '' + Private key file as generated by wg genkey. + ''; + }; + + listenPort = mkOption { + default = null; + type = with types; nullOr int; + example = 51820; + description = '' + 16-bit port for listening. Optional; if not specified, + automatically generated based on interface name. + ''; + }; + + preUp = mkOption { + example = literalExample '' + ${pkgs.iproute}/bin/ip netns add foo + ''; + default = ""; + type = with types; coercedTo (listOf str) (concatStringsSep "\n") lines; + description = '' + Commands called at the start of the interface setup. + ''; + }; + + preDown = mkOption { + example = literalExample '' + ${pkgs.iproute}/bin/ip netns del foo + ''; + default = ""; + type = with types; coercedTo (listOf str) (concatStringsSep "\n") lines; + description = '' + Command called before the interface is taken down. + ''; + }; + + postUp = mkOption { + example = literalExample '' + ${pkgs.iproute}/bin/ip netns add foo + ''; + default = ""; + type = with types; coercedTo (listOf str) (concatStringsSep "\n") lines; + description = '' + Commands called after the interface setup. + ''; + }; + + postDown = mkOption { + example = literalExample '' + ${pkgs.iproute}/bin/ip netns del foo + ''; + default = ""; + type = with types; coercedTo (listOf str) (concatStringsSep "\n") lines; + description = '' + Command called after the interface is taken down. + ''; + }; + + table = mkOption { + example = "main"; + default = null; + type = with types; nullOr str; + description = '' + The kernel routing table to add this interface's + associated routes to. Setting this is useful for e.g. policy routing + ("ip rule") or virtual routing and forwarding ("ip vrf"). Both numeric + table IDs and table names (/etc/rt_tables) can be used. Defaults to + "main". + ''; + }; + + mtu = mkOption { + example = 1248; + default = null; + type = with types; nullOr int; + description = '' + If not specified, the MTU is automatically determined + from the endpoint addresses or the system default route, which is usually + a sane choice. However, to manually specify an MTU to override this + automatic discovery, this value may be specified explicitly. + ''; + }; + + peers = mkOption { + default = []; + description = "Peers linked to the interface."; + type = with types; listOf (submodule peerOpts); + }; + }; + }; + + # peer options + + peerOpts = { + options = { + publicKey = mkOption { + example = "xTIBA5rboUvnH4htodjb6e697QjLERt1NAB4mZqp8Dg="; + type = types.str; + description = "The base64 public key the peer."; + }; + + presharedKey = mkOption { + default = null; + example = "rVXs/Ni9tu3oDBLS4hOyAUAa1qTWVA3loR8eL20os3I="; + type = with types; nullOr str; + description = '' + Base64 preshared key generated by wg genpsk. Optional, + and may be omitted. This option adds an additional layer of + symmetric-key cryptography to be mixed into the already existing + public-key cryptography, for post-quantum resistance. + + Warning: Consider using presharedKeyFile instead if you do not + want to store the key in the world-readable Nix store. + ''; + }; + + presharedKeyFile = mkOption { + default = null; + example = "/private/wireguard_psk"; + type = with types; nullOr str; + description = '' + File pointing to preshared key as generated by wg pensk. Optional, + and may be omitted. This option adds an additional layer of + symmetric-key cryptography to be mixed into the already existing + public-key cryptography, for post-quantum resistance. + ''; + }; + + allowedIPs = mkOption { + example = [ "10.192.122.3/32" "10.192.124.1/24" ]; + type = with types; listOf str; + description = ''List of IP (v4 or v6) addresses with CIDR masks from + which this peer is allowed to send incoming traffic and to which + outgoing traffic for this peer is directed. The catch-all 0.0.0.0/0 may + be specified for matching all IPv4 addresses, and ::/0 may be specified + for matching all IPv6 addresses.''; + }; + + endpoint = mkOption { + default = null; + example = "demo.wireguard.io:12913"; + type = with types; nullOr str; + description = ''Endpoint IP or hostname of the peer, followed by a colon, + and then a port number of the peer.''; + }; + + persistentKeepalive = mkOption { + default = null; + type = with types; nullOr int; + example = 25; + description = ''This is optional and is by default off, because most + users will not need it. It represents, in seconds, between 1 and 65535 + inclusive, how often to send an authenticated empty packet to the peer, + for the purpose of keeping a stateful firewall or NAT mapping valid + persistently. For example, if the interface very rarely sends traffic, + but it might at anytime receive traffic from a peer, and it is behind + NAT, the interface might benefit from having a persistent keepalive + interval of 25 seconds; however, most users will not need this.''; + }; + }; + }; + + writeScriptFile = name: text: ((pkgs.writeShellScriptBin name text) + "/bin/${name}"); + + generateUnit = name: values: + assert assertMsg ((values.privateKey != null) != (values.privateKeyFile != null)) "Only one of privateKey or privateKeyFile may be set"; + let + preUpFile = if values.preUp != "" then writeScriptFile "preUp.sh" values.preUp else null; + postUp = + optional (values.privateKeyFile != null) "wg set ${name} private-key <(cat ${values.privateKeyFile})" ++ + (concatMap (peer: optional (peer.presharedKeyFile != null) "wg set ${name} peer ${peer.publicKey} preshared-key <(cat ${peer.presharedKeyFile})") values.peers) ++ + optional (values.postUp != null) values.postUp; + postUpFile = if postUp != [] then writeScriptFile "postUp.sh" (concatMapStringsSep "\n" (line: line) postUp) else null; + preDownFile = if values.preDown != "" then writeScriptFile "preDown.sh" values.preDown else null; + postDownFile = if values.postDown != "" then writeScriptFile "postDown.sh" values.postDown else null; + configDir = pkgs.writeTextFile { + name = "config-${name}"; + executable = false; + destination = "/${name}.conf"; + text = + '' + [interface] + ${concatMapStringsSep "\n" (address: + "Address = ${address}" + ) values.address} + ${concatMapStringsSep "\n" (dns: + "DNS = ${dns}" + ) values.dns} + '' + + optionalString (values.table != null) "Table = ${values.table}\n" + + optionalString (values.mtu != null) "MTU = ${toString values.mtu}\n" + + optionalString (values.privateKey != null) "PrivateKey = ${values.privateKey}\n" + + optionalString (values.listenPort != null) "ListenPort = ${toString values.listenPort}\n" + + optionalString (preUpFile != null) "PreUp = ${preUpFile}\n" + + optionalString (postUpFile != null) "PostUp = ${postUpFile}\n" + + optionalString (preDownFile != null) "PreDown = ${preDownFile}\n" + + optionalString (postDownFile != null) "PostDown = ${postDownFile}\n" + + concatMapStringsSep "\n" (peer: + assert assertMsg (!((peer.presharedKeyFile != null) && (peer.presharedKey != null))) "Only one of presharedKey or presharedKeyFile may be set"; + "[Peer]\n" + + "PublicKey = ${peer.publicKey}\n" + + optionalString (peer.presharedKey != null) "PresharedKey = ${peer.presharedKey}\n" + + optionalString (peer.endpoint != null) "Endpoint = ${peer.endpoint}\n" + + optionalString (peer.persistentKeepalive != null) "PersistentKeepalive = ${toString peer.persistentKeepalive}\n" + + optionalString (peer.allowedIPs != []) "AllowedIPs = ${concatStringsSep "," peer.allowedIPs}\n" + ) values.peers; + }; + configPath = "${configDir}/${name}.conf"; + in + nameValuePair "wg-quick-${name}" + { + description = "wg-quick WireGuard Tunnel - ${name}"; + requires = [ "network-online.target" ]; + after = [ "network.target" "network-online.target" ]; + wantedBy = [ "multi-user.target" ]; + environment.DEVICE = name; + path = [ pkgs.kmod pkgs.wireguard-tools ]; + + serviceConfig = { + Type = "oneshot"; + RemainAfterExit = true; + }; + + script = '' + ${optionalString (!config.boot.isContainer) "modprobe wireguard"} + wg-quick up ${configPath} + ''; + + preStop = '' + wg-quick down ${configPath} + ''; + }; +in { + + ###### interface + + options = { + networking.wg-quick = { + interfaces = mkOption { + description = "Wireguard interfaces."; + default = {}; + example = { + wg0 = { + address = [ "192.168.20.4/24" ]; + privateKey = "yAnz5TF+lXXJte14tji3zlMNq+hd2rYUIgJBgB3fBmk="; + peers = [ + { allowedIPs = [ "192.168.20.1/32" ]; + publicKey = "xTIBA5rboUvnH4htodjb6e697QjLERt1NAB4mZqp8Dg="; + endpoint = "demo.wireguard.io:12913"; } + ]; + }; + }; + type = with types; attrsOf (submodule interfaceOpts); + }; + }; + }; + + + ###### implementation + + config = mkIf (cfg.interfaces != {}) { + boot.extraModulePackages = [ kernel.wireguard ]; + environment.systemPackages = [ pkgs.wireguard-tools ]; + # This is forced to false for now because the default "--validmark" rpfilter we apply on reverse path filtering + # breaks the wg-quick routing because wireguard packets leave with a fwmark from wireguard. + networking.firewall.checkReversePath = false; + systemd.services = mapAttrs' generateUnit cfg.interfaces; + }; +} diff --git a/nixos/tests/all-tests.nix b/nixos/tests/all-tests.nix index a1871ee5f903..016e695b3ada 100644 --- a/nixos/tests/all-tests.nix +++ b/nixos/tests/all-tests.nix @@ -182,6 +182,7 @@ in osrm-backend = handleTest ./osrm-backend.nix {}; ostree = handleTest ./ostree.nix {}; overlayfs = handleTest ./overlayfs.nix {}; + packagekit = handleTest ./packagekit.nix {}; pam-oath-login = handleTest ./pam-oath-login.nix {}; pam-u2f = handleTest ./pam-u2f.nix {}; pantheon = handleTest ./pantheon.nix {}; diff --git a/nixos/tests/packagekit.nix b/nixos/tests/packagekit.nix new file mode 100644 index 000000000000..e2d68af661f8 --- /dev/null +++ b/nixos/tests/packagekit.nix @@ -0,0 +1,24 @@ +import ./make-test.nix ({ pkgs, ... }: { + name = "packagekit"; + meta = with pkgs.stdenv.lib.maintainers; { + maintainers = [ peterhoeg ]; + }; + + machine = { ... }: { + environment.systemPackages = with pkgs; [ dbus ]; + services.packagekit = { + enable = true; + backend = "test_nop"; + }; + }; + + testScript = '' + startAll; + + # send a dbus message to activate the service + $machine->succeed("dbus-send --system --type=method_call --print-reply --dest=org.freedesktop.PackageKit /org/freedesktop/PackageKit org.freedesktop.DBus.Introspectable.Introspect"); + + # so now it should be running + $machine->succeed("systemctl is-active packagekit.service"); + ''; +}) diff --git a/pkgs/applications/audio/lollypop/default.nix b/pkgs/applications/audio/lollypop/default.nix index 565c0b315226..2a790514447d 100644 --- a/pkgs/applications/audio/lollypop/default.nix +++ b/pkgs/applications/audio/lollypop/default.nix @@ -1,11 +1,27 @@ -{ stdenv, fetchgit, meson, ninja, pkgconfig -, python3, gtk3, gst_all_1, libsecret, libsoup -, appstream-glib, desktop-file-utils, totem-pl-parser -, hicolor-icon-theme, gobject-introspection, wrapGAppsHook }: +{ lib +, fetchgit +, meson +, ninja +, pkgconfig +, python3 +, gtk3 +, gst_all_1 +, libsecret +, libsoup +, appstream-glib +, desktop-file-utils +, totem-pl-parser +, hicolor-icon-theme +, gobject-introspection +, wrapGAppsHook +, lastFMSupport ? true +, wikipediaSupport ? true +, youtubeSupport ? true, youtube-dl +}: python3.pkgs.buildPythonApplication rec { pname = "lollypop"; - version = "1.0.5"; + version = "1.0.7"; format = "other"; doCheck = false; @@ -14,7 +30,7 @@ python3.pkgs.buildPythonApplication rec { url = "https://gitlab.gnome.org/World/lollypop"; rev = "refs/tags/${version}"; fetchSubmodules = true; - sha256 = "1p6glzvbbha3cvq462ymbn1q58skclfk469kk28cr1hlsf5x2pry"; + sha256 = "0gdds4qssn32axsa5janqny5i4426azj5wyj6bzn026zs3z38svn"; }; nativeBuildInputs = [ @@ -37,10 +53,9 @@ python3.pkgs.buildPythonApplication rec { gstreamer gtk3 hicolor-icon-theme - libsecret libsoup totem-pl-parser - ]; + ] ++ lib.optional lastFMSupport libsecret; propagatedBuildInputs = with python3.pkgs; [ beautifulsoup4 @@ -49,8 +64,11 @@ python3.pkgs.buildPythonApplication rec { pycairo pydbus pygobject3 - pylast - ]; + ] + ++ lib.optional lastFMSupport pylast + ++ lib.optional wikipediaSupport wikipedia + ++ lib.optional youtubeSupport youtube-dl + ; postPatch = '' chmod +x meson_post_install.py @@ -62,7 +80,7 @@ python3.pkgs.buildPythonApplication rec { patchPythonScript "$out/libexec/lollypop-sp" ''; - meta = with stdenv.lib; { + meta = with lib; { description = "A modern music player for GNOME"; homepage = https://wiki.gnome.org/Apps/Lollypop; license = licenses.gpl3Plus; diff --git a/pkgs/applications/audio/padthv1/default.nix b/pkgs/applications/audio/padthv1/default.nix index 5957a740f350..b2e5fb11ac31 100644 --- a/pkgs/applications/audio/padthv1/default.nix +++ b/pkgs/applications/audio/padthv1/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "padthv1-${version}"; - version = "0.9.5"; + version = "0.9.6"; src = fetchurl { url = "mirror://sourceforge/padthv1/${name}.tar.gz"; - sha256 = "0cd1jfb3ynfrsbz8jwfsbvs5liyddxg4zghrvz931qkkqi117hbh"; + sha256 = "0ddvlpjlg6zr9ckanqhisw0sgm8rxibvj1aj5dxzs9xb2wlwd8rr"; }; buildInputs = [ libjack2 alsaLib libsndfile liblo lv2 qt5.qtbase qt5.qttools fftw ]; diff --git a/pkgs/applications/editors/android-studio/default.nix b/pkgs/applications/editors/android-studio/default.nix index a7c2c3da444c..714daa3649c5 100644 --- a/pkgs/applications/editors/android-studio/default.nix +++ b/pkgs/applications/editors/android-studio/default.nix @@ -14,9 +14,9 @@ let }; betaVersion = stableVersion; latestVersion = { # canary & dev - version = "3.5.0.11"; # "Android Studio 3.5 Canary 12" - build = "191.5471097"; - sha256Hash = "1dz9iy8f12fzqp8wv9c5v01d33djy97aha8rxxp18vi6myak42ca"; + version = "3.5.0.12"; # "Android Studio 3.5 Canary 13" + build = "191.5487692"; + sha256Hash = "0iwd2qa551rs9b0w4rs7wmzdbh3r4j76xvs815l6i5pilk0s47gz"; }; in rec { # Attributes are named by their corresponding release channels diff --git a/pkgs/applications/gis/qgis/unwrapped.nix b/pkgs/applications/gis/qgis/unwrapped.nix index 719491ac2b08..7d201cc0e593 100644 --- a/pkgs/applications/gis/qgis/unwrapped.nix +++ b/pkgs/applications/gis/qgis/unwrapped.nix @@ -10,12 +10,12 @@ let [ qscintilla-qt5 gdal jinja2 numpy psycopg2 chardet dateutil pyyaml pytz requests urllib3 pygments pyqt5 sip owslib six ]; in stdenv.mkDerivation rec { - version = "3.4.6"; + version = "3.4.7"; name = "qgis-unwrapped-${version}"; src = fetchurl { url = "http://qgis.org/downloads/qgis-${version}.tar.bz2"; - sha256 = "1skdimcbcv41hi4ii7iq8ka29k2zizzqv04fwidzfbxqclz7300h"; + sha256 = "15w2cb5ac0n3g3jbnbk6qyqs7kx3y64zbyvcsw09p0dn9rnw4hdr"; }; passthru = { diff --git a/pkgs/applications/graphics/epeg/default.nix b/pkgs/applications/graphics/epeg/default.nix index 3645cc565728..3b7bdfb8efc2 100644 --- a/pkgs/applications/graphics/epeg/default.nix +++ b/pkgs/applications/graphics/epeg/default.nix @@ -3,13 +3,14 @@ }: stdenv.mkDerivation rec { - name = "epeg-0.9.1.042"; # version taken from configure.ac + pname = "epeg"; + version = "0.9.2"; src = fetchFromGitHub { owner = "mattes"; repo = "epeg"; - rev = "248ae9fc3f1d6d06e6062a1f7bf5df77d4f7de9b"; - sha256 = "14ad33w3pxrg2yfc2xzyvwyvjirwy2d00889dswisq8b84cmxfia"; + rev = "v${version}"; + sha256 = "14bjl9v6zzac4df25gm3bkw3n0mza5iazazsi65gg3m6661x6c5g"; }; enableParallelBuilding = true; diff --git a/pkgs/applications/graphics/freecad/default.nix b/pkgs/applications/graphics/freecad/default.nix index 6362d6c06fe9..c3177a8c7aa3 100644 --- a/pkgs/applications/graphics/freecad/default.nix +++ b/pkgs/applications/graphics/freecad/default.nix @@ -9,11 +9,11 @@ let pythonPackages = python27Packages; in stdenv.mkDerivation rec { name = "freecad-${version}"; - version = "0.17"; + version = "0.18.1"; src = fetchurl { url = "https://github.com/FreeCAD/FreeCAD/archive/${version}.tar.gz"; - sha256 = "1yv6abdzlpn4wxy315943xwrnbywxqfgkjib37qwfvbb8y9p60df"; + sha256 = "0lamrs84zv99v4z7yi6d9amjmnh7r6frairc2aajgfic380720bc"; }; buildInputs = [ cmake coin3d xercesc ode eigen qt4 opencascade gts @@ -22,14 +22,6 @@ in stdenv.mkDerivation rec { matplotlib pycollada pyside pysideShiboken pysideTools pivy python boost ]); - patches = [ - # Fix for finding boost_python. Boost >= 1.67.0 appends the Python version. - (fetchpatch { - url = https://github.com/FreeCAD/FreeCAD/commit/3c9e6b038ed544e446c61695dab62f83e781a28a.patch; - sha256 = "0f09qywzn0y41hylizb5g8jy74fi53iqmvqr5zznaz16wpw4hqbp"; - }) - ]; - enableParallelBuilding = true; # This should work on both x86_64, and i686 linux @@ -45,40 +37,8 @@ in stdenv.mkDerivation rec { postInstall = '' wrapProgram $out/bin/FreeCAD --prefix PYTHONPATH : $PYTHONPATH \ --set COIN_GL_NO_CURRENT_CONTEXT_CHECK 1 - - mkdir -p $out/share/mime/packages - cat << EOF > $out/share/mime/packages/freecad.xml - <?xml version="1.0" encoding="UTF-8"?> - <mime-info xmlns='http://www.freedesktop.org/standards/shared-mime-info'> - <mime-type type="application/x-extension-fcstd"> - <sub-class-of type="application/zip"/> - <comment>FreeCAD Document</comment> - <glob pattern="*.fcstd"/> - </mime-type> - </mime-info> - EOF - - mkdir -p $out/share/applications - cp $desktopItem/share/applications/* $out/share/applications/ - for entry in $out/share/applications/*.desktop; do - substituteAllInPlace $entry - done ''; - - desktopItem = makeDesktopItem { - name = "freecad"; - desktopName = "FreeCAD"; - genericName = "CAD Application"; - comment = meta.description; - exec = "@out@/bin/FreeCAD %F"; - categories = "Science;Education;Engineering;"; - startupNotify = "true"; - mimeType = "application/x-extension-fcstd;"; - extraEntries = '' - Path=@out@/share/freecad - ''; - }; - + meta = with stdenv.lib; { description = "General purpose Open Source 3D CAD/MCAD/CAx/CAE/PLM modeler"; homepage = https://www.freecadweb.org/; diff --git a/pkgs/applications/graphics/goxel/default.nix b/pkgs/applications/graphics/goxel/default.nix index 371abafbe72d..488c3eacc019 100644 --- a/pkgs/applications/graphics/goxel/default.nix +++ b/pkgs/applications/graphics/goxel/default.nix @@ -32,7 +32,7 @@ stdenv.mkDerivation rec { description = "Open Source 3D voxel editor"; homepage = https://guillaumechereau.github.io/goxel/; license = licenses.gpl3; - platforms = [ "x86_64-linux" ]; # see https://github.com/guillaumechereau/goxel/issues/125 + platforms = platforms.linux; maintainers = with maintainers; [ tilpner ]; }; } diff --git a/pkgs/applications/misc/guake/default.nix b/pkgs/applications/misc/guake/default.nix index 1e2c57a34691..0d7f460fb062 100644 --- a/pkgs/applications/misc/guake/default.nix +++ b/pkgs/applications/misc/guake/default.nix @@ -2,7 +2,7 @@ , gtk3, keybinder3, libnotify, libutempter, vte }: let - version = "3.4.0"; + version = "3.5.0"; in python3.pkgs.buildPythonApplication rec { name = "guake-${version}"; format = "other"; @@ -11,7 +11,7 @@ in python3.pkgs.buildPythonApplication rec { owner = "Guake"; repo = "guake"; rev = version; - sha256 = "1j38z968ha8ij6wrgbwvr8ad930nvhybm9g7pf4s4zv6d3vln0vm"; + sha256 = "0fz0gciw5fpxrp6yyji27l7q8c0r9ljsq6vw584mr70bcl1gzjqx"; }; # Strict deps breaks guake @@ -29,12 +29,6 @@ in python3.pkgs.buildPythonApplication rec { PBR_VERSION = version; # pbr needs either .git directory, sdist, or env var - postPatch = '' - # unnecessary /usr/bin/env in Makefile - # https://github.com/Guake/guake/pull/1285 - substituteInPlace "Makefile" --replace "/usr/bin/env python3" "python3" - ''; - makeFlags = [ "prefix=$(out)" ]; diff --git a/pkgs/applications/misc/hugo/default.nix b/pkgs/applications/misc/hugo/default.nix index f9f67b6cdaae..0bb3f15fdc18 100644 --- a/pkgs/applications/misc/hugo/default.nix +++ b/pkgs/applications/misc/hugo/default.nix @@ -2,7 +2,7 @@ buildGoModule rec { name = "hugo-${version}"; - version = "0.55.3"; + version = "0.55.4"; goPackagePath = "github.com/gohugoio/hugo"; @@ -10,7 +10,7 @@ buildGoModule rec { owner = "gohugoio"; repo = "hugo"; rev = "v${version}"; - sha256 = "0hpyaxfjgfm04fcw3qha2rdx93fr326mw5aiw95vnj5i0x1xbs3x"; + sha256 = "0hbkl8dhhdic0admrkvlp1h1bmfrrwfnvipx27clyk0f88jcvb7y"; }; modSha256 = "0yrwkaaasj9ihjjfbywnzkppix1y2znagg3dkyikk21sl5n0nz23"; diff --git a/pkgs/applications/misc/joplin-desktop/default.nix b/pkgs/applications/misc/joplin-desktop/default.nix index 615ca619aec7..57f564fdc667 100644 --- a/pkgs/applications/misc/joplin-desktop/default.nix +++ b/pkgs/applications/misc/joplin-desktop/default.nix @@ -1,31 +1,26 @@ -{ stdenv, appimage-run, fetchurl, gsettings-desktop-schemas, gtk3, gobject-introspection, wrapGAppsHook }: +{ appimageTools, fetchurl, lib, gsettings-desktop-schemas, gtk3 }: let + pname = "joplin-desktop"; version = "1.0.143"; - sha256 = "1waglwxpr18a07m7ix9al6ac4hrdqzzqmy1qgp45b922nbkw9g10"; -in - stdenv.mkDerivation rec { - name = "joplin-${version}"; - +in appimageTools.wrapType2 rec { + name = "${pname}-${version}"; src = fetchurl { url = "https://github.com/laurent22/joplin/releases/download/v${version}/Joplin-${version}-x86_64.AppImage"; - inherit sha256; + sha256 = "1waglwxpr18a07m7ix9al6ac4hrdqzzqmy1qgp45b922nbkw9g10"; }; - nativeBuildInputs = [ wrapGAppsHook ]; - buildInputs = [ appimage-run gtk3 gsettings-desktop-schemas gobject-introspection ]; - - unpackPhase = ":"; - installPhase = '' - mkdir -p $out/{bin,share} - cp $src $out/share/joplin.AppImage - echo "#!/bin/sh" > $out/bin/joplin-desktop - echo "${appimage-run}/bin/appimage-run $out/share/joplin.AppImage" >> $out/bin/joplin-desktop - chmod +x $out/bin/joplin-desktop $out/share/joplin.AppImage + profile = '' + export LC_ALL=C.UTF-8 + export XDG_DATA_DIRS=${gsettings-desktop-schemas}/share/gsettings-schemas/${gsettings-desktop-schemas.name}:${gtk3}/share/gsettings-schemas/${gtk3.name}:$XDG_DATA_DIRS ''; - meta = with stdenv.lib; { + multiPkgs = null; # no 32bit needed + extraPkgs = appimageTools.defaultFhsEnvArgs.multiPkgs; + extraInstallCommands = "mv $out/bin/{${name},${pname}}"; + + meta = with lib; { description = "An open source note taking and to-do application with synchronisation capabilities"; longDescription = '' Joplin is a free, open source note taking and to-do application, which can diff --git a/pkgs/applications/misc/librecad/default.nix b/pkgs/applications/misc/librecad/default.nix index ca9a90777e33..c049ed2374fd 100644 --- a/pkgs/applications/misc/librecad/default.nix +++ b/pkgs/applications/misc/librecad/default.nix @@ -18,8 +18,11 @@ stdenv.mkDerivation rec { qmakeFlags = [ "MUPARSER_DIR=${muparser}" "BOOST_DIR=${boost.dev}" ]; installPhase = '' - mkdir -p $out/bin $out/share - cp -R unix/librecad $out/bin + install -m 555 -D unix/librecad $out/bin/librecad + install -m 444 -D desktop/librecad.desktop $out/share/applications/librecad.desktop + install -m 444 -D desktop/librecad.sharedmimeinfo $out/share/mime/packages/librecad.xml + install -m 444 -D desktop/graphics_icons_and_splash/Icon\ LibreCAD/Icon_Librecad.svg \ + $out/share/icons/hicolor/scalable/apps/librecad.svg cp -R unix/resources $out/share/librecad ''; diff --git a/pkgs/applications/misc/notable/default.nix b/pkgs/applications/misc/notable/default.nix new file mode 100644 index 000000000000..055728ee046c --- /dev/null +++ b/pkgs/applications/misc/notable/default.nix @@ -0,0 +1,30 @@ +{ appimageTools, fetchurl, lib, gsettings-desktop-schemas, gtk3 }: + +let + pname = "notable"; + version = "1.4.0"; +in +appimageTools.wrapType2 rec { + name = "${pname}-${version}"; + src = fetchurl { + url = "https://github.com/notable/notable/releases/download/v${version}/Notable.${version}.AppImage"; + sha256 = "0ldmxnhqcphr92rb7imgb1dfx7bb3p515nrdds8jn4b8x6jgmnjr"; + }; + + profile = '' + export LC_ALL=C.UTF-8 + export XDG_DATA_DIRS=${gsettings-desktop-schemas}/share/gsettings-schemas/${gsettings-desktop-schemas.name}:${gtk3}/share/gsettings-schemas/${gtk3.name}:$XDG_DATA_DIRS + ''; + + multiPkgs = null; # no 32bit needed + extraPkgs = appimageTools.defaultFhsEnvArgs.multiPkgs; + extraInstallCommands = "mv $out/bin/{${name},${pname}}"; + + meta = with lib; { + description = "The markdown-based note-taking app that doesn't suck"; + homepage = https://github.com/notable/notable; + license = licenses.agpl3; + platforms = [ "x86_64-linux" ]; + maintainers = with maintainers; [ dtzWill ]; + }; +} diff --git a/pkgs/applications/misc/orca/default.nix b/pkgs/applications/misc/orca/default.nix index b20227590572..98ebde981c0a 100644 --- a/pkgs/applications/misc/orca/default.nix +++ b/pkgs/applications/misc/orca/default.nix @@ -4,7 +4,7 @@ , python, pygobject3, gtk3, gnome3, substituteAll , at-spi2-atk, at-spi2-core, pyatspi, dbus, dbus-python, pyxdg , xkbcomp, procps, lsof, coreutils, gsettings-desktop-schemas -, speechd, brltty, setproctitle, gst_all_1, gst-python +, speechd, brltty, liblouis, setproctitle, gst_all_1, gst-python }: buildPythonApplication rec { @@ -34,10 +34,11 @@ buildPythonApplication rec { ]; propagatedBuildInputs = [ - # TODO: re-add liblouis when it is fixed - pygobject3 pyatspi dbus-python pyxdg brltty speechd gst-python setproctitle + pygobject3 pyatspi dbus-python pyxdg brltty liblouis speechd gst-python setproctitle ]; + strictDeps = false; + buildInputs = [ python gtk3 at-spi2-atk at-spi2-core dbus gsettings-desktop-schemas gst_all_1.gstreamer gst_all_1.gst-plugins-base gst_all_1.gst-plugins-good diff --git a/pkgs/applications/misc/pwsafe/default.nix b/pkgs/applications/misc/pwsafe/default.nix index 25b3a6b4e7af..82b8f2cf8471 100644 --- a/pkgs/applications/misc/pwsafe/default.nix +++ b/pkgs/applications/misc/pwsafe/default.nix @@ -1,26 +1,29 @@ { stdenv, fetchFromGitHub, cmake, pkgconfig, zip, gettext, perl -, wxGTK31, libXi, libXt, libXtst, xercesc, xorgproto +, wxGTK31, libXext, libXi, libXt, libXtst, xercesc , qrencode, libuuid, libyubikey, yubikey-personalization +, curl, openssl }: stdenv.mkDerivation rec { pname = "pwsafe"; - version = "1.06"; - name = "${pname}-${version}"; + version = "1.07"; src = fetchFromGitHub { owner = "${pname}"; repo = "${pname}"; rev = "${version}BETA"; - sha256 = "1q3xi7i4r3nmz3hc79lx8l15sr1nqhwbi3lrnfqr356nv6aaf03y"; + sha256 = "0syxmliybgvm9j6d426l7j12ryrl42azy80m66jc56fv9nkqwaya"; }; - nativeBuildInputs = [ cmake pkgconfig zip ]; + nativeBuildInputs = [ + cmake gettext perl pkgconfig zip + ]; buildInputs = [ - gettext perl qrencode libuuid - libXi libXt libXtst wxGTK31 xercesc xorgproto + libXext libXi libXt libXtst wxGTK31 + curl qrencode libuuid openssl xercesc libyubikey yubikey-personalization ]; + cmakeFlags = [ "-DNO_GTEST=ON" "-DCMAKE_CXX_FLAGS=-I${yubikey-personalization}/include/ykpers-1" diff --git a/pkgs/applications/misc/pydf/default.nix b/pkgs/applications/misc/pydf/default.nix new file mode 100644 index 000000000000..bfbee1bea24d --- /dev/null +++ b/pkgs/applications/misc/pydf/default.nix @@ -0,0 +1,18 @@ +{ stdenv, python3Packages }: + +python3Packages.buildPythonPackage rec { + pname = "pydf"; + version = "12"; + + src = python3Packages.fetchPypi { + inherit pname version; + sha256 = "7f47a7c3abfceb1ac04fc009ded538df1ae449c31203962a1471a4eb3bf21439"; + }; + + meta = with stdenv.lib; { + description = "colourised df(1)-clone"; + homepage = http://kassiopeia.juls.savba.sk/~garabik/software/pydf/; + license = licenses.publicDomain; + maintainers = with maintainers; [ monsieurp ]; + }; +} diff --git a/pkgs/applications/misc/taskopen/default.nix b/pkgs/applications/misc/taskopen/default.nix new file mode 100644 index 000000000000..9f1773b191d2 --- /dev/null +++ b/pkgs/applications/misc/taskopen/default.nix @@ -0,0 +1,34 @@ +{ fetchurl, stdenv, makeWrapper, which, perl, perlPackages }: + +stdenv.mkDerivation rec { + name = "taskopen-1.1.4"; + src = fetchurl { + url = "https://github.com/ValiValpas/taskopen/archive/v1.1.4.tar.gz"; + sha256 = "774dd89f5c92462098dd6227e181268e5ec9930bbc569f25784000df185c71ba"; + }; + + nativeBuildInputs = [ makeWrapper ]; + buildInputs = [ which perl ] ++ (with perlPackages; [ JSON ]); + + installPhase = '' + # We don't need a DESTDIR and an empty string results in an absolute path + # (due to the trailing slash) which breaks the build. + sed 's|$(DESTDIR)/||' -i Makefile + + make PREFIX=$out + make PREFIX=$out install + ''; + + postFixup = '' + wrapProgram $out/bin/taskopen \ + --set PERL5LIB "$PERL5LIB" + ''; + + meta = with stdenv.lib; { + description = "Script for taking notes and open urls with taskwarrior"; + homepage = https://github.com/ValiValpas/taskopen; + platforms = platforms.linux; + license = stdenv.lib.licenses.free ; + maintainers = [ maintainers.winpat ]; + }; +} diff --git a/pkgs/applications/networking/browsers/chromium/upstream-info.nix b/pkgs/applications/networking/browsers/chromium/upstream-info.nix index de83e0e0646c..566ec6006aa1 100644 --- a/pkgs/applications/networking/browsers/chromium/upstream-info.nix +++ b/pkgs/applications/networking/browsers/chromium/upstream-info.nix @@ -1,18 +1,18 @@ # This file is autogenerated from update.sh in the same directory. { beta = { - sha256 = "1lpgkf292f6v6v19zjp1si6vvizixk9192yjx76pq1d790678qrb"; - sha256bin64 = "028c3gjh5zbxr53wkk3s5jvgwc2fz9cnvnyr58q4la91vyrbjslm"; - version = "74.0.3729.61"; + sha256 = "0vsvjhmrc2p8mf4rfp9bf9y4nqkbbi5v8008cdvr6c14zq35w7hy"; + sha256bin64 = "1zzmk08y2rhirm297a91bvq5q30vvxll8fzfp7z5cpqb6az80y2h"; + version = "74.0.3729.108"; }; dev = { - sha256 = "15197r2gbx4h7dsasvgz0vcl7mqmj0glc4sip99dw145drwdpmsq"; - sha256bin64 = "1qf089l5k7l69msrn49z5lkg932n1rgnzgr9yg5ja89arcgynacv"; - version = "75.0.3753.4"; + sha256 = "1wrg4r2q043i8i4vq9zn69yvnzjxzmxyn21k367909kci83hhi44"; + sha256bin64 = "1jv9wi4nddijjp9y0r77rxciqsd1rkd87ipvagyq5nzpxr6wdzsa"; + version = "75.0.3766.2"; }; stable = { - sha256 = "1bskjr7yiwvdab1b5mp36y6964xqpgks6dqazm4qifwqvqcw80pb"; - sha256bin64 = "00ndrqhmnk567sw6xj22m84126qvivq0jzfx0v46ya3kq6ln22gr"; - version = "73.0.3683.103"; + sha256 = "0vsvjhmrc2p8mf4rfp9bf9y4nqkbbi5v8008cdvr6c14zq35w7hy"; + sha256bin64 = "0zs3khzszppmjf5s4rs6fbmhgc9y0abj4q4q8j3hn6nisddi9q9c"; + version = "74.0.3729.108"; }; } diff --git a/pkgs/applications/networking/mpop/default.nix b/pkgs/applications/networking/mpop/default.nix index a48cc47106c5..c4dd8e402eca 100644 --- a/pkgs/applications/networking/mpop/default.nix +++ b/pkgs/applications/networking/mpop/default.nix @@ -3,12 +3,12 @@ with stdenv.lib; stdenv.mkDerivation rec { - version = "1.4.3"; - name = "mpop-${version}"; + pname = "mpop"; + version = "1.4.4"; src = fetchurl { - url = "https://marlam.de/mpop/releases/${name}.tar.xz"; - sha256 = "1di86frxv4gj8fasni409m87qmv0j0vmj13lawkz1pwv9hbynhjb"; + url = "https://marlam.de/${pname}/releases/${pname}-${version}.tar.xz"; + sha256 = "0j21cp8bw12vgfymxi3i4av3j97lrcyb5y9xa3mb59wr17izz73x"; }; nativeBuildInputs = [ pkgconfig ]; diff --git a/pkgs/applications/networking/msmtp/default.nix b/pkgs/applications/networking/msmtp/default.nix index b5973fc8d3ee..940e2d74be49 100644 --- a/pkgs/applications/networking/msmtp/default.nix +++ b/pkgs/applications/networking/msmtp/default.nix @@ -9,12 +9,11 @@ let in stdenv.mkDerivation rec { pname = "msmtp"; - name = "${pname}-${version}"; - version = "1.8.3"; + version = "1.8.4"; src = fetchurl { - url = "https://marlam.de/msmtp/releases/${name}.tar.xz"; - sha256 = "1d4jdgrx4czp66nnwdsy938lzr4llhwyy0715pwg0j6h6gyyxciw"; + url = "https://marlam.de/${pname}/releases/${pname}-${version}.tar.xz"; + sha256 = "1xr926lyy44baqdgv9q0sw5z6ll2cb4lx2g4lgpgbqn8bglpzpg5"; }; patches = [ diff --git a/pkgs/applications/office/atlassian-cli/default.nix b/pkgs/applications/office/atlassian-cli/default.nix index 6bb84c523362..462e6fbb7a04 100644 --- a/pkgs/applications/office/atlassian-cli/default.nix +++ b/pkgs/applications/office/atlassian-cli/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "atlassian-cli-${version}"; - version = "8.0.0"; + version = "8.2.0"; src = fetchzip { url = "https://bobswift.atlassian.net/wiki/download/attachments/16285777/${name}-distribution.zip"; - sha256 = "0ysyam06ll70d0baa3hb7wcgqnqflssr64bqjr3db6fnk1q096m8"; + sha256 = "0lcyyay2fyywcn096y33d77r6fpvwggv5qdkky5qy16lh6rfx1lm"; extraPostFetch = "chmod go-w $out"; }; diff --git a/pkgs/applications/office/minetime/default.nix b/pkgs/applications/office/minetime/default.nix new file mode 100644 index 000000000000..85e8bc131ce3 --- /dev/null +++ b/pkgs/applications/office/minetime/default.nix @@ -0,0 +1,31 @@ +{ appimageTools, fetchurl, lib, gsettings-desktop-schemas, gtk3 }: + +let + pname = "minetime"; + version = "1.5.1"; +in +appimageTools.wrapType2 rec { + name = "${pname}-${version}"; + src = fetchurl { + url = "https://github.com/marcoancona/MineTime/releases/download/v${version}/${name}-x86_64.AppImage"; + sha256 = "0099cq4p7j01bzs7q79y9xi7g6ji17v9g7cykfjggwsgqfmvd0hz"; + }; + + profile = '' + export LC_ALL=C.UTF-8 + export XDG_DATA_DIRS=${gsettings-desktop-schemas}/share/gsettings-schemas/${gsettings-desktop-schemas.name}:${gtk3}/share/gsettings-schemas/${gtk3.name}:$XDG_DATA_DIRS + ''; + + multiPkgs = null; # no 32bit needed + extraPkgs = appimageTools.defaultFhsEnvArgs.multiPkgs; + extraInstallCommands = "mv $out/bin/{${name},${pname}}"; + + meta = with lib; { + description = "Modern, intuitive and smart calendar application"; + homepage = https://minetime.ai; + license = licenses.unfree; + # Should be cross-platform, but for now we just grab the appimage + platforms = [ "x86_64-linux" ]; + maintainers = with maintainers; [ dtzWill ]; + }; +} diff --git a/pkgs/applications/office/wordgrinder/default.nix b/pkgs/applications/office/wordgrinder/default.nix index 9518aaca878e..4271e3d17aa2 100644 --- a/pkgs/applications/office/wordgrinder/default.nix +++ b/pkgs/applications/office/wordgrinder/default.nix @@ -16,7 +16,11 @@ stdenv.mkDerivation rec { "PREFIX=$(out)" "LUA_INCLUDE=${lua52Packages.lua}/include" "LUA_LIB=${lua52Packages.lua}/lib/liblua.so" - ] ++ stdenv.lib.optional stdenv.isLinux "XFT_PACKAGE=--libs=\{-lX11 -lXft\}"; + ]; + + preBuild = stdenv.lib.optionalString stdenv.isLinux '' + makeFlagsArray+=('XFT_PACKAGE=--cflags={} --libs={-lX11 -lXft}') + ''; dontUseNinjaBuild = true; dontUseNinjaInstall = true; diff --git a/pkgs/applications/science/biology/sumatools/default.nix b/pkgs/applications/science/biology/sumatools/default.nix new file mode 100644 index 000000000000..6f7227d7a3e9 --- /dev/null +++ b/pkgs/applications/science/biology/sumatools/default.nix @@ -0,0 +1,65 @@ +{ gccStdenv, fetchFromGitLab, zlib }: + +let + stdenv = gccStdenv; + meta = with stdenv.lib; { + description = "Fast and exact comparison and clustering of sequences"; + homepage = https://metabarcoding.org/sumatra; + maintainers = [ maintainers.bzizou ]; + platforms = platforms.unix; + }; + +in rec { + + # Suma library + sumalibs = stdenv.mkDerivation rec { + version = "1.0.34"; + pname = "sumalibs"; + src = fetchFromGitLab { + domain = "git.metabarcoding.org"; + owner = "obitools"; + repo = pname; + rev = "sumalib_v${version}"; + sha256 = "0hwkrxzfz7m5wdjvmrhkjg8kis378iaqr5n4nhdhkwwhn8x1jn5a"; + }; + makeFlags = "PREFIX=$(out)"; + }; + + # Sumatra + sumatra = stdenv.mkDerivation rec { + version = "1.0.34"; + pname = "sumatra"; + src = fetchFromGitLab { + domain = "git.metabarcoding.org"; + owner = "obitools"; + repo = pname; + rev = "${pname}_v${version}"; + sha256 = "1bbpbdkshdc3xffqnr1qfy8qk64ldsmdc3s8mrcrlx132rgbi5f6"; + }; + buildInputs = [ sumalibs zlib ]; + makeFlags = [ + "LIBSUMA=${sumalibs}/lib/libsuma.a" + "LIBSUMAPATH=-L${sumalibs}" + "PREFIX=$(out)" + ]; + }; + + # Sumaclust + sumaclust = stdenv.mkDerivation rec { + version = "1.0.34"; + pname = "sumaclust"; + src = fetchFromGitLab { + domain = "git.metabarcoding.org"; + owner = "obitools"; + repo = pname; + rev = "${pname}_v${version}"; + sha256 = "0x8yi3k3jxhmv2krp4rcjlj2f9zg0qrk7gx4kpclf9c3yxgsgrds"; + }; + buildInputs = [ sumalibs ]; + makeFlags = [ + "LIBSUMA=${sumalibs}/lib/libsuma.a" + "LIBSUMAPATH=-L${sumalibs}" + "PREFIX=$(out)" + ]; + }; +} diff --git a/pkgs/applications/science/electronics/eagle/eagle.nix b/pkgs/applications/science/electronics/eagle/eagle.nix index 831ec9662b09..286dbc07f3da 100644 --- a/pkgs/applications/science/electronics/eagle/eagle.nix +++ b/pkgs/applications/science/electronics/eagle/eagle.nix @@ -13,11 +13,11 @@ let in stdenv.mkDerivation rec { name = "eagle-${version}"; - version = "9.3.1"; + version = "9.3.2"; src = fetchurl { url = "https://eagle-updates.circuits.io/downloads/${builtins.replaceStrings ["."] ["_"] version}/Autodesk_EAGLE_${version}_English_Linux_64bit.tar.gz"; - sha256 = "0hrbw368kskjzwjnqrri5j7c10d0z5m81h3s9zhqfrmwym42vdc5"; + sha256 = "0xrrd2d86gxrkbqvssbg8zki40hk05h48w73b0hv7wnc7wg1msir"; }; desktopItem = makeDesktopItem { diff --git a/pkgs/applications/science/math/gmsh/default.nix b/pkgs/applications/science/math/gmsh/default.nix index 8f96eb8f3060..503c98f55913 100644 --- a/pkgs/applications/science/math/gmsh/default.nix +++ b/pkgs/applications/science/math/gmsh/default.nix @@ -1,14 +1,14 @@ { stdenv, fetchurl, cmake, openblasCompat, gfortran, gmm, fltk, libjpeg , zlib, libGLU_combined, libGLU, xorg }: -let version = "4.2.2"; in +let version = "4.2.3"; in stdenv.mkDerivation { name = "gmsh-${version}"; src = fetchurl { url = "http://gmsh.info/src/gmsh-${version}-source.tgz"; - sha256 = "e9ee9f5c606bbec5f2adbb8c3d6023c4e2577f487fa4e4ecfcfc94a241cc8dcc"; + sha256 = "0n18wmj8i4m1pzri3r0676lx1427zf8qmsrgnn07drv6if1cia2q"; }; buildInputs = [ cmake openblasCompat gmm fltk libjpeg zlib libGLU_combined diff --git a/pkgs/applications/version-management/git-review/default.nix b/pkgs/applications/version-management/git-review/default.nix index 101770da8885..ecc054df47e7 100644 --- a/pkgs/applications/version-management/git-review/default.nix +++ b/pkgs/applications/version-management/git-review/default.nix @@ -1,20 +1,18 @@ -{ stdenv, fetchurl, pythonPackages} : +{ stdenv, fetchFromGitHub, pythonPackages} : pythonPackages.buildPythonApplication rec { - name = "git-review-${version}"; - version = "1.27.0"; + pname = "git-review"; + version = "1.28.0"; # Manually set version because prb wants to get it from the git # upstream repository (and we are installing from tarball instead) PBR_VERSION = "${version}"; - postPatch = '' - sed -i -e '/argparse/d' requirements.txt - ''; - - src = fetchurl rec { - url = "https://github.com/openstack-infra/git-review/archive/${version}.tar.gz"; - sha256 = "0smdkps9avnj58izyfc5m0amq8nafgs9iqlyaf7ncrlvypia1f3q"; + src = fetchFromGitHub rec { + owner = "openstack-infra"; + repo = pname; + rev = version; + sha256 = "1hgw1dkl94m3idv4izc7wf2j7al2c7nnsqywy7g53nzkv9pfv47s"; }; propagatedBuildInputs = with pythonPackages; [ pbr requests setuptools ]; diff --git a/pkgs/applications/version-management/gogs/default.nix b/pkgs/applications/version-management/gogs/default.nix index 238540a1c981..0587bc9af767 100644 --- a/pkgs/applications/version-management/gogs/default.nix +++ b/pkgs/applications/version-management/gogs/default.nix @@ -27,8 +27,11 @@ buildGoPackage rec { nativeBuildInputs = [ makeWrapper ] ++ optional pamSupport pam; - buildFlags = optional sqliteSupport "-tags sqlite" - ++ optional pamSupport "-tags pam"; + buildFlags = "-tags"; + + buildFlagsArray = + ( optional sqliteSupport "sqlite" + ++ optional pamSupport "pam"); outputs = [ "bin" "out" "data" ]; diff --git a/pkgs/build-support/appimage/default.nix b/pkgs/build-support/appimage/default.nix index 6db626464fb7..f0c0faa8cdab 100644 --- a/pkgs/build-support/appimage/default.nix +++ b/pkgs/build-support/appimage/default.nix @@ -23,7 +23,7 @@ rec { buildCommand = '' install $src ./appimage patchelf \ - --set-interpreter $(cat $NIX_CC/nix-support/dynamic-linker) \ + --set-interpreter ${stdenv.cc.bintools.dynamicLinker} \ --replace-needed libz.so.1 ${zlib}/lib/libz.so.1 \ ./appimage @@ -33,7 +33,7 @@ rec { ''; }; - wrapAppImage = { name, src, extraPkgs }: buildFHSUserEnv (defaultFhsEnvArgs // { + wrapAppImage = args@{ name, src, extraPkgs, ... }: buildFHSUserEnv (defaultFhsEnvArgs // { inherit name; targetPkgs = pkgs: defaultFhsEnvArgs.targetPkgs pkgs ++ extraPkgs pkgs; @@ -46,17 +46,15 @@ rec { cd $APPDIR exec ./AppRun "$@" ''; - }); + } // (removeAttrs args (builtins.attrNames (builtins.functionArgs wrapAppImage)))); - wrapType1 = args@{ name, src, extraPkgs ? pkgs: [] }: wrapAppImage { - inherit name extraPkgs; + wrapType1 = args@{ name, src, extraPkgs ? pkgs: [], ... }: wrapAppImage (args // { src = extractType1 { inherit name src; }; - }; + }); - wrapType2 = args@{ name, src, extraPkgs ? pkgs: [] }: wrapAppImage { - inherit name extraPkgs; + wrapType2 = args@{ name, src, extraPkgs ? pkgs: [], ... }: wrapAppImage (args // { src = extractType2 { inherit name src; }; - }; + }); defaultFhsEnvArgs = { name = "appimage-env"; diff --git a/pkgs/data/fonts/xkcd-font/default.nix b/pkgs/data/fonts/xkcd-font/default.nix new file mode 100644 index 000000000000..9aa664fd2896 --- /dev/null +++ b/pkgs/data/fonts/xkcd-font/default.nix @@ -0,0 +1,28 @@ +{ stdenv, fetchFromGitHub }: + +stdenv.mkDerivation rec { + pname = "xkcd-font"; + version = "unstable-2017-08-24"; + + src = fetchFromGitHub { + owner = "ipython"; + repo = pname; + rev = "5632fde618845dba5c22f14adc7b52bf6c52d46d"; + sha256 = "01wpfc1yp93b37r472mx2b459il5gywnv5sl7pp9afpycb3i4f6l"; + }; + + phases = [ "unpackPhase" "installPhase" ]; + + installPhase = '' + install -Dm444 -t $out/share/fonts/opentype/ xkcd/build/xkcd.otf + install -Dm444 -t $out/share/fonts/truetype/ xkcd-script/font/xkcd-script.ttf + ''; + + meta = with stdenv.lib; { + description = "The xkcd font"; + homepage = https://github.com/ipython/xkcd-font; + license = licenses.cc-by-nc-30; + platforms = platforms.all; + maintainers = [ maintainers.marsam ]; + }; +} diff --git a/pkgs/development/compilers/ocaml/4.08.nix b/pkgs/development/compilers/ocaml/4.08.nix index 92b2badf6a4c..53d4ceef92a7 100644 --- a/pkgs/development/compilers/ocaml/4.08.nix +++ b/pkgs/development/compilers/ocaml/4.08.nix @@ -1,8 +1,8 @@ import ./generic.nix { major_version = "4"; minor_version = "08"; - patch_version = "0+beta2"; - sha256 = "1ngsrw74f3hahzsglxkrdxzv86bkmpsiaaynnzjwfwyzvy8sqrac"; + patch_version = "0+beta3"; + sha256 = "02pk4bxrgqb12hvpbxyqnl4nwr4g2h96wsfzfd1k8vj8h0jmxzc4"; # If the executable is stripped it does not work dontStrip = true; diff --git a/pkgs/development/compilers/oraclejdk/jdk-linux-base.nix b/pkgs/development/compilers/oraclejdk/jdk-linux-base.nix index 8342c9fd3359..ea6b9d2a9fe7 100644 --- a/pkgs/development/compilers/oraclejdk/jdk-linux-base.nix +++ b/pkgs/development/compilers/oraclejdk/jdk-linux-base.nix @@ -89,8 +89,9 @@ let result = stdenv.mkDerivation rec { armv7l-linux = "linux-arm32-vfp-hflt"; aarch64-linux = "linux-arm64-vfp-hflt"; }.${stdenv.hostPlatform.system}; + javadlPlatformName = "linux-i586"; in fetchurl { - url = "http://download.oracle.com/otn-pub/java/jdk/${productVersion}u${patchVersion}-b${buildVersion}/${releaseToken}/jdk-${productVersion}u${patchVersion}-${platformName}.tar.gz"; + url = "http://javadl.oracle.com/webapps/download/GetFile/1.${productVersion}.0_${patchVersion}-b${buildVersion}/${releaseToken}/${javadlPlatformName}/jdk-${productVersion}u${patchVersion}-${platformName}.tar.gz"; curlOpts = "-b oraclelicense=a"; sha256 = sha256.${stdenv.hostPlatform.system}; }; diff --git a/pkgs/development/compilers/pforth/default.nix b/pkgs/development/compilers/pforth/default.nix new file mode 100644 index 000000000000..7885582ad125 --- /dev/null +++ b/pkgs/development/compilers/pforth/default.nix @@ -0,0 +1,28 @@ +{ stdenv, fetchFromGitHub }: + +stdenv.mkDerivation rec { + version = "28"; + pname = "pforth"; + src = fetchFromGitHub { + owner = "philburk"; + repo = "pforth"; + rev = "9190005e32c6151b76ac707b30eeb4d5d9dd1d36"; + sha256 = "0k3pmcgybsnwrxy75piyb2420r8d4ij190606js32j99062glr3x"; + }; + + makeFlags = [ "SRCDIR=." ]; + makefile = "build/unix/Makefile"; + + installPhase = '' + install -Dm755 pforth_standalone $out/bin/pforth + ''; + + + meta = { + description = "Portable ANSI style Forth written in ANSI C"; + homepage = http://www.softsynth.com/pforth/; + license = stdenv.lib.licenses.publicDomain; + platforms = stdenv.lib.platforms.unix; + maintainers = with stdenv.lib.maintainers; [ yrashk ]; + }; +} diff --git a/pkgs/development/compilers/purescript/purescript/default.nix b/pkgs/development/compilers/purescript/purescript/default.nix index 0bfb8de0061b..67818bfa1dc9 100644 --- a/pkgs/development/compilers/purescript/purescript/default.nix +++ b/pkgs/development/compilers/purescript/purescript/default.nix @@ -17,20 +17,20 @@ let ''; in stdenv.mkDerivation rec { - name = "purs-simple"; - version = "v0.12.4"; + pname = "purescript"; + version = "0.12.5"; src = if stdenv.isDarwin then fetchurl { - url = "https://github.com/purescript/purescript/releases/download/v0.12.4/macos.tar.gz"; - sha256 = "046b18plakwvqr77x1hybhfiyzrhnnq0q5ixcmypri1mkkdsmczx"; + url = "https://github.com/${pname}/${pname}/releases/download/v${version}/macos.tar.gz"; + sha256 = "15j9lkrl15dicx37bmh0199b3qdixig7w24wvdzi20jqbacz8nkn"; } else fetchurl { - url = "https://github.com/purescript/purescript/releases/download/v0.12.4/linux64.tar.gz"; - sha256 = "18yny533sjfgacxqx1ki306nhznj4q6nv52c83l82gqj8amyj7k0"; + url = "https://github.com/${pname}/${pname}/releases/download/v${version}/linux64.tar.gz"; + sha256 = "07dva5gxq77g787krscv4dsz5088fzkvpmm9fwxw9a59jszzs7kq"; }; diff --git a/pkgs/development/coq-modules/Verdi/default.nix b/pkgs/development/coq-modules/Verdi/default.nix index 8eaa2bdfae70..9b3b5320c8ed 100644 --- a/pkgs/development/coq-modules/Verdi/default.nix +++ b/pkgs/development/coq-modules/Verdi/default.nix @@ -1,7 +1,12 @@ { stdenv, fetchFromGitHub, coq, Cheerios, InfSeqExt, ssreflect }: let param = + if stdenv.lib.versionAtLeast coq.coq-version "8.7" then { + version = "20190202"; + rev = "bc193be9ea8485add7646a0f72e2aa76a9c7e01f"; + sha256 = "1adkwxnmc9qfah2bya0hpd2vzkmk1y212z4n7fcmvr1a85ykgd7z"; + } else { version = "20181102"; rev = "25b79cf1be5527ab8dc1b8314fcee93e76a2e564"; sha256 = "1vw47c37k5vaa8vbr6ryqy8riagngwcrfmb3rai37yi9xhdqg55z"; diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index ff309da41d2d..46230a532f05 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -1259,7 +1259,7 @@ self: super: { # Use latest pandoc despite what LTS says. # Test suite fails in both 2.5 and 2.6: https://github.com/jgm/pandoc/issues/5309. pandoc = doDistribute super.pandoc_2_7_2; - pandoc-citeproc = doDistribute super.pandoc-citeproc_0_16_1_3; + pandoc-citeproc = doDistribute super.pandoc-citeproc_0_16_2; # https://github.com/qfpl/tasty-hedgehog/issues/24 tasty-hedgehog = dontCheck super.tasty-hedgehog; diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml index ad444e56b56a..f8a5c0bb5737 100644 --- a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml +++ b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml @@ -46,7 +46,7 @@ default-package-overrides: # Newer versions don't work in LTS-12.x - alsa-mixer < 0.3 - cassava-megaparsec < 2 - # LTS Haskell 13.17 + # LTS Haskell 13.18 - abstract-deque ==0.3 - abstract-deque-tests ==0.3 - abstract-par ==0.3.3 @@ -239,7 +239,7 @@ default-package-overrides: - avers ==0.0.17.1 - avers-api ==0.1.0 - avers-server ==0.1.0.1 - - avro ==0.4.4.1 + - avro ==0.4.4.2 - avwx ==0.3.0.2 - axel ==0.0.9 - backprop ==0.2.6.2 @@ -382,6 +382,8 @@ default-package-overrides: - ChannelT ==0.0.0.7 - charset ==0.3.7.1 - charsetdetect-ae ==1.1.0.4 + - Chart ==1.9.1 + - Chart-diagrams ==1.9.2 - chaselev-deque ==0.5.0.5 - cheapskate ==0.1.1.1 - cheapskate-highlight ==0.1.0.0 @@ -588,6 +590,7 @@ default-package-overrides: - diagrams-contrib ==1.4.3 - diagrams-core ==1.4.1.1 - diagrams-lib ==1.4.2.3 + - diagrams-postscript ==1.4.1 - diagrams-rasterific ==1.4.1.1 - diagrams-solve ==0.1.1 - diagrams-svg ==1.4.2 @@ -815,7 +818,7 @@ default-package-overrides: - getopt-generics ==0.13.0.3 - ghc-core ==0.5.6 - ghc-exactprint ==0.5.8.2 - - ghcid ==0.7.2 + - ghcid ==0.7.4 - ghci-hexcalc ==0.1.0.2 - ghcjs-codemirror ==0.0.0.2 - ghc-paths ==0.1.0.9 @@ -1043,6 +1046,7 @@ default-package-overrides: - http-common ==0.8.2.0 - http-conduit ==2.3.7 - http-date ==0.0.8 + - http-directory ==0.1.1 - httpd-shed ==0.4.0.3 - http-link-header ==1.0.3.1 - http-media ==0.7.1.3 @@ -1116,7 +1120,7 @@ default-package-overrides: - insert-ordered-containers ==0.2.1.0 - inspection-testing ==0.4.1.2 - instance-control ==0.1.2.0 - - integer-logarithms ==1.0.2.2 + - integer-logarithms ==1.0.3 - integration ==0.2.1 - intern ==0.9.2 - interpolate ==0.2.0 @@ -1196,7 +1200,7 @@ default-package-overrides: - language-haskell-extract ==0.2.4 - language-java ==0.2.9 - language-javascript ==0.6.0.11 - - language-puppet ==1.4.3 + - language-puppet ==1.4.4 - lapack-ffi ==0.0.2 - lapack-ffi-tools ==0.1.2 - largeword ==1.2.5 @@ -1260,7 +1264,7 @@ default-package-overrides: - long-double ==0.1 - loop ==0.3.0 - lrucaching ==0.3.3 - - lsp-test ==0.5.1.0 + - lsp-test ==0.5.1.1 - lucid ==2.9.11 - lucid-extras ==0.1.0.1 - lxd-client-config ==0.1.0.1 @@ -1422,7 +1426,7 @@ default-package-overrides: - network-messagepack-rpc ==0.1.1.0 - network-multicast ==0.2.0 - network-simple ==0.4.3 - - network-simple-tls ==0.3.1 + - network-simple-tls ==0.3.2 - network-transport ==0.5.2 - network-transport-composed ==0.2.1 - network-uri ==2.6.1.0 @@ -1526,7 +1530,7 @@ default-package-overrides: - pem ==0.2.4 - percent-format ==0.0.1 - perfect-hash-generator ==0.2.0.6 - - persist ==0.1.1.2 + - persist ==0.1.1.3 - persistable-record ==0.6.0.4 - persistable-types-HDBC-pg ==0.0.3.5 - persistent ==2.9.2 @@ -1621,7 +1625,7 @@ default-package-overrides: - protocol-radius ==0.0.1.1 - protocol-radius-test ==0.0.1.0 - proto-lens ==0.4.0.1 - - proto-lens-arbitrary ==0.1.2.6 + - proto-lens-arbitrary ==0.1.2.7 - proto-lens-combinators ==0.4.0.1 - proto-lens-optparse ==0.1.1.5 - proto-lens-protobuf-types ==0.4.0.1 @@ -1702,7 +1706,7 @@ default-package-overrides: - regex-tdfa ==1.2.3.1 - regex-tdfa-text ==1.0.0.3 - regex-with-pcre ==1.0.2.0 - - registry ==0.1.3.4 + - registry ==0.1.3.5 - reinterpret-cast ==0.1.0 - relapse ==1.0.0.0 - relational-query ==0.12.1.0 @@ -2054,7 +2058,7 @@ default-package-overrides: - th-strict-compat ==0.1.0.1 - th-utilities ==0.2.1.0 - thyme ==0.3.5.5 - - tidal ==1.0.10 + - tidal ==1.0.11 - tile ==0.3.0.0 - time-compat ==0.1.0.3 - timeit ==2.0 @@ -2097,7 +2101,7 @@ default-package-overrides: - tuples-homogenous-h98 ==0.1.1.0 - tuple-sop ==0.3.1.0 - tuple-th ==0.2.5 - - turtle ==1.5.13 + - turtle ==1.5.14 - typed-process ==0.2.4.0 - type-fun ==0.1.1 - type-hint ==0.1 @@ -2190,7 +2194,7 @@ default-package-overrides: - vector-split ==1.0.0.2 - vector-th-unbox ==0.2.1.6 - verbosity ==0.2.3.0 - - versions ==3.5.0 + - versions ==3.5.1 - ViennaRNAParser ==1.3.3 - vinyl ==0.10.0.1 - vivid ==0.4.2.3 @@ -2237,7 +2241,7 @@ default-package-overrides: - websockets-snap ==0.10.3.0 - weigh ==0.0.14 - wide-word ==0.1.0.8 - - wikicfp-scraper ==0.1.0.10 + - wikicfp-scraper ==0.1.0.11 - wild-bind ==0.1.2.3 - wild-bind-x11 ==0.2.0.6 - Win32-notify ==0.3.0.3 @@ -6888,6 +6892,7 @@ broken-packages: - minesweeper - miniforth - minilens + - minilight - minimung - minio-hs - minions @@ -6895,6 +6900,7 @@ broken-packages: - miniplex - minirotate - ministg + - minitypeset-opengl - minst-idx - mios - mirror-tweet @@ -7184,6 +7190,7 @@ broken-packages: - network-server - network-service - network-simple-sockaddr + - network-simple-wss - network-stream - network-topic-models - network-transport-amqp @@ -7954,6 +7961,7 @@ broken-packages: - rascal - Rasenschach - rating-chgk-info + - rattle - rattletrap - raven-haskell-scotty - raw-feldspar @@ -8223,6 +8231,7 @@ broken-packages: - safe-failure-cme - safe-freeze - safe-globals + - safe-json - safe-lazy-io - safe-length - safe-money @@ -8478,6 +8487,8 @@ broken-packages: - shellish - shellmate - shellmate-extras + - shh + - shh-extras - shivers-cfg - shoap - shopify @@ -8526,6 +8537,7 @@ broken-packages: - simple-tar - simple-templates - simple-ui + - simple-units - simple-vec3 - simple-zipper - simpleargs @@ -9834,6 +9846,7 @@ broken-packages: - yam - yam-datasource - yam-job + - yam-redis - yam-servant - yam-transaction-odbc - yam-web diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix index ce4b3b2d7074..1035064f90ea 100644 --- a/pkgs/development/haskell-modules/hackage-packages.nix +++ b/pkgs/development/haskell-modules/hackage-packages.nix @@ -942,15 +942,15 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "Allure_0_9_3_3" = callPackage + "Allure_0_9_4_1" = callPackage ({ mkDerivation, async, base, enummapset, filepath, ghc-compact , LambdaHack, optparse-applicative, primitive, random , template-haskell, text, transformers }: mkDerivation { pname = "Allure"; - version = "0.9.3.3"; - sha256 = "0s2f8fmcbcyvqg9vx492irr69ihkrwwf6nhp511b4y5xcgw69k12"; + version = "0.9.4.1"; + sha256 = "05zmidzwl24aqzgvnbv3hmsav7a6wq90qjhiirrbqpck3c33xqb9"; isLibrary = true; isExecutable = true; enableSeparateDataOutput = true; @@ -6213,6 +6213,25 @@ self: { broken = true; }) {}; + "Frames-map-reduce" = callPackage + ({ mkDerivation, base, containers, foldl, Frames, hashable + , map-reduce-folds, newtype, profunctors, random, text, vinyl + }: + mkDerivation { + pname = "Frames-map-reduce"; + version = "0.1.0.0"; + sha256 = "05xk49qc5l8h7qnxhyxj9k2r2igcf7qc4njiw9w28fajlmnrgcw3"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + base containers foldl Frames hashable map-reduce-folds newtype + profunctors vinyl + ]; + executableHaskellDepends = [ base foldl Frames random text vinyl ]; + description = "Frames wrapper for map-reduce-folds and some extra folds helpers"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "Frank" = callPackage ({ mkDerivation, base, mtl, newtype, she, void }: mkDerivation { @@ -11789,7 +11808,7 @@ self: { broken = true; }) {}; - "LambdaHack_0_9_3_1" = callPackage + "LambdaHack_0_9_4_1" = callPackage ({ mkDerivation, assert-failure, async, base, base-compat, binary , bytestring, containers, deepseq, directory, enummapset, filepath , ghc-compact, ghc-prim, hashable, hsini, keys, miniutter @@ -11799,8 +11818,8 @@ self: { }: mkDerivation { pname = "LambdaHack"; - version = "0.9.3.1"; - sha256 = "1s1xz5iz81wdwxc1bmgbpj2s19qlvz1d5q7c2l01cdzqwd2iwn3f"; + version = "0.9.4.1"; + sha256 = "05p80yrfa5v5fq7zyhwpd8ndbw2kgc7a6i2hnikb222lna99b6gk"; isLibrary = true; isExecutable = true; enableSeparateDataOutput = true; @@ -13224,6 +13243,21 @@ self: { broken = true; }) {}; + "Monadoro" = callPackage + ({ mkDerivation, ansi-terminal, base, process, time }: + mkDerivation { + pname = "Monadoro"; + version = "0.1.2.0"; + sha256 = "1bqaiarr5gv42xl8fww67iryyh1mscwdkgcahdc988y19ag8a4j9"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ ansi-terminal base process time ]; + executableHaskellDepends = [ ansi-terminal base process time ]; + testHaskellDepends = [ ansi-terminal base process time ]; + description = "A minimalistic CLI Pomodoro timer, based on a library of the same purpose"; + license = stdenv.lib.licenses.mit; + }) {}; + "Monaris" = callPackage ({ mkDerivation, array, base, containers, directory, free , free-game, mtl @@ -13622,6 +13656,20 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "NaperianNetCDF" = callPackage + ({ mkDerivation, base, hnetcdf, Naperian, split, vector }: + mkDerivation { + pname = "NaperianNetCDF"; + version = "0.1.0.1"; + sha256 = "0hyx9lg9hs124h9a666ym6cpnd3amdcl3v727shzc5v3hzwbvqgj"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ base hnetcdf Naperian vector ]; + executableHaskellDepends = [ base hnetcdf Naperian split ]; + description = "Instances of NcStore for hypercuboids"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "NaturalLanguageAlphabets" = callPackage ({ mkDerivation, aeson, attoparsec, base, binary, cereal , containers, criterion, deepseq, file-embed, hashtables @@ -22198,6 +22246,19 @@ self: { license = stdenv.lib.licenses.publicDomain; }) {}; + "acme-this" = callPackage + ({ mkDerivation, base, template-haskell }: + mkDerivation { + pname = "acme-this"; + version = "0.1.0.0"; + sha256 = "16zmjrf849m066mnj7rlc10jcddy31ck83mg0b7pmn4cvp95q8k5"; + revision = "1"; + editedCabalFile = "1xizmz9yyhxkkaynlk9x0l1nv5maz0shk3d1ipaphc9c6q4b1mjq"; + libraryHaskellDepends = [ base template-haskell ]; + description = "import This"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "acme-timemachine" = callPackage ({ mkDerivation, base, ghc-prim, mtl, transformers }: mkDerivation { @@ -22305,8 +22366,8 @@ self: { pname = "active"; version = "0.2.0.13"; sha256 = "1yw029rh0gb63bhwwjynbv173mny14is4cyjkrlvzvxwb0fi96jx"; - revision = "7"; - editedCabalFile = "0z4l6j1q3y5zq4941bsb6ypkhfg3pyvb5gcmasymh2nj9g952xkd"; + revision = "8"; + editedCabalFile = "1j771jblfaygc3qf8iaw9b87yrqxhkq79mdi9zyhvlr2vcac362s"; libraryHaskellDepends = [ base lens linear semigroupoids semigroups vector ]; @@ -27585,6 +27646,34 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "amqp_0_18_2" = callPackage + ({ mkDerivation, base, binary, bytestring, clock, connection + , containers, data-binary-ieee754, hspec, hspec-expectations + , monad-control, network, network-uri, split, stm, text, vector + , xml + }: + mkDerivation { + pname = "amqp"; + version = "0.18.2"; + sha256 = "0sp7c9vbgaxc5rhfc402q52djr0qpqgmfklhcrx45av2rqymkyxv"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + base binary bytestring clock connection containers + data-binary-ieee754 monad-control network network-uri split stm + text vector + ]; + executableHaskellDepends = [ base containers xml ]; + testHaskellDepends = [ + base binary bytestring clock connection containers + data-binary-ieee754 hspec hspec-expectations network network-uri + split stm text vector + ]; + description = "Client library for AMQP servers (currently only RabbitMQ)"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "amqp-conduit" = callPackage ({ mkDerivation, amqp, base, bytestring, conduit, exceptions, hspec , HUnit, lifted-base, monad-control, mtl, resourcet, text @@ -30093,6 +30182,34 @@ self: { broken = true; }) {debian-mirror = null; help = null;}; + "archive-sig" = callPackage + ({ mkDerivation, base, bytestring, composition-prelude, directory + , filepath + }: + mkDerivation { + pname = "archive-sig"; + version = "0.2.0.0"; + sha256 = "1imbailszvxahmhxg9g0qrygi6433gmyg5pby3zq9k5gcc16mmy2"; + libraryHaskellDepends = [ + base bytestring composition-prelude directory filepath + ]; + description = "Backpack signature for archive libraries"; + license = stdenv.lib.licenses.bsd3; + }) {}; + + "archive-tar" = callPackage + ({ mkDerivation, base, bytestring, composition-prelude, tar }: + mkDerivation { + pname = "archive-tar"; + version = "0.2.0.0"; + sha256 = "0svbxr9734ysskilv5kvhfd7s436spn149pb5bcsq3hjz1zq5xq7"; + libraryHaskellDepends = [ + base bytestring composition-prelude tar + ]; + description = "Common interface using the tar package"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "archiver" = callPackage ({ mkDerivation, base, bytestring, containers, curl, HTTP, network , process, random @@ -32389,15 +32506,15 @@ self: { "attoparsec-data" = callPackage ({ mkDerivation, attoparsec, attoparsec-time, base, base-prelude - , bytestring, scientific, text, time + , bytestring, scientific, text, time, uuid }: mkDerivation { pname = "attoparsec-data"; - version = "1.0.3"; - sha256 = "02bkrbdipd0940aq34dx4156z538jbfxpgdk3pkbb6vjdcghcw9g"; + version = "1.0.4"; + sha256 = "03pgzx7l9hh8233r8afhgbk0adw58pln3si83vmrv1h6d8s2x4nr"; libraryHaskellDepends = [ attoparsec attoparsec-time base base-prelude bytestring scientific - text time + text time uuid ]; description = "Parsers for the standard Haskell data types"; license = stdenv.lib.licenses.mit; @@ -33294,14 +33411,14 @@ self: { ({ mkDerivation, aeson, array, base, base16-bytestring, bifunctors , binary, bytestring, containers, data-binary-ieee754, deepseq , directory, extra, fail, gauge, hashable, hspec, hspec-discover - , lens, lens-aeson, mtl, pure-zlib, QuickCheck, random, scientific - , semigroups, tagged, template-haskell, text, tf-random - , transformers, unordered-containers, vector, zlib + , lens, lens-aeson, mtl, pure-zlib, QuickCheck, random + , raw-strings-qq, scientific, semigroups, tagged, template-haskell + , text, tf-random, transformers, unordered-containers, vector, zlib }: mkDerivation { pname = "avro"; - version = "0.4.4.1"; - sha256 = "12mrgjhms4m9zjax6zqlzn9cisdr482sa642xh5p9h6hdp86ay59"; + version = "0.4.4.2"; + sha256 = "1x01f05rhz4nhvzbzai5817c9ajqnph1vfn0z8cp4y7r4srm55w0"; libraryHaskellDepends = [ aeson array base base16-bytestring bifunctors binary bytestring containers data-binary-ieee754 deepseq fail hashable mtl scientific @@ -33311,13 +33428,14 @@ self: { testHaskellDepends = [ aeson array base base16-bytestring bifunctors binary bytestring containers directory extra fail hashable hspec lens lens-aeson mtl - pure-zlib QuickCheck scientific semigroups tagged template-haskell - text tf-random transformers unordered-containers vector + pure-zlib QuickCheck raw-strings-qq scientific semigroups tagged + template-haskell text tf-random transformers unordered-containers + vector ]; testToolDepends = [ hspec-discover ]; benchmarkHaskellDepends = [ - aeson base bytestring containers gauge hashable mtl random text - transformers unordered-containers vector + aeson base bytestring containers gauge hashable mtl random + raw-strings-qq text transformers unordered-containers vector ]; description = "Avro serialization support for Haskell"; license = stdenv.lib.licenses.bsd3; @@ -41903,6 +42021,62 @@ self: { broken = true; }) {}; + "brotli" = callPackage + ({ mkDerivation, base, bytestring, HUnit, libbrotlidec + , libbrotlienc, QuickCheck, tasty, tasty-hunit, tasty-quickcheck + , transformers + }: + mkDerivation { + pname = "brotli"; + version = "0.0.0.0"; + sha256 = "1l9qiw5cl0k1rcnqnj9pb7vgj1b06wckkk5i73nqr15ixgcjmr9j"; + libraryHaskellDepends = [ base bytestring transformers ]; + libraryPkgconfigDepends = [ libbrotlidec libbrotlienc ]; + testHaskellDepends = [ + base bytestring HUnit QuickCheck tasty tasty-hunit tasty-quickcheck + ]; + description = "Brotli (RFC7932) compression and decompression"; + license = stdenv.lib.licenses.gpl3; + }) {libbrotlidec = null; libbrotlienc = null;}; + + "brotli-conduit" = callPackage + ({ mkDerivation, base, brotli, bytestring, conduit, HUnit + , QuickCheck, resourcet, test-framework, test-framework-hunit + , test-framework-quickcheck2, transformers + }: + mkDerivation { + pname = "brotli-conduit"; + version = "0.0.0.0"; + sha256 = "00hl8g4aw4klzvq8gbgx3ff5iq5diz7lxk9ssn7q8icdpl8w5fbf"; + libraryHaskellDepends = [ + base brotli bytestring conduit resourcet transformers + ]; + testHaskellDepends = [ + base bytestring conduit HUnit QuickCheck resourcet test-framework + test-framework-hunit test-framework-quickcheck2 + ]; + description = "Conduit interface for Brotli (RFC7932) compression"; + license = stdenv.lib.licenses.bsd3; + }) {}; + + "brotli-streams" = callPackage + ({ mkDerivation, base, brotli, bytestring, HUnit, io-streams + , QuickCheck, test-framework, test-framework-hunit + , test-framework-quickcheck2 + }: + mkDerivation { + pname = "brotli-streams"; + version = "0.0.0.0"; + sha256 = "14jc1nhm50razsl99d95amdf4njf75dnzx8vqkihgrgp7qisyz3z"; + libraryHaskellDepends = [ base brotli bytestring io-streams ]; + testHaskellDepends = [ + base bytestring HUnit io-streams QuickCheck test-framework + test-framework-hunit test-framework-quickcheck2 + ]; + description = "IO-Streams interface for Brotli (RFC7932) compression"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "browscap" = callPackage ({ mkDerivation, base, bytestring, deepseq, ini, lens, lrucache , mtl, text, unordered-containers, wreq @@ -42821,8 +42995,8 @@ self: { }: mkDerivation { pname = "byline"; - version = "0.3.2.0"; - sha256 = "100s2f4w0lgnsjgjazck7hnbk3k9ibg1i4rdcyza9jphp67vjgar"; + version = "0.3.2.1"; + sha256 = "196c75i7cz7yww3d5pi5p51wd5bf3a8v8nsb2vkiv25ndwrsb20w"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -46591,8 +46765,8 @@ self: { }: mkDerivation { pname = "cassava-streams"; - version = "0.3.0.3"; - sha256 = "01s0h2mi9b4h3jy405jvz2an8w6fdvg370mizfk910anx7wsa3ix"; + version = "0.3.0.4"; + sha256 = "17g3qrinzfpmbcqyjrnwaycplmys0p93hb6841cp5rr1pjramb55"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -55490,8 +55664,8 @@ self: { pname = "connection"; version = "0.2.8"; sha256 = "1swkb9w5vx9ph7x55y51dc0srj2z27nd9ibgn8c0qcl6hx7g9cbh"; - revision = "1"; - editedCabalFile = "15qdwqqjv60w14m319a58yjmhzr39dydsnk6r26ydkwxwh23rk73"; + revision = "2"; + editedCabalFile = "0bhwcd9dqa2jk23bdz3z3vn2p1gzssinp96dxzznb7af4y5x2gmk"; libraryHaskellDepends = [ base byteable bytestring containers data-default-class network socks tls x509 x509-store x509-system x509-validation @@ -55500,6 +55674,26 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "connection_0_3_0" = callPackage + ({ mkDerivation, base, basement, bytestring, containers + , data-default-class, network, socks, tls, x509, x509-store + , x509-system, x509-validation + }: + mkDerivation { + pname = "connection"; + version = "0.3.0"; + sha256 = "1f53bysp8zr8c8dhivrq2k9qmlwnk84d4c1s31sd62ws9yddcw34"; + revision = "1"; + editedCabalFile = "0cm421anscv6h4nvhkaqvi5s3lwkc0f34p6z8lzap4wyc4gv578k"; + libraryHaskellDepends = [ + base basement bytestring containers data-default-class network + socks tls x509 x509-store x509-system x509-validation + ]; + description = "Simple and easy network connections API"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "connection-pool" = callPackage ({ mkDerivation, base, between, data-default-class, monad-control , network, resource-pool, streaming-commons, time @@ -57417,26 +57611,24 @@ self: { }) {}; "cpkg" = callPackage - ({ mkDerivation, base, binary, bytestring, bzlib - , composition-prelude, containers, cpphs, dhall, directory - , filemanip, filepath, hashable, hspec, hspec-megaparsec - , http-client, http-client-tls, libarchive, lzma, megaparsec - , microlens, mtl, network-uri, optparse-applicative, prettyprinter - , process, recursion, tar, temporary, text, zip-archive, zlib + ({ mkDerivation, base, binary, bytestring, bzlib, containers, cpphs + , dhall, directory, filemanip, filepath, hashable, hspec + , hspec-megaparsec, http-client, http-client-tls, libarchive, lzma + , megaparsec, microlens, mtl, network-uri, optparse-applicative + , prettyprinter, process, recursion, tar, temporary, text + , zip-archive, zlib }: mkDerivation { pname = "cpkg"; - version = "0.1.1.1"; - sha256 = "06nwkys90i0rdhg1nvwzii88z5f3ijn9kjwrg6lgy2m973zr8668"; - revision = "1"; - editedCabalFile = "0dqfgr06mv9xmqs2whzklzgj9ny17ncm6202bhykh9xp8qvzfbyy"; + version = "0.1.2.1"; + sha256 = "1wn084r71fq3kx5qjvsg7l7v4njsfxbp1s4rv7f3dgyh7h36xgjj"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ - base binary bytestring bzlib composition-prelude containers dhall - directory filemanip filepath hashable http-client http-client-tls - libarchive lzma megaparsec microlens mtl network-uri prettyprinter - process recursion tar temporary text zip-archive zlib + base binary bytestring bzlib containers dhall directory filemanip + filepath hashable http-client http-client-tls libarchive lzma + megaparsec microlens mtl network-uri prettyprinter process + recursion tar temporary text zip-archive zlib ]; libraryToolDepends = [ cpphs ]; executableHaskellDepends = [ @@ -61394,6 +61586,17 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "data-compat" = callPackage + ({ mkDerivation, base, constraints }: + mkDerivation { + pname = "data-compat"; + version = "0.1.0.0"; + sha256 = "0j9gx0sg2bwqigw9w3kg286bm6imqa35jkgkzagdjg9mfkgy6kwy"; + libraryHaskellDepends = [ base constraints ]; + description = "Define Backwards Compatibility Schemes for Arbitrary Data"; + license = stdenv.lib.licenses.mit; + }) {}; + "data-concurrent-queue" = callPackage ({ mkDerivation, base, stm }: mkDerivation { @@ -62932,8 +63135,8 @@ self: { }: mkDerivation { pname = "datadog-tracing"; - version = "1.4.0"; - sha256 = "02gdkh7yxjh2lnjjm4cgpabl0ywwqs145gd5in6s22999chf0hif"; + version = "1.4.2"; + sha256 = "1yrig10a38sy6zkj18snqiv4r7b1gd16xk3ni9jm8vn7ls7niwcc"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -66424,8 +66627,8 @@ self: { pname = "diagrams-contrib"; version = "1.4.3"; sha256 = "01r081rvxkb9i56iqi28zw4054nm62pf9f1szd9i0avmnxxsiyv5"; - revision = "2"; - editedCabalFile = "0xpw4myq4n6k5lxdll1wg76m3gfymwb746x6qd48qfy3z22nrymw"; + revision = "3"; + editedCabalFile = "0mm1mmagx6q8g6dxk1cagqka38z6393ihp0lvf6095prlvidasqs"; libraryHaskellDepends = [ base circle-packing colour containers cubicbezier data-default data-default-class diagrams-core diagrams-lib diagrams-solve @@ -67892,6 +68095,19 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "direm" = callPackage + ({ mkDerivation, base, directory }: + mkDerivation { + pname = "direm"; + version = "0.1.0.0"; + sha256 = "048503bgikwffvqa00yxawr1lmqy523i9zvs05dyim6v927m1fmx"; + isLibrary = false; + isExecutable = true; + executableHaskellDepends = [ base directory ]; + description = "Deletes a directory and retains its contents in the parent directory"; + license = stdenv.lib.licenses.gpl3; + }) {}; + "dirfiles" = callPackage ({ mkDerivation, aeson, base, containers, hblock, safecopy, text , time, unordered-containers @@ -67989,8 +68205,8 @@ self: { }: mkDerivation { pname = "discord-haskell"; - version = "0.8.1"; - sha256 = "0r7nlivcrqazjgsh54k8qrl64h7065c9vdg4ndv8bahvxvw1ld8r"; + version = "0.8.2"; + sha256 = "0ig8qwz0qgr41x5rk59npgkyd9d2g15xvmhnq4igxzaql0b2f0pl"; libraryHaskellDepends = [ aeson async base base64-bytestring bytestring containers data-default http-client iso8601-time JuicyPixels MonadRandom req @@ -71294,6 +71510,19 @@ self: { broken = true; }) {}; + "dura" = callPackage + ({ mkDerivation, base, bytestring, directory, filepath }: + mkDerivation { + pname = "dura"; + version = "0.1"; + sha256 = "0sm5f8678lym1maavvx0jsl0px3phry6687wsvf5askbrdyla84m"; + revision = "1"; + editedCabalFile = "018pwi48hx6jcy9gkbbc4gcbjxa2n8b4lbfmd18mnm49ymwyyqlv"; + libraryHaskellDepends = [ base bytestring directory filepath ]; + description = "durable/atomic file system writes (from rio package)"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "duration" = callPackage ({ mkDerivation, base, doctest, hspec, parsec, template-haskell , time @@ -73099,6 +73328,8 @@ self: { pname = "ekg-prometheus-adapter"; version = "0.1.0.4"; sha256 = "1i9bqbn8zj7hbkc7iypmjji4sh8s2h9jix2ngp77mkmii6wblfx2"; + revision = "1"; + editedCabalFile = "1aq3x5j33bb0rwlip0p3y6ppk8m1x8k3hnrwnb7pca98gyz8fm6r"; libraryHaskellDepends = [ base containers ekg-core microlens-th prometheus text transformers unordered-containers @@ -74635,6 +74866,8 @@ self: { pname = "enummapset-th"; version = "0.6.1.1"; sha256 = "0anmarswk8vvd9c8qhkhgwzmr5h2yq0bdx48ww5lbca1zf6h5hkw"; + revision = "1"; + editedCabalFile = "0fyjwcw7ibm0x5k2281q53drwm1ddsmkc890fywcv7r6b9jdx5py"; libraryHaskellDepends = [ base containers deepseq template-haskell ]; @@ -76699,8 +76932,8 @@ self: { ({ mkDerivation, base, template-haskell }: mkDerivation { pname = "exception-hierarchy"; - version = "0.1.0.1"; - sha256 = "1zk06z8fwr4g701c79vvsqmagjcm2h850d9m96zrig08kz3lshm9"; + version = "0.1.0.2"; + sha256 = "1srzc1dz3cpplxsqjiw3iiy0jnwyc57qxmdgibkkymjlaksi721i"; libraryHaskellDepends = [ base template-haskell ]; description = "Exception type hierarchy with TemplateHaskell"; license = stdenv.lib.licenses.bsd3; @@ -77724,8 +77957,8 @@ self: { }: mkDerivation { pname = "extensible-effects-concurrent"; - version = "0.21.1"; - sha256 = "1ijk6z4g6y5bfif5rv3w3ld2rfm1ad1sqqicpx9n6lkvh0awc3vp"; + version = "0.22.1"; + sha256 = "1vjd8rr60zxgvv96i9fx5vjbvvxagj8fxz6891irmjgxhlb1v75z"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -77801,6 +78034,23 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "extra_1_6_15" = callPackage + ({ mkDerivation, base, clock, directory, filepath, process + , QuickCheck, semigroups, time, unix + }: + mkDerivation { + pname = "extra"; + version = "1.6.15"; + sha256 = "1kbx15x1y6mdzydm4apizym89in4dd71imwk239ywyg27hl8f4gv"; + libraryHaskellDepends = [ + base clock directory filepath process semigroups time unix + ]; + testHaskellDepends = [ base directory filepath QuickCheck unix ]; + description = "Extra functions I use"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "extract-dependencies" = callPackage ({ mkDerivation, async, base, Cabal, containers , package-description-remote @@ -79327,8 +79577,8 @@ self: { }: mkDerivation { pname = "fedora-img-dl"; - version = "0.2"; - sha256 = "0jk9wljmqszfjr4alhx13112bbdgi84662v1f1fslq8w0q17y3m2"; + version = "0.3"; + sha256 = "0mly2lmrirzskralw9ajywmcirmsv67gjws4dckvf1ns24cx33lw"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -79916,10 +80166,8 @@ self: { }: mkDerivation { pname = "ffunctor"; - version = "1.1.99"; - sha256 = "0b6r72921cr6xrwwnvlw7ndnhfyavrk5a4vsgz3xvisf3i0slb4c"; - revision = "2"; - editedCabalFile = "0772irhfscf3bkxgiy33g7np8wrkdc8pzc7pnap362qvd8v2xkjj"; + version = "1.1.100"; + sha256 = "07s9ax9pi8bxvj94dfh237wfxdmx63gglkw8cx7pn2w1jybpb8v9"; libraryHaskellDepends = [ base transformers ]; testHaskellDepends = [ aeson base exceptions generic-lens http-client mtl servant @@ -80951,6 +81199,29 @@ self: { broken = true; }) {}; + "fits-parse" = callPackage + ({ mkDerivation, base, binary, bytestring, data-default + , fast-logger, JuicyPixels, megaparsec, optparse-applicative + , parser-combinators, statistics, text, text-latin1, vector + }: + mkDerivation { + pname = "fits-parse"; + version = "0.0.1"; + sha256 = "13a072ribpn10hfiiqkx2bkns8rjcsf32zx4lsvxzfhm7p24p499"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + base binary bytestring data-default megaparsec parser-combinators + text text-latin1 + ]; + executableHaskellDepends = [ + base bytestring fast-logger JuicyPixels optparse-applicative + statistics vector + ]; + description = "Parse FITS files"; + license = stdenv.lib.licenses.bsd2; + }) {}; + "fitsio" = callPackage ({ mkDerivation, base, cfitsio, filepath, mtl }: mkDerivation { @@ -81629,8 +81900,8 @@ self: { ({ mkDerivation, base, directory, parsec }: mkDerivation { pname = "flat-tex"; - version = "0.6.1"; - sha256 = "1g116pdjlxx8mz3w2bapbcfd4jgk8jl24fg7fck3j2gyh8282zbm"; + version = "0.7.0"; + sha256 = "19djkalk3pw309y8ngia88qrppm3c6128db7lk7q6l0w18vrnb9d"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ base directory parsec ]; @@ -84674,15 +84945,19 @@ self: { }) {}; "front" = callPackage - ({ mkDerivation, base, blaze-html, blaze-markup, bytestring, fay - , text + ({ mkDerivation, aeson, async, base, blaze-html, blaze-markup + , bytestring, conduit, fay, fay-dom, fay-websockets, mtl, stm + , stm-lifted, text, websockets }: mkDerivation { pname = "front"; - version = "0.0.0.1"; - sha256 = "1iaabr2cfvgismar58w7nazi4mckcvxv37qrkjqnxm82zhnv2fgc"; + version = "0.0.0.2"; + sha256 = "106y0qnz5lyvxy69s24fapqkys6i373kl2v51bpkvfwq5ppax0b0"; + isLibrary = true; + isExecutable = true; libraryHaskellDepends = [ - base blaze-html blaze-markup bytestring fay text + aeson async base blaze-html blaze-markup bytestring conduit fay + fay-dom fay-websockets mtl stm stm-lifted text websockets ]; description = "A reactive frontend web framework"; license = stdenv.lib.licenses.bsd3; @@ -85165,6 +85440,8 @@ self: { pname = "full-text-search"; version = "0.2.1.4"; sha256 = "1qbfklpyxdf5d4d5s1ka9s5a43y892387b0lyjsx9fq3g6d2vck7"; + revision = "1"; + editedCabalFile = "0dma678xflfplrld48aca1p9kjnnwlsqdrqmkgwh9dp54wrxzxl1"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ array base containers text vector ]; @@ -85753,18 +86030,21 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "fused-effects_0_3_0_0" = callPackage + "fused-effects_0_3_1_0" = callPackage ({ mkDerivation, base, criterion, deepseq, doctest, hspec - , MonadRandom, QuickCheck, random, transformers + , inspection-testing, MonadRandom, QuickCheck, random, transformers + , unliftio-core }: mkDerivation { pname = "fused-effects"; - version = "0.3.0.0"; - sha256 = "1plivl5vdgzpb2pbbhyiv2i6jk39l43bwa574qs9nb5jx5i7n056"; + version = "0.3.1.0"; + sha256 = "0mg6sgp4j6my34wzsdpvjvsb07s9k515shvi8nnrnzf0djqq95rv"; libraryHaskellDepends = [ - base deepseq MonadRandom random transformers + base deepseq MonadRandom random transformers unliftio-core + ]; + testHaskellDepends = [ + base doctest hspec inspection-testing QuickCheck transformers ]; - testHaskellDepends = [ base doctest hspec QuickCheck ]; benchmarkHaskellDepends = [ base criterion ]; description = "A fast, flexible, fused effect system"; license = stdenv.lib.licenses.bsd3; @@ -88618,7 +88898,7 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "ghc_8_6_4" = callPackage + "ghc_8_6_5" = callPackage ({ mkDerivation, array, base, binary, bytestring, containers , deepseq, directory, filepath, ghc-boot, ghc-boot-th, ghc-heap , ghci, hpc, process, template-haskell, terminfo, time @@ -88626,8 +88906,8 @@ self: { }: mkDerivation { pname = "ghc"; - version = "8.6.4"; - sha256 = "1ninm000qkpvvfgfrlvj0259451wwmfayh46px3zg6mkr19x64yi"; + version = "8.6.5"; + sha256 = "13sh7f40pib5v00wd5bdxrwz7m5q398l93kky0z14q47130mpp20"; libraryHaskellDepends = [ array base binary bytestring containers deepseq directory filepath ghc-boot ghc-boot-th ghc-heap ghci hpc process template-haskell @@ -88638,14 +88918,14 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "ghc-boot_8_6_4" = callPackage + "ghc-boot_8_6_5" = callPackage ({ mkDerivation, base, binary, bytestring, directory, filepath , ghc-boot-th }: mkDerivation { pname = "ghc-boot"; - version = "8.6.4"; - sha256 = "1clk84l47bdyj74jykyzqzlwxgpwhs2r9x9bxfnw6f7c24xiv4xp"; + version = "8.6.5"; + sha256 = "1sxar25ji02a4yaz6s5hksf7b8pbl66vv9nb3bfc7fxq6gzj5n4b"; libraryHaskellDepends = [ base binary bytestring directory filepath ghc-boot-th ]; @@ -88654,14 +88934,14 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "ghc-boot-th_8_6_4" = callPackage + "ghc-boot-th_8_6_5" = callPackage ({ mkDerivation, base }: mkDerivation { pname = "ghc-boot-th"; - version = "8.6.4"; - sha256 = "15hvcns1vpagx0bdpzgm1cgwnxvz4cbbhbzsvdzpl8zf4y0jd8jz"; + version = "8.6.5"; + sha256 = "18gjvxp3668np9n3c5l65q03nlqhgfjhh9wizvifmk673g0cl7n9"; libraryHaskellDepends = [ base ]; - description = "Shared functionality between GHC and the @template-haskell@ library"; + description = "Shared functionality between GHC and the `template-haskell` library"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; }) {}; @@ -89088,8 +89368,8 @@ self: { }: mkDerivation { pname = "ghc-lib"; - version = "0.20190402"; - sha256 = "1w91n0bh5xyfgzk4kgn43s3wnx4a0h2la9phwf11327ajiacch4l"; + version = "0.20190423"; + sha256 = "1jj4ph9ldxicccs3myqmll9x3a1rl9zv95b797mm9yas80sbijnx"; isLibrary = true; isExecutable = true; enableSeparateDataOutput = true; @@ -89113,8 +89393,8 @@ self: { }: mkDerivation { pname = "ghc-lib-parser"; - version = "0.20190402"; - sha256 = "0ppp7grcmbml472yi766hsmzlnwvb6dawr4f72k41s3xwkfpjmpg"; + version = "0.20190423"; + sha256 = "1vwfsyyj8h0x56zq498mhjbpj6bz9n901v3mwyn5hzp7c25zdv5k"; enableSeparateDataOutput = true; libraryHaskellDepends = [ array base binary bytestring containers deepseq directory filepath @@ -89697,15 +89977,15 @@ self: { broken = true; }) {}; - "ghci_8_6_4" = callPackage + "ghci_8_6_5" = callPackage ({ mkDerivation, array, base, binary, bytestring, containers , deepseq, filepath, ghc-boot, ghc-boot-th, ghc-heap , template-haskell, transformers, unix }: mkDerivation { pname = "ghci"; - version = "8.6.4"; - sha256 = "0gjl2bs2alv56j45khylcdjm3cl71kfcadc83lw3b1zpiinhkb7m"; + version = "8.6.5"; + sha256 = "0h011kixzv5x5bjb2i71bl9dnffc6if7k6jmsncbyvj0vvchrrn8"; libraryHaskellDepends = [ array base binary bytestring containers deepseq filepath ghc-boot ghc-boot-th ghc-heap template-haskell transformers unix @@ -89848,34 +90128,8 @@ self: { }: mkDerivation { pname = "ghcid"; - version = "0.7.2"; - sha256 = "1h50438brxazk6vx8ym3f8y83rijh0lnkf6ac2rwhxi07r016h7s"; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ - ansi-terminal base cmdargs directory extra filepath process time - ]; - executableHaskellDepends = [ - ansi-terminal base cmdargs containers directory extra filepath - fsnotify process terminal-size time unix - ]; - testHaskellDepends = [ - ansi-terminal base cmdargs containers directory extra filepath - fsnotify process tasty tasty-hunit terminal-size time unix - ]; - description = "GHCi based bare bones IDE"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "ghcid_0_7_3" = callPackage - ({ mkDerivation, ansi-terminal, base, cmdargs, containers - , directory, extra, filepath, fsnotify, process, tasty, tasty-hunit - , terminal-size, time, unix - }: - mkDerivation { - pname = "ghcid"; - version = "0.7.3"; - sha256 = "00af44r0y4n8nz9sc8mgbydgwzjmp32yrnf1k15lrlyahqrixhfl"; + version = "0.7.4"; + sha256 = "1wd278xligp0qj98zhqp3lkxdzpgb8k7yy0vhva6cs1ch6032gpp"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -89891,7 +90145,6 @@ self: { ]; description = "GHCi based bare bones IDE"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "ghcjs-ajax" = callPackage @@ -97289,8 +97542,8 @@ self: { ({ mkDerivation, base, containers, json, text }: mkDerivation { pname = "graphql-w-persistent"; - version = "0.3.1.1"; - sha256 = "1cfq41s18n73fpn0zzwrvw0b2n7l2h7i71dz9wvifsjxrpla50q1"; + version = "0.3.1.2"; + sha256 = "0kd73yxack1allp27l4pp4xsdw3rs3g44kbk6qadhdvrws7d105z"; libraryHaskellDepends = [ base containers json text ]; description = "Haskell GraphQL query parser-interpreter-data processor"; license = stdenv.lib.licenses.isc; @@ -97452,8 +97705,8 @@ self: { }: mkDerivation { pname = "gray-extended"; - version = "1.5.6"; - sha256 = "13a18vri2akfahp8k7s5sg6knn0plcsf6lqdzy05628wymiia2s3"; + version = "1.5.7"; + sha256 = "0j2lzy15jiykz9b6cqzh7xhpf1idwxp8illvy3r50g1g4hc8zvyp"; libraryHaskellDepends = [ base ]; testHaskellDepends = [ base QuickCheck test-framework test-framework-quickcheck2 @@ -99672,6 +99925,26 @@ self: { license = stdenv.lib.licenses.publicDomain; }) {}; + "hablo" = callPackage + ({ mkDerivation, aeson, base, bytestring, containers, directory + , filepath, lucid, mtl, optparse-applicative, parsec, template + , text, time, unix + }: + mkDerivation { + pname = "hablo"; + version = "1.0.0.0"; + sha256 = "19lhchfvkyqjfbr7i07y6a26dyk19w83s0qa6drgnr6zqsvdqkg8"; + isLibrary = false; + isExecutable = true; + enableSeparateDataOutput = true; + executableHaskellDepends = [ + aeson base bytestring containers directory filepath lucid mtl + optparse-applicative parsec template text time unix + ]; + description = "A minimalist static blog generator"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "hablog" = callPackage ({ mkDerivation, base, bifunctors, blaze-html, blaze-markup , bytestring, containers, directory, filepath, markdown, mime-types @@ -101021,8 +101294,8 @@ self: { }: mkDerivation { pname = "haiji"; - version = "0.2.3.0"; - sha256 = "12g7nlfci2hrsqi19z8mi7i8vqd1s7a8c3sr8k43f0hhzk6b528i"; + version = "0.3.0.0"; + sha256 = "079q3m3c39ip86hpirq9c5l3b9hw030zd5slwi2bssbmq2bhfv5i"; libraryHaskellDepends = [ aeson attoparsec base data-default mtl scientific tagged template-haskell text transformers unordered-containers vector @@ -103491,8 +103764,8 @@ self: { pname = "hasbolt"; version = "0.1.3.2"; sha256 = "14sq3iqbrfkwyswdka2285cdhwx3c6srfhn5qb7yw1nfjx2bdb1i"; - revision = "3"; - editedCabalFile = "10h7pbkrkc9cdxx09zk0s8ygcdva2xy646zq3k8czph3vdaffzqx"; + revision = "4"; + editedCabalFile = "0h38mjkr3cqhsr9hwf2wj27mknnxyb2y3swzp18s7q4vmrb1ijyz"; libraryHaskellDepends = [ base binary bytestring connection containers data-binary-ieee754 data-default network text transformers @@ -103504,6 +103777,27 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "hasbolt_0_1_3_3" = callPackage + ({ mkDerivation, base, binary, bytestring, connection, containers + , data-binary-ieee754, data-default, hex, hspec, network + , QuickCheck, text, transformers + }: + mkDerivation { + pname = "hasbolt"; + version = "0.1.3.3"; + sha256 = "1l1p9iz9k8i1car5cd6cfd2bpidkrfbr2354hxvg8gpnw1i5jsbb"; + libraryHaskellDepends = [ + base binary bytestring connection containers data-binary-ieee754 + data-default network text transformers + ]; + testHaskellDepends = [ + base bytestring containers hex hspec QuickCheck text + ]; + description = "Haskell driver for Neo4j 3+ (BOLT protocol)"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "hasbolt-extras" = callPackage ({ mkDerivation, aeson, aeson-casing, base, bytestring, containers , data-default, free, hasbolt, lens, mtl, neat-interpolation @@ -104998,6 +105292,8 @@ self: { pname = "haskell-lsp"; version = "0.8.2.0"; sha256 = "18qkrybwvmyz5h03xj9wjigpqs6s6rw9wi1lqcla4ppg1pkd5zyd"; + revision = "1"; + editedCabalFile = "0m6kprfsgxcmif0mmb1vpc46jyr0kjk6fqv3k1sqfvpjpldh0mvy"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -105018,6 +105314,40 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "haskell-lsp_0_10_0_0" = callPackage + ({ mkDerivation, aeson, base, bytestring, containers, data-default + , directory, filepath, hashable, haskell-lsp-types, hslogger, hspec + , hspec-discover, lens, mtl, network-uri, parsec, QuickCheck + , quickcheck-instances, sorted-list, stm, text, time, transformers + , unordered-containers, vector, yi-rope + }: + mkDerivation { + pname = "haskell-lsp"; + version = "0.10.0.0"; + sha256 = "01vfpv4zi6h9rdn39l7rx3y0mm2gsabwsf5ny2dbrca8x7462vys"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + aeson base bytestring containers data-default directory filepath + hashable haskell-lsp-types hslogger lens mtl network-uri parsec + sorted-list stm text time unordered-containers yi-rope + ]; + executableHaskellDepends = [ + aeson base bytestring containers data-default directory filepath + hslogger lens mtl network-uri parsec stm text time transformers + unordered-containers vector yi-rope + ]; + testHaskellDepends = [ + aeson base bytestring containers data-default directory filepath + hashable hspec lens network-uri QuickCheck quickcheck-instances + sorted-list stm text yi-rope + ]; + testToolDepends = [ hspec-discover ]; + description = "Haskell library for the Microsoft Language Server Protocol"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "haskell-lsp-client" = callPackage ({ mkDerivation, aeson, base, bytestring, containers, directory , haskell-lsp, lens, process, text, unix @@ -105057,6 +105387,24 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "haskell-lsp-types_0_10_0_0" = callPackage + ({ mkDerivation, aeson, base, bytestring, data-default, filepath + , hashable, lens, network-uri, scientific, text + , unordered-containers + }: + mkDerivation { + pname = "haskell-lsp-types"; + version = "0.10.0.0"; + sha256 = "03k8sip1mgcpr93075cpylp7d9h956vxx6dpcli1r46filbb88an"; + libraryHaskellDepends = [ + aeson base bytestring data-default filepath hashable lens + network-uri scientific text unordered-containers + ]; + description = "Haskell library for the Microsoft Language Server Protocol, data types"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "haskell-menu" = callPackage ({ mkDerivation, base, containers }: mkDerivation { @@ -107046,8 +107394,8 @@ self: { }: mkDerivation { pname = "haskoin-node"; - version = "0.9.9"; - sha256 = "0d4bv1wr3c89x7r6aakvvwklwzk8g90bl21bc52k4d88znyclqvm"; + version = "0.9.10"; + sha256 = "05pnj7caia2ifr793pryfdc8q8p203rii4agrgy4i123mcfmxqjq"; libraryHaskellDepends = [ base bytestring cereal conduit conduit-extra containers data-default hashable haskoin-core monad-logger mtl network nqe @@ -107125,8 +107473,8 @@ self: { }: mkDerivation { pname = "haskoin-store"; - version = "0.14.0"; - sha256 = "0d508vs1rhj54iixh1m4s7jcszav83bwbxd7g6d4hgn0vwf2l1wh"; + version = "0.14.1"; + sha256 = "0n5c51if17gm6ldsbpapqwc4bdshbnkxd403ssfgy3b923cmqm1r"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -107997,6 +108345,35 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "hasql_1_3_0_5" = callPackage + ({ mkDerivation, attoparsec, base, base-prelude, bug, bytestring + , bytestring-strict-builder, contravariant, contravariant-extras + , criterion, data-default-class, dlist, hashable, hashtables + , loch-th, mtl, placeholders, postgresql-binary, postgresql-libpq + , profunctors, QuickCheck, quickcheck-instances, rebase, rerebase + , tasty, tasty-hunit, tasty-quickcheck, text, text-builder + , transformers, vector + }: + mkDerivation { + pname = "hasql"; + version = "1.3.0.5"; + sha256 = "0qs2x4gbaffrxndivb4237vxc6qrzn2rs5kbf04n4d6py9cdhbjv"; + libraryHaskellDepends = [ + attoparsec base base-prelude bytestring bytestring-strict-builder + contravariant contravariant-extras data-default-class dlist + hashable hashtables loch-th mtl placeholders postgresql-binary + postgresql-libpq profunctors text text-builder transformers vector + ]; + testHaskellDepends = [ + bug data-default-class QuickCheck quickcheck-instances rebase + rerebase tasty tasty-hunit tasty-quickcheck + ]; + benchmarkHaskellDepends = [ bug criterion rerebase ]; + description = "An efficient PostgreSQL driver and a flexible mapping API"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "hasql-backend" = callPackage ({ mkDerivation, base, base-prelude, bytestring, either, free , list-t, text, transformers, vector @@ -110283,6 +110660,17 @@ self: { broken = true; }) {}; + "hedgehog-generic" = callPackage + ({ mkDerivation, base, hedgehog }: + mkDerivation { + pname = "hedgehog-generic"; + version = "0.1"; + sha256 = "1166jwk3f4bfw54qaxk3q3gxrfmffwwfkmd8xyvwj7i3whwzxq0f"; + libraryHaskellDepends = [ base hedgehog ]; + description = "GHC Generics automatically derived hedgehog generators"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "hedgehog-quickcheck" = callPackage ({ mkDerivation, base, hedgehog, QuickCheck, transformers }: mkDerivation { @@ -110320,7 +110708,7 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "hedis_0_12_1" = callPackage + "hedis_0_12_2" = callPackage ({ mkDerivation, async, base, bytestring, bytestring-lexing , deepseq, doctest, errors, HTTP, HUnit, mtl, network, network-uri , resource-pool, scanner, stm, test-framework, test-framework-hunit @@ -110328,8 +110716,8 @@ self: { }: mkDerivation { pname = "hedis"; - version = "0.12.1"; - sha256 = "01l8fmwwanw00bj3rzyv8k9swgvvzbvh920li67w10w5qlwvmgri"; + version = "0.12.2"; + sha256 = "13kvi01v2bbz8xn44s4plmzka8khz3a4hc6pinw1walpfi8kygsx"; libraryHaskellDepends = [ async base bytestring bytestring-lexing deepseq errors HTTP mtl network network-uri resource-pool scanner stm text time tls @@ -114229,19 +114617,21 @@ self: { }) {}; "hledger-flow" = callPackage - ({ mkDerivation, base, containers, foldl, HUnit, stm, text, time - , turtle + ({ mkDerivation, base, containers, foldl, HUnit + , optparse-applicative, stm, text, time, turtle }: mkDerivation { pname = "hledger-flow"; - version = "0.11.0.0"; - sha256 = "1zjmy80r7iifj4cw53jskxqnnhrn8ysall5nx7xxhzfx4mwixq6f"; + version = "0.11.2.0"; + sha256 = "17v9iqh9dhild0m67j2141yxv4hx5p59fjn51yl5q0jbib63gq14"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base containers foldl stm text time turtle ]; - executableHaskellDepends = [ base text turtle ]; + executableHaskellDepends = [ + base optparse-applicative text turtle + ]; testHaskellDepends = [ base containers foldl HUnit stm text turtle ]; @@ -114531,8 +114921,8 @@ self: { }: mkDerivation { pname = "hlint"; - version = "2.1.16"; - sha256 = "027v3aigghmghwbiwkhv9iadwv15fa40brkin489ahi6jwrlnp32"; + version = "2.1.17"; + sha256 = "0brinb3fjy619qh8yingqz2k03gcixc7mvqxzhzjadj69zlns6j3"; isLibrary = true; isExecutable = true; enableSeparateDataOutput = true; @@ -115382,44 +115772,44 @@ self: { "hnix" = callPackage ({ mkDerivation, aeson, array, base, base16-bytestring, binary - , bytestring, comonad, containers, criterion, cryptohash-md5 - , cryptohash-sha1, cryptohash-sha256, cryptohash-sha512, data-fix - , deepseq, dependent-sum, deriving-compat, Diff, directory - , exceptions, filepath, free, generic-random, Glob, hashable - , hashing, haskeline, hedgehog, hnix-store-core, http-client - , http-client-tls, http-types, interpolate, lens-family - , lens-family-core, lens-family-th, logict, megaparsec - , monad-control, monadlist, mtl, optparse-applicative - , parser-combinators, pretty-show, prettyprinter, process, ref-tf - , regex-tdfa, regex-tdfa-text, repline, scientific, semigroups - , serialise, split, syb, tasty, tasty-hedgehog, tasty-hunit - , tasty-quickcheck, tasty-th, template-haskell, text, these, time - , transformers, transformers-base, unix, unordered-containers - , vector, xml + , bytestring, comonad, containers, contravariant, criterion + , cryptohash-md5, cryptohash-sha1, cryptohash-sha256 + , cryptohash-sha512, data-fix, deepseq, dependent-sum + , deriving-compat, Diff, directory, exceptions, filepath, free + , generic-random, Glob, hashable, hashing, haskeline, hedgehog + , hnix-store-core, http-client, http-client-tls, http-types + , interpolate, lens-family, lens-family-core, lens-family-th + , logict, megaparsec, monad-control, monadlist, mtl + , optparse-applicative, parser-combinators, pretty-show + , prettyprinter, process, ref-tf, regex-tdfa, regex-tdfa-text + , repline, scientific, semigroups, serialise, split, syb, tasty + , tasty-hedgehog, tasty-hunit, tasty-quickcheck, tasty-th + , template-haskell, text, these, time, transformers + , transformers-base, unix, unordered-containers, vector, xml }: mkDerivation { pname = "hnix"; - version = "0.6.0"; - sha256 = "1yirs9q2hm7h8zahc053q129s5iab6c24745hin4hik0ghdqw6k7"; + version = "0.6.1"; + sha256 = "0q79wdrm3z88mknq6nf7cpg7lwgbx355k95k11rz3iz0sgk9hjwi"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ aeson array base base16-bytestring binary bytestring comonad - containers cryptohash-md5 cryptohash-sha1 cryptohash-sha256 - cryptohash-sha512 data-fix deepseq dependent-sum deriving-compat - directory exceptions filepath free hashable hashing haskeline - hnix-store-core http-client http-client-tls http-types interpolate - lens-family lens-family-core lens-family-th logict megaparsec - monad-control monadlist mtl optparse-applicative parser-combinators - pretty-show prettyprinter process ref-tf regex-tdfa regex-tdfa-text - scientific semigroups serialise split syb template-haskell text - these time transformers transformers-base unix unordered-containers - vector xml + containers contravariant cryptohash-md5 cryptohash-sha1 + cryptohash-sha256 cryptohash-sha512 data-fix deepseq dependent-sum + deriving-compat directory exceptions filepath free hashable hashing + haskeline hnix-store-core http-client http-client-tls http-types + interpolate lens-family lens-family-core lens-family-th logict + megaparsec monad-control monadlist mtl optparse-applicative + parser-combinators pretty-show prettyprinter process ref-tf + regex-tdfa regex-tdfa-text scientific semigroups serialise split + syb template-haskell text these time transformers transformers-base + unix unordered-containers vector xml ]; executableHaskellDepends = [ aeson base base16-bytestring bytestring comonad containers cryptohash-md5 cryptohash-sha1 cryptohash-sha256 cryptohash-sha512 - data-fix deepseq exceptions filepath hashing haskeline mtl + data-fix deepseq exceptions filepath free hashing haskeline mtl optparse-applicative pretty-show prettyprinter ref-tf repline serialise template-haskell text time transformers unordered-containers @@ -118180,10 +118570,8 @@ self: { ]; description = "Compression and decompression in the brotli format"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; - }) {brotli = null; brotlidec = null; brotlienc = null; - libbrotlidec = null; libbrotlienc = null;}; + }) {brotlidec = null; brotlienc = null; libbrotlidec = null; + libbrotlienc = null;}; "hs-captcha" = callPackage ({ mkDerivation, base, bytestring, gd, random }: @@ -120376,6 +120764,8 @@ self: { pname = "hsini"; version = "0.5.1.2"; sha256 = "1r6qksnrmk18ndxs5zaga8b7kvmk34kp0kh5hwqmq797qrlax9pa"; + revision = "1"; + editedCabalFile = "0wkvajjgs64l4wlw8s6sn3pbwx3ni41p1260chp67a16innr1qp6"; libraryHaskellDepends = [ base bytestring containers mtl parsec ]; testHaskellDepends = [ base bytestring containers mtl parsec tasty tasty-hunit @@ -120483,6 +120873,23 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "hslogger_1_3_0_0" = callPackage + ({ mkDerivation, base, bytestring, containers, HUnit, network + , network-bsd, old-locale, time, unix + }: + mkDerivation { + pname = "hslogger"; + version = "1.3.0.0"; + sha256 = "1gnnqyd5hr59agqjcbim3kys5zarwsj7b1kfdbhy5qmjjwnpyzs8"; + libraryHaskellDepends = [ + base bytestring containers network network-bsd old-locale time unix + ]; + testHaskellDepends = [ base HUnit ]; + description = "Versatile logging framework"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "hslogger-reader" = callPackage ({ mkDerivation, attoparsec, base, hslogger, optparse-applicative , text, text-icu, time @@ -123895,6 +124302,29 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "http-media_0_8_0_0" = callPackage + ({ mkDerivation, base, bytestring, case-insensitive, containers + , QuickCheck, test-framework, test-framework-quickcheck2 + , utf8-string + }: + mkDerivation { + pname = "http-media"; + version = "0.8.0.0"; + sha256 = "0lww5cxrc9jlvzsysjv99lca33i4rb7cll66p3c0rdpmvz8pk0ir"; + revision = "1"; + editedCabalFile = "01kb67m99jl3b8k06bp84sxiwxygz48ci5wkll42688qgsjb3rab"; + libraryHaskellDepends = [ + base bytestring case-insensitive containers utf8-string + ]; + testHaskellDepends = [ + base bytestring case-insensitive containers QuickCheck + test-framework test-framework-quickcheck2 utf8-string + ]; + description = "Processing HTTP Content-Type and Accept headers"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "http-monad" = callPackage ({ mkDerivation, base, bytestring, containers, explicit-exception , HTTP, lazyio, network, network-uri, parsec, semigroups @@ -124248,14 +124678,18 @@ self: { "http2-client" = callPackage ({ mkDerivation, async, base, bytestring, containers, deepseq - , http2, network, stm, time, tls + , http2, lifted-async, lifted-base, mtl, network, stm, time, tls + , transformers-base }: mkDerivation { pname = "http2-client"; - version = "0.8.0.2"; - sha256 = "16m4amw7xq7psvxix76z7g1dvllkfs9pzpnig5rfhbgfvbf5pydw"; + version = "0.9.0.0"; + sha256 = "1z46an4sign2ashjsj2y07vkf73i2wzx5x10qsdaf4av5ib8ykxq"; + revision = "1"; + editedCabalFile = "00fg9a62qkjwp7rb38j7z7yy6dk3mkh6mgwspd79v2ycmn4mr25q"; libraryHaskellDepends = [ - async base bytestring containers deepseq http2 network stm time tls + async base bytestring containers deepseq http2 lifted-async + lifted-base mtl network stm time tls transformers-base ]; testHaskellDepends = [ base ]; description = "A native HTTP2 client library"; @@ -124264,17 +124698,18 @@ self: { "http2-client-exe" = callPackage ({ mkDerivation, async, base, bytestring, data-default-class, http2 - , http2-client, optparse-applicative, time, tls + , http2-client, lifted-async, lifted-base, optparse-applicative + , time, tls }: mkDerivation { pname = "http2-client-exe"; - version = "0.1.0.1"; - sha256 = "1z1y52253dybliwplybwd71a1ssmma34zcylv54aj6x7grrj37hm"; + version = "0.2.0.0"; + sha256 = "15yvg3nmsajc7q63c2qsmmckw3v4h37364zdxqi3dk9r0xkpssjy"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ async base bytestring data-default-class http2 http2-client - optparse-applicative time tls + lifted-async lifted-base optparse-applicative time tls ]; description = "A command-line http2 client"; license = stdenv.lib.licenses.bsd3; @@ -124283,15 +124718,16 @@ self: { "http2-client-grpc" = callPackage ({ mkDerivation, async, base, binary, bytestring, case-insensitive , data-default-class, http2, http2-client, http2-grpc-types, lens - , proto-lens, text, tls + , lifted-async, lifted-base, proto-lens, text, tls }: mkDerivation { pname = "http2-client-grpc"; - version = "0.6.0.0"; - sha256 = "0cf6asfh8wmjh1j0i1ldh557n33q1k1kfj604rz7rrrcarmn0m5h"; + version = "0.7.0.0"; + sha256 = "1iy825wrn2ai2qpbkq4p9k2amc5rarr57b9sa2vm8vqdrclcvzn1"; libraryHaskellDepends = [ async base binary bytestring case-insensitive data-default-class - http2 http2-client http2-grpc-types lens proto-lens text tls + http2 http2-client http2-grpc-types lens lifted-async lifted-base + proto-lens text tls ]; testHaskellDepends = [ base ]; description = "Implement gRPC-over-HTTP2 clients"; @@ -130409,10 +130845,8 @@ self: { }: mkDerivation { pname = "integer-logarithms"; - version = "1.0.2.2"; - sha256 = "1hvzbrh8fm1g9fbavdym52pr5n9f2bnfx1parkfizwqlbj6n51ms"; - revision = "1"; - editedCabalFile = "1684dkh8j2xqsd85bfsmhv3iam37hasjg4x79mvl6xh7scmpfdbw"; + version = "1.0.3"; + sha256 = "05pc5hws66csvcvfswlwcr2fplwn1lbssvwifjxkbbwqhq0n5qjs"; libraryHaskellDepends = [ array base ghc-prim integer-gmp ]; testHaskellDepends = [ base QuickCheck smallcheck tasty tasty-hunit tasty-quickcheck @@ -133143,8 +133577,10 @@ self: { }: mkDerivation { pname = "jaeger-flamegraph"; - version = "1.1.0"; - sha256 = "01aa2wk95hwkdh6b3m4c9j73ym2xl1ndys81fvvam6wq0dwf9k14"; + version = "1.2.0"; + sha256 = "1ha7zngxr9nin3gyqwwv6bplvrrc2n3j9sl8fp2dmxpjfwpi9r7f"; + revision = "1"; + editedCabalFile = "0xv7828z08rfd1m29ib8vlvigbavx5ksc67vj57293qiq590a3xf"; isLibrary = false; isExecutable = true; libraryHaskellDepends = [ base QuickCheck ]; @@ -137426,6 +137862,35 @@ self: { broken = true; }) {}; + "knit-haskell" = callPackage + ({ mkDerivation, aeson-pretty, base, base64-bytestring + , blaze-colonnade, blaze-html, bytestring, case-insensitive + , colonnade, containers, directory, Glob, here, http-client + , http-client-tls, http-types, hvega, logging-effect, lucid, mtl + , network, network-uri, pandoc, polysemy, prettyprinter, random + , random-fu, random-source, text, time + }: + mkDerivation { + pname = "knit-haskell"; + version = "0.1.0.0"; + sha256 = "11kqv2jxjn3maj53lgbccxcjcjrfqgsi8dd2ys51aalak2pf79bx"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + aeson-pretty base base64-bytestring blaze-colonnade blaze-html + bytestring case-insensitive colonnade containers directory Glob + http-client http-client-tls http-types hvega logging-effect lucid + mtl network network-uri pandoc polysemy prettyprinter random + random-fu random-source text time + ]; + executableHaskellDepends = [ + base blaze-html colonnade containers here hvega mtl polysemy + random-fu text + ]; + description = "a minimal Rmarkdown sort-of-thing for haskell, by way of Pandoc"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "knob" = callPackage ({ mkDerivation, base, bytestring, transformers }: mkDerivation { @@ -138871,8 +139336,8 @@ self: { }: mkDerivation { pname = "language-ats"; - version = "1.7.1.1"; - sha256 = "0zqvr8z0mdjjdd9wx3ghf4aiv61brs52wk04d2vqar8nvv2wpzn4"; + version = "1.7.1.2"; + sha256 = "057gskb5y57jvh6z71d35qq228kpvf0wk09wf175mgy9qc78vg9p"; enableSeparateDataOutput = true; libraryHaskellDepends = [ ansi-wl-pprint array base composition-prelude containers deepseq @@ -139744,8 +140209,8 @@ self: { }: mkDerivation { pname = "language-puppet"; - version = "1.4.3"; - sha256 = "1sh0i487w7mz5c0scly1s11xzha4dbp2wdiwdks3203c5yrjdfq7"; + version = "1.4.4"; + sha256 = "0dgbbyz89q1hhacy2pymhvmp8k5dvnzzsrxq0zc6l865nhha67ch"; isLibrary = true; isExecutable = true; enableSeparateDataOutput = true; @@ -140334,8 +140799,8 @@ self: { pname = "lattices"; version = "1.7.1.1"; sha256 = "1byx2hmmh2213afdcsjxf3mvq3h9bwkl5wrvzxv1yqvd9jiqjz3r"; - revision = "1"; - editedCabalFile = "18182vlzaz5kzcn2j0k1jmdl8kgqmnpjc3ynsi7v6jdl3vig89dr"; + revision = "2"; + editedCabalFile = "0qxz4v5pqwvhb79mz4b7wc66r2c0xc9ixfhss4h56jk3vb1hriys"; libraryHaskellDepends = [ base base-compat containers deepseq hashable semigroupoids tagged universe-base universe-reverse-instances unordered-containers @@ -142134,6 +142599,18 @@ self: { license = stdenv.lib.licenses.bsd3; }) {ffi = null; inherit (pkgs) libffi;}; + "libffi-dynamic" = callPackage + ({ mkDerivation, base, contravariant, ffi, hashable, intern }: + mkDerivation { + pname = "libffi-dynamic"; + version = "0.0.0.1"; + sha256 = "0fh3a07qv6fgxycba2yy02warz2lm2npps9118nkxq0qf8gnvinv"; + libraryHaskellDepends = [ base contravariant hashable intern ]; + librarySystemDepends = [ ffi ]; + description = "LibFFI interface with dynamic bidirectional type-driven binding generation"; + license = stdenv.lib.licenses.publicDomain; + }) {ffi = null;}; + "libgit" = callPackage ({ mkDerivation, base, mtl, process }: mkDerivation { @@ -143409,8 +143886,8 @@ self: { }: mkDerivation { pname = "line-bot-sdk"; - version = "0.5.0.0"; - sha256 = "135l32xf28ric12ya9mfis6rixd4cyfp3801dr6q8di4vvfgblm4"; + version = "0.5.0.1"; + sha256 = "0d2a540dflyv3zjx9phs85qar1kpyl287f01hh8fxkp550wivfgg"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -146949,8 +147426,37 @@ self: { }: mkDerivation { pname = "lsp-test"; - version = "0.5.1.0"; - sha256 = "1kmffpfq6cnby3gij5sd1p2fp8hhn7gjk1nm5a4hs2gfhlyik57y"; + version = "0.5.1.1"; + sha256 = "03dvkh8i6mkmcv1pvaqlr9pava14qxbd31my4hjvs37xzm6dw22b"; + libraryHaskellDepends = [ + aeson aeson-pretty ansi-terminal base bytestring conduit + conduit-parse containers data-default Diff directory filepath + haskell-lsp lens mtl parser-combinators process text transformers + unix unordered-containers yi-rope + ]; + testHaskellDepends = [ + aeson base data-default haskell-lsp hspec lens text + unordered-containers + ]; + description = "Functional test framework for LSP servers"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; + }) {}; + + "lsp-test_0_5_1_3" = callPackage + ({ mkDerivation, aeson, aeson-pretty, ansi-terminal, base + , bytestring, conduit, conduit-parse, containers, data-default + , Diff, directory, filepath, haskell-lsp, hspec, lens, mtl + , parser-combinators, process, text, transformers, unix + , unordered-containers, yi-rope + }: + mkDerivation { + pname = "lsp-test"; + version = "0.5.1.3"; + sha256 = "1ksjsxf5y9jx7j8rbfsvc667p7ikvvvscvjaa97mps8aci5izv48"; + revision = "1"; + editedCabalFile = "1aa59vpfa5an1fx3xq92lzg9k7wkwbxncmx04zkwdidwh5i2p4pg"; libraryHaskellDepends = [ aeson aeson-pretty ansi-terminal base bytestring conduit conduit-parse containers data-default Diff directory filepath @@ -149164,6 +149670,35 @@ self: { broken = true; }) {}; + "map-reduce-folds" = callPackage + ({ mkDerivation, base, containers, criterion, deepseq + , discrimination, foldl, hashable, hashtables, hedgehog, parallel + , profunctors, random, split, streaming, streamly, text + , unordered-containers, vector + }: + mkDerivation { + pname = "map-reduce-folds"; + version = "0.1.0.0"; + sha256 = "03f5jkjsrn5a82g0cvjwm9dq1hn4c9m6a8hsyh035f92vflfk5vc"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + base containers discrimination foldl hashable hashtables parallel + profunctors split streaming streamly text unordered-containers + vector + ]; + executableHaskellDepends = [ + base containers foldl profunctors text unordered-containers + ]; + testHaskellDepends = [ base containers foldl hedgehog ]; + benchmarkHaskellDepends = [ + base containers criterion deepseq foldl profunctors random text + unordered-containers + ]; + description = "foldl wrappers for map-reduce"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "map-syntax" = callPackage ({ mkDerivation, base, containers, deepseq, hspec, HUnit, mtl , QuickCheck, transformers @@ -152498,10 +153033,8 @@ self: { }: mkDerivation { pname = "midi-util"; - version = "0.2.0.1"; - sha256 = "0s37csd1x039q0cb487pd811jz7h0i26chvvbmwffh11bc2icjzc"; - revision = "1"; - editedCabalFile = "0a3hasbhvd327m65yqqyjah7y8r48l65bqg1ymcrc0s2zff10gl5"; + version = "0.2.1"; + sha256 = "0ajmjwxa2g5fjgb9zhil63mszsalmg4fqdv62zabf774z8k1x1ry"; libraryHaskellDepends = [ base containers event-list midi non-negative ]; @@ -152949,19 +153482,19 @@ self: { , hashable, linear, microlens, microlens-mtl, mtl, mwc-random , scientific, sdl2, sdl2-gfx, sdl2-image, sdl2-ttf, tasty , tasty-discover, tasty-hspec, template-haskell, text, trifecta - , unordered-containers, vector, yaml + , unordered-containers, uuid, vector, yaml }: mkDerivation { pname = "minilight"; - version = "0.1.1"; - sha256 = "0wl37m7wz5jdq4hwcbrnd0m5lhz9mgfk6p8ysinjwfc1458g8v91"; + version = "0.2.0"; + sha256 = "18kjzmqpm967z0560z09n7s61s21f13mkr6iwb5dp7a5vnwq8lxm"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ aeson base containers exceptions FontyFruity hashable linear microlens microlens-mtl mtl mwc-random scientific sdl2 sdl2-gfx sdl2-image sdl2-ttf template-haskell text trifecta - unordered-containers vector yaml + unordered-containers uuid vector yaml ]; executableHaskellDepends = [ base linear microlens mtl mwc-random sdl2 sdl2-ttf text vector @@ -152972,6 +153505,8 @@ self: { testToolDepends = [ tasty-discover ]; description = "A SDL2-based graphics library, batteries-included"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "minimal-configuration" = callPackage @@ -153181,6 +153716,8 @@ self: { ]; description = "Layout and render text with TrueType fonts using OpenGL"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "miniutter" = callPackage @@ -161783,8 +162320,8 @@ self: { pname = "network-simple"; version = "0.4.3"; sha256 = "0a4hag26ry6lg90q4ppchvrm5xaij50jd4633mhfkfq8scgczm8d"; - revision = "1"; - editedCabalFile = "1xyz4b24vgnidvd43cfmf0k6090dayhfcp6n8x894ibd2mq3vash"; + revision = "2"; + editedCabalFile = "073g0agplvgan62s638w5hcq25biq8f811xhha6drfyxybs6cspn"; libraryHaskellDepends = [ base bytestring network safe-exceptions socks transformers ]; @@ -161816,8 +162353,8 @@ self: { }: mkDerivation { pname = "network-simple-tls"; - version = "0.3.1"; - sha256 = "12kwi2jc8g310wrw7ynq2hfhkxhh95qn0fy205g7a48xrw75npyj"; + version = "0.3.2"; + sha256 = "09fw7ynvry0wjc2nip6kwncl662f7glzq1akiwgh09bwnpbswxsh"; libraryHaskellDepends = [ base bytestring data-default network network-simple safe-exceptions tls transformers x509 x509-store x509-system x509-validation @@ -161826,6 +162363,40 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "network-simple-ws" = callPackage + ({ mkDerivation, base, bytestring, case-insensitive, network-simple + , safe-exceptions, websockets + }: + mkDerivation { + pname = "network-simple-ws"; + version = "0.1"; + sha256 = "04a0q4q7idah834dvgkl4j1a8fjgrw9qkxppmk5jnvdphq6sxxzd"; + libraryHaskellDepends = [ + base bytestring case-insensitive network-simple safe-exceptions + websockets + ]; + description = "Simple interface to WebSockets"; + license = stdenv.lib.licenses.bsd3; + }) {}; + + "network-simple-wss" = callPackage + ({ mkDerivation, base, bytestring, network-simple-tls + , network-simple-ws, safe-exceptions, websockets + }: + mkDerivation { + pname = "network-simple-wss"; + version = "0.1"; + sha256 = "1wmicn9zyf4308spf1s7dd4xbi8hfwksdigf62jdm87ywv8jd6rj"; + libraryHaskellDepends = [ + base bytestring network-simple-tls network-simple-ws + safe-exceptions websockets + ]; + description = "Simple interface to TLS secured WebSockets"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; + }) {}; + "network-socket-options" = callPackage ({ mkDerivation, base, network }: mkDerivation { @@ -162509,8 +163080,8 @@ self: { }: mkDerivation { pname = "ngx-export"; - version = "1.7.0.1"; - sha256 = "0gaj4v8hzjjljr5v3l1by6rhin2k8a2wsaff61s5g77gdkcmi2i5"; + version = "1.7.1"; + sha256 = "0dylj1i6370r1yz2rgjpjs5ynsvaqshgvz71200r0q2hqqznax6d"; libraryHaskellDepends = [ async base binary bytestring deepseq monad-loops template-haskell unix @@ -162525,8 +163096,8 @@ self: { }: mkDerivation { pname = "ngx-export-tools"; - version = "0.4.4.0"; - sha256 = "19x6qzryjdac1alq4wsmy0as6258ga9b3ga3iszqwvqjdpc89a6n"; + version = "0.4.5.0"; + sha256 = "1775syhp5pgm6sdn3x8y3zqzvqrwypl07xm6rkv34sbw5x84mmmv"; libraryHaskellDepends = [ aeson base binary bytestring ngx-export safe template-haskell ]; @@ -162534,6 +163105,23 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "ngx-export-tools-extra" = callPackage + ({ mkDerivation, aeson, base, bytestring, containers + , enclosed-exceptions, http-client, ngx-export-tools, snap-core + , snap-server, template-haskell, text, time + }: + mkDerivation { + pname = "ngx-export-tools-extra"; + version = "0.1.0.0"; + sha256 = "0j3bfrmic9zrivsnaf4kzf5bf0inianmnn7v0c21s5ip775k5jy8"; + libraryHaskellDepends = [ + aeson base bytestring containers enclosed-exceptions http-client + ngx-export-tools snap-core snap-server template-haskell text time + ]; + description = "More extra tools for Nginx haskell module"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "niagra" = callPackage ({ mkDerivation, base, ghc-prim, HUnit, mtl, primitive, QuickCheck , text, transformers @@ -164493,8 +165081,8 @@ self: { }: mkDerivation { pname = "nvim-hs"; - version = "2.0.0.0"; - sha256 = "0wnvvzd1ry8a3863dyj6ylsh075px7ppd1wrv3cbf9694dc5zfih"; + version = "2.1.0.0"; + sha256 = "02i6nvdk99vjy98r666sb3ik79zq8ssri0nhnfn9r60nfcpsrini"; libraryHaskellDepends = [ base bytestring cereal cereal-conduit conduit containers data-default deepseq foreign-store hslogger megaparsec messagepack @@ -165147,24 +165735,24 @@ self: { "odpic-raw" = callPackage ({ mkDerivation, base, binary, bytestring, c2hs, conduit, hspec - , odpic, resourcet, scientific, time + , resourcet, scientific, time }: mkDerivation { pname = "odpic-raw"; - version = "0.4.0"; - sha256 = "0kdsmjksy2dcsc1dgwx8r8fcv1czap06fy8n3wlg29759md1bchm"; + version = "0.5.0"; + sha256 = "1cgg4yvcdysh1l1h8nv9jcn26hfcyx5hxqaqpvfd292c0spylary"; libraryHaskellDepends = [ base binary bytestring conduit resourcet scientific time ]; - librarySystemDepends = [ odpic ]; libraryToolDepends = [ c2hs ]; testHaskellDepends = [ base binary bytestring conduit hspec resourcet scientific time ]; + testToolDepends = [ c2hs ]; description = "Oracle Database Bindings"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; - }) {inherit (pkgs) odpic;}; + }) {}; "oeis" = callPackage ({ mkDerivation, base, HTTP, HUnit, network, network-uri @@ -167149,6 +167737,25 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "optparse-simple_0_1_1_2" = callPackage + ({ mkDerivation, base, bytestring, directory, githash + , optparse-applicative, template-haskell, transformers + }: + mkDerivation { + pname = "optparse-simple"; + version = "0.1.1.2"; + sha256 = "1r00hkri42vyx552l8hcd1779fxiyl9w4k0pql915zsprirn8w82"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + base githash optparse-applicative template-haskell transformers + ]; + testHaskellDepends = [ base bytestring directory ]; + description = "Simple interface to optparse-applicative"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "optparse-text" = callPackage ({ mkDerivation, base, hspec, optparse-applicative, text }: mkDerivation { @@ -168459,8 +169066,8 @@ self: { pname = "pandoc"; version = "2.7.2"; sha256 = "1qjla7zk8whx17qapmv3zji6b98qdpd464gwhi4zv8g4hfzv7010"; - revision = "1"; - editedCabalFile = "0xxnb1arycrlxjqnnka4gsz7nff70ahvr6zbrladhigian4mpk9z"; + revision = "3"; + editedCabalFile = "17m7pd1d1q7blavh5vv9m9ll2v9z4pj48k7cn3x6k884c9haicwc"; configureFlags = [ "-fhttps" "-f-trypandoc" ]; isLibrary = true; isExecutable = true; @@ -168530,7 +169137,7 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "pandoc-citeproc_0_16_1_3" = callPackage + "pandoc-citeproc_0_16_2" = callPackage ({ mkDerivation, aeson, aeson-pretty, attoparsec, base, bytestring , Cabal, containers, data-default, directory, filepath, hs-bibutils , libyaml, mtl, network, old-locale, pandoc, pandoc-types, parsec @@ -168539,8 +169146,8 @@ self: { }: mkDerivation { pname = "pandoc-citeproc"; - version = "0.16.1.3"; - sha256 = "13pd7rfpzpc7a4dn2sasc30icrihv5kgmngyx70s4v42scgsfndg"; + version = "0.16.2"; + sha256 = "15mm17awgi1b5yazwhr5nh8b59qml1qk6pz6gpyijks70fq2arsv"; isLibrary = true; isExecutable = true; enableSeparateDataOutput = true; @@ -168837,16 +169444,17 @@ self: { license = stdenv.lib.licenses.mit; }) {}; - "pandoc-pyplot_2_1_0_1" = callPackage - ({ mkDerivation, base, containers, data-default-class, directory - , filepath, hashable, hspec, hspec-expectations, pandoc - , pandoc-types, tasty, tasty-hspec, tasty-hunit, temporary, text - , typed-process, yaml + "pandoc-pyplot_2_1_1_0" = callPackage + ({ mkDerivation, base, containers, data-default-class, deepseq + , directory, filepath, hashable, hspec, hspec-expectations + , open-browser, pandoc, pandoc-types, tasty, tasty-hspec + , tasty-hunit, template-haskell, temporary, text, typed-process + , yaml }: mkDerivation { pname = "pandoc-pyplot"; - version = "2.1.0.1"; - sha256 = "0hhsy90chq3ap54816qhpplxg4c8iwdvx8xrcrn2n0p3yi2ma0yi"; + version = "2.1.1.0"; + sha256 = "0s66m591v6x91qqdkyxl40zwlv6nan86zfq5z4cx73yz9xf3gjsx"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -168854,13 +169462,14 @@ self: { pandoc pandoc-types temporary text typed-process yaml ]; executableHaskellDepends = [ - base data-default-class directory pandoc-types + base data-default-class deepseq directory filepath open-browser + pandoc pandoc-types template-haskell temporary text ]; testHaskellDepends = [ base data-default-class directory filepath hspec hspec-expectations pandoc-types tasty tasty-hspec tasty-hunit temporary text ]; - description = "A Pandoc filter for including figures generated from Matplotlib"; + description = "A Pandoc filter to include figures generated from Python code blocks"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; }) {}; @@ -170321,8 +170930,8 @@ self: { }: mkDerivation { pname = "parsix"; - version = "0.2.0.0"; - sha256 = "07azgir8gkjbr2if8cvcmlqf3v9bi27w4xh922j0r9q1c3ry7k5i"; + version = "0.2.1.0"; + sha256 = "1282mzlriyl4gi0l2ds4a3prjh6q0vl5cv14ms03999hmygpnr3l"; libraryHaskellDepends = [ base containers fingertree mtl parsers prettyprinter prettyprinter-ansi-terminal text transformers @@ -172269,8 +172878,8 @@ self: { }: mkDerivation { pname = "persist"; - version = "0.1.1.2"; - sha256 = "08l59z7jc1ij7y497yjvv0q9bcd100l3bkdj4zwjl3dx6fhz2gq2"; + version = "0.1.1.3"; + sha256 = "0lcjk2q9x0qclc3znwv9xrqqwbczw2ryvamfqa6hvabr618lmi4p"; libraryHaskellDepends = [ base bytestring containers text ]; testHaskellDepends = [ base bytestring QuickCheck test-framework @@ -172402,6 +173011,35 @@ self: { maintainers = with stdenv.lib.maintainers; [ psibi ]; }) {}; + "persistent_2_10_0" = callPackage + ({ mkDerivation, aeson, attoparsec, base, base64-bytestring + , blaze-html, bytestring, conduit, containers, fast-logger, hspec + , http-api-data, monad-logger, mtl, path-pieces, resource-pool + , resourcet, scientific, silently, template-haskell, text, time + , transformers, unliftio-core, unordered-containers, vector + }: + mkDerivation { + pname = "persistent"; + version = "2.10.0"; + sha256 = "1ja34gdwf72rxnz3v5d9wjri11285fpzxn8sh9ws7ldrx3kfqy1g"; + libraryHaskellDepends = [ + aeson attoparsec base base64-bytestring blaze-html bytestring + conduit containers fast-logger http-api-data monad-logger mtl + path-pieces resource-pool resourcet scientific silently + template-haskell text time transformers unliftio-core + unordered-containers vector + ]; + testHaskellDepends = [ + aeson attoparsec base base64-bytestring blaze-html bytestring + containers hspec http-api-data path-pieces scientific text time + transformers unordered-containers vector + ]; + description = "Type-safe, multi-backend data serialization"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + maintainers = with stdenv.lib.maintainers; [ psibi ]; + }) {}; + "persistent-audit" = callPackage ({ mkDerivation, aeson, attoparsec, base, bytestring , getopt-generics, hashable, hspec, mongoDB, persistent @@ -172599,6 +173237,8 @@ self: { pname = "persistent-mysql"; version = "2.9.0"; sha256 = "0aa1ia4r49vy5hfg59rbrfmfwdyaix0l32drdjnj9xxqbayifjzf"; + revision = "1"; + editedCabalFile = "0xvis08x4ajayp73f6j0czpksn309f3anv5kklxa9r6j8j5qkhvz"; libraryHaskellDepends = [ aeson base blaze-builder bytestring conduit containers monad-logger mysql mysql-simple persistent resource-pool resourcet text @@ -172608,6 +173248,33 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "persistent-mysql_2_10_0" = callPackage + ({ mkDerivation, aeson, base, blaze-builder, bytestring, conduit + , containers, fast-logger, hspec, HUnit, monad-logger, mysql + , mysql-simple, persistent, persistent-qq, persistent-template + , persistent-test, QuickCheck, quickcheck-instances, resource-pool + , resourcet, text, time, transformers, unliftio-core + }: + mkDerivation { + pname = "persistent-mysql"; + version = "2.10.0"; + sha256 = "13y65l0vaiczxndah2djh28j4jhslymb53gnfz3av24kg5vb2y4n"; + libraryHaskellDepends = [ + aeson base blaze-builder bytestring conduit containers monad-logger + mysql mysql-simple persistent resource-pool resourcet text + transformers unliftio-core + ]; + testHaskellDepends = [ + base bytestring containers fast-logger hspec HUnit monad-logger + mysql persistent persistent-qq persistent-template persistent-test + QuickCheck quickcheck-instances resourcet text time transformers + unliftio-core + ]; + description = "Backend for the persistent library using MySQL database server"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "persistent-mysql-haskell" = callPackage ({ mkDerivation, aeson, base, bytestring, conduit, containers , io-streams, monad-logger, mysql-haskell, network, persistent @@ -172687,6 +173354,36 @@ self: { maintainers = with stdenv.lib.maintainers; [ psibi ]; }) {}; + "persistent-postgresql_2_10_0" = callPackage + ({ mkDerivation, aeson, base, blaze-builder, bytestring, conduit + , containers, fast-logger, hspec, hspec-expectations, HUnit + , monad-logger, persistent, persistent-qq, persistent-template + , persistent-test, postgresql-libpq, postgresql-simple, QuickCheck + , quickcheck-instances, resource-pool, resourcet, text, time + , transformers, unliftio-core, unordered-containers, vector + }: + mkDerivation { + pname = "persistent-postgresql"; + version = "2.10.0"; + sha256 = "00kc14zf6ggblyps68qvg7d0s4wbsz0iv96sdvjv5rsqwblrav18"; + libraryHaskellDepends = [ + aeson base blaze-builder bytestring conduit containers monad-logger + persistent postgresql-libpq postgresql-simple resource-pool + resourcet text time transformers unliftio-core + ]; + testHaskellDepends = [ + aeson base bytestring containers fast-logger hspec + hspec-expectations HUnit monad-logger persistent persistent-qq + persistent-template persistent-test QuickCheck quickcheck-instances + resourcet text time transformers unliftio-core unordered-containers + vector + ]; + description = "Backend for the persistent library using postgresql"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + maintainers = with stdenv.lib.maintainers; [ psibi ]; + }) {}; + "persistent-protobuf" = callPackage ({ mkDerivation, base, bytestring, persistent, protocol-buffers , protocol-buffers-descriptor, template-haskell, text @@ -172876,6 +173573,41 @@ self: { maintainers = with stdenv.lib.maintainers; [ psibi ]; }) {inherit (pkgs) sqlite;}; + "persistent-sqlite_2_10_0" = callPackage + ({ mkDerivation, aeson, base, bytestring, conduit, containers + , exceptions, fast-logger, hspec, HUnit, microlens-th, monad-logger + , persistent, persistent-template, persistent-test, QuickCheck + , resource-pool, resourcet, sqlite, system-fileio, system-filepath + , temporary, text, time, transformers, unliftio-core + , unordered-containers + }: + mkDerivation { + pname = "persistent-sqlite"; + version = "2.10.0"; + sha256 = "1h3ls1wg02q7336zqfrpggx64f1wm3x701dvkwvci6yn4hqvkpn2"; + revision = "1"; + editedCabalFile = "1kxqz47h2gxinck114ip75brbm0wsimff5fdzldv72mqv7id66nl"; + configureFlags = [ "-fsystemlib" ]; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + aeson base bytestring conduit containers microlens-th monad-logger + persistent resource-pool resourcet text time transformers + unliftio-core unordered-containers + ]; + librarySystemDepends = [ sqlite ]; + testHaskellDepends = [ + base bytestring containers exceptions fast-logger hspec HUnit + monad-logger persistent persistent-template persistent-test + QuickCheck resourcet system-fileio system-filepath temporary text + time transformers unliftio-core + ]; + description = "Backend for the persistent library using sqlite3"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + maintainers = with stdenv.lib.maintainers; [ psibi ]; + }) {inherit (pkgs) sqlite;}; + "persistent-template" = callPackage ({ mkDerivation, aeson, aeson-compat, base, bytestring, containers , ghc-prim, hspec, http-api-data, monad-control, monad-logger @@ -172901,23 +173633,27 @@ self: { maintainers = with stdenv.lib.maintainers; [ psibi ]; }) {}; - "persistent-template_2_6_0" = callPackage - ({ mkDerivation, aeson, aeson-compat, base, bytestring, containers - , ghc-prim, hspec, http-api-data, monad-control, monad-logger - , path-pieces, persistent, QuickCheck, tagged, template-haskell - , text, transformers, unordered-containers + "persistent-template_2_7_0" = callPackage + ({ mkDerivation, aeson, base, bytestring, containers, criterion + , deepseq, deepseq-generics, file-embed, hspec, http-api-data + , monad-control, monad-logger, path-pieces, persistent, QuickCheck + , template-haskell, text, transformers, unordered-containers }: mkDerivation { pname = "persistent-template"; - version = "2.6.0"; - sha256 = "0wr1z2nfrl6jv1lprxb0d2jw4izqfcbcwvkdrhryzg95gjz8ryjv"; + version = "2.7.0"; + sha256 = "0pz750b7ybg27nl9b7hiw25vg0dwjy8196c6kpj1xwfgcxkdizq5"; libraryHaskellDepends = [ - aeson aeson-compat base bytestring containers ghc-prim - http-api-data monad-control monad-logger path-pieces persistent - tagged template-haskell text transformers unordered-containers + aeson base bytestring containers http-api-data monad-control + monad-logger path-pieces persistent template-haskell text + transformers unordered-containers ]; testHaskellDepends = [ - aeson base bytestring hspec persistent QuickCheck text transformers + aeson base bytestring hspec persistent QuickCheck text + ]; + benchmarkHaskellDepends = [ + base criterion deepseq deepseq-generics file-embed persistent + template-haskell text ]; description = "Type-safe, non-relational, multi-backend persistence"; license = stdenv.lib.licenses.mit; @@ -174421,6 +175157,22 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "pipes-brotli" = callPackage + ({ mkDerivation, base, brotli, bytestring, pipes, pipes-bytestring + , QuickCheck + }: + mkDerivation { + pname = "pipes-brotli"; + version = "0.0.0.0"; + sha256 = "0qld1j404sddw850pdm5y65n8rld5vqzpr38kq9xcnlxmfs29zhp"; + libraryHaskellDepends = [ base brotli bytestring pipes ]; + testHaskellDepends = [ + base bytestring pipes pipes-bytestring QuickCheck + ]; + description = "Brotli (RFC7932) compressors and decompressors for the Pipes package"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "pipes-bytestring" = callPackage ({ mkDerivation, base, bytestring, pipes, pipes-group, pipes-parse , stringsearch, transformers @@ -174994,6 +175746,19 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "pipes-network-ws" = callPackage + ({ mkDerivation, base, bytestring, network-simple-ws, pipes }: + mkDerivation { + pname = "pipes-network-ws"; + version = "0.1"; + sha256 = "1jb59wl3xh0jkp4njj7xhybhnanwrx6h0zzj647lgxg6wpf8f704"; + libraryHaskellDepends = [ + base bytestring network-simple-ws pipes + ]; + description = "WebSockets support for pipes"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "pipes-ordered-zip" = callPackage ({ mkDerivation, base, foldl, pipes }: mkDerivation { @@ -175838,8 +176603,8 @@ self: { }: mkDerivation { pname = "playlists-http"; - version = "0.2.1.0"; - sha256 = "1kzc1awfqk979h2hmpqh2pjiy33v140pibbp703hqbq0fkrynj2k"; + version = "0.2.1.1"; + sha256 = "1smshj9ib0fp9kd7bsj15nq6vglzrdy8wzs3l6pi1rf6sjhjhb3l"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -176697,6 +177462,23 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "poly" = callPackage + ({ mkDerivation, base, QuickCheck, quickcheck-classes, semirings + , tasty, tasty-quickcheck, vector + }: + mkDerivation { + pname = "poly"; + version = "0.1.0.0"; + sha256 = "1aipcajm5vg7ircpds2sg7ryvhid77hc56hsk146i5hyblnb4wbw"; + libraryHaskellDepends = [ base semirings vector ]; + testHaskellDepends = [ + base QuickCheck quickcheck-classes semirings tasty tasty-quickcheck + vector + ]; + description = "Polynomials"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "poly-arity" = callPackage ({ mkDerivation, base, constraints }: mkDerivation { @@ -179354,8 +180136,8 @@ self: { }: mkDerivation { pname = "pretty-ghci"; - version = "0.1.0.0"; - sha256 = "0g3vssp09n77p05z7y36iddq05gymzlaar6k3k3si49il0cl56v7"; + version = "0.2.0.0"; + sha256 = "1ng4ypjz3yq2f536pd89bkwsdc2icfkw54ys5j5kzm75khgkhqg1"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -181483,8 +182265,8 @@ self: { }: mkDerivation { pname = "proto-lens-arbitrary"; - version = "0.1.2.6"; - sha256 = "1ij221zy2m7g9wp05ksk7labminvp6zynylfh4bc7z50qmhbwgr3"; + version = "0.1.2.7"; + sha256 = "092gdxw1jbhp0pxzgyg8jmcwiimyhzvhxh29h7c7vmvb6m956d0f"; libraryHaskellDepends = [ base bytestring containers lens-family proto-lens QuickCheck text ]; @@ -182773,8 +183555,8 @@ self: { }: mkDerivation { pname = "purescript"; - version = "0.12.4"; - sha256 = "1lkicclh9gm3lwgi2vl7qqa2vzf763rw06m79mr1j291z4h2ym76"; + version = "0.12.5"; + sha256 = "0dpn0v510lgzd9zqglqan4m8l7bf891psqmih147pnrmigmiaa39"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -186159,6 +186941,26 @@ self: { broken = true; }) {}; + "rank2classes_1_3" = callPackage + ({ mkDerivation, base, distributive, doctest, tasty, tasty-hunit + , template-haskell, transformers + }: + mkDerivation { + pname = "rank2classes"; + version = "1.3"; + sha256 = "1mwwismxafz43qjqh74gjd8d1hiflkilkxkwfvwhq0gx4h4i0rq1"; + libraryHaskellDepends = [ + base distributive template-haskell transformers + ]; + testHaskellDepends = [ + base distributive doctest tasty tasty-hunit + ]; + description = "standard type constructor class hierarchy, only with methods of rank 2 types"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; + }) {}; + "rapid" = callPackage ({ mkDerivation, async, base, containers, foreign-store, stm }: mkDerivation { @@ -186558,6 +187360,28 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "rattle" = callPackage + ({ mkDerivation, base, bytestring, cryptohash-sha256, deepseq + , directory, extra, filepath, filepattern, hashable, shake, time + , transformers, unordered-containers + }: + mkDerivation { + pname = "rattle"; + version = "0.1"; + sha256 = "10ra58lqhi9pn92rgyv6lkz7036kbq9gr6ly5w1lqdayla10fqhr"; + revision = "1"; + editedCabalFile = "1ppli9l28b4pg6h57kx7vvy0wqacn4vx86bvrgjcwwlvlir49scw"; + libraryHaskellDepends = [ + base bytestring cryptohash-sha256 deepseq directory extra filepath + hashable shake time transformers unordered-containers + ]; + testHaskellDepends = [ base directory extra filepattern shake ]; + description = "Forward build system, with caching and speculation"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; + }) {}; + "rattletrap" = callPackage ({ mkDerivation, aeson, aeson-pretty, base, binary, binary-bits , bytestring, clock, containers, filepath, http-client @@ -186591,7 +187415,7 @@ self: { broken = true; }) {}; - "rattletrap_6_2_3" = callPackage + "rattletrap_6_3_0" = callPackage ({ mkDerivation, aeson, aeson-pretty, base, binary, binary-bits , bytestring, clock, containers, filepath, http-client , http-client-tls, HUnit, template-haskell, temporary, text @@ -186599,8 +187423,8 @@ self: { }: mkDerivation { pname = "rattletrap"; - version = "6.2.3"; - sha256 = "0h542a6i1rc1zh2xy4fc9cdaq424hka77mxndg2ka8a0c0mj0jfp"; + version = "6.3.0"; + sha256 = "0b20ih5b1g74zpdyhlpi9j98zjimad1b6lwmxqqdcviw2wwih28p"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -186890,8 +187714,10 @@ self: { }: mkDerivation { pname = "rdf"; - version = "0.1.0.2"; - sha256 = "0vqznprx5r7lqyj8b850pfyy7mvin55l1v4krmi1wyacynv977c8"; + version = "0.1.0.3"; + sha256 = "0bypvzr4xj3nvq839slhjcl6lzs4zp34yg6q3hdkwa5vgall6x2s"; + revision = "1"; + editedCabalFile = "0x5zdjbyrpap5qs40yl0m96fcgy11f6s5r3v0n8n5904cxa5sqy3"; libraryHaskellDepends = [ attoparsec base bytestring deepseq dlist fgl text transformers ]; @@ -189704,8 +190530,8 @@ self: { }: mkDerivation { pname = "registry"; - version = "0.1.3.4"; - sha256 = "1l26b1isxqfax7c91l23fqx2kyl5cw4j2b6i0jiiz8lcn71qy0ha"; + version = "0.1.3.5"; + sha256 = "1nyk32bimkhsbz2597hdy089c7w5025wj9yfj1i3gd0145liaf2h"; libraryHaskellDepends = [ base containers exceptions hashable mtl protolude resourcet semigroupoids semigroups template-haskell text transformers-base @@ -191005,6 +191831,8 @@ self: { pname = "req"; version = "2.0.1"; sha256 = "1mfm6yy23l64kqbxvp1yn3yqf7fl46as87rz4yazg7f5x13bas3r"; + revision = "1"; + editedCabalFile = "1ghz63gcgkfd7hqx3ff97fg6m3cw1ariqk06ck2x75cn4y42myvn"; enableSeparateDataOutput = true; libraryHaskellDepends = [ aeson authenticate-oauth base blaze-builder bytestring @@ -194864,6 +195692,32 @@ self: { broken = true; }) {}; + "safe-json" = callPackage + ({ mkDerivation, aeson, base, bytestring, containers, dlist + , generic-arbitrary, hashable, quickcheck-instances, scientific + , tasty, tasty-hunit, tasty-quickcheck, temporary, text, time + , unordered-containers, uuid, uuid-types, vector + }: + mkDerivation { + pname = "safe-json"; + version = "0.1.0"; + sha256 = "17h5z20fcqp6gsmml1zqhckxgvc7jrx4mzdcqbsjlmpy52hb0lxq"; + libraryHaskellDepends = [ + aeson base bytestring containers dlist hashable scientific tasty + tasty-hunit tasty-quickcheck text time unordered-containers + uuid-types vector + ]; + testHaskellDepends = [ + aeson base bytestring containers dlist generic-arbitrary hashable + quickcheck-instances scientific tasty tasty-hunit tasty-quickcheck + temporary text time unordered-containers uuid uuid-types vector + ]; + description = "Automatic JSON format versioning"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; + }) {}; + "safe-lazy-io" = callPackage ({ mkDerivation, base, extensible-exceptions, parallel, strict-io }: @@ -195327,22 +196181,23 @@ self: { broken = true; }) {}; - "salak_0_2_9" = callPackage - ({ mkDerivation, attoparsec, base, containers, data-default - , directory, filepath, hspec, menshen, mtl, pqueue, QuickCheck - , scientific, text, time + "salak_0_2_9_3" = callPackage + ({ mkDerivation, attoparsec, base, bytestring, containers + , data-default, directory, filepath, hspec, menshen, mtl, pqueue + , QuickCheck, scientific, text, time, unliftio-core }: mkDerivation { pname = "salak"; - version = "0.2.9"; - sha256 = "1zq8sr5m10bkglwiscadprs4rdj5irpkgpd4ya72r4f61waba5fd"; + version = "0.2.9.3"; + sha256 = "0y1p2cf8bpglqf20a16d2h5xfknzz6wcdgwv6mamh24mdqv0c3rn"; libraryHaskellDepends = [ - attoparsec base containers data-default directory filepath menshen - mtl pqueue scientific text time + attoparsec base bytestring containers data-default directory + filepath menshen mtl pqueue scientific text time unliftio-core ]; testHaskellDepends = [ - attoparsec base containers data-default directory filepath hspec - menshen mtl pqueue QuickCheck scientific text time + attoparsec base bytestring containers data-default directory + filepath hspec menshen mtl pqueue QuickCheck scientific text time + unliftio-core ]; description = "Configuration Loader"; license = stdenv.lib.licenses.bsd3; @@ -195356,8 +196211,8 @@ self: { }: mkDerivation { pname = "salak-toml"; - version = "0.2.9"; - sha256 = "1v5lc98dva6y2d6pqbwipnan2hyrhisx6c57r1rbw0lsalh7vpqx"; + version = "0.2.9.3"; + sha256 = "1hb5ddm7a9acwri730w50p14vyk6z8q1wnx2b87386d80am5mbpy"; libraryHaskellDepends = [ base mtl salak text time tomland unordered-containers ]; @@ -195377,9 +196232,9 @@ self: { }: mkDerivation { pname = "salak-yaml"; - version = "0.2.9"; - sha256 = "162gz0rs73ls1r3y9dfg3pz47nnc7mk5hmvxms814jspac27c1h5"; - libraryHaskellDepends = [ base conduit libyaml mtl salak text ]; + version = "0.2.9.3"; + sha256 = "0jjmw923zvm349q318iw7y5lfqhbr85xgp6ai3xx5w5d4mcb2f32"; + libraryHaskellDepends = [ base conduit libyaml salak text ]; testHaskellDepends = [ base conduit hspec libyaml mtl QuickCheck salak text ]; @@ -199135,8 +199990,8 @@ self: { pname = "serialize-instances"; version = "0.1.0.0"; sha256 = "1m88jd5w68vpk7z2x2fffd5ljrzr93y20246dkkzn1md9ky0fclw"; - revision = "2"; - editedCabalFile = "1jbp16c0zg0g85m4cmn0wd5zm6z13ks93wm3q7qhxcaa1qrm8mgr"; + revision = "3"; + editedCabalFile = "1apx6j68l0gyicf8bxh010r1xy6sp2nbw3zj79lfqbw7fm3swv52"; libraryHaskellDepends = [ base cereal hashable semigroups unordered-containers ]; @@ -199279,7 +200134,7 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "servant_0_16" = callPackage + "servant_0_16_0_1" = callPackage ({ mkDerivation, aeson, attoparsec, base, base-compat, bifunctors , bytestring, Cabal, cabal-doctest, case-insensitive, deepseq , doctest, hspec, hspec-discover, http-api-data, http-media @@ -199289,8 +200144,8 @@ self: { }: mkDerivation { pname = "servant"; - version = "0.16"; - sha256 = "0flpk4hd459lglxxyrbcvsk1401lcl5qrcr4ixz87jrs6vx97h37"; + version = "0.16.0.1"; + sha256 = "0ial3gvmsbaa26lgqlxk5sigpdqrr982cgkp2amlgniwg85sa2wp"; setupHaskellDepends = [ base Cabal cabal-doctest ]; libraryHaskellDepends = [ aeson attoparsec base base-compat bifunctors bytestring @@ -199299,8 +200154,9 @@ self: { text transformers vault ]; testHaskellDepends = [ - aeson base base-compat bytestring doctest hspec mtl QuickCheck - quickcheck-instances string-conversions text transformers + aeson base base-compat bytestring doctest hspec http-media mtl + QuickCheck quickcheck-instances string-conversions text + transformers ]; testToolDepends = [ hspec-discover ]; description = "A family of combinators for defining webservices APIs"; @@ -199408,6 +200264,8 @@ self: { pname = "servant-auth-client"; version = "0.4.0.0"; sha256 = "1kh4kq3cc9fn49vmh304zyzn7idb4k1j0803yp7a6qc733panf9g"; + revision = "1"; + editedCabalFile = "0cynalya2y5bfnhkc49vwf0ldxg4km6nklk77nlxjcrvwas21g7z"; libraryHaskellDepends = [ base bytestring containers servant servant-auth servant-client-core ]; @@ -199463,8 +200321,8 @@ self: { pname = "servant-auth-docs"; version = "0.2.10.0"; sha256 = "0j1ynnrb6plrhpb2vzs2p7a9jb41llp0j1jwgap7hjhkwhyc7wxd"; - revision = "2"; - editedCabalFile = "0309a6pc8jj24xwqmzj1yslgij9g212hnaqh2qkcvlm6k6riffil"; + revision = "3"; + editedCabalFile = "0in6rhgwn5idc2rsl4zbh6kkhxq471iczjd3i6ap60xg46ciymga"; setupHaskellDepends = [ base Cabal cabal-doctest ]; libraryHaskellDepends = [ base lens servant servant-auth servant-docs text @@ -199527,6 +200385,8 @@ self: { pname = "servant-auth-server"; version = "0.4.4.0"; sha256 = "13196aknmb125ri3szqx8z5hdkk8lglv4795ck5glpn953vgq51c"; + revision = "1"; + editedCabalFile = "1wxiakkcx7d0j6zasjd84y7k98j94sy5nkj0vngjpd2jzlv79bb0"; libraryHaskellDepends = [ aeson base base64-bytestring blaze-builder bytestring case-insensitive cookie data-default-class entropy http-types jose @@ -199551,8 +200411,8 @@ self: { pname = "servant-auth-swagger"; version = "0.2.10.0"; sha256 = "04ndbbhdmpgb8yshki6q2j46a5q8fzvlb4nn8x8gv0mqkriq79sh"; - revision = "1"; - editedCabalFile = "105rniz4cmmwr0ynyv75s4ap1fgfwxy2k5mvvj66gwpvzmj55cnx"; + revision = "2"; + editedCabalFile = "1vr0qss87gi6r9z876v9vnmfhr4m58n5x44fgzpmjkn7wlh1i6m7"; libraryHaskellDepends = [ base lens servant servant-auth servant-swagger swagger2 text ]; @@ -199751,8 +200611,8 @@ self: { pname = "servant-blaze"; version = "0.9"; sha256 = "1pfnpc6m7i8knndc1734fbzpfgmvdcpkd8cj0jyw139b70siz63r"; - revision = "1"; - editedCabalFile = "06lq9lyli0pnmpw9489vzindjs0s9f982v6y9zk1lwc043nzg3ax"; + revision = "2"; + editedCabalFile = "0icqk00h03d6slfha8ylb07jj69y4chnhczxk8zskvgc89f6jl97"; libraryHaskellDepends = [ base blaze-html http-media servant ]; testHaskellDepends = [ base blaze-html servant-server wai warp ]; description = "Blaze-html support for servant"; @@ -199924,6 +200784,8 @@ self: { pname = "servant-client"; version = "0.16"; sha256 = "0641fqlvqkm5075pcgcg5q81j7jil79sjpifg1snagfisrsxifxj"; + revision = "1"; + editedCabalFile = "0grjsgdmyr9mp7mnmf5qw6wkciigpzxsyzsj6l8fbb7mq5rsid78"; libraryHaskellDepends = [ base base-compat bytestring containers deepseq exceptions http-client http-media http-types kan-extensions monad-control mtl @@ -199973,6 +200835,8 @@ self: { pname = "servant-client-core"; version = "0.16"; sha256 = "0cvv9a7z6ahwjp433c4sxa9i1ifabbih63bx71r9gvqzl85pb3dz"; + revision = "1"; + editedCabalFile = "1hanl8sz14z11441ng8vkzpxrl6igk3xzp6fcm6wg59fsb30fh29"; libraryHaskellDepends = [ aeson base base-compat base64-bytestring bytestring containers deepseq exceptions free http-media http-types network-uri safe @@ -200100,6 +200964,8 @@ self: { pname = "servant-dhall"; version = "0.1.0.2"; sha256 = "09fvyhkqpypg73cxs7y2asvlch83i4sqzh2w0d5ix0zl5i7f6rz3"; + revision = "1"; + editedCabalFile = "19jdp0xj1nl21wzfnk2y3qrzi7cag1m3wk0zqvqayc2czq9h0k08"; libraryHaskellDepends = [ base base-compat bytestring dhall http-media megaparsec prettyprinter servant text @@ -200125,8 +200991,8 @@ self: { pname = "servant-docs"; version = "0.11.3"; sha256 = "0cys1h3m0aq77aw0szj7k6p7zqcr8074zrxzsjp58lss1daqisq7"; - revision = "1"; - editedCabalFile = "1f5vdd096yrb0fsnzy709xw3x1r5q1pymscqaaarz3h2sky385lv"; + revision = "2"; + editedCabalFile = "1zzv3mbfyvpqddhz8a7z8wfwy4w4y21rwpi7k15xzm9647sdgga5"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -200452,6 +201318,8 @@ self: { pname = "servant-http-streams"; version = "0.16"; sha256 = "1gkgk13zxi8y071i9dx0i1kbs14rgp8cfnfcd7rpg86pffxkx6cp"; + revision = "1"; + editedCabalFile = "0i3668fw4h503hig1vd9d7k0mxlsis81cs7a5fh2k5yja5sj81ik"; libraryHaskellDepends = [ base base-compat bytestring case-insensitive containers deepseq exceptions http-common http-media http-streams http-types @@ -200611,8 +201479,8 @@ self: { pname = "servant-lucid"; version = "0.9"; sha256 = "1xamwcijd03cynml5c2hr577qairybyrqd90ixyb1a94lql6agbf"; - revision = "1"; - editedCabalFile = "0fgik3s4vqyx5f8r777x82baj42qqgnxwi8gfp8iz3wfifvpc43k"; + revision = "2"; + editedCabalFile = "17p1xxzmr3ya0k4cy9n5mqf356gm35jdcm8mw1cxg2v80sd6nr4j"; libraryHaskellDepends = [ base http-media lucid servant text ]; testHaskellDepends = [ base lucid servant-server wai warp ]; description = "Servant support for lucid"; @@ -200718,6 +201586,8 @@ self: { pname = "servant-multipart"; version = "0.11.4"; sha256 = "0vcwrdzj1xyjg11yvfcds9rql3gcwgdcdq4z085g44fpabjxj50s"; + revision = "1"; + editedCabalFile = "0sf5vmzdcfzy01d65dd2f5l4k67znmjvp86d4xgkrmqsqmgxcgpg"; libraryHaskellDepends = [ base bytestring directory http-media lens resourcet servant servant-docs servant-foreign servant-server text transformers wai @@ -200995,8 +201865,8 @@ self: { }: mkDerivation { pname = "servant-quickcheck"; - version = "0.0.7.3"; - sha256 = "0d904xfw5q7qcwkp5n7v18drc1idssvfwic2ksfmqlxisnxmyp5r"; + version = "0.0.7.4"; + sha256 = "1z47fgzdwfqb0byr8wa0s9n3g8hcbf112nbgaifm0zmxx6w4jlcf"; libraryHaskellDepends = [ aeson base base-compat-batteries bytestring case-insensitive clock data-default-class hspec http-client http-media http-types mtl @@ -201215,6 +202085,8 @@ self: { pname = "servant-server"; version = "0.16"; sha256 = "18rv99hyb448mcv1cjvs0p6cqrkw9f3zpdh18nsd29fskcybsv3b"; + revision = "1"; + editedCabalFile = "1v0zr3mqzjhiqrgyqgbnixa9zjvgknis3rjwyi2a3ig5l36y6ifh"; isLibrary = true; isExecutable = true; setupHaskellDepends = [ base Cabal cabal-doctest ]; @@ -201497,8 +202369,8 @@ self: { pname = "servant-swagger"; version = "1.1.7"; sha256 = "0dnyh4g55x70cb6xwksm0rk23v5lawdws5bxgq27ja1walh106p3"; - revision = "1"; - editedCabalFile = "0maasfw086a2iy4dyfaap4f1ncq1cg3p2mw6ypqhfr3dipgj5d3v"; + revision = "2"; + editedCabalFile = "1crl8c71ns8mnp056ba1zph57cf1l4dajbgw07gpcw2cvni6x560"; setupHaskellDepends = [ base Cabal cabal-doctest ]; libraryHaskellDepends = [ aeson aeson-pretty base base-compat bytestring hspec http-media @@ -201541,8 +202413,8 @@ self: { pname = "servant-swagger-ui-core"; version = "0.3.2"; sha256 = "1a1wk90vm6mq8byxz4syr03l1rf6qj8zhda7lnp23pn5d270xkd2"; - revision = "3"; - editedCabalFile = "1di8fz3kcyp395yvjx3i48p68kx3qg83vbjc81c5jdp1i8w0kmww"; + revision = "4"; + editedCabalFile = "0vvfqf9zh8a5sgd4sn4mkay803lqc5zd9dz175gxs3wmca0gr3fk"; libraryHaskellDepends = [ base blaze-markup bytestring http-media servant servant-blaze servant-server swagger2 text transformers transformers-compat @@ -201687,8 +202559,8 @@ self: { pname = "servant-yaml"; version = "0.1.0.1"; sha256 = "00gnbdlcq6cvmhsga8h0csd35pnfib038rqlhm445l4wa0cp8m01"; - revision = "1"; - editedCabalFile = "05j3hqvqiq8wa45jsdx72xa5phbhvn2lxbkbhh1g0j13ky8x2waw"; + revision = "2"; + editedCabalFile = "0scpm5dshnb7izn1xx8q3xm1m5f52y1s7nzgp7sa7zcv3pp6n7lw"; libraryHaskellDepends = [ base bytestring http-media servant yaml ]; @@ -201832,6 +202704,35 @@ self: { broken = true; }) {}; + "serverless-haskell_0_8_7" = callPackage + ({ mkDerivation, aeson, aeson-casing, aeson-extra, amazonka-core + , amazonka-kinesis, amazonka-s3, base, bytestring, case-insensitive + , hspec, hspec-discover, http-types, iproute, lens, network + , network-simple, raw-strings-qq, text, time, unix + , unordered-containers + }: + mkDerivation { + pname = "serverless-haskell"; + version = "0.8.7"; + sha256 = "0q73j6n6552ajv5sm52rbcj4kk86wjmvrh6khci1nbln4wxgbwq2"; + libraryHaskellDepends = [ + aeson aeson-casing aeson-extra amazonka-core amazonka-kinesis + amazonka-s3 base bytestring case-insensitive http-types iproute + lens network network-simple text time unix unordered-containers + ]; + testHaskellDepends = [ + aeson aeson-casing aeson-extra amazonka-core amazonka-kinesis + amazonka-s3 base bytestring case-insensitive hspec hspec-discover + http-types iproute lens network network-simple raw-strings-qq text + time unix unordered-containers + ]; + testToolDepends = [ hspec-discover ]; + description = "Deploying Haskell code onto AWS Lambda using Serverless"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; + }) {}; + "serversession" = callPackage ({ mkDerivation, aeson, base, base64-bytestring, bytestring , containers, data-default, hashable, hspec, nonce, path-pieces @@ -203667,13 +204568,13 @@ self: { "shh" = callPackage ({ mkDerivation, async, base, containers, deepseq, directory - , filepath, hashable, mtl, process, split, tasty, tasty-hunit + , doctest, filepath, mtl, process, split, tasty, tasty-hunit , tasty-quickcheck, template-haskell, temporary, unix }: mkDerivation { pname = "shh"; - version = "0.3.1.3"; - sha256 = "0dsb4q83zsxx78xa4cx5vgkkyrbj50567vlvxk8g10pwah0lkr4c"; + version = "0.4.0.0"; + sha256 = "0ghkiz720g4p8gs5h3h43pkdsgcl7iffnqdis122qhvfliwqcmpr"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -203681,11 +204582,15 @@ self: { template-haskell unix ]; executableHaskellDepends = [ - async base directory hashable split temporary + async base deepseq directory temporary unix + ]; + testHaskellDepends = [ + async base directory doctest tasty tasty-hunit tasty-quickcheck ]; - testHaskellDepends = [ base tasty tasty-hunit tasty-quickcheck ]; description = "Simple shell scripting from Haskell"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "shh-extras" = callPackage @@ -203698,6 +204603,8 @@ self: { testHaskellDepends = [ base tasty ]; description = "Utility functions for using shh"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "shift" = callPackage @@ -204803,6 +205710,19 @@ self: { broken = true; }) {}; + "simple-ltl" = callPackage + ({ mkDerivation, base, criterion, deepseq, tasty, tasty-hunit }: + mkDerivation { + pname = "simple-ltl"; + version = "2.1.0"; + sha256 = "1hq9s9s9rslsq0ccdi92mjcxvvv3ficdfbfbbplgclzmlwbmwqzw"; + libraryHaskellDepends = [ base deepseq ]; + testHaskellDepends = [ base tasty tasty-hunit ]; + benchmarkHaskellDepends = [ base criterion ]; + description = "A simple LTL checker"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "simple-money" = callPackage ({ mkDerivation, base, containers }: mkDerivation { @@ -205164,6 +206084,19 @@ self: { broken = true; }) {}; + "simple-units" = callPackage + ({ mkDerivation, base, first-class-families }: + mkDerivation { + pname = "simple-units"; + version = "1.0.1.1"; + sha256 = "1dzsr15lq32dqsbhb639vzlx2d6m2kx0qax75ik2z765r5h9f9sa"; + libraryHaskellDepends = [ base first-class-families ]; + description = "Simple arithmetic with SI units using type-checked dimensional analysis"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; + }) {}; + "simple-vec3" = callPackage ({ mkDerivation, base, criterion, doctest, doctest-driver-gen , QuickCheck, tasty, tasty-quickcheck, vector @@ -205340,8 +206273,8 @@ self: { }: mkDerivation { pname = "simplest-sqlite"; - version = "0.1.0.0"; - sha256 = "0vjx01bls2z99hmynqhxm4j2cq17334wz3pz0gm5saxslkldw2sz"; + version = "0.1.0.1"; + sha256 = "06ccads286air3m6xys60aap5dckjimp6rvchk3v6927z9vgrn0v"; libraryHaskellDepends = [ base bytestring exception-hierarchy template-haskell text ]; @@ -208101,8 +209034,8 @@ self: { }: mkDerivation { pname = "snaplet-postgresql-simple"; - version = "1.1.0.0"; - sha256 = "0k82g3540jx7bddg0x6764c8xr955y8v5rc69kagi01nvhh7n2z5"; + version = "1.2.0.0"; + sha256 = "0an9b72vfnb562k49bz5wh72s637r3vrbm4x9brwf483rrmlmvrf"; isLibrary = true; isExecutable = true; enableSeparateDataOutput = true; @@ -209072,6 +210005,20 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "socks_0_6_0" = callPackage + ({ mkDerivation, base, basement, bytestring, cereal, network }: + mkDerivation { + pname = "socks"; + version = "0.6.0"; + sha256 = "10bkf2gw5l48j6g1i2slndcg4nzdqj8syrnbj21gjz6sms3zlqlp"; + libraryHaskellDepends = [ + base basement bytestring cereal network + ]; + description = "Socks proxy (ver 5)"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "sodium" = callPackage ({ mkDerivation, base, containers, mtl }: mkDerivation { @@ -211516,10 +212463,10 @@ self: { }: mkDerivation { pname = "stack"; - version = "1.9.3"; - sha256 = "01lbr9gp3djr5bzlchzb2rdw20855aganmczvq76fzzjyway64cf"; - revision = "7"; - editedCabalFile = "0gc09yfhrphzn6r2g1ifx6l5k3g78q38myg83f2djjmy9vp047bl"; + version = "1.9.3.1"; + sha256 = "0lxx2gwwh4kjhy9d67ykdnhm5z9zsflv515jgsf97nkf6b8db8lj"; + revision = "2"; + editedCabalFile = "1fypvcvjlhyxnr81gll1w0l4nw6zvsr1vhb1y5g1jnyzy8f278zj"; configureFlags = [ "-fdisable-git-info" "-fhide-dependency-versions" "-fsupported-build" @@ -212944,8 +213891,8 @@ self: { }: mkDerivation { pname = "staversion"; - version = "0.2.3.0"; - sha256 = "012j2gcmcyjqsmfcpll2y61j7n191y8wipdki49p7i0d2n4ak88v"; + version = "0.2.3.1"; + sha256 = "0y3x0bylpiad1l87gzdwbgbaizqas6r9l83cngg3anqsg1gpd7a6"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -213344,16 +214291,14 @@ self: { }: mkDerivation { pname = "stm-containers"; - version = "1.1.0.2"; - sha256 = "1yhivblfxycr2vk09gwg904n6fqkzn5g5rvg3whm40fnabdfa9av"; - revision = "1"; - editedCabalFile = "14dy3rxa009bgx534583g11i8986pjcgygzh8l15fk3rv9q1iwb8"; + version = "1.1.0.4"; + sha256 = "0mcn4v9gjkqp27xcwvqphiqnaj4grvxpsflhq0rwqp5ymnzlccyl"; libraryHaskellDepends = [ base deferred-folds focus hashable list-t stm-hamt transformers ]; testHaskellDepends = [ - deferred-folds focus foldl free HTF QuickCheck quickcheck-text - rerebase + deferred-folds focus foldl free HTF list-t QuickCheck + quickcheck-text rerebase ]; description = "Containers for STM"; license = stdenv.lib.licenses.mit; @@ -213869,6 +214814,60 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "store_0_5_1_0" = callPackage + ({ mkDerivation, array, async, base, base-orphans + , base64-bytestring, bifunctors, bytestring, cereal, cereal-vector + , clock, containers, contravariant, criterion, cryptohash, deepseq + , directory, filepath, free, ghc-prim, hashable, hspec + , hspec-smallcheck, integer-gmp, lifted-base, monad-control + , mono-traversable, network, primitive, resourcet, safe, semigroups + , smallcheck, store-core, syb, template-haskell, text, th-lift + , th-lift-instances, th-orphans, th-reify-many, th-utilities, time + , transformers, unordered-containers, vector + , vector-binary-instances, void, weigh + }: + mkDerivation { + pname = "store"; + version = "0.5.1.0"; + sha256 = "0r15b04vxfca45a0rv1n4lcd6zpxhlhc9gmg9if17r1bm63x59hr"; + revision = "1"; + editedCabalFile = "0nfy8lrvj9kzhmbx8nkg8vlvlha8hkr4k23vs9xasvrw2wp5rfhj"; + libraryHaskellDepends = [ + array async base base-orphans base64-bytestring bifunctors + bytestring containers contravariant cryptohash deepseq directory + filepath free ghc-prim hashable hspec hspec-smallcheck integer-gmp + lifted-base monad-control mono-traversable network primitive + resourcet safe semigroups smallcheck store-core syb + template-haskell text th-lift th-lift-instances th-orphans + th-reify-many th-utilities time transformers unordered-containers + vector void + ]; + testHaskellDepends = [ + array async base base-orphans base64-bytestring bifunctors + bytestring clock containers contravariant cryptohash deepseq + directory filepath free ghc-prim hashable hspec hspec-smallcheck + integer-gmp lifted-base monad-control mono-traversable network + primitive resourcet safe semigroups smallcheck store-core syb + template-haskell text th-lift th-lift-instances th-orphans + th-reify-many th-utilities time transformers unordered-containers + vector void + ]; + benchmarkHaskellDepends = [ + array async base base-orphans base64-bytestring bifunctors + bytestring cereal cereal-vector containers contravariant criterion + cryptohash deepseq directory filepath free ghc-prim hashable hspec + hspec-smallcheck integer-gmp lifted-base monad-control + mono-traversable network primitive resourcet safe semigroups + smallcheck store-core syb template-haskell text th-lift + th-lift-instances th-orphans th-reify-many th-utilities time + transformers unordered-containers vector vector-binary-instances + void weigh + ]; + description = "Fast binary serialization"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "store-core" = callPackage ({ mkDerivation, base, bytestring, ghc-prim, primitive, text , transformers @@ -214303,6 +215302,26 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "streaming-brotli" = callPackage + ({ mkDerivation, base, brotli, bytestring, HUnit, QuickCheck + , streaming, streaming-bytestring, test-framework + , test-framework-hunit, test-framework-quickcheck2 + }: + mkDerivation { + pname = "streaming-brotli"; + version = "0.0.0.0"; + sha256 = "12bp033sjcjf3l16ihg2xa69yl7ai0886jriqpipsddfkcjnx7mr"; + libraryHaskellDepends = [ + base brotli bytestring streaming streaming-bytestring + ]; + testHaskellDepends = [ + base bytestring HUnit QuickCheck streaming streaming-bytestring + test-framework test-framework-hunit test-framework-quickcheck2 + ]; + description = "Streaming interface for Brotli (RFC7932) compression"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "streaming-bytestring" = callPackage ({ mkDerivation, base, bytestring, deepseq, exceptions, mmorph, mtl , resourcet, smallcheck, streaming, tasty, tasty-smallcheck @@ -214466,6 +215485,26 @@ self: { license = stdenv.lib.licenses.asl20; }) {}; + "streaming-lzma" = callPackage + ({ mkDerivation, base, bytestring, HUnit, lzma, QuickCheck + , streaming, streaming-bytestring, test-framework + , test-framework-hunit, test-framework-quickcheck2 + }: + mkDerivation { + pname = "streaming-lzma"; + version = "0.0.0.0"; + sha256 = "0nqy6400fzr7mrl70wshcdfzz531wxy5x1mqg8zixg128xc0cnfb"; + libraryHaskellDepends = [ + base bytestring lzma streaming streaming-bytestring + ]; + testHaskellDepends = [ + base bytestring HUnit QuickCheck streaming streaming-bytestring + test-framework test-framework-hunit test-framework-quickcheck2 + ]; + description = "Streaming interface for LZMA/XZ compression"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "streaming-osm" = callPackage ({ mkDerivation, attoparsec, base, bytestring, containers , criterion, streaming, streaming-bytestring, streaming-utils @@ -214747,17 +215786,17 @@ self: { , base64-bytestring, bifunctors, bytestring , bytestring-tree-builder, hashable, http-media, mtl, scientific , semigroups, strelka-core, text, text-builder, time, transformers - , unordered-containers, url-decoders + , unordered-containers, url-decoders, uuid }: mkDerivation { pname = "strelka"; - version = "2.0.2.2"; - sha256 = "14n4wk7xzqrl795flxvks7kzf9mm93b626r2x657xjsy7rwkw7y3"; + version = "2.0.5"; + sha256 = "04z2ibka7gzgkcwqjg6xi0cj42hmix1pm4r8kmfqbb68a39hqbp6"; libraryHaskellDepends = [ attoparsec attoparsec-data base base-prelude base64-bytestring bifunctors bytestring bytestring-tree-builder hashable http-media mtl scientific semigroups strelka-core text text-builder time - transformers unordered-containers url-decoders + transformers unordered-containers url-decoders uuid ]; description = "A simple, flexible and composable web-router"; license = stdenv.lib.licenses.mit; @@ -217123,6 +218162,8 @@ self: { pname = "swagger2"; version = "2.3.1.1"; sha256 = "19fslhjqcnk0da1c8sdflnnxjzbbzqb0nbknpgyd45q0psxr6xs7"; + revision = "1"; + editedCabalFile = "1g6jiadrvglrbf0857nzfbnjxmb3lwqamgs47j3qv9k6kfwilzyk"; setupHaskellDepends = [ base Cabal cabal-doctest ]; libraryHaskellDepends = [ aeson base base-compat-batteries bytestring containers cookie @@ -218746,8 +219787,8 @@ self: { }: mkDerivation { pname = "table-layout"; - version = "0.8.0.3"; - sha256 = "03q3icqgxiwbyl9bhqzhdwsdirr9r40k20k1j8z1barg2309r2aa"; + version = "0.8.0.4"; + sha256 = "160ns7fd3xivlfirir7lk0ghv1f63b6cyfvnk8p2cn3jjfdp9xb3"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -220126,8 +221167,8 @@ self: { pname = "tasty-hspec"; version = "1.1.5.1"; sha256 = "0i9kdzjpk750sa078jj3iyhp72k0177zk7vxl131r6dkyz09x27y"; - revision = "2"; - editedCabalFile = "1xrb7gyidbgbd1c94c1wa5dazsllp23xi4w7flsws09r267q8qpc"; + revision = "3"; + editedCabalFile = "1wgz3z5bnq5qml8d0i18gvz30dmmax3686lmqz3vf4hxd3vqfkpj"; libraryHaskellDepends = [ base hspec hspec-core QuickCheck tasty tasty-quickcheck tasty-smallcheck @@ -220840,21 +221881,6 @@ self: { broken = true; }) {}; - "telega" = callPackage - ({ mkDerivation, aeson, base, http-client, lens, tagged, text, time - , transformers, wreq - }: - mkDerivation { - pname = "telega"; - version = "0.2.0"; - sha256 = "1q2prviwbnwhi0xfwwblhncnpz2l0829i3zp2v573w9h91qc5yjn"; - libraryHaskellDepends = [ - aeson base http-client lens tagged text time transformers wreq - ]; - description = "Telegram Bot API binding"; - license = stdenv.lib.licenses.mit; - }) {}; - "telegram" = callPackage ({ mkDerivation, aeson, base, bytestring, data-default , http-conduit, url, utf8-string @@ -221423,6 +222449,29 @@ self: { broken = true; }) {}; + "tensor-safe" = callPackage + ({ mkDerivation, base, casing, cmdargs, containers, extra + , formatting, ghc-typelits-extra, hint, singletons, text, vector + , vector-sized + }: + mkDerivation { + pname = "tensor-safe"; + version = "0.1.0.0"; + sha256 = "077jy3k47aw182nsdi3352lq9h6zssc9dpm7vwv999ksysaymhpw"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + base casing cmdargs containers extra formatting ghc-typelits-extra + hint singletons text vector vector-sized + ]; + executableHaskellDepends = [ + base casing cmdargs containers extra formatting ghc-typelits-extra + hint singletons text vector vector-sized + ]; + description = "Create valid deep neural network architectures"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "tensorflow" = callPackage ({ mkDerivation, async, attoparsec, base, bytestring, c2hs , containers, data-default, exceptions, fgl, HUnit, lens-family @@ -221704,12 +222753,12 @@ self: { }) {}; "termbox-banana" = callPackage - ({ mkDerivation, base, reactive-banana, stm, termbox }: + ({ mkDerivation, base, reactive-banana, termbox }: mkDerivation { pname = "termbox-banana"; - version = "0.1.0"; - sha256 = "0qyr2zykplxdg2x7k4xcg0cnv7lxx60lr55k8fs29556zalkgcgz"; - libraryHaskellDepends = [ base reactive-banana stm termbox ]; + version = "0.1.1"; + sha256 = "0584n8fq3rdq4rw20sglqwm76w8qmg8akhrkvda8scrvmgi5xbck"; + libraryHaskellDepends = [ base reactive-banana termbox ]; description = "reactive-banana + termbox"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; @@ -224192,6 +225241,23 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "th-reify-many_0_1_9" = callPackage + ({ mkDerivation, base, containers, mtl, safe, template-haskell + , th-expand-syns + }: + mkDerivation { + pname = "th-reify-many"; + version = "0.1.9"; + sha256 = "0hxf56filzqnyrc8q7766vai80y6cgrrbrczx6n93caskl1dv2gq"; + libraryHaskellDepends = [ + base containers mtl safe template-haskell th-expand-syns + ]; + testHaskellDepends = [ base template-haskell ]; + description = "Recurseively reify template haskell datatype info"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "th-sccs" = callPackage ({ mkDerivation, base, containers, template-haskell }: mkDerivation { @@ -224338,8 +225404,8 @@ self: { }: mkDerivation { pname = "themoviedb"; - version = "1.1.5.0"; - sha256 = "05za904yimkf9vpkksyxw6j488xyd0wigjdkj25hf2xx4nw36j0v"; + version = "1.1.5.2"; + sha256 = "0pp603wvq03m56w0y12abjqbfv712aj3k6ki69jq60l9pxj4nni4"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -225124,21 +226190,42 @@ self: { }) {}; "tidal" = callPackage - ({ mkDerivation, base, bifunctors, colour, containers, hosc - , microspec, mwc-random, network, parsec, template-haskell, text - , transformers, vector + ({ mkDerivation, base, bifunctors, bytestring, clock, colour + , containers, hosc, microspec, mwc-random, network, parsec + , template-haskell, text, transformers, vector }: mkDerivation { pname = "tidal"; - version = "1.0.10"; - sha256 = "1pays7hjsv7rpc0ldmzhavxkyp3avcwz912zfm9y80fyhhyyf4jp"; + version = "1.0.11"; + sha256 = "1lpb5233s48hfb9qjwm18c7mv31i8fw0vxqqia8kxlqdhmfcz5ri"; + enableSeparateDataOutput = true; libraryHaskellDepends = [ - base bifunctors colour containers hosc mwc-random network parsec - template-haskell text transformers vector + base bifunctors bytestring clock colour containers hosc mwc-random + network parsec template-haskell text transformers vector + ]; + testHaskellDepends = [ base containers microspec parsec ]; + description = "Pattern language for improvised music"; + license = stdenv.lib.licenses.gpl3; + }) {}; + + "tidal_1_0_13" = callPackage + ({ mkDerivation, base, bifunctors, bytestring, clock, colour + , containers, hosc, microspec, mwc-random, network, parsec + , template-haskell, text, transformers, vector + }: + mkDerivation { + pname = "tidal"; + version = "1.0.13"; + sha256 = "0m28z3mlp6q51znzjgw1hsfy8g4npsxl8bydm8hm9dslqc7gdi7j"; + enableSeparateDataOutput = true; + libraryHaskellDepends = [ + base bifunctors bytestring clock colour containers hosc mwc-random + network parsec template-haskell text transformers vector ]; testHaskellDepends = [ base containers microspec parsec ]; description = "Pattern language for improvised music"; license = stdenv.lib.licenses.gpl3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "tidal-midi" = callPackage @@ -229721,8 +230808,8 @@ self: { }: mkDerivation { pname = "turtle"; - version = "1.5.13"; - sha256 = "1124yhw0l8924cwkmap1qn2z0hf4vn3r73h4pmi9icahg8zpc1hg"; + version = "1.5.14"; + sha256 = "10sxbmis82z5r2ksfkik5kryz5i0xwihz9drc1dzz4fb76kkb67z"; libraryHaskellDepends = [ ansi-wl-pprint async base bytestring clock containers directory exceptions foldl hostname managed optional-args @@ -232874,8 +233961,8 @@ self: { pname = "uniprot-kb"; version = "0.1.2.0"; sha256 = "0hh6fnnmr6i4mgli07hgaagswdipa0p3ckr3jzzfcw4y5x98036l"; - revision = "3"; - editedCabalFile = "1a532yhvgs7n096f6mjwm7811d2c6xbgr45gscg7d4ys042c0586"; + revision = "4"; + editedCabalFile = "1g4qds20lwsbn5hqrgbhb4yd5w5vx2gkw47mjvxr8z8nj20g2pii"; libraryHaskellDepends = [ attoparsec base text ]; testHaskellDepends = [ attoparsec base hspec neat-interpolation QuickCheck text @@ -233173,19 +234260,18 @@ self: { }) {}; "universe" = callPackage - ({ mkDerivation, universe-instances-base - , universe-instances-extended, universe-instances-trans - , universe-reverse-instances + ({ mkDerivation, universe-base, universe-dependent-sum + , universe-instances-extended, universe-reverse-instances }: mkDerivation { pname = "universe"; - version = "1.0"; - sha256 = "19zr9zcqc5sfp5qfn8slkk2732j1814m3j1jkbim739limwf900z"; + version = "1.1"; + sha256 = "0zghqcv6jyl9x3qfmbnqyfvr4pkf3m6lil0vg66m16xlrgz68hds"; libraryHaskellDepends = [ - universe-instances-base universe-instances-extended - universe-instances-trans universe-reverse-instances + universe-base universe-dependent-sum universe-instances-extended + universe-reverse-instances ]; - description = "Classes for types where we know all the values"; + description = "A class for finite and recursively enumerable types"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; broken = true; @@ -233202,6 +234288,39 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "universe-base_1_1" = callPackage + ({ mkDerivation, base, containers, QuickCheck, tagged, transformers + }: + mkDerivation { + pname = "universe-base"; + version = "1.1"; + sha256 = "1alr2gbmdp9lsarnhfl72zkcqrfwxwvmlq3nyb9ilmwinahlzf0n"; + libraryHaskellDepends = [ base containers tagged transformers ]; + testHaskellDepends = [ base containers QuickCheck ]; + description = "A class for finite and recursively enumerable types"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + + "universe-dependent-sum" = callPackage + ({ mkDerivation, base, dependent-sum, template-haskell + , th-abstraction, transformers, universe-base + }: + mkDerivation { + pname = "universe-dependent-sum"; + version = "1.1"; + sha256 = "1psnj7xk5ig7ghvxr6awz60117y6xdwxd8i4jbxivgfrp5ixp85f"; + libraryHaskellDepends = [ + base dependent-sum template-haskell th-abstraction transformers + universe-base + ]; + testHaskellDepends = [ + base dependent-sum template-haskell universe-base + ]; + description = "Universe instances for types from dependent-sum"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "universe-instances-base" = callPackage ({ mkDerivation, base, containers, universe-base }: mkDerivation { @@ -233215,20 +234334,26 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "universe-instances-base_1_1" = callPackage + ({ mkDerivation, base, universe-base }: + mkDerivation { + pname = "universe-instances-base"; + version = "1.1"; + sha256 = "17g4xf7zcxd9a2am0p401b0l87ynxwpm3c2lqc4vmw4sz071kccb"; + libraryHaskellDepends = [ base universe-base ]; + description = "Universe instances for types from the base package"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "universe-instances-extended" = callPackage - ({ mkDerivation, adjunctions, base, comonad - , universe-instances-base, void - }: + ({ mkDerivation, adjunctions, base, comonad, universe-base }: mkDerivation { pname = "universe-instances-extended"; - version = "1.0.0.1"; - sha256 = "15y9f0hbxqsksclxrssj4h08y0yb3nm9clqasjw6nsmi04kjfnv6"; - revision = "3"; - editedCabalFile = "1f7mzwn97kmnm1p1hscz5mzly700q2pw5awwdzzsxfkxv3law7xn"; - libraryHaskellDepends = [ - adjunctions base comonad universe-instances-base void - ]; - description = "Universe instances for types from select extra packages"; + version = "1.1"; + sha256 = "12ads0n5md27wznrv7ah668ip2pp3gryn8d6my74kyhsz6g2fn5q"; + libraryHaskellDepends = [ adjunctions base comonad universe-base ]; + description = "Universe instances for types from selected extra packages"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; broken = true; @@ -233251,6 +234376,18 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "universe-instances-trans_1_1" = callPackage + ({ mkDerivation, base, universe-base }: + mkDerivation { + pname = "universe-instances-trans"; + version = "1.1"; + sha256 = "0dp37rb61g5mqj4kfkgi6zxcjhrm9npz197sksqwg1skgjdgbbn6"; + libraryHaskellDepends = [ base universe-base ]; + description = "Universe instances for types from the transformers and mtl packages"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "universe-reverse-instances" = callPackage ({ mkDerivation, base, containers, universe-instances-base }: mkDerivation { @@ -233266,6 +234403,18 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "universe-reverse-instances_1_1" = callPackage + ({ mkDerivation, base, containers, universe-base }: + mkDerivation { + pname = "universe-reverse-instances"; + version = "1.1"; + sha256 = "0pdmv146ap0dh38mxhjf11jx3fbr9im7mc0zxb3bsnwpfrv1kfqd"; + libraryHaskellDepends = [ base containers universe-base ]; + description = "Instances of standard classes that are made possible by enumerations"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "universe-th" = callPackage ({ mkDerivation, base, checkers, composition, DebugTraceHelpers , HUnit, mtl, QuickCheck, template-haskell, test-framework @@ -236505,6 +237654,20 @@ self: { broken = true; }) {}; + "vector-endian" = callPackage + ({ mkDerivation, base, cpu, deepseq, vector, zenhack-prelude }: + mkDerivation { + pname = "vector-endian"; + version = "0.1.0.0"; + sha256 = "0qfs19l2d56w6jl8niiq8vsjldb8mabf56xfsj45ai7ipi92cx13"; + libraryHaskellDepends = [ + base cpu deepseq vector zenhack-prelude + ]; + doHaddock = false; + description = "Storable vectors with cpu-independent representation"; + license = stdenv.lib.licenses.mit; + }) {}; + "vector-extras" = callPackage ({ mkDerivation, base, containers, deferred-folds, foldl, hashable , unordered-containers, vector @@ -237014,10 +238177,8 @@ self: { }: mkDerivation { pname = "versions"; - version = "3.5.0"; - sha256 = "1g6db0ah78yk1m5wyxp0az7bzlbxsfkychqjcj423wzx90z7ww4w"; - revision = "1"; - editedCabalFile = "13gb4n3bdkbgf199q3px7ihaqycbx76cb8isrs3qn16n67mx5b2f"; + version = "3.5.1"; + sha256 = "1qbihyqw99wkdmslvxqkj6h8x0ih9w86h4s7k51maaicmgijm94w"; libraryHaskellDepends = [ base deepseq hashable megaparsec text ]; testHaskellDepends = [ base base-prelude checkers megaparsec microlens QuickCheck tasty @@ -237220,8 +238381,8 @@ self: { }: mkDerivation { pname = "vimeta"; - version = "0.2.5.0"; - sha256 = "03ykd8pz7wn9dcj78zgq15ip04g8b4b7945g6fj5a7bfz0y9asbf"; + version = "0.2.5.1"; + sha256 = "1v46b0215mcyhxma3ascg3paz683j8xqsf4czs8syx4amyls36qg"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -239567,8 +240728,8 @@ self: { }: mkDerivation { pname = "wai-secure-cookies"; - version = "0.1.0.3"; - sha256 = "01jqwl9z7p3vkh7jvlxzvqcq2bgkcfx559pnc87qgp7ldh018z7f"; + version = "0.1.0.4"; + sha256 = "0m77h2xnm3h3axchvmbylrhm4s7d31zxsv0bgqvmh9zhydr90d2v"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -240115,6 +241276,27 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "warp-tls-uid_0_2_0_6" = callPackage + ({ mkDerivation, base, bytestring, data-default, network + , streaming-commons, tls, unix, wai, warp, warp-tls, x509 + }: + mkDerivation { + pname = "warp-tls-uid"; + version = "0.2.0.6"; + sha256 = "09xvwvb6nc6ymp6x389dxbllisrj24srcdli6d19h05cwlqbay4w"; + libraryHaskellDepends = [ + base bytestring data-default network streaming-commons tls unix wai + warp warp-tls x509 + ]; + testHaskellDepends = [ + base bytestring data-default network streaming-commons tls unix wai + warp warp-tls x509 + ]; + description = "set group and user id before running server"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "warped" = callPackage ({ mkDerivation, aeson, base, blaze-builder, conduit, http-types , lifted-async, monad-control, preamble, uuid, wai, wai-conduit @@ -241850,8 +243032,8 @@ self: { }: mkDerivation { pname = "wikicfp-scraper"; - version = "0.1.0.10"; - sha256 = "1j6aizgsf387pm6ajr6zjj1l4nnaq8mryq4vr09jji91ix9zhnw7"; + version = "0.1.0.11"; + sha256 = "1f6zrgjhid1fps02hbd6lmaxpi635bdzcxbsfkfk8xd7wmj0x91b"; libraryHaskellDepends = [ attoparsec base bytestring scalpel-core text time ]; @@ -242063,7 +243245,7 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "winery_1_0_1" = callPackage + "winery_1_1_1" = callPackage ({ mkDerivation, aeson, base, binary, bytestring, cereal , containers, cpu, deepseq, directory, fast-builder, gauge , hashable, HUnit, megaparsec, mtl, prettyprinter @@ -242073,8 +243255,8 @@ self: { }: mkDerivation { pname = "winery"; - version = "1.0.1"; - sha256 = "03g397c7s13brm5jsdzrwg5vyanvj6yznhn95aax7a8dwvhphk2n"; + version = "1.1.1"; + sha256 = "0jyr5vwz55rjwqvvh2ys3aq426i6jhfrykz0mx4kidr9l9yd0yls"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -242096,7 +243278,7 @@ self: { aeson base binary bytestring cereal deepseq directory gauge serialise text ]; - description = "Sustainable serialisation library"; + description = "A compact, well-typed seralisation format for Haskell values"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; }) {}; @@ -242195,16 +243377,6 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "with" = callPackage - ({ mkDerivation }: - mkDerivation { - pname = "with"; - version = "0.1.0"; - sha256 = "0jgm6w1xisyww81ak9rrrqmhgaiwdgk5rgvzax72rknzg9rb6701"; - description = "Simple open product type"; - license = stdenv.lib.licenses.bsd3; - }) {}; - "with-index" = callPackage ({ mkDerivation, base }: mkDerivation { @@ -246406,6 +247578,41 @@ self: { broken = true; }) {}; + "yam_0_6_1" = callPackage + ({ mkDerivation, aeson, base, base16-bytestring, binary, bytestring + , data-default, exceptions, fast-logger, hspec, http-client + , http-types, lens, menshen, monad-logger, mtl, mwc-random + , QuickCheck, reflection, salak, scientific, servant-client + , servant-server, servant-swagger, servant-swagger-ui, swagger2 + , text, transformers, unliftio-core, unordered-containers, vault + , vector, wai, warp + }: + mkDerivation { + pname = "yam"; + version = "0.6.1"; + sha256 = "1llgyx9giibm1yzgk61c47jnr0ppgj5q4sq0ml9bz99j5c16id70"; + libraryHaskellDepends = [ + aeson base base16-bytestring binary bytestring data-default + exceptions fast-logger http-client http-types lens menshen + monad-logger mtl mwc-random reflection salak scientific + servant-client servant-server servant-swagger servant-swagger-ui + swagger2 text transformers unliftio-core unordered-containers vault + vector wai warp + ]; + testHaskellDepends = [ + aeson base base16-bytestring binary bytestring data-default + exceptions fast-logger hspec http-client http-types lens menshen + monad-logger mtl mwc-random QuickCheck reflection salak scientific + servant-client servant-server servant-swagger servant-swagger-ui + swagger2 text transformers unliftio-core unordered-containers vault + vector wai warp + ]; + description = "A wrapper of servant"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; + }) {}; + "yam-app" = callPackage ({ mkDerivation, aeson, base, conduit, containers, ctrie , data-default, directory, exceptions, fast-logger, monad-control @@ -246462,6 +247669,25 @@ self: { broken = true; }) {}; + "yam-datasource_0_6_1" = callPackage + ({ mkDerivation, base, conduit, data-default, monad-logger + , persistent, resource-pool, resourcet, salak, servant-server, text + , unliftio-core, yam + }: + mkDerivation { + pname = "yam-datasource"; + version = "0.6.1"; + sha256 = "1k373bhh7pyb6i021a0akvsjfkpw7h3vw33a2ag57f97yalfwha4"; + libraryHaskellDepends = [ + base conduit data-default monad-logger persistent resource-pool + resourcet salak servant-server text unliftio-core yam + ]; + description = "Yam DataSource Middleware"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; + }) {}; + "yam-job" = callPackage ({ mkDerivation, base, cron, yam-app }: mkDerivation { @@ -246489,6 +247715,24 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "yam-redis" = callPackage + ({ mkDerivation, base, bytestring, data-default, hedis, menshen + , monad-logger, mtl, salak, servant-server, text, yam + }: + mkDerivation { + pname = "yam-redis"; + version = "0.6.1"; + sha256 = "07qswsac1ygsfm97njry4ar1j9hb6ghkzmna7hw7f7a1y77x9m9p"; + libraryHaskellDepends = [ + base bytestring data-default hedis menshen monad-logger mtl salak + servant-server text yam + ]; + description = "Yam Redis Middleware"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; + }) {}; + "yam-servant" = callPackage ({ mkDerivation, aeson, base, http-types, lens, servant , servant-server, servant-swagger, servant-swagger-ui, swagger2 @@ -247479,6 +248723,8 @@ self: { pname = "yesod-auth"; version = "1.6.6"; sha256 = "0ibmv3ghxrrjjjqb9jg4wnwr7w4hl4lsvwic13ys8fihg40ln6ka"; + revision = "1"; + editedCabalFile = "14l8v1znq9y628vc6vj7dlgbryjkhf09kk2l2f5spr697lygh3qp"; libraryHaskellDepends = [ aeson authenticate base base16-bytestring base64-bytestring binary blaze-builder blaze-html blaze-markup bytestring conduit @@ -248690,6 +249936,30 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "yesod-paginator_1_1_0_2" = callPackage + ({ mkDerivation, base, blaze-markup, doctest, hspec, path-pieces + , persistent, QuickCheck, quickcheck-classes, safe, text + , transformers, uri-encode, yesod-core, yesod-test + }: + mkDerivation { + pname = "yesod-paginator"; + version = "1.1.0.2"; + sha256 = "0r0qprsr2nkhy2b44xixmys32hp3wwhp5x521jzpcrd1jc5x38s9"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + base blaze-markup path-pieces persistent safe text transformers + uri-encode yesod-core + ]; + testHaskellDepends = [ + base doctest hspec QuickCheck quickcheck-classes yesod-core + yesod-test + ]; + description = "A pagination approach for yesod"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "yesod-paypal-rest" = callPackage ({ mkDerivation, base, paypal-rest-client, time, yesod-core }: mkDerivation { @@ -248748,6 +250018,28 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "yesod-persistent_1_6_0_2" = callPackage + ({ mkDerivation, base, blaze-builder, conduit, hspec, persistent + , persistent-sqlite, persistent-template, resource-pool, resourcet + , text, transformers, wai-extra, yesod-core + }: + mkDerivation { + pname = "yesod-persistent"; + version = "1.6.0.2"; + sha256 = "17adw0aaj29ia7ii3jka301442860b5wvfrms079q973gzahz5fd"; + libraryHaskellDepends = [ + base blaze-builder conduit persistent persistent-template + resource-pool resourcet transformers yesod-core + ]; + testHaskellDepends = [ + base blaze-builder conduit hspec persistent persistent-sqlite text + wai-extra yesod-core + ]; + description = "Some helpers for using Persistent from Yesod"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "yesod-platform" = callPackage ({ mkDerivation, ansi-terminal, ansi-wl-pprint, asn1-encoding , asn1-parse, asn1-types, attoparsec-conduit, authenticate @@ -251132,6 +252424,33 @@ self: { license = stdenv.lib.licenses.bsd3; }) {inherit (pkgs) unzip; inherit (pkgs) which;}; + "zip-archive_0_4_1" = callPackage + ({ mkDerivation, array, base, binary, bytestring, containers + , digest, directory, filepath, HUnit, mtl, pretty, process + , temporary, text, time, unix, unzip, which, zlib + }: + mkDerivation { + pname = "zip-archive"; + version = "0.4.1"; + sha256 = "1cdix5mnxrbs7b2kivhdydhfzgxidd9dqlw71mdw5p21cabwkmf5"; + revision = "1"; + editedCabalFile = "1mv6jns7zf0fi7lrhzk007g12v6x7yf5ycbj67rbh83xfkf4nxsi"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + array base binary bytestring containers digest directory filepath + mtl pretty text time unix zlib + ]; + testHaskellDepends = [ + base bytestring directory filepath HUnit process temporary time + unix + ]; + testToolDepends = [ unzip which ]; + description = "Library for creating and modifying zip archives"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {inherit (pkgs) unzip; inherit (pkgs) which;}; + "zip-conduit" = callPackage ({ mkDerivation, base, bytestring, cereal, conduit, conduit-extra , criterion, digest, directory, filepath, hpc, HUnit, LibZip, mtl diff --git a/pkgs/development/interpreters/python/mk-python-derivation.nix b/pkgs/development/interpreters/python/mk-python-derivation.nix index b7477c9b7b7d..d986490310bc 100644 --- a/pkgs/development/interpreters/python/mk-python-derivation.nix +++ b/pkgs/development/interpreters/python/mk-python-derivation.nix @@ -33,6 +33,9 @@ # DEPRECATED: use propagatedBuildInputs , pythonPath ? [] +# Enabled to detect some (native)BuildInputs mistakes +, strictDeps ? true + # used to disable derivation, useful for specific python versions , disabled ? false @@ -87,8 +90,7 @@ let self = toPythonModule (python.stdenv.mkDerivation (builtins.removeAttrs attr # Propagate python and setuptools. We should stop propagating setuptools. propagatedBuildInputs = propagatedBuildInputs ++ [ python setuptools ]; - # Enabled to detect some (native)BuildInputs mistakes - strictDeps = true; + inherit strictDeps; LANG = "${if python.stdenv.isDarwin then "en_US" else "C"}.UTF-8"; diff --git a/pkgs/development/libraries/catch2/default.nix b/pkgs/development/libraries/catch2/default.nix index 666db6f88e22..c81e97b970e5 100644 --- a/pkgs/development/libraries/catch2/default.nix +++ b/pkgs/development/libraries/catch2/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { name = "catch2-${version}"; - version = "2.7.0"; + version = "2.7.2"; src = fetchFromGitHub { owner = "catchorg"; repo = "Catch2"; rev = "v${version}"; - sha256="05j01v4hmw0vv5vcj11pbngl200b3j2yvawk08fw9a249jzx6v1a"; + sha256="0h4yihf2avaw9awcigdqqlnfk5ak7scfv5lm0j8s6la4hyswc982"; }; nativeBuildInputs = [ cmake ]; diff --git a/pkgs/development/libraries/cctz/default.nix b/pkgs/development/libraries/cctz/default.nix index e61b5840cf93..2930ffa61e3c 100644 --- a/pkgs/development/libraries/cctz/default.nix +++ b/pkgs/development/libraries/cctz/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { name = "cctz-${version}"; - version = "2.2"; + version = "2.3"; src = fetchFromGitHub { owner = "google"; repo = "cctz"; rev = "v${version}"; - sha256 = "0liiqz1swfc019rzfaa9y5kavs2hwabs2vnwbn9jfczhyxy34y89"; + sha256 = "0254xfwscfkjc3fbvx6qgifr3pwkc2rb03z8pbvvqy098di9alhr"; }; makeFlags = [ "PREFIX=$(out)" ]; diff --git a/pkgs/development/libraries/cmark/default.nix b/pkgs/development/libraries/cmark/default.nix index a7b604bc0d2e..ede2049b6ee9 100644 --- a/pkgs/development/libraries/cmark/default.nix +++ b/pkgs/development/libraries/cmark/default.nix @@ -1,14 +1,14 @@ { stdenv, fetchFromGitHub, cmake }: stdenv.mkDerivation rec { - version = "0.28.3"; + version = "0.29.0"; name = "cmark-${version}"; src = fetchFromGitHub { owner = "jgm"; repo = "cmark"; rev = version; - sha256 = "1lal6n6q7l84njgdcq1xbfxan56qlvr8xaw9m2jbd0jk4y2wkczg"; + sha256 = "0r7jpqhgnssq444i8pwji2g36058vfzwkl70wbiwj13h4w5rfc8f"; }; nativeBuildInputs = [ cmake ]; diff --git a/pkgs/development/libraries/gecode/default.nix b/pkgs/development/libraries/gecode/default.nix index af47ccd358b0..9a6b5d9cf273 100644 --- a/pkgs/development/libraries/gecode/default.nix +++ b/pkgs/development/libraries/gecode/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { name = "gecode-${version}"; - version = "6.1.1"; + version = "6.2.0"; src = fetchFromGitHub { owner = "Gecode"; repo = "gecode"; rev = "release-${version}"; - sha256 = "07jyx17qsfx3wmd2zlcs0rxax8h3cs2g9aapxkdjdcsmfxsldqb7"; + sha256 = "0b1cq0c810j1xr2x9y9996p894571sdxng5h74py17c6nr8c6dmk"; }; enableParallelBuilding = true; diff --git a/pkgs/development/libraries/grpc/default.nix b/pkgs/development/libraries/grpc/default.nix index 93e76c621822..77773e91e174 100644 --- a/pkgs/development/libraries/grpc/default.nix +++ b/pkgs/development/libraries/grpc/default.nix @@ -1,13 +1,13 @@ { stdenv, fetchFromGitHub, cmake, zlib, c-ares, pkgconfig, openssl, protobuf, gflags }: stdenv.mkDerivation rec { - version = "1.19.0"; + version = "1.19.1"; name = "grpc-${version}"; src = fetchFromGitHub { owner = "grpc"; repo = "grpc"; rev = "v${version}"; - sha256 = "105hvpn2z3qiyc01wyzpmfbrpmy20kz1nb9j1c2s0kz1r0v92gqi"; + sha256 = "0c0jra4qnd86gyr4rlblic3igb5dpgrldac35myk5i5ia547fdhj"; }; nativeBuildInputs = [ cmake pkgconfig ]; buildInputs = [ zlib c-ares c-ares.cmake-config openssl protobuf gflags ]; @@ -18,6 +18,7 @@ stdenv.mkDerivation rec { "-DgRPC_SSL_PROVIDER=package" "-DgRPC_PROTOBUF_PROVIDER=package" "-DgRPC_GFLAGS_PROVIDER=package" + "-DBUILD_SHARED_LIBS=ON" ]; # CMake creates a build directory by default, this conflicts with the @@ -26,6 +27,10 @@ stdenv.mkDerivation rec { rm -vf BUILD ''; + preBuild = '' + export LD_LIBRARY_PATH=$(pwd):$LD_LIBRARY_PATH + ''; + NIX_CFLAGS_COMPILE = stdenv.lib.optionalString stdenv.cc.isClang "-Wno-error=unknown-warning-option"; enableParallelBuilds = true; diff --git a/pkgs/development/libraries/intel-gmmlib/default.nix b/pkgs/development/libraries/intel-gmmlib/default.nix index 61d7b067ae82..50e97bfbfdb3 100644 --- a/pkgs/development/libraries/intel-gmmlib/default.nix +++ b/pkgs/development/libraries/intel-gmmlib/default.nix @@ -4,13 +4,13 @@ stdenv.mkDerivation rec { name = "intel-gmmlib-${version}"; - version = "18.4.1"; + version = "19.1.2"; src = fetchFromGitHub { owner = "intel"; repo = "gmmlib"; rev = name; - sha256 = "1nxbz54a0md9hf0asdbyglvi6kiggksy24ffmk4wzvkai6vinm17"; + sha256 = "1nw5qg10dqkchx39vqk9nkqggk0in2kr794dqjp73njpirixgr2b"; }; nativeBuildInputs = [ cmake ]; diff --git a/pkgs/development/libraries/intel-media-driver/default.nix b/pkgs/development/libraries/intel-media-driver/default.nix index b1c9f59b019e..a362b1ac6343 100644 --- a/pkgs/development/libraries/intel-media-driver/default.nix +++ b/pkgs/development/libraries/intel-media-driver/default.nix @@ -5,13 +5,13 @@ stdenv.mkDerivation rec { name = "intel-media-driver-${version}"; - version = "18.4.1"; + version = "19.1.0"; src = fetchFromGitHub { owner = "intel"; repo = "media-driver"; rev = "intel-media-${version}"; - sha256 = "192rfv6dk9jagx0q92jq6n1slc1pllgcc7rm85fgachq9rjl7szh"; + sha256 = "072ry87h1lds14fqb2sfz3n2sssvacamaxv2gj4nd8agnzbwizn7"; }; cmakeFlags = [ diff --git a/pkgs/development/libraries/intel-media-sdk/default.nix b/pkgs/development/libraries/intel-media-sdk/default.nix index 6ab10c24d3dc..274058b7ec99 100644 --- a/pkgs/development/libraries/intel-media-sdk/default.nix +++ b/pkgs/development/libraries/intel-media-sdk/default.nix @@ -4,11 +4,11 @@ stdenv.mkDerivation rec { name = "intel-media-sdk-${version}"; - version = "18.4.1"; + version = "19.1.0"; src = fetchurl { url = "https://github.com/Intel-Media-SDK/MediaSDK/archive/intel-mediasdk-${version}.tar.gz"; - sha256 = "0yqqw6hyjn28zk4f4wznqpyiz9vinnjj8067dim64bz1f4pjhyra"; + sha256 = "1gligrg6khzmwcy6miikljj75hhxqy0a95qzc8m61ipx5c8igdpv"; }; # patchelf is needed for binaries in $out/share/samples diff --git a/pkgs/development/libraries/kdb/default.nix b/pkgs/development/libraries/kdb/default.nix index 1dedd3836c29..0cd8ab503566 100644 --- a/pkgs/development/libraries/kdb/default.nix +++ b/pkgs/development/libraries/kdb/default.nix @@ -6,12 +6,12 @@ mkDerivation rec { pname = "kdb"; - version = "3.1.0"; + version = "3.2.0"; name = "${pname}-${version}"; src = fetchurl { url = "mirror://kde/stable/${pname}/src/${name}.tar.xz"; - sha256 = "1wi9z7j0nr9wi6aqqkdcpnr38ixyxbv00sblya7pakdf96hlamhp"; + sha256 = "0s909x34a56n3xwhqz27irl2gbzidax0685w2kf34f0liny872cg"; }; nativeBuildInputs = [ extra-cmake-modules ]; diff --git a/pkgs/development/libraries/libp11/default.nix b/pkgs/development/libraries/libp11/default.nix index fa3e35e7ad37..774019de0d5b 100644 --- a/pkgs/development/libraries/libp11/default.nix +++ b/pkgs/development/libraries/libp11/default.nix @@ -1,4 +1,5 @@ -{ stdenv, fetchFromGitHub, autoreconfHook, libtool, openssl, pkgconfig }: +{ stdenv, fetchFromGitHub, autoreconfHook, libtool, pkgconfig +, openssl }: stdenv.mkDerivation rec { name = "libp11-${version}"; @@ -11,15 +12,20 @@ stdenv.mkDerivation rec { sha256 = "1m4aw45bqichhx7cn78d8l1r1v0ccvwzlfj09fay2l9rfic5jgfz"; }; - makeFlags = [ "DESTDIR=$(out)" "PREFIX=" ]; + configureFlags = [ + "--with-enginesdir=${placeholder "out"}/lib/engines" + ]; nativeBuildInputs = [ autoreconfHook pkgconfig libtool ]; + buildInputs = [ openssl ]; + enableParallelBuilding = true; + meta = with stdenv.lib; { + description = "Small layer on top of PKCS#11 API to make PKCS#11 implementations easier"; homepage = https://github.com/OpenSC/libp11; license = licenses.lgpl21Plus; - description = "Small layer on top of PKCS#11 API to make PKCS#11 implementations easier"; platforms = platforms.all; }; } diff --git a/pkgs/development/libraries/quazip/default.nix b/pkgs/development/libraries/quazip/default.nix index ae858738ec16..b53335f45c34 100644 --- a/pkgs/development/libraries/quazip/default.nix +++ b/pkgs/development/libraries/quazip/default.nix @@ -1,22 +1,23 @@ -{ fetchurl, stdenv, zlib, qtbase, qmake }: +{ fetchFromGitHub, stdenv, zlib, qtbase, qmake }: stdenv.mkDerivation rec { - name = "quazip-0.7.3"; + pname = "quazip"; + version = "0.7.6"; - src = fetchurl { - url = "mirror://sourceforge/quazip/${name}.tar.gz"; - sha256 = "1db9w8ax1ki0p67a47h4cnbwfgi2di4y3k9nc3a610kffiag7m1a"; + src = fetchFromGitHub { + owner = "stachenov"; + repo = pname; + rev = version; + sha256 = "1p6khy8fn9bwp14l6wd3sniwwm5v216l8xncfb7a6psjzvq5ypy6"; }; - preConfigure = "cd quazip"; - buildInputs = [ zlib qtbase ]; nativeBuildInputs = [ qmake ]; meta = { description = "Provides access to ZIP archives from Qt programs"; license = stdenv.lib.licenses.gpl2Plus; - homepage = http://quazip.sourceforge.net/; + homepage = https://stachenov.github.io/quazip/; # Migrated from http://quazip.sourceforge.net/ platforms = stdenv.lib.platforms.linux; }; } diff --git a/pkgs/development/libraries/science/math/cudnn/default.nix b/pkgs/development/libraries/science/math/cudnn/default.nix index b41469c215e2..a33e3ec20096 100644 --- a/pkgs/development/libraries/science/math/cudnn/default.nix +++ b/pkgs/development/libraries/science/math/cudnn/default.nix @@ -59,10 +59,10 @@ in rec { cudnn_cudatoolkit_9 = cudnn_cudatoolkit_9_2; cudnn_cudatoolkit_10_0 = generic rec { - version = "7.3.1"; + version = "7.4.2"; cudatoolkit = cudatoolkit_10_0; - srcName = "cudnn-${cudatoolkit.majorVersion}-linux-x64-v7.3.1.20.tgz"; - sha256 = "1yp35mng4ym40g5rqp63dcpa6jg4q1pnjkspnhlakzzdy8is65af"; + srcName = "cudnn-${cudatoolkit.majorVersion}-linux-x64-v7.4.2.24.tgz"; + sha256 = "18ys0apiz9afid2s6lvy9qbyi8g66aimb2a7ikl1f3dm09mciprf"; }; cudnn_cudatoolkit_10 = cudnn_cudatoolkit_10_0; diff --git a/pkgs/development/ocaml-modules/zarith/default.nix b/pkgs/development/ocaml-modules/zarith/default.nix index 9122a3509d96..1d331090a44f 100644 --- a/pkgs/development/ocaml-modules/zarith/default.nix +++ b/pkgs/development/ocaml-modules/zarith/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl +{ stdenv, buildOcaml, fetchurl , ocaml, findlib, pkgconfig, perl , gmp }: @@ -16,20 +16,25 @@ let source = }; in -stdenv.mkDerivation rec { - name = "ocaml${ocaml.version}-zarith-${version}"; +buildOcaml rec { + name = "zarith"; inherit (source) version; src = fetchurl { inherit (source) url sha256; }; + minimumSupportedOcamlVersion = "3.12.1"; + nativeBuildInputs = [ pkgconfig ]; buildInputs = [ ocaml findlib perl ]; propagatedBuildInputs = [ gmp ]; + # needed so setup-hook.sh sets CAML_LD_LIBRARY_PATH for dllzarith.so + hasSharedObjects = true; + patchPhase = "patchShebangs ./z_pp.pl"; configurePhase = '' ./configure -installdir $out/lib/ocaml/${ocaml.version}/site-lib ''; - createFindlibDestdir = true; + preInstall = "mkdir -p $out/lib/ocaml/${ocaml.version}/site-lib"; meta = with stdenv.lib; { description = "Fast, arbitrary precision OCaml integers"; diff --git a/pkgs/development/python-modules/colanderalchemy/default.nix b/pkgs/development/python-modules/colanderalchemy/default.nix index 78f0f6fe371f..686608445abc 100644 --- a/pkgs/development/python-modules/colanderalchemy/default.nix +++ b/pkgs/development/python-modules/colanderalchemy/default.nix @@ -30,6 +30,9 @@ buildPythonPackage rec { description = "Autogenerate Colander schemas based on SQLAlchemy models"; homepage = https://github.com/stefanofontanelli/ColanderAlchemy; license = licenses.mit; + # ColanderAlchemy's tests currently fail with colander >1.6.0 + # (see https://github.com/stefanofontanelli/ColanderAlchemy/issues/107) + broken = versionOlder "1.6.0" colander.version; }; } diff --git a/pkgs/development/python-modules/cysignals/default.nix b/pkgs/development/python-modules/cysignals/default.nix index 1cd55acdbeb8..e69fbce21587 100644 --- a/pkgs/development/python-modules/cysignals/default.nix +++ b/pkgs/development/python-modules/cysignals/default.nix @@ -9,11 +9,11 @@ assert pariSupport -> pari != null; buildPythonPackage rec { pname = "cysignals"; - version = "1.9.0"; + version = "1.10.2"; src = fetchPypi { inherit pname version; - sha256 = "15ix8crpad26cfl1skyg7qajqqfdrm8q5ahhmlfmqi1aw0jqj2g2"; + sha256 = "1ckxzch3wk5cg80mppky5jib5z4fzslny3001r5zg4ar1ixbc1w1"; }; # explicit check: diff --git a/pkgs/development/python-modules/google-auth-oauthlib/default.nix b/pkgs/development/python-modules/google-auth-oauthlib/default.nix index fd8eb816784e..c5e9b1028288 100644 --- a/pkgs/development/python-modules/google-auth-oauthlib/default.nix +++ b/pkgs/development/python-modules/google-auth-oauthlib/default.nix @@ -1,6 +1,7 @@ { lib , buildPythonPackage , fetchPypi +, isPy3k , click , mock , pytest @@ -19,8 +20,8 @@ buildPythonPackage rec { }; checkInputs = [ - click mock pytest futures - ]; + click mock pytest + ] ++ lib.optionals (!isPy3k) [ futures ]; propagatedBuildInputs = [ google_auth requests_oauthlib diff --git a/pkgs/development/python-modules/joblib/default.nix b/pkgs/development/python-modules/joblib/default.nix index f9f5ba23eac9..9b2a5c447327 100644 --- a/pkgs/development/python-modules/joblib/default.nix +++ b/pkgs/development/python-modules/joblib/default.nix @@ -38,8 +38,10 @@ buildPythonPackage rec { checkInputs = [ sphinx numpydoc pytest ]; propagatedBuildInputs = [ python-lz4 ]; + # test_disk_used is broken + # https://github.com/joblib/joblib/issues/57 checkPhase = '' - py.test joblib + py.test joblib -k "not test_disk_used" ''; meta = { diff --git a/pkgs/development/python-modules/jupyterlab/default.nix b/pkgs/development/python-modules/jupyterlab/default.nix index e13c9f97d9f3..6d9d2a6b309f 100644 --- a/pkgs/development/python-modules/jupyterlab/default.nix +++ b/pkgs/development/python-modules/jupyterlab/default.nix @@ -4,6 +4,7 @@ , jupyterlab_server , notebook , pythonOlder +, fetchpatch }: buildPythonPackage rec { @@ -22,6 +23,14 @@ buildPythonPackage rec { "--set" "JUPYTERLAB_DIR" "$out/share/jupyter/lab" ]; + patches = [ + (fetchpatch { + name = "bump-jupyterlab_server-version"; + url = https://github.com/jupyterlab/jupyterlab/commit/3b8d451e6f9a4c609e60cde5fbb3cc84aae79951.patch; + sha256 = "08vv6rp1k5fbmvj4v9x1d9zb6ymm9pv8ml80j7p45r9fay34rndf"; + }) + ]; + # Depends on npm doCheck = false; diff --git a/pkgs/development/python-modules/mysql-connector/default.nix b/pkgs/development/python-modules/mysql-connector/default.nix index 56c1ab227c8d..efddecd42469 100644 --- a/pkgs/development/python-modules/mysql-connector/default.nix +++ b/pkgs/development/python-modules/mysql-connector/default.nix @@ -4,13 +4,13 @@ buildPythonPackage rec { pname = "mysql-connector"; - version = "8.0.15"; + version = "8.0.16"; src = fetchFromGitHub { owner = "mysql"; repo = "mysql-connector-python"; rev = version; - sha256 = "1w4j2sf07aid3453529z8kg1ziycbayxi3g2r4wqn0nb3y1caqz6"; + sha256 = "0yl3fkyws24lc2qrbvn42bqy72aqy8q5v8f0j5zy3mkh9a7wlxdp"; }; propagatedBuildInputs = [ protobuf ]; diff --git a/pkgs/development/python-modules/pychromecast/default.nix b/pkgs/development/python-modules/pychromecast/default.nix index 1283fe9340e5..7d0f7da5d96c 100644 --- a/pkgs/development/python-modules/pychromecast/default.nix +++ b/pkgs/development/python-modules/pychromecast/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "PyChromecast"; - version = "3.0.0"; + version = "3.2.0"; src = fetchPypi { inherit pname version; - sha256 = "15zaka9zjyx5lb78f0qs6w8g1rgz94gjgrgxm6iwih0a2l0pv5h9"; + sha256 = "0jksh7rb4880kni8iw3hb5q9dm5gi40zmx4r2fwydnpfhadhq5af"; }; disabled = !isPy3k; diff --git a/pkgs/development/python-modules/pyside/tools.nix b/pkgs/development/python-modules/pyside/tools.nix index e23e63525183..6c2b357c5668 100644 --- a/pkgs/development/python-modules/pyside/tools.nix +++ b/pkgs/development/python-modules/pyside/tools.nix @@ -1,29 +1,28 @@ -{ lib, fetchurl, cmake, pyside, qt4, pysideShiboken, buildPythonPackage }: +{ lib, buildPythonPackage, fetchFromGitHub, cmake, qt4, pyside, pysideShiboken }: -# This derivation provides a Python module and should therefore be called via `python-packages.nix`. buildPythonPackage rec { pname = "pyside-tools"; version = "0.2.15"; format = "other"; - src = fetchurl { - url = "https://github.com/PySide/Tools/archive/0.2.15.tar.gz"; - sha256 = "0x4z3aq7jgar74gxzwznl3agla9i1dcskw5gh11jnnwwn63ffzwa"; + src = fetchFromGitHub { + owner = "PySide"; + repo = "Tools"; + rev = version; + sha256 = "017i2yxgjrisaifxqnl3ym8ijl63l2yl6a3474dsqhlyqz2nx2ll"; }; - enableParallelBuilding = true; - nativeBuildInputs = [ cmake ]; buildInputs = [ qt4 ]; propagatedBuildInputs = [ pyside pysideShiboken ]; - meta = { - description = "Tools for pyside, the LGPL-licensed Python bindings for the Qt cross-platform application and UI framework"; - license = lib.licenses.gpl2; - homepage = http://www.pyside.org; + meta = with lib; { + description = "Development tools (pyside-uic/rcc/lupdate) for PySide, the LGPL-licensed Python bindings for the Qt framework"; + license = licenses.gpl2; + homepage = https://wiki.qt.io/PySide; maintainers = [ ]; - platforms = lib.platforms.all; + platforms = platforms.all; }; } diff --git a/pkgs/development/python-modules/serversyncstorage/default.nix b/pkgs/development/python-modules/serversyncstorage/default.nix index 7342a729e292..2f7acce976de 100644 --- a/pkgs/development/python-modules/serversyncstorage/default.nix +++ b/pkgs/development/python-modules/serversyncstorage/default.nix @@ -38,6 +38,7 @@ buildPythonPackage rec { ]; meta = with stdenv.lib; { + broken = cornice.version != "0.17"; description = "The SyncServer server software, as used by Firefox Sync"; homepage = https://github.com/mozilla-services/server-syncstorage; license = licenses.mpl20; diff --git a/pkgs/development/python-modules/spacy/default.nix b/pkgs/development/python-modules/spacy/default.nix index 275e924e4113..a39593bb9e78 100644 --- a/pkgs/development/python-modules/spacy/default.nix +++ b/pkgs/development/python-modules/spacy/default.nix @@ -31,7 +31,8 @@ buildPythonPackage rec { prePatch = '' substituteInPlace setup.py \ --replace "regex==" "regex>=" \ - --replace "plac<1.0.0,>=0.9.6" "plac>=0.9.6" + --replace "plac<1.0.0,>=0.9.6" "plac>=0.9.6" \ + --replace "wheel>=0.32.0,<0.33.0" "wheel>=0.32.0" ''; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/wikipedia/default.nix b/pkgs/development/python-modules/wikipedia/default.nix new file mode 100644 index 000000000000..19b7c42558ec --- /dev/null +++ b/pkgs/development/python-modules/wikipedia/default.nix @@ -0,0 +1,37 @@ +{ lib +, buildPythonPackage +, fetchPypi +, beautifulsoup4 +, requests +, python +}: + +buildPythonPackage rec { + pname = "wikipedia"; + version = "1.4.0"; + + src = fetchPypi { + inherit pname version; + sha256 = "db0fad1829fdd441b1852306e9856398204dc0786d2996dd2e0c8bb8e26133b2"; + }; + + propagatedBuildInputs = [ + beautifulsoup4 + requests + ]; + + checkPhase = '' + runHook preCheck + + ${python.interpreter} -m unittest discover tests/ '*test.py' + + runHook postCheck + ''; + + meta = with lib; { + description = "Wikipedia API for Python"; + homepage = https://github.com/goldsmith/Wikipedia; + license = licenses.mit; + maintainers = [ maintainers.worldofpeace ]; + }; +} diff --git a/pkgs/development/tools/analysis/evmdis/default.nix b/pkgs/development/tools/analysis/evmdis/default.nix new file mode 100644 index 000000000000..77bfa548068c --- /dev/null +++ b/pkgs/development/tools/analysis/evmdis/default.nix @@ -0,0 +1,21 @@ +{ stdenv, buildGoPackage, fetchFromGitHub }: + +buildGoPackage rec { + name = "evmdis-unstable-${version}"; + version = "2018-03-23"; + goPackagePath = "github.com/Arachnid/evmdis"; + + src = fetchFromGitHub { + owner = "Arachnid"; + repo = "evmdis"; + rev = "0d1406905c5fda6224651fa53260a21c907eb986"; + sha256 = "09y4j7ipgv8yd99g3xk3f079w8fqfj7kl1y7ry81ainysn0qlqrg"; + }; + + meta = with stdenv.lib; { + homepage = https://github.com/Arachnid/evmdis; + description = "Ethereum EVM disassembler"; + license = [ licenses.asl20 ]; + maintainers = with maintainers; [ asymmetric ]; + }; +} diff --git a/pkgs/development/tools/build-managers/sbt-extras/default.nix b/pkgs/development/tools/build-managers/sbt-extras/default.nix index 74e30aa0e6dd..e0cfe59b0516 100644 --- a/pkgs/development/tools/build-managers/sbt-extras/default.nix +++ b/pkgs/development/tools/build-managers/sbt-extras/default.nix @@ -1,8 +1,8 @@ { stdenv, fetchFromGitHub, which, curl, makeWrapper, jdk }: let - rev = "a9f2e2592d069313329971930d1740943d19ef91"; - version = "2019-01-30"; + rev = "a47a965e00ecd66793832e2a12a1972d25e6f734"; + version = "2019-04-05"; in stdenv.mkDerivation { name = "sbt-extras-${version}"; @@ -12,7 +12,7 @@ stdenv.mkDerivation { owner = "paulp"; repo = "sbt-extras"; inherit rev; - sha256 = "1kkpsd3fb8lm631bwjj41x4i9a5m88y2f3flzs918y12bjkli8ji"; + sha256 = "1hrz7kg0k2iqq18bg6ll2bdj487p0987880dz0c0g35ah70ps2hj"; }; dontBuild = true; diff --git a/pkgs/development/tools/database/timescaledb-parallel-copy/default.nix b/pkgs/development/tools/database/timescaledb-parallel-copy/default.nix index 1c12a8bc81cd..3c9f9c54dd39 100644 --- a/pkgs/development/tools/database/timescaledb-parallel-copy/default.nix +++ b/pkgs/development/tools/database/timescaledb-parallel-copy/default.nix @@ -1,8 +1,8 @@ { stdenv, buildGoPackage, fetchFromGitHub }: buildGoPackage rec { - name = "timescaledb-parallel-copy-${version}"; - version = "2018-05-14"; + name = "timescaledb-parallel-copy"; + version = "0.2.0"; owner = "timescale"; repo = "timescaledb-parallel-copy"; @@ -12,8 +12,8 @@ buildGoPackage rec { src = fetchFromGitHub { inherit owner repo; - rev = "20d3e8f8219329f2f4b0a5aa985f280dd04d10bb"; - sha256 = "0waaccw991cnxaxjdxh9ksb94kiiyx1r7gif6pkd5k58js0kfvdn"; + rev = version; + sha256 = "1z9vf29vrxqs8imbisv681d02p4cfk3hlsrin6hhibxf1h0br9gd"; }; meta = with stdenv.lib; { diff --git a/pkgs/development/tools/database/timescaledb-parallel-copy/deps.nix b/pkgs/development/tools/database/timescaledb-parallel-copy/deps.nix index c672611e09c1..ac145fcd34ed 100644 --- a/pkgs/development/tools/database/timescaledb-parallel-copy/deps.nix +++ b/pkgs/development/tools/database/timescaledb-parallel-copy/deps.nix @@ -1,12 +1,12 @@ -# This file was generated by https://github.com/kamilchm/go2nix v1.2.1 +# This file was generated by https://github.com/kamilchm/go2nix v1.3.0 [ { goPackagePath = "github.com/jmoiron/sqlx"; fetch = { type = "git"; url = "https://github.com/jmoiron/sqlx"; - rev = "0dae4fefe7c0e190f7b5a78dac28a1c82cc8d849"; - sha256 = "0r8fyj70n0v84byvagw8w8rzz532s94mjr72b9sx018j0b6xglmy"; + rev = "82935fac6c1a317907c8f43ed3f7f85ea844a78b"; + sha256 = "0cbscnss2ifc3qgmy97i0zbirrp4hix4jlcz853f4bg5n2zzgwh2"; }; } { @@ -14,8 +14,8 @@ fetch = { type = "git"; url = "https://github.com/lib/pq"; - rev = "90697d60dd844d5ef6ff15135d0203f65d2f53b8"; - sha256 = "0hb4bfsk8g5473yzbf3lzrb373xicakjznkf0v085xgimz991i9r"; + rev = "7aad666537ab32b76f0966145530335f1fed51fd"; + sha256 = "12qczn5afbf6203wnbpay1kazzh20jg5qyakrph3j1r13n91nc1r"; }; } ] diff --git a/pkgs/development/tools/database/timescaledb-tune/default.nix b/pkgs/development/tools/database/timescaledb-tune/default.nix new file mode 100644 index 000000000000..34a7ee4b66c8 --- /dev/null +++ b/pkgs/development/tools/database/timescaledb-tune/default.nix @@ -0,0 +1,24 @@ +{ stdenv, buildGoPackage, fetchFromGitHub }: + +buildGoPackage rec { + name = "timescaledb-tune"; + version = "0.5.0"; + + goPackagePath = "github.com/timescale/timescaledb-tune"; + + goDeps = ./deps.nix; + + src = fetchFromGitHub { + owner = "timescale"; + repo = name; + rev = version; + sha256 = "1fs7ggpdik3qjvjmair1svni2sw9wz54716m2iwngv8x4s9b15nn"; + }; + + meta = with stdenv.lib; { + description = "A tool for tuning your TimescaleDB for better performance"; + homepage = https://github.com/timescale/timescaledb-tune; + license = licenses.asl20; + maintainers = with maintainers; [ marsam ]; + }; +} diff --git a/pkgs/development/tools/database/timescaledb-tune/deps.nix b/pkgs/development/tools/database/timescaledb-tune/deps.nix new file mode 100644 index 000000000000..d898770fd4ef --- /dev/null +++ b/pkgs/development/tools/database/timescaledb-tune/deps.nix @@ -0,0 +1,21 @@ +# This file was generated by https://github.com/kamilchm/go2nix v1.3.0 +[ + { + goPackagePath = "github.com/fatih/color"; + fetch = { + type = "git"; + url = "https://github.com/fatih/color"; + rev = "3f9d52f7176a6927daacff70a3e8d1dc2025c53e"; + sha256 = "165ww24x6ba47ji4j14mp3f006ksnmi53ws9280pgd2zcw91nbn8"; + }; + } + { + goPackagePath = "github.com/pbnjay/memory"; + fetch = { + type = "git"; + url = "https://github.com/pbnjay/memory"; + rev = "974d429e7ae40c89e7dcd41cfcc22a0bfbe42510"; + sha256 = "0kazg5psdn90pqadrzma5chdwh0l2by9z31sspr47gx93fhjmkkq"; + }; + } +] diff --git a/pkgs/development/tools/electron/default.nix b/pkgs/development/tools/electron/default.nix index e0d2d56e7fa5..b6f7d0b072b2 100644 --- a/pkgs/development/tools/electron/default.nix +++ b/pkgs/development/tools/electron/default.nix @@ -1,7 +1,7 @@ { stdenv, libXScrnSaver, makeWrapper, fetchurl, unzip, atomEnv, libuuid, at-spi2-atk }: let - version = "4.1.4"; + version = "4.1.5"; name = "electron-${version}"; throwSystem = throw "Unsupported system: ${stdenv.hostPlatform.system}"; @@ -19,19 +19,19 @@ let src = { i686-linux = fetchurl { url = "https://github.com/electron/electron/releases/download/v${version}/electron-v${version}-linux-ia32.zip"; - sha256 = "0z1pr85mdw8c7vdsvznhixzmqmy3s6rrjaybym76c93hdvkr2ir9"; + sha256 = "0rqaydlg7wkccks7crwpylad0bsz8knm82mpb7hnj68p9njxpsbz"; }; x86_64-linux = fetchurl { url = "https://github.com/electron/electron/releases/download/v${version}/electron-v${version}-linux-x64.zip"; - sha256 = "05lyq67paad4h4ng39h8bwkv84bmy6axbxh60fmvl6l1x55dsan6"; + sha256 = "0xwvn41pvpsrx54waix8kmg3w1f1f9nmfn08hf9bkgnlgh251shy"; }; armv7l-linux = fetchurl { url = "https://github.com/electron/electron/releases/download/v${version}/electron-v${version}-linux-armv7l.zip"; - sha256 = "1ddc9b6h29qdqxnkc4vd6y5iah9i3f5i7v5zjb5b61rssz78wdbq"; + sha256 = "172yq2m4i0pf72xr6w3xgkxfakkx2wrc54aah5j3nr6809bcnzji"; }; aarch64-linux = fetchurl { url = "https://github.com/electron/electron/releases/download/v${version}/electron-v${version}-linux-arm64.zip"; - sha256 = "0qha5klws8l2i0grmwjiz34srr66h93lpx1j0lsgz3pxjxhc33xs"; + sha256 = "0gcgvgplg9c2sm53sa4nll4x486c4m190ma9a98xfx9mp9vy55vq"; }; }.${stdenv.hostPlatform.system} or throwSystem; @@ -59,7 +59,7 @@ let src = fetchurl { url = "https://github.com/electron/electron/releases/download/v${version}/electron-v${version}-darwin-x64.zip"; - sha256 = "0zbgrwphd1xfkzqai8n7mi9vpzqflq4wwwnl4pdryrkyi3k4yxa6"; + sha256 = "1z43ga620rw84x1yxvnxf11pd782s5vgj5dgnn4k0nfgxlihy058"; }; buildInputs = [ unzip ]; diff --git a/pkgs/development/tools/java/cfr/default.nix b/pkgs/development/tools/java/cfr/default.nix index 4eff5c3f4319..abe7b308e0b0 100644 --- a/pkgs/development/tools/java/cfr/default.nix +++ b/pkgs/development/tools/java/cfr/default.nix @@ -2,14 +2,14 @@ stdenv.mkDerivation rec { name = "cfr-${version}"; - version = "0.140"; + version = "0.143"; src = fetchurl { url = "http://www.benf.org/other/cfr/cfr_${version}.jar"; - sha256 = "0pgja3inhwikis80zwa58x5y51xg7pp1ji63n1xsab8ciyca52if"; + sha256 = "129ab79xavrk0bwkmpvl56f74hyl1phfgbgz86cbij8bpvhhljyz"; }; - buildInputs = [ makeWrapper ]; + nativeBuildInputs = [ makeWrapper ]; buildCommand = '' jar=$out/share/java/cfr_${version}.jar diff --git a/pkgs/development/tools/pipenv/default.nix b/pkgs/development/tools/pipenv/default.nix index 8083151ef81f..f51ce6fcfaba 100644 --- a/pkgs/development/tools/pipenv/default.nix +++ b/pkgs/development/tools/pipenv/default.nix @@ -15,15 +15,15 @@ buildPythonApplication rec { flake8 invoke parver - pew pip requests + virtualenv ]; doCheck = false; makeWrapperArgs = [ - "--set PYTHONPATH \"$PYTHONPATH\"" + "--set PYTHONPATH \".:$PYTHONPATH\"" "--set PIP_IGNORE_INSTALLED 1" ]; diff --git a/pkgs/development/tools/rust/bindgen/default.nix b/pkgs/development/tools/rust/bindgen/default.nix index a1f5e5769ae8..d0cd28379d6c 100644 --- a/pkgs/development/tools/rust/bindgen/default.nix +++ b/pkgs/development/tools/rust/bindgen/default.nix @@ -2,17 +2,17 @@ runtimeShell }: rustPlatform.buildRustPackage rec { - name = "rust-bindgen-${version}"; - version = "0.42.2"; + pname = "rust-bindgen"; + version = "0.49.0"; src = fetchFromGitHub { - owner = "rust-lang-nursery"; - repo = "rust-bindgen"; + owner = "rust-lang"; + repo = pname; rev = "v${version}"; - sha256 = "10h0h7x8yf4dsyw2p2nas2jg5p3i29np0y3rfzrdq898d70gvq4j"; + sha256 = "0i1lh8z0jpf8gcfqxig8kl6wzjrkwb3jkad5ghb6ppkdkpr94jq4"; }; - cargoSha256 = "01jvi86xgz0r7ia9agnfpms6b6x68lzwj6f085m0w659i94acgpi"; + cargoSha256 = "0v3slbah0s1w75s38x1akvshcxsi1s810yybd9faday7biwmdbmj"; libclang = llvmPackages.libclang.lib; #for substituteAll @@ -56,7 +56,7 @@ rustPlatform.buildRustPackage rec { As with most compiler related software, this will only work inside a nix-shell with the required libraries as buildInputs. ''; - homepage = https://github.com/rust-lang-nursery/rust-bindgen; + homepage = https://github.com/rust-lang/rust-bindgen; license = with licenses; [ bsd3 ]; maintainers = [ maintainers.ralith ]; }; diff --git a/pkgs/development/tools/rust/cargo-sweep/default.nix b/pkgs/development/tools/rust/cargo-sweep/default.nix new file mode 100644 index 000000000000..52198665e9f3 --- /dev/null +++ b/pkgs/development/tools/rust/cargo-sweep/default.nix @@ -0,0 +1,23 @@ +{ stdenv, rustPlatform, fetchFromGitHub }: + +rustPlatform.buildRustPackage rec { + pname = "cargo-sweep"; + version = "0.4.1"; + + src = fetchFromGitHub { + owner = "holmgr"; + repo = pname; + rev = "v${version}"; + sha256 = "1zp0x0jy5bjqbxawlwvpj6vb3y602mnh19p48rw70kdx6vripbvj"; + }; + + cargoSha256 = "06hx8mlqarjnqrprwdp80cmanmacg3xz62r1bbn27pn60xv719hn"; + + meta = with stdenv.lib; { + description = "A Cargo subcommand for cleaning up unused build files generated by Cargo"; + homepage = https://github.com/holmgr/cargo-sweep; + license = licenses.mit; + platforms = platforms.all; + maintainers = with maintainers; [ xrelkd ]; + }; +} diff --git a/pkgs/development/tools/rust/rls/default.nix b/pkgs/development/tools/rust/rls/default.nix index accdc7678c60..f52ab0d767a3 100644 --- a/pkgs/development/tools/rust/rls/default.nix +++ b/pkgs/development/tools/rust/rls/default.nix @@ -1,19 +1,19 @@ { stdenv, fetchFromGitHub, rustPlatform -, openssh, openssl, pkgconfig, cmake, zlib, curl }: +, openssh, openssl, pkgconfig, cmake, zlib, curl, libiconv }: rustPlatform.buildRustPackage rec { name = "rls-${version}"; # with rust 1.x you can only build rls version 1.x.y - version = "1.31.7"; + version = "1.34.0"; src = fetchFromGitHub { owner = "rust-lang"; repo = "rls"; - rev = version; - sha256 = "0n33pf7sm31y55rllb8wv3mn75srspr4yj2y6cpcdyf15n47c8cf"; + rev = "0d6f53e1a4adbaf7d83cdc0cb54720203fcb522e"; + sha256 = "1aabs0kr87sp68n9893im5wz21dicip9ixir9a9l56nis4qxpm7i"; }; - cargoSha256 = "0jcsggq4ay8f4vb8n6gh8z995icvvbjkzapxf6jq6qkg6jp3vv17"; + cargoSha256 = "16r9rmjhb0dbdgx9qf740nsckjazz4z663vaajw5z9i4qh0jsy18"; # a nightly compiler is required unless we use this cheat code. RUSTC_BOOTSTRAP=1; @@ -22,12 +22,16 @@ rustPlatform.buildRustPackage rec { cargoBuildFlags = [ "--no-default-features" ]; nativeBuildInputs = [ pkgconfig cmake ]; - buildInputs = [ openssh openssl curl zlib ]; + buildInputs = [ openssh openssl curl zlib libiconv ]; doCheck = true; # the default checkPhase has no way to pass --no-default-features checkPhase = '' runHook preCheck + + # client tests are flaky + rm tests/client.rs + echo "Running cargo test" cargo test --no-default-features runHook postCheck diff --git a/pkgs/games/crawl/default.nix b/pkgs/games/crawl/default.nix index 01d1202658c0..ac58a43aecb0 100644 --- a/pkgs/games/crawl/default.nix +++ b/pkgs/games/crawl/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, fetchFromGitHub, which, sqlite, lua5_1, perl, python3, zlib, pkgconfig, ncurses +{ stdenv, lib, fetchFromGitHub, fetchpatch, which, sqlite, lua5_1, perl, python3, zlib, pkgconfig, ncurses , dejavu_fonts, libpng, SDL2, SDL2_image, SDL2_mixer, libGLU_combined, freetype, pngcrush, advancecomp , tileMode ? false, enableSound ? tileMode }: @@ -14,8 +14,13 @@ stdenv.mkDerivation rec { sha256 = "1d6mip4rvp81839yf2xm63hf34aza5wg4g5z5hi5275j94szaacs"; }; - # Patch hard-coded paths in the makefile - patches = [ ./crawl_purify.patch ]; + patches = [ + ./crawl_purify.patch # Patch hard-coded paths + (fetchpatch { # Use a nice high-res app icon + url = "https://github.com/crawl/crawl/commit/2aa1166087e44e6585b26cedf1fe81b3f3ba547f.patch"; + sha256 = "1jqrdv4wy18shg1fdabdb421232hg5micphkixcyzxd1lrmvadg0"; + }) + ]; nativeBuildInputs = [ pkgconfig which perl pngcrush advancecomp ]; @@ -40,7 +45,13 @@ stdenv.mkDerivation rec { ] ++ lib.optional tileMode "TILES=y" ++ lib.optional enableSound "SOUND=y"; - postInstall = lib.optionalString tileMode "mv $out/bin/crawl $out/bin/crawl-tiles"; + postInstall = '' + ${lib.optionalString tileMode "mv $out/bin/crawl $out/bin/crawl-tiles"} + sed -i 's#/usr/games/##' debian/crawl${lib.optionalString tileMode "-tiles"}.desktop + install -m 444 -D debian/crawl${lib.optionalString tileMode "-tiles"}.desktop \ + $out/share/applications/crawl${lib.optionalString tileMode "-tiles"}.desktop + install -m 444 -D dat/tiles/stone_soup_icon-512x512.png $out/share/icons/hicolor/512x512/apps/crawl.png + ''; enableParallelBuilding = true; diff --git a/pkgs/games/torcs/default.nix b/pkgs/games/torcs/default.nix index 7497084f8d02..67d7f82457f9 100644 --- a/pkgs/games/torcs/default.nix +++ b/pkgs/games/torcs/default.nix @@ -12,25 +12,30 @@ stdenv.mkDerivation rec { patches = [ (fetchpatch { - url = "https://salsa.debian.org/games-team/torcs/raw/master/debian/patches/gcc6-isnan.patch"; + url = "https://salsa.debian.org/games-team/torcs/raw/fb0711c171b38c4648dc7c048249ec20f79eb8e2/debian/patches/gcc6-isnan.patch"; sha256 = "16scmq30vwb8429ah9d4ws0v1w6ai59lvn7hcgnvfzyap42ry876"; }) (fetchpatch { - url = "https://salsa.debian.org/games-team/torcs/raw/master/debian/patches/format-argument.patch"; + url = "https://salsa.debian.org/games-team/torcs/raw/fb0711c171b38c4648dc7c048249ec20f79eb8e2/debian/patches/format-argument.patch"; sha256 = "04advcx88yh23ww767iysydzhp370x7cqp2wf9hk2y1qvw7mxsja"; }) (fetchpatch { - url = "https://salsa.debian.org/games-team/torcs/raw/master/debian/patches/glibc-default-source.patch"; + url = "https://salsa.debian.org/games-team/torcs/raw/fb0711c171b38c4648dc7c048249ec20f79eb8e2/debian/patches/glibc-default-source.patch"; sha256 = "0k4hgpddnhv68mdc9ics7ah8q54j60g394d7zmcmzg6l3bjd9pyp"; }) + (fetchpatch { + url = "https://salsa.debian.org/games-team/torcs/raw/32bbe77c68b4de07b28c34497f3c0ad666ee618d/debian/patches/gcc7.patch"; + sha256 = "09iilnvdv8h7b4nb1372arszkbz9hbzsck4rimzz1xjdh9ydniw9"; + }) ]; postPatch = '' sed -i -e s,/bin/bash,`type -P bash`, src/linux/torcs.in ''; + nativeBuildInputs = [ makeWrapper ]; buildInputs = [ libGLU freeglut libX11 plib openal freealut libXrandr xorgproto - libXext libSM libICE libXi libXt libXrender libXxf86vm libpng zlib libvorbis makeWrapper ]; + libXext libSM libICE libXi libXt libXrender libXxf86vm libpng zlib libvorbis ]; installTargets = "install datainstall"; diff --git a/pkgs/misc/tmux-plugins/default.nix b/pkgs/misc/tmux-plugins/default.nix index 8d1a8e64b61f..6c85f9a6329f 100644 --- a/pkgs/misc/tmux-plugins/default.nix +++ b/pkgs/misc/tmux-plugins/default.nix @@ -230,6 +230,7 @@ in rec { vim-tmux-navigator = mkDerivation { pluginName = "vim-tmux-navigator"; + rtpFilePath = "vim-tmux-navigator.tmux"; src = fetchgit { url = "https://github.com/christoomey/vim-tmux-navigator"; rev = "4e1a877f51a17a961b8c2a285ee80aebf05ccf42"; diff --git a/pkgs/misc/uboot/default.nix b/pkgs/misc/uboot/default.nix index 084cb33a7a21..a17ddf440ed5 100644 --- a/pkgs/misc/uboot/default.nix +++ b/pkgs/misc/uboot/default.nix @@ -120,6 +120,13 @@ in rec { filesToInstall = ["u-boot-sunxi-with-spl.bin"]; }; + ubootBananaPim64 = buildUBoot rec { + defconfig = "bananapi_m64_defconfig"; + extraMeta.platforms = ["aarch64-linux"]; + BL31 = "${armTrustedFirmwareAllwinner}/bl31.bin"; + filesToInstall = ["u-boot-sunxi-with-spl.bin"]; + }; + ubootBeagleboneBlack = buildUBoot rec { defconfig = "am335x_boneblack_defconfig"; extraMeta.platforms = ["armv7l-linux"]; diff --git a/pkgs/os-specific/linux/cifs-utils/default.nix b/pkgs/os-specific/linux/cifs-utils/default.nix index 7d98e51c1c73..ba66bd309bc3 100644 --- a/pkgs/os-specific/linux/cifs-utils/default.nix +++ b/pkgs/os-specific/linux/cifs-utils/default.nix @@ -3,11 +3,11 @@ stdenv.mkDerivation rec { name = "cifs-utils-${version}"; - version = "6.8"; + version = "6.9"; src = fetchurl { url = "mirror://samba/pub/linux-cifs/cifs-utils/${name}.tar.bz2"; - sha256 = "0ygz3pagjpaj5ky11hzh4byyymb7fpmqiqkprn11zwj31h2zdlg7"; + sha256 = "175cp509wn1zv8p8mv37hkf6sxiskrsxdnq22mhlsg61jazz3n0q"; }; nativeBuildInputs = [ autoreconfHook docutils pkgconfig ]; diff --git a/pkgs/os-specific/linux/fwts/default.nix b/pkgs/os-specific/linux/fwts/default.nix index 4bd811496b1c..566d1e9f56a7 100644 --- a/pkgs/os-specific/linux/fwts/default.nix +++ b/pkgs/os-specific/linux/fwts/default.nix @@ -3,11 +3,11 @@ stdenv.mkDerivation rec { name = "fwts-${version}"; - version = "19.02.00"; + version = "19.03.00"; src = fetchzip { url = "http://fwts.ubuntu.com/release/fwts-V${version}.tar.gz"; - sha256 = "1rjyfscchman9ih0473hgzvfzrvkfwl5bjf7c9ksr3d9plz3n7ad"; + sha256 = "1zri73qmpgc0dwmdcfbcywcvxld7dqz7rkwwqncfkvvfc9zchk5l"; stripRoot = false; }; diff --git a/pkgs/os-specific/linux/kernel/i2c-oops.patch b/pkgs/os-specific/linux/kernel/i2c-oops.patch new file mode 100644 index 000000000000..2d4f25cec68d --- /dev/null +++ b/pkgs/os-specific/linux/kernel/i2c-oops.patch @@ -0,0 +1,12 @@ +diff --git a/drivers/hid/i2c-hid/i2c-hid-dmi-quirks.c b/drivers/hid/i2c-hid/i2c-hid-dmi-quirks.c +index 1d645c9ab417bf..cac262a912c124 100644 +--- a/drivers/hid/i2c-hid/i2c-hid-dmi-quirks.c ++++ b/drivers/hid/i2c-hid/i2c-hid-dmi-quirks.c +@@ -337,7 +337,8 @@ static const struct dmi_system_id i2c_hid_dmi_desc_override_table[] = { + DMI_EXACT_MATCH(DMI_PRODUCT_NAME, "FlexBook edge11 - M-FBE11"), + }, + .driver_data = (void *)&sipodev_desc +- } ++ }, ++ { } /* Terminate list */ + }; diff --git a/pkgs/os-specific/linux/kernel/linux-rpi.nix b/pkgs/os-specific/linux/kernel/linux-rpi.nix index 7077a70a7ab0..69900f044a3b 100644 --- a/pkgs/os-specific/linux/kernel/linux-rpi.nix +++ b/pkgs/os-specific/linux/kernel/linux-rpi.nix @@ -1,8 +1,8 @@ { stdenv, lib, buildPackages, fetchFromGitHub, perl, buildLinux, ... } @ args: let - modDirVersion = "4.14.70"; - tag = "1.20180919"; + modDirVersion = "4.14.98"; + tag = "1.20190215"; in lib.overrideDerivation (buildLinux (args // rec { version = "${modDirVersion}-${tag}"; @@ -12,7 +12,7 @@ lib.overrideDerivation (buildLinux (args // rec { owner = "raspberrypi"; repo = "linux"; rev = "raspberrypi-kernel_${tag}-1"; - sha256 = "1zjvzk6rhrn3ngc012gjq3v7lxn8hy89ljb7fqwld5g7py9lkf0b"; + sha256 = "1gc4x7p82m2v1jhahhyl7qfdkflj71ly6p0fpc1vf9sk13hbwgj2"; }; defconfig = { diff --git a/pkgs/os-specific/linux/kernel/linux-testing-bcachefs.nix b/pkgs/os-specific/linux/kernel/linux-testing-bcachefs.nix index 4b9afba0ea92..144ac0e07cbc 100644 --- a/pkgs/os-specific/linux/kernel/linux-testing-bcachefs.nix +++ b/pkgs/os-specific/linux/kernel/linux-testing-bcachefs.nix @@ -1,17 +1,26 @@ -{ stdenv, buildPackages, fetchgit, perl, buildLinux, ... } @ args: +{ stdenv, buildPackages, fetchgit, fetchpatch, perl, buildLinux, ... } @ args: buildLinux (args // rec { - version = "4.20.2019.03.13"; - modDirVersion = "4.20.0"; + version = "5.0.2019.04.04"; + modDirVersion = "5.0.0"; src = fetchgit { url = "https://evilpiepirate.org/git/bcachefs.git"; - rev = "986543d24e08a0c0308472403b230d546e7ecbbb"; - sha256 = "07h9l47wijhlx3xnyxnj8kv1zb9yf2x0gag8n606yq6wn9r523hv"; + rev = "d83b992f653d9f742f3f8567dbcfd1f4f72e858f"; + sha256 = "17xipjhkl4arshyj3riwq4pgl2qqcnlfhaga77a430wy22s7plh2"; }; extraConfig = "BCACHEFS_FS m"; + kernelPatches = [ + { name = "export-bio_iov_iter_get_pages"; + patch = fetchpatch { + name = "export-bio_iov_iter_get_pages.patch"; + url = "https://evilpiepirate.org/git/bcachefs.git/patch/?id=bd8be01aa04eb9cc33fcdce89ac6e0fac0ae0fcf"; + sha256 = "0h5z98krx8077wwhiqp3bwc1h4nwnifxsn8mpxr2lcxnqmky3hz0"; + }; } + ]; + extraMeta = { branch = "master"; hydraPlatforms = []; # Should the testing kernels ever be built on Hydra? diff --git a/pkgs/os-specific/linux/kernel/patches.nix b/pkgs/os-specific/linux/kernel/patches.nix index 4c338b37deca..e02cd0545a4c 100644 --- a/pkgs/os-specific/linux/kernel/patches.nix +++ b/pkgs/os-specific/linux/kernel/patches.nix @@ -57,4 +57,8 @@ rec { sha256 = "1l8xq02rd7vakxg52xm9g4zng0ald866rpgm8kjlh88mwwyjkrwv"; }; }; + + # Fix kernel OOPS on boot: https://github.com/NixOS/nixpkgs/issues/60126 + # Remove with the next release. + i2c-oops = { name = "i2c-oops"; patch = ./i2c-oops.patch; }; } diff --git a/pkgs/os-specific/linux/kexectools/default.nix b/pkgs/os-specific/linux/kexectools/default.nix index d68e538d6714..bb96e5dea576 100644 --- a/pkgs/os-specific/linux/kexectools/default.nix +++ b/pkgs/os-specific/linux/kexectools/default.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { hardeningDisable = [ "format" "pic" "relro" "pie" ]; configureFlags = [ "BUILD_CC=${buildPackages.stdenv.cc.targetPrefix}cc" ]; - nativeBuildInputs = [ buildPackages.stdenv.cc ]; + depsBuildBuild = [ buildPackages.stdenv.cc ]; buildInputs = [ zlib ]; meta = with stdenv.lib; { diff --git a/pkgs/os-specific/linux/mxu11x0/default.nix b/pkgs/os-specific/linux/mxu11x0/default.nix index 1bf7c8467326..76e60ec80ff5 100644 --- a/pkgs/os-specific/linux/mxu11x0/default.nix +++ b/pkgs/os-specific/linux/mxu11x0/default.nix @@ -1,13 +1,11 @@ -{ stdenv, fetchFromGitHub, kernel }: +{ stdenv, fetchurl, kernel }: stdenv.mkDerivation { - name = "mxu11x0-1.3.11+git2017-07-13-${kernel.version}"; + name = "mxu11x0-1.4-${kernel.version}"; - src = fetchFromGitHub { - owner = "ellysh"; - repo = "mxu11x0"; - rev = "cbbb5ec2045939209117cb5fcd6c7c23bcc109ef"; - sha256 = "0wf44pnz5aclvg2k1f8ljnwws8hh6191i5h06nz95ijbxhwz63w4"; + src = fetchurl { + url = "https://www.moxa.com/Moxa/media/PDIM/S100000385/moxa-uport-1000-series-linux-3.x-and-4.x-for-uport-11x0-series-driver-v1.4.tgz"; + sha256 = "1hz9ygabbp8pv49k1j4qcsr0v3zw9xy0bh1akqgxp5v29gbdgxjl"; }; preBuild = '' @@ -30,10 +28,9 @@ stdenv.mkDerivation { meta = with stdenv.lib; { description = "MOXA UPort 11x0 USB to Serial Hub driver"; - homepage = https://github.com/ellysh/mxu11x0; - license = licenses.gpl1; + homepage = https://www.moxa.com/en/products/industrial-edge-connectivity/usb-to-serial-converters-usb-hubs/usb-to-serial-converters/uport-1000-series; + license = licenses.gpl2Plus; maintainers = with maintainers; [ uralbash ]; platforms = platforms.linux; - broken = versionOlder kernel.version "4.9" || !versionOlder kernel.version "4.13"; }; } diff --git a/pkgs/os-specific/linux/sysdig/default.nix b/pkgs/os-specific/linux/sysdig/default.nix index 33f1bbdd893f..87cc4db640e3 100644 --- a/pkgs/os-specific/linux/sysdig/default.nix +++ b/pkgs/os-specific/linux/sysdig/default.nix @@ -1,22 +1,22 @@ { stdenv, fetchFromGitHub, cmake, kernel -, luajit, zlib, ncurses, perl, jsoncpp, libb64, openssl, curl, jq, gcc, elfutils, tbb +, luajit, zlib, ncurses, perl, jsoncpp, libb64, openssl, curl, jq, gcc, elfutils, tbb, c-ares, protobuf, grpc }: with stdenv.lib; stdenv.mkDerivation rec { name = "sysdig-${version}"; - version = "0.24.2"; + version = "0.25"; src = fetchFromGitHub { owner = "draios"; repo = "sysdig"; rev = version; - sha256 = "16gz6gcp0zfhrqldw9cms38w0x5h3qhlx64dayqgsqbkw914b31a"; + sha256 = "1591jz4fmgk5r3q410h771nzhv6wfqpnr7pn34kpc5rl0vhky37m"; }; nativeBuildInputs = [ cmake perl ]; buildInputs = [ - zlib luajit ncurses jsoncpp libb64 openssl curl jq gcc elfutils tbb + zlib luajit ncurses jsoncpp libb64 openssl curl jq gcc elfutils tbb c-ares protobuf grpc ] ++ optional (kernel != null) kernel.moduleBuildDependencies; hardeningDisable = [ "pic" ]; diff --git a/pkgs/os-specific/linux/wpa_supplicant/default.nix b/pkgs/os-specific/linux/wpa_supplicant/default.nix index 8b8c23739c22..b2851116ce8e 100644 --- a/pkgs/os-specific/linux/wpa_supplicant/default.nix +++ b/pkgs/os-specific/linux/wpa_supplicant/default.nix @@ -4,13 +4,13 @@ with stdenv.lib; stdenv.mkDerivation rec { - version = "2.7"; + version = "2.8"; name = "wpa_supplicant-${version}"; src = fetchurl { url = "https://w1.fi/releases/${name}.tar.gz"; - sha256 = "0x1hqyahq44jyla8jl6791nnwrgicrhidadikrnqxsm2nw36pskn"; + sha256 = "15ixzm347n8w6gdvi3j3yks3i15qmp6by9ayvswm34d929m372d6"; }; # TODO: Patch epoll so that the dbus actually responds @@ -81,14 +81,6 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkgconfig ]; - patches = [ - (fetchpatch { - name = "build-fix.patch"; - url = "https://gitweb.gentoo.org/repo/gentoo.git/plain/net-wireless/wpa_supplicant/files/wpa_supplicant-2.7-fix-undefined-remove-ie.patch?id=e0288112138a70a8acc3ae0196772fd7ccb677ce"; - sha256 = "0ysazfcyn195mvkb1v10mgzzmpmqgv5kwqxwzfbsfhzq5bbaihld"; - }) - ]; - postInstall = '' mkdir -p $out/share/man/man5 $out/share/man/man8 cp -v "doc/docbook/"*.5 $out/share/man/man5/ diff --git a/pkgs/servers/dex/default.nix b/pkgs/servers/dex/default.nix index 119d5f03f626..1f9c2c9cb77f 100644 --- a/pkgs/servers/dex/default.nix +++ b/pkgs/servers/dex/default.nix @@ -1,17 +1,16 @@ { lib, buildGoPackage, fetchFromGitHub }: -let version = "2.4.1"; in - buildGoPackage rec { - name = "dex-${version}"; + pname = "dex"; + version = "2.16.0"; - goPackagePath = "github.com/coreos/dex"; + goPackagePath = "github.com/dexidp/dex"; src = fetchFromGitHub { rev = "v${version}"; - owner = "coreos"; - repo = "dex"; - sha256 = "11qpn3wh74mq16xgl9l50n2v02ffqcd14xccf77j5il04xr764nx"; + owner = "dexidp"; + repo = pname; + sha256 = "0w8nl7inqp4grbaq320dgynmznbrln8vihd799dwb2cx86laxsi1"; }; subPackages = [ @@ -22,10 +21,15 @@ buildGoPackage rec { "-ldflags=-w -X ${goPackagePath}/version.Version=${src.rev}" ]; + postInstall = '' + mkdir -p $out/share + cp -r go/src/${goPackagePath}/web $out/share/web + ''; + meta = { description = "OpenID Connect and OAuth2 identity provider with pluggable connectors"; license = lib.licenses.asl20; - homepage = https://github.com/coreos/dex; + homepage = https://github.com/dexidp/dex; maintainers = with lib.maintainers; [benley]; platforms = lib.platforms.unix; }; diff --git a/pkgs/servers/dns/bind/default.nix b/pkgs/servers/dns/bind/default.nix index 39589b3698fb..683eacee61a3 100644 --- a/pkgs/servers/dns/bind/default.nix +++ b/pkgs/servers/dns/bind/default.nix @@ -8,14 +8,14 @@ assert enableSeccomp -> libseccomp != null; assert enablePython -> python3 != null; -let version = "9.12.3-P4"; in +let version = "9.12.4-P1"; in stdenv.mkDerivation rec { name = "bind-${version}"; src = fetchurl { url = "https://ftp.isc.org/isc/bind9/${version}/${name}.tar.gz"; - sha256 = "01pj47z5582rd538dmbzf1msw4jc8j4zr0zx4ciy88r6qr9l80fi"; + sha256 = "1if7zc5gzrfd28csc63v9bjwrc0rgvm1x9yx058946hc5gp5lyp2"; }; outputs = [ "out" "lib" "dev" "man" "dnsutils" "host" ]; diff --git a/pkgs/servers/monitoring/cadvisor/default.nix b/pkgs/servers/monitoring/cadvisor/default.nix index 6422d7238037..502a3026b2ae 100644 --- a/pkgs/servers/monitoring/cadvisor/default.nix +++ b/pkgs/servers/monitoring/cadvisor/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { name = "cadvisor-${version}"; - version = "0.33.0"; + version = "0.33.1"; src = fetchFromGitHub { owner = "google"; repo = "cadvisor"; rev = "v${version}"; - sha256 = "14v4xjycr34kvilidhhavc8yvhkxb7mxc9qd56jd1x2c42lfna8k"; + sha256 = "15wddg0xwkz42n5y2f72yq3imhbvnp83g1jq6p81ddw9qzbz62zs"; }; nativeBuildInputs = [ go ]; diff --git a/pkgs/servers/plex/default.nix b/pkgs/servers/plex/default.nix index c157fccad503..1332edbab45f 100644 --- a/pkgs/servers/plex/default.nix +++ b/pkgs/servers/plex/default.nix @@ -1,81 +1,102 @@ -{ config, stdenv, fetchurl, rpmextract, glibc -, dataDir ? "/var/lib/plex" # Plex's data directory must be baked into the package due to symlinks. -, enablePlexPass ? config.plex.enablePlexPass or false +# The actual Plex package that we run is a FHS userenv of the "raw" package. +{ stdenv +, buildFHSUserEnv +, writeScript +, plexRaw + +# Old argument for overriding the Plex data directory; isn't necessary for this +# version of Plex to function, but still around for backwards-compatibility. +, dataDir ? "/var/lib/plex" }: -let - plexPass = throw "Plex pass has been removed at upstream's request; please unset nixpkgs.config.plex.pass"; - plexpkg = if enablePlexPass then plexPass else { - version = "1.15.3.876"; - vsnHash = "ad6e39743"; - sha256 = "01g7wccm01kg3nhf3qrmwcn20nkpv0bqz6zqv2gq5v03ps58h6g5"; - }; +buildFHSUserEnv rec { + name = "plexmediaserver"; + inherit (plexRaw) meta; -in stdenv.mkDerivation rec { - name = "plex-${version}"; - version = plexpkg.version; - vsnHash = plexpkg.vsnHash; - sha256 = plexpkg.sha256; + # This script is run when we start our Plex binary + runScript = writeScript "plex-run-script" '' + #!${stdenv.shell} - src = fetchurl { - url = "https://downloads.plex.tv/plex-media-server-new/${version}-${vsnHash}/redhat/plexmediaserver-${version}-${vsnHash}.x86_64.rpm"; - inherit sha256; - }; + set -eu - buildInputs = [ rpmextract glibc ]; + # The root path to our Plex installation + root=${plexRaw}/lib/plexmediaserver - phases = [ "unpackPhase" "installPhase" "fixupPhase" "distPhase" ]; + # Path to where we're storing our Plex data files. We default to storing + # them in the user's home directory under the XDG-compatible location, but + # allow overriding with an environment variable so the location can be + # configured in our NixOS module. + # + # NOTE: the old version of Plex used /var/lib/plex as the default location, + # but this package shouldn't assume that we're going to run Plex with the + # ability to write to /var/lib, so using a subdirectory of $HOME when none + # is specified feels less likely to have permission errors. + if [[ -z "''${PLEX_DATADIR:-}" ]]; then + PLEX_DATADIR="$HOME/.local/share/plex" + fi + if [[ ! -d "$PLEX_DATADIR" ]]; then + echo "Creating Plex data directory: $PLEX_DATADIR" + mkdir -p "$PLEX_DATADIR" + fi - unpackPhase = '' - rpmextract $src - ''; + # The database is stored under the given directory + db="$PLEX_DATADIR/.skeleton/com.plexapp.plugins.library.db" - installPhase = '' - install -d $out/usr/lib - cp -dr --no-preserve='ownership' usr/lib/plexmediaserver $out/usr/lib/ - - # Now we need to patch up the executables and libraries to work on Nix. - # Side note: PLEASE don't put spaces in your binary names. This is stupid. - for bin in "Plex Media Server" \ - "Plex Commercial Skipper" \ - "Plex DLNA Server" \ - "Plex Media Scanner" \ - "Plex Relay" \ - "Plex Script Host" \ - "Plex Transcoder" \ - "Plex Tuner Service" ; do - patchelf --set-interpreter "${glibc.out}/lib/ld-linux-x86-64.so.2" "$out/usr/lib/plexmediaserver/$bin" - patchelf --set-rpath "$out/usr/lib/plexmediaserver/lib" "$out/usr/lib/plexmediaserver/$bin" - done - - find $out/usr/lib/plexmediaserver/Resources -type f -a -perm -0100 \ - -print -exec patchelf --set-interpreter "${glibc.out}/lib/ld-linux-x86-64.so.2" '{}' \; - - # Our next problem is the "Resources" directory in /usr/lib/plexmediaserver. - # This is ostensibly a skeleton directory, which contains files that Plex - # copies into its folder in /var. Unfortunately, there are some SQLite - # databases in the directory that are opened at startup. Since these - # database files are read-only, SQLite chokes and Plex fails to start. To - # solve this, we keep the resources directory in the Nix store, but we - # rename the database files and replace the originals with symlinks to - # /var/lib/plex. Then, in the systemd unit, the base database files are - # copied to /var/lib/plex before starting Plex. - RSC=$out/usr/lib/plexmediaserver/Resources - for db in "com.plexapp.plugins.library.db"; do - mv $RSC/$db $RSC/base_$db - ln -s "${dataDir}/.skeleton/$db" $RSC/$db - done - ''; + # If we don't have a database in the expected path, then create one by + # copying our base database to that location. + if ! test -f "$db"; then + echo "Copying base database file to: $db" + mkdir -p "$(dirname "$db")" + cat "${plexRaw.basedb}" > "$db" + fi + + # Set up symbolic link at '/db', which is linked to by our Plex package + # (see the 'plexRaw' package). + ln -s "$db" /db + + # If we have a plugin list (set by our NixOS module), we create plugins in + # the data directory as expected. This is a colon-separated list of paths. + if [[ -n "''${PLEX_PLUGINS:-}" ]]; then + echo "Preparing plugin directory" + + pluginDir="$PLEX_DATADIR/Plex Media Server/Plug-ins" + test -d "$pluginDir" || mkdir -p "$pluginDir" - meta = with stdenv.lib; { - homepage = https://plex.tv/; - license = licenses.unfree; - platforms = platforms.linux; - maintainers = with stdenv.lib.maintainers; [ colemickens forkk thoughtpolice pjones lnl7 ]; - description = "Media / DLNA server"; - longDescription = '' - Plex is a media server which allows you to store your media and play it - back across many different devices. - ''; - }; + # First, remove all of the symlinks in the plugins directory. + echo "Removing old symlinks" + for f in $(ls "$pluginDir/"); do + if [[ -L "$pluginDir/$f" ]]; then + echo "Removing plugin symlink: $pluginDir/$f" + rm "$pluginDir/$f" + fi + done + + echo "Symlinking plugins" + IFS=':' read -ra pluginsArray <<< "$PLEX_PLUGINS" + for path in "''${pluginsArray[@]}"; do + dest="$pluginDir/$(basename "$path")" + + if [[ ! -d "$path" ]]; then + echo "Error symlinking plugin from $path: no such directory" + elif [[ -d "$dest" || -L "$dest" ]]; then + echo "Error symlinking plugin from $path to $dest: file or directory already exists" + else + echo "Symlinking plugin at: $path" + ln -s "$path" "$dest" + fi + done + fi + + # Tell Plex to use the data directory as the "Application Support" + # directory, otherwise it tries to write things into the user's home + # directory. + export PLEX_MEDIA_SERVER_APPLICATION_SUPPORT_DIR="$PLEX_DATADIR" + + # Tell Plex where the 'home' directory for itself is. + export PLEX_MEDIA_SERVER_HOME="${plexRaw}/lib/plexmediaserver" + + # Actually run Plex, prepending LD_LIBRARY_PATH with the libraries from + # the Plex package. + LD_LIBRARY_PATH=$LD_LIBRARY_PATH:$root exec "$root/Plex Media Server" + ''; } diff --git a/pkgs/servers/plex/raw.nix b/pkgs/servers/plex/raw.nix new file mode 100644 index 000000000000..de81235c26f3 --- /dev/null +++ b/pkgs/servers/plex/raw.nix @@ -0,0 +1,70 @@ +{ stdenv +, fetchurl +, rpmextract +}: + +# The raw package that fetches and extracts the Plex RPM. Override the source +# and version of this derivation if you want to use a Plex Pass version of the +# server, and the FHS userenv and corresponding NixOS module should +# automatically pick up the changes. +stdenv.mkDerivation rec { + version = "1.15.3.876-ad6e39743"; + pname = "plexmediaserver"; + name = "${pname}-${version}"; + + # Fetch the source + src = fetchurl { + url = "https://downloads.plex.tv/plex-media-server-new/${version}/redhat/plexmediaserver-${version}.x86_64.rpm"; + sha256 = "01g7wccm01kg3nhf3qrmwcn20nkpv0bqz6zqv2gq5v03ps58h6g5"; + }; + + outputs = [ "out" "basedb" ]; + + nativeBuildInputs = [ rpmextract ]; + + phases = [ "unpackPhase" "installPhase" "fixupPhase" "distPhase" ]; + + unpackPhase = '' + rpmextract $src + ''; + + installPhase = '' + mkdir -p "$out/lib" + cp -dr --no-preserve='ownership' usr/lib/plexmediaserver $out/lib/ + + # Location of the initial Plex plugins database + f=$out/lib/plexmediaserver/Resources/com.plexapp.plugins.library.db + + # Store the base database in the 'basedb' output + cat $f > $basedb + + # Overwrite the base database in the Plex package with an absolute symlink + # to the '/db' file; we create this path in the FHS userenv (see the "plex" + # package). + ln -fs /db $f + ''; + + # We're running in a FHS userenv; don't patch anything + dontPatchShebangs = true; + dontStrip = true; + dontPatchELF = true; + dontAutoPatchelf = true; + + meta = with stdenv.lib; { + homepage = https://plex.tv/; + license = licenses.unfree; + platforms = platforms.linux; + maintainers = with maintainers; [ + colemickens + forkk + lnl7 + pjones + thoughtpolice + ]; + description = "Media library streaming server"; + longDescription = '' + Plex is a media server which allows you to store your media and play it + back across many different devices. + ''; + }; +} diff --git a/pkgs/servers/sql/postgresql/ext/plv8.nix b/pkgs/servers/sql/postgresql/ext/plv8.nix index dae3b2fd1af1..b6446f292c6c 100644 --- a/pkgs/servers/sql/postgresql/ext/plv8.nix +++ b/pkgs/servers/sql/postgresql/ext/plv8.nix @@ -1,8 +1,8 @@ { stdenv, fetchFromGitHub, v8, perl, postgresql }: stdenv.mkDerivation rec { - name = "plv8-${version}"; - version = "2.3.8"; + pname = "plv8"; + version = "2.3.11"; nativeBuildInputs = [ perl ]; buildInputs = [ v8 postgresql ]; @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { owner = "plv8"; repo = "plv8"; rev = "v${version}"; - sha256 = "0hrmn1zzzdf52zwldg6axv57p0f3b279l9s8lbpijcv60fqrzx16"; + sha256 = "0bv2b8xxdqqhj6nwyc8kwhi5m5i7i1yl078sk3bnnc84b0mnza5x"; }; makeFlags = [ "--makefile=Makefile.shared" ]; diff --git a/pkgs/servers/sql/postgresql/ext/timescaledb.nix b/pkgs/servers/sql/postgresql/ext/timescaledb.nix index 3c53054ba7de..9a664bc25188 100644 --- a/pkgs/servers/sql/postgresql/ext/timescaledb.nix +++ b/pkgs/servers/sql/postgresql/ext/timescaledb.nix @@ -8,7 +8,7 @@ stdenv.mkDerivation rec { name = "timescaledb-${version}"; - version = "1.0.0"; + version = "1.2.2"; nativeBuildInputs = [ cmake ]; buildInputs = [ postgresql openssl ]; @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { owner = "timescale"; repo = "timescaledb"; rev = "refs/tags/${version}"; - sha256 = "1359jc0dw8q3f0iipqfadzs8lvri9qa5w59ziz00x1d09ppw2q40"; + sha256 = "1fb1ab07jmgd1drinl25mbhwx966f75c7i7nh3ah0xf3cbk298xr"; }; # Fix the install phase which tries to install into the pgsql extension dir, @@ -28,7 +28,7 @@ stdenv.mkDerivation rec { --replace 'DESTINATION "''${PG_SHAREDIR}/extension"' "DESTINATION \"$out/share/extension\"" done - for x in src/CMakeLists.txt src/loader/CMakeLists.txt; do + for x in src/CMakeLists.txt src/loader/CMakeLists.txt tsl/src/CMakeLists.txt; do substituteInPlace "$x" \ --replace 'DESTINATION ''${PG_PKGLIBDIR}' "DESTINATION \"$out/lib\"" done @@ -45,7 +45,7 @@ stdenv.mkDerivation rec { description = "Scales PostgreSQL for time-series data via automatic partitioning across time and space"; homepage = https://www.timescale.com/; maintainers = with maintainers; [ volth ]; - platforms = platforms.linux; + platforms = postgresql.meta.platforms; license = licenses.asl20; }; } diff --git a/pkgs/shells/rush/default.nix b/pkgs/shells/rush/default.nix index 3bfafdc46a03..3063e991d98a 100644 --- a/pkgs/shells/rush/default.nix +++ b/pkgs/shells/rush/default.nix @@ -1,17 +1,14 @@ { fetchurl, stdenv }: stdenv.mkDerivation rec { - name = "rush-1.8"; + pname = "rush"; + version = "1.9"; src = fetchurl { - url = "mirror://gnu/rush/${name}.tar.gz"; - sha256 = "1vxdb81ify4xcyygh86250pi50krb16dkj42i5ii4ns3araiwckz"; + url = "mirror://gnu/${pname}/${pname}-${version}.tar.gz"; + sha256 = "12x7dyi9vl3lwlv618156nzpi5s0li93wcx2c26h4z7la20yq2yk"; }; - patches = [ ./fix-format-security-error.patch - ./intprops.patch - ]; - doCheck = true; meta = { diff --git a/pkgs/shells/rush/fix-format-security-error.patch b/pkgs/shells/rush/fix-format-security-error.patch deleted file mode 100644 index ed3ad0aa4c1f..000000000000 --- a/pkgs/shells/rush/fix-format-security-error.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -Nur rush-1.8.orig/lib/wordsplit.c rush-1.8/lib/wordsplit.c ---- rush-1.8.orig/lib/wordsplit.c 2016-08-18 20:11:43.000000000 +0200 -+++ rush-1.8/lib/wordsplit.c 2016-11-14 14:37:02.976177414 +0100 -@@ -2330,7 +2330,7 @@ - break; - - default: -- wsp->ws_error (wordsplit_strerror (wsp)); -+ wsp->ws_error ("%s", wordsplit_strerror (wsp)); - } - } - diff --git a/pkgs/shells/rush/intprops.patch b/pkgs/shells/rush/intprops.patch deleted file mode 100644 index 947cb0b9ab9f..000000000000 --- a/pkgs/shells/rush/intprops.patch +++ /dev/null @@ -1,257 +0,0 @@ -Description: Update to latest intprops.h from gnulib, fixes FTBFS with gcc 7 -Author: Adrian Bunk <bunk@debian.org> -Bug-Debian: https://bugs.debian.org/853649 - ---- rush-1.8+dfsg.orig/gnu/intprops.h -+++ rush-1.8+dfsg/gnu/intprops.h -@@ -1,20 +1,18 @@ --/* -*- buffer-read-only: t -*- vi: set ro: */ --/* DO NOT EDIT! GENERATED AUTOMATICALLY! */ - /* intprops.h -- properties of integer types - -- Copyright (C) 2001-2016 Free Software Foundation, Inc. -+ Copyright (C) 2001-2017 Free Software Foundation, Inc. - - This program is free software: you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published -- by the Free Software Foundation; either version 3 of the License, or -+ under the terms of the GNU Lesser General Public License as published -+ by the Free Software Foundation; either version 2.1 of the License, or - (at your option) any later version. - - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -- GNU General Public License for more details. -+ GNU Lesser General Public License for more details. - -- You should have received a copy of the GNU General Public License -+ You should have received a copy of the GNU Lesser General Public License - along with this program. If not, see <http://www.gnu.org/licenses/>. */ - - /* Written by Paul Eggert. */ -@@ -23,7 +21,6 @@ - #define _GL_INTPROPS_H - - #include <limits.h> --#include <verify.h> - - /* Return a value with the common real type of E and V and the value of V. */ - #define _GL_INT_CONVERT(e, v) (0 * (e) + (v)) -@@ -49,12 +46,16 @@ - - /* Minimum and maximum values for integer types and expressions. */ - -+/* The width in bits of the integer type or expression T. -+ Padding bits are not supported; this is checked at compile-time below. */ -+#define TYPE_WIDTH(t) (sizeof (t) * CHAR_BIT) -+ - /* The maximum and minimum values for the integer type T. */ - #define TYPE_MINIMUM(t) ((t) ~ TYPE_MAXIMUM (t)) - #define TYPE_MAXIMUM(t) \ - ((t) (! TYPE_SIGNED (t) \ - ? (t) -1 \ -- : ((((t) 1 << (sizeof (t) * CHAR_BIT - 2)) - 1) * 2 + 1))) -+ : ((((t) 1 << (TYPE_WIDTH (t) - 2)) - 1) * 2 + 1))) - - /* The maximum and minimum values for the type of the expression E, - after integer promotion. E should not have side effects. */ -@@ -67,29 +68,23 @@ - ? _GL_SIGNED_INT_MAXIMUM (e) \ - : _GL_INT_NEGATE_CONVERT (e, 1)) - #define _GL_SIGNED_INT_MAXIMUM(e) \ -- (((_GL_INT_CONVERT (e, 1) << (sizeof ((e) + 0) * CHAR_BIT - 2)) - 1) * 2 + 1) -+ (((_GL_INT_CONVERT (e, 1) << (TYPE_WIDTH ((e) + 0) - 2)) - 1) * 2 + 1) -+ -+/* Work around OpenVMS incompatibility with C99. */ -+#if !defined LLONG_MAX && defined __INT64_MAX -+# define LLONG_MAX __INT64_MAX -+# define LLONG_MIN __INT64_MIN -+#endif - - /* This include file assumes that signed types are two's complement without - padding bits; the above macros have undefined behavior otherwise. - If this is a problem for you, please let us know how to fix it for your host. -- As a sanity check, test the assumption for some signed types that -- <limits.h> bounds. */ --verify (TYPE_MINIMUM (signed char) == SCHAR_MIN); --verify (TYPE_MAXIMUM (signed char) == SCHAR_MAX); --verify (TYPE_MINIMUM (short int) == SHRT_MIN); --verify (TYPE_MAXIMUM (short int) == SHRT_MAX); --verify (TYPE_MINIMUM (int) == INT_MIN); --verify (TYPE_MAXIMUM (int) == INT_MAX); --verify (TYPE_MINIMUM (long int) == LONG_MIN); --verify (TYPE_MAXIMUM (long int) == LONG_MAX); --#ifdef LLONG_MAX --verify (TYPE_MINIMUM (long long int) == LLONG_MIN); --verify (TYPE_MAXIMUM (long long int) == LLONG_MAX); --#endif -+ This assumption is tested by the intprops-tests module. */ - - /* Does the __typeof__ keyword work? This could be done by - 'configure', but for now it's easier to do it by hand. */ --#if (2 <= __GNUC__ || defined __IBM__TYPEOF__ \ -+#if (2 <= __GNUC__ \ -+ || (1210 <= __IBMC__ && defined __IBM__TYPEOF__) \ - || (0x5110 <= __SUNPRO_C && !__STDC__)) - # define _GL_HAVE___TYPEOF__ 1 - #else -@@ -118,8 +113,7 @@ verify (TYPE_MAXIMUM (long long int) == - signed, this macro may overestimate the true bound by one byte when - applied to unsigned types of size 2, 4, 16, ... bytes. */ - #define INT_STRLEN_BOUND(t) \ -- (INT_BITS_STRLEN_BOUND (sizeof (t) * CHAR_BIT \ -- - _GL_SIGNED_TYPE_OR_EXPR (t)) \ -+ (INT_BITS_STRLEN_BOUND (TYPE_WIDTH (t) - _GL_SIGNED_TYPE_OR_EXPR (t)) \ - + _GL_SIGNED_TYPE_OR_EXPR (t)) - - /* Bound on buffer size needed to represent an integer type or expression T, -@@ -224,20 +218,27 @@ verify (TYPE_MAXIMUM (long long int) == - ? (a) < (min) >> (b) \ - : (max) >> (b) < (a)) - --/* True if __builtin_add_overflow (A, B, P) works when P is null. */ --#define _GL_HAS_BUILTIN_OVERFLOW_WITH_NULL (7 <= __GNUC__) -+/* True if __builtin_add_overflow (A, B, P) works when P is non-null. */ -+#if 5 <= __GNUC__ && !defined __ICC -+# define _GL_HAS_BUILTIN_OVERFLOW 1 -+#else -+# define _GL_HAS_BUILTIN_OVERFLOW 0 -+#endif -+ -+/* True if __builtin_add_overflow_p (A, B, C) works. */ -+#define _GL_HAS_BUILTIN_OVERFLOW_P (7 <= __GNUC__) - - /* The _GL*_OVERFLOW macros have the same restrictions as the - *_RANGE_OVERFLOW macros, except that they do not assume that operands - (e.g., A and B) have the same type as MIN and MAX. Instead, they assume - that the result (e.g., A + B) has that type. */ --#if _GL_HAS_BUILTIN_OVERFLOW_WITH_NULL --# define _GL_ADD_OVERFLOW(a, b, min, max) -- __builtin_add_overflow (a, b, (__typeof__ ((a) + (b)) *) 0) --# define _GL_SUBTRACT_OVERFLOW(a, b, min, max) -- __builtin_sub_overflow (a, b, (__typeof__ ((a) - (b)) *) 0) --# define _GL_MULTIPLY_OVERFLOW(a, b, min, max) -- __builtin_mul_overflow (a, b, (__typeof__ ((a) * (b)) *) 0) -+#if _GL_HAS_BUILTIN_OVERFLOW_P -+# define _GL_ADD_OVERFLOW(a, b, min, max) \ -+ __builtin_add_overflow_p (a, b, (__typeof__ ((a) + (b))) 0) -+# define _GL_SUBTRACT_OVERFLOW(a, b, min, max) \ -+ __builtin_sub_overflow_p (a, b, (__typeof__ ((a) - (b))) 0) -+# define _GL_MULTIPLY_OVERFLOW(a, b, min, max) \ -+ __builtin_mul_overflow_p (a, b, (__typeof__ ((a) * (b))) 0) - #else - # define _GL_ADD_OVERFLOW(a, b, min, max) \ - ((min) < 0 ? INT_ADD_RANGE_OVERFLOW (a, b, min, max) \ -@@ -317,7 +318,7 @@ verify (TYPE_MAXIMUM (long long int) == - _GL_BINARY_OP_OVERFLOW (a, b, _GL_ADD_OVERFLOW) - #define INT_SUBTRACT_OVERFLOW(a, b) \ - _GL_BINARY_OP_OVERFLOW (a, b, _GL_SUBTRACT_OVERFLOW) --#if _GL_HAS_BUILTIN_OVERFLOW_WITH_NULL -+#if _GL_HAS_BUILTIN_OVERFLOW_P - # define INT_NEGATE_OVERFLOW(a) INT_SUBTRACT_OVERFLOW (0, a) - #else - # define INT_NEGATE_OVERFLOW(a) \ -@@ -351,10 +352,6 @@ verify (TYPE_MAXIMUM (long long int) == - #define INT_MULTIPLY_WRAPV(a, b, r) \ - _GL_INT_OP_WRAPV (a, b, r, *, __builtin_mul_overflow, INT_MULTIPLY_OVERFLOW) - --#ifndef __has_builtin --# define __has_builtin(x) 0 --#endif -- - /* Nonzero if this compiler has GCC bug 68193 or Clang bug 25390. See: - https://gcc.gnu.org/bugzilla/show_bug.cgi?id=68193 - https://llvm.org/bugs/show_bug.cgi?id=25390 -@@ -371,17 +368,17 @@ verify (TYPE_MAXIMUM (long long int) == - the operation. BUILTIN is the builtin operation, and OVERFLOW the - overflow predicate. Return 1 if the result overflows. See above - for restrictions. */ --#if 5 <= __GNUC__ || __has_builtin (__builtin_add_overflow) -+#if _GL_HAS_BUILTIN_OVERFLOW - # define _GL_INT_OP_WRAPV(a, b, r, op, builtin, overflow) builtin (a, b, r) - #elif 201112 <= __STDC_VERSION__ && !_GL__GENERIC_BOGUS - # define _GL_INT_OP_WRAPV(a, b, r, op, builtin, overflow) \ - (_Generic \ - (*(r), \ - signed char: \ -- _GL_INT_OP_CALC (a, b, r, op, overflow, unsigned char, \ -+ _GL_INT_OP_CALC (a, b, r, op, overflow, unsigned int, \ - signed char, SCHAR_MIN, SCHAR_MAX), \ - short int: \ -- _GL_INT_OP_CALC (a, b, r, op, overflow, unsigned short int, \ -+ _GL_INT_OP_CALC (a, b, r, op, overflow, unsigned int, \ - short int, SHRT_MIN, SHRT_MAX), \ - int: \ - _GL_INT_OP_CALC (a, b, r, op, overflow, unsigned int, \ -@@ -395,10 +392,10 @@ verify (TYPE_MAXIMUM (long long int) == - #else - # define _GL_INT_OP_WRAPV(a, b, r, op, builtin, overflow) \ - (sizeof *(r) == sizeof (signed char) \ -- ? _GL_INT_OP_CALC (a, b, r, op, overflow, unsigned char, \ -+ ? _GL_INT_OP_CALC (a, b, r, op, overflow, unsigned int, \ - signed char, SCHAR_MIN, SCHAR_MAX) \ - : sizeof *(r) == sizeof (short int) \ -- ? _GL_INT_OP_CALC (a, b, r, op, overflow, unsigned short int, \ -+ ? _GL_INT_OP_CALC (a, b, r, op, overflow, unsigned int, \ - short int, SHRT_MIN, SHRT_MAX) \ - : sizeof *(r) == sizeof (int) \ - ? _GL_INT_OP_CALC (a, b, r, op, overflow, unsigned int, \ -@@ -414,15 +411,14 @@ verify (TYPE_MAXIMUM (long long int) == - # else - # define _GL_INT_OP_WRAPV_LONGISH(a, b, r, op, overflow) \ - _GL_INT_OP_CALC (a, b, r, op, overflow, unsigned long int, \ -- long int, LONG_MIN, LONG_MAX)) -+ long int, LONG_MIN, LONG_MAX) - # endif - #endif - - /* Store the low-order bits of A <op> B into *R, where the operation - is given by OP. Use the unsigned type UT for calculation to avoid -- overflow problems. *R's type is T, with extremal values TMIN and -- TMAX. T must be a signed integer type. Return 1 if the result -- overflows. */ -+ overflow problems. *R's type is T, with extrema TMIN and TMAX. -+ T must be a signed integer type. Return 1 if the result overflows. */ - #define _GL_INT_OP_CALC(a, b, r, op, overflow, ut, t, tmin, tmax) \ - (sizeof ((a) op (b)) < sizeof (t) \ - ? _GL_INT_OP_CALC1 ((t) (a), (t) (b), r, op, overflow, ut, t, tmin, tmax) \ -@@ -431,17 +427,27 @@ verify (TYPE_MAXIMUM (long long int) == - ((overflow (a, b) \ - || (EXPR_SIGNED ((a) op (b)) && ((a) op (b)) < (tmin)) \ - || (tmax) < ((a) op (b))) \ -- ? (*(r) = _GL_INT_OP_WRAPV_VIA_UNSIGNED (a, b, op, ut, t, tmin, tmax), 1) \ -- : (*(r) = _GL_INT_OP_WRAPV_VIA_UNSIGNED (a, b, op, ut, t, tmin, tmax), 0)) -+ ? (*(r) = _GL_INT_OP_WRAPV_VIA_UNSIGNED (a, b, op, ut, t), 1) \ -+ : (*(r) = _GL_INT_OP_WRAPV_VIA_UNSIGNED (a, b, op, ut, t), 0)) -+ -+/* Return the low-order bits of A <op> B, where the operation is given -+ by OP. Use the unsigned type UT for calculation to avoid undefined -+ behavior on signed integer overflow, and convert the result to type T. -+ UT is at least as wide as T and is no narrower than unsigned int, -+ T is two's complement, and there is no padding or trap representations. -+ Assume that converting UT to T yields the low-order bits, as is -+ done in all known two's-complement C compilers. E.g., see: -+ https://gcc.gnu.org/onlinedocs/gcc/Integers-implementation.html -+ -+ According to the C standard, converting UT to T yields an -+ implementation-defined result or signal for values outside T's -+ range. However, code that works around this theoretical problem -+ runs afoul of a compiler bug in Oracle Studio 12.3 x86. See: -+ http://lists.gnu.org/archive/html/bug-gnulib/2017-04/msg00049.html -+ As the compiler bug is real, don't try to work around the -+ theoretical problem. */ - --/* Return A <op> B, where the operation is given by OP. Use the -- unsigned type UT for calculation to avoid overflow problems. -- Convert the result to type T without overflow by subtracting TMIN -- from large values before converting, and adding it afterwards. -- Compilers can optimize all the operations except OP. */ --#define _GL_INT_OP_WRAPV_VIA_UNSIGNED(a, b, op, ut, t, tmin, tmax) \ -- (((ut) (a) op (ut) (b)) <= (tmax) \ -- ? (t) ((ut) (a) op (ut) (b)) \ -- : ((t) (((ut) (a) op (ut) (b)) - (tmin)) + (tmin))) -+#define _GL_INT_OP_WRAPV_VIA_UNSIGNED(a, b, op, ut, t) \ -+ ((t) ((ut) (a) op (ut) (b))) - - #endif /* _GL_INTPROPS_H */ diff --git a/pkgs/shells/zsh/oh-my-zsh/default.nix b/pkgs/shells/zsh/oh-my-zsh/default.nix index ab513f9b0ec0..68e13d085497 100644 --- a/pkgs/shells/zsh/oh-my-zsh/default.nix +++ b/pkgs/shells/zsh/oh-my-zsh/default.nix @@ -4,13 +4,13 @@ { stdenv, fetchgit }: stdenv.mkDerivation rec { - version = "2019-04-22"; + version = "2019-04-26"; name = "oh-my-zsh-${version}"; - rev = "f46476589aa092f75f5911fa4d6f65401a8d3577"; + rev = "f5b2d9c7ce8ced5a4ec67a4ecfa877e6951124ef"; src = fetchgit { inherit rev; url = "https://github.com/robbyrussell/oh-my-zsh"; - sha256 = "1zfqa39da867zxwsyms12qv4jxl1z7rgnr817hhh1xn62i4y41f2"; + sha256 = "17d837kyw16g91cnmdpdvhl2sgi3cb7fzligwwzjyp0y7kbiy3n4"; }; pathsToLink = [ "/share/oh-my-zsh" ]; diff --git a/pkgs/tools/X11/wpgtk/default.nix b/pkgs/tools/X11/wpgtk/default.nix index 897067774a9f..419004049396 100644 --- a/pkgs/tools/X11/wpgtk/default.nix +++ b/pkgs/tools/X11/wpgtk/default.nix @@ -3,13 +3,13 @@ python3Packages.buildPythonApplication rec { pname = "wpgtk"; - version = "6.0.3"; + version = "6.0.5"; src = fetchFromGitHub { owner = "deviantfero"; repo = "wpgtk"; rev = version; - sha256 = "1ma1d4h751qnxadfn42h29knq0rl1lgzraifx6ypidjph5i5a10l"; + sha256 = "00nrc6ad2y0ivics6gpg63s86m8014a79yjn1q6d905qx32kk9dr"; }; buildInputs = [ diff --git a/pkgs/tools/backup/restic/default.nix b/pkgs/tools/backup/restic/default.nix index 7b039f93a039..da44e389bdd5 100644 --- a/pkgs/tools/backup/restic/default.nix +++ b/pkgs/tools/backup/restic/default.nix @@ -2,7 +2,7 @@ buildGoPackage rec { name = "restic-${version}"; - version = "0.9.4"; + version = "0.9.5"; goPackagePath = "github.com/restic/restic"; @@ -10,7 +10,7 @@ buildGoPackage rec { owner = "restic"; repo = "restic"; rev = "v${version}"; - sha256 = "15lx01w46bwn3hjwpmm8xy71m7ml9wdwddbbfvmk5in61gv1acr5"; + sha256 = "1bhn3xwlycpnjg2qbqblwxn3apj43lr5cakgkmrblk13yfwfv5xv"; }; buildPhase = '' diff --git a/pkgs/tools/compression/pigz/default.nix b/pkgs/tools/compression/pigz/default.nix index 7d4cdc2df86d..1fabedaf62d8 100644 --- a/pkgs/tools/compression/pigz/default.nix +++ b/pkgs/tools/compression/pigz/default.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation { buildInputs = [zlib] ++ stdenv.lib.optional stdenv.isLinux utillinux; - makeFlags = [ "CC=cc" ]; + makeFlags = [ "CC=${stdenv.cc}/bin/${stdenv.cc.targetPrefix}cc" ]; doCheck = stdenv.isLinux; checkTarget = "tests"; diff --git a/pkgs/tools/filesystems/bcachefs-tools/default.nix b/pkgs/tools/filesystems/bcachefs-tools/default.nix index 2e9bdff2aa38..c33ae4e8304a 100644 --- a/pkgs/tools/filesystems/bcachefs-tools/default.nix +++ b/pkgs/tools/filesystems/bcachefs-tools/default.nix @@ -3,12 +3,12 @@ stdenv.mkDerivation rec { pname = "bcachefs-tools"; - version = "2019-03-13"; + version = "2019-04-04"; src = fetchgit { url = "https://evilpiepirate.org/git/bcachefs-tools.git"; - rev = "0894d547501fb9306ae7b1c669b66a7b49fb2205"; - sha256 = "1vwzwag413kzlij2f1hw1b8g592m40dr03zwkc8k5snbl4daiwr6"; + rev = "d13bbb2955f899f10be4ab315ad229d2951fdcda"; + sha256 = "0cjy12qjd572sbg8h4i18fn001p6a6ahc4ljwids58nv83q99ll3"; }; enableParallelBuilding = true; diff --git a/pkgs/tools/filesystems/bindfs/default.nix b/pkgs/tools/filesystems/bindfs/default.nix index a674de9ac49b..ebf5291f43a6 100644 --- a/pkgs/tools/filesystems/bindfs/default.nix +++ b/pkgs/tools/filesystems/bindfs/default.nix @@ -1,12 +1,12 @@ { stdenv, fetchurl, fuse, pkgconfig }: stdenv.mkDerivation rec { - version = "1.13.10"; + version = "1.13.11"; name = "bindfs-${version}"; src = fetchurl { url = "https://bindfs.org/downloads/${name}.tar.gz"; - sha256 = "14wfp2dcjm0f1pmqqvkf94k7pijbi8ka395cm3hryqpi4k0w3f4j"; + sha256 = "0ayadwlc6j1ba0n0dkry4iyp49nxkkj5l4dazzqybl5d5c4n605b"; }; dontStrip = true; diff --git a/pkgs/tools/filesystems/rmount/default.nix b/pkgs/tools/filesystems/rmount/default.nix new file mode 100644 index 000000000000..cdc90097653f --- /dev/null +++ b/pkgs/tools/filesystems/rmount/default.nix @@ -0,0 +1,32 @@ +{ stdenv, nmap, jq, cifs-utils, sshfs, fetchFromGitHub, makeWrapper }: + +stdenv.mkDerivation rec { + + pname = "rmount"; + version = "1.0.1"; + + src = fetchFromGitHub rec { + rev = "v${version}"; + owner = "Luis-Hebendanz"; + repo = "rmount"; + sha256 = "1wjmfvbsq3126z51f2ivj85cjmkrzdm2acqsiyqs57qga2g6w5p9"; + }; + + buildInputs = [ makeWrapper ]; + + installPhase = '' + install -D ${src}/rmount.man $out/share/man/man1/rmount.1 + install -D ${src}/rmount.bash $out/bin/rmount + install -D ${src}/config.json $out/share/config.json + + wrapProgram $out/bin/rmount --prefix PATH : ${stdenv.lib.makeBinPath [ nmap jq cifs-utils sshfs ]} + ''; + + meta = with stdenv.lib; { + homepage = https://github.com/Luis-Hebendanz/rmount; + description = "Remote mount utility which parses a json file"; + license = licenses.mit; + maintainers = [ maintainers.luis ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/tools/misc/mpdscribble/default.nix b/pkgs/tools/misc/mpdscribble/default.nix index ca6808effda5..5be323a6f4bc 100644 --- a/pkgs/tools/misc/mpdscribble/default.nix +++ b/pkgs/tools/misc/mpdscribble/default.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "A Music Player Daemon (MPD) client which submits information about tracks beeing played to a scrobbler (e.g. last.fm)"; - homepage = http://mpd.wikia.com/wiki/Client:mpdscribble; + homepage = https://www.musicpd.org/clients/mpdscribble/; license = licenses.gpl2; maintainers = [ maintainers.matthiasbeyer ]; platforms = platforms.linux; diff --git a/pkgs/tools/misc/pandoc-imagine/default.nix b/pkgs/tools/misc/pandoc-imagine/default.nix new file mode 100644 index 000000000000..811e44a6ce8e --- /dev/null +++ b/pkgs/tools/misc/pandoc-imagine/default.nix @@ -0,0 +1,28 @@ +{ fetchFromGitHub, buildPythonApplication, lib, pandocfilters, six }: + +buildPythonApplication rec { + pname = "pandoc-imagine"; + version = "unstable-2018-11-19"; + + src = fetchFromGitHub { + repo = "imagine"; + owner = "hertogp"; + rev = "cc9be85155666c2d12d47a71690ba618cea1fac2"; + sha256 = "0iksh9081g488yfjzd24bz4lm1nrrjamph1vynx3imrcfgyq7nsb"; + }; + + propagatedBuildInputs = [ pandocfilters six ]; + + # No tests in archive + doCheck = false; + + meta = with lib; { + homepage = src.meta.homepage; + description = '' + A pandoc filter that will turn code blocks tagged with certain classes + into images or ASCII art + ''; + license = with licenses; [ mit ]; + maintainers = with maintainers; [ synthetica ]; + }; +} diff --git a/pkgs/tools/misc/tmux/default.nix b/pkgs/tools/misc/tmux/default.nix index 192c5eb0823b..d102d27a6c4c 100644 --- a/pkgs/tools/misc/tmux/default.nix +++ b/pkgs/tools/misc/tmux/default.nix @@ -12,22 +12,18 @@ let in stdenv.mkDerivation rec { - name = "tmux-${version}"; - version = "2.8"; + pname = "tmux"; + version = "2.9"; outputs = [ "out" "man" ]; src = fetchFromGitHub { - owner = "tmux"; - repo = "tmux"; - rev = "01918cb0170e07288d3aec624516e6470bf5b7fc"; - sha256 = "1fy87wvxn7r7jzqapvjisc1iizic3kxqk2lv83giqmw1y4g3s7rl"; + owner = pname; + repo = pname; + rev = version; + sha256 = "191y986k9q17fdxlh3ldkr81s8fpxj4n2lc2lys6hzi4ybrhgdik"; }; - postPatch = '' - sed -i 's/2.8-rc/2.8/' configure.ac - ''; - nativeBuildInputs = [ pkgconfig autoreconfHook ]; buildInputs = [ ncurses libevent makeWrapper ]; diff --git a/pkgs/tools/misc/you-get/default.nix b/pkgs/tools/misc/you-get/default.nix index 7171ef45fa86..2f009acc13a0 100644 --- a/pkgs/tools/misc/you-get/default.nix +++ b/pkgs/tools/misc/you-get/default.nix @@ -2,7 +2,7 @@ buildPythonApplication rec { pname = "you-get"; - version = "0.4.1270"; + version = "0.4.1295"; # Tests aren't packaged, but they all hit the real network so # probably aren't suitable for a build environment anyway. @@ -10,7 +10,7 @@ buildPythonApplication rec { src = fetchPypi { inherit pname version; - sha256 = "1gq6z605xfhgama11krsc8y0qr690dgf9x39q2z941bqdxvxra5g"; + sha256 = "15p9ngscrn20shkg909hcnsizqpbl038zbnmxwbprj88lnn8xz9m"; }; meta = with stdenv.lib; { diff --git a/pkgs/tools/package-management/home-manager/default.nix b/pkgs/tools/package-management/home-manager/default.nix index 2b50e81dfc4f..43a8c4644639 100644 --- a/pkgs/tools/package-management/home-manager/default.nix +++ b/pkgs/tools/package-management/home-manager/default.nix @@ -1,18 +1,18 @@ #Adapted from -#https://github.com/rycee/home-manager/blob/9c1b3735b402346533449efc741f191d6ef578dd/home-manager/default.nix +#https://github.com/rycee/home-manager/blob/2c07829be2bcae55e04997b19719ff902a44016d/home-manager/default.nix -{ bash, coreutils, less, stdenv, makeWrapper, fetchFromGitHub }: +{ bash, coreutils, findutils, gnused, less, stdenv, makeWrapper, fetchFromGitHub }: stdenv.mkDerivation rec { name = "home-manager-${version}"; - version = "2018-11-04"; + version = "2019-04-23"; src = fetchFromGitHub { owner = "rycee"; repo = "home-manager"; - rev = "05c93ff3ae13f1a2d90a279a890534cda7dc8ad6"; - sha256 = "0ymfvjnnz98ynws3v6dcil1cmp7x2cmm6zy8yqgkn8z7wyrrqq0v"; + rev = "ba0375bf06e0e0c3b2377edf913b7fddfd5a0b40"; + sha256 = "1ksr8fw5p5ai2a02whppc0kz9b3m5363hvfjghkzkd623kfh9073"; }; nativeBuildInputs = [ makeWrapper ]; @@ -24,6 +24,8 @@ stdenv.mkDerivation rec { substituteInPlace $out/bin/home-manager \ --subst-var-by bash "${bash}" \ --subst-var-by coreutils "${coreutils}" \ + --subst-var-by findutils "${findutils}" \ + --subst-var-by gnused "${gnused}" \ --subst-var-by less "${less}" \ --subst-var-by HOME_MANAGER_PATH '${src}' ''; diff --git a/pkgs/tools/security/rng-tools/default.nix b/pkgs/tools/security/rng-tools/default.nix index 86a5a1b7c396..41faa375f83d 100644 --- a/pkgs/tools/security/rng-tools/default.nix +++ b/pkgs/tools/security/rng-tools/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, libtool, autoconf, automake, pkgconfig +{ stdenv, fetchFromGitHub, libtool, autoreconfHook, pkgconfig , sysfsutils # WARNING: DO NOT USE BEACON GENERATED VALUES AS SECRET CRYPTOGRAPHIC KEYS # https://www.nist.gov/programs-projects/nist-randomness-beacon @@ -8,32 +8,48 @@ # Not sure if jitterentropy is safe to use for cryptography # and thus a default entropy source , jitterentropy ? null, withJitterEntropy ? false +, libp11 ? null, opensc ? null, withPkcs11 ? true }: + with stdenv.lib; + stdenv.mkDerivation rec { - name = "rng-tools-${version}"; - version = "6.6"; + pname = "rng-tools"; + version = "6.7"; src = fetchFromGitHub { owner = "nhorman"; repo = "rng-tools"; rev = "v${version}"; - sha256 = "0c32sxfvngdjzfmxn5ngc5yxwi8ij3yl216nhzyz9r31qi3m14v7"; + sha256 = "19f75m6mzg8h7b4snzg7d6ypvkz6nq32lrpi9ja95gqz4wsd18a5"; }; - nativeBuildInputs = [ libtool autoconf automake pkgconfig ]; + postPatch = '' + cp README.md README - preConfigure = "./autogen.sh"; + ${optionalString withPkcs11 '' + substituteInPlace rngd.c \ + --replace /usr/lib64/opensc-pkcs11.so ${opensc}/lib/opensc-pkcs11.so + ''} + ''; - configureFlags = - optional (!withJitterEntropy) "--disable-jitterentropy" - ++ optional (!withNistBeacon) "--without-nistbeacon" - ++ optional (!withGcrypt) "--without-libgcrypt"; + nativeBuildInputs = [ autoreconfHook libtool pkgconfig ]; + + configureFlags = [ + (withFeature withGcrypt "libgcrypt") + (enableFeature withJitterEntropy "jitterentropy") + (withFeature withNistBeacon "nistbeacon") + (withFeature withPkcs11 "pkcs11") + ]; buildInputs = [ sysfsutils ] - ++ optional withJitterEntropy [ jitterentropy ] - ++ optional withGcrypt [ libgcrypt.dev ] - ++ optional withNistBeacon [ openssl.dev curl.dev libxml2.dev ]; + ++ optionals withGcrypt [ libgcrypt ] + ++ optionals withJitterEntropy [ jitterentropy ] + ++ optionals withNistBeacon [ curl libxml2 openssl ] + ++ optionals withPkcs11 [ libp11 openssl ]; + + # This shouldn't be necessary but is as of 6.7 + NIX_LDFLAGS = optionalString withPkcs11 "-lcrypto"; enableParallelBuilding = true; @@ -43,8 +59,8 @@ stdenv.mkDerivation rec { meta = { description = "A random number generator daemon"; homepage = https://github.com/nhorman/rng-tools; - license = stdenv.lib.licenses.gpl2Plus; - platforms = stdenv.lib.platforms.linux; - maintainers = with stdenv.lib.maintainers; [ johnazoidberg ]; + license = licenses.gpl2Plus; + platforms = platforms.linux; + maintainers = with maintainers; [ johnazoidberg ]; }; } diff --git a/pkgs/tools/system/ledmon/default.nix b/pkgs/tools/system/ledmon/default.nix new file mode 100644 index 000000000000..ab11fc9e27f8 --- /dev/null +++ b/pkgs/tools/system/ledmon/default.nix @@ -0,0 +1,35 @@ +{ stdenv, fetchFromGitHub, perl, udev, sg3_utils }: + +stdenv.mkDerivation rec { + pname = "ledmon"; + version = "0.92"; + + src = fetchFromGitHub { + owner = "intel"; + repo = "ledmon"; + rev = "v${version}"; + sha256 = "1lz59606vf2sws5xwijxyffm8kxcf8p9qbdpczsq1b5mm3dk6lvp"; + }; + + nativeBuildInputs = [ + perl # for pod2man + ]; + buildInputs = [ udev sg3_utils ]; + + installTargets = [ "install" "install-systemd" ]; + + makeFlags = [ + "MAN_INSTDIR=${placeholder "out"}/share/man" + "SYSTEMD_SERVICE_INSTDIR=${placeholder "out"}/lib/systemd/system" + "LEDCTL_INSTDIR=${placeholder "out"}/sbin" + "LEDMON_INSTDIR=${placeholder "out"}/sbin" + ]; + + meta = with stdenv.lib; { + homepage = https://github.com/intel/ledmon; + description = "Enclosure LED Utilities"; + platforms = platforms.linux; + license = with licenses; [ gpl2 ]; + maintainers = with stdenv.lib.maintainers; [ sorki ]; + }; +} diff --git a/pkgs/tools/text/epubcheck/default.nix b/pkgs/tools/text/epubcheck/default.nix new file mode 100644 index 000000000000..d9acf106e2ea --- /dev/null +++ b/pkgs/tools/text/epubcheck/default.nix @@ -0,0 +1,41 @@ +{ stdenv, fetchzip +, jre, makeWrapper }: + +stdenv.mkDerivation rec { + pname = "epubcheck"; + version = "4.2.0"; + + src = fetchzip { + url = "https://github.com/w3c/epubcheck/releases/download/v${version}/epubcheck-${version}.zip"; + sha256 = "1bf5jbzqvgpvhbkprynxj75ilk3r6zld157vjf6k7l5g21cwyn9d"; + }; + + nativeBuildInputs = [ makeWrapper ]; + + dontBuild = true; + + installPhase = '' + mkdir -p $out/lib + cp -r lib/* $out/lib + + mkdir -p $out/libexec/epubcheck + cp epubcheck.jar $out/libexec/epubcheck + + classpath=$out/libexec/epubcheck/epubcheck.jar + for jar in $out/lib/*.jar; do + classpath="$classpath:$jar" + done + + mkdir -p $out/bin + makeWrapper ${jre}/bin/java $out/bin/epubcheck \ + --add-flags "-classpath $classpath com.adobe.epubcheck.tool.Checker" + ''; + + meta = with stdenv.lib; { + homepage = https://github.com/w3c/epubcheck; + description = "Validation tool for EPUB"; + license = with licenses; [ asl20 bsd3 mpl10 w3c ]; + platforms = platforms.all; + maintainers = with maintainers; [ eadwu ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 6c66f68ee512..17b8056a5152 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -2560,6 +2560,8 @@ in eid-mw = callPackage ../tools/security/eid-mw { }; + epubcheck = callPackage ../tools/text/epubcheck { }; + mcrcon = callPackage ../tools/networking/mcrcon {}; s-tar = callPackage ../tools/archivers/s-tar {}; @@ -4120,6 +4122,8 @@ in leatherman = callPackage ../development/libraries/leatherman { }; + ledmon = callPackage ../tools/system/ledmon { }; + leela = callPackage ../tools/graphics/leela { }; lftp = callPackage ../tools/networking/lftp { }; @@ -4401,6 +4405,8 @@ in mimetic = callPackage ../development/libraries/mimetic { }; + minetime = callPackage ../applications/office/minetime { }; + minio-client = callPackage ../tools/networking/minio-client { buildGoPackage = buildGo110Package; }; @@ -4649,6 +4655,8 @@ in buildGoPackage = buildGo110Package; }; + notable = callPackage ../applications/misc/notable { }; + miller = callPackage ../tools/text/miller { }; milu = callPackage ../applications/misc/milu { }; @@ -4657,6 +4665,8 @@ in pa_applet = callPackage ../tools/audio/pa-applet { }; + pandoc-imagine = python3Packages.callPackage ../tools/misc/pandoc-imagine { }; + pasystray = callPackage ../tools/audio/pasystray { }; phash = callPackage ../development/libraries/phash { }; @@ -5105,6 +5115,7 @@ in playbar2 = libsForQt5.callPackage ../applications/audio/playbar2 { }; plex = callPackage ../servers/plex { }; + plexRaw = callPackage ../servers/plex/raw.nix { }; tautulli = callPackage ../servers/tautulli { python = python2; }; @@ -5233,6 +5244,8 @@ in pydb = callPackage ../development/tools/pydb { }; + pydf = callPackage ../applications/misc/pydf { }; + pygmentex = callPackage ../tools/typesetting/pygmentex { }; pythonIRClib = pythonPackages.pythonIRClib; @@ -7731,6 +7744,8 @@ in inherit (ocaml-ng.ocamlPackages_4_05) ocaml; }; + pforth = callPackage ../development/compilers/pforth {}; + picat = callPackage ../development/compilers/picat { stdenv = overrideCC stdenv gcc49; }; @@ -7783,6 +7798,7 @@ in cargo-bloat = callPackage ../development/tools/rust/cargo-bloat { }; cargo-expand = callPackage ../development/tools/rust/cargo-expand { }; cargo-fuzz = callPackage ../development/tools/rust/cargo-fuzz { }; + cargo-sweep = callPackage ../development/tools/rust/cargo-sweep { }; cargo-xbuild = callPackage ../development/tools/rust/cargo-xbuild { }; pyo3-pack = callPackage ../development/tools/rust/pyo3-pack { }; @@ -8941,6 +8957,8 @@ in eresi = callPackage ../development/tools/analysis/eresi { }; + evmdis = callPackage ../development/tools/analysis/evmdis { }; + eweb = callPackage ../development/tools/literate-programming/eweb { }; eztrace = callPackage ../development/tools/profiling/EZTrace { }; @@ -14299,6 +14317,8 @@ in timescaledb-parallel-copy = callPackage ../development/tools/database/timescaledb-parallel-copy { }; + timescaledb-tune = callPackage ../development/tools/database/timescaledb-tune { }; + inherit (import ../servers/sql/postgresql pkgs) postgresql_9_4 postgresql_9_5 @@ -14987,6 +15007,7 @@ in [ kernelPatches.bridge_stp_helper kernelPatches.cpu-cgroup-v2."4.9" kernelPatches.modinst_arg_list_too_long + kernelPatches.i2c-oops ]; }; @@ -14997,6 +15018,7 @@ in # when adding a new linux version kernelPatches.cpu-cgroup-v2."4.11" kernelPatches.modinst_arg_list_too_long + kernelPatches.i2c-oops ]; }; @@ -15004,6 +15026,7 @@ in kernelPatches = [ kernelPatches.bridge_stp_helper kernelPatches.modinst_arg_list_too_long + kernelPatches.i2c-oops ]; }; @@ -15678,6 +15701,7 @@ in ubootTools ubootA20OlinuxinoLime ubootBananaPi + ubootBananaPim64 ubootBeagleboneBlack ubootClearfog ubootGuruplug @@ -16412,6 +16436,8 @@ in xits-math = callPackage ../data/fonts/xits-math { }; + xkcd-font = callPackage ../data/fonts/xkcd-font { }; + xkeyboard_config = xorg.xkeyboardconfig; xlsx2csv = with python3Packages; toPythonApplication xlsx2csv; @@ -18309,7 +18335,7 @@ in inherit (kdeApplications) akonadi akregator ark dolphin dragon ffmpegthumbs filelight gwenview k3b kaddressbook kate kcachegrind kcalc kcharselect kcolorchooser kcontacts kdenlive kdf kdialog - keditbookmarks kget kgpg khelpcenter kig kleopatra kmail kmix kmplot kolourpaint kompare konsole + keditbookmarks kfind kget kgpg khelpcenter kig kleopatra kmail kmix kmplot kolourpaint kompare konsole kpkpass kitinerary kontact korganizer krdc krfb ksystemlog ktouch kwalletmanager marble minuet okular spectacle; okteta = libsForQt5.callPackage ../applications/editors/okteta { }; @@ -20006,6 +20032,8 @@ in taskserver = callPackage ../servers/misc/taskserver { }; + taskopen = callPackage ../applications/misc/taskopen { }; + tdesktopPackages = dontRecurseIntoAttrs (callPackage ../applications/networking/instant-messengers/telegram/tdesktop { }); tdesktop = tdesktopPackages.stable; @@ -22031,6 +22059,11 @@ in strelka = callPackage ../applications/science/biology/strelka { }; + inherit (callPackages ../applications/science/biology/sumatools {}) + sumalibs + sumaclust + sumatra; + seaview = callPackage ../applications/science/biology/seaview { }; varscan = callPackage ../applications/science/biology/varscan { }; @@ -23271,6 +23304,8 @@ in ricty = callPackage ../data/fonts/ricty { }; + rmount = callPackage ../tools/filesystems/rmount {}; + rss-glx = callPackage ../misc/screensavers/rss-glx { }; run-scaled = callPackage ../tools/X11/run-scaled { }; diff --git a/pkgs/top-level/php-packages.nix b/pkgs/top-level/php-packages.nix index ce647a8d5682..2cbdd0aee5c0 100644 --- a/pkgs/top-level/php-packages.nix +++ b/pkgs/top-level/php-packages.nix @@ -7,6 +7,12 @@ let inherit (pkgs) stdenv autoreconfHook fetchurl; }; + # Wrap mkDerivation to prepend pname with "php-" to make names consistent + # with how buildPecl does it and make the file easier to overview. + mkDerivation = { pname, ... }@args: pkgs.stdenv.mkDerivation (args // { + pname = "php-${pname}"; + }); + isPhp73 = pkgs.lib.versionAtLeast php.version "7.3"; apcu = buildPecl rec { @@ -39,9 +45,9 @@ let sha256 = "0ja74k2lmxwhhvp9y9kc7khijd7s2dqma5x8ghbhx9ajkn0wg8iq"; }; - box = pkgs.stdenv.mkDerivation rec { + box = mkDerivation rec { version = "2.7.5"; - pname = "php-box"; + pname = "box"; src = pkgs.fetchurl { url = "https://github.com/box-project/box2/releases/download/${version}/box-${version}.phar"; @@ -66,9 +72,9 @@ let }; }; - composer = pkgs.stdenv.mkDerivation rec { + composer = mkDerivation rec { version = "1.8.5"; - pname = "php-composer"; + pname = "composer"; src = pkgs.fetchurl { url = "https://getcomposer.org/download/${version}/composer.phar"; @@ -210,7 +216,7 @@ let buildInputs = [ pkgs.unixODBC ]; }; - php-cs-fixer = pkgs.stdenv.mkDerivation rec { + php-cs-fixer = mkDerivation rec { version = "2.14.2"; pname = "php-cs-fixer"; @@ -237,7 +243,7 @@ let }; }; - php-parallel-lint = pkgs.stdenv.mkDerivation rec { + php-parallel-lint = mkDerivation rec { version = "1.0.0"; pname = "php-parallel-lint"; @@ -286,9 +292,9 @@ let meta.broken = true; }; - phpcbf = pkgs.stdenv.mkDerivation rec { + phpcbf = mkDerivation rec { version = "3.4.2"; - pname = "php-phpcbf"; + pname = "phpcbf"; src = pkgs.fetchurl { url = "https://github.com/squizlabs/PHP_CodeSniffer/releases/download/${version}/phpcbf.phar"; @@ -313,9 +319,9 @@ let }; }; - phpcs = pkgs.stdenv.mkDerivation rec { + phpcs = mkDerivation rec { version = "3.4.2"; - pname = "php-phpcs"; + pname = "phpcs"; src = pkgs.fetchurl { url = "https://github.com/squizlabs/PHP_CodeSniffer/releases/download/${version}/phpcs.phar"; @@ -340,9 +346,9 @@ let }; }; - phpstan = pkgs.stdenv.mkDerivation rec { + phpstan = mkDerivation rec { version = "0.11.5"; - pname = "php-phpstan"; + pname = "phpstan"; src = pkgs.fetchurl { url = "https://github.com/phpstan/phpstan/releases/download/${version}/phpstan.phar"; @@ -374,9 +380,9 @@ let }; }; - psysh = pkgs.stdenv.mkDerivation rec { + psysh = mkDerivation rec { version = "0.9.9"; - pname = "php-psysh"; + pname = "psysh"; src = pkgs.fetchurl { url = "https://github.com/bobthecow/psysh/releases/download/v${version}/psysh-v${version}.tar.gz"; diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 086ae6efd191..bf74cdc7b0a7 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -4434,6 +4434,8 @@ in { wordfreq = callPackage ../development/python-modules/wordfreq { }; + wikipedia = callPackage ../development/python-modules/wikipedia { }; + magic-wormhole = callPackage ../development/python-modules/magic-wormhole { }; magic-wormhole-mailbox-server = callPackage ../development/python-modules/magic-wormhole-mailbox-server { }; |