diff options
416 files changed, 9642 insertions, 5808 deletions
diff --git a/doc/languages-frameworks/haskell.section.md b/doc/languages-frameworks/haskell.section.md index 7cbac95f7d4..be5c7b7c8d1 100644 --- a/doc/languages-frameworks/haskell.section.md +++ b/doc/languages-frameworks/haskell.section.md @@ -25,14 +25,14 @@ avoided that by keeping all Haskell-related packages in a separate attribute set called `haskellPackages`, which the following command will list: ``` $ nix-env -f "<nixpkgs>" -qaP -A haskellPackages -haskellPackages.a50 a50-0.5 -haskellPackages.abacate haskell-abacate-0.0.0.0 -haskellPackages.abcBridge haskell-abcBridge-0.12 -haskellPackages.afv afv-0.1.1 -haskellPackages.alex alex-3.1.4 -haskellPackages.Allure Allure-0.4.101.1 -haskellPackages.alms alms-0.6.7 -[... some 8000 entries omitted ...] +haskellPackages.a50 a50-0.5 +haskellPackages.AAI AAI-0.2.0.1 +haskellPackages.abacate abacate-0.0.0.0 +haskellPackages.abc-puzzle abc-puzzle-0.2.1 +haskellPackages.abcBridge abcBridge-0.15 +haskellPackages.abcnotation abcnotation-1.9.0 +haskellPackages.abeson abeson-0.1.0.1 +[... some 14000 entries omitted ...] ``` To install any of those packages into your profile, refer to them by their @@ -101,19 +101,21 @@ to compile your Haskell packages with any GHC version you please. The following command displays the complete list of available compilers: ``` $ nix-env -f "<nixpkgs>" -qaP -A haskell.compiler -haskell.compiler.ghc6104 ghc-6.10.4 -haskell.compiler.ghc6123 ghc-6.12.3 -haskell.compiler.ghc704 ghc-7.0.4 -haskell.compiler.ghc722 ghc-7.2.2 -haskell.compiler.ghc742 ghc-7.4.2 -haskell.compiler.ghc763 ghc-7.6.3 -haskell.compiler.ghc784 ghc-7.8.4 -haskell.compiler.ghc7102 ghc-7.10.2 -haskell.compiler.ghcHEAD ghc-7.11.20150402 -haskell.compiler.ghcNokinds ghc-nokinds-7.11.20150704 -haskell.compiler.ghcjs ghcjs-0.1.0 -haskell.compiler.jhc jhc-0.8.2 -haskell.compiler.uhc uhc-1.1.9.0 +haskell.compiler.ghc822 ghc-8.2.2 +haskell.compiler.integer-simple.ghc822 ghc-8.2.2 +haskell.compiler.ghc822Binary ghc-8.2.2-binary +haskell.compiler.ghc844 ghc-8.4.4 +haskell.compiler.ghc863Binary ghc-8.6.3-binary +haskell.compiler.ghc864 ghc-8.6.4 +haskell.compiler.integer-simple.ghc864 ghc-8.6.4 +haskell.compiler.ghc865 ghc-8.6.5 +haskell.compiler.integer-simple.ghc865 ghc-8.6.5 +haskell.compiler.ghc881 ghc-8.8.1 +haskell.compiler.integer-simple.ghc881 ghc-8.8.1 +haskell.compiler.ghcHEAD ghc-8.9.20190601 +haskell.compiler.integer-simple.ghcHEAD ghc-8.9.20190601 +haskell.compiler.ghcjs84 ghcjs-8.4.0.1 +haskell.compiler.ghcjs ghcjs-8.6.0.1 ``` We have no package sets for `jhc` or `uhc` yet, unfortunately, but for every diff --git a/doc/stdenv/cross-compilation.xml b/doc/stdenv/cross-compilation.xml index 5476c9a4893..bea56a0c2fc 100644 --- a/doc/stdenv/cross-compilation.xml +++ b/doc/stdenv/cross-compilation.xml @@ -244,7 +244,7 @@ </question> <answer> <para> - Many packages assume that an unprefixed <command>ar</command> is available, but Nix doesn't provide one. It only provides a prefixed one, just as it only does for all the other binutils programs. It may be necessary to patch the package to fix the build system to use a prefixed `ar`. + Many packages assume that an unprefixed <command>ar</command> is available, but Nix doesn't provide one. It only provides a prefixed one, just as it only does for all the other binutils programs. It may be necessary to patch the package to fix the build system to use a prefixed <command>ar</command>. </para> </answer> </qandaentry> diff --git a/doc/stdenv/stdenv.xml b/doc/stdenv/stdenv.xml index 0b59f90eb49..49699d7168d 100644 --- a/doc/stdenv/stdenv.xml +++ b/doc/stdenv/stdenv.xml @@ -1717,7 +1717,7 @@ someVar=$(stripHash $name) </para> <para> - The most typical use of the setup hook is actually to add other hooks which are then run (i.e. after all the setup hooks) on each dependency. For example, the C compiler wrapper's setup hook feeds itself flags for each dependency that contains relevant libraries and headers. This is done by defining a bash function, and appending its name to one of <envar>envBuildBuildHooks</envar>`, <envar>envBuildHostHooks</envar>`, <envar>envBuildTargetHooks</envar>`, <envar>envHostHostHooks</envar>`, <envar>envHostTargetHooks</envar>`, or <envar>envTargetTargetHooks</envar>`. These 6 bash variables correspond to the 6 sorts of dependencies by platform (there's 12 total but we ignore the propagated/non-propagated axis). + The most typical use of the setup hook is actually to add other hooks which are then run (i.e. after all the setup hooks) on each dependency. For example, the C compiler wrapper's setup hook feeds itself flags for each dependency that contains relevant libraries and headers. This is done by defining a bash function, and appending its name to one of <envar>envBuildBuildHooks</envar>, <envar>envBuildHostHooks</envar>, <envar>envBuildTargetHooks</envar>, <envar>envHostHostHooks</envar>, <envar>envHostTargetHooks</envar>, or <envar>envTargetTargetHooks</envar>. These 6 bash variables correspond to the 6 sorts of dependencies by platform (there's 12 total but we ignore the propagated/non-propagated axis). </para> <para> diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index eefc9560f16..7614e2ec2bd 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -1484,6 +1484,16 @@ } ]; }; + d-goldin = { + email = "dgoldin+github@protonmail.ch"; + github = "d-goldin"; + githubId = 43349662; + name = "Dima"; + keys = [{ + longkeyid = "rsa4096/BAB1D15FB7B4D4CE"; + fingerprint = "1C4E F4FE 7F8E D8B7 1E88 CCDF BAB1 D15F B7B4 D4CE"; + }]; + }; dadada = { name = "dadada"; email = "dadada@dadada.li"; @@ -4491,6 +4501,12 @@ githubId = 16974598; name = "Mike Playle"; }; + mkaito = { + email = "chris@mkaito.net"; + github = "mkaito"; + githubId = 20434; + name = "Christian Höppner"; + }; mkazulak = { email = "kazulakm@gmail.com"; github = "mulderr"; @@ -4650,6 +4666,12 @@ githubId = 2881922; name = "Francis St-Amour"; }; + mtrsk = { + email = "marcos.schonfinkel@protonmail.com"; + github = "mtrsk"; + githubId = 16356569; + name = "Marcos Benevides"; + }; mredaelli = { email = "massimo@typish.io"; github = "mredaelli"; diff --git a/nixos/doc/manual/release-notes/rl-2003.xml b/nixos/doc/manual/release-notes/rl-2003.xml index 4980a99e646..2a5064c71b0 100644 --- a/nixos/doc/manual/release-notes/rl-2003.xml +++ b/nixos/doc/manual/release-notes/rl-2003.xml @@ -186,6 +186,19 @@ The osquery module has been removed. </para> </listitem> + <listitem> + <para> + Going forward, <literal>~/bin</literal> in the users home directory will no longer be in <literal>PATH</literal> by default. + If you depend on this you should set the option <literal>environment.homeBinInPath</literal> to <literal>true</literal>. + The aforementioned option was added this release. + </para> + </listitem> + <listitem> + <para> + The <literal>buildRustCrate</literal> infrastructure now produces <literal>lib</literal> outputs in addition to the <literal>out</literal> output. + This has led to drastically reduced closed sizes for some rust crates since development dependencies are now in the <literal>lib</literal> output. + </para> + </listitem> </itemizedlist> </section> diff --git a/nixos/modules/config/shells-environment.nix b/nixos/modules/config/shells-environment.nix index b79e16cd797..a0a20228a74 100644 --- a/nixos/modules/config/shells-environment.nix +++ b/nixos/modules/config/shells-environment.nix @@ -122,7 +122,7 @@ in description = '' Include ~/bin/ in $PATH. ''; - default = true; + default = false; type = types.bool; }; diff --git a/nixos/modules/hardware/video/nvidia.nix b/nixos/modules/hardware/video/nvidia.nix index 1e18e927ec6..fcb30187fa2 100644 --- a/nixos/modules/hardware/video/nvidia.nix +++ b/nixos/modules/hardware/video/nvidia.nix @@ -111,9 +111,10 @@ in config = mkIf enabled { assertions = [ { - assertion = with config.services.xserver.displayManager; gdm.enable -> !gdm.wayland; - message = "NVIDIA drivers don't support wayland, set services.xserver.displayManager.gdm.wayland=false"; + assertion = with config.services.xserver.displayManager; gdm.nvidiaWayland -> cfg.modesetting.enable; + message = "You cannot use wayland with GDM without modesetting enabled for NVIDIA drivers, set `hardware.nvidia.modesetting.enable = true`"; } + { assertion = !optimusCfg.enable || (optimusCfg.nvidiaBusId != "" && optimusCfg.intelBusId != ""); diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix index 9e0d9478b5d..076e1654818 100644 --- a/nixos/modules/module-list.nix +++ b/nixos/modules/module-list.nix @@ -307,6 +307,7 @@ ./services/desktops/gnome3/sushi.nix ./services/desktops/gnome3/tracker.nix ./services/desktops/gnome3/tracker-miners.nix + ./services/desktops/neard.nix ./services/desktops/profile-sync-daemon.nix ./services/desktops/system-config-printer.nix ./services/desktops/telepathy.nix diff --git a/nixos/modules/programs/ssmtp.nix b/nixos/modules/programs/ssmtp.nix index 0e060e3f522..e45748af205 100644 --- a/nixos/modules/programs/ssmtp.nix +++ b/nixos/modules/programs/ssmtp.nix @@ -8,18 +8,16 @@ with lib; let - - cfg = config.networking.defaultMailServer; + cfg = config.services.ssmtp; in - { options = { - networking.defaultMailServer = { + services.ssmtp = { - directDelivery = mkOption { + enable = mkOption { type = types.bool; default = false; description = '' @@ -29,7 +27,7 @@ in <command>sendmail</command> or <command>postfix</command> on your machine, set this option to <literal>true</literal>, and set the option - <option>networking.defaultMailServer.hostName</option> to the + <option>services.ssmtp.hostName</option> to the host name of your preferred mail server. ''; }; @@ -129,9 +127,9 @@ in }; - config = mkIf cfg.directDelivery { + config = mkIf cfg.enable { - networking.defaultMailServer.authPassFile = mkIf (cfg.authPass != "") + services.ssmtp.authPassFile = mkIf (cfg.authPass != "") (mkDefault (toString (pkgs.writeTextFile { name = "ssmtp-authpass"; text = cfg.authPass; diff --git a/nixos/modules/rename.nix b/nixos/modules/rename.nix index d4bce3b49d3..e392fef54dd 100644 --- a/nixos/modules/rename.nix +++ b/nixos/modules/rename.nix @@ -11,6 +11,8 @@ with lib; (mkRenamedOptionModule [ "networking" "enableRTL8192cFirmware" ] [ "hardware" "enableRedistributableFirmware" ]) (mkRenamedOptionModule [ "networking" "networkmanager" "useDnsmasq" ] [ "networking" "networkmanager" "dns" ]) (mkRenamedOptionModule [ "networking" "connman" ] [ "services" "connman" ]) + (mkRenamedOptionModule [ "networking" "defaultMailServer" ] [ "services" "ssmtp" ]) + (mkRenamedOptionModule [ "services" "ssmtp" "directDelivery" ] [ "services" "ssmtp" "enable" ]) (mkChangedOptionModule [ "services" "printing" "gutenprint" ] [ "services" "printing" "drivers" ] (config: let enabled = getAttrFromPath [ "services" "printing" "gutenprint" ] config; diff --git a/nixos/modules/services/audio/roon-server.nix b/nixos/modules/services/audio/roon-server.nix index 4eda3c5708d..6aed485638c 100644 --- a/nixos/modules/services/audio/roon-server.nix +++ b/nixos/modules/services/audio/roon-server.nix @@ -66,7 +66,8 @@ in { if cfg.user == "roon-server" then { isSystemUser = true; description = "Roon Server user"; - groups = [ cfg.group "audio" ]; + group = cfg.group; + extraGroups = [ "audio" ]; } else {}; }; diff --git a/nixos/modules/services/desktops/neard.nix b/nixos/modules/services/desktops/neard.nix new file mode 100644 index 00000000000..9b0f8d1b3a7 --- /dev/null +++ b/nixos/modules/services/desktops/neard.nix @@ -0,0 +1,23 @@ +# neard service. +{ config, lib, pkgs, ... }: + +with lib; + +{ + ###### interface + options = { + services.neard = { + enable = mkEnableOption "neard, NFC daemon"; + }; + }; + + + ###### implementation + config = mkIf config.services.neard.enable { + environment.systemPackages = [ pkgs.neard ]; + + services.dbus.packages = [ pkgs.neard ]; + + systemd.packages = [ pkgs.neard ]; + }; +} diff --git a/nixos/modules/services/hardware/bluetooth.nix b/nixos/modules/services/hardware/bluetooth.nix index c5f9d1f9b72..7b13beea1ca 100644 --- a/nixos/modules/services/hardware/bluetooth.nix +++ b/nixos/modules/services/hardware/bluetooth.nix @@ -36,17 +36,25 @@ in { ''; }; + config = mkOption { + type = with types; attrsOf (attrsOf (oneOf [ bool int str ])); + example = { + General = { + ControllerMode = "bredr"; + }; + }; + description = "Set configuration for system-wide bluetooth (/etc/bluetooth/main.conf)."; + }; + extraConfig = mkOption { - type = types.lines; - default = ""; + type = with types; nullOr lines; + default = null; example = '' [General] ControllerMode = bredr ''; description = '' Set additional configuration for system-wide bluetooth (/etc/bluetooth/main.conf). - - NOTE: We already include [Policy], so any configuration under the Policy group should come first. ''; }; }; @@ -56,16 +64,18 @@ in { ###### implementation config = mkIf cfg.enable { + warnings = optional (cfg.extraConfig != null) "hardware.bluetooth.`extraConfig` is deprecated, please use hardware.bluetooth.`config`."; + + hardware.bluetooth.config = { + Policy = { + AutoEnable = mkDefault cfg.powerOnBoot; + }; + }; environment.systemPackages = [ bluez-bluetooth pkgs.openobex pkgs.obexftp ]; environment.etc = singleton { - source = pkgs.writeText "main.conf" '' - [Policy] - AutoEnable=${lib.boolToString cfg.powerOnBoot} - - ${cfg.extraConfig} - ''; + source = pkgs.writeText "main.conf" (generators.toINI { } cfg.config + optionalString (cfg.extraConfig != null) cfg.extraConfig); target = "bluetooth/main.conf"; }; diff --git a/nixos/modules/services/monitoring/prometheus/exporters.nix b/nixos/modules/services/monitoring/prometheus/exporters.nix index 35b513bac57..53f32b8fadc 100644 --- a/nixos/modules/services/monitoring/prometheus/exporters.nix +++ b/nixos/modules/services/monitoring/prometheus/exporters.nix @@ -197,6 +197,9 @@ in services.prometheus.exporters.minio.minioAccessSecret = mkDefault config.services.minio.secretKey; })] ++ [(mkIf config.services.rspamd.enable { services.prometheus.exporters.rspamd.url = mkDefault "http://localhost:11334/stat"; + })] ++ [(mkIf config.services.nginx.enable { + systemd.services.prometheus-nginx-exporter.after = [ "nginx.service" ]; + systemd.services.prometheus-nginx-exporter.requires = [ "nginx.service" ]; })] ++ (mapAttrsToList (name: conf: mkExporterConf { inherit name; diff --git a/nixos/modules/services/network-filesystems/samba.nix b/nixos/modules/services/network-filesystems/samba.nix index c66011afccb..875ab70bfc7 100644 --- a/nixos/modules/services/network-filesystems/samba.nix +++ b/nixos/modules/services/network-filesystems/samba.nix @@ -115,7 +115,7 @@ in type = types.package; default = pkgs.samba; defaultText = "pkgs.samba"; - example = literalExample "pkgs.samba3"; + example = literalExample "pkgs.samba4Full"; description = '' Defines which package should be used for the samba server. ''; diff --git a/nixos/modules/services/networking/dnschain.nix b/nixos/modules/services/networking/dnschain.nix index 5b58ea9b0c9..b837bf816a1 100644 --- a/nixos/modules/services/networking/dnschain.nix +++ b/nixos/modules/services/networking/dnschain.nix @@ -137,7 +137,7 @@ in ]; services.pdns-recursor = mkIf cfgs.pdns-recursor.resolveDNSChainQueries { - forwardZones = + forwardZonesRecurse = { bit = "127.0.0.1:${toString cfg.dns.port}"; dns = "127.0.0.1:${toString cfg.dns.port}"; }; diff --git a/nixos/modules/services/networking/pdns-recursor.nix b/nixos/modules/services/networking/pdns-recursor.nix index ebfdd9f35b7..e55ea363378 100644 --- a/nixos/modules/services/networking/pdns-recursor.nix +++ b/nixos/modules/services/networking/pdns-recursor.nix @@ -91,10 +91,18 @@ in { forwardZones = mkOption { type = types.attrs; + default = {}; + description = '' + DNS zones to be forwarded to other authoritative servers. + ''; + }; + + forwardZonesRecurse = mkOption { + type = types.attrs; example = { eth = "127.0.0.1:5353"; }; default = {}; description = '' - DNS zones to be forwarded to other servers. + DNS zones to be forwarded to other recursive servers. ''; }; @@ -158,7 +166,8 @@ in { webserver-port = cfg.api.port; webserver-allow-from = cfg.api.allowFrom; - forward-zones = mapAttrsToList (zone: uri: "${zone}.=${uri}") cfg.forwardZones; + forward-zones = mapAttrsToList (zone: uri: "${zone}.=${uri}") cfg.forwardZones; + forward-zones-recurse = mapAttrsToList (zone: uri: "${zone}.=${uri}") cfg.forwardZonesRecurse; export-etc-hosts = cfg.exportHosts; dnssec = cfg.dnssecValidation; serve-rfc1918 = cfg.serveRFC1918; diff --git a/nixos/modules/services/networking/wpa_supplicant.nix b/nixos/modules/services/networking/wpa_supplicant.nix index 294c0d70ede..8f05c3949fb 100644 --- a/nixos/modules/services/networking/wpa_supplicant.nix +++ b/nixos/modules/services/networking/wpa_supplicant.nix @@ -236,9 +236,12 @@ in { ${if ifaces == [] then '' for i in $(cd /sys/class/net && echo *); do DEVTYPE= - source /sys/class/net/$i/uevent - if [ "$DEVTYPE" = "wlan" -o -e /sys/class/net/$i/wireless ]; then - ifaces="$ifaces''${ifaces:+ -N} -i$i" + UEVENT_PATH=/sys/class/net/$i/uevent + if [ -e "$UEVENT_PATH" ]; then + source "$UEVENT_PATH" + if [ "$DEVTYPE" = "wlan" -o -e /sys/class/net/$i/wireless ]; then + ifaces="$ifaces''${ifaces:+ -N} -i$i" + fi fi done '' else '' diff --git a/nixos/modules/services/web-apps/matomo-doc.xml b/nixos/modules/services/web-apps/matomo-doc.xml index 79cece551d3..69d1170e452 100644 --- a/nixos/modules/services/web-apps/matomo-doc.xml +++ b/nixos/modules/services/web-apps/matomo-doc.xml @@ -86,12 +86,6 @@ GRANT ALL PRIVILEGES ON matomo.* TO 'matomo'@'localhost'; <itemizedlist> <listitem> <para> - Matomo's file integrity check will warn you. This is due to the patches - necessary for NixOS, you can safely ignore this. - </para> - </listitem> - <listitem> - <para> Matomo will warn you that the JavaScript tracker is not writable. This is because it's located in the read-only nix store. You can safely ignore this, unless you need a plugin that needs JavaScript tracker access. diff --git a/nixos/modules/services/x11/display-managers/gdm.nix b/nixos/modules/services/x11/display-managers/gdm.nix index 0af9ccfcf3e..912ec5bd38e 100644 --- a/nixos/modules/services/x11/display-managers/gdm.nix +++ b/nixos/modules/services/x11/display-managers/gdm.nix @@ -126,11 +126,21 @@ in wayland = mkOption { default = true; description = '' - Allow GDM run on Wayland instead of Xserver + Allow GDM to run on Wayland instead of Xserver. + Note to enable Wayland with Nvidia you need to + enable the <option>nvidiaWayland</option>. ''; type = types.bool; }; + nvidiaWayland = mkOption { + default = false; + description = '' + Whether to allow wayland to be used with the proprietary + NVidia graphics driver. + ''; + }; + autoSuspend = mkOption { default = true; description = '' @@ -237,6 +247,19 @@ in services.dbus.packages = [ gdm ]; + # We duplicate upstream's udev rules manually to make wayland with nvidia configurable + services.udev.extraRules = '' + # disable Wayland on Cirrus chipsets + ATTR{vendor}=="0x1013", ATTR{device}=="0x00b8", ATTR{subsystem_vendor}=="0x1af4", ATTR{subsystem_device}=="0x1100", RUN+="${gdm}/libexec/gdm-disable-wayland" + # disable Wayland on Hi1710 chipsets + ATTR{vendor}=="0x19e5", ATTR{device}=="0x1711", RUN+="${gdm}/libexec/gdm-disable-wayland" + ${optionalString (!cfg.gdm.nvidiaWayland) '' + DRIVER=="nvidia", RUN+="${gdm}/libexec/gdm-disable-wayland" + ''} + # disable Wayland when modesetting is disabled + IMPORT{cmdline}="nomodeset", RUN+="${gdm}/libexec/gdm-disable-wayland" + ''; + systemd.user.services.dbus.wantedBy = [ "default.target" ]; programs.dconf.profiles.gdm = diff --git a/nixos/modules/system/activation/switch-to-configuration.pl b/nixos/modules/system/activation/switch-to-configuration.pl index 641cf9faadc..12a80a12d19 100644 --- a/nixos/modules/system/activation/switch-to-configuration.pl +++ b/nixos/modules/system/activation/switch-to-configuration.pl @@ -214,7 +214,17 @@ while (my ($unit, $state) = each %{$activePrev}) { # Reload the changed mount unit to force a remount. $unitsToReload{$unit} = 1; recordUnit($reloadListFile, $unit); - } elsif ($unit =~ /\.socket$/ || $unit =~ /\.path$/ || $unit =~ /\.slice$/) { + } elsif ($unit =~ /\.socket$/) { + my $unitInfo = parseUnit($newUnitFile); + # If a socket unit has been changed, the corresponding + # service unit has to be stopped before the socket can + # be restarted. The service will be started again on demand. + my $serviceUnit = $unitInfo->{'Unit'} // "$baseName.service"; + $unitsToStop{$serviceUnit} = 1; + $unitsToStop{$unit} = 1; + $unitsToStart{$unit} = 1; + recordUnit($startListFile, $unit); + } elsif ($unit =~ /\.path$/ || $unit =~ /\.slice$/) { # FIXME: do something? } else { my $unitInfo = parseUnit($newUnitFile); diff --git a/nixos/release-combined.nix b/nixos/release-combined.nix index 689f881cbea..678ce3c2880 100644 --- a/nixos/release-combined.nix +++ b/nixos/release-combined.nix @@ -63,8 +63,7 @@ in rec { #(all nixos.tests.containers) (all nixos.tests.containers-imperative) - (all nixos.tests.containers-ipv4) - (all nixos.tests.containers-ipv6) + (all nixos.tests.containers-ip) nixos.tests.chromium.x86_64-linux or [] (all nixos.tests.firefox) (all nixos.tests.firewall) diff --git a/nixos/release-small.nix b/nixos/release-small.nix index 84af457801a..74c16e990f3 100644 --- a/nixos/release-small.nix +++ b/nixos/release-small.nix @@ -32,8 +32,7 @@ in rec { tests = { inherit (nixos'.tests) containers-imperative - containers-ipv4 - containers-ipv6 + containers-ip firewall ipv6 login diff --git a/nixos/tests/all-tests.nix b/nixos/tests/all-tests.nix index 7945a239f6a..df65ef249e8 100644 --- a/nixos/tests/all-tests.nix +++ b/nixos/tests/all-tests.nix @@ -53,8 +53,7 @@ in containers-extra_veth = handleTest ./containers-extra_veth.nix {}; containers-hosts = handleTest ./containers-hosts.nix {}; containers-imperative = handleTest ./containers-imperative.nix {}; - containers-ipv4 = handleTest ./containers-ipv4.nix {}; - containers-ipv6 = handleTest ./containers-ipv6.nix {}; + containers-ip = handleTest ./containers-ip.nix {}; containers-macvlans = handleTest ./containers-macvlans.nix {}; containers-physical_interfaces = handleTest ./containers-physical_interfaces.nix {}; containers-restart_networking = handleTest ./containers-restart_networking.nix {}; diff --git a/nixos/tests/containers-bridge.nix b/nixos/tests/containers-bridge.nix index 38db64eb793..2c8e8fa5370 100644 --- a/nixos/tests/containers-bridge.nix +++ b/nixos/tests/containers-bridge.nix @@ -7,7 +7,7 @@ let containerIp6 = "fc00::2/7"; in -import ./make-test.nix ({ pkgs, ...} : { +import ./make-test-python.nix ({ pkgs, ...} : { name = "containers-bridge"; meta = with pkgs.stdenv.lib.maintainers; { maintainers = [ aristid aszlig eelco kampfschlaefer ]; @@ -61,43 +61,42 @@ import ./make-test.nix ({ pkgs, ...} : { virtualisation.pathsInNixDB = [ pkgs.stdenv ]; }; - testScript = - '' - $machine->waitForUnit("default.target"); - $machine->succeed("nixos-container list") =~ /webserver/ or die; - - # Start the webserver container. - $machine->succeed("nixos-container status webserver") =~ /up/ or die; - - # Check if bridges exist inside containers - $machine->succeed("nixos-container run webserver -- ip link show eth0"); - $machine->succeed("nixos-container run web-noip -- ip link show eth0"); - - "${containerIp}" =~ /([^\/]+)\/([0-9+])/; - my $ip = $1; - chomp $ip; - $machine->succeed("ping -n -c 1 $ip"); - $machine->succeed("curl --fail http://$ip/ > /dev/null"); - - "${containerIp6}" =~ /([^\/]+)\/([0-9+])/; - my $ip6 = $1; - chomp $ip6; - $machine->succeed("ping -n -c 1 $ip6"); - $machine->succeed("curl --fail http://[$ip6]/ > /dev/null"); - - # Check that nixos-container show-ip works in case of an ipv4 address with - # subnetmask in CIDR notation. - my $result = $machine->succeed("nixos-container show-ip webserver"); - chomp $result; - $result eq $ip or die; - - # Stop the container. - $machine->succeed("nixos-container stop webserver"); - $machine->fail("curl --fail --connect-timeout 2 http://$ip/ > /dev/null"); - $machine->fail("curl --fail --connect-timeout 2 http://[$ip6]/ > /dev/null"); - - # Destroying a declarative container should fail. - $machine->fail("nixos-container destroy webserver"); - ''; - + testScript = '' + machine.wait_for_unit("default.target") + assert "webserver" in machine.succeed("nixos-container list") + + with subtest("Start the webserver container"): + assert "up" in machine.succeed("nixos-container status webserver") + + with subtest("Bridges exist inside containers"): + machine.succeed( + "nixos-container run webserver -- ip link show eth0", + "nixos-container run web-noip -- ip link show eth0", + ) + + ip = "${containerIp}".split("/")[0] + machine.succeed(f"ping -n -c 1 {ip}") + machine.succeed(f"curl --fail http://{ip}/ > /dev/null") + + ip6 = "${containerIp6}".split("/")[0] + machine.succeed(f"ping -n -c 1 {ip6}") + machine.succeed(f"curl --fail http://[{ip6}]/ > /dev/null") + + with subtest( + "nixos-container show-ip works in case of an ipv4 address " + + "with subnetmask in CIDR notation." + ): + result = machine.succeed("nixos-container show-ip webserver").rstrip() + assert result == ip + + with subtest("Stop the container"): + machine.succeed("nixos-container stop webserver") + machine.fail( + f"curl --fail --connect-timeout 2 http://{ip}/ > /dev/null", + f"curl --fail --connect-timeout 2 http://[{ip6}]/ > /dev/null", + ) + + # Destroying a declarative container should fail. + machine.fail("nixos-container destroy webserver") + ''; }) diff --git a/nixos/tests/containers-ephemeral.nix b/nixos/tests/containers-ephemeral.nix index 1ef8717d9a0..692554ac0ba 100644 --- a/nixos/tests/containers-ephemeral.nix +++ b/nixos/tests/containers-ephemeral.nix @@ -1,6 +1,6 @@ # Test for NixOS' container support. -import ./make-test.nix ({ pkgs, ...} : { +import ./make-test-python.nix ({ pkgs, ...} : { name = "containers-ephemeral"; machine = { pkgs, ... }: { @@ -16,10 +16,10 @@ import ./make-test.nix ({ pkgs, ...} : { services.nginx = { enable = true; virtualHosts.localhost = { - root = (pkgs.runCommand "localhost" {} '' + root = pkgs.runCommand "localhost" {} '' mkdir "$out" echo hello world > "$out/index.html" - ''); + ''; }; }; networking.firewall.allowedTCPPorts = [ 80 ]; @@ -28,29 +28,27 @@ import ./make-test.nix ({ pkgs, ...} : { }; testScript = '' - $machine->succeed("nixos-container list") =~ /webserver/ or die; + assert "webserver" in machine.succeed("nixos-container list") - # Start the webserver container. - $machine->succeed("nixos-container start webserver"); + machine.succeed("nixos-container start webserver") - # Check that container got its own root folder - $machine->succeed("ls /run/containers/webserver"); + with subtest("Container got its own root folder"): + machine.succeed("ls /run/containers/webserver") - # Check that container persistent directory is not created - $machine->fail("ls /var/lib/containers/webserver"); + with subtest("Container persistent directory is not created"): + machine.fail("ls /var/lib/containers/webserver") # Since "start" returns after the container has reached # multi-user.target, we should now be able to access it. - my $ip = $machine->succeed("nixos-container show-ip webserver"); - chomp $ip; - $machine->succeed("ping -n -c1 $ip"); - $machine->succeed("curl --fail http://$ip/ > /dev/null"); + ip = machine.succeed("nixos-container show-ip webserver").rstrip() + machine.succeed(f"ping -n -c1 {ip}") + machine.succeed(f"curl --fail http://{ip}/ > /dev/null") - # Stop the container. - $machine->succeed("nixos-container stop webserver"); - $machine->fail("curl --fail --connect-timeout 2 http://$ip/ > /dev/null"); + with subtest("Stop the container"): + machine.succeed("nixos-container stop webserver") + machine.fail(f"curl --fail --connect-timeout 2 http://{ip}/ > /dev/null") - # Check that container's root folder was removed - $machine->fail("ls /run/containers/webserver"); + with subtest("Container's root folder was removed"): + machine.fail("ls /run/containers/webserver") ''; }) diff --git a/nixos/tests/containers-hosts.nix b/nixos/tests/containers-hosts.nix index 8cf298c6225..d6fb4a761ee 100644 --- a/nixos/tests/containers-hosts.nix +++ b/nixos/tests/containers-hosts.nix @@ -1,6 +1,6 @@ # Test for NixOS' container support. -import ./make-test.nix ({ pkgs, ...} : { +import ./make-test-python.nix ({ pkgs, ...} : { name = "containers-hosts"; meta = with pkgs.stdenv.lib.maintainers; { maintainers = [ montag451 ]; @@ -42,11 +42,11 @@ import ./make-test.nix ({ pkgs, ...} : { }; testScript = '' - startAll; - $machine->waitForUnit("default.target"); + start_all() + machine.wait_for_unit("default.target") - # Ping the containers using the entries added in /etc/hosts - $machine->succeed("ping -n -c 1 simple.containers"); - $machine->succeed("ping -n -c 1 netmask.containers"); + with subtest("Ping the containers using the entries added in /etc/hosts"): + for host in "simple.containers", "netmask.containers": + machine.succeed(f"ping -n -c 1 {host}") ''; }) diff --git a/nixos/tests/containers-imperative.nix b/nixos/tests/containers-imperative.nix index 2e7e4b2f1d6..61df74042cb 100644 --- a/nixos/tests/containers-imperative.nix +++ b/nixos/tests/containers-imperative.nix @@ -1,6 +1,6 @@ # Test for NixOS' container support. -import ./make-test.nix ({ pkgs, ...} : { +import ./make-test-python.nix ({ pkgs, ...} : { name = "containers-imperative"; meta = with pkgs.stdenv.lib.maintainers; { maintainers = [ aristid aszlig eelco kampfschlaefer ]; @@ -36,95 +36,99 @@ import ./make-test.nix ({ pkgs, ...} : { }; testScript = let - tmpfilesContainerConfig = pkgs.writeText "container-config-tmpfiles" '' - { - systemd.tmpfiles.rules = [ "d /foo - - - - -" ]; - systemd.services.foo = { - serviceConfig.Type = "oneshot"; - script = "ls -al /foo"; - wantedBy = [ "multi-user.target" ]; - }; - } - ''; in - '' - # Make sure we have a NixOS tree (required by ‘nixos-container create’). - $machine->succeed("PAGER=cat nix-env -qa -A nixos.hello >&2"); - - # Create some containers imperatively. - my $id1 = $machine->succeed("nixos-container create foo --ensure-unique-name"); - chomp $id1; - $machine->log("created container $id1"); - - my $id2 = $machine->succeed("nixos-container create foo --ensure-unique-name"); - chomp $id2; - $machine->log("created container $id2"); - - die if $id1 eq $id2; - - # Put the root of $id2 into a bind mount. - $machine->succeed( - "mv /var/lib/containers/$id2 /id2-bindmount", - "mount --bind /id2-bindmount /var/lib/containers/$id1" - ); - - my $ip1 = $machine->succeed("nixos-container show-ip $id1"); - chomp $ip1; - my $ip2 = $machine->succeed("nixos-container show-ip $id2"); - chomp $ip2; - die if $ip1 eq $ip2; - - # Create a directory and a file we can later check if it still exists - # after destruction of the container. - $machine->succeed( - "mkdir /nested-bindmount", - "echo important data > /nested-bindmount/dummy", - ); - - # Create a directory with a dummy file and bind-mount it into both - # containers. - foreach ($id1, $id2) { - my $importantPath = "/var/lib/containers/$_/very/important/data"; - $machine->succeed( - "mkdir -p $importantPath", - "mount --bind /nested-bindmount $importantPath" - ); - } - - # Start one of them. - $machine->succeed("nixos-container start $id1"); - - # Execute commands via the root shell. - $machine->succeed("nixos-container run $id1 -- uname") =~ /Linux/ or die; - - # Execute a nix command via the root shell. (regression test for #40355) - $machine->succeed("nixos-container run $id1 -- nix-instantiate -E 'derivation { name = \"empty\"; builder = \"false\"; system = \"false\"; }'"); - - # Stop and start (regression test for #4989) - $machine->succeed("nixos-container stop $id1"); - $machine->succeed("nixos-container start $id1"); - - # Ensure tmpfiles are present - $machine->log("creating container tmpfiles"); - $machine->succeed("nixos-container create tmpfiles --config-file ${tmpfilesContainerConfig}"); - $machine->log("created, starting…"); - $machine->succeed("nixos-container start tmpfiles"); - $machine->log("done starting, investigating…"); - $machine->succeed("echo \$(nixos-container run tmpfiles -- systemctl is-active foo.service) | grep -q active;"); - $machine->succeed("nixos-container destroy tmpfiles"); - - # Execute commands via the root shell. - $machine->succeed("nixos-container run $id1 -- uname") =~ /Linux/ or die; - - # Destroy the containers. - $machine->succeed("nixos-container destroy $id1"); - $machine->succeed("nixos-container destroy $id2"); - - $machine->succeed( - # Check whether destruction of any container has killed important data - "grep -qF 'important data' /nested-bindmount/dummy", - # Ensure that the container path is gone - "test ! -e /var/lib/containers/$id1" - ); + tmpfilesContainerConfig = pkgs.writeText "container-config-tmpfiles" '' + { + systemd.tmpfiles.rules = [ "d /foo - - - - -" ]; + systemd.services.foo = { + serviceConfig.Type = "oneshot"; + script = "ls -al /foo"; + wantedBy = [ "multi-user.target" ]; + }; + } + ''; + in '' + with subtest("Make sure we have a NixOS tree (required by ‘nixos-container create’)"): + machine.succeed("PAGER=cat nix-env -qa -A nixos.hello >&2") + + id1, id2 = None, None + + with subtest("Create some containers imperatively"): + id1 = machine.succeed("nixos-container create foo --ensure-unique-name").rstrip() + machine.log(f"created container {id1}") + + id2 = machine.succeed("nixos-container create foo --ensure-unique-name").rstrip() + machine.log(f"created container {id2}") + + assert id1 != id2 + + with subtest(f"Put the root of {id2} into a bind mount"): + machine.succeed( + f"mv /var/lib/containers/{id2} /id2-bindmount", + f"mount --bind /id2-bindmount /var/lib/containers/{id1}", + ) + + ip1 = machine.succeed(f"nixos-container show-ip {id1}").rstrip() + ip2 = machine.succeed(f"nixos-container show-ip {id2}").rstrip() + assert ip1 != ip2 + + with subtest( + "Create a directory and a file we can later check if it still exists " + + "after destruction of the container" + ): + machine.succeed("mkdir /nested-bindmount") + machine.succeed("echo important data > /nested-bindmount/dummy") + + with subtest( + "Create a directory with a dummy file and bind-mount it into both containers." + ): + for id in id1, id2: + important_path = f"/var/lib/containers/{id}/very/important/data" + machine.succeed( + f"mkdir -p {important_path}", + f"mount --bind /nested-bindmount {important_path}", + ) + + with subtest("Start one of them"): + machine.succeed(f"nixos-container start {id1}") + + with subtest("Execute commands via the root shell"): + assert "Linux" in machine.succeed(f"nixos-container run {id1} -- uname") + + with subtest("Execute a nix command via the root shell. (regression test for #40355)"): + machine.succeed( + f"nixos-container run {id1} -- nix-instantiate -E " + + '\'derivation { name = "empty"; builder = "false"; system = "false"; }\' ' + ) + + with subtest("Stop and start (regression test for #4989)"): + machine.succeed(f"nixos-container stop {id1}") + machine.succeed(f"nixos-container start {id1}") + + with subtest("tmpfiles are present"): + machine.log("creating container tmpfiles") + machine.succeed( + "nixos-container create tmpfiles --config-file ${tmpfilesContainerConfig}" + ) + machine.log("created, starting…") + machine.succeed("nixos-container start tmpfiles") + machine.log("done starting, investigating…") + machine.succeed( + "echo $(nixos-container run tmpfiles -- systemctl is-active foo.service) | grep -q active;" + ) + machine.succeed("nixos-container destroy tmpfiles") + + with subtest("Execute commands via the root shell"): + assert "Linux" in machine.succeed(f"nixos-container run {id1} -- uname") + + with subtest("Destroy the containers"): + for id in id1, id2: + machine.succeed(f"nixos-container destroy {id}") + + with subtest("Check whether destruction of any container has killed important data"): + machine.succeed("grep -qF 'important data' /nested-bindmount/dummy") + + with subtest("Ensure that the container path is gone"): + print(machine.succeed("ls -lsa /var/lib/containers")) + machine.succeed(f"test ! -e /var/lib/containers/{id1}") ''; - }) diff --git a/nixos/tests/containers-ip.nix b/nixos/tests/containers-ip.nix new file mode 100644 index 00000000000..8583a08c625 --- /dev/null +++ b/nixos/tests/containers-ip.nix @@ -0,0 +1,77 @@ +# Test for NixOS' container support. + +let + webserverFor = hostAddress: localAddress: { + inherit hostAddress localAddress; + privateNetwork = true; + config = { + services.httpd = { + enable = true; + adminAddr = "foo@example.org"; + }; + networking.firewall.allowedTCPPorts = [ 80 ]; + }; + }; + +in import ./make-test-python.nix ({ pkgs, ...} : { + name = "containers-ipv4-ipv6"; + meta = with pkgs.stdenv.lib.maintainers; { + maintainers = [ aristid aszlig eelco kampfschlaefer ]; + }; + + machine = + { pkgs, ... }: { + imports = [ ../modules/installer/cd-dvd/channel.nix ]; + virtualisation = { + writableStore = true; + memorySize = 768; + }; + + containers.webserver4 = webserverFor "10.231.136.1" "10.231.136.2"; + containers.webserver6 = webserverFor "fc00::2" "fc00::1"; + virtualisation.pathsInNixDB = [ pkgs.stdenv ]; + }; + + testScript = { nodes, ... }: '' + import time + + + def curl_host(ip): + # put [] around ipv6 addresses for curl + host = ip if ":" not in ip else f"[{ip}]" + return f"curl --fail --connect-timeout 2 http://{host}/ > /dev/null" + + + def get_ip(container): + # need to distinguish because show-ip won't work for ipv6 + if container == "webserver4": + ip = machine.succeed(f"nixos-container show-ip {container}").rstrip() + assert ip == "${nodes.machine.config.containers.webserver4.localAddress}" + return ip + return "${nodes.machine.config.containers.webserver6.localAddress}" + + + for container in "webserver4", "webserver6": + assert container in machine.succeed("nixos-container list") + + with subtest(f"Start container {container}"): + machine.succeed(f"nixos-container start {container}") + # wait 2s for container to start and network to be up + time.sleep(2) + + # Since "start" returns after the container has reached + # multi-user.target, we should now be able to access it. + + ip = get_ip(container) + with subtest(f"{container} reacts to pings and HTTP requests"): + machine.succeed(f"ping -n -c1 {ip}") + machine.succeed(curl_host(ip)) + + with subtest(f"Stop container {container}"): + machine.succeed(f"nixos-container stop {container}") + machine.fail(curl_host(ip)) + + # Destroying a declarative container should fail. + machine.fail(f"nixos-container destroy {container}") + ''; +}) diff --git a/nixos/tests/containers-ipv4.nix b/nixos/tests/containers-ipv4.nix deleted file mode 100644 index ace68ff2df8..00000000000 --- a/nixos/tests/containers-ipv4.nix +++ /dev/null @@ -1,55 +0,0 @@ -# Test for NixOS' container support. - -import ./make-test.nix ({ pkgs, ...} : { - name = "containers-ipv4"; - meta = with pkgs.stdenv.lib.maintainers; { - maintainers = [ aristid aszlig eelco kampfschlaefer ]; - }; - - machine = - { pkgs, ... }: - { imports = [ ../modules/installer/cd-dvd/channel.nix ]; - virtualisation.writableStore = true; - virtualisation.memorySize = 768; - - containers.webserver = - { privateNetwork = true; - hostAddress = "10.231.136.1"; - localAddress = "10.231.136.2"; - config = - { services.httpd.enable = true; - services.httpd.adminAddr = "foo@example.org"; - networking.firewall.allowedTCPPorts = [ 80 ]; - system.stateVersion = "18.03"; - }; - }; - - virtualisation.pathsInNixDB = [ pkgs.stdenv ]; - }; - - testScript = - '' - $machine->succeed("nixos-container list") =~ /webserver/ or die; - - # Start the webserver container. - $machine->succeed("nixos-container start webserver"); - - # wait two seconds for the container to start and the network to be up - sleep 2; - - # Since "start" returns after the container has reached - # multi-user.target, we should now be able to access it. - my $ip = $machine->succeed("nixos-container show-ip webserver"); - chomp $ip; - $machine->succeed("ping -n -c1 $ip"); - $machine->succeed("curl --fail http://$ip/ > /dev/null"); - - # Stop the container. - $machine->succeed("nixos-container stop webserver"); - $machine->fail("curl --fail --connect-timeout 2 http://$ip/ > /dev/null"); - - # Destroying a declarative container should fail. - $machine->fail("nixos-container destroy webserver"); - ''; - -}) diff --git a/nixos/tests/containers-ipv6.nix b/nixos/tests/containers-ipv6.nix deleted file mode 100644 index a9499d192bd..00000000000 --- a/nixos/tests/containers-ipv6.nix +++ /dev/null @@ -1,60 +0,0 @@ -# Test for NixOS' container support. - -let - hostIp = "fc00::2"; - localIp = "fc00::1"; -in - -import ./make-test.nix ({ pkgs, ...} : { - name = "containers-ipv6"; - meta = with pkgs.stdenv.lib.maintainers; { - maintainers = [ aristid aszlig eelco kampfschlaefer ]; - }; - - machine = - { pkgs, ... }: - { imports = [ ../modules/installer/cd-dvd/channel.nix ]; - virtualisation.writableStore = true; - virtualisation.memorySize = 768; - - containers.webserver = - { privateNetwork = true; - hostAddress6 = hostIp; - localAddress6 = localIp; - config = - { services.httpd.enable = true; - services.httpd.adminAddr = "foo@example.org"; - networking.firewall.allowedTCPPorts = [ 80 ]; - }; - }; - - virtualisation.pathsInNixDB = [ pkgs.stdenv ]; - }; - - testScript = - '' - $machine->waitForUnit("default.target"); - $machine->succeed("nixos-container list") =~ /webserver/ or die; - - # Start the webserver container. - $machine->succeed("nixos-container start webserver"); - - # wait two seconds for the container to start and the network to be up - sleep 2; - - # Since "start" returns after the container has reached - # multi-user.target, we should now be able to access it. - my $ip = "${localIp}"; - chomp $ip; - $machine->succeed("ping -n -c 1 $ip"); - $machine->succeed("curl --fail http://[$ip]/ > /dev/null"); - - # Stop the container. - $machine->succeed("nixos-container stop webserver"); - $machine->fail("curl --fail --connect-timeout 2 http://[$ip]/ > /dev/null"); - - # Destroying a declarative container should fail. - $machine->fail("nixos-container destroy webserver"); - ''; - -}) diff --git a/nixos/tests/containers-reloadable.nix b/nixos/tests/containers-reloadable.nix index f41dea91b1e..35aff91e85b 100644 --- a/nixos/tests/containers-reloadable.nix +++ b/nixos/tests/containers-reloadable.nix @@ -1,7 +1,7 @@ -import ./make-test.nix ({ pkgs, lib, ...} : +import ./make-test-python.nix ({ pkgs, lib, ...} : let client_base = { - + containers.test1 = { autoStart = true; config = { @@ -48,18 +48,25 @@ in { c1System = nodes.client_c1.config.system.build.toplevel; c2System = nodes.client_c2.config.system.build.toplevel; in '' - $client->start(); - $client->waitForUnit("default.target"); - $client->succeed("[[ \$(nixos-container run test1 cat /etc/check) == client_base ]] >&2"); + client.start() + client.wait_for_unit("default.target") + + assert "client_base" in client.succeed("nixos-container run test1 cat /etc/check") - $client->succeed("${c1System}/bin/switch-to-configuration test >&2"); - $client->succeed("[[ \$(nixos-container run test1 cat /etc/check) == client_c1 ]] >&2"); - $client->succeed("systemctl status httpd -M test1 >&2"); + with subtest("httpd is available after activating config1"): + client.succeed( + "${c1System}/bin/switch-to-configuration test >&2", + "[[ $(nixos-container run test1 cat /etc/check) == client_c1 ]] >&2", + "systemctl status httpd -M test1 >&2", + ) - $client->succeed("${c2System}/bin/switch-to-configuration test >&2"); - $client->succeed("[[ \$(nixos-container run test1 cat /etc/check) == client_c2 ]] >&2"); - $client->fail("systemctl status httpd -M test1 >&2"); - $client->succeed("systemctl status nginx -M test1 >&2"); + with subtest("httpd is not available any longer after switching to config2"): + client.succeed( + "${c2System}/bin/switch-to-configuration test >&2", + "[[ $(nixos-container run test1 cat /etc/check) == client_c2 ]] >&2", + "systemctl status nginx -M test1 >&2", + ) + client.fail("systemctl status httpd -M test1 >&2") ''; }) diff --git a/nixos/tests/containers-tmpfs.nix b/nixos/tests/containers-tmpfs.nix index e29fe6bbf03..171e8f01c7b 100644 --- a/nixos/tests/containers-tmpfs.nix +++ b/nixos/tests/containers-tmpfs.nix @@ -1,6 +1,6 @@ # Test for NixOS' container support. -import ./make-test.nix ({ pkgs, ...} : { +import ./make-test-python.nix ({ pkgs, ...} : { name = "containers-tmpfs"; meta = with pkgs.stdenv.lib.maintainers; { maintainers = [ kampka ]; @@ -31,49 +31,63 @@ import ./make-test.nix ({ pkgs, ...} : { virtualisation.pathsInNixDB = [ pkgs.stdenv ]; }; - testScript = - '' - $machine->waitForUnit("default.target"); - $machine->succeed("nixos-container list") =~ /tmpfs/ or die; - - # Start the tmpfs container. - #$machine->succeed("nixos-container status tmpfs") =~ /up/ or die; - - # Verify that /var is mounted as a tmpfs - #$machine->succeed("nixos-container run tmpfs -- systemctl status var.mount --no-pager 2>/dev/null") =~ /What: tmpfs/ or die; - $machine->succeed("nixos-container run tmpfs -- mountpoint -q /var 2>/dev/null"); - - # Verify that /var/log is mounted as a tmpfs - $machine->succeed("nixos-container run tmpfs -- systemctl status var-log.mount --no-pager 2>/dev/null") =~ /What: tmpfs/ or die; - $machine->succeed("nixos-container run tmpfs -- mountpoint -q /var/log 2>/dev/null"); - - # Verify that /some/random/path is mounted as a tmpfs - $machine->succeed("nixos-container run tmpfs -- systemctl status some-random-path.mount --no-pager 2>/dev/null") =~ /What: tmpfs/ or die; - $machine->succeed("nixos-container run tmpfs -- mountpoint -q /some/random/path 2>/dev/null"); - - # Verify that files created in the container in a non-tmpfs directory are visible on the host. - # This establishes legitimacy for the following tests - $machine->succeed("nixos-container run tmpfs -- touch /root/test.file 2>/dev/null"); - $machine->succeed("nixos-container run tmpfs -- ls -l /root | grep -q test.file 2>/dev/null"); - $machine->succeed("test -e /var/lib/containers/tmpfs/root/test.file"); - - - # Verify that /some/random/path is writable and that files created there - # are not in the hosts container dir but in the tmpfs - $machine->succeed("nixos-container run tmpfs -- touch /some/random/path/test.file 2>/dev/null"); - $machine->succeed("nixos-container run tmpfs -- test -e /some/random/path/test.file 2>/dev/null"); - - $machine->fail("test -e /var/lib/containers/tmpfs/some/random/path/test.file"); - - # Verify that files created in the hosts container dir in a path where a tmpfs file system has been mounted - # are not visible to the container as the do not exist in the tmpfs - $machine->succeed("touch /var/lib/containers/tmpfs/var/test.file"); - - $machine->succeed("test -e /var/lib/containers/tmpfs/var/test.file"); - $machine->succeed("ls -l /var/lib/containers/tmpfs/var/ | grep -q test.file 2>/dev/null"); - - $machine->fail("nixos-container run tmpfs -- ls -l /var | grep -q test.file 2>/dev/null"); - + testScript = '' + machine.wait_for_unit("default.target") + assert "tmpfs" in machine.succeed("nixos-container list") + + with subtest("tmpfs container is up"): + assert "up" in machine.succeed("nixos-container status tmpfs") + + + def tmpfs_cmd(command): + return f"nixos-container run tmpfs -- {command} 2>/dev/null" + + + with subtest("/var is mounted as a tmpfs"): + machine.succeed(tmpfs_cmd("mountpoint -q /var")) + + with subtest("/var/log is mounted as a tmpfs"): + assert "What: tmpfs" in machine.succeed( + tmpfs_cmd("systemctl status var-log.mount --no-pager") + ) + machine.succeed(tmpfs_cmd("mountpoint -q /var/log")) + + with subtest("/some/random/path is mounted as a tmpfs"): + assert "What: tmpfs" in machine.succeed( + tmpfs_cmd("systemctl status some-random-path.mount --no-pager") + ) + machine.succeed(tmpfs_cmd("mountpoint -q /some/random/path")) + + with subtest( + "files created in the container in a non-tmpfs directory are visible on the host." + ): + # This establishes legitimacy for the following tests + machine.succeed( + tmpfs_cmd("touch /root/test.file"), + tmpfs_cmd("ls -l /root | grep -q test.file"), + "test -e /var/lib/containers/tmpfs/root/test.file", + ) + + with subtest( + "/some/random/path is writable and that files created there are not " + + "in the hosts container dir but in the tmpfs" + ): + machine.succeed( + tmpfs_cmd("touch /some/random/path/test.file"), + tmpfs_cmd("test -e /some/random/path/test.file"), + ) + machine.fail("test -e /var/lib/containers/tmpfs/some/random/path/test.file") + + with subtest( + "files created in the hosts container dir in a path where a tmpfs " + + "file system has been mounted are not visible to the container as " + + "the do not exist in the tmpfs" + ): + machine.succeed( + "touch /var/lib/containers/tmpfs/var/test.file", + "test -e /var/lib/containers/tmpfs/var/test.file", + "ls -l /var/lib/containers/tmpfs/var/ | grep -q test.file 2>/dev/null", + ) + machine.fail(tmpfs_cmd("ls -l /var | grep -q test.file")) ''; - }) diff --git a/nixos/tests/iftop.nix b/nixos/tests/iftop.nix index a4f524ceb27..8a161027c2a 100644 --- a/nixos/tests/iftop.nix +++ b/nixos/tests/iftop.nix @@ -1,4 +1,4 @@ -import ./make-test.nix ({ pkgs, lib, ... }: +import ./make-test-python.nix ({ pkgs, lib, ... }: with lib; @@ -18,17 +18,16 @@ with lib; }; testScript = '' - subtest "machine with iftop enabled", sub { - $withIftop->waitForUnit("default.target"); - # limit to eth1 (eth0 is the test driver's control interface) - # and don't try name lookups - $withIftop->succeed("su -l alice -c 'iftop -t -s 1 -n -i eth1'"); - }; - subtest "machine without iftop", sub { - $withoutIftop->waitForUnit("default.target"); - # check that iftop is there but user alice lacks capabilities - $withoutIftop->succeed("iftop -t -s 1 -n -i eth1"); - $withoutIftop->fail("su -l alice -c 'iftop -t -s 1 -n -i eth1'"); - }; + with subtest("machine with iftop enabled"): + withIftop.wait_for_unit("default.target") + # limit to eth1 (eth0 is the test driver's control interface) + # and don't try name lookups + withIftop.succeed("su -l alice -c 'iftop -t -s 1 -n -i eth1'") + + with subtest("machine without iftop"): + withoutIftop.wait_for_unit("default.target") + # check that iftop is there but user alice lacks capabilitie + withoutIftop.succeed("iftop -t -s 1 -n -i eth1") + withoutIftop.fail("su -l alice -c 'iftop -t -s 1 -n -i eth1'") ''; }) diff --git a/nixos/tests/kernel-latest.nix b/nixos/tests/kernel-latest.nix index f30bd2e2e76..f09d0926d22 100644 --- a/nixos/tests/kernel-latest.nix +++ b/nixos/tests/kernel-latest.nix @@ -1,4 +1,4 @@ -import ./make-test.nix ({ pkgs, ...} : { +import ./make-test-python.nix ({ pkgs, ...} : { name = "kernel-latest"; meta = with pkgs.stdenv.lib.maintainers; { maintainers = [ nequissimus ]; @@ -11,7 +11,7 @@ import ./make-test.nix ({ pkgs, ...} : { testScript = '' - $machine->succeed("uname -s | grep 'Linux'"); - $machine->succeed("uname -a | grep '${pkgs.linuxPackages_latest.kernel.version}'"); + assert "Linux" in machine.succeed("uname -s") + assert "${pkgs.linuxPackages_latest.kernel.version}" in machine.succeed("uname -a") ''; }) diff --git a/nixos/tests/kernel-lts.nix b/nixos/tests/kernel-lts.nix index 28717fa6a84..bad706d63c0 100644 --- a/nixos/tests/kernel-lts.nix +++ b/nixos/tests/kernel-lts.nix @@ -1,4 +1,4 @@ -import ./make-test.nix ({ pkgs, ...} : { +import ./make-test-python.nix ({ pkgs, ...} : { name = "kernel-lts"; meta = with pkgs.stdenv.lib.maintainers; { maintainers = [ nequissimus ]; @@ -11,7 +11,7 @@ import ./make-test.nix ({ pkgs, ...} : { testScript = '' - $machine->succeed("uname -s | grep 'Linux'"); - $machine->succeed("uname -a | grep '${pkgs.linuxPackages.kernel.version}'"); + assert "Linux" in machine.succeed("uname -s") + assert "${pkgs.linuxPackages.kernel.version}" in machine.succeed("uname -a") ''; }) diff --git a/nixos/tests/kernel-testing.nix b/nixos/tests/kernel-testing.nix index 276d2de12bb..b7e10ebd5bd 100644 --- a/nixos/tests/kernel-testing.nix +++ b/nixos/tests/kernel-testing.nix @@ -1,4 +1,4 @@ -import ./make-test.nix ({ pkgs, ...} : { +import ./make-test-python.nix ({ pkgs, ...} : { name = "kernel-testing"; meta = with pkgs.stdenv.lib.maintainers; { maintainers = [ nequissimus ]; @@ -11,7 +11,7 @@ import ./make-test.nix ({ pkgs, ...} : { testScript = '' - $machine->succeed("uname -s | grep 'Linux'"); - $machine->succeed("uname -a | grep '${pkgs.linuxPackages_testing.kernel.modDirVersion}'"); + assert "Linux" in machine.succeed("uname -s") + assert "${pkgs.linuxPackages_testing.kernel.modDirVersion}" in machine.succeed("uname -a") ''; }) diff --git a/nixos/tests/mailcatcher.nix b/nixos/tests/mailcatcher.nix index d45b5d4edfc..eb5b606ecc8 100644 --- a/nixos/tests/mailcatcher.nix +++ b/nixos/tests/mailcatcher.nix @@ -9,8 +9,8 @@ import ./make-test.nix ({ lib, ... }: { services.mailcatcher.enable = true; - networking.defaultMailServer.directDelivery = true; - networking.defaultMailServer.hostName = "localhost:1025"; + services.ssmtp.enable = true; + services.ssmtp.hostName = "localhost:1025"; environment.systemPackages = [ pkgs.mailutils ]; }; diff --git a/nixos/tests/memcached.nix b/nixos/tests/memcached.nix index b120599c51d..31f5627d25c 100644 --- a/nixos/tests/memcached.nix +++ b/nixos/tests/memcached.nix @@ -1,28 +1,24 @@ -import ./make-test.nix ({ pkgs, ...} : { +import ./make-test-python.nix ({ pkgs, ... }: { name = "memcached"; - nodes = { - machine = - { ... }: - { - imports = [ ../modules/profiles/minimal.nix ]; - services.memcached.enable = true; - }; + machine = { + imports = [ ../modules/profiles/minimal.nix ]; + services.memcached.enable = true; }; testScript = let - testScript = pkgs.writeScript "testScript.py" '' - #!${pkgs.python3.withPackages (p: [p.memcached])}/bin/python - + testScript = pkgs.writers.writePython3 "test_memcache" { + libraries = with pkgs.python3Packages; [ memcached ]; + } '' import memcache c = memcache.Client(['localhost:11211']) c.set('key', 'value') assert 'value' == c.get('key') ''; in '' - startAll; - $machine->waitForUnit("memcached.service"); - $machine->waitForOpenPort("11211"); - $machine->succeed("${testScript}"); + machine.start() + machine.wait_for_unit("memcached.service") + machine.wait_for_open_port(11211) + machine.succeed("${testScript}") ''; }) diff --git a/nixos/tests/ndppd.nix b/nixos/tests/ndppd.nix index 6a6f602726d..b67b26a7934 100644 --- a/nixos/tests/ndppd.nix +++ b/nixos/tests/ndppd.nix @@ -1,4 +1,4 @@ -import ./make-test.nix ({ pkgs, lib, ...} : { +import ./make-test-python.nix ({ pkgs, lib, ...} : { name = "ndppd"; meta = with pkgs.stdenv.lib.maintainers; { maintainers = [ fpletz ]; @@ -52,9 +52,9 @@ import ./make-test.nix ({ pkgs, lib, ...} : { }; testScript = '' - startAll; - $server->waitForUnit("multi-user.target"); - $upstream->waitForUnit("multi-user.target"); - $upstream->waitUntilSucceeds("ping -c5 fd42::2"); + start_all() + server.wait_for_unit("multi-user.target") + upstream.wait_for_unit("multi-user.target") + upstream.wait_until_succeeds("ping -c5 fd42::2") ''; }) diff --git a/nixos/tests/netdata.nix b/nixos/tests/netdata.nix index 9bd147968e4..8dd5eafb097 100644 --- a/nixos/tests/netdata.nix +++ b/nixos/tests/netdata.nix @@ -1,6 +1,6 @@ # This test runs netdata and checks for data via apps.plugin -import ./make-test.nix ({ pkgs, ...} : { +import ./make-test-python.nix ({ pkgs, ...} : { name = "netdata"; meta = with pkgs.stdenv.lib.maintainers; { maintainers = [ cransom ]; @@ -16,23 +16,22 @@ import ./make-test.nix ({ pkgs, ...} : { }; testScript = '' - startAll; + start_all() - $netdata->waitForUnit("netdata.service"); + netdata.wait_for_unit("netdata.service") # wait for the service to listen before sending a request - $netdata->waitForOpenPort(19999); + netdata.wait_for_open_port(19999) # check if the netdata main page loads. - $netdata->succeed("curl --fail http://localhost:19999/"); + netdata.succeed("curl --fail http://localhost:19999/") # check if netdata can read disk ops for root owned processes. # if > 0, successful. verifies both netdata working and # apps.plugin has elevated capabilities. - my $cmd = <<'CMD'; - curl -s http://localhost:19999/api/v1/data\?chart=users.pwrites | \ - jq -e '[.data[range(10)][.labels | indices("root")[0]]] | add | . > 0' - CMD - $netdata->waitUntilSucceeds($cmd); + url = "http://localhost:19999/api/v1/data\?chart=users.pwrites" + filter = '[.data[range(10)][.labels | indices("root")[0]]] | add | . > 0' + cmd = f"curl -s {url} | jq -e '{filter}'" + netdata.wait_until_succeeds(cmd) ''; }) diff --git a/nixos/tests/nextcloud/basic.nix b/nixos/tests/nextcloud/basic.nix index bfb97ec3f23..75862feb202 100644 --- a/nixos/tests/nextcloud/basic.nix +++ b/nixos/tests/nextcloud/basic.nix @@ -1,4 +1,4 @@ -import ../make-test.nix ({ pkgs, ...}: let +import ../make-test-python.nix ({ pkgs, ...}: let adminpass = "notproduction"; adminuser = "root"; in { @@ -50,11 +50,15 @@ in { diff <(echo 'hi') <(${pkgs.rclone}/bin/rclone cat nextcloud:test-shared-file) ''; in '' - startAll(); - $nextcloud->waitForUnit("multi-user.target"); - $nextcloud->succeed("curl -sSf http://nextcloud/login"); - $nextcloud->succeed("${withRcloneEnv} ${copySharedFile}"); - $client->waitForUnit("multi-user.target"); - $client->succeed("${withRcloneEnv} ${diffSharedFile}"); + start_all() + nextcloud.wait_for_unit("multi-user.target") + nextcloud.succeed("curl -sSf http://nextcloud/login") + nextcloud.succeed( + "${withRcloneEnv} ${copySharedFile}" + ) + client.wait_for_unit("multi-user.target") + client.succeed( + "${withRcloneEnv} ${diffSharedFile}" + ) ''; }) diff --git a/nixos/tests/nextcloud/with-mysql-and-memcached.nix b/nixos/tests/nextcloud/with-mysql-and-memcached.nix index aaf37ee4c81..b9ba5888187 100644 --- a/nixos/tests/nextcloud/with-mysql-and-memcached.nix +++ b/nixos/tests/nextcloud/with-mysql-and-memcached.nix @@ -1,4 +1,4 @@ -import ../make-test.nix ({ pkgs, ...}: let +import ../make-test-python.nix ({ pkgs, ...}: let adminpass = "hunter2"; adminuser = "root"; in { @@ -85,13 +85,16 @@ in { diff <(echo 'hi') <(${pkgs.rclone}/bin/rclone cat nextcloud:test-shared-file) ''; in '' - startAll(); - $nextcloud->waitForUnit("multi-user.target"); - $nextcloud->succeed("${configureMemcached}"); - $nextcloud->succeed("curl -sSf http://nextcloud/login"); - $nextcloud->succeed("${withRcloneEnv} ${copySharedFile}"); - $client->waitForUnit("multi-user.target"); - $client->succeed("${withRcloneEnv} ${diffSharedFile}"); - + start_all() + nextcloud.wait_for_unit("multi-user.target") + nextcloud.succeed("${configureMemcached}") + nextcloud.succeed("curl -sSf http://nextcloud/login") + nextcloud.succeed( + "${withRcloneEnv} ${copySharedFile}" + ) + client.wait_for_unit("multi-user.target") + client.succeed( + "${withRcloneEnv} ${diffSharedFile}" + ) ''; }) diff --git a/nixos/tests/nextcloud/with-postgresql-and-redis.nix b/nixos/tests/nextcloud/with-postgresql-and-redis.nix index f655aba9d45..324853350af 100644 --- a/nixos/tests/nextcloud/with-postgresql-and-redis.nix +++ b/nixos/tests/nextcloud/with-postgresql-and-redis.nix @@ -1,4 +1,4 @@ -import ../make-test.nix ({ pkgs, ...}: let +import ../make-test-python.nix ({ pkgs, ...}: let adminpass = "hunter2"; adminuser = "custom-admin-username"; in { @@ -85,12 +85,16 @@ in { diff <(echo 'hi') <(${pkgs.rclone}/bin/rclone cat nextcloud:test-shared-file) ''; in '' - startAll(); - $nextcloud->waitForUnit("multi-user.target"); - $nextcloud->succeed("${configureRedis}"); - $nextcloud->succeed("curl -sSf http://nextcloud/login"); - $nextcloud->succeed("${withRcloneEnv} ${copySharedFile}"); - $client->waitForUnit("multi-user.target"); - $client->succeed("${withRcloneEnv} ${diffSharedFile}"); + start_all() + nextcloud.wait_for_unit("multi-user.target") + nextcloud.succeed("${configureRedis}") + nextcloud.succeed("curl -sSf http://nextcloud/login") + nextcloud.succeed( + "${withRcloneEnv} ${copySharedFile}" + ) + client.wait_for_unit("multi-user.target") + client.succeed( + "${withRcloneEnv} ${diffSharedFile}" + ) ''; }) diff --git a/nixos/tests/pantheon.nix b/nixos/tests/pantheon.nix index 6ff19be1bb9..c0434f20754 100644 --- a/nixos/tests/pantheon.nix +++ b/nixos/tests/pantheon.nix @@ -28,7 +28,8 @@ import ./make-test-python.nix ({ pkgs, ...} : with subtest("Test we can see usernames in elementary-greeter"): machine.wait_for_text("${user.description}") - machine.wait_for_text("${bob.description}") + # OCR was struggling with this one. + # machine.wait_for_text("${bob.description}") machine.screenshot("elementary_greeter_lightdm") with subtest("Login with elementary-greeter"): diff --git a/nixos/tests/rabbitmq.nix b/nixos/tests/rabbitmq.nix index bb5932c3641..8e7f34d06e3 100644 --- a/nixos/tests/rabbitmq.nix +++ b/nixos/tests/rabbitmq.nix @@ -1,21 +1,21 @@ # This test runs rabbitmq and checks if rabbitmq is up and running. -import ./make-test.nix ({ pkgs, ... }: { +import ./make-test-python.nix ({ pkgs, ... }: { name = "rabbitmq"; meta = with pkgs.stdenv.lib.maintainers; { maintainers = [ eelco offline ]; }; - nodes = { - one = { ... }: { - services.rabbitmq.enable = true; - }; + machine = { + services.rabbitmq.enable = true; }; testScript = '' - startAll; + machine.start() - $one->waitForUnit("rabbitmq.service"); - $one->waitUntilSucceeds("su -s ${pkgs.stdenv.shell} rabbitmq -c \"rabbitmqctl status\""); + machine.wait_for_unit("rabbitmq.service") + machine.wait_until_succeeds( + 'su -s ${pkgs.stdenv.shell} rabbitmq -c "rabbitmqctl status"' + ) ''; }) diff --git a/nixos/tests/xmpp/ejabberd.nix b/nixos/tests/xmpp/ejabberd.nix index 196a04aca30..1518aaacc8a 100644 --- a/nixos/tests/xmpp/ejabberd.nix +++ b/nixos/tests/xmpp/ejabberd.nix @@ -1,4 +1,4 @@ -import ../make-test.nix ({ pkgs, ... }: { +import ../make-test-python.nix ({ pkgs, ... }: { name = "ejabberd"; meta = with pkgs.stdenv.lib.maintainers; { maintainers = [ ajs124 ]; @@ -248,13 +248,21 @@ import ../make-test.nix ({ pkgs, ... }: { }; testScript = { nodes, ... }: '' - $server->waitForUnit('ejabberd.service'); - $server->succeed('su ejabberd -s $(which ejabberdctl) status|grep started') =~ /ejabberd is running/; - $server->succeed('su ejabberd -s $(which ejabberdctl) register azurediamond example.com hunter2'); - $server->succeed('su ejabberd -s $(which ejabberdctl) register cthon98 example.com nothunter2'); - $server->fail('su ejabberd -s $(which ejabberdctl) register asdf wrong.domain'); - $client->succeed('send-message'); - $server->succeed('su ejabberd -s $(which ejabberdctl) unregister cthon98 example.com'); - $server->succeed('su ejabberd -s $(which ejabberdctl) unregister azurediamond example.com'); + ejabberd_prefix = "su ejabberd -s $(which ejabberdctl) " + + server.wait_for_unit("ejabberd.service") + + assert "status: started" in server.succeed(ejabberd_prefix + "status") + + server.succeed( + ejabberd_prefix + "register azurediamond example.com hunter2", + ejabberd_prefix + "register cthon98 example.com nothunter2", + ) + server.fail(ejabberd_prefix + "register asdf wrong.domain") + client.succeed("send-message") + server.succeed( + ejabberd_prefix + "unregister cthon98 example.com", + ejabberd_prefix + "unregister azurediamond example.com", + ) ''; }) diff --git a/nixos/tests/xss-lock.nix b/nixos/tests/xss-lock.nix index 0d757e8cef3..3a7dea07d53 100644 --- a/nixos/tests/xss-lock.nix +++ b/nixos/tests/xss-lock.nix @@ -1,4 +1,4 @@ -import ./make-test.nix ({ pkgs, lib, ... }: +import ./make-test-python.nix ({ pkgs, lib, ... }: with lib; @@ -26,15 +26,19 @@ with lib; }; testScript = '' - startAll; - - ${concatStringsSep "\n" (mapAttrsToList (name: lockCmd: '' - ${"$"+name}->start; - ${"$"+name}->waitForX; - ${"$"+name}->waitForUnit("xss-lock.service", "alice"); - ${"$"+name}->fail("pgrep ${lockCmd}"); - ${"$"+name}->succeed("su -l alice -c 'xset dpms force standby'"); - ${"$"+name}->waitUntilSucceeds("pgrep ${lockCmd}"); - '') { simple = "i3lock"; custom_lockcmd = "xlock"; })} + def perform_xsslock_test(machine, lockCmd): + machine.start() + machine.wait_for_x() + machine.wait_for_unit("xss-lock.service", "alice") + machine.fail(f"pgrep {lockCmd}") + machine.succeed("su -l alice -c 'xset dpms force standby'") + machine.wait_until_succeeds(f"pgrep {lockCmd}") + + + with subtest("simple"): + perform_xsslock_test(simple, "i3lock") + + with subtest("custom_cmd"): + perform_xsslock_test(custom_lockcmd, "xlock") ''; }) diff --git a/pkgs/applications/audio/bsequencer/default.nix b/pkgs/applications/audio/bsequencer/default.nix index e4ac2fbbcdc..b91554f5716 100644 --- a/pkgs/applications/audio/bsequencer/default.nix +++ b/pkgs/applications/audio/bsequencer/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "BSEQuencer"; - version = "0.4"; + version = "1.2.0"; src = fetchFromGitHub { owner = "sjaehn"; repo = pname; - rev = "v${version}"; - sha256 = "0c3bm2z6z2bjjv1cy50383zr81h99rcb2frmxad0r7lhi27mjyqn"; + rev = "${version}"; + sha256 = "08xwz5v8wrar0rx7qdr9pkpjz2k9sw6bn5glhpn6sp6453fabf8q"; }; nativeBuildInputs = [ pkgconfig ]; diff --git a/pkgs/applications/audio/bslizr/default.nix b/pkgs/applications/audio/bslizr/default.nix index 8fbac6daf46..3273d7de68c 100644 --- a/pkgs/applications/audio/bslizr/default.nix +++ b/pkgs/applications/audio/bslizr/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "BSlizr"; - version = "1.2.0"; + version = "1.2.2"; src = fetchFromGitHub { owner = "sjaehn"; repo = pname; rev = "${version}"; - sha256 = "1xqhpppfj47nzmyksbqgfvvi5j807g96hqla544w2f752zz4yi0s"; + sha256 = "0q92ygz17iiriwzqylmaxd5ml2bhqy3n6c3f7g71n4hn9z3bl3s1"; }; nativeBuildInputs = [ pkgconfig ]; diff --git a/pkgs/applications/audio/mpc/default.nix b/pkgs/applications/audio/mpc/default.nix index 9a273299297..1e8d73ce560 100644 --- a/pkgs/applications/audio/mpc/default.nix +++ b/pkgs/applications/audio/mpc/default.nix @@ -1,17 +1,17 @@ -{ stdenv, fetchFromGitHub, meson, ninja, pkgconfig, mpd_clientlib, sphinx }: +{ stdenv, fetchFromGitHub, meson, ninja, pkgconfig, mpd_clientlib, sphinx, libiconv }: stdenv.mkDerivation rec { pname = "mpc"; - version = "0.31"; + version = "0.33"; src = fetchFromGitHub { owner = "MusicPlayerDaemon"; repo = "mpc"; rev = "v${version}"; - sha256 = "06wn5f24bgkqmhh2p8rbizmqibzqr4x1q7c6zl0pfq7mdy49g5ds"; + sha256 = "1qbi0i9cq54rj8z2kapk8x8g1jkw2jz781niwb9i7kw4xfhvy5zx"; }; - buildInputs = [ mpd_clientlib ]; + buildInputs = [ mpd_clientlib ] ++ stdenv.lib.optionals stdenv.isDarwin [ libiconv ]; nativeBuildInputs = [ meson ninja pkgconfig sphinx ]; diff --git a/pkgs/applications/audio/ncspot/default.nix b/pkgs/applications/audio/ncspot/default.nix index 63ae9278c5d..136f6fc1427 100644 --- a/pkgs/applications/audio/ncspot/default.nix +++ b/pkgs/applications/audio/ncspot/default.nix @@ -11,17 +11,17 @@ let ++ lib.optional withPortAudio "portaudio_backend"; in rustPlatform.buildRustPackage rec { - pname = "ncspot-unstable"; - version = "2019-10-12"; + pname = "ncspot"; + version = "0.1.1"; src = fetchFromGitHub { owner = "hrkfdn"; repo = "ncspot"; - rev = "4defded54646958268a20787917e4721ae96407d"; - sha256 = "1w3cmilwjzk3pfnq97qgz6hzxgjgi27dm8jq7maw87qyl3v17gyg"; + rev = "v${version}"; + sha256 = "0ldisr45w6ys1j62qv99ssqfg5q9dwrrzxh2maggyrx1zqdlsk6m"; }; - cargoSha256 = "1w1fk39pragfy2i2myw99mqf63w6fw4nr2kri8ily2iqc6g9xpgw"; + cargoSha256 = "0k765hinqxfm30li1z66m1chsv69v6hiz109q2zlkxzg937qbnjh"; cargoBuildFlags = [ "--no-default-features" "--features" "${lib.concatStringsSep "," features}" ]; diff --git a/pkgs/applications/audio/noise-repellent/default.nix b/pkgs/applications/audio/noise-repellent/default.nix new file mode 100644 index 00000000000..146e13f34de --- /dev/null +++ b/pkgs/applications/audio/noise-repellent/default.nix @@ -0,0 +1,29 @@ +{ stdenv, fetchFromGitHub, meson, ninja, pkgconfig, fftwFloat, lv2 }: + +stdenv.mkDerivation rec { + pname = "noise-repellent"; + version = "unstable-2018-12-29"; + + src = fetchFromGitHub { + owner = "lucianodato"; + repo = pname; + rev = "9efdd0b41ec184a792087c87cbf5382f455e33ec"; + sha256 = "0pn9cxapfvb5l62q86bchyfll1290vi0rhrzarb1jpc4ix7kz53c"; + fetchSubmodules = true; + }; + + mesonFlags = ("--prefix=${placeholder "out"}/lib/lv2"); + + nativeBuildInputs = [ meson ninja pkgconfig ]; + buildInputs = [ + fftwFloat lv2 + ]; + + meta = with stdenv.lib; { + description = "An lv2 plugin for broadband noise reduction"; + homepage = https://github.com/lucianodato/noise-repellent; + license = licenses.gpl3; + maintainers = [ maintainers.magnetophon ]; + platforms = [ "x86_64-linux" "i686-linux" "x86_64-darwin" "i686-darwin" ]; + }; +} diff --git a/pkgs/applications/audio/picard/default.nix b/pkgs/applications/audio/picard/default.nix index dc1118f47e0..b40ab6d4f7a 100644 --- a/pkgs/applications/audio/picard/default.nix +++ b/pkgs/applications/audio/picard/default.nix @@ -4,13 +4,13 @@ let pythonPackages = python3Packages; in pythonPackages.buildPythonApplication rec { pname = "picard"; - version = "2.2.2"; + version = "2.2.3"; src = fetchFromGitHub { owner = "metabrainz"; repo = pname; rev = "release-${version}"; - sha256 = "1iibkvwpj862wcrl0fmyi6qhcgx4q5ay63yr0zyg0bkqgcka0gpr"; + sha256 = "0lb4pzl03mr5hrzrzva99rxqd5yfip62b7sjmlg4j0imw8mxaj16"; }; nativeBuildInputs = [ gettext qt5.wrapQtAppsHook qt5.qtbase ]; diff --git a/pkgs/applications/audio/strawberry/default.nix b/pkgs/applications/audio/strawberry/default.nix index 315bb624e51..bf17798531b 100644 --- a/pkgs/applications/audio/strawberry/default.nix +++ b/pkgs/applications/audio/strawberry/default.nix @@ -35,13 +35,13 @@ mkDerivation rec { pname = "strawberry"; - version = "0.6.5"; + version = "0.6.6"; src = fetchFromGitHub { owner = "jonaski"; repo = pname; rev = version; - sha256 = "1kqx0q99n1p5pm6skvqjihz11byhxdid1qw6gqp67dh2na62z1lm"; + sha256 = "113z2qdcg0fm6ff2k36nl5zbbj5wsidl94ca1sfnsv9bq9lkvck5"; }; buildInputs = [ @@ -93,7 +93,7 @@ mkDerivation rec { changelog = "https://raw.githubusercontent.com/jonaski/strawberry/${version}/Changelog"; license = licenses.gpl3; maintainers = with maintainers; [ peterhoeg ]; - # upstream says darwin should work but they lack maintainers as of 0.6.5 + # upstream says darwin should work but they lack maintainers as of 0.6.6 platforms = platforms.linux; }; } diff --git a/pkgs/applications/audio/zam-plugins/default.nix b/pkgs/applications/audio/zam-plugins/default.nix index ecbd9042346..a8236b4b60f 100644 --- a/pkgs/applications/audio/zam-plugins/default.nix +++ b/pkgs/applications/audio/zam-plugins/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchgit , boost, libX11, libGLU, libGL, liblo, libjack2, ladspaH, lv2, pkgconfig, rubberband, libsndfile, fftwFloat, libsamplerate }: +{ stdenv, fetchgit , boost, libX11, libGL, liblo, libjack2, ladspaH, lv2, pkgconfig, rubberband, libsndfile, fftwFloat, libsamplerate }: stdenv.mkDerivation { pname = "zam-plugins"; @@ -12,16 +12,18 @@ stdenv.mkDerivation { }; nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ boost libX11 libGLU libGL liblo libjack2 ladspaH lv2 rubberband libsndfile fftwFloat libsamplerate ]; + buildInputs = [ boost libX11 libGL liblo libjack2 ladspaH lv2 rubberband libsndfile fftwFloat libsamplerate ]; - patchPhase = '' + postPatch = '' patchShebangs ./dpf/utils/generate-ttl.sh ''; makeFlags = [ - "PREFIX=$(out)" + "PREFIX=${placeholder ''out''}" ]; + enableParallelBuilding = true; + meta = with stdenv.lib; { homepage = http://www.zamaudio.com/?p=976; description = "A collection of LV2/LADSPA/VST/JACK audio plugins by ZamAudio"; diff --git a/pkgs/applications/blockchains/bitcoin-abc.nix b/pkgs/applications/blockchains/bitcoin-abc.nix index 0c806a89015..95dab9f18b9 100644 --- a/pkgs/applications/blockchains/bitcoin-abc.nix +++ b/pkgs/applications/blockchains/bitcoin-abc.nix @@ -7,13 +7,13 @@ with stdenv.lib; stdenv.mkDerivation rec { name = "bitcoin" + (toString (optional (!withGui) "d")) + "-abc-" + version; - version = "0.20.5"; + version = "0.20.6"; src = fetchFromGitHub { owner = "bitcoin-ABC"; repo = "bitcoin-abc"; rev = "v${version}"; - sha256 = "1adps3g99m7cxs58c48g2dgyihfv0v8d198klzcbbf4dq0s5v45c"; + sha256 = "1a65pykdjkiic67fcs8cg2qrvzzrqifa93r1bzza3gdyfdvgv3ww"; }; patches = [ ./fix-bitcoin-qt-build.patch ]; diff --git a/pkgs/applications/blockchains/dogecoin.nix b/pkgs/applications/blockchains/dogecoin.nix index e5f149a0efe..02744e50647 100644 --- a/pkgs/applications/blockchains/dogecoin.nix +++ b/pkgs/applications/blockchains/dogecoin.nix @@ -7,13 +7,13 @@ with stdenv.lib; stdenv.mkDerivation rec { name = "dogecoin" + (toString (optional (!withGui) "d")) + "-" + version; - version = "1.14.1"; + version = "1.14.2"; src = fetchFromGitHub { owner = "dogecoin"; repo = "dogecoin"; rev = "v${version}"; - sha256 = "0nmbi5gmms16baqs3fmdp2xm0yf8wawnyz80gcmca4j5ph2zka1v"; + sha256 = "1gw46q63mjzwvb17ck6p1bap2xpdrap08szw2kjhasa3yvd5swyy"; }; nativeBuildInputs = [ pkgconfig autoreconfHook ]; diff --git a/pkgs/applications/blockchains/go-ethereum.nix b/pkgs/applications/blockchains/go-ethereum.nix index fe7a5f991dd..cfdb8dbdc60 100644 --- a/pkgs/applications/blockchains/go-ethereum.nix +++ b/pkgs/applications/blockchains/go-ethereum.nix @@ -1,22 +1,39 @@ -{ stdenv, buildGoPackage, fetchFromGitHub, libobjc, IOKit }: +{ stdenv, buildGoModule, fetchFromGitHub, libobjc, IOKit }: -buildGoPackage rec { +buildGoModule rec { pname = "go-ethereum"; - version = "1.9.7"; - - goPackagePath = "github.com/ethereum/go-ethereum"; - - # Fix for usb-related segmentation faults on darwin - propagatedBuildInputs = - stdenv.lib.optionals stdenv.isDarwin [ libobjc IOKit ]; + version = "1.9.8"; src = fetchFromGitHub { owner = "ethereum"; repo = pname; rev = "v${version}"; - sha256 = "07110dj91wmkpwz7iy0lmxx3y9wjxjrhk3rhkfdil74cxm0wkkn2"; + sha256 = "0v4hchy6h3282347ps11iv7klcr60bmghha78rnp0iqpx2k8pqb4"; }; + modSha256 = "1l10p6a4qq77pfx7jmipkcg2qg6w3hg83q5a37yid3apily2scfa"; + + subPackages = [ + "cmd/abigen" + "cmd/bootnode" + "cmd/checkpoint-admin" + "cmd/clef" + "cmd/devp2p" + "cmd/ethkey" + "cmd/evm" + "cmd/faucet" + "cmd/geth" + "cmd/p2psim" + "cmd/puppeth" + "cmd/rlpdump" + "cmd/utils" + "cmd/wnode" + ]; + + # Fix for usb-related segmentation faults on darwin + propagatedBuildInputs = + stdenv.lib.optionals stdenv.isDarwin [ libobjc IOKit ]; + meta = with stdenv.lib; { homepage = "https://geth.ethereum.org/"; description = "Official golang implementation of the Ethereum protocol"; diff --git a/pkgs/applications/blockchains/monero-gui/default.nix b/pkgs/applications/blockchains/monero-gui/default.nix index dde324b39e1..7082794bba7 100644 --- a/pkgs/applications/blockchains/monero-gui/default.nix +++ b/pkgs/applications/blockchains/monero-gui/default.nix @@ -12,13 +12,13 @@ with stdenv.lib; stdenv.mkDerivation rec { pname = "monero-gui"; - version = "0.15.0.0"; + version = "0.15.0.1"; src = fetchFromGitHub { owner = "monero-project"; repo = "monero-gui"; rev = "v${version}"; - sha256 = "1shpnly2dym5jhvk8zk10p69mz062dihx979djg74q6hgkhhhqsh"; + sha256 = "08j8kkncdn57xql0bhmlzjpjkdfhqbpda1p07r797q8qi0nl4w8n"; }; nativeBuildInputs = [ qmake pkgconfig wrapQtAppsHook ]; diff --git a/pkgs/applications/blockchains/zcash/default.nix b/pkgs/applications/blockchains/zcash/default.nix index 1852d72d326..f6114b3c213 100644 --- a/pkgs/applications/blockchains/zcash/default.nix +++ b/pkgs/applications/blockchains/zcash/default.nix @@ -1,37 +1,29 @@ -{ stdenv, libsodium, fetchFromGitHub, wget, pkgconfig, autoreconfHook, openssl, db62, boost -, zlib, gtest, gmock, callPackage, gmp, qt4, utillinux, protobuf, qrencode, libevent -, libsnark, withGui }: +{ stdenv, libsodium, fetchFromGitHub, wget, pkgconfig, autoreconfHook, openssl, db62, boost17x +, zlib, gtest, gmock, callPackage, gmp, qt4, utillinux, protobuf, qrencode, libevent }: let librustzcash = callPackage ./librustzcash {}; in with stdenv.lib; stdenv.mkDerivation rec { - name = "zcash" + (toString (optional (!withGui) "d")) + "-" + version; - version = "1.0.13"; + pname = "zcash"; + version = "2.1.0-1"; src = fetchFromGitHub { owner = "zcash"; repo = "zcash"; rev = "v${version}"; - sha256 = "05y7wxs66anxr5akbf05r36mmjfzqpwawn6vyh3jhpva51hzzzyz"; + sha256 = "05bnn4lxrrcv1ha3jdfrgwg4ar576161n3j9d4gpc14ww3zgf9vz"; }; - # Dependencies are underspecified: "make -C src gtest/zcash_gtest-test_merkletree.o" - # fails with "fatal error: test/data/merkle_roots.json.h: No such file or directory" - enableParallelBuilding = false; - nativeBuildInputs = [ autoreconfHook pkgconfig ]; - buildInputs = [ gtest gmock gmp openssl wget db62 boost zlib - protobuf libevent libsodium librustzcash libsnark ] - ++ optionals stdenv.isLinux [ utillinux ] - ++ optionals withGui [ qt4 qrencode ]; + buildInputs = [ gtest gmock gmp openssl wget db62 boost17x zlib + protobuf libevent libsodium librustzcash ] + ++ optionals stdenv.isLinux [ utillinux ]; - configureFlags = [ "--with-boost-libdir=${boost.out}/lib" - ] ++ optionals withGui [ "--with-gui=qt4" ]; + configureFlags = [ "--with-boost-libdir=${boost17x.out}/lib" ]; patchPhase = '' - sed -i"" 's,-lboost_system-mt,-lboost_system,' configure.ac sed -i"" 's,-fvisibility=hidden,,g' src/Makefile.am ''; @@ -42,7 +34,7 @@ stdenv.mkDerivation rec { meta = { description = "Peer-to-peer, anonymous electronic cash system"; homepage = https://z.cash/; - maintainers = with maintainers; [ rht ]; + maintainers = with maintainers; [ rht tkerber ]; license = licenses.mit; platforms = platforms.linux; }; diff --git a/pkgs/applications/blockchains/zcash/librustzcash/default.nix b/pkgs/applications/blockchains/zcash/librustzcash/default.nix index 634d4e8538a..31703f8fb2a 100644 --- a/pkgs/applications/blockchains/zcash/librustzcash/default.nix +++ b/pkgs/applications/blockchains/zcash/librustzcash/default.nix @@ -2,28 +2,30 @@ rustPlatform.buildRustPackage rec { pname = "librustzcash-unstable"; - version = "2017-03-17"; + version = "2018-10-27"; src = fetchFromGitHub { owner = "zcash"; repo = "librustzcash"; - rev = "91348647a86201a9482ad4ad68398152dc3d635e"; - sha256 = "02l1f46frpvw1r6k1wfh77mrsnmsdvifqx0vnscxz4xgb9ia9d1c"; + rev = "06da3b9ac8f278e5d4ae13088cf0a4c03d2c13f5"; + sha256 = "0md0pp3k97iv7kfjpfkg14pjanhrql4vafa8ggbxpkajv1j4xldv"; }; - cargoSha256 = "1xlq8vkzfyr5q8gxvzkwi8r1kxg4rg8l1ckdwfdxlkhnw0yscbra"; + cargoSha256 = "166v8cxlpfslbs5gljbh7wp0lxqakayw47ikxm9r9a39n7j36mq1"; installPhase = '' mkdir -p $out/lib cp target/release/librustzcash.a $out/lib/ mkdir -p $out/include - cp include/librustzcash.h $out/include/ + cp librustzcash/include/librustzcash.h $out/include/ ''; + doCheck = false; + meta = with stdenv.lib; { description = "Rust-language assets for Zcash"; homepage = https://github.com/zcash/librustzcash; - maintainers = with maintainers; [ rht ]; + maintainers = with maintainers; [ rht tkerber ]; license = with licenses; [ mit asl20 ]; platforms = platforms.unix; }; diff --git a/pkgs/applications/editors/android-studio/default.nix b/pkgs/applications/editors/android-studio/default.nix index c9bd1d089ca..5c796e71fdf 100644 --- a/pkgs/applications/editors/android-studio/default.nix +++ b/pkgs/applications/editors/android-studio/default.nix @@ -18,9 +18,9 @@ let sha256Hash = "0wyyr6r0jzb1l4rn1mfgp0nnzvgk3x62imq629z6vrdbymy8psf1"; }; latestVersion = { # canary & dev - version = "4.0.0.3"; # "Android Studio 4.0 Canary 3" - build = "192.5994236"; - sha256Hash = "14ig352anjs0df72f41v4r6jl7mlm2n4pn9syanmykaj87dm4kf4"; + version = "4.0.0.4"; # "Android Studio 4.0 Canary 4" + build = "192.6008643"; + sha256Hash = "1z1srginlg1xnp911nlilhf515mbpmngwhln29q6lxsir8g2cw2z"; }; in { # Attributes are named by their corresponding release channels diff --git a/pkgs/applications/editors/mle/default.nix b/pkgs/applications/editors/mle/default.nix index e98759edd15..2c36be1c21b 100644 --- a/pkgs/applications/editors/mle/default.nix +++ b/pkgs/applications/editors/mle/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "mle"; - version = "1.4.1"; + version = "1.4.2"; src = fetchFromGitHub { owner = "adsr"; repo = "mle"; rev = "v${version}"; - sha256 = "15i5lzcp0zar2zh34ky9m6pvvi41zgdrl3hmylpgsqnnj4r87vqc"; + sha256 = "053zvxkjx2zwq6lwkycirxz1m9sjc3zi9ic8fvp3mjvbqfri1y3x"; }; # Fix location of Lua 5.3 header and library diff --git a/pkgs/applications/editors/tiled/default.nix b/pkgs/applications/editors/tiled/default.nix index fa9cc155f36..e66530aaf76 100644 --- a/pkgs/applications/editors/tiled/default.nix +++ b/pkgs/applications/editors/tiled/default.nix @@ -3,13 +3,13 @@ mkDerivation rec { pname = "tiled"; - version = "1.2.5"; + version = "1.3.1"; src = fetchFromGitHub { owner = "bjorn"; repo = pname; rev = "v${version}"; - sha256 = "0sz8klz0nz60dhvz7pdn44zwr9q578pq50sxsbynz7irhrv02b52"; + sha256 = "1vhg8m1b7ccccrzlp0pyf3qskgvlf6sn1w956zsczmndrixbli9a"; }; nativeBuildInputs = [ pkgconfig qmake ]; diff --git a/pkgs/applications/graphics/avocode/default.nix b/pkgs/applications/graphics/avocode/default.nix index 1497fe19991..e2a7a9fe5c4 100644 --- a/pkgs/applications/graphics/avocode/default.nix +++ b/pkgs/applications/graphics/avocode/default.nix @@ -5,11 +5,11 @@ stdenv.mkDerivation rec { pname = "avocode"; - version = "3.9.6"; + version = "4.0.1"; src = fetchurl { url = "https://media.avocode.com/download/avocode-app/${version}/avocode-${version}-linux.zip"; - sha256 = "0jnl461dg2s5panrw12707bv34g6wxc1pxc90awnja13yq0z6bfc"; + sha256 = "13jwxwvwb9nnjxcnh9vfi22n4c00bhdypl84wrpdg5xw9325zhvy"; }; libPath = stdenv.lib.makeLibraryPath (with xorg; [ diff --git a/pkgs/applications/graphics/kodelife/default.nix b/pkgs/applications/graphics/kodelife/default.nix index 35990946d51..47a0687e79d 100644 --- a/pkgs/applications/graphics/kodelife/default.nix +++ b/pkgs/applications/graphics/kodelife/default.nix @@ -9,11 +9,11 @@ stdenv.mkDerivation rec { pname = "kodelife"; - version = "0.8.6.101"; + version = "0.8.7.105"; src = fetchzip { url = "https://hexler.net/pub/${pname}/${pname}-${version}-linux-x86_64.zip"; - sha256 = "1ldab1famdcby2djfys657g85d46s8k96m6mr71riw4v336ar238"; + sha256 = "0ld4lwigzwlikx04qy3gskqqg0wzlk8m3ccrd704ifl8lsp46n5r"; }; dontConfigure = true; diff --git a/pkgs/applications/graphics/mypaint/default.nix b/pkgs/applications/graphics/mypaint/default.nix index c08bbbea766..1acaf4850eb 100644 --- a/pkgs/applications/graphics/mypaint/default.nix +++ b/pkgs/applications/graphics/mypaint/default.nix @@ -1,8 +1,22 @@ -{ stdenv, fetchFromGitHub, gtk3, intltool, json_c, lcms2, libpng, librsvg, gobject-introspection -, gdk-pixbuf, pkgconfig, python2Packages, scons, swig, wrapGAppsHook }: +{ stdenv +, fetchFromGitHub +, gtk3 +, intltool +, json_c +, lcms2 +, libpng +, librsvg +, gobject-introspection +, gdk-pixbuf +, pkgconfig +, python2 +, scons +, swig +, wrapGAppsHook +}: let - inherit (python2Packages) python pycairo pygobject3 numpy; + inherit (python2.pkgs) pycairo pygobject3 numpy; in stdenv.mkDerivation { pname = "mypaint"; version = "1.2.1"; @@ -16,18 +30,32 @@ in stdenv.mkDerivation { }; nativeBuildInputs = [ - intltool pkgconfig scons swig wrapGAppsHook + intltool + pkgconfig + scons + swig + wrapGAppsHook gobject-introspection # for setup hook ]; buildInputs = [ - gtk3 gdk-pixbuf json_c lcms2 libpng librsvg pycairo pygobject3 python + gtk3 + gdk-pixbuf + json_c + lcms2 + libpng + librsvg + pycairo + pygobject3 + python2 ]; - propagatedBuildInputs = [ numpy ]; + propagatedBuildInputs = [ + numpy + ]; postInstall = '' - sed -i -e 's|/usr/bin/env python2.7|${python}/bin/python|' $out/bin/mypaint + sed -i -e 's|/usr/bin/env python2.7|${python2}/bin/python|' $out/bin/mypaint ''; preFixup = '' @@ -36,7 +64,7 @@ in stdenv.mkDerivation { meta = with stdenv.lib; { description = "A graphics application for digital painters"; - homepage = http://mypaint.org/; + homepage = "http://mypaint.org/"; license = licenses.gpl2Plus; platforms = platforms.linux; maintainers = with maintainers; [ goibhniu jtojnar ]; diff --git a/pkgs/applications/graphics/openimageio/2.x.nix b/pkgs/applications/graphics/openimageio/2.x.nix index 69cc323b40f..bbd2f0b5929 100644 --- a/pkgs/applications/graphics/openimageio/2.x.nix +++ b/pkgs/applications/graphics/openimageio/2.x.nix @@ -14,13 +14,13 @@ stdenv.mkDerivation rec { pname = "openimageio"; - version = "2.0.11"; + version = "2.0.12"; src = fetchFromGitHub { owner = "OpenImageIO"; repo = "oiio"; rev = "Release-${version}"; - sha256 = "1kasp9as81wjvys9qrx10mgdf9bjbdgryhdgjqn05zdmv2rs95nc"; + sha256 = "0v3k33jb0glb30jdhq3c732a9dxvnidaclz6b2wpqwik8l3658mj"; }; outputs = [ "bin" "out" "dev" "doc" ]; diff --git a/pkgs/applications/graphics/pdfcpu/default.nix b/pkgs/applications/graphics/pdfcpu/default.nix index 3d6d04db553..3df2ab4ab40 100644 --- a/pkgs/applications/graphics/pdfcpu/default.nix +++ b/pkgs/applications/graphics/pdfcpu/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "pdfcpu"; - version = "0.2.5"; + version = "0.3"; src = fetchFromGitHub { owner = "pdfcpu"; repo = pname; rev = "v${version}"; - sha256 = "0fgdq8byb9pp9wiq3dm0vxw32kbspczqnk41agxpzjf303zmv75y"; + sha256 = "03v4wc531dwmbjqgs3y3ncdn6g3xirv1w6h1mfgglb6sjll8jxp5"; }; modSha256 = "1nagb3k2ghfw27g4vcmn7v8s5flg387jpf1l18gw6c44a1xjcivs"; diff --git a/pkgs/applications/graphics/xournalpp/default.nix b/pkgs/applications/graphics/xournalpp/default.nix index 3597b97fae6..76f8e03fa13 100644 --- a/pkgs/applications/graphics/xournalpp/default.nix +++ b/pkgs/applications/graphics/xournalpp/default.nix @@ -23,13 +23,13 @@ stdenv.mkDerivation rec { pname = "xournalpp"; - version = "1.0.15"; + version = "1.0.16"; src = fetchFromGitHub { owner = "xournalpp"; repo = pname; rev = version; - sha256 = "1q716hn2ajkxfba0dxp7vcnqfa31hx36ax09yz4d13sdw43rfjf4"; + sha256 = "1bdmxxkcqpjvkckizmrz2839b4yspw4xv69bqkrrgkcyvxsr804w"; }; nativeBuildInputs = [ cmake gettext pkgconfig wrapGAppsHook ]; diff --git a/pkgs/applications/misc/alacritty/default.nix b/pkgs/applications/misc/alacritty/default.nix index 24f788ef468..4b4148bdc63 100644 --- a/pkgs/applications/misc/alacritty/default.nix +++ b/pkgs/applications/misc/alacritty/default.nix @@ -52,16 +52,16 @@ let ]; in buildRustPackage rec { pname = "alacritty"; - version = "0.3.3"; + version = "0.4.0"; src = fetchFromGitHub { owner = "jwilm"; repo = pname; rev = "v${version}"; - sha256 = "1h9zid7bi19qga3a8a2d4x3ma9wf1njmj74s4xnw7nzqqf3dh750"; + sha256 = "0adaqdbma6gskb2g14yscrgr9gch5wf2g2clchplv72c2qr1k427"; }; - cargoSha256 = "1rxb5ljgvn881jkxm8772kf815mmp08ci7sqmn2x1jwdcrphhxr1"; + cargoSha256 = "1r267g8f986nxh8ms5yhp50qy1yl8gly2jr78p738qqc6frlxlhv"; nativeBuildInputs = [ cmake @@ -76,10 +76,6 @@ in buildRustPackage rec { ++ lib.optionals stdenv.isDarwin [ AppKit CoreGraphics CoreServices CoreText Foundation OpenGL ]; outputs = [ "out" "terminfo" ]; - postPatch = '' - substituteInPlace alacritty_terminal/src/config/mouse.rs \ - --replace xdg-open ${xdg_utils}/bin/xdg-open - ''; postBuild = lib.optionalString stdenv.isDarwin "make app"; @@ -118,7 +114,7 @@ in buildRustPackage rec { description = "GPU-accelerated terminal emulator"; homepage = https://github.com/jwilm/alacritty; license = with licenses; [ asl20 ]; - maintainers = with maintainers; [ mic92 ]; + maintainers = with maintainers; [ filalex77 mic92 ]; platforms = [ "x86_64-linux" "i686-linux" "x86_64-darwin" "aarch64-linux" ]; }; } diff --git a/pkgs/applications/misc/calibre/default.nix b/pkgs/applications/misc/calibre/default.nix index 22ae573353e..9701db3c0b7 100644 --- a/pkgs/applications/misc/calibre/default.nix +++ b/pkgs/applications/misc/calibre/default.nix @@ -47,7 +47,7 @@ mkDerivation rec { poppler_utils libpng imagemagick libjpeg fontconfig podofo qtbase chmlib icu sqlite libusb1 libmtp xdg_utils ] ++ (with pypkgs; [ - apsw cssselect css-parser dateutil dnspython html5-parser lxml markdown netifaces pillow + apsw cssselect css-parser dateutil dnspython feedparser html5-parser lxml markdown netifaces pillow python pyqt5_with_qtwebkit sip regex msgpack beautifulsoup4 html2text # the following are distributed with calibre, but we use upstream instead diff --git a/pkgs/applications/misc/gallery-dl/default.nix b/pkgs/applications/misc/gallery-dl/default.nix index b1cd6a36e08..1a9789114dc 100644 --- a/pkgs/applications/misc/gallery-dl/default.nix +++ b/pkgs/applications/misc/gallery-dl/default.nix @@ -2,11 +2,11 @@ python3Packages.buildPythonApplication rec { pname = "gallery_dl"; - version = "1.10.6"; + version = "1.11.1"; src = python3Packages.fetchPypi { inherit pname version; - sha256 = "0jbfp072rnb3pkqp10xds57bnlcn87vqjaz68nhpzkwvwhs3hr4w"; + sha256 = "08py1f48ylw83712h8313rxz55igbszxcwr2yxkchpr4233avzph"; }; doCheck = false; diff --git a/pkgs/applications/misc/hugo/default.nix b/pkgs/applications/misc/hugo/default.nix index 840f4c32e52..c2065d94353 100644 --- a/pkgs/applications/misc/hugo/default.nix +++ b/pkgs/applications/misc/hugo/default.nix @@ -2,7 +2,7 @@ buildGoModule rec { pname = "hugo"; - version = "0.58.3"; + version = "0.60.0"; goPackagePath = "github.com/gohugoio/hugo"; @@ -10,10 +10,10 @@ buildGoModule rec { owner = "gohugoio"; repo = pname; rev = "v${version}"; - sha256 = "00dhb6xilkwr9yhncpyc6alzqw77ch3vd85dc7lzsmhw1c80n0lc"; + sha256 = "0g8rq79xp7c9p31xc0anfjyz7xp8n7qzv3vmvg2nmzl7nayg88aa"; }; - modSha256 = "0d6zc7hxb246zsvwsjz4ds6gdd2m95x6l3djh3mmciwfg9cd7prx"; + modSha256 = "12h1ik1hgs4lkmk699wpa34rnycnm03qyr2vp1y5lywz1h93by20"; buildFlags = "-tags extended"; diff --git a/pkgs/applications/misc/josm/default.nix b/pkgs/applications/misc/josm/default.nix index 857cc6c7456..a3cbdabeacf 100644 --- a/pkgs/applications/misc/josm/default.nix +++ b/pkgs/applications/misc/josm/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "josm"; - version = "15390"; + version = "15492"; src = fetchurl { url = "https://josm.openstreetmap.de/download/josm-snapshot-${version}.jar"; - sha256 = "1wxncd3mjd4j14svgpmvrxc0nkzfkpn0xlci7m7wp9hfp1l81v9f"; + sha256 = "0x7ndcrlvrvk2fd4pyn10npr3778khcwg6xzzh19vdw4glh5zfcl"; }; buildInputs = [ jdk11 makeWrapper ]; diff --git a/pkgs/applications/misc/keepassx/community.nix b/pkgs/applications/misc/keepassx/community.nix index 6701c910a1f..06fc04ba8fb 100644 --- a/pkgs/applications/misc/keepassx/community.nix +++ b/pkgs/applications/misc/keepassx/community.nix @@ -34,13 +34,13 @@ with stdenv.lib; stdenv.mkDerivation rec { pname = "keepassxc"; - version = "2.5.0"; + version = "2.5.1"; src = fetchFromGitHub { owner = "keepassxreboot"; repo = "keepassxc"; rev = version; - sha256 = "053z6mzcn22w3vkf09i7kdi5p0c6zcd9g62v3p5i3yhd14cgviqr"; + sha256 = "0dkya9smx81c5cgcwk2gi2m1pabfff1v9gd3ngl42sdvyb63wgdq"; }; NIX_CFLAGS_COMPILE = stdenv.lib.optionalString stdenv.cc.isClang [ diff --git a/pkgs/applications/misc/kitty/default.nix b/pkgs/applications/misc/kitty/default.nix index e87d09b50cc..cd04fdb2574 100644 --- a/pkgs/applications/misc/kitty/default.nix +++ b/pkgs/applications/misc/kitty/default.nix @@ -21,14 +21,14 @@ with python3Packages; buildPythonApplication rec { pname = "kitty"; - version = "0.14.6"; + version = "0.15.0"; format = "other"; src = fetchFromGitHub { owner = "kovidgoyal"; repo = "kitty"; rev = "v${version}"; - sha256 = "1rb5ys9xsdhd2qa3kz5gqzz111c6b14za98va6hlglk69wqlmb51"; + sha256 = "1gh8lcyqpkwvmjxwiq5d43sd43bg3c49fyy2x8drqdzj34gc49qg"; }; buildInputs = [ diff --git a/pkgs/applications/misc/kitty/no-werror.patch b/pkgs/applications/misc/kitty/no-werror.patch index 8217b5ef51a..92a65258855 100644 --- a/pkgs/applications/misc/kitty/no-werror.patch +++ b/pkgs/applications/misc/kitty/no-werror.patch @@ -1,11 +1,11 @@ --- a/setup.py +++ b/setup.py -@@ -212,7 +212,7 @@ +@@ -217,7 +217,7 @@ def init_env( cflags = os.environ.get( 'OVERRIDE_CFLAGS', ( - '-Wextra -Wno-missing-field-initializers -Wall -Wstrict-prototypes -std=c11' + '-Wextra {} -Wno-missing-field-initializers -Wall -Wstrict-prototypes -std={}11' - ' -pedantic-errors -Werror {} {} -fwrapv {} {} -pipe {} -fvisibility=hidden' + ' {} {} -fwrapv {} {} -pipe {} -fvisibility=hidden' ).format( + float_conversion, std, optimize, - ' '.join(sanitize_args), diff --git a/pkgs/applications/misc/mlterm/default.nix b/pkgs/applications/misc/mlterm/default.nix index 303b9fe5e8b..0c8ad9ae1b3 100644 --- a/pkgs/applications/misc/mlterm/default.nix +++ b/pkgs/applications/misc/mlterm/default.nix @@ -7,11 +7,11 @@ stdenv.mkDerivation rec { pname = "mlterm"; - version = "3.8.8"; + version = "3.8.9"; src = fetchurl { url = "mirror://sourceforge/project/mlterm/01release/${pname}-${version}/${pname}-${version}.tar.gz"; - sha256 = "1jq3fv2wqhszfipkzj8d0lykr6g0zzksn7xy4d3kwincmzfskv7k"; + sha256 = "1iy7wq953gcnygr1d04h5ddvhpmy8l575n5is2w0rj3ck31ihpqd"; }; nativeBuildInputs = [ pkgconfig autoconf ]; @@ -86,8 +86,9 @@ stdenv.mkDerivation rec { }; meta = with stdenv.lib; { + description = "Multi Lingual TERMinal emulator on X11"; homepage = http://mlterm.sourceforge.net/; - license = licenses.bsd2; + license = licenses.bsd3; maintainers = with maintainers; [ vrthra ramkromberg ]; platforms = with platforms; linux; }; diff --git a/pkgs/applications/misc/osmium-tool/default.nix b/pkgs/applications/misc/osmium-tool/default.nix index 19657da607f..82144e9689f 100644 --- a/pkgs/applications/misc/osmium-tool/default.nix +++ b/pkgs/applications/misc/osmium-tool/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "osmium-tool"; - version = "1.11.0"; + version = "1.11.1"; src = fetchFromGitHub { owner = "osmcode"; repo = "osmium-tool"; rev = "v${version}"; - sha256 = "164r1w539dzy67ir2rqh21kwdvkjv87isd18gp51qyxbsprz6kq5"; + sha256 = "199dvajik5d56nybk2061vdjyxwakngfd7frxj99wr2vsrp4aw2b"; }; nativeBuildInputs = [ cmake ]; diff --git a/pkgs/applications/misc/simplenote/default.nix b/pkgs/applications/misc/simplenote/default.nix index be8e2105401..1829407705b 100644 --- a/pkgs/applications/misc/simplenote/default.nix +++ b/pkgs/applications/misc/simplenote/default.nix @@ -1,23 +1,37 @@ -{ atomEnv, autoPatchelfHook, dpkg, fetchurl, makeDesktopItem, makeWrapper -, stdenv, udev, wrapGAppsHook }: +{ atomEnv +, autoPatchelfHook +, dpkg +, fetchurl +, makeDesktopItem +, makeWrapper +, stdenv +, udev +, wrapGAppsHook +}: let inherit (stdenv.hostPlatform) system; + throwSystem = throw "Unsupported system: ${system}"; + pname = "simplenote"; - version = "1.9.1"; + version = "1.11.0"; sha256 = { - x86_64-linux = "1zqrjh1xfdpkpj1fsri9r4qkazh9j89pbj8vjr474b39v56v693j"; - }.${system}; + x86_64-linux = "1ljam1yfiy1lh6lrknrq7cdqpj1q7f655mxjiiwv3izp98qr1f8s"; + }.${system} or throwSystem; meta = with stdenv.lib; { description = "The simplest way to keep notes"; homepage = "https://github.com/Automattic/simplenote-electron"; license = licenses.gpl2; - maintainers = with maintainers; [ kiwi ]; - platforms = [ "x86_64-linux" ]; + maintainers = with maintainers; [ + kiwi + ]; + platforms = [ + "x86_64-linux" + ]; }; linux = stdenv.mkDerivation rec { @@ -31,14 +45,14 @@ let }; desktopItem = makeDesktopItem { - name = "simplenote"; + categories = "Development"; comment = "Simplenote for Linux"; + desktopName = "Simplenote"; exec = "simplenote %U"; icon = "simplenote"; - type = "Application"; + name = "simplenote"; startupNotify = "true"; - desktopName = "Simplenote"; - categories = "Development"; + type = "Application"; }; dontBuild = true; @@ -46,9 +60,14 @@ let dontPatchELF = true; dontWrapGApps = true; - buildInputs = atomEnv.packages; + nativeBuildInputs = [ + autoPatchelfHook + dpkg + makeWrapper + wrapGAppsHook + ]; - nativeBuildInputs = [ dpkg makeWrapper autoPatchelfHook wrapGAppsHook ]; + buildInputs = atomEnv.packages; unpackPhase = "dpkg-deb -x $src ."; @@ -62,14 +81,15 @@ let cp "${desktopItem}/share/applications/"* "$out/share/applications" ''; - runtimeDependencies = [ udev.lib ]; + runtimeDependencies = [ + udev.lib + ]; postFixup = '' - ls -ahl $out makeWrapper $out/opt/Simplenote/simplenote $out/bin/simplenote \ - "''${gappsWrapperArgs[@]}" + "''${gappsWrapperArgs[@]}" ''; }; in - linux +linux diff --git a/pkgs/applications/misc/slic3r/boost-compile-error.patch b/pkgs/applications/misc/slic3r/boost-compile-error.patch new file mode 100644 index 00000000000..4dbdb85f743 --- /dev/null +++ b/pkgs/applications/misc/slic3r/boost-compile-error.patch @@ -0,0 +1,12 @@ +diff --git a/xs/src/libslic3r/GCodeSender.hpp b/xs/src/libslic3r/GCodeSender.hpp +index cc0b2983..0f39f5a3 100644 +--- a/xs/src/libslic3r/GCodeSender.hpp ++++ b/xs/src/libslic3r/GCodeSender.hpp +@@ -9,6 +9,7 @@ + #include <boost/asio.hpp> + #include <boost/bind.hpp> + #include <boost/thread.hpp> ++#include <boost/core/noncopyable.hpp> + + namespace Slic3r { + diff --git a/pkgs/applications/misc/slic3r/default.nix b/pkgs/applications/misc/slic3r/default.nix index cf9e93b87b3..8dbd0cd5776 100644 --- a/pkgs/applications/misc/slic3r/default.nix +++ b/pkgs/applications/misc/slic3r/default.nix @@ -1,5 +1,5 @@ -{ stdenv, fetchgit, perl, makeWrapper, makeDesktopItem -, which, perlPackages, boost +{ lib, stdenv, fetchgit, perl, makeWrapper +, makeDesktopItem, which, perlPackages, boost }: stdenv.mkDerivation rec { @@ -40,6 +40,11 @@ stdenv.mkDerivation rec { sed -i 's|"/usr/include/asm-generic/ioctls.h"|<asm-generic/ioctls.h>|g' xs/src/libslic3r/GCodeSender.cpp ''; + # note the boost-compile-error is fixed in + # https://github.com/slic3r/Slic3r/commit/90f108ae8e7a4315f82e317f2141733418d86a68 + # this patch can be probably be removed in the next version after 1.3.0 + patches = lib.optional (lib.versionAtLeast boost.version "1.56.0") ./boost-compile-error.patch; + buildPhase = '' export SLIC3R_NO_AUTO=true export LD=$CXX diff --git a/pkgs/applications/misc/syncthingtray/default.nix b/pkgs/applications/misc/syncthingtray/default.nix index 816ae664f8e..857dcfaf69f 100644 --- a/pkgs/applications/misc/syncthingtray/default.nix +++ b/pkgs/applications/misc/syncthingtray/default.nix @@ -20,14 +20,14 @@ }: mkDerivation rec { - version = "0.10.2"; + version = "0.10.3"; pname = "syncthingtray"; src = fetchFromGitHub { owner = "Martchus"; repo = "syncthingtray"; rev = "v${version}"; - sha256 = "09iq1rr70wwy5xk0jmfnwzvnigq409hvs2viy1j0khn9jhvnk6z0"; + sha256 = "12s1v65h4z051k4gi1b5f3z4hpbgqnhkjnz2xv5bdwhs24zxrrif"; }; buildInputs = [ qtbase cpp-utilities qtutilities ] diff --git a/pkgs/applications/networking/browsers/next-gtk-webkit/default.nix b/pkgs/applications/networking/browsers/next-gtk-webkit/default.nix deleted file mode 100644 index 6ab53376310..00000000000 --- a/pkgs/applications/networking/browsers/next-gtk-webkit/default.nix +++ /dev/null @@ -1,25 +0,0 @@ -{ stdenv, gcc7, pkg-config -, next -, webkitgtk, gsettings-desktop-schemas -}: - -stdenv.mkDerivation rec { - pname = "next-gtk-webkit"; - inherit (next) src version; - - makeFlags = [ "gtk-webkit" "PREFIX=$(out)" ]; - installTargets = "install-gtk-webkit"; - - nativeBuildInputs = [ gcc7 pkg-config ]; - buildInputs = [ - webkitgtk - gsettings-desktop-schemas - ]; - meta = with stdenv.lib; { - description = "Infinitely extensible web-browser (user interface only)"; - homepage = https://next.atlas.engineer; - license = licenses.bsd3; - maintainers = [ maintainers.lewo ]; - platforms = [ "x86_64-linux" ]; - }; -} diff --git a/pkgs/applications/networking/browsers/next/default.nix b/pkgs/applications/networking/browsers/next/default.nix index 9b537c55337..97c65fc12ef 100644 --- a/pkgs/applications/networking/browsers/next/default.nix +++ b/pkgs/applications/networking/browsers/next/default.nix @@ -1,86 +1,90 @@ -{ pkgs, stdenv, fetchFromGitHub -, gcc7, pkg-config, makeWrapper -, glib-networking -, next-gtk-webkit +{ stdenv +, fetchFromGitHub , lispPackages , sbcl +, callPackage }: -stdenv.mkDerivation rec { - pname = "next"; - version = "1.3.4"; +let + + # This is the wrapped webkitgtk platform port that we hardcode into the Lisp Core. + # See https://github.com/atlas-engineer/next/tree/master/ports#next-platform-ports + next-gtk-webkit = callPackage ./next-gtk-webkit.nix {}; - src = fetchFromGitHub { - owner = "atlas-engineer"; - repo = "next"; - rev = version; - sha256 = "00iqv4xarabl98gdl1rzqkc5v0vfljx1nawsxqsx9x3a9mnxmgxi"; - }; +in + +stdenv.mkDerivation rec { + pname = "next"; + version = "1.3.4"; - # Stripping destroys the generated SBCL image - dontStrip = true; + src = fetchFromGitHub { + owner = "atlas-engineer"; + repo = "next"; + rev = version; + sha256 = "00iqv4xarabl98gdl1rzqkc5v0vfljx1nawsxqsx9x3a9mnxmgxi"; + }; - prePatch = '' - substituteInPlace source/ports/gtk-webkit.lisp \ - --replace "next-gtk-webkit" "${next-gtk-webkit}/bin/next-gtk-webkit" - ''; + nativeBuildInputs = [ + sbcl + ] ++ (with lispPackages; [ + prove-asdf + trivial-features + ]); - nativeBuildInputs = - [ sbcl makeWrapper ] ++ (with lispPackages; - [ prove-asdf trivial-features ]); + buildInputs = with lispPackages; [ + alexandria + bordeaux-threads + cl-annot + cl-ansi-text + cl-css + cl-hooks + cl-json + cl-markup + cl-ppcre + cl-ppcre-unicode + cl-prevalence + closer-mop + dbus + dexador + ironclad + local-time + log4cl + lparallel + mk-string-metrics + parenscript + quri + sqlite + str + swank + trivia + trivial-clipboard + unix-opts + ]; - buildInputs = with lispPackages; [ - alexandria - bordeaux-threads - cl-annot - cl-ansi-text - cl-css - cl-hooks - cl-json - cl-markup - cl-ppcre - cl-ppcre-unicode - cl-prevalence - closer-mop - dbus - dexador - ironclad - local-time - log4cl - lparallel - mk-string-metrics - parenscript - quri - sqlite - str - swank - trivia - trivial-clipboard - unix-opts - ]; - propagatedBuildInputs = [ next-gtk-webkit ]; + prePatch = '' + substituteInPlace source/ports/gtk-webkit.lisp \ + --replace "next-gtk-webkit" "${next-gtk-webkit}/bin/next-gtk-webkit" + ''; - buildPhase = '' - common-lisp.sh --eval "(require :asdf)" \ - --eval "(asdf:load-asd (truename \"next.asd\") :name \"next\")" \ - --eval '(asdf:make :next)' \ - --quit - ''; + buildPhase = '' + common-lisp.sh --eval "(require :asdf)" \ + --eval "(asdf:load-asd (truename \"next.asd\") :name \"next\")" \ + --eval '(asdf:make :next)' \ + --quit + ''; - installPhase = '' - install -D -m0755 next $out/bin/next - ''; + installPhase = '' + install -D -m0755 next $out/bin/next + ''; - preFixup = '' - wrapProgram $out/bin/next \ - --prefix GIO_EXTRA_MODULES : "${glib-networking.out}/lib/gio/modules" - ''; + # Stripping destroys the generated SBCL image + dontStrip = true; - meta = with stdenv.lib; { - description = "Infinitely extensible web-browser (with Lisp development files)"; - homepage = https://next.atlas.engineer; - license = licenses.bsd3; - maintainers = [ maintainers.lewo ]; - platforms = [ "x86_64-linux" ]; - }; - } + meta = with stdenv.lib; { + description = "Infinitely extensible web-browser (with Lisp development files using WebKitGTK platform port)"; + homepage = https://next.atlas.engineer; + license = licenses.bsd3; + maintainers = [ maintainers.lewo ]; + platforms = [ "x86_64-linux" ]; + }; +} diff --git a/pkgs/applications/networking/browsers/next/next-gtk-webkit.nix b/pkgs/applications/networking/browsers/next/next-gtk-webkit.nix new file mode 100644 index 00000000000..a71583ffbec --- /dev/null +++ b/pkgs/applications/networking/browsers/next/next-gtk-webkit.nix @@ -0,0 +1,50 @@ +# https://github.com/atlas-engineer/next/tree/master/ports/gtk-webkit + +{ stdenv +, pkg-config +, next +, webkitgtk +, gtk3 +, glib +, gsettings-desktop-schemas +, glib-networking +, gst_all_1 +, wrapGAppsHook +}: + +stdenv.mkDerivation rec { + pname = "next-gtk-webkit"; + inherit (next) src version; + + nativeBuildInputs = [ + pkg-config + wrapGAppsHook + ]; + + buildInputs = [ + glib + glib-networking + gsettings-desktop-schemas + gtk3 + webkitgtk + gst_all_1.gst-plugins-base + gst_all_1.gstreamer + ]; + + makeFlags = [ + "gtk-webkit" + "PREFIX=${placeholder "out"}" + ]; + + installTargets = [ + "install-gtk-webkit" + ]; + + meta = with stdenv.lib; { + description = "Infinitely extensible web-browser (user interface only)"; + homepage = https://next.atlas.engineer; + license = licenses.bsd3; + maintainers = [ maintainers.lewo ]; + platforms = [ "x86_64-linux" ]; + }; +} diff --git a/pkgs/applications/networking/browsers/qutebrowser/default.nix b/pkgs/applications/networking/browsers/qutebrowser/default.nix index 7b13d748fe0..8f2f5a2cf7e 100644 --- a/pkgs/applications/networking/browsers/qutebrowser/default.nix +++ b/pkgs/applications/networking/browsers/qutebrowser/default.nix @@ -10,23 +10,23 @@ assert withMediaPlayback -> gst_all_1 != null; let pdfjs = let - version = "2.2.228"; + version = "2.3.200"; in fetchzip rec { name = "pdfjs-${version}"; url = "https://github.com/mozilla/pdf.js/releases/download/v${version}/${name}-dist.zip"; - sha256 = "0yik4vfnz46j844jfw1gq5cshgzry42kpy2d5rr7fbn9fjf98bw6"; + sha256 = "1fpxsw0hzahccyng08acvc7g0gk29j2x701p6w6fg1718mvcrm1q"; stripRoot = false; }; in mkDerivationWith python3Packages.buildPythonApplication rec { pname = "qutebrowser"; - version = "1.8.1"; + version = "1.8.2"; # the release tarballs are different from the git checkout! src = fetchurl { url = "https://github.com/qutebrowser/qutebrowser/releases/download/v${version}/${pname}-${version}.tar.gz"; - sha256 = "0ckffbw2zlg0afz4rgyywzdprnqs74va5qj0xqlaqc14ziiypxnw"; + sha256 = "0walddppjb61k3dyq22cngkaw6alzn75k5npvnawla2l153irw5s"; }; # Needs tox diff --git a/pkgs/applications/networking/cawbird/default.nix b/pkgs/applications/networking/cawbird/default.nix index 02368990a01..5179cc9090d 100644 --- a/pkgs/applications/networking/cawbird/default.nix +++ b/pkgs/applications/networking/cawbird/default.nix @@ -1,6 +1,23 @@ -{ stdenv, fetchFromGitHub, glib, gtk3, json-glib, sqlite, libsoup, gettext, vala -, meson, ninja, pkgconfig, gnome3, gst_all_1, wrapGAppsHook, gobject-introspection -, glib-networking, python3 }: +{ stdenv +, fetchFromGitHub +, glib +, gtk3 +, json-glib +, sqlite +, libsoup +, gettext +, gspell +, vala +, meson +, ninja +, pkgconfig +, gnome3 +, gst_all_1 +, wrapGAppsHook +, gobject-introspection +, glib-networking +, python3 +}: stdenv.mkDerivation rec { version = "1.0.3.1"; @@ -14,13 +31,34 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ - meson ninja vala pkgconfig wrapGAppsHook python3 + meson + ninja + vala + pkgconfig + wrapGAppsHook + python3 gobject-introspection # for setup hook ]; buildInputs = [ - glib gtk3 json-glib sqlite libsoup gettext gnome3.dconf gnome3.gspell glib-networking - ] ++ (with gst_all_1; [ gstreamer gst-plugins-base gst-plugins-bad (gst-plugins-good.override { gtkSupport = true; }) gst-libav ]); + glib + gtk3 + json-glib + sqlite + libsoup + gettext + gnome3.dconf + gspell + glib-networking + ] ++ (with gst_all_1; [ + gstreamer + gst-plugins-base + gst-plugins-bad + (gst-plugins-good.override { + gtkSupport = true; + }) + gst-libav + ]); postPatch = '' chmod +x data/meson_post_install.py # patchShebangs requires executable file @@ -30,7 +68,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Native GTK Twitter client for the Linux desktop"; longDescription = "Cawbird is a modern, easy and fun Twitter client. Fork of the discontinued Corebird."; - homepage = https://ibboard.co.uk/cawbird/; + homepage = "https://ibboard.co.uk/cawbird/"; license = licenses.gpl3; platforms = platforms.linux; maintainers = with stdenv.lib.maintainers; [ jonafato schmittlauch ]; diff --git a/pkgs/applications/networking/feedreaders/rssguard/default.nix b/pkgs/applications/networking/feedreaders/rssguard/default.nix index 169b88f2718..2bb592bfb42 100644 --- a/pkgs/applications/networking/feedreaders/rssguard/default.nix +++ b/pkgs/applications/networking/feedreaders/rssguard/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, qmake, qtwebengine, qttools, wrapGAppsHook }: +{ stdenv, fetchFromGitHub, qmake, qtwebengine, qttools, wrapGAppsHook, wrapQtAppsHook }: stdenv.mkDerivation rec { pname = "rssguard"; @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { }; buildInputs = [ qtwebengine qttools ]; - nativeBuildInputs = [ qmake wrapGAppsHook ]; + nativeBuildInputs = [ qmake wrapGAppsHook wrapQtAppsHook ]; qmakeFlags = [ "CONFIG+=release" ]; meta = with stdenv.lib; { diff --git a/pkgs/applications/networking/instant-messengers/matrix-recorder/composition.nix b/pkgs/applications/networking/instant-messengers/matrix-recorder/composition.nix new file mode 100644 index 00000000000..e03bdd9909e --- /dev/null +++ b/pkgs/applications/networking/instant-messengers/matrix-recorder/composition.nix @@ -0,0 +1,21 @@ +# This file has been generated by node2nix 1.7.0. Do not edit! + +{pkgs ? import <nixpkgs> { + inherit system; + }, system ? builtins.currentSystem, nodejs ? pkgs."nodejs-12_x"}: + +let + nodeEnv = import ./node-env.nix { + inherit (pkgs) stdenv python2 utillinux runCommand writeTextFile; + inherit nodejs; + libtool = if pkgs.stdenv.isDarwin then pkgs.darwin.cctools else null; + }; +locpkgs = +import ./node-packages.nix { + inherit (pkgs) fetchurl fetchgit; + inherit nodeEnv; + globalBuildInputs = [ + locpkgs.node-pre-gyp + ]; +}; +in locpkgs diff --git a/pkgs/applications/networking/instant-messengers/matrix-recorder/default.nix b/pkgs/applications/networking/instant-messengers/matrix-recorder/default.nix new file mode 100644 index 00000000000..633219626b6 --- /dev/null +++ b/pkgs/applications/networking/instant-messengers/matrix-recorder/default.nix @@ -0,0 +1,27 @@ +{ stdenv, pkgs }: +(import ./composition.nix { + inherit pkgs; + inherit (stdenv.hostPlatform) system; +})."package".override { + postInstall = '' + mkdir "$out/bin" + echo '#!/bin/sh' >> "$out/bin/matrix-recorder" + echo "'${pkgs.nodejs-12_x}/bin/node'" \ + "'$out/lib/node_modules/matrix-recorder/matrix-recorder.js'" \ + '"$@"' >> "$out/bin/matrix-recorder" + echo '#!/bin/sh' >> "$out/bin/matrix-recorder-to-html" + echo 'cd "$1"' >> "$out/bin/matrix-recorder-to-html" + echo "test -d templates/ || ln -sfT '$out/lib/node_modules/matrix-recorder/templates' templates" >> "$out/bin/matrix-recorder-to-html" + echo "'${pkgs.nodejs-12_x}/bin/node'" \ + "'$out/lib/node_modules/matrix-recorder/recorder-to-html.js'" \ + '.' >> "$out/bin/matrix-recorder-to-html" + chmod a+x "$out/bin/matrix-recorder" + chmod a+x "$out/bin/matrix-recorder-to-html" + ''; + meta = { + description = "Matrix message recorder"; + homepage = "https://gitlab.com/argit/matrix-recorder/"; + license = stdenv.lib.licenses.mit; + maintainers = [ stdenv.lib.maintainers.raskin ]; + }; +} diff --git a/pkgs/applications/networking/instant-messengers/matrix-recorder/node-env.nix b/pkgs/applications/networking/instant-messengers/matrix-recorder/node-env.nix new file mode 100644 index 00000000000..670556bf271 --- /dev/null +++ b/pkgs/applications/networking/instant-messengers/matrix-recorder/node-env.nix @@ -0,0 +1,540 @@ +# This file originates from node2nix + +{stdenv, nodejs, python2, utillinux, libtool, runCommand, writeTextFile}: + +let + python = if nodejs ? python then nodejs.python else python2; + + # Create a tar wrapper that filters all the 'Ignoring unknown extended header keyword' noise + tarWrapper = runCommand "tarWrapper" {} '' + mkdir -p $out/bin + + cat > $out/bin/tar <<EOF + #! ${stdenv.shell} -e + $(type -p tar) "\$@" --warning=no-unknown-keyword --delay-directory-restore + EOF + + chmod +x $out/bin/tar + ''; + + # Function that generates a TGZ file from a NPM project + buildNodeSourceDist = + { name, version, src, ... }: + + stdenv.mkDerivation { + name = "node-tarball-${name}-${version}"; + inherit src; + buildInputs = [ nodejs ]; + buildPhase = '' + export HOME=$TMPDIR + tgzFile=$(npm pack | tail -n 1) # Hooks to the pack command will add output (https://docs.npmjs.com/misc/scripts) + ''; + installPhase = '' + mkdir -p $out/tarballs + mv $tgzFile $out/tarballs + mkdir -p $out/nix-support + echo "file source-dist $out/tarballs/$tgzFile" >> $out/nix-support/hydra-build-products + ''; + }; + + includeDependencies = {dependencies}: + stdenv.lib.optionalString (dependencies != []) + (stdenv.lib.concatMapStrings (dependency: + '' + # Bundle the dependencies of the package + mkdir -p node_modules + cd node_modules + + # Only include dependencies if they don't exist. They may also be bundled in the package. + if [ ! -e "${dependency.name}" ] + then + ${composePackage dependency} + fi + + cd .. + '' + ) dependencies); + + # Recursively composes the dependencies of a package + composePackage = { name, packageName, src, dependencies ? [], ... }@args: + '' + DIR=$(pwd) + cd $TMPDIR + + unpackFile ${src} + + # Make the base dir in which the target dependency resides first + mkdir -p "$(dirname "$DIR/${packageName}")" + + if [ -f "${src}" ] + then + # Figure out what directory has been unpacked + packageDir="$(find . -maxdepth 1 -type d | tail -1)" + + # Restore write permissions to make building work + find "$packageDir" -type d -exec chmod u+x {} \; + chmod -R u+w "$packageDir" + + # Move the extracted tarball into the output folder + mv "$packageDir" "$DIR/${packageName}" + elif [ -d "${src}" ] + then + # Get a stripped name (without hash) of the source directory. + # On old nixpkgs it's already set internally. + if [ -z "$strippedName" ] + then + strippedName="$(stripHash ${src})" + fi + + # Restore write permissions to make building work + chmod -R u+w "$strippedName" + + # Move the extracted directory into the output folder + mv "$strippedName" "$DIR/${packageName}" + fi + + # Unset the stripped name to not confuse the next unpack step + unset strippedName + + # Include the dependencies of the package + cd "$DIR/${packageName}" + ${includeDependencies { inherit dependencies; }} + cd .. + ${stdenv.lib.optionalString (builtins.substring 0 1 packageName == "@") "cd .."} + ''; + + pinpointDependencies = {dependencies, production}: + let + pinpointDependenciesFromPackageJSON = writeTextFile { + name = "pinpointDependencies.js"; + text = '' + var fs = require('fs'); + var path = require('path'); + + function resolveDependencyVersion(location, name) { + if(location == process.env['NIX_STORE']) { + return null; + } else { + var dependencyPackageJSON = path.join(location, "node_modules", name, "package.json"); + + if(fs.existsSync(dependencyPackageJSON)) { + var dependencyPackageObj = JSON.parse(fs.readFileSync(dependencyPackageJSON)); + + if(dependencyPackageObj.name == name) { + return dependencyPackageObj.version; + } + } else { + return resolveDependencyVersion(path.resolve(location, ".."), name); + } + } + } + + function replaceDependencies(dependencies) { + if(typeof dependencies == "object" && dependencies !== null) { + for(var dependency in dependencies) { + var resolvedVersion = resolveDependencyVersion(process.cwd(), dependency); + + if(resolvedVersion === null) { + process.stderr.write("WARNING: cannot pinpoint dependency: "+dependency+", context: "+process.cwd()+"\n"); + } else { + dependencies[dependency] = resolvedVersion; + } + } + } + } + + /* Read the package.json configuration */ + var packageObj = JSON.parse(fs.readFileSync('./package.json')); + + /* Pinpoint all dependencies */ + replaceDependencies(packageObj.dependencies); + if(process.argv[2] == "development") { + replaceDependencies(packageObj.devDependencies); + } + replaceDependencies(packageObj.optionalDependencies); + + /* Write the fixed package.json file */ + fs.writeFileSync("package.json", JSON.stringify(packageObj, null, 2)); + ''; + }; + in + '' + node ${pinpointDependenciesFromPackageJSON} ${if production then "production" else "development"} + + ${stdenv.lib.optionalString (dependencies != []) + '' + if [ -d node_modules ] + then + cd node_modules + ${stdenv.lib.concatMapStrings (dependency: pinpointDependenciesOfPackage dependency) dependencies} + cd .. + fi + ''} + ''; + + # Recursively traverses all dependencies of a package and pinpoints all + # dependencies in the package.json file to the versions that are actually + # being used. + + pinpointDependenciesOfPackage = { packageName, dependencies ? [], production ? true, ... }@args: + '' + if [ -d "${packageName}" ] + then + cd "${packageName}" + ${pinpointDependencies { inherit dependencies production; }} + cd .. + ${stdenv.lib.optionalString (builtins.substring 0 1 packageName == "@") "cd .."} + fi + ''; + + # Extract the Node.js source code which is used to compile packages with + # native bindings + nodeSources = runCommand "node-sources" {} '' + tar --no-same-owner --no-same-permissions -xf ${nodejs.src} + mv node-* $out + ''; + + # Script that adds _integrity fields to all package.json files to prevent NPM from consulting the cache (that is empty) + addIntegrityFieldsScript = writeTextFile { + name = "addintegrityfields.js"; + text = '' + var fs = require('fs'); + var path = require('path'); + + function augmentDependencies(baseDir, dependencies) { + for(var dependencyName in dependencies) { + var dependency = dependencies[dependencyName]; + + // Open package.json and augment metadata fields + var packageJSONDir = path.join(baseDir, "node_modules", dependencyName); + var packageJSONPath = path.join(packageJSONDir, "package.json"); + + if(fs.existsSync(packageJSONPath)) { // Only augment packages that exist. Sometimes we may have production installs in which development dependencies can be ignored + console.log("Adding metadata fields to: "+packageJSONPath); + var packageObj = JSON.parse(fs.readFileSync(packageJSONPath)); + + if(dependency.integrity) { + packageObj["_integrity"] = dependency.integrity; + } else { + packageObj["_integrity"] = "sha1-000000000000000000000000000="; // When no _integrity string has been provided (e.g. by Git dependencies), add a dummy one. It does not seem to harm and it bypasses downloads. + } + + if(dependency.resolved) { + packageObj["_resolved"] = dependency.resolved; // Adopt the resolved property if one has been provided + } else { + packageObj["_resolved"] = dependency.version; // Set the resolved version to the version identifier. This prevents NPM from cloning Git repositories. + } + + if(dependency.from !== undefined) { // Adopt from property if one has been provided + packageObj["_from"] = dependency.from; + } + + fs.writeFileSync(packageJSONPath, JSON.stringify(packageObj, null, 2)); + } + + // Augment transitive dependencies + if(dependency.dependencies !== undefined) { + augmentDependencies(packageJSONDir, dependency.dependencies); + } + } + } + + if(fs.existsSync("./package-lock.json")) { + var packageLock = JSON.parse(fs.readFileSync("./package-lock.json")); + + if(packageLock.lockfileVersion !== 1) { + process.stderr.write("Sorry, I only understand lock file version 1!\n"); + process.exit(1); + } + + if(packageLock.dependencies !== undefined) { + augmentDependencies(".", packageLock.dependencies); + } + } + ''; + }; + + # Reconstructs a package-lock file from the node_modules/ folder structure and package.json files with dummy sha1 hashes + reconstructPackageLock = writeTextFile { + name = "addintegrityfields.js"; + text = '' + var fs = require('fs'); + var path = require('path'); + + var packageObj = JSON.parse(fs.readFileSync("package.json")); + + var lockObj = { + name: packageObj.name, + version: packageObj.version, + lockfileVersion: 1, + requires: true, + dependencies: {} + }; + + function augmentPackageJSON(filePath, dependencies) { + var packageJSON = path.join(filePath, "package.json"); + if(fs.existsSync(packageJSON)) { + var packageObj = JSON.parse(fs.readFileSync(packageJSON)); + dependencies[packageObj.name] = { + version: packageObj.version, + integrity: "sha1-000000000000000000000000000=", + dependencies: {} + }; + processDependencies(path.join(filePath, "node_modules"), dependencies[packageObj.name].dependencies); + } + } + + function processDependencies(dir, dependencies) { + if(fs.existsSync(dir)) { + var files = fs.readdirSync(dir); + + files.forEach(function(entry) { + var filePath = path.join(dir, entry); + var stats = fs.statSync(filePath); + + if(stats.isDirectory()) { + if(entry.substr(0, 1) == "@") { + // When we encounter a namespace folder, augment all packages belonging to the scope + var pkgFiles = fs.readdirSync(filePath); + + pkgFiles.forEach(function(entry) { + if(stats.isDirectory()) { + var pkgFilePath = path.join(filePath, entry); + augmentPackageJSON(pkgFilePath, dependencies); + } + }); + } else { + augmentPackageJSON(filePath, dependencies); + } + } + }); + } + } + + processDependencies("node_modules", lockObj.dependencies); + + fs.writeFileSync("package-lock.json", JSON.stringify(lockObj, null, 2)); + ''; + }; + + prepareAndInvokeNPM = {packageName, bypassCache, reconstructLock, npmFlags, production}: + let + forceOfflineFlag = if bypassCache then "--offline" else "--registry http://www.example.com"; + in + '' + # Pinpoint the versions of all dependencies to the ones that are actually being used + echo "pinpointing versions of dependencies..." + source $pinpointDependenciesScriptPath + + # Patch the shebangs of the bundled modules to prevent them from + # calling executables outside the Nix store as much as possible + patchShebangs . + + # Deploy the Node.js package by running npm install. Since the + # dependencies have been provided already by ourselves, it should not + # attempt to install them again, which is good, because we want to make + # it Nix's responsibility. If it needs to install any dependencies + # anyway (e.g. because the dependency parameters are + # incomplete/incorrect), it fails. + # + # The other responsibilities of NPM are kept -- version checks, build + # steps, postprocessing etc. + + export HOME=$TMPDIR + cd "${packageName}" + runHook preRebuild + + ${stdenv.lib.optionalString bypassCache '' + ${stdenv.lib.optionalString reconstructLock '' + if [ -f package-lock.json ] + then + echo "WARNING: Reconstruct lock option enabled, but a lock file already exists!" + echo "This will most likely result in version mismatches! We will remove the lock file and regenerate it!" + rm package-lock.json + else + echo "No package-lock.json file found, reconstructing..." + fi + + node ${reconstructPackageLock} + ''} + + node ${addIntegrityFieldsScript} + ''} + + npm ${forceOfflineFlag} --nodedir=${nodeSources} ${npmFlags} ${stdenv.lib.optionalString production "--production"} rebuild + + if [ "$dontNpmInstall" != "1" ] + then + # NPM tries to download packages even when they already exist if npm-shrinkwrap is used. + rm -f npm-shrinkwrap.json + + npm ${forceOfflineFlag} --nodedir=${nodeSources} ${npmFlags} ${stdenv.lib.optionalString production "--production"} install + fi + ''; + + # Builds and composes an NPM package including all its dependencies + buildNodePackage = + { name + , packageName + , version + , dependencies ? [] + , buildInputs ? [] + , production ? true + , npmFlags ? "" + , dontNpmInstall ? false + , bypassCache ? false + , reconstructLock ? false + , preRebuild ? "" + , dontStrip ? true + , unpackPhase ? "true" + , buildPhase ? "true" + , ... }@args: + + let + extraArgs = removeAttrs args [ "name" "dependencies" "buildInputs" "dontStrip" "dontNpmInstall" "preRebuild" "unpackPhase" "buildPhase" ]; + in + stdenv.mkDerivation ({ + name = "node_${name}-${version}"; + buildInputs = [ tarWrapper python nodejs ] + ++ stdenv.lib.optional (stdenv.isLinux) utillinux + ++ stdenv.lib.optional (stdenv.isDarwin) libtool + ++ buildInputs; + + inherit dontStrip; # Stripping may fail a build for some package deployments + inherit dontNpmInstall preRebuild unpackPhase buildPhase; + + compositionScript = composePackage args; + pinpointDependenciesScript = pinpointDependenciesOfPackage args; + + passAsFile = [ "compositionScript" "pinpointDependenciesScript" ]; + + installPhase = '' + # Create and enter a root node_modules/ folder + mkdir -p $out/lib/node_modules + cd $out/lib/node_modules + + # Compose the package and all its dependencies + source $compositionScriptPath + + ${prepareAndInvokeNPM { inherit packageName bypassCache reconstructLock npmFlags production; }} + + # Create symlink to the deployed executable folder, if applicable + if [ -d "$out/lib/node_modules/.bin" ] + then + ln -s $out/lib/node_modules/.bin $out/bin + fi + + # Create symlinks to the deployed manual page folders, if applicable + if [ -d "$out/lib/node_modules/${packageName}/man" ] + then + mkdir -p $out/share + for dir in "$out/lib/node_modules/${packageName}/man/"* + do + mkdir -p $out/share/man/$(basename "$dir") + for page in "$dir"/* + do + ln -s $page $out/share/man/$(basename "$dir") + done + done + fi + + # Run post install hook, if provided + runHook postInstall + ''; + } // extraArgs); + + # Builds a development shell + buildNodeShell = + { name + , packageName + , version + , src + , dependencies ? [] + , buildInputs ? [] + , production ? true + , npmFlags ? "" + , dontNpmInstall ? false + , bypassCache ? false + , reconstructLock ? false + , dontStrip ? true + , unpackPhase ? "true" + , buildPhase ? "true" + , ... }@args: + + let + extraArgs = removeAttrs args [ "name" "dependencies" "buildInputs" ]; + + nodeDependencies = stdenv.mkDerivation ({ + name = "node-dependencies-${name}-${version}"; + + buildInputs = [ tarWrapper python nodejs ] + ++ stdenv.lib.optional (stdenv.isLinux) utillinux + ++ stdenv.lib.optional (stdenv.isDarwin) libtool + ++ buildInputs; + + inherit dontStrip; # Stripping may fail a build for some package deployments + inherit dontNpmInstall unpackPhase buildPhase; + + includeScript = includeDependencies { inherit dependencies; }; + pinpointDependenciesScript = pinpointDependenciesOfPackage args; + + passAsFile = [ "includeScript" "pinpointDependenciesScript" ]; + + installPhase = '' + mkdir -p $out/${packageName} + cd $out/${packageName} + + source $includeScriptPath + + # Create fake package.json to make the npm commands work properly + cp ${src}/package.json . + chmod 644 package.json + ${stdenv.lib.optionalString bypassCache '' + if [ -f ${src}/package-lock.json ] + then + cp ${src}/package-lock.json . + fi + ''} + + # Go to the parent folder to make sure that all packages are pinpointed + cd .. + ${stdenv.lib.optionalString (builtins.substring 0 1 packageName == "@") "cd .."} + + ${prepareAndInvokeNPM { inherit packageName bypassCache reconstructLock npmFlags production; }} + + # Expose the executables that were installed + cd .. + ${stdenv.lib.optionalString (builtins.substring 0 1 packageName == "@") "cd .."} + + mv ${packageName} lib + ln -s $out/lib/node_modules/.bin $out/bin + ''; + } // extraArgs); + in + stdenv.mkDerivation { + name = "node-shell-${name}-${version}"; + + buildInputs = [ python nodejs ] ++ stdenv.lib.optional (stdenv.isLinux) utillinux ++ buildInputs; + buildCommand = '' + mkdir -p $out/bin + cat > $out/bin/shell <<EOF + #! ${stdenv.shell} -e + $shellHook + exec ${stdenv.shell} + EOF + chmod +x $out/bin/shell + ''; + + # Provide the dependencies in a development shell through the NODE_PATH environment variable + inherit nodeDependencies; + shellHook = stdenv.lib.optionalString (dependencies != []) '' + export NODE_PATH=$nodeDependencies/lib/node_modules + export PATH="$nodeDependencies/bin:$PATH" + ''; + }; +in +{ + buildNodeSourceDist = stdenv.lib.makeOverridable buildNodeSourceDist; + buildNodePackage = stdenv.lib.makeOverridable buildNodePackage; + buildNodeShell = stdenv.lib.makeOverridable buildNodeShell; +} diff --git a/pkgs/applications/networking/instant-messengers/matrix-recorder/node-packages.nix b/pkgs/applications/networking/instant-messengers/matrix-recorder/node-packages.nix new file mode 100644 index 00000000000..012ad195a71 --- /dev/null +++ b/pkgs/applications/networking/instant-messengers/matrix-recorder/node-packages.nix @@ -0,0 +1,1426 @@ +# This file has been generated by node2nix 1.7.0. Do not edit! + +{nodeEnv, fetchurl, fetchgit, globalBuildInputs ? []}: + +let + sources = { + "abbrev-1.1.1" = { + name = "abbrev"; + packageName = "abbrev"; + version = "1.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/abbrev/-/abbrev-1.1.1.tgz"; + sha512 = "nne9/IiQ/hzIhY6pdDnbBtz7DjPTKrY00P/zvPSm5pOFkl6xuGrGnXn/VtTNNfNtAfZ9/1RtehkszU9qcTii0Q=="; + }; + }; + "ajv-6.10.2" = { + name = "ajv"; + packageName = "ajv"; + version = "6.10.2"; + src = fetchurl { + url = "https://registry.npmjs.org/ajv/-/ajv-6.10.2.tgz"; + sha512 = "TXtUUEYHuaTEbLZWIKUr5pmBuhDLy+8KYtPYdcV8qC+pOZL+NKqYwvWSRrVXHn+ZmRRAu8vJTAznH7Oag6RVRw=="; + }; + }; + "another-json-0.2.0" = { + name = "another-json"; + packageName = "another-json"; + version = "0.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/another-json/-/another-json-0.2.0.tgz"; + sha1 = "b5f4019c973b6dd5c6506a2d93469cb6d32aeedc"; + }; + }; + "ansi-regex-2.1.1" = { + name = "ansi-regex"; + packageName = "ansi-regex"; + version = "2.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/ansi-regex/-/ansi-regex-2.1.1.tgz"; + sha1 = "c3b33ab5ee360d86e0e628f0468ae7ef27d654df"; + }; + }; + "aproba-1.2.0" = { + name = "aproba"; + packageName = "aproba"; + version = "1.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/aproba/-/aproba-1.2.0.tgz"; + sha512 = "Y9J6ZjXtoYh8RnXVCMOU/ttDmk1aBjunq9vO0ta5x85WDQiQfUF9sIPBITdbiiIVcBo03Hi3jMxigBtsddlXRw=="; + }; + }; + "are-we-there-yet-1.1.5" = { + name = "are-we-there-yet"; + packageName = "are-we-there-yet"; + version = "1.1.5"; + src = fetchurl { + url = "https://registry.npmjs.org/are-we-there-yet/-/are-we-there-yet-1.1.5.tgz"; + sha512 = "5hYdAkZlcG8tOLujVDTgCT+uPX0VnpAH28gWsLfzpXYm7wP6mp5Q/gYyR7YQ0cKVJcXJnl3j2kpBan13PtQf6w=="; + }; + }; + "asn1-0.2.4" = { + name = "asn1"; + packageName = "asn1"; + version = "0.2.4"; + src = fetchurl { + url = "https://registry.npmjs.org/asn1/-/asn1-0.2.4.tgz"; + sha512 = "jxwzQpLQjSmWXgwaCZE9Nz+glAG01yF1QnWgbhGwHI5A6FRIEY6IVqtHhIepHqI7/kyEyQEagBC5mBEFlIYvdg=="; + }; + }; + "assert-plus-1.0.0" = { + name = "assert-plus"; + packageName = "assert-plus"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/assert-plus/-/assert-plus-1.0.0.tgz"; + sha1 = "f12e0f3c5d77b0b1cdd9146942e4e96c1e4dd525"; + }; + }; + "asynckit-0.4.0" = { + name = "asynckit"; + packageName = "asynckit"; + version = "0.4.0"; + src = fetchurl { + url = "https://registry.npmjs.org/asynckit/-/asynckit-0.4.0.tgz"; + sha1 = "c79ed97f7f34cb8f2ba1bc9790bcc366474b4b79"; + }; + }; + "aws-sign2-0.7.0" = { + name = "aws-sign2"; + packageName = "aws-sign2"; + version = "0.7.0"; + src = fetchurl { + url = "https://registry.npmjs.org/aws-sign2/-/aws-sign2-0.7.0.tgz"; + sha1 = "b46e890934a9591f2d2f6f86d7e6a9f1b3fe76a8"; + }; + }; + "aws4-1.9.0" = { + name = "aws4"; + packageName = "aws4"; + version = "1.9.0"; + src = fetchurl { + url = "https://registry.npmjs.org/aws4/-/aws4-1.9.0.tgz"; + sha512 = "Uvq6hVe90D0B2WEnUqtdgY1bATGz3mw33nH9Y+dmA+w5DHvUmBgkr5rM/KCHpCsiFNRUfokW/szpPPgMK2hm4A=="; + }; + }; + "balanced-match-1.0.0" = { + name = "balanced-match"; + packageName = "balanced-match"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.0.tgz"; + sha1 = "89b4d199ab2bee49de164ea02b89ce462d71b767"; + }; + }; + "bcrypt-pbkdf-1.0.2" = { + name = "bcrypt-pbkdf"; + packageName = "bcrypt-pbkdf"; + version = "1.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/bcrypt-pbkdf/-/bcrypt-pbkdf-1.0.2.tgz"; + sha1 = "a4301d389b6a43f9b67ff3ca11a3f6637e360e9e"; + }; + }; + "brace-expansion-1.1.11" = { + name = "brace-expansion"; + packageName = "brace-expansion"; + version = "1.1.11"; + src = fetchurl { + url = "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz"; + sha512 = "iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA=="; + }; + }; + "browser-request-0.3.3" = { + name = "browser-request"; + packageName = "browser-request"; + version = "0.3.3"; + src = fetchurl { + url = "https://registry.npmjs.org/browser-request/-/browser-request-0.3.3.tgz"; + sha1 = "9ece5b5aca89a29932242e18bf933def9876cc17"; + }; + }; + "caseless-0.12.0" = { + name = "caseless"; + packageName = "caseless"; + version = "0.12.0"; + src = fetchurl { + url = "https://registry.npmjs.org/caseless/-/caseless-0.12.0.tgz"; + sha1 = "1b681c21ff84033c826543090689420d187151dc"; + }; + }; + "chownr-1.1.3" = { + name = "chownr"; + packageName = "chownr"; + version = "1.1.3"; + src = fetchurl { + url = "https://registry.npmjs.org/chownr/-/chownr-1.1.3.tgz"; + sha512 = "i70fVHhmV3DtTl6nqvZOnIjbY0Pe4kAUjwHj8z0zAdgBtYrJyYwLKCCuRBQ5ppkyL0AkN7HKRnETdmdp1zqNXw=="; + }; + }; + "code-point-at-1.1.0" = { + name = "code-point-at"; + packageName = "code-point-at"; + version = "1.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/code-point-at/-/code-point-at-1.1.0.tgz"; + sha1 = "0d070b4d043a5bea33a2f1a40e2edb3d9a4ccf77"; + }; + }; + "combined-stream-1.0.8" = { + name = "combined-stream"; + packageName = "combined-stream"; + version = "1.0.8"; + src = fetchurl { + url = "https://registry.npmjs.org/combined-stream/-/combined-stream-1.0.8.tgz"; + sha512 = "FQN4MRfuJeHf7cBbBMJFXhKSDq+2kAArBlmRBvcvFE5BB1HZKXtSFASDhdlz9zOYwxh8lDdnvmMOe/+5cdoEdg=="; + }; + }; + "concat-map-0.0.1" = { + name = "concat-map"; + packageName = "concat-map"; + version = "0.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz"; + sha1 = "d8a96bd77fd68df7793a73036a3ba0d5405d477b"; + }; + }; + "console-control-strings-1.1.0" = { + name = "console-control-strings"; + packageName = "console-control-strings"; + version = "1.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/console-control-strings/-/console-control-strings-1.1.0.tgz"; + sha1 = "3d7cf4464db6446ea644bf4b39507f9851008e8e"; + }; + }; + "core-util-is-1.0.2" = { + name = "core-util-is"; + packageName = "core-util-is"; + version = "1.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.2.tgz"; + sha1 = "b5fd54220aa2bc5ab57aab7140c940754503c1a7"; + }; + }; + "dashdash-1.14.1" = { + name = "dashdash"; + packageName = "dashdash"; + version = "1.14.1"; + src = fetchurl { + url = "https://registry.npmjs.org/dashdash/-/dashdash-1.14.1.tgz"; + sha1 = "853cfa0f7cbe2fed5de20326b8dd581035f6e2f0"; + }; + }; + "debug-3.2.6" = { + name = "debug"; + packageName = "debug"; + version = "3.2.6"; + src = fetchurl { + url = "https://registry.npmjs.org/debug/-/debug-3.2.6.tgz"; + sha512 = "mel+jf7nrtEl5Pn1Qx46zARXKDpBbvzezse7p7LqINmdoIk8PYP5SySaxEmYv6TZ0JyEKA1hsCId6DIhgITtWQ=="; + }; + }; + "deep-extend-0.6.0" = { + name = "deep-extend"; + packageName = "deep-extend"; + version = "0.6.0"; + src = fetchurl { + url = "https://registry.npmjs.org/deep-extend/-/deep-extend-0.6.0.tgz"; + sha512 = "LOHxIOaPYdHlJRtCQfDIVZtfw/ufM8+rVj649RIHzcm/vGwQRXFt6OPqIFWsm2XEMrNIEtWR64sY1LEKD2vAOA=="; + }; + }; + "delayed-stream-1.0.0" = { + name = "delayed-stream"; + packageName = "delayed-stream"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/delayed-stream/-/delayed-stream-1.0.0.tgz"; + sha1 = "df3ae199acadfb7d440aaae0b29e2272b24ec619"; + }; + }; + "delegates-1.0.0" = { + name = "delegates"; + packageName = "delegates"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/delegates/-/delegates-1.0.0.tgz"; + sha1 = "84c6e159b81904fdca59a0ef44cd870d31250f9a"; + }; + }; + "detect-libc-1.0.3" = { + name = "detect-libc"; + packageName = "detect-libc"; + version = "1.0.3"; + src = fetchurl { + url = "https://registry.npmjs.org/detect-libc/-/detect-libc-1.0.3.tgz"; + sha1 = "fa137c4bd698edf55cd5cd02ac559f91a4c4ba9b"; + }; + }; + "ecc-jsbn-0.1.2" = { + name = "ecc-jsbn"; + packageName = "ecc-jsbn"; + version = "0.1.2"; + src = fetchurl { + url = "https://registry.npmjs.org/ecc-jsbn/-/ecc-jsbn-0.1.2.tgz"; + sha1 = "3a83a904e54353287874c564b7549386849a98c9"; + }; + }; + "encoding-0.1.12" = { + name = "encoding"; + packageName = "encoding"; + version = "0.1.12"; + src = fetchurl { + url = "https://registry.npmjs.org/encoding/-/encoding-0.1.12.tgz"; + sha1 = "538b66f3ee62cd1ab51ec323829d1f9480c74beb"; + }; + }; + "extend-3.0.2" = { + name = "extend"; + packageName = "extend"; + version = "3.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/extend/-/extend-3.0.2.tgz"; + sha512 = "fjquC59cD7CyW6urNXK0FBufkZcoiGG80wTuPujX590cB5Ttln20E2UB4S/WARVqhXffZl2LNgS+gQdPIIim/g=="; + }; + }; + "extsprintf-1.3.0" = { + name = "extsprintf"; + packageName = "extsprintf"; + version = "1.3.0"; + src = fetchurl { + url = "https://registry.npmjs.org/extsprintf/-/extsprintf-1.3.0.tgz"; + sha1 = "96918440e3041a7a414f8c52e3c574eb3c3e1e05"; + }; + }; + "fast-deep-equal-2.0.1" = { + name = "fast-deep-equal"; + packageName = "fast-deep-equal"; + version = "2.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/fast-deep-equal/-/fast-deep-equal-2.0.1.tgz"; + sha1 = "7b05218ddf9667bf7f370bf7fdb2cb15fdd0aa49"; + }; + }; + "fast-json-stable-stringify-2.0.0" = { + name = "fast-json-stable-stringify"; + packageName = "fast-json-stable-stringify"; + version = "2.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/fast-json-stable-stringify/-/fast-json-stable-stringify-2.0.0.tgz"; + sha1 = "d5142c0caee6b1189f87d3a76111064f86c8bbf2"; + }; + }; + "forever-agent-0.6.1" = { + name = "forever-agent"; + packageName = "forever-agent"; + version = "0.6.1"; + src = fetchurl { + url = "https://registry.npmjs.org/forever-agent/-/forever-agent-0.6.1.tgz"; + sha1 = "fbc71f0c41adeb37f96c577ad1ed42d8fdacca91"; + }; + }; + "form-data-2.3.3" = { + name = "form-data"; + packageName = "form-data"; + version = "2.3.3"; + src = fetchurl { + url = "https://registry.npmjs.org/form-data/-/form-data-2.3.3.tgz"; + sha512 = "1lLKB2Mu3aGP1Q/2eCOx0fNbRMe7XdwktwOruhfqqd0rIJWwN4Dh+E3hrPSlDCXnSR7UtZ1N38rVXm+6+MEhJQ=="; + }; + }; + "fs-minipass-1.2.7" = { + name = "fs-minipass"; + packageName = "fs-minipass"; + version = "1.2.7"; + src = fetchurl { + url = "https://registry.npmjs.org/fs-minipass/-/fs-minipass-1.2.7.tgz"; + sha512 = "GWSSJGFy4e9GUeCcbIkED+bgAoFyj7XF1mV8rma3QW4NIqX9Kyx79N/PF61H5udOV3aY1IaMLs6pGbH71nlCTA=="; + }; + }; + "fs.realpath-1.0.0" = { + name = "fs.realpath"; + packageName = "fs.realpath"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/fs.realpath/-/fs.realpath-1.0.0.tgz"; + sha1 = "1504ad2523158caa40db4a2787cb01411994ea4f"; + }; + }; + "gauge-2.7.4" = { + name = "gauge"; + packageName = "gauge"; + version = "2.7.4"; + src = fetchurl { + url = "https://registry.npmjs.org/gauge/-/gauge-2.7.4.tgz"; + sha1 = "2c03405c7538c39d7eb37b317022e325fb018bf7"; + }; + }; + "getpass-0.1.7" = { + name = "getpass"; + packageName = "getpass"; + version = "0.1.7"; + src = fetchurl { + url = "https://registry.npmjs.org/getpass/-/getpass-0.1.7.tgz"; + sha1 = "5eff8e3e684d569ae4cb2b1282604e8ba62149fa"; + }; + }; + "glob-7.1.6" = { + name = "glob"; + packageName = "glob"; + version = "7.1.6"; + src = fetchurl { + url = "https://registry.npmjs.org/glob/-/glob-7.1.6.tgz"; + sha512 = "LwaxwyZ72Lk7vZINtNNrywX0ZuLyStrdDtabefZKAY5ZGJhVtgdznluResxNmPitE0SAO+O26sWTHeKSI2wMBA=="; + }; + }; + "graceful-fs-4.2.3" = { + name = "graceful-fs"; + packageName = "graceful-fs"; + version = "4.2.3"; + src = fetchurl { + url = "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.3.tgz"; + sha512 = "a30VEBm4PEdx1dRB7MFK7BejejvCvBronbLjht+sHuGYj8PHs7M/5Z+rt5lw551vZ7yfTCj4Vuyy3mSJytDWRQ=="; + }; + }; + "har-schema-2.0.0" = { + name = "har-schema"; + packageName = "har-schema"; + version = "2.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/har-schema/-/har-schema-2.0.0.tgz"; + sha1 = "a94c2224ebcac04782a0d9035521f24735b7ec92"; + }; + }; + "har-validator-5.1.3" = { + name = "har-validator"; + packageName = "har-validator"; + version = "5.1.3"; + src = fetchurl { + url = "https://registry.npmjs.org/har-validator/-/har-validator-5.1.3.tgz"; + sha512 = "sNvOCzEQNr/qrvJgc3UG/kD4QtlHycrzwS+6mfTrrSq97BvaYcPZZI1ZSqGSPR73Cxn4LKTD4PttRwfU7jWq5g=="; + }; + }; + "has-unicode-2.0.1" = { + name = "has-unicode"; + packageName = "has-unicode"; + version = "2.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/has-unicode/-/has-unicode-2.0.1.tgz"; + sha1 = "e0e6fe6a28cf51138855e086d1691e771de2a8b9"; + }; + }; + "http-signature-1.2.0" = { + name = "http-signature"; + packageName = "http-signature"; + version = "1.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/http-signature/-/http-signature-1.2.0.tgz"; + sha1 = "9aecd925114772f3d95b65a60abb8f7c18fbace1"; + }; + }; + "iconv-lite-0.4.24" = { + name = "iconv-lite"; + packageName = "iconv-lite"; + version = "0.4.24"; + src = fetchurl { + url = "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.4.24.tgz"; + sha512 = "v3MXnZAcvnywkTUEZomIActle7RXXeedOR31wwl7VlyoXO4Qi9arvSenNQWne1TcRwhCL1HwLI21bEqdpj8/rA=="; + }; + }; + "ignore-walk-3.0.3" = { + name = "ignore-walk"; + packageName = "ignore-walk"; + version = "3.0.3"; + src = fetchurl { + url = "https://registry.npmjs.org/ignore-walk/-/ignore-walk-3.0.3.tgz"; + sha512 = "m7o6xuOaT1aqheYHKf8W6J5pYH85ZI9w077erOzLje3JsB1gkafkAhHHY19dqjulgIZHFm32Cp5uNZgcQqdJKw=="; + }; + }; + "imurmurhash-0.1.4" = { + name = "imurmurhash"; + packageName = "imurmurhash"; + version = "0.1.4"; + src = fetchurl { + url = "https://registry.npmjs.org/imurmurhash/-/imurmurhash-0.1.4.tgz"; + sha1 = "9218b9b2b928a238b13dc4fb6b6d576f231453ea"; + }; + }; + "inflight-1.0.6" = { + name = "inflight"; + packageName = "inflight"; + version = "1.0.6"; + src = fetchurl { + url = "https://registry.npmjs.org/inflight/-/inflight-1.0.6.tgz"; + sha1 = "49bd6331d7d02d0c09bc910a1075ba8165b56df9"; + }; + }; + "inherits-2.0.4" = { + name = "inherits"; + packageName = "inherits"; + version = "2.0.4"; + src = fetchurl { + url = "https://registry.npmjs.org/inherits/-/inherits-2.0.4.tgz"; + sha512 = "k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ=="; + }; + }; + "ini-1.3.5" = { + name = "ini"; + packageName = "ini"; + version = "1.3.5"; + src = fetchurl { + url = "https://registry.npmjs.org/ini/-/ini-1.3.5.tgz"; + sha512 = "RZY5huIKCMRWDUqZlEi72f/lmXKMvuszcMBduliQ3nnWbx9X/ZBQO7DijMEYS9EhHBb2qacRUMtC7svLwe0lcw=="; + }; + }; + "is-fullwidth-code-point-1.0.0" = { + name = "is-fullwidth-code-point"; + packageName = "is-fullwidth-code-point"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-1.0.0.tgz"; + sha1 = "ef9e31386f031a7f0d643af82fde50c457ef00cb"; + }; + }; + "is-stream-1.1.0" = { + name = "is-stream"; + packageName = "is-stream"; + version = "1.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/is-stream/-/is-stream-1.1.0.tgz"; + sha1 = "12d4a3dd4e68e0b79ceb8dbc84173ae80d91ca44"; + }; + }; + "is-typedarray-1.0.0" = { + name = "is-typedarray"; + packageName = "is-typedarray"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/is-typedarray/-/is-typedarray-1.0.0.tgz"; + sha1 = "e479c80858df0c1b11ddda6940f96011fcda4a9a"; + }; + }; + "isarray-1.0.0" = { + name = "isarray"; + packageName = "isarray"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz"; + sha1 = "bb935d48582cba168c06834957a54a3e07124f11"; + }; + }; + "isstream-0.1.2" = { + name = "isstream"; + packageName = "isstream"; + version = "0.1.2"; + src = fetchurl { + url = "https://registry.npmjs.org/isstream/-/isstream-0.1.2.tgz"; + sha1 = "47e63f7af55afa6f92e1500e690eb8b8529c099a"; + }; + }; + "jsbn-0.1.1" = { + name = "jsbn"; + packageName = "jsbn"; + version = "0.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/jsbn/-/jsbn-0.1.1.tgz"; + sha1 = "a5e654c2e5a2deb5f201d96cefbca80c0ef2f513"; + }; + }; + "json-schema-0.2.3" = { + name = "json-schema"; + packageName = "json-schema"; + version = "0.2.3"; + src = fetchurl { + url = "https://registry.npmjs.org/json-schema/-/json-schema-0.2.3.tgz"; + sha1 = "b480c892e59a2f05954ce727bd3f2a4e882f9e13"; + }; + }; + "json-schema-traverse-0.4.1" = { + name = "json-schema-traverse"; + packageName = "json-schema-traverse"; + version = "0.4.1"; + src = fetchurl { + url = "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-0.4.1.tgz"; + sha512 = "xbbCH5dCYU5T8LcEhhuh7HJ88HXuW3qsI3Y0zOZFKfZEHcpWiHU/Jxzk629Brsab/mMiHQti9wMP+845RPe3Vg=="; + }; + }; + "json-stringify-safe-5.0.1" = { + name = "json-stringify-safe"; + packageName = "json-stringify-safe"; + version = "5.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/json-stringify-safe/-/json-stringify-safe-5.0.1.tgz"; + sha1 = "1296a2d58fd45f19a0f6ce01d65701e2c735b6eb"; + }; + }; + "jsprim-1.4.1" = { + name = "jsprim"; + packageName = "jsprim"; + version = "1.4.1"; + src = fetchurl { + url = "https://registry.npmjs.org/jsprim/-/jsprim-1.4.1.tgz"; + sha1 = "313e66bc1e5cc06e438bc1b7499c2e5c56acb6a2"; + }; + }; + "marked-0.6.3" = { + name = "marked"; + packageName = "marked"; + version = "0.6.3"; + src = fetchurl { + url = "https://registry.npmjs.org/marked/-/marked-0.6.3.tgz"; + sha512 = "Fqa7eq+UaxfMriqzYLayfqAE40WN03jf+zHjT18/uXNuzjq3TY0XTbrAoPeqSJrAmPz11VuUA+kBPYOhHt9oOQ=="; + }; + }; + "matrix-js-sdk-0.7.13" = { + name = "matrix-js-sdk"; + packageName = "matrix-js-sdk"; + version = "0.7.13"; + src = fetchurl { + url = "https://registry.npmjs.org/matrix-js-sdk/-/matrix-js-sdk-0.7.13.tgz"; + sha1 = "283accc710009f5a0b02367682f2e86155fd00c4"; + }; + }; + "mime-db-1.42.0" = { + name = "mime-db"; + packageName = "mime-db"; + version = "1.42.0"; + src = fetchurl { + url = "https://registry.npmjs.org/mime-db/-/mime-db-1.42.0.tgz"; + sha512 = "UbfJCR4UAVRNgMpfImz05smAXK7+c+ZntjaA26ANtkXLlOe947Aag5zdIcKQULAiF9Cq4WxBi9jUs5zkA84bYQ=="; + }; + }; + "mime-types-2.1.25" = { + name = "mime-types"; + packageName = "mime-types"; + version = "2.1.25"; + src = fetchurl { + url = "https://registry.npmjs.org/mime-types/-/mime-types-2.1.25.tgz"; + sha512 = "5KhStqB5xpTAeGqKBAMgwaYMnQik7teQN4IAzC7npDv6kzeU6prfkR67bc87J1kWMPGkoaZSq1npmexMgkmEVg=="; + }; + }; + "minimatch-3.0.4" = { + name = "minimatch"; + packageName = "minimatch"; + version = "3.0.4"; + src = fetchurl { + url = "https://registry.npmjs.org/minimatch/-/minimatch-3.0.4.tgz"; + sha512 = "yJHVQEhyqPLUTgt9B83PXu6W3rx4MvvHvSUvToogpwoGDOUQ+yDrR0HRot+yOCdCO7u4hX3pWft6kWBBcqh0UA=="; + }; + }; + "minimist-0.0.8" = { + name = "minimist"; + packageName = "minimist"; + version = "0.0.8"; + src = fetchurl { + url = "https://registry.npmjs.org/minimist/-/minimist-0.0.8.tgz"; + sha1 = "857fcabfc3397d2625b8228262e86aa7a011b05d"; + }; + }; + "minimist-1.2.0" = { + name = "minimist"; + packageName = "minimist"; + version = "1.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/minimist/-/minimist-1.2.0.tgz"; + sha1 = "a35008b20f41383eec1fb914f4cd5df79a264284"; + }; + }; + "minipass-2.9.0" = { + name = "minipass"; + packageName = "minipass"; + version = "2.9.0"; + src = fetchurl { + url = "https://registry.npmjs.org/minipass/-/minipass-2.9.0.tgz"; + sha512 = "wxfUjg9WebH+CUDX/CdbRlh5SmfZiy/hpkxaRI16Y9W56Pa75sWgd/rvFilSgrauD9NyFymP/+JFV3KwzIsJeg=="; + }; + }; + "minizlib-1.3.3" = { + name = "minizlib"; + packageName = "minizlib"; + version = "1.3.3"; + src = fetchurl { + url = "https://registry.npmjs.org/minizlib/-/minizlib-1.3.3.tgz"; + sha512 = "6ZYMOEnmVsdCeTJVE0W9ZD+pVnE8h9Hma/iOwwRDsdQoePpoX56/8B6z3P9VNwppJuBKNRuFDRNRqRWexT9G9Q=="; + }; + }; + "mkdirp-0.5.1" = { + name = "mkdirp"; + packageName = "mkdirp"; + version = "0.5.1"; + src = fetchurl { + url = "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.1.tgz"; + sha1 = "30057438eac6cf7f8c4767f38648d6697d75c903"; + }; + }; + "ms-2.1.2" = { + name = "ms"; + packageName = "ms"; + version = "2.1.2"; + src = fetchurl { + url = "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz"; + sha512 = "sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w=="; + }; + }; + "mustache-2.3.2" = { + name = "mustache"; + packageName = "mustache"; + version = "2.3.2"; + src = fetchurl { + url = "https://registry.npmjs.org/mustache/-/mustache-2.3.2.tgz"; + sha512 = "KpMNwdQsYz3O/SBS1qJ/o3sqUJ5wSb8gb0pul8CO0S56b9Y2ALm8zCfsjPXsqGFfoNBkDwZuZIAjhsZI03gYVQ=="; + }; + }; + "nan-2.14.0" = { + name = "nan"; + packageName = "nan"; + version = "2.14.0"; + src = fetchurl { + url = "https://registry.npmjs.org/nan/-/nan-2.14.0.tgz"; + sha512 = "INOFj37C7k3AfaNTtX8RhsTw7qRy7eLET14cROi9+5HAVbbHuIWUHEauBv5qT4Av2tWasiTY1Jw6puUNqRJXQg=="; + }; + }; + "needle-2.4.0" = { + name = "needle"; + packageName = "needle"; + version = "2.4.0"; + src = fetchurl { + url = "https://registry.npmjs.org/needle/-/needle-2.4.0.tgz"; + sha512 = "4Hnwzr3mi5L97hMYeNl8wRW/Onhy4nUKR/lVemJ8gJedxxUyBLm9kkrDColJvoSfwi0jCNhD+xCdOtiGDQiRZg=="; + }; + }; + "node-fetch-1.7.3" = { + name = "node-fetch"; + packageName = "node-fetch"; + version = "1.7.3"; + src = fetchurl { + url = "https://registry.npmjs.org/node-fetch/-/node-fetch-1.7.3.tgz"; + sha512 = "NhZ4CsKx7cYm2vSrBAr2PvFOe6sWDf0UYLRqA6svUYg7+/TSfVAu49jYC4BvQ4Sms9SZgdqGBgroqfDhJdTyKQ=="; + }; + }; + "node-localstorage-1.3.1" = { + name = "node-localstorage"; + packageName = "node-localstorage"; + version = "1.3.1"; + src = fetchurl { + url = "https://registry.npmjs.org/node-localstorage/-/node-localstorage-1.3.1.tgz"; + sha512 = "NMWCSWWc6JbHT5PyWlNT2i8r7PgGYXVntmKawY83k/M0UJScZ5jirb61TLnqKwd815DfBQu+lR3sRw08SPzIaQ=="; + }; + }; + "node-pre-gyp-0.11.0" = { + name = "node-pre-gyp"; + packageName = "node-pre-gyp"; + version = "0.11.0"; + src = fetchurl { + url = "https://registry.npmjs.org/node-pre-gyp/-/node-pre-gyp-0.11.0.tgz"; + sha512 = "TwWAOZb0j7e9eGaf9esRx3ZcLaE5tQ2lvYy1pb5IAaG1a2e2Kv5Lms1Y4hpj+ciXJRofIxxlt5haeQ/2ANeE0Q=="; + }; + }; + "nopt-4.0.1" = { + name = "nopt"; + packageName = "nopt"; + version = "4.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/nopt/-/nopt-4.0.1.tgz"; + sha1 = "d0d4685afd5415193c8c7505602d0d17cd64474d"; + }; + }; + "npm-bundled-1.0.6" = { + name = "npm-bundled"; + packageName = "npm-bundled"; + version = "1.0.6"; + src = fetchurl { + url = "https://registry.npmjs.org/npm-bundled/-/npm-bundled-1.0.6.tgz"; + sha512 = "8/JCaftHwbd//k6y2rEWp6k1wxVfpFzB6t1p825+cUb7Ym2XQfhwIC5KwhrvzZRJu+LtDE585zVaS32+CGtf0g=="; + }; + }; + "npm-packlist-1.4.6" = { + name = "npm-packlist"; + packageName = "npm-packlist"; + version = "1.4.6"; + src = fetchurl { + url = "https://registry.npmjs.org/npm-packlist/-/npm-packlist-1.4.6.tgz"; + sha512 = "u65uQdb+qwtGvEJh/DgQgW1Xg7sqeNbmxYyrvlNznaVTjV3E5P6F/EFjM+BVHXl7JJlsdG8A64M0XI8FI/IOlg=="; + }; + }; + "npmlog-4.1.2" = { + name = "npmlog"; + packageName = "npmlog"; + version = "4.1.2"; + src = fetchurl { + url = "https://registry.npmjs.org/npmlog/-/npmlog-4.1.2.tgz"; + sha512 = "2uUqazuKlTaSI/dC8AzicUck7+IrEaOnN/e0jd3Xtt1KcGpwx30v50mL7oPyr/h9bL3E4aZccVwpwP+5W9Vjkg=="; + }; + }; + "number-is-nan-1.0.1" = { + name = "number-is-nan"; + packageName = "number-is-nan"; + version = "1.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/number-is-nan/-/number-is-nan-1.0.1.tgz"; + sha1 = "097b602b53422a522c1afb8790318336941a011d"; + }; + }; + "oauth-sign-0.9.0" = { + name = "oauth-sign"; + packageName = "oauth-sign"; + version = "0.9.0"; + src = fetchurl { + url = "https://registry.npmjs.org/oauth-sign/-/oauth-sign-0.9.0.tgz"; + sha512 = "fexhUFFPTGV8ybAtSIGbV6gOkSv8UtRbDBnAyLQw4QPKkgNlsH2ByPGtMUqdWkos6YCRmAqViwgZrJc/mRDzZQ=="; + }; + }; + "object-assign-4.1.1" = { + name = "object-assign"; + packageName = "object-assign"; + version = "4.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/object-assign/-/object-assign-4.1.1.tgz"; + sha1 = "2109adc7965887cfc05cbbd442cac8bfbb360863"; + }; + }; + "olm-https://packages.matrix.org/npm/olm/olm-2.3.0.tgz" = { + name = "olm"; + packageName = "olm"; + version = "2.3.0"; + src = fetchurl { + name = "olm-2.3.0.tar.gz"; + url = https://packages.matrix.org/npm/olm/olm-2.3.0.tgz; + sha256 = "1f0f037a025a44509646cb849ded7c1a1f55e7bfed240fad19676c002fcd953a"; + }; + }; + "once-1.4.0" = { + name = "once"; + packageName = "once"; + version = "1.4.0"; + src = fetchurl { + url = "https://registry.npmjs.org/once/-/once-1.4.0.tgz"; + sha1 = "583b1aa775961d4b113ac17d9c50baef9dd76bd1"; + }; + }; + "os-homedir-1.0.2" = { + name = "os-homedir"; + packageName = "os-homedir"; + version = "1.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/os-homedir/-/os-homedir-1.0.2.tgz"; + sha1 = "ffbc4988336e0e833de0c168c7ef152121aa7fb3"; + }; + }; + "os-tmpdir-1.0.2" = { + name = "os-tmpdir"; + packageName = "os-tmpdir"; + version = "1.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/os-tmpdir/-/os-tmpdir-1.0.2.tgz"; + sha1 = "bbe67406c79aa85c5cfec766fe5734555dfa1274"; + }; + }; + "osenv-0.1.5" = { + name = "osenv"; + packageName = "osenv"; + version = "0.1.5"; + src = fetchurl { + url = "https://registry.npmjs.org/osenv/-/osenv-0.1.5.tgz"; + sha512 = "0CWcCECdMVc2Rw3U5w9ZjqX6ga6ubk1xDVKxtBQPK7wis/0F2r9T6k4ydGYhecl7YUBxBVxhL5oisPsNxAPe2g=="; + }; + }; + "path-is-absolute-1.0.1" = { + name = "path-is-absolute"; + packageName = "path-is-absolute"; + version = "1.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/path-is-absolute/-/path-is-absolute-1.0.1.tgz"; + sha1 = "174b9268735534ffbc7ace6bf53a5a9e1b5c5f5f"; + }; + }; + "performance-now-2.1.0" = { + name = "performance-now"; + packageName = "performance-now"; + version = "2.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/performance-now/-/performance-now-2.1.0.tgz"; + sha1 = "6309f4e0e5fa913ec1c69307ae364b4b377c9e7b"; + }; + }; + "process-nextick-args-2.0.1" = { + name = "process-nextick-args"; + packageName = "process-nextick-args"; + version = "2.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/process-nextick-args/-/process-nextick-args-2.0.1.tgz"; + sha512 = "3ouUOpQhtgrbOa17J7+uxOTpITYWaGP7/AhoR3+A+/1e9skrzelGi/dXzEYyvbxubEF6Wn2ypscTKiKJFFn1ag=="; + }; + }; + "psl-1.4.0" = { + name = "psl"; + packageName = "psl"; + version = "1.4.0"; + src = fetchurl { + url = "https://registry.npmjs.org/psl/-/psl-1.4.0.tgz"; + sha512 = "HZzqCGPecFLyoRj5HLfuDSKYTJkAfB5thKBIkRHtGjWwY7p1dAyveIbXIq4tO0KYfDF2tHqPUgY9SDnGm00uFw=="; + }; + }; + "punycode-1.4.1" = { + name = "punycode"; + packageName = "punycode"; + version = "1.4.1"; + src = fetchurl { + url = "https://registry.npmjs.org/punycode/-/punycode-1.4.1.tgz"; + sha1 = "c0d5a63b2718800ad8e1eb0fa5269c84dd41845e"; + }; + }; + "punycode-2.1.1" = { + name = "punycode"; + packageName = "punycode"; + version = "2.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/punycode/-/punycode-2.1.1.tgz"; + sha512 = "XRsRjdf+j5ml+y/6GKHPZbrF/8p2Yga0JPtdqTIY2Xe5ohJPD9saDJJLPvp9+NSBprVvevdXZybnj2cv8OEd0A=="; + }; + }; + "q-1.5.1" = { + name = "q"; + packageName = "q"; + version = "1.5.1"; + src = fetchurl { + url = "https://registry.npmjs.org/q/-/q-1.5.1.tgz"; + sha1 = "7e32f75b41381291d04611f1bf14109ac00651d7"; + }; + }; + "qs-6.5.2" = { + name = "qs"; + packageName = "qs"; + version = "6.5.2"; + src = fetchurl { + url = "https://registry.npmjs.org/qs/-/qs-6.5.2.tgz"; + sha512 = "N5ZAX4/LxJmF+7wN74pUD6qAh9/wnvdQcjq9TZjevvXzSUo7bfmw91saqMjzGS2xq91/odN2dW/WOl7qQHNDGA=="; + }; + }; + "rc-1.2.8" = { + name = "rc"; + packageName = "rc"; + version = "1.2.8"; + src = fetchurl { + url = "https://registry.npmjs.org/rc/-/rc-1.2.8.tgz"; + sha512 = "y3bGgqKj3QBdxLbLkomlohkvsA8gdAiUQlSBJnBhfn+BPxg4bc62d8TcBW15wavDfgexCgccckhcZvywyQYPOw=="; + }; + }; + "readable-stream-2.3.6" = { + name = "readable-stream"; + packageName = "readable-stream"; + version = "2.3.6"; + src = fetchurl { + url = "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.6.tgz"; + sha512 = "tQtKA9WIAhBF3+VLAseyMqZeBjW0AHJoxOtYqSUZNJxauErmLbVm2FW1y+J/YA9dUrAC39ITejlZWhVIwawkKw=="; + }; + }; + "request-2.88.0" = { + name = "request"; + packageName = "request"; + version = "2.88.0"; + src = fetchurl { + url = "https://registry.npmjs.org/request/-/request-2.88.0.tgz"; + sha512 = "NAqBSrijGLZdM0WZNsInLJpkJokL72XYjUpnB0iwsRgxh7dB6COrHnTBNwN0E+lHDAJzu7kLAkDeY08z2/A0hg=="; + }; + }; + "rimraf-2.7.1" = { + name = "rimraf"; + packageName = "rimraf"; + version = "2.7.1"; + src = fetchurl { + url = "https://registry.npmjs.org/rimraf/-/rimraf-2.7.1.tgz"; + sha512 = "uWjbaKIK3T1OSVptzX7Nl6PvQ3qAGtKEtVRjRuazjfL3Bx5eI409VZSqgND+4UNnmzLVdPj9FqFJNPqBZFve4w=="; + }; + }; + "safe-buffer-5.1.2" = { + name = "safe-buffer"; + packageName = "safe-buffer"; + version = "5.1.2"; + src = fetchurl { + url = "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.2.tgz"; + sha512 = "Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g=="; + }; + }; + "safe-buffer-5.2.0" = { + name = "safe-buffer"; + packageName = "safe-buffer"; + version = "5.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.2.0.tgz"; + sha512 = "fZEwUGbVl7kouZs1jCdMLdt95hdIv0ZeHg6L7qPeciMZhZ+/gdesW4wgTARkrFWEpspjEATAzUGPG8N2jJiwbg=="; + }; + }; + "safer-buffer-2.1.2" = { + name = "safer-buffer"; + packageName = "safer-buffer"; + version = "2.1.2"; + src = fetchurl { + url = "https://registry.npmjs.org/safer-buffer/-/safer-buffer-2.1.2.tgz"; + sha512 = "YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg=="; + }; + }; + "sax-1.2.4" = { + name = "sax"; + packageName = "sax"; + version = "1.2.4"; + src = fetchurl { + url = "https://registry.npmjs.org/sax/-/sax-1.2.4.tgz"; + sha512 = "NqVDv9TpANUjFm0N8uM5GxL36UgKi9/atZw+x7YFnQ8ckwFGKrl4xX4yWtrey3UJm5nP1kUbnYgLopqWNSRhWw=="; + }; + }; + "semver-5.7.1" = { + name = "semver"; + packageName = "semver"; + version = "5.7.1"; + src = fetchurl { + url = "https://registry.npmjs.org/semver/-/semver-5.7.1.tgz"; + sha512 = "sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ=="; + }; + }; + "set-blocking-2.0.0" = { + name = "set-blocking"; + packageName = "set-blocking"; + version = "2.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/set-blocking/-/set-blocking-2.0.0.tgz"; + sha1 = "045f9782d011ae9a6803ddd382b24392b3d890f7"; + }; + }; + "signal-exit-3.0.2" = { + name = "signal-exit"; + packageName = "signal-exit"; + version = "3.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/signal-exit/-/signal-exit-3.0.2.tgz"; + sha1 = "b5fdc08f1287ea1178628e415e25132b73646c6d"; + }; + }; + "slide-1.1.6" = { + name = "slide"; + packageName = "slide"; + version = "1.1.6"; + src = fetchurl { + url = "https://registry.npmjs.org/slide/-/slide-1.1.6.tgz"; + sha1 = "56eb027d65b4d2dce6cb2e2d32c4d4afc9e1d707"; + }; + }; + "sqlite3-4.1.0" = { + name = "sqlite3"; + packageName = "sqlite3"; + version = "4.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/sqlite3/-/sqlite3-4.1.0.tgz"; + sha512 = "RvqoKxq+8pDHsJo7aXxsFR18i+dU2Wp5o12qAJOV5LNcDt+fgJsc2QKKg3sIRfXrN9ZjzY1T7SNe/DFVqAXjaw=="; + }; + }; + "sshpk-1.16.1" = { + name = "sshpk"; + packageName = "sshpk"; + version = "1.16.1"; + src = fetchurl { + url = "https://registry.npmjs.org/sshpk/-/sshpk-1.16.1.tgz"; + sha512 = "HXXqVUq7+pcKeLqqZj6mHFUMvXtOJt1uoUx09pFW6011inTMxqI8BA8PM95myrIyyKwdnzjdFjLiE6KBPVtJIg=="; + }; + }; + "string-width-1.0.2" = { + name = "string-width"; + packageName = "string-width"; + version = "1.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/string-width/-/string-width-1.0.2.tgz"; + sha1 = "118bdf5b8cdc51a2a7e70d211e07e2b0b9b107d3"; + }; + }; + "string_decoder-1.1.1" = { + name = "string_decoder"; + packageName = "string_decoder"; + version = "1.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz"; + sha512 = "n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg=="; + }; + }; + "strip-ansi-3.0.1" = { + name = "strip-ansi"; + packageName = "strip-ansi"; + version = "3.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/strip-ansi/-/strip-ansi-3.0.1.tgz"; + sha1 = "6a385fb8853d952d5ff05d0e8aaf94278dc63dcf"; + }; + }; + "strip-json-comments-2.0.1" = { + name = "strip-json-comments"; + packageName = "strip-json-comments"; + version = "2.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/strip-json-comments/-/strip-json-comments-2.0.1.tgz"; + sha1 = "3c531942e908c2697c0ec344858c286c7ca0a60a"; + }; + }; + "tar-4.4.13" = { + name = "tar"; + packageName = "tar"; + version = "4.4.13"; + src = fetchurl { + url = "https://registry.npmjs.org/tar/-/tar-4.4.13.tgz"; + sha512 = "w2VwSrBoHa5BsSyH+KxEqeQBAllHhccyMFVHtGtdMpF4W7IRWfZjFiQceJPChOeTsSDVUpER2T8FA93pr0L+QA=="; + }; + }; + "tough-cookie-2.4.3" = { + name = "tough-cookie"; + packageName = "tough-cookie"; + version = "2.4.3"; + src = fetchurl { + url = "https://registry.npmjs.org/tough-cookie/-/tough-cookie-2.4.3.tgz"; + sha512 = "Q5srk/4vDM54WJsJio3XNn6K2sCG+CQ8G5Wz6bZhRZoAe/+TxjWB/GlFAnYEbkYVlON9FMk/fE3h2RLpPXo4lQ=="; + }; + }; + "tunnel-agent-0.6.0" = { + name = "tunnel-agent"; + packageName = "tunnel-agent"; + version = "0.6.0"; + src = fetchurl { + url = "https://registry.npmjs.org/tunnel-agent/-/tunnel-agent-0.6.0.tgz"; + sha1 = "27a5dea06b36b04a0a9966774b290868f0fc40fd"; + }; + }; + "tweetnacl-0.14.5" = { + name = "tweetnacl"; + packageName = "tweetnacl"; + version = "0.14.5"; + src = fetchurl { + url = "https://registry.npmjs.org/tweetnacl/-/tweetnacl-0.14.5.tgz"; + sha1 = "5ae68177f192d4456269d108afa93ff8743f4f64"; + }; + }; + "uri-js-4.2.2" = { + name = "uri-js"; + packageName = "uri-js"; + version = "4.2.2"; + src = fetchurl { + url = "https://registry.npmjs.org/uri-js/-/uri-js-4.2.2.tgz"; + sha512 = "KY9Frmirql91X2Qgjry0Wd4Y+YTdrdZheS8TFwvkbLWf/G5KNJDCh6pKL5OZctEW4+0Baa5idK2ZQuELRwPznQ=="; + }; + }; + "util-deprecate-1.0.2" = { + name = "util-deprecate"; + packageName = "util-deprecate"; + version = "1.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/util-deprecate/-/util-deprecate-1.0.2.tgz"; + sha1 = "450d4dc9fa70de732762fbd2d4a28981419a0ccf"; + }; + }; + "uuid-3.3.3" = { + name = "uuid"; + packageName = "uuid"; + version = "3.3.3"; + src = fetchurl { + url = "https://registry.npmjs.org/uuid/-/uuid-3.3.3.tgz"; + sha512 = "pW0No1RGHgzlpHJO1nsVrHKpOEIxkGg1xB+v0ZmdNH5OAeAwzAVrCnI2/6Mtx+Uys6iaylxa+D3g4j63IKKjSQ=="; + }; + }; + "verror-1.10.0" = { + name = "verror"; + packageName = "verror"; + version = "1.10.0"; + src = fetchurl { + url = "https://registry.npmjs.org/verror/-/verror-1.10.0.tgz"; + sha1 = "3a105ca17053af55d6e270c1f8288682e18da400"; + }; + }; + "wide-align-1.1.3" = { + name = "wide-align"; + packageName = "wide-align"; + version = "1.1.3"; + src = fetchurl { + url = "https://registry.npmjs.org/wide-align/-/wide-align-1.1.3.tgz"; + sha512 = "QGkOQc8XL6Bt5PwnsExKBPuMKBxnGxWWW3fU55Xt4feHozMUhdUMaBCk290qpm/wG5u/RSKzwdAC4i51YigihA=="; + }; + }; + "wrappy-1.0.2" = { + name = "wrappy"; + packageName = "wrappy"; + version = "1.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/wrappy/-/wrappy-1.0.2.tgz"; + sha1 = "b5243d8f3ec1aa35f1364605bc0d1036e30ab69f"; + }; + }; + "write-file-atomic-1.3.4" = { + name = "write-file-atomic"; + packageName = "write-file-atomic"; + version = "1.3.4"; + src = fetchurl { + url = "https://registry.npmjs.org/write-file-atomic/-/write-file-atomic-1.3.4.tgz"; + sha1 = "f807a4f0b1d9e913ae7a48112e6cc3af1991b45f"; + }; + }; + "yallist-3.1.1" = { + name = "yallist"; + packageName = "yallist"; + version = "3.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/yallist/-/yallist-3.1.1.tgz"; + sha512 = "a4UGQaWPH59mOXUYnAG2ewncQS4i4F43Tv3JoAM+s2VDAmS9NsK8GpDMLrCHPksFT7h3K6TOoUNn2pb7RoXx4g=="; + }; + }; + }; + node-pre-gyp = nodeEnv.buildNodePackage { + name = "node-pre-gyp"; + packageName = "node-pre-gyp"; + version = "0.14.0"; + src = fetchurl { + url = "https://registry.npmjs.org/node-pre-gyp/-/node-pre-gyp-0.14.0.tgz"; + sha512 = "+CvDC7ZttU/sSt9rFjix/P05iS43qHCOOGzcr3Ry99bXG7VX953+vFyEuph/tfqoYu8dttBkE86JSKBO2OzcxA=="; + }; + dependencies = [ + sources."abbrev-1.1.1" + sources."ansi-regex-2.1.1" + sources."aproba-1.2.0" + sources."are-we-there-yet-1.1.5" + sources."balanced-match-1.0.0" + sources."brace-expansion-1.1.11" + sources."chownr-1.1.3" + sources."code-point-at-1.1.0" + sources."concat-map-0.0.1" + sources."console-control-strings-1.1.0" + sources."core-util-is-1.0.2" + sources."debug-3.2.6" + sources."deep-extend-0.6.0" + sources."delegates-1.0.0" + sources."detect-libc-1.0.3" + sources."fs-minipass-1.2.7" + sources."fs.realpath-1.0.0" + sources."gauge-2.7.4" + sources."glob-7.1.6" + sources."has-unicode-2.0.1" + sources."iconv-lite-0.4.24" + sources."ignore-walk-3.0.3" + sources."inflight-1.0.6" + sources."inherits-2.0.4" + sources."ini-1.3.5" + sources."is-fullwidth-code-point-1.0.0" + sources."isarray-1.0.0" + sources."minimatch-3.0.4" + sources."minimist-0.0.8" + sources."minipass-2.9.0" + sources."minizlib-1.3.3" + sources."mkdirp-0.5.1" + sources."ms-2.1.2" + sources."needle-2.4.0" + sources."nopt-4.0.1" + sources."npm-bundled-1.0.6" + sources."npm-packlist-1.4.6" + sources."npmlog-4.1.2" + sources."number-is-nan-1.0.1" + sources."object-assign-4.1.1" + sources."once-1.4.0" + sources."os-homedir-1.0.2" + sources."os-tmpdir-1.0.2" + sources."osenv-0.1.5" + sources."path-is-absolute-1.0.1" + sources."process-nextick-args-2.0.1" + (sources."rc-1.2.8" // { + dependencies = [ + sources."minimist-1.2.0" + ]; + }) + sources."readable-stream-2.3.6" + sources."rimraf-2.7.1" + sources."safe-buffer-5.1.2" + sources."safer-buffer-2.1.2" + sources."sax-1.2.4" + sources."semver-5.7.1" + sources."set-blocking-2.0.0" + sources."signal-exit-3.0.2" + sources."string-width-1.0.2" + sources."string_decoder-1.1.1" + sources."strip-ansi-3.0.1" + sources."strip-json-comments-2.0.1" + sources."tar-4.4.13" + sources."util-deprecate-1.0.2" + sources."wide-align-1.1.3" + sources."wrappy-1.0.2" + sources."yallist-3.1.1" + ]; + buildInputs = []; + meta = { + description = "Node.js native addon binary install tool"; + homepage = "https://github.com/mapbox/node-pre-gyp#readme"; + license = "BSD-3-Clause"; + }; + production = true; + bypassCache = true; + reconstructLock = true; + }; + args = { + name = "matrix-recorder"; + packageName = "matrix-recorder"; + version = "0.0.6"; + src = fetchgit { + url = "https://gitlab.com/argit/matrix-recorder/"; + rev = "006b78c8a4ddc636be8f6f1e3875b13a4a6d2c7c"; + sha256 = "0m3kzwbrxymwl6hr981q6fsf752fqxwzbpxryx25j4lkwc23nmj3"; + }; + dependencies = [ + sources."abbrev-1.1.1" + sources."ajv-6.10.2" + sources."another-json-0.2.0" + sources."ansi-regex-2.1.1" + sources."aproba-1.2.0" + sources."are-we-there-yet-1.1.5" + sources."asn1-0.2.4" + sources."assert-plus-1.0.0" + sources."asynckit-0.4.0" + sources."aws-sign2-0.7.0" + sources."aws4-1.9.0" + sources."balanced-match-1.0.0" + sources."bcrypt-pbkdf-1.0.2" + sources."brace-expansion-1.1.11" + sources."browser-request-0.3.3" + sources."caseless-0.12.0" + sources."chownr-1.1.3" + sources."code-point-at-1.1.0" + sources."combined-stream-1.0.8" + sources."concat-map-0.0.1" + sources."console-control-strings-1.1.0" + sources."core-util-is-1.0.2" + sources."dashdash-1.14.1" + sources."debug-3.2.6" + sources."deep-extend-0.6.0" + sources."delayed-stream-1.0.0" + sources."delegates-1.0.0" + sources."detect-libc-1.0.3" + sources."ecc-jsbn-0.1.2" + sources."encoding-0.1.12" + sources."extend-3.0.2" + sources."extsprintf-1.3.0" + sources."fast-deep-equal-2.0.1" + sources."fast-json-stable-stringify-2.0.0" + sources."forever-agent-0.6.1" + sources."form-data-2.3.3" + sources."fs-minipass-1.2.7" + sources."fs.realpath-1.0.0" + sources."gauge-2.7.4" + sources."getpass-0.1.7" + sources."glob-7.1.6" + sources."graceful-fs-4.2.3" + sources."har-schema-2.0.0" + sources."har-validator-5.1.3" + sources."has-unicode-2.0.1" + sources."http-signature-1.2.0" + sources."iconv-lite-0.4.24" + sources."ignore-walk-3.0.3" + sources."imurmurhash-0.1.4" + sources."inflight-1.0.6" + sources."inherits-2.0.4" + sources."ini-1.3.5" + sources."is-fullwidth-code-point-1.0.0" + sources."is-stream-1.1.0" + sources."is-typedarray-1.0.0" + sources."isarray-1.0.0" + sources."isstream-0.1.2" + sources."jsbn-0.1.1" + sources."json-schema-0.2.3" + sources."json-schema-traverse-0.4.1" + sources."json-stringify-safe-5.0.1" + sources."jsprim-1.4.1" + sources."marked-0.6.3" + sources."matrix-js-sdk-0.7.13" + sources."mime-db-1.42.0" + sources."mime-types-2.1.25" + sources."minimatch-3.0.4" + sources."minimist-0.0.8" + sources."minipass-2.9.0" + sources."minizlib-1.3.3" + sources."mkdirp-0.5.1" + sources."ms-2.1.2" + sources."mustache-2.3.2" + sources."nan-2.14.0" + sources."needle-2.4.0" + sources."node-fetch-1.7.3" + sources."node-localstorage-1.3.1" + sources."node-pre-gyp-0.11.0" + sources."nopt-4.0.1" + sources."npm-bundled-1.0.6" + sources."npm-packlist-1.4.6" + sources."npmlog-4.1.2" + sources."number-is-nan-1.0.1" + sources."oauth-sign-0.9.0" + sources."object-assign-4.1.1" + sources."olm-https://packages.matrix.org/npm/olm/olm-2.3.0.tgz" + sources."once-1.4.0" + sources."os-homedir-1.0.2" + sources."os-tmpdir-1.0.2" + sources."osenv-0.1.5" + sources."path-is-absolute-1.0.1" + sources."performance-now-2.1.0" + sources."process-nextick-args-2.0.1" + sources."psl-1.4.0" + sources."punycode-2.1.1" + sources."q-1.5.1" + sources."qs-6.5.2" + (sources."rc-1.2.8" // { + dependencies = [ + sources."minimist-1.2.0" + ]; + }) + (sources."readable-stream-2.3.6" // { + dependencies = [ + sources."safe-buffer-5.1.2" + ]; + }) + sources."request-2.88.0" + sources."rimraf-2.7.1" + sources."safe-buffer-5.2.0" + sources."safer-buffer-2.1.2" + sources."sax-1.2.4" + sources."semver-5.7.1" + sources."set-blocking-2.0.0" + sources."signal-exit-3.0.2" + sources."slide-1.1.6" + sources."sqlite3-4.1.0" + sources."sshpk-1.16.1" + sources."string-width-1.0.2" + (sources."string_decoder-1.1.1" // { + dependencies = [ + sources."safe-buffer-5.1.2" + ]; + }) + sources."strip-ansi-3.0.1" + sources."strip-json-comments-2.0.1" + sources."tar-4.4.13" + (sources."tough-cookie-2.4.3" // { + dependencies = [ + sources."punycode-1.4.1" + ]; + }) + sources."tunnel-agent-0.6.0" + sources."tweetnacl-0.14.5" + sources."uri-js-4.2.2" + sources."util-deprecate-1.0.2" + sources."uuid-3.3.3" + sources."verror-1.10.0" + sources."wide-align-1.1.3" + sources."wrappy-1.0.2" + sources."write-file-atomic-1.3.4" + sources."yallist-3.1.1" + ]; + buildInputs = globalBuildInputs; + meta = { + description = "A recorder that can record Matrix rooms you are a member of (including E2E-encrypted rooms)."; + license = "MIT"; + }; + production = true; + bypassCache = true; + reconstructLock = true; + }; +in +{ + tarball = nodeEnv.buildNodeSourceDist args; + package = nodeEnv.buildNodePackage args; + shell = nodeEnv.buildNodeShell args; + inherit node-pre-gyp; +} diff --git a/pkgs/applications/networking/instant-messengers/matrix-recorder/package.json b/pkgs/applications/networking/instant-messengers/matrix-recorder/package.json new file mode 100644 index 00000000000..fc03d636ad2 --- /dev/null +++ b/pkgs/applications/networking/instant-messengers/matrix-recorder/package.json @@ -0,0 +1,27 @@ +{ + "name": "matrix-recorder", + "version": "0.0.6", + "description": "A recorder that can record Matrix rooms you are a member of (including E2E-encrypted rooms).", + "author": "Hello Matrix <hello@hello-matrix.net>", + "main": "matrix-recorder.js", + "scripts": { + "start": "node matrix-recorder.js" + }, + "repository": { + "type": "git", + "url": "https://gitlab.com/argit/matrix-recorder.git" + }, + "dependencies": { + "marked": "^0.6.2", + "matrix-js-sdk": "^0.7.13", + "mime-types": "^2.1.14", + "mustache": "^2.3.0", + "node-fetch": "^1.6.3", + "node-localstorage": "^1.3.0", + "sqlite3": "^4.0.7", + "olm": "https://packages.matrix.org/npm/olm/olm-2.3.0.tgz" + }, + "license": "MIT", + "optionalDependencies": { + } +} diff --git a/pkgs/applications/networking/instant-messengers/matrixcli/default.nix b/pkgs/applications/networking/instant-messengers/matrixcli/default.nix new file mode 100644 index 00000000000..54b7ef2bd99 --- /dev/null +++ b/pkgs/applications/networking/instant-messengers/matrixcli/default.nix @@ -0,0 +1,53 @@ +{ stdenv, fetchgit + , buildPythonApplication, buildPythonPackage + , pygobject3, pytestrunner, requests, responses, pytest, python-olm + , canonicaljson, olm +}: +let + mainsrc = fetchgit { + url = "https://github.com/saadnpq/matrixcli"; + rev = "61ebde173ca2f77185c261c2b7f6db297ca89863"; + sha256 = "0xcjjy2xwlcixr9fwgzcfjjkivqpk104h7dslfa7lz9jq9pzqzvq"; + fetchSubmodules = true; + }; + + sdk = buildPythonPackage rec { + name = "${pname}-${version}"; + pname = "matrix-python-sdk-matrixcli"; + version = "0.0.2019-08-15"; + + src = "${mainsrc}/matrix-python-sdk/"; + + propagatedBuildInputs = [ + requests responses olm python-olm canonicaljson + pytestrunner pytest + ]; + + doCheck = false; + doInstallCheck = false; + + meta = { + license = stdenv.lib.licenses.asl20; + description = "Fork of Matrix Python SDK"; + platforms = stdenv.lib.platforms.linux; + }; + }; + +in +buildPythonApplication rec { + name = "${pname}-${version}"; + pname = "matrixcli"; + version = "0.0.2019-08-15"; + + src = mainsrc; + + propagatedBuildInputs = [pygobject3 sdk]; + + meta = { + description = "CLI client for Matrix"; + license = stdenv.lib.licenses.gpl3; + maintainers = [stdenv.lib.maintainers.raskin]; + platforms = stdenv.lib.platforms.linux; + homepage = "https://github.com/saadnpq/matrixcli"; + }; +} diff --git a/pkgs/applications/networking/instant-messengers/riot/riot-desktop-package.json b/pkgs/applications/networking/instant-messengers/riot/riot-desktop-package.json index 30012970d78..3338f6159d9 100644 --- a/pkgs/applications/networking/instant-messengers/riot/riot-desktop-package.json +++ b/pkgs/applications/networking/instant-messengers/riot/riot-desktop-package.json @@ -2,7 +2,7 @@ "name": "riot-web", "productName": "Riot", "main": "src/electron-main.js", - "version": "1.5.0", + "version": "1.5.5", "description": "A feature-rich client for Matrix.org", "author": "New Vector Ltd.", "dependencies": { diff --git a/pkgs/applications/networking/instant-messengers/riot/riot-desktop.nix b/pkgs/applications/networking/instant-messengers/riot/riot-desktop.nix index 5dc61ff5cc8..c3fe4b9dd33 100644 --- a/pkgs/applications/networking/instant-messengers/riot/riot-desktop.nix +++ b/pkgs/applications/networking/instant-messengers/riot/riot-desktop.nix @@ -6,12 +6,12 @@ let executableName = "riot-desktop"; - version = "1.5.0"; + version = "1.5.5"; riot-web-src = fetchFromGitHub { owner = "vector-im"; repo = "riot-web"; rev = "v${version}"; - sha256 = "1xi5zg3602d7gdjxskpk2q3anpn2drrkxyirfvi9mzcfp2r05557"; + sha256 = "18xhqniwxp1sv49qcd9ah8nyy2n2yliy3wg613raxjl16qvvzxmc"; }; in mkYarnPackage rec { diff --git a/pkgs/applications/networking/instant-messengers/riot/riot-web.nix b/pkgs/applications/networking/instant-messengers/riot/riot-web.nix index ccfad7259a5..93c3d837b05 100644 --- a/pkgs/applications/networking/instant-messengers/riot/riot-web.nix +++ b/pkgs/applications/networking/instant-messengers/riot/riot-web.nix @@ -5,11 +5,11 @@ stdenv.mkDerivation rec { pname = "riot-web"; - version = "1.5.0"; + version = "1.5.5"; src = fetchurl { url = "https://github.com/vector-im/riot-web/releases/download/v${version}/riot-v${version}.tar.gz"; - sha256 = "08r9473ncfy3wzqhnds729s77fq82jjgz8w3yya07aahcxzasi94"; + sha256 = "0isln25sl5jvvlqvh822w73a4i82x75g1ywf3p9n5m1a5sr9f537"; }; installPhase = let diff --git a/pkgs/applications/networking/instant-messengers/skypeforlinux/default.nix b/pkgs/applications/networking/instant-messengers/skypeforlinux/default.nix index 2893f21357b..a368473b0c8 100644 --- a/pkgs/applications/networking/instant-messengers/skypeforlinux/default.nix +++ b/pkgs/applications/networking/instant-messengers/skypeforlinux/default.nix @@ -7,7 +7,7 @@ let # Please keep the version x.y.0.z and do not update to x.y.76.z because the # source of the latter disappears much faster. - version = "8.54.0.85"; + version = "8.54.0.91"; rpath = stdenv.lib.makeLibraryPath [ alsaLib @@ -63,7 +63,7 @@ let "https://repo.skype.com/deb/pool/main/s/skypeforlinux/skypeforlinux_${version}_amd64.deb" "https://web.archive.org/web/https://repo.skype.com/deb/pool/main/s/skypeforlinux/skypeforlinux_${version}_amd64.deb" ]; - sha256 = "09k260g9qy4n8vy6wr2jb5mm27cvqyapmv8vj4ff2j72f3ad31vm"; + sha256 = "1hnha8sqk78zxkjqg62npmg6dymi5fnyj2bmxlwpgi61v3pyxj94"; } else throw "Skype for linux is not supported on ${stdenv.hostPlatform.system}"; diff --git a/pkgs/applications/networking/instant-messengers/wire-desktop/default.nix b/pkgs/applications/networking/instant-messengers/wire-desktop/default.nix index f395c2a8055..0079d9f324f 100644 --- a/pkgs/applications/networking/instant-messengers/wire-desktop/default.nix +++ b/pkgs/applications/networking/instant-messengers/wire-desktop/default.nix @@ -1,12 +1,14 @@ -{ stdenv, fetchurl, makeDesktopItem - -, alsaLib, at-spi2-atk, atk, cairo, cups, dbus, dpkg, expat, fontconfig -, freetype, gdk-pixbuf, glib, gtk3, hunspell, libX11, libXScrnSaver -, libXcomposite, libXcursor, libXdamage, libXext, libXfixes, libXi, libXrandr -, libXrender, libXtst, libnotify, libuuid, nspr, nss, pango, pciutils -, pulseaudio, udev, xdg_utils, xorg - -, cpio, xar +{ atomEnv +, autoPatchelfHook +, dpkg +, fetchurl +, makeDesktopItem +, makeWrapper +, stdenv +, udev +, wrapGAppsHook +, cpio +, xar }: let @@ -18,13 +20,13 @@ let pname = "wire-desktop"; version = { - x86_64-linux = "3.11.2912"; x86_64-darwin = "3.10.3215"; + x86_64-linux = "3.11.2912"; }.${system} or throwSystem; sha256 = { - x86_64-linux = "1d2wa13d750dd2vslnvzf0ibwjmf5s299pxq0rs2x98y2sabw3sl"; x86_64-darwin = "0ygm3fgy9k1dp2kjfwsrrwq1i88wgxc6k8y80yz61ivdawgph9wa"; + x86_64-linux = "1d2wa13d750dd2vslnvzf0ibwjmf5s299pxq0rs2x98y2sabw3sl"; }.${system} or throwSystem; meta = with stdenv.lib; { @@ -40,11 +42,19 @@ let * Timed messages and chats * Synced across your phone, desktop and tablet ''; - homepage = https://wire.com/; - downloadPage = https://wire.com/download/; + homepage = "https://wire.com/"; + downloadPage = "https://wire.com/download/"; license = licenses.gpl3Plus; - maintainers = with maintainers; [ arianvp toonn worldofpeace ]; - platforms = [ "x86_64-darwin" "x86_64-linux" ]; + maintainers = with maintainers; [ + arianvp + kiwi + toonn + worldofpeace + ]; + platforms = [ + "x86_64-darwin" + "x86_64-linux" + ]; }; linux = stdenv.mkDerivation rec { @@ -52,54 +62,55 @@ let src = fetchurl { url = "https://wire-app.wire.com/linux/debian/pool/main/" - + "Wire-${version}_amd64.deb"; + + "Wire-${version}_amd64.deb"; inherit sha256; }; desktopItem = makeDesktopItem { - name = "wire-desktop"; - exec = "wire-desktop %U"; - icon = "wire-desktop"; + categories = "Network;InstantMessaging;Chat;VideoConference"; comment = "Secure messenger for everyone"; desktopName = "Wire Desktop"; + exec = "wire-desktop %U"; genericName = "Secure messenger"; - categories = "Network;InstantMessaging;Chat;VideoConference"; + icon = "wire-desktop"; + name = "wire-desktop"; }; dontBuild = true; - dontPatchELF = true; dontConfigure = true; + dontPatchELF = true; + dontWrapGApps = true; - nativeBuildInputs = [ dpkg ]; - rpath = stdenv.lib.makeLibraryPath [ - alsaLib at-spi2-atk atk cairo cups dbus expat fontconfig freetype - gdk-pixbuf glib gtk3 hunspell libX11 libXScrnSaver libXcomposite - libXcursor libXdamage libXext libXfixes libXi libXrandr libXrender - libXtst libnotify libuuid nspr nss pango pciutils pulseaudio - stdenv.cc.cc udev xdg_utils xorg.libxcb + nativeBuildInputs = [ + autoPatchelfHook + dpkg + makeWrapper + wrapGAppsHook ]; + buildInputs = atomEnv.packages; + unpackPhase = "dpkg-deb -x $src ."; installPhase = '' - mkdir -p "$out" + mkdir -p "$out/bin" cp -R "opt" "$out" cp -R "usr/share" "$out/share" chmod -R g-w "$out" - # Patch wire-desktop - patchelf --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \ - --set-rpath "${rpath}:$out/opt/Wire" \ - "$out/opt/Wire/wire-desktop" - - # Symlink to bin - mkdir -p "$out/bin" - ln -s "$out/opt/Wire/wire-desktop" "$out/bin/wire-desktop" - # Desktop file mkdir -p "$out/share/applications" cp "${desktopItem}/share/applications/"* "$out/share/applications" ''; + + runtimeDependencies = [ + udev.lib + ]; + + postFixup = '' + makeWrapper $out/opt/Wire/wire-desktop $out/bin/wire-desktop \ + "''${gappsWrapperArgs[@]}" + ''; }; darwin = stdenv.mkDerivation { @@ -107,18 +118,20 @@ let src = fetchurl { url = "https://github.com/wireapp/wire-desktop/releases/download/" - + "macos%2F${version}/Wire.pkg"; + + "macos%2F${version}/Wire.pkg"; inherit sha256; }; - buildInputs = [ cpio xar ]; + buildInputs = [ + cpio + xar + ]; unpackPhase = '' xar -xf $src cd com.wearezeta.zclient.mac.pkg ''; - buildPhase = '' cat Payload | gunzip -dc | cpio -i ''; @@ -129,6 +142,7 @@ let ''; }; -in if stdenv.isDarwin - then darwin - else linux +in +if stdenv.isDarwin +then darwin +else linux diff --git a/pkgs/applications/networking/mailreaders/balsa/default.nix b/pkgs/applications/networking/mailreaders/balsa/default.nix index ff659959876..e7c9d50cb9b 100644 --- a/pkgs/applications/networking/mailreaders/balsa/default.nix +++ b/pkgs/applications/networking/mailreaders/balsa/default.nix @@ -6,11 +6,11 @@ stdenv.mkDerivation rec { pname = "balsa"; - version = "2.5.7"; + version = "2.5.9"; src = fetchurl { url = "https://pawsa.fedorapeople.org/balsa/${pname}-${version}.tar.bz2"; - sha256 = "0yfqhfpwm1qnwmbpr6dfn2f5w8a8xxq51pn8ypgg0fw973l1c1nx"; + sha256 = "19gs1qfvbk9qx4rjmgrmvid00kl9k153zjjx8zjii2lz09w7g19i"; }; nativeBuildInputs = [ diff --git a/pkgs/applications/networking/mailreaders/imapfilter.nix b/pkgs/applications/networking/mailreaders/imapfilter.nix index 9f05020f2c3..587cc40aada 100644 --- a/pkgs/applications/networking/mailreaders/imapfilter.nix +++ b/pkgs/applications/networking/mailreaders/imapfilter.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "imapfilter"; - version = "2.6.14"; + version = "2.6.16"; src = fetchFromGitHub { owner = "lefcha"; repo = "imapfilter"; rev = "v${version}"; - sha256 = "09aq9gw1vz0zl6k4fb4zdm6cpjhddsl13asfjx3qy21pbw0azmj6"; + sha256 = "0f65sg6hhv6778fxwsz4hvarbm97dsb8jj0mg7a9qs273r35pqck"; }; makeFlagsArray = "PREFIX=$(out)"; diff --git a/pkgs/applications/networking/mailreaders/neomutt/default.nix b/pkgs/applications/networking/mailreaders/neomutt/default.nix index 4305294297a..79110ac37b2 100644 --- a/pkgs/applications/networking/mailreaders/neomutt/default.nix +++ b/pkgs/applications/networking/mailreaders/neomutt/default.nix @@ -4,14 +4,14 @@ }: stdenv.mkDerivation rec { - version = "20191111"; + version = "20191129"; pname = "neomutt"; src = fetchFromGitHub { owner = "neomutt"; repo = "neomutt"; rev = version; - sha256 = "16xr7wdmjw0i72xbnyyh098wx4cr0m8w2cr1szdi1b14p4kpgr67"; + sha256 = "1zwnap307qzjkfcap0rxgwwmis77lhr7js4avig0qdqnmqbdlgbh"; }; buildInputs = [ diff --git a/pkgs/applications/networking/newsreaders/quiterss/default.nix b/pkgs/applications/networking/newsreaders/quiterss/default.nix index 6274c1c345d..d54e8eca78e 100644 --- a/pkgs/applications/networking/newsreaders/quiterss/default.nix +++ b/pkgs/applications/networking/newsreaders/quiterss/default.nix @@ -4,13 +4,13 @@ stdenv.mkDerivation rec { pname = "quiterss"; - version = "0.19.1"; + version = "0.19.2"; src = fetchFromGitHub { owner = "QuiteRSS"; repo = "quiterss"; rev = version; - sha256 = "0zr17r33g99ylvb1avcbixg2jiwisaks4x91lywv2dy3g6dkpxml"; + sha256 = "1dmfag5hmy4jac20nizwgd92w8h2hdl2ch57hvw5hmjyfckn9rpj"; }; nativeBuildInputs = [ qmake pkgconfig wrapQtAppsHook ]; diff --git a/pkgs/applications/networking/p2p/tribler/default.nix b/pkgs/applications/networking/p2p/tribler/default.nix index 65abcf35a35..683507f8b19 100644 --- a/pkgs/applications/networking/p2p/tribler/default.nix +++ b/pkgs/applications/networking/p2p/tribler/default.nix @@ -1,48 +1,51 @@ -{ stdenv, fetchurl, pythonPackages, makeWrapper, imagemagick -, enablePlayer ? true, vlc ? null, qt5 }: +{ stdenv, fetchurl, pkgs, python3Packages, makeWrapper +, enablePlayer ? true, vlc ? null, qt5, lib }: stdenv.mkDerivation rec { pname = "tribler"; - version = "7.1.2"; + version = "7.4.0-exp1"; src = fetchurl { - url = "https://github.com/Tribler/tribler/releases/download/v${version}/Tribler-v${version}.tar.gz"; - sha256 = "1ayzqx4358qlx56hsnsn5s8xl6mzdb6nw4kwsalmp86dw6vmmis8"; + url = "https://github.com/Tribler/tribler/releases/download/v${version}/Tribler-v${version}.tar.xz"; + sha256 = "18ziisg0v2gdxnprbhqsryz92yk270waj0la7m2h326k5qql3qkf"; }; - buildInputs = [ - pythonPackages.python - pythonPackages.wrapPython + nativeBuildInputs = [ + python3Packages.wrapPython makeWrapper - imagemagick + ]; + + buildInputs = [ + python3Packages.python ]; pythonPath = [ - pythonPackages.libtorrentRasterbar - pythonPackages.apsw - pythonPackages.twisted - pythonPackages.netifaces - pythonPackages.pycrypto - pythonPackages.pyasn1 - pythonPackages.requests - pythonPackages.setuptools - pythonPackages.m2crypto - pythonPackages.pyqt5 - pythonPackages.chardet - pythonPackages.cherrypy - pythonPackages.cryptography - pythonPackages.libnacl - pythonPackages.configobj - pythonPackages.matplotlib - pythonPackages.plyvel - pythonPackages.decorator - pythonPackages.feedparser - pythonPackages.service-identity - pythonPackages.psutil - pythonPackages.meliae - pythonPackages.sip - pythonPackages.pillow - pythonPackages.networkx + python3Packages.libtorrentRasterbar + python3Packages.twisted + python3Packages.netifaces + python3Packages.pycrypto + python3Packages.pyasn1 + python3Packages.requests + python3Packages.m2crypto + python3Packages.pyqt5 + python3Packages.chardet + python3Packages.cherrypy + python3Packages.cryptography + python3Packages.libnacl + python3Packages.configobj + python3Packages.decorator + python3Packages.feedparser + python3Packages.service-identity + python3Packages.psutil + python3Packages.pillow + python3Packages.networkx + python3Packages.pony + python3Packages.lz4 + python3Packages.pyqtgraph + + # there is a BTC feature, but it requires some unclear version of + # bitcoinlib, so this doesn't work right now. + # python3Packages.bitcoinlib ]; postPatch = '' @@ -54,12 +57,11 @@ stdenv.mkDerivation rec { ''; installPhase = '' - find . -name '*.png' -exec convert -strip {} {} \; mkdir -pv $out # Nasty hack; call wrapPythonPrograms to set program_PYTHONPATH. wrapPythonPrograms cp -prvd ./* $out/ - makeWrapper ${pythonPackages.python}/bin/python $out/bin/tribler \ + makeWrapper ${python3Packages.python}/bin/python $out/bin/tribler \ --set QT_QPA_PLATFORM_PLUGIN_PATH ${qt5.qtbase.bin}/lib/qt-*/plugins/platforms \ --set _TRIBLERPATH $out \ --set PYTHONPATH $out:$program_PYTHONPATH \ diff --git a/pkgs/applications/networking/remote/anydesk/default.nix b/pkgs/applications/networking/remote/anydesk/default.nix index eff1e5834b4..03a2ef9551b 100644 --- a/pkgs/applications/networking/remote/anydesk/default.nix +++ b/pkgs/applications/networking/remote/anydesk/default.nix @@ -5,8 +5,8 @@ let sha256 = { - x86_64-linux = "1zdbgbbdavaqx4y02sw9y7i1r9wkxqccrqkn0sp5847a26cpk9k9"; - i386-linux = "11qwyxvy3c3n7hvksmlsfl9vvqaqkv3kwbk5rgjyy7vy8vn4kjmk"; + x86_64-linux = "0dcg9znjxpnysypznnnq4xbaciiqz8l4p1hrbis3pazwi7bakizs"; + i386-linux = "04bvsvqjkayac17y9jcpdcfm3hzm2kq1brd9vwnx34gg07x9mn7g"; }.${stdenv.hostPlatform.system} or (throw "system ${stdenv.hostPlatform.system} not supported"); arch = { @@ -28,7 +28,7 @@ let in stdenv.mkDerivation rec { pname = "anydesk"; - version = "5.4.1"; + version = "5.5.0"; src = fetchurl { url = "https://download.anydesk.com/linux/${pname}-${version}-${arch}.tar.gz"; diff --git a/pkgs/applications/radio/tlf/default.nix b/pkgs/applications/radio/tlf/default.nix index f45e695486d..530008702f1 100644 --- a/pkgs/applications/radio/tlf/default.nix +++ b/pkgs/applications/radio/tlf/default.nix @@ -3,13 +3,13 @@ stdenv.mkDerivation rec { pname = "tlf"; - version = "1.3.2"; + version = "1.4.0"; src = fetchFromGitHub { owner = pname; repo = pname; rev = "${pname}-${version}"; - sha256 = "0gniysjm8aq5anq0a0az31vd6h1vyg56bifc7rpf53lsh9hkzmgc"; + sha256 = "0f97hxiwc6blp5haik871q6zzvwy0b3p2jg8ad2dvaxg07xc76l0"; }; nativeBuildInputs = [ autoreconfHook autoconf automake pkgconfig perl ]; diff --git a/pkgs/applications/science/biology/hmmer/default.nix b/pkgs/applications/science/biology/hmmer/default.nix index 3adbaf0079e..69ecb228697 100644 --- a/pkgs/applications/science/biology/hmmer/default.nix +++ b/pkgs/applications/science/biology/hmmer/default.nix @@ -1,12 +1,12 @@ { stdenv, fetchurl }: stdenv.mkDerivation rec { - version = "3.2.1"; + version = "3.3"; pname = "hmmer"; src = fetchurl { url = "http://eddylab.org/software/hmmer/${pname}-${version}.tar.gz"; - sha256 = "171bivy6xhgjsz5nv53n81pc3frnwz29ylblawk2bv46szwjjqd5"; + sha256 = "0v3kcgkr6jihq0xmpgn2xd5q7wiwvj6yswa905k2c0v7mx0bz1h1"; }; meta = with stdenv.lib; { diff --git a/pkgs/applications/science/logic/coq/default.nix b/pkgs/applications/science/logic/coq/default.nix index a463a2c5f3a..bf2d0396f69 100644 --- a/pkgs/applications/science/logic/coq/default.nix +++ b/pkgs/applications/science/logic/coq/default.nix @@ -124,7 +124,7 @@ self = stdenv.mkDerivation { setupHook = writeText "setupHook.sh" '' addCoqPath () { if test -d "''$1/lib/coq/${coq-version}/user-contrib"; then - export COQPATH="''${COQPATH}''${COQPATH:+:}''$1/lib/coq/${coq-version}/user-contrib/" + export COQPATH="''${COQPATH-}''${COQPATH:+:}''$1/lib/coq/${coq-version}/user-contrib/" fi } diff --git a/pkgs/applications/science/misc/root/setup-hook.sh b/pkgs/applications/science/misc/root/setup-hook.sh index fc2b697d8a8..b26cf9b779f 100644 --- a/pkgs/applications/science/misc/root/setup-hook.sh +++ b/pkgs/applications/science/misc/root/setup-hook.sh @@ -1,9 +1,13 @@ thisroot () { # Workaround thisroot.sh dependency on man - if [ -z "${MANPATH}" ]; then + if [ -z "${MANPATH-}" ]; then MANPATH=: fi + local oldOpts="-u" + shopt -qo nounset || oldOpts="+u" + set +u source @out@/bin/thisroot.sh + set "$oldOpts" } postHooks+=(thisroot) diff --git a/pkgs/applications/version-management/bugseverywhere/default.nix b/pkgs/applications/version-management/bugseverywhere/default.nix deleted file mode 100644 index 7d1de378f53..00000000000 --- a/pkgs/applications/version-management/bugseverywhere/default.nix +++ /dev/null @@ -1,34 +0,0 @@ -{ stdenv, pythonPackages, fetchurl }: - -# -# Upstream stopped development of this package. If this package does not build -# anymore, feel free to remove it by reverting the appropriate patch -# (git log --grep bugseverywhere) -# -pythonPackages.buildPythonApplication rec { - version = "1.1.1"; - pname = "bugseverywhere"; - - src = fetchurl { - url = - "mirror://pypi/b/bugs-everywhere/bugs-everywhere-${version}.tar.gz"; - sha256 = "1ikm3ckwpimwcvx32vy7gh5gbp7q750j3327m17nvrj99g3daz2d"; - }; - - # There are no tests in the repository. - doCheck = false; - - buildInputs = with pythonPackages; [ - jinja2 - cherrypy - ]; - - meta = with stdenv.lib; { - description = "Bugtracker supporting distributed revision control"; - homepage = http://www.bugseverywhere.org/; - license = licenses.gpl2Plus; - platforms = platforms.all; - maintainers = [ maintainers.matthiasbeyer ]; - }; -} - diff --git a/pkgs/applications/version-management/git-and-tools/default.nix b/pkgs/applications/version-management/git-and-tools/default.nix index 68e10ed4e3e..d57ffd75d7f 100644 --- a/pkgs/applications/version-management/git-and-tools/default.nix +++ b/pkgs/applications/version-management/git-and-tools/default.nix @@ -129,6 +129,8 @@ let git-subrepo = callPackage ./git-subrepo { }; + git-subtrac = callPackage ./git-subtrac { }; + git-sync = callPackage ./git-sync { }; git-test = callPackage ./git-test { }; diff --git a/pkgs/applications/version-management/git-and-tools/git-machete/default.nix b/pkgs/applications/version-management/git-and-tools/git-machete/default.nix index aafaa6659d3..32d3465016c 100644 --- a/pkgs/applications/version-management/git-and-tools/git-machete/default.nix +++ b/pkgs/applications/version-management/git-and-tools/git-machete/default.nix @@ -4,11 +4,11 @@ buildPythonApplication rec { pname = "git-machete"; - version = "2.12.1"; + version = "2.12.2"; src = fetchPypi { inherit pname version; - sha256 = "114kq396zq45jlibn1lp0nk4lmanj4w1bcn48gi7xzdm0y1nkzfq"; + sha256 = "0kmwm9rwngxm2qdlv6nvxyhwpfa0i95kbrmasrj1qqdz7rmyyzmi"; }; nativeBuildInputs = [ installShellFiles pbr ]; diff --git a/pkgs/applications/version-management/git-and-tools/git-subtrac/default.nix b/pkgs/applications/version-management/git-and-tools/git-subtrac/default.nix new file mode 100644 index 00000000000..07c63ea0119 --- /dev/null +++ b/pkgs/applications/version-management/git-and-tools/git-subtrac/default.nix @@ -0,0 +1,22 @@ +{ lib, buildGoModule, fetchFromGitHub }: + +buildGoModule rec { + pname = "git-subtrac"; + version = "0.01"; + + src = fetchFromGitHub { + owner = "apenwarr"; + repo = pname; + rev = "v${version}"; + sha256 = "1w6gd0x1902lzpqr74gsdrnxq36f6v14bv8h0vhlrfhbwbsih7n6"; + }; + + modSha256 = "147vzllp1gydk2156hif313vwykagrj35vaiqy1swqczxs7p9hhs"; + + meta = with lib; { + description = "Keep the content for your git submodules all in one place: the parent repo"; + homepage = "https://github.com/apenwarr/git-subtrac"; + license = licenses.asl20; + maintainers = [ maintainers.marsam ]; + }; +} diff --git a/pkgs/applications/version-management/gitlab/data.json b/pkgs/applications/version-management/gitlab/data.json index 722bbc11b30..b2a9c2a28fc 100644 --- a/pkgs/applications/version-management/gitlab/data.json +++ b/pkgs/applications/version-management/gitlab/data.json @@ -1,13 +1,13 @@ { - "version": "12.4.3", - "repo_hash": "1qsd3qxvvb3rbyrlyrqvrday4c9s2krgics99ch7v74hprj3xfq9", + "version": "12.5.2", + "repo_hash": "18mviak37rkpj92m0hzh79rjbfsk8p91r5zzjp7y3y4qjnsf2a8p", "owner": "gitlab-org", "repo": "gitlab", - "rev": "v12.4.3-ee", + "rev": "v12.5.2-ee", "passthru": { - "GITALY_SERVER_VERSION": "1.67.0", - "GITLAB_PAGES_VERSION": "1.11.0", + "GITALY_SERVER_VERSION": "1.72.1", + "GITLAB_PAGES_VERSION": "1.12.0", "GITLAB_SHELL_VERSION": "10.2.0", - "GITLAB_WORKHORSE_VERSION": "8.14.0" + "GITLAB_WORKHORSE_VERSION": "8.14.1" } } \ No newline at end of file diff --git a/pkgs/applications/version-management/gitlab/default.nix b/pkgs/applications/version-management/gitlab/default.nix index 545894cc1e5..60035990ed0 100644 --- a/pkgs/applications/version-management/gitlab/default.nix +++ b/pkgs/applications/version-management/gitlab/default.nix @@ -64,6 +64,11 @@ let # Fixup "resolved"-entries in yarn.lock to match our offline cache ${fixup_yarn_lock}/bin/fixup_yarn_lock yarn.lock + # fixup_yarn_lock currently doesn't correctly fix the dagre-d3 + # url, so we have to do it manually + ${replace}/bin/replace-literal -f -e '"https://codeload.github.com/dagrejs/dagre-d3/tar.gz/e1a00e5cb518f5d2304a35647e024f31d178e55b"' \ + '"https___codeload.github.com_dagrejs_dagre_d3_tar.gz_e1a00e5cb518f5d2304a35647e024f31d178e55b"' yarn.lock + yarn install --offline --frozen-lockfile --ignore-scripts --no-progress --non-interactive patchShebangs node_modules/ diff --git a/pkgs/applications/version-management/gitlab/gitaly/Gemfile b/pkgs/applications/version-management/gitlab/gitaly/Gemfile index 9478dc9a84b..841f6bfdefc 100644 --- a/pkgs/applications/version-management/gitlab/gitaly/Gemfile +++ b/pkgs/applications/version-management/gitlab/gitaly/Gemfile @@ -4,13 +4,13 @@ source 'https://rubygems.org' gem 'bundler', '>= 1.17.3' gem 'rugged', '~> 0.28' -gem 'github-linguist', '~> 6.1', require: 'linguist' +gem 'github-linguist', '~> 7.5', require: 'linguist' gem 'gitlab-markup', '~> 1.7.0' gem 'activesupport', '~> 5.2.3' -gem 'rdoc', '~> 4.2' +gem 'rdoc', '~> 6.0' gem 'gitlab-gollum-lib', '~> 4.2.7.7', require: false gem 'gitlab-gollum-rugged_adapter', '~> 0.4.4.2', require: false -gem 'grpc', '~> 1.19.0' +gem 'grpc', '~> 1.24.0' gem 'sentry-raven', '~> 2.9.0', require: false gem 'faraday', '~> 0.12' gem 'rbtrace', require: false @@ -22,7 +22,7 @@ gem 'gitlab-labkit', '~> 0.5.0' # This version needs to be in sync with GitLab CE/EE gem 'licensee', '~> 8.9.0' -gem 'google-protobuf', '~> 3.7.1' +gem 'google-protobuf', '~> 3.8.0' group :development, :test do gem 'rubocop', '~> 0.69', require: false diff --git a/pkgs/applications/version-management/gitlab/gitaly/Gemfile.lock b/pkgs/applications/version-management/gitlab/gitaly/Gemfile.lock index cb292af8cc3..90c4e1bccea 100644 --- a/pkgs/applications/version-management/gitlab/gitaly/Gemfile.lock +++ b/pkgs/applications/version-management/gitlab/gitaly/Gemfile.lock @@ -49,10 +49,10 @@ GEM ffi (1.11.1) gemojione (3.3.0) json - github-linguist (6.4.1) + github-linguist (7.5.1) charlock_holmes (~> 0.7.6) escape_utils (~> 1.2.0) - mime-types (>= 1.19) + mini_mime (~> 1.0) rugged (>= 0.25.1) github-markup (1.7.0) gitlab-gollum-lib (4.2.7.7) @@ -81,12 +81,12 @@ GEM gitlab-markup (1.7.0) gollum-grit_adapter (1.0.1) gitlab-grit (~> 2.7, >= 2.7.1) - google-protobuf (3.7.1) + google-protobuf (3.8.0) googleapis-common-protos-types (1.0.4) google-protobuf (~> 3.0) - grpc (1.19.0) - google-protobuf (~> 3.1) - googleapis-common-protos-types (~> 1.0.0) + grpc (1.24.0) + google-protobuf (~> 3.8) + googleapis-common-protos-types (~> 1.0) hashdiff (0.3.9) i18n (1.6.0) concurrent-ruby (~> 1.0) @@ -99,7 +99,7 @@ GEM licensee (8.9.2) rugged (~> 0.24) listen (0.5.3) - loofah (2.2.3) + loofah (2.3.0) crass (~> 1.0.2) nokogiri (>= 1.5.9) memoizable (0.4.2) @@ -108,12 +108,13 @@ GEM mime-types (3.2.2) mime-types-data (~> 3.2015) mime-types-data (3.2019.0331) + mini_mime (1.0.2) mini_portile2 (2.4.0) minitest (5.11.3) msgpack (1.3.0) multi_json (1.13.1) multipart-post (2.0.0) - nokogiri (1.10.4) + nokogiri (1.10.5) mini_portile2 (~> 2.4.0) nokogumbo (1.5.0) nokogiri @@ -138,14 +139,14 @@ GEM rails-dom-testing (2.0.3) activesupport (>= 4.2.0) nokogiri (>= 1.6) - rails-html-sanitizer (1.2.0) - loofah (~> 2.2, >= 2.2.2) + rails-html-sanitizer (1.3.0) + loofah (~> 2.3) rainbow (3.0.0) rbtrace (0.4.11) ffi (>= 1.0.6) msgpack (>= 0.4.3) optimist (>= 3.0.0) - rdoc (4.3.0) + rdoc (6.2.0) redis (4.1.2) rouge (3.11.0) rspec (3.8.0) @@ -217,18 +218,18 @@ DEPENDENCIES bundler (>= 1.17.3) factory_bot faraday (~> 0.12) - github-linguist (~> 6.1) + github-linguist (~> 7.5) gitlab-gollum-lib (~> 4.2.7.7) gitlab-gollum-rugged_adapter (~> 0.4.4.2) gitlab-labkit (~> 0.5.0) gitlab-markup (~> 1.7.0) - google-protobuf (~> 3.7.1) - grpc (~> 1.19.0) + google-protobuf (~> 3.8.0) + grpc (~> 1.24.0) licensee (~> 8.9.0) listen (~> 0.5.0) pry (~> 0.12.2) rbtrace - rdoc (~> 4.2) + rdoc (~> 6.0) rspec rspec-parameterized rubocop (~> 0.69) diff --git a/pkgs/applications/version-management/gitlab/gitaly/default.nix b/pkgs/applications/version-management/gitlab/gitaly/default.nix index dd17618dc74..2c764162230 100644 --- a/pkgs/applications/version-management/gitlab/gitaly/default.nix +++ b/pkgs/applications/version-management/gitlab/gitaly/default.nix @@ -17,14 +17,14 @@ let }; }; in buildGoPackage rec { - version = "1.67.0"; + version = "1.72.1"; pname = "gitaly"; src = fetchFromGitLab { owner = "gitlab-org"; repo = "gitaly"; rev = "v${version}"; - sha256 = "1mj2l15hnxwqmyc8xn79d6qpmpqbqw2ishalr8qvn83nzdsbk8l3"; + sha256 = "0gnhw7p8fgy3w15828qjgkkxcd4dg7gf1hpanc3xqawb8jqpfc91"; }; goPackagePath = "gitlab.com/gitlab-org/gitaly"; diff --git a/pkgs/applications/version-management/gitlab/gitaly/deps.nix b/pkgs/applications/version-management/gitlab/gitaly/deps.nix index 34c30f71054..5f3a324a802 100644 --- a/pkgs/applications/version-management/gitlab/gitaly/deps.nix +++ b/pkgs/applications/version-management/gitlab/gitaly/deps.nix @@ -19,6 +19,42 @@ }; } { + goPackagePath = "github.com/Joker/hpp"; + fetch = { + type = "git"; + url = "https://github.com/Joker/hpp"; + rev = "6893e659854a"; + sha256 = "0lsx63c28rzqigv3lwzznqacpk7nr0dn6ig37v023x8lzc728ix5"; + }; + } + { + goPackagePath = "github.com/Joker/jade"; + fetch = { + type = "git"; + url = "https://github.com/Joker/jade"; + rev = "v1.0.0"; + sha256 = "0k9b8dcwwhajw6rzjmakqwmhw9z192pzzdhppcvam6dy63yl4zjf"; + }; + } + { + goPackagePath = "github.com/Shopify/goreferrer"; + fetch = { + type = "git"; + url = "https://github.com/Shopify/goreferrer"; + rev = "ec9c9a553398"; + sha256 = "0d740psj8czks1hl0nr6nlrwfbwq3nc51jj2p91d1wyhhmgn6jmn"; + }; + } + { + goPackagePath = "github.com/ajg/form"; + fetch = { + type = "git"; + url = "https://github.com/ajg/form"; + rev = "v1.5.1"; + sha256 = "1d6sxzzf9yycdf8jm5877y0khmhkmhxfw3sc4xpdcsrdlc7gqh5a"; + }; + } + { goPackagePath = "github.com/alecthomas/template"; fetch = { type = "git"; @@ -37,6 +73,15 @@ }; } { + goPackagePath = "github.com/aymerick/raymond"; + fetch = { + type = "git"; + url = "https://github.com/aymerick/raymond"; + rev = "v2.0.2"; + sha256 = "1w6am4142k8lyjnwwcgx94c2d8zviflzi0a9c81gn2j0gyx475i3"; + }; + } + { goPackagePath = "github.com/beorn7/perks"; fetch = { type = "git"; @@ -82,6 +127,15 @@ }; } { + goPackagePath = "github.com/codegangsta/inject"; + fetch = { + type = "git"; + url = "https://github.com/codegangsta/inject"; + rev = "33e0aa1cb7c0"; + sha256 = "1jqakr3z9l60qhcgrdzsb6rlk8ikcamisw0g2ndmrf27s0ibfcaj"; + }; + } + { goPackagePath = "github.com/davecgh/go-spew"; fetch = { type = "git"; @@ -91,6 +145,42 @@ }; } { + goPackagePath = "github.com/dgrijalva/jwt-go"; + fetch = { + type = "git"; + url = "https://github.com/dgrijalva/jwt-go"; + rev = "v3.2.0"; + sha256 = "08m27vlms74pfy5z79w67f9lk9zkx6a9jd68k3c4msxy75ry36mp"; + }; + } + { + goPackagePath = "github.com/eknkc/amber"; + fetch = { + type = "git"; + url = "https://github.com/eknkc/amber"; + rev = "cdade1c07385"; + sha256 = "152w97yckwncgw7lwjvgd8d00wy6y0nxzlvx72kl7nqqxs9vhxd9"; + }; + } + { + goPackagePath = "github.com/fatih/structs"; + fetch = { + type = "git"; + url = "https://github.com/fatih/structs"; + rev = "v1.1.0"; + sha256 = "1wrhb8wp8zpzggl61lapb627lw8yv281abvr6vqakmf569nswa9q"; + }; + } + { + goPackagePath = "github.com/flosch/pongo2"; + fetch = { + type = "git"; + url = "https://github.com/flosch/pongo2"; + rev = "bbf5a6c351f4"; + sha256 = "0yqh58phznnxakm64w82gawrpndb0r85vsd1s7h244qqrq7w4avq"; + }; + } + { goPackagePath = "github.com/fsnotify/fsnotify"; fetch = { type = "git"; @@ -100,15 +190,69 @@ }; } { + goPackagePath = "github.com/gavv/monotime"; + fetch = { + type = "git"; + url = "https://github.com/gavv/monotime"; + rev = "30dba4353424"; + sha256 = "0w67yyc9y11dp7lp4b712dkcgbiln1qmgfx1nbbrw3mfkzr61d7g"; + }; + } + { goPackagePath = "github.com/getsentry/raven-go"; fetch = { type = "git"; url = "https://github.com/getsentry/raven-go"; - rev = "v0.1.2"; + rev = "v0.1.0"; sha256 = "1dl80kar4lzdcfl3w6jssi1ld6bv0rmx6sp6bz6rzysfr9ilm02z"; }; } { + goPackagePath = "github.com/getsentry/sentry-go"; + fetch = { + type = "git"; + url = "https://github.com/getsentry/sentry-go"; + rev = "v0.3.0"; + sha256 = "1919lhvg1swcqyfa6mck6nz53c7n4df21jsz46f7x4wncb6f5il1"; + }; + } + { + goPackagePath = "github.com/gin-contrib/sse"; + fetch = { + type = "git"; + url = "https://github.com/gin-contrib/sse"; + rev = "5545eab6dad3"; + sha256 = "0jhcvi66rn7c1wg3rf7q7sylrvlk7c40yk79c5lypnz1dpsdcrb5"; + }; + } + { + goPackagePath = "github.com/gin-gonic/gin"; + fetch = { + type = "git"; + url = "https://github.com/gin-gonic/gin"; + rev = "v1.4.0"; + sha256 = "19nxip48p2s8l7p1p7wpd5li2fcngi4c58rgcg71izdmsmj2iw1d"; + }; + } + { + goPackagePath = "github.com/go-check/check"; + fetch = { + type = "git"; + url = "https://github.com/go-check/check"; + rev = "788fd7840127"; + sha256 = "0v3bim0j375z81zrpr5qv42knqs0y2qv2vkjiqi5axvb78slki1a"; + }; + } + { + goPackagePath = "github.com/go-errors/errors"; + fetch = { + type = "git"; + url = "https://github.com/go-errors/errors"; + rev = "v1.0.1"; + sha256 = "0rznpknk19rxkr7li6dqs52c26pjazp69lh493l4ny4sxn5922lp"; + }; + } + { goPackagePath = "github.com/go-kit/kit"; fetch = { type = "git"; @@ -127,6 +271,15 @@ }; } { + goPackagePath = "github.com/go-martini/martini"; + fetch = { + type = "git"; + url = "https://github.com/go-martini/martini"; + rev = "22fa46961aab"; + sha256 = "01ip3mwbnm5isq120ww73yrvbcn6n5944prhhbyf2ggyf6g46ylh"; + }; + } + { goPackagePath = "github.com/go-stack/stack"; fetch = { type = "git"; @@ -154,15 +307,6 @@ }; } { - goPackagePath = "github.com/golang/lint"; - fetch = { - type = "git"; - url = "https://github.com/golang/lint"; - rev = "06c8688daad7"; - sha256 = "0xi94dwvz50a66bq1hp9fyqkym5mcpdxdb1hrfvicldgjf37lc47"; - }; - } - { goPackagePath = "github.com/golang/mock"; fetch = { type = "git"; @@ -176,8 +320,26 @@ fetch = { type = "git"; url = "https://github.com/golang/protobuf"; - rev = "v1.3.1"; - sha256 = "15am4s4646qy6iv0g3kkqq52rzykqjhm4bf08dk0fy2r58knpsyl"; + rev = "v1.3.2"; + sha256 = "1k1wb4zr0qbwgpvz9q5ws9zhlal8hq7dmq62pwxxriksayl6hzym"; + }; + } + { + goPackagePath = "github.com/google/go-cmp"; + fetch = { + type = "git"; + url = "https://github.com/google/go-cmp"; + rev = "v0.2.0"; + sha256 = "1fbv0x27k9sn8svafc0hjwsnckk864lv4yi7bvzrxvmd3d5hskds"; + }; + } + { + goPackagePath = "github.com/google/go-querystring"; + fetch = { + type = "git"; + url = "https://github.com/google/go-querystring"; + rev = "v1.0.0"; + sha256 = "0xl12bqyvmn4xcnf8p9ksj9rmnr7s40pvppsdmy8n9bzw1db0iwz"; }; } { @@ -190,6 +352,24 @@ }; } { + goPackagePath = "github.com/gopherjs/gopherjs"; + fetch = { + type = "git"; + url = "https://github.com/gopherjs/gopherjs"; + rev = "0766667cb4d1"; + sha256 = "13pfc9sxiwjky2lm1xb3i3lcisn8p6mgjk2d927l7r92ysph8dmw"; + }; + } + { + goPackagePath = "github.com/gorilla/schema"; + fetch = { + type = "git"; + url = "https://github.com/gorilla/schema"; + rev = "v1.1.0"; + sha256 = "14d31i3h6bg83r7ncmwm2pirab66z9hza38in18l89pbazxyh2n9"; + }; + } + { goPackagePath = "github.com/grpc-ecosystem/go-grpc-middleware"; fetch = { type = "git"; @@ -217,6 +397,51 @@ }; } { + goPackagePath = "github.com/imkira/go-interpol"; + fetch = { + type = "git"; + url = "https://github.com/imkira/go-interpol"; + rev = "v1.1.0"; + sha256 = "180h3pf2p0pch6hmqf45wk7wd87md83d3p122f8ll43x5nja5mph"; + }; + } + { + goPackagePath = "github.com/iris-contrib/blackfriday"; + fetch = { + type = "git"; + url = "https://github.com/iris-contrib/blackfriday"; + rev = "v2.0.0"; + sha256 = "1gkizavajqmxm79il8r6cbi0g9ls3vwdh9wr0zy89vc9sq17p3im"; + }; + } + { + goPackagePath = "github.com/iris-contrib/formBinder"; + fetch = { + type = "git"; + url = "https://github.com/iris-contrib/formBinder"; + rev = "v5.0.0"; + sha256 = "0mqk6j7a9d3y28ad4ylqc7z5w4hmn1ws5wwnyll918xn1wkzr5rg"; + }; + } + { + goPackagePath = "github.com/iris-contrib/go.uuid"; + fetch = { + type = "git"; + url = "https://github.com/iris-contrib/go.uuid"; + rev = "v2.0.0"; + sha256 = "0nc0ggn0a6bcwdrwinnx3z6889x65c20a2dwja0n8can3xblxs35"; + }; + } + { + goPackagePath = "github.com/iris-contrib/httpexpect"; + fetch = { + type = "git"; + url = "https://github.com/iris-contrib/httpexpect"; + rev = "ebe99fcebbce"; + sha256 = "126c50c6r5l2gdn60jirpb54pqwswxag3wgrv6wcn998h9w9gv8c"; + }; + } + { goPackagePath = "github.com/json-iterator/go"; fetch = { type = "git"; @@ -226,6 +451,42 @@ }; } { + goPackagePath = "github.com/jtolds/gls"; + fetch = { + type = "git"; + url = "https://github.com/jtolds/gls"; + rev = "v4.20.0"; + sha256 = "1k7xd2q2ysv2xsh373qs801v6f359240kx0vrl0ydh7731lngvk6"; + }; + } + { + goPackagePath = "github.com/juju/errors"; + fetch = { + type = "git"; + url = "https://github.com/juju/errors"; + rev = "089d3ea4e4d5"; + sha256 = "056za75j1zgksky7pbf0pkjqz5ha15g3wj3p4ma10m9sywdyq79r"; + }; + } + { + goPackagePath = "github.com/juju/loggo"; + fetch = { + type = "git"; + url = "https://github.com/juju/loggo"; + rev = "584905176618"; + sha256 = "0hzi0652y74jf62wwyi9gf8bzrs7ynvhjfqc8rwr4l799d7i5gd4"; + }; + } + { + goPackagePath = "github.com/juju/testing"; + fetch = { + type = "git"; + url = "https://github.com/juju/testing"; + rev = "472a3e8b2073"; + sha256 = "05wjc2k0kwbam7anaxwnj30pl03dcdbrsz32icd70zl70ipsqsw4"; + }; + } + { goPackagePath = "github.com/julienschmidt/httprouter"; fetch = { type = "git"; @@ -235,6 +496,42 @@ }; } { + goPackagePath = "github.com/k0kubun/colorstring"; + fetch = { + type = "git"; + url = "https://github.com/k0kubun/colorstring"; + rev = "9440f1994b88"; + sha256 = "0isskya7ky4k9znrh85crfc2pxwyfz2s8j1a5cbjb8b8zf2v0qbj"; + }; + } + { + goPackagePath = "github.com/kataras/golog"; + fetch = { + type = "git"; + url = "https://github.com/kataras/golog"; + rev = "99c81de45f40"; + sha256 = "1dgrsvhzymgj7da54ldv8plkxk3n8zh3kc995qxl6mrpz65j801p"; + }; + } + { + goPackagePath = "github.com/kataras/iris"; + fetch = { + type = "git"; + url = "https://github.com/kataras/iris"; + rev = "v11.1.1"; + sha256 = "1rxpr5hdj9mji26mlfp4zic0pc6nh93akzccw24a5kynj07g68wg"; + }; + } + { + goPackagePath = "github.com/kataras/pio"; + fetch = { + type = "git"; + url = "https://github.com/kataras/pio"; + rev = "ea782b38602d"; + sha256 = "0ca29wmkpx19qwnvi4fja3avkxkzz14x9wyzmg1l9074bxbj8cgj"; + }; + } + { goPackagePath = "github.com/kelseyhightower/envconfig"; fetch = { type = "git"; @@ -244,12 +541,21 @@ }; } { - goPackagePath = "github.com/kisielk/gotool"; + goPackagePath = "github.com/klauspost/compress"; fetch = { type = "git"; - url = "https://github.com/kisielk/gotool"; - rev = "v1.0.0"; - sha256 = "14af2pa0ssyp8bp2mvdw184s5wcysk6akil3wzxmr05wwy951iwn"; + url = "https://github.com/klauspost/compress"; + rev = "v1.4.0"; + sha256 = "1y7951q0ji894d111lqqbacq64cxyi2dxsni5sqi9488zsasgw8s"; + }; + } + { + goPackagePath = "github.com/klauspost/cpuid"; + fetch = { + type = "git"; + url = "https://github.com/klauspost/cpuid"; + rev = "e7e905edc00e"; + sha256 = "0cmyv3rwv5r5iqvvfhbiwp3jsfa40c6xfm42nxbngd5lygjcwwgf"; }; } { @@ -271,6 +577,51 @@ }; } { + goPackagePath = "github.com/kr/pretty"; + fetch = { + type = "git"; + url = "https://github.com/kr/pretty"; + rev = "v0.1.0"; + sha256 = "18m4pwg2abd0j9cn5v3k2ksk9ig4vlwxmlw9rrglanziv9l967qp"; + }; + } + { + goPackagePath = "github.com/kr/pty"; + fetch = { + type = "git"; + url = "https://github.com/kr/pty"; + rev = "v1.1.1"; + sha256 = "0383f0mb9kqjvncqrfpidsf8y6ns5zlrc91c6a74xpyxjwvzl2y6"; + }; + } + { + goPackagePath = "github.com/kr/text"; + fetch = { + type = "git"; + url = "https://github.com/kr/text"; + rev = "v0.1.0"; + sha256 = "1gm5bsl01apvc84bw06hasawyqm4q84vx1pm32wr9jnd7a8vjgj1"; + }; + } + { + goPackagePath = "github.com/labstack/echo"; + fetch = { + type = "git"; + url = "https://github.com/labstack/echo"; + rev = "v4.1.10"; + sha256 = "0qg9ykmhgldiv2v1w8sz8x0j0bgqf11ghzrim59fb6pxz8qgg25h"; + }; + } + { + goPackagePath = "github.com/labstack/gommon"; + fetch = { + type = "git"; + url = "https://github.com/labstack/gommon"; + rev = "v0.3.0"; + sha256 = "18z7akyzm75p6anm4b8qkqgm4iivx50z07hi5wf50w1pbsvbcdi0"; + }; + } + { goPackagePath = "github.com/libgit2/git2go"; fetch = { type = "git"; @@ -289,6 +640,33 @@ }; } { + goPackagePath = "github.com/mattn/go-colorable"; + fetch = { + type = "git"; + url = "https://github.com/mattn/go-colorable"; + rev = "v0.1.2"; + sha256 = "0512jm3wmzkkn7d99x9wflyqf48n5ri3npy1fqkq6l6adc5mni3n"; + }; + } + { + goPackagePath = "github.com/mattn/go-isatty"; + fetch = { + type = "git"; + url = "https://github.com/mattn/go-isatty"; + rev = "v0.0.9"; + sha256 = "0i3km37lajahh1y2392g4hpgvq05arcgiiv93yhzxxyv0fpqj72m"; + }; + } + { + goPackagePath = "github.com/mattn/goveralls"; + fetch = { + type = "git"; + url = "https://github.com/mattn/goveralls"; + rev = "v0.0.2"; + sha256 = "13ffdikvc594g1mryhi94m87skr7irwkjnpxp8ad2kprn6syfslp"; + }; + } + { goPackagePath = "github.com/matttproud/golang_protobuf_extensions"; fetch = { type = "git"; @@ -298,6 +676,15 @@ }; } { + goPackagePath = "github.com/microcosm-cc/bluemonday"; + fetch = { + type = "git"; + url = "https://github.com/microcosm-cc/bluemonday"; + rev = "v1.0.2"; + sha256 = "0j0aylsxqjcj49w7ph8cmpaqjlpvg7mb5mrcrd9bg71dlb9z9ir2"; + }; + } + { goPackagePath = "github.com/modern-go/concurrent"; fetch = { type = "git"; @@ -316,6 +703,15 @@ }; } { + goPackagePath = "github.com/moul/http2curl"; + fetch = { + type = "git"; + url = "https://github.com/moul/http2curl"; + rev = "v1.0.0"; + sha256 = "15bpx33d3ygya8dg8hbsn24h7acpajl27006pj8lw1c0bfvbnrl0"; + }; + } + { goPackagePath = "github.com/mwitkow/go-conntrack"; fetch = { type = "git"; @@ -329,8 +725,8 @@ fetch = { type = "git"; url = "https://github.com/onsi/ginkgo"; - rev = "v1.7.0"; - sha256 = "14wgpdrvpc35rdz3859bz53sc1g4vpr1fysy15wy3ff9gmqs14yg"; + rev = "v1.10.1"; + sha256 = "033a42h1wzmji57p86igg9whvsbp6nvfdsypskw738ys903n3z4d"; }; } { @@ -338,8 +734,8 @@ fetch = { type = "git"; url = "https://github.com/onsi/gomega"; - rev = "v1.4.3"; - sha256 = "1c8rqg5i2hz3snmq7s41yar1zjnzilb0fyiyhkg83v97afcfx79v"; + rev = "v1.7.0"; + sha256 = "09j6wq425wgzzsbwm9ckhfgl2capv3yyqbrf45qyrjwkzm49i02y"; }; } { @@ -361,12 +757,21 @@ }; } { + goPackagePath = "github.com/pingcap/errors"; + fetch = { + type = "git"; + url = "https://github.com/pingcap/errors"; + rev = "v0.11.1"; + sha256 = "00wr0l4cwq0qx8jw51j0n7pbh9l7hdq2874x9rf1mz5svz1wbmcp"; + }; + } + { goPackagePath = "github.com/pkg/errors"; fetch = { type = "git"; url = "https://github.com/pkg/errors"; - rev = "v0.8.0"; - sha256 = "001i6n71ghp2l6kdl3qq1v2vmghcz3kicv9a5wgcihrzigm75pp5"; + rev = "v0.8.1"; + sha256 = "0g5qcb4d4fd96midz0zdk8b9kz8xkzwfa8kr1cliqbg8sxsy5vd1"; }; } { @@ -415,6 +820,33 @@ }; } { + goPackagePath = "github.com/ryanuber/columnize"; + fetch = { + type = "git"; + url = "https://github.com/ryanuber/columnize"; + rev = "v2.1.0"; + sha256 = "0m9jhagb1k44zfcdai76xdf9vpi3bqdl7p078ffyibmz0z9jfap6"; + }; + } + { + goPackagePath = "github.com/sergi/go-diff"; + fetch = { + type = "git"; + url = "https://github.com/sergi/go-diff"; + rev = "v1.0.0"; + sha256 = "0swiazj8wphs2zmk1qgq75xza6m19snif94h2m6fi8dqkwqdl7c7"; + }; + } + { + goPackagePath = "github.com/shurcooL/sanitized_anchor_name"; + fetch = { + type = "git"; + url = "https://github.com/shurcooL/sanitized_anchor_name"; + rev = "v1.0.0"; + sha256 = "1gv9p2nr46z80dnfjsklc6zxbgk96349sdsxjz05f3z6wb6m5l8f"; + }; + } + { goPackagePath = "github.com/sirupsen/logrus"; fetch = { type = "git"; @@ -424,6 +856,24 @@ }; } { + goPackagePath = "github.com/smartystreets/assertions"; + fetch = { + type = "git"; + url = "https://github.com/smartystreets/assertions"; + rev = "b2de0cb4f26d"; + sha256 = "1i7ldgavgl35c7gk25p7bvdr282ckng090zr4ch9mk1705akx09y"; + }; + } + { + goPackagePath = "github.com/smartystreets/goconvey"; + fetch = { + type = "git"; + url = "https://github.com/smartystreets/goconvey"; + rev = "505e41936337"; + sha256 = "07zjxwszayal88z1j2bwnqrsa32vg8l4nivks5yfr9j8xfsw7n6m"; + }; + } + { goPackagePath = "github.com/stretchr/objx"; fetch = { type = "git"; @@ -437,8 +887,8 @@ fetch = { type = "git"; url = "https://github.com/stretchr/testify"; - rev = "v1.3.0"; - sha256 = "0wjchp2c8xbgcbbq32w3kvblk6q6yn533g78nxl6iskq6y95lxsy"; + rev = "v1.4.0"; + sha256 = "187i5g88sxfy4vxpm7dw1gwv29pa2qaq475lxrdh5livh69wqfjb"; }; } { @@ -478,6 +928,123 @@ }; } { + goPackagePath = "github.com/ugorji/go"; + fetch = { + type = "git"; + url = "https://github.com/ugorji/go"; + rev = "v1.1.4"; + sha256 = "0ma2qvn5wqvjidpdz74x832a813qnr1cxbx6n6n125ak9b3wbn5w"; + }; + } + { + goPackagePath = "github.com/urfave/negroni"; + fetch = { + type = "git"; + url = "https://github.com/urfave/negroni"; + rev = "v1.0.0"; + sha256 = "1gp6j74adi1cn8fq5v3wzlzhwl4zg43n2746m4fzdcdimihk3ccp"; + }; + } + { + goPackagePath = "github.com/valyala/bytebufferpool"; + fetch = { + type = "git"; + url = "https://github.com/valyala/bytebufferpool"; + rev = "v1.0.0"; + sha256 = "01lqzjddq6kz9v41nkky7wbgk7f1cw036sa7ldz10d82g5klzl93"; + }; + } + { + goPackagePath = "github.com/valyala/fasthttp"; + fetch = { + type = "git"; + url = "https://github.com/valyala/fasthttp"; + rev = "v1.4.0"; + sha256 = "0kypc7r91n61fm6qsadza1aiy9n6byghvcxzvx7agi6yzrllk956"; + }; + } + { + goPackagePath = "github.com/valyala/fasttemplate"; + fetch = { + type = "git"; + url = "https://github.com/valyala/fasttemplate"; + rev = "v1.0.1"; + sha256 = "0l131znbv8v67y20s4q361mwiww2c33zdc68mwvxchzk1gpy5ywq"; + }; + } + { + goPackagePath = "github.com/valyala/tcplisten"; + fetch = { + type = "git"; + url = "https://github.com/valyala/tcplisten"; + rev = "ceec8f93295a"; + sha256 = "0ksbj1gsdqanbnhly5w1wcc107bib4w0zpnyl00prr89zch3imnf"; + }; + } + { + goPackagePath = "github.com/xeipuuv/gojsonpointer"; + fetch = { + type = "git"; + url = "https://github.com/xeipuuv/gojsonpointer"; + rev = "df4f5c81cb3b"; + sha256 = "0dfwc66z5gq75m3z7va80c10c22ijiq99bahq86l26ki71g286xn"; + }; + } + { + goPackagePath = "github.com/xeipuuv/gojsonreference"; + fetch = { + type = "git"; + url = "https://github.com/xeipuuv/gojsonreference"; + rev = "bd5ef7bd5415"; + sha256 = "1xby79padc7bmyb8rfbad8wfnfdzpnh51b1n8c0kibch0kwc1db5"; + }; + } + { + goPackagePath = "github.com/xeipuuv/gojsonschema"; + fetch = { + type = "git"; + url = "https://github.com/xeipuuv/gojsonschema"; + rev = "v1.1.0"; + sha256 = "10gn5y4l72zknj21mff29d9vnk4pz7jnw39xnlsb373lsiih91xg"; + }; + } + { + goPackagePath = "github.com/yalp/jsonpath"; + fetch = { + type = "git"; + url = "https://github.com/yalp/jsonpath"; + rev = "5cc68e5049a0"; + sha256 = "0kkyxp1cg3kfxy5hhwzxg132jin4xb492z5jpqq94ix15v6rdf4b"; + }; + } + { + goPackagePath = "github.com/yudai/gojsondiff"; + fetch = { + type = "git"; + url = "https://github.com/yudai/gojsondiff"; + rev = "v1.0.0"; + sha256 = "0qnymi0027mb8kxm24mmd22bvjrdkc56c7f4q3lbdf93x1vxbbc2"; + }; + } + { + goPackagePath = "github.com/yudai/golcs"; + fetch = { + type = "git"; + url = "https://github.com/yudai/golcs"; + rev = "ecda9a501e82"; + sha256 = "0mx6wc5fz05yhvg03vvps93bc5mw4vnng98fhmixd47385qb29pq"; + }; + } + { + goPackagePath = "github.com/yudai/pp"; + fetch = { + type = "git"; + url = "https://github.com/yudai/pp"; + rev = "v2.0.1"; + sha256 = "18vbc7jagnjw1wpvhqjffl0np7bzzqdd9jpdcisvj5h85lbyn5gk"; + }; + } + { goPackagePath = "gitlab.com/gitlab-org/labkit"; fetch = { type = "git"; @@ -500,8 +1067,8 @@ fetch = { type = "git"; url = "https://go.googlesource.com/crypto"; - rev = "20be4c3c3ed5"; - sha256 = "1ph7y8v30hc95h1dwr7vrhg1nzs47a261qin6zg8mhf12g5k2lxb"; + rev = "4def268fd1a4"; + sha256 = "1bfsnari529gw34cz0zqk3d9mrkcj1ay35kangri8kbgll0ss5a6"; }; } { @@ -509,8 +1076,8 @@ fetch = { type = "git"; url = "https://go.googlesource.com/lint"; - rev = "06c8688daad7"; - sha256 = "0xi94dwvz50a66bq1hp9fyqkym5mcpdxdb1hrfvicldgjf37lc47"; + rev = "d0100b6bd8b3"; + sha256 = "0b0amr9x4ji66iv9ayfx7zrfx52k1m5g66qfcxkgj80qrb1y2yn7"; }; } { @@ -536,8 +1103,8 @@ fetch = { type = "git"; url = "https://go.googlesource.com/sync"; - rev = "37e7f081c4d4"; - sha256 = "1bb0mw6ckb1k7z8v3iil2qlqwfj408fvvp8m1cik2b46p7snyjhm"; + rev = "112230192c58"; + sha256 = "05i2k43j2d0llq768hg5pf3hb2yhfzp9la1w5wp0rsnnzblr0lfn"; }; } { @@ -545,8 +1112,8 @@ fetch = { type = "git"; url = "https://go.googlesource.com/sys"; - rev = "953cdadca894"; - sha256 = "0gkha4whk8xkcv3isigbs250akag99isxnd3v9xmy0kl3g88hxy1"; + rev = "fde4db37ae7a"; + sha256 = "16k4w4pzziq1kln18k5fg01qgk4hpzb5xsm7175kaky6d6gwyhg3"; }; } { @@ -563,8 +1130,8 @@ fetch = { type = "git"; url = "https://go.googlesource.com/tools"; - rev = "6cd1fcedba52"; - sha256 = "00hl0vkmy8impsnmc2dmm55sdhia95k0kqcrjbdpynryn1lamn5d"; + rev = "2c0ae7006135"; + sha256 = "1lsi2ssxajclj3bciz2a41v1vjv768ja3v6wnbyhxy8xphwkp4fk"; }; } { @@ -590,8 +1157,8 @@ fetch = { type = "git"; url = "https://github.com/grpc/grpc-go"; - rev = "v1.16.0"; - sha256 = "0a9xl6c5j7lvsb4q6ry5p892rjm86p47d4f8xrf0r8lxblf79qbg"; + rev = "v1.24.0"; + sha256 = "0h8mwv74vzcfb7p4ai247x094skxca71vjp4wpj2wzmri0x9p4v6"; }; } { @@ -631,6 +1198,33 @@ }; } { + goPackagePath = "gopkg.in/go-playground/assert.v1"; + fetch = { + type = "git"; + url = "https://gopkg.in/go-playground/assert.v1"; + rev = "v1.2.1"; + sha256 = "1h4amgykpa0djwi619llr3g55p75ia0mi184h9s5zdl8l4rhn9pm"; + }; + } + { + goPackagePath = "gopkg.in/go-playground/validator.v8"; + fetch = { + type = "git"; + url = "https://gopkg.in/go-playground/validator.v8"; + rev = "v8.18.2"; + sha256 = "1m2i48ph5a3kw9nlw2srx8i04v7chicds2hlzlrfm15045crga55"; + }; + } + { + goPackagePath = "gopkg.in/mgo.v2"; + fetch = { + type = "git"; + url = "https://gopkg.in/mgo.v2"; + rev = "9856a29383ce"; + sha256 = "1gfbcmvpwwf1lydxj3g42wv2g9w3pf0y02igqk4f4f21h02sazkw"; + }; + } + { goPackagePath = "gopkg.in/tomb.v1"; fetch = { type = "git"; @@ -653,8 +1247,8 @@ fetch = { type = "git"; url = "https://github.com/dominikh/go-tools"; - rev = "88497007e858"; - sha256 = "0rinkyx3r2bq45mgcasnn5jb07cwbv3p3s2wwcrzxsarsj6wa5lc"; + rev = "ea95bdfd59fc"; + sha256 = "1763nw7pwpzkvzfnm63dgzcgbq9hwmq5l1nffchnhh77vgkaq4ic"; }; } ] diff --git a/pkgs/applications/version-management/gitlab/gitaly/gemset.nix b/pkgs/applications/version-management/gitlab/gitaly/gemset.nix index a5140972ef0..47e1c3b3568 100644 --- a/pkgs/applications/version-management/gitlab/gitaly/gemset.nix +++ b/pkgs/applications/version-management/gitlab/gitaly/gemset.nix @@ -224,15 +224,15 @@ version = "3.3.0"; }; github-linguist = { - dependencies = ["charlock_holmes" "escape_utils" "mime-types" "rugged"]; + dependencies = ["charlock_holmes" "escape_utils" "mini_mime" "rugged"]; groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0nqsprsy4xd6yxzk3b54815hv0gk2r1xn0vsm81pkyy61bbm35hf"; + sha256 = "092bq7bjfj2yvss2ig6jb71j0h04cigq79xxfis37j315iixl12j"; type = "gem"; }; - version = "6.4.1"; + version = "7.5.1"; }; github-markup = { source = { @@ -308,10 +308,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "04988m3hmllg4sl4syjb35x0wzsg7rj1nmvhx3d9ihml22w76gb2"; + sha256 = "0by3289irdklb9gjqw41fq6mg6yja3iyzh99dj8p8z9l4brllqn4"; type = "gem"; }; - version = "3.7.1"; + version = "3.8.0"; }; googleapis-common-protos-types = { dependencies = ["google-protobuf"]; @@ -330,10 +330,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1rdywzism5vxz8pnml6xjb9f19diclyy74014z69q01jzqwi1wgs"; + sha256 = "18wikj9qd4jb4lks55cs2cf3q7fifnanm9z9ywnxhpj57vbnilpf"; type = "gem"; }; - version = "1.19.0"; + version = "1.24.0"; }; hashdiff = { groups = ["default" "development" "test"]; @@ -418,10 +418,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1ccsid33xjajd0im2xv941aywi58z7ihwkvaf1w2bv89vn5bhsjg"; + sha256 = "06kfq90vi38gv6i128f4zg462kj32szs5vsgm25hxgw9zd12pj9x"; type = "gem"; }; - version = "2.2.3"; + version = "2.3.0"; }; memoizable = { dependencies = ["thread_safe"]; @@ -459,6 +459,16 @@ }; version = "3.2019.0331"; }; + mini_mime = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1axm0rxyx3ss93wbmfkm78a6x03l8y4qy60rhkkiq0aza0vwq3ha"; + type = "gem"; + }; + version = "1.0.2"; + }; mini_portile2 = { source = { remotes = ["https://rubygems.org"]; @@ -507,10 +517,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0nmdrqqz1gs0fwkgzxjl4wr554gr8dc1fkrqjc2jpsvwgm41rygv"; + sha256 = "185g3dwba73jqxjr94bd2zk6fil6n9hmcfnfyzh3p1w47vm296r7"; type = "gem"; }; - version = "1.10.4"; + version = "1.10.5"; }; nokogumbo = { dependencies = ["nokogiri"]; @@ -640,10 +650,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0ilwxzm3a7bql5c9q2n9g9nb1hax7vd8d65a5yp3d967ld97nvrq"; + sha256 = "1icpqmxbppl4ynzmn6dx7wdil5hhq6fz707m9ya6d86c7ys8sd4f"; type = "gem"; }; - version = "1.2.0"; + version = "1.3.0"; }; rainbow = { source = { @@ -663,12 +673,14 @@ version = "0.4.11"; }; rdoc = { + groups = ["default"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "13ba2mhqqcsp3k97x3iz9x29xk26rv4561lfzzzibcy41vvj1n4c"; + sha256 = "1gh7sc3xd4rgl9z90181cq580r1xqn063mmv51wdrhhsrkkw2bi9"; type = "gem"; }; - version = "4.3.0"; + version = "6.2.0"; }; redis = { groups = ["default"]; diff --git a/pkgs/applications/version-management/gitlab/gitlab-shell/deps.nix b/pkgs/applications/version-management/gitlab/gitlab-shell/deps.nix index d5ea22f960b..5b5d0b99bcf 100644 --- a/pkgs/applications/version-management/gitlab/gitlab-shell/deps.nix +++ b/pkgs/applications/version-management/gitlab/gitlab-shell/deps.nix @@ -163,15 +163,6 @@ }; } { - goPackagePath = "github.com/golang/lint"; - fetch = { - type = "git"; - url = "https://github.com/golang/lint"; - rev = "06c8688daad7"; - sha256 = "0xi94dwvz50a66bq1hp9fyqkym5mcpdxdb1hrfvicldgjf37lc47"; - }; - } - { goPackagePath = "github.com/golang/mock"; fetch = { type = "git"; @@ -262,15 +253,6 @@ }; } { - goPackagePath = "github.com/kisielk/gotool"; - fetch = { - type = "git"; - url = "https://github.com/kisielk/gotool"; - rev = "v1.0.0"; - sha256 = "14af2pa0ssyp8bp2mvdw184s5wcysk6akil3wzxmr05wwy951iwn"; - }; - } - { goPackagePath = "github.com/konsorten/go-windows-terminal-sequences"; fetch = { type = "git"; diff --git a/pkgs/applications/version-management/gitlab/gitlab-workhorse/default.nix b/pkgs/applications/version-management/gitlab/gitlab-workhorse/default.nix index aa8cf7c164c..4f3322f3d0f 100644 --- a/pkgs/applications/version-management/gitlab/gitlab-workhorse/default.nix +++ b/pkgs/applications/version-management/gitlab/gitlab-workhorse/default.nix @@ -3,13 +3,13 @@ buildGoPackage rec { pname = "gitlab-workhorse"; - version = "8.14.0"; + version = "8.14.1"; src = fetchFromGitLab { owner = "gitlab-org"; repo = "gitlab-workhorse"; rev = "v${version}"; - sha256 = "1cqx75h4x4chjvp72kzbln8qkm5p7p2w7x8bdd99g38kf21wxxaq"; + sha256 = "19flb9b9l9214ykwgjphcqrinncnfvhis7nrvcr4ns6rlpxnc9dl"; }; goPackagePath = "gitlab.com/gitlab-org/gitlab-workhorse"; diff --git a/pkgs/applications/version-management/gitlab/rubyEnv/Gemfile b/pkgs/applications/version-management/gitlab/rubyEnv/Gemfile index 920f778c053..d27bc276088 100644 --- a/pkgs/applications/version-management/gitlab/rubyEnv/Gemfile +++ b/pkgs/applications/version-management/gitlab/rubyEnv/Gemfile @@ -8,12 +8,12 @@ gem 'bootsnap', '~> 1.4' gem 'nakayoshi_fork', '~> 0.0.4' # Responders respond_to and respond_with -gem 'responders', '~> 2.0' +gem 'responders', '~> 3.0' gem 'sprockets', '~> 3.7.0' # Default values for AR models -gem 'default_value_for', '~> 3.2.0' +gem 'default_value_for', '~> 3.3.0' # Supported DBs gem 'pg', '~> 1.1' @@ -42,7 +42,7 @@ gem 'omniauth-shibboleth', '~> 1.3.0' gem 'omniauth-twitter', '~> 1.4' gem 'omniauth_crowd', '~> 2.2.0' gem 'omniauth-authentiq', '~> 0.3.3' -gem 'omniauth_openid_connect', '~> 0.3.1' +gem 'omniauth_openid_connect', '~> 0.3.3' gem "omniauth-ultraauth", '~> 0.0.2' gem 'omniauth-salesforce', '~> 1.0.5' gem 'rack-oauth2', '~> 1.9.3' @@ -64,7 +64,7 @@ gem 'u2f', '~> 0.2.1' # GitLab Pages gem 'validates_hostname', '~> 1.0.6' -gem 'rubyzip', '~> 1.2.2', require: 'zip' +gem 'rubyzip', '~> 1.3.0', require: 'zip' # GitLab Pages letsencrypt support gem 'acme-client', '~> 2.0.2' @@ -72,7 +72,7 @@ gem 'acme-client', '~> 2.0.2' gem 'browser', '~> 2.5' # GPG -gem 'gpgme', '~> 2.0.18' +gem 'gpgme', '~> 2.0.19' # LDAP Auth # GitLab fork with several improvements to original library. For full list of changes @@ -136,7 +136,7 @@ gem 'faraday_middleware-aws-signers-v4' # Markdown and HTML processing gem 'html-pipeline', '~> 2.8' -gem 'deckar01-task_list', '2.2.0' +gem 'deckar01-task_list', '2.2.1' gem 'gitlab-markup', '~> 1.7.0' gem 'github-markup', '~> 1.7.0', require: 'github/markup' gem 'commonmarker', '~> 0.17' @@ -151,7 +151,7 @@ gem 'asciidoctor-plantuml', '0.0.9' gem 'rouge', '~> 3.11.0' gem 'truncato', '~> 0.7.11' gem 'bootstrap_form', '~> 4.2.0' -gem 'nokogiri', '~> 1.10.4' +gem 'nokogiri', '~> 1.10.5' gem 'escape_utils', '~> 1.1' # Calendar rendering @@ -159,6 +159,7 @@ gem 'icalendar' # Diffs gem 'diffy', '~> 3.1.0' +gem 'diff_match_patch', '~> 0.1.0' # Application server gem 'rack', '~> 2.0.7' @@ -175,7 +176,7 @@ group :puma do end # State machine -gem 'state_machines-activerecord', '~> 0.5.1' +gem 'state_machines-activerecord', '~> 0.6.0' # Issue tags gem 'acts-as-taggable-on', '~> 6.0' @@ -259,9 +260,6 @@ gem 'loofah', '~> 2.2' # Working with license gem 'licensee', '~> 8.9' -# Protect against bruteforcing -gem 'rack-attack', '~> 4.4.1' - # Ace editor gem 'ace-rails-ap', '~> 4.1.0' @@ -293,10 +291,13 @@ gem 'base32', '~> 0.3.0' gem "gitlab-license", "~> 1.0" +# Protect against bruteforcing +gem 'rack-attack', '~> 6.2.0' + # Sentry integration gem 'sentry-raven', '~> 2.9' -gem 'premailer-rails', '~> 1.9.7' +gem 'premailer-rails', '~> 1.10.3' # LabKit: Tracing and Correlation gem 'gitlab-labkit', '~> 0.5' @@ -331,7 +332,6 @@ group :metrics do end group :development do - gem 'foreman', '~> 0.84.0' gem 'brakeman', '~> 4.2', require: false gem 'danger', '~> 6.0', require: false @@ -388,7 +388,6 @@ group :development, :test do gem 'benchmark-ips', '~> 2.3.0', require: false - gem 'license_finder', '~> 5.4', require: false gem 'knapsack', '~> 1.17' gem 'stackprof', '~> 0.2.10', require: false @@ -398,6 +397,11 @@ group :development, :test do gem 'timecop', '~> 0.8.0' end +# Gems required in omnibus-gitlab pipeline +group :development, :test, :omnibus do + gem 'license_finder', '~> 5.4', require: false +end + group :test do gem 'shoulda-matchers', '~> 4.0.1', require: false gem 'email_spec', '~> 2.2.0' @@ -407,6 +411,7 @@ group :test do gem 'concurrent-ruby', '~> 1.1' gem 'test-prof', '~> 0.10.0' gem 'rspec_junit_formatter' + gem 'guard-rspec' end gem 'octokit', '~> 4.9' @@ -446,18 +451,18 @@ group :ed25519 do end # Gitaly GRPC protocol definitions -gem 'gitaly', '~> 1.65.0' +gem 'gitaly', '~> 1.70.0' -gem 'grpc', '~> 1.19.0' +gem 'grpc', '~> 1.24.0' -gem 'google-protobuf', '~> 3.7.1' +gem 'google-protobuf', '~> 3.8.0' gem 'toml-rb', '~> 1.0.0', require: false # Feature toggles -gem 'flipper', '~> 0.13.0' -gem 'flipper-active_record', '~> 0.13.0' -gem 'flipper-active_support_cache_store', '~> 0.13.0' +gem 'flipper', '~> 0.17.1' +gem 'flipper-active_record', '~> 0.17.1' +gem 'flipper-active_support_cache_store', '~> 0.17.1' gem 'unleash', '~> 0.1.5' # Structured logging @@ -469,3 +474,5 @@ gem 'gitlab-net-dns', '~> 0.9.1' # Countries list gem 'countries', '~> 3.0' + +gem 'retriable', '~> 3.1.2' diff --git a/pkgs/applications/version-management/gitlab/rubyEnv/Gemfile.lock b/pkgs/applications/version-management/gitlab/rubyEnv/Gemfile.lock index 18160932c56..15465cd6b03 100644 --- a/pkgs/applications/version-management/gitlab/rubyEnv/Gemfile.lock +++ b/pkgs/applications/version-management/gitlab/rubyEnv/Gemfile.lock @@ -50,8 +50,8 @@ GEM i18n (>= 0.7, < 2) minitest (~> 5.1) tzinfo (~> 1.1) - acts-as-taggable-on (6.0.0) - activerecord (~> 5.0) + acts-as-taggable-on (6.5.0) + activerecord (>= 5.0, < 6.1) adamantium (0.2.0) ice_nine (~> 0.11.0) memoizable (~> 0.4.0) @@ -80,14 +80,16 @@ GEM encryptor (~> 3.0.0) attr_required (1.0.1) awesome_print (1.8.0) - aws-sdk (2.9.32) - aws-sdk-resources (= 2.9.32) - aws-sdk-core (2.9.32) + aws-eventstream (1.0.3) + aws-sdk (2.11.374) + aws-sdk-resources (= 2.11.374) + aws-sdk-core (2.11.374) aws-sigv4 (~> 1.0) jmespath (~> 1.0) - aws-sdk-resources (2.9.32) - aws-sdk-core (= 2.9.32) - aws-sigv4 (1.0.0) + aws-sdk-resources (2.11.374) + aws-sdk-core (= 2.11.374) + aws-sigv4 (1.1.0) + aws-eventstream (~> 1.0, >= 1.0.2) axiom-types (0.1.1) descendants_tracker (~> 0.0.4) ice_nine (~> 0.11.0) @@ -171,9 +173,9 @@ GEM unicode_utils (~> 1.4) crack (0.4.3) safe_yaml (~> 1.0.0) - crass (1.0.4) + crass (1.0.5) creole (0.5.0) - css_parser (1.5.0) + css_parser (1.7.0) addressable daemons (1.2.6) danger (6.0.9) @@ -192,12 +194,12 @@ GEM database_cleaner (1.7.0) debug_inspector (0.0.3) debugger-ruby_core_source (1.3.8) - deckar01-task_list (2.2.0) + deckar01-task_list (2.2.1) html-pipeline declarative (0.0.10) declarative-option (0.1.0) - default_value_for (3.2.0) - activerecord (>= 3.2.0, < 6.0) + default_value_for (3.3.0) + activerecord (>= 3.2.0, < 6.1) derailed_benchmarks (1.3.5) benchmark-ips (~> 2) get_process_mem (~> 0) @@ -222,6 +224,7 @@ GEM railties rotp (~> 2.0) diff-lcs (1.3) + diff_match_patch (0.1.0) diffy (3.1.0) discordrb-webhooks-blackst0ne (3.3.0) rest-client (~> 2.0) @@ -285,13 +288,13 @@ GEM fast_gettext (1.6.0) ffaker (2.10.0) ffi (1.11.1) - flipper (0.13.0) - flipper-active_record (0.13.0) - activerecord (>= 3.2, < 6) - flipper (~> 0.13.0) - flipper-active_support_cache_store (0.13.0) - activesupport (>= 3.2, < 6) - flipper (~> 0.13.0) + flipper (0.17.1) + flipper-active_record (0.17.1) + activerecord (>= 4.2, < 7) + flipper (~> 0.17.1) + flipper-active_support_cache_store (0.17.1) + activesupport (>= 4.2, < 7) + flipper (~> 0.17.1) flowdock (0.7.1) httparty (~> 0.7) multi_json @@ -332,10 +335,8 @@ GEM fog-xml (0.1.3) fog-core nokogiri (>= 1.5.11, < 2.0.0) - font-awesome-rails (4.7.0.4) - railties (>= 3.2, < 6.0) - foreman (0.84.0) - thor (~> 0.19.1) + font-awesome-rails (4.7.0.5) + railties (>= 3.2, < 6.1) formatador (0.2.5) fugit (1.2.1) et-orbi (~> 1.1, >= 1.1.8) @@ -358,12 +359,12 @@ GEM po_to_json (>= 1.0.0) rails (>= 3.2.0) git (1.5.0) - gitaly (1.65.0) + gitaly (1.70.0) grpc (~> 1.0) github-markup (1.7.0) - gitlab-labkit (0.5.2) - actionpack (~> 5) - activesupport (~> 5) + gitlab-labkit (0.7.0) + actionpack (>= 5.0.0, < 6.1.0) + activesupport (>= 5.0.0, < 6.1.0) grpc (~> 1.19) jaeger-client (~> 0.10) opentracing (~> 0.4) @@ -400,7 +401,7 @@ GEM mime-types (~> 3.0) representable (~> 3.0) retriable (>= 2.0, < 4.0) - google-protobuf (3.7.1) + google-protobuf (3.8.0) googleapis-common-protos-types (1.0.4) google-protobuf (~> 3.0) googleauth (0.6.6) @@ -410,7 +411,7 @@ GEM multi_json (~> 1.11) os (>= 0.9, < 2.0) signet (~> 0.7) - gpgme (2.0.18) + gpgme (2.0.19) mini_portile2 (~> 2.3) grape (1.1.0) activesupport @@ -440,11 +441,25 @@ GEM graphql (~> 1.6) html-pipeline (~> 2.8) sass (~> 3.4) - grpc (1.19.0) - google-protobuf (~> 3.1) - googleapis-common-protos-types (~> 1.0.0) + grpc (1.24.0) + google-protobuf (~> 3.8) + googleapis-common-protos-types (~> 1.0) gssapi (1.2.0) ffi (>= 1.0.1) + guard (2.15.1) + formatador (>= 0.2.4) + listen (>= 2.7, < 4.0) + lumberjack (>= 1.0.12, < 2.0) + nenv (~> 0.1) + notiffany (~> 0.0) + pry (>= 0.9.12) + shellany (~> 0.0) + thor (>= 0.18.1) + guard-compat (1.2.1) + guard-rspec (4.7.3) + guard (~> 2.1) + guard-compat (~> 1.1) + rspec (>= 2.99.0, < 4.0) haml (5.0.4) temple (>= 0.8.0) tilt @@ -508,7 +523,7 @@ GEM atlassian-jwt multipart-post oauth (~> 0.5, >= 0.5.0) - jmespath (1.3.1) + jmespath (1.4.0) js_regex (3.1.1) character_set (~> 1.1) regexp_parser (~> 1.1) @@ -560,15 +575,20 @@ GEM xml-simple licensee (8.9.2) rugged (~> 0.24) + listen (3.1.5) + rb-fsevent (~> 0.9, >= 0.9.4) + rb-inotify (~> 0.9, >= 0.9.7) + ruby_dep (~> 1.2) locale (2.1.2) lograge (0.10.0) actionpack (>= 4) activesupport (>= 4) railties (>= 4) request_store (~> 1.0) - loofah (2.3.0) + loofah (2.3.1) crass (~> 1.0.2) nokogiri (>= 1.5.9) + lumberjack (1.0.13) mail (2.7.1) mini_mime (>= 0.1.1) mail_room (0.9.1) @@ -584,7 +604,7 @@ GEM mime-types-data (3.2019.0331) mimemagic (0.3.2) mini_magick (4.9.5) - mini_mime (1.0.1) + mini_mime (1.0.2) mini_portile2 (2.4.0) minitest (5.11.3) msgpack (1.3.1) @@ -597,16 +617,20 @@ GEM mustermann (~> 1.0.0) nakayoshi_fork (0.0.4) nap (1.1.0) + nenv (0.3.0) net-ldap (0.16.0) net-ntp (2.1.3) net-ssh (5.2.0) netrc (0.11.0) nio4r (2.3.1) no_proxy_fix (0.1.2) - nokogiri (1.10.4) + nokogiri (1.10.5) mini_portile2 (~> 2.4.0) nokogumbo (1.5.0) nokogiri + notiffany (0.1.3) + nenv (~> 0.1) + shellany (~> 0.0) numerizer (0.1.1) oauth (0.5.4) oauth2 (1.4.1) @@ -675,12 +699,12 @@ GEM activesupport nokogiri (>= 1.4.4) omniauth (~> 1.0) - omniauth_openid_connect (0.3.1) + omniauth_openid_connect (0.3.3) addressable (~> 2.5) - omniauth (~> 1.3) + omniauth (~> 1.9) openid_connect (~> 1.1) open4 (1.3.4) - openid_connect (1.1.6) + openid_connect (1.1.8) activemodel attr_required (>= 1.0.0) json-jwt (>= 1.5.0) @@ -703,12 +727,12 @@ GEM pg (1.1.4) po_to_json (1.0.1) json (>= 1.6.0) - premailer (1.10.4) + premailer (1.11.1) addressable - css_parser (>= 1.4.10) + css_parser (>= 1.6.0) htmlentities (>= 4.0.0) - premailer-rails (1.9.7) - actionmailer (>= 3, < 6) + premailer-rails (1.10.3) + actionmailer (>= 3) premailer (~> 1.7, >= 1.7.9) proc_to_ast (0.1.0) coderay @@ -724,7 +748,7 @@ GEM pry (~> 0.10) pry-rails (0.3.6) pry (>= 0.10.4) - public_suffix (3.1.0) + public_suffix (3.1.1) puma (3.12.0) puma_worker_killer (0.1.0) get_process_mem (~> 0.2) @@ -734,8 +758,8 @@ GEM rack (2.0.7) rack-accept (0.4.5) rack (>= 0.4) - rack-attack (4.4.1) - rack + rack-attack (6.2.0) + rack (>= 1.0, < 3) rack-cors (1.0.2) rack-oauth2 (1.9.3) activesupport @@ -763,10 +787,10 @@ GEM bundler (>= 1.3.0) railties (= 5.2.3) sprockets-rails (>= 2.0.0) - rails-controller-testing (1.0.2) - actionpack (~> 5.x, >= 5.0.1) - actionview (~> 5.x, >= 5.0.1) - activesupport (~> 5.x) + rails-controller-testing (1.0.4) + actionpack (>= 5.0.1.x) + actionview (>= 5.0.1.x) + activesupport (>= 5.0.1.x) rails-dom-testing (2.0.3) activesupport (>= 4.2.0) nokogiri (>= 1.6) @@ -798,25 +822,25 @@ GEM recaptcha (4.13.1) json recursive-open-struct (1.1.0) - redis (4.1.2) - redis-actionpack (5.0.2) - actionpack (>= 4.0, < 6) + redis (4.1.3) + redis-actionpack (5.1.0) + actionpack (>= 4.0, < 7) redis-rack (>= 1, < 3) redis-store (>= 1.1.0, < 2) - redis-activesupport (5.0.7) - activesupport (>= 3, < 6) + redis-activesupport (5.2.0) + activesupport (>= 3, < 7) redis-store (>= 1.3, < 2) redis-namespace (1.6.0) redis (>= 3.0.4) - redis-rack (2.0.5) + redis-rack (2.0.6) rack (>= 1.5, < 3) redis-store (>= 1.2, < 2) redis-rails (5.0.2) redis-actionpack (>= 5.0, < 6) redis-activesupport (>= 5.0, < 6) redis-store (>= 1.2, < 2) - redis-store (1.6.0) - redis (>= 2.2, < 5) + redis-store (1.8.1) + redis (>= 4, < 5) regexp_parser (1.5.1) regexp_property_values (0.3.4) representable (3.0.4) @@ -824,9 +848,9 @@ GEM declarative-option (< 0.2.0) uber (< 0.2.0) request_store (1.3.1) - responders (2.4.1) - actionpack (>= 4.2.0, < 6.0) - railties (>= 4.2.0, < 6.0) + responders (3.0.0) + actionpack (>= 5.0) + railties (>= 5.0) rest-client (2.0.2) http-cookie (>= 1.0.2, < 2.0) mime-types (>= 1.16, < 4.0) @@ -897,11 +921,12 @@ GEM ruby-progressbar (1.10.1) ruby-saml (1.7.2) nokogiri (>= 1.5.10) + ruby_dep (1.5.0) ruby_parser (3.13.1) sexp_processor (~> 4.9) rubyntlm (0.6.2) rubypants (0.2.0) - rubyzip (1.2.2) + rubyzip (1.3.0) rugged (0.28.3.1) safe_yaml (1.0.4) sanitize (4.6.6) @@ -938,6 +963,7 @@ GEM faraday (>= 0.7.6, < 1.0) settingslogic (2.0.9) sexp_processor (4.12.0) + shellany (0.0.1) shoulda-matchers (4.0.1) activesupport (>= 4.2.0) sidekiq (5.2.7) @@ -978,11 +1004,11 @@ GEM sshkey (2.0.0) stackprof (0.2.10) state_machines (0.5.0) - state_machines-activemodel (0.5.1) - activemodel (>= 4.1, < 6.0) + state_machines-activemodel (0.7.1) + activemodel (>= 4.1) state_machines (>= 0.5.0) - state_machines-activerecord (0.5.1) - activerecord (>= 4.1, < 6.0) + state_machines-activerecord (0.6.0) + activerecord (>= 4.1) state_machines-activemodel (>= 0.5.0) swd (1.1.2) activesupport (>= 3) @@ -1127,12 +1153,13 @@ DEPENDENCIES creole (~> 0.5.0) danger (~> 6.0) database_cleaner (~> 1.7.0) - deckar01-task_list (= 2.2.0) - default_value_for (~> 3.2.0) + deckar01-task_list (= 2.2.1) + default_value_for (~> 3.3.0) derailed_benchmarks device_detector devise (~> 4.6) devise-two-factor (~> 3.0.0) + diff_match_patch (~> 0.1.0) diffy (~> 3.1.0) discordrb-webhooks-blackst0ne (~> 3.3) doorkeeper (~> 4.3) @@ -1149,9 +1176,9 @@ DEPENDENCIES faraday_middleware-aws-signers-v4 fast_blank ffaker (~> 2.10) - flipper (~> 0.13.0) - flipper-active_record (~> 0.13.0) - flipper-active_support_cache_store (~> 0.13.0) + flipper (~> 0.17.1) + flipper-active_record (~> 0.17.1) + flipper-active_support_cache_store (~> 0.17.1) flowdock (~> 0.7) fog-aliyun (~> 0.3) fog-aws (~> 3.5) @@ -1161,14 +1188,13 @@ DEPENDENCIES fog-openstack (~> 1.0) fog-rackspace (~> 0.1.1) font-awesome-rails (~> 4.7) - foreman (~> 0.84.0) fugit (~> 1.2.1) fuubar (~> 2.2.0) gemojione (~> 3.3) gettext (~> 3.2.2) gettext_i18n_rails (~> 1.8.0) gettext_i18n_rails_js (~> 1.3) - gitaly (~> 1.65.0) + gitaly (~> 1.70.0) github-markup (~> 1.7.0) gitlab-labkit (~> 0.5) gitlab-license (~> 1.0) @@ -1181,8 +1207,8 @@ DEPENDENCIES gitlab_omniauth-ldap (~> 2.1.1) gon (~> 6.2) google-api-client (~> 0.23) - google-protobuf (~> 3.7.1) - gpgme (~> 2.0.18) + google-protobuf (~> 3.8.0) + gpgme (~> 2.0.19) grape (~> 1.1.0) grape-entity (~> 0.7.1) grape-path-helpers (~> 1.1) @@ -1190,8 +1216,9 @@ DEPENDENCIES graphiql-rails (~> 1.4.10) graphql (~> 1.9.11) graphql-docs (~> 1.6.0) - grpc (~> 1.19.0) + grpc (~> 1.24.0) gssapi + guard-rspec haml_lint (~> 0.31.0) hamlit (~> 2.8.8) hangouts-chat (~> 0.0.5) @@ -1226,7 +1253,7 @@ DEPENDENCIES net-ldap net-ntp net-ssh (~> 5.2) - nokogiri (~> 1.10.4) + nokogiri (~> 1.10.5) oauth2 (~> 1.4) octokit (~> 4.9) omniauth (~> 1.8) @@ -1246,17 +1273,17 @@ DEPENDENCIES omniauth-twitter (~> 1.4) omniauth-ultraauth (~> 0.0.2) omniauth_crowd (~> 2.2.0) - omniauth_openid_connect (~> 0.3.1) + omniauth_openid_connect (~> 0.3.3) org-ruby (~> 0.9.12) pg (~> 1.1) - premailer-rails (~> 1.9.7) + premailer-rails (~> 1.10.3) prometheus-client-mmap (~> 0.9.10) pry-byebug (~> 3.5.1) pry-rails (~> 0.3.4) puma (~> 3.12) puma_worker_killer rack (~> 2.0.7) - rack-attack (~> 4.4.1) + rack-attack (~> 6.2.0) rack-cors (~> 1.0.0) rack-oauth2 (~> 1.9.3) rack-proxy (~> 0.6.0) @@ -1275,7 +1302,8 @@ DEPENDENCIES redis-namespace (~> 1.6.0) redis-rails (~> 5.0.2) request_store (~> 1.3) - responders (~> 2.0) + responders (~> 3.0) + retriable (~> 3.1.2) rouge (~> 3.11.0) rqrcode-rails3 (~> 0.1.7) rspec-parameterized @@ -1291,7 +1319,7 @@ DEPENDENCIES ruby-prof (~> 1.0.0) ruby-progressbar ruby_parser (~> 3.8) - rubyzip (~> 1.2.2) + rubyzip (~> 1.3.0) rugged (~> 0.28) sanitize (~> 4.6) sassc-rails (~> 2.1.0) @@ -1312,7 +1340,7 @@ DEPENDENCIES sprockets (~> 3.7.0) sshkey (~> 2.0) stackprof (~> 0.2.10) - state_machines-activerecord (~> 0.5.1) + state_machines-activerecord (~> 0.6.0) sys-filesystem (~> 1.1.6) test-prof (~> 0.10.0) thin (~> 1.7.0) diff --git a/pkgs/applications/version-management/gitlab/rubyEnv/gemset.nix b/pkgs/applications/version-management/gitlab/rubyEnv/gemset.nix index 84a984ea2b3..dc9c8128d2f 100644 --- a/pkgs/applications/version-management/gitlab/rubyEnv/gemset.nix +++ b/pkgs/applications/version-management/gitlab/rubyEnv/gemset.nix @@ -146,10 +146,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0hl52pjgfzy3acdwnbxfqy08m808vlv9dmsyp03d5x7x0y499kvl"; + sha256 = "1nvhd986xa6llyjnhikq4h1nrcf5b9r9s11if25qsj8358inrpga"; type = "gem"; }; - version = "6.0.0"; + version = "6.5.0"; }; adamantium = { dependencies = ["ice_nine" "memoizable"]; @@ -309,16 +309,26 @@ }; version = "1.8.0"; }; + aws-eventstream = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "100g77a5ixg4p5zwq77f28n2pdkk0y481f7v83qrlmnj22318qq6"; + type = "gem"; + }; + version = "1.0.3"; + }; aws-sdk = { dependencies = ["aws-sdk-resources"]; groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "03r754cqa0jayf1nxpcmp1anaypxwpcjyjaq5cz7i04l9jdxvsnn"; + sha256 = "1yvl9bxzaxgcyzix2yw46cgll9nl0xfg5qx1j6y3xc1i78rk7vy0"; type = "gem"; }; - version = "2.9.32"; + version = "2.11.374"; }; aws-sdk-core = { dependencies = ["aws-sigv4" "jmespath"]; @@ -326,10 +336,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1pq09wwb74y4m5adk4hi4zlz05q6sxjxij6g71v6nkd0z83hi34x"; + sha256 = "1d7nw1jihv7rglcmkd3hhidjflbzq5ik63n43q27pmx8ki108rd9"; type = "gem"; }; - version = "2.9.32"; + version = "2.11.374"; }; aws-sdk-resources = { dependencies = ["aws-sdk-core"]; @@ -337,20 +347,21 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "15m56k12x9gzkcyhwrab1qhi3wqla0qmv84dkqcjwp44d7c2xjyi"; + sha256 = "0qx2a67vsw8rz1y0m04f97p1q4zx7miy06a5ck78hm77nvsigjj4"; type = "gem"; }; - version = "2.9.32"; + version = "2.11.374"; }; aws-sigv4 = { + dependencies = ["aws-eventstream"]; groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0cnrfxbaxn86qrxhfidg10f89ka1hddihakdhcvnri0dljaw7dsz"; + sha256 = "1dfc8i5cxjwlvi4b665lbpbwvks8a6wfy3vfmwr3pjdmxwdmc2cs"; type = "gem"; }; - version = "1.0.0"; + version = "1.1.0"; }; axiom-types = { dependencies = ["descendants_tracker" "ice_nine" "thread_safe"]; @@ -814,10 +825,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0bpxzy6gjw9ggjynlxschbfsgmx8lv3zw1azkjvnb8b9i895dqfi"; + sha256 = "030sc98kjrb36rh7g21qsbdfxrj6knsjkx0mn3b7gig8zknwhp2f"; type = "gem"; }; - version = "1.0.4"; + version = "1.0.5"; }; creole = { groups = ["default"]; @@ -835,10 +846,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0jlr17cn044yaq4l3d9p42g3bghnamwsprq9c39xn6pxjrn5k1hy"; + sha256 = "1y4vc018b5mzp7winw4pbb22jk0dpxp22pzzxq7w0rgvfxzi89pd"; type = "gem"; }; - version = "1.5.0"; + version = "1.7.0"; }; daemons = { groups = ["default" "development"]; @@ -901,10 +912,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0s637v5pi5ipmv0gn9g2wwjpxdm27dvppfjd8ml0dc1m0jsm7964"; + sha256 = "09k7rlxsl7pd5kn3wyswgqi0hhbmlj40b66l4mf8v9mqf3c7v0yk"; type = "gem"; }; - version = "2.2.0"; + version = "2.2.1"; }; declarative = { groups = ["default"]; @@ -932,10 +943,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1xj9d1y2fk3kxfm1kyiwasjpw6r1w7c1xjx26sm3c33xhmz57fla"; + sha256 = "08hwnnqm3bxd4n627isliq79zysdlmfkf813403v0b4mkhika5my"; type = "gem"; }; - version = "3.2.0"; + version = "3.3.0"; }; derailed_benchmarks = { dependencies = ["benchmark-ips" "get_process_mem" "heapy" "memory_profiler" "rack" "rake" "thor"]; @@ -1001,6 +1012,16 @@ }; version = "1.3"; }; + diff_match_patch = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "03n4g4w2pwiygmqq5lfhqrpbs9g6kv0jhb3vrffz3vgaryzmfq5k"; + type = "gem"; + }; + version = "0.1.0"; + }; diffy = { groups = ["default"]; platforms = []; @@ -1374,10 +1395,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1pdj9y3k6padiicfraxw9ibx9fm8yi2ihh608736lq5nnbf3k6gw"; + sha256 = "01gbn1qmcvn49gjcbvd5fga57qc8l3915kb04ikkffvb6n09q7f7"; type = "gem"; }; - version = "0.13.0"; + version = "0.17.1"; }; flipper-active_record = { dependencies = ["activerecord" "flipper"]; @@ -1385,10 +1406,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0rgm4h5h6xcbf17z47sw8ancaxva8x4hwlxmyqpm0vzj1pnc47c1"; + sha256 = "154q9xajqs64gxa9fv4hwpad44x3rmwgpldrb941i8wi37dpzskg"; type = "gem"; }; - version = "0.13.0"; + version = "0.17.1"; }; flipper-active_support_cache_store = { dependencies = ["activesupport" "flipper"]; @@ -1396,10 +1417,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0zpikmfhadb7l1ny6xbhk5d4840im6yq0wvfsnlw718spxi4ccgk"; + sha256 = "0mkbyn3mx3f411x4z1l1djc9vix3wrfzd5rhrmxb83iqp60r42hg"; type = "gem"; }; - version = "0.13.0"; + version = "0.17.1"; }; flowdock = { dependencies = ["httparty" "multi_json"]; @@ -1517,21 +1538,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "11mf7bk2737pyxjwba3a9lpgcxzbp0vgq01n2dn30774zysc90hj"; + sha256 = "0a32q69rdsdw9zhmf2cflvvnikg20amidhn40sv2afw2qk91fcrz"; type = "gem"; }; - version = "4.7.0.4"; - }; - foreman = { - dependencies = ["thor"]; - groups = ["development"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "06mq39lpmc17bxzlwhad9d8i0lcnbb08xr18smh2x79mm631wsw0"; - type = "gem"; - }; - version = "0.84.0"; + version = "4.7.0.5"; }; formatador = { groups = ["default"]; @@ -1645,10 +1655,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0h8jzwifqgkrgh9d05g0vsdkyrnk75i53lmm3pfp9rj47gvn1z1j"; + sha256 = "0b705d2fmdisirf3hydakswdr8jq786wbqn053gvxgssrwcdlrq3"; type = "gem"; }; - version = "1.65.0"; + version = "1.70.0"; }; github-markup = { groups = ["default"]; @@ -1666,10 +1676,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1j06gl4ksd83rycg3fb46bb77iw74i1ivs5li6pyf5klrxjq8k3h"; + sha256 = "0r2zkxkj2l78c6qgr6k9lgcp7w6x7r703259rbsbrg7cfnjm43b7"; type = "gem"; }; - version = "0.5.2"; + version = "0.7.0"; }; gitlab-license = { groups = ["default"]; @@ -1794,10 +1804,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "04988m3hmllg4sl4syjb35x0wzsg7rj1nmvhx3d9ihml22w76gb2"; + sha256 = "0by3289irdklb9gjqw41fq6mg6yja3iyzh99dj8p8z9l4brllqn4"; type = "gem"; }; - version = "3.7.1"; + version = "3.8.0"; }; googleapis-common-protos-types = { dependencies = ["google-protobuf"]; @@ -1827,10 +1837,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "12fqirxr964mc8jwsfl5nif6q4wcckrmj7w4c9ci4xg9xy2b9v6m"; + sha256 = "0jbqajngi5ndqfarw9dxkhbphva0j71jav5wfym3fsiisvk5gg6p"; type = "gem"; }; - version = "2.0.18"; + version = "2.0.19"; }; grape = { dependencies = ["activesupport" "builder" "mustermann-grape" "rack" "rack-accept" "virtus"]; @@ -1914,10 +1924,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1rdywzism5vxz8pnml6xjb9f19diclyy74014z69q01jzqwi1wgs"; + sha256 = "18wikj9qd4jb4lks55cs2cf3q7fifnanm9z9ywnxhpj57vbnilpf"; type = "gem"; }; - version = "1.19.0"; + version = "1.24.0"; }; gssapi = { dependencies = ["ffi"]; @@ -1930,6 +1940,38 @@ }; version = "1.2.0"; }; + guard = { + dependencies = ["formatador" "listen" "lumberjack" "nenv" "notiffany" "pry" "shellany" "thor"]; + groups = ["default" "test"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "000hn5cdqz3wl99b245q958c5byi2dlsqi814q5gmyljv7i47zwf"; + type = "gem"; + }; + version = "2.15.1"; + }; + guard-compat = { + groups = ["default" "test"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1zj6sr1k8w59mmi27rsii0v8xyy2rnsi09nqvwpgj1q10yq1mlis"; + type = "gem"; + }; + version = "1.2.1"; + }; + guard-rspec = { + dependencies = ["guard" "guard-compat" "rspec"]; + groups = ["test"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1jkm5xp90gm4c5s51pmf92i9hc10gslwwic6mvk72g0yplya0yx4"; + type = "gem"; + }; + version = "4.7.3"; + }; haml = { dependencies = ["temple" "tilt"]; groups = ["default" "development" "test"]; @@ -2241,10 +2283,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "07w8ipjg59qavijq59hl82zs74jf3jsp7vxl9q3a2d0wpv5akz3y"; + sha256 = "1d4wac0dcd1jf6kc57891glih9w57552zgqswgy74d1xhgnk0ngf"; type = "gem"; }; - version = "1.3.1"; + version = "1.4.0"; }; js_regex = { dependencies = ["character_set" "regexp_parser" "regexp_property_values"]; @@ -2450,6 +2492,17 @@ }; version = "8.9.2"; }; + listen = { + dependencies = ["rb-fsevent" "rb-inotify" "ruby_dep"]; + groups = ["default" "test"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "01v5mrnfqm6sgm8xn2v5swxsn1wlmq7rzh2i48d4jzjsc7qvb6mx"; + type = "gem"; + }; + version = "3.1.5"; + }; locale = { groups = ["default" "development"]; platforms = []; @@ -2477,10 +2530,20 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "06kfq90vi38gv6i128f4zg462kj32szs5vsgm25hxgw9zd12pj9x"; + sha256 = "0npqav026zd7r4qdidq9x5nxcp2dzg71bnp421xxx7sngbxf2xbd"; type = "gem"; }; - version = "2.3.0"; + version = "2.3.1"; + }; + lumberjack = { + groups = ["default" "test"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "06im7gcg42x77yhz2w5da2ly9xz0n0c36y5ks7xs53v0l9g0vf5n"; + type = "gem"; + }; + version = "1.0.13"; }; mail = { dependencies = ["mini_mime"]; @@ -2605,10 +2668,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1q4pshq387lzv9m39jv32vwb8wrq3wc4jwgl4jk209r4l33v09d3"; + sha256 = "1axm0rxyx3ss93wbmfkm78a6x03l8y4qy60rhkkiq0aza0vwq3ha"; type = "gem"; }; - version = "1.0.1"; + version = "1.0.2"; }; mini_portile2 = { groups = ["default" "development" "test"]; @@ -2721,6 +2784,16 @@ }; version = "1.1.0"; }; + nenv = { + groups = ["default" "test"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0r97jzknll9bhd8yyg2bngnnkj8rjhal667n7d32h8h7ny7nvpnr"; + type = "gem"; + }; + version = "0.3.0"; + }; net-ldap = { groups = ["default"]; platforms = []; @@ -2787,10 +2860,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0nmdrqqz1gs0fwkgzxjl4wr554gr8dc1fkrqjc2jpsvwgm41rygv"; + sha256 = "185g3dwba73jqxjr94bd2zk6fil6n9hmcfnfyzh3p1w47vm296r7"; type = "gem"; }; - version = "1.10.4"; + version = "1.10.5"; }; nokogumbo = { dependencies = ["nokogiri"]; @@ -2803,6 +2876,17 @@ }; version = "1.5.0"; }; + notiffany = { + dependencies = ["nenv" "shellany"]; + groups = ["default" "test"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0f47h3bmg1apr4x51szqfv3rh2vq58z3grh4w02cp3bzbdh6jxnk"; + type = "gem"; + }; + version = "0.1.3"; + }; numerizer = { groups = ["default"]; platforms = []; @@ -3071,10 +3155,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0ja7cjlm4z0k0pwwy64djl58pay3lzkw7im565fybs4a8q4wmacb"; + sha256 = "0awybp2jnai0w2qfgqnr3f478g3nbg5r0vcm6pa5g8k5f4rs19qr"; type = "gem"; }; - version = "0.3.1"; + version = "0.3.3"; }; open4 = { groups = ["default" "development"]; @@ -3092,10 +3176,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1r13bv18nyvw0g1nw3fzffvv2si99zj24w0k5zgawf4q6nn5f7vd"; + sha256 = "0r50vwf9hsf6r8gx5mwqs3w3w92l864ikiz9d0fcibqsr1489pbg"; type = "gem"; }; - version = "1.1.6"; + version = "1.1.8"; }; opentracing = { groups = ["default"]; @@ -3206,10 +3290,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "10w6f7r6snpkcnv3byxma9b08lyqzcfxkm083scb2dr2ly4xkzyf"; + sha256 = "1xrhmialxn5vlp1nmf40a4db9gji4h2wbzd7f43sz64z8lvrjj6h"; type = "gem"; }; - version = "1.10.4"; + version = "1.11.1"; }; premailer-rails = { dependencies = ["actionmailer" "premailer"]; @@ -3217,10 +3301,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "05czxmx6hnykg6g23hy2ww2bf86a69njbi02sv7lrds4w776jhim"; + sha256 = "0bqi7d4f15vy3f1g0xb3bxmncfbzv9dd3ilhqj0plvw64xqbkp3w"; type = "gem"; }; - version = "1.9.7"; + version = "1.10.3"; }; proc_to_ast = { dependencies = ["coderay" "parser" "unparser"]; @@ -3299,10 +3383,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1c7c5xxkx91hwj4572hbnyvxmydb90q69wlpr2l0dxrmwx2p365l"; + sha256 = "0g9ds2ffzljl6jjmkjffwxc1z6lh5nkqqmhhkxjk71q5ggv0rkpm"; type = "gem"; }; - version = "3.1.0"; + version = "3.1.1"; }; puma = { groups = ["puma"]; @@ -3372,10 +3456,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1czx68p70x98y21dkdndsb64lrxf9qrv09wl1dbcxrypcjnpsdl1"; + sha256 = "1sqjqwa18c0l59zdymcvvvnh5nk3pjggnzaydb2q1qbrk3rypcnq"; type = "gem"; }; - version = "4.4.1"; + version = "6.2.0"; }; rack-cors = { groups = ["default"]; @@ -3458,10 +3542,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "16kdkk73mhhs73iz3i1i0ryjm84dadiyh817b3nh8acdi490jyhy"; + sha256 = "1m1rklj6pvzi4fydxcmcv4q0xd7913hhhw1hw530nfz1wkl7vjlf"; type = "gem"; }; - version = "1.0.2"; + version = "1.0.4"; }; rails-dom-testing = { dependencies = ["activesupport" "nokogiri"]; @@ -3640,10 +3724,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1mymdx7s5sr4mablklaipz679ckczsiigswm1g2v5mc93yj5amw3"; + sha256 = "08v2y91q1pmv12g9zsvwj66w3s8j9d82yrmxgyv4y4gz380j3wyh"; type = "gem"; }; - version = "4.1.2"; + version = "4.1.3"; }; redis-actionpack = { dependencies = ["actionpack" "redis-rack" "redis-store"]; @@ -3651,10 +3735,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "15k41gz7nygd4yydk2yd25gghya1j7q6zifk4mdrra6bwnwjbm63"; + sha256 = "1hvai5ygkyii9wq8h98wim8shgrm7vkv0js62zpm85vdl1xzvphz"; type = "gem"; }; - version = "5.0.2"; + version = "5.1.0"; }; redis-activesupport = { dependencies = ["activesupport" "redis-store"]; @@ -3662,10 +3746,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0y1df62gpqgy0yrlmgl05rp4kb0xvn0kylprhv1k32bs33dgpv62"; + sha256 = "14a3z8810j02ysvg53f3mvcfb4rw34m91yfd19zy9y5lb3yv2g59"; type = "gem"; }; - version = "5.0.7"; + version = "5.2.0"; }; redis-namespace = { dependencies = ["redis"]; @@ -3684,10 +3768,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "03xgdmq4fh187aqlh8z05idbxrmgddcarlb8x1kw4wjfcsf5afqi"; + sha256 = "1pa19ydbk0l6wilwbxcjn6knfs4ffgj0rhaaldrlhf76pjgkaiqb"; type = "gem"; }; - version = "2.0.5"; + version = "2.0.6"; }; redis-rails = { dependencies = ["redis-actionpack" "redis-activesupport" "redis-store"]; @@ -3706,10 +3790,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1mrcnjgkbmx1zf569mly82agdizqayjvnp2k6055k1iy07in3j8b"; + sha256 = "1isqzzds9kszc2nn8jiy8ikry01qspn7637ba9z2k6sk7vky46d9"; type = "gem"; }; - version = "1.6.0"; + version = "1.8.1"; }; regexp_parser = { groups = ["default" "development" "test"]; @@ -3758,10 +3842,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "18lqbiyc7234vd6iwxia5yvvzg6bdvdwl2nm4a5y7ia5fxjl3kqm"; + sha256 = "1p7pqcfq33q1z4xlp4qm94w4h3fzc1yvr3cny16d00i8b20v4rx2"; type = "gem"; }; - version = "2.4.1"; + version = "3.0.0"; }; rest-client = { dependencies = ["http-cookie" "mime-types" "netrc"]; @@ -4052,6 +4136,16 @@ }; version = "1.7.2"; }; + ruby_dep = { + groups = ["default" "test"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1c1bkl97i9mkcvkn1jks346ksnvnnp84cs22gwl0vd7radybrgy5"; + type = "gem"; + }; + version = "1.5.0"; + }; ruby_parser = { dependencies = ["sexp_processor"]; groups = ["default"]; @@ -4084,14 +4178,14 @@ version = "0.2.0"; }; rubyzip = { - groups = ["default" "development" "test"]; + groups = ["default" "development" "omnibus" "test"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1n1lb2sdwh9h27y244hxzg1lrxxg2m53pk1vq7p33bna003qkyrj"; + sha256 = "1qxc2zxwwipm6kviiar4gfhcakpx1jdcs89v6lvzivn5hq1xk78l"; type = "gem"; }; - version = "1.2.2"; + version = "1.3.0"; }; rugged = { groups = ["default"]; @@ -4243,6 +4337,16 @@ }; version = "4.12.0"; }; + shellany = { + groups = ["default" "test"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1ryyzrj1kxmnpdzhlv4ys3dnl2r5r3d2rs2jwzbnd1v96a8pl4hf"; + type = "gem"; + }; + version = "0.0.1"; + }; shoulda-matchers = { dependencies = ["activesupport"]; groups = ["test"]; @@ -4439,10 +4543,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0chhm5hs1y83dq8haff10m66r3yrm7jab35r9xg6adn6qd8ynv2l"; + sha256 = "05c2dw3115zj3pmyyqh2iypc7afj8ibhrghisg0d61z7gzmir1rd"; type = "gem"; }; - version = "0.5.1"; + version = "0.7.1"; }; state_machines-activerecord = { dependencies = ["activerecord" "state_machines-activemodel"]; @@ -4450,10 +4554,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "00h07gd4kb22ahgv61r8zca9hqxaw44fnk2sc28j00c1nmwsw6r3"; + sha256 = "12g7yqy11fpfiprzc86pwa9jjky1h3haxj37kg47467fgg43p511"; type = "gem"; }; - version = "0.5.1"; + version = "0.6.0"; }; swd = { dependencies = ["activesupport" "attr_required" "httpclient"]; diff --git a/pkgs/applications/version-management/gitlab/yarnPkgs.nix b/pkgs/applications/version-management/gitlab/yarnPkgs.nix index cff2603129d..04c0b44f4ac 100644 --- a/pkgs/applications/version-management/gitlab/yarnPkgs.nix +++ b/pkgs/applications/version-management/gitlab/yarnPkgs.nix @@ -42,14 +42,6 @@ }; } { - name = "_babel_helper_builder_react_jsx___helper_builder_react_jsx_7.3.0.tgz"; - path = fetchurl { - name = "_babel_helper_builder_react_jsx___helper_builder_react_jsx_7.3.0.tgz"; - url = "https://registry.yarnpkg.com/@babel/helper-builder-react-jsx/-/helper-builder-react-jsx-7.3.0.tgz"; - sha1 = "a1ac95a5d2b3e88ae5e54846bf462eeb81b318a4"; - }; - } - { name = "_babel_helper_call_delegate___helper_call_delegate_7.4.4.tgz"; path = fetchurl { name = "_babel_helper_call_delegate___helper_call_delegate_7.4.4.tgz"; @@ -210,14 +202,6 @@ }; } { - name = "_babel_parser___parser_7.1.3.tgz"; - path = fetchurl { - name = "_babel_parser___parser_7.1.3.tgz"; - url = "https://registry.yarnpkg.com/@babel/parser/-/parser-7.1.3.tgz"; - sha1 = "2c92469bac2b7fbff810b67fca07bd138b48af77"; - }; - } - { name = "_babel_parser___parser_7.6.2.tgz"; path = fetchurl { name = "_babel_parser___parser_7.6.2.tgz"; @@ -242,22 +226,6 @@ }; } { - name = "_babel_plugin_proposal_decorators___plugin_proposal_decorators_7.4.4.tgz"; - path = fetchurl { - name = "_babel_plugin_proposal_decorators___plugin_proposal_decorators_7.4.4.tgz"; - url = "https://registry.yarnpkg.com/@babel/plugin-proposal-decorators/-/plugin-proposal-decorators-7.4.4.tgz"; - sha1 = "de9b2a1a8ab0196f378e2a82f10b6e2a36f21cc0"; - }; - } - { - name = "_babel_plugin_proposal_do_expressions___plugin_proposal_do_expressions_7.5.0.tgz"; - path = fetchurl { - name = "_babel_plugin_proposal_do_expressions___plugin_proposal_do_expressions_7.5.0.tgz"; - url = "https://registry.yarnpkg.com/@babel/plugin-proposal-do-expressions/-/plugin-proposal-do-expressions-7.5.0.tgz"; - sha1 = "ceb594d4a618545b00aa0b5cd61cad4aaaeb7a5a"; - }; - } - { name = "_babel_plugin_proposal_dynamic_import___plugin_proposal_dynamic_import_7.5.0.tgz"; path = fetchurl { name = "_babel_plugin_proposal_dynamic_import___plugin_proposal_dynamic_import_7.5.0.tgz"; @@ -266,38 +234,6 @@ }; } { - name = "_babel_plugin_proposal_export_default_from___plugin_proposal_export_default_from_7.5.2.tgz"; - path = fetchurl { - name = "_babel_plugin_proposal_export_default_from___plugin_proposal_export_default_from_7.5.2.tgz"; - url = "https://registry.yarnpkg.com/@babel/plugin-proposal-export-default-from/-/plugin-proposal-export-default-from-7.5.2.tgz"; - sha1 = "2c0ac2dcc36e3b2443fead2c3c5fc796fb1b5145"; - }; - } - { - name = "_babel_plugin_proposal_export_namespace_from___plugin_proposal_export_namespace_from_7.5.2.tgz"; - path = fetchurl { - name = "_babel_plugin_proposal_export_namespace_from___plugin_proposal_export_namespace_from_7.5.2.tgz"; - url = "https://registry.yarnpkg.com/@babel/plugin-proposal-export-namespace-from/-/plugin-proposal-export-namespace-from-7.5.2.tgz"; - sha1 = "ccd5ed05b06d700688ff1db01a9dd27155e0d2a0"; - }; - } - { - name = "_babel_plugin_proposal_function_bind___plugin_proposal_function_bind_7.2.0.tgz"; - path = fetchurl { - name = "_babel_plugin_proposal_function_bind___plugin_proposal_function_bind_7.2.0.tgz"; - url = "https://registry.yarnpkg.com/@babel/plugin-proposal-function-bind/-/plugin-proposal-function-bind-7.2.0.tgz"; - sha1 = "94dc2cdc505cafc4e225c0014335a01648056bf7"; - }; - } - { - name = "_babel_plugin_proposal_function_sent___plugin_proposal_function_sent_7.5.0.tgz"; - path = fetchurl { - name = "_babel_plugin_proposal_function_sent___plugin_proposal_function_sent_7.5.0.tgz"; - url = "https://registry.yarnpkg.com/@babel/plugin-proposal-function-sent/-/plugin-proposal-function-sent-7.5.0.tgz"; - sha1 = "39233aa801145e7d8072077cdb2d25f781c1ffd7"; - }; - } - { name = "_babel_plugin_proposal_json_strings___plugin_proposal_json_strings_7.2.0.tgz"; path = fetchurl { name = "_babel_plugin_proposal_json_strings___plugin_proposal_json_strings_7.2.0.tgz"; @@ -306,30 +242,6 @@ }; } { - name = "_babel_plugin_proposal_logical_assignment_operators___plugin_proposal_logical_assignment_operators_7.2.0.tgz"; - path = fetchurl { - name = "_babel_plugin_proposal_logical_assignment_operators___plugin_proposal_logical_assignment_operators_7.2.0.tgz"; - url = "https://registry.yarnpkg.com/@babel/plugin-proposal-logical-assignment-operators/-/plugin-proposal-logical-assignment-operators-7.2.0.tgz"; - sha1 = "8a5cea6c42a7c87446959e02fff5fad012c56f57"; - }; - } - { - name = "_babel_plugin_proposal_nullish_coalescing_operator___plugin_proposal_nullish_coalescing_operator_7.4.4.tgz"; - path = fetchurl { - name = "_babel_plugin_proposal_nullish_coalescing_operator___plugin_proposal_nullish_coalescing_operator_7.4.4.tgz"; - url = "https://registry.yarnpkg.com/@babel/plugin-proposal-nullish-coalescing-operator/-/plugin-proposal-nullish-coalescing-operator-7.4.4.tgz"; - sha1 = "41c360d59481d88e0ce3a3f837df10121a769b39"; - }; - } - { - name = "_babel_plugin_proposal_numeric_separator___plugin_proposal_numeric_separator_7.2.0.tgz"; - path = fetchurl { - name = "_babel_plugin_proposal_numeric_separator___plugin_proposal_numeric_separator_7.2.0.tgz"; - url = "https://registry.yarnpkg.com/@babel/plugin-proposal-numeric-separator/-/plugin-proposal-numeric-separator-7.2.0.tgz"; - sha1 = "646854daf4cd22fd6733f6076013a936310443ac"; - }; - } - { name = "_babel_plugin_proposal_object_rest_spread___plugin_proposal_object_rest_spread_7.6.2.tgz"; path = fetchurl { name = "_babel_plugin_proposal_object_rest_spread___plugin_proposal_object_rest_spread_7.6.2.tgz"; @@ -346,22 +258,6 @@ }; } { - name = "_babel_plugin_proposal_optional_chaining___plugin_proposal_optional_chaining_7.2.0.tgz"; - path = fetchurl { - name = "_babel_plugin_proposal_optional_chaining___plugin_proposal_optional_chaining_7.2.0.tgz"; - url = "https://registry.yarnpkg.com/@babel/plugin-proposal-optional-chaining/-/plugin-proposal-optional-chaining-7.2.0.tgz"; - sha1 = "ae454f4c21c6c2ce8cb2397dc332ae8b420c5441"; - }; - } - { - name = "_babel_plugin_proposal_pipeline_operator___plugin_proposal_pipeline_operator_7.5.0.tgz"; - path = fetchurl { - name = "_babel_plugin_proposal_pipeline_operator___plugin_proposal_pipeline_operator_7.5.0.tgz"; - url = "https://registry.yarnpkg.com/@babel/plugin-proposal-pipeline-operator/-/plugin-proposal-pipeline-operator-7.5.0.tgz"; - sha1 = "4100ec55ef4f6a4c2490b5f5a4f2a22dfa272c06"; - }; - } - { name = "_babel_plugin_proposal_private_methods___plugin_proposal_private_methods_7.6.0.tgz"; path = fetchurl { name = "_babel_plugin_proposal_private_methods___plugin_proposal_private_methods_7.6.0.tgz"; @@ -370,14 +266,6 @@ }; } { - name = "_babel_plugin_proposal_throw_expressions___plugin_proposal_throw_expressions_7.2.0.tgz"; - path = fetchurl { - name = "_babel_plugin_proposal_throw_expressions___plugin_proposal_throw_expressions_7.2.0.tgz"; - url = "https://registry.yarnpkg.com/@babel/plugin-proposal-throw-expressions/-/plugin-proposal-throw-expressions-7.2.0.tgz"; - sha1 = "2d9e452d370f139000e51db65d0a85dc60c64739"; - }; - } - { name = "_babel_plugin_proposal_unicode_property_regex___plugin_proposal_unicode_property_regex_7.6.2.tgz"; path = fetchurl { name = "_babel_plugin_proposal_unicode_property_regex___plugin_proposal_unicode_property_regex_7.6.2.tgz"; @@ -394,22 +282,6 @@ }; } { - name = "_babel_plugin_syntax_decorators___plugin_syntax_decorators_7.2.0.tgz"; - path = fetchurl { - name = "_babel_plugin_syntax_decorators___plugin_syntax_decorators_7.2.0.tgz"; - url = "https://registry.yarnpkg.com/@babel/plugin-syntax-decorators/-/plugin-syntax-decorators-7.2.0.tgz"; - sha1 = "c50b1b957dcc69e4b1127b65e1c33eef61570c1b"; - }; - } - { - name = "_babel_plugin_syntax_do_expressions___plugin_syntax_do_expressions_7.2.0.tgz"; - path = fetchurl { - name = "_babel_plugin_syntax_do_expressions___plugin_syntax_do_expressions_7.2.0.tgz"; - url = "https://registry.yarnpkg.com/@babel/plugin-syntax-do-expressions/-/plugin-syntax-do-expressions-7.2.0.tgz"; - sha1 = "f3d4b01be05ecde2892086d7cfd5f1fa1ead5a2a"; - }; - } - { name = "_babel_plugin_syntax_dynamic_import___plugin_syntax_dynamic_import_7.2.0.tgz"; path = fetchurl { name = "_babel_plugin_syntax_dynamic_import___plugin_syntax_dynamic_import_7.2.0.tgz"; @@ -418,46 +290,6 @@ }; } { - name = "_babel_plugin_syntax_export_default_from___plugin_syntax_export_default_from_7.2.0.tgz"; - path = fetchurl { - name = "_babel_plugin_syntax_export_default_from___plugin_syntax_export_default_from_7.2.0.tgz"; - url = "https://registry.yarnpkg.com/@babel/plugin-syntax-export-default-from/-/plugin-syntax-export-default-from-7.2.0.tgz"; - sha1 = "edd83b7adc2e0d059e2467ca96c650ab6d2f3820"; - }; - } - { - name = "_babel_plugin_syntax_export_namespace_from___plugin_syntax_export_namespace_from_7.2.0.tgz"; - path = fetchurl { - name = "_babel_plugin_syntax_export_namespace_from___plugin_syntax_export_namespace_from_7.2.0.tgz"; - url = "https://registry.yarnpkg.com/@babel/plugin-syntax-export-namespace-from/-/plugin-syntax-export-namespace-from-7.2.0.tgz"; - sha1 = "8d257838c6b3b779db52c0224443459bd27fb039"; - }; - } - { - name = "_babel_plugin_syntax_flow___plugin_syntax_flow_7.2.0.tgz"; - path = fetchurl { - name = "_babel_plugin_syntax_flow___plugin_syntax_flow_7.2.0.tgz"; - url = "https://registry.yarnpkg.com/@babel/plugin-syntax-flow/-/plugin-syntax-flow-7.2.0.tgz"; - sha1 = "a765f061f803bc48f240c26f8747faf97c26bf7c"; - }; - } - { - name = "_babel_plugin_syntax_function_bind___plugin_syntax_function_bind_7.2.0.tgz"; - path = fetchurl { - name = "_babel_plugin_syntax_function_bind___plugin_syntax_function_bind_7.2.0.tgz"; - url = "https://registry.yarnpkg.com/@babel/plugin-syntax-function-bind/-/plugin-syntax-function-bind-7.2.0.tgz"; - sha1 = "68fe85b0c0da67125f87bf239c68051b06c66309"; - }; - } - { - name = "_babel_plugin_syntax_function_sent___plugin_syntax_function_sent_7.2.0.tgz"; - path = fetchurl { - name = "_babel_plugin_syntax_function_sent___plugin_syntax_function_sent_7.2.0.tgz"; - url = "https://registry.yarnpkg.com/@babel/plugin-syntax-function-sent/-/plugin-syntax-function-sent-7.2.0.tgz"; - sha1 = "91474d4d400604e4c6cbd4d77cd6cb3b8565576c"; - }; - } - { name = "_babel_plugin_syntax_import_meta___plugin_syntax_import_meta_7.2.0.tgz"; path = fetchurl { name = "_babel_plugin_syntax_import_meta___plugin_syntax_import_meta_7.2.0.tgz"; @@ -474,38 +306,6 @@ }; } { - name = "_babel_plugin_syntax_jsx___plugin_syntax_jsx_7.2.0.tgz"; - path = fetchurl { - name = "_babel_plugin_syntax_jsx___plugin_syntax_jsx_7.2.0.tgz"; - url = "https://registry.yarnpkg.com/@babel/plugin-syntax-jsx/-/plugin-syntax-jsx-7.2.0.tgz"; - sha1 = "0b85a3b4bc7cdf4cc4b8bf236335b907ca22e7c7"; - }; - } - { - name = "_babel_plugin_syntax_logical_assignment_operators___plugin_syntax_logical_assignment_operators_7.2.0.tgz"; - path = fetchurl { - name = "_babel_plugin_syntax_logical_assignment_operators___plugin_syntax_logical_assignment_operators_7.2.0.tgz"; - url = "https://registry.yarnpkg.com/@babel/plugin-syntax-logical-assignment-operators/-/plugin-syntax-logical-assignment-operators-7.2.0.tgz"; - sha1 = "fcab7388530e96c6f277ce494c55caa6c141fcfb"; - }; - } - { - name = "_babel_plugin_syntax_nullish_coalescing_operator___plugin_syntax_nullish_coalescing_operator_7.2.0.tgz"; - path = fetchurl { - name = "_babel_plugin_syntax_nullish_coalescing_operator___plugin_syntax_nullish_coalescing_operator_7.2.0.tgz"; - url = "https://registry.yarnpkg.com/@babel/plugin-syntax-nullish-coalescing-operator/-/plugin-syntax-nullish-coalescing-operator-7.2.0.tgz"; - sha1 = "f75083dfd5ade73e783db729bbd87e7b9efb7624"; - }; - } - { - name = "_babel_plugin_syntax_numeric_separator___plugin_syntax_numeric_separator_7.2.0.tgz"; - path = fetchurl { - name = "_babel_plugin_syntax_numeric_separator___plugin_syntax_numeric_separator_7.2.0.tgz"; - url = "https://registry.yarnpkg.com/@babel/plugin-syntax-numeric-separator/-/plugin-syntax-numeric-separator-7.2.0.tgz"; - sha1 = "7470fe070c2944469a756752a69a6963135018be"; - }; - } - { name = "_babel_plugin_syntax_object_rest_spread___plugin_syntax_object_rest_spread_7.2.0.tgz"; path = fetchurl { name = "_babel_plugin_syntax_object_rest_spread___plugin_syntax_object_rest_spread_7.2.0.tgz"; @@ -522,30 +322,6 @@ }; } { - name = "_babel_plugin_syntax_optional_chaining___plugin_syntax_optional_chaining_7.2.0.tgz"; - path = fetchurl { - name = "_babel_plugin_syntax_optional_chaining___plugin_syntax_optional_chaining_7.2.0.tgz"; - url = "https://registry.yarnpkg.com/@babel/plugin-syntax-optional-chaining/-/plugin-syntax-optional-chaining-7.2.0.tgz"; - sha1 = "a59d6ae8c167e7608eaa443fda9fa8fa6bf21dff"; - }; - } - { - name = "_babel_plugin_syntax_pipeline_operator___plugin_syntax_pipeline_operator_7.5.0.tgz"; - path = fetchurl { - name = "_babel_plugin_syntax_pipeline_operator___plugin_syntax_pipeline_operator_7.5.0.tgz"; - url = "https://registry.yarnpkg.com/@babel/plugin-syntax-pipeline-operator/-/plugin-syntax-pipeline-operator-7.5.0.tgz"; - sha1 = "8ea7c2c22847c797748bf07752722a317079dc1e"; - }; - } - { - name = "_babel_plugin_syntax_throw_expressions___plugin_syntax_throw_expressions_7.2.0.tgz"; - path = fetchurl { - name = "_babel_plugin_syntax_throw_expressions___plugin_syntax_throw_expressions_7.2.0.tgz"; - url = "https://registry.yarnpkg.com/@babel/plugin-syntax-throw-expressions/-/plugin-syntax-throw-expressions-7.2.0.tgz"; - sha1 = "79001ee2afe1b174b1733cdc2fc69c9a46a0f1f8"; - }; - } - { name = "_babel_plugin_transform_arrow_functions___plugin_transform_arrow_functions_7.2.0.tgz"; path = fetchurl { name = "_babel_plugin_transform_arrow_functions___plugin_transform_arrow_functions_7.2.0.tgz"; @@ -626,14 +402,6 @@ }; } { - name = "_babel_plugin_transform_flow_strip_types___plugin_transform_flow_strip_types_7.4.4.tgz"; - path = fetchurl { - name = "_babel_plugin_transform_flow_strip_types___plugin_transform_flow_strip_types_7.4.4.tgz"; - url = "https://registry.yarnpkg.com/@babel/plugin-transform-flow-strip-types/-/plugin-transform-flow-strip-types-7.4.4.tgz"; - sha1 = "d267a081f49a8705fc9146de0768c6b58dccd8f7"; - }; - } - { name = "_babel_plugin_transform_for_of___plugin_transform_for_of_7.4.4.tgz"; path = fetchurl { name = "_babel_plugin_transform_for_of___plugin_transform_for_of_7.4.4.tgz"; @@ -738,38 +506,6 @@ }; } { - name = "_babel_plugin_transform_react_display_name___plugin_transform_react_display_name_7.2.0.tgz"; - path = fetchurl { - name = "_babel_plugin_transform_react_display_name___plugin_transform_react_display_name_7.2.0.tgz"; - url = "https://registry.yarnpkg.com/@babel/plugin-transform-react-display-name/-/plugin-transform-react-display-name-7.2.0.tgz"; - sha1 = "ebfaed87834ce8dc4279609a4f0c324c156e3eb0"; - }; - } - { - name = "_babel_plugin_transform_react_jsx_self___plugin_transform_react_jsx_self_7.2.0.tgz"; - path = fetchurl { - name = "_babel_plugin_transform_react_jsx_self___plugin_transform_react_jsx_self_7.2.0.tgz"; - url = "https://registry.yarnpkg.com/@babel/plugin-transform-react-jsx-self/-/plugin-transform-react-jsx-self-7.2.0.tgz"; - sha1 = "461e21ad9478f1031dd5e276108d027f1b5240ba"; - }; - } - { - name = "_babel_plugin_transform_react_jsx_source___plugin_transform_react_jsx_source_7.5.0.tgz"; - path = fetchurl { - name = "_babel_plugin_transform_react_jsx_source___plugin_transform_react_jsx_source_7.5.0.tgz"; - url = "https://registry.yarnpkg.com/@babel/plugin-transform-react-jsx-source/-/plugin-transform-react-jsx-source-7.5.0.tgz"; - sha1 = "583b10c49cf057e237085bcbd8cc960bd83bd96b"; - }; - } - { - name = "_babel_plugin_transform_react_jsx___plugin_transform_react_jsx_7.3.0.tgz"; - path = fetchurl { - name = "_babel_plugin_transform_react_jsx___plugin_transform_react_jsx_7.3.0.tgz"; - url = "https://registry.yarnpkg.com/@babel/plugin-transform-react-jsx/-/plugin-transform-react-jsx-7.3.0.tgz"; - sha1 = "f2cab99026631c767e2745a5368b331cfe8f5290"; - }; - } - { name = "_babel_plugin_transform_regenerator___plugin_transform_regenerator_7.4.5.tgz"; path = fetchurl { name = "_babel_plugin_transform_regenerator___plugin_transform_regenerator_7.4.5.tgz"; @@ -842,30 +578,6 @@ }; } { - name = "_babel_preset_flow___preset_flow_7.0.0.tgz"; - path = fetchurl { - name = "_babel_preset_flow___preset_flow_7.0.0.tgz"; - url = "https://registry.yarnpkg.com/@babel/preset-flow/-/preset-flow-7.0.0.tgz"; - sha1 = "afd764835d9535ec63d8c7d4caf1c06457263da2"; - }; - } - { - name = "_babel_preset_react___preset_react_7.0.0.tgz"; - path = fetchurl { - name = "_babel_preset_react___preset_react_7.0.0.tgz"; - url = "https://registry.yarnpkg.com/@babel/preset-react/-/preset-react-7.0.0.tgz"; - sha1 = "e86b4b3d99433c7b3e9e91747e2653958bc6b3c0"; - }; - } - { - name = "_babel_preset_stage_0___preset_stage_0_7.0.0.tgz"; - path = fetchurl { - name = "_babel_preset_stage_0___preset_stage_0_7.0.0.tgz"; - url = "https://registry.yarnpkg.com/@babel/preset-stage-0/-/preset-stage-0-7.0.0.tgz"; - sha1 = "999aaec79ee8f0a763042c68c06539c97c6e0646"; - }; - } - { name = "_babel_standalone___standalone_7.5.5.tgz"; path = fetchurl { name = "_babel_standalone___standalone_7.5.5.tgz"; @@ -938,27 +650,27 @@ }; } { - name = "_gitlab_svgs___svgs_1.78.0.tgz"; + name = "_gitlab_svgs___svgs_1.82.0.tgz"; path = fetchurl { - name = "_gitlab_svgs___svgs_1.78.0.tgz"; - url = "https://registry.yarnpkg.com/@gitlab/svgs/-/svgs-1.78.0.tgz"; - sha1 = "469493bd6cdd254eb5d1271edeab22bbbee2f4c4"; + name = "_gitlab_svgs___svgs_1.82.0.tgz"; + url = "https://registry.yarnpkg.com/@gitlab/svgs/-/svgs-1.82.0.tgz"; + sha1 = "c059c460afc13ebfe9df370521ca8963fa5afb80"; }; } { - name = "_gitlab_ui___ui_5.36.0.tgz"; + name = "_gitlab_ui___ui_7.11.0.tgz"; path = fetchurl { - name = "_gitlab_ui___ui_5.36.0.tgz"; - url = "https://registry.yarnpkg.com/@gitlab/ui/-/ui-5.36.0.tgz"; - sha1 = "3087b23c138ad1c222f6b047e533f253371bc618"; + name = "_gitlab_ui___ui_7.11.0.tgz"; + url = "https://registry.yarnpkg.com/@gitlab/ui/-/ui-7.11.0.tgz"; + sha1 = "b5c981f3b1edbf0ad75bcca8fa1cd81017676b3b"; }; } { - name = "_gitlab_visual_review_tools___visual_review_tools_1.0.3.tgz"; + name = "_gitlab_visual_review_tools___visual_review_tools_1.2.0.tgz"; path = fetchurl { - name = "_gitlab_visual_review_tools___visual_review_tools_1.0.3.tgz"; - url = "https://registry.yarnpkg.com/@gitlab/visual-review-tools/-/visual-review-tools-1.0.3.tgz"; - sha1 = "b49c4a6fd8af3a1517d7e7d04096562f8bcb5d14"; + name = "_gitlab_visual_review_tools___visual_review_tools_1.2.0.tgz"; + url = "https://registry.yarnpkg.com/@gitlab/visual-review-tools/-/visual-review-tools-1.2.0.tgz"; + sha1 = "8d6757917193c1023012bb4a316dc1a97309a27a"; }; } { @@ -1074,6 +786,62 @@ }; } { + name = "_sentry_browser___browser_5.7.1.tgz"; + path = fetchurl { + name = "_sentry_browser___browser_5.7.1.tgz"; + url = "https://registry.yarnpkg.com/@sentry/browser/-/browser-5.7.1.tgz"; + sha1 = "1f8435e2a325d7a09f830065ebce40a2b3c708a4"; + }; + } + { + name = "_sentry_core___core_5.7.1.tgz"; + path = fetchurl { + name = "_sentry_core___core_5.7.1.tgz"; + url = "https://registry.yarnpkg.com/@sentry/core/-/core-5.7.1.tgz"; + sha1 = "3eb2b7662cac68245931ee939ec809bf7a639d0e"; + }; + } + { + name = "_sentry_hub___hub_5.7.1.tgz"; + path = fetchurl { + name = "_sentry_hub___hub_5.7.1.tgz"; + url = "https://registry.yarnpkg.com/@sentry/hub/-/hub-5.7.1.tgz"; + sha1 = "a52acd9fead7f3779d96e9965c6978aecc8b9cad"; + }; + } + { + name = "_sentry_minimal___minimal_5.7.1.tgz"; + path = fetchurl { + name = "_sentry_minimal___minimal_5.7.1.tgz"; + url = "https://registry.yarnpkg.com/@sentry/minimal/-/minimal-5.7.1.tgz"; + sha1 = "56afc537737586929e25349765e37a367958c1e1"; + }; + } + { + name = "_sentry_types___types_5.7.1.tgz"; + path = fetchurl { + name = "_sentry_types___types_5.7.1.tgz"; + url = "https://registry.yarnpkg.com/@sentry/types/-/types-5.7.1.tgz"; + sha1 = "4c4c1d4d891b6b8c2c3c7b367d306a8b1350f090"; + }; + } + { + name = "_sentry_utils___utils_5.7.1.tgz"; + path = fetchurl { + name = "_sentry_utils___utils_5.7.1.tgz"; + url = "https://registry.yarnpkg.com/@sentry/utils/-/utils-5.7.1.tgz"; + sha1 = "cf37ad55f78e317665cd8680f202d307fa77f1d0"; + }; + } + { + name = "_sourcegraph_code_host_integration___code_host_integration_0.0.13.tgz"; + path = fetchurl { + name = "_sourcegraph_code_host_integration___code_host_integration_0.0.13.tgz"; + url = "https://registry.yarnpkg.com/@sourcegraph/code-host-integration/-/code-host-integration-0.0.13.tgz"; + sha1 = "4fd5fe1e0088c63b2a26be231c5a2a4ca79b1596"; + }; + } + { name = "_types_anymatch___anymatch_1.3.0.tgz"; path = fetchurl { name = "_types_anymatch___anymatch_1.3.0.tgz"; @@ -1434,6 +1202,22 @@ }; } { + name = "_wry_context___context_0.4.4.tgz"; + path = fetchurl { + name = "_wry_context___context_0.4.4.tgz"; + url = "https://registry.yarnpkg.com/@wry/context/-/context-0.4.4.tgz"; + sha1 = "e50f5fa1d6cfaabf2977d1fda5ae91717f8815f8"; + }; + } + { + name = "_wry_equality___equality_0.1.9.tgz"; + path = fetchurl { + name = "_wry_equality___equality_0.1.9.tgz"; + url = "https://registry.yarnpkg.com/@wry/equality/-/equality-0.1.9.tgz"; + sha1 = "b13e18b7a8053c6858aa6c85b54911fb31e3a909"; + }; + } + { name = "_xtuc_ieee754___ieee754_1.2.0.tgz"; path = fetchurl { name = "_xtuc_ieee754___ieee754_1.2.0.tgz"; @@ -1458,14 +1242,6 @@ }; } { - name = "JSONStream___JSONStream_1.3.5.tgz"; - path = fetchurl { - name = "JSONStream___JSONStream_1.3.5.tgz"; - url = "https://registry.yarnpkg.com/JSONStream/-/JSONStream-1.3.5.tgz"; - sha1 = "3208c1f08d3a4d99261ab64f92302bc15e111ca0"; - }; - } - { name = "abab___abab_2.0.0.tgz"; path = fetchurl { name = "abab___abab_2.0.0.tgz"; @@ -1658,27 +1434,27 @@ }; } { - name = "apollo_cache_inmemory___apollo_cache_inmemory_1.5.1.tgz"; + name = "apollo_cache_inmemory___apollo_cache_inmemory_1.6.3.tgz"; path = fetchurl { - name = "apollo_cache_inmemory___apollo_cache_inmemory_1.5.1.tgz"; - url = "https://registry.yarnpkg.com/apollo-cache-inmemory/-/apollo-cache-inmemory-1.5.1.tgz"; - sha1 = "265d1ee67b0bf0aca9c37629d410bfae44e62953"; + name = "apollo_cache_inmemory___apollo_cache_inmemory_1.6.3.tgz"; + url = "https://registry.yarnpkg.com/apollo-cache-inmemory/-/apollo-cache-inmemory-1.6.3.tgz"; + sha1 = "826861d20baca4abc45f7ca7a874105905b8525d"; }; } { - name = "apollo_cache___apollo_cache_1.2.1.tgz"; + name = "apollo_cache___apollo_cache_1.3.2.tgz"; path = fetchurl { - name = "apollo_cache___apollo_cache_1.2.1.tgz"; - url = "https://registry.yarnpkg.com/apollo-cache/-/apollo-cache-1.2.1.tgz"; - sha1 = "aae71eb4a11f1f7322adc343f84b1a39b0693644"; + name = "apollo_cache___apollo_cache_1.3.2.tgz"; + url = "https://registry.yarnpkg.com/apollo-cache/-/apollo-cache-1.3.2.tgz"; + sha1 = "df4dce56240d6c95c613510d7e409f7214e6d26a"; }; } { - name = "apollo_client___apollo_client_2.5.1.tgz"; + name = "apollo_client___apollo_client_2.6.4.tgz"; path = fetchurl { - name = "apollo_client___apollo_client_2.5.1.tgz"; - url = "https://registry.yarnpkg.com/apollo-client/-/apollo-client-2.5.1.tgz"; - sha1 = "36126ed1d32edd79c3713c6684546a3bea80e6d1"; + name = "apollo_client___apollo_client_2.6.4.tgz"; + url = "https://registry.yarnpkg.com/apollo-client/-/apollo-client-2.6.4.tgz"; + sha1 = "872c32927263a0d34655c5ef8a8949fbb20b6140"; }; } { @@ -1698,14 +1474,6 @@ }; } { - name = "apollo_link_dedup___apollo_link_dedup_1.0.10.tgz"; - path = fetchurl { - name = "apollo_link_dedup___apollo_link_dedup_1.0.10.tgz"; - url = "https://registry.yarnpkg.com/apollo-link-dedup/-/apollo-link-dedup-1.0.10.tgz"; - sha1 = "7b94589fe7f969777efd18a129043c78430800ae"; - }; - } - { name = "apollo_link_http_common___apollo_link_http_common_0.2.13.tgz"; path = fetchurl { name = "apollo_link_http_common___apollo_link_http_common_0.2.13.tgz"; @@ -1730,19 +1498,11 @@ }; } { - name = "apollo_utilities___apollo_utilities_1.2.1.tgz"; + name = "apollo_utilities___apollo_utilities_1.3.2.tgz"; path = fetchurl { - name = "apollo_utilities___apollo_utilities_1.2.1.tgz"; - url = "https://registry.yarnpkg.com/apollo-utilities/-/apollo-utilities-1.2.1.tgz"; - sha1 = "1c3a1ebf5607d7c8efe7636daaf58e7463b41b3c"; - }; - } - { - name = "append_buffer___append_buffer_1.0.2.tgz"; - path = fetchurl { - name = "append_buffer___append_buffer_1.0.2.tgz"; - url = "https://registry.yarnpkg.com/append-buffer/-/append-buffer-1.0.2.tgz"; - sha1 = "d8220cf466081525efea50614f3de6514dfa58f1"; + name = "apollo_utilities___apollo_utilities_1.3.2.tgz"; + url = "https://registry.yarnpkg.com/apollo-utilities/-/apollo-utilities-1.3.2.tgz"; + sha1 = "8cbdcf8b012f664cd6cb5767f6130f5aed9115c9"; }; } { @@ -2122,14 +1882,6 @@ }; } { - name = "babelify___babelify_10.0.0.tgz"; - path = fetchurl { - name = "babelify___babelify_10.0.0.tgz"; - url = "https://registry.yarnpkg.com/babelify/-/babelify-10.0.0.tgz"; - sha1 = "fe73b1a22583f06680d8d072e25a1e0d1d1d7fb5"; - }; - } - { name = "babylon___babylon_7.0.0_beta.19.tgz"; path = fetchurl { name = "babylon___babylon_7.0.0_beta.19.tgz"; @@ -2298,14 +2050,6 @@ }; } { - name = "body___body_5.1.0.tgz"; - path = fetchurl { - name = "body___body_5.1.0.tgz"; - url = "https://registry.yarnpkg.com/body/-/body-5.1.0.tgz"; - sha1 = "e4ba0ce410a46936323367609ecb4e6553125069"; - }; - } - { name = "bonjour___bonjour_3.5.0.tgz"; path = fetchurl { name = "bonjour___bonjour_3.5.0.tgz"; @@ -2458,14 +2202,6 @@ }; } { - name = "buffer_equal___buffer_equal_1.0.0.tgz"; - path = fetchurl { - name = "buffer_equal___buffer_equal_1.0.0.tgz"; - url = "https://registry.yarnpkg.com/buffer-equal/-/buffer-equal-1.0.0.tgz"; - sha1 = "59616b498304d556abd466966b22eeda3eca5fbe"; - }; - } - { name = "buffer_from___buffer_from_1.1.1.tgz"; path = fetchurl { name = "buffer_from___buffer_from_1.1.1.tgz"; @@ -2490,14 +2226,6 @@ }; } { - name = "buffer_shims___buffer_shims_1.0.0.tgz"; - path = fetchurl { - name = "buffer_shims___buffer_shims_1.0.0.tgz"; - url = "https://registry.yarnpkg.com/buffer-shims/-/buffer-shims-1.0.0.tgz"; - sha1 = "9978ce317388c649ad8793028c3477ef044a8b51"; - }; - } - { name = "buffer_xor___buffer_xor_1.0.3.tgz"; path = fetchurl { name = "buffer_xor___buffer_xor_1.0.3.tgz"; @@ -2522,14 +2250,6 @@ }; } { - name = "bytes___bytes_1.0.0.tgz"; - path = fetchurl { - name = "bytes___bytes_1.0.0.tgz"; - url = "https://registry.yarnpkg.com/bytes/-/bytes-1.0.0.tgz"; - sha1 = "3569ede8ba34315fab99c3e92cb04c7220de1fa8"; - }; - } - { name = "bytes___bytes_3.0.0.tgz"; path = fetchurl { name = "bytes___bytes_3.0.0.tgz"; @@ -2578,14 +2298,6 @@ }; } { - name = "cached_path_relative___cached_path_relative_1.0.2.tgz"; - path = fetchurl { - name = "cached_path_relative___cached_path_relative_1.0.2.tgz"; - url = "https://registry.yarnpkg.com/cached-path-relative/-/cached-path-relative-1.0.2.tgz"; - sha1 = "a13df4196d26776220cc3356eb147a52dba2c6db"; - }; - } - { name = "call_me_maybe___call_me_maybe_1.0.1.tgz"; path = fetchurl { name = "call_me_maybe___call_me_maybe_1.0.1.tgz"; @@ -2994,14 +2706,6 @@ }; } { - name = "clone_buffer___clone_buffer_1.0.0.tgz"; - path = fetchurl { - name = "clone_buffer___clone_buffer_1.0.0.tgz"; - url = "https://registry.yarnpkg.com/clone-buffer/-/clone-buffer-1.0.0.tgz"; - sha1 = "e3e25b207ac4e701af721e2cb5a16792cac3dc58"; - }; - } - { name = "clone_deep___clone_deep_4.0.1.tgz"; path = fetchurl { name = "clone_deep___clone_deep_4.0.1.tgz"; @@ -3018,30 +2722,6 @@ }; } { - name = "clone_stats___clone_stats_1.0.0.tgz"; - path = fetchurl { - name = "clone_stats___clone_stats_1.0.0.tgz"; - url = "https://registry.yarnpkg.com/clone-stats/-/clone-stats-1.0.0.tgz"; - sha1 = "b3782dff8bb5474e18b9b6bf0fdfe782f8777680"; - }; - } - { - name = "clone___clone_2.1.2.tgz"; - path = fetchurl { - name = "clone___clone_2.1.2.tgz"; - url = "https://registry.yarnpkg.com/clone/-/clone-2.1.2.tgz"; - sha1 = "1b7f4b9f591f1e8f83670401600345a02887435f"; - }; - } - { - name = "cloneable_readable___cloneable_readable_1.1.3.tgz"; - path = fetchurl { - name = "cloneable_readable___cloneable_readable_1.1.3.tgz"; - url = "https://registry.yarnpkg.com/cloneable-readable/-/cloneable-readable-1.1.3.tgz"; - sha1 = "120a00cb053bfb63a222e709f9683ea2e11d8cec"; - }; - } - { name = "co___co_4.6.0.tgz"; path = fetchurl { name = "co___co_4.6.0.tgz"; @@ -3138,14 +2818,6 @@ }; } { - name = "comma_separated_tokens___comma_separated_tokens_1.0.7.tgz"; - path = fetchurl { - name = "comma_separated_tokens___comma_separated_tokens_1.0.7.tgz"; - url = "https://registry.yarnpkg.com/comma-separated-tokens/-/comma-separated-tokens-1.0.7.tgz"; - sha1 = "419cd7fb3258b1ed838dc0953167a25e152f5b59"; - }; - } - { name = "commander___commander_2.20.0.tgz"; path = fetchurl { name = "commander___commander_2.20.0.tgz"; @@ -3242,14 +2914,6 @@ }; } { - name = "concat_stream___concat_stream_1.5.2.tgz"; - path = fetchurl { - name = "concat_stream___concat_stream_1.5.2.tgz"; - url = "https://registry.yarnpkg.com/concat-stream/-/concat-stream-1.5.2.tgz"; - sha1 = "708978624d856af41a5a741defdd261da752c266"; - }; - } - { name = "config_chain___config_chain_1.1.12.tgz"; path = fetchurl { name = "config_chain___config_chain_1.1.12.tgz"; @@ -3346,14 +3010,6 @@ }; } { - name = "continuable_cache___continuable_cache_0.3.1.tgz"; - path = fetchurl { - name = "continuable_cache___continuable_cache_0.3.1.tgz"; - url = "https://registry.yarnpkg.com/continuable-cache/-/continuable-cache-0.3.1.tgz"; - sha1 = "bd727a7faed77e71ff3985ac93351a912733ad0f"; - }; - } - { name = "convert_source_map___convert_source_map_1.6.0.tgz"; path = fetchurl { name = "convert_source_map___convert_source_map_1.6.0.tgz"; @@ -3554,6 +3210,14 @@ }; } { + name = "crypto_random_string___crypto_random_string_3.0.1.tgz"; + path = fetchurl { + name = "crypto_random_string___crypto_random_string_3.0.1.tgz"; + url = "https://registry.yarnpkg.com/crypto-random-string/-/crypto-random-string-3.0.1.tgz"; + sha1 = "29d7dc759d577a768afb3b7b2765dd9bd7ffe36a"; + }; + } + { name = "css_b64_images___css_b64_images_0.2.5.tgz"; path = fetchurl { name = "css_b64_images___css_b64_images_0.2.5.tgz"; @@ -3618,6 +3282,14 @@ }; } { + name = "cssfontparser___cssfontparser_1.2.1.tgz"; + path = fetchurl { + name = "cssfontparser___cssfontparser_1.2.1.tgz"; + url = "https://registry.yarnpkg.com/cssfontparser/-/cssfontparser-1.2.1.tgz"; + sha1 = "f4022fc8f9700c68029d542084afbaf425a3f3e3"; + }; + } + { name = "cssom___cssom_0.3.4.tgz"; path = fetchurl { name = "cssom___cssom_0.3.4.tgz"; @@ -3946,27 +3618,27 @@ }; } { - name = "d3___d3_5.9.2.tgz"; + name = "d3___d3_5.12.0.tgz"; path = fetchurl { - name = "d3___d3_5.9.2.tgz"; - url = "https://registry.yarnpkg.com/d3/-/d3-5.9.2.tgz"; - sha1 = "64e8a7e9c3d96d9e6e4999d2c8a2c829767e67f5"; + name = "d3___d3_5.12.0.tgz"; + url = "https://registry.yarnpkg.com/d3/-/d3-5.12.0.tgz"; + sha1 = "0ddeac879c28c882317cd439b495290acd59ab61"; }; } { - name = "dagre_d3_renderer___dagre_d3_renderer_0.5.8.tgz"; + name = "https___codeload.github.com_dagrejs_dagre_d3_tar.gz_e1a00e5cb518f5d2304a35647e024f31d178e55b"; path = fetchurl { - name = "dagre_d3_renderer___dagre_d3_renderer_0.5.8.tgz"; - url = "https://registry.yarnpkg.com/dagre-d3-renderer/-/dagre-d3-renderer-0.5.8.tgz"; - sha1 = "aa071bb71d3c4d67426925906f3f6ddead49c1a3"; + name = "https___codeload.github.com_dagrejs_dagre_d3_tar.gz_e1a00e5cb518f5d2304a35647e024f31d178e55b"; + url = "https://codeload.github.com/dagrejs/dagre-d3/tar.gz/e1a00e5cb518f5d2304a35647e024f31d178e55b"; + sha1 = "7400df3f5fe80538fde43d0201e1570e1d689004"; }; } { - name = "dagre_layout___dagre_layout_0.8.8.tgz"; + name = "dagre___dagre_0.8.4.tgz"; path = fetchurl { - name = "dagre_layout___dagre_layout_0.8.8.tgz"; - url = "https://registry.yarnpkg.com/dagre-layout/-/dagre-layout-0.8.8.tgz"; - sha1 = "9b6792f24229f402441c14162c1049e3f261f6d9"; + name = "dagre___dagre_0.8.4.tgz"; + url = "https://registry.yarnpkg.com/dagre/-/dagre-0.8.4.tgz"; + sha1 = "26b9fb8f7bdc60c6110a0458c375261836786061"; }; } { @@ -4066,11 +3738,11 @@ }; } { - name = "deckar01_task_list___deckar01_task_list_2.2.0.tgz"; + name = "deckar01_task_list___deckar01_task_list_2.2.1.tgz"; path = fetchurl { - name = "deckar01_task_list___deckar01_task_list_2.2.0.tgz"; - url = "https://registry.yarnpkg.com/deckar01-task_list/-/deckar01-task_list-2.2.0.tgz"; - sha1 = "5cc3ea06f01d3d786b1a667064a462eb5d069bd3"; + name = "deckar01_task_list___deckar01_task_list_2.2.1.tgz"; + url = "https://registry.yarnpkg.com/deckar01-task_list/-/deckar01-task_list-2.2.1.tgz"; + sha1 = "e1e8a16c4fd6e153e51fd9258fdbee067ebcd86b"; }; } { @@ -4162,14 +3834,6 @@ }; } { - name = "defined___defined_1.0.0.tgz"; - path = fetchurl { - name = "defined___defined_1.0.0.tgz"; - url = "https://registry.yarnpkg.com/defined/-/defined-1.0.0.tgz"; - sha1 = "c98d9bcef75674188e110969151199e39b1fa693"; - }; - } - { name = "del___del_2.2.2.tgz"; path = fetchurl { name = "del___del_2.2.2.tgz"; @@ -4242,14 +3906,6 @@ }; } { - name = "detab___detab_2.0.2.tgz"; - path = fetchurl { - name = "detab___detab_2.0.2.tgz"; - url = "https://registry.yarnpkg.com/detab/-/detab-2.0.2.tgz"; - sha1 = "074970d1a807b045d0258a4235df5928dd683561"; - }; - } - { name = "detect_file___detect_file_1.0.0.tgz"; path = fetchurl { name = "detect_file___detect_file_1.0.0.tgz"; @@ -4282,14 +3938,6 @@ }; } { - name = "detective___detective_4.7.1.tgz"; - path = fetchurl { - name = "detective___detective_4.7.1.tgz"; - url = "https://registry.yarnpkg.com/detective/-/detective-4.7.1.tgz"; - sha1 = "0eca7314338442febb6d65da54c10bb1c82b246e"; - }; - } - { name = "di___di_0.0.1.tgz"; path = fetchurl { name = "di___di_0.0.1.tgz"; @@ -4314,14 +3962,6 @@ }; } { - name = "diff___diff_4.0.1.tgz"; - path = fetchurl { - name = "diff___diff_4.0.1.tgz"; - url = "https://registry.yarnpkg.com/diff/-/diff-4.0.1.tgz"; - sha1 = "0c667cb467ebbb5cea7f14f135cc2dba7780a8ff"; - }; - } - { name = "diffie_hellman___diffie_hellman_5.0.2.tgz"; path = fetchurl { name = "diffie_hellman___diffie_hellman_5.0.2.tgz"; @@ -4370,14 +4010,6 @@ }; } { - name = "doctrine_temporary_fork___doctrine_temporary_fork_2.1.0.tgz"; - path = fetchurl { - name = "doctrine_temporary_fork___doctrine_temporary_fork_2.1.0.tgz"; - url = "https://registry.yarnpkg.com/doctrine-temporary-fork/-/doctrine-temporary-fork-2.1.0.tgz"; - sha1 = "36f2154f556ee4f1e60311d391cd23de5187ed57"; - }; - } - { name = "doctrine___doctrine_1.5.0.tgz"; path = fetchurl { name = "doctrine___doctrine_1.5.0.tgz"; @@ -4402,14 +4034,6 @@ }; } { - name = "documentation___documentation_12.0.3.tgz"; - path = fetchurl { - name = "documentation___documentation_12.0.3.tgz"; - url = "https://registry.yarnpkg.com/documentation/-/documentation-12.0.3.tgz"; - sha1 = "32f91da8e5cb4104f69db9fd32c87773a1ad6240"; - }; - } - { name = "dom_serialize___dom_serialize_2.2.1.tgz"; path = fetchurl { name = "dom_serialize___dom_serialize_2.2.1.tgz"; @@ -4490,14 +4114,6 @@ }; } { - name = "duplexer2___duplexer2_0.1.4.tgz"; - path = fetchurl { - name = "duplexer2___duplexer2_0.1.4.tgz"; - url = "https://registry.yarnpkg.com/duplexer2/-/duplexer2-0.1.4.tgz"; - sha1 = "8b12dab878c0d69e3e7891051662a32fc6bddcc1"; - }; - } - { name = "duplexer3___duplexer3_0.1.4.tgz"; path = fetchurl { name = "duplexer3___duplexer3_0.1.4.tgz"; @@ -4586,14 +4202,6 @@ }; } { - name = "emoji_regex___emoji_regex_6.1.1.tgz"; - path = fetchurl { - name = "emoji_regex___emoji_regex_6.1.1.tgz"; - url = "https://registry.yarnpkg.com/emoji-regex/-/emoji-regex-6.1.1.tgz"; - sha1 = "c6cd0ec1b0642e2a3c67a1137efc5e796da4f88e"; - }; - } - { name = "emoji_regex___emoji_regex_7.0.3.tgz"; path = fetchurl { name = "emoji_regex___emoji_regex_7.0.3.tgz"; @@ -4714,14 +4322,6 @@ }; } { - name = "error___error_7.0.2.tgz"; - path = fetchurl { - name = "error___error_7.0.2.tgz"; - url = "https://registry.yarnpkg.com/error/-/error-7.0.2.tgz"; - sha1 = "a5f75fff4d9926126ddac0ea5dc38e689153cb02"; - }; - } - { name = "es_abstract___es_abstract_1.13.0.tgz"; path = fetchurl { name = "es_abstract___es_abstract_1.13.0.tgz"; @@ -5546,14 +5146,6 @@ }; } { - name = "fs_mkdirp_stream___fs_mkdirp_stream_1.0.0.tgz"; - path = fetchurl { - name = "fs_mkdirp_stream___fs_mkdirp_stream_1.0.0.tgz"; - url = "https://registry.yarnpkg.com/fs-mkdirp-stream/-/fs-mkdirp-stream-1.0.0.tgz"; - sha1 = "0b7815fc3201c6a69e14db98ce098c16935259eb"; - }; - } - { name = "fs_write_stream_atomic___fs_write_stream_atomic_1.0.10.tgz"; path = fetchurl { name = "fs_write_stream_atomic___fs_write_stream_atomic_1.0.10.tgz"; @@ -5650,14 +5242,6 @@ }; } { - name = "get_port___get_port_4.2.0.tgz"; - path = fetchurl { - name = "get_port___get_port_4.2.0.tgz"; - url = "https://registry.yarnpkg.com/get-port/-/get-port-4.2.0.tgz"; - sha1 = "e37368b1e863b7629c43c5a323625f95cf24b119"; - }; - } - { name = "get_stdin___get_stdin_4.0.1.tgz"; path = fetchurl { name = "get_stdin___get_stdin_4.0.1.tgz"; @@ -5738,38 +5322,6 @@ }; } { - name = "git_up___git_up_2.1.0.tgz"; - path = fetchurl { - name = "git_up___git_up_2.1.0.tgz"; - url = "https://registry.yarnpkg.com/git-up/-/git-up-2.1.0.tgz"; - sha1 = "2f14cfe78327e7c4a2b92fcac7bfc674fdfad40c"; - }; - } - { - name = "git_url_parse___git_url_parse_10.1.0.tgz"; - path = fetchurl { - name = "git_url_parse___git_url_parse_10.1.0.tgz"; - url = "https://registry.yarnpkg.com/git-url-parse/-/git-url-parse-10.1.0.tgz"; - sha1 = "a27813218f8777e91d15f1c121b83bf14721b67e"; - }; - } - { - name = "github_slugger___github_slugger_1.2.0.tgz"; - path = fetchurl { - name = "github_slugger___github_slugger_1.2.0.tgz"; - url = "https://registry.yarnpkg.com/github-slugger/-/github-slugger-1.2.0.tgz"; - sha1 = "8ada3286fd046d8951c3c952a8d7854cfd90fd9a"; - }; - } - { - name = "github_slugger___github_slugger_1.2.1.tgz"; - path = fetchurl { - name = "github_slugger___github_slugger_1.2.1.tgz"; - url = "https://registry.yarnpkg.com/github-slugger/-/github-slugger-1.2.1.tgz"; - sha1 = "47e904e70bf2dccd0014748142d31126cfd49508"; - }; - } - { name = "glob_parent___glob_parent_3.1.0.tgz"; path = fetchurl { name = "glob_parent___glob_parent_3.1.0.tgz"; @@ -5786,14 +5338,6 @@ }; } { - name = "glob_stream___glob_stream_6.1.0.tgz"; - path = fetchurl { - name = "glob_stream___glob_stream_6.1.0.tgz"; - url = "https://registry.yarnpkg.com/glob-stream/-/glob-stream-6.1.0.tgz"; - sha1 = "7045c99413b3eb94888d83ab46d0b404cc7bdde4"; - }; - } - { name = "glob_to_regexp___glob_to_regexp_0.3.0.tgz"; path = fetchurl { name = "glob_to_regexp___glob_to_regexp_0.3.0.tgz"; @@ -5858,14 +5402,6 @@ }; } { - name = "globals_docs___globals_docs_2.4.0.tgz"; - path = fetchurl { - name = "globals_docs___globals_docs_2.4.0.tgz"; - url = "https://registry.yarnpkg.com/globals-docs/-/globals-docs-2.4.0.tgz"; - sha1 = "f2c647544eb6161c7c38452808e16e693c2dafbb"; - }; - } - { name = "globals___globals_11.12.0.tgz"; path = fetchurl { name = "globals___globals_11.12.0.tgz"; @@ -5962,11 +5498,11 @@ }; } { - name = "graphlibrary___graphlibrary_2.2.0.tgz"; + name = "graphlib___graphlib_2.1.7.tgz"; path = fetchurl { - name = "graphlibrary___graphlibrary_2.2.0.tgz"; - url = "https://registry.yarnpkg.com/graphlibrary/-/graphlibrary-2.2.0.tgz"; - sha1 = "017a14899775228dec4497a39babfdd6bf56eac6"; + name = "graphlib___graphlib_2.1.7.tgz"; + url = "https://registry.yarnpkg.com/graphlib/-/graphlib-2.1.7.tgz"; + sha1 = "b6a69f9f44bd9de3963ce6804a2fc9e73d86aecc"; }; } { @@ -6154,38 +5690,6 @@ }; } { - name = "hast_util_is_element___hast_util_is_element_1.0.3.tgz"; - path = fetchurl { - name = "hast_util_is_element___hast_util_is_element_1.0.3.tgz"; - url = "https://registry.yarnpkg.com/hast-util-is-element/-/hast-util-is-element-1.0.3.tgz"; - sha1 = "423b4b26fe8bf1f25950fe052e9ce8f83fd5f6a4"; - }; - } - { - name = "hast_util_sanitize___hast_util_sanitize_1.3.1.tgz"; - path = fetchurl { - name = "hast_util_sanitize___hast_util_sanitize_1.3.1.tgz"; - url = "https://registry.yarnpkg.com/hast-util-sanitize/-/hast-util-sanitize-1.3.1.tgz"; - sha1 = "4e60d66336bd67e52354d581967467029a933f2e"; - }; - } - { - name = "hast_util_to_html___hast_util_to_html_4.0.1.tgz"; - path = fetchurl { - name = "hast_util_to_html___hast_util_to_html_4.0.1.tgz"; - url = "https://registry.yarnpkg.com/hast-util-to-html/-/hast-util-to-html-4.0.1.tgz"; - sha1 = "3666b05afb62bd69f8f5e6c94db04dea19438e2a"; - }; - } - { - name = "hast_util_whitespace___hast_util_whitespace_1.0.3.tgz"; - path = fetchurl { - name = "hast_util_whitespace___hast_util_whitespace_1.0.3.tgz"; - url = "https://registry.yarnpkg.com/hast-util-whitespace/-/hast-util-whitespace-1.0.3.tgz"; - sha1 = "6d161b307bd0693b5ec000c7c7e8b5445109ee34"; - }; - } - { name = "he___he_1.2.0.tgz"; path = fetchurl { name = "he___he_1.2.0.tgz"; @@ -6194,14 +5698,6 @@ }; } { - name = "highlight.js___highlight.js_9.15.8.tgz"; - path = fetchurl { - name = "highlight.js___highlight.js_9.15.8.tgz"; - url = "https://registry.yarnpkg.com/highlight.js/-/highlight.js-9.15.8.tgz"; - sha1 = "f344fda123f36f1a65490e932cf90569e4999971"; - }; - } - { name = "highlight.js___highlight.js_9.13.1.tgz"; path = fetchurl { name = "highlight.js___highlight.js_9.13.1.tgz"; @@ -6282,14 +5778,6 @@ }; } { - name = "html_void_elements___html_void_elements_1.0.4.tgz"; - path = fetchurl { - name = "html_void_elements___html_void_elements_1.0.4.tgz"; - url = "https://registry.yarnpkg.com/html-void-elements/-/html-void-elements-1.0.4.tgz"; - sha1 = "95e8bb5ecd6b88766569c2645f2b5f1591db9ba5"; - }; - } - { name = "htmlparser2___htmlparser2_3.10.0.tgz"; path = fetchurl { name = "htmlparser2___htmlparser2_3.10.0.tgz"; @@ -6442,14 +5930,6 @@ }; } { - name = "immutable_tuple___immutable_tuple_0.4.9.tgz"; - path = fetchurl { - name = "immutable_tuple___immutable_tuple_0.4.9.tgz"; - url = "https://registry.yarnpkg.com/immutable-tuple/-/immutable-tuple-0.4.9.tgz"; - sha1 = "473ebdd6c169c461913a454bf87ef8f601a20ff0"; - }; - } - { name = "import_fresh___import_fresh_2.0.0.tgz"; path = fetchurl { name = "import_fresh___import_fresh_2.0.0.tgz"; @@ -6658,14 +6138,6 @@ }; } { - name = "is_absolute___is_absolute_1.0.0.tgz"; - path = fetchurl { - name = "is_absolute___is_absolute_1.0.0.tgz"; - url = "https://registry.yarnpkg.com/is-absolute/-/is-absolute-1.0.0.tgz"; - sha1 = "395e1ae84b11f26ad1795e73c17378e48a301576"; - }; - } - { name = "is_accessor_descriptor___is_accessor_descriptor_0.1.6.tgz"; path = fetchurl { name = "is_accessor_descriptor___is_accessor_descriptor_0.1.6.tgz"; @@ -6922,14 +6394,6 @@ }; } { - name = "is_negated_glob___is_negated_glob_1.0.0.tgz"; - path = fetchurl { - name = "is_negated_glob___is_negated_glob_1.0.0.tgz"; - url = "https://registry.yarnpkg.com/is-negated-glob/-/is-negated-glob-1.0.0.tgz"; - sha1 = "6910bca5da8c95e784b5751b976cf5a10fee36d2"; - }; - } - { name = "is_npm___is_npm_1.0.0.tgz"; path = fetchurl { name = "is_npm___is_npm_1.0.0.tgz"; @@ -7066,14 +6530,6 @@ }; } { - name = "is_relative___is_relative_1.0.0.tgz"; - path = fetchurl { - name = "is_relative___is_relative_1.0.0.tgz"; - url = "https://registry.yarnpkg.com/is-relative/-/is-relative-1.0.0.tgz"; - sha1 = "a1bb6935ce8c5dba1e8b9754b9b2dcc020e2260d"; - }; - } - { name = "is_resolvable___is_resolvable_1.1.0.tgz"; path = fetchurl { name = "is_resolvable___is_resolvable_1.1.0.tgz"; @@ -7090,14 +6546,6 @@ }; } { - name = "is_ssh___is_ssh_1.3.1.tgz"; - path = fetchurl { - name = "is_ssh___is_ssh_1.3.1.tgz"; - url = "https://registry.yarnpkg.com/is-ssh/-/is-ssh-1.3.1.tgz"; - sha1 = "f349a8cadd24e65298037a522cf7520f2e81a0f3"; - }; - } - { name = "is_stream___is_stream_1.1.0.tgz"; path = fetchurl { name = "is_stream___is_stream_1.1.0.tgz"; @@ -7122,14 +6570,6 @@ }; } { - name = "is_unc_path___is_unc_path_1.0.0.tgz"; - path = fetchurl { - name = "is_unc_path___is_unc_path_1.0.0.tgz"; - url = "https://registry.yarnpkg.com/is-unc-path/-/is-unc-path-1.0.0.tgz"; - sha1 = "d731e8898ed090a12c352ad2eaed5095ad322c9d"; - }; - } - { name = "is_utf8___is_utf8_0.2.1.tgz"; path = fetchurl { name = "is_utf8___is_utf8_0.2.1.tgz"; @@ -7138,14 +6578,6 @@ }; } { - name = "is_valid_glob___is_valid_glob_1.0.0.tgz"; - path = fetchurl { - name = "is_valid_glob___is_valid_glob_1.0.0.tgz"; - url = "https://registry.yarnpkg.com/is-valid-glob/-/is-valid-glob-1.0.0.tgz"; - sha1 = "29bf3eff701be2d4d315dbacc39bc39fe8f601aa"; - }; - } - { name = "is_whitespace_character___is_whitespace_character_1.0.2.tgz"; path = fetchurl { name = "is_whitespace_character___is_whitespace_character_1.0.2.tgz"; @@ -7338,6 +6770,14 @@ }; } { + name = "jest_canvas_mock___jest_canvas_mock_2.1.2.tgz"; + path = fetchurl { + name = "jest_canvas_mock___jest_canvas_mock_2.1.2.tgz"; + url = "https://registry.yarnpkg.com/jest-canvas-mock/-/jest-canvas-mock-2.1.2.tgz"; + sha1 = "0d16c9f91534f773fd132fc289f2e6b6db8faa28"; + }; + } + { name = "jest_changed_files___jest_changed_files_24.8.0.tgz"; path = fetchurl { name = "jest_changed_files___jest_changed_files_24.8.0.tgz"; @@ -7802,14 +7242,6 @@ }; } { - name = "jsonparse___jsonparse_1.3.1.tgz"; - path = fetchurl { - name = "jsonparse___jsonparse_1.3.1.tgz"; - url = "https://registry.yarnpkg.com/jsonparse/-/jsonparse-1.3.1.tgz"; - sha1 = "3f4dae4a91fac315f71062f8521cc239f1366280"; - }; - } - { name = "jsprim___jsprim_1.4.1.tgz"; path = fetchurl { name = "jsprim___jsprim_1.4.1.tgz"; @@ -7978,14 +7410,6 @@ }; } { - name = "lazystream___lazystream_1.0.0.tgz"; - path = fetchurl { - name = "lazystream___lazystream_1.0.0.tgz"; - url = "https://registry.yarnpkg.com/lazystream/-/lazystream-1.0.0.tgz"; - sha1 = "f6995fe0f820392f61396be89462407bb77168e4"; - }; - } - { name = "lcid___lcid_1.0.0.tgz"; path = fetchurl { name = "lcid___lcid_1.0.0.tgz"; @@ -8002,14 +7426,6 @@ }; } { - name = "lead___lead_1.0.0.tgz"; - path = fetchurl { - name = "lead___lead_1.0.0.tgz"; - url = "https://registry.yarnpkg.com/lead/-/lead-1.0.0.tgz"; - sha1 = "6f14f99a37be3a9dd784f5495690e5903466ee42"; - }; - } - { name = "left_pad___left_pad_1.3.0.tgz"; path = fetchurl { name = "left_pad___left_pad_1.3.0.tgz"; @@ -8066,14 +7482,6 @@ }; } { - name = "livereload_js___livereload_js_2.4.0.tgz"; - path = fetchurl { - name = "livereload_js___livereload_js_2.4.0.tgz"; - url = "https://registry.yarnpkg.com/livereload-js/-/livereload-js-2.4.0.tgz"; - sha1 = "447c31cf1ea9ab52fc20db615c5ddf678f78009c"; - }; - } - { name = "load_json_file___load_json_file_1.1.0.tgz"; path = fetchurl { name = "load_json_file___load_json_file_1.1.0.tgz"; @@ -8186,6 +7594,22 @@ }; } { + name = "lodash.isplainobject___lodash.isplainobject_4.0.6.tgz"; + path = fetchurl { + name = "lodash.isplainobject___lodash.isplainobject_4.0.6.tgz"; + url = "https://registry.yarnpkg.com/lodash.isplainobject/-/lodash.isplainobject-4.0.6.tgz"; + sha1 = "7c526a52d89b45c45cc690b88163be0497f550cb"; + }; + } + { + name = "lodash.isstring___lodash.isstring_4.0.1.tgz"; + path = fetchurl { + name = "lodash.isstring___lodash.isstring_4.0.1.tgz"; + url = "https://registry.yarnpkg.com/lodash.isstring/-/lodash.isstring-4.0.1.tgz"; + sha1 = "d527dfb5456eca7cc9bb95d5daeaf88ba54a5451"; + }; + } + { name = "lodash.kebabcase___lodash.kebabcase_4.1.1.tgz"; path = fetchurl { name = "lodash.kebabcase___lodash.kebabcase_4.1.1.tgz"; @@ -8514,46 +7938,6 @@ }; } { - name = "mdast_util_definitions___mdast_util_definitions_1.2.4.tgz"; - path = fetchurl { - name = "mdast_util_definitions___mdast_util_definitions_1.2.4.tgz"; - url = "https://registry.yarnpkg.com/mdast-util-definitions/-/mdast-util-definitions-1.2.4.tgz"; - sha1 = "2b54ad4eecaff9d9fcb6bf6f9f6b68b232d77ca7"; - }; - } - { - name = "mdast_util_inject___mdast_util_inject_1.1.0.tgz"; - path = fetchurl { - name = "mdast_util_inject___mdast_util_inject_1.1.0.tgz"; - url = "https://registry.yarnpkg.com/mdast-util-inject/-/mdast-util-inject-1.1.0.tgz"; - sha1 = "db06b8b585be959a2dcd2f87f472ba9b756f3675"; - }; - } - { - name = "mdast_util_to_hast___mdast_util_to_hast_3.0.4.tgz"; - path = fetchurl { - name = "mdast_util_to_hast___mdast_util_to_hast_3.0.4.tgz"; - url = "https://registry.yarnpkg.com/mdast-util-to-hast/-/mdast-util-to-hast-3.0.4.tgz"; - sha1 = "132001b266031192348d3366a6b011f28e54dc40"; - }; - } - { - name = "mdast_util_to_string___mdast_util_to_string_1.0.6.tgz"; - path = fetchurl { - name = "mdast_util_to_string___mdast_util_to_string_1.0.6.tgz"; - url = "https://registry.yarnpkg.com/mdast-util-to-string/-/mdast-util-to-string-1.0.6.tgz"; - sha1 = "7d85421021343b33de1552fc71cb8e5b4ae7536d"; - }; - } - { - name = "mdast_util_toc___mdast_util_toc_3.1.0.tgz"; - path = fetchurl { - name = "mdast_util_toc___mdast_util_toc_3.1.0.tgz"; - url = "https://registry.yarnpkg.com/mdast-util-toc/-/mdast-util-toc-3.1.0.tgz"; - sha1 = "395eeb877f067f9d2165d990d77c7eea6f740934"; - }; - } - { name = "mdurl___mdurl_1.0.1.tgz"; path = fetchurl { name = "mdurl___mdurl_1.0.1.tgz"; @@ -8642,11 +8026,11 @@ }; } { - name = "mermaid___mermaid_8.2.6.tgz"; + name = "mermaid___mermaid_8.4.2.tgz"; path = fetchurl { - name = "mermaid___mermaid_8.2.6.tgz"; - url = "https://registry.yarnpkg.com/mermaid/-/mermaid-8.2.6.tgz"; - sha1 = "e73f396461a435c39a998819171c2114f59e46e1"; + name = "mermaid___mermaid_8.4.2.tgz"; + url = "https://registry.yarnpkg.com/mermaid/-/mermaid-8.4.2.tgz"; + sha1 = "91d3d8e9541e72eed7a78d0e882db11564fab3bb"; }; } { @@ -8834,14 +8218,6 @@ }; } { - name = "module_deps_sortable___module_deps_sortable_5.0.0.tgz"; - path = fetchurl { - name = "module_deps_sortable___module_deps_sortable_5.0.0.tgz"; - url = "https://registry.yarnpkg.com/module-deps-sortable/-/module-deps-sortable-5.0.0.tgz"; - sha1 = "99db5bb08f7eab55e4c31f6b7c722c6a2144ba74"; - }; - } - { name = "moment_mini___moment_mini_2.22.1.tgz"; path = fetchurl { name = "moment_mini___moment_mini_2.22.1.tgz"; @@ -9154,22 +8530,6 @@ }; } { - name = "normalize_url___normalize_url_1.9.1.tgz"; - path = fetchurl { - name = "normalize_url___normalize_url_1.9.1.tgz"; - url = "https://registry.yarnpkg.com/normalize-url/-/normalize-url-1.9.1.tgz"; - sha1 = "2cc0d66b31ea23036458436e3620d85954c66c3c"; - }; - } - { - name = "now_and_later___now_and_later_2.0.1.tgz"; - path = fetchurl { - name = "now_and_later___now_and_later_2.0.1.tgz"; - url = "https://registry.yarnpkg.com/now-and-later/-/now-and-later-2.0.1.tgz"; - sha1 = "8e579c8685764a7cc02cb680380e94f43ccb1f7c"; - }; - } - { name = "npm_bundled___npm_bundled_1.0.6.tgz"; path = fetchurl { name = "npm_bundled___npm_bundled_1.0.6.tgz"; @@ -9362,11 +8722,11 @@ }; } { - name = "optimism___optimism_0.6.9.tgz"; + name = "optimism___optimism_0.10.3.tgz"; path = fetchurl { - name = "optimism___optimism_0.6.9.tgz"; - url = "https://registry.yarnpkg.com/optimism/-/optimism-0.6.9.tgz"; - sha1 = "19258ff8b3be0cea29ac35f06bff818e026e30bb"; + name = "optimism___optimism_0.10.3.tgz"; + url = "https://registry.yarnpkg.com/optimism/-/optimism-0.10.3.tgz"; + sha1 = "163268fdc741dea2fb50f300bedda80356445fd7"; }; } { @@ -9386,14 +8746,6 @@ }; } { - name = "ordered_read_streams___ordered_read_streams_1.0.1.tgz"; - path = fetchurl { - name = "ordered_read_streams___ordered_read_streams_1.0.1.tgz"; - url = "https://registry.yarnpkg.com/ordered-read-streams/-/ordered-read-streams-1.0.1.tgz"; - sha1 = "77c0cb37c41525d64166d990ffad7ec6a0e1363e"; - }; - } - { name = "orderedmap___orderedmap_1.0.0.tgz"; path = fetchurl { name = "orderedmap___orderedmap_1.0.0.tgz"; @@ -9610,27 +8962,19 @@ }; } { - name = "parse_entities___parse_entities_1.2.0.tgz"; + name = "parse_color___parse_color_1.0.0.tgz"; path = fetchurl { - name = "parse_entities___parse_entities_1.2.0.tgz"; - url = "https://registry.yarnpkg.com/parse-entities/-/parse-entities-1.2.0.tgz"; - sha1 = "9deac087661b2e36814153cb78d7e54a4c5fd6f4"; + name = "parse_color___parse_color_1.0.0.tgz"; + url = "https://registry.yarnpkg.com/parse-color/-/parse-color-1.0.0.tgz"; + sha1 = "7b748b95a83f03f16a94f535e52d7f3d94658619"; }; } { - name = "parse_filepath___parse_filepath_1.0.2.tgz"; - path = fetchurl { - name = "parse_filepath___parse_filepath_1.0.2.tgz"; - url = "https://registry.yarnpkg.com/parse-filepath/-/parse-filepath-1.0.2.tgz"; - sha1 = "a632127f53aaf3d15876f5872f3ffac763d6c891"; - }; - } - { - name = "parse_git_config___parse_git_config_0.2.0.tgz"; + name = "parse_entities___parse_entities_1.2.0.tgz"; path = fetchurl { - name = "parse_git_config___parse_git_config_0.2.0.tgz"; - url = "https://registry.yarnpkg.com/parse-git-config/-/parse-git-config-0.2.0.tgz"; - sha1 = "272833fdd15fea146fb75d336d236b963b6ff706"; + name = "parse_entities___parse_entities_1.2.0.tgz"; + url = "https://registry.yarnpkg.com/parse-entities/-/parse-entities-1.2.0.tgz"; + sha1 = "9deac087661b2e36814153cb78d7e54a4c5fd6f4"; }; } { @@ -9658,22 +9002,6 @@ }; } { - name = "parse_path___parse_path_3.0.4.tgz"; - path = fetchurl { - name = "parse_path___parse_path_3.0.4.tgz"; - url = "https://registry.yarnpkg.com/parse-path/-/parse-path-3.0.4.tgz"; - sha1 = "a48b7b529da41f34d9d1428602a39b29fc7180e4"; - }; - } - { - name = "parse_url___parse_url_3.0.2.tgz"; - path = fetchurl { - name = "parse_url___parse_url_3.0.2.tgz"; - url = "https://registry.yarnpkg.com/parse-url/-/parse-url-3.0.2.tgz"; - sha1 = "602787a7063a795d72b8673197505e72f60610be"; - }; - } - { name = "parse5___parse5_4.0.0.tgz"; path = fetchurl { name = "parse5___parse5_4.0.0.tgz"; @@ -9794,22 +9122,6 @@ }; } { - name = "path_root_regex___path_root_regex_0.1.2.tgz"; - path = fetchurl { - name = "path_root_regex___path_root_regex_0.1.2.tgz"; - url = "https://registry.yarnpkg.com/path-root-regex/-/path-root-regex-0.1.2.tgz"; - sha1 = "bfccdc8df5b12dc52c8b43ec38d18d72c04ba96d"; - }; - } - { - name = "path_root___path_root_0.1.1.tgz"; - path = fetchurl { - name = "path_root___path_root_0.1.1.tgz"; - url = "https://registry.yarnpkg.com/path-root/-/path-root-0.1.1.tgz"; - sha1 = "9a4a6814cac1c0cd73360a95f32083c8ea4745b7"; - }; - } - { name = "path_to_regexp___path_to_regexp_0.1.7.tgz"; path = fetchurl { name = "path_to_regexp___path_to_regexp_0.1.7.tgz"; @@ -10194,11 +9506,11 @@ }; } { - name = "postcss___postcss_7.0.18.tgz"; + name = "postcss___postcss_7.0.21.tgz"; path = fetchurl { - name = "postcss___postcss_7.0.18.tgz"; - url = "https://registry.yarnpkg.com/postcss/-/postcss-7.0.18.tgz"; - sha1 = "4b9cda95ae6c069c67a4d933029eddd4838ac233"; + name = "postcss___postcss_7.0.21.tgz"; + url = "https://registry.yarnpkg.com/postcss/-/postcss-7.0.21.tgz"; + sha1 = "06bb07824c19c2021c5d056d5b10c35b989f7e17"; }; } { @@ -10258,14 +9570,6 @@ }; } { - name = "process_nextick_args___process_nextick_args_2.0.1.tgz"; - path = fetchurl { - name = "process_nextick_args___process_nextick_args_2.0.1.tgz"; - url = "https://registry.yarnpkg.com/process-nextick-args/-/process-nextick-args-2.0.1.tgz"; - sha1 = "7820d9b16120cc55ca9ae7792680ae7dba6d7fe2"; - }; - } - { name = "process_nextick_args___process_nextick_args_1.0.7.tgz"; path = fetchurl { name = "process_nextick_args___process_nextick_args_1.0.7.tgz"; @@ -10274,6 +9578,14 @@ }; } { + name = "process_nextick_args___process_nextick_args_2.0.1.tgz"; + path = fetchurl { + name = "process_nextick_args___process_nextick_args_2.0.1.tgz"; + url = "https://registry.yarnpkg.com/process-nextick-args/-/process-nextick-args-2.0.1.tgz"; + sha1 = "7820d9b16120cc55ca9ae7792680ae7dba6d7fe2"; + }; + } + { name = "process___process_0.11.10.tgz"; path = fetchurl { name = "process___process_0.11.10.tgz"; @@ -10306,14 +9618,6 @@ }; } { - name = "property_information___property_information_4.2.0.tgz"; - path = fetchurl { - name = "property_information___property_information_4.2.0.tgz"; - url = "https://registry.yarnpkg.com/property-information/-/property-information-4.2.0.tgz"; - sha1 = "f0e66e07cbd6fed31d96844d958d153ad3eb486e"; - }; - } - { name = "prosemirror_commands___prosemirror_commands_1.0.7.tgz"; path = fetchurl { name = "prosemirror_commands___prosemirror_commands_1.0.7.tgz"; @@ -10434,14 +9738,6 @@ }; } { - name = "protocols___protocols_1.4.7.tgz"; - path = fetchurl { - name = "protocols___protocols_1.4.7.tgz"; - url = "https://registry.yarnpkg.com/protocols/-/protocols-1.4.7.tgz"; - sha1 = "95f788a4f0e979b291ffefcf5636ad113d037d32"; - }; - } - { name = "proxy_addr___proxy_addr_2.0.5.tgz"; path = fetchurl { name = "proxy_addr___proxy_addr_2.0.5.tgz"; @@ -10562,14 +9858,6 @@ }; } { - name = "query_string___query_string_4.3.4.tgz"; - path = fetchurl { - name = "query_string___query_string_4.3.4.tgz"; - url = "https://registry.yarnpkg.com/query-string/-/query-string-4.3.4.tgz"; - sha1 = "bbb693b9ca915c232515b228b1a02b609043dbeb"; - }; - } - { name = "querystring_es3___querystring_es3_0.2.1.tgz"; path = fetchurl { name = "querystring_es3___querystring_es3_0.2.1.tgz"; @@ -10634,14 +9922,6 @@ }; } { - name = "raven_js___raven_js_3.22.1.tgz"; - path = fetchurl { - name = "raven_js___raven_js_3.22.1.tgz"; - url = "https://registry.yarnpkg.com/raven-js/-/raven-js-3.22.1.tgz"; - sha1 = "1117f00dfefaa427ef6e1a7d50bbb1fb998a24da"; - }; - } - { name = "raw_body___raw_body_2.4.0.tgz"; path = fetchurl { name = "raw_body___raw_body_2.4.0.tgz"; @@ -10650,14 +9930,6 @@ }; } { - name = "raw_body___raw_body_1.1.7.tgz"; - path = fetchurl { - name = "raw_body___raw_body_1.1.7.tgz"; - url = "https://registry.yarnpkg.com/raw-body/-/raw-body-1.1.7.tgz"; - sha1 = "1d027c2bfa116acc6623bca8f00016572a87d425"; - }; - } - { name = "raw_loader___raw_loader_3.1.0.tgz"; path = fetchurl { name = "raw_loader___raw_loader_3.1.0.tgz"; @@ -10762,14 +10034,6 @@ }; } { - name = "readable_stream___readable_stream_2.1.5.tgz"; - path = fetchurl { - name = "readable_stream___readable_stream_2.1.5.tgz"; - url = "https://registry.yarnpkg.com/readable-stream/-/readable-stream-2.1.5.tgz"; - sha1 = "66fa8b720e1438b364681f2ad1a63c618448c9d0"; - }; - } - { name = "readdir_enhanced___readdir_enhanced_2.2.4.tgz"; path = fetchurl { name = "readdir_enhanced___readdir_enhanced_2.2.4.tgz"; @@ -10930,22 +10194,6 @@ }; } { - name = "remark_html___remark_html_8.0.0.tgz"; - path = fetchurl { - name = "remark_html___remark_html_8.0.0.tgz"; - url = "https://registry.yarnpkg.com/remark-html/-/remark-html-8.0.0.tgz"; - sha1 = "9fcb859a6f3cb40f3ef15402950f1a62ec301b3a"; - }; - } - { - name = "remark_parse___remark_parse_5.0.0.tgz"; - path = fetchurl { - name = "remark_parse___remark_parse_5.0.0.tgz"; - url = "https://registry.yarnpkg.com/remark-parse/-/remark-parse-5.0.0.tgz"; - sha1 = "4c077f9e499044d1d5c13f80d7a98cf7b9285d95"; - }; - } - { name = "remark_parse___remark_parse_6.0.3.tgz"; path = fetchurl { name = "remark_parse___remark_parse_6.0.3.tgz"; @@ -10954,30 +10202,6 @@ }; } { - name = "remark_reference_links___remark_reference_links_4.0.4.tgz"; - path = fetchurl { - name = "remark_reference_links___remark_reference_links_4.0.4.tgz"; - url = "https://registry.yarnpkg.com/remark-reference-links/-/remark-reference-links-4.0.4.tgz"; - sha1 = "190579a0d6b002859d6cdbdc5aeb8bbdae4e06ab"; - }; - } - { - name = "remark_slug___remark_slug_5.1.2.tgz"; - path = fetchurl { - name = "remark_slug___remark_slug_5.1.2.tgz"; - url = "https://registry.yarnpkg.com/remark-slug/-/remark-slug-5.1.2.tgz"; - sha1 = "715ecdef8df1226786204b1887d31ab16aa24609"; - }; - } - { - name = "remark_stringify___remark_stringify_5.0.0.tgz"; - path = fetchurl { - name = "remark_stringify___remark_stringify_5.0.0.tgz"; - url = "https://registry.yarnpkg.com/remark-stringify/-/remark-stringify-5.0.0.tgz"; - sha1 = "336d3a4d4a6a3390d933eeba62e8de4bd280afba"; - }; - } - { name = "remark_stringify___remark_stringify_6.0.4.tgz"; path = fetchurl { name = "remark_stringify___remark_stringify_6.0.4.tgz"; @@ -10986,14 +10210,6 @@ }; } { - name = "remark_toc___remark_toc_5.1.1.tgz"; - path = fetchurl { - name = "remark_toc___remark_toc_5.1.1.tgz"; - url = "https://registry.yarnpkg.com/remark-toc/-/remark-toc-5.1.1.tgz"; - sha1 = "8c229d6f834cdb43fde6685e2d43248d3fc82d78"; - }; - } - { name = "remark___remark_10.0.1.tgz"; path = fetchurl { name = "remark___remark_10.0.1.tgz"; @@ -11002,38 +10218,6 @@ }; } { - name = "remark___remark_9.0.0.tgz"; - path = fetchurl { - name = "remark___remark_9.0.0.tgz"; - url = "https://registry.yarnpkg.com/remark/-/remark-9.0.0.tgz"; - sha1 = "c5cfa8ec535c73a67c4b0f12bfdbd3a67d8b2f60"; - }; - } - { - name = "remote_origin_url___remote_origin_url_0.4.0.tgz"; - path = fetchurl { - name = "remote_origin_url___remote_origin_url_0.4.0.tgz"; - url = "https://registry.yarnpkg.com/remote-origin-url/-/remote-origin-url-0.4.0.tgz"; - sha1 = "4d3e2902f34e2d37d1c263d87710b77eb4086a30"; - }; - } - { - name = "remove_bom_buffer___remove_bom_buffer_3.0.0.tgz"; - path = fetchurl { - name = "remove_bom_buffer___remove_bom_buffer_3.0.0.tgz"; - url = "https://registry.yarnpkg.com/remove-bom-buffer/-/remove-bom-buffer-3.0.0.tgz"; - sha1 = "c2bf1e377520d324f623892e33c10cac2c252b53"; - }; - } - { - name = "remove_bom_stream___remove_bom_stream_1.2.0.tgz"; - path = fetchurl { - name = "remove_bom_stream___remove_bom_stream_1.2.0.tgz"; - url = "https://registry.yarnpkg.com/remove-bom-stream/-/remove-bom-stream-1.2.0.tgz"; - sha1 = "05f1a593f16e42e1fb90ebf59de8e569525f9523"; - }; - } - { name = "remove_trailing_separator___remove_trailing_separator_1.1.0.tgz"; path = fetchurl { name = "remove_trailing_separator___remove_trailing_separator_1.1.0.tgz"; @@ -11202,14 +10386,6 @@ }; } { - name = "resolve_options___resolve_options_1.1.0.tgz"; - path = fetchurl { - name = "resolve_options___resolve_options_1.1.0.tgz"; - url = "https://registry.yarnpkg.com/resolve-options/-/resolve-options-1.1.0.tgz"; - sha1 = "32bb9e39c06d67338dc9378c0d6d6074566ad131"; - }; - } - { name = "resolve_url___resolve_url_0.2.1.tgz"; path = fetchurl { name = "resolve_url___resolve_url_0.2.1.tgz"; @@ -11338,14 +10514,6 @@ }; } { - name = "safe_json_parse___safe_json_parse_1.0.1.tgz"; - path = fetchurl { - name = "safe_json_parse___safe_json_parse_1.0.1.tgz"; - url = "https://registry.yarnpkg.com/safe-json-parse/-/safe-json-parse-1.0.1.tgz"; - sha1 = "3e76723e38dfdda13c9b1d29a1e07ffee4b30b57"; - }; - } - { name = "safe_regex___safe_regex_1.1.0.tgz"; path = fetchurl { name = "safe_regex___safe_regex_1.1.0.tgz"; @@ -11370,11 +10538,11 @@ }; } { - name = "sanitize_html___sanitize_html_1.16.3.tgz"; + name = "sanitize_html___sanitize_html_1.20.1.tgz"; path = fetchurl { - name = "sanitize_html___sanitize_html_1.16.3.tgz"; - url = "https://registry.yarnpkg.com/sanitize-html/-/sanitize-html-1.16.3.tgz"; - sha1 = "96c1b44a36ff7312e1c22a14b05274370ac8bd56"; + name = "sanitize_html___sanitize_html_1.20.1.tgz"; + url = "https://registry.yarnpkg.com/sanitize-html/-/sanitize-html-1.20.1.tgz"; + sha1 = "f6effdf55dd398807171215a62bfc21811bacf85"; }; } { @@ -11778,14 +10946,6 @@ }; } { - name = "sort_keys___sort_keys_1.1.2.tgz"; - path = fetchurl { - name = "sort_keys___sort_keys_1.1.2.tgz"; - url = "https://registry.yarnpkg.com/sort-keys/-/sort-keys-1.1.2.tgz"; - sha1 = "441b6d4d346798f1b4e49e8920adfba0e543f9ad"; - }; - } - { name = "sortablejs___sortablejs_1.10.0.tgz"; path = fetchurl { name = "sortablejs___sortablejs_1.10.0.tgz"; @@ -11866,14 +11026,6 @@ }; } { - name = "space_separated_tokens___space_separated_tokens_1.1.4.tgz"; - path = fetchurl { - name = "space_separated_tokens___space_separated_tokens_1.1.4.tgz"; - url = "https://registry.yarnpkg.com/space-separated-tokens/-/space-separated-tokens-1.1.4.tgz"; - sha1 = "27910835ae00d0adfcdbd0ad7e611fb9544351fa"; - }; - } - { name = "spdx_correct___spdx_correct_1.0.2.tgz"; path = fetchurl { name = "spdx_correct___spdx_correct_1.0.2.tgz"; @@ -12034,14 +11186,6 @@ }; } { - name = "stream_array___stream_array_1.1.2.tgz"; - path = fetchurl { - name = "stream_array___stream_array_1.1.2.tgz"; - url = "https://registry.yarnpkg.com/stream-array/-/stream-array-1.1.2.tgz"; - sha1 = "9e5f7345f2137c30ee3b498b9114e80b52bb7eb5"; - }; - } - { name = "stream_browserify___stream_browserify_2.0.1.tgz"; path = fetchurl { name = "stream_browserify___stream_browserify_2.0.1.tgz"; @@ -12050,14 +11194,6 @@ }; } { - name = "stream_combiner2___stream_combiner2_1.1.1.tgz"; - path = fetchurl { - name = "stream_combiner2___stream_combiner2_1.1.1.tgz"; - url = "https://registry.yarnpkg.com/stream-combiner2/-/stream-combiner2-1.1.1.tgz"; - sha1 = "fb4d8a1420ea362764e21ad4780397bebcb41cbe"; - }; - } - { name = "stream_each___stream_each_1.2.2.tgz"; path = fetchurl { name = "stream_each___stream_each_1.2.2.tgz"; @@ -12090,14 +11226,6 @@ }; } { - name = "strict_uri_encode___strict_uri_encode_1.1.0.tgz"; - path = fetchurl { - name = "strict_uri_encode___strict_uri_encode_1.1.0.tgz"; - url = "https://registry.yarnpkg.com/strict-uri-encode/-/strict-uri-encode-1.1.0.tgz"; - sha1 = "279b225df1d582b1f54e65addd4352e18faa0713"; - }; - } - { name = "string_length___string_length_2.0.0.tgz"; path = fetchurl { name = "string_length___string_length_2.0.0.tgz"; @@ -12106,14 +11234,6 @@ }; } { - name = "string_template___string_template_0.2.1.tgz"; - path = fetchurl { - name = "string_template___string_template_0.2.1.tgz"; - url = "https://registry.yarnpkg.com/string-template/-/string-template-0.2.1.tgz"; - sha1 = "42932e598a352d01fc22ec3367d9d84eec6c9add"; - }; - } - { name = "string_width___string_width_1.0.2.tgz"; path = fetchurl { name = "string_width___string_width_1.0.2.tgz"; @@ -12146,14 +11266,6 @@ }; } { - name = "string_decoder___string_decoder_0.10.31.tgz"; - path = fetchurl { - name = "string_decoder___string_decoder_0.10.31.tgz"; - url = "https://registry.yarnpkg.com/string_decoder/-/string_decoder-0.10.31.tgz"; - sha1 = "62e203bc41766c6c28c9fc84301dab1c5310fa94"; - }; - } - { name = "string_decoder___string_decoder_1.1.1.tgz"; path = fetchurl { name = "string_decoder___string_decoder_1.1.1.tgz"; @@ -12162,6 +11274,14 @@ }; } { + name = "string_decoder___string_decoder_0.10.31.tgz"; + path = fetchurl { + name = "string_decoder___string_decoder_0.10.31.tgz"; + url = "https://registry.yarnpkg.com/string_decoder/-/string_decoder-0.10.31.tgz"; + sha1 = "62e203bc41766c6c28c9fc84301dab1c5310fa94"; + }; + } + { name = "stringify_entities___stringify_entities_1.3.2.tgz"; path = fetchurl { name = "stringify_entities___stringify_entities_1.3.2.tgz"; @@ -12290,14 +11410,6 @@ }; } { - name = "subarg___subarg_1.0.0.tgz"; - path = fetchurl { - name = "subarg___subarg_1.0.0.tgz"; - url = "https://registry.yarnpkg.com/subarg/-/subarg-1.0.0.tgz"; - sha1 = "f62cf17581e996b48fc965699f54c06ae268b8d2"; - }; - } - { name = "sugarss___sugarss_2.0.0.tgz"; path = fetchurl { name = "sugarss___sugarss_2.0.0.tgz"; @@ -12498,14 +11610,6 @@ }; } { - name = "through2_filter___through2_filter_3.0.0.tgz"; - path = fetchurl { - name = "through2_filter___through2_filter_3.0.0.tgz"; - url = "https://registry.yarnpkg.com/through2-filter/-/through2-filter-3.0.0.tgz"; - sha1 = "700e786df2367c2c88cd8aa5be4cf9c1e7831254"; - }; - } - { name = "through2___through2_2.0.5.tgz"; path = fetchurl { name = "through2___through2_2.0.5.tgz"; @@ -12570,14 +11674,6 @@ }; } { - name = "tiny_lr___tiny_lr_1.1.1.tgz"; - path = fetchurl { - name = "tiny_lr___tiny_lr_1.1.1.tgz"; - url = "https://registry.yarnpkg.com/tiny-lr/-/tiny-lr-1.1.1.tgz"; - sha1 = "9fa547412f238fedb068ee295af8b682c98b2aab"; - }; - } - { name = "tiptap_commands___tiptap_commands_1.4.0.tgz"; path = fetchurl { name = "tiptap_commands___tiptap_commands_1.4.0.tgz"; @@ -12626,14 +11722,6 @@ }; } { - name = "to_absolute_glob___to_absolute_glob_2.0.2.tgz"; - path = fetchurl { - name = "to_absolute_glob___to_absolute_glob_2.0.2.tgz"; - url = "https://registry.yarnpkg.com/to-absolute-glob/-/to-absolute-glob-2.0.2.tgz"; - sha1 = "1865f43d9e74b0822db9f145b78cff7d0f7c849b"; - }; - } - { name = "to_array___to_array_0.1.4.tgz"; path = fetchurl { name = "to_array___to_array_0.1.4.tgz"; @@ -12690,14 +11778,6 @@ }; } { - name = "to_through___to_through_2.0.0.tgz"; - path = fetchurl { - name = "to_through___to_through_2.0.0.tgz"; - url = "https://registry.yarnpkg.com/to-through/-/to-through-2.0.0.tgz"; - sha1 = "fc92adaba072647bc0b67d6b03664aa195093af6"; - }; - } - { name = "toggle_selection___toggle_selection_1.0.6.tgz"; path = fetchurl { name = "toggle_selection___toggle_selection_1.0.6.tgz"; @@ -12738,14 +11818,6 @@ }; } { - name = "trim_lines___trim_lines_1.1.2.tgz"; - path = fetchurl { - name = "trim_lines___trim_lines_1.1.2.tgz"; - url = "https://registry.yarnpkg.com/trim-lines/-/trim-lines-1.1.2.tgz"; - sha1 = "c8adbdbdae21bb5c2766240a661f693afe23e59b"; - }; - } - { name = "trim_newlines___trim_newlines_1.0.0.tgz"; path = fetchurl { name = "trim_newlines___trim_newlines_1.0.0.tgz"; @@ -12818,14 +11890,6 @@ }; } { - name = "ts_invariant___ts_invariant_0.2.1.tgz"; - path = fetchurl { - name = "ts_invariant___ts_invariant_0.2.1.tgz"; - url = "https://registry.yarnpkg.com/ts-invariant/-/ts-invariant-0.2.1.tgz"; - sha1 = "3d587f9d6e3bded97bf9ec17951dd9814d5a9d3f"; - }; - } - { name = "ts_invariant___ts_invariant_0.3.2.tgz"; path = fetchurl { name = "ts_invariant___ts_invariant_0.3.2.tgz"; @@ -12834,6 +11898,14 @@ }; } { + name = "ts_invariant___ts_invariant_0.4.4.tgz"; + path = fetchurl { + name = "ts_invariant___ts_invariant_0.4.4.tgz"; + url = "https://registry.yarnpkg.com/ts-invariant/-/ts-invariant-0.4.4.tgz"; + sha1 = "97a523518688f93aafad01b0e80eb803eb2abd86"; + }; + } + { name = "ts_jest___ts_jest_24.0.0.tgz"; path = fetchurl { name = "ts_jest___ts_jest_24.0.0.tgz"; @@ -12882,6 +11954,14 @@ }; } { + name = "type_fest___type_fest_0.5.2.tgz"; + path = fetchurl { + name = "type_fest___type_fest_0.5.2.tgz"; + url = "https://registry.yarnpkg.com/type-fest/-/type-fest-0.5.2.tgz"; + sha1 = "d6ef42a0356c6cd45f49485c3b6281fc148e48a2"; + }; + } + { name = "type_is___type_is_1.6.18.tgz"; path = fetchurl { name = "type_is___type_is_1.6.18.tgz"; @@ -12930,14 +12010,6 @@ }; } { - name = "unc_path_regex___unc_path_regex_0.1.2.tgz"; - path = fetchurl { - name = "unc_path_regex___unc_path_regex_0.1.2.tgz"; - url = "https://registry.yarnpkg.com/unc-path-regex/-/unc-path-regex-0.1.2.tgz"; - sha1 = "e73dd3d7b0d7c5ed86fbac6b0ae7d8c6a69d50fa"; - }; - } - { name = "undefsafe___undefsafe_2.0.2.tgz"; path = fetchurl { name = "undefsafe___undefsafe_2.0.2.tgz"; @@ -13018,14 +12090,6 @@ }; } { - name = "unified___unified_6.2.0.tgz"; - path = fetchurl { - name = "unified___unified_6.2.0.tgz"; - url = "https://registry.yarnpkg.com/unified/-/unified-6.2.0.tgz"; - sha1 = "7fbd630f719126d67d40c644b7e3f617035f6dba"; - }; - } - { name = "unified___unified_7.1.0.tgz"; path = fetchurl { name = "unified___unified_7.1.0.tgz"; @@ -13066,14 +12130,6 @@ }; } { - name = "unique_stream___unique_stream_2.3.1.tgz"; - path = fetchurl { - name = "unique_stream___unique_stream_2.3.1.tgz"; - url = "https://registry.yarnpkg.com/unique-stream/-/unique-stream-2.3.1.tgz"; - sha1 = "c65d110e9a4adf9a6c5948b28053d9a8d04cbeac"; - }; - } - { name = "unique_string___unique_string_1.0.0.tgz"; path = fetchurl { name = "unique_string___unique_string_1.0.0.tgz"; @@ -13082,14 +12138,6 @@ }; } { - name = "unist_builder___unist_builder_1.0.4.tgz"; - path = fetchurl { - name = "unist_builder___unist_builder_1.0.4.tgz"; - url = "https://registry.yarnpkg.com/unist-builder/-/unist-builder-1.0.4.tgz"; - sha1 = "e1808aed30bd72adc3607f25afecebef4dd59e17"; - }; - } - { name = "unist_util_find_all_after___unist_util_find_all_after_1.0.2.tgz"; path = fetchurl { name = "unist_util_find_all_after___unist_util_find_all_after_1.0.2.tgz"; @@ -13098,14 +12146,6 @@ }; } { - name = "unist_util_generated___unist_util_generated_1.1.4.tgz"; - path = fetchurl { - name = "unist_util_generated___unist_util_generated_1.1.4.tgz"; - url = "https://registry.yarnpkg.com/unist-util-generated/-/unist-util-generated-1.1.4.tgz"; - sha1 = "2261c033d9fc23fae41872cdb7663746e972c1a7"; - }; - } - { name = "unist_util_is___unist_util_is_2.1.2.tgz"; path = fetchurl { name = "unist_util_is___unist_util_is_2.1.2.tgz"; @@ -13114,14 +12154,6 @@ }; } { - name = "unist_util_position___unist_util_position_3.0.3.tgz"; - path = fetchurl { - name = "unist_util_position___unist_util_position_3.0.3.tgz"; - url = "https://registry.yarnpkg.com/unist-util-position/-/unist-util-position-3.0.3.tgz"; - sha1 = "fff942b879538b242096c148153826664b1ca373"; - }; - } - { name = "unist_util_remove_position___unist_util_remove_position_1.1.2.tgz"; path = fetchurl { name = "unist_util_remove_position___unist_util_remove_position_1.1.2.tgz"; @@ -13138,14 +12170,6 @@ }; } { - name = "unist_util_stringify_position___unist_util_stringify_position_2.0.1.tgz"; - path = fetchurl { - name = "unist_util_stringify_position___unist_util_stringify_position_2.0.1.tgz"; - url = "https://registry.yarnpkg.com/unist-util-stringify-position/-/unist-util-stringify-position-2.0.1.tgz"; - sha1 = "de2a2bc8d3febfa606652673a91455b6a36fb9f3"; - }; - } - { name = "unist_util_visit_parents___unist_util_visit_parents_2.0.1.tgz"; path = fetchurl { name = "unist_util_visit_parents___unist_util_visit_parents_2.0.1.tgz"; @@ -13362,14 +12386,6 @@ }; } { - name = "value_or_function___value_or_function_3.0.0.tgz"; - path = fetchurl { - name = "value_or_function___value_or_function_3.0.0.tgz"; - url = "https://registry.yarnpkg.com/value-or-function/-/value-or-function-3.0.0.tgz"; - sha1 = "1c243a50b595c1be54a754bfece8563b9ff8d813"; - }; - } - { name = "vary___vary_1.1.2.tgz"; path = fetchurl { name = "vary___vary_1.1.2.tgz"; @@ -13402,46 +12418,6 @@ }; } { - name = "vfile_message___vfile_message_2.0.1.tgz"; - path = fetchurl { - name = "vfile_message___vfile_message_2.0.1.tgz"; - url = "https://registry.yarnpkg.com/vfile-message/-/vfile-message-2.0.1.tgz"; - sha1 = "951881861c22fc1eb39f873c0b93e336a64e8f6d"; - }; - } - { - name = "vfile_reporter___vfile_reporter_6.0.0.tgz"; - path = fetchurl { - name = "vfile_reporter___vfile_reporter_6.0.0.tgz"; - url = "https://registry.yarnpkg.com/vfile-reporter/-/vfile-reporter-6.0.0.tgz"; - sha1 = "753119f51dec9289b7508b457afc0cddf5e07f2e"; - }; - } - { - name = "vfile_sort___vfile_sort_2.2.1.tgz"; - path = fetchurl { - name = "vfile_sort___vfile_sort_2.2.1.tgz"; - url = "https://registry.yarnpkg.com/vfile-sort/-/vfile-sort-2.2.1.tgz"; - sha1 = "74e714f9175618cdae96bcaedf1a3dc711d87567"; - }; - } - { - name = "vfile_statistics___vfile_statistics_1.1.3.tgz"; - path = fetchurl { - name = "vfile_statistics___vfile_statistics_1.1.3.tgz"; - url = "https://registry.yarnpkg.com/vfile-statistics/-/vfile-statistics-1.1.3.tgz"; - sha1 = "e9c87071997fbcb4243764d2c3805e0bb0820c60"; - }; - } - { - name = "vfile___vfile_2.3.0.tgz"; - path = fetchurl { - name = "vfile___vfile_2.3.0.tgz"; - url = "https://registry.yarnpkg.com/vfile/-/vfile-2.3.0.tgz"; - sha1 = "e62d8e72b20e83c324bc6c67278ee272488bf84a"; - }; - } - { name = "vfile___vfile_3.0.1.tgz"; path = fetchurl { name = "vfile___vfile_3.0.1.tgz"; @@ -13450,38 +12426,6 @@ }; } { - name = "vfile___vfile_4.0.1.tgz"; - path = fetchurl { - name = "vfile___vfile_4.0.1.tgz"; - url = "https://registry.yarnpkg.com/vfile/-/vfile-4.0.1.tgz"; - sha1 = "fc3d43a1c71916034216bf65926d5ee3c64ed60c"; - }; - } - { - name = "vinyl_fs___vinyl_fs_3.0.3.tgz"; - path = fetchurl { - name = "vinyl_fs___vinyl_fs_3.0.3.tgz"; - url = "https://registry.yarnpkg.com/vinyl-fs/-/vinyl-fs-3.0.3.tgz"; - sha1 = "c85849405f67428feabbbd5c5dbdd64f47d31bc7"; - }; - } - { - name = "vinyl_sourcemap___vinyl_sourcemap_1.1.0.tgz"; - path = fetchurl { - name = "vinyl_sourcemap___vinyl_sourcemap_1.1.0.tgz"; - url = "https://registry.yarnpkg.com/vinyl-sourcemap/-/vinyl-sourcemap-1.1.0.tgz"; - sha1 = "92a800593a38703a8cdb11d8b300ad4be63b3e16"; - }; - } - { - name = "vinyl___vinyl_2.2.0.tgz"; - path = fetchurl { - name = "vinyl___vinyl_2.2.0.tgz"; - url = "https://registry.yarnpkg.com/vinyl/-/vinyl-2.2.0.tgz"; - sha1 = "d85b07da96e458d25b2ffe19fece9f2caa13ed86"; - }; - } - { name = "visibilityjs___visibilityjs_1.2.4.tgz"; path = fetchurl { name = "visibilityjs___visibilityjs_1.2.4.tgz"; diff --git a/pkgs/applications/version-management/gource/default.nix b/pkgs/applications/version-management/gource/default.nix index 371d9d83e29..2ce855d3a7f 100644 --- a/pkgs/applications/version-management/gource/default.nix +++ b/pkgs/applications/version-management/gource/default.nix @@ -3,12 +3,12 @@ }: stdenv.mkDerivation rec { - version = "0.49"; + version = "0.51"; pname = "gource"; src = fetchurl { url = "https://github.com/acaudwell/Gource/releases/download/${pname}-${version}/${pname}-${version}.tar.gz"; - sha256 = "12hf5ipcsp9dxsqn84n4kr63xaiskrnf5a084wr29qk171lj7pd9"; + sha256 = "16p7b1x4r0915w883lp374jcdqqja37fnb7m8vnsfnl2n64gi8qr"; }; nativeBuildInputs = [ pkgconfig ]; diff --git a/pkgs/applications/version-management/yadm/default.nix b/pkgs/applications/version-management/yadm/default.nix index 66b785e43b1..bebc9fef0c6 100644 --- a/pkgs/applications/version-management/yadm/default.nix +++ b/pkgs/applications/version-management/yadm/default.nix @@ -1,10 +1,12 @@ -{ stdenv, fetchFromGitHub }: +{ stdenv, fetchFromGitHub, git, gnupg }: let version = "1.12.0"; in stdenv.mkDerivation { pname = "yadm"; inherit version; + buildInputs = [ git gnupg ]; + src = fetchFromGitHub { owner = "TheLocehiliosan"; repo = "yadm"; @@ -12,26 +14,26 @@ stdenv.mkDerivation { sha256 = "0873jgks7dpfkj5km1jchxdrhf7lia70p0f8zsrh9p4crj5f4pc6"; }; - buildCommand = '' - mkdir -p $out/bin - mkdir -p $out/share/man/man1 - mkdir -p $out/share/zsh/site-functions - mkdir -p $out/share/bash-completion/completions - sed -e 's:/bin/bash:/usr/bin/env bash:' $src/yadm > $out/bin/yadm - chmod 755 $out/bin/yadm - install -m 644 $src/yadm.1 $out/share/man/man1/yadm.1 - install -m644 $src/completion/yadm.zsh_completion $out/share/zsh/site-functions/_yadm - install -m644 $src/completion/yadm.bash_completion $out/share/bash-completion/completions/yadm.bash + dontConfigure = true; + dontBuild = true; + + installPhase = '' + runHook preInstall + install -Dt $out/bin $src/yadm + install -Dt $out/share/man/man1 $src/yadm.1 + install -D $src/completion/yadm.zsh_completion $out/share/zsh/site-functions/_yadm + install -D $src/completion/yadm.bash_completion $out/share/bash-completion/completions/yadm.bash + runHook postInstall ''; meta = { homepage = https://github.com/TheLocehiliosan/yadm; description = "Yet Another Dotfiles Manager"; longDescription = '' - yadm is a dotfile management tool with 3 main features: Manages files across - systems using a single Git repository. Provides a way to use alternate files on - a specific OS or host. Supplies a method of encrypting confidential data so it - can safely be stored in your repository. + yadm is a dotfile management tool with 3 main features: + * Manages files across systems using a single Git repository. + * Provides a way to use alternate files on a specific OS or host. + * Supplies a method of encrypting confidential data so it can safely be stored in your repository. ''; license = stdenv.lib.licenses.gpl3; platforms = stdenv.lib.platforms.unix; diff --git a/pkgs/applications/video/smplayer/default.nix b/pkgs/applications/video/smplayer/default.nix index facb8fabe26..65a7f358d6f 100644 --- a/pkgs/applications/video/smplayer/default.nix +++ b/pkgs/applications/video/smplayer/default.nix @@ -2,11 +2,11 @@ mkDerivation rec { pname = "smplayer"; - version = "19.10.0"; + version = "19.10.2"; src = fetchurl { url = "mirror://sourceforge/${pname}/${pname}-${version}.tar.bz2"; - sha256 = "0sq7hr10b4pbbi0y1q4mxs24h2lb042nv4rqr03r72bp57353xsl"; + sha256 = "0i2c15yxk4by2zyjhb7n08larz9pmpa6zw383aybjxqh0nd9zv9p"; }; buildInputs = [ qtscript ]; diff --git a/pkgs/applications/virtualization/charliecloud/default.nix b/pkgs/applications/virtualization/charliecloud/default.nix index 35c78dfd50a..a0694b7efbe 100644 --- a/pkgs/applications/virtualization/charliecloud/default.nix +++ b/pkgs/applications/virtualization/charliecloud/default.nix @@ -2,14 +2,14 @@ stdenv.mkDerivation rec { - version = "0.11"; + version = "0.12"; pname = "charliecloud"; src = fetchFromGitHub { owner = "hpc"; repo = "charliecloud"; rev = "v${version}"; - sha256 = "10dzas5fyh2lpa0kf1xv8z9c4g4cf0zlmnpilyvpcyccyfjf6cp2"; + sha256 = "177rcf1klcxsp6x9cw75cmz3y2izgd1hvi1rb9vc6iz9qx1nmk3v"; }; buildInputs = [ python ]; diff --git a/pkgs/applications/virtualization/cntr/default.nix b/pkgs/applications/virtualization/cntr/default.nix index 13afe0a4261..698f6df0673 100644 --- a/pkgs/applications/virtualization/cntr/default.nix +++ b/pkgs/applications/virtualization/cntr/default.nix @@ -2,13 +2,13 @@ rustPlatform.buildRustPackage rec { pname = "cntr"; - version = "1.2.0"; + version = "1.2.1"; src = fetchFromGitHub { owner = "Mic92"; repo = "cntr"; rev = version; - sha256 = "0lmbsnjia44h4rskqkv9yc7xb6f3qjgbg8kcr9zqnr7ivr5fjcxg"; + sha256 = "0dhfz7aj3cqi974ybf0axchih40rzrs9m8bxhwz1hgig57aisfc0"; }; cargoSha256 = "0xkwza9fx61pvlsm0s3dxc9i09mqp6c9df8w63fyiq7174vjxryx"; diff --git a/pkgs/applications/virtualization/cri-o/default.nix b/pkgs/applications/virtualization/cri-o/default.nix index fddf1741720..29111399ae9 100644 --- a/pkgs/applications/virtualization/cri-o/default.nix +++ b/pkgs/applications/virtualization/cri-o/default.nix @@ -17,7 +17,7 @@ buildGoPackage rec { project = "cri-o"; - version = "1.16.0"; + version = "1.16.1"; name = "${project}-${version}${flavor}"; goPackagePath = "github.com/${project}/${project}"; @@ -26,7 +26,7 @@ buildGoPackage rec { owner = "cri-o"; repo = "cri-o"; rev = "v${version}"; - sha256 = "1kbg544v7c1apaxrpndgrap0pb5c67d8fazbkgykg6ynskx6n344"; + sha256 = "0w690zhc55gdqzc31jc34nrzwd253pfb3rq23z51q22nqwmlsh9p"; }; outputs = [ "bin" "out" ]; diff --git a/pkgs/applications/virtualization/docker-compose/default.nix b/pkgs/applications/virtualization/docker-compose/default.nix index b1c42b099b6..7e8dbf33a7b 100644 --- a/pkgs/applications/virtualization/docker-compose/default.nix +++ b/pkgs/applications/virtualization/docker-compose/default.nix @@ -7,12 +7,12 @@ }: buildPythonApplication rec { - version = "1.24.1"; + version = "1.25.0"; pname = "docker-compose"; src = fetchPypi { inherit pname version; - sha256 = "0lx7bx6jvhydbab8vwry0bclhdf0dfj6jrns1m5y45yp9ybqxmd5"; + sha256 = "0zlprmsgmj4z627snsl0qmq8y7ggcyqrqm5vxvrvcigl7zywnprc"; }; # lots of networking and other fails diff --git a/pkgs/applications/virtualization/virt-manager/default.nix b/pkgs/applications/virtualization/virt-manager/default.nix index 42860966fe1..99d20477a12 100644 --- a/pkgs/applications/virtualization/virt-manager/default.nix +++ b/pkgs/applications/virtualization/virt-manager/default.nix @@ -9,17 +9,12 @@ with stdenv.lib; -# TODO: remove after there's support for setupPyDistFlags -let - setuppy = ../../../development/interpreters/python/run_setup.py; -in python3Packages.buildPythonApplication rec { - name = "virt-manager-${version}"; + pname = "virt-manager"; version = "2.2.1"; - namePrefix = ""; src = fetchurl { - url = "http://virt-manager.org/download/sources/virt-manager/${name}.tar.gz"; + url = "http://virt-manager.org/download/sources/virt-manager/${pname}-${version}.tar.gz"; sha256 = "06ws0agxlip6p6n3n43knsnjyd91gqhh2dadgc33wl9lx1k8vn6g"; }; @@ -49,13 +44,7 @@ python3Packages.buildPythonApplication rec { ${python3Packages.python.interpreter} setup.py configure --prefix=$out ''; - # TODO: remove after there's support for setupPyDistFlags - buildPhase = '' - runHook preBuild - cp ${setuppy} nix_run_setup - ${python3Packages.python.pythonForBuild.interpreter} nix_run_setup --no-update-icon-cache build_ext bdist_wheel - runHook postBuild - ''; + setupPyGlobalFlags = [ "--no-update-icon-cache" ]; preFixup = '' gappsWrapperArgs+=(--set PYTHONPATH "$PYTHONPATH") diff --git a/pkgs/applications/virtualization/virtualbox/default.nix b/pkgs/applications/virtualization/virtualbox/default.nix index addcf125e27..13e70c2561d 100644 --- a/pkgs/applications/virtualization/virtualbox/default.nix +++ b/pkgs/applications/virtualization/virtualbox/default.nix @@ -214,7 +214,7 @@ in stdenv.mkDerivation { description = "PC emulator"; license = licenses.gpl2; homepage = https://www.virtualbox.org/; - maintainers = with maintainers; [ flokli sander ]; + maintainers = with maintainers; [ sander ]; platforms = [ "x86_64-linux" ]; }; } diff --git a/pkgs/applications/virtualization/virtualbox/extpack.nix b/pkgs/applications/virtualization/virtualbox/extpack.nix index 56400a75945..9357a641de2 100644 --- a/pkgs/applications/virtualization/virtualbox/extpack.nix +++ b/pkgs/applications/virtualization/virtualbox/extpack.nix @@ -18,7 +18,7 @@ fetchurl rec { description = "Oracle Extension pack for VirtualBox"; license = licenses.virtualbox-puel; homepage = https://www.virtualbox.org/; - maintainers = with maintainers; [ flokli sander cdepillabout ]; + maintainers = with maintainers; [ sander cdepillabout ]; platforms = [ "x86_64-linux" ]; }; } diff --git a/pkgs/applications/virtualization/x11docker/default.nix b/pkgs/applications/virtualization/x11docker/default.nix index c57a7f6e771..af136f7e545 100644 --- a/pkgs/applications/virtualization/x11docker/default.nix +++ b/pkgs/applications/virtualization/x11docker/default.nix @@ -1,12 +1,12 @@ { stdenv, fetchFromGitHub, makeWrapper, nx-libs, xorg, getopt, gnugrep, gawk, ps, mount, iproute }: stdenv.mkDerivation rec { pname = "x11docker"; - version = "6.3.0"; + version = "6.4.0"; src = fetchFromGitHub { owner = "mviereck"; repo = "x11docker"; rev = "v${version}"; - sha256 = "0x2sx41y3ylzg511x52k3wh8mfbzp4ialpas6sn4ccagqxh2hc4y"; + sha256 = "0s8gk2kqxkfwx1x44g19ckm7rqgrcax59y8brgmigajqizik7sql"; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/pkgs/build-support/build-bazel-package/default.nix b/pkgs/build-support/build-bazel-package/default.nix index a1a38484386..8fa3cc55279 100644 --- a/pkgs/build-support/build-bazel-package/default.nix +++ b/pkgs/build-support/build-bazel-package/default.nix @@ -4,10 +4,30 @@ , lib }: -args@{ name, bazelFlags ? [], bazelBuildFlags ? [], bazelFetchFlags ? [], bazelTarget, buildAttrs, fetchAttrs, ... }: +args@{ + name +, bazelFlags ? [] +, bazelBuildFlags ? [] +, bazelFetchFlags ? [] +, bazelTarget +, buildAttrs +, fetchAttrs + +# Newer versions of Bazel are moving away from built-in rules_cc and instead +# allow fetching it as an external dependency in a WORKSPACE file[1]. If +# removed in the fixed-output fetch phase, building will fail to download it. +# This can be seen e.g. in #73097 +# +# This option allows configuring the removal of rules_cc in cases where a +# project depends on it via an external dependency. +# +# [1]: https://github.com/bazelbuild/rules_cc +, removeRulesCC ? true +, ... +}: let - fArgs = removeAttrs args [ "buildAttrs" "fetchAttrs" ]; + fArgs = removeAttrs args [ "buildAttrs" "fetchAttrs" "removeRulesCC" ]; fBuildAttrs = fArgs // buildAttrs; fFetchAttrs = fArgs // removeAttrs fetchAttrs [ "sha256" ]; @@ -24,8 +44,12 @@ in stdenv.mkDerivation (fBuildAttrs // { export bazelOut="$(echo ''${NIX_BUILD_TOP}/output | sed -e 's,//,/,g')" export bazelUserRoot="$(echo ''${NIX_BUILD_TOP}/tmp | sed -e 's,//,/,g')" export HOME="$NIX_BUILD_TOP" + export USER="nix" # This is needed for git_repository with https remotes export GIT_SSL_CAINFO="${cacert}/etc/ssl/certs/ca-bundle.crt" + # This is needed for Bazel fetchers that are themselves programs (e.g. + # rules_go using the go toolchain) + export SSL_CERT_FILE="${cacert}/etc/ssl/certs/ca-bundle.crt" ''; buildPhase = fFetchAttrs.buildPhase or '' @@ -60,7 +84,7 @@ in stdenv.mkDerivation (fBuildAttrs // { # Remove all built in external workspaces, Bazel will recreate them when building rm -rf $bazelOut/external/{bazel_tools,\@bazel_tools.marker} - rm -rf $bazelOut/external/{rules_cc,\@rules_cc.marker} + ${if removeRulesCC then "rm -rf $bazelOut/external/{rules_cc,\\@rules_cc.marker}" else ""} rm -rf $bazelOut/external/{embedded_jdk,\@embedded_jdk.marker} rm -rf $bazelOut/external/{local_*,\@local_*.marker} diff --git a/pkgs/build-support/fetchgit/nix-prefetch-git b/pkgs/build-support/fetchgit/nix-prefetch-git index 931be1a3700..8020ba46f3f 100755 --- a/pkgs/build-support/fetchgit/nix-prefetch-git +++ b/pkgs/build-support/fetchgit/nix-prefetch-git @@ -42,6 +42,7 @@ Options: --url url Any url understood by 'git clone'. --rev ref Any sha1 or references (such as refs/heads/master) --hash h Expected hash. + --branch-name Branch name to check out into --deepClone Clone the entire repository. --no-deepClone Make a shallow clone of just the required ref. --leave-dotGit Keep the .git directories. diff --git a/pkgs/build-support/rust/build-rust-crate/build-crate.nix b/pkgs/build-support/rust/build-rust-crate/build-crate.nix index e0a52e62561..db187d2ac14 100644 --- a/pkgs/build-support/rust/build-rust-crate/build-crate.nix +++ b/pkgs/build-support/rust/build-rust-crate/build-crate.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, echo_build_heading, noisily, makeDeps }: +{ lib, stdenv, echo_build_heading, noisily, makeDeps, rust }: { crateName, dependencies, crateFeatures, crateRenames, libName, release, libPath, @@ -13,17 +13,6 @@ (if release then "-C opt-level=3" else "-C debuginfo=2") (["-C codegen-units=$NIX_BUILD_CORES"] ++ extraRustcOpts); rustcMeta = "-C metadata=${metadata} -C extra-filename=-${metadata}"; - - # Some platforms have different names for rustc. - rustPlatform = - with stdenv.hostPlatform.parsed; - let cpu_ = if cpu.name == "armv7a" then "armv7" - else cpu.name; - vendor_ = vendor.name; - kernel_ = kernel.name; - abi_ = abi.name; - in - "${cpu_}-${vendor_}-${kernel_}-${abi_}"; in '' runHook preBuild norm="" @@ -67,7 +56,7 @@ ${crateFeatures} --out-dir target/bin --emit=dep-info,link -L dependency=target/deps \ $LINK ${deps}$EXTRA_LIB --cap-lints allow \ $BUILD_OUT_DIR $EXTRA_BUILD $EXTRA_FEATURES --color ${colors} \ - ${if stdenv.hostPlatform != stdenv.buildPlatform then "--target ${rustPlatform} -C linker=${stdenv.hostPlatform.config}-gcc" else ""} + ${if stdenv.hostPlatform != stdenv.buildPlatform then "--target ${rust.toRustTarget stdenv.hostPlatform} -C linker=${stdenv.hostPlatform.config}-gcc" else ""} if [ "$crate_name_" != "$crate_name" ]; then mv target/bin/$crate_name_ target/bin/$crate_name fi @@ -91,18 +80,18 @@ echo "$EXTRA_LINK_SEARCH" | while read i; do if [[ ! -z "$i" ]]; then - for lib in $i; do - echo "-L $lib" >> target/link - L=$(echo $lib | sed -e "s#$(pwd)/target/build#$out/lib#") + for library in $i; do + echo "-L $library" >> target/link + L=$(echo $library | sed -e "s#$(pwd)/target/build#$lib/lib#") echo "-L $L" >> target/link.final done fi done echo "$EXTRA_LINK" | while read i; do if [[ ! -z "$i" ]]; then - for lib in $i; do - echo "-l $lib" >> target/link - echo "-l $lib" >> target/link.final + for library in $i; do + echo "-l $library" >> target/link + echo "-l $library" >> target/link.final done fi done diff --git a/pkgs/build-support/rust/build-rust-crate/default.nix b/pkgs/build-support/rust/build-rust-crate/default.nix index 6534e21c0f0..edff3941636 100644 --- a/pkgs/build-support/rust/build-rust-crate/default.nix +++ b/pkgs/build-support/rust/build-rust-crate/default.nix @@ -4,7 +4,7 @@ # This can be useful for deploying packages with NixOps, and to share # binary dependencies between projects. -{ lib, stdenv, defaultCrateOverrides, fetchCrate, rustc }: +{ lib, stdenv, defaultCrateOverrides, fetchCrate, rustc, rust }: let # This doesn't appear to be officially documented anywhere yet. @@ -22,9 +22,9 @@ let else extern; in (if lib.lists.any (x: x == "lib") dep.crateType then - " --extern ${name}=${dep.out}/lib/lib${extern}-${dep.metadata}.rlib" + " --extern ${name}=${dep.lib}/lib/lib${extern}-${dep.metadata}.rlib" else - " --extern ${name}=${dep.out}/lib/lib${extern}-${dep.metadata}${stdenv.hostPlatform.extensions.sharedLibrary}") + " --extern ${name}=${dep.lib}/lib/lib${extern}-${dep.metadata}${stdenv.hostPlatform.extensions.sharedLibrary}") ) dependencies); echo_build_heading = colors: '' @@ -59,7 +59,7 @@ let ''; configureCrate = import ./configure-crate.nix { inherit lib stdenv echo_build_heading noisily makeDeps; }; - buildCrate = import ./build-crate.nix { inherit lib stdenv echo_build_heading noisily makeDeps; }; + buildCrate = import ./build-crate.nix { inherit lib stdenv echo_build_heading noisily makeDeps rust; }; installCrate = import ./install-crate.nix; in @@ -96,12 +96,12 @@ stdenv.mkDerivation (rec { buildInputs = (crate.buildInputs or []) ++ buildInputs_; dependencies = builtins.map - (dep: dep.override { rust = rust; release = release; verbose = verbose; crateOverrides = crateOverrides; }) + (dep: lib.getLib (dep.override { rust = rust; release = release; verbose = verbose; crateOverrides = crateOverrides; })) dependencies_; buildDependencies = builtins.map - (dep: dep.override { rust = rust; release = release; verbose = verbose; crateOverrides = crateOverrides; }) + (dep: lib.getLib (dep.override { rust = rust; release = release; verbose = verbose; crateOverrides = crateOverrides; })) buildDependencies_; completeDeps = lib.lists.unique (dependencies ++ lib.lists.concatMap (dep: dep.completeDeps) dependencies); @@ -160,6 +160,9 @@ stdenv.mkDerivation (rec { }; installPhase = installCrate crateName metadata; + outputs = [ "out" "lib" ]; + outputDev = [ "lib" ]; + } // extraDerivationAttrs )) { rust = rustc; diff --git a/pkgs/build-support/rust/build-rust-crate/install-crate.nix b/pkgs/build-support/rust/build-rust-crate/install-crate.nix index 3b0282621ea..934c3a03176 100644 --- a/pkgs/build-support/rust/build-rust-crate/install-crate.nix +++ b/pkgs/build-support/rust/build-rust-crate/install-crate.nix @@ -1,24 +1,26 @@ crateName: metadata: '' runHook preInstall - mkdir -p $out + # always create $out even if we do not have binaries. We are detecting binary targets during compilation, if those are missing there is no way to only have $lib + mkdir $out if [[ -s target/env ]]; then - cp target/env $out/env + mkdir -p $lib + cp target/env $lib/env fi if [[ -s target/link.final ]]; then - mkdir -p $out/lib - cp target/link.final $out/lib/link + mkdir -p $lib/lib + cp target/link.final $lib/lib/link fi if [[ "$(ls -A target/lib)" ]]; then - mkdir -p $out/lib - cp target/lib/* $out/lib #*/ - for lib in $out/lib/*.so $out/lib/*.dylib; do #*/ - ln -s $lib $(echo $lib | sed -e "s/-${metadata}//") + mkdir -p $lib/lib + cp target/lib/* $lib/lib #*/ + for library in $lib/lib/*.so $lib/lib/*.dylib; do #*/ + ln -s $library $(echo $library | sed -e "s/-${metadata}//") done fi if [[ "$(ls -A target/build)" ]]; then # */ - mkdir -p $out/lib - cp -r target/build/* $out/lib # */ + mkdir -p $lib/lib + cp -r target/build/* $lib/lib # */ fi if [[ -d target/bin ]]; then if [[ "$(ls -A target/bin)" ]]; then diff --git a/pkgs/build-support/rust/default.nix b/pkgs/build-support/rust/default.nix index f0f949b2205..1d8e4448674 100644 --- a/pkgs/build-support/rust/default.nix +++ b/pkgs/build-support/rust/default.nix @@ -1,4 +1,4 @@ -{ stdenv, cacert, git, cargo, rustc, fetchcargo, buildPackages, windows }: +{ stdenv, cacert, git, rust, cargo, rustc, fetchcargo, buildPackages, windows }: { name ? "${args.pname}-${args.version}" , cargoSha256 ? "unset" @@ -46,12 +46,7 @@ let cargoDepsCopy="$sourceRoot/${cargoVendorDir}" ''; - hostConfig = stdenv.hostPlatform.config; - - rustHostConfig = { - x86_64-pc-mingw32 = "x86_64-pc-windows-gnu"; - }.${hostConfig} or hostConfig; - rustTarget = if target == null then rustHostConfig else target; + rustTarget = if target == null then rust.toRustTarget stdenv.hostPlatform else target; ccForBuild="${buildPackages.stdenv.cc}/bin/${buildPackages.stdenv.cc.targetPrefix}cc"; cxxForBuild="${buildPackages.stdenv.cc}/bin/${buildPackages.stdenv.cc.targetPrefix}c++"; @@ -87,7 +82,7 @@ stdenv.mkDerivation (args // { --subst-var-by vendor "$(pwd)/$cargoDepsCopy" cat >> .cargo/config <<'EOF' - [target."${stdenv.buildPlatform.config}"] + [target."${rust.toRustTarget stdenv.buildPlatform}"] "linker" = "${ccForBuild}" ${stdenv.lib.optionalString (stdenv.buildPlatform.config != stdenv.hostPlatform.config) '' [target."${rustTarget}"] @@ -129,10 +124,10 @@ stdenv.mkDerivation (args // { ( set -x env \ - "CC_${stdenv.buildPlatform.config}"="${ccForBuild}" \ - "CXX_${stdenv.buildPlatform.config}"="${cxxForBuild}" \ - "CC_${stdenv.hostPlatform.config}"="${ccForHost}" \ - "CXX_${stdenv.hostPlatform.config}"="${cxxForHost}" \ + "CC_${rust.toRustTarget stdenv.buildPlatform}"="${ccForBuild}" \ + "CXX_${rust.toRustTarget stdenv.buildPlatform}"="${cxxForBuild}" \ + "CC_${rust.toRustTarget stdenv.hostPlatform}"="${ccForHost}" \ + "CXX_${rust.toRustTarget stdenv.hostPlatform}"="${cxxForHost}" \ cargo build \ ${stdenv.lib.optionalString (buildType == "release") "--release"} \ --target ${rustTarget} \ diff --git a/pkgs/common-updater/scripts/update-source-version b/pkgs/common-updater/scripts/update-source-version index 0a436ff02a3..d051a0f75c1 100755 --- a/pkgs/common-updater/scripts/update-source-version +++ b/pkgs/common-updater/scripts/update-source-version @@ -93,7 +93,7 @@ if [ -z "$oldUrl" ]; then fi drvName=$(nix-instantiate $systemArg --eval -E "with import ./. {}; lib.getName $attr" | tr -d '"') -oldVersion=$(nix-instantiate $systemArg --eval -E "with import ./. {}; $attr.${versionKey} or lib.getVersion $attr" | tr -d '"') +oldVersion=$(nix-instantiate $systemArg --eval -E "with import ./. {}; $attr.${versionKey} or (lib.getVersion $attr)" | tr -d '"') if [ -z "$drvName" -o -z "$oldVersion" ]; then die "Couldn't evaluate name and version from '$attr.name'!" diff --git a/pkgs/data/fonts/input-fonts/default.nix b/pkgs/data/fonts/input-fonts/default.nix index 68322bd5482..c3d3bf4aa6a 100644 --- a/pkgs/data/fonts/input-fonts/default.nix +++ b/pkgs/data/fonts/input-fonts/default.nix @@ -2,12 +2,12 @@ stdenv.mkDerivation { pname = "input-fonts"; - version = "2017-08-10"; # date of the download and checksum + version = "2019-11-25"; # date of the download and checksum src = requireFile { name = "Input-Font.zip"; url = "https://input.fontbureau.com/download/"; - sha256 = "07fkyvbb12agkb2kpnq2j45nycgbjvb4n1s5hjyqsipdh2z9zihq"; + sha256 = "10rax2a7vzidcs7kyfg5lv5bwp9i7kvjpdcsd10p0517syijkp3b"; }; nativeBuildInputs = [ unzip ]; @@ -25,7 +25,7 @@ stdenv.mkDerivation { outputHashAlgo = "sha256"; outputHashMode = "recursive"; - outputHash = "0k7xqkgqldd110ch9s144ilh762q777qcjvg3plmrb9s6xiaqvvd"; + outputHash = "15sdhqqqd4jgk80fw7ncx49avi9cxbdgyrvnrfya0066x4q4r6lv"; meta = with stdenv.lib; { description = "Fonts for Code, from Font Bureau"; diff --git a/pkgs/data/fonts/iosevka/bin.nix b/pkgs/data/fonts/iosevka/bin.nix index d6d986c699a..cbe4b25bd36 100644 --- a/pkgs/data/fonts/iosevka/bin.nix +++ b/pkgs/data/fonts/iosevka/bin.nix @@ -1,7 +1,7 @@ { stdenv, fetchzip }: let - version = "2.3.2"; + version = "2.3.3"; in fetchzip { name = "iosevka-bin-${version}"; @@ -12,7 +12,7 @@ in fetchzip { unzip -j $downloadedFile \*.ttc -d $out/share/fonts/iosevka ''; - sha256 = "1dkfh354scjgzq7kgy4cn70z030wmfgxixqp8p9m6i0ps8gccjgs"; + sha256 = "1dfm1888rii5kfmkxp5hnx8ycji57cbs5gazpgkxg1mnmn7i35wl"; meta = with stdenv.lib; { homepage = https://be5invis.github.io/Iosevka/; diff --git a/pkgs/data/fonts/overpass/default.nix b/pkgs/data/fonts/overpass/default.nix index 4730a67e290..1d0cf04d756 100644 --- a/pkgs/data/fonts/overpass/default.nix +++ b/pkgs/data/fonts/overpass/default.nix @@ -1,7 +1,7 @@ { lib, fetchzip }: let - version = "3.0.3"; + version = "3.0.4"; in fetchzip rec { name = "overpass-${version}"; @@ -12,10 +12,10 @@ in fetchzip rec { mkdir -p $out/share/doc/${name} ; unzip -j $downloadedFile \*.md -d $out/share/doc/${name} ''; - sha256 = "1m6p7rrlyqikjvypp4698sn0lp3a4z0z5al4swblfhg8qaxzv5pg"; + sha256 = "13b4yam0nycclccxidzj2fa3nwms5qji7gfkixdnl4ybf0f56b64"; meta = with lib; { - homepage = http://overpassfont.org/; + homepage = "https://overpassfont.org/"; description = "Font heavily inspired by Highway Gothic"; license = licenses.ofl; platforms = platforms.all; diff --git a/pkgs/data/fonts/rhodium-libre/default.nix b/pkgs/data/fonts/rhodium-libre/default.nix new file mode 100644 index 00000000000..fc89d652592 --- /dev/null +++ b/pkgs/data/fonts/rhodium-libre/default.nix @@ -0,0 +1,28 @@ +{ lib, fetchFromGitHub }: + +let + pname = "RhodiumLibre"; + version = "1.2.0"; +in fetchFromGitHub { + name = "${pname}-${version}"; + + owner = "DunwichType"; + repo = pname; + rev = version; + + postFetch = '' + tar xf $downloadedFile --strip=1 + install -Dm444 -t $out/share/fonts/opentype/ RhodiumLibre-Regular.otf + install -Dm444 -t $out/share/fonts/truetype/ RhodiumLibre-Regular.ttf + ''; + + sha256 = "04ax6bri5vsji465806p8d7zbdf12r5bpvcm9nb8isfqm81ggj0r"; + + meta = with lib; { + description = "F/OSS/Libre font for Latin and Devanagari"; + homepage = "https://github.com/DunwichType/RhodiumLibre"; + license = licenses.ofl; + platforms = platforms.all; + maintainers = [ maintainers.marsam ]; + }; +} diff --git a/pkgs/data/icons/flat-remix-icon-theme/default.nix b/pkgs/data/icons/flat-remix-icon-theme/default.nix new file mode 100644 index 00000000000..f0e13b21dfd --- /dev/null +++ b/pkgs/data/icons/flat-remix-icon-theme/default.nix @@ -0,0 +1,35 @@ +{ stdenv, fetchFromGitHub , gtk3 }: + +stdenv.mkDerivation rec { + pname = "flat-remix-icon-theme"; + version = "20191018"; + + src = fetchFromGitHub { + owner = "daniruiz"; + repo = "flat-remix"; + rev = version; + sha256 = "13ibxvrvri04lb5phm49b6d553jh0aigm57z5i0nsins405gixn9"; + }; + + nativeBuildInputs = [ gtk3 ]; + + installPhase = '' + mkdir -p $out/share/icons + mv Flat-Remix* $out/share/icons/ + ''; + + postFixup = '' + for theme in $out/share/icons/*; do + gtk-update-icon-cache $theme + done + ''; + + meta = with stdenv.lib; { + description = "Flat remix is a pretty simple icon theme inspired on material design"; + homepage = https://drasite.com/flat-remix; + license = with licenses; [ gpl3 ]; + platforms = platforms.linux; + maintainers = with maintainers; [ mschneider ]; + }; +} + diff --git a/pkgs/data/icons/zafiro-icons/default.nix b/pkgs/data/icons/zafiro-icons/default.nix index 0b28a02ba4d..c3670a6f58c 100644 --- a/pkgs/data/icons/zafiro-icons/default.nix +++ b/pkgs/data/icons/zafiro-icons/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "zafiro-icons"; - version = "0.9"; + version = "1.0"; src = fetchFromGitHub { owner = "zayronxio"; repo = pname; - rev = "v${version}"; - sha256 = "0zmnhih4gz8bidyzf1wimy85z7zx9i29mv1zirmykpqj819g7mx9"; + rev = "${version}"; + sha256 = "0gy3c0jkj1icnwcs23b6km9cj9cccv8y5z1w11nfdv91cq3mdhmb"; }; nativeBuildInputs = [ gtk3 ]; diff --git a/pkgs/desktops/gnome-3/apps/gedit/default.nix b/pkgs/desktops/gnome-3/apps/gedit/default.nix index 5115c2d8fb4..6ea04910d23 100644 --- a/pkgs/desktops/gnome-3/apps/gedit/default.nix +++ b/pkgs/desktops/gnome-3/apps/gedit/default.nix @@ -6,11 +6,11 @@ stdenv.mkDerivation rec { pname = "gedit"; - version = "3.34.0"; + version = "3.34.1"; src = fetchurl { url = "mirror://gnome/sources/gedit/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "0zjh3p3lns7a7kx3g3v7gkgcqdzyx1zyv8ssr6d5ljfb7hfyb59y"; + sha256 = "1inm50sdfw63by1lf4f1swb59mpyxlly0g5rdg99j5l3357fzygb"; }; nativeBuildInputs = [ diff --git a/pkgs/desktops/gnome-3/apps/gnome-boxes/default.nix b/pkgs/desktops/gnome-3/apps/gnome-boxes/default.nix index ce8215d6391..d59746adc3d 100644 --- a/pkgs/desktops/gnome-3/apps/gnome-boxes/default.nix +++ b/pkgs/desktops/gnome-3/apps/gnome-boxes/default.nix @@ -51,11 +51,11 @@ stdenv.mkDerivation rec { pname = "gnome-boxes"; - version = "3.34.1"; + version = "3.34.2"; src = fetchurl { url = "mirror://gnome/sources/gnome-boxes/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "1758k5b79kyywdg67b4byqhva9045i13lzg5r62my950c4c2p0pc"; + sha256 = "1rqdjf61cbi3zcpzr6cfkj3lcfrdlhs20bl65lxw2xrwk4jn0ph5"; }; doCheck = true; diff --git a/pkgs/desktops/gnome-3/apps/gnome-maps/default.nix b/pkgs/desktops/gnome-3/apps/gnome-maps/default.nix index 49b44f5f283..12dba8b41e1 100644 --- a/pkgs/desktops/gnome-3/apps/gnome-maps/default.nix +++ b/pkgs/desktops/gnome-3/apps/gnome-maps/default.nix @@ -5,13 +5,13 @@ let pname = "gnome-maps"; - version = "3.34.1"; + version = "3.34.2"; in stdenv.mkDerivation rec { name = "${pname}-${version}"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz"; - sha256 = "03nswj60lqznr2j3ld2lgjzr4j9x2gblqx2ip4l2yxnm9kgbm14s"; + sha256 = "00xslcnhhwslqglgfv2im7vq3awa49y2jxzr8wsby7f713k28vf5"; }; doCheck = true; diff --git a/pkgs/desktops/gnome-3/core/evince/default.nix b/pkgs/desktops/gnome-3/core/evince/default.nix index 61f27f10ae1..bab84eeb78c 100644 --- a/pkgs/desktops/gnome-3/core/evince/default.nix +++ b/pkgs/desktops/gnome-3/core/evince/default.nix @@ -43,13 +43,13 @@ stdenv.mkDerivation rec { pname = "evince"; - version = "3.34.1"; + version = "3.34.2"; outputs = [ "out" "dev" "devdoc" ]; src = fetchurl { url = "mirror://gnome/sources/evince/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "1pr6fvbaam1mzxjwyqd53hcxzdjzf73idn10j4j7n54nwg6hgr45"; + sha256 = "05q6v9lssd21623mnj2p49clj9v9csw9kay7n4nklki025grbh1w"; }; postPatch = '' diff --git a/pkgs/desktops/gnome-3/core/evolution-data-server/default.nix b/pkgs/desktops/gnome-3/core/evolution-data-server/default.nix index fa70ecea264..6c293cb55b9 100644 --- a/pkgs/desktops/gnome-3/core/evolution-data-server/default.nix +++ b/pkgs/desktops/gnome-3/core/evolution-data-server/default.nix @@ -6,13 +6,13 @@ stdenv.mkDerivation rec { pname = "evolution-data-server"; - version = "3.34.1"; + version = "3.34.2"; outputs = [ "out" "dev" ]; src = fetchurl { url = "mirror://gnome/sources/evolution-data-server/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "1gisymfjhkibqy73pmd0d3fwl43a23d0lvlxzqkycfdn9jh6pxbg"; + sha256 = "16z85y6hhazcrp5ngw47w4x9r0j8zrj7awv5im58hhp0xs19zf1y"; }; patches = [ diff --git a/pkgs/desktops/gnome-3/core/mutter/default.nix b/pkgs/desktops/gnome-3/core/mutter/default.nix index 8fad9e3c288..6d36b8710b6 100644 --- a/pkgs/desktops/gnome-3/core/mutter/default.nix +++ b/pkgs/desktops/gnome-3/core/mutter/default.nix @@ -10,6 +10,7 @@ , sysprof , desktop-file-utils , libcap_ng +, egl-wayland }: stdenv.mkDerivation rec { @@ -26,6 +27,8 @@ stdenv.mkDerivation rec { mesonFlags = [ "-Dxwayland-path=${xwayland}/bin/Xwayland" "-Dinstalled_tests=false" # TODO: enable these + "-Dwayland_eglstream=true" + "-Degl_device=true" ]; propagatedBuildInputs = [ @@ -52,7 +55,7 @@ stdenv.mkDerivation rec { gnome-desktop cairo pango cogl zenity libstartup_notification geocode-glib libinput libgudev libwacom libcanberra-gtk3 zenity xkeyboard_config libxkbfile - libxkbcommon pipewire xwayland + libxkbcommon pipewire xwayland egl-wayland gnome-settings-daemon sysprof ]; diff --git a/pkgs/desktops/gnome-3/core/simple-scan/default.nix b/pkgs/desktops/gnome-3/core/simple-scan/default.nix index 21e198a867f..8d737b22a7a 100644 --- a/pkgs/desktops/gnome-3/core/simple-scan/default.nix +++ b/pkgs/desktops/gnome-3/core/simple-scan/default.nix @@ -4,11 +4,11 @@ stdenv.mkDerivation rec { pname = "simple-scan"; - version = "3.34.1"; + version = "3.34.2"; src = fetchurl { url = "mirror://gnome/sources/simple-scan/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "0glzskxdc7p9z7nwcakqc7qzij4l79adlvvb2cj5fmis731zw9yq"; + sha256 = "1fk3g4f9slckqfwm576jrjq1d1qihw0dlgzdf00ns7qbhzb0kxsp"; }; buildInputs = [ diff --git a/pkgs/desktops/gnome-3/games/gnome-taquin/default.nix b/pkgs/desktops/gnome-3/games/gnome-taquin/default.nix index dd7908ba726..9edeb3ea5de 100644 --- a/pkgs/desktops/gnome-3/games/gnome-taquin/default.nix +++ b/pkgs/desktops/gnome-3/games/gnome-taquin/default.nix @@ -5,11 +5,11 @@ stdenv.mkDerivation rec { pname = "gnome-taquin"; - version = "3.34.1"; + version = "3.34.2"; src = fetchurl { url = "mirror://gnome/sources/gnome-taquin/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "0vyrfhkfpx83n9p70jssykbndvb3sxwdihqvvvb94rbw7n6c4q4r"; + sha256 = "1ff3h57wr26np3dlh7smpslba2awxasmhv3y45bn498i3n1vyvsk"; }; passthru = { diff --git a/pkgs/desktops/gnome-3/games/iagno/default.nix b/pkgs/desktops/gnome-3/games/iagno/default.nix index c679f3f74b8..33cd60f5272 100644 --- a/pkgs/desktops/gnome-3/games/iagno/default.nix +++ b/pkgs/desktops/gnome-3/games/iagno/default.nix @@ -5,11 +5,11 @@ stdenv.mkDerivation rec { pname = "iagno"; - version = "3.34.2"; + version = "3.34.3"; src = fetchurl { url = "mirror://gnome/sources/iagno/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "0r31k6b8mqgn5c55hi94gpdr776ykq7ww55vq6pmp5irhdwb3gn9"; + sha256 = "1m9654dbi4vrl59wvbyxz7jf81v4mn4n5lcq7abb42lba965d2z2"; }; nativeBuildInputs = [ diff --git a/pkgs/desktops/gnome-3/misc/gnome-flashback/default.nix b/pkgs/desktops/gnome-3/misc/gnome-flashback/default.nix index dc7e0ed222f..808d36dab95 100644 --- a/pkgs/desktops/gnome-3/misc/gnome-flashback/default.nix +++ b/pkgs/desktops/gnome-3/misc/gnome-flashback/default.nix @@ -27,14 +27,14 @@ let pname = "gnome-flashback"; - version = "3.34.1"; + version = "3.34.2"; requiredComponents = wmName: "RequiredComponents=${wmName};gnome-flashback;gnome-panel;org.gnome.SettingsDaemon.A11ySettings;org.gnome.SettingsDaemon.Color;org.gnome.SettingsDaemon.Datetime;org.gnome.SettingsDaemon.Housekeeping;org.gnome.SettingsDaemon.Keyboard;org.gnome.SettingsDaemon.MediaKeys;org.gnome.SettingsDaemon.Power;org.gnome.SettingsDaemon.PrintNotifications;org.gnome.SettingsDaemon.Rfkill;org.gnome.SettingsDaemon.ScreensaverProxy;org.gnome.SettingsDaemon.Sharing;org.gnome.SettingsDaemon.Smartcard;org.gnome.SettingsDaemon.Sound;org.gnome.SettingsDaemon.Wacom;org.gnome.SettingsDaemon.XSettings;"; gnome-flashback = stdenv.mkDerivation rec { name = "${pname}-${version}"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz"; - sha256 = "0xxw5w66gx04amyxhf4xbz0s4bf0rdp7y9nyrf6bb4xdc6b0rfnx"; + sha256 = "1726xcm2q94nfvb055d3m61m20s0xy3xl1fc3ds3k3rcrn457riv"; }; # make .desktop Execs absolute diff --git a/pkgs/development/compilers/abcl/default.nix b/pkgs/development/compilers/abcl/default.nix index accedf9a7af..44f72a93c3a 100644 --- a/pkgs/development/compilers/abcl/default.nix +++ b/pkgs/development/compilers/abcl/default.nix @@ -1,11 +1,11 @@ {stdenv, fetchurl, ant, jre, jdk}: stdenv.mkDerivation rec { pname = "abcl"; - version = "1.5.0"; + version = "1.6.0"; # or fetchFromGitHub(owner,repo,rev) or fetchgit(rev) src = fetchurl { url = "https://common-lisp.net/project/armedbear/releases/${version}/${pname}-src-${version}.tar.gz"; - sha256 = "1hhvcg050nfpjbdmskc1cv2j38qi6qfl77a61b5cxx576kbff3lj"; + sha256 = "0hvbcsffr8n2xwdixc8wyw1bfl9fxn2gyy0c4nma7j9zbn0wwgw9"; }; configurePhase = '' mkdir nix-tools diff --git a/pkgs/development/compilers/fasm/bin.nix b/pkgs/development/compilers/fasm/bin.nix index 5353862424a..14610af10ae 100644 --- a/pkgs/development/compilers/fasm/bin.nix +++ b/pkgs/development/compilers/fasm/bin.nix @@ -3,11 +3,11 @@ stdenvNoCC.mkDerivation rec { pname = "fasm-bin"; - version = "1.73.16"; + version = "1.73.18"; src = fetchurl { url = "https://flatassembler.net/fasm-${version}.tgz"; - sha256 = "1jaqm7w458ny37fsw3fln17kw31rcsk8kyadci45qcbw6jspmn7k"; + sha256 = "0m88vi8ac9mlak430nyrg3nxsj0fzy3yli8kk0mqsw8rqw2pfvqb"; }; installPhase = '' diff --git a/pkgs/development/compilers/kotlin/default.nix b/pkgs/development/compilers/kotlin/default.nix index 12a75eb8f14..a6384c449c8 100644 --- a/pkgs/development/compilers/kotlin/default.nix +++ b/pkgs/development/compilers/kotlin/default.nix @@ -1,14 +1,14 @@ { stdenv, fetchurl, makeWrapper, jre, unzip }: let - version = "1.3.50"; + version = "1.3.60"; in stdenv.mkDerivation { inherit version; pname = "kotlin"; src = fetchurl { url = "https://github.com/JetBrains/kotlin/releases/download/v${version}/kotlin-compiler-${version}.zip"; - sha256 = "1v66pnk810agf26khwdv7l8jpc11x6na5fyqxs9jvxdpls8l0hk9"; + sha256 = "1frgnirrl795m8xydngrbn73np5gwgs7wymr9j81d0gz4gzpry8j"; }; propagatedBuildInputs = [ jre ] ; diff --git a/pkgs/development/compilers/mruby/default.nix b/pkgs/development/compilers/mruby/default.nix index 03f3d56fd93..e4c756e9c7d 100644 --- a/pkgs/development/compilers/mruby/default.nix +++ b/pkgs/development/compilers/mruby/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "mruby"; - version = "2.0.1"; + version = "2.1.0"; src = fetchFromGitHub { owner = "mruby"; repo = "mruby"; rev = version; - sha256 = "1zm2d5kj9fnfx8ifj8ysrrr838ipwmvz35byzjhprakrg64911p9"; + sha256 = "1y072c7dh9jf8xwy7kia6cb4dkpspq4zf24ssn7zm5f46p4waxni"; }; nativeBuildInputs = [ ruby bison ]; diff --git a/pkgs/development/compilers/ponyc/default.nix b/pkgs/development/compilers/ponyc/default.nix index f20a32acedd..33a3a1216dd 100644 --- a/pkgs/development/compilers/ponyc/default.nix +++ b/pkgs/development/compilers/ponyc/default.nix @@ -1,18 +1,18 @@ -{ stdenv, fetchFromGitHub, llvm, makeWrapper, pcre2, coreutils, which, libressl, +{ stdenv, fetchFromGitHub, llvm, makeWrapper, pcre2, coreutils, which, libressl, libxml2, cc ? stdenv.cc, lto ? !stdenv.isDarwin }: stdenv.mkDerivation ( rec { pname = "ponyc"; - version = "0.32.0"; + version = "0.33.0"; src = fetchFromGitHub { owner = "ponylang"; repo = pname; rev = version; - sha256 = "07ai5lr0zdrcdmfjxsypp33fpj8lnak7y5177s7qd19163z0ia20"; + sha256 = "0a0sw902nrayg0s1zrkhfpvrmdqw19nif67hsv0ijrckcq37bjcz"; }; - buildInputs = [ llvm makeWrapper which ]; + buildInputs = [ llvm makeWrapper which libxml2 ]; propagatedBuildInputs = [ cc ]; # Disable problematic networking tests diff --git a/pkgs/development/compilers/ponyc/pony-stable.nix b/pkgs/development/compilers/ponyc/pony-stable.nix index 6719293af2a..23e7f3b28f7 100644 --- a/pkgs/development/compilers/ponyc/pony-stable.nix +++ b/pkgs/development/compilers/ponyc/pony-stable.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "pony-stable"; - version = "0.2.1"; + version = "0.2.2"; src = fetchFromGitHub { owner = "ponylang"; repo = "pony-stable"; rev = version; - sha256 = "1wiinw35bp3zpq9kx61x2zvid7ln00jrw052ah8801s0d9dbwrdr"; + sha256 = "0nzvsqvl315brp3yb4j5kl82xnkmib4jk416jjc7yrz4k3jgr278"; }; buildInputs = [ ponyc ]; diff --git a/pkgs/development/compilers/purescript/purescript/default.nix b/pkgs/development/compilers/purescript/purescript/default.nix index 149a38231b4..f1126fdeddf 100644 --- a/pkgs/development/compilers/purescript/purescript/default.nix +++ b/pkgs/development/compilers/purescript/purescript/default.nix @@ -18,19 +18,19 @@ let in stdenv.mkDerivation rec { pname = "purescript"; - version = "0.13.4"; + version = "0.13.5"; src = if stdenv.isDarwin then fetchurl { url = "https://github.com/${pname}/${pname}/releases/download/v${version}/macos.tar.gz"; - sha256 = "0rqjair1r1yr1k8rva3ly16dv5594f4s8xwpnrz9n7x3f99mk4fx"; + sha256 = "19bb50m0cd738r353blgy21d842b3yj58xfbplk7bz59jawj9lym"; } else fetchurl { url = "https://github.com/${pname}/${pname}/releases/download/v${version}/linux64.tar.gz"; - sha256 = "1ajzi5ikgzgdfrgq36r9pc3yc6f7h0qgnqcq414zd66z08mbggng"; + sha256 = "016wvwypgb4859f0n1lqsqv9a8cca2y8g7d6ffvzx6rncd115gxi"; }; diff --git a/pkgs/development/compilers/rust/1_38_0.nix b/pkgs/development/compilers/rust/1_38_0.nix index 5260ab20174..be43e074228 100644 --- a/pkgs/development/compilers/rust/1_38_0.nix +++ b/pkgs/development/compilers/rust/1_38_0.nix @@ -10,6 +10,7 @@ import ./default.nix { bootstrapHashes = { i686-unknown-linux-gnu = "74510e0e52a55e65a9f716673c2cda4d2bd427e2453541c6993c77c3ec04acf9"; x86_64-unknown-linux-gnu = "cb573229bfd32928177c3835fdeb62d52da64806b844bc1095c6225b0665a1cb"; + arm-unknown-linux-gnueabihf = "272739fbb23cf6c2040c1813af9c8c7f386cac37d9de638f22a1816eb96bc0ae"; armv7-unknown-linux-gnueabihf = "5b87b877f0ed20c6a09ce26e7a15d8c61b26b62484b97e78a51099d0efefec98"; aarch64-unknown-linux-gnu = "263ef98fa3a6b2911b56f89c06615cdebf6ef676eb9b2493ad1539602f79b6ba"; i686-apple-darwin = "e45d0c4d882fc6c404ffa6fe790294f4ea96384a2b48804adbf723f3635477a8"; diff --git a/pkgs/development/compilers/rust/1_39_0.nix b/pkgs/development/compilers/rust/1_39_0.nix index aa29c7a9ff7..cc07590dedc 100644 --- a/pkgs/development/compilers/rust/1_39_0.nix +++ b/pkgs/development/compilers/rust/1_39_0.nix @@ -10,6 +10,7 @@ import ./default.nix { bootstrapHashes = { i686-unknown-linux-gnu = "41aed8a350e24a0cac1444ed99b3dd24a90bc581dd88cb420c6e547d6b5f57af"; x86_64-unknown-linux-gnu = "adda26b3f0609dbfbdc2019da4a20101879b9db2134fae322a4e863a069ec221"; + arm-unknown-linux-gnueabihf = "0603a3d3d16ae8f3b3b117eb699e8f3ef7532a6f6d3c29d13e7d4614fc3c9e7a"; armv7-unknown-linux-gnueabihf = "8b1bf1680a61a643d6b5c7a3b1a1ce88448652756395e20ba5846739cbd085c4"; aarch64-unknown-linux-gnu = "06afd6d525326cea95c3aa658aaa8542eab26f44235565bb16913ac9d12b7bda"; i686-apple-darwin = "cdbf2807774bed350a3af6f41d7f7dd7ceff28777cde310c3ba90033188eb2f8"; diff --git a/pkgs/development/compilers/rust/bootstrap.nix b/pkgs/development/compilers/rust/bootstrap.nix index 54b2d3016e5..7c0b46d5593 100644 --- a/pkgs/development/compilers/rust/bootstrap.nix +++ b/pkgs/development/compilers/rust/bootstrap.nix @@ -1,24 +1,11 @@ -{ stdenv, fetchurl, callPackage, version, hashes }: +{ stdenv, fetchurl, rust, callPackage, version, hashes }: let - platform = - if stdenv.hostPlatform.system == "i686-linux" - then "i686-unknown-linux-gnu" - else if stdenv.hostPlatform.system == "x86_64-linux" - then "x86_64-unknown-linux-gnu" - else if stdenv.hostPlatform.system == "armv7l-linux" - then "armv7-unknown-linux-gnueabihf" - else if stdenv.hostPlatform.system == "aarch64-linux" - then "aarch64-unknown-linux-gnu" - else if stdenv.hostPlatform.system == "i686-darwin" - then "i686-apple-darwin" - else if stdenv.hostPlatform.system == "x86_64-darwin" - then "x86_64-apple-darwin" - else throw "missing bootstrap url for platform ${stdenv.hostPlatform.system}"; + platform = rust.toRustTarget stdenv.hostPlatform; src = fetchurl { url = "https://static.rust-lang.org/dist/rust-${version}-${platform}.tar.gz"; - sha256 = hashes.${platform}; + sha256 = hashes.${platform} or (throw "missing bootstrap url for platform ${platform}"); }; in callPackage ./binary.nix diff --git a/pkgs/development/compilers/rust/default.nix b/pkgs/development/compilers/rust/default.nix index efd641efb6e..75104ac7ad5 100644 --- a/pkgs/development/compilers/rust/default.nix +++ b/pkgs/development/compilers/rust/default.nix @@ -11,6 +11,14 @@ , llvmPackages_5 , pkgsBuildTarget, pkgsBuildBuild }: rec { + toRustTarget = platform: with platform.parsed; let + cpu_ = { + "armv7a" = "armv7"; + "armv7l" = "armv7"; + "armv6l" = "arm"; + }.${cpu.name} or cpu.name; + in "${cpu_}-${vendor.name}-${kernel.name}${lib.optionalString (abi.name != "unknown") "-${abi.name}"}"; + makeRustPlatform = { rustc, cargo, ... }: { rust = { inherit rustc cargo; diff --git a/pkgs/development/compilers/rust/print-hashes.sh b/pkgs/development/compilers/rust/print-hashes.sh index 7eb00a30ad7..1d46fe376d4 100755 --- a/pkgs/development/compilers/rust/print-hashes.sh +++ b/pkgs/development/compilers/rust/print-hashes.sh @@ -10,6 +10,7 @@ set -euo pipefail PLATFORMS=( i686-unknown-linux-gnu x86_64-unknown-linux-gnu + arm-unknown-linux-gnueabihf armv7-unknown-linux-gnueabihf aarch64-unknown-linux-gnu i686-apple-darwin diff --git a/pkgs/development/compilers/rust/rustc.nix b/pkgs/development/compilers/rust/rustc.nix index ceaf6f4c225..ca9bf05b7e7 100644 --- a/pkgs/development/compilers/rust/rustc.nix +++ b/pkgs/development/compilers/rust/rustc.nix @@ -1,6 +1,6 @@ { stdenv, removeReferencesTo, pkgsBuildBuild, pkgsBuildHost, pkgsBuildTarget , fetchurl, file, python2 -, llvm_9, darwin, git, cmake, rustPlatform +, llvm_9, darwin, git, cmake, rust, rustPlatform , pkgconfig, openssl , which, libffi , withBundledLLVM ? false @@ -53,9 +53,9 @@ in stdenv.mkDerivation rec { # We need rust to build rust. If we don't provide it, configure will try to download it. # Reference: https://github.com/rust-lang/rust/blob/master/src/bootstrap/configure.py configureFlags = let - setBuild = "--set=target.${stdenv.buildPlatform.config}"; - setHost = "--set=target.${stdenv.hostPlatform.config}"; - setTarget = "--set=target.${stdenv.targetPlatform.config}"; + setBuild = "--set=target.${rust.toRustTarget stdenv.buildPlatform}"; + setHost = "--set=target.${rust.toRustTarget stdenv.hostPlatform}"; + setTarget = "--set=target.${rust.toRustTarget stdenv.targetPlatform}"; ccForBuild = "${pkgsBuildBuild.targetPackages.stdenv.cc}/bin/${pkgsBuildBuild.targetPackages.stdenv.cc.targetPrefix}cc"; cxxForBuild = "${pkgsBuildBuild.targetPackages.stdenv.cc}/bin/${pkgsBuildBuild.targetPackages.stdenv.cc.targetPrefix}c++"; ccForHost = "${pkgsBuildHost.targetPackages.stdenv.cc}/bin/${pkgsBuildHost.targetPackages.stdenv.cc.targetPrefix}cc"; @@ -68,9 +68,9 @@ in stdenv.mkDerivation rec { "--set=build.cargo=${rustPlatform.rust.cargo}/bin/cargo" "--enable-rpath" "--enable-vendor" - "--build=${stdenv.buildPlatform.config}" - "--host=${stdenv.hostPlatform.config}" - "--target=${stdenv.targetPlatform.config}" + "--build=${rust.toRustTarget stdenv.buildPlatform}" + "--host=${rust.toRustTarget stdenv.hostPlatform}" + "--target=${rust.toRustTarget stdenv.targetPlatform}" "${setBuild}.cc=${ccForBuild}" "${setHost}.cc=${ccForHost}" diff --git a/pkgs/development/compilers/souffle/default.nix b/pkgs/development/compilers/souffle/default.nix index a39a6c4a2e4..33821bfc257 100644 --- a/pkgs/development/compilers/souffle/default.nix +++ b/pkgs/development/compilers/souffle/default.nix @@ -10,13 +10,13 @@ let in stdenv.mkDerivation rec { pname = "souffle"; - version = "1.6.1"; + version = "1.7.0"; src = fetchFromGitHub { owner = "souffle-lang"; repo = "souffle"; rev = version; - sha256 = "004c5iicjnlzn1yz1k7a28s4xdqx00016rr870drdq2z30mxfgz8"; + sha256 = "0q6cwfy3pwmaw3j1hhfk1ivcf03ijyvchyf92wdgrpj6q626kcpj"; }; nativeBuildInputs = [ autoreconfHook bison flex mcpp doxygen graphviz makeWrapper perl ]; diff --git a/pkgs/development/compilers/unison/default.nix b/pkgs/development/compilers/unison/default.nix index 03a62d1e4d8..2a8c07fa0fe 100644 --- a/pkgs/development/compilers/unison/default.nix +++ b/pkgs/development/compilers/unison/default.nix @@ -4,18 +4,18 @@ stdenv.mkDerivation rec { pname = "unison-code-manager"; - milestone_id = "M1f"; + milestone_id = "M1g"; version = "1.0.${milestone_id}-alpha"; src = if (stdenv.isDarwin) then fetchurl { url = "https://github.com/unisonweb/unison/releases/download/release/${milestone_id}/unison-osx.tar.gz"; - sha256 = "089nb0b9ghsdbs39sskwa9a6v6s5xwshcfzk9qbbpahzphp1xmfk"; + sha256 = "186y7y7ffg976w01cbb8am84ajbifb7lcnsc4g3x262mkswr7lry"; } else fetchurl { url = "https://github.com/unisonweb/unison/releases/download/release/${milestone_id}/unison-linux64.tar.gz"; - sha256 = "0jq2cspanlw15910khlzfdqdfgkwkr1q4fkmrkj0q8gz70mqi6ri"; + sha256 = "1ki9car1clpaspnl5jb5qnr6nzv108q279n8m8bjm8azfcnl61ab"; }; # The tarball is just the prebuilt binary, in the archive root. diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index 9fd343870b9..4579cf015cd 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -511,7 +511,9 @@ self: super: { else dontCheck super.tasty-discover); # generic-deriving bound is too tight - aeson = doJailbreak super.aeson; + # aeson 1.4.6.0 needs Diff 0.4.0 to do tests but nixpkgs is still at 0.3.4 + # https://github.com/bos/aeson/issues/740 + aeson = dontCheck (doJailbreak super.aeson); # containers >=0.4 && <0.6 is too tight # https://github.com/RaphaelJ/friday/issues/34 @@ -1183,18 +1185,6 @@ self: super: { # test suite failure: https://github.com/jgm/pandoc/issues/5582 pandoc = dontCheck super.pandoc; - # The latest release version is ancient. You really need this tool from git. - haskell-ci = generateOptparseApplicativeCompletion "haskell-ci" - (addBuildDepend (overrideSrc (dontCheck super.haskell-ci) { - version = "20190814-git"; - src = pkgs.fetchFromGitHub { - owner = "haskell-CI"; - repo = "haskell-ci"; - rev = "70918d80b6fd43aca7e4d00ba0d2ea116b666556"; - sha256 = "0bzp959qy74zmqq75f60rcixpjbvvyrb5a8zp2nyql3nm9vxzy5k"; - }; - }) (with self; [temporary lattices Cabal_3_0_0_0])); - # Fix build with attr-2.4.48 (see #53716) xattr = appendPatch super.xattr ./patches/xattr-fix-build.patch; @@ -1251,7 +1241,7 @@ self: super: { }); # The LTS-14.x version of their dependencies are too old. - cabal-plan = super.cabal-plan.override { optparse-applicative = self.optparse-applicative_0_15_1_0; }; + cabal-plan = super.cabal-plan.overrideScope (self: super: { optparse-applicative = self.optparse-applicative_0_15_1_0; ansi-terminal = self.ansi-terminal_0_10_2; base-compat = self.base-compat_0_11_0; semialign = self.semialign_1_1; time-compat = doJailbreak super.time-compat; }); hoogle = super.hoogle.override { haskell-src-exts = self.haskell-src-exts_1_22_0; }; # Version bounds for http-client are too strict: @@ -1318,4 +1308,10 @@ self: super: { # Needs the corresponding version of haskell-src-exts. haskell-src-exts-simple = super.haskell-src-exts-simple.override { haskell-src-exts = self.haskell-src-exts_1_22_0; }; + # https://github.com/Daniel-Diaz/HaTeX/issues/144 + HaTeX = dontCheck super.HaTeX; + + # https://github.com/kazu-yamamoto/dns/issues/150 + dns = dontCheck super.dns; + } // import ./configuration-tensorflow.nix {inherit pkgs haskellLib;} self super diff --git a/pkgs/development/haskell-modules/configuration-ghc-8.8.x.nix b/pkgs/development/haskell-modules/configuration-ghc-8.8.x.nix index ec0e4377f76..617ca63c27f 100644 --- a/pkgs/development/haskell-modules/configuration-ghc-8.8.x.nix +++ b/pkgs/development/haskell-modules/configuration-ghc-8.8.x.nix @@ -69,20 +69,29 @@ self: super: { snap-server = doJailbreak super.snap-server; # use latest version to fix the build + doctemplates = self.doctemplates_0_7_2; generics-sop = self.generics-sop_0_5_0_0; hackage-db = self.hackage-db_2_1_0; + haddock-library = self.haddock-library_1_8_0; + HsYAML = self.HsYAML_0_2_1_0; lens = self.lens_4_18_1; memory = self.memory_0_15_0; microlens = self.microlens_0_4_11_2; optparse-applicative = self.optparse-applicative_0_15_1_0; + pandoc = self.pandoc_2_8_0_1; + pandoc-types = self.pandoc-types_1_20; primitive = dontCheck super.primitive_0_7_0_0; # evaluating the test suite gives an infinite recursion regex-base = self.regex-base_0_94_0_0; regex-pcre-builtin = self.regex-pcre-builtin_0_95_1_1_8_43; regex-posix = self.regex-posix_0_96_0_0; regex-tdfa = self.regex-tdfa_1_3_0; shelly = self.shelly_1_9_0; + skylighting = self.skylighting_0_8_3; + skylighting-core = self.skylighting-core_0_8_3; sop-core = self.sop-core_0_5_0_0; + texmath = self.texmath_0_12; tls = self.tls_1_5_2; + trifecta = self.trifecta_2_1; xmonad-contrib = self.xmonad-contrib_0_16; # These packages don't work and need patching and/or an update. diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml index f57768ecb77..b8b38c77043 100644 --- a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml +++ b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml @@ -43,7 +43,7 @@ core-packages: - ghcjs-base-0 default-package-overrides: - # LTS Haskell 14.14 + # LTS Haskell 14.16 - abstract-deque ==0.3 - abstract-deque-tests ==0.3 - abstract-par ==0.3.3 @@ -55,7 +55,7 @@ default-package-overrides: - adjunctions ==4.4 - adler32 ==0.1.2.0 - advent-of-code-api ==0.1.2.3 - - aeson ==1.4.5.0 + - aeson ==1.4.6.0 - aeson-attoparsec ==0.0.0 - aeson-better-errors ==0.9.1.0 - aeson-casing ==0.2.0.0 @@ -120,7 +120,7 @@ default-package-overrides: - async-timer ==0.2.0.0 - atom-basic ==0.2.5 - atomic-primops ==0.8.3 - - atomic-write ==0.2.0.6 + - atomic-write ==0.2.0.7 - attoparsec ==0.13.2.3 - attoparsec-base64 ==0.0.0 - attoparsec-binary ==0.2 @@ -131,7 +131,7 @@ default-package-overrides: - attoparsec-uri ==0.0.7 - audacity ==0.0.2 - aur ==6.2.0.1 - - authenticate ==1.3.4 + - authenticate ==1.3.5 - authenticate-oauth ==1.6.0.1 - auto ==0.4.3.1 - autoexporter ==1.1.15 @@ -142,7 +142,7 @@ default-package-overrides: - avro ==0.4.5.4 - avwx ==0.3.0.2 - aws-cloudfront-signed-cookies ==0.2.0.1 - - aws-lambda-haskell-runtime ==2.0.1 + - aws-lambda-haskell-runtime ==2.0.2 - backprop ==0.2.6.3 - bank-holidays-england ==0.2.0.2 - barbies ==1.1.3.0 @@ -279,7 +279,7 @@ default-package-overrides: - casing ==0.1.4.1 - cassava ==0.5.2.0 - cassava-conduit ==0.5.1 - - cassava-megaparsec ==2.0.0 + - cassava-megaparsec ==2.0.1 - cassava-records ==0.1.0.4 - cast ==0.1.0.2 - caster ==0.0.3.0 @@ -311,7 +311,7 @@ default-package-overrides: - chiphunk ==0.1.2.1 - choice ==0.2.2 - chronologique ==0.3.1.1 - - chronos ==1.0.8 + - chronos ==1.0.9 - chronos-bench ==0.2.0.2 - chunked-data ==0.3.1 - cipher-aes ==0.2.11 @@ -326,7 +326,7 @@ default-package-overrides: - classy-prelude ==1.5.0 - classy-prelude-conduit ==1.5.0 - classy-prelude-yesod ==1.5.0 - - clay ==0.13.1 + - clay ==0.13.2 - clientsession ==0.9.1.2 - Clipboard ==2.3.2.0 - clock ==0.8 @@ -336,7 +336,7 @@ default-package-overrides: - clr-marshal ==0.2.0.0 - clumpiness ==0.17.0.2 - cmark ==0.6 - - cmark-gfm ==0.2.0 + - cmark-gfm ==0.2.1 - cmdargs ==0.10.20 - codec ==0.2.1 - codec-beam ==0.2.0 @@ -388,7 +388,7 @@ default-package-overrides: - connection ==0.3.1 - connection-pool ==0.2.2 - console-style ==0.0.2.1 - - constraint ==0.1.3.0 + - constraint ==0.1.4.0 - constraints ==0.10.1 - contravariant ==1.5.2 - contravariant-extras ==0.3.5 @@ -397,9 +397,9 @@ default-package-overrides: - control-monad-free ==0.6.2 - control-monad-omega ==0.3.2 - convertible ==1.1.1.0 - - cookie ==0.4.4 - - core-data ==0.2.1.0 - - core-text ==0.2.2.1 + - cookie ==0.4.5 + - core-data ==0.2.1.4 + - core-text ==0.2.2.4 - countable ==1.0 - country ==0.1.6 - courier ==0.1.1.5 @@ -408,7 +408,7 @@ default-package-overrides: - cprng-aes ==0.6.1 - cpu ==0.1.2 - cpuinfo ==0.1.0.1 - - cql ==4.0.1 + - cql ==4.0.2 - cql-io ==1.1.1 - crackNum ==2.3 - crc32c ==0.0.0 @@ -519,14 +519,14 @@ default-package-overrides: - dhall-bash ==1.0.21 - dhall-json ==1.3.0 - diagrams ==1.4 - - diagrams-contrib ==1.4.3 + - diagrams-contrib ==1.4.4 - diagrams-core ==1.4.2 - diagrams-lib ==1.4.3 - diagrams-postscript ==1.4.1 - diagrams-rasterific ==1.4.1.1 - diagrams-solve ==0.1.1 - diagrams-svg ==1.4.2 - - di-core ==1.0.3 + - di-core ==1.0.4 - dictionary-sharing ==0.1.0.0 - Diff ==0.3.4 - digest ==0.0.1.2 @@ -544,7 +544,7 @@ default-package-overrides: - dlist ==0.8.0.7 - dlist-instances ==0.1.1.1 - dlist-nonempty ==0.1.1 - - dns ==4.0.0 + - dns ==4.0.1 - dockerfile ==0.2.0 - docopt ==0.7.0.5 - doctemplates ==0.2.2.1 @@ -555,7 +555,7 @@ default-package-overrides: - do-list ==1.0.1 - dom-parser ==3.1.0 - do-notation ==0.1.0.2 - - dotenv ==0.8.0.2 + - dotenv ==0.8.0.4 - dotgen ==0.4.2 - dotnet-timespan ==0.0.1.0 - double-conversion ==2.0.2.0 @@ -664,7 +664,7 @@ default-package-overrides: - filecache ==0.4.1 - file-embed ==0.0.11 - file-embed-lzma ==0 - - filelock ==0.1.1.3 + - filelock ==0.1.1.4 - filemanip ==0.3.6.3 - file-modules ==0.1.2.4 - filepattern ==0.1.1 @@ -734,7 +734,7 @@ default-package-overrides: - gauge ==0.2.5 - gc ==0.0.3 - gd ==3000.7.3 - - gdp ==0.0.0.2 + - gdp ==0.0.3.0 - general-games ==1.1.1 - generic-arbitrary ==0.1.0 - generic-data ==0.7.0.0 @@ -847,7 +847,7 @@ default-package-overrides: - hackage-db ==2.0.1 - hackage-security ==0.5.3.0 - haddock-library ==1.7.0 - - hadolint ==1.17.2 + - hadolint ==1.17.3 - half ==0.3 - hamilton ==0.1.0.3 - hamtsolo ==1.0.3 @@ -885,7 +885,7 @@ default-package-overrides: - haxl ==2.1.2.0 - hbeanstalk ==0.2.4 - HCodecs ==0.5.1 - - hdaemonize ==0.5.5 + - hdaemonize ==0.5.6 - HDBC ==2.4.0.3 - HDBC-mysql ==0.7.1.0 - HDBC-session ==0.1.2.0 @@ -929,7 +929,7 @@ default-package-overrides: - hmpfr ==0.4.4 - hoauth2 ==1.8.9 - Hoed ==0.5.1 - - hOpenPGP ==2.8 + - hOpenPGP ==2.8.4 - hopenpgp-tools ==0.21.3 - hopfli ==0.2.2.1 - hosc ==0.17 @@ -1007,7 +1007,7 @@ default-package-overrides: - htoml ==1.0.0.3 - http2 ==1.6.5 - HTTP ==4000.3.14 - - http-api-data ==0.4.1 + - http-api-data ==0.4.1.1 - http-client ==0.6.4 - http-client-tls ==0.3.5.3 - http-common ==0.8.2.0 @@ -1047,7 +1047,7 @@ default-package-overrides: - hw-mquery ==0.2.0.2 - hw-packed-vector ==0.0.0.3 - hw-parser ==0.1.0.2 - - hw-prim ==0.6.2.38 + - hw-prim ==0.6.2.39 - hw-rankselect ==0.13.0.0 - hw-rankselect-base ==0.3.2.3 - hw-simd ==0.1.1.5 @@ -1086,7 +1086,6 @@ default-package-overrides: - indents ==0.5.0.1 - indexed ==0.1.3 - indexed-list-literals ==0.2.1.2 - - indexed-profunctors ==0.1 - infer-license ==0.2.0 - inflections ==0.4.0.4 - influxdb ==1.7.1.1 @@ -1096,7 +1095,7 @@ default-package-overrides: - inline-c-cpp ==0.3.0.3 - inline-r ==0.10.2 - inliterate ==0.1.0 - - insert-ordered-containers ==0.2.3 + - insert-ordered-containers ==0.2.2 - inspection-testing ==0.4.2.2 - instance-control ==0.1.2.0 - int-cast ==0.2.0.0 @@ -1141,7 +1140,7 @@ default-package-overrides: - ixset-typed ==0.4.0.1 - ix-shapable ==0.1.0 - jack ==0.7.1.4 - - jose ==0.8.1.0 + - jose ==0.8.2.0 - jose-jwt ==0.8.0 - js-dgtable ==0.5.2 - js-flot ==0.8.3 @@ -1253,7 +1252,7 @@ default-package-overrides: - log-domain ==0.12 - logfloat ==0.13.3.3 - logger-thread ==0.1.0.2 - - logging-effect ==1.3.7 + - logging-effect ==1.3.8 - logging-facade ==0.3.0 - logging-facade-syslog ==1 - logict ==0.7.0.2 @@ -1280,7 +1279,7 @@ default-package-overrides: - markdown-unlit ==0.5.0 - markov-chain ==0.0.3.4 - massiv ==0.4.3.0 - - massiv-io ==0.1.7.0 + - massiv-io ==0.1.9.0 - massiv-test ==0.1.1 - mathexpr ==0.3.0.0 - math-functions ==0.3.3.0 @@ -1352,7 +1351,7 @@ default-package-overrides: - monad-logger ==0.3.30 - monad-logger-json ==0.1.0.0 - monad-logger-prefix ==0.1.11 - - monad-logger-syslog ==0.1.4.0 + - monad-logger-syslog ==0.1.5.0 - monad-loops ==0.4.3 - monad-memo ==0.5.1 - monad-metrics ==0.2.1.4 @@ -1432,7 +1431,7 @@ default-package-overrides: - network-house ==0.1.0.2 - network-info ==0.2.0.10 - network-ip ==0.3.0.3 - - network-messagepack-rpc ==0.1.1.4 + - network-messagepack-rpc ==0.1.2.0 - network-multicast ==0.3.2 - network-simple ==0.4.5 - network-simple-tls ==0.3.2 @@ -1448,10 +1447,9 @@ default-package-overrides: - nonce ==1.0.7 - nondeterminism ==1.4 - non-empty ==0.3.2 - - nonempty-containers ==0.3.2.0 + - nonempty-containers ==0.3.1.0 - nonemptymap ==0.0.6.0 - - non-empty-sequence ==0.2.0.2 - - nonempty-vector ==0.2.0.1 + - non-empty-sequence ==0.2.0.4 - non-negative ==0.1.2 - not-gloss ==0.7.7.0 - no-value ==1.0.0.0 @@ -1461,7 +1459,7 @@ default-package-overrides: - numbers ==3000.2.0.2 - numeric-extras ==0.1 - numeric-prelude ==0.4.3.1 - - numhask ==0.3.0.0 + - numhask ==0.3.1 - NumInstances ==1.4 - numtype-dk ==0.5.0.2 - nuxeo ==0.3.2 @@ -1495,8 +1493,6 @@ default-package-overrides: - open-witness ==0.4.0.1 - operational ==0.2.3.5 - operational-class ==0.3.0.0 - - optics-core ==0.2 - - optics-extra ==0.2 - optional-args ==1.0.2 - options ==1.2.1.1 - optparse-applicative ==0.14.3.0 @@ -1548,7 +1544,7 @@ default-package-overrides: - pcf-font-embed ==0.1.2.0 - pcg-random ==0.1.3.6 - pcre-heavy ==1.0.0.2 - - pcre-light ==0.4.0.4 + - pcre-light ==0.4.1.0 - pcre-utils ==0.1.8.1.1 - pdfinfo ==1.5.4 - peano ==0.1.0.1 @@ -1651,7 +1647,7 @@ default-package-overrides: - primitive ==0.6.4.0 - primitive-extras ==0.7.1.1 - prim-uniq ==0.1.0.1 - - probability ==0.2.5.2 + - probability ==0.2.6 - process-extras ==0.7.4 - product-isomorphic ==0.0.3.3 - product-profunctors ==0.10.0.0 @@ -1909,7 +1905,7 @@ default-package-overrides: - sexpr-parser ==0.1.1.2 - SHA ==1.6.4.4 - shake-language-c ==0.12.0 - - shakespeare ==2.0.22 + - shakespeare ==2.0.23 - shared-memory ==0.2.0.0 - shell-conduit ==4.7.0 - shell-escape ==0.2.0 @@ -1953,7 +1949,7 @@ default-package-overrides: - smallcheck-series ==0.6.1 - smoothie ==0.4.2.9 - snap-blaze ==0.2.1.5 - - snap-core ==1.0.4.0 + - snap-core ==1.0.4.1 - snap-server ==1.1.1.1 - snowflake ==0.1.1.1 - soap ==0.2.3.6 @@ -2226,7 +2222,7 @@ default-package-overrides: - type-operators ==0.2.0.0 - typerep-map ==0.3.2 - type-spec ==0.4.0.0 - - tz ==0.1.3.2 + - tz ==0.1.3.3 - tzdata ==0.1.20190325.0 - ua-parser ==0.7.5.1 - ucam-webauth ==0.1.0.0 @@ -2355,7 +2351,7 @@ default-package-overrides: - webex-teams-api ==0.2.0.0 - webex-teams-conduit ==0.2.0.0 - webex-teams-pipes ==0.2.0.0 - - web-routes ==0.27.14.2 + - web-routes ==0.27.14.3 - web-routes-hsp ==0.24.6.1 - web-routes-wai ==0.24.3.1 - webrtc-vad ==0.1.0.3 @@ -2437,7 +2433,7 @@ default-package-overrides: - yesod-auth ==1.6.8 - yesod-auth-hashdb ==1.7.1.1 - yesod-auth-oauth2 ==0.6.1.2 - - yesod-bin ==1.6.0.3 + - yesod-bin ==1.6.0.4 - yesod-core ==1.6.16.1 - yesod-csp ==0.2.5.0 - yesod-eventsource ==1.6.0 @@ -2452,7 +2448,7 @@ default-package-overrides: - yesod-recaptcha2 ==0.3.0 - yesod-sitemap ==1.6.0 - yesod-static ==1.6.0.1 - - yesod-test ==1.6.7 + - yesod-test ==1.6.8 - yesod-text-markdown ==0.1.10 - yesod-websockets ==0.3.0.2 - yes-precure5-command ==5.5.3 @@ -2548,7 +2544,6 @@ package-maintainers: - funcmp - git-annex - hackage-db - - haskell-ci - hledger - hledger-interest - hledger-ui @@ -2594,6 +2589,7 @@ package-maintainers: cdepillabout: - pretty-simple - purescript + - spago - termonad unsupported-platforms: @@ -2855,6 +2851,7 @@ broken-packages: - alerta - alex-meta - alex-prelude + - alex-tools - alfred - alg - alga @@ -2937,6 +2934,7 @@ broken-packages: - apecs-stm - apelsin - api-builder + - api-rpc-factom - api-rpc-pegnet - api-tools - api-yoti @@ -2998,6 +2996,7 @@ broken-packages: - array-chunks - array-forth - array-primops + - arrayfire - arraylist - ArrayRef - arrow-improve @@ -3264,6 +3263,7 @@ broken-packages: - biofasta - biofastq - biohazard + - BioHMM - bioinformatics-toolkit - biophd - biopsl @@ -3273,6 +3273,7 @@ broken-packages: - bird - BirdPP - bisect-binary + - bishbosh - bit-array - bit-stream - bitcoin-hs @@ -3388,6 +3389,7 @@ broken-packages: - buffer - buffer-builder-aeson - BufferedSocket + - buffet - buffon - bugzilla - build @@ -3446,11 +3448,13 @@ broken-packages: - cabal-ghc-dynflags - cabal-ghci - cabal-graphdeps + - cabal-helper - Cabal-ide-backend - cabal-info - cabal-install-bundle - cabal-install-ghc72 - cabal-install-ghc74 + - cabal-install-parsers - cabal-meta - cabal-mon - cabal-nirvana @@ -3492,7 +3496,9 @@ broken-packages: - calculator - caldims - caledon + - calenderweek - call + - call-alloy - call-haskell-from-anything - camfort - campfire @@ -3685,6 +3691,7 @@ broken-packages: - cloud-haskell - cloud-seeder - cloudfront-signer + - cloudi - clr-inline - clua - cluss @@ -3713,6 +3720,8 @@ broken-packages: - co-log-sys - Coadjute - coalpit + - cobot-io + - cobot-tools - code-builder - codec-beam - codec-libevent @@ -3764,6 +3773,7 @@ broken-packages: - compact-socket - compact-string - compact-string-fix + - compact-word-vectors - Compactable - compdata-dags - competition @@ -3827,6 +3837,7 @@ broken-packages: - conkin - conlogger - connection-string + - connections - Conscript - consistent - const-math-ghc-plugin @@ -4177,6 +4188,7 @@ broken-packages: - dgim - dgs - dhall-check + - dhall-fly - dhall-lsp-server - dhall-nix - dhall-to-cabal @@ -4355,6 +4367,7 @@ broken-packages: - dtd-text - dtw - dual + - duet - Dung - duplo - Dust @@ -4430,6 +4443,7 @@ broken-packages: - email - email-header - email-postmark + - email-validator - emailparse - embeddock - embeddock-example @@ -4542,6 +4556,7 @@ broken-packages: - exif - exinst-deepseq - exinst-hashable + - exist-instances - exists - exitcode - expand @@ -4571,6 +4586,7 @@ broken-packages: - f-ree-hack-cheats-free-v-bucks-generator - Facebook-Password-Hacker-Online-Latest-Version - faceted + - factory - Facts - factual-api - fadno @@ -4665,6 +4681,7 @@ broken-packages: - FilePather - filepather - Files + - filestore - FileSystem - filesystem-conduit - filesystem-enumerator @@ -4687,6 +4704,7 @@ broken-packages: - first-and-last - firstify - FirstOrderTheory + - fishfood - fit - fits-parse - fitsio @@ -4757,6 +4775,7 @@ broken-packages: - Forestry - forger - ForkableT + - forma - formal - FormalGrammars - format @@ -4862,6 +4881,10 @@ broken-packages: - funnyprint - funpat - funsat + - fused-effects-exceptions + - fused-effects-lens + - fused-effects-random + - fused-effects-resumable - fusion - futhark - futun @@ -4875,6 +4898,7 @@ broken-packages: - g2q - g4ip - gact + - galois-fft - game-probability - gameclock - gamgee @@ -4957,6 +4981,7 @@ broken-packages: - getflag - GGg - ggtsTC + - gh-labeler - ghc-core-smallstep - ghc-datasize - ghc-dump-tree @@ -5289,7 +5314,6 @@ broken-packages: - hakyll-dir-list - hakyll-favicon - hakyll-filestore - - hakyll-images - hakyll-ogmarkup - hakyll-R - hakyll-sass @@ -5412,6 +5436,7 @@ broken-packages: - haskell-bitmex-client - haskell-bitmex-rest - haskell-brainfuck + - haskell-ci - haskell-cnc - haskell-coffee - haskell-compression @@ -5505,6 +5530,7 @@ broken-packages: - haskmon - haskoin - haskoin-bitcoind + - haskoin-core - haskoin-crypto - haskoin-node - haskoin-protocol @@ -5634,6 +5660,7 @@ broken-packages: - hedgehog-classes - hedgehog-gen-json - hedgehog-generic + - hedgehog-golden - Hedi - hedis-config - hedis-pile @@ -5889,6 +5916,7 @@ broken-packages: - hoovie - hopencc - hopencl + - hOpenPGP - hopenpgp-tools - hopfield - hoppy-docs @@ -5946,6 +5974,9 @@ broken-packages: - hR - hranker - HRay + - hreq-client + - hreq-conduit + - hreq-core - Hricket - hricket - hriemann @@ -6167,6 +6198,7 @@ broken-packages: - http-streams - http-wget - http2-client-grpc + - http2-grpc-proto3-wire - https-everywhere-rules - https-everywhere-rules-raw - httpspec @@ -6561,6 +6593,7 @@ broken-packages: - JYU-Utils - kademlia - kafka-client + - kafka-client-sync - kaleidoscope - Kalman - kalman @@ -7066,6 +7099,9 @@ broken-packages: - marxup - masakazu-bot - MASMGen + - massiv + - massiv-io + - massiv-test - master-plan - matchable-th - matchers @@ -7208,6 +7244,7 @@ broken-packages: - mm2 - mmsyn2 - mmsyn4 + - mmsyn6ukr - mmtf - mmtl - mmtl-base @@ -7293,6 +7330,7 @@ broken-packages: - monoids - monopati - monte-carlo + - months - monzo - moo - moonshine @@ -7301,11 +7339,14 @@ broken-packages: - morley - morley-prelude - morph + - morpheus-graphql-cli - morphisms-functors - morphisms-functors-inventory - morphisms-objects - morte - mosaico-lib + - moto + - moto-postgresql - mount - movie-monad - mp @@ -7524,6 +7565,7 @@ broken-packages: - nirum - nitro - nixfromnpm + - nixpkgs-update - nkjp - nlp-scores - nlp-scores-scripts @@ -7549,6 +7591,7 @@ broken-packages: - NoSlow - not-gloss-examples - notcpp + - notifications-tray-icon - notmuch-haskell - notmuch-web - now-haskell @@ -7574,6 +7617,7 @@ broken-packages: - numhask-histogram - numhask-prelude - numhask-range + - numhask-space - numhask-test - Nussinov78 - Nutri @@ -7679,6 +7723,7 @@ broken-packages: - orgstat - origami - orizentic + - ormolu - OrPatterns - osc - oscpacking @@ -7714,12 +7759,13 @@ broken-packages: - pairing - pam - panda + - pandoc-citeproc-preamble + - pandoc-crossref - pandoc-include - pandoc-include-code - pandoc-japanese-filters - pandoc-lens - pandoc-markdown-ghci-filter - - pandoc-placetable - pandoc-plantuml-diagrams - pandoc-pyplot - pandoc-unlit @@ -7885,6 +7931,7 @@ broken-packages: - piet - pig - pinchot + - pine - ping - pinpon - Pipe @@ -7959,6 +8006,7 @@ broken-packages: - pocket-dns - point-octree - pointfree-fancy + - pointful - pointless-lenses - pointless-rewrite - pokemon-go-protobuf-types @@ -8092,6 +8140,7 @@ broken-packages: - product - prof2dot - prof2pretty + - profunctor-optics - progress - progress-meter - progressbar @@ -8115,6 +8164,7 @@ broken-packages: - proteome - proto-lens-combinators - proto-lens-descriptors + - proto-lens-jsonpb - proto3-suite - protobuf-native - protocol-buffers-descriptor-fork @@ -8226,6 +8276,7 @@ broken-packages: - quiver-instances - quiver-interleave - quiver-sort + - quokka - quoridor-hs - qux - R-pandoc @@ -8357,6 +8408,7 @@ broken-packages: - reformat - refresht - refurb + - reg-alloc - regex-deriv - regex-dfa - regex-generator @@ -8484,6 +8536,7 @@ broken-packages: - riff - ring-buffer - ring-buffers + - rings - riot - risc386 - riscv-isa @@ -8620,6 +8673,7 @@ broken-packages: - scenegraph - schedevr - schedule-planner + - scheduler - schedyield - schemas - schematic @@ -8896,6 +8950,7 @@ broken-packages: - singleton-dict - singleton-typelits - singnal + - singular-factory - sink - siphon - siren-json @@ -9044,6 +9099,7 @@ broken-packages: - sorted - sorting - sorty + - souffle-haskell - sound-collage - sounddelay - soundgen @@ -9114,6 +9170,7 @@ broken-packages: - sqlvalue-list - sqsd-local - squeal-postgresql + - squeeze - sr-extra - srcinst - sscan @@ -9124,6 +9181,7 @@ broken-packages: - sssp - sstable - SSTG + - st2 - stable-heap - stable-maps - stable-marriage @@ -9382,6 +9440,7 @@ broken-packages: - tasty-laws - tasty-lens - tasty-stats + - tasty-tap - Taxonomy - TaxonomyTools - TBC @@ -9696,6 +9755,7 @@ broken-packages: - twilio - twill - twine + - twirp - twitter - twitter-conduit - twitter-enumerator @@ -10059,6 +10119,7 @@ broken-packages: - websockets-simple - websockets-simple-extra - webwire + - weekdaze - weighted - weighted-regexp - welshy @@ -10230,6 +10291,7 @@ broken-packages: - yam-servant - yam-transaction-odbc - yam-web + - yaml-combinators - yaml-pretty-extras - yaml-rpc - yaml-rpc-scotty diff --git a/pkgs/development/haskell-modules/configuration-nix.nix b/pkgs/development/haskell-modules/configuration-nix.nix index 2413a764f1d..b31ed9af71b 100644 --- a/pkgs/development/haskell-modules/configuration-nix.nix +++ b/pkgs/development/haskell-modules/configuration-nix.nix @@ -636,4 +636,60 @@ self: super: builtins.intersectAttrs super { # need it during the build itself, too. cairo = addBuildTool super.cairo self.buildHaskellPackages.gtk2hs-buildtools; pango = disableHardening (addBuildTool super.pango self.buildHaskellPackages.gtk2hs-buildtools) ["fortify"]; + + spago = + let + # Spago basically compiles with LTS-14, but it requires a newer version + # of directory. This is to work around a bug only present on windows, so + # we can safely jailbreak spago and use the older directory package from + # LTS-14. + spagoWithOverrides = doJailbreak (super.spago.override { + # spago requires the latest version of dhall. + directory = self.dhall_1_27_0; + }); + + docsSearchAppJsFile = pkgs.fetchurl { + url = "https://github.com/spacchetti/purescript-docs-search/releases/download/v0.0.5/docs-search-app.js"; + sha256 = "11721x455qzh40vzfmralaynn9v8b5wix86r107hhs08vhryjib2"; + }; + + purescriptDocsSearchFile = pkgs.fetchurl { + url = "https://github.com/spacchetti/purescript-docs-search/releases/download/v0.0.5/purescript-docs-search"; + sha256 = "16p1fmdvpwz1yswav8qjsd26c9airb22xncqw1rjnbd8lcpqx0p5"; + }; + + spagoFixHpack = overrideCabal spagoWithOverrides (drv: { + postUnpack = (drv.postUnpack or "") + '' + # The source for spago is pulled directly from GitHub. It uses a + # package.yaml file with hpack, not a .cabal file. In the package.yaml file, + # it uses defaults from the master branch of the hspec repo. It will try to + # fetch these at build-time (but it will fail if running in the sandbox). + # + # The following line modifies the package.yaml to not pull in + # defaults from the hspec repo. + substituteInPlace "$sourceRoot/package.yaml" --replace 'defaults: hspec/hspec@master' "" + + # Spago includes the following two files directly into the binary + # with Template Haskell. They are fetched at build-time from the + # `purescript-docs-search` repo above. If they cannot be fetched at + # build-time, they are pulled in from the `templates/` directory in + # the spago source. + # + # However, they are not actually available in the spago source, so they + # need to fetched with nix and put in the correct place. + # https://github.com/spacchetti/spago/issues/510 + cp ${docsSearchAppJsFile} "$sourceRoot/templates/docs-search-app.js" + cp ${purescriptDocsSearchFile} "$sourceRoot/templates/purescript-docs-search" + ''; + }); + + # Haddock generation is broken for spago. + # https://github.com/spacchetti/spago/issues/511 + spagoWithoutHaddocks = dontHaddock spagoFixHpack; + + # Because of the problem above with pulling in hspec defaults to the + # package.yaml file, the tests are disabled. + spagoWithoutChecks = dontCheck spagoWithoutHaddocks; + in + spagoWithoutChecks; } diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix index 8c795eab75a..c343821f2d9 100644 --- a/pkgs/development/haskell-modules/hackage-packages.nix +++ b/pkgs/development/haskell-modules/hackage-packages.nix @@ -1509,6 +1509,8 @@ self: { ]; description = "Libary for Hidden Markov Models in HMMER3 format"; license = stdenv.lib.licenses.gpl3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "Biobase" = callPackage @@ -1668,8 +1670,8 @@ self: { }: mkDerivation { pname = "BiobaseHTTP"; - version = "1.1.0"; - sha256 = "0y26d4aqxqpdr142y26p70v6cnrr48dhxm5nnnhqxg0lsirbxad0"; + version = "1.2.0"; + sha256 = "1m6lfs08zyk2xcxcmapcdfqp7afmzz3n2r3rr3qzlibwc6w7pj1d"; libraryHaskellDepends = [ aeson base BiobaseEnsembl bytestring conduit either-unwrap HTTP http-conduit hxt mtl network Taxonomy text transformers @@ -8027,12 +8029,12 @@ self: { }) {}; "HGL" = callPackage - ({ mkDerivation, array, base, X11 }: + ({ mkDerivation, array, base, stm, X11 }: mkDerivation { pname = "HGL"; - version = "3.2.3.1"; - sha256 = "0m9y2sdlbmw0n4xad26viajr391w0clpqw1256lanidwkrxfwpfh"; - libraryHaskellDepends = [ array base X11 ]; + version = "3.2.3.2"; + sha256 = "087k8i0bha3mzpqa3z3c6npl5vmccg7xcwl28lbv0yzbvj1qkg38"; + libraryHaskellDepends = [ array base stm X11 ]; description = "A simple graphics library based on X11 or Win32"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; @@ -9229,6 +9231,42 @@ self: { license = stdenv.lib.licenses.lgpl21; }) {}; + "HTF_0_14_0_1" = callPackage + ({ mkDerivation, aeson, aeson-pretty, array, base + , base64-bytestring, bytestring, Cabal, containers, cpphs, Diff + , directory, filepath, haskell-src, HUnit, lifted-base + , monad-control, mtl, old-time, pretty, process, QuickCheck, random + , regex-compat, template-haskell, temporary, text, time, unix + , unordered-containers, vector, xmlgen + }: + mkDerivation { + pname = "HTF"; + version = "0.14.0.1"; + sha256 = "025gcc77j547713bxm8y2i7xmq95nc4imyym6agmfrd7bh8h1jdb"; + isLibrary = true; + isExecutable = true; + setupHaskellDepends = [ base Cabal process ]; + libraryHaskellDepends = [ + aeson array base base64-bytestring bytestring containers cpphs Diff + directory haskell-src HUnit lifted-base monad-control mtl old-time + pretty process QuickCheck random regex-compat text time unix vector + xmlgen + ]; + libraryToolDepends = [ cpphs ]; + executableHaskellDepends = [ + array base cpphs directory HUnit mtl old-time random text + ]; + executableToolDepends = [ cpphs ]; + testHaskellDepends = [ + aeson aeson-pretty base bytestring directory filepath HUnit mtl + process random regex-compat template-haskell temporary text + unordered-containers + ]; + description = "The Haskell Test Framework"; + license = stdenv.lib.licenses.lgpl21; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "HTTP" = callPackage ({ mkDerivation, array, base, bytestring, deepseq, httpd-shed , HUnit, mtl, network, network-uri, parsec, pureMD5, split @@ -12458,6 +12496,28 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "ListLike_4_6_3" = callPackage + ({ mkDerivation, array, base, bytestring, containers, deepseq + , dlist, fmlist, HUnit, QuickCheck, random, text, utf8-string + , vector + }: + mkDerivation { + pname = "ListLike"; + version = "4.6.3"; + sha256 = "10vn7gslx4zzjq547cwpzdfb4c5w3nsfis6qr03dr9c4fdzj61lx"; + libraryHaskellDepends = [ + array base bytestring containers deepseq dlist fmlist text + utf8-string vector + ]; + testHaskellDepends = [ + array base bytestring containers dlist fmlist HUnit QuickCheck + random text utf8-string vector + ]; + description = "Generalized support for list-like structures"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "ListT" = callPackage ({ mkDerivation, base, smallcheck, tasty, tasty-smallcheck , transformers, util @@ -12887,8 +12947,8 @@ self: { }: mkDerivation { pname = "Map"; - version = "0.1.3.0"; - sha256 = "06i3lw329mvx7is5kb8hl2dz9dd0r8qh5g674ld006kbbk7p3jay"; + version = "0.1.3.1"; + sha256 = "1a5pygjxk839lxx6pavq72fl35sk53zq10q1ivsm309xrvq93pki"; libraryHaskellDepends = [ base containers either-both filtrable util ]; @@ -18549,8 +18609,8 @@ self: { }: mkDerivation { pname = "StockholmAlignment"; - version = "1.1.2"; - sha256 = "1x41m0xcmz9j4gypbl4pi6a6v53j6v37ndl8g5rq60fqfl18hizb"; + version = "1.2.0"; + sha256 = "0zz437d771cb4zpjzcddjl8xvz9qxmj1pyxql70lqczvqrk6k78y"; libraryHaskellDepends = [ base colour diagrams-cairo diagrams-lib directory either-unwrap filepath parsec ParsecTools SVGFonts text vector @@ -19050,8 +19110,8 @@ self: { }: mkDerivation { pname = "Taxonomy"; - version = "1.0.3"; - sha256 = "0w4j1v2l7c8a8x0rpvq1gxbvjcw83kj84m5bw6bwx3x6gc997xxn"; + version = "2.0.0"; + sha256 = "1b2x0lkg5pgjk1jyanbi8g9rs1sr7llihyjhdfsg6fajklrzh3m9"; libraryHaskellDepends = [ aeson base bytestring either-unwrap fgl graphviz parsec text vector ]; @@ -20652,10 +20712,8 @@ self: { ({ mkDerivation, base, bytestring, deepseq, text, text-short }: mkDerivation { pname = "X"; - version = "0.3.0.0"; - sha256 = "0grjiznl8j44mq3m0jkhm9z7wcr4cywrnfmk92nk3g6ddhcyakkc"; - revision = "1"; - editedCabalFile = "1nbp0zci2sp07cr5j5xlh7gswcnj52z9dp6akh9xk4mzk3salxwq"; + version = "0.3.1.0"; + sha256 = "10paczbaiwag50v8ay9pl0f6whqds6y0yy14z0h8s6j04p9zd50f"; libraryHaskellDepends = [ base bytestring deepseq text text-short ]; @@ -22652,8 +22710,8 @@ self: { ({ mkDerivation, base, criterion, time }: mkDerivation { pname = "acme-year"; - version = "2016"; - sha256 = "1zvhy62hrc47idl1awbdjzrhbhqjplsfy7lpybvdhc298criygdl"; + version = "2019"; + sha256 = "011vpap3j0riw6y23j8c4h7610yhjq00jpcfjg2g7lagb62gmkpa"; libraryHaskellDepends = [ base ]; testHaskellDepends = [ base time ]; benchmarkHaskellDepends = [ base criterion ]; @@ -23109,20 +23167,21 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "advent-of-code-api_0_2_2_0" = callPackage + "advent-of-code-api_0_2_4_2" = callPackage ({ mkDerivation, aeson, base, bytestring, containers, deepseq , directory, filepath, finite-typelits, http-api-data, http-client - , http-client-tls, http-media, HUnit, megaparsec, mtl, servant - , servant-client, servant-client-core, stm, tagsoup, text, time + , http-client-tls, http-media, HUnit, megaparsec, mtl, profunctors + , servant, servant-client, servant-client-core, stm, tagsoup, text + , time }: mkDerivation { pname = "advent-of-code-api"; - version = "0.2.2.0"; - sha256 = "1r06kb8l6h4hm4r1f7prch3px0zigdcp8vrzi1x0qw6g1wj4zii0"; + version = "0.2.4.2"; + sha256 = "01mw95ygb20bg6fs9bda1fr7z05h2sinmycpvi0ccid5qci57fa3"; libraryHaskellDepends = [ aeson base bytestring containers deepseq directory filepath finite-typelits http-api-data http-client http-client-tls - http-media megaparsec mtl servant servant-client + http-media megaparsec mtl profunctors servant servant-client servant-client-core stm tagsoup text time ]; testHaskellDepends = [ base directory filepath HUnit text ]; @@ -23216,38 +23275,6 @@ self: { }: mkDerivation { pname = "aeson"; - version = "1.4.5.0"; - sha256 = "1jhabz1lbbv6yqxqiybifi86cb5xlsadrn368n5dd0wzzc7ja4iz"; - libraryHaskellDepends = [ - attoparsec base base-compat bytestring containers deepseq dlist - ghc-prim hashable primitive scientific tagged template-haskell text - th-abstraction time time-compat unordered-containers uuid-types - vector - ]; - testHaskellDepends = [ - attoparsec base base-compat base-orphans base16-bytestring - bytestring containers Diff directory dlist filepath - generic-deriving ghc-prim hashable hashable-time integer-logarithms - QuickCheck quickcheck-instances scientific tagged tasty - tasty-golden tasty-hunit tasty-quickcheck template-haskell text - time time-compat unordered-containers uuid-types vector - ]; - description = "Fast JSON parsing and encoding"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "aeson_1_4_6_0" = callPackage - ({ mkDerivation, attoparsec, base, base-compat, base-orphans - , base16-bytestring, bytestring, containers, deepseq, Diff - , directory, dlist, filepath, generic-deriving, ghc-prim, hashable - , hashable-time, integer-logarithms, primitive, QuickCheck - , quickcheck-instances, scientific, tagged, tasty, tasty-golden - , tasty-hunit, tasty-quickcheck, template-haskell, text - , th-abstraction, time, time-compat, unordered-containers - , uuid-types, vector - }: - mkDerivation { - pname = "aeson"; version = "1.4.6.0"; sha256 = "12s8nfsady47zlz94f7m978irwwj0l0v2x41hk8w1i14wb3b4gwj"; libraryHaskellDepends = [ @@ -23266,7 +23293,6 @@ self: { ]; description = "Fast JSON parsing and encoding"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "aeson-applicative" = callPackage @@ -24811,16 +24837,21 @@ self: { }) {}; "alex-tools" = callPackage - ({ mkDerivation, base, deepseq, template-haskell, text }: + ({ mkDerivation, base, bytestring, deepseq, template-haskell, text + }: mkDerivation { pname = "alex-tools"; - version = "0.4"; - sha256 = "0qyh3dr5nh7whv3qh431l8x4lx3nzkildlyl3xgnaxpbs8gr8sgi"; - revision = "2"; - editedCabalFile = "1hz7gdff15bxvx5jijgh6ih1m2v39nadfy2yjsb43c48p9hcn93z"; - libraryHaskellDepends = [ base deepseq template-haskell text ]; + version = "0.5"; + sha256 = "06ghkigqabz9h17wjpc3jwv1f4k6fajpzblzvysqzg71pfncx88m"; + revision = "1"; + editedCabalFile = "0br92hrl0pxw2a5k9wgzk3zwyz2dimcwwjxijgzrd2yg0s1vnm9p"; + libraryHaskellDepends = [ + base bytestring deepseq template-haskell text + ]; description = "A set of functions for a common use case of Alex"; license = stdenv.lib.licenses.isc; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "alfred" = callPackage @@ -25516,6 +25547,22 @@ self: { broken = true; }) {}; + "altsvc" = callPackage + ({ mkDerivation, base, bytestring, cereal, tasty, tasty-hunit + , tasty-quickcheck + }: + mkDerivation { + pname = "altsvc"; + version = "0.1.0.0"; + sha256 = "0lgfj02ryc3130ymrkw179j311df2cj0ry9w32mvd77mwx48396c"; + libraryHaskellDepends = [ base bytestring cereal ]; + testHaskellDepends = [ + base bytestring cereal tasty tasty-hunit tasty-quickcheck + ]; + description = "HTTP Alternative Services"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "alure" = callPackage ({ mkDerivation, alure, base, OpenAL }: mkDerivation { @@ -28687,10 +28734,8 @@ self: { }: mkDerivation { pname = "ansi-pretty"; - version = "0.1.2.1"; - sha256 = "1ill2dlzbxn97smkzdqcjfx9z3fw7pgwvz6w36d92n8p7zwik23h"; - revision = "6"; - editedCabalFile = "1j2iyzf61wmwdrb8i3xynins7shjv89y4028sy13rfywsbqpjg4s"; + version = "0.1.2.2"; + sha256 = "0q72y2pnx5qx7jk1waq3qdry1azq07wygb9hcgjqz78lbszg19cm"; libraryHaskellDepends = [ aeson ansi-wl-pprint array base bytestring containers generics-sop nats scientific semigroups tagged text time unordered-containers @@ -28713,12 +28758,12 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "ansi-terminal_0_10_1" = callPackage + "ansi-terminal_0_10_2" = callPackage ({ mkDerivation, base, colour }: mkDerivation { pname = "ansi-terminal"; - version = "0.10.1"; - sha256 = "1b168z688b1lg4d2bmbxmm2mj51mwm2wv0smfb1vcwjp2vzpqf9i"; + version = "0.10.2"; + sha256 = "0h09lia7gqchp023hbgwq4w8bmg33a02chaixdsx8nqbj8jf5558"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base colour ]; @@ -28734,8 +28779,8 @@ self: { }: mkDerivation { pname = "ansi-terminal-game"; - version = "0.6.0.0"; - sha256 = "117j5s87pw1cmh9klzcc3jcc3hvynsrwknkqys8lqlhp2xkvha5y"; + version = "0.7.2.0"; + sha256 = "041xw7kq620ydnbdawmsdb65021p2534f9725qddv1i0pcwdn274"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -29614,6 +29659,8 @@ self: { testHaskellDepends = [ base bytestring ]; description = "RPC API client for Factom"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "api-rpc-pegnet" = callPackage @@ -30589,8 +30636,8 @@ self: { }: mkDerivation { pname = "arbor-monad-metric-datadog"; - version = "1.1.1"; - sha256 = "1188xwwxx7ykdh7v15gqnh0kv9w1g66wp09jp1fpfyms1qj12nqj"; + version = "1.1.2"; + sha256 = "1wja13n9k2vad0icqsm8lydrxkgb01062ajm3y1xq7fybn5g6rbx"; libraryHaskellDepends = [ arbor-datadog arbor-monad-metric base bytestring containers generic-lens lens mtl network resourcet stm text transformers @@ -31406,6 +31453,8 @@ self: { testToolDepends = [ hspec-discover ]; description = "Haskell bindings to the ArrayFire general-purpose GPU library"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {af = null;}; "arraylist" = callPackage @@ -32829,8 +32878,8 @@ self: { }: mkDerivation { pname = "atomic-write"; - version = "0.2.0.6"; - sha256 = "1xs3shwnlj8hmnm3q6jc8nv78z0481i5n4hrqqdmbpx8grvlnqyl"; + version = "0.2.0.7"; + sha256 = "03cn3ii74h0w3g4h78xsx9v2sn58r3qsr2dbdwq340xwhiwcgxdm"; libraryHaskellDepends = [ base bytestring directory filepath temporary text unix-compat ]; @@ -32903,8 +32952,8 @@ self: { }: mkDerivation { pname = "ats-format"; - version = "0.2.0.34"; - sha256 = "146l1zlm4jc83v8rs3ci9j53x2gsvpdb2wjx06d4zg1h2ri8064i"; + version = "0.2.0.35"; + sha256 = "02lqpvfqmz99k5ywim9badn22y18qqss2q21ibj79l1lljw4sqss"; isLibrary = false; isExecutable = true; setupHaskellDepends = [ base Cabal cli-setup filepath ]; @@ -32929,8 +32978,8 @@ self: { }: mkDerivation { pname = "ats-pkg"; - version = "3.3.0.7"; - sha256 = "15xr1g3ivmfnwmbrh2ga75vppyv1qk6zcx556f69jxx1ab492zyq"; + version = "3.4.0.1"; + sha256 = "0lfmlsnxa7fvifqay4xvnkl8cpbx7a6vbfb0szvb5j0nfa8607n6"; isLibrary = true; isExecutable = true; enableSeparateDataOutput = true; @@ -33574,21 +33623,18 @@ self: { "authenticate" = callPackage ({ mkDerivation, aeson, attoparsec, base, blaze-builder, bytestring - , case-insensitive, conduit, containers, http-conduit, http-types - , network-uri, resourcet, tagstream-conduit, text, transformers + , case-insensitive, conduit, containers, html-conduit, http-conduit + , http-types, network-uri, resourcet, text, transformers , unordered-containers, xml-conduit }: mkDerivation { pname = "authenticate"; - version = "1.3.4"; - sha256 = "1f1gjggfq114h3nrlzg2svm0j5ghp6n9zlgb3fnq2pgpzpdndm9z"; - revision = "1"; - editedCabalFile = "0ipbmf633c0kmcwwb7d51ac8s4220nfyk5xghhq66mpgna77j2c2"; + version = "1.3.5"; + sha256 = "10df40ycd4r45p58xzdh0vcsa401909fa99nkgd18fx5alqh84sz"; libraryHaskellDepends = [ aeson attoparsec base blaze-builder bytestring case-insensitive - conduit containers http-conduit http-types network-uri resourcet - tagstream-conduit text transformers unordered-containers - xml-conduit + conduit containers html-conduit http-conduit http-types network-uri + resourcet text transformers unordered-containers xml-conduit ]; description = "Authentication methods for Haskell web applications"; license = stdenv.lib.licenses.mit; @@ -34587,8 +34633,8 @@ self: { }: mkDerivation { pname = "aws-lambda-haskell-runtime"; - version = "2.0.1"; - sha256 = "0q8x5zqxql403wm9ndii42lac8737i0qhd7p7nsy3i2sswfr5gry"; + version = "2.0.2"; + sha256 = "11pkvq3d5w56bsqdha9cfsbqw0rhfda9bh7zipik1b0lc3mk8p0a"; libraryHaskellDepends = [ aeson base bytestring http-client http-types path path-io safe-exceptions-checked template-haskell text @@ -36092,8 +36138,8 @@ self: { pname = "base62"; version = "0.1.0.0"; sha256 = "1ns8hr9xjmrlq5lgi47630gpn8xdglk33ncqw4kjvdrb1x90iz0p"; - revision = "1"; - editedCabalFile = "13n150czdd97hrpjnrkd0wcg7ch9d5zvqlv38n61pjcds6dvvdsy"; + revision = "2"; + editedCabalFile = "0i1ipcawbnjf0mjdva4q8s2kw4hd4lfnygmvc81sjxd9crlwy4vm"; libraryHaskellDepends = [ base byteslice natural-arithmetic primitive small-bytearray-builder wide-word @@ -37701,6 +37747,29 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "bifunctors_5_5_6" = callPackage + ({ mkDerivation, base, base-orphans, comonad, containers, hspec + , hspec-discover, QuickCheck, tagged, template-haskell + , th-abstraction, transformers, transformers-compat + }: + mkDerivation { + pname = "bifunctors"; + version = "5.5.6"; + sha256 = "1jnsnc0rj3vkx8rjwsf2aacla9xzdfy1am9mmjk8crxp2gkazcnc"; + libraryHaskellDepends = [ + base base-orphans comonad containers tagged template-haskell + th-abstraction transformers + ]; + testHaskellDepends = [ + base hspec QuickCheck template-haskell transformers + transformers-compat + ]; + testToolDepends = [ hspec-discover ]; + description = "Bifunctors"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "bighugethesaurus" = callPackage ({ mkDerivation, base, HTTP, split }: mkDerivation { @@ -39793,6 +39862,8 @@ self: { ]; description = "Plays chess"; license = "GPL"; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "bit-array" = callPackage @@ -41743,15 +41814,16 @@ self: { "bond" = callPackage ({ mkDerivation, aeson, aeson-pretty, async, base, bytestring - , cmdargs, derive, Diff, directory, filepath, HUnit, megaparsec - , monad-loops, mtl, pretty, process, QuickCheck, scientific - , shakespeare, tasty, tasty-golden, tasty-hunit, tasty-quickcheck - , text, unordered-containers + , cmdargs, Diff, directory, filepath, HUnit, megaparsec + , monad-loops, mtl, pretty, process, QuickCheck + , quickcheck-arbitrary-template, scientific, shakespeare, tasty + , tasty-golden, tasty-hunit, tasty-quickcheck, text + , unordered-containers }: mkDerivation { pname = "bond"; - version = "0.11.0.3"; - sha256 = "1zarrlhcp8q1impikmqsz8mnaxi8l8b4nl02qp8xm6y6gpbyhaqj"; + version = "0.12.0.1"; + sha256 = "0zhfhr1ya0ljvg5s0s6fpqyrb0f25qdkschblfcmf68c6xmy4ws0"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -41760,12 +41832,14 @@ self: { ]; executableHaskellDepends = [ aeson async base bytestring cmdargs directory filepath megaparsec - monad-loops process text + monad-loops mtl process scientific shakespeare text + unordered-containers ]; testHaskellDepends = [ - aeson aeson-pretty base bytestring cmdargs derive Diff directory - filepath HUnit megaparsec monad-loops pretty QuickCheck shakespeare - tasty tasty-golden tasty-hunit tasty-quickcheck text + aeson aeson-pretty base bytestring cmdargs Diff directory filepath + HUnit megaparsec monad-loops mtl pretty QuickCheck + quickcheck-arbitrary-template scientific shakespeare tasty + tasty-golden tasty-hunit tasty-quickcheck text unordered-containers ]; description = "Bond schema compiler and code generator"; license = stdenv.lib.licenses.mit; @@ -42064,8 +42138,8 @@ self: { ({ mkDerivation, base, mtl, semigroups, template-haskell, text }: mkDerivation { pname = "boomerang"; - version = "1.4.5.6"; - sha256 = "0zkr9w9qqrcicdm6r928a1z1svspnx6vh0b9mac4q7cd1h021ph3"; + version = "1.4.5.7"; + sha256 = "11ycghpgngnw0ks47h3wmp0xdfl3qw1wnwdil1vmr1b5a4gngzi1"; libraryHaskellDepends = [ base mtl semigroups template-haskell text ]; @@ -42732,7 +42806,7 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "brick_0_50" = callPackage + "brick_0_50_1" = callPackage ({ mkDerivation, base, bytestring, config-ini, containers , contravariant, data-clist, deepseq, directory, dlist, filepath , microlens, microlens-mtl, microlens-th, QuickCheck, stm @@ -42741,10 +42815,8 @@ self: { }: mkDerivation { pname = "brick"; - version = "0.50"; - sha256 = "0g2c420zpvjv8v3y5l4jhmml279d920k9d92yga8d86jymanbvy9"; - revision = "1"; - editedCabalFile = "0sknkg4fkmxs78ysk76xhrz5mixndazxnmw7ss1j560z8z368ry0"; + version = "0.50.1"; + sha256 = "0wv69pbs4xqfdqw9ag32fhqhmh8djxb14h8jpyblmykirlznx77y"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -43007,16 +43079,14 @@ self: { }) {}; "broadcast-chan" = callPackage - ({ mkDerivation, async, base, criterion, deepseq, stm + ({ mkDerivation, async, base, criterion, deepseq, stm, transformers , unliftio-core }: mkDerivation { pname = "broadcast-chan"; - version = "0.2.0.2"; - sha256 = "12ax37y9i3cs8wifz01lpq0awm9c235l5xkybf13ywvyk5svb0jv"; - revision = "1"; - editedCabalFile = "1sgifhdf9l8zkc0dddnkfy8f1bkry061vm67iich489fi8nlhfjn"; - libraryHaskellDepends = [ base unliftio-core ]; + version = "0.2.1"; + sha256 = "1pigxkncv71p51qnhxkag6hry14jp5s2skmxxbq2pmlrkj9j6rgs"; + libraryHaskellDepends = [ base transformers unliftio-core ]; benchmarkHaskellDepends = [ async base criterion deepseq stm ]; description = "Closable, fair, single-wakeup channel type that avoids 0 reader space leaks"; license = stdenv.lib.licenses.bsd3; @@ -43028,8 +43098,8 @@ self: { }: mkDerivation { pname = "broadcast-chan-conduit"; - version = "0.2.0.2"; - sha256 = "1xnf1ibgnzi4xbmfgrkkfg3pkig7v8vv0xpfhhcdmnybwm2yhlli"; + version = "0.2.1"; + sha256 = "1n9hqmdyw3v58kv8czbvvw5sfy4il3izqvn6rk8gak84hb51brxq"; libraryHaskellDepends = [ base broadcast-chan conduit resourcet transformers unliftio-core ]; @@ -43048,8 +43118,8 @@ self: { }: mkDerivation { pname = "broadcast-chan-pipes"; - version = "0.2.0.2"; - sha256 = "1brr0vjrsd53qji8pmns003m3k1s28hvr2w8875hv2fznmm8x1g7"; + version = "0.2.1"; + sha256 = "0yifpd97cihagflmh0xs0wcl541k89hick4h9hh8zrah72g71fqr"; libraryHaskellDepends = [ base broadcast-chan pipes pipes-safe ]; testHaskellDepends = [ base broadcast-chan-tests containers foldl pipes pipes-safe @@ -43068,10 +43138,8 @@ self: { }: mkDerivation { pname = "broadcast-chan-tests"; - version = "0.2.0.2"; - sha256 = "1m7m06pd9vfvz0rfnylpr6pjvizxv31qizri3a400rkz3zanhkym"; - revision = "2"; - editedCabalFile = "0mfld36ppfyhx2w9a99gxa8qxnik0mnznl7bvqhbbaf1ayinhx91"; + version = "0.2.1"; + sha256 = "01vlhxxwhkakllffw7vdqr7fcsf9m7rkwkbs8x6d5dfwb5qxs6gk"; libraryHaskellDepends = [ async base broadcast-chan clock containers optparse-applicative paramtree stm tagged tasty tasty-golden tasty-hunit tasty-travis @@ -43273,8 +43341,8 @@ self: { pname = "bsb-http-chunked"; version = "0.0.0.4"; sha256 = "0z0f18yc6zlwh29c6175ivfcin325lvi4irpvv0n3cmq7vi0k0ql"; - revision = "1"; - editedCabalFile = "07k9422yaw7rz66awmc20ni17xw2bd1pn48ja79c66d5va89f6wz"; + revision = "2"; + editedCabalFile = "0bz62lxdbnwkfr1d4ngm8xi4y1ndpdflbv71s6h43vp5lbd546hr"; libraryHaskellDepends = [ base bytestring ]; testHaskellDepends = [ attoparsec base blaze-builder bytestring doctest hedgehog tasty @@ -43589,6 +43657,35 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "buffet" = callPackage + ({ mkDerivation, aeson, aeson-pretty, base, bytestring, cassava + , containers, directory, filepath, language-docker, mustache + , optparse-applicative, parsec, random, split, tasty, tasty-hunit + , text, typed-process, unordered-containers, vector, yaml + }: + mkDerivation { + pname = "buffet"; + version = "0.2.0"; + sha256 = "1zmsgsxdl7mr6h9m7g9n7qb2w86s6xr379psr947fba4vkydzi0n"; + isLibrary = false; + isExecutable = true; + libraryHaskellDepends = [ + aeson aeson-pretty base bytestring cassava containers directory + filepath language-docker mustache optparse-applicative parsec + random split text typed-process unordered-containers vector yaml + ]; + executableHaskellDepends = [ base ]; + testHaskellDepends = [ + aeson base bytestring directory filepath tasty tasty-hunit text + typed-process unordered-containers vector yaml + ]; + doHaddock = false; + description = "Assembles many Dockerfiles in one"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; + }) {}; + "buffon" = callPackage ({ mkDerivation, base, monad-primitive, mwc-random , mwc-random-monad, primitive, transformers @@ -43885,8 +43982,8 @@ self: { }: mkDerivation { pname = "bulmex"; - version = "2.1.0"; - sha256 = "0awdbwh9s5wdj05fnkzr7dpp2riipv9rlvknrcxf4dpxp9c72n1g"; + version = "4.0.0"; + sha256 = "0892prpi8hf8mkwr6n9228bfyji0wgdz9hyh619k20f6xim13ysc"; libraryHaskellDepends = [ aeson base bytestring containers generic-lens jsaddle jsaddle-dom keycode lens network-uri reflex reflex-dom-core reflex-dom-helpers @@ -44396,6 +44493,8 @@ self: { pname = "bytesmith"; version = "0.3.1.0"; sha256 = "1wkwxb9ygc6hii90jr7cjbv4s5d0l4wv0197p9jn4lj7h4i79iqd"; + revision = "1"; + editedCabalFile = "13maddwkl9ajczvnrsnsa9f7w20fzq8il09xh9lqhwyrz9yak4ii"; libraryHaskellDepends = [ base byteslice bytestring contiguous primitive run-st text-short wide-word @@ -44848,6 +44947,8 @@ self: { pname = "bytestring-trie"; version = "0.2.5.0"; sha256 = "1jpynpyarikxhlc4ifdswvkj0ph9fd5d0vcxhjv0lrv0zwqvv488"; + revision = "1"; + editedCabalFile = "1qpv52ywp8r30s3m9qyjiqiwa6clg3zp095yhs2d4533amprryly"; libraryHaskellDepends = [ base binary bytestring ]; description = "An efficient finite map from (byte)strings to values"; license = stdenv.lib.licenses.bsd3; @@ -45623,6 +45724,8 @@ self: { doCheck = false; description = "Simple interface to some of Cabal's configuration state, mainly used by ghc-mod"; license = stdenv.lib.licenses.gpl3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "cabal-info" = callPackage @@ -45740,6 +45843,32 @@ self: { broken = true; }) {}; + "cabal-install-parsers" = callPackage + ({ mkDerivation, aeson, ansi-terminal, base, base16-bytestring + , binary, binary-instances, bytestring, Cabal, containers + , cryptohash-sha256, directory, filepath, lukko, network-uri + , parsec, pretty, tar, tasty, tasty-golden, tasty-hunit, text, time + , transformers, tree-diff + }: + mkDerivation { + pname = "cabal-install-parsers"; + version = "0.1"; + sha256 = "0jklbv5c6nsbdj52a42ywr6nl7xqr2hgzc8l8g6aalb8nr117b45"; + libraryHaskellDepends = [ + aeson base base16-bytestring binary binary-instances bytestring + Cabal containers cryptohash-sha256 directory filepath lukko + network-uri parsec pretty tar text time transformers + ]; + testHaskellDepends = [ + ansi-terminal base bytestring Cabal containers directory filepath + tasty tasty-golden tasty-hunit tree-diff + ]; + description = "Utilities to work with cabal-install files"; + license = "GPL-2.0-or-later AND BSD-3-Clause"; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; + }) {}; + "cabal-lenses" = callPackage ({ mkDerivation, base, Cabal, lens, strict, system-fileio , system-filepath, text, transformers, unordered-containers @@ -45846,18 +45975,16 @@ self: { }) {}; "cabal-plan" = callPackage - ({ mkDerivation, aeson, ansi-terminal, base, base-compat + ({ mkDerivation, aeson, ansi-terminal, async, base, base-compat , base16-bytestring, bytestring, containers, directory, filepath - , mtl, optics-core, optparse-applicative, parsec, process-extras + , mtl, optics-core, optparse-applicative, parsec, process , semialign, singleton-bool, text, these, topograph, transformers , vector }: mkDerivation { pname = "cabal-plan"; - version = "0.6.1.0"; - sha256 = "0jb50a45aky1jljl6g84h61wrirk6gh5pwk0m0pkhd1q7zj58jgi"; - revision = "1"; - editedCabalFile = "02krq0ibb4q2ypj7cp8yclc175a2hlaa9x5x3j3i8wjkf8pyyvx1"; + version = "0.6.2.0"; + sha256 = "0gwbyyj4xih9barg2c589v6z82s0gx98airs6icivg301khg9fzg"; configureFlags = [ "-fexe" ]; isLibrary = true; isExecutable = true; @@ -45866,9 +45993,9 @@ self: { filepath text ]; executableHaskellDepends = [ - ansi-terminal base base-compat bytestring containers directory mtl - optics-core optparse-applicative parsec process-extras semialign - singleton-bool text these topograph transformers vector + ansi-terminal async base base-compat bytestring containers + directory mtl optics-core optparse-applicative parsec process + semialign singleton-bool text these topograph transformers vector ]; description = "Library and utility for processing cabal's plan.json file"; license = stdenv.lib.licenses.gpl2Plus; @@ -46937,6 +47064,23 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "calenderweek" = callPackage + ({ mkDerivation, base, megaparsec, optparse-generic, text, time }: + mkDerivation { + pname = "calenderweek"; + version = "1.0.0"; + sha256 = "10lv7c74jrw8v06vaz8assgqlvrk0spn08sw0nvzz1q0x0zbbwff"; + isLibrary = false; + isExecutable = true; + executableHaskellDepends = [ + base megaparsec optparse-generic text time + ]; + description = "Commandline tool to get week of the year"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; + }) {}; + "call" = callPackage ({ mkDerivation, base, bindings-portaudio, boundingboxes, colors , containers, control-bool, deepseq, directory, filepath, free @@ -46982,6 +47126,8 @@ self: { ]; description = "A simple library to call Alloy given a specification"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "call-haskell-from-anything" = callPackage @@ -47292,8 +47438,8 @@ self: { pname = "cantor-pairing"; version = "0.1.1.0"; sha256 = "03vl7qd5962kr0mi4ymgmh667948rzqiq9f1ixcvycyjz8hz0yqw"; - revision = "2"; - editedCabalFile = "0vl4b3v7qzbsd93vb0flyd6xkpayji49il97d2a6v35cliph5yw2"; + revision = "3"; + editedCabalFile = "0rcjz2r4l4crxxda3hjpi5kkxrh4pgdrcbw29bj5w9a4jph0d0ld"; libraryHaskellDepends = [ arithmoi base containers integer-gmp integer-logarithms ]; @@ -48204,24 +48350,6 @@ self: { }: mkDerivation { pname = "cassava-megaparsec"; - version = "2.0.0"; - sha256 = "0jwhvgfkgxpxp6cci9ahp3kryr4vaxbpqgjzf8ylr2592dm2irnf"; - libraryHaskellDepends = [ - base bytestring cassava megaparsec unordered-containers vector - ]; - testHaskellDepends = [ - base bytestring cassava hspec hspec-megaparsec vector - ]; - description = "Megaparsec parser of CSV files that plays nicely with Cassava"; - license = stdenv.lib.licenses.mit; - }) {}; - - "cassava-megaparsec_2_0_1" = callPackage - ({ mkDerivation, base, bytestring, cassava, hspec, hspec-megaparsec - , megaparsec, unordered-containers, vector - }: - mkDerivation { - pname = "cassava-megaparsec"; version = "2.0.1"; sha256 = "0q4skw98nzy6icmgpwqvgw0c5pqcgi25rf7nmwh2pksvv94pi3p3"; libraryHaskellDepends = [ @@ -48232,7 +48360,6 @@ self: { ]; description = "Megaparsec parser of CSV files that plays nicely with Cassava"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "cassava-records" = callPackage @@ -50558,8 +50685,8 @@ self: { }: mkDerivation { pname = "chronos"; - version = "1.0.8"; - sha256 = "08lxf5f40nhqpxx7f75d3lp5xyjmh3gk1hljm4iq7p8mm22nl2fn"; + version = "1.0.9"; + sha256 = "103vwpdjqk1csw8famc62ba5ck9s6yd8w5hfa6a0qj3bx9vmf9qv"; libraryHaskellDepends = [ aeson attoparsec base bytestring clock hashable primitive semigroups text torsor vector @@ -50576,20 +50703,19 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "chronos_1_0_9" = callPackage - ({ mkDerivation, aeson, attoparsec, base, bytestring, clock - , criterion, deepseq, doctest, hashable, HUnit, old-locale - , primitive, QuickCheck, semigroups, test-framework - , test-framework-hunit, test-framework-quickcheck2, text, thyme - , time, torsor, vector + "chronos_1_1" = callPackage + ({ mkDerivation, aeson, attoparsec, base, bytestring, criterion + , deepseq, doctest, hashable, HUnit, old-locale, primitive + , QuickCheck, semigroups, test-framework, test-framework-hunit + , test-framework-quickcheck2, text, thyme, time, torsor, vector }: mkDerivation { pname = "chronos"; - version = "1.0.9"; - sha256 = "103vwpdjqk1csw8famc62ba5ck9s6yd8w5hfa6a0qj3bx9vmf9qv"; + version = "1.1"; + sha256 = "0g41hchir6rxfnd8halg49y80pc9dr38k7b7cik18gqdasswwg6c"; libraryHaskellDepends = [ - aeson attoparsec base bytestring clock hashable primitive - semigroups text torsor vector + aeson attoparsec base bytestring hashable primitive semigroups text + torsor vector ]; testHaskellDepends = [ attoparsec base bytestring doctest HUnit QuickCheck test-framework @@ -51855,8 +51981,23 @@ self: { ({ mkDerivation, base, hspec, hspec-discover, mtl, text }: mkDerivation { pname = "clay"; - version = "0.13.1"; - sha256 = "18r8lgzyscxnw6xdxg0jxvp2977i02fjh3n5p89fnd8qrh0r2kl4"; + version = "0.13.2"; + sha256 = "1jxwq159hcc55ijga18zdlqr3ga1flilymq96hqpizb4khpq7y6j"; + libraryHaskellDepends = [ base mtl text ]; + testHaskellDepends = [ base hspec hspec-discover mtl text ]; + testToolDepends = [ hspec-discover ]; + description = "CSS preprocessor as embedded Haskell"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; + }) {}; + + "clay_0_13_3" = callPackage + ({ mkDerivation, base, hspec, hspec-discover, mtl, text }: + mkDerivation { + pname = "clay"; + version = "0.13.3"; + sha256 = "192lsbyj6azjs2ygpx4i47fyr8zfmvwcas8mia07ndqglk2c9csx"; libraryHaskellDepends = [ base mtl text ]; testHaskellDepends = [ base hspec hspec-discover mtl text ]; testToolDepends = [ hspec-discover ]; @@ -52264,8 +52405,8 @@ self: { }: mkDerivation { pname = "cli-setup"; - version = "0.2.1.0"; - sha256 = "010rra96lw9qkqm2jvnjxzb6q7xmg8drxaiywbmpb93slrb56r6n"; + version = "0.2.1.2"; + sha256 = "0fh9lp8r73mslhwxcjpfzvm0j0qbq0prr4bkkwq2v16izg14ccda"; libraryHaskellDepends = [ base bytestring directory file-embed process ]; @@ -52723,13 +52864,15 @@ self: { }: mkDerivation { pname = "cloudi"; - version = "1.7.5"; - sha256 = "08cklswxmd7x0zxkkrlwh1qy57jbqp0dv3x57xskxpmwyhws2vgs"; + version = "1.8.0"; + sha256 = "0j98dbyhc845y26abyp8sdcajpxvpsjcqrmcls4jnb4bhnz21jkc"; libraryHaskellDepends = [ array base binary bytestring containers network time unix zlib ]; description = "Haskell CloudI API"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "cloudyfs" = callPackage @@ -53037,23 +53180,6 @@ self: { }: mkDerivation { pname = "cmark-gfm"; - version = "0.2.0"; - sha256 = "03xflrkyw84qv3yjly5iks9311bqv5cmrmsylr763v4ph0fn7rjq"; - libraryHaskellDepends = [ base bytestring text ]; - testHaskellDepends = [ base HUnit text ]; - benchmarkHaskellDepends = [ - base blaze-html cheapskate criterion discount markdown sundown text - ]; - description = "Fast, accurate GitHub Flavored Markdown parser and renderer"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "cmark-gfm_0_2_1" = callPackage - ({ mkDerivation, base, blaze-html, bytestring, cheapskate - , criterion, discount, HUnit, markdown, sundown, text - }: - mkDerivation { - pname = "cmark-gfm"; version = "0.2.1"; sha256 = "1qbhcirg7a0r68l3ifq8q9clnkai5hyhk62jb232bjplrl6y4c23"; libraryHaskellDepends = [ base bytestring text ]; @@ -53063,7 +53189,6 @@ self: { ]; description = "Fast, accurate GitHub Flavored Markdown parser and renderer"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "cmark-highlight" = callPackage @@ -53258,6 +53383,18 @@ self: { broken = true; }) {}; + "cmf" = callPackage + ({ mkDerivation, base, containers, hedgehog }: + mkDerivation { + pname = "cmf"; + version = "0.1"; + sha256 = "16d83x6qggifljm7n8sqlawy79iz7lkrb6vknrr825wa0zg1bc49"; + libraryHaskellDepends = [ base containers ]; + testHaskellDepends = [ base containers hedgehog ]; + description = "(C)oncurrent (M)onoidal (F)olds"; + license = stdenv.lib.licenses.mit; + }) {}; + "cml" = callPackage ({ mkDerivation, base }: mkDerivation { @@ -53552,46 +53689,52 @@ self: { "cobot-io" = callPackage ({ mkDerivation, array, attoparsec, base, binary, bytestring - , containers, data-msgpack, deepseq, hspec, http-conduit, hyraxAbif - , lens, linear, mtl, neat-interpolation, QuickCheck, split, text - , vector + , containers, data-msgpack, deepseq, directory, hspec, http-conduit + , hyraxAbif, lens, linear, mtl, neat-interpolation, QuickCheck + , split, text, vector }: mkDerivation { pname = "cobot-io"; - version = "0.1.2.0"; - sha256 = "0md5sd67sd3wl7p9z6904pbswlkkzlclrgj7lc3a2qpq6ky7w1ik"; + version = "0.1.2.1"; + sha256 = "17rl3xbap3fgn2bg0iykysxaff1rakr8fq759hl7pmx3qnr8xz12"; libraryHaskellDepends = [ array attoparsec base binary bytestring containers data-msgpack deepseq http-conduit hyraxAbif lens linear mtl split text vector ]; testHaskellDepends = [ array attoparsec base binary bytestring containers data-msgpack - deepseq hspec http-conduit hyraxAbif lens linear mtl + deepseq directory hspec http-conduit hyraxAbif lens linear mtl neat-interpolation QuickCheck split text vector ]; description = "Biological data file formats and IO"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "cobot-tools" = callPackage - ({ mkDerivation, array, base, cobot, containers, data-msgpack - , deepseq, hspec, lens, mtl, neat-interpolation, QuickCheck, RNA - , text + ({ mkDerivation, array, base, bytestring, cobot, containers + , data-default, data-msgpack, deepseq, hspec, lens, mtl + , neat-interpolation, QuickCheck, regex-tdfa, RNA, text }: mkDerivation { pname = "cobot-tools"; - version = "0.1.0.1"; - sha256 = "0jlfz2jf8vphaxg3wn9bhzzjp5ldnpiyf420fz7waadi6bfi7q75"; + version = "0.1.1.0"; + sha256 = "0i717g632jvnah8cibgia6r12mmyiqwfgryiam71pvbaz2508rhr"; libraryHaskellDepends = [ - array base cobot containers data-msgpack deepseq lens mtl text + array base bytestring cobot containers data-default data-msgpack + deepseq lens mtl regex-tdfa text ]; librarySystemDepends = [ RNA ]; testHaskellDepends = [ - array base cobot containers data-msgpack deepseq hspec lens mtl - neat-interpolation QuickCheck text + array base bytestring cobot containers data-default data-msgpack + deepseq hspec lens mtl neat-interpolation QuickCheck regex-tdfa + text ]; description = "Biological data file formats and IO"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {RNA = null;}; "code-builder" = callPackage @@ -54995,6 +55138,25 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "comonad_5_0_6" = callPackage + ({ mkDerivation, base, Cabal, cabal-doctest, containers + , distributive, doctest, tagged, transformers, transformers-compat + }: + mkDerivation { + pname = "comonad"; + version = "5.0.6"; + sha256 = "1blgp2nm9cvnsdi2bmkmly5m0gz91npjvf1i5j4pnx6imhbb1kvp"; + setupHaskellDepends = [ base Cabal cabal-doctest ]; + libraryHaskellDepends = [ + base containers distributive tagged transformers + transformers-compat + ]; + testHaskellDepends = [ base doctest ]; + description = "Comonads"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "comonad-extras" = callPackage ({ mkDerivation, array, base, comonad, containers, distributive , semigroupoids, transformers @@ -55175,6 +55337,24 @@ self: { broken = true; }) {}; + "compact-word-vectors" = callPackage + ({ mkDerivation, base, primitive, QuickCheck, random, tasty + , tasty-hunit, tasty-quickcheck + }: + mkDerivation { + pname = "compact-word-vectors"; + version = "0.2.0.1"; + sha256 = "0ix8l6vvnf62vp6716gmypwqsrs6x5pzcx5yfj24bn4gk0xak3lm"; + libraryHaskellDepends = [ base primitive ]; + testHaskellDepends = [ + base primitive QuickCheck random tasty tasty-hunit tasty-quickcheck + ]; + description = "Small vectors of small integers stored very compactly"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; + }) {}; + "compactable" = callPackage ({ mkDerivation, base, containers, transformers, vector }: mkDerivation { @@ -55319,6 +55499,8 @@ self: { pname = "compensated"; version = "0.7.3"; sha256 = "089xj9j3gznxz66ywapjd9kasjcnv197ipj4azgjfbpl2y11l8dg"; + revision = "1"; + editedCabalFile = "1ax4jq2hp5737yvi3lxvyj3c4bzkg10h4c7w3nw0hgfcn1ng49kc"; setupHaskellDepends = [ base Cabal cabal-doctest ]; libraryHaskellDepends = [ base bifunctors binary bytes cereal comonad deepseq distributive @@ -55331,6 +55513,29 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "compensated_0_8" = callPackage + ({ mkDerivation, base, bifunctors, binary, bytes, Cabal + , cabal-doctest, cereal, comonad, deepseq, distributive, doctest + , generic-deriving, hashable, lens, log-domain, safecopy + , semigroupoids, semigroups, simple-reflect, vector + }: + mkDerivation { + pname = "compensated"; + version = "0.8"; + sha256 = "1jvvsa1dqsds6ri6f746y47flwrlfxnc7jsgic2m6kvf1b700qr9"; + setupHaskellDepends = [ base Cabal cabal-doctest ]; + libraryHaskellDepends = [ + base bifunctors binary bytes cereal comonad deepseq distributive + hashable lens log-domain safecopy semigroupoids semigroups vector + ]; + testHaskellDepends = [ + base doctest generic-deriving semigroups simple-reflect + ]; + description = "Compensated floating-point arithmetic"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "competition" = callPackage ({ mkDerivation, base, filepath, parsec }: mkDerivation { @@ -56147,14 +56352,14 @@ self: { license = stdenv.lib.licenses.mit; }) {}; - "concurrency_1_8_0_0" = callPackage + "concurrency_1_8_1_0" = callPackage ({ mkDerivation, array, atomic-primops, base, exceptions , monad-control, mtl, stm, transformers }: mkDerivation { pname = "concurrency"; - version = "1.8.0.0"; - sha256 = "091nv78c4cfcrg4hwxhn97l0xr5x2n4pfh802ysxmn2zvnm9fbf4"; + version = "1.8.1.0"; + sha256 = "0nw5i85lzh03ppcprzpvrlp3bmdam1z50bp7ddq9mp2ycyjbvrp5"; libraryHaskellDepends = [ array atomic-primops base exceptions monad-control mtl stm transformers @@ -57711,6 +57916,8 @@ self: { testHaskellDepends = [ base hedgehog property ]; description = "Partial orders & Galois connections"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "consistent" = callPackage @@ -57927,8 +58134,8 @@ self: { ({ mkDerivation, base, category, unconstrained }: mkDerivation { pname = "constraint"; - version = "0.1.3.0"; - sha256 = "0yp09vg9hx5p7ncyh8h6mhcl14kanhhjldyn892lmp0jmlm7flyy"; + version = "0.1.4.0"; + sha256 = "0cdncdzpgyr9a0v213g9f6fqfd4311j5rg84gh85xynp8hhh0rr4"; libraryHaskellDepends = [ base category unconstrained ]; description = "Reified constraints"; license = stdenv.lib.licenses.bsd3; @@ -57977,8 +58184,8 @@ self: { ({ mkDerivation, base }: mkDerivation { pname = "constraint-tuples"; - version = "0.1.1"; - sha256 = "0jml9sqgmfz3yqpd8g7k0ki1n036a6ws4m5ywbjmcyiz6gr52czl"; + version = "0.1.2"; + sha256 = "16f9y0q771f3mc38g8jpr875c8grjav6sg9lwbhg7nmcvcczwqk2"; libraryHaskellDepends = [ base ]; description = "Partially applicable constraint tuples"; license = stdenv.lib.licenses.bsd3; @@ -59000,26 +59207,6 @@ self: { }: mkDerivation { pname = "cookie"; - version = "0.4.4"; - sha256 = "1qy09i0jh2z9i9avy2khf8a8afq4fqgnv0fyrszgfg4kmq2fsi9j"; - libraryHaskellDepends = [ - base bytestring data-default-class deepseq text time - ]; - testHaskellDepends = [ - base bytestring HUnit QuickCheck tasty tasty-hunit tasty-quickcheck - text time - ]; - description = "HTTP cookie parsing and rendering"; - license = stdenv.lib.licenses.mit; - }) {}; - - "cookie_0_4_5" = callPackage - ({ mkDerivation, base, bytestring, data-default-class, deepseq - , HUnit, QuickCheck, tasty, tasty-hunit, tasty-quickcheck, text - , time - }: - mkDerivation { - pname = "cookie"; version = "0.4.5"; sha256 = "10rmdasb7mypbwxdj2mhr810vqhkakpik7hyd8fvj60hng8r8zvh"; libraryHaskellDepends = [ @@ -59031,7 +59218,6 @@ self: { ]; description = "HTTP cookie parsing and rendering"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "cookies" = callPackage @@ -59066,12 +59252,15 @@ self: { }: mkDerivation { pname = "copilot"; - version = "3.0.1"; - sha256 = "0sfvrk8ik6zaim6xlkvlnz3rnrqbiqvq7i6yxjiba74qx5w8yv4m"; + version = "3.1"; + sha256 = "1dw7bkmadwsncd39pkngaxglfsnrnc9km7y8ld0l9bkiiw136x2w"; + isLibrary = true; + isExecutable = true; libraryHaskellDepends = [ base copilot-c99 copilot-core copilot-language copilot-libraries copilot-theorem directory filepath optparse-applicative ]; + executableHaskellDepends = [ base copilot-c99 copilot-libraries ]; description = "A stream DSL for writing embedded C programs"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; @@ -59085,8 +59274,8 @@ self: { }: mkDerivation { pname = "copilot-c99"; - version = "3.0.2"; - sha256 = "02987kxwsrxcjicgfnj55prabiv12y5d1s82nr34kk3scrlixl1y"; + version = "3.1"; + sha256 = "1cwypmis5dcdzjasq03wcas4lnml7l4a4ymw1v55aybfmz94mxc3"; libraryHaskellDepends = [ base containers copilot-core directory filepath language-c99 language-c99-simple language-c99-util mtl pretty @@ -59114,14 +59303,12 @@ self: { }) {}; "copilot-core" = callPackage - ({ mkDerivation, base, containers, dlist, mtl, pretty, random }: + ({ mkDerivation, base, containers, dlist, mtl, pretty }: mkDerivation { pname = "copilot-core"; - version = "3.0.1"; - sha256 = "0gq55db39fsg3kim83s86nw58f9wbg59nlrhi4ic70864iv55zs8"; - libraryHaskellDepends = [ - base containers dlist mtl pretty random - ]; + version = "3.1"; + sha256 = "08xz5s0b2fd5igja5wiaq93ignx6bsf942rg4hy42fmh4c03hylp"; + libraryHaskellDepends = [ base containers dlist mtl pretty ]; description = "An intermediate representation for Copilot"; license = stdenv.lib.licenses.bsd3; }) {}; @@ -59132,8 +59319,8 @@ self: { }: mkDerivation { pname = "copilot-language"; - version = "3.0.1"; - sha256 = "1vx656vdjvdbsd3zv5cpb9xjvj85ylfqbbk8iibkbdgbq6sm11f6"; + version = "3.1"; + sha256 = "0hdk8418l30vz9lv7c4bzh8m5gn8knpvg296b14n66si9g36qglp"; libraryHaskellDepends = [ array base containers copilot-core copilot-theorem data-reify ghc-prim mtl @@ -59150,8 +59337,8 @@ self: { }: mkDerivation { pname = "copilot-libraries"; - version = "3.0"; - sha256 = "0xrv37m770qnc722iv5x67kjic11q2sd1bcx2b0gr93p54frbjs4"; + version = "3.1"; + sha256 = "094hjzg22b55n4kv89ccr7pbgqpbd0z8f5myn93nyw6yqpmpp30v"; libraryHaskellDepends = [ array base containers copilot-language data-reify mtl parsec ]; @@ -59185,8 +59372,8 @@ self: { }: mkDerivation { pname = "copilot-theorem"; - version = "3.0"; - sha256 = "1h8gjlfhl473d6h8zafmqv3dzdhmgpyp8bsvysfzb7s2ga5hwnrq"; + version = "3.1"; + sha256 = "15vnl5lg9s6h9s98f1nvva3ab0gdn3a5314mxdfxxa53ywmiq2a0"; libraryHaskellDepends = [ ansi-terminal base bimap containers copilot-core data-default directory mtl parsec pretty process random transformers xml @@ -59257,26 +59444,8 @@ self: { }: mkDerivation { pname = "core-data"; - version = "0.2.1.0"; - sha256 = "1d4sf0383kcc7wzy1bld1hlagf9g934bwnx6xdvj45grdkj8l787"; - libraryHaskellDepends = [ - aeson base bytestring containers core-text hashable prettyprinter - prettyprinter-ansi-terminal scientific text unordered-containers - vector - ]; - description = "Convenience wrappers around common data structures and encodings"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "core-data_0_2_1_3" = callPackage - ({ mkDerivation, aeson, base, bytestring, containers, core-text - , hashable, prettyprinter, prettyprinter-ansi-terminal, scientific - , text, unordered-containers, vector - }: - mkDerivation { - pname = "core-data"; - version = "0.2.1.3"; - sha256 = "1l5q8ayhpr6cjvsj9y4hj8b9iq2013rg9dq1f8b349c9mz98bxqa"; + version = "0.2.1.4"; + sha256 = "1arrw5xbzxpwqzpxcyw13lv4sazn5pzv448crw54284kyi798hc3"; libraryHaskellDepends = [ aeson base bytestring containers core-text hashable prettyprinter prettyprinter-ansi-terminal scientific text unordered-containers @@ -59284,7 +59453,6 @@ self: { ]; description = "Convenience wrappers around common data structures and encodings"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "core-haskell" = callPackage @@ -59313,8 +59481,8 @@ self: { }: mkDerivation { pname = "core-program"; - version = "0.2.2.3"; - sha256 = "0yyhvi84qw67lql1vdf9j1psxglqv1nd43wh6kxz92n1im7canks"; + version = "0.2.2.4"; + sha256 = "0l30qvn118bb6vj39ca6wl7ynhf7hkwq7pbh60vhcmwcr20rj4b1"; libraryHaskellDepends = [ async base bytestring chronologique core-data core-text directory exceptions filepath hashable hinotify hourglass mtl prettyprinter @@ -59334,32 +59502,14 @@ self: { }: mkDerivation { pname = "core-text"; - version = "0.2.2.1"; - sha256 = "0bql1ksfblnplhj4rbzsjwjbdqdy3z28c51i63q6vhy20mr3bxqk"; - libraryHaskellDepends = [ - base bytestring deepseq fingertree hashable prettyprinter - prettyprinter-ansi-terminal template-haskell text text-short - ]; - description = "A rope type based on a finger tree over UTF-8 fragments"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "core-text_0_2_2_3" = callPackage - ({ mkDerivation, base, bytestring, deepseq, fingertree, hashable - , prettyprinter, prettyprinter-ansi-terminal, template-haskell - , text, text-short - }: - mkDerivation { - pname = "core-text"; - version = "0.2.2.3"; - sha256 = "00ac8f7pajqr77r48g332kgfwsmnybdw2f2z9f7dx03hm3x9vgyx"; + version = "0.2.2.4"; + sha256 = "1lfxphm5y9irrs225vr0gbvb129lxzfr0xjxy23dz6d0cc3pr1ph"; libraryHaskellDepends = [ base bytestring deepseq fingertree hashable prettyprinter prettyprinter-ansi-terminal template-haskell text text-short ]; description = "A rope type based on a finger tree over UTF-8 fragments"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "corebot-bliki" = callPackage @@ -60051,28 +60201,6 @@ self: { }: mkDerivation { pname = "cql"; - version = "4.0.1"; - sha256 = "021qaz6qvbdp76gdyfcs07wnnq6k6r1cmqky0g3giinjdrm4qac9"; - libraryHaskellDepends = [ - base bytestring cereal containers Decimal iproute network - template-haskell text time transformers uuid vector - ]; - testHaskellDepends = [ - base bytestring cereal Decimal iproute network QuickCheck tasty - tasty-quickcheck text time uuid - ]; - description = "Cassandra CQL binary protocol"; - license = "unknown"; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - - "cql_4_0_2" = callPackage - ({ mkDerivation, base, bytestring, cereal, containers, Decimal - , iproute, network, QuickCheck, tasty, tasty-quickcheck - , template-haskell, text, time, transformers, uuid, vector - }: - mkDerivation { - pname = "cql"; version = "4.0.2"; sha256 = "0b6806ahmg4yacx5wc4v53gihhkwywajhqm13kb11nxabww3lapl"; libraryHaskellDepends = [ @@ -62661,8 +62789,8 @@ self: { }: mkDerivation { pname = "curry-base"; - version = "1.1.0"; - sha256 = "1hxac2mx7irphcyhljwivx1w6j6li0s7gl54yb50na6qpna7arqg"; + version = "1.1.1"; + sha256 = "0dczgya46jk80j8b7sswjcck64hzw7fifipixnhylhlfvd1cqdlb"; libraryHaskellDepends = [ base containers directory extra filepath mtl parsec pretty time transformers @@ -62673,24 +62801,26 @@ self: { }) {}; "curry-frontend" = callPackage - ({ mkDerivation, base, Cabal, containers, curry-base, directory - , extra, filepath, mtl, network-uri, pretty, process, set-extra - , transformers + ({ mkDerivation, base, bytestring, Cabal, containers, curry-base + , directory, extra, file-embed, filepath, mtl, network-uri, pretty + , process, set-extra, template-haskell, transformers }: mkDerivation { pname = "curry-frontend"; - version = "1.0.3"; - sha256 = "0dqmmvn6iziyzdmig1gbcpdpbpg1hjp57pldzcv03fm2bjhq0a4q"; + version = "1.0.4"; + sha256 = "1dfljqyrp9w0sw3zmyy9rglpnjv14qj8ky1yjslmiaanjnl0m07b"; isLibrary = true; isExecutable = true; enableSeparateDataOutput = true; libraryHaskellDepends = [ - base containers curry-base directory extra filepath mtl network-uri - pretty process set-extra transformers + base bytestring containers curry-base directory extra file-embed + filepath mtl network-uri pretty process set-extra template-haskell + transformers ]; executableHaskellDepends = [ - base containers curry-base directory extra filepath mtl network-uri - pretty process set-extra transformers + base bytestring containers curry-base directory extra file-embed + filepath mtl network-uri pretty process set-extra template-haskell + transformers ]; testHaskellDepends = [ base Cabal curry-base filepath ]; description = "Compile the functional logic language Curry to several intermediate formats"; @@ -64181,6 +64311,24 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "data-diverse_4_7_0_0" = callPackage + ({ mkDerivation, base, containers, criterion, deepseq, ghc-prim + , hspec, tagged + }: + mkDerivation { + pname = "data-diverse"; + version = "4.7.0.0"; + sha256 = "0ccbb8kf2spaa2h6k10y26zzaij1w28vrifhc8c1ljlvsmc9dkf3"; + libraryHaskellDepends = [ + base containers deepseq ghc-prim tagged + ]; + testHaskellDepends = [ base hspec tagged ]; + benchmarkHaskellDepends = [ base criterion ]; + description = "Extensible records and polymorphic variants"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "data-diverse-lens" = callPackage ({ mkDerivation, base, data-diverse, data-has, hspec, lens , profunctors, tagged @@ -67632,8 +67780,8 @@ self: { }: mkDerivation { pname = "dependent-monoidal-map"; - version = "0.1.1.0"; - sha256 = "0l5nj7jalyca6vv9aqsx0j799vrr65cm1jzh17fcnwkxair3lkgx"; + version = "0.1.1.1"; + sha256 = "0i3zgngcdli6hw09h985ca4n7l9cpsrxalbhg8lbq32hwh7dim89"; libraryHaskellDepends = [ aeson base constraints constraints-extras dependent-map dependent-sum dependent-sum-aeson-orphans @@ -68077,6 +68225,30 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "deriving-compat_0_5_8" = callPackage + ({ mkDerivation, base, base-compat, base-orphans, containers + , ghc-boot-th, ghc-prim, hspec, hspec-discover, QuickCheck, tagged + , template-haskell, th-abstraction, transformers + , transformers-compat + }: + mkDerivation { + pname = "deriving-compat"; + version = "0.5.8"; + sha256 = "1dznwypw0w935z30zi9pf9k4mr5yfl6jfp43nv9vx3f6zy5gip9r"; + libraryHaskellDepends = [ + base containers ghc-boot-th ghc-prim template-haskell + th-abstraction transformers transformers-compat + ]; + testHaskellDepends = [ + base base-compat base-orphans hspec QuickCheck tagged + template-haskell transformers transformers-compat + ]; + testToolDepends = [ hspec-discover ]; + description = "Backports of GHC deriving extensions"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "derp" = callPackage ({ mkDerivation, base, containers }: mkDerivation { @@ -68365,8 +68537,8 @@ self: { }: mkDerivation { pname = "df1"; - version = "0.3.1"; - sha256 = "0a1fpi9r6nivjxlknfyfkwdgnq5m6qmf68z46m3xjvy0md40caij"; + version = "0.3.2"; + sha256 = "1iywyrz2pfdpichfq6n77x8fpmfikj20rhkgnrwcf63ichav6xfp"; libraryHaskellDepends = [ attoparsec base bytestring containers text time ]; @@ -68632,30 +68804,33 @@ self: { "dhall-fly" = callPackage ({ mkDerivation, aeson, aeson-casing, aeson-yaml, base, bytestring - , dhall, dhall-json, hspec, hspec-discover, scientific, text - , transformers, unordered-containers, vector + , dhall, dhall-json, hspec, hspec-discover, optparse-applicative + , scientific, text, transformers, unordered-containers, vector }: mkDerivation { pname = "dhall-fly"; - version = "0.1.0"; - sha256 = "0rjbcpwcpz3kq0cil0pp7vkmksvnyxzv8jg5jpgnkg9pzmapg43y"; + version = "0.2.0"; + sha256 = "0h684icyp6r5cmr5cddgwbi2ci5ihkra0lyhgnisgrsvn8qmzz5d"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ - aeson aeson-casing base dhall scientific text transformers - unordered-containers vector + aeson aeson-casing base dhall optparse-applicative scientific text + transformers unordered-containers vector ]; executableHaskellDepends = [ aeson aeson-casing aeson-yaml base bytestring dhall dhall-json - scientific text transformers unordered-containers vector + optparse-applicative scientific text transformers + unordered-containers vector ]; testHaskellDepends = [ - aeson aeson-casing base dhall hspec scientific text transformers - unordered-containers vector + aeson aeson-casing base dhall hspec optparse-applicative scientific + text transformers unordered-containers vector ]; testToolDepends = [ hspec-discover ]; description = "Translate concourse config from Dhall to YAML"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "dhall-json" = callPackage @@ -68900,8 +69075,8 @@ self: { }: mkDerivation { pname = "di"; - version = "1.2"; - sha256 = "0d4ywmnibg9h12bah4bdh03fs2l50f5s590kv45baz010bcqyx0b"; + version = "1.3"; + sha256 = "13d503xhmnj2br9m4r4xx58hd2p8jsj8hxf9b4k4451p31kbzs54"; libraryHaskellDepends = [ base containers df1 di-core di-df1 di-handle di-monad exceptions ]; @@ -68915,8 +69090,8 @@ self: { }: mkDerivation { pname = "di-core"; - version = "1.0.3"; - sha256 = "1rfza96ljcf754mj44m2ffm51k9v6c0ii2sqqnddjkva3h3hx47h"; + version = "1.0.4"; + sha256 = "0wrj2ndzk9r7izjvwkjjmqb3gg1zy93ch7j7fdalzadzzsd4sqsm"; libraryHaskellDepends = [ base containers safe-exceptions stm time ]; @@ -68934,8 +69109,8 @@ self: { }: mkDerivation { pname = "di-df1"; - version = "1.0.2"; - sha256 = "1imk26njmr7hj56227yxgshjh4dicgr2c9bpc2m9nvsw2qbqslfh"; + version = "1.2"; + sha256 = "0bixrinmmb496j55c3vlh914nq6zfsaxq0pp2fcdxhwig1y53fgr"; libraryHaskellDepends = [ base df1 di-core di-handle di-monad stm ]; @@ -69147,34 +69322,6 @@ self: { }: mkDerivation { pname = "diagrams-contrib"; - version = "1.4.3"; - sha256 = "01r081rvxkb9i56iqi28zw4054nm62pf9f1szd9i0avmnxxsiyv5"; - revision = "3"; - editedCabalFile = "0mm1mmagx6q8g6dxk1cagqka38z6393ihp0lvf6095prlvidasqs"; - libraryHaskellDepends = [ - base circle-packing colour containers cubicbezier data-default - data-default-class diagrams-core diagrams-lib diagrams-solve - force-layout hashable lens linear mfsolve MonadRandom monoid-extras - mtl mtl-compat parsec random semigroups split text - ]; - testHaskellDepends = [ - base containers diagrams-lib HUnit QuickCheck test-framework - test-framework-hunit test-framework-quickcheck2 - ]; - description = "Collection of user contributions to diagrams EDSL"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "diagrams-contrib_1_4_4" = callPackage - ({ mkDerivation, base, circle-packing, colour, containers - , cubicbezier, data-default, data-default-class, diagrams-core - , diagrams-lib, diagrams-solve, force-layout, hashable, HUnit, lens - , linear, mfsolve, MonadRandom, monoid-extras, mtl, mtl-compat - , parsec, QuickCheck, random, semigroups, split, test-framework - , test-framework-hunit, test-framework-quickcheck2, text - }: - mkDerivation { - pname = "diagrams-contrib"; version = "1.4.4"; sha256 = "043jpr7lqg708lzmv6cqys7312lfdwnf8ijcnpl4jkbvcwl87c1m"; libraryHaskellDepends = [ @@ -69189,7 +69336,6 @@ self: { ]; description = "Collection of user contributions to diagrams EDSL"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "diagrams-core" = callPackage @@ -70196,8 +70342,8 @@ self: { }: mkDerivation { pname = "digit"; - version = "0.8"; - sha256 = "0m3m9c2452b0x7ccglkz7mr3ivi7r98qa44zwfnf7a55d6xckfa9"; + version = "0.9"; + sha256 = "0xyghgg8kzjrvhrcjizqnbprcyq5a3ma3x0dfijrdvbyd3lzghvm"; libraryHaskellDepends = [ base lens parsers scientific semigroupoids semigroups template-haskell @@ -72265,17 +72411,14 @@ self: { "dns" = callPackage ({ mkDerivation, array, async, attoparsec, auto-update, base - , base16-bytestring, base64-bytestring, bytestring, Cabal - , cabal-doctest, containers, cryptonite, doctest, hourglass, hspec - , iproute, mtl, network, psqueues, QuickCheck, word8 + , base16-bytestring, base64-bytestring, bytestring, containers + , cryptonite, doctest, hourglass, hspec, iproute, mtl, network + , psqueues, QuickCheck, word8 }: mkDerivation { pname = "dns"; - version = "4.0.0"; - sha256 = "0gq0y8pw4x8fja0f3hhwpbxh4rg2i8nzfnp2rxh2py49qfhg38mj"; - revision = "1"; - editedCabalFile = "0cg5jhn5g28qspkinx44zyz0yn08ddcsylhmvlpp4clyb9zlz1si"; - setupHaskellDepends = [ base Cabal cabal-doctest ]; + version = "4.0.1"; + sha256 = "1jv89bdhvwb51d9h9157k2r1cg7x0gzari91lddwvghrkx8v9k90"; libraryHaskellDepends = [ array async attoparsec auto-update base base16-bytestring base64-bytestring bytestring containers cryptonite hourglass @@ -72284,6 +72427,7 @@ self: { testHaskellDepends = [ base bytestring doctest hspec iproute network QuickCheck word8 ]; + doHaddock = false; testTarget = "spec"; description = "DNS library in Haskell"; license = stdenv.lib.licenses.bsd3; @@ -72643,7 +72787,7 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "doctemplates_0_7" = callPackage + "doctemplates_0_7_2" = callPackage ({ mkDerivation, aeson, base, bytestring, containers, criterion , doclayout, filepath, Glob, HsYAML, mtl, parsec, safe, scientific , tasty, tasty-golden, tasty-hunit, temporary, text @@ -72651,16 +72795,16 @@ self: { }: mkDerivation { pname = "doctemplates"; - version = "0.7"; - sha256 = "061llh59b69a84175z5wp0y0s2nw461kmf2w986wd5qcrjanxi62"; + version = "0.7.2"; + sha256 = "1sadadxq3vyzq4l3p05wvmkw68nwjprn98hn4l5zxif0r722jyxj"; enableSeparateDataOutput = true; libraryHaskellDepends = [ aeson base containers doclayout filepath HsYAML mtl parsec safe scientific text text-conversions unordered-containers vector ]; testHaskellDepends = [ - aeson base bytestring doclayout filepath Glob tasty tasty-golden - tasty-hunit temporary text + aeson base bytestring containers doclayout filepath Glob tasty + tasty-golden tasty-hunit temporary text ]; benchmarkHaskellDepends = [ aeson base containers criterion doclayout filepath mtl text @@ -73111,34 +73255,6 @@ self: { }: mkDerivation { pname = "dotenv"; - version = "0.8.0.2"; - sha256 = "0an7spi0cgvzr64nyy7p8pdslyf0jlh9l2ww52jbh1habsxjn6fp"; - isLibrary = true; - isExecutable = true; - enableSeparateDataOutput = true; - libraryHaskellDepends = [ - base base-compat containers directory exceptions megaparsec process - text transformers yaml - ]; - executableHaskellDepends = [ - base base-compat megaparsec optparse-applicative process text - transformers yaml - ]; - testHaskellDepends = [ - base base-compat containers directory exceptions hspec - hspec-megaparsec megaparsec process text transformers yaml - ]; - description = "Loads environment variables from dotenv files"; - license = stdenv.lib.licenses.mit; - }) {}; - - "dotenv_0_8_0_4" = callPackage - ({ mkDerivation, base, base-compat, containers, directory - , exceptions, hspec, hspec-megaparsec, megaparsec - , optparse-applicative, process, text, transformers, yaml - }: - mkDerivation { - pname = "dotenv"; version = "0.8.0.4"; sha256 = "05dqa91zmxkzkz1dcpx2jxkzhdr4f51gw0qql47da9bllavl0jj4"; isLibrary = true; @@ -73158,7 +73274,6 @@ self: { ]; description = "Loads environment variables from dotenv files"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "dotfs" = callPackage @@ -74254,8 +74369,8 @@ self: { }: mkDerivation { pname = "duet"; - version = "0.0.1"; - sha256 = "00f9j3zcna8gxs9g3rnmcm6xqsx7sm9ivygbzjw5dyhmiivh6nr7"; + version = "0.0.2"; + sha256 = "16hjhyn254d307ibg5541y00x0l6n5rwk06r5cdkj5x07jmgcafm"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -74270,8 +74385,10 @@ self: { aeson base containers deepseq edit-distance exceptions hspec monad-logger mtl parsec syb text ]; - description = "A tiny language, a subset of Haskell (with type classes) aimed at aiding teachers teach Haskell"; + description = "A tiny language, a subset of Haskell (with type classes) aimed at aiding teachers to teach Haskell"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "dumb-cas" = callPackage @@ -75907,26 +76024,27 @@ self: { ({ mkDerivation, array, base, containers, criterion, deepseq , directory, filepath, ghc, ghc-paths, Glob, hashable, haskeline , HUnit, megaparsec, mtl, optparse-applicative, parsec - , parser-combinators, process, random, regex-tdfa, split - , test-framework, test-framework-hunit, text, transformers + , parser-combinators, prettyprinter, process, random, regex-tdfa + , split, test-framework, test-framework-hunit, text, transformers , unordered-containers, vector }: mkDerivation { pname = "egison"; - version = "3.9.3"; - sha256 = "03scyzfwrzn8hbkk3r02ix7lw2pfx6r5qyf60xgvi0fgxhg7v7cv"; + version = "3.10.1"; + sha256 = "047l2knxhzlrmc4n6xaannnwa1zhq7lxr3iswwrji5xcqbbag5xp"; isLibrary = true; isExecutable = true; enableSeparateDataOutput = true; libraryHaskellDepends = [ array base containers directory ghc ghc-paths hashable haskeline - megaparsec mtl parsec parser-combinators process random regex-tdfa - split text transformers unordered-containers vector + megaparsec mtl optparse-applicative parsec parser-combinators + prettyprinter process random regex-tdfa split text transformers + unordered-containers vector ]; executableHaskellDepends = [ array base containers directory filepath ghc ghc-paths haskeline - mtl optparse-applicative parsec process text transformers - unordered-containers vector + mtl optparse-applicative parsec prettyprinter process split text + transformers unordered-containers vector ]; testHaskellDepends = [ base filepath Glob HUnit mtl test-framework test-framework-hunit @@ -75963,8 +76081,8 @@ self: { }: mkDerivation { pname = "egison-tutorial"; - version = "3.9.3"; - sha256 = "0p55bak45hxqajpz0kh6d4czhxm8xm1jkcmk7la6h0fvazz4665p"; + version = "3.10.0"; + sha256 = "109j17iskxs7gwgvxyyvmipf3xsbnysjxj20z6hhjzz1sb3sw5x5"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -77294,6 +77412,8 @@ self: { ]; description = "Perform basic syntax and deliverability checks on email addresses"; license = stdenv.lib.licenses.agpl3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "emailaddress" = callPackage @@ -79025,7 +79145,7 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "esqueleto_3_2_2" = callPackage + "esqueleto_3_2_3" = callPackage ({ mkDerivation, aeson, attoparsec, base, blaze-html, bytestring , conduit, containers, exceptions, hspec, monad-logger, mtl, mysql , mysql-simple, persistent, persistent-mysql, persistent-postgresql @@ -79035,8 +79155,8 @@ self: { }: mkDerivation { pname = "esqueleto"; - version = "3.2.2"; - sha256 = "1pnhnnsxx21jah4rnv8qy7jb4n7f6vbrxjh9cs2rygvrwqkg3n9c"; + version = "3.2.3"; + sha256 = "1m8ib08bnrmigpf0lzkn1wm8p479aflm92irzq5v3gg07dqgypcy"; libraryHaskellDepends = [ aeson attoparsec base blaze-html bytestring conduit containers monad-logger persistent resourcet tagged text time transformers @@ -80673,6 +80793,34 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "exist" = callPackage + ({ mkDerivation, base, base-unicode-symbols, util }: + mkDerivation { + pname = "exist"; + version = "0.2.0.0"; + sha256 = "0w2ip29f99qzi3wxicydkv991ws0lhnar3w0qka54r2mjb3xzrk9"; + libraryHaskellDepends = [ base base-unicode-symbols util ]; + description = "Dependent sum type"; + license = stdenv.lib.licenses.bsd3; + }) {}; + + "exist-instances" = callPackage + ({ mkDerivation, base, base-unicode-symbols, constraint, exist + , util + }: + mkDerivation { + pname = "exist-instances"; + version = "0.1.0.0"; + sha256 = "09714dl2gwpr44fhkq5w9fswn4fk0zhddg21mgcw2nb5l7930d7x"; + libraryHaskellDepends = [ + base base-unicode-symbols constraint exist util + ]; + description = "Instances for \"exist\" package (requires more language extensions and dependencies)"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; + }) {}; + "existential" = callPackage ({ mkDerivation, base, cereal, constraints, control-invariants , lens, portable-template-haskell-lens, QuickCheck @@ -81116,8 +81264,8 @@ self: { }: mkDerivation { pname = "expresso"; - version = "0.1.2.0"; - sha256 = "15s4gpf7pv6wv13q5i1cff7s93nx5vb8gyjfm4ifz76ki3xafgcn"; + version = "0.1.2.2"; + sha256 = "1fa37bqyw8zlva3z6sj10sp4r7sslh4xakrmr7d5diqynyrgdjax"; isLibrary = true; isExecutable = true; enableSeparateDataOutput = true; @@ -81580,6 +81728,8 @@ self: { ]; description = "Rational arithmetic in an irrational world"; license = "GPL"; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "facts" = callPackage @@ -81829,7 +81979,7 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "fakedata_0_3_1" = callPackage + "fakedata_0_4_0" = callPackage ({ mkDerivation, base, bytestring, containers, deepseq, directory , exceptions, filepath, gauge, hashable, hspec, hspec-discover , random, template-haskell, text, time, unordered-containers @@ -81837,8 +81987,8 @@ self: { }: mkDerivation { pname = "fakedata"; - version = "0.3.1"; - sha256 = "0y5gnqjgn3n2px80xbpqx0kaxrdkaqhw8n9ah4ry310j80m9z8ma"; + version = "0.4.0"; + sha256 = "0q90aa92wraqjnj256bpv34mhsl42wyp31y2g4nv2sgzj7mi9jjg"; enableSeparateDataOutput = true; libraryHaskellDepends = [ base bytestring containers directory exceptions filepath hashable @@ -82068,15 +82218,15 @@ self: { }) {}; "fast-downward" = callPackage - ({ mkDerivation, base, containers, list-t, mtl, process, temporary - , text, transformers + ({ mkDerivation, base, containers, mtl, process, temporary, text + , transformers }: mkDerivation { pname = "fast-downward"; - version = "0.1.1.0"; - sha256 = "1c4qsihjf6wjmmh4nm088pxaj7xc1mm9di8jq124zgllf85j1lfl"; + version = "0.2.0.0"; + sha256 = "0a2ax0z326mf02p5wyp1d8knxj6afn92n9bqxav2qhkc2v5kijhw"; libraryHaskellDepends = [ - base containers list-t mtl process temporary text transformers + base containers mtl process temporary text transformers ]; description = "Solve classical planning problems (STRIPS/SAS+) using Haskell & Fast Downward"; license = stdenv.lib.licenses.bsd3; @@ -83053,6 +83203,31 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "feed_1_3_0_0" = callPackage + ({ mkDerivation, base, base-compat, bytestring, HUnit + , markdown-unlit, old-locale, old-time, safe, syb, test-framework + , test-framework-hunit, text, time, time-locale-compat, utf8-string + , xml-conduit, xml-types + }: + mkDerivation { + pname = "feed"; + version = "1.3.0.0"; + sha256 = "19xqkx8ars0sjana18m34d7qg9l0qbg1i3v14a5rqabdppzcfrp2"; + enableSeparateDataOutput = true; + libraryHaskellDepends = [ + base base-compat bytestring old-locale old-time safe text time + time-locale-compat utf8-string xml-conduit xml-types + ]; + testHaskellDepends = [ + base base-compat HUnit old-time syb test-framework + test-framework-hunit text time xml-conduit xml-types + ]; + testToolDepends = [ markdown-unlit ]; + description = "Interfacing with RSS (v 0.9x, 2.x, 1.0) + Atom feeds."; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "feed-cli" = callPackage ({ mkDerivation, base, directory, feed, old-locale, old-time, time , xml @@ -84057,8 +84232,8 @@ self: { ({ mkDerivation, async, base, process, unix }: mkDerivation { pname = "filelock"; - version = "0.1.1.3"; - sha256 = "04qimhz78jjndk686dblkx06l9jscq2q9gyr014a4pbfj4iljgi5"; + version = "0.1.1.4"; + sha256 = "189n4pvq7f4d235smg2iqs2m5rqmnjdxflifq0mnb2qdbc4jjznr"; libraryHaskellDepends = [ base unix ]; testHaskellDepends = [ async base process ]; description = "Portable interface to file locking (flock / LockFileEx)"; @@ -84193,8 +84368,8 @@ self: { }: mkDerivation { pname = "filestore"; - version = "0.6.3.4"; - sha256 = "0q1ynqjslcxx5r93l6w2hsmd1khlq38c5g5mwrifrv12qnh28sx0"; + version = "0.6.4"; + sha256 = "1z967kviqsy3ma8xdfffx864f7ji6nsrbd5riis0nasm1bbwm8rr"; enableSeparateDataOutput = true; libraryHaskellDepends = [ base bytestring containers Diff directory filepath old-locale @@ -84205,6 +84380,8 @@ self: { ]; description = "Interface for versioning file stores"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "filesystem-abstractions" = callPackage @@ -84538,24 +84715,25 @@ self: { }) {}; "finitary-derive" = callPackage - ({ mkDerivation, base, binary, coercible-utils, deepseq, finitary - , finite-typelits, ghc-typelits-extra, ghc-typelits-knownnat - , hashable, hedgehog, hedgehog-classes, monad-loops, mtl, vector - , vector-sized + ({ mkDerivation, base, binary, bitvec, coercible-utils, deepseq + , finitary, finite-typelits, ghc-typelits-extra + , ghc-typelits-knownnat, hashable, hedgehog, hedgehog-classes + , transformers, vector, vector-binary-instances, vector-instances }: mkDerivation { pname = "finitary-derive"; - version = "1.0.0.1"; - sha256 = "1wv9jjvv1jd5y39pybfawb19pxzwb6r3p69ajyh2f7m8nn81kcim"; + version = "2.2.0.0"; + sha256 = "11nkryzbhkbz4v2i4kwaggw67nlhs5jljqczmvliyz1df75f5kh3"; libraryHaskellDepends = [ - base binary coercible-utils deepseq finitary finite-typelits - ghc-typelits-extra ghc-typelits-knownnat hashable mtl vector - vector-sized + base binary bitvec coercible-utils deepseq finitary finite-typelits + ghc-typelits-extra ghc-typelits-knownnat hashable transformers + vector vector-binary-instances vector-instances ]; testHaskellDepends = [ - base finitary finite-typelits hedgehog hedgehog-classes monad-loops + base binary deepseq finitary finite-typelits hashable hedgehog + hedgehog-classes ]; - description = "Easy and efficient Unbox, Storable, Binary and Hashable instances for Finitary types"; + description = "Flexible and easy deriving of type classes for finitary types"; license = stdenv.lib.licenses.gpl3Plus; hydraPlatforms = stdenv.lib.platforms.none; broken = true; @@ -84747,6 +84925,8 @@ self: { ]; description = "Calculates file-size frequency-distribution"; license = "GPL"; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "fit" = callPackage @@ -85217,10 +85397,8 @@ self: { }: mkDerivation { pname = "fixplate"; - version = "0.1.7"; - sha256 = "0brll5vkb3341l5iblrc1r50jzg8q6ycvbqvrc9jnj2nc86mslay"; - revision = "1"; - editedCabalFile = "0ynmm06iblqsyzfc068sdvmlpll8zwyccwkdlji3nf535biv56hb"; + version = "0.1.8"; + sha256 = "0m0g7gbdhigfc0k0sbvxhcl3gilv1wfmffwl14wr6jqbmpqy0as5"; libraryHaskellDepends = [ base containers ]; testHaskellDepends = [ base containers QuickCheck tasty tasty-quickcheck @@ -87033,6 +87211,26 @@ self: { testHaskellDepends = [ aeson base containers hspec mtl text ]; description = "Parse and validate forms in JSON format"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; + }) {}; + + "forma_1_1_3" = callPackage + ({ mkDerivation, aeson, base, containers, hspec, mtl, text + , unordered-containers + }: + mkDerivation { + pname = "forma"; + version = "1.1.3"; + sha256 = "0pd2qzibffbkw2c4mk687yg109pl0nfjq0kpwi2cl0l8d0qlyv0c"; + libraryHaskellDepends = [ + aeson base containers mtl text unordered-containers + ]; + testHaskellDepends = [ aeson base containers hspec mtl text ]; + description = "Parse and validate forms in JSON format"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "formal" = callPackage @@ -87782,6 +87980,24 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "free_5_1_3" = callPackage + ({ mkDerivation, base, comonad, containers, distributive + , exceptions, mtl, profunctors, semigroupoids, template-haskell + , transformers, transformers-base + }: + mkDerivation { + pname = "free"; + version = "5.1.3"; + sha256 = "0b9f9jrfgkq13333px6p1faxpcypqvzi0m9dnbj2rm8s79pdcw1c"; + libraryHaskellDepends = [ + base comonad containers distributive exceptions mtl profunctors + semigroupoids template-haskell transformers transformers-base + ]; + description = "Monads for free"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "free-algebras" = callPackage ({ mkDerivation, base, containers, data-fix, dlist, free, groups , hedgehog, kan-extensions, mtl, transformers @@ -89475,6 +89691,33 @@ self: { broken = true; }) {}; + "functor-combinators_0_2_0_0" = callPackage + ({ mkDerivation, base, bifunctors, comonad, constraints, containers + , dependent-sum, deriving-compat, free, hedgehog, kan-extensions + , mmorph, mtl, natural-transformation, nonempty-containers, pointed + , profunctors, semigroupoids, tagged, tasty, tasty-hedgehog, these + , transformers, trivial-constraint, vinyl + }: + mkDerivation { + pname = "functor-combinators"; + version = "0.2.0.0"; + sha256 = "0z8r9z08cayyv2ag748aa8550sd2mnj2zagdkf5i5yn3lvhd0k6j"; + libraryHaskellDepends = [ + base bifunctors comonad constraints containers deriving-compat free + kan-extensions mmorph mtl natural-transformation + nonempty-containers pointed profunctors semigroupoids tagged these + transformers trivial-constraint vinyl + ]; + testHaskellDepends = [ + base bifunctors dependent-sum free hedgehog nonempty-containers + semigroupoids tasty tasty-hedgehog transformers + ]; + description = "Tools for functor combinator-based program design"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; + }) {}; + "functor-combo" = callPackage ({ mkDerivation, base, base-orphans, containers, data-inttrie, lub , type-unary, TypeCompose @@ -89793,6 +90036,8 @@ self: { testToolDepends = [ markdown-unlit ]; description = "Handle exceptions thrown in IO with fused-effects"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "fused-effects-lens" = callPackage @@ -89805,6 +90050,8 @@ self: { testHaskellDepends = [ base fused-effects hspec microlens ]; description = "Monadic lens combinators for fused-effects"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "fused-effects-random" = callPackage @@ -89820,6 +90067,8 @@ self: { ]; description = "Random number generation for fused-effects"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "fused-effects-resumable" = callPackage @@ -89833,6 +90082,8 @@ self: { ]; description = "Resumable exceptions for the fused-effects ecosystem"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "fusion" = callPackage @@ -89866,8 +90117,8 @@ self: { }: mkDerivation { pname = "futhark"; - version = "0.12.3"; - sha256 = "02ddxa7mkmbwg16ylvjdld85fw479n8jvi21mn7fak7vaqjdd2hw"; + version = "0.13.1"; + sha256 = "0h92q21hg3850f7hv5n497mn90dv3hxp8fa3cl29gwkn0pkaz33b"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -90234,6 +90485,34 @@ self: { broken = true; }) {}; + "galois-fft" = callPackage + ({ mkDerivation, base, criterion, elliptic-curve, galois-field + , pairing, poly, protolude, QuickCheck, quickcheck-instances, tasty + , tasty-discover, tasty-hunit, tasty-quickcheck, vector + }: + mkDerivation { + pname = "galois-fft"; + version = "0.1.0"; + sha256 = "1qyhx0b0p3avag82g1fdwbiwxdr0npw39k4f2nv0x772rr4h9rz1"; + libraryHaskellDepends = [ + base elliptic-curve galois-field poly protolude vector + ]; + testHaskellDepends = [ + base elliptic-curve galois-field pairing poly protolude QuickCheck + quickcheck-instances tasty tasty-discover tasty-hunit + tasty-quickcheck vector + ]; + testToolDepends = [ tasty-discover ]; + benchmarkHaskellDepends = [ + base criterion elliptic-curve galois-field pairing poly protolude + vector + ]; + description = "FFTs over finite fields"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; + }) {}; + "galois-field" = callPackage ({ mkDerivation, base, criterion, integer-gmp, MonadRandom , protolude, tasty, tasty-quickcheck, wl-pprint-text @@ -90505,12 +90784,12 @@ self: { }) {}; "gasp" = callPackage - ({ mkDerivation, base, binary, containers }: + ({ mkDerivation, base, binary, containers, mtl }: mkDerivation { pname = "gasp"; - version = "1.1.0.0"; - sha256 = "1zv7jq60nw2nd0np7xkz83y7jnvnshccz63j0i9bl0d9x1grhzbq"; - libraryHaskellDepends = [ base binary containers ]; + version = "1.2.0.0"; + sha256 = "0dq867kgil7xp7wqk8ylmx9ninxrqwc375g5l13iskvyz1li7474"; + libraryHaskellDepends = [ base binary containers mtl ]; description = "A framework of algebraic classes"; license = stdenv.lib.licenses.bsd3; }) {}; @@ -90751,20 +91030,6 @@ self: { ({ mkDerivation, base, lawful }: mkDerivation { pname = "gdp"; - version = "0.0.0.2"; - sha256 = "1gqs19wjyng0nacwvi7sjxnhnxjy2az0jwjyy6w2r5g4w9dgykr1"; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ base lawful ]; - executableHaskellDepends = [ base ]; - description = "Reason about invariants and preconditions with ghosts of departed proofs"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "gdp_0_0_3_0" = callPackage - ({ mkDerivation, base, lawful }: - mkDerivation { - pname = "gdp"; version = "0.0.3.0"; sha256 = "0pkx6j557p9rm39pr6pw8p2j3nz8s4q839n6y9p6c31dnlz0zxx0"; isLibrary = true; @@ -90773,7 +91038,6 @@ self: { executableHaskellDepends = [ base ]; description = "Reason about invariants and preconditions with ghosts of departed proofs"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "gearbox" = callPackage @@ -91333,14 +91597,14 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "generic-deriving_1_13" = callPackage + "generic-deriving_1_13_1" = callPackage ({ mkDerivation, base, containers, ghc-prim, hspec, hspec-discover , template-haskell, th-abstraction }: mkDerivation { pname = "generic-deriving"; - version = "1.13"; - sha256 = "0k4av4jamgpavn82q54g345la5i2ckfbq2w9nnf2a6vhvk1lnw8g"; + version = "1.13.1"; + sha256 = "1glsl15dc40wn1r851bray6i450g82xa2n0q53p1i3p5x903mdg9"; libraryHaskellDepends = [ base containers ghc-prim template-haskell th-abstraction ]; @@ -92578,8 +92842,8 @@ self: { }: mkDerivation { pname = "geoip2"; - version = "0.4.0.0"; - sha256 = "1a2wxblnv611asfwkgm2ndam1jvm2xqajj3rk0ii9qi7j9s5w8v0"; + version = "0.4.0.1"; + sha256 = "0q0clfmq7spfplxr6dxhq0d39f5l95yfr87ixnv2cn0ahcx7fpi7"; libraryHaskellDepends = [ base bytestring cereal containers iproute lens mmap reinterpret-cast text @@ -92807,6 +93071,8 @@ self: { ]; description = "Github Standard Labeler"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "gh-pocket-knife" = callPackage @@ -93855,11 +94121,11 @@ self: { ({ mkDerivation, base, bytestring, criterion, text }: mkDerivation { pname = "ghc-trace-events"; - version = "0.0.0.1"; - sha256 = "0b9s07wy26f9xswg6ysylpjaa9gv9iqw50n3zqpkj3jr8ah8y3kl"; + version = "0.1.0"; + sha256 = "0i68zk3k02f3hp6yvkgmdvdjfm8kgh3pwhr3qff4bc9isfh6qks2"; libraryHaskellDepends = [ base bytestring text ]; benchmarkHaskellDepends = [ base bytestring criterion ]; - description = "Faster replacements for traceEvent and traceMarker"; + description = "Faster traceEvent and traceMarker, and binary object logging for eventlog"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; broken = true; @@ -94023,8 +94289,8 @@ self: { ({ mkDerivation, base, directory, ghc, time }: mkDerivation { pname = "ghcflags"; - version = "1.0.1"; - sha256 = "1s7xx13ka5jc8c5ga2yzzx3m6l9kn8fjgrfq6g7y6z8kw38590vb"; + version = "1.0.2"; + sha256 = "17j7bkx7ki5vqr0a3vl0f0v4l9cz2q7lm9xpkj3144y9sqmiqzy3"; libraryHaskellDepends = [ base directory ghc time ]; description = "Dump the ghc flags during compilation"; license = stdenv.lib.licenses.bsd2; @@ -94218,6 +94484,33 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "ghcid_0_7_7" = 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.7"; + sha256 = "1qrj6is1f6jnx9m2g7cp2009dik7inzf5yqlvqv4pwzzxp0nhl3a"; + 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; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "ghcide" = callPackage ({ mkDerivation, aeson, async, base, binary, bytestring, containers , data-default, deepseq, directory, extra, filepath, ghc, ghc-boot @@ -95985,8 +96278,8 @@ self: { }: mkDerivation { pname = "git-config"; - version = "0.1.1"; - sha256 = "0vspjqscw02x3hr6n0d0d4kyjfh5lij4wy58fp4z301vmyv77vgl"; + version = "0.1.2"; + sha256 = "1kp5yqn7pz5haq41m2za2f3bw0ygf1zlnn3n0b76zh0jbrndgknh"; libraryHaskellDepends = [ base megaparsec text unordered-containers ]; @@ -96395,8 +96688,8 @@ self: { }: mkDerivation { pname = "github"; - version = "0.23"; - sha256 = "1d08m0kajl6zaralz1rbm4miv2a5zrbm6asjyrl75n915l56m9mb"; + version = "0.24"; + sha256 = "0jbk34aibm5bqbax8f2sif840f31g81yipnkav96lr4pfdv5b4mr"; libraryHaskellDepends = [ aeson base base-compat base16-bytestring binary binary-instances bytestring containers cryptohash-sha1 deepseq deepseq-generics @@ -96760,22 +97053,23 @@ self: { }) {}; "gitlab-haskell" = callPackage - ({ mkDerivation, aeson, base, bytestring, connection, http-conduit - , http-types, optparse-applicative, text, transformers, unliftio - , unliftio-core + ({ mkDerivation, aeson, base, bytestring, connection, directory + , filepath, http-conduit, http-types, moss, optparse-applicative + , temporary, text, time, transformers, unliftio, unliftio-core }: mkDerivation { pname = "gitlab-haskell"; - version = "0.1.2"; - sha256 = "0m5gxf7799ds3ff46bz7j3rxycwnbaaik7lffyh22ipp3wlxjxpn"; + version = "0.1.3"; + sha256 = "12yfq12c6jlkr08x2jhykxdydikf3x4dmkyyn15fxhajqi7f1ka2"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ - aeson base bytestring connection http-conduit http-types text + aeson base bytestring connection http-conduit http-types text time transformers unliftio unliftio-core ]; executableHaskellDepends = [ - base http-types optparse-applicative text + base bytestring directory filepath http-types moss + optparse-applicative temporary text unliftio-core ]; description = "A Haskell library for the GitLab web API"; license = stdenv.lib.licenses.bsd3; @@ -97785,10 +98079,15 @@ self: { }: mkDerivation { pname = "glpk-hs"; - version = "0.5"; - sha256 = "1scr5iyxn83172g3d7wjww3frcrgk8kh3hzni11qchskllkx0vm3"; + version = "0.7"; + sha256 = "0cbdlidq14hmhndlgxid4gdzyg0jlm5habp5389xl3zkbmm2hni9"; + isLibrary = true; + isExecutable = true; libraryHaskellDepends = [ array base containers deepseq gasp mtl ]; librarySystemDepends = [ glpk ]; + executableHaskellDepends = [ + array base containers deepseq gasp mtl + ]; description = "Comprehensive GLPK linear programming bindings"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; @@ -102064,21 +102363,22 @@ self: { }) {}; "graphql" = callPackage - ({ mkDerivation, aeson, base, hspec, hspec-expectations + ({ mkDerivation, aeson, base, containers, hspec, hspec-expectations , hspec-megaparsec, megaparsec, raw-strings-qq, text, transformers , unordered-containers }: mkDerivation { pname = "graphql"; - version = "0.5.1.0"; - sha256 = "0wnn4nhszcciv06h17qkaxn649w48fw876v85934mfbn56fczzdd"; + version = "0.6.0.0"; + sha256 = "0gippn2y1ngykfz33825r4r4m5km7m8qch7ijics1q9d1jnszs5a"; enableSeparateDataOutput = true; libraryHaskellDepends = [ - aeson base megaparsec text transformers unordered-containers + aeson base containers megaparsec text transformers + unordered-containers ]; testHaskellDepends = [ - aeson base hspec hspec-expectations hspec-megaparsec megaparsec - raw-strings-qq text transformers unordered-containers + aeson base containers hspec hspec-expectations hspec-megaparsec + megaparsec raw-strings-qq text transformers unordered-containers ]; description = "Haskell GraphQL implementation"; license = stdenv.lib.licenses.bsd3; @@ -102121,8 +102421,8 @@ self: { ({ mkDerivation, base, containers, json, text }: mkDerivation { pname = "graphql-w-persistent"; - version = "0.6.0.0"; - sha256 = "03m247xmj8gvvjs4bgsc06daz9avklza7ngs575psaqmkpxd8ga3"; + version = "0.7.0.0"; + sha256 = "02qbwkbr8hckr6z9ivszdnwlilz7mkh6zinb33s7gas7iwzkf9jc"; libraryHaskellDepends = [ base containers json text ]; description = "GraphQL interface middleware for (SQL) databases"; license = stdenv.lib.licenses.isc; @@ -104270,29 +104570,28 @@ self: { "hOpenPGP" = callPackage ({ mkDerivation, aeson, asn1-encoding, attoparsec, base - , base16-bytestring, base64-bytestring, bifunctors, binary - , binary-conduit, bytestring, bzlib, conduit, conduit-extra - , containers, criterion, crypto-cipher-types, cryptonite, errors - , hashable, incremental-parser, ixset-typed, lens, memory - , monad-loops, nettle, network, network-uri, newtype - , openpgp-asciiarmor, prettyprinter, QuickCheck - , quickcheck-instances, resourcet, semigroups, split, tasty - , tasty-hunit, tasty-quickcheck, text, time, time-locale-compat - , transformers, unliftio-core, unordered-containers, zlib + , base16-bytestring, bifunctors, binary, binary-conduit, bytestring + , bzlib, conduit, conduit-extra, containers, criterion + , crypto-cipher-types, cryptonite, errors, hashable + , incremental-parser, ixset-typed, lens, memory, monad-loops + , nettle, network, network-uri, newtype, openpgp-asciiarmor + , prettyprinter, QuickCheck, quickcheck-instances, resourcet + , semigroups, split, tasty, tasty-hunit, tasty-quickcheck, text + , time, time-locale-compat, transformers, unliftio-core + , unordered-containers, zlib }: mkDerivation { pname = "hOpenPGP"; - version = "2.8"; - sha256 = "1n6cpwgg934ii3b4ap2gp347q3k4b64dc9x37d4bj51hs6910pmw"; - libraryHaskellDepends = [ - aeson asn1-encoding attoparsec base base16-bytestring - base64-bytestring bifunctors binary binary-conduit bytestring bzlib - conduit conduit-extra containers crypto-cipher-types cryptonite - errors hashable incremental-parser ixset-typed lens memory - monad-loops nettle network-uri newtype openpgp-asciiarmor - prettyprinter resourcet semigroups split text time - time-locale-compat transformers unliftio-core unordered-containers - zlib + version = "2.8.4"; + sha256 = "0vvr86y29ncgs3j2hd5qhsxix09jf01ah8qqq6n12zsh484cr127"; + libraryHaskellDepends = [ + aeson asn1-encoding attoparsec base base16-bytestring bifunctors + binary binary-conduit bytestring bzlib conduit conduit-extra + containers crypto-cipher-types cryptonite errors hashable + incremental-parser ixset-typed lens memory monad-loops nettle + network-uri newtype openpgp-asciiarmor prettyprinter resourcet + semigroups split text time time-locale-compat transformers + unliftio-core unordered-containers zlib ]; testHaskellDepends = [ aeson asn1-encoding attoparsec base base16-bytestring bifunctors @@ -104305,16 +104604,68 @@ self: { unliftio-core unordered-containers zlib ]; benchmarkHaskellDepends = [ - aeson base base16-bytestring base64-bytestring bifunctors binary - binary-conduit bytestring bzlib conduit conduit-extra containers - criterion crypto-cipher-types cryptonite errors hashable + aeson base base16-bytestring bifunctors binary binary-conduit + bytestring bzlib conduit conduit-extra containers criterion + crypto-cipher-types cryptonite errors hashable incremental-parser + ixset-typed lens memory monad-loops nettle network network-uri + newtype openpgp-asciiarmor prettyprinter resourcet semigroups split + text time time-locale-compat transformers unliftio-core + unordered-containers zlib + ]; + description = "native Haskell implementation of OpenPGP (RFC4880)"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; + }) {}; + + "hOpenPGP_2_8_5" = callPackage + ({ mkDerivation, aeson, asn1-encoding, attoparsec, base + , base16-bytestring, bifunctors, binary, binary-conduit, bytestring + , bzlib, conduit, conduit-extra, containers, criterion + , crypto-cipher-types, cryptonite, errors, hashable + , incremental-parser, ixset-typed, lens, memory, monad-loops + , nettle, network, network-uri, newtype, openpgp-asciiarmor + , prettyprinter, QuickCheck, quickcheck-instances, resourcet + , semigroups, split, tasty, tasty-hunit, tasty-quickcheck, text + , time, time-locale-compat, transformers, unliftio-core + , unordered-containers, zlib + }: + mkDerivation { + pname = "hOpenPGP"; + version = "2.8.5"; + sha256 = "1d5cmgj3rg8snc2b5jn9h7hb83j2hhf0c9shiiyrpr8rrl4hx2mj"; + libraryHaskellDepends = [ + aeson asn1-encoding attoparsec base base16-bytestring bifunctors + binary binary-conduit bytestring bzlib conduit conduit-extra + containers crypto-cipher-types cryptonite errors hashable incremental-parser ixset-typed lens memory monad-loops nettle - network network-uri newtype openpgp-asciiarmor prettyprinter - resourcet semigroups split text time time-locale-compat - transformers unliftio-core unordered-containers zlib + network-uri newtype openpgp-asciiarmor prettyprinter resourcet + semigroups split text time time-locale-compat transformers + unliftio-core unordered-containers zlib + ]; + testHaskellDepends = [ + aeson asn1-encoding attoparsec base base16-bytestring bifunctors + binary binary-conduit bytestring bzlib conduit conduit-extra + containers crypto-cipher-types cryptonite errors hashable + incremental-parser ixset-typed lens memory monad-loops nettle + network network-uri newtype prettyprinter QuickCheck + quickcheck-instances resourcet semigroups split tasty tasty-hunit + tasty-quickcheck text time time-locale-compat transformers + unliftio-core unordered-containers zlib + ]; + benchmarkHaskellDepends = [ + aeson base base16-bytestring bifunctors binary binary-conduit + bytestring bzlib conduit conduit-extra containers criterion + crypto-cipher-types cryptonite errors hashable incremental-parser + ixset-typed lens memory monad-loops nettle network network-uri + newtype openpgp-asciiarmor prettyprinter resourcet semigroups split + text time time-locale-compat transformers unliftio-core + unordered-containers zlib ]; description = "native Haskell implementation of OpenPGP (RFC4880)"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "hPDB" = callPackage @@ -105253,6 +105604,34 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "hackage-security_0_6_0_0" = callPackage + ({ mkDerivation, aeson, base, base16-bytestring, base64-bytestring + , bytestring, Cabal, containers, cryptohash-sha256, directory + , ed25519, filepath, ghc-prim, lukko, mtl, network, network-uri + , parsec, pretty, QuickCheck, tar, tasty, tasty-hunit + , tasty-quickcheck, template-haskell, temporary, time, transformers + , unordered-containers, vector, zlib + }: + mkDerivation { + pname = "hackage-security"; + version = "0.6.0.0"; + sha256 = "1y9vs30y474ri8b9jqkbwfkcfh7p7jaafzwxina9z0xl32d0bn1c"; + libraryHaskellDepends = [ + base base16-bytestring base64-bytestring bytestring Cabal + containers cryptohash-sha256 directory ed25519 filepath ghc-prim + lukko mtl network network-uri parsec pretty tar template-haskell + time transformers zlib + ]; + testHaskellDepends = [ + aeson base bytestring Cabal containers network-uri QuickCheck tar + tasty tasty-hunit tasty-quickcheck temporary time + unordered-containers vector zlib + ]; + description = "Hackage security library"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "hackage-security-HTTP" = callPackage ({ mkDerivation, base, bytestring, hackage-security, HTTP, mtl , network, network-uri, zlib @@ -105729,8 +106108,8 @@ self: { }: mkDerivation { pname = "hadolint"; - version = "1.17.2"; - sha256 = "0s9q0016j3y56sblkq12mai1j58h8w8cy8k2x1bzvhb95zpg1va9"; + version = "1.17.3"; + sha256 = "00lyf2m6q866383q79b705xhn987504wz3fp3zh7m8580v8phy5p"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -106484,8 +106863,6 @@ self: { ]; description = "Hakyll utilities to work with images"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "hakyll-ogmarkup" = callPackage @@ -107511,8 +107888,8 @@ self: { }: mkDerivation { pname = "happstack-authenticate"; - version = "2.4.0"; - sha256 = "1q4k8x6mwh9g7y5njcjd1xyn79yjnjv01nk4xa5q9yspmsa4685m"; + version = "2.4.0.2"; + sha256 = "16f4rs4h3lznkci5axibliiwfr3vrm03arxcjfjiv6mypkcpnp2r"; enableSeparateDataOutput = true; libraryHaskellDepends = [ acid-state aeson authenticate base base64-bytestring boomerang @@ -107771,8 +108148,8 @@ self: { }: mkDerivation { pname = "happstack-hsp"; - version = "7.3.7.3"; - sha256 = "0m7psd6dg33xijshs3dxz2xrqghmpbs402h67b52pkqsk5nmy633"; + version = "7.3.7.4"; + sha256 = "188fqqpq7m921qkfv2b64pikcx8zzsy376l4py4wxlkabl7fkydr"; libraryHaskellDepends = [ base bytestring happstack-server harp hsp hsx2hs mtl syb text utf8-string @@ -107827,8 +108204,8 @@ self: { }: mkDerivation { pname = "happstack-jmacro"; - version = "7.0.12.1"; - sha256 = "0bx2wa0pdj73f11xhkk0qq3k8zwh6ccc3kqli9q59617s05wq6zz"; + version = "7.0.12.2"; + sha256 = "0zgmh75z59g6hs8n924sbnhswjdd6b947ywiird2a3y6d2zwqj3v"; libraryHaskellDepends = [ base base64-bytestring bytestring cereal digest happstack-server jmacro text utf8-string wl-pprint-text @@ -108408,8 +108785,8 @@ self: { ({ mkDerivation, base }: mkDerivation { pname = "harp"; - version = "0.4.3.2"; - sha256 = "1abyfsr0ya7j0s6znixhfhsr9mlmcg16rg5d9909b0xr896bkbn6"; + version = "0.4.3.3"; + sha256 = "16bmv3ymiiyvy65vf4s5h4fhp6q5hrw40xfdba4yarwgpbm0frm2"; libraryHaskellDepends = [ base ]; description = "HaRP allows pattern-matching with regular expressions"; license = stdenv.lib.licenses.bsd3; @@ -108501,6 +108878,27 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "hasbolt_0_1_3_6" = callPackage + ({ mkDerivation, base, binary, bytestring, connection, containers + , data-binary-ieee754, data-default, hex, hspec, mtl, network + , QuickCheck, text + }: + mkDerivation { + pname = "hasbolt"; + version = "0.1.3.6"; + sha256 = "0sgxvgvxqykslbjslrb5mzmaaar4nbc59p94qhk7rzbjsas01vp2"; + libraryHaskellDepends = [ + base binary bytestring connection containers data-binary-ieee754 + data-default mtl network text + ]; + 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, doctest, free, hasbolt, lens, mtl @@ -109485,23 +109883,24 @@ self: { "haskell-ci" = callPackage ({ mkDerivation, aeson, ansi-terminal, base, base-compat - , bytestring, Cabal, containers, deepseq, Diff, directory - , exceptions, filepath, generic-lens, HsYAML, lattices, microlens - , mtl, network-uri, optparse-applicative, parsec, pretty, process - , ShellCheck, tasty, tasty-golden, temporary, text, transformers - , unordered-containers + , bytestring, Cabal, cabal-install-parsers, containers, deepseq + , Diff, directory, exceptions, filepath, generic-lens, HsYAML + , lattices, microlens, mtl, network-uri, optparse-applicative + , parsec, pretty, process, ShellCheck, tasty, tasty-golden + , temporary, text, transformers, unordered-containers }: mkDerivation { pname = "haskell-ci"; - version = "0.6"; - sha256 = "1g9zfdw4z00sbh3mkaz2hzn09hjlawkb7h67mqn4qsdjw6dbwaab"; + version = "0.8"; + sha256 = "1wm5fs8fdy85lvjyy9n0yh66ax6bs0ll4gq7d8ba0ibsp69g6pm3"; isLibrary = false; isExecutable = true; libraryHaskellDepends = [ - aeson base base-compat bytestring Cabal containers deepseq - directory exceptions filepath generic-lens HsYAML lattices - microlens mtl network-uri optparse-applicative parsec pretty - process ShellCheck temporary text transformers unordered-containers + aeson base base-compat bytestring Cabal cabal-install-parsers + containers deepseq directory exceptions filepath generic-lens + HsYAML lattices microlens mtl network-uri optparse-applicative + parsec pretty process ShellCheck temporary text transformers + unordered-containers ]; executableHaskellDepends = [ base ]; testHaskellDepends = [ @@ -109511,7 +109910,8 @@ self: { doHaddock = false; description = "Cabal package script generator for Travis-CI"; license = stdenv.lib.licenses.gpl3Plus; - maintainers = with stdenv.lib.maintainers; [ peti ]; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "haskell-cnc" = callPackage @@ -110051,7 +110451,7 @@ self: { license = stdenv.lib.licenses.mit; }) {}; - "haskell-lsp_0_17_0_0" = callPackage + "haskell-lsp_0_18_0_0" = callPackage ({ mkDerivation, aeson, async, attoparsec, base, bytestring , containers, data-default, directory, filepath, hashable , haskell-lsp-types, hslogger, hspec, hspec-discover, lens, mtl @@ -110060,8 +110460,8 @@ self: { }: mkDerivation { pname = "haskell-lsp"; - version = "0.17.0.0"; - sha256 = "17c95ndm6jadab04q707pmv6x9cwshk463c8gc9ai0m7763win7x"; + version = "0.18.0.0"; + sha256 = "0q9xpjgr3n7svhd9f7mmkw113avswvfm08fnbijdr1sblipd12sl"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -110120,15 +110520,15 @@ self: { license = stdenv.lib.licenses.mit; }) {}; - "haskell-lsp-types_0_17_0_0" = callPackage + "haskell-lsp-types_0_18_0_0" = callPackage ({ mkDerivation, aeson, base, bytestring, data-default, deepseq , filepath, hashable, lens, network-uri, scientific, text , unordered-containers }: mkDerivation { pname = "haskell-lsp-types"; - version = "0.17.0.0"; - sha256 = "03i3s7f82imv4ysclhjv07mcs0dl3m5nmjxmfa5wafircai4yi3p"; + version = "0.18.0.0"; + sha256 = "1ypa3gxxcg7dl905d4nprcqzw2fcl7z7xy1hpg5har1dw3w9fyiq"; libraryHaskellDepends = [ aeson base bytestring data-default deepseq filepath hashable lens network-uri scientific text unordered-containers @@ -110772,14 +111172,14 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "haskell-src-meta_0_8_4" = callPackage + "haskell-src-meta_0_8_5" = callPackage ({ mkDerivation, base, containers, haskell-src-exts, HUnit, pretty , syb, tasty, tasty-hunit, template-haskell, th-orphans }: mkDerivation { pname = "haskell-src-meta"; - version = "0.8.4"; - sha256 = "18zcsaz9cb65rpyxmxrs30vqmdighc4flyfv8ix623nlq247drsn"; + version = "0.8.5"; + sha256 = "1csqp3n7330rhia9msyw34z7qwwj64gdy5qlv8w4jbm49dap24ik"; libraryHaskellDepends = [ base haskell-src-exts pretty syb template-haskell th-orphans ]; @@ -112108,6 +112508,8 @@ self: { testToolDepends = [ hspec-discover ]; description = "Bitcoin & Bitcoin Cash library for Haskell"; license = stdenv.lib.licenses.publicDomain; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "haskoin-crypto" = callPackage @@ -113406,21 +113808,21 @@ self: { license = stdenv.lib.licenses.mit; }) {}; - "hasql-transaction_1" = callPackage + "hasql-transaction_1_0_0_1" = callPackage ({ mkDerivation, async, base, bytestring, bytestring-tree-builder , contravariant, contravariant-extras, hasql, mtl, rebase , transformers }: mkDerivation { pname = "hasql-transaction"; - version = "1"; - sha256 = "1k82b0bx4j2g7lhr2p4z4a365kx1i23dr6zikwg1yyhpvhl3xbcj"; + version = "1.0.0.1"; + sha256 = "0jfvabsjpj56piny41hzbblhprjsk5xkpk35x502q2isl2mkk5ql"; libraryHaskellDepends = [ base bytestring bytestring-tree-builder contravariant contravariant-extras hasql mtl transformers ]; testHaskellDepends = [ async hasql rebase ]; - description = "A composable abstraction over the retryable transactions for Hasql"; + description = "Composable abstraction over retryable transactions for Hasql"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; }) {}; @@ -114614,21 +115016,6 @@ self: { }: mkDerivation { pname = "hdaemonize"; - version = "0.5.5"; - sha256 = "17q2zr9bv6xwnldgbsh1idwfgybp8q4xzq79p2lmmi3f0q6cnl6j"; - libraryHaskellDepends = [ - base bytestring extensible-exceptions filepath hsyslog mtl unix - ]; - description = "Library to handle the details of writing daemons for UNIX"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "hdaemonize_0_5_6" = callPackage - ({ mkDerivation, base, bytestring, extensible-exceptions, filepath - , hsyslog, mtl, unix - }: - mkDerivation { - pname = "hdaemonize"; version = "0.5.6"; sha256 = "097fgjgskigy3grnd3ijzyhdq34vjmd9bjk2rscixi59j8j30vxd"; libraryHaskellDepends = [ @@ -114636,7 +115023,6 @@ self: { ]; description = "Library to handle the details of writing daemons for UNIX"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "hdaemonize-buildfix" = callPackage @@ -115109,6 +115495,21 @@ self: { broken = true; }) {}; + "headed-megaparsec" = callPackage + ({ mkDerivation, base, case-insensitive, megaparsec + , parser-combinators, selective + }: + mkDerivation { + pname = "headed-megaparsec"; + version = "0.1.0.2"; + sha256 = "0npkkphm4gv7cgm08asr5qxjyk6jdbm4h4w0jwsvxzpxh3nfxgbr"; + libraryHaskellDepends = [ + base case-insensitive megaparsec parser-combinators selective + ]; + description = "More informative parser"; + license = stdenv.lib.licenses.mit; + }) {}; + "headergen" = callPackage ({ mkDerivation, aeson, aeson-pretty, base, bytestring, directory , filepath, haskeline, time @@ -115527,6 +115928,25 @@ self: { broken = true; }) {}; + "hedgehog-golden" = callPackage + ({ mkDerivation, aeson, aeson-pretty, base, bytestring, containers + , Diff, directory, extra, hedgehog, text + }: + mkDerivation { + pname = "hedgehog-golden"; + version = "1.0.0"; + sha256 = "17ja3ch042kvk0fpd1gd9nnj9x5jbl37vxn579hr9rimwgf99az7"; + libraryHaskellDepends = [ + aeson aeson-pretty base bytestring containers Diff directory extra + hedgehog text + ]; + testHaskellDepends = [ base hedgehog ]; + description = "Golden testing capabilities for hedgehog using Aeson"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; + }) {}; + "hedgehog-quickcheck" = callPackage ({ mkDerivation, base, hedgehog, QuickCheck, transformers }: mkDerivation { @@ -118880,20 +119300,22 @@ self: { }) {}; "hip" = callPackage - ({ mkDerivation, base, bytestring, Chart, Chart-diagrams, colour - , criterion, deepseq, directory, filepath, hspec, JuicyPixels - , netpbm, primitive, process, QuickCheck, repa, repa-algorithms - , temporary, vector + ({ mkDerivation, array, base, bytestring, Chart, Chart-diagrams + , colour, criterion, deepseq, directory, filepath, hspec + , hspec-discover, JuicyPixels, netpbm, primitive, process + , QuickCheck, random, repa, repa-algorithms, temporary, vector }: mkDerivation { pname = "hip"; - version = "1.5.3.0"; - sha256 = "07jgqz5dz8qk96xz0q92hpn172jaqivfmn0mrynhicmvkx7a7izr"; + version = "1.5.4.0"; + sha256 = "09vv9zshgy6g9333pyny5lcja8662rxnldg1m0vvfiywcjafbn14"; libraryHaskellDepends = [ - base bytestring Chart Chart-diagrams colour deepseq directory - filepath JuicyPixels netpbm primitive process repa temporary vector + array base bytestring Chart Chart-diagrams colour deepseq directory + filepath JuicyPixels netpbm primitive process random repa temporary + vector ]; testHaskellDepends = [ base bytestring hspec QuickCheck ]; + testToolDepends = [ hspec-discover ]; benchmarkHaskellDepends = [ base criterion deepseq repa repa-algorithms vector ]; @@ -120183,6 +120605,8 @@ self: { pname = "hlrdb"; version = "0.3.0.0"; sha256 = "0pc3hqi6v9b78fijisnarfs59w6mw8jgyww25r1wmblgwyakl5ab"; + revision = "1"; + editedCabalFile = "1ycglx3b5n1l97pq0rd50wd313gwz1is10snf8s0c9bjlrzspbn5"; libraryHaskellDepends = [ base base64-bytestring bytestring cryptonite hashable hedis hlrdb-core memory random store time unordered-containers @@ -122280,6 +122704,40 @@ self: { broken = true; }) {}; + "hopenpgp-tools_0_22" = callPackage + ({ mkDerivation, aeson, alex, array, attoparsec, base + , base16-bytestring, binary, binary-conduit, bytestring, conduit + , conduit-extra, containers, crypto-pubkey, cryptohash, cryptonite + , directory, errors, fgl, graphviz, happy, hOpenPGP, http-client + , http-client-tls, http-types, ixset-typed, lens, monad-loops, mtl + , openpgp-asciiarmor, optparse-applicative, prettyprinter + , prettyprinter-ansi-terminal, prettyprinter-convert-ansi-wl-pprint + , resourcet, text, time, time-locale-compat, transformers + , unordered-containers, vector, yaml + }: + mkDerivation { + pname = "hopenpgp-tools"; + version = "0.22"; + sha256 = "1rcjwbnns5fj8x9sgyjlpjda2srmcixvdlmia4nid5nq01clc0c4"; + isLibrary = false; + isExecutable = true; + executableHaskellDepends = [ + aeson array attoparsec base base16-bytestring binary binary-conduit + bytestring conduit conduit-extra containers crypto-pubkey + cryptohash cryptonite directory errors fgl graphviz hOpenPGP + http-client http-client-tls http-types ixset-typed lens monad-loops + mtl openpgp-asciiarmor optparse-applicative prettyprinter + prettyprinter-ansi-terminal prettyprinter-convert-ansi-wl-pprint + resourcet text time time-locale-compat transformers + unordered-containers vector yaml + ]; + executableToolDepends = [ alex happy ]; + description = "hOpenPGP-based command-line tools"; + license = stdenv.lib.licenses.agpl3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; + }) {}; + "hopenssl" = callPackage ({ mkDerivation, base, bytestring, HUnit, openssl }: mkDerivation { @@ -123757,8 +124215,8 @@ self: { }: mkDerivation { pname = "hreq-client"; - version = "0.1.0.0"; - sha256 = "0slvpkypfxk4szrls0jsbjn00izgslskzixn9i2fq108wadm0b1b"; + version = "0.1.1.0"; + sha256 = "0bx4vhvwh4arkp5ly6clj55dmai3npl2p87l64radhyqr9z0il24"; isLibrary = true; isExecutable = true; setupHaskellDepends = [ base Cabal cabal-doctest ]; @@ -123774,6 +124232,8 @@ self: { testToolDepends = [ hspec-discover ]; description = "A Type dependent Highlevel HTTP client library"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "hreq-conduit" = callPackage @@ -123798,6 +124258,8 @@ self: { testToolDepends = [ hspec-discover markdown-unlit ]; description = "Conduit streaming support for Hreq"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "hreq-core" = callPackage @@ -123808,8 +124270,8 @@ self: { }: mkDerivation { pname = "hreq-core"; - version = "0.1.0.0"; - sha256 = "0ndbwdfcs89n8k96h2piw9n2hs0dbpp8vr7kpzdavaji0jzg0w20"; + version = "0.1.1.0"; + sha256 = "0lc1bc3kr3j6rkrz9w0s5aqb5bb60xhafg1v02n7vcyishdh2iwl"; setupHaskellDepends = [ base Cabal cabal-doctest ]; libraryHaskellDepends = [ aeson attoparsec base base-compat bytestring containers exceptions @@ -123818,6 +124280,8 @@ self: { testHaskellDepends = [ base doctest ]; description = "Core functionality for Hreq Http client library"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "hrfsize" = callPackage @@ -126224,8 +126688,8 @@ self: { }: mkDerivation { pname = "hsinspect"; - version = "0.0.7"; - sha256 = "0vwhxlycvmyczd412llpsjfl63f58bz4ad4fbhiiqw754d7qwaka"; + version = "0.0.8"; + sha256 = "1lqczihv7qjh1yy51qds4sg95riwaq1i0fd9mgn3kvhgbyx1r9nn"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -126887,6 +127351,17 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "hspec-bracket" = callPackage + ({ mkDerivation, base, hspec }: + mkDerivation { + pname = "hspec-bracket"; + version = "0.0.1.0"; + sha256 = "1d6262frfaghmq77nqsvcalm6w4jl7bn995bkphx461skhm8n300"; + libraryHaskellDepends = [ base hspec ]; + description = "The bracket definitions for Hspec"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "hspec-checkers" = callPackage ({ mkDerivation, base, checkers, hspec }: mkDerivation { @@ -128436,8 +128911,8 @@ self: { }: mkDerivation { pname = "hsx2hs"; - version = "0.14.1.5"; - sha256 = "0cw66j3firzgg5c7689y0kffgfq36yn4y17yprbbgv6kw4g7wid4"; + version = "0.14.1.6"; + sha256 = "09qynnmy5pq7yl8zic91wysrvjb1a1ibcjc9ry458wgbz236br4n"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -129185,35 +129660,6 @@ self: { "http-api-data" = callPackage ({ mkDerivation, attoparsec, attoparsec-iso8601, base, base-compat - , bytestring, Cabal, cabal-doctest, containers, cookie, directory - , doctest, filepath, hashable, hspec, hspec-discover, http-types - , HUnit, nats, QuickCheck, quickcheck-instances, tagged, text - , time-compat, unordered-containers, uuid-types - }: - mkDerivation { - pname = "http-api-data"; - version = "0.4.1"; - sha256 = "1ps4bvln43gz72dr9mc3c9n1rn38c4rz6m49vxzz9nz6jz1978rv"; - revision = "2"; - editedCabalFile = "14gvcqdxxs9s74r73i5f5g2819dfyp05m0p4s729ynwm7c20fzfs"; - setupHaskellDepends = [ base Cabal cabal-doctest ]; - libraryHaskellDepends = [ - attoparsec attoparsec-iso8601 base base-compat bytestring - containers cookie hashable http-types tagged text time-compat - unordered-containers uuid-types - ]; - testHaskellDepends = [ - base base-compat bytestring cookie directory doctest filepath hspec - HUnit nats QuickCheck quickcheck-instances text time-compat - unordered-containers uuid-types - ]; - testToolDepends = [ hspec-discover ]; - description = "Converting to/from HTTP API data like URL pieces, headers and query parameters"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "http-api-data_0_4_1_1" = callPackage - ({ mkDerivation, attoparsec, attoparsec-iso8601, base, base-compat , bytestring, containers, cookie, hashable, hspec, hspec-discover , http-types, HUnit, nats, QuickCheck, quickcheck-instances, tagged , text, time-compat, unordered-containers, uuid-types @@ -129235,7 +129681,6 @@ self: { testToolDepends = [ hspec-discover ]; description = "Converting to/from HTTP API data like URL pieces, headers and query parameters"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "http-attoparsec" = callPackage @@ -130377,6 +130822,8 @@ self: { ]; description = "Encoders based on `proto3-wire` for gRPC over HTTP2"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "http2-grpc-types" = callPackage @@ -131310,6 +131757,29 @@ self: { broken = true; }) {}; + "hw-bits_0_7_0_9" = callPackage + ({ mkDerivation, base, bytestring, criterion, deepseq, hedgehog + , hspec, hspec-discover, hw-hspec-hedgehog, hw-int, hw-prim + , hw-string-parse, vector + }: + mkDerivation { + pname = "hw-bits"; + version = "0.7.0.9"; + sha256 = "0k10r3xyk030h4j9mv7wksglwqm5i3jhfzm7fy6qw0ddqp59nynq"; + libraryHaskellDepends = [ + base bytestring deepseq hw-int hw-prim hw-string-parse vector + ]; + testHaskellDepends = [ + base bytestring hedgehog hspec hw-hspec-hedgehog hw-prim vector + ]; + testToolDepends = [ hspec-discover ]; + benchmarkHaskellDepends = [ base criterion vector ]; + description = "Bit manipulation"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; + }) {}; + "hw-ci-assist" = callPackage ({ mkDerivation, base, hedgehog, hspec, hspec-discover, hw-hedgehog , hw-hspec-hedgehog, optparse-applicative @@ -131546,6 +132016,8 @@ self: { pname = "hw-eliasfano"; version = "0.1.1.1"; sha256 = "0fmbcddw13m49xvw8gnpjh246mw4k9h3hr94k956bi1vdvywyqv7"; + revision = "1"; + editedCabalFile = "1i5in5h9jnx4p873qv80jmdd1ak6yyyf70002j3lhxyaxx9byy7k"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -132094,8 +132566,8 @@ self: { }: mkDerivation { pname = "hw-prim"; - version = "0.6.2.38"; - sha256 = "0669dkpwax4nh66c2ll4lb0fvzqhvpvirwnbzzskvykqkq1sj3kr"; + version = "0.6.2.39"; + sha256 = "06f4ygwmfb3ambzw972cninj9v0i7pir97qq0832a1mb19h4222g"; libraryHaskellDepends = [ base bytestring deepseq ghc-prim mmap semigroups transformers unliftio-core vector @@ -132388,25 +132860,26 @@ self: { }: mkDerivation { pname = "hw-xml"; - version = "0.4.0.2"; - sha256 = "122viqivv2csgrv144xc88xhafiq5vcsy545jpmg052d3kg1x4g2"; + version = "0.5.0.0"; + sha256 = "0cqrs19bd9yh67yczhhb1yf5dhcx2v6xikybd88vqwxdh51pxyyn"; isLibrary = true; isExecutable = true; enableSeparateDataOutput = true; libraryHaskellDepends = [ ansi-wl-pprint array attoparsec base bytestring cereal containers deepseq ghc-prim hw-balancedparens hw-bits hw-parser hw-prim - hw-rankselect hw-rankselect-base lens mmap mtl resourcet + hw-rankselect hw-rankselect-base lens mmap mtl resourcet text transformers vector word8 ]; executableHaskellDepends = [ - attoparsec base bytestring generic-lens hw-balancedparens hw-bits - hw-prim hw-rankselect lens mmap mtl optparse-applicative resourcet - text vector + attoparsec base bytestring deepseq generic-lens hw-balancedparens + hw-bits hw-prim hw-rankselect lens mmap mtl optparse-applicative + resourcet text vector ]; testHaskellDepends = [ attoparsec base bytestring hedgehog hspec hw-balancedparens hw-bits - hw-hspec-hedgehog hw-prim hw-rankselect hw-rankselect-base vector + hw-hspec-hedgehog hw-prim hw-rankselect hw-rankselect-base text + vector ]; testToolDepends = [ hspec-discover ]; benchmarkHaskellDepends = [ @@ -136173,6 +136646,26 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "inflections_0_4_0_5" = callPackage + ({ mkDerivation, base, containers, exceptions, hspec + , hspec-megaparsec, megaparsec, QuickCheck, text + , unordered-containers + }: + mkDerivation { + pname = "inflections"; + version = "0.4.0.5"; + sha256 = "0fdq3iwa2vgb5k19ck6jxzh7f1xsf1kpwx4p3agpdpsrylrcanvb"; + libraryHaskellDepends = [ + base exceptions megaparsec text unordered-containers + ]; + testHaskellDepends = [ + base containers hspec hspec-megaparsec megaparsec QuickCheck text + ]; + description = "Inflections library for Haskell"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "inflist" = callPackage ({ mkDerivation, base, QuickCheck }: mkDerivation { @@ -136415,16 +136908,16 @@ self: { license = stdenv.lib.licenses.mit; }) {}; - "inline-c_0_8_0_1" = callPackage + "inline-c_0_9_0_0" = callPackage ({ mkDerivation, ansi-wl-pprint, base, bytestring, containers , hashable, hspec, mtl, parsec, parsers, QuickCheck, raw-strings-qq - , regex-posix, template-haskell, transformers, unordered-containers - , vector + , regex-posix, split, template-haskell, transformers + , unordered-containers, vector }: mkDerivation { pname = "inline-c"; - version = "0.8.0.1"; - sha256 = "1w8njc8k1g8kmpk8c8q5p7m8adgpv5v4k4643hsi5422jdaq0g3i"; + version = "0.9.0.0"; + sha256 = "086kqca1vcxhi7wdzmdv3rjwh9k50k3wj4rzig1yjz3x12d0h6q6"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -136433,7 +136926,7 @@ self: { ]; testHaskellDepends = [ ansi-wl-pprint base containers hashable hspec parsers QuickCheck - raw-strings-qq regex-posix template-haskell transformers + raw-strings-qq regex-posix split template-haskell transformers unordered-containers vector ]; description = "Write Haskell source files including C code inline. No FFI required."; @@ -136470,6 +136963,25 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "inline-c-cpp_0_4_0_0" = callPackage + ({ mkDerivation, base, containers, hspec, inline-c, safe-exceptions + , template-haskell + }: + mkDerivation { + pname = "inline-c-cpp"; + version = "0.4.0.0"; + sha256 = "10d0yxs3jfkws440wzxrzwcyxjszv8c3f45hbfmj5ln0b0hpfrq0"; + libraryHaskellDepends = [ + base containers inline-c safe-exceptions template-haskell + ]; + testHaskellDepends = [ + base containers hspec inline-c safe-exceptions + ]; + description = "Lets you embed C++ code into Haskell"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "inline-c-win32" = callPackage ({ mkDerivation, base, containers, inline-c, template-haskell , Win32 @@ -136576,6 +137088,30 @@ self: { "insert-ordered-containers" = callPackage ({ mkDerivation, aeson, base, base-compat, hashable, lens + , QuickCheck, semigroupoids, semigroups, tasty, tasty-quickcheck + , text, transformers, unordered-containers + }: + mkDerivation { + pname = "insert-ordered-containers"; + version = "0.2.2"; + sha256 = "1ikjhg0pdfpnx1d645r92k2dwlk7y935j1w5lcsk23nzpwhbkxja"; + revision = "1"; + editedCabalFile = "1hlinc8nnjlzc6ds3wf8jvkihpcbhz2dk0rqxq1ns0c5zbbhnylq"; + libraryHaskellDepends = [ + aeson base base-compat hashable lens semigroupoids semigroups text + transformers unordered-containers + ]; + testHaskellDepends = [ + aeson base base-compat hashable lens QuickCheck semigroupoids + semigroups tasty tasty-quickcheck text transformers + unordered-containers + ]; + description = "Associative containers retaining insertion order for traversals"; + license = stdenv.lib.licenses.bsd3; + }) {}; + + "insert-ordered-containers_0_2_3" = callPackage + ({ mkDerivation, aeson, base, base-compat, hashable, lens , optics-core, optics-extra, QuickCheck, semigroupoids, semigroups , tasty, tasty-quickcheck, text, transformers, unordered-containers }: @@ -136594,6 +137130,7 @@ self: { ]; description = "Associative containers retaining insertion order for traversals"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "inserts" = callPackage @@ -137534,6 +138071,29 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "intro_0_6_0_0" = callPackage + ({ mkDerivation, base, bytestring, containers, deepseq, dlist + , extra, hashable, lens, mtl, QuickCheck, safe, text, transformers + , unordered-containers, writer-cps-mtl + }: + mkDerivation { + pname = "intro"; + version = "0.6.0.0"; + sha256 = "11a9xnamk8n6fns86az1rhq2grx5173ywyby944jn2zvjkba7fkc"; + libraryHaskellDepends = [ + base bytestring containers deepseq dlist extra hashable mtl safe + text transformers unordered-containers writer-cps-mtl + ]; + testHaskellDepends = [ + base bytestring containers deepseq dlist extra hashable lens mtl + QuickCheck safe text transformers unordered-containers + writer-cps-mtl + ]; + description = "Safe and minimal prelude"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "intro-prelude" = callPackage ({ mkDerivation, intro }: mkDerivation { @@ -137637,6 +138197,8 @@ self: { pname = "invariant"; version = "0.5.3"; sha256 = "03245nhcqxx6b0yw81fzqaqd7cgllmx8awzhvs2xv7ys73pmsgnp"; + revision = "1"; + editedCabalFile = "0sjy375npw6lqcckhyicizzv91v8jh3ca5yjkygiaj22bw5k8c74"; libraryHaskellDepends = [ array base bifunctors comonad containers contravariant ghc-prim profunctors StateVar stm tagged template-haskell th-abstraction @@ -137873,8 +138435,8 @@ self: { pname = "io-streams-haproxy"; version = "1.0.1.0"; sha256 = "1dcn5hd4fiwyq7m01r6fi93vfvygca5s6mz87c78m0zyj29clkmp"; - revision = "1"; - editedCabalFile = "00zbqcxfkrxidrli5qd8jvdw0jkyvcb3bwv29w8nbk9cr8vmmfl3"; + revision = "2"; + editedCabalFile = "1pvw39f0vrzb5hdx6nqpdg4ccsxa59vwjspfjkh6vvw1zwmidgja"; libraryHaskellDepends = [ attoparsec base bytestring io-streams network transformers ]; @@ -138055,6 +138617,8 @@ self: { pname = "ip"; version = "1.7.0"; sha256 = "18m8586ns6kijvk8wwflkhr9apki1h0gd7rkxd4w6qq66x034hk2"; + revision = "1"; + editedCabalFile = "1yjz4822vq22zh8mb96ccplqmm6rxrvy334n34gwyq0cfddsilr0"; libraryHaskellDepends = [ aeson attoparsec base byteslice bytesmith bytestring deepseq hashable natural-arithmetic primitive small-bytearray-builder text @@ -138106,8 +138670,8 @@ self: { ({ mkDerivation, base, binary, bytestring, iproute }: mkDerivation { pname = "ip2proxy"; - version = "2.1.0"; - sha256 = "0qcmqy8p13hg9aih8m9w7qpbr6zcbvgc9y6bzh2cqm2sbx7ksvqm"; + version = "2.2.0"; + sha256 = "12j8jd0ir24xgghvmac2npf9zqfbfq7fwj1ni2xdi8p673k3d0kd"; libraryHaskellDepends = [ base binary bytestring iproute ]; description = "IP2Proxy Haskell package for proxy detection"; license = stdenv.lib.licenses.mit; @@ -138274,6 +138838,26 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "iproute_1_7_8" = callPackage + ({ mkDerivation, appar, base, byteorder, containers, doctest, hspec + , network, QuickCheck, safe + }: + mkDerivation { + pname = "iproute"; + version = "1.7.8"; + sha256 = "0k2qzdw36qp9qs2j0bxsn95ymk3wpjvw6s5c1535aw677gw19bad"; + libraryHaskellDepends = [ + appar base byteorder containers network + ]; + testHaskellDepends = [ + appar base byteorder containers doctest hspec network QuickCheck + safe + ]; + description = "IP Routing Table"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "iptables-helpers" = callPackage ({ mkDerivation, base, containers, mtl, parsec, QuickCheck, safe , syb, utf8-string @@ -140363,6 +140947,21 @@ self: { broken = true; }) {}; + "jira-wiki-markup" = callPackage + ({ mkDerivation, base, parsec, tasty, tasty-hunit, text }: + mkDerivation { + pname = "jira-wiki-markup"; + version = "0.1.1"; + sha256 = "1a6vk4aryppay87fyirxprwklqvpjh6nj9x2k9s3ybrwhapf1wdx"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ base parsec text ]; + executableHaskellDepends = [ base text ]; + testHaskellDepends = [ base parsec tasty tasty-hunit text ]; + description = "Handle Jira wiki markup"; + license = stdenv.lib.licenses.mit; + }) {}; + "jmacro" = callPackage ({ mkDerivation, aeson, base, bytestring, containers , haskell-src-exts, haskell-src-meta, mtl, parseargs, parsec @@ -140639,36 +141238,6 @@ self: { }: mkDerivation { pname = "jose"; - version = "0.8.1.0"; - sha256 = "02xg8axy6whbkn0mzg1gjy6b1mhxlmsh1x7vjk1fiawvg9nwzrkl"; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ - aeson attoparsec base base64-bytestring bytestring concise - containers cryptonite lens memory monad-time mtl network-uri - QuickCheck quickcheck-instances safe semigroups template-haskell - text time unordered-containers vector x509 - ]; - testHaskellDepends = [ - aeson attoparsec base base64-bytestring bytestring concise - containers cryptonite hspec lens memory monad-time mtl network-uri - QuickCheck quickcheck-instances safe semigroups tasty tasty-hspec - tasty-quickcheck template-haskell text time unordered-containers - vector x509 - ]; - description = "Javascript Object Signing and Encryption and JSON Web Token library"; - license = stdenv.lib.licenses.asl20; - }) {}; - - "jose_0_8_2_0" = callPackage - ({ mkDerivation, aeson, attoparsec, base, base64-bytestring - , bytestring, concise, containers, cryptonite, hspec, lens, memory - , monad-time, mtl, network-uri, QuickCheck, quickcheck-instances - , safe, semigroups, tasty, tasty-hspec, tasty-quickcheck - , template-haskell, text, time, unordered-containers, vector, x509 - }: - mkDerivation { - pname = "jose"; version = "0.8.2.0"; sha256 = "0kv2kmws9kwymx8pm6j8nnlk1d8pwv22hw2ka2kwlipjvmb7mld4"; isLibrary = true; @@ -140688,7 +141257,6 @@ self: { ]; description = "Javascript Object Signing and Encryption and JSON Web Token library"; license = stdenv.lib.licenses.asl20; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "jose-jwt" = callPackage @@ -141559,8 +142127,8 @@ self: { pname = "json-rpc-server"; version = "0.2.6.0"; sha256 = "1xfcxbwri9a5p3xxbc4kvr1kqdnm4c1axd8kgb8dglabffbrk7hn"; - revision = "6"; - editedCabalFile = "1rfabr679pk605v141gm0ynbp3l6x87s3ip3wa49lwnpab495mxs"; + revision = "7"; + editedCabalFile = "1fjkl0p5glkk01jny6ar62356pmp2a2vf9v1jq67ly3y14dcvywq"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -142468,6 +143036,8 @@ self: { testHaskellDepends = [ base hw-kafka-client monad-parallel text ]; description = "Synchronous Kafka Client"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "kafka-device" = callPackage @@ -143816,8 +144386,8 @@ self: { pname = "keycode"; version = "0.2.2"; sha256 = "046k8d1h5wwadf5z4pppjkc3g7v2zxlzb06s1xgixc42y5y41yan"; - revision = "4"; - editedCabalFile = "081spzhywygv90i7jwhbcm7p1aqz6qqph02ddxvqncghar5kjc7n"; + revision = "5"; + editedCabalFile = "17fhzhlbqgd5pqp357n3z0k176q79c2jxvpwqryl3gbad3s8qsfw"; libraryHaskellDepends = [ base containers ghc-prim template-haskell ]; @@ -144281,15 +144851,17 @@ self: { "knead" = callPackage ({ mkDerivation, base, bool8, comfort-array, llvm-extra, llvm-tf - , storable-record, storable-tuple, tfp, transformers, utility-ht + , prelude-compat, storable-enum, storable-record, storable-tuple + , tagged, tfp, transformers, utility-ht }: mkDerivation { pname = "knead"; - version = "0.4"; - sha256 = "1p1zfa2mihy2di5wjb189mdq6kygr47y19194ycxdx47sh8y6s6y"; + version = "0.4.1"; + sha256 = "07jjs6qx58whwh61n4avrbi6krpl3qawx3mp8wacbjyrjfskcyln"; libraryHaskellDepends = [ - base bool8 comfort-array llvm-extra llvm-tf storable-record - storable-tuple tfp transformers utility-ht + base bool8 comfort-array llvm-extra llvm-tf prelude-compat + storable-enum storable-record storable-tuple tagged tfp + transformers utility-ht ]; description = "Repa-like array processing using LLVM JIT"; license = stdenv.lib.licenses.bsd3; @@ -145123,8 +145695,8 @@ self: { }: mkDerivation { pname = "lambda-options"; - version = "1.0.0.0"; - sha256 = "1cpd5s0m10d09mqbpy1qxnrpy8np21ci6fcd09d01xj7lx8p2yzx"; + version = "1.0.2.0"; + sha256 = "04h7i79iiq91606x3k7zr2gs3f7apswwv9xxv5lf4qr1h3i4lfix"; libraryHaskellDepends = [ base containers funspection mtl read-bounded ]; @@ -147337,6 +147909,8 @@ self: { pname = "latex-formulae-hakyll"; version = "0.2.0.4"; sha256 = "0q16p3ccql38ri3rnbsx54vj6jn154j3m6vic64zi4nk54g0sc5f"; + revision = "1"; + editedCabalFile = "08502482n0szzg32bcrdyhs853hlmx3r14bpjww1fv2dijk5asrw"; libraryHaskellDepends = [ base hakyll latex-formulae-image latex-formulae-pandoc lrucache pandoc-types @@ -147355,6 +147929,8 @@ self: { pname = "latex-formulae-image"; version = "0.1.1.4"; sha256 = "0s3r0qd235lgmw4g5j52r2d97zsr3nd0ikzffgpwigvcbzshddv0"; + revision = "1"; + editedCabalFile = "0m15dyrxala5dh5sh228bsrfa3nym9wd719byj19vfl4i2nabw9d"; libraryHaskellDepends = [ base directory errors filepath JuicyPixels process temporary transformers @@ -150396,6 +150972,26 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "lift-generics_0_1_3" = callPackage + ({ mkDerivation, base, base-compat, generic-deriving, ghc-prim + , hspec, hspec-discover, template-haskell + }: + mkDerivation { + pname = "lift-generics"; + version = "0.1.3"; + sha256 = "0r2rbik5lh5x8psy5cblzd1ly1ybizdcyjdg8n79m7k3rqp2w6v7"; + libraryHaskellDepends = [ + base generic-deriving ghc-prim template-haskell + ]; + testHaskellDepends = [ + base base-compat generic-deriving hspec template-haskell + ]; + testToolDepends = [ hspec-discover ]; + description = "GHC.Generics-based Language.Haskell.TH.Syntax.lift implementation"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "lift-read-show" = callPackage ({ mkDerivation, base }: mkDerivation { @@ -152527,18 +153123,20 @@ self: { }) {}; "llvm-extra" = callPackage - ({ mkDerivation, base, bool8, containers, cpuid, llvm-tf, non-empty - , prelude-compat, tfp, transformers, unsafe, utility-ht + ({ mkDerivation, base, bool8, containers, cpuid, enumset, llvm-tf + , non-empty, prelude-compat, storable-enum, tagged, tfp + , transformers, unsafe, utility-ht }: mkDerivation { pname = "llvm-extra"; - version = "0.8.0.3"; - sha256 = "1cqxfrjhfgliwxjgbmjkbpcy4dlv0fwwqzdd9jd8fiq96njfqfvp"; + version = "0.8.2"; + sha256 = "0fv2q05w86xqak5b8w26iy9szzc6khghc622dgqkjywd9b72xs1s"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ - base bool8 containers cpuid llvm-tf non-empty prelude-compat tfp - transformers unsafe utility-ht + base bool8 containers cpuid enumset llvm-tf non-empty + prelude-compat storable-enum tagged tfp transformers unsafe + utility-ht ]; description = "Utility functions for the llvm interface"; license = stdenv.lib.licenses.bsd3; @@ -152550,8 +153148,8 @@ self: { ({ mkDerivation, base, enumset, LLVM }: mkDerivation { pname = "llvm-ffi"; - version = "3.8.1.2"; - sha256 = "04k2ag8nh54f9hh3blgyn1xa88hfv6c6ps51i5b84g4jdvja7f5v"; + version = "3.9.1"; + sha256 = "0gyda3bh43iib5isp6fd0rsf1rxkgidnmxrdm31xwjc0qnz71yf2"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base enumset ]; @@ -152855,8 +153453,8 @@ self: { }: mkDerivation { pname = "llvm-tf"; - version = "3.1.1.1"; - sha256 = "1rqszg06r8md7cgw2zgf30yvri4isndj608r9l8grqfnyi4lfjay"; + version = "3.1.2"; + sha256 = "0k5aj63hl78h8lkxizragvgh57yzzc5ns7h8kz93wicsdxaca8cn"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -153356,6 +153954,30 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "log-domain_0_13" = callPackage + ({ mkDerivation, base, binary, bytes, Cabal, cabal-doctest, cereal + , comonad, deepseq, distributive, doctest, generic-deriving + , hashable, semigroupoids, semigroups, simple-reflect, vector + }: + mkDerivation { + pname = "log-domain"; + version = "0.13"; + sha256 = "0isl8rs0k5088sxapfh351sff3lh7r1qkgwz8lmai3gvqasb3avv"; + revision = "1"; + editedCabalFile = "0wcy54axpnym55f1skagnbmdpw6y2ys6zvn99x8i6qcfzw00i6l9"; + setupHaskellDepends = [ base Cabal cabal-doctest ]; + libraryHaskellDepends = [ + base binary bytes cereal comonad deepseq distributive hashable + semigroupoids semigroups vector + ]; + testHaskellDepends = [ + base doctest generic-deriving semigroups simple-reflect + ]; + description = "Log-domain arithmetic"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "log-effect" = callPackage ({ mkDerivation, base, bytestring, extensible-effects , monad-control, text, transformers-base @@ -153636,29 +154258,6 @@ self: { }: mkDerivation { pname = "logging-effect"; - version = "1.3.7"; - sha256 = "1m8f9s6v1xxfp3li1yjfwdhn2an29lk07ijqcrb1db8chrlx93vd"; - libraryHaskellDepends = [ - async base exceptions free monad-control mtl prettyprinter - semigroups stm stm-delay text time transformers transformers-base - unliftio-core - ]; - benchmarkHaskellDepends = [ - base bytestring criterion fast-logger lifted-async monad-logger - prettyprinter text time - ]; - description = "A mtl-style monad transformer for general purpose & compositional logging"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "logging-effect_1_3_8" = callPackage - ({ mkDerivation, async, base, bytestring, criterion, exceptions - , fast-logger, free, lifted-async, monad-control, monad-logger, mtl - , prettyprinter, semigroups, stm, stm-delay, text, time - , transformers, transformers-base, unliftio-core - }: - mkDerivation { - pname = "logging-effect"; version = "1.3.8"; sha256 = "0ksavyvcz0c9fadik9yksm4zskzh313srf3713migwrdza5ci5q3"; libraryHaskellDepends = [ @@ -153672,7 +154271,6 @@ self: { ]; description = "A mtl-style monad transformer for general purpose & compositional logging"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "logging-effect-extra" = callPackage @@ -154498,8 +155096,8 @@ self: { }: mkDerivation { pname = "lp-diagrams"; - version = "2.1.1"; - sha256 = "0dynm0kib4lgyz00gbg4gi0ds5cgpbdx40davk53cknwxv7icri0"; + version = "2.1.2"; + sha256 = "0q0qzij6j0nv01hhrd417swyyf5vhgi2m83bmk98dvrd0309l9xl"; libraryHaskellDepends = [ base containers gasp graphviz labeled-tree lens mtl parsek polynomials-bernstein process reflection text typography-geometry @@ -154627,7 +155225,7 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "lsp-test_0_8_0_0" = callPackage + "lsp-test_0_8_2_0" = callPackage ({ mkDerivation, aeson, aeson-pretty, ansi-terminal, async, base , bytestring, conduit, conduit-parse, containers, data-default , Diff, directory, filepath, haskell-lsp, hspec, lens, mtl @@ -154636,8 +155234,8 @@ self: { }: mkDerivation { pname = "lsp-test"; - version = "0.8.0.0"; - sha256 = "1w8ag6v8mdgxynz32nzxmvfaar68abmsh3fchdfbhz2ky07p6085"; + version = "0.8.2.0"; + sha256 = "1762avrs4fkkd9v8i76giaf6km5f3lds5laickn7la7zq7ysh8a3"; libraryHaskellDepends = [ aeson aeson-pretty ansi-terminal async base bytestring conduit conduit-parse containers data-default Diff directory filepath @@ -155032,8 +155630,8 @@ self: { }: mkDerivation { pname = "lukko"; - version = "0.1.1"; - sha256 = "1wy2dqs304cynsgnwpc47fwnm9gcy7ch53xxhj5schc0kak3xxbq"; + version = "0.1.1.1"; + sha256 = "13wf2vgi3bq48h757qs0zi1sxa6ip9pk8fxfiq7qrrb9p5silcpj"; libraryHaskellDepends = [ base ]; testHaskellDepends = [ async base bytestring filepath singleton-bool tasty @@ -156788,8 +157386,8 @@ self: { }: mkDerivation { pname = "mandrill"; - version = "0.5.3.6"; - sha256 = "1jvgxhc3x7867cryvsbpj7hks9syhpqbwyh4y0v6b0yp0xil8qrl"; + version = "0.5.4.0"; + sha256 = "0cp0xd4by5ml1526lybqvxr1g5ccgskmj9ibl3xnrcmkbi9a14y6"; libraryHaskellDepends = [ aeson base base64-bytestring blaze-html bytestring containers email-validate http-client http-client-tls http-types microlens-th @@ -156996,8 +157594,8 @@ self: { pname = "map-syntax"; version = "0.3"; sha256 = "0b3ddi998saw5gi5r4bjbpid03rxlifn08zv15wf0b90ambhcc4k"; - revision = "1"; - editedCabalFile = "1qfjficc7b6hbg44r3czk8iqgkjmgnp14wmzcdcz4ai93kx8dp44"; + revision = "2"; + editedCabalFile = "1cpiarychx4cmv7v71rbd5ccfsjac928isd52sf42mzs2nb492ya"; libraryHaskellDepends = [ base containers mtl ]; testHaskellDepends = [ base containers deepseq hspec HUnit mtl QuickCheck transformers @@ -157494,8 +158092,8 @@ self: { }: mkDerivation { pname = "marxup"; - version = "3.1.1.0"; - sha256 = "0b22mf14qajkpf7hlm6086d951g0wgihlyiw93m0nh4yl1kmgf5q"; + version = "3.1.2.0"; + sha256 = "0a6lfjh5brkjm66y4yizzskra4007shqnsb5bjljxwg0vwphp112"; isLibrary = true; isExecutable = true; enableSeparateDataOutput = true; @@ -157557,32 +158155,43 @@ self: { ]; description = "Massiv (Массив) is an Array Library"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; - "massiv-io" = callPackage - ({ mkDerivation, base, bytestring, data-default-class, deepseq - , directory, filepath, JuicyPixels, massiv, netpbm, process, vector + "massiv_0_4_4_0" = callPackage + ({ mkDerivation, base, bytestring, Cabal, cabal-doctest + , data-default-class, deepseq, doctest, exceptions + , mersenne-random-pure64, primitive, QuickCheck, random, scheduler + , splitmix, template-haskell, unliftio-core, vector }: mkDerivation { - pname = "massiv-io"; - version = "0.1.7.0"; - sha256 = "0w3yffkrsjkgfqdfmhq42am2hpmkblnfg0prifr2ja5pfwr02l5c"; + pname = "massiv"; + version = "0.4.4.0"; + sha256 = "13hwf1z9iqybrjsn21gkglqq3knin6x84rflv3wk6wplk7dfhd2n"; + setupHaskellDepends = [ base Cabal cabal-doctest ]; libraryHaskellDepends = [ - base bytestring data-default-class deepseq directory filepath - JuicyPixels massiv netpbm process vector + base bytestring data-default-class deepseq exceptions primitive + scheduler unliftio-core vector ]; - description = "Import/export of Image files into massiv Arrays"; + testHaskellDepends = [ + base doctest mersenne-random-pure64 QuickCheck random splitmix + template-haskell + ]; + description = "Massiv (Массив) is an Array Library"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; - "massiv-io_0_1_8_0" = callPackage + "massiv-io" = callPackage ({ mkDerivation, base, bytestring, data-default-class, deepseq , directory, filepath, JuicyPixels, massiv, netpbm, process, vector }: mkDerivation { pname = "massiv-io"; - version = "0.1.8.0"; - sha256 = "0c67lcqgbzwxcpp3gp0x35f3njai1sgainwxhjckn9bjddad6vrq"; + version = "0.1.9.0"; + sha256 = "0splwbavahv3g0p1pyhym9hwncaw7zd5f12girwxlwhcdwrsgz3r"; libraryHaskellDepends = [ base bytestring data-default-class deepseq directory filepath JuicyPixels massiv netpbm process vector @@ -157590,6 +158199,7 @@ self: { description = "Import/export of Image files into massiv Arrays"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "massiv-scheduler" = callPackage @@ -157631,6 +158241,8 @@ self: { ]; description = "Library that contains generators, properties and tests for Massiv Array Library"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "master-plan" = callPackage @@ -157758,15 +158370,16 @@ self: { }) {}; "math-grads" = callPackage - ({ mkDerivation, aeson, array, base, containers, hspec, linear - , matrix, mtl, random, vector + ({ mkDerivation, aeson, array, base, bimap, containers, hspec + , ilist, lens, linear, matrix, mtl, random, vector }: mkDerivation { pname = "math-grads"; - version = "0.1.5.1"; - sha256 = "0bq08gh1fv83glx4i2gs560cynl2dv1610kby7vlvjnhg0kkyjgl"; + version = "0.1.6.2"; + sha256 = "02flkabfqwgmgcsrlxcfk9zm8b94l65imr3xprdap1g9z26si66l"; libraryHaskellDepends = [ - aeson array base containers linear matrix mtl random vector + aeson array base bimap containers ilist lens linear matrix mtl + random vector ]; testHaskellDepends = [ array base containers hspec random ]; description = "Library containing graph data structures and graph algorithms"; @@ -161075,8 +161688,8 @@ self: { }: mkDerivation { pname = "mini-egison"; - version = "0.1.5"; - sha256 = "19g5743q2h0vr9r7m854pi60r6z7f8cqr3l3fqi4b308jb492ngq"; + version = "0.1.6"; + sha256 = "08348nw7xnni81iwcah43x5hi0hyqz286g3zpmkhja8if99l59lj"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -161150,8 +161763,8 @@ self: { }: mkDerivation { pname = "minilight"; - version = "0.4.0"; - sha256 = "1ishxvijigfjfvrqiibbds2l7bb5vp51lsy933q4nphapvqrhk2m"; + version = "0.4.1"; + sha256 = "0zx21dhnzc8p0x6v827178rl2s215gik705fggmg31hqhwkzfy4c"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -161631,15 +162244,15 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "miso_1_3_0_0" = callPackage + "miso_1_4_0_0" = callPackage ({ mkDerivation, aeson, base, bytestring, containers, http-api-data , http-types, lucid, network-uri, servant, servant-lucid, text , transformers, vector }: mkDerivation { pname = "miso"; - version = "1.3.0.0"; - sha256 = "1vz7k7ajngmrzczw4bl33g081hbmbk1bkixsm47y4x8jzxa0lk7x"; + version = "1.4.0.0"; + sha256 = "067z49ial3dwkbcza54aivdh8r4yx54zmpyxmd6mpyqlv96dv8gc"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -161992,6 +162605,34 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "mmark_0_0_7_2" = callPackage + ({ mkDerivation, aeson, base, case-insensitive, containers + , criterion, deepseq, dlist, email-validate, foldl, hashable, hspec + , hspec-megaparsec, html-entity-map, lucid, megaparsec, microlens + , microlens-th, modern-uri, mtl, parser-combinators, QuickCheck + , text, text-metrics, unordered-containers, weigh, yaml + }: + mkDerivation { + pname = "mmark"; + version = "0.0.7.2"; + sha256 = "1wwszzba6fvg0r4q5z2dzashim0nkaxzx4rmjl216kdi08jkp7mm"; + enableSeparateDataOutput = true; + libraryHaskellDepends = [ + aeson base case-insensitive containers deepseq dlist email-validate + foldl hashable html-entity-map lucid megaparsec microlens + microlens-th modern-uri mtl parser-combinators text text-metrics + unordered-containers yaml + ]; + testHaskellDepends = [ + aeson base foldl hspec hspec-megaparsec lucid megaparsec modern-uri + QuickCheck text + ]; + benchmarkHaskellDepends = [ base criterion text weigh ]; + description = "Strict markdown processor for writers"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "mmark-cli" = callPackage ({ mkDerivation, aeson, base, bytestring, directory , ghc-syntax-highlighter, gitrev, lucid, megaparsec, mmark @@ -162002,8 +162643,8 @@ self: { pname = "mmark-cli"; version = "0.0.5.0"; sha256 = "15qrp2q1flx9csqvj8zx9w1jqg8pwfi0v7wpia7n7vg09jgydhby"; - revision = "1"; - editedCabalFile = "11yrsr4hpl5vxrfav1nfg3gidcr1qy0rjv5mkh5hqsxdpxy6c7aj"; + revision = "2"; + editedCabalFile = "1kpxrf3gwcl0l8jqq3dic49705p338rcvach95vp1g1jjpwd8kbj"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -162067,8 +162708,8 @@ self: { ({ mkDerivation, base, directory }: mkDerivation { pname = "mmsyn3"; - version = "0.1.2.0"; - sha256 = "1cjjdiyb1n5y5bswpm1lckqnn97lvn4mx8nrkydzsi1lfmxjvhk3"; + version = "0.1.3.0"; + sha256 = "0asxxv2ykwn82lr744ihfip8lhck888l3rvn4qadjdapv1sn3zfx"; libraryHaskellDepends = [ base directory ]; description = "A small library to deal with executable endings"; license = stdenv.lib.licenses.mit; @@ -162096,13 +162737,36 @@ self: { ({ mkDerivation, base }: mkDerivation { pname = "mmsyn5"; - version = "0.4.2.1"; - sha256 = "1cq8180xkq01jpqwiv6f7wiwyjhs76gh5a148hvxhffvfhnsarb8"; + version = "0.4.2.2"; + sha256 = "1y5f9fwc9k7hbmnk8fvm6m6h2lrdsfijr6jn0dfj6fhc17kmp46p"; libraryHaskellDepends = [ base ]; description = "Various additional operations on lists (some with intermediate Monads)"; license = stdenv.lib.licenses.mit; }) {}; + "mmsyn6ukr" = callPackage + ({ mkDerivation, base, bytestring, mmsyn2, mmsyn3, mmsyn5, process + , vector + }: + mkDerivation { + pname = "mmsyn6ukr"; + version = "0.3.2.0"; + sha256 = "1qv34s1aypm43xf51bf7mlp7jbkfcgsz8gil7xcly50is1a19z3n"; + isLibrary = true; + isExecutable = true; + enableSeparateDataOutput = true; + libraryHaskellDepends = [ + base bytestring mmsyn2 mmsyn3 mmsyn5 process vector + ]; + executableHaskellDepends = [ + base bytestring mmsyn2 mmsyn3 mmsyn5 process vector + ]; + description = "Can be used as a musical instrument synthesizer or for Ukrainian language listening"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; + }) {}; + "mmtf" = callPackage ({ mkDerivation, array, base, binary, bytestring, containers , data-msgpack, deepseq, hspec, http-conduit, QuickCheck, text @@ -163089,6 +163753,28 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "monad-logger_0_3_31" = callPackage + ({ mkDerivation, base, bytestring, conduit, conduit-extra + , exceptions, fast-logger, lifted-base, monad-control, monad-loops + , mtl, resourcet, stm, stm-chans, template-haskell, text + , transformers, transformers-base, transformers-compat + , unliftio-core + }: + mkDerivation { + pname = "monad-logger"; + version = "0.3.31"; + sha256 = "0awr06bh5d51kci2w2xsj34qvh98sb6dm48a4k05k8awv8hrrpmd"; + libraryHaskellDepends = [ + base bytestring conduit conduit-extra exceptions fast-logger + lifted-base monad-control monad-loops mtl resourcet stm stm-chans + template-haskell text transformers transformers-base + transformers-compat unliftio-core + ]; + description = "A class of monads which can log messages"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "monad-logger-json" = callPackage ({ mkDerivation, aeson, base, monad-logger, template-haskell, text }: @@ -163128,8 +163814,8 @@ self: { }: mkDerivation { pname = "monad-logger-syslog"; - version = "0.1.4.0"; - sha256 = "1jwwpjn35mvl7z05xcykpxdyhaa6mgiighgcr8qzprrmw89kwb05"; + version = "0.1.5.0"; + sha256 = "0y96f5qan5na32s8xilky7z30mc7yci1s5i3585aqvqsyyvshchf"; libraryHaskellDepends = [ base bytestring fast-logger hsyslog monad-logger text transformers ]; @@ -163137,14 +163823,14 @@ self: { license = stdenv.lib.licenses.mit; }) {}; - "monad-logger-syslog_0_1_5_0" = callPackage + "monad-logger-syslog_0_1_6_0" = callPackage ({ mkDerivation, base, bytestring, fast-logger, hsyslog , monad-logger, text, transformers }: mkDerivation { pname = "monad-logger-syslog"; - version = "0.1.5.0"; - sha256 = "0y96f5qan5na32s8xilky7z30mc7yci1s5i3585aqvqsyyvshchf"; + version = "0.1.6.0"; + sha256 = "1n4r0fl043r18683ym3k03sdm3b9wlxfzjgmnxi804kwna639rj3"; libraryHaskellDepends = [ base bytestring fast-logger hsyslog monad-logger text transformers ]; @@ -164489,16 +165175,14 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "monoidal-containers_0_6" = callPackage + "monoidal-containers_0_6_0_1" = callPackage ({ mkDerivation, aeson, base, containers, deepseq, hashable, lens , newtype, semialign, semigroups, these, unordered-containers }: mkDerivation { pname = "monoidal-containers"; - version = "0.6"; - sha256 = "1ii09s068g6bj2j10ig3g3ymv1ci6zg596pmmaw6als15j9bybc9"; - revision = "2"; - editedCabalFile = "17qv2kds7m4mi3r4rd89d2nhcjc06lzdfg93qsn6ldssnypq0rra"; + version = "0.6.0.1"; + sha256 = "1j5mfs0ysvwk3jsmq4hlj4l3kasfc28lk1b3xaymf9dw48ac5j82"; libraryHaskellDepends = [ aeson base containers deepseq hashable lens newtype semialign semigroups these unordered-containers @@ -164654,6 +165338,8 @@ self: { ]; description = "Month, YearMonth, Quarter, YearQuarter types"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "monus" = callPackage @@ -164887,22 +165573,23 @@ self: { "morpheus-graphql" = callPackage ({ mkDerivation, aeson, base, bytestring, containers, megaparsec , mtl, scientific, tasty, tasty-hunit, template-haskell, text - , transformers, unordered-containers, uuid, vector, websockets + , th-lift-instances, transformers, unordered-containers, uuid + , vector, websockets }: mkDerivation { pname = "morpheus-graphql"; - version = "0.6.2"; - sha256 = "160wg001xpwrhvv1wgdqbcwhdpxk4yhi0vf5sjyyzr0bq3j9x1dn"; + version = "0.7.1"; + sha256 = "1yh49icsq68xbw9gmvqssy4piaqb97cy39jg4a20360j9sfr87dp"; enableSeparateDataOutput = true; libraryHaskellDepends = [ aeson base bytestring containers megaparsec mtl scientific - template-haskell text transformers unordered-containers uuid vector - websockets + template-haskell text th-lift-instances transformers + unordered-containers uuid vector websockets ]; testHaskellDepends = [ aeson base bytestring containers megaparsec mtl scientific tasty - tasty-hunit template-haskell text transformers unordered-containers - uuid vector websockets + tasty-hunit template-haskell text th-lift-instances transformers + unordered-containers uuid vector websockets ]; description = "Morpheus GraphQL"; license = stdenv.lib.licenses.mit; @@ -164926,6 +165613,8 @@ self: { ]; description = "Morpheus GraphQL CLI"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "morphisms" = callPackage @@ -165082,6 +165771,8 @@ self: { ]; description = "General purpose migrations library"; license = stdenv.lib.licenses.asl20; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "moto-postgresql" = callPackage @@ -165097,6 +165788,8 @@ self: { ]; description = "PostgreSQL-based migrations registry for moto"; license = stdenv.lib.licenses.asl20; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "motor" = callPackage @@ -167472,6 +168165,18 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "mx-state-codes" = callPackage + ({ mkDerivation, aeson, base, hspec, QuickCheck, text }: + mkDerivation { + pname = "mx-state-codes"; + version = "1.0.0.0"; + sha256 = "1jxw7hh24rqs1c5y4b7bmllvcwq3gsrrn0rixq9lzhn2915ykaq6"; + libraryHaskellDepends = [ aeson base text ]; + testHaskellDepends = [ aeson base hspec QuickCheck text ]; + description = "ISO 3166-2:MX State Codes and Names"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "mxnet" = callPackage ({ mkDerivation, base, c2hs, c2hs-extra, mxnet, pretty, tasty , tasty-hunit, template-haskell, unordered-containers, vector @@ -168712,8 +169417,8 @@ self: { ({ mkDerivation, base }: mkDerivation { pname = "natural-arithmetic"; - version = "0.1.0.0"; - sha256 = "0h5ga04hw7v54xsxjj852238spl3px190g67qjqzxvnyn0f76jrp"; + version = "0.1.1.0"; + sha256 = "0n2330b2g4gy1ljpcww9vmj74ig23m0zxkg92721zpdfywlcy44g"; libraryHaskellDepends = [ base ]; description = "Arithmetic of natural numbers"; license = stdenv.lib.licenses.bsd3; @@ -169044,8 +169749,8 @@ self: { }: mkDerivation { pname = "neko-obfs"; - version = "0.1.0.2"; - sha256 = "1kqki738d7jfjgr0jcybs9w0fzccmdb1i64caanydpfn6x9rkiac"; + version = "0.1.0.4"; + sha256 = "1vffkpxxvxykrjy9awx0vqda6gbpmzz2ybr5ijmb47dl7mr7sl88"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -169289,8 +169994,8 @@ self: { }: mkDerivation { pname = "net-mqtt"; - version = "0.6.2.0"; - sha256 = "0mryfsjcvybfx7zrakn6h8hw2l8fdq7g194kmiy9xafkkgyza1pk"; + version = "0.6.2.1"; + sha256 = "09l9m213x1v7cvrfr039hg2c1pa4dknyhj827h9n0w9pawj61r55"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -169935,14 +170640,14 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "network_3_1_1_0" = callPackage + "network_3_1_1_1" = callPackage ({ mkDerivation, base, bytestring, deepseq, directory, hspec , hspec-discover, HUnit }: mkDerivation { pname = "network"; - version = "3.1.1.0"; - sha256 = "0gr99ksn7khijfjf0g4bkp13kb6jbxnq23b6pxflnvlsf5la8yks"; + version = "3.1.1.1"; + sha256 = "16ic2hgvadyiy0zfnyd2zknf8rxqmwzpy5mw5x9apwpzfc0mkvyp"; libraryHaskellDepends = [ base bytestring deepseq ]; testHaskellDepends = [ base bytestring directory hspec HUnit ]; testToolDepends = [ hspec-discover ]; @@ -170130,8 +170835,8 @@ self: { pname = "network-bsd"; version = "2.8.1.0"; sha256 = "0kid0811lv4x761fd5gv6lsc8p5j2bn41rfd366pjb642p562jfr"; - revision = "2"; - editedCabalFile = "1cqb720gl960zfzbzxakc2wvrvw8plncgarbb1v1hdzmdxw07js7"; + revision = "3"; + editedCabalFile = "1hc3jdbmpq2wxh82xfx452v2m2l97jbdaqqbmj5nz4lljxa2696r"; libraryHaskellDepends = [ base deepseq network ]; description = "POSIX network database (<netdb.h>) API"; license = stdenv.lib.licenses.bsd3; @@ -170173,6 +170878,19 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "network-byte-order_0_1_2_0" = callPackage + ({ mkDerivation, base, bytestring, doctest }: + mkDerivation { + pname = "network-byte-order"; + version = "0.1.2.0"; + sha256 = "1y2azf5zbydzvi4b0hxmy7am4kgpkq8ajnsbrpfrqz87b5y87ccy"; + libraryHaskellDepends = [ base bytestring ]; + testHaskellDepends = [ base bytestring doctest ]; + description = "Network byte order utilities"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "network-bytestring" = callPackage ({ mkDerivation, base, bytestring, network, unix }: mkDerivation { @@ -170429,22 +171147,6 @@ self: { }: mkDerivation { pname = "network-messagepack-rpc"; - version = "0.1.1.4"; - sha256 = "040kj2rs80kg7746rqrrsgpbi3vpbfg4c6r5n08nvqqslcx932xb"; - libraryHaskellDepends = [ - base bytestring data-msgpack safe-exceptions text - unordered-containers - ]; - description = "MessagePack RPC"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "network-messagepack-rpc_0_1_2_0" = callPackage - ({ mkDerivation, base, bytestring, data-msgpack, safe-exceptions - , text, unordered-containers - }: - mkDerivation { - pname = "network-messagepack-rpc"; version = "0.1.2.0"; sha256 = "118agkkbvfyynk6qg5yzazbs0s7w0bw9n0ndj8nm35yy6cil9lky"; libraryHaskellDepends = [ @@ -170453,7 +171155,6 @@ self: { ]; description = "MessagePack RPC"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "network-messagepack-rpc-websocket" = callPackage @@ -170463,8 +171164,8 @@ self: { }: mkDerivation { pname = "network-messagepack-rpc-websocket"; - version = "0.1.1.0"; - sha256 = "05cd6cqyydjwymnk8rscqngvz3knyibl674rcbjpz28him6gbc7d"; + version = "0.1.1.1"; + sha256 = "0adkav3nl7ghbx2r7dx83ki6m397clxaw37s54ivnkxydqscjv06"; libraryHaskellDepends = [ base network-messagepack-rpc text websockets wss-client ]; @@ -170729,6 +171430,25 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "network-simple-tls_0_4" = callPackage + ({ mkDerivation, base, bytestring, data-default, network + , network-simple, safe-exceptions, tls, tls-session-manager + , transformers, x509, x509-store, x509-system, x509-validation + }: + mkDerivation { + pname = "network-simple-tls"; + version = "0.4"; + sha256 = "0c5xxqp2xw1q046sngd5gnwp7gn0ima9wm8drxxry13l0i0bnmn1"; + libraryHaskellDepends = [ + base bytestring data-default network network-simple safe-exceptions + tls tls-session-manager transformers x509 x509-store x509-system + x509-validation + ]; + description = "Simple interface to TLS secured network sockets"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "network-simple-ws" = callPackage ({ mkDerivation, base, bytestring, case-insensitive, network-simple , safe-exceptions, websockets @@ -171350,6 +172070,8 @@ self: { pname = "newtype-generics"; version = "0.5.4"; sha256 = "0cprfg4n0z62cnix1qrbc79bfdd4s50b05fj9m9hk6vm1pc3szq0"; + revision = "1"; + editedCabalFile = "1id9a6prj2bzdsyfsfr0pnfy9p8v9wlw59x12fny6y2szfcxcrv7"; libraryHaskellDepends = [ base transformers ]; testHaskellDepends = [ base hspec ]; testToolDepends = [ hspec-discover ]; @@ -171763,26 +172485,26 @@ self: { ({ mkDerivation, aeson, aeson-pretty, ansi-terminal, base , bytestring, directory, file-embed, filepath, hashable , http-conduit, mtl, optparse-applicative, process, profunctors - , string-qq, tasty, tasty-hunit, text, unliftio + , pureMD5, string-qq, tasty, tasty-hunit, text, unliftio , unordered-containers }: mkDerivation { pname = "niv"; - version = "0.2.1"; - sha256 = "18ym8zqxillqf0psc9xyjzgnxhfrfgy5sj3hvrdmggy4dlnn500j"; + version = "0.2.3"; + sha256 = "182miqhcndb3fqxdcjnhpphma89pxdnbv8k3scrhzjd893ncxv8i"; isLibrary = true; isExecutable = true; enableSeparateDataOutput = true; libraryHaskellDepends = [ aeson aeson-pretty ansi-terminal base bytestring directory file-embed filepath hashable http-conduit mtl optparse-applicative - process profunctors string-qq tasty tasty-hunit text unliftio - unordered-containers + process profunctors pureMD5 string-qq tasty tasty-hunit text + unliftio unordered-containers ]; executableHaskellDepends = [ aeson aeson-pretty ansi-terminal base bytestring directory file-embed filepath hashable http-conduit mtl optparse-applicative - process profunctors string-qq tasty text unliftio + process profunctors pureMD5 string-qq tasty text unliftio unordered-containers ]; description = "Easy dependency management for Nix projects"; @@ -171814,8 +172536,8 @@ self: { }: mkDerivation { pname = "nix-deploy"; - version = "1.0.3"; - sha256 = "0anhmc9g9k40nwj87f24hq4wnj6mkli36dzhzdpa0p3cpg7sh2kh"; + version = "1.0.4"; + sha256 = "1wmwrnm6wflkdaq0m84az1q6245iyvkzd2r47vdy9a2a1szqnvl3"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -172006,6 +172728,8 @@ self: { ]; description = "Tool for semi-automatic updating of nixpkgs repository"; license = stdenv.lib.licenses.publicDomain; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "nkjp" = callPackage @@ -172441,23 +173165,11 @@ self: { ({ mkDerivation, base, containers, semigroups }: mkDerivation { pname = "non-empty-sequence"; - version = "0.2.0.2"; - sha256 = "1qfidlv190wxrrp67h7rcrlczwfv7r0mdbwm31rrf08l1i6618yr"; - libraryHaskellDepends = [ base containers semigroups ]; - description = "Non-empty sequence"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "non-empty-sequence_0_2_0_4" = callPackage - ({ mkDerivation, base, containers, semigroups }: - mkDerivation { - pname = "non-empty-sequence"; version = "0.2.0.4"; sha256 = "0a6xk2ijj3lzhqzdrk6q89538d1a62aw8x0ccvkq2kyl1dlahwc0"; libraryHaskellDepends = [ base containers semigroups ]; description = "Non-empty sequence"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "non-empty-text" = callPackage @@ -172540,6 +173252,25 @@ self: { "nonempty-containers" = callPackage ({ mkDerivation, base, comonad, containers, deepseq, hedgehog + , hedgehog-fn, semigroupoids, tasty, tasty-hedgehog, text, these + }: + mkDerivation { + pname = "nonempty-containers"; + version = "0.3.1.0"; + sha256 = "15flyfv6w4078wk69d2nb2lx21b76xr6c34rxs0w8jz1mb497f6l"; + libraryHaskellDepends = [ + base comonad containers deepseq semigroupoids these + ]; + testHaskellDepends = [ + base comonad containers hedgehog hedgehog-fn semigroupoids tasty + tasty-hedgehog text these + ]; + description = "Non-empty variants of containers data types, with full API"; + license = stdenv.lib.licenses.bsd3; + }) {}; + + "nonempty-containers_0_3_2_0" = callPackage + ({ mkDerivation, base, comonad, containers, deepseq, hedgehog , hedgehog-fn, nonempty-vector, semigroupoids, tasty , tasty-hedgehog, text, these, vector }: @@ -172557,6 +173288,7 @@ self: { ]; description = "Non-empty variants of containers data types, with full API"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "nonempty-lift" = callPackage @@ -172814,6 +173546,8 @@ self: { transformers tuple ]; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "notmuch" = callPackage @@ -173510,23 +174244,11 @@ self: { ({ mkDerivation, base }: mkDerivation { pname = "numhask"; - version = "0.3.0.0"; - sha256 = "1zkiqav683mmghxz0hj0wjzg3sf95zfd4ghicw674d9j3vl4gmcw"; - libraryHaskellDepends = [ base ]; - description = "numeric classes"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "numhask_0_3_1" = callPackage - ({ mkDerivation, base }: - mkDerivation { - pname = "numhask"; version = "0.3.1"; sha256 = "0r7raa7sw9k6p5xb3kl7jfpfkg4dym2kb8hrdkq9xvj2yrajzg77"; libraryHaskellDepends = [ base ]; description = "numeric classes"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "numhask-array" = callPackage @@ -173639,6 +174361,8 @@ self: { testHaskellDepends = [ base doctest ]; description = "numerical spaces"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "numhask-test" = callPackage @@ -176958,23 +177682,22 @@ self: { "ormolu" = callPackage ({ mkDerivation, base, bytestring, containers, dlist, exceptions - , filepath, ghc, ghc-boot-th, ghc-paths, gitrev, hspec - , hspec-discover, mtl, optparse-applicative, path, path-io, syb - , text + , filepath, ghc-lib-parser, gitrev, hspec, hspec-discover, mtl + , optparse-applicative, path, path-io, syb, text }: mkDerivation { pname = "ormolu"; - version = "0.0.1.0"; - sha256 = "1p4m9hiavirnhf941fb5pdnrlrknr5rhcvznhqywianvvw6qcm30"; + version = "0.0.2.0"; + sha256 = "10p3h98k5ph2awmdd89k8knavv4npvdmh00a9nrzaw6z32j0igfh"; isLibrary = true; isExecutable = true; enableSeparateDataOutput = true; libraryHaskellDepends = [ - base bytestring containers dlist exceptions ghc ghc-boot-th - ghc-paths mtl syb text + base bytestring containers dlist exceptions ghc-lib-parser mtl syb + text ]; executableHaskellDepends = [ - base ghc gitrev optparse-applicative text + base ghc-lib-parser gitrev optparse-applicative text ]; testHaskellDepends = [ base containers filepath hspec path path-io text @@ -176982,6 +177705,8 @@ self: { testToolDepends = [ hspec-discover ]; description = "A formatter for Haskell source code"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "os-release" = callPackage @@ -177266,10 +177991,8 @@ self: { }: mkDerivation { pname = "overloaded"; - version = "0.1.2"; - sha256 = "0m2ddb48vsl0x0hz6pq8wabl1s6vl7s66rz7z9v2i6d809zl83kw"; - revision = "1"; - editedCabalFile = "08w1f1g0vq0q8v93fdhb8w7a2xmq6mbyh8c3s5y5sli1bynsgbzb"; + version = "0.1.3"; + sha256 = "0yz94zzcwdw34c5v9qmqak9bwqz8gq1s80phf9rn8p0bg6a4l0h4"; libraryHaskellDepends = [ base bytestring containers fin ghc optics-core record-hasfield sop-core split syb symbols text time vec @@ -177940,6 +178663,61 @@ self: { maintainers = with stdenv.lib.maintainers; [ peti ]; }) {}; + "pandoc_2_8_0_1" = callPackage + ({ mkDerivation, aeson, aeson-pretty, attoparsec, base + , base64-bytestring, binary, blaze-html, blaze-markup, bytestring + , case-insensitive, cmark-gfm, containers, criterion, data-default + , deepseq, Diff, directory, doclayout, doctemplates, exceptions + , executable-path, filepath, Glob, haddock-library, hslua + , hslua-module-system, hslua-module-text, HsYAML, HTTP, http-client + , http-client-tls, http-types, ipynb, JuicyPixels, mtl, network + , network-uri, pandoc-types, parsec, process, QuickCheck, random + , safe, scientific, SHA, skylighting, skylighting-core, split, syb + , tagsoup, tasty, tasty-golden, tasty-hunit, tasty-lua + , tasty-quickcheck, temporary, texmath, text, text-conversions + , time, unicode-transforms, unix, unordered-containers, vector + , weigh, xml, zip-archive, zlib + }: + mkDerivation { + pname = "pandoc"; + version = "2.8.0.1"; + sha256 = "0g8sg52319id1srfb7z9j85lsk84x2rbillrcl4qsjg81lgq7pzs"; + configureFlags = [ "-fhttps" "-f-trypandoc" ]; + isLibrary = true; + isExecutable = true; + enableSeparateDataOutput = true; + libraryHaskellDepends = [ + aeson aeson-pretty attoparsec base base64-bytestring binary + blaze-html blaze-markup bytestring case-insensitive cmark-gfm + containers data-default deepseq directory doclayout doctemplates + exceptions filepath Glob haddock-library hslua hslua-module-system + hslua-module-text HsYAML HTTP http-client http-client-tls + http-types ipynb JuicyPixels mtl network network-uri pandoc-types + parsec process random safe scientific SHA skylighting + skylighting-core split syb tagsoup temporary texmath text + text-conversions time unicode-transforms unix unordered-containers + vector xml zip-archive zlib + ]; + executableHaskellDepends = [ base ]; + testHaskellDepends = [ + base base64-bytestring bytestring containers Diff directory + doctemplates executable-path filepath Glob hslua mtl pandoc-types + process QuickCheck tasty tasty-golden tasty-hunit tasty-lua + tasty-quickcheck temporary text time xml zip-archive + ]; + benchmarkHaskellDepends = [ + base bytestring containers criterion mtl text time weigh + ]; + postInstall = '' + mkdir -p $out/share/man/man1 + mv "man/"*.1 $out/share/man/man1/ + ''; + description = "Conversion between markup formats"; + license = stdenv.lib.licenses.gpl2; + hydraPlatforms = stdenv.lib.platforms.none; + maintainers = with stdenv.lib.maintainers; [ peti ]; + }) {}; + "pandoc-citeproc" = callPackage ({ mkDerivation, aeson, aeson-pretty, attoparsec, base, bytestring , Cabal, containers, data-default, directory, filepath, hs-bibutils @@ -177976,7 +178754,7 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "pandoc-citeproc_0_16_3_1" = callPackage + "pandoc-citeproc_0_16_4" = callPackage ({ mkDerivation, aeson, aeson-pretty, attoparsec, base, bytestring , Cabal, containers, data-default, directory, filepath, hs-bibutils , HsYAML, HsYAML-aeson, libyaml, mtl, network, old-locale, pandoc @@ -177986,8 +178764,8 @@ self: { }: mkDerivation { pname = "pandoc-citeproc"; - version = "0.16.3.1"; - sha256 = "12fsvvjcl7mf52xggh6v7p9va7vhfxj62ziyl1idiz13wp0ipc2z"; + version = "0.16.4"; + sha256 = "0mnkhyj56pw8cnycf4ny082rz67gii1x6clzhmxi60zafg07v04c"; isLibrary = true; isExecutable = true; enableSeparateDataOutput = true; @@ -178014,18 +178792,21 @@ self: { "pandoc-citeproc-preamble" = callPackage ({ mkDerivation, base, directory, filepath, pandoc-types, process + , text-conversions }: mkDerivation { pname = "pandoc-citeproc-preamble"; - version = "1.2.4"; - sha256 = "0bdarf6rjncd8lfap4xn479675vsvqzxrmdqd367l2gxfi1nmrv5"; + version = "1.3"; + sha256 = "1lnsklvqvi9569wxdkyk2qwc33mm5d3n28xj64847i8g9af2jqs9"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ - base directory filepath pandoc-types process + base directory filepath pandoc-types process text-conversions ]; description = "Insert a preamble before pandoc-citeproc's bibliography"; license = stdenv.lib.licenses.gpl3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "pandoc-crossref" = callPackage @@ -178037,8 +178818,8 @@ self: { }: mkDerivation { pname = "pandoc-crossref"; - version = "0.3.4.1"; - sha256 = "19hs4akqsg7nlspnbdbyncq8irj0a3h8akmyfzxmi2yb35x7c8ny"; + version = "0.3.5.0"; + sha256 = "1x01qf7v88f42p6h4mjm8rllxm8jl7bj8rq3512qjksns6qajvk4"; isLibrary = true; isExecutable = true; enableSeparateDataOutput = true; @@ -178062,6 +178843,8 @@ self: { ]; description = "Pandoc filter for cross-references"; license = stdenv.lib.licenses.gpl2; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "pandoc-csv2table" = callPackage @@ -178267,8 +179050,6 @@ self: { ]; description = "Pandoc filter to include CSV files"; license = "GPL"; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "pandoc-plantuml-diagrams" = callPackage @@ -178327,7 +179108,7 @@ self: { broken = true; }) {}; - "pandoc-pyplot_2_2_0_0" = callPackage + "pandoc-pyplot_2_3_0_0" = callPackage ({ mkDerivation, base, containers, data-default-class, deepseq , directory, filepath, hashable, hspec, hspec-expectations, mtl , open-browser, optparse-applicative, pandoc, pandoc-types @@ -178336,8 +179117,8 @@ self: { }: mkDerivation { pname = "pandoc-pyplot"; - version = "2.2.0.0"; - sha256 = "1090c3ilm2krz8wyhizlrbwdrn0hq05a7cyh1n0y57sfv3hxprbj"; + version = "2.3.0.0"; + sha256 = "04brh01arvmp3v8b006933n55m6z1pvz9v3x58732n693s7bhq8n"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -178374,17 +179155,17 @@ self: { }) {}; "pandoc-stylefrommeta" = callPackage - ({ mkDerivation, base, bytestring, containers, MissingH, pandoc + ({ mkDerivation, base, bytestring, containers, extra, pandoc , pandoc-types, text }: mkDerivation { pname = "pandoc-stylefrommeta"; - version = "0.2.1.1"; - sha256 = "0jqgpgz1yx85zhm4f6qjaqcj94zi71ab0gam5vdz0jad79szr5l8"; + version = "0.2.3.0"; + sha256 = "1145flz4jkn5knqkc5cppc1412m6hfzd13124k2kfm8dmw196k31"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ - base bytestring containers MissingH pandoc pandoc-types text + base bytestring containers extra pandoc pandoc-types text ]; description = "Pandoc filter to customize links, images and paragraphs"; license = stdenv.lib.licenses.bsd3; @@ -178454,17 +179235,17 @@ self: { "pandoc-vimhl" = callPackage ({ mkDerivation, base, cond, directory, filepath, pandoc-types - , process, regex-compat, temporary + , process, regex-compat, temporary, text }: mkDerivation { pname = "pandoc-vimhl"; - version = "0.1.2.4"; - sha256 = "16gvlskbp2d000mbx2rkbz6dg6758ni4x2mkzxjyk5m475h13w6b"; + version = "0.1.3.0"; + sha256 = "0ppn42jicmx3v0qk6ql0ccx61kk53c75n5wnl3dppgnv1xgmlnq8"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ base cond directory filepath pandoc-types process regex-compat - temporary + temporary text ]; description = "Pandoc filter for native Vim code highlighting"; license = stdenv.lib.licenses.bsd3; @@ -181144,18 +181925,6 @@ self: { }) {}; "pcre-light" = callPackage - ({ mkDerivation, base, bytestring, pcre }: - mkDerivation { - pname = "pcre-light"; - version = "0.4.0.4"; - sha256 = "0xcyi1fivwg7a92mch5bcqzmrfxzqj42rmb3m8kgs61x4qwpxj82"; - libraryHaskellDepends = [ base bytestring ]; - libraryPkgconfigDepends = [ pcre ]; - description = "Portable regex library for Perl 5 compatible regular expressions"; - license = stdenv.lib.licenses.bsd3; - }) {inherit (pkgs) pcre;}; - - "pcre-light_0_4_1_0" = callPackage ({ mkDerivation, base, bytestring, containers, HUnit, mtl, pcre }: mkDerivation { pname = "pcre-light"; @@ -181166,7 +181935,6 @@ self: { testHaskellDepends = [ base bytestring containers HUnit mtl ]; description = "Portable regex library for Perl 5 compatible regular expressions"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {inherit (pkgs) pcre;}; "pcre-light-extra" = callPackage @@ -184260,6 +185028,8 @@ self: { testHaskellDepends = [ base containers sdl2 sdl2-image stm text ]; description = "Functional 2D Game Framework"; license = stdenv.lib.licenses.zlib; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "ping" = callPackage @@ -185197,6 +185967,24 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "pipes-network-tls_0_4" = callPackage + ({ mkDerivation, base, bytestring, network, network-simple + , network-simple-tls, pipes, pipes-network, pipes-safe, tls + , transformers + }: + mkDerivation { + pname = "pipes-network-tls"; + version = "0.4"; + sha256 = "161nqwgv0r5vlnpa1bq0y2wyh2yp8b583dxbwpbgxfjrnsy5f5vm"; + libraryHaskellDepends = [ + base bytestring network network-simple network-simple-tls pipes + pipes-network pipes-safe tls transformers + ]; + description = "TLS-secured network connections support for pipes"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "pipes-network-ws" = callPackage ({ mkDerivation, base, bytestring, network-simple-ws, pipes }: mkDerivation { @@ -186698,8 +187486,8 @@ self: { }: mkDerivation { pname = "pointfree-fancy"; - version = "1.1.1.14"; - sha256 = "08b2dslkblxch8k6wlc6xx50lva8abdkdwibgfxdj2yw4mgdnhry"; + version = "1.1.1.15"; + sha256 = "1jbxgn4raa5zzy5riflvx1sch6ar78fi84yf0ag86yxda3lh70qd"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -186730,6 +187518,8 @@ self: { executableHaskellDepends = [ base ]; description = "Pointful refactoring tool"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "pointless-fun" = callPackage @@ -188314,6 +189104,36 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "postgresql-binary_0_12_2" = callPackage + ({ mkDerivation, aeson, base, base-prelude, binary-parser + , bytestring, bytestring-strict-builder, containers, conversion + , conversion-bytestring, conversion-text, criterion, json-ast + , loch-th, network-ip, placeholders, postgresql-libpq, QuickCheck + , quickcheck-instances, rerebase, scientific, tasty, tasty-hunit + , tasty-quickcheck, text, time, transformers, unordered-containers + , uuid, vector + }: + mkDerivation { + pname = "postgresql-binary"; + version = "0.12.2"; + sha256 = "1zkhwl8g141p1zgnbxjhh0r6wgvzlpwdbvyl80z31fdxd5v29bv8"; + libraryHaskellDepends = [ + aeson base base-prelude binary-parser bytestring + bytestring-strict-builder containers loch-th network-ip + placeholders scientific text time transformers unordered-containers + uuid vector + ]; + testHaskellDepends = [ + aeson conversion conversion-bytestring conversion-text json-ast + loch-th network-ip placeholders postgresql-libpq QuickCheck + quickcheck-instances rerebase tasty tasty-hunit tasty-quickcheck + ]; + benchmarkHaskellDepends = [ criterion rerebase ]; + description = "Encoders and decoders for the PostgreSQL's binary format"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "postgresql-common" = callPackage ({ mkDerivation, attoparsec, base, bytestring, postgresql-simple }: mkDerivation { @@ -188385,8 +189205,8 @@ self: { ({ mkDerivation, base, bytestring }: mkDerivation { pname = "postgresql-copy-escape"; - version = "0.1"; - sha256 = "063phxj8r3vy25awwwn47k9ac0s8z59igpgqrhb9gbfdq4ldrlpm"; + version = "0.1.0.1"; + sha256 = "08ld3rqjjjhlikcv1cpxjqs8wlsjhvv7qq9fjb032hx6mvcqwz0i"; libraryHaskellDepends = [ base bytestring ]; description = "Format data to feed to a PostgreSQL COPY FROM statement"; license = stdenv.lib.licenses.bsd3; @@ -189585,23 +190405,24 @@ self: { "predicate-typed" = callPackage ({ mkDerivation, aeson, base, binary, bytestring, comonad - , containers, deepseq, directory, doctest, ghc-prim, lens, mtl - , pcre-heavy, pcre-light, pretty, pretty-terminal, QuickCheck, safe - , stm, tasty, tasty-hunit, tasty-quickcheck, template-haskell, text - , th-lift, these, time, tree-view + , containers, deepseq, directory, doctest, ghc-prim, hashable, lens + , mtl, pcre-heavy, pcre-light, pretty, pretty-terminal, QuickCheck + , safe, stm, tasty, tasty-hunit, tasty-quickcheck, template-haskell + , text, th-lift, these, time, tree-view }: mkDerivation { pname = "predicate-typed"; - version = "0.4.0.0"; - sha256 = "1inbwv7g98b8pc0z3ri4hrmang6caaam99mv6vd1pam11kpw6l8g"; + version = "0.6.0.0"; + sha256 = "0fk30pn759fg9v2k5gw51hk6vkp2vq4sh574zlqdk4vx6r2r5jrp"; libraryHaskellDepends = [ aeson base binary bytestring comonad containers deepseq directory - ghc-prim lens mtl pcre-heavy pcre-light pretty pretty-terminal - QuickCheck safe template-haskell text th-lift these time tree-view + ghc-prim hashable lens mtl pcre-heavy pcre-light pretty + pretty-terminal QuickCheck safe template-haskell text th-lift these + time tree-view ]; testHaskellDepends = [ aeson base binary bytestring comonad containers deepseq directory - doctest ghc-prim lens mtl pcre-heavy pcre-light pretty + doctest ghc-prim hashable lens mtl pcre-heavy pcre-light pretty pretty-terminal QuickCheck safe stm tasty tasty-hunit tasty-quickcheck template-haskell text th-lift these time tree-view ]; @@ -191134,21 +191955,6 @@ self: { }: mkDerivation { pname = "probability"; - version = "0.2.5.2"; - sha256 = "059l9by2zxb92dd2vshxx9f3sm1kazc2i2ll168hfsya9rrqqaqg"; - enableSeparateDataOutput = true; - libraryHaskellDepends = [ - base containers random transformers utility-ht - ]; - description = "Probabilistic Functional Programming"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "probability_0_2_6" = callPackage - ({ mkDerivation, base, containers, random, transformers, utility-ht - }: - mkDerivation { - pname = "probability"; version = "0.2.6"; sha256 = "12qzgn9jb9hvbpbkb75ad55yhmhai945rvdbamx6zspbrjlsb9sz"; enableSeparateDataOutput = true; @@ -191157,7 +191963,6 @@ self: { ]; description = "Probabilistic Functional Programming"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "probable" = callPackage @@ -191217,16 +192022,14 @@ self: { license = stdenv.lib.licenses.mit; }) {}; - "process_1_6_6_0" = callPackage + "process_1_6_7_0" = callPackage ({ mkDerivation, base, bytestring, deepseq, directory, filepath , unix }: mkDerivation { pname = "process"; - version = "1.6.6.0"; - sha256 = "140as37rfad7hy1lg03n19dzfbcdaahv64aydl6frv06qvdlc49w"; - revision = "1"; - editedCabalFile = "0y3v5ly6fg42ngv41d28ny4x06ddqkivxx16whsfss06k15x3vz5"; + version = "1.6.7.0"; + sha256 = "1qplrcdzdv8dhzh859f709facw7xc6kmfwhwmm26qks4arkih7j5"; libraryHaskellDepends = [ base deepseq directory filepath unix ]; testHaskellDepends = [ base bytestring directory ]; description = "Process libraries"; @@ -191718,6 +192521,8 @@ self: { ]; description = "Profunctor optics"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "profunctors" = callPackage @@ -191738,14 +192543,14 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "profunctors_5_5" = callPackage + "profunctors_5_5_1" = callPackage ({ mkDerivation, base, base-orphans, bifunctors, comonad , contravariant, distributive, tagged, transformers }: mkDerivation { pname = "profunctors"; - version = "5.5"; - sha256 = "0z7kf8hkfk5wfxw80zs9jsh22mk3mjzfvqbdkihrw1wiyw4xkjfl"; + version = "5.5.1"; + sha256 = "0nmiv7hhmimiwj4jnh5vd5n96bihpairq2rf6hrw11rignal2dqx"; libraryHaskellDepends = [ base base-orphans bifunctors comonad contravariant distributive tagged transformers @@ -192585,6 +193390,8 @@ self: { ]; description = "JSON protobuf encoding for proto-lens"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "proto-lens-optparse" = callPackage @@ -193433,29 +194240,29 @@ self: { }) {}; "publish" = callPackage - ({ mkDerivation, base, bytestring, chronologique, deepseq - , directory, filepath, hinotify, hspec, megaparsec, pandoc - , pandoc-types, template-haskell, text, typed-process, unbeliever - , unix, unordered-containers + ({ mkDerivation, base, bytestring, chronologique, core-program + , core-text, deepseq, directory, filepath, hinotify, hspec + , megaparsec, pandoc, pandoc-types, template-haskell, text + , typed-process, unix, unordered-containers }: mkDerivation { pname = "publish"; - version = "2.0.1"; - sha256 = "12jhwihg6nlhs1q2cf4ivd7qw724qz1wk1i5rmi4akfga8ad7n4l"; + version = "2.1.0"; + sha256 = "03fwk0ami5xxqacqb8gikqzxdp7cavvni5bmxd5bi1lvavk49sh7"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ - base bytestring chronologique deepseq directory filepath hinotify - megaparsec pandoc pandoc-types template-haskell text typed-process - unbeliever unix unordered-containers + base bytestring chronologique core-program core-text deepseq + directory filepath hinotify megaparsec pandoc pandoc-types + template-haskell text typed-process unix unordered-containers ]; testHaskellDepends = [ - base bytestring chronologique deepseq directory filepath hinotify - hspec megaparsec pandoc pandoc-types template-haskell text - typed-process unbeliever unix unordered-containers + base bytestring chronologique core-program core-text deepseq + directory filepath hinotify hspec megaparsec pandoc pandoc-types + template-haskell text typed-process unix unordered-containers ]; description = "Publishing tools for papers, books, and presentations"; - license = stdenv.lib.licenses.bsd3; + license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; broken = true; }) {}; @@ -196221,6 +197028,8 @@ self: { ]; description = "Test helpers which help generate data for projects that use postgresql"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "quoridor-hs" = callPackage @@ -196589,16 +197398,16 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "rainbow_0_34_0_0" = callPackage - ({ mkDerivation, base, bytestring, lens, process, QuickCheck, text + "rainbow_0_34_2_0" = callPackage + ({ mkDerivation, base, bytestring, lens, QuickCheck, terminfo, text }: mkDerivation { pname = "rainbow"; - version = "0.34.0.0"; - sha256 = "17v87fkr2skdq1rqcfd5x6philvr5zvnw6sdy9qj0ljafcq31mdd"; - libraryHaskellDepends = [ base bytestring lens process text ]; + version = "0.34.2.0"; + sha256 = "1lamwlkq3g184h7ab2f03x8bhmmpmcn0f1piqp8zqn0594v76a0q"; + libraryHaskellDepends = [ base bytestring lens terminfo text ]; testHaskellDepends = [ - base bytestring lens process QuickCheck text + base bytestring lens QuickCheck terminfo text ]; description = "Print text to terminal with colors and effects"; license = stdenv.lib.licenses.bsd3; @@ -196641,14 +197450,14 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "rainbox_0_24_0_0" = callPackage + "rainbox_0_24_2_0" = callPackage ({ mkDerivation, base, bytestring, containers, lens, QuickCheck , rainbow, tasty, tasty-quickcheck, text }: mkDerivation { pname = "rainbox"; - version = "0.24.0.0"; - sha256 = "1y2zs6062y7xfhcach4s4q4nhhhb111dwggziwgzl3a60cnfhln3"; + version = "0.24.2.0"; + sha256 = "1b1nkw7j24fcmgzkcn92j6c8v6abrhg9580hnwna1b4sjjx6ayak"; libraryHaskellDepends = [ base bytestring containers lens rainbow text ]; @@ -199275,8 +200084,8 @@ self: { pname = "recursion-schemes"; version = "5.1.3"; sha256 = "0a0mkwy3sxg5f1mdlblpn0xl3lwgilnmzs94jqab0pqx9gjkc5xj"; - revision = "1"; - editedCabalFile = "0zxcmga4fy42arbyv1kzbyfnsghnll3prkpva58x654x4cg4diwk"; + revision = "2"; + editedCabalFile = "01q18gplv5k328qf74innnx2z2p15pg5nc6sikxq6fkkw4v3rkyb"; libraryHaskellDepends = [ base base-orphans comonad free template-haskell th-abstraction transformers @@ -199342,8 +200151,8 @@ self: { }: mkDerivation { pname = "red-black-record"; - version = "2.1.0.2"; - sha256 = "0xfvvhdqnhialxf13xw894mpsf8xj8jig5zipqj1hh6galb0b164"; + version = "2.1.0.3"; + sha256 = "0g1av0w52m0admcqif5imkla43yk6id4y8jmiy843xbdqs3qzcx4"; libraryHaskellDepends = [ base sop-core ]; testHaskellDepends = [ aeson base bytestring doctest profunctors sop-core tasty @@ -200345,8 +201154,8 @@ self: { }: mkDerivation { pname = "reform-happstack"; - version = "0.2.5.2"; - sha256 = "0d6w500y47ghmiawlv116hqrknr1sx4k525c7arq340slzch03r6"; + version = "0.2.5.3"; + sha256 = "04fnn47rcm7n98q0qifyyg9jrh09mzchirwsgi2zzb6j9mciz6ci"; libraryHaskellDepends = [ base bytestring happstack-server mtl random reform text utf8-string ]; @@ -200460,6 +201269,8 @@ self: { libraryHaskellDepends = [ base ]; description = "Register allocation API"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "reg-alloc-types" = callPackage @@ -200920,22 +201731,22 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "regex-tdfa_1_3_0" = callPackage - ({ mkDerivation, array, base, bytestring, containers, file-embed - , filepath, ghc-prim, mtl, parsec, regex-base, utf8-string + "regex-tdfa_1_3_1_0" = callPackage + ({ mkDerivation, array, base, bytestring, containers, directory + , filepath, mtl, parsec, regex-base, text, utf8-string }: mkDerivation { pname = "regex-tdfa"; - version = "1.3.0"; - sha256 = "1qzcix4bmz5lj0w433qrfi576rvy8y8flv5wvlp6cchb2s8mfq0v"; + version = "1.3.1.0"; + sha256 = "1h1fliv2zjxwmddl9wnn7ckxxpgy1049hdfg6fcknyrr7mw7dhqm"; libraryHaskellDepends = [ - array base bytestring containers ghc-prim mtl parsec regex-base + array base bytestring containers mtl parsec regex-base text ]; testHaskellDepends = [ - array base bytestring containers file-embed filepath mtl regex-base - utf8-string + array base bytestring containers directory filepath mtl regex-base + text utf8-string ]; - description = "Replaces/Enhances Text.Regex"; + description = "Pure Haskell Tagged DFA Backend for \"Text.Regex\" (regex-base)"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; }) {}; @@ -204255,20 +205066,20 @@ self: { "rib" = callPackage ({ mkDerivation, aeson, async, base, binary, bytestring, clay - , cmdargs, containers, data-default, fsnotify, http-types, lens - , lens-aeson, lucid, mtl, pandoc, pandoc-include-code, pandoc-types - , safe, shake, skylighting, text, time, wai, wai-app-static - , wai-extra, warp + , cmdargs, containers, data-default, directory, fsnotify + , http-types, lens, lens-aeson, lucid, mtl, pandoc + , pandoc-include-code, pandoc-types, safe, shake, skylighting, text + , time, wai, wai-app-static, wai-extra, warp }: mkDerivation { pname = "rib"; - version = "0.3.0.0"; - sha256 = "1dw86xrz310vrapgln48r46z0ss35jm85c0r95pqvnq4smbwiw18"; + version = "0.4.1.0"; + sha256 = "06rxf3fnj9csng69p815ff3wlrbh48wszjcdm7v2xg6vbild3xkg"; libraryHaskellDepends = [ aeson async base binary bytestring clay cmdargs containers - data-default fsnotify http-types lens lens-aeson lucid mtl pandoc - pandoc-include-code pandoc-types safe shake skylighting text time - wai wai-app-static wai-extra warp + data-default directory fsnotify http-types lens lens-aeson lucid + mtl pandoc pandoc-include-code pandoc-types safe shake skylighting + text time wai wai-app-static wai-extra warp ]; description = "Static site generator using Shake"; license = stdenv.lib.licenses.bsd3; @@ -204280,10 +205091,12 @@ self: { ({ mkDerivation, base, Only, postgresql-simple, text, time }: mkDerivation { pname = "ribbit"; - version = "0.4.0.0"; - sha256 = "0nmpsi8b6m88za9jxawz36jjhsybn39ldi503ap7m9wd765j1dbz"; + version = "0.4.1.0"; + sha256 = "1pgyh7ar03k62mpn09g8qm13m1j07wq257hpva3f9sx9n5qd8z2a"; + revision = "1"; + editedCabalFile = "11ky88hgkys3bzsqr3sl9j685h6l97r2zccpz1ylinsrvinwnq8s"; libraryHaskellDepends = [ base Only postgresql-simple text time ]; - description = "Type-level Relational DB combinators"; + description = "Type-level Relational DB language"; license = stdenv.lib.licenses.mit; }) {}; @@ -204545,6 +205358,8 @@ self: { testHaskellDepends = [ base connections hedgehog property ]; description = "Rings, semirings, and dioids"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "rio" = callPackage @@ -208628,6 +209443,8 @@ self: { ]; description = "Work stealing scheduler"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "schedyield" = callPackage @@ -209696,6 +210513,19 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "sdl-try-drivers" = callPackage + ({ mkDerivation, base, pretty-simple, sdl2, text }: + mkDerivation { + pname = "sdl-try-drivers"; + version = "0.0.0.1"; + sha256 = "1zwcf6l2v3k8hi33ssij9a8x2wvlsp4lsa0x7qb9zaq4nbb8nsqj"; + isLibrary = false; + isExecutable = true; + executableHaskellDepends = [ base pretty-simple sdl2 text ]; + description = "small testing tool for sdl2 and accelerated drivers"; + license = stdenv.lib.licenses.mit; + }) {}; + "sdl2" = callPackage ({ mkDerivation, base, bytestring, deepseq, exceptions, linear , SDL2, StateVar, text, transformers, vector, weigh @@ -210761,6 +211591,28 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "semigroupoids_5_3_4" = callPackage + ({ mkDerivation, base, base-orphans, bifunctors, Cabal + , cabal-doctest, comonad, containers, contravariant, distributive + , doctest, hashable, tagged, template-haskell, transformers + , transformers-compat, unordered-containers + }: + mkDerivation { + pname = "semigroupoids"; + version = "5.3.4"; + sha256 = "0r49qpbi803jk3v4i09jr1a98l6hcgnjhrv1a9fhmay3ff4y9lh0"; + setupHaskellDepends = [ base Cabal cabal-doctest ]; + libraryHaskellDepends = [ + base base-orphans bifunctors comonad containers contravariant + distributive hashable tagged template-haskell transformers + transformers-compat unordered-containers + ]; + testHaskellDepends = [ base doctest ]; + description = "Semigroupoids: Category sans id"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "semigroupoids-syntax" = callPackage ({ mkDerivation, base, comonad, containers, contravariant , directory, distributive, doctest, filepath, QuickCheck @@ -210864,10 +211716,8 @@ self: { }: mkDerivation { pname = "semiring-num"; - version = "1.6.0.1"; - sha256 = "1l9j59r0ph34fqkjw1gdf3yzyzk8p6362cznixzx6qnhphbkqjsi"; - revision = "1"; - editedCabalFile = "123jk59i4ziv6ghmy8349icpvzgw90xjd6dxzlnayf0qg01adzsr"; + version = "1.6.0.4"; + sha256 = "1wpszhdjh2hmgnfzwdsdai1xzq0y1panay9jz5sa82hg11p4wa44"; libraryHaskellDepends = [ base containers deepseq hashable log-domain scientific template-haskell time unordered-containers vector @@ -212186,6 +213036,37 @@ self: { pname = "servant-cli"; version = "0.1.0.1"; sha256 = "12d18ca90b7mijaav3glx60b9c9qd1f2g4p5m4m7hzz2m22dyimn"; + revision = "1"; + editedCabalFile = "1h29x87kqyylwigz86bwrgjdykk1119alsy65a7jkkcrj7a3syqa"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + base bytestring case-insensitive containers filepath free + functor-combinators http-types optparse-applicative profunctors + recursion-schemes servant servant-client-core servant-docs text + transformers vinyl + ]; + executableHaskellDepends = [ + aeson base bytestring containers http-client optparse-applicative + random servant servant-client servant-server text vinyl warp + ]; + description = "Command line interface for Servant API clients"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; + }) {}; + + "servant-cli_0_1_0_2" = callPackage + ({ mkDerivation, aeson, base, bytestring, case-insensitive + , containers, filepath, free, functor-combinators, http-client + , http-types, optparse-applicative, profunctors, random + , recursion-schemes, servant, servant-client, servant-client-core + , servant-docs, servant-server, text, transformers, vinyl, warp + }: + mkDerivation { + pname = "servant-cli"; + version = "0.1.0.2"; + sha256 = "11pl9z3l2f7py16drqq9zvl9z5358jv1q7pqslhkhrqg5vhp822k"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -214137,8 +215018,8 @@ self: { }: mkDerivation { pname = "serverless-haskell"; - version = "0.9.3"; - sha256 = "09mxwqzwcv7dzrb39jiqfay91jh64ajdcp2j2zsp0j1d6g3n8ywf"; + version = "0.9.4"; + sha256 = "11svl9km810xw4vbn3vd9jqnv9fglf5jqfyfshnjachiz38fdsih"; libraryHaskellDepends = [ aeson aeson-casing aeson-extra amazonka-core amazonka-kinesis amazonka-s3 base bytestring case-insensitive http-types iproute @@ -215480,8 +216361,8 @@ self: { }: mkDerivation { pname = "shakespeare"; - version = "2.0.22"; - sha256 = "1mc1a0vv070gcawwcx6vzpj6gpfh1qnlqrndiyfic3p500y656vh"; + version = "2.0.23"; + sha256 = "0i1k6ahpvc45z05lycxs0f70ngm8xrazp6ayyxv1bzw8q8d4bkz3"; libraryHaskellDepends = [ aeson base blaze-html blaze-markup bytestring containers directory exceptions ghc-prim parsec process scientific template-haskell text @@ -218082,6 +218963,28 @@ self: { broken = true; }) {}; + "singular-factory" = callPackage + ({ mkDerivation, base, containers, directory, filepath, hgmp + , process, QuickCheck, random, singular-factory, tasty, tasty-hunit + , tasty-quickcheck, text + }: + mkDerivation { + pname = "singular-factory"; + version = "0.1"; + sha256 = "0gz9p32y37ci7i1xnq4n086p1ql5nli84z15xyq6dl1jaz0f541r"; + libraryHaskellDepends = [ + base containers directory filepath hgmp process text + ]; + libraryPkgconfigDepends = [ singular-factory ]; + testHaskellDepends = [ + base QuickCheck random tasty tasty-hunit tasty-quickcheck + ]; + description = "Multivariate polynomial factorization via bindings to Singular-factory"; + license = "GPL"; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; + }) {singular-factory = null;}; + "sink" = callPackage ({ mkDerivation, base }: mkDerivation { @@ -218206,8 +219109,8 @@ self: { }: mkDerivation { pname = "sitepipe"; - version = "0.4.0.0"; - sha256 = "0y8llic3imc1zs53glig24vjm59f2dnw4sw32gzkvlzq33689s7s"; + version = "0.4.0.1"; + sha256 = "1iq7i2zs1bqnxqjp5bwsx8q2vvp1kngwg45mzsiwmhzq4m88x80h"; libraryHaskellDepends = [ aeson base bytestring containers directory exceptions filepath Glob lens lens-aeson megaparsec MissingH mtl mustache @@ -218633,14 +219536,14 @@ self: { license = stdenv.lib.licenses.gpl2; }) {}; - "skylighting_0_8_2_3" = callPackage + "skylighting_0_8_3" = callPackage ({ mkDerivation, base, binary, bytestring, containers , skylighting-core }: mkDerivation { pname = "skylighting"; - version = "0.8.2.3"; - sha256 = "10byr42qnsrqs368li412n8zz405annwmh4vvq2yh6xskipgb32p"; + version = "0.8.3"; + sha256 = "1gsmbzgfxwsfvnk3mbd29llv5wkvn5v7ybs46y6kvf51sdf4v6i6"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -218683,7 +219586,7 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "skylighting-core_0_8_2_3" = callPackage + "skylighting-core_0_8_3" = callPackage ({ mkDerivation, aeson, ansi-terminal, attoparsec, base , base64-bytestring, binary, blaze-html, bytestring , case-insensitive, colour, containers, criterion, Diff, directory @@ -218693,8 +219596,8 @@ self: { }: mkDerivation { pname = "skylighting-core"; - version = "0.8.2.3"; - sha256 = "005ancb8y846xsiagnb4gp4bn4h86r551rvpm3x4xj5zpr795pnc"; + version = "0.8.3"; + sha256 = "07l8n290wm533qp7h1kdn99b47f2lrq4mag2snfpllll8ss35773"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -219198,20 +220101,21 @@ self: { "small-bytearray-builder" = callPackage ({ mkDerivation, base, byteslice, bytestring, gauge , natural-arithmetic, primitive, primitive-offset, QuickCheck - , run-st, tasty, tasty-hunit, tasty-quickcheck, text, text-short - , vector + , quickcheck-classes, run-st, tasty, tasty-hunit, tasty-quickcheck + , text, text-short, vector, wide-word }: mkDerivation { pname = "small-bytearray-builder"; - version = "0.3.0.0"; - sha256 = "17c0mwanwj96djirh6vac9k5dh8qsl9inx237wwbln4j3br4mkz4"; + version = "0.3.1.0"; + sha256 = "1swv0cwsxrmffkvx16qxxxkxfhqfwxwfz7d2msp5fzzz6all6vli"; libraryHaskellDepends = [ base byteslice bytestring natural-arithmetic primitive - primitive-offset run-st text-short + primitive-offset run-st text-short wide-word ]; testHaskellDepends = [ base byteslice bytestring natural-arithmetic primitive QuickCheck - tasty tasty-hunit tasty-quickcheck text vector + quickcheck-classes tasty tasty-hunit tasty-quickcheck text vector + wide-word ]; benchmarkHaskellDepends = [ base byteslice gauge natural-arithmetic primitive text-short @@ -220021,10 +220925,8 @@ self: { }: mkDerivation { pname = "snap-core"; - version = "1.0.4.0"; - sha256 = "0dklxgrbqhnb6bc4ic358g4fyj11ywmjrkxxhqcjmci2hhpn00mr"; - revision = "1"; - editedCabalFile = "1nw74vpfag6gdh66kq82a0kdb05c2xnwcfacwlcg77j24gxcgi6s"; + version = "1.0.4.1"; + sha256 = "19dmfqbsfyk1rkjnnrnajpjfam2xjxgmpfmx10yr5qffgza7gcf0"; libraryHaskellDepends = [ attoparsec base bytestring bytestring-builder case-insensitive containers directory filepath hashable HUnit io-streams lifted-base @@ -221953,8 +222855,8 @@ self: { ({ mkDerivation, base, deepseq }: mkDerivation { pname = "some"; - version = "1.0.0.3"; - sha256 = "0c2y51gw94faafa0jvb3awnsvj89saan4ryy0d5dwivp0zp9gg64"; + version = "1.0.1"; + sha256 = "13dpvxswjcsmic8h2vayp77qzl820gg4g29g5n2xcja8gnzjkkii"; libraryHaskellDepends = [ base deepseq ]; testHaskellDepends = [ base ]; description = "Existential type: Some"; @@ -222117,6 +223019,26 @@ self: { broken = true; }) {}; + "souffle-haskell" = callPackage + ({ mkDerivation, base, hspec, mtl, template-haskell + , type-errors-pretty + }: + mkDerivation { + pname = "souffle-haskell"; + version = "0.0.1"; + sha256 = "1sz5xaw24fknq4y9a9cpp36h6fm46ipclp3nwmpqpnc5svsslgbz"; + libraryHaskellDepends = [ + base mtl template-haskell type-errors-pretty + ]; + testHaskellDepends = [ + base hspec mtl template-haskell type-errors-pretty + ]; + description = "Souffle Datalog bindings for Haskell"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; + }) {}; + "sound-collage" = callPackage ({ mkDerivation, array, base, Cabal, carray, containers, fft , filepath, numeric-prelude, optparse-applicative, pathtype @@ -223931,6 +224853,8 @@ self: { ]; description = "A file-packing application"; license = "GPL"; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "sr-extra" = callPackage @@ -224238,6 +225162,8 @@ self: { libraryHaskellDepends = [ base gdp ghc-prim primitive ]; description = "shared heap regions between local mutable state threads"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "stable-heap" = callPackage @@ -226852,7 +227778,7 @@ self: { license = stdenv.lib.licenses.mit; }) {}; - "store_0_7_0" = callPackage + "store_0_7_1" = callPackage ({ mkDerivation, array, async, base, base-orphans , base64-bytestring, bifunctors, bytestring, cereal, cereal-vector , clock, containers, contravariant, criterion, cryptohash, deepseq @@ -226866,8 +227792,8 @@ self: { }: mkDerivation { pname = "store"; - version = "0.7.0"; - sha256 = "0vm0gmdgay66wyvg3inlpdc4p7clpvd23767wldfilvvq5zcjq1q"; + version = "0.7.1"; + sha256 = "0mxvyy7l0vg545f3v1y5kh7q58ajhwz02fhfk0km2198bhsdfrij"; libraryHaskellDepends = [ array async base base-orphans base64-bytestring bifunctors bytestring containers contravariant cryptohash deepseq directory @@ -226999,15 +227925,15 @@ self: { license = stdenv.lib.licenses.mit; }) {}; - "stratosphere_0_44_0" = callPackage + "stratosphere_0_46_0" = callPackage ({ mkDerivation, aeson, aeson-pretty, base, bytestring, containers , hashable, hspec, hspec-discover, lens, template-haskell, text , unordered-containers }: mkDerivation { pname = "stratosphere"; - version = "0.44.0"; - sha256 = "10brxs6hs8s0nb17aycbpn4xhiixxhxnv1wgmkc4jy0pbbrp942w"; + version = "0.46.0"; + sha256 = "07qm0bi5f3fkpnbsjbyi4qv2kp7w0wb7zd75q4cikjwkm1wxlldr"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -227187,12 +228113,12 @@ self: { }) {}; "streamdeck" = callPackage - ({ mkDerivation, base, bytestring, hidapi, mtl }: + ({ mkDerivation, base, bytestring, hidapi, mtl, split }: mkDerivation { pname = "streamdeck"; - version = "0.0.3"; - sha256 = "1cjvdf9ld55pv7n9cx2c4rsczqjxkrx1mkci8aziz59bs2ipqhak"; - libraryHaskellDepends = [ base bytestring hidapi mtl ]; + version = "0.1.0"; + sha256 = "0dg5hmv61jnpqby4v5g4wpsb7ynsm56fmb3xj2pixswnzqz31ian"; + libraryHaskellDepends = [ base bytestring hidapi mtl split ]; description = "Control library for the Elgato Stream Deck"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; @@ -227625,8 +228551,8 @@ self: { }: mkDerivation { pname = "streaming-postgresql-simple"; - version = "0.2.0.3"; - sha256 = "1gy6yy14q18zfbbj6rvsnhvhkra78m2jwbyd3hnpbx25jgvz230n"; + version = "0.2.0.4"; + sha256 = "1qdfqp1w7pszks4iqbvgqsxmr2c6bx81jgkyz9k8wfz7vajg6f67"; libraryHaskellDepends = [ base bytestring exceptions postgresql-libpq postgresql-simple resourcet safe-exceptions streaming transformers @@ -228706,8 +229632,8 @@ self: { pname = "structs"; version = "0.1.2"; sha256 = "0myv13g48y8vn397lvg45lb942fmw4n9gs80v5nnjfvgika7qbw4"; - revision = "1"; - editedCabalFile = "1snsprlbv9npn06iliy937vxqpsjpcmv880bnkbzj3nz4c6c59pa"; + revision = "2"; + editedCabalFile = "0ma2s0by622kaq7p57g859pxha02bqrd7n86cczfb2gzcm7kqma7"; setupHaskellDepends = [ base Cabal cabal-doctest ]; libraryHaskellDepends = [ base deepseq ghc-prim primitive template-haskell @@ -230304,6 +231230,39 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "swagger2_2_5" = callPackage + ({ mkDerivation, aeson, aeson-pretty, base, base-compat-batteries + , bytestring, Cabal, cabal-doctest, containers, cookie, doctest + , generics-sop, Glob, hashable, hspec, hspec-discover, http-media + , HUnit, insert-ordered-containers, lens, mtl, network, optics-core + , optics-th, QuickCheck, quickcheck-instances, scientific + , template-haskell, text, time, transformers, transformers-compat + , unordered-containers, utf8-string, uuid-types, vector + }: + mkDerivation { + pname = "swagger2"; + version = "2.5"; + sha256 = "0ywj4536daz43vrxibqn271gq96bzkawx3qcwbm547315jfd4fqf"; + setupHaskellDepends = [ base Cabal cabal-doctest ]; + libraryHaskellDepends = [ + aeson aeson-pretty base base-compat-batteries bytestring containers + cookie generics-sop hashable http-media insert-ordered-containers + lens mtl network optics-core optics-th QuickCheck scientific + template-haskell text time transformers transformers-compat + unordered-containers uuid-types vector + ]; + testHaskellDepends = [ + aeson base base-compat-batteries bytestring containers doctest Glob + hashable hspec HUnit insert-ordered-containers lens mtl QuickCheck + quickcheck-instances template-haskell text time + unordered-containers utf8-string vector + ]; + testToolDepends = [ hspec-discover ]; + description = "Swagger 2.0 data model"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "swapper" = callPackage ({ mkDerivation, base, binary, bytestring, deepseq, happstack-data , happstack-state, parallel, tokyocabinet @@ -232261,8 +233220,8 @@ self: { pname = "tagged"; version = "0.8.6"; sha256 = "1pciqzxf9ncv954v4r527xkxkn7r5hcr13mfw5dg1xjci3qdw5md"; - revision = "1"; - editedCabalFile = "070xwfw7y81hd63il76dmwbdl9ca1rd07c54zynfx6vpr4wyx4vh"; + revision = "2"; + editedCabalFile = "1y8z8hmm846z7h3wqncpi0d4zhsnkwf08q0wchivkjw8di7ahz0z"; libraryHaskellDepends = [ base deepseq template-haskell transformers ]; @@ -232556,8 +233515,8 @@ self: { }: mkDerivation { pname = "tagsoup-navigate"; - version = "0.1.0.3"; - sha256 = "1vfadi0ls4wqv8kzpil5ph715mihxp70nb2nnjq70gsdgarndv2j"; + version = "0.1.0.4"; + sha256 = "1mds95a0xz3iklidmvczjpmm9vjhzdrdvcj3dg0n3ivwwli672m9"; libraryHaskellDepends = [ base deriving-compat lens mmorph mtl semigroupoids semigroups tagsoup tagsoup-selection transformers @@ -233164,8 +234123,8 @@ self: { pname = "taskwarrior"; version = "0.1.0.0"; sha256 = "0af58ns601bqih7nvg614wclxvd2f9j3rqakz9djjybdk1771j2v"; - revision = "1"; - editedCabalFile = "0idswz48jgl48grmbbynh1447bblw99wpqifjcwr6apcl63hrn3a"; + revision = "3"; + editedCabalFile = "1b2v1rl2impngxn8bw9j36nr0id4s5dy6pnj0nw5p69mfb046zd5"; libraryHaskellDepends = [ aeson base bytestring process string-interpolate text time unordered-containers uuid @@ -233705,6 +234664,8 @@ self: { ]; description = "TAP (Test Anything Protocol) Version 13 formatter for tasty"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "tasty-test-vector" = callPackage @@ -233740,8 +234701,8 @@ self: { }: mkDerivation { pname = "tasty-tmux"; - version = "0.1.0.1"; - sha256 = "07jx1ik8bmirc6ycimzv763kfqvhi712ivk32npw5iprpn94k6h2"; + version = "0.1.0.2"; + sha256 = "0lksanhb1nsk45vqg1h9jigllfg0lrqsynxkplh8lyx6g8k0naav"; libraryHaskellDepends = [ base bytestring mtl regex-posix tasty tasty-hunit text typed-process @@ -237097,6 +238058,8 @@ self: { pname = "th-abstraction"; version = "0.3.1.0"; sha256 = "1f81w0gshvc816cf9qz0f19jsrzh6wpzmmy317xrgn63dv61p7jb"; + revision = "1"; + editedCabalFile = "1c0sy614vfcdvshn0z09nzfiq89v5if31yvvpxzrivrdy9gf912s"; libraryHaskellDepends = [ base containers ghc-prim template-haskell ]; @@ -237333,8 +238296,8 @@ self: { }: mkDerivation { pname = "th-format"; - version = "0.1.2.0"; - sha256 = "1wc9ndqv2qxk75b47s44j0lrx5h9hc1r4h1nvl01pbdks6yyi43j"; + version = "0.1.3.0"; + sha256 = "0ckyf5r5sz3x8ixj5nclqsi6ifk7zz08b6wf09gbwb4gbydklw7c"; libraryHaskellDepends = [ base Earley haskell-src-meta template-haskell text ]; @@ -237490,6 +238453,8 @@ self: { pname = "th-orphans"; version = "0.13.9"; sha256 = "1xj1gssv77hdx1r3ndg8k49v3ipj3a6r7crkyvx13jrps3m6ng1z"; + revision = "1"; + editedCabalFile = "100gpi0np50vxlapyl6d05w8ss9l2gqacn28i228hsvhvrxxwjdy"; libraryHaskellDepends = [ base mtl template-haskell th-lift th-lift-instances th-reify-many ]; @@ -238252,8 +239217,8 @@ self: { }: mkDerivation { pname = "thrift"; - version = "0.12.0"; - sha256 = "1yzfq671apw3mjaws16a6agjw3vpm7yz0gdp3kyh8vvbp5d0czyf"; + version = "0.13.0"; + sha256 = "005gaw3n548l7ij8m2di2b7nmfz2sg6nhafb3xjccw9wgwzl9qs2"; libraryHaskellDepends = [ attoparsec base base64-bytestring binary bytestring containers ghc-prim hashable hspec-core HTTP network network-uri QuickCheck @@ -238584,8 +239549,8 @@ self: { }: mkDerivation { pname = "tidal"; - version = "1.4.4"; - sha256 = "0ibaq9gyn0iz00jsdmifw5fcj4f01l6z8ds13gxz365r1wgcn2pj"; + version = "1.4.5"; + sha256 = "146nhi2y8c5acqmkhgh4f1bb3wrasba0i1w4v2vwnbznpdv6cxs1"; enableSeparateDataOutput = true; libraryHaskellDepends = [ base bifunctors bytestring clock colour containers deepseq hosc @@ -239464,8 +240429,8 @@ self: { ({ mkDerivation, base, hspec }: mkDerivation { pname = "timers-tick"; - version = "0.4.1.0"; - sha256 = "1dbkgsvzfxgf4cgkzlmn1dcjw3rb7rrx56ix7n5r1k42n0wsyfsg"; + version = "0.4.2.0"; + sha256 = "079pgfgpgdmn9yqyd81rz615a035zjw24na8q332m1ld51xc0n8f"; libraryHaskellDepends = [ base ]; testHaskellDepends = [ base hspec ]; description = "tick based timers"; @@ -240209,27 +241174,36 @@ self: { broken = true; }) {}; - "tmp-postgres_1_13_0_0" = callPackage - ({ mkDerivation, ansi-wl-pprint, async, base, bytestring - , containers, criterion, directory, generic-monoid, hspec, mtl - , port-utils, postgres-options, postgresql-simple, process, random - , temporary, transformers, unix + "tmp-postgres_1_23_0_3" = callPackage + ({ mkDerivation, ansi-wl-pprint, async, base, base64-bytestring + , bytestring, containers, criterion, cryptohash-sha1, deepseq + , directory, generic-monoid, hspec, mtl, network, port-utils + , postgres-options, postgresql-simple, process, stm, temporary + , transformers, unix }: mkDerivation { pname = "tmp-postgres"; - version = "1.13.0.0"; - sha256 = "01xpa5jignp7a3fw2rczyciaz9h6m1hf0i1iwanadbacnvzh7ing"; + version = "1.23.0.3"; + sha256 = "1fjp6021lxz1a2drd1f9g3n7sxdrq17wgc2cbjiihcqrjld5qqs0"; + isLibrary = true; + isExecutable = true; libraryHaskellDepends = [ - ansi-wl-pprint async base bytestring containers directory - generic-monoid port-utils postgres-options postgresql-simple - process random temporary transformers unix + ansi-wl-pprint async base base64-bytestring bytestring containers + cryptohash-sha1 deepseq directory generic-monoid port-utils + postgres-options postgresql-simple process stm temporary + transformers unix + ]; + executableHaskellDepends = [ + async base directory postgres-options postgresql-simple process + temporary ]; testHaskellDepends = [ - base containers directory hspec mtl port-utils postgres-options - postgresql-simple process temporary unix + base containers directory generic-monoid hspec mtl network + port-utils postgres-options postgresql-simple process temporary + unix ]; benchmarkHaskellDepends = [ - base criterion postgres-options postgresql-simple + base criterion deepseq postgres-options postgresql-simple ]; description = "Start and stop a temporary postgres"; license = stdenv.lib.licenses.bsd3; @@ -241108,10 +242082,10 @@ self: { ({ mkDerivation, base, containers, semiring-num }: mkDerivation { pname = "total-map"; - version = "0.1.0"; - sha256 = "0fqgazhs3ppv4ywdxjrhrdzp5z1szgkq4l0lqpbzqwrhi7axgl69"; + version = "0.1.3"; + sha256 = "015bj6g4hjp38fc8bm5z57w6akdgvyab6j2sc666x0qdxgrdwp88"; libraryHaskellDepends = [ base containers semiring-num ]; - description = "Finitely represented /total/ maps"; + description = "Finitely represented total maps"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; broken = true; @@ -242409,8 +243383,8 @@ self: { }: mkDerivation { pname = "tree-sitter"; - version = "0.5.0.0"; - sha256 = "0gf2mcrrib4id0374hs9mf24g09d4rz7nrrgf92ls7b8279xvjkd"; + version = "0.6.0.0"; + sha256 = "1kdx7axkx34h6jlmpzvmqbabyiqj3yp78bl1qn6aj5c2mql4hi12"; libraryHaskellDepends = [ aeson base bytestring containers directory filepath fused-effects semantic-source split template-haskell text unordered-containers @@ -242453,26 +243427,35 @@ self: { }) {}; "tree-sitter-java" = callPackage - ({ mkDerivation, base, template-haskell, tree-sitter }: + ({ mkDerivation, base, bytestring, pathtype, semantic-source, tasty + , tasty-hunit, template-haskell, text, tree-sitter + , tree-sitter-test-helpers + }: mkDerivation { pname = "tree-sitter-java"; - version = "0.4.0.0"; - sha256 = "0v8mw4slp6rgyw2h3qpqkjqs13kg8dcigq7014dh77h804plk0w7"; + version = "0.5.0.0"; + sha256 = "0rmmsp1alyvc94f61qfha5wm0z2605n9wz3yxaac58bqghsqjx8f"; enableSeparateDataOutput = true; - libraryHaskellDepends = [ base template-haskell tree-sitter ]; + libraryHaskellDepends = [ + base semantic-source template-haskell tree-sitter + ]; + testHaskellDepends = [ + base bytestring pathtype tasty tasty-hunit text tree-sitter + tree-sitter-test-helpers + ]; doHaddock = false; description = "Tree-sitter grammar/parser for Java"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; broken = true; - }) {}; + }) {tree-sitter-test-helpers = null;}; "tree-sitter-json" = callPackage ({ mkDerivation, base, template-haskell, text, tree-sitter }: mkDerivation { pname = "tree-sitter-json"; - version = "0.3.0.0"; - sha256 = "09489gikbmddw28ckgf6mg526j43386sdilvb7gzs5x9kc86sd4q"; + version = "0.4.0.0"; + sha256 = "1syd5md8gwxhcfqwvfy4f3rilpn8fr83ib54wa3mmf7165jscwpz"; enableSeparateDataOutput = true; libraryHaskellDepends = [ base template-haskell text tree-sitter ]; doHaddock = false; @@ -242498,24 +243481,29 @@ self: { "tree-sitter-python" = callPackage ({ mkDerivation, aeson, base, bytestring, directory, filepath - , hedgehog, semantic-source, template-haskell, tree-sitter + , hedgehog, pathtype, semantic-source, tasty, tasty-hedgehog + , tasty-hunit, template-haskell, text, tree-sitter + , tree-sitter-test-helpers }: mkDerivation { pname = "tree-sitter-python"; - version = "0.6.0.0"; - sha256 = "041qrxdkn19x9h0vcjb0jvc6d0mp6ysdak7i4yqqww683npxjkp1"; + version = "0.7.0.0"; + sha256 = "0s86c4jbfp8dbkkqxdq9k28xphx5vrkf2ss1xzjq88bkzz6q7hqy"; enableSeparateDataOutput = true; libraryHaskellDepends = [ aeson base directory filepath semantic-source template-haskell tree-sitter ]; - testHaskellDepends = [ base bytestring hedgehog tree-sitter ]; + testHaskellDepends = [ + base bytestring hedgehog pathtype tasty tasty-hedgehog tasty-hunit + text tree-sitter tree-sitter-test-helpers + ]; doHaddock = false; description = "Tree-sitter grammar/parser for Python"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; broken = true; - }) {}; + }) {tree-sitter-test-helpers = null;}; "tree-sitter-ruby" = callPackage ({ mkDerivation, base, template-haskell, tree-sitter }: @@ -244220,6 +245208,8 @@ self: { ]; description = "Haskell twirp foundations"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "twisty" = callPackage @@ -244362,8 +245352,8 @@ self: { }: mkDerivation { pname = "twitter-types"; - version = "0.9.0"; - sha256 = "0hfm2zdgvpkfn06x140pnnbylmgram3i5zqf62c4yg6khi78m7hg"; + version = "0.10.0"; + sha256 = "0a2wgidg5dk3cxszb0q07cg0sywqgyxl5scswlr91yjvmjmlnkby"; libraryHaskellDepends = [ aeson base text time unordered-containers ]; @@ -244384,8 +245374,8 @@ self: { }: mkDerivation { pname = "twitter-types-lens"; - version = "0.9.0"; - sha256 = "0xp6dwzw0mba4i6vq1sginn7d6ini2c3ig2ss0pn1m0sjwj8x7yq"; + version = "0.10.0"; + sha256 = "1x9w68mr6r6354in9l4vmawk5symvfh2qlhjn2gd30m8b1mzbrjg"; libraryHaskellDepends = [ base lens template-haskell text time twitter-types ]; @@ -245721,8 +246711,8 @@ self: { }: mkDerivation { pname = "tz"; - version = "0.1.3.2"; - sha256 = "0k35pw27a3hwg5wqjpfqij0y7rkdlmd85n4kj4ckna4z2v86dl7h"; + version = "0.1.3.3"; + sha256 = "1cnin3dlk6xmvk5cz1sjj88djdv1rq87hvwmhc2dj22hgbs3p3ni"; libraryHaskellDepends = [ base binary bytestring containers data-default deepseq template-haskell time tzdata vector @@ -246503,12 +247493,16 @@ self: { }) {}; "unexceptionalio" = callPackage - ({ mkDerivation, base }: + ({ mkDerivation, base, HUnit, test-framework, test-framework-hunit + }: mkDerivation { pname = "unexceptionalio"; - version = "0.4.0"; - sha256 = "09gynk472l7nn5l2w320n4dwigwp0wh0shfp6dyw6r5h2jdxz18p"; + version = "0.5.0"; + sha256 = "04jrmv075cas6qs58m3j0q9h4w14kd4b87bp42k3x3v6hcl62xi9"; libraryHaskellDepends = [ base ]; + testHaskellDepends = [ + base HUnit test-framework test-framework-hunit + ]; description = "IO without any non-error, synchronous exceptions"; license = "unknown"; hydraPlatforms = stdenv.lib.platforms.none; @@ -246518,8 +247512,8 @@ self: { ({ mkDerivation, base, transformers, unexceptionalio }: mkDerivation { pname = "unexceptionalio-trans"; - version = "0.4.0"; - sha256 = "19jzvxx0z4w7d1mp09spiz01sd349376hf5xkg8r2zfr8fx7hj71"; + version = "0.5.0"; + sha256 = "1sd5q97zjk1qkffbhj4rzdrvwwz4q7b6vwrmb6mpkbg7ra4ks49p"; libraryHaskellDepends = [ base transformers unexceptionalio ]; description = "A wrapper around UnexceptionalIO using monad transformers"; license = "unknown"; @@ -247506,7 +248500,7 @@ self: { license = stdenv.lib.licenses.mit; }) {}; - "universum_1_6_0" = callPackage + "universum_1_6_1" = callPackage ({ mkDerivation, base, bytestring, containers, deepseq, doctest , gauge, ghc-prim, Glob, hashable, hedgehog, microlens , microlens-mtl, mtl, safe-exceptions, stm, tasty, tasty-hedgehog @@ -247514,8 +248508,8 @@ self: { }: mkDerivation { pname = "universum"; - version = "1.6.0"; - sha256 = "12gz4hpwmykb73dplbd8j628f54ipk0pygrswy0k1k7j68awnjl6"; + version = "1.6.1"; + sha256 = "007nh8kw5a2m681bjwvcdjdf69nb768kwdsckj2kdd7406mfgdm7"; libraryHaskellDepends = [ base bytestring containers deepseq ghc-prim hashable microlens microlens-mtl mtl safe-exceptions stm text transformers @@ -248934,8 +249928,8 @@ self: { }: mkDerivation { pname = "userid"; - version = "0.1.3.3"; - sha256 = "1p1dfbr68bkn09zpy50i1xazvfblds46bs60vra2sqn4hv8vj0s9"; + version = "0.1.3.4"; + sha256 = "149c32v5fa4aqkknqwlamf1r06ki0g0q03nbsc0giaw5qsavf7x1"; libraryHaskellDepends = [ aeson base boomerang cereal safecopy web-routes web-routes-th ]; @@ -250681,6 +251675,24 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "vector-algorithms_0_8_0_2" = callPackage + ({ mkDerivation, base, bytestring, containers, mwc-random + , primitive, QuickCheck, vector + }: + mkDerivation { + pname = "vector-algorithms"; + version = "0.8.0.2"; + sha256 = "05jc15ckdmh4hbwmqax8jyahqslj7c03la1vgz5a5gw0hwspyq34"; + libraryHaskellDepends = [ base bytestring primitive vector ]; + testHaskellDepends = [ + base bytestring containers QuickCheck vector + ]; + benchmarkHaskellDepends = [ base mwc-random vector ]; + description = "Efficient algorithms for vector arrays"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "vector-binary" = callPackage ({ mkDerivation, base, binary, vector }: mkDerivation { @@ -255157,8 +256169,8 @@ self: { }: mkDerivation { pname = "web-routes"; - version = "0.27.14.2"; - sha256 = "0jpps7ay2hw41595hlfrx5k4lh9p2nib02n3rhd1vphpbnf392xg"; + version = "0.27.14.3"; + sha256 = "1a66m261ilqafbwwgjvalh3rz38qxcwxw9a99wr18lm0ah27lvx4"; libraryHaskellDepends = [ base blaze-builder bytestring exceptions ghc-prim http-types mtl parsec split text utf8-string @@ -255198,8 +256210,8 @@ self: { }: mkDerivation { pname = "web-routes-happstack"; - version = "0.23.11"; - sha256 = "0jzxcwh3g6y5y4whjbw86y94hfrl73iwnwhhm728l69z5knqry9y"; + version = "0.23.12"; + sha256 = "0p5fa2cdpk6s9n0wa7nllhk1naa3a8a8vx63q6da8ifk6x8jn68a"; libraryHaskellDepends = [ base bytestring happstack-server text web-routes ]; @@ -255265,8 +256277,8 @@ self: { }: mkDerivation { pname = "web-routes-th"; - version = "0.22.6.4"; - sha256 = "0r0z39hdxm3ggqq9n71wy0k44gb27zpka4pnmp07855czc4l61ca"; + version = "0.22.6.5"; + sha256 = "1amzab59hhd723clg9skcn5nhwvlw1la1acc9qdbyg302a75s0l9"; libraryHaskellDepends = [ base parsec split template-haskell text web-routes ]; @@ -256151,6 +257163,8 @@ self: { ]; description = "A school-timetable problem-solver"; license = "GPL"; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "weigh" = callPackage @@ -256646,6 +257660,8 @@ self: { pname = "windns"; version = "0.1.0.1"; sha256 = "016d1cf51jqvhbzlf5kbizv4l4dymradac1420rl47q2k5faczq8"; + revision = "1"; + editedCabalFile = "17d44pzi4q5yvrygimdrwdrabz62s1ylw918w28sxgcvj64ir22g"; libraryHaskellDepends = [ base bytestring deepseq ]; librarySystemDepends = [ dnsapi ]; description = "Domain Name Service (DNS) lookup via the <windns.h>/dnsapi.dll standard library"; @@ -257338,8 +258354,8 @@ self: { }: mkDerivation { pname = "wordchoice"; - version = "0.1.2.7"; - sha256 = "06xz5xk14fiy1z4j6q7lbjwj13m4hy22pzrcdwk6c078w85rp4yd"; + version = "0.1.2.8"; + sha256 = "0ncs3g174db6508fic7x2xibvkccmz068g6hizp8fi20bwxb9js8"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -258195,10 +259211,8 @@ self: { }: mkDerivation { pname = "wss-client"; - version = "0.2.1.1"; - sha256 = "1wgqd8hh22ld72c1ccfr191ydqb5fija6c1l0vbg7n8pldhmi92w"; - revision = "1"; - editedCabalFile = "03q6mpdy93y8kjmjcxpjasg6q1mg64az28z99gm2w2iih3mqa702"; + version = "0.3.0.0"; + sha256 = "1licynhnyhfdq4gxpsya3gaypjs9inqzr2xqmjs9f99ymbvin8d8"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -259307,6 +260321,35 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "xlsx_0_8_0" = callPackage + ({ mkDerivation, attoparsec, base, base64-bytestring, binary-search + , bytestring, conduit, containers, criterion, data-default, deepseq + , Diff, errors, extra, filepath, groom, lens, mtl, network-uri + , old-locale, raw-strings-qq, safe, smallcheck, tasty, tasty-hunit + , tasty-smallcheck, text, time, transformers, vector, xeno + , xml-conduit, zip-archive, zlib + }: + mkDerivation { + pname = "xlsx"; + version = "0.8.0"; + sha256 = "1wp2ybkf5z4x87a73yygi3g1nqjy6pfb1wdwyvmjqk64ibjz0p7d"; + libraryHaskellDepends = [ + attoparsec base base64-bytestring binary-search bytestring conduit + containers data-default deepseq errors extra filepath lens mtl + network-uri old-locale safe text time transformers vector xeno + xml-conduit zip-archive zlib + ]; + testHaskellDepends = [ + base bytestring containers Diff groom lens mtl raw-strings-qq + smallcheck tasty tasty-hunit tasty-smallcheck text time vector + xml-conduit + ]; + benchmarkHaskellDepends = [ base bytestring criterion ]; + description = "Simple and incomplete Excel file parser/writer"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "xlsx-tabular" = callPackage ({ mkDerivation, aeson, base, bytestring, containers, data-default , lens, text, xlsx @@ -261339,6 +262382,8 @@ self: { ]; description = "YAML parsing combinators for improved validation and error reporting"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "yaml-config" = callPackage @@ -262595,39 +263640,6 @@ self: { }) {}; "yesod-bin" = callPackage - ({ mkDerivation, attoparsec, base, base64-bytestring, blaze-builder - , bytestring, Cabal, conduit, conduit-extra, containers - , data-default-class, directory, file-embed, filepath, fsnotify - , http-client, http-client-tls, http-reverse-proxy, http-types - , network, optparse-applicative, parsec, process, project-template - , resourcet, say, shakespeare, split, stm, streaming-commons, tar - , template-haskell, text, time, transformers, transformers-compat - , unix-compat, unliftio, unordered-containers, wai, wai-extra, warp - , warp-tls, yaml, zlib - }: - mkDerivation { - pname = "yesod-bin"; - version = "1.6.0.3"; - sha256 = "1p5f6bl4gynm47m1xg1x1xh9nz913i83iprh2xd207359idjknz4"; - revision = "4"; - editedCabalFile = "1iw9m3z6m4n9dlwamf1kwr7pp2wpk6awf1m63zjkgw5j4vwxlcpg"; - isLibrary = false; - isExecutable = true; - executableHaskellDepends = [ - attoparsec base base64-bytestring blaze-builder bytestring Cabal - conduit conduit-extra containers data-default-class directory - file-embed filepath fsnotify http-client http-client-tls - http-reverse-proxy http-types network optparse-applicative parsec - process project-template resourcet say shakespeare split stm - streaming-commons tar template-haskell text time transformers - transformers-compat unix-compat unliftio unordered-containers wai - wai-extra warp warp-tls yaml zlib - ]; - description = "The yesod helper executable"; - license = stdenv.lib.licenses.mit; - }) {}; - - "yesod-bin_1_6_0_4" = callPackage ({ mkDerivation, base, bytestring, Cabal, conduit, conduit-extra , containers, data-default-class, directory, file-embed, filepath , fsnotify, http-client, http-client-tls, http-reverse-proxy @@ -262652,7 +263664,6 @@ self: { ]; description = "The yesod helper executable"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "yesod-bootstrap" = callPackage @@ -264123,8 +265134,8 @@ self: { }: mkDerivation { pname = "yesod-test"; - version = "1.6.7"; - sha256 = "1x7fmp1q3zn15av6rhdddnilkb54xmkpb6pkfzfpjm3vff27i7jj"; + version = "1.6.8"; + sha256 = "1c8xana3lf79db17mc74q88ygdskhyhvrv325fpwdw00fcwc0fn6"; libraryHaskellDepends = [ attoparsec base blaze-builder blaze-html bytestring case-insensitive conduit containers cookie hspec-core html-conduit @@ -265066,8 +266077,8 @@ self: { }: mkDerivation { pname = "yst"; - version = "0.7.0.1"; - sha256 = "1cmdx2bghp508qm26xydnljswgldvvv5rapmzcivmnn8pzp9g9kl"; + version = "0.7.1"; + sha256 = "0clvfkdrmw7lmrcyn8cilgf0k7438c384vwvjx256pyl46y3ym5m"; isLibrary = false; isExecutable = true; enableSeparateDataOutput = true; @@ -265887,6 +266898,24 @@ self: { license = stdenv.lib.licenses.gpl3; }) {}; + "zinza" = callPackage + ({ mkDerivation, base, bytestring, containers, parsec, tasty + , tasty-golden, tasty-hunit, text, transformers + }: + mkDerivation { + pname = "zinza"; + version = "0.1"; + sha256 = "0p7m15qkp7lsdhckkj2xz7ck54kkaz8pw0gz9dddll57mqjyy6zk"; + libraryHaskellDepends = [ + base containers parsec text transformers + ]; + testHaskellDepends = [ + base bytestring containers tasty tasty-golden tasty-hunit + ]; + description = "Typed templates with jinja like syntax"; + license = stdenv.lib.licenses.gpl2Plus; + }) {}; + "zip" = callPackage ({ mkDerivation, base, bytestring, bzlib-conduit, case-insensitive , cereal, conduit, conduit-extra, containers, digest, directory diff --git a/pkgs/development/haskell-modules/non-hackage-packages.nix b/pkgs/development/haskell-modules/non-hackage-packages.nix index 8b667a1e669..c292eeec128 100644 --- a/pkgs/development/haskell-modules/non-hackage-packages.nix +++ b/pkgs/development/haskell-modules/non-hackage-packages.nix @@ -13,4 +13,7 @@ self: super: { # https://github.com/channable/vaultenv/issues/1 vaultenv = self.callPackage ../tools/haskell/vaultenv { }; + # spago is not released to Hackage. + # https://github.com/spacchetti/spago/issues/512 + spago = self.callPackage ../tools/purescript/spago { }; } diff --git a/pkgs/development/interpreters/janet/default.nix b/pkgs/development/interpreters/janet/default.nix index 337b83767f4..be5da812530 100644 --- a/pkgs/development/interpreters/janet/default.nix +++ b/pkgs/development/interpreters/janet/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "janet"; - version = "1.4.0"; + version = "1.5.1"; src = fetchFromGitHub { owner = "janet-lang"; repo = pname; rev = "v${version}"; - sha256 = "0xszmgw5nl5b6gd3344h1mic1c1a3hj7nivp4d9hqzzh131qvbn5"; + sha256 = "13b4haaanlgi8qpwwvf59zf7qsw8p0zdqv7xdxjjyid5yww7jmm2"; }; nativeBuildInputs = [ meson ninja ]; diff --git a/pkgs/development/interpreters/wasmtime/cargo-lock.patch b/pkgs/development/interpreters/wasmtime/cargo-lock.patch index 95513d4437a..56c9879dd6e 100644 --- a/pkgs/development/interpreters/wasmtime/cargo-lock.patch +++ b/pkgs/development/interpreters/wasmtime/cargo-lock.patch @@ -1,9 +1,9 @@ diff --git a/Cargo.lock b/Cargo.lock new file mode 100644 -index 00000000..9cff614a +index 00000000..3b45d5eb --- /dev/null +++ b/Cargo.lock -@@ -0,0 +1,2181 @@ +@@ -0,0 +1,2272 @@ +# This file is automatically @generated by Cargo. +# It is not intended for manual editing. +[[package]] @@ -31,6 +31,11 @@ index 00000000..9cff614a +] + +[[package]] ++name = "anyhow" ++version = "1.0.19" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++ ++[[package]] +name = "arrayref" +version = "0.3.5" +source = "registry+https://github.com/rust-lang/crates.io-index" @@ -86,6 +91,11 @@ index 00000000..9cff614a +] + +[[package]] ++name = "base64" ++version = "0.11.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++ ++[[package]] +name = "bincode" +version = "1.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" @@ -109,7 +119,7 @@ index 00000000..9cff614a + "lazy_static 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)", + "log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)", + "peeking_take_while 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)", -+ "proc-macro2 1.0.5 (registry+https://github.com/rust-lang/crates.io-index)", ++ "proc-macro2 1.0.6 (registry+https://github.com/rust-lang/crates.io-index)", + "quote 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)", + "regex 1.3.1 (registry+https://github.com/rust-lang/crates.io-index)", + "rustc-hash 1.0.1 (registry+https://github.com/rust-lang/crates.io-index)", @@ -283,48 +293,57 @@ index 00000000..9cff614a +source = "registry+https://github.com/rust-lang/crates.io-index" + +[[package]] ++name = "cpu-time" ++version = "1.0.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "libc 0.2.64 (registry+https://github.com/rust-lang/crates.io-index)", ++ "winapi 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] +name = "cranelift-bforest" -+version = "0.46.1" ++version = "0.49.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +dependencies = [ -+ "cranelift-entity 0.46.1 (registry+https://github.com/rust-lang/crates.io-index)", ++ "cranelift-entity 0.49.0 (registry+https://github.com/rust-lang/crates.io-index)", +] + +[[package]] +name = "cranelift-codegen" -+version = "0.46.1" ++version = "0.49.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +dependencies = [ -+ "cranelift-bforest 0.46.1 (registry+https://github.com/rust-lang/crates.io-index)", -+ "cranelift-codegen-meta 0.46.1 (registry+https://github.com/rust-lang/crates.io-index)", -+ "cranelift-codegen-shared 0.46.1 (registry+https://github.com/rust-lang/crates.io-index)", -+ "cranelift-entity 0.46.1 (registry+https://github.com/rust-lang/crates.io-index)", -+ "failure 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)", -+ "failure_derive 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)", ++ "byteorder 1.3.2 (registry+https://github.com/rust-lang/crates.io-index)", ++ "cranelift-bforest 0.49.0 (registry+https://github.com/rust-lang/crates.io-index)", ++ "cranelift-codegen-meta 0.49.0 (registry+https://github.com/rust-lang/crates.io-index)", ++ "cranelift-codegen-shared 0.49.0 (registry+https://github.com/rust-lang/crates.io-index)", ++ "cranelift-entity 0.49.0 (registry+https://github.com/rust-lang/crates.io-index)", + "hashbrown 0.6.1 (registry+https://github.com/rust-lang/crates.io-index)", + "log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)", + "serde 1.0.101 (registry+https://github.com/rust-lang/crates.io-index)", -+ "smallvec 0.6.10 (registry+https://github.com/rust-lang/crates.io-index)", -+ "target-lexicon 0.8.1 (registry+https://github.com/rust-lang/crates.io-index)", ++ "smallvec 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)", ++ "target-lexicon 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)", ++ "thiserror 1.0.5 (registry+https://github.com/rust-lang/crates.io-index)", +] + +[[package]] +name = "cranelift-codegen-meta" -+version = "0.46.1" ++version = "0.49.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +dependencies = [ -+ "cranelift-codegen-shared 0.46.1 (registry+https://github.com/rust-lang/crates.io-index)", -+ "cranelift-entity 0.46.1 (registry+https://github.com/rust-lang/crates.io-index)", ++ "cranelift-codegen-shared 0.49.0 (registry+https://github.com/rust-lang/crates.io-index)", ++ "cranelift-entity 0.49.0 (registry+https://github.com/rust-lang/crates.io-index)", +] + +[[package]] +name = "cranelift-codegen-shared" -+version = "0.46.1" ++version = "0.49.0" +source = "registry+https://github.com/rust-lang/crates.io-index" + +[[package]] +name = "cranelift-entity" -+version = "0.46.1" ++version = "0.49.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +dependencies = [ + "serde 1.0.101 (registry+https://github.com/rust-lang/crates.io-index)", @@ -332,39 +351,38 @@ index 00000000..9cff614a + +[[package]] +name = "cranelift-frontend" -+version = "0.46.1" ++version = "0.49.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +dependencies = [ -+ "cranelift-codegen 0.46.1 (registry+https://github.com/rust-lang/crates.io-index)", ++ "cranelift-codegen 0.49.0 (registry+https://github.com/rust-lang/crates.io-index)", + "hashbrown 0.6.1 (registry+https://github.com/rust-lang/crates.io-index)", + "log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)", -+ "smallvec 0.6.10 (registry+https://github.com/rust-lang/crates.io-index)", -+ "target-lexicon 0.8.1 (registry+https://github.com/rust-lang/crates.io-index)", ++ "smallvec 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)", ++ "target-lexicon 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)", +] + +[[package]] +name = "cranelift-native" -+version = "0.46.1" ++version = "0.49.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +dependencies = [ -+ "cranelift-codegen 0.46.1 (registry+https://github.com/rust-lang/crates.io-index)", -+ "raw-cpuid 6.1.0 (registry+https://github.com/rust-lang/crates.io-index)", -+ "target-lexicon 0.8.1 (registry+https://github.com/rust-lang/crates.io-index)", ++ "cranelift-codegen 0.49.0 (registry+https://github.com/rust-lang/crates.io-index)", ++ "raw-cpuid 7.0.3 (registry+https://github.com/rust-lang/crates.io-index)", ++ "target-lexicon 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)", +] + +[[package]] +name = "cranelift-wasm" -+version = "0.46.1" ++version = "0.49.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +dependencies = [ -+ "cranelift-codegen 0.46.1 (registry+https://github.com/rust-lang/crates.io-index)", -+ "cranelift-entity 0.46.1 (registry+https://github.com/rust-lang/crates.io-index)", -+ "cranelift-frontend 0.46.1 (registry+https://github.com/rust-lang/crates.io-index)", -+ "failure 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)", -+ "failure_derive 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)", ++ "cranelift-codegen 0.49.0 (registry+https://github.com/rust-lang/crates.io-index)", ++ "cranelift-entity 0.49.0 (registry+https://github.com/rust-lang/crates.io-index)", ++ "cranelift-frontend 0.49.0 (registry+https://github.com/rust-lang/crates.io-index)", + "hashbrown 0.6.1 (registry+https://github.com/rust-lang/crates.io-index)", + "log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)", + "serde 1.0.101 (registry+https://github.com/rust-lang/crates.io-index)", ++ "thiserror 1.0.5 (registry+https://github.com/rust-lang/crates.io-index)", + "wasmparser 0.39.2 (registry+https://github.com/rust-lang/crates.io-index)", +] + @@ -386,7 +404,7 @@ index 00000000..9cff614a + "cfg-if 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)", + "crossbeam-utils 0.6.6 (registry+https://github.com/rust-lang/crates.io-index)", + "lazy_static 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)", -+ "memoffset 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)", ++ "memoffset 0.5.3 (registry+https://github.com/rust-lang/crates.io-index)", + "scopeguard 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)", +] + @@ -472,7 +490,7 @@ index 00000000..9cff614a + "byteorder 1.3.2 (registry+https://github.com/rust-lang/crates.io-index)", + "lazy_static 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)", + "owning_ref 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)", -+ "proc-macro2 1.0.5 (registry+https://github.com/rust-lang/crates.io-index)", ++ "proc-macro2 1.0.6 (registry+https://github.com/rust-lang/crates.io-index)", + "quote 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)", + "syn 1.0.5 (registry+https://github.com/rust-lang/crates.io-index)", +] @@ -524,16 +542,16 @@ index 00000000..9cff614a + +[[package]] +name = "faerie" -+version = "0.11.0" ++version = "0.12.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +dependencies = [ + "failure 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)", -+ "goblin 0.0.24 (registry+https://github.com/rust-lang/crates.io-index)", ++ "goblin 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)", + "indexmap 1.2.0 (registry+https://github.com/rust-lang/crates.io-index)", + "log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)", -+ "scroll 0.9.2 (registry+https://github.com/rust-lang/crates.io-index)", ++ "scroll 0.10.1 (registry+https://github.com/rust-lang/crates.io-index)", + "string-interner 0.7.1 (registry+https://github.com/rust-lang/crates.io-index)", -+ "target-lexicon 0.8.1 (registry+https://github.com/rust-lang/crates.io-index)", ++ "target-lexicon 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)", +] + +[[package]] @@ -550,7 +568,7 @@ index 00000000..9cff614a +version = "0.1.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +dependencies = [ -+ "proc-macro2 1.0.5 (registry+https://github.com/rust-lang/crates.io-index)", ++ "proc-macro2 1.0.6 (registry+https://github.com/rust-lang/crates.io-index)", + "quote 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)", + "syn 1.0.5 (registry+https://github.com/rust-lang/crates.io-index)", + "synstructure 0.12.1 (registry+https://github.com/rust-lang/crates.io-index)", @@ -619,7 +637,7 @@ index 00000000..9cff614a +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +dependencies = [ -+ "proc-macro2 1.0.5 (registry+https://github.com/rust-lang/crates.io-index)", ++ "proc-macro2 1.0.6 (registry+https://github.com/rust-lang/crates.io-index)", + "quote 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)", + "syn 1.0.5 (registry+https://github.com/rust-lang/crates.io-index)", +] @@ -638,22 +656,17 @@ index 00000000..9cff614a + +[[package]] +name = "glob" -+version = "0.2.11" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+ -+[[package]] -+name = "glob" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" + +[[package]] +name = "goblin" -+version = "0.0.24" ++version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +dependencies = [ + "log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)", + "plain 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)", -+ "scroll 0.9.2 (registry+https://github.com/rust-lang/crates.io-index)", ++ "scroll 0.10.1 (registry+https://github.com/rust-lang/crates.io-index)", +] + +[[package]] @@ -711,7 +724,7 @@ index 00000000..9cff614a +source = "registry+https://github.com/rust-lang/crates.io-index" +dependencies = [ + "proc-macro-hack 0.5.11 (registry+https://github.com/rust-lang/crates.io-index)", -+ "proc-macro2 1.0.5 (registry+https://github.com/rust-lang/crates.io-index)", ++ "proc-macro2 1.0.6 (registry+https://github.com/rust-lang/crates.io-index)", + "quote 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)", + "syn 1.0.5 (registry+https://github.com/rust-lang/crates.io-index)", + "unindent 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)", @@ -732,7 +745,7 @@ index 00000000..9cff614a +version = "0.1.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +dependencies = [ -+ "proc-macro2 1.0.5 (registry+https://github.com/rust-lang/crates.io-index)", ++ "proc-macro2 1.0.6 (registry+https://github.com/rust-lang/crates.io-index)", + "quote 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)", + "syn 1.0.5 (registry+https://github.com/rust-lang/crates.io-index)", +] @@ -789,21 +802,21 @@ index 00000000..9cff614a +version = "0.0.0" +dependencies = [ + "capstone 0.6.0 (registry+https://github.com/rust-lang/crates.io-index)", -+ "cranelift-codegen 0.46.1 (registry+https://github.com/rust-lang/crates.io-index)", ++ "cranelift-codegen 0.49.0 (registry+https://github.com/rust-lang/crates.io-index)", + "dynasm 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)", + "dynasmrt 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)", + "either 1.5.3 (registry+https://github.com/rust-lang/crates.io-index)", -+ "failure 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)", -+ "failure_derive 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)", + "itertools 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)", + "lazy_static 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)", -+ "memoffset 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)", ++ "memoffset 0.5.3 (registry+https://github.com/rust-lang/crates.io-index)", ++ "more-asserts 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)", + "multi_mut 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)", + "quickcheck 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)", -+ "smallvec 0.6.10 (registry+https://github.com/rust-lang/crates.io-index)", ++ "smallvec 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)", ++ "thiserror 1.0.5 (registry+https://github.com/rust-lang/crates.io-index)", + "typemap 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)", -+ "wabt 0.9.2 (registry+https://github.com/rust-lang/crates.io-index)", + "wasmparser 0.39.2 (registry+https://github.com/rust-lang/crates.io-index)", ++ "wat 1.0.3 (registry+https://github.com/rust-lang/crates.io-index)", +] + +[[package]] @@ -838,13 +851,18 @@ index 00000000..9cff614a + +[[package]] +name = "memoffset" -+version = "0.5.1" ++version = "0.5.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +dependencies = [ + "rustc_version 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)", +] + +[[package]] ++name = "more-asserts" ++version = "0.2.1" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++ ++[[package]] +name = "multi_mut" +version = "0.1.3" +source = "registry+https://github.com/rust-lang/crates.io-index" @@ -876,6 +894,27 @@ index 00000000..9cff614a +] + +[[package]] ++name = "num" ++version = "0.2.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "num-complex 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)", ++ "num-integer 0.1.41 (registry+https://github.com/rust-lang/crates.io-index)", ++ "num-iter 0.1.39 (registry+https://github.com/rust-lang/crates.io-index)", ++ "num-rational 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)", ++ "num-traits 0.2.8 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "num-complex" ++version = "0.2.3" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "autocfg 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)", ++ "num-traits 0.2.8 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] +name = "num-integer" +version = "0.1.41" +source = "registry+https://github.com/rust-lang/crates.io-index" @@ -885,6 +924,26 @@ index 00000000..9cff614a +] + +[[package]] ++name = "num-iter" ++version = "0.1.39" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "autocfg 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)", ++ "num-integer 0.1.41 (registry+https://github.com/rust-lang/crates.io-index)", ++ "num-traits 0.2.8 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "num-rational" ++version = "0.2.2" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "autocfg 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)", ++ "num-integer 0.1.41 (registry+https://github.com/rust-lang/crates.io-index)", ++ "num-traits 0.2.8 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] +name = "num-traits" +version = "0.2.8" +source = "registry+https://github.com/rust-lang/crates.io-index" @@ -906,6 +965,15 @@ index 00000000..9cff614a +source = "registry+https://github.com/rust-lang/crates.io-index" + +[[package]] ++name = "os_pipe" ++version = "0.9.1" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "libc 0.2.64 (registry+https://github.com/rust-lang/crates.io-index)", ++ "winapi 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] +name = "owning_ref" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" @@ -928,7 +996,7 @@ index 00000000..9cff614a +source = "registry+https://github.com/rust-lang/crates.io-index" +dependencies = [ + "proc-macro-hack 0.5.11 (registry+https://github.com/rust-lang/crates.io-index)", -+ "proc-macro2 1.0.5 (registry+https://github.com/rust-lang/crates.io-index)", ++ "proc-macro2 1.0.6 (registry+https://github.com/rust-lang/crates.io-index)", + "quote 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)", + "syn 1.0.5 (registry+https://github.com/rust-lang/crates.io-index)", +] @@ -963,22 +1031,14 @@ index 00000000..9cff614a +version = "0.5.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +dependencies = [ -+ "proc-macro2 1.0.5 (registry+https://github.com/rust-lang/crates.io-index)", ++ "proc-macro2 1.0.6 (registry+https://github.com/rust-lang/crates.io-index)", + "quote 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)", + "syn 1.0.5 (registry+https://github.com/rust-lang/crates.io-index)", +] + +[[package]] +name = "proc-macro2" -+version = "0.4.30" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+dependencies = [ -+ "unicode-xid 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)", -+] -+ -+[[package]] -+name = "proc-macro2" -+version = "1.0.5" ++version = "1.0.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +dependencies = [ + "unicode-xid 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)", @@ -1009,7 +1069,7 @@ index 00000000..9cff614a +version = "0.8.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +dependencies = [ -+ "proc-macro2 1.0.5 (registry+https://github.com/rust-lang/crates.io-index)", ++ "proc-macro2 1.0.6 (registry+https://github.com/rust-lang/crates.io-index)", + "quote 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)", + "syn 1.0.5 (registry+https://github.com/rust-lang/crates.io-index)", +] @@ -1019,7 +1079,7 @@ index 00000000..9cff614a +version = "0.8.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +dependencies = [ -+ "proc-macro2 1.0.5 (registry+https://github.com/rust-lang/crates.io-index)", ++ "proc-macro2 1.0.6 (registry+https://github.com/rust-lang/crates.io-index)", + "pyo3-derive-backend 0.8.1 (registry+https://github.com/rust-lang/crates.io-index)", + "quote 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)", + "syn 1.0.5 (registry+https://github.com/rust-lang/crates.io-index)", @@ -1043,18 +1103,10 @@ index 00000000..9cff614a + +[[package]] +name = "quote" -+version = "0.6.13" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+dependencies = [ -+ "proc-macro2 0.4.30 (registry+https://github.com/rust-lang/crates.io-index)", -+] -+ -+[[package]] -+name = "quote" +version = "1.0.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +dependencies = [ -+ "proc-macro2 1.0.5 (registry+https://github.com/rust-lang/crates.io-index)", ++ "proc-macro2 1.0.6 (registry+https://github.com/rust-lang/crates.io-index)", +] + +[[package]] @@ -1132,7 +1184,7 @@ index 00000000..9cff614a + +[[package]] +name = "raw-cpuid" -+version = "6.1.0" ++version = "7.0.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +dependencies = [ + "bitflags 1.2.1 (registry+https://github.com/rust-lang/crates.io-index)", @@ -1264,21 +1316,20 @@ index 00000000..9cff614a + +[[package]] +name = "scroll" -+version = "0.9.2" ++version = "0.10.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +dependencies = [ -+ "rustc_version 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)", -+ "scroll_derive 0.9.5 (registry+https://github.com/rust-lang/crates.io-index)", ++ "scroll_derive 0.10.1 (registry+https://github.com/rust-lang/crates.io-index)", +] + +[[package]] +name = "scroll_derive" -+version = "0.9.5" ++version = "0.10.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +dependencies = [ -+ "proc-macro2 0.4.30 (registry+https://github.com/rust-lang/crates.io-index)", -+ "quote 0.6.13 (registry+https://github.com/rust-lang/crates.io-index)", -+ "syn 0.15.44 (registry+https://github.com/rust-lang/crates.io-index)", ++ "proc-macro2 1.0.6 (registry+https://github.com/rust-lang/crates.io-index)", ++ "quote 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)", ++ "syn 1.0.5 (registry+https://github.com/rust-lang/crates.io-index)", +] + +[[package]] @@ -1307,7 +1358,7 @@ index 00000000..9cff614a +version = "1.0.101" +source = "registry+https://github.com/rust-lang/crates.io-index" +dependencies = [ -+ "proc-macro2 1.0.5 (registry+https://github.com/rust-lang/crates.io-index)", ++ "proc-macro2 1.0.6 (registry+https://github.com/rust-lang/crates.io-index)", + "quote 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)", + "syn 1.0.5 (registry+https://github.com/rust-lang/crates.io-index)", +] @@ -1340,7 +1391,7 @@ index 00000000..9cff614a + +[[package]] +name = "smallvec" -+version = "0.6.10" ++version = "1.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" + +[[package]] @@ -1373,20 +1424,10 @@ index 00000000..9cff614a + +[[package]] +name = "syn" -+version = "0.15.44" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+dependencies = [ -+ "proc-macro2 0.4.30 (registry+https://github.com/rust-lang/crates.io-index)", -+ "quote 0.6.13 (registry+https://github.com/rust-lang/crates.io-index)", -+ "unicode-xid 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)", -+] -+ -+[[package]] -+name = "syn" +version = "1.0.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +dependencies = [ -+ "proc-macro2 1.0.5 (registry+https://github.com/rust-lang/crates.io-index)", ++ "proc-macro2 1.0.6 (registry+https://github.com/rust-lang/crates.io-index)", + "quote 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)", + "unicode-xid 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)", +] @@ -1396,7 +1437,7 @@ index 00000000..9cff614a +version = "0.12.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +dependencies = [ -+ "proc-macro2 1.0.5 (registry+https://github.com/rust-lang/crates.io-index)", ++ "proc-macro2 1.0.6 (registry+https://github.com/rust-lang/crates.io-index)", + "quote 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)", + "syn 1.0.5 (registry+https://github.com/rust-lang/crates.io-index)", + "unicode-xid 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)", @@ -1404,13 +1445,8 @@ index 00000000..9cff614a + +[[package]] +name = "target-lexicon" -+version = "0.8.1" ++version = "0.9.0" +source = "registry+https://github.com/rust-lang/crates.io-index" -+dependencies = [ -+ "failure 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)", -+ "failure_derive 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)", -+ "serde_json 1.0.41 (registry+https://github.com/rust-lang/crates.io-index)", -+] + +[[package]] +name = "tempfile" @@ -1442,6 +1478,24 @@ index 00000000..9cff614a +] + +[[package]] ++name = "thiserror" ++version = "1.0.5" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "thiserror-impl 1.0.5 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "thiserror-impl" ++version = "1.0.5" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "proc-macro2 1.0.6 (registry+https://github.com/rust-lang/crates.io-index)", ++ "quote 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)", ++ "syn 1.0.5 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] +name = "thread_local" +version = "0.3.6" +source = "registry+https://github.com/rust-lang/crates.io-index" @@ -1461,7 +1515,7 @@ index 00000000..9cff614a + +[[package]] +name = "toml" -+version = "0.5.3" ++version = "0.5.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +dependencies = [ + "serde 1.0.101 (registry+https://github.com/rust-lang/crates.io-index)", @@ -1473,6 +1527,19 @@ index 00000000..9cff614a +source = "registry+https://github.com/rust-lang/crates.io-index" + +[[package]] ++name = "trybuild" ++version = "1.0.17" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "glob 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)", ++ "lazy_static 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)", ++ "serde 1.0.101 (registry+https://github.com/rust-lang/crates.io-index)", ++ "serde_json 1.0.41 (registry+https://github.com/rust-lang/crates.io-index)", ++ "termcolor 1.0.5 (registry+https://github.com/rust-lang/crates.io-index)", ++ "toml 0.5.5 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] +name = "typemap" +version = "0.3.3" +source = "registry+https://github.com/rust-lang/crates.io-index" @@ -1497,11 +1564,6 @@ index 00000000..9cff614a + +[[package]] +name = "unicode-xid" -+version = "0.1.0" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+ -+[[package]] -+name = "unicode-xid" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" + @@ -1539,46 +1601,25 @@ index 00000000..9cff614a +source = "registry+https://github.com/rust-lang/crates.io-index" + +[[package]] -+name = "wabt" -+version = "0.9.2" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+dependencies = [ -+ "serde 1.0.101 (registry+https://github.com/rust-lang/crates.io-index)", -+ "serde_derive 1.0.101 (registry+https://github.com/rust-lang/crates.io-index)", -+ "serde_json 1.0.41 (registry+https://github.com/rust-lang/crates.io-index)", -+ "wabt-sys 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)", -+] -+ -+[[package]] -+name = "wabt-sys" -+version = "0.7.0" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+dependencies = [ -+ "cc 1.0.46 (registry+https://github.com/rust-lang/crates.io-index)", -+ "cmake 0.1.42 (registry+https://github.com/rust-lang/crates.io-index)", -+ "glob 0.2.11 (registry+https://github.com/rust-lang/crates.io-index)", -+] -+ -+[[package]] +name = "walrus" -+version = "0.12.0" ++version = "0.13.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +dependencies = [ -+ "failure 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)", ++ "anyhow 1.0.19 (registry+https://github.com/rust-lang/crates.io-index)", + "id-arena 2.2.1 (registry+https://github.com/rust-lang/crates.io-index)", + "leb128 0.2.4 (registry+https://github.com/rust-lang/crates.io-index)", + "log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)", -+ "walrus-macro 0.12.0 (registry+https://github.com/rust-lang/crates.io-index)", -+ "wasmparser 0.37.2 (registry+https://github.com/rust-lang/crates.io-index)", ++ "walrus-macro 0.13.0 (registry+https://github.com/rust-lang/crates.io-index)", ++ "wasmparser 0.39.2 (registry+https://github.com/rust-lang/crates.io-index)", +] + +[[package]] +name = "walrus-macro" -+version = "0.12.0" ++version = "0.13.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +dependencies = [ + "heck 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)", -+ "proc-macro2 1.0.5 (registry+https://github.com/rust-lang/crates.io-index)", ++ "proc-macro2 1.0.6 (registry+https://github.com/rust-lang/crates.io-index)", + "quote 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)", + "syn 1.0.5 (registry+https://github.com/rust-lang/crates.io-index)", +] @@ -1590,48 +1631,57 @@ index 00000000..9cff614a + +[[package]] +name = "wasi-common" -+version = "0.1.0" -+source = "git+https://github.com/CraneStation/wasi-common?rev=c3bf040#c3bf04042e03c706088de62acf1cd7aa79f0fa50" ++version = "0.5.0" +dependencies = [ ++ "anyhow 1.0.19 (registry+https://github.com/rust-lang/crates.io-index)", + "cfg-if 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)", -+ "failure 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)", ++ "cpu-time 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)", ++ "cranelift-codegen 0.49.0 (registry+https://github.com/rust-lang/crates.io-index)", + "filetime 0.2.7 (registry+https://github.com/rust-lang/crates.io-index)", ++ "lazy_static 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)", + "libc 0.2.64 (registry+https://github.com/rust-lang/crates.io-index)", + "log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)", + "nix 0.15.0 (registry+https://github.com/rust-lang/crates.io-index)", ++ "num 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)", ++ "os_pipe 0.9.1 (registry+https://github.com/rust-lang/crates.io-index)", ++ "pretty_env_logger 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)", + "rand 0.7.2 (registry+https://github.com/rust-lang/crates.io-index)", -+ "wasi-common-cbindgen 0.1.0 (git+https://github.com/CraneStation/wasi-common?rev=c3bf040)", ++ "target-lexicon 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)", ++ "tempfile 3.1.0 (registry+https://github.com/rust-lang/crates.io-index)", ++ "thiserror 1.0.5 (registry+https://github.com/rust-lang/crates.io-index)", ++ "wasi-common-cbindgen 0.5.0", ++ "wasmtime 0.1.0", ++ "wasmtime-environ 0.2.0", ++ "wasmtime-jit 0.2.0", ++ "wasmtime-runtime 0.2.0", ++ "wasmtime-wasi 0.2.0", ++ "wig 0.1.0", + "winapi 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)", -+ "winx 0.1.0 (git+https://github.com/CraneStation/wasi-common?rev=c3bf040)", ++ "winx 0.5.0", +] + +[[package]] +name = "wasi-common-cbindgen" -+version = "0.1.0" -+source = "git+https://github.com/CraneStation/wasi-common?rev=c3bf040#c3bf04042e03c706088de62acf1cd7aa79f0fa50" ++version = "0.5.0" +dependencies = [ + "quote 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)", + "syn 1.0.5 (registry+https://github.com/rust-lang/crates.io-index)", ++ "trybuild 1.0.17 (registry+https://github.com/rust-lang/crates.io-index)", +] + +[[package]] +name = "wasm-webidl-bindings" -+version = "0.5.0" ++version = "0.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +dependencies = [ -+ "failure 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)", ++ "anyhow 1.0.19 (registry+https://github.com/rust-lang/crates.io-index)", + "id-arena 2.2.1 (registry+https://github.com/rust-lang/crates.io-index)", + "leb128 0.2.4 (registry+https://github.com/rust-lang/crates.io-index)", -+ "walrus 0.12.0 (registry+https://github.com/rust-lang/crates.io-index)", ++ "walrus 0.13.0 (registry+https://github.com/rust-lang/crates.io-index)", +] + +[[package]] +name = "wasmparser" -+version = "0.37.2" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+ -+[[package]] -+name = "wasmparser" +version = "0.39.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +dependencies = [ @@ -1640,78 +1690,79 @@ index 00000000..9cff614a + +[[package]] +name = "wasmtime" -+version = "0.2.0" ++version = "0.1.0" +dependencies = [ -+ "cranelift-codegen 0.46.1 (registry+https://github.com/rust-lang/crates.io-index)", -+ "cranelift-entity 0.46.1 (registry+https://github.com/rust-lang/crates.io-index)", -+ "cranelift-native 0.46.1 (registry+https://github.com/rust-lang/crates.io-index)", -+ "cranelift-wasm 0.46.1 (registry+https://github.com/rust-lang/crates.io-index)", ++ "anyhow 1.0.19 (registry+https://github.com/rust-lang/crates.io-index)", ++ "cranelift-codegen 0.49.0 (registry+https://github.com/rust-lang/crates.io-index)", ++ "cranelift-entity 0.49.0 (registry+https://github.com/rust-lang/crates.io-index)", ++ "cranelift-frontend 0.49.0 (registry+https://github.com/rust-lang/crates.io-index)", ++ "cranelift-native 0.49.0 (registry+https://github.com/rust-lang/crates.io-index)", ++ "cranelift-wasm 0.49.0 (registry+https://github.com/rust-lang/crates.io-index)", + "docopt 1.1.0 (registry+https://github.com/rust-lang/crates.io-index)", -+ "faerie 0.11.0 (registry+https://github.com/rust-lang/crates.io-index)", -+ "failure 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)", + "file-per-thread-logger 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)", -+ "libc 0.2.64 (registry+https://github.com/rust-lang/crates.io-index)", ++ "hashbrown 0.6.1 (registry+https://github.com/rust-lang/crates.io-index)", + "pretty_env_logger 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)", + "rayon 1.2.0 (registry+https://github.com/rust-lang/crates.io-index)", ++ "region 2.1.2 (registry+https://github.com/rust-lang/crates.io-index)", + "serde 1.0.101 (registry+https://github.com/rust-lang/crates.io-index)", -+ "target-lexicon 0.8.1 (registry+https://github.com/rust-lang/crates.io-index)", -+ "wabt 0.9.2 (registry+https://github.com/rust-lang/crates.io-index)", -+ "wasi-common 0.1.0 (git+https://github.com/CraneStation/wasi-common?rev=c3bf040)", -+ "wasm-webidl-bindings 0.5.0 (registry+https://github.com/rust-lang/crates.io-index)", -+ "wasmtime-api 0.1.0", -+ "wasmtime-debug 0.2.0", ++ "target-lexicon 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)", ++ "thiserror 1.0.5 (registry+https://github.com/rust-lang/crates.io-index)", ++ "wasi-common 0.5.0", ++ "wasmparser 0.39.2 (registry+https://github.com/rust-lang/crates.io-index)", + "wasmtime-environ 0.2.0", -+ "wasmtime-interface-types 0.2.0", + "wasmtime-jit 0.2.0", -+ "wasmtime-obj 0.2.0", + "wasmtime-runtime 0.2.0", + "wasmtime-wasi 0.2.0", -+ "wasmtime-wasi-c 0.2.0", + "wasmtime-wast 0.2.0", +] + +[[package]] -+name = "wasmtime-api" -+version = "0.1.0" ++name = "wasmtime-cli" ++version = "0.2.0" +dependencies = [ -+ "cranelift-codegen 0.46.1 (registry+https://github.com/rust-lang/crates.io-index)", -+ "cranelift-entity 0.46.1 (registry+https://github.com/rust-lang/crates.io-index)", -+ "cranelift-frontend 0.46.1 (registry+https://github.com/rust-lang/crates.io-index)", -+ "cranelift-native 0.46.1 (registry+https://github.com/rust-lang/crates.io-index)", -+ "cranelift-wasm 0.46.1 (registry+https://github.com/rust-lang/crates.io-index)", ++ "anyhow 1.0.19 (registry+https://github.com/rust-lang/crates.io-index)", ++ "cranelift-codegen 0.49.0 (registry+https://github.com/rust-lang/crates.io-index)", ++ "cranelift-entity 0.49.0 (registry+https://github.com/rust-lang/crates.io-index)", ++ "cranelift-native 0.49.0 (registry+https://github.com/rust-lang/crates.io-index)", ++ "cranelift-wasm 0.49.0 (registry+https://github.com/rust-lang/crates.io-index)", + "docopt 1.1.0 (registry+https://github.com/rust-lang/crates.io-index)", -+ "failure 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)", -+ "failure_derive 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)", ++ "faerie 0.12.0 (registry+https://github.com/rust-lang/crates.io-index)", + "file-per-thread-logger 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)", -+ "hashbrown 0.6.1 (registry+https://github.com/rust-lang/crates.io-index)", ++ "libc 0.2.64 (registry+https://github.com/rust-lang/crates.io-index)", ++ "more-asserts 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)", + "pretty_env_logger 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)", + "rayon 1.2.0 (registry+https://github.com/rust-lang/crates.io-index)", -+ "region 2.1.2 (registry+https://github.com/rust-lang/crates.io-index)", + "serde 1.0.101 (registry+https://github.com/rust-lang/crates.io-index)", -+ "target-lexicon 0.8.1 (registry+https://github.com/rust-lang/crates.io-index)", -+ "wabt 0.9.2 (registry+https://github.com/rust-lang/crates.io-index)", -+ "wasi-common 0.1.0 (git+https://github.com/CraneStation/wasi-common?rev=c3bf040)", -+ "wasmparser 0.39.2 (registry+https://github.com/rust-lang/crates.io-index)", ++ "target-lexicon 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)", ++ "wasi-common 0.5.0", ++ "wasm-webidl-bindings 0.6.0 (registry+https://github.com/rust-lang/crates.io-index)", ++ "wasmtime 0.1.0", ++ "wasmtime-debug 0.2.0", + "wasmtime-environ 0.2.0", ++ "wasmtime-interface-types 0.2.0", + "wasmtime-jit 0.2.0", ++ "wasmtime-obj 0.2.0", + "wasmtime-runtime 0.2.0", + "wasmtime-wasi 0.2.0", ++ "wasmtime-wasi-c 0.2.0", + "wasmtime-wast 0.2.0", ++ "wat 1.0.3 (registry+https://github.com/rust-lang/crates.io-index)", +] + +[[package]] +name = "wasmtime-debug" +version = "0.2.0" +dependencies = [ -+ "cranelift-codegen 0.46.1 (registry+https://github.com/rust-lang/crates.io-index)", -+ "cranelift-entity 0.46.1 (registry+https://github.com/rust-lang/crates.io-index)", -+ "cranelift-wasm 0.46.1 (registry+https://github.com/rust-lang/crates.io-index)", -+ "faerie 0.11.0 (registry+https://github.com/rust-lang/crates.io-index)", ++ "cranelift-codegen 0.49.0 (registry+https://github.com/rust-lang/crates.io-index)", ++ "cranelift-entity 0.49.0 (registry+https://github.com/rust-lang/crates.io-index)", ++ "cranelift-wasm 0.49.0 (registry+https://github.com/rust-lang/crates.io-index)", ++ "faerie 0.12.0 (registry+https://github.com/rust-lang/crates.io-index)", + "failure 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)", -+ "failure_derive 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)", + "gimli 0.19.0 (registry+https://github.com/rust-lang/crates.io-index)", + "hashbrown 0.6.1 (registry+https://github.com/rust-lang/crates.io-index)", -+ "target-lexicon 0.8.1 (registry+https://github.com/rust-lang/crates.io-index)", ++ "more-asserts 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)", ++ "target-lexicon 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)", ++ "thiserror 1.0.5 (registry+https://github.com/rust-lang/crates.io-index)", + "wasmparser 0.39.2 (registry+https://github.com/rust-lang/crates.io-index)", + "wasmtime-environ 0.2.0", +] @@ -1720,15 +1771,13 @@ index 00000000..9cff614a +name = "wasmtime-environ" +version = "0.2.0" +dependencies = [ -+ "base64 0.10.1 (registry+https://github.com/rust-lang/crates.io-index)", ++ "base64 0.11.0 (registry+https://github.com/rust-lang/crates.io-index)", + "bincode 1.2.0 (registry+https://github.com/rust-lang/crates.io-index)", -+ "cranelift-codegen 0.46.1 (registry+https://github.com/rust-lang/crates.io-index)", -+ "cranelift-entity 0.46.1 (registry+https://github.com/rust-lang/crates.io-index)", -+ "cranelift-wasm 0.46.1 (registry+https://github.com/rust-lang/crates.io-index)", ++ "cranelift-codegen 0.49.0 (registry+https://github.com/rust-lang/crates.io-index)", ++ "cranelift-entity 0.49.0 (registry+https://github.com/rust-lang/crates.io-index)", ++ "cranelift-wasm 0.49.0 (registry+https://github.com/rust-lang/crates.io-index)", + "directories 2.0.2 (registry+https://github.com/rust-lang/crates.io-index)", + "errno 0.2.4 (registry+https://github.com/rust-lang/crates.io-index)", -+ "failure 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)", -+ "failure_derive 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)", + "file-per-thread-logger 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)", + "filetime 0.2.7 (registry+https://github.com/rust-lang/crates.io-index)", + "indexmap 1.2.0 (registry+https://github.com/rust-lang/crates.io-index)", @@ -1736,27 +1785,29 @@ index 00000000..9cff614a + "libc 0.2.64 (registry+https://github.com/rust-lang/crates.io-index)", + "lightbeam 0.0.0", + "log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)", ++ "more-asserts 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)", + "pretty_env_logger 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)", + "rand 0.7.2 (registry+https://github.com/rust-lang/crates.io-index)", + "rayon 1.2.0 (registry+https://github.com/rust-lang/crates.io-index)", + "serde 1.0.101 (registry+https://github.com/rust-lang/crates.io-index)", + "sha2 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)", + "spin 0.5.2 (registry+https://github.com/rust-lang/crates.io-index)", -+ "target-lexicon 0.8.1 (registry+https://github.com/rust-lang/crates.io-index)", ++ "target-lexicon 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)", + "tempfile 3.1.0 (registry+https://github.com/rust-lang/crates.io-index)", -+ "toml 0.5.3 (registry+https://github.com/rust-lang/crates.io-index)", ++ "thiserror 1.0.5 (registry+https://github.com/rust-lang/crates.io-index)", ++ "toml 0.5.5 (registry+https://github.com/rust-lang/crates.io-index)", + "winapi 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)", -+ "zstd 0.4.28+zstd.1.4.3 (registry+https://github.com/rust-lang/crates.io-index)", ++ "zstd 0.5.1+zstd.1.4.4 (registry+https://github.com/rust-lang/crates.io-index)", +] + +[[package]] +name = "wasmtime-interface-types" +version = "0.2.0" +dependencies = [ -+ "cranelift-codegen 0.46.1 (registry+https://github.com/rust-lang/crates.io-index)", -+ "failure 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)", -+ "walrus 0.12.0 (registry+https://github.com/rust-lang/crates.io-index)", -+ "wasm-webidl-bindings 0.5.0 (registry+https://github.com/rust-lang/crates.io-index)", ++ "anyhow 1.0.19 (registry+https://github.com/rust-lang/crates.io-index)", ++ "cranelift-codegen 0.49.0 (registry+https://github.com/rust-lang/crates.io-index)", ++ "walrus 0.13.0 (registry+https://github.com/rust-lang/crates.io-index)", ++ "wasm-webidl-bindings 0.6.0 (registry+https://github.com/rust-lang/crates.io-index)", + "wasmparser 0.39.2 (registry+https://github.com/rust-lang/crates.io-index)", + "wasmtime-jit 0.2.0", + "wasmtime-runtime 0.2.0", @@ -1766,29 +1817,32 @@ index 00000000..9cff614a +name = "wasmtime-jit" +version = "0.2.0" +dependencies = [ -+ "cranelift-codegen 0.46.1 (registry+https://github.com/rust-lang/crates.io-index)", -+ "cranelift-entity 0.46.1 (registry+https://github.com/rust-lang/crates.io-index)", -+ "cranelift-frontend 0.46.1 (registry+https://github.com/rust-lang/crates.io-index)", -+ "cranelift-wasm 0.46.1 (registry+https://github.com/rust-lang/crates.io-index)", ++ "cranelift-codegen 0.49.0 (registry+https://github.com/rust-lang/crates.io-index)", ++ "cranelift-entity 0.49.0 (registry+https://github.com/rust-lang/crates.io-index)", ++ "cranelift-frontend 0.49.0 (registry+https://github.com/rust-lang/crates.io-index)", ++ "cranelift-wasm 0.49.0 (registry+https://github.com/rust-lang/crates.io-index)", + "failure 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)", -+ "failure_derive 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)", + "hashbrown 0.6.1 (registry+https://github.com/rust-lang/crates.io-index)", ++ "more-asserts 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)", + "region 2.1.2 (registry+https://github.com/rust-lang/crates.io-index)", -+ "target-lexicon 0.8.1 (registry+https://github.com/rust-lang/crates.io-index)", ++ "target-lexicon 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)", ++ "thiserror 1.0.5 (registry+https://github.com/rust-lang/crates.io-index)", + "wasmparser 0.39.2 (registry+https://github.com/rust-lang/crates.io-index)", + "wasmtime-debug 0.2.0", + "wasmtime-environ 0.2.0", + "wasmtime-runtime 0.2.0", ++ "winapi 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)", +] + +[[package]] +name = "wasmtime-obj" +version = "0.2.0" +dependencies = [ -+ "cranelift-codegen 0.46.1 (registry+https://github.com/rust-lang/crates.io-index)", -+ "cranelift-entity 0.46.1 (registry+https://github.com/rust-lang/crates.io-index)", -+ "cranelift-wasm 0.46.1 (registry+https://github.com/rust-lang/crates.io-index)", -+ "faerie 0.11.0 (registry+https://github.com/rust-lang/crates.io-index)", ++ "cranelift-codegen 0.49.0 (registry+https://github.com/rust-lang/crates.io-index)", ++ "cranelift-entity 0.49.0 (registry+https://github.com/rust-lang/crates.io-index)", ++ "cranelift-wasm 0.49.0 (registry+https://github.com/rust-lang/crates.io-index)", ++ "faerie 0.12.0 (registry+https://github.com/rust-lang/crates.io-index)", ++ "more-asserts 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)", + "wasmtime-environ 0.2.0", +] + @@ -1796,15 +1850,15 @@ index 00000000..9cff614a +name = "wasmtime-py" +version = "0.2.0" +dependencies = [ -+ "cranelift-codegen 0.46.1 (registry+https://github.com/rust-lang/crates.io-index)", -+ "cranelift-entity 0.46.1 (registry+https://github.com/rust-lang/crates.io-index)", -+ "cranelift-frontend 0.46.1 (registry+https://github.com/rust-lang/crates.io-index)", -+ "cranelift-native 0.46.1 (registry+https://github.com/rust-lang/crates.io-index)", -+ "cranelift-wasm 0.46.1 (registry+https://github.com/rust-lang/crates.io-index)", -+ "failure 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)", ++ "anyhow 1.0.19 (registry+https://github.com/rust-lang/crates.io-index)", ++ "cranelift-codegen 0.49.0 (registry+https://github.com/rust-lang/crates.io-index)", ++ "cranelift-entity 0.49.0 (registry+https://github.com/rust-lang/crates.io-index)", ++ "cranelift-frontend 0.49.0 (registry+https://github.com/rust-lang/crates.io-index)", ++ "cranelift-native 0.49.0 (registry+https://github.com/rust-lang/crates.io-index)", ++ "cranelift-wasm 0.49.0 (registry+https://github.com/rust-lang/crates.io-index)", + "pyo3 0.8.1 (registry+https://github.com/rust-lang/crates.io-index)", + "region 2.1.2 (registry+https://github.com/rust-lang/crates.io-index)", -+ "target-lexicon 0.8.1 (registry+https://github.com/rust-lang/crates.io-index)", ++ "target-lexicon 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)", + "wasmparser 0.39.2 (registry+https://github.com/rust-lang/crates.io-index)", + "wasmtime-environ 0.2.0", + "wasmtime-interface-types 0.2.0", @@ -1817,18 +1871,18 @@ index 00000000..9cff614a +version = "0.2.0" +dependencies = [ + "cc 1.0.46 (registry+https://github.com/rust-lang/crates.io-index)", -+ "cranelift-codegen 0.46.1 (registry+https://github.com/rust-lang/crates.io-index)", -+ "cranelift-entity 0.46.1 (registry+https://github.com/rust-lang/crates.io-index)", -+ "cranelift-wasm 0.46.1 (registry+https://github.com/rust-lang/crates.io-index)", -+ "failure 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)", -+ "failure_derive 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)", ++ "cranelift-codegen 0.49.0 (registry+https://github.com/rust-lang/crates.io-index)", ++ "cranelift-entity 0.49.0 (registry+https://github.com/rust-lang/crates.io-index)", ++ "cranelift-wasm 0.49.0 (registry+https://github.com/rust-lang/crates.io-index)", + "hashbrown 0.6.1 (registry+https://github.com/rust-lang/crates.io-index)", + "indexmap 1.2.0 (registry+https://github.com/rust-lang/crates.io-index)", + "lazy_static 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)", + "libc 0.2.64 (registry+https://github.com/rust-lang/crates.io-index)", -+ "memoffset 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)", ++ "memoffset 0.5.3 (registry+https://github.com/rust-lang/crates.io-index)", ++ "more-asserts 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)", + "region 2.1.2 (registry+https://github.com/rust-lang/crates.io-index)", + "spin 0.5.2 (registry+https://github.com/rust-lang/crates.io-index)", ++ "thiserror 1.0.5 (registry+https://github.com/rust-lang/crates.io-index)", + "wasmtime-environ 0.2.0", + "winapi 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)", +] @@ -1837,19 +1891,20 @@ index 00000000..9cff614a +name = "wasmtime-rust" +version = "0.2.0" +dependencies = [ -+ "cranelift-codegen 0.46.1 (registry+https://github.com/rust-lang/crates.io-index)", -+ "cranelift-native 0.46.1 (registry+https://github.com/rust-lang/crates.io-index)", -+ "failure 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)", ++ "anyhow 1.0.19 (registry+https://github.com/rust-lang/crates.io-index)", ++ "cranelift-codegen 0.49.0 (registry+https://github.com/rust-lang/crates.io-index)", ++ "cranelift-native 0.49.0 (registry+https://github.com/rust-lang/crates.io-index)", + "wasmtime-interface-types 0.2.0", + "wasmtime-jit 0.2.0", + "wasmtime-rust-macro 0.2.0", ++ "wasmtime-wasi 0.2.0", +] + +[[package]] +name = "wasmtime-rust-macro" +version = "0.2.0" +dependencies = [ -+ "proc-macro2 1.0.5 (registry+https://github.com/rust-lang/crates.io-index)", ++ "proc-macro2 1.0.6 (registry+https://github.com/rust-lang/crates.io-index)", + "quote 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)", + "syn 1.0.5 (registry+https://github.com/rust-lang/crates.io-index)", +] @@ -1858,12 +1913,12 @@ index 00000000..9cff614a +name = "wasmtime-wasi" +version = "0.2.0" +dependencies = [ -+ "cranelift-codegen 0.46.1 (registry+https://github.com/rust-lang/crates.io-index)", -+ "cranelift-entity 0.46.1 (registry+https://github.com/rust-lang/crates.io-index)", -+ "cranelift-wasm 0.46.1 (registry+https://github.com/rust-lang/crates.io-index)", ++ "cranelift-codegen 0.49.0 (registry+https://github.com/rust-lang/crates.io-index)", ++ "cranelift-entity 0.49.0 (registry+https://github.com/rust-lang/crates.io-index)", ++ "cranelift-wasm 0.49.0 (registry+https://github.com/rust-lang/crates.io-index)", + "log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)", -+ "target-lexicon 0.8.1 (registry+https://github.com/rust-lang/crates.io-index)", -+ "wasi-common 0.1.0 (git+https://github.com/CraneStation/wasi-common?rev=c3bf040)", ++ "target-lexicon 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)", ++ "wasi-common 0.5.0", + "wasmtime-environ 0.2.0", + "wasmtime-jit 0.2.0", + "wasmtime-runtime 0.2.0", @@ -1875,12 +1930,13 @@ index 00000000..9cff614a +dependencies = [ + "bindgen 0.51.1 (registry+https://github.com/rust-lang/crates.io-index)", + "cmake 0.1.42 (registry+https://github.com/rust-lang/crates.io-index)", -+ "cranelift-codegen 0.46.1 (registry+https://github.com/rust-lang/crates.io-index)", -+ "cranelift-entity 0.46.1 (registry+https://github.com/rust-lang/crates.io-index)", -+ "cranelift-wasm 0.46.1 (registry+https://github.com/rust-lang/crates.io-index)", ++ "cranelift-codegen 0.49.0 (registry+https://github.com/rust-lang/crates.io-index)", ++ "cranelift-entity 0.49.0 (registry+https://github.com/rust-lang/crates.io-index)", ++ "cranelift-wasm 0.49.0 (registry+https://github.com/rust-lang/crates.io-index)", + "libc 0.2.64 (registry+https://github.com/rust-lang/crates.io-index)", + "log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)", -+ "target-lexicon 0.8.1 (registry+https://github.com/rust-lang/crates.io-index)", ++ "more-asserts 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)", ++ "target-lexicon 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)", + "wasmtime-environ 0.2.0", + "wasmtime-jit 0.2.0", + "wasmtime-runtime 0.2.0", @@ -1890,16 +1946,31 @@ index 00000000..9cff614a +name = "wasmtime-wast" +version = "0.2.0" +dependencies = [ -+ "cranelift-codegen 0.46.1 (registry+https://github.com/rust-lang/crates.io-index)", -+ "cranelift-entity 0.46.1 (registry+https://github.com/rust-lang/crates.io-index)", -+ "cranelift-wasm 0.46.1 (registry+https://github.com/rust-lang/crates.io-index)", -+ "failure 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)", -+ "failure_derive 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)", -+ "target-lexicon 0.8.1 (registry+https://github.com/rust-lang/crates.io-index)", -+ "wabt 0.9.2 (registry+https://github.com/rust-lang/crates.io-index)", ++ "anyhow 1.0.19 (registry+https://github.com/rust-lang/crates.io-index)", ++ "cranelift-codegen 0.49.0 (registry+https://github.com/rust-lang/crates.io-index)", ++ "cranelift-entity 0.49.0 (registry+https://github.com/rust-lang/crates.io-index)", ++ "cranelift-wasm 0.49.0 (registry+https://github.com/rust-lang/crates.io-index)", ++ "target-lexicon 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)", + "wasmtime-environ 0.2.0", + "wasmtime-jit 0.2.0", + "wasmtime-runtime 0.2.0", ++ "wast 3.0.2 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "wast" ++version = "3.0.2" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "leb128 0.2.4 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "wat" ++version = "1.0.3" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "wast 3.0.2 (registry+https://github.com/rust-lang/crates.io-index)", +] + +[[package]] @@ -1911,6 +1982,15 @@ index 00000000..9cff614a +] + +[[package]] ++name = "wig" ++version = "0.1.0" ++dependencies = [ ++ "proc-macro2 1.0.6 (registry+https://github.com/rust-lang/crates.io-index)", ++ "quote 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)", ++ "witx 0.4.0", ++] ++ ++[[package]] +name = "winapi" +version = "0.3.8" +source = "registry+https://github.com/rust-lang/crates.io-index" @@ -1948,8 +2028,7 @@ index 00000000..9cff614a + +[[package]] +name = "winx" -+version = "0.1.0" -+source = "git+https://github.com/CraneStation/wasi-common?rev=c3bf040#c3bf04042e03c706088de62acf1cd7aa79f0fa50" ++version = "0.5.0" +dependencies = [ + "bitflags 1.2.1 (registry+https://github.com/rust-lang/crates.io-index)", + "cvt 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)", @@ -1957,25 +2036,34 @@ index 00000000..9cff614a +] + +[[package]] ++name = "witx" ++version = "0.4.0" ++dependencies = [ ++ "clap 2.33.0 (registry+https://github.com/rust-lang/crates.io-index)", ++ "failure 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)", ++ "wast 3.0.2 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] +name = "zstd" -+version = "0.4.28+zstd.1.4.3" ++version = "0.5.1+zstd.1.4.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +dependencies = [ -+ "zstd-safe 1.4.13+zstd.1.4.3 (registry+https://github.com/rust-lang/crates.io-index)", ++ "zstd-safe 2.0.3+zstd.1.4.4 (registry+https://github.com/rust-lang/crates.io-index)", +] + +[[package]] +name = "zstd-safe" -+version = "1.4.13+zstd.1.4.3" ++version = "2.0.3+zstd.1.4.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +dependencies = [ + "libc 0.2.64 (registry+https://github.com/rust-lang/crates.io-index)", -+ "zstd-sys 1.4.13+zstd.1.4.3 (registry+https://github.com/rust-lang/crates.io-index)", ++ "zstd-sys 1.4.15+zstd.1.4.4 (registry+https://github.com/rust-lang/crates.io-index)", +] + +[[package]] +name = "zstd-sys" -+version = "1.4.13+zstd.1.4.3" ++version = "1.4.15+zstd.1.4.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +dependencies = [ + "cc 1.0.46 (registry+https://github.com/rust-lang/crates.io-index)", @@ -1987,6 +2075,7 @@ index 00000000..9cff614a +"checksum ahash 0.2.16 (registry+https://github.com/rust-lang/crates.io-index)" = "b35dfc96a657c1842b4eb73180b65e37152d4b94d0eb5cb51708aee7826950b4" +"checksum aho-corasick 0.7.6 (registry+https://github.com/rust-lang/crates.io-index)" = "58fb5e95d83b38284460a5fda7d6470aa0b8844d283a0b614b8535e880800d2d" +"checksum ansi_term 0.11.0 (registry+https://github.com/rust-lang/crates.io-index)" = "ee49baf6cb617b853aa8d93bf420db2383fab46d314482ca2803b40d5fde979b" ++"checksum anyhow 1.0.19 (registry+https://github.com/rust-lang/crates.io-index)" = "57114fc2a6cc374bce195d3482057c846e706d252ff3604363449695684d7a0d" +"checksum arrayref 0.3.5 (registry+https://github.com/rust-lang/crates.io-index)" = "0d382e583f07208808f6b1249e60848879ba3543f57c32277bf52d69c2f0f0ee" +"checksum arrayvec 0.4.12 (registry+https://github.com/rust-lang/crates.io-index)" = "cd9fd44efafa8690358b7408d253adf110036b88f55672a933f01d616ad9b1b9" +"checksum atty 0.2.13 (registry+https://github.com/rust-lang/crates.io-index)" = "1803c647a3ec87095e7ae7acfca019e98de5ec9a7d01343f611cf3152ed71a90" @@ -1994,6 +2083,7 @@ index 00000000..9cff614a +"checksum backtrace 0.3.40 (registry+https://github.com/rust-lang/crates.io-index)" = "924c76597f0d9ca25d762c25a4d369d51267536465dc5064bdf0eb073ed477ea" +"checksum backtrace-sys 0.1.32 (registry+https://github.com/rust-lang/crates.io-index)" = "5d6575f128516de27e3ce99689419835fce9643a9b215a14d2b5b685be018491" +"checksum base64 0.10.1 (registry+https://github.com/rust-lang/crates.io-index)" = "0b25d992356d2eb0ed82172f5248873db5560c4721f564b13cb5193bda5e668e" ++"checksum base64 0.11.0 (registry+https://github.com/rust-lang/crates.io-index)" = "b41b7ea54a0c9d92199de89e20e58d49f02f8e699814ef3fdf266f6f748d15c7" +"checksum bincode 1.2.0 (registry+https://github.com/rust-lang/crates.io-index)" = "b8ab639324e3ee8774d296864fbc0dbbb256cf1a41c490b94cba90c082915f92" +"checksum bindgen 0.51.1 (registry+https://github.com/rust-lang/crates.io-index)" = "ebd71393f1ec0509b553aa012b9b58e81dadbdff7130bd3b8cba576e69b32f75" +"checksum bitflags 1.2.1 (registry+https://github.com/rust-lang/crates.io-index)" = "cf1de2fe8c75bc145a2f577add951f8134889b4795d47466a54a5c846d691693" @@ -2016,14 +2106,15 @@ index 00000000..9cff614a +"checksum const-random 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)" = "7b641a8c9867e341f3295564203b1c250eb8ce6cb6126e007941f78c4d2ed7fe" +"checksum const-random-macro 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)" = "c750ec12b83377637110d5a57f5ae08e895b06c4b16e2bdbf1a94ef717428c59" +"checksum constant_time_eq 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)" = "995a44c877f9212528ccc74b21a232f66ad69001e40ede5bcee2ac9ef2657120" -+"checksum cranelift-bforest 0.46.1 (registry+https://github.com/rust-lang/crates.io-index)" = "18c97588946d3e5fe11f8e34ebf8cc65fd3fda50f3ffa2e80c98b2748058f00f" -+"checksum cranelift-codegen 0.46.1 (registry+https://github.com/rust-lang/crates.io-index)" = "3255935da50302bcb0f7109f2fef27f44b46f1c797dfa7db971379261023adcd" -+"checksum cranelift-codegen-meta 0.46.1 (registry+https://github.com/rust-lang/crates.io-index)" = "fd57265ef5e6ff253c378b6261ed8c2e6cb1b15e91624540dbd09b1e5a40e9ca" -+"checksum cranelift-codegen-shared 0.46.1 (registry+https://github.com/rust-lang/crates.io-index)" = "c093398d21f9493ab29445191362592ef621f497e56a8efb15bdf80471978b7a" -+"checksum cranelift-entity 0.46.1 (registry+https://github.com/rust-lang/crates.io-index)" = "e915fa58d2a75e3c4b768b7e4760282889915c3fcd9ccb2ad2b3ebec99654a78" -+"checksum cranelift-frontend 0.46.1 (registry+https://github.com/rust-lang/crates.io-index)" = "46963952cda267bd0177b3f036e50038cd56e7b4c5b09a455b02df727e0f2a16" -+"checksum cranelift-native 0.46.1 (registry+https://github.com/rust-lang/crates.io-index)" = "7ba8a2d69ddd4729199a321bc2f4020e1969a088b468ed6a29dc7a69350be76e" -+"checksum cranelift-wasm 0.46.1 (registry+https://github.com/rust-lang/crates.io-index)" = "5a802357a6a016bf4c1dcdc6d73a650640eb3b613cc098a1a044a6c3731ca264" ++"checksum cpu-time 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)" = "e9e393a7668fe1fad3075085b86c781883000b4ede868f43627b34a87c8b7ded" ++"checksum cranelift-bforest 0.49.0 (registry+https://github.com/rust-lang/crates.io-index)" = "ba29e425110674c89fdc2f79479d767f31003dd9187c29ba2dad57fe4d321670" ++"checksum cranelift-codegen 0.49.0 (registry+https://github.com/rust-lang/crates.io-index)" = "8cb71c7ce1438c41f3d35383fa41eee26f5adf9815c7f5c2e7029a6c9356df2c" ++"checksum cranelift-codegen-meta 0.49.0 (registry+https://github.com/rust-lang/crates.io-index)" = "4aa634fd60290d5047d40172028a0aa86458e32a72c76fcce0a317bbbbcca4e5" ++"checksum cranelift-codegen-shared 0.49.0 (registry+https://github.com/rust-lang/crates.io-index)" = "6fa6cf5c2adc031be07cd5bc88145ebb93d9d2a05a28a93136782b2167eacb62" ++"checksum cranelift-entity 0.49.0 (registry+https://github.com/rust-lang/crates.io-index)" = "932d5f9622b336e10e8cf843ded09a688ec49f32c32b3101d7c5a7b71cad3dc9" ++"checksum cranelift-frontend 0.49.0 (registry+https://github.com/rust-lang/crates.io-index)" = "0d1a3c105c657cd65c20d9183bbd4f2b16bf3548db4b865c065bf7028f3021de" ++"checksum cranelift-native 0.49.0 (registry+https://github.com/rust-lang/crates.io-index)" = "ba5e34645453b73a9e2def05561f957a9df17253996379dd59c4afe3cf7db0f1" ++"checksum cranelift-wasm 0.49.0 (registry+https://github.com/rust-lang/crates.io-index)" = "23410ae1f5edf7d83e95bf8537e771345ecc2b11e5c7208cbee8151ea3b88e97" +"checksum crossbeam-deque 0.7.1 (registry+https://github.com/rust-lang/crates.io-index)" = "b18cd2e169ad86297e6bc0ad9aa679aee9daa4f19e8163860faf7c164e4f5a71" +"checksum crossbeam-epoch 0.7.2 (registry+https://github.com/rust-lang/crates.io-index)" = "fedcd6772e37f3da2a9af9bf12ebe046c0dfe657992377b4df982a2b54cd37a9" +"checksum crossbeam-queue 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)" = "7c979cd6cfe72335896575c6b5688da489e420d36a27a0b9eb0c73db574b4a4b" @@ -2040,7 +2131,7 @@ index 00000000..9cff614a +"checksum env_logger 0.6.2 (registry+https://github.com/rust-lang/crates.io-index)" = "aafcde04e90a5226a6443b7aabdb016ba2f8307c847d524724bd9b346dd1a2d3" +"checksum errno 0.2.4 (registry+https://github.com/rust-lang/crates.io-index)" = "c2a071601ed01b988f896ab14b95e67335d1eeb50190932a1320f7fe3cadc84e" +"checksum errno-dragonfly 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "14ca354e36190500e1e1fb267c647932382b54053c50b14970856c0b00a35067" -+"checksum faerie 0.11.0 (registry+https://github.com/rust-lang/crates.io-index)" = "875d78b92b2a4d9e1e2c7eeccfa30a327d2ee6434db3beb8fd6fd92f41898bc4" ++"checksum faerie 0.12.0 (registry+https://github.com/rust-lang/crates.io-index)" = "01fed63609767c70e34203201032c249d60a24578a67ef0ce7cc13ff010e9cf2" +"checksum failure 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)" = "f8273f13c977665c5db7eb2b99ae520952fe5ac831ae4cd09d80c4c7042b5ed9" +"checksum failure_derive 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)" = "0bc225b78e0391e4b8683440bf2e63c2deeeb2ce5189eab46e2b68c6d3725d08" +"checksum fake-simd 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)" = "e88a8acf291dafb59c2d96e8f59828f3838bb1a70398823ade51a84de6a6deed" @@ -2053,9 +2144,8 @@ index 00000000..9cff614a +"checksum getrandom 0.1.12 (registry+https://github.com/rust-lang/crates.io-index)" = "473a1265acc8ff1e808cd0a1af8cee3c2ee5200916058a2ca113c29f2d903571" +"checksum ghost 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "2a36606a68532b5640dc86bb1f33c64b45c4682aad4c50f3937b317ea387f3d6" +"checksum gimli 0.19.0 (registry+https://github.com/rust-lang/crates.io-index)" = "162d18ae5f2e3b90a993d202f1ba17a5633c2484426f8bcae201f86194bacd00" -+"checksum glob 0.2.11 (registry+https://github.com/rust-lang/crates.io-index)" = "8be18de09a56b60ed0edf84bc9df007e30040691af7acd1c41874faac5895bfb" +"checksum glob 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)" = "9b919933a397b79c37e33b77bb2aa3dc8eb6e165ad809e58ff75bc7db2e34574" -+"checksum goblin 0.0.24 (registry+https://github.com/rust-lang/crates.io-index)" = "e3fa261d919c1ae9d1e4533c4a2f99e10938603c4208d56c05bec7a872b661b0" ++"checksum goblin 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "5e6040506480da04a63de51a478e8021892d65d8411f29b2a422c2648bdd8bcb" +"checksum hashbrown 0.5.0 (registry+https://github.com/rust-lang/crates.io-index)" = "e1de41fb8dba9714efd92241565cdff73f78508c95697dd56787d3cba27e2353" +"checksum hashbrown 0.6.1 (registry+https://github.com/rust-lang/crates.io-index)" = "6587d09be37fb98a11cb08b9000a3f592451c1b1b613ca69d949160e313a430a" +"checksum heck 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)" = "20564e78d53d2bb135c343b3f47714a56af2061f1c928fdb541dc7b9fdd94205" @@ -2077,15 +2167,21 @@ index 00000000..9cff614a +"checksum mach 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)" = "86dd2487cdfea56def77b88438a2c915fb45113c5319bfe7e14306ca4cd0b0e1" +"checksum memchr 2.2.1 (registry+https://github.com/rust-lang/crates.io-index)" = "88579771288728879b57485cc7d6b07d648c9f0141eb955f8ab7f9d45394468e" +"checksum memmap 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)" = "6585fd95e7bb50d6cc31e20d4cf9afb4e2ba16c5846fc76793f11218da9c475b" -+"checksum memoffset 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)" = "ce6075db033bbbb7ee5a0bbd3a3186bbae616f57fb001c485c7ff77955f8177f" ++"checksum memoffset 0.5.3 (registry+https://github.com/rust-lang/crates.io-index)" = "75189eb85871ea5c2e2c15abbdd541185f63b408415e5051f5cac122d8c774b9" ++"checksum more-asserts 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)" = "0debeb9fcf88823ea64d64e4a815ab1643f33127d995978e099942ce38f25238" +"checksum multi_mut 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)" = "816df386e5557ac1843a96f1ba8a7cbf4ab175d05ccc15c87a3cda27b4fbdece" +"checksum nix 0.15.0 (registry+https://github.com/rust-lang/crates.io-index)" = "3b2e0b4f3320ed72aaedb9a5ac838690a8047c7b275da22711fddff4f8a14229" +"checksum nodrop 0.1.14 (registry+https://github.com/rust-lang/crates.io-index)" = "72ef4a56884ca558e5ddb05a1d1e7e1bfd9a68d9ed024c21704cc98872dae1bb" +"checksum nom 4.2.3 (registry+https://github.com/rust-lang/crates.io-index)" = "2ad2a91a8e869eeb30b9cb3119ae87773a8f4ae617f41b1eb9c154b2905f7bd6" ++"checksum num 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)" = "cf4825417e1e1406b3782a8ce92f4d53f26ec055e3622e1881ca8e9f5f9e08db" ++"checksum num-complex 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)" = "fcb0cf31fb3ff77e6d2a6ebd6800df7fdcd106f2ad89113c9130bcd07f93dffc" +"checksum num-integer 0.1.41 (registry+https://github.com/rust-lang/crates.io-index)" = "b85e541ef8255f6cf42bbfe4ef361305c6c135d10919ecc26126c4e5ae94bc09" ++"checksum num-iter 0.1.39 (registry+https://github.com/rust-lang/crates.io-index)" = "76bd5272412d173d6bf9afdf98db8612bbabc9a7a830b7bfc9c188911716132e" ++"checksum num-rational 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)" = "f2885278d5fe2adc2f75ced642d52d879bffaceb5a2e0b1d4309ffdfb239b454" +"checksum num-traits 0.2.8 (registry+https://github.com/rust-lang/crates.io-index)" = "6ba9a427cfca2be13aa6f6403b0b7e7368fe982bfa16fccc450ce74c46cd9b32" +"checksum num_cpus 1.10.1 (registry+https://github.com/rust-lang/crates.io-index)" = "bcef43580c035376c0705c42792c294b66974abbfd2789b511784023f71f3273" +"checksum opaque-debug 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)" = "2839e79665f131bdb5782e51f2c6c9599c133c6098982a54c794358bf432529c" ++"checksum os_pipe 0.9.1 (registry+https://github.com/rust-lang/crates.io-index)" = "db4d06355a7090ce852965b2d08e11426c315438462638c6d721448d0b47aa22" +"checksum owning_ref 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)" = "49a4b8ea2179e6a2e27411d3bca09ca6dd630821cf6894c6c7c8467a8ee7ef13" +"checksum paste 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)" = "423a519e1c6e828f1e73b720f9d9ed2fa643dce8a7737fb43235ce0b41eeaa49" +"checksum paste-impl 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)" = "4214c9e912ef61bf42b81ba9a47e8aad1b2ffaf739ab162bf96d1e011f54e6c5" @@ -2094,14 +2190,12 @@ index 00000000..9cff614a +"checksum ppv-lite86 0.2.5 (registry+https://github.com/rust-lang/crates.io-index)" = "e3cbf9f658cdb5000fcf6f362b8ea2ba154b9f146a61c7a20d647034c6b6561b" +"checksum pretty_env_logger 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)" = "717ee476b1690853d222af4634056d830b5197ffd747726a9a1eee6da9f49074" +"checksum proc-macro-hack 0.5.11 (registry+https://github.com/rust-lang/crates.io-index)" = "ecd45702f76d6d3c75a80564378ae228a85f0b59d2f3ed43c91b4a69eb2ebfc5" -+"checksum proc-macro2 0.4.30 (registry+https://github.com/rust-lang/crates.io-index)" = "cf3d2011ab5c909338f7887f4fc896d35932e29146c12c8d01da6b22a80ba759" -+"checksum proc-macro2 1.0.5 (registry+https://github.com/rust-lang/crates.io-index)" = "90cf5f418035b98e655e9cdb225047638296b862b42411c4e45bb88d700f7fc0" ++"checksum proc-macro2 1.0.6 (registry+https://github.com/rust-lang/crates.io-index)" = "9c9e470a8dc4aeae2dee2f335e8f533e2d4b347e1434e5671afc49b054592f27" +"checksum pyo3 0.8.1 (registry+https://github.com/rust-lang/crates.io-index)" = "a00f96312ebe4082db7d93ad062df1818f597660002541c1bbae6752ec583244" +"checksum pyo3-derive-backend 0.8.1 (registry+https://github.com/rust-lang/crates.io-index)" = "1a7caa60cb986fca5b488e29d078fb25ae228e01dab080b855168ce061bbef0a" +"checksum pyo3cls 0.8.1 (registry+https://github.com/rust-lang/crates.io-index)" = "a5ccfa624ed9b5d805079f1ad64b3f1de5d551a946d4cf494f1f032b5572d39f" +"checksum quick-error 1.2.2 (registry+https://github.com/rust-lang/crates.io-index)" = "9274b940887ce9addde99c4eee6b5c44cc494b182b97e73dc8ffdcb3397fd3f0" +"checksum quickcheck 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)" = "d5ca504a2fdaa08d3517f442fbbba91ac24d1ec4c51ea68688a038765e3b2662" -+"checksum quote 0.6.13 (registry+https://github.com/rust-lang/crates.io-index)" = "6ce23b6b870e8f94f81fb0a363d65d86675884b34a09043c81e5562f11c1f8e1" +"checksum quote 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)" = "053a8c8bcc71fcce321828dc897a98ab9760bef03a4fc36693c231e5b3216cfe" +"checksum rand 0.7.2 (registry+https://github.com/rust-lang/crates.io-index)" = "3ae1b169243eaf61759b8475a998f0a385e42042370f3a7dbaf35246eacc8412" +"checksum rand_chacha 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)" = "03a2a90da8c7523f554344f921aa97283eadf6ac484a6d2a7d0212fa7f8d6853" @@ -2111,7 +2205,7 @@ index 00000000..9cff614a +"checksum rand_hc 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)" = "ca3129af7b92a17112d59ad498c6f81eaf463253766b90396d39ea7a39d6613c" +"checksum rand_os 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)" = "7b75f676a1e053fc562eafbb47838d67c84801e38fc1ba459e8f180deabd5071" +"checksum rand_pcg 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)" = "3e196346cbbc5c70c77e7b4926147ee8e383a38ee4d15d58a08098b169e492b6" -+"checksum raw-cpuid 6.1.0 (registry+https://github.com/rust-lang/crates.io-index)" = "30a9d219c32c9132f7be513c18be77c9881c7107d2ab5569d205a6a0f0e6dc7d" ++"checksum raw-cpuid 7.0.3 (registry+https://github.com/rust-lang/crates.io-index)" = "b4a349ca83373cfa5d6dbb66fd76e58b2cca08da71a5f6400de0a0a6a9bceeaf" +"checksum rayon 1.2.0 (registry+https://github.com/rust-lang/crates.io-index)" = "83a27732a533a1be0a0035a111fe76db89ad312f6f0347004c220c57f209a123" +"checksum rayon-core 1.6.0 (registry+https://github.com/rust-lang/crates.io-index)" = "98dcf634205083b17d0861252431eb2acbfb698ab7478a2d20de07954f47ec7b" +"checksum rdrand 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)" = "678054eb77286b51581ba43620cc911abf02758c91f93f479767aed0f90458b2" @@ -2127,8 +2221,8 @@ index 00000000..9cff614a +"checksum rustc_version 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)" = "138e3e0acb6c9fb258b19b67cb8abd63c00679d2851805ea151465464fe9030a" +"checksum ryu 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)" = "bfa8506c1de11c9c4e4c38863ccbe02a305c8188e85a05a784c9e11e1c3910c8" +"checksum scopeguard 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)" = "b42e15e59b18a828bbf5c58ea01debb36b9b096346de35d941dcb89009f24a0d" -+"checksum scroll 0.9.2 (registry+https://github.com/rust-lang/crates.io-index)" = "2f84d114ef17fd144153d608fba7c446b0145d038985e7a8cc5d08bb0ce20383" -+"checksum scroll_derive 0.9.5 (registry+https://github.com/rust-lang/crates.io-index)" = "8f1aa96c45e7f5a91cb7fabe7b279f02fea7126239fc40b732316e8b6a2d0fcb" ++"checksum scroll 0.10.1 (registry+https://github.com/rust-lang/crates.io-index)" = "abb2332cb595d33f7edd5700f4cbf94892e680c7f0ae56adab58a35190b66cb1" ++"checksum scroll_derive 0.10.1 (registry+https://github.com/rust-lang/crates.io-index)" = "f8584eea9b9ff42825b46faf46a8c24d2cff13ec152fa2a50df788b87c07ee28" +"checksum semver 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)" = "1d7eb9ef2c18661902cc47e535f9bc51b78acd254da71d375c2f6720d9a40403" +"checksum semver-parser 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)" = "388a1df253eca08550bef6c72392cfe7c30914bf41df5269b68cbd6ff8f570a3" +"checksum serde 1.0.101 (registry+https://github.com/rust-lang/crates.io-index)" = "9796c9b7ba2ffe7a9ce53c2287dfc48080f4b2b362fcc245a259b3a7201119dd" @@ -2136,28 +2230,29 @@ index 00000000..9cff614a +"checksum serde_json 1.0.41 (registry+https://github.com/rust-lang/crates.io-index)" = "2f72eb2a68a7dc3f9a691bfda9305a1c017a6215e5a4545c258500d2099a37c2" +"checksum sha2 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)" = "7b4d8bfd0e469f417657573d8451fb33d16cfe0989359b93baf3a1ffc639543d" +"checksum shlex 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "7fdf1b9db47230893d76faad238fd6097fd6d6a9245cd7a4d90dbd639536bbd2" -+"checksum smallvec 0.6.10 (registry+https://github.com/rust-lang/crates.io-index)" = "ab606a9c5e214920bb66c458cd7be8ef094f813f20fe77a54cc7dbfff220d4b7" ++"checksum smallvec 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)" = "4ecf3b85f68e8abaa7555aa5abdb1153079387e60b718283d732f03897fcfc86" +"checksum spin 0.5.2 (registry+https://github.com/rust-lang/crates.io-index)" = "6e63cff320ae2c57904679ba7cb63280a3dc4613885beafb148ee7bf9aa9042d" +"checksum stable_deref_trait 1.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "dba1a27d3efae4351c8051072d619e3ade2820635c3958d826bfea39d59b54c8" +"checksum string-interner 0.7.1 (registry+https://github.com/rust-lang/crates.io-index)" = "fd710eadff449a1531351b0e43eb81ea404336fa2f56c777427ab0e32a4cf183" +"checksum strsim 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)" = "8ea5119cdb4c55b55d432abb513a0429384878c15dde60cc77b1c99de1a95a6a" +"checksum strsim 0.9.2 (registry+https://github.com/rust-lang/crates.io-index)" = "032c03039aae92b350aad2e3779c352e104d919cb192ba2fabbd7b831ce4f0f6" -+"checksum syn 0.15.44 (registry+https://github.com/rust-lang/crates.io-index)" = "9ca4b3b69a77cbe1ffc9e198781b7acb0c7365a883670e8f1c1bc66fba79a5c5" +"checksum syn 1.0.5 (registry+https://github.com/rust-lang/crates.io-index)" = "66850e97125af79138385e9b88339cbcd037e3f28ceab8c5ad98e64f0f1f80bf" +"checksum synstructure 0.12.1 (registry+https://github.com/rust-lang/crates.io-index)" = "3f085a5855930c0441ca1288cf044ea4aecf4f43a91668abdb870b4ba546a203" -+"checksum target-lexicon 0.8.1 (registry+https://github.com/rust-lang/crates.io-index)" = "7975cb2c6f37d77b190bc5004a2bb015971464756fde9514651a525ada2a741a" ++"checksum target-lexicon 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)" = "6f4c118a7a38378f305a9e111fcb2f7f838c0be324bfb31a77ea04f7f6e684b4" +"checksum tempfile 3.1.0 (registry+https://github.com/rust-lang/crates.io-index)" = "7a6e24d9338a0a5be79593e2fa15a648add6138caa803e2d5bc782c371732ca9" +"checksum termcolor 1.0.5 (registry+https://github.com/rust-lang/crates.io-index)" = "96d6098003bde162e4277c70665bd87c326f5a0c3f3fbfb285787fa482d54e6e" +"checksum textwrap 0.11.0 (registry+https://github.com/rust-lang/crates.io-index)" = "d326610f408c7a4eb6f51c37c330e496b08506c9457c9d34287ecc38809fb060" ++"checksum thiserror 1.0.5 (registry+https://github.com/rust-lang/crates.io-index)" = "f9fb62ff737e573b1e677459bea6fd023cd5d6e868c3242d3cdf3ef2f0554824" ++"checksum thiserror-impl 1.0.5 (registry+https://github.com/rust-lang/crates.io-index)" = "24069c0ba08aab54289d6a25f5036d94afc61e1538bbc42ae5501df141c9027d" +"checksum thread_local 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)" = "c6b53e329000edc2b34dbe8545fd20e55a333362d0a321909685a19bd28c3f1b" +"checksum time 0.1.42 (registry+https://github.com/rust-lang/crates.io-index)" = "db8dcfca086c1143c9270ac42a2bbd8a7ee477b78ac8e45b19abfb0cbede4b6f" -+"checksum toml 0.5.3 (registry+https://github.com/rust-lang/crates.io-index)" = "c7aabe75941d914b72bf3e5d3932ed92ce0664d49d8432305a8b547c37227724" ++"checksum toml 0.5.5 (registry+https://github.com/rust-lang/crates.io-index)" = "01d1404644c8b12b16bfcffa4322403a91a451584daaaa7c28d3152e6cbc98cf" +"checksum traitobject 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)" = "efd1f82c56340fdf16f2a953d7bda4f8fdffba13d93b00844c25572110b26079" ++"checksum trybuild 1.0.17 (registry+https://github.com/rust-lang/crates.io-index)" = "e6851bf8351876984fbab8a2391de6378947b898410d8714edd12164d2137127" +"checksum typemap 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)" = "653be63c80a3296da5551e1bfd2cca35227e13cdd08c6668903ae2f4f77aa1f6" +"checksum typenum 1.11.2 (registry+https://github.com/rust-lang/crates.io-index)" = "6d2783fe2d6b8c1101136184eb41be8b1ad379e4657050b8aaff0c79ee7575f9" +"checksum unicode-segmentation 1.3.0 (registry+https://github.com/rust-lang/crates.io-index)" = "1967f4cdfc355b37fd76d2a954fb2ed3871034eb4f26d60537d88795cfc332a9" +"checksum unicode-width 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)" = "7007dbd421b92cc6e28410fe7362e2e0a2503394908f417b68ec8d1c364c4e20" -+"checksum unicode-xid 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)" = "fc72304796d0818e357ead4e000d19c9c174ab23dc11093ac919054d20a6a7fc" +"checksum unicode-xid 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)" = "826e7639553986605ec5979c7dd957c7895e93eabed50ab2ffa7f6128a75097c" +"checksum unindent 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)" = "63f18aa3b0e35fed5a0048f029558b1518095ffe2a0a31fb87c93dece93a4993" +"checksum unsafe-any 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)" = "f30360d7979f5e9c6e6cea48af192ea8fab4afb3cf72597154b8f08935bc9c7f" @@ -2165,23 +2260,19 @@ index 00000000..9cff614a +"checksum version_check 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)" = "914b1a6776c4c929a602fafd8bc742e06365d4bcbe48c30f9cca5824f70dc9dd" +"checksum version_check 0.9.1 (registry+https://github.com/rust-lang/crates.io-index)" = "078775d0255232fb988e6fccf26ddc9d1ac274299aaedcedce21c6f72cc533ce" +"checksum void 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)" = "6a02e4885ed3bc0f2de90ea6dd45ebcbb66dacffe03547fadbb0eeae2770887d" -+"checksum wabt 0.9.2 (registry+https://github.com/rust-lang/crates.io-index)" = "3c5c5c1286c6e578416982609f47594265f9d489f9b836157d403ad605a46693" -+"checksum wabt-sys 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)" = "af5d153dc96aad7dc13ab90835b892c69867948112d95299e522d370c4e13a08" -+"checksum walrus 0.12.0 (registry+https://github.com/rust-lang/crates.io-index)" = "e6f3bd9559eb5b59d55cc60986e26dc9b3f64377d0b9495e41abd9ede9a6443f" -+"checksum walrus-macro 0.12.0 (registry+https://github.com/rust-lang/crates.io-index)" = "0464a6e0d86be4c95c8c838bcb1910df831e1216a9586feeb02478cd52c4e554" ++"checksum walrus 0.13.0 (registry+https://github.com/rust-lang/crates.io-index)" = "85ce93ab0c27412ba41d509f2410fa575ecbfdb4a6aba0e02e79e12c09745485" ++"checksum walrus-macro 0.13.0 (registry+https://github.com/rust-lang/crates.io-index)" = "8757b0da38353d55a9687f4dee68a8f441f980dd36e16ab07d6e6c673f505f76" +"checksum wasi 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)" = "b89c3ce4ce14bdc6fb6beaf9ec7928ca331de5df7e5ea278375642a2f478570d" -+"checksum wasi-common 0.1.0 (git+https://github.com/CraneStation/wasi-common?rev=c3bf040)" = "<none>" -+"checksum wasi-common-cbindgen 0.1.0 (git+https://github.com/CraneStation/wasi-common?rev=c3bf040)" = "<none>" -+"checksum wasm-webidl-bindings 0.5.0 (registry+https://github.com/rust-lang/crates.io-index)" = "e407ee3155cb0742acacd0b21060daafe2ad78ea718f2d6b10e7d9d1032aa961" -+"checksum wasmparser 0.37.2 (registry+https://github.com/rust-lang/crates.io-index)" = "f7387ba67c13dd9cd01d7d961e733375aee889f828564e190da85b5602eb5eeb" ++"checksum wasm-webidl-bindings 0.6.0 (registry+https://github.com/rust-lang/crates.io-index)" = "b5cae185868c6038a48f487b9af3766ee0c68d4a85fa3610c3a0522092b3cec1" +"checksum wasmparser 0.39.2 (registry+https://github.com/rust-lang/crates.io-index)" = "e5083b449454f7de0b15f131eee17de54b5a71dcb9adcf11df2b2f78fad0cd82" ++"checksum wast 3.0.2 (registry+https://github.com/rust-lang/crates.io-index)" = "86b52202bd73a756b216bbfea019991ff317b1e5f22677da5cef2964696a3245" ++"checksum wat 1.0.3 (registry+https://github.com/rust-lang/crates.io-index)" = "80db13d155bab63db0f19c24a0e12bf60c3fe346edba8da508ba6962e08c137b" +"checksum which 3.0.0 (registry+https://github.com/rust-lang/crates.io-index)" = "240a31163872f7e8e49f35b42b58485e35355b07eb009d9f3686733541339a69" +"checksum winapi 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)" = "8093091eeb260906a183e6ae1abdba2ef5ef2257a21801128899c3fc699229c6" +"checksum winapi-i686-pc-windows-gnu 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)" = "ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6" +"checksum winapi-util 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)" = "7168bab6e1daee33b4557efd0e95d5ca70a03706d39fa5f3fe7a236f584b03c9" +"checksum winapi-x86_64-pc-windows-gnu 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)" = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f" +"checksum wincolor 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)" = "96f5016b18804d24db43cebf3c77269e7569b8954a8464501c216cc5e070eaa9" -+"checksum winx 0.1.0 (git+https://github.com/CraneStation/wasi-common?rev=c3bf040)" = "<none>" -+"checksum zstd 0.4.28+zstd.1.4.3 (registry+https://github.com/rust-lang/crates.io-index)" = "f4e716acaad66f2daf2526f37a1321674a8814c0b37a366ebe6c97a699f85ddc" -+"checksum zstd-safe 1.4.13+zstd.1.4.3 (registry+https://github.com/rust-lang/crates.io-index)" = "bfe4d3b26a0790201848865663e8ffabf091e126e548bc9710ccfa95621ece48" -+"checksum zstd-sys 1.4.13+zstd.1.4.3 (registry+https://github.com/rust-lang/crates.io-index)" = "fadc8ebe858f056ab82dffb9d93850b841603bdf663db7cf5e3dbd7f34cc55b2" ++"checksum zstd 0.5.1+zstd.1.4.4 (registry+https://github.com/rust-lang/crates.io-index)" = "5c5d978b793ae64375b80baf652919b148f6a496ac8802922d9999f5a553194f" ++"checksum zstd-safe 2.0.3+zstd.1.4.4 (registry+https://github.com/rust-lang/crates.io-index)" = "bee25eac9753cfedd48133fa1736cbd23b774e253d89badbeac7d12b23848d3f" ++"checksum zstd-sys 1.4.15+zstd.1.4.4 (registry+https://github.com/rust-lang/crates.io-index)" = "89719b034dc22d240d5b407fb0a3fe6d29952c181cff9a9f95c0bd40b4f8f7d8" diff --git a/pkgs/development/interpreters/wasmtime/default.nix b/pkgs/development/interpreters/wasmtime/default.nix index 954b7e73b94..0cdf1aae3f7 100644 --- a/pkgs/development/interpreters/wasmtime/default.nix +++ b/pkgs/development/interpreters/wasmtime/default.nix @@ -2,17 +2,17 @@ rustPlatform.buildRustPackage { pname = "wasmtime"; - version = "20191018"; + version = "20191111"; src = fetchFromGitHub { - owner = "CraneStation"; + owner = "bytecodealliance"; repo = "wasmtime"; - rev = "ebef2c6b5720fce164af9ded8b7ff3dd5d7e041c"; - sha256 = "15wa0by7lb90qd6fg8i2v1hw7hgbkrh1rqhrf7z850c9ydah6n13"; + rev = "0006a2af954eba74c79885cb1fe8cdeb68f531c1"; + sha256 = "0lf3pdkjxcrjmjic7xxyjl5dka3arxi809sp9hm4hih5p2fhf2gw"; fetchSubmodules = true; }; - cargoSha256 = "07qz6wl32j6gzc9nxv0dr7y6ixmzbzv5j1flkrysdrfidxlldn9k"; + cargoSha256 = "0mnwaipa2az3vpgbz4m9siz6bfyhmzwz174k678cv158m7mxx12f"; cargoPatches = [ ./cargo-lock.patch ]; diff --git a/pkgs/development/libraries/ace/default.nix b/pkgs/development/libraries/ace/default.nix index 04ab1331475..ea352772b33 100644 --- a/pkgs/development/libraries/ace/default.nix +++ b/pkgs/development/libraries/ace/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "ace"; - version = "6.5.6"; + version = "6.5.7"; src = fetchurl { url = "http://download.dre.vanderbilt.edu/previous_versions/ACE-${version}.tar.bz2"; - sha256 = "15lfjc8r854hvjfvimhnqc3987b3cdngilhkii9rwpzginbyipi4"; + sha256 = "0hvd7y3hs8r3r7qbllfaqrva3jrx5razcnwlws822k66v4r10cbx"; }; enableParallelBuilding = true; diff --git a/pkgs/development/libraries/cln/default.nix b/pkgs/development/libraries/cln/default.nix index 7adc2a365c5..dc36414fc28 100644 --- a/pkgs/development/libraries/cln/default.nix +++ b/pkgs/development/libraries/cln/default.nix @@ -2,18 +2,18 @@ stdenv.mkDerivation rec { pname = "cln"; - version = "1.3.4"; + version = "1.3.5"; src = fetchurl { url = "${meta.homepage}${pname}-${version}.tar.bz2"; - sha256 = "0j5p18hwbbrchsdbnc8d2bf9ncslhflri4i950gdnq7v6g2dg69d"; + sha256 = "0bc43v4fyxwik9gjkvm8jan74bkx9bjssv61lfh9jhhblmj010bq"; }; buildInputs = [ gmp ]; meta = with stdenv.lib; { description = "C/C++ library for numbers, a part of GiNaC"; - homepage = http://www.ginac.de/CLN/; + homepage = https://www.ginac.de/CLN/; license = licenses.gpl2; platforms = platforms.unix; # Once had cygwin problems }; diff --git a/pkgs/development/libraries/egl-wayland/default.nix b/pkgs/development/libraries/egl-wayland/default.nix new file mode 100644 index 00000000000..fa2c3687ba7 --- /dev/null +++ b/pkgs/development/libraries/egl-wayland/default.nix @@ -0,0 +1,79 @@ +{ lib +, stdenv +, fetchFromGitHub +, pkgconfig +, meson +, ninja +, libX11 +, mesa +, libGL +, wayland +}: + +let + eglexternalplatform = stdenv.mkDerivation { + pname = "eglexternalplatform"; + version = "1.1"; + + src = fetchFromGitHub { + owner = "Nvidia"; + repo = "eglexternalplatform"; + rev = "7c8f8e2218e46b1a4aa9538520919747f1184d86"; + sha256 = "0lr5s2xa1zn220ghmbsiwgmx77l156wk54c7hybia0xpr9yr2nhb"; + }; + + installPhase = '' + mkdir -p "$out/include/" + cp interface/eglexternalplatform.h "$out/include/" + cp interface/eglexternalplatformversion.h "$out/include/" + + substituteInPlace eglexternalplatform.pc \ + --replace "/usr/include/EGL" "$out/include" + mkdir -p "$out/share/pkgconfig" + cp eglexternalplatform.pc "$out/share/pkgconfig/" + ''; + + meta = with lib; { + license = licenses.mit; + }; + }; + +in stdenv.mkDerivation rec { + pname = "egl-wayland"; + version = "1.1.4"; + + outputs = [ "out" "dev" ]; + + src = fetchFromGitHub { + owner = "Nvidia"; + repo = pname; + rev = version; + sha256 = "0wvamjcfycd7rgk7v14g2rin55xin9rfkxmivyay3cm08vnl7y1d"; + }; + + # Add missing include + # https://github.com/NVIDIA/egl-wayland/pull/24 + patches = [ ./eglmesaext.patch ]; + + nativeBuildInputs = [ + meson + ninja + pkgconfig + ]; + + buildInputs = [ + eglexternalplatform + libX11 + mesa + libGL + wayland + ]; + + meta = with lib; { + description = "The EGLStream-based Wayland external platform"; + homepage = https://github.com/NVIDIA/egl-wayland/; + license = licenses.mit; + platforms = platforms.linux; + maintainers = with maintainers; [ hedning ]; + }; +} diff --git a/pkgs/development/libraries/egl-wayland/eglmesaext.patch b/pkgs/development/libraries/egl-wayland/eglmesaext.patch new file mode 100644 index 00000000000..9384ecff9b0 --- /dev/null +++ b/pkgs/development/libraries/egl-wayland/eglmesaext.patch @@ -0,0 +1,12 @@ +diff --git a/src/wayland-eglsurface.c b/src/wayland-eglsurface.c +index 01c9cb3..45736b0 100644 +--- a/src/wayland-eglsurface.c ++++ b/src/wayland-eglsurface.c +@@ -37,6 +37,7 @@ + #include <sys/types.h> + #include <netinet/in.h> + #include <fcntl.h> ++#include <EGL/eglmesaext.h> + + #define WL_EGL_WINDOW_DESTROY_CALLBACK_SINCE 3 + diff --git a/pkgs/development/libraries/gjs/default.nix b/pkgs/development/libraries/gjs/default.nix index c723a54765b..7facdc1426f 100644 --- a/pkgs/development/libraries/gjs/default.nix +++ b/pkgs/development/libraries/gjs/default.nix @@ -19,11 +19,11 @@ stdenv.mkDerivation rec { pname = "gjs"; - version = "1.58.1"; + version = "1.58.3"; src = fetchurl { url = "mirror://gnome/sources/gjs/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "1xf68rbagkflb9yi3visfw8cbxqlzd717y8jakgw0y6whzm1dpxl"; + sha256 = "1bkksx362007zs8c31ydygb29spwa5g5kch1ad2grc2sp53wv7ya"; }; outputs = [ "out" "dev" "installedTests" ]; diff --git a/pkgs/development/libraries/gmime/3.nix b/pkgs/development/libraries/gmime/3.nix index 81546e5c127..754d5aa7411 100644 --- a/pkgs/development/libraries/gmime/3.nix +++ b/pkgs/development/libraries/gmime/3.nix @@ -1,12 +1,12 @@ { stdenv, fetchurl, pkgconfig, glib, zlib, gnupg, gpgme, libidn2, libunistring, gobject-introspection }: stdenv.mkDerivation rec { - version = "3.2.3"; + version = "3.2.5"; pname = "gmime"; src = fetchurl { url = "mirror://gnome/sources/gmime/3.2/${pname}-${version}.tar.xz"; - sha256 = "04bk7rqs5slpvlvqf11i6s37s8b2xn6acls8smyl9asjnpp7a23a"; + sha256 = "0ndsg1z1kq4w4caascydvialpyn4rfbjdn7xclzbzhw53x85cxgv"; }; outputs = [ "out" "dev" ]; diff --git a/pkgs/development/libraries/gstreamer/good/default.nix b/pkgs/development/libraries/gstreamer/good/default.nix index 1c7107e50fa..9fa94a02f88 100644 --- a/pkgs/development/libraries/gstreamer/good/default.nix +++ b/pkgs/development/libraries/gstreamer/good/default.nix @@ -44,7 +44,7 @@ assert gtkSupport -> gtk3 != null; let - inherit (stdenv.lib) optional optionals; + inherit (stdenv.lib) optionals; in stdenv.mkDerivation rec { pname = "gst-plugins-good"; @@ -93,7 +93,7 @@ stdenv.mkDerivation rec { xorg.libXfixes xorg.libXdamage wavpack - ] ++ optional gtkSupport [ + ] ++ optionals gtkSupport [ # for gtksink gtk3 ] ++ optionals stdenv.isDarwin [ diff --git a/pkgs/development/libraries/gvfs/default.nix b/pkgs/development/libraries/gvfs/default.nix index 181d5e4c196..f8db6f573d9 100644 --- a/pkgs/development/libraries/gvfs/default.nix +++ b/pkgs/development/libraries/gvfs/default.nix @@ -41,11 +41,11 @@ stdenv.mkDerivation rec { pname = "gvfs"; - version = "1.42.1"; + version = "1.42.2"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "0c3pqc8qc2pn08by43rkkmk725k3cqmw7qyhfqgng0qx98dhf1lx"; + sha256 = "0jgrbid8a61hgh05wl8c4f4638x7dffd5vip02jmladxfdszjymm"; }; postPatch = '' diff --git a/pkgs/development/libraries/intel-gmmlib/default.nix b/pkgs/development/libraries/intel-gmmlib/default.nix index 6657409a708..6c872272e37 100644 --- a/pkgs/development/libraries/intel-gmmlib/default.nix +++ b/pkgs/development/libraries/intel-gmmlib/default.nix @@ -4,13 +4,13 @@ stdenv.mkDerivation rec { pname = "intel-gmmlib"; - version = "19.3.2"; + version = "19.3.4"; src = fetchFromGitHub { owner = "intel"; repo = "gmmlib"; rev = "${pname}-${version}"; - sha256 = "04jmzyciswvfb31h9shkja9183bmm1clw0l0sn1flq76888nngma"; + sha256 = "1vgh14vdmwr34l6rfzmbpsdwp4xi7qp8lg527p16pm7nv0bwx2zk"; }; nativeBuildInputs = [ cmake ]; diff --git a/pkgs/development/libraries/libappindicator/default.nix b/pkgs/development/libraries/libappindicator/default.nix index 46cc30a8944..7f3a2678da5 100644 --- a/pkgs/development/libraries/libappindicator/default.nix +++ b/pkgs/development/libraries/libappindicator/default.nix @@ -1,19 +1,18 @@ # TODO: Resolve the issues with the Mono bindings. -{ stdenv, fetchurl, lib, file +{ stdenv, fetchurl, fetchpatch, lib, file , pkgconfig, autoconf , glib, dbus-glib, gtkVersion ? "3" , gtk2 ? null, libindicator-gtk2 ? null, libdbusmenu-gtk2 ? null , gtk3 ? null, libindicator-gtk3 ? null, libdbusmenu-gtk3 ? null -, python2Packages, gobject-introspection, vala +, vala, gobject-introspection , monoSupport ? false, mono ? null, gtk-sharp-2_0 ? null }: with lib; -let - inherit (python2Packages) python pygobject2 pygtk; -in stdenv.mkDerivation rec { + +stdenv.mkDerivation rec { name = let postfix = if gtkVersion == "2" && monoSupport then "sharp" else "gtk${gtkVersion}"; in "libappindicator-${postfix}-${version}"; version = "${versionMajor}.${versionMinor}"; @@ -25,7 +24,7 @@ in stdenv.mkDerivation rec { sha256 = "17xlqd60v0zllrxp8bgq3k5a1jkj0svkqn8rzllcyjh8k0gpr46m"; }; - nativeBuildInputs = [ pkgconfig autoconf ]; + nativeBuildInputs = [ pkgconfig autoconf vala gobject-introspection ]; propagatedBuildInputs = if gtkVersion == "2" @@ -34,14 +33,20 @@ in stdenv.mkDerivation rec { buildInputs = [ glib dbus-glib - python pygobject2 pygtk gobject-introspection vala ] ++ (if gtkVersion == "2" then [ libindicator-gtk2 ] ++ optionals monoSupport [ mono gtk-sharp-2_0 ] else [ libindicator-gtk3 ]); + patches = [ + # Remove python2 from libappindicator. + (fetchpatch { + name = "no-python.patch"; + url = "https://src.fedoraproject.org/rpms/libappindicator/raw/8508f7a52437679fd95a79b4630373f08315f189/f/nopython.patch"; + sha256 = "18b1xzvwsbhhfpbzf5zragij4g79pa04y1dk6v5ci1wsjvii725s"; + }) + ]; + postPatch = '' - substituteInPlace configure.ac \ - --replace '=codegendir pygtk-2.0' '=codegendir pygobject-2.0' autoconf for f in {configure,ltmain.sh,m4/libtool.m4}; do substituteInPlace $f \ @@ -64,7 +69,7 @@ in stdenv.mkDerivation rec { doCheck = false; # generates shebangs in check phase, too lazy to fix installFlags = [ - "sysconfdir=\${out}/etc" + "sysconfdir=${placeholder "out"}/etc" "localstatedir=\${TMPDIR}" ]; diff --git a/pkgs/development/libraries/libcerf/default.nix b/pkgs/development/libraries/libcerf/default.nix index fd5ee8dcaaf..0ffb2085967 100644 --- a/pkgs/development/libraries/libcerf/default.nix +++ b/pkgs/development/libraries/libcerf/default.nix @@ -1,16 +1,19 @@ -{ stdenv, lib, fetchurl }: +{ stdenv, lib, fetchurl, cmake, perl }: -stdenv.mkDerivation { - name = "libcerf-1.5"; +stdenv.mkDerivation rec { + pname = "libcerf"; + version = "1.13"; src = fetchurl { - url = "http://apps.jcns.fz-juelich.de/src/libcerf/libcerf-1.5.tgz"; - sha256 = "11jwr8ql4a9kmv04ycgwk4dsqnlv4l65a8aa0x1i3y7zwx3w2vg3"; + url = "https://jugit.fz-juelich.de/mlz/libcerf/-/archive/v${version}/libcerf-v${version}.tar.gz"; + sha256 = "01d3fr4qa0080xdgp66mjbsa884qivn9y83p7rdyz2l3my0rysg4"; }; + nativeBuildInputs = [ cmake perl ]; + meta = with lib; { description = "Complex error (erf), Dawson, Faddeeva, and Voigt function library"; - homepage = http://apps.jcns.fz-juelich.de/doku/sc/libcerf; + homepage = https://jugit.fz-juelich.de/mlz/libcerf; license = licenses.mit; maintainers = with maintainers; [ orivej ]; platforms = platforms.all; diff --git a/pkgs/development/libraries/libfilezilla/default.nix b/pkgs/development/libraries/libfilezilla/default.nix index 95954a120c8..fd17267b615 100644 --- a/pkgs/development/libraries/libfilezilla/default.nix +++ b/pkgs/development/libraries/libfilezilla/default.nix @@ -9,11 +9,11 @@ stdenv.mkDerivation rec { pname = "libfilezilla"; - version = "0.18.2"; + version = "0.19.1"; src = fetchurl { url = "https://download.filezilla-project.org/${pname}/${pname}-${version}.tar.bz2"; - sha256 = "1j9da9xi2k4nw97m14mpp7h39rh03br0gmjj9ff819l6nhlnkn20"; + sha256 = "0cjscv68nnqivzba94xapx1c970j1jbdbm0h3g2ym9i0hgnyyhha"; }; nativeBuildInputs = [ pkgconfig ]; diff --git a/pkgs/development/libraries/libgnurl/default.nix b/pkgs/development/libraries/libgnurl/default.nix index 1736e97f466..dd7b91ffb9a 100644 --- a/pkgs/development/libraries/libgnurl/default.nix +++ b/pkgs/development/libraries/libgnurl/default.nix @@ -3,11 +3,11 @@ stdenv.mkDerivation rec { pname = "libgnurl"; - version = "7.66.0"; + version = "7.67.0"; src = fetchurl { url = "mirror://gnu/gnunet/gnurl-${version}.tar.gz"; - sha256 = "03bkzcld384z7i3zh3k9k3pr0xpyqbcr8cxjqya1zqs5lk7i55x5"; + sha256 = "0ima9hz5d54iyvvih51s8xn6dsfxd3qyzgnj9l7w9f1smia295rb"; }; nativeBuildInputs = [ libtool groff perl pkgconfig python2 ]; diff --git a/pkgs/development/libraries/libmypaint/default.nix b/pkgs/development/libraries/libmypaint/default.nix index 91e0b5ef072..c36633edfff 100644 --- a/pkgs/development/libraries/libmypaint/default.nix +++ b/pkgs/development/libraries/libmypaint/default.nix @@ -7,7 +7,7 @@ , json_c , libtool , pkgconfig -, python2 +, python3 }: stdenv.mkDerivation rec { @@ -29,7 +29,7 @@ stdenv.mkDerivation rec { intltool libtool pkgconfig - python2 + python3 ]; buildInputs = [ @@ -43,6 +43,10 @@ stdenv.mkDerivation rec { doCheck = true; + postPatch = '' + sed 's|python2|python|' -i autogen.sh + ''; + preConfigure = "./autogen.sh"; meta = with stdenv.lib; { diff --git a/pkgs/development/libraries/librealsense/default.nix b/pkgs/development/libraries/librealsense/default.nix index 468bcfb0a18..91c093c991a 100644 --- a/pkgs/development/libraries/librealsense/default.nix +++ b/pkgs/development/libraries/librealsense/default.nix @@ -1,18 +1,20 @@ -{ stdenv, fetchFromGitHub, cmake, libusb, ninja, pkgconfig}: +{ stdenv, fetchFromGitHub, cmake, libusb1, ninja, pkgconfig }: stdenv.mkDerivation rec { pname = "librealsense"; - version = "2.25.0"; + version = "2.29.0"; + + outputs = [ "out" "dev" ]; src = fetchFromGitHub { owner = "IntelRealSense"; - repo = "librealsense"; + repo = pname; rev = "v${version}"; - sha256 = "029qps0bbck0m2xj0mb5g3pgkk7a1zq8wcilfkvpx72sn7039xvw"; + sha256 = "0wrg1c4fcd5ky96hmnczg9izfgd0yxls8ghxxzrdvgdlg269f443"; }; buildInputs = [ - libusb + libusb1 ]; nativeBuildInputs = [ @@ -25,9 +27,9 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "A cross-platform library for Intel® RealSense™ depth cameras (D400 series and the SR300)"; - homepage = https://github.com/IntelRealSense/librealsense; + homepage = "https://github.com/IntelRealSense/librealsense"; license = licenses.asl20; maintainers = with maintainers; [ brian-dawn ]; - platforms = ["i686-linux" "x86_64-linux" "x86_64-darwin"]; + platforms = [ "i686-linux" "x86_64-linux" "x86_64-darwin" ]; }; } diff --git a/pkgs/development/libraries/libvncserver/default.nix b/pkgs/development/libraries/libvncserver/default.nix index 0a7819743e0..c9adad6f645 100644 --- a/pkgs/development/libraries/libvncserver/default.nix +++ b/pkgs/development/libraries/libvncserver/default.nix @@ -1,41 +1,43 @@ -{stdenv, fetchurl, fetchpatch, - libtool, libjpeg, openssl, zlib, libgcrypt, autoreconfHook, pkgconfig, libpng, - systemd +{ stdenv, fetchzip, fetchpatch, cmake +, libjpeg, openssl, zlib, libgcrypt, libpng +, systemd }: let s = # Generated upstream information rec { - baseName="libvncserver"; - version="0.9.11"; - name="${baseName}-${version}"; - url="https://github.com/LibVNC/libvncserver/archive/LibVNCServer-${version}.tar.gz"; - sha256="15189n09r1pg2nqrpgxqrcvad89cdcrca9gx6qhm6akjf81n6g8r"; + pname = "libvncserver"; + version = "0.9.12"; + url = "https://github.com/LibVNC/libvncserver/archive/LibVNCServer-${version}.tar.gz"; + sha256 = "1226hb179l914919f5nm2mlf8rhaarqbf48aa649p4rwmghyx9vm"; # unpacked archive checksum }; in stdenv.mkDerivation { - inherit (s) name version; - src = fetchurl { + inherit (s) pname version; + src = fetchzip { inherit (s) url sha256; }; patches = [ - # CVE-2018-7225. Remove with the next release (fetchpatch { - url = https://salsa.debian.org/debian/libvncserver/raw/master/debian/patches/CVE-2018-7225.patch; - sha256 = "1hj1lzxsrdmzzl061vg0ncdpvfmvvkrpk8q12mp70qvszcqa7ja3"; + name = "CVE-2018-20750.patch"; + url = "https://github.com/LibVNC/libvncserver/commit/09e8fc02f59f16e2583b34fe1a270c238bd9ffec.patch"; + sha256 = "004h50786nvjl3y3yazpsi2b767vc9gqrwm1ralj3zgy47kwfhqm"; + }) + (fetchpatch { + name = "CVE-2019-15681.patch"; + url = "https://github.com/LibVNC/libvncserver/commit/d01e1bb4246323ba6fcee3b82ef1faa9b1dac82a.patch"; + sha256 = "0hf0ss7all2m50z2kan4mck51ws44yim4ymn8p0d991y465y6l9s"; }) ]; - preConfigure = '' - sed -e 's@/usr/include/linux@${stdenv.cc.libc}/include/linux@g' -i configure - ''; - nativeBuildInputs = [ pkgconfig autoreconfHook ]; + nativeBuildInputs = [ cmake ]; buildInputs = [ - libtool libjpeg openssl libgcrypt libpng + libjpeg openssl libgcrypt libpng ] ++ stdenv.lib.optional stdenv.isLinux systemd; propagatedBuildInputs = [ zlib ]; meta = { inherit (s) version; - description = "VNC server library"; + description = "VNC server library"; + homepage = "https://libvnc.github.io/"; license = stdenv.lib.licenses.gpl2Plus ; maintainers = [stdenv.lib.maintainers.raskin]; platforms = stdenv.lib.platforms.unix; diff --git a/pkgs/development/libraries/libvterm-neovim/default.nix b/pkgs/development/libraries/libvterm-neovim/default.nix index 231b426e6a7..50ee7e4d387 100644 --- a/pkgs/development/libraries/libvterm-neovim/default.nix +++ b/pkgs/development/libraries/libvterm-neovim/default.nix @@ -6,13 +6,13 @@ stdenv.mkDerivation { pname = "libvterm-neovim"; - version = "2019-08-28"; + version = "2019-10-08"; src = fetchFromGitHub { owner = "neovim"; repo = "libvterm"; - rev = "1aa95e24d8f07a396aa80b7cd52f93e2b5bcca79"; - sha256 = "0vjd397lqrfv4kc79i5izva4bynbymx3gllkg281fnk0b15vxfif"; + rev = "7c72294d84ce20da4c27362dbd7fa4b08cfc91da"; + sha256 = "111qyxq33x74dwdnqcnzlv9j0n8hxyribd6ppwcsxmyrniyw9qrk"; }; buildInputs = [ perl ]; diff --git a/pkgs/development/libraries/nlohmann_json/default.nix b/pkgs/development/libraries/nlohmann_json/default.nix index 72d425e8918..43a7cf15c15 100644 --- a/pkgs/development/libraries/nlohmann_json/default.nix +++ b/pkgs/development/libraries/nlohmann_json/default.nix @@ -3,13 +3,13 @@ stdenv.mkDerivation rec { pname = "nlohmann_json"; - version = "3.7.0"; + version = "3.7.3"; src = fetchFromGitHub { owner = "nlohmann"; repo = "json"; rev = "v${version}"; - sha256 = "0v7xih4zjixxxfvkfbs7a8j9qcvpwlsv4vrkbyns3hc7b44nb8ap"; + sha256 = "04rry1xzis71z5gj1ylcj8b4li5q18zxhcwaviwvi3hx0frzxl9w"; }; nativeBuildInputs = [ cmake ]; diff --git a/pkgs/development/libraries/nss_wrapper/default.nix b/pkgs/development/libraries/nss_wrapper/default.nix index 79eb4d1e10e..40ee4f890d4 100644 --- a/pkgs/development/libraries/nss_wrapper/default.nix +++ b/pkgs/development/libraries/nss_wrapper/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, cmake, pkgconfig }: stdenv.mkDerivation rec { - name = "nss_wrapper-1.1.6"; + name = "nss_wrapper-1.1.7"; src = fetchurl { url = "mirror://samba/cwrap/${name}.tar.gz"; - sha256 = "1hijnwabj4nh0m0a913pq07iqq0bw8qb2zxcv73zbnsaay7pa55h"; + sha256 = "1pa7gakprkxblxdqbcy2242lk924gvzdgfr5648wb7cslksm7hbq"; }; nativeBuildInputs = [ pkgconfig ]; diff --git a/pkgs/development/libraries/nuspell/default.nix b/pkgs/development/libraries/nuspell/default.nix index db542ec93a9..c1f354a1ac9 100644 --- a/pkgs/development/libraries/nuspell/default.nix +++ b/pkgs/development/libraries/nuspell/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "nuspell"; - version = "2.3.0"; + version = "3.0.0"; src = fetchFromGitHub { owner = "nuspell"; repo = "nuspell"; rev = "v${version}"; - sha256 = "0n5cajrp1fhk8p54ch3akkd9nl8b9c6wwf25980dhagcdys3vab3"; + sha256 = "1cyvvf5f92a777qgh00ja43z43j5nhc9dw5l3wvw9j6j9bqc4i8p"; }; nativeBuildInputs = [ cmake pkgconfig ronn ]; diff --git a/pkgs/development/libraries/physics/applgrid/default.nix b/pkgs/development/libraries/physics/applgrid/default.nix index edda5148068..3e2a53d81dd 100644 --- a/pkgs/development/libraries/physics/applgrid/default.nix +++ b/pkgs/development/libraries/physics/applgrid/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, gfortran, hoppet, lhapdf, root5 }: +{ stdenv, fetchurl, gfortran, hoppet, lhapdf, root5, zlib }: stdenv.mkDerivation rec { pname = "applgrid"; @@ -9,7 +9,8 @@ stdenv.mkDerivation rec { sha256 = "1yw9wrk3vjv84kd3j4s1scfhinirknwk6xq0hvj7x2srx3h93q9p"; }; - buildInputs = [ gfortran hoppet lhapdf root5 ]; + # For some reason zlib was only needed after bump to gfortran8 + buildInputs = [ gfortran hoppet lhapdf root5 zlib ]; patches = [ ./bad_code.patch diff --git a/pkgs/development/libraries/protobuf/3.11.nix b/pkgs/development/libraries/protobuf/3.11.nix new file mode 100644 index 00000000000..26f8ca13341 --- /dev/null +++ b/pkgs/development/libraries/protobuf/3.11.nix @@ -0,0 +1,6 @@ +{ callPackage, ... }: + +callPackage ./generic-v3.nix { + version = "3.11.0"; + sha256 = "1b0kf02aw1yvpwdax3865057dzrlrdc7dgam05znwq8id5q76ckr"; +} diff --git a/pkgs/development/libraries/pybind11/default.nix b/pkgs/development/libraries/pybind11/default.nix deleted file mode 100644 index 7dfbdc4d64a..00000000000 --- a/pkgs/development/libraries/pybind11/default.nix +++ /dev/null @@ -1,47 +0,0 @@ -{ stdenv, fetchurl, fetchFromGitHub, cmake, catch, python, eigen }: - -stdenv.mkDerivation rec { - pname = "pybind"; - version = "2.2.4"; - - src = fetchFromGitHub { - owner = "pybind"; - repo = "pybind11"; - rev = "v${version}"; - sha256 = "0pa79ymcasv8br5ifbx7878id5py2jpjac3i20cqxr6gs9l6ivlv"; - }; - - nativeBuildInputs = [ cmake ]; - checkInputs = with python.pkgs; [ catch eigen pytest numpy scipy ]; - - # Disable test_cmake_build test, as it fails in sandbox - # https://github.com/pybind/pybind11/issues/1355 - patches = [ - ./no_test_cmake_build.patch - (fetchurl { # Remove on bump to v2.2.5 - name = "pytest_namespace_to_configure.patch"; - url = "https://github.com/pybind/pybind11/commit/e7ef34f23f194cfa40bdbf967c6d34712261a4ee.patch"; - sha256 = "1dhv6p0b5fxzxc8j3sfy8kvfmdshczk22xfxh6bk0cfnfdy9iqrq"; - }) - ]; - - doCheck = true; - - cmakeFlags = [ - "-DPYTHON_EXECUTABLE=${python.interpreter}" - "-DPYBIND11_TEST=${if doCheck then "ON" else "OFF"}" - ]; - - meta = { - homepage = https://github.com/pybind/pybind11; - description = "Seamless operability between C++11 and Python"; - longDescription = '' - Pybind11 is a lightweight header-only library that exposes - C++ types in Python and vice versa, mainly to create Python - bindings of existing C++ code. - ''; - platforms = with stdenv.lib.platforms; unix; - license = stdenv.lib.licenses.bsd3; - maintainers = with stdenv.lib.maintainers; [ yuriaisaka ]; - }; -} diff --git a/pkgs/development/libraries/pybind11/no_test_cmake_build.patch b/pkgs/development/libraries/pybind11/no_test_cmake_build.patch deleted file mode 100644 index c5d6ecc4481..00000000000 --- a/pkgs/development/libraries/pybind11/no_test_cmake_build.patch +++ /dev/null @@ -1,7 +0,0 @@ ---- a/tests/CMakeLists.txt 2019-01-28 14:13:55.822119328 +0100 -+++ b/tests/CMakeLists.txt 2019-01-28 14:14:06.741161928 +0100 -@@ -233,4 +233,3 @@ - add_subdirectory(test_embed) - - # Test CMake build using functions and targets from subdirectory or installed location --add_subdirectory(test_cmake_build) diff --git a/pkgs/development/ocaml-modules/eigen/default.nix b/pkgs/development/ocaml-modules/eigen/default.nix new file mode 100644 index 00000000000..7c1ec79f7da --- /dev/null +++ b/pkgs/development/ocaml-modules/eigen/default.nix @@ -0,0 +1,25 @@ +{ stdenv, buildDunePackage, fetchFromGitHub, ctypes }: + +buildDunePackage rec { + pname = "eigen"; + version = "0.1.5"; + + src = fetchFromGitHub { + owner = "owlbarn"; + repo = pname; + rev = version; + sha256 = "0pbqd87i9h7qpx84hr8k4iw0rhmjgma4s3wihxh992jjvsrgdyfi"; + }; + + minimumOCamlVersion = "4.04"; + + propagatedBuildInputs = [ ctypes ]; + + meta = with stdenv.lib; { + inherit (src.meta) homepage; + description = "Minimal/incomplete Ocaml interface to Eigen3, mostly for Owl"; + platforms = platforms.x86_64; + maintainers = [ maintainers.bcdarwin ]; + license = licenses.mit; + }; +} diff --git a/pkgs/development/ocaml-modules/kafka/default.nix b/pkgs/development/ocaml-modules/kafka/default.nix new file mode 100644 index 00000000000..4eeb8d975fd --- /dev/null +++ b/pkgs/development/ocaml-modules/kafka/default.nix @@ -0,0 +1,26 @@ +{ stdenv, fetchFromGitHub, buildDunePackage, base, cmdliner, ocaml_lwt, + rdkafka, zlib }: + +buildDunePackage rec { + pname = "kafka"; + version = "0.4"; + + src = fetchFromGitHub { + owner = "didier-wenzek"; + repo = "ocaml-kafka"; + rev = version; + sha256 = "0lb8x0wh7sf8v9mjwhq32azjz54kw49fsjfb7m76z4nhxfkjw5hy"; + }; + + buildInputs = [ base cmdliner ocaml_lwt zlib ]; + + propagatedBuildInputs = [ rdkafka zlib ]; + + meta = with stdenv.lib; { + homepage = https://github.com/didier-wenzek/ocaml-kafka; + description = "OCaml bindings for Kafka"; + license = licenses.mit; + maintainers = [ maintainers.rixed ]; + }; +} + diff --git a/pkgs/development/ocaml-modules/owl-base/default.nix b/pkgs/development/ocaml-modules/owl-base/default.nix new file mode 100644 index 00000000000..b2546f3e93c --- /dev/null +++ b/pkgs/development/ocaml-modules/owl-base/default.nix @@ -0,0 +1,25 @@ +{ stdenv, buildDunePackage, fetchFromGitHub, integers, stdlib-shims }: + +buildDunePackage rec { + pname = "owl-base"; + version = "0.7.1"; + + src = fetchFromGitHub { + owner = "owlbarn"; + repo = "owl"; + rev = version; + sha256 = "1v4jfn3w18zq188f9gskx9ffja3xx59j2mgrw6azp8lsbqixg5xk"; + }; + + propagatedBuildInputs = [ stdlib-shims ]; + + minimumOCamlVersion = "4.06"; + + meta = with stdenv.lib; { + description = "Numerical computing library for Ocaml"; + homepage = "https://ocaml.xyz"; + platforms = platforms.x86_64; + maintainers = [ maintainers.bcdarwin ]; + license = licenses.mit; + }; +} diff --git a/pkgs/development/ocaml-modules/owl/default.nix b/pkgs/development/ocaml-modules/owl/default.nix new file mode 100644 index 00000000000..95d4f6da704 --- /dev/null +++ b/pkgs/development/ocaml-modules/owl/default.nix @@ -0,0 +1,15 @@ +{ stdenv, buildDunePackage, fetchFromGitHub, alcotest +, eigen, stdio, stdlib-shims, openblasCompat, owl-base +}: + +buildDunePackage rec { + pname = "owl"; + + inherit (owl-base) version src meta; + + buildInputs = [ eigen ]; + checkInputs = [ alcotest ]; + propagatedBuildInputs = [ stdio stdlib-shims openblasCompat owl-base ]; + + # tests not enabled for now due to owlbarn/owl/issues/460 +} diff --git a/pkgs/development/python-modules/XlsxWriter/default.nix b/pkgs/development/python-modules/XlsxWriter/default.nix index 679725db307..f9730eb61ae 100644 --- a/pkgs/development/python-modules/XlsxWriter/default.nix +++ b/pkgs/development/python-modules/XlsxWriter/default.nix @@ -3,7 +3,7 @@ buildPythonPackage rec { pname = "XlsxWriter"; - version = "1.2.1"; + version = "1.2.6"; # PyPI release tarball doesn't contain tests so let's use GitHub. See: # https://github.com/jmcnamara/XlsxWriter/issues/327 @@ -11,7 +11,7 @@ buildPythonPackage rec { owner = "jmcnamara"; repo = pname; rev = "RELEASE_${version}"; - sha256 = "0br8ib9n17dfprfly93mjkhdhpndb7i4g57lwscvp2s69ssql32s"; + sha256 = "05y1py5mn1m65bbwhinzv84jd3xj8snvf2795flw0xbxnkn8nd8p"; }; meta = { diff --git a/pkgs/development/python-modules/ansiwrap/default.nix b/pkgs/development/python-modules/ansiwrap/default.nix new file mode 100644 index 00000000000..517083a0621 --- /dev/null +++ b/pkgs/development/python-modules/ansiwrap/default.nix @@ -0,0 +1,44 @@ +{ lib +, buildPythonPackage +, fetchPypi +, tox +, pytest +, ansicolors +, coverage +, pytestcov +, textwrap3 +}: + +buildPythonPackage rec { + pname = "ansiwrap"; + version = "0.8.4"; + + src = fetchPypi { + inherit pname version; + extension = "zip"; + sha256 = "ca0c740734cde59bf919f8ff2c386f74f9a369818cdc60efe94893d01ea8d9b7"; + }; + + checkInputs = [ + tox + pytest + ansicolors + coverage + pytestcov + ]; + + propagatedBuildInputs = [ + textwrap3 + ]; + + checkPhase = '' + pytest + ''; + + meta = with lib; { + description = "Textwrap, but savvy to ANSI colors and styles"; + homepage = https://github.com/jonathaneunice/ansiwrap; + license = licenses.asl20; + maintainers = [ maintainers.costrouc ]; + }; +} diff --git a/pkgs/development/python-modules/astroquery/conftest-astropy-3-fix.patch b/pkgs/development/python-modules/astroquery/conftest-astropy-3-fix.patch deleted file mode 100644 index 0b1c7973b59..00000000000 --- a/pkgs/development/python-modules/astroquery/conftest-astropy-3-fix.patch +++ /dev/null @@ -1,54 +0,0 @@ -diff -ruN astroquery-0.3.9.orig/astroquery/conftest.py astroquery-0.3.9/astroquery/conftest.py ---- astroquery-0.3.9.orig/astroquery/conftest.py 2018-11-27 14:51:16.000000000 +0100 -+++ astroquery-0.3.9/astroquery/conftest.py 2019-07-23 18:19:17.000000000 +0200 -@@ -5,15 +5,20 @@ - # by importing them here in conftest.py they are discoverable by py.test - # no matter how it is invoked within the source tree. - --from astropy.tests.pytest_plugins import (PYTEST_HEADER_MODULES, -- enable_deprecations_as_exceptions, -- TESTED_VERSIONS) -+from astropy.version import version as astropy_version - --try: -- packagename = os.path.basename(os.path.dirname(__file__)) -- TESTED_VERSIONS[packagename] = version.version --except NameError: -- pass -+if astropy_version < '3.0': -+ # With older versions of Astropy, we actually need to import the pytest -+ # plugins themselves in order to make them discoverable by pytest. -+ from astropy.tests.pytest_plugins import * -+else: -+ # As of Astropy 3.0, the pytest plugins provided by Astropy are -+ # automatically made available when Astropy is installed. This means it's -+ # not necessary to import them here, but we still need to import global -+ # variables that are used for configuration. -+ from astropy.tests.plugins.display import PYTEST_HEADER_MODULES, TESTED_VERSIONS -+ -+from astropy.tests.helper import enable_deprecations_as_exceptions - - # Add astropy to test header information and remove unused packages. - # Pytest header customisation was introduced in astropy 1.0. -@@ -36,12 +41,17 @@ - # The warnings_to_ignore_by_pyver parameter was added in astropy 2.0 - enable_deprecations_as_exceptions(modules_to_ignore_on_import=['requests']) - -+# add '_testrun' to the version name so that the user-agent indicates that -+# it's being run in a test -+from . import version -+version.version += '_testrun' -+ -+ - # This is to figure out the affiliated package version, rather than - # using Astropy's --try: -- from .version import version --except ImportError: -- version = 'dev' -+from .version import version, astropy_helpers_version -+ - - packagename = os.path.basename(os.path.dirname(__file__)) - TESTED_VERSIONS[packagename] = version -+TESTED_VERSIONS['astropy_helpers'] = astropy_helpers_version diff --git a/pkgs/development/python-modules/astroquery/default.nix b/pkgs/development/python-modules/astroquery/default.nix index e1f36ffa8cf..461d8801e60 100644 --- a/pkgs/development/python-modules/astroquery/default.nix +++ b/pkgs/development/python-modules/astroquery/default.nix @@ -20,10 +20,6 @@ buildPythonPackage rec { sha256 = "1ce57a8792c7d5d74206d797d379de6da35d56be433ea5840c41a49f202e2fab"; }; - # Fix tests using conftest.py from HEAD in the upstream GitHub - # repository. - patches = [ ./conftest-astropy-3-fix.patch ]; - propagatedBuildInputs = [ astropy requests keyring beautifulsoup4 html5lib ]; nativeBuildInputs = [ astropy-helpers ]; diff --git a/pkgs/development/python-modules/asyncpg/default.nix b/pkgs/development/python-modules/asyncpg/default.nix index 8bcfb2d84a2..2a47f13fe4b 100644 --- a/pkgs/development/python-modules/asyncpg/default.nix +++ b/pkgs/development/python-modules/asyncpg/default.nix @@ -3,12 +3,12 @@ buildPythonPackage rec { pname = "asyncpg"; - version = "0.19.0"; + version = "0.20.0"; disabled = !isPy3k; src = fetchPypi { inherit pname version; - sha256 = "0sp3m6sgw83rhvg87y78lhk4xxx58ffzyf9rsq5f1a7b8azbnlxj"; + sha256 = "0yjszgg1zbbsfxj1gv17ymc2hcfvymkvg69dvpvwy0dqspjxq0ma"; }; checkInputs = [ diff --git a/pkgs/development/python-modules/atomman/default.nix b/pkgs/development/python-modules/atomman/default.nix index ef69ee91d38..d873700f32a 100644 --- a/pkgs/development/python-modules/atomman/default.nix +++ b/pkgs/development/python-modules/atomman/default.nix @@ -1,34 +1,33 @@ -{ stdenv -, buildPythonPackage -, fetchPypi -, xmltodict +{ stdenv, buildPythonPackage, fetchFromGitHub, isPy27 +, cython , datamodeldict -, numpy , matplotlib -, scipy -, pandas -, cython , numericalunits +, numpy +, pandas , pytest +, scipy +, toolz +, xmltodict }: buildPythonPackage rec { - version = "1.2.8"; + version = "1.3.0"; pname = "atomman"; + disabled = isPy27; - src = fetchPypi { - inherit pname version; - sha256 = "0ed099fdceca2d733e81afb08d777e8e852a6e53660d6d268f3739b8d323ced9"; + src = fetchFromGitHub { + owner = "usnistgov"; + repo = "atomman"; + rev = "v${version}"; + sha256 = "09pfykd96wmw00s3kgabghykjn8b4yjml4ybpi7kwy7ygdmzcx51"; }; checkInputs = [ pytest ]; - propagatedBuildInputs = [ xmltodict datamodeldict numpy matplotlib scipy pandas cython numericalunits ]; - - # tests not included with Pypi release - doCheck = false; + propagatedBuildInputs = [ xmltodict datamodeldict numpy matplotlib scipy pandas cython numericalunits toolz ]; checkPhase = '' - py.test tests + py.test tests -k 'not test_atomic' ''; meta = with stdenv.lib; { diff --git a/pkgs/development/python-modules/aws-lambda-builders/default.nix b/pkgs/development/python-modules/aws-lambda-builders/default.nix index 1e49edab25f..d9c90cfa049 100644 --- a/pkgs/development/python-modules/aws-lambda-builders/default.nix +++ b/pkgs/development/python-modules/aws-lambda-builders/default.nix @@ -10,14 +10,14 @@ buildPythonPackage rec { pname = "aws-lambda-builders"; - version = "0.4.0"; + version = "0.6.0"; # No tests available in PyPI tarball src = fetchFromGitHub { owner = "awslabs"; repo = "aws-lambda-builders"; rev = "v${version}"; - sha256 = "1z2l9qm6mxp90zl64i9j2cmlzn8n7sc8yfpqh14fi9ay887ayjs1"; + sha256 = "0bvph58wrw9in5irdbv103knvw2dhqs3kapqv5lpaac9dn7lsk6q"; }; # Package is not compatible with Python 3.5 diff --git a/pkgs/development/python-modules/aws-sam-translator/default.nix b/pkgs/development/python-modules/aws-sam-translator/default.nix index b43ec658f5e..298ce22daa6 100644 --- a/pkgs/development/python-modules/aws-sam-translator/default.nix +++ b/pkgs/development/python-modules/aws-sam-translator/default.nix @@ -10,11 +10,11 @@ buildPythonPackage rec { pname = "aws-sam-translator"; - version = "1.15.1"; + version = "1.16.0"; src = fetchPypi { inherit pname version; - sha256 = "11c62c00f37b57c39a55d7a29d93f4704a88549c29a6448ebc953147173fbe85"; + sha256 = "0xvfbhiqdqy4qs4z8v2p7z3l01w5af948bmf400s5jsq2hnxl6nv"; }; # Tests are not included in the PyPI package diff --git a/pkgs/development/python-modules/azure-cli-core/default.nix b/pkgs/development/python-modules/azure-cli-core/default.nix deleted file mode 100644 index b08f74d2ab5..00000000000 --- a/pkgs/development/python-modules/azure-cli-core/default.nix +++ /dev/null @@ -1,93 +0,0 @@ -{ stdenv -, lib -, python -, buildPythonPackage -, fetchPypi -, adal -, antlr4-python3-runtime -, argcomplete -, azure-cli-telemetry -, colorama -, jmespath -, humanfriendly -, knack -, msrest -, msrestazure -, paramiko -, pygments -, pyjwt -, pyopenssl -, pyyaml -, requests -, six -, tabulate -, azure-mgmt-resource -, pyperclip -, psutil -, enum34 -, futures -, antlr4-python2-runtime -, ndg-httpsclient -, isPy3k -}: - -buildPythonPackage rec { - pname = "azure-cli-core"; - version = "2.0.76"; - - src = fetchPypi { - inherit pname version; - sha256 = "6c2f8535f457b1ec865340a24f35791f11cfedd9242565bdc099b8e078a735a0"; - }; - - propagatedBuildInputs = [ - adal - argcomplete - azure-cli-telemetry - colorama - jmespath - humanfriendly - knack - msrest - msrestazure - paramiko - pygments - pyjwt - pyopenssl - pyyaml - requests - six - tabulate - azure-mgmt-resource - pyperclip - psutil - ] - ++ lib.optionals isPy3k [ antlr4-python3-runtime ] - ++ lib.optionals (!isPy3k) [ enum34 futures antlr4-python2-runtime ndg-httpsclient ]; - - # Remove overly restrictive version contraints and obsolete namespace setup - prePatch = '' - substituteInPlace setup.py \ - --replace "wheel==0.30.0" "wheel" \ - --replace "azure-mgmt-resource==2.1.0" "azure-mgmt-resource" - substituteInPlace setup.cfg \ - --replace "azure-namespace-package = azure-cli-nspkg" "" - ''; - - # Prevent these __init__'s from violating PEP420, only needed for python2 - postInstall = lib.optionalString isPy3k '' - rm $out/${python.sitePackages}/azure/__init__.py \ - $out/${python.sitePackages}/azure/cli/__init__.py - ''; - - # Tests are not included in sdist package - doCheck = false; - - meta = with lib; { - homepage = https://github.com/Azure/azure-cli; - description = "Next generation multi-platform command line experience for Azure"; - platforms = platforms.all; - license = licenses.mit; - maintainers = with maintainers; [ jonringer ]; - }; -} diff --git a/pkgs/development/python-modules/azure-cli-telemetry/default.nix b/pkgs/development/python-modules/azure-cli-telemetry/default.nix deleted file mode 100644 index 202e0a013b9..00000000000 --- a/pkgs/development/python-modules/azure-cli-telemetry/default.nix +++ /dev/null @@ -1,50 +0,0 @@ -{ stdenv -, lib -, buildPythonPackage -, fetchPypi -, isPy3k -, python -, applicationinsights -, portalocker -}: - -buildPythonPackage rec { - pname = "azure-cli-telemetry"; - version = "1.0.4"; - - src = fetchPypi { - inherit pname version; - sha256 = "1f239d544d309c29e827982cc20113eb57037dba16db6cdd2e0283e437e0e577"; - }; - - propagatedBuildInputs = [ - applicationinsights - portalocker - ]; - - # tests are not published to pypi - doCheck = false; - - # Remove overly restrictive version contraints and obsolete namespace setup - prePatch = '' - substituteInPlace setup.py \ - --replace "applicationinsights>=0.11.1,<0.12" "applicationinsights" - substituteInPlace setup.cfg \ - --replace "azure-namespace-package = azure-cli-nspkg" "" - rm azure_bdist_wheel.py # we'll fix PEP420 namespacing - ''; - - # Prevent these __init__'s from violating PEP420, only needed for python2 - postInstall = lib.optionalString isPy3k '' - rm $out/${python.sitePackages}/azure/__init__.py \ - $out/${python.sitePackages}/azure/cli/__init__.py - ''; - - meta = with lib; { - homepage = https://github.com/Azure/azure-cli; - description = "Next generation multi-platform command line experience for Azure"; - platforms = platforms.all; - license = licenses.mit; - maintainers = with maintainers; [ jonringer ]; - }; -} diff --git a/pkgs/development/python-modules/azure-mgmt-cosmosdb/default.nix b/pkgs/development/python-modules/azure-mgmt-cosmosdb/default.nix index 33617383a1d..aef56be79c0 100644 --- a/pkgs/development/python-modules/azure-mgmt-cosmosdb/default.nix +++ b/pkgs/development/python-modules/azure-mgmt-cosmosdb/default.nix @@ -10,12 +10,12 @@ buildPythonPackage rec { pname = "azure-mgmt-cosmosdb"; - version = "0.8.0"; + version = "0.9.0"; src = fetchPypi { inherit pname version; extension = "zip"; - sha256 = "0iakxb2rr1w9171802m9syjzqas02vjah711mpagbgcj549mjysb"; + sha256 = "0y28z30g7y2pj7rfxyxmqpr19z24d01g9qhafvjxry748im1961h"; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/azure-mgmt-network/default.nix b/pkgs/development/python-modules/azure-mgmt-network/default.nix index 236eb0cd8ce..4663b9fa035 100644 --- a/pkgs/development/python-modules/azure-mgmt-network/default.nix +++ b/pkgs/development/python-modules/azure-mgmt-network/default.nix @@ -7,13 +7,13 @@ }: buildPythonPackage rec { - version = "7.0.0"; + version = "8.0.0"; pname = "azure-mgmt-network"; src = fetchPypi { inherit pname version; extension = "zip"; - sha256 = "32ce90691b96ecdaa974ecb4d35063377c8fd21fd05984164507b63113f3456b"; + sha256 = "1prg4b1agda9bsn6zmvffkj22rr6jy784rdfp6154yifjr6z5jiv"; }; postInstall = if isPy3k then "" else '' diff --git a/pkgs/development/python-modules/azure-mgmt-reservations/default.nix b/pkgs/development/python-modules/azure-mgmt-reservations/default.nix index cc19e904863..5d13acb6ec8 100644 --- a/pkgs/development/python-modules/azure-mgmt-reservations/default.nix +++ b/pkgs/development/python-modules/azure-mgmt-reservations/default.nix @@ -10,12 +10,12 @@ buildPythonPackage rec { pname = "azure-mgmt-reservations"; - version = "0.5.0"; + version = "0.6.0"; src = fetchPypi { inherit pname version; extension = "zip"; - sha256 = "06l362xiqhk8vvb1pch6ngfyv8m00ahr6ysdznd6qvxz8awazy10"; + sha256 = "16ycni3cjl9c0mv419gy5rgbrlg8zp0vnr6aj8z8p2ypdw6sgac3"; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/azure-mgmt-resource/default.nix b/pkgs/development/python-modules/azure-mgmt-resource/default.nix index 4c02be90a09..4f2481097e1 100644 --- a/pkgs/development/python-modules/azure-mgmt-resource/default.nix +++ b/pkgs/development/python-modules/azure-mgmt-resource/default.nix @@ -8,13 +8,13 @@ buildPythonPackage rec { - version = "5.1.0"; + version = "6.0.0"; pname = "azure-mgmt-resource"; src = fetchPypi { inherit pname version; extension = "zip"; - sha256 = "88db03ea5b9db1dfbf3de8c7be111ed41b121a374645e3ddf3fbba47584c32b1"; + sha256 = "08n6r6ja7p20qlhb9pp51nwwxz2mal19an98zry276i8z5x8ckp0"; }; postInstall = if isPy3k then "" else '' diff --git a/pkgs/development/python-modules/azure-mgmt-sql/default.nix b/pkgs/development/python-modules/azure-mgmt-sql/default.nix index 5ad1e620ede..5a5a708a5dd 100644 --- a/pkgs/development/python-modules/azure-mgmt-sql/default.nix +++ b/pkgs/development/python-modules/azure-mgmt-sql/default.nix @@ -10,12 +10,12 @@ buildPythonPackage rec { pname = "azure-mgmt-sql"; - version = "0.14.0"; + version = "0.15.0"; src = fetchPypi { inherit pname version; extension = "zip"; - sha256 = "109w1kj45fvwc94bkhdkj3bdysrskfz8i6ph4qlpjk340zy81vvl"; + sha256 = "0qv58xraznv2ldhd34cvznhz045x3ncfgam9c12gxyj4q0k3pyc9"; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/azure-mgmt-web/default.nix b/pkgs/development/python-modules/azure-mgmt-web/default.nix index 4a372139fdb..ea6c1502123 100644 --- a/pkgs/development/python-modules/azure-mgmt-web/default.nix +++ b/pkgs/development/python-modules/azure-mgmt-web/default.nix @@ -10,12 +10,12 @@ buildPythonPackage rec { pname = "azure-mgmt-web"; - version = "0.43.1"; + version = "0.44.0"; src = fetchPypi { inherit pname version; extension = "zip"; - sha256 = "e3ab5acc9f13746e1f4ce19ccbacc4522527dd1f75eff2826cd882b7ba54806a"; + sha256 = "05dqakhfi301k2jnvccxdkigqvwnf9xz858pqg9vsri3dq69f1rw"; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/babelgladeextractor/default.nix b/pkgs/development/python-modules/babelgladeextractor/default.nix index 40c2493c151..997682ca865 100644 --- a/pkgs/development/python-modules/babelgladeextractor/default.nix +++ b/pkgs/development/python-modules/babelgladeextractor/default.nix @@ -3,23 +3,21 @@ , buildPythonPackage , fetchPypi , Babel -, lxml }: buildPythonPackage rec { pname = "babelgladeextractor"; - version = "0.6.0"; + version = "0.6.1"; src = fetchPypi { pname = "BabelGladeExtractor"; inherit version; extension = "tar.bz2"; - sha256 = "18m5vi3sj2h26ibmb6fzfjs2lscg757ivk1bjgkn1haf9gdwyjj6"; + sha256 = "1jhs12pliz54dbnigib1h8ywfzsj1g32c1vhspvg46f5983nvf93"; }; propagatedBuildInputs = [ Babel - lxml # TODO: remove in 0.7.0 ]; # Tests missing diff --git a/pkgs/development/python-modules/behave/default.nix b/pkgs/development/python-modules/behave/default.nix index 7ad3489553c..6d0364676f9 100644 --- a/pkgs/development/python-modules/behave/default.nix +++ b/pkgs/development/python-modules/behave/default.nix @@ -1,9 +1,10 @@ { stdenv, fetchPypi, fetchpatch , buildPythonApplication, python, pythonOlder -, mock, nose, pathpy, pyhamcrest, pytest +, mock, nose, pathpy, pyhamcrest, pytest_4 , glibcLocales, parse, parse-type, six , traceback2 }: + buildPythonApplication rec { pname = "behave"; version = "1.2.6"; @@ -21,7 +22,7 @@ buildPythonApplication rec { }) ]; - checkInputs = [ mock nose pathpy pyhamcrest pytest ]; + checkInputs = [ mock nose pathpy pyhamcrest pytest_4 ]; buildInputs = [ glibcLocales ]; propagatedBuildInputs = [ parse parse-type six ] ++ stdenv.lib.optional (pythonOlder "3.0") traceback2; diff --git a/pkgs/development/python-modules/biopython/default.nix b/pkgs/development/python-modules/biopython/default.nix index e60d4c60aea..a35c2d07394 100644 --- a/pkgs/development/python-modules/biopython/default.nix +++ b/pkgs/development/python-modules/biopython/default.nix @@ -6,11 +6,11 @@ buildPythonPackage rec { pname = "biopython"; - version = "1.74"; + version = "1.75"; src = fetchPypi { inherit pname version; - sha256 = "1h4hcpx1vqrcddpcznyxy14zzvy2yanlkz0117w5n869w8djq595"; + sha256 = "01lrm353si63anhhynf6hqbd3f753c2k8dkk953j3g6257py8q2h"; }; propagatedBuildInputs = [ numpy ]; diff --git a/pkgs/development/python-modules/blist/default.nix b/pkgs/development/python-modules/blist/default.nix index d6d55accaca..90a4b99cda3 100644 --- a/pkgs/development/python-modules/blist/default.nix +++ b/pkgs/development/python-modules/blist/default.nix @@ -1,5 +1,6 @@ { stdenv , buildPythonPackage +, fetchpatch , fetchPypi , isPyPy }: @@ -14,6 +15,15 @@ buildPythonPackage rec { sha256 = "1hqz9pqbwx0czvq9bjdqjqh5bwfksva1is0anfazig81n18c84is"; }; + + patches = [ + # Fix compatibility for Python 3.7 https://github.com/DanielStutzbach/blist/pull/78 + (fetchpatch { + url = "https://github.com/DanielStutzbach/blist/commit/2dc1ec28ed68611fcec9ac1c68070c782d6b4b4e.patch"; + sha256 = "0ma0z6ga80w3wzh3sidwd8ckfbgx4j1y7cc29q6j9ddrvxpf276y"; + }) + ]; + meta = with stdenv.lib; { homepage = http://stutzbachenterprises.com/blist/; description = "A list-like type with better asymptotic performance and similar performance on small lists"; diff --git a/pkgs/development/python-modules/boltons/default.nix b/pkgs/development/python-modules/boltons/default.nix index b5aa9e6cf03..8b7139f5a62 100644 --- a/pkgs/development/python-modules/boltons/default.nix +++ b/pkgs/development/python-modules/boltons/default.nix @@ -2,14 +2,14 @@ buildPythonPackage rec { pname = "boltons"; - version = "19.1.0"; + version = "19.3.0"; # No tests in PyPi Tarball src = fetchFromGitHub { owner = "mahmoud"; repo = "boltons"; rev = version; - sha256 = "0b55wly0ksviyl3a4dmih9vzd7bj3p10gr6la4722cs9cx4128q5"; + sha256 = "0pgqr2hf7lxag8nc8wnh8hpp8fd2lxccq9h0bb8lb9x8npnzhnbn"; }; checkInputs = [ pytest ]; diff --git a/pkgs/development/python-modules/click-default-group/default.nix b/pkgs/development/python-modules/click-default-group/default.nix index eeee7370b7e..6bc092dcd4e 100644 --- a/pkgs/development/python-modules/click-default-group/default.nix +++ b/pkgs/development/python-modules/click-default-group/default.nix @@ -2,14 +2,14 @@ buildPythonPackage rec { pname = "click-default-group"; - version = "1.2.1"; + version = "1.2.2"; # No tests in Pypi tarball src = fetchFromGitHub { owner = "click-contrib"; repo = "click-default-group"; rev = "v${version}"; - sha256 = "1wdmabfpmzxpiww0slinvxm9xjyxql250dn1pvjijq675pxafiz4"; + sha256 = "0nk39lmkn208w8kvq6f4h3a6qzxrrvxixahpips6ik3zflbkss86"; }; propagatedBuildInputs = [ click ]; diff --git a/pkgs/development/python-modules/diff_cover/default.nix b/pkgs/development/python-modules/diff_cover/default.nix index 86a124d2355..0d49f627821 100644 --- a/pkgs/development/python-modules/diff_cover/default.nix +++ b/pkgs/development/python-modules/diff_cover/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { pname = "diff_cover"; - version = "2.4.0"; + version = "2.4.1"; preCheck = '' export LC_ALL=en_US.UTF-8; @@ -25,7 +25,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "a78babbec1c3088a6c3a5b62cddccaeac4717236ea4f5d28b6af00f2d9b2e341"; + sha256 = "12h91rvbrf9qmdmj5nfqhcd3bpwq1pvk990bag4hyxcf86qlzds4"; }; propagatedBuildInputs = [ jinja2 jinja2_pluralize pygments six inflect ]; diff --git a/pkgs/development/python-modules/distlib/default.nix b/pkgs/development/python-modules/distlib/default.nix index aea6bcd9504..81575058b15 100644 --- a/pkgs/development/python-modules/distlib/default.nix +++ b/pkgs/development/python-modules/distlib/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "distlib"; - version = "0.2.9.post0"; + version = "0.3.0"; src = fetchPypi { inherit pname version; - sha256 = "ecb3d0e4f71d0fa7f38db6bcc276c7c9a1c6638a516d726495934a553eb3fbe0"; + sha256 = "08fyi2r246733vharl2yckw20rilci28r91mzrnnvcr638inw5if"; extension = "zip"; }; diff --git a/pkgs/development/python-modules/django-dynamic-preferences/default.nix b/pkgs/development/python-modules/django-dynamic-preferences/default.nix index 28ec9aae24f..cea5a7976bb 100644 --- a/pkgs/development/python-modules/django-dynamic-preferences/default.nix +++ b/pkgs/development/python-modules/django-dynamic-preferences/default.nix @@ -4,11 +4,11 @@ buildPythonPackage rec { pname = "django-dynamic-preferences"; - version = "1.7.1"; + version = "1.8"; src = fetchPypi { inherit pname version; - sha256 = "1z2dndkpypk4pvb0byh5a771vgp50vn8g1rbk5r3sml6dm4wcn7s"; + sha256 = "1v7mf48gb2qmmks3ifnhkh0vfd7hpvx5v81ypc9cqy35n3ir0q4a"; }; propagatedBuildInputs = [ six django persisting-theory ]; diff --git a/pkgs/development/python-modules/django-storages/default.nix b/pkgs/development/python-modules/django-storages/default.nix index a82f9d3fb9b..5756d0ab5e6 100644 --- a/pkgs/development/python-modules/django-storages/default.nix +++ b/pkgs/development/python-modules/django-storages/default.nix @@ -4,11 +4,11 @@ buildPythonPackage rec { pname = "django-storages"; - version = "1.7.2"; + version = "1.8"; src = fetchPypi { inherit pname version; - sha256 = "01xq232h321716r08rari9payas7fsiwwr5q6zgcrlwkckwxxczk"; + sha256 = "000abaayhymh4rxmk19hwhlyibc62rs0qdfczkhf4wb3p9san8lk"; }; propagatedBuildInputs = [ django ]; diff --git a/pkgs/development/python-modules/hvplot/default.nix b/pkgs/development/python-modules/hvplot/default.nix index 176258a10e0..2079f849769 100644 --- a/pkgs/development/python-modules/hvplot/default.nix +++ b/pkgs/development/python-modules/hvplot/default.nix @@ -12,6 +12,7 @@ , xarray , networkx , streamz +, colorcet }: buildPythonPackage rec { @@ -26,6 +27,7 @@ buildPythonPackage rec { checkInputs = [ pytest parameterized nbsmoke flake8 coveralls xarray networkx streamz ]; propagatedBuildInputs = [ bokeh + colorcet holoviews pandas ]; diff --git a/pkgs/development/python-modules/imbalanced-learn/0.4.nix b/pkgs/development/python-modules/imbalanced-learn/0.4.nix index c1ff24711e8..e7d2c2f3714 100644 --- a/pkgs/development/python-modules/imbalanced-learn/0.4.nix +++ b/pkgs/development/python-modules/imbalanced-learn/0.4.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "imbalanced-learn"; - version = "0.5.0"; + version = "0.4.3"; src = fetchPypi { inherit pname version; - sha256 = "5df760537886678ef9e25f5bad96d194c5fc66f62de84488069acf5d4b0119d5"; + sha256 = "5bd9e86e40ce4001a57426541d7c79b18143cbd181e3330c1a3e5c5c43287083"; }; propagatedBuildInputs = [ scikitlearn ]; diff --git a/pkgs/development/python-modules/imbalanced-learn/default.nix b/pkgs/development/python-modules/imbalanced-learn/default.nix index 6de97aff7d3..d8e35d3fcea 100644 --- a/pkgs/development/python-modules/imbalanced-learn/default.nix +++ b/pkgs/development/python-modules/imbalanced-learn/default.nix @@ -24,7 +24,8 @@ buildPythonPackage rec { # or very large dependencies (keras + tensorflow) py.test imblearn -k 'not estimator \ and not classification \ - and not _generator' + and not _generator \ + and not show_versions' ''; meta = with stdenv.lib; { diff --git a/pkgs/development/python-modules/inotify-simple/default.nix b/pkgs/development/python-modules/inotify-simple/default.nix index 2d5e9d78094..10c64fa6b3f 100644 --- a/pkgs/development/python-modules/inotify-simple/default.nix +++ b/pkgs/development/python-modules/inotify-simple/default.nix @@ -2,12 +2,12 @@ buildPythonPackage rec { pname = "inotify-simple"; - version = "1.1.8"; + version = "1.2.1"; src = fetchPypi { pname = "inotify_simple"; inherit version; - sha256 = "1pfqvnynwh318cakldhg7535kbs02asjsgv6s0ki12i7fgfi0b7w"; + sha256 = "132craajflksgxxwjawj73nn1ssv8jn58j3k5vvyiq03avbz4sfv"; }; # The package has no tests diff --git a/pkgs/development/python-modules/jenkins-job-builder/default.nix b/pkgs/development/python-modules/jenkins-job-builder/default.nix index 184c86e9268..4cdef182ca7 100644 --- a/pkgs/development/python-modules/jenkins-job-builder/default.nix +++ b/pkgs/development/python-modules/jenkins-job-builder/default.nix @@ -10,11 +10,11 @@ buildPythonPackage rec { pname = "jenkins-job-builder"; - version = "3.0.2"; + version = "3.1.0"; src = fetchPypi { inherit pname version; - sha256 = "02ggscsyrrqk06w9lb43km77qgcj8cixrrm5mkigr4gz2pzdjhmf"; + sha256 = "1wcmn01md6hykblk5zz8wd5zizyisspspakz446jg2kqfv4y3q03"; }; postPatch = '' diff --git a/pkgs/development/python-modules/kconfiglib/default.nix b/pkgs/development/python-modules/kconfiglib/default.nix index c6007bc0b42..ace5b862825 100644 --- a/pkgs/development/python-modules/kconfiglib/default.nix +++ b/pkgs/development/python-modules/kconfiglib/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "kconfiglib"; - version = "13.1.1"; + version = "13.2.0"; src = fetchPypi { inherit pname version; - sha256 = "b44af5a6dc0c716926c926ba4c1f301ce286b3a3f292ae359a866eb01dc5260e"; + sha256 = "045yjmn6xqbyb68l1jqlgi3c8cwlw1krsrlfwrrgjijkmbx6yqmd"; }; # doesnt work out of the box but might be possible diff --git a/pkgs/development/python-modules/klaus/default.nix b/pkgs/development/python-modules/klaus/default.nix index 687798735d3..c9c98cc9701 100644 --- a/pkgs/development/python-modules/klaus/default.nix +++ b/pkgs/development/python-modules/klaus/default.nix @@ -2,13 +2,13 @@ python.pkgs.buildPythonPackage rec { pname = "klaus"; - version = "1.4.0"; + version = "1.5.0"; src = fetchFromGitHub { owner = "jonashaag"; repo = pname; rev = version; - sha256 = "041l5dpymi9h0yyr55r6m0skp0m2ags3miay0s1bgfcp469k0l20"; + sha256 = "0pagyqfcj47ghd9m7b32hvi17hbl19f0wallkz6ncvmvvy919lfz"; }; prePatch = '' diff --git a/pkgs/development/python-modules/lark-parser/default.nix b/pkgs/development/python-modules/lark-parser/default.nix index abd3a491b20..38e51ac0ac6 100644 --- a/pkgs/development/python-modules/lark-parser/default.nix +++ b/pkgs/development/python-modules/lark-parser/default.nix @@ -5,13 +5,13 @@ buildPythonPackage rec { pname = "lark-parser"; - version = "0.7.7"; + version = "0.7.8"; src = fetchFromGitHub { owner = "lark-parser"; repo = "lark"; rev = version; - sha256 = "1b0dvvqqasir8dfpqj4jch7wxxk43csbv0wa80fiqsdlymxxj2dj"; + sha256 = "0gd5c3scpyir3h8clhwb5jsf8dkmh1vh7rx8135lkx9fxx01q0az"; }; # tests of Nearley support require js2py diff --git a/pkgs/development/python-modules/license-expression/default.nix b/pkgs/development/python-modules/license-expression/default.nix index 177949fbd51..e934c519428 100644 --- a/pkgs/development/python-modules/license-expression/default.nix +++ b/pkgs/development/python-modules/license-expression/default.nix @@ -4,13 +4,13 @@ buildPythonPackage rec { pname = "license-expression"; - version = "1.0"; + version = "1.2"; src = fetchFromGitHub { owner = "nexB"; repo = "license-expression"; rev = "v${version}"; - sha256 = "15dk3j5sr8iypzqqa8wa12b2a84f6ssbfvam1c1vzz00y2y5v3ic"; + sha256 = "0bbd7d90z58p9sd01b00g0vfd9bmwzksjb7pc8833s2jpja9mxz1"; }; postPatch = "patchShebangs ./configure"; diff --git a/pkgs/development/python-modules/m2crypto/default.nix b/pkgs/development/python-modules/m2crypto/default.nix index cd9781dbc88..56e1de49f20 100644 --- a/pkgs/development/python-modules/m2crypto/default.nix +++ b/pkgs/development/python-modules/m2crypto/default.nix @@ -1,7 +1,9 @@ { stdenv +, lib , fetchpatch , buildPythonPackage , fetchPypi +, pythonOlder , swig2 , openssl , typing @@ -28,7 +30,7 @@ buildPythonPackage rec { nativeBuildInputs = [ swig2 ]; buildInputs = [ swig2 openssl ]; - propagatedBuildInputs = [ typing ]; + propagatedBuildInputs = lib.optional (pythonOlder "3.5") typing; preConfigure = '' substituteInPlace setup.py --replace "self.openssl = '/usr'" "self.openssl = '${openssl.dev}'" diff --git a/pkgs/development/python-modules/mpv/default.nix b/pkgs/development/python-modules/mpv/default.nix index f5ae020c71c..5a6fa42f286 100644 --- a/pkgs/development/python-modules/mpv/default.nix +++ b/pkgs/development/python-modules/mpv/default.nix @@ -4,14 +4,14 @@ buildPythonPackage rec { pname = "mpv"; - version = "0.3.9"; + version = "0.3.10"; disabled = isPy27; src = fetchFromGitHub { owner = "jaseg"; repo = "python-mpv"; rev = "v${version}"; - sha256 = "112kr9wppcyy3shsb7v7kq0s1pdw6vw3v2fvqicm7qb2f49y2p4q"; + sha256 = "1w67rrxsvxl7glh5lri7c5hn1011jij1yh1dn50dxlz79n4h51b5"; }; buildInputs = [ mpv ]; diff --git a/pkgs/development/python-modules/nbsphinx/default.nix b/pkgs/development/python-modules/nbsphinx/default.nix index 07038cb26e1..788a8f73ab8 100644 --- a/pkgs/development/python-modules/nbsphinx/default.nix +++ b/pkgs/development/python-modules/nbsphinx/default.nix @@ -12,11 +12,11 @@ buildPythonPackage rec { pname = "nbsphinx"; - version = "0.4.3"; + version = "0.5.0"; src = fetchPypi { inherit pname version; - sha256 = "09j47hmzgvf7rnz7n4n7295pp6qscq9hp50qva70vglzqck9yyjp"; + sha256 = "03g0mqbgk143cq3l3r42js2iy5l6iyvpckpqip4p468rlzrddyhn"; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/opentimestamps/default.nix b/pkgs/development/python-modules/opentimestamps/default.nix index 01f5595fea1..f9394efe398 100644 --- a/pkgs/development/python-modules/opentimestamps/default.nix +++ b/pkgs/development/python-modules/opentimestamps/default.nix @@ -3,7 +3,7 @@ buildPythonPackage rec { pname = "opentimestamps"; - version = "0.4.0"; + version = "0.4.1"; disabled = (!isPy3k); # We can't use the pypi source because it doesn't include README.md which is @@ -12,7 +12,7 @@ buildPythonPackage rec { owner = "opentimestamps"; repo = "python-opentimestamps"; rev = "python-opentimestamps-v${version}"; - sha256 = "165rj08hwmbn44ra9n0cj5vfn6p49dqfn5lz2mks962mx19c7l0m"; + sha256 = "0c45ij8absfgwizq6dfgg81siq3y8605sgg184vazp292w8nqmqr"; }; # Remove a failing test which expects the test source file to reside in the diff --git a/pkgs/development/python-modules/papermill/default.nix b/pkgs/development/python-modules/papermill/default.nix new file mode 100644 index 00000000000..ffe0fbc5da5 --- /dev/null +++ b/pkgs/development/python-modules/papermill/default.nix @@ -0,0 +1,70 @@ +{ lib +, buildPythonPackage +, fetchPypi +, ansiwrap +, click +, future +, pyyaml +, nbformat +, nbconvert +, six +, tqdm +, jupyter_client +, requests +, entrypoints +, tenacity +, futures +, backports_tempfile +, isPy27 +, pytest +, pytestcov +, pytest-mock +}: + +buildPythonPackage rec { + pname = "papermill"; + version = "1.2.1"; + + src = fetchPypi { + inherit pname version; + sha256 = "04dadaabdeb129c7414079f77b9f9a4a08f1322549aa99e20e4a12700ee23509"; + }; + + propagatedBuildInputs = [ + ansiwrap + click + future + pyyaml + nbformat + nbconvert + six + tqdm + jupyter_client + requests + entrypoints + tenacity + ] ++ lib.optionals isPy27 [ + futures + backports_tempfile + ]; + + checkInputs = [ + pytest + pytestcov + pytest-mock + ]; + + checkPhase = '' + HOME=$(mktemp -d) pytest + ''; + + # the test suite depends on cloud resources azure/aws + doCheck = false; + + meta = with lib; { + description = "Parametrize and run Jupyter and nteract Notebooks"; + homepage = https://github.com/nteract/papermill; + license = licenses.bsd3; + maintainers = [ maintainers.costrouc ]; + }; +} diff --git a/pkgs/development/python-modules/papis/default.nix b/pkgs/development/python-modules/papis/default.nix index a2fd5118b3e..f770fecd5e5 100644 --- a/pkgs/development/python-modules/papis/default.nix +++ b/pkgs/development/python-modules/papis/default.nix @@ -3,7 +3,7 @@ , pyyaml, chardet, beautifulsoup4, colorama, bibtexparser , pylibgen, click, python-slugify, habanero, isbnlib , prompt_toolkit, pygments, stevedore, tqdm, lxml -, python-doi, isPy3k +, python-doi, isPy3k, pythonOlder #, optional, dependencies , whoosh, pytest , stdenv @@ -12,6 +12,7 @@ buildPythonPackage rec { pname = "papis"; version = "0.9"; + disabled = !isPy3k; # Missing tests on Pypi src = fetchFromGitHub { @@ -32,9 +33,14 @@ buildPythonPackage rec { whoosh ]; - disabled = !isPy3k; + postPatch = '' + substituteInPlace setup.py \ + --replace "lxml<=4.3.5" "lxml~=4.3" \ + --replace "python-slugify>=1.2.6,<4" "python-slugify" + ''; - doCheck = !stdenv.isDarwin; + # pytest seems to hang with python3.8 + doCheck = !stdenv.isDarwin && pythonOlder "3.8"; checkInputs = ([ pytest diff --git a/pkgs/development/python-modules/pdf2image/default.nix b/pkgs/development/python-modules/pdf2image/default.nix index 1fbddca8cc4..41009a4b7a2 100644 --- a/pkgs/development/python-modules/pdf2image/default.nix +++ b/pkgs/development/python-modules/pdf2image/default.nix @@ -2,13 +2,13 @@ buildPythonPackage rec { pname = "pdf2image"; - version = "1.9.0"; + version = "1.10.0"; propagatedBuildInputs = [ pillow poppler_utils ]; src = fetchPypi { inherit pname version; - sha256 = "186g36dcfv83iranyd8gqw2zinhpcvmq86zd7sbsn237gcqk43rn"; + sha256 = "0bpprn5wcz414pqpvwjpd5cc0838shkw2cfvrwfiilhr09bhxbhb"; }; meta = with stdenv.lib; { diff --git a/pkgs/development/python-modules/pip-tools/default.nix b/pkgs/development/python-modules/pip-tools/default.nix index 2b00da73bf7..0a8d679ae5f 100644 --- a/pkgs/development/python-modules/pip-tools/default.nix +++ b/pkgs/development/python-modules/pip-tools/default.nix @@ -1,18 +1,18 @@ -{ stdenv, fetchPypi, buildPythonPackage, pip, pytest, click, six, first +{ stdenv, fetchPypi, buildPythonPackage, pip, pytest, click, six , setuptools_scm, git, glibcLocales, mock }: buildPythonPackage rec { pname = "pip-tools"; - version = "4.2.0"; + version = "4.3.0"; src = fetchPypi { inherit pname version; - sha256 = "5427ea4dcc175649723985fbcace9b2d8f46f9adbcc63bc2d7b247d9bcc74917"; + sha256 = "0x36mp3a3f3wandfc0g8d53gg2jkc14nhisbryzspcl9f05sbvq6"; }; LC_ALL = "en_US.UTF-8"; checkInputs = [ pytest git glibcLocales mock ]; - propagatedBuildInputs = [ pip click six first setuptools_scm ]; + propagatedBuildInputs = [ pip click six setuptools_scm ]; disabledTests = stdenv.lib.concatMapStringsSep " and " (s: "not " + s) [ # Depend on network tests: @@ -32,12 +32,8 @@ buildPythonPackage rec { "test_stdin" "test_upgrade_packages_option" "test_url_package" - # Expect specific version of "six": "test_editable_package" - "test_input_file_without_extension" "test_locally_available_editable_package_is_not_archived_in_cache_dir" - "test_no_candidates" - "test_no_candidates_pre" ]; checkPhase = '' @@ -50,6 +46,5 @@ buildPythonPackage rec { homepage = https://github.com/jazzband/pip-tools/; license = licenses.bsd3; maintainers = with maintainers; [ zimbatm ]; - broken = true; }; } diff --git a/pkgs/development/python-modules/pony/default.nix b/pkgs/development/python-modules/pony/default.nix new file mode 100644 index 00000000000..ebda1976e2a --- /dev/null +++ b/pkgs/development/python-modules/pony/default.nix @@ -0,0 +1,25 @@ +{ stdenv, python, buildPythonPackage, fetchPypi }: + +buildPythonPackage rec { + pname = "pony"; + version = "0.7.11"; + + src = fetchPypi { + inherit pname version; + sha256 = "05vyvsbcb99vjjs7qpbwy8j4m854w74z8di6zqsv8p9wbm38s06i"; + }; + + doCheck = true; + + # stripping the tests + postInstall = '' + rm -rf $out/${python.sitePackages}/pony/orm/tests + ''; + + meta = with stdenv.lib; { + description = "Pony is a Python ORM with beautiful query syntax"; + homepage = "https://ponyorm.org/"; + maintainers = with maintainers; [ d-goldin xvapx ]; + license = licenses.asl20; + }; +} diff --git a/pkgs/development/python-modules/pudb/default.nix b/pkgs/development/python-modules/pudb/default.nix index bcba04fdfd2..789a9484d73 100644 --- a/pkgs/development/python-modules/pudb/default.nix +++ b/pkgs/development/python-modules/pudb/default.nix @@ -8,11 +8,11 @@ buildPythonPackage rec { pname = "pudb"; - version = "2019.1"; + version = "2019.2"; src = fetchPypi { inherit pname version; - sha256 = "19imrr17jnkd6fd2w1zzh63z0hcipg5b9v2x4svqm5c08p3cyc5c"; + sha256 = "1p2qizb35f9lfhklldzrn8g9mwiar3zmpc44463h5n1ln40ymw78"; }; propagatedBuildInputs = [ pygments urwid ]; diff --git a/pkgs/development/python-modules/pyGithub/default.nix b/pkgs/development/python-modules/pyGithub/default.nix index 895a06ce558..d09862184c0 100644 --- a/pkgs/development/python-modules/pyGithub/default.nix +++ b/pkgs/development/python-modules/pyGithub/default.nix @@ -3,13 +3,13 @@ buildPythonPackage rec { pname = "PyGithub"; - version = "1.44"; + version = "1.44.1"; src = fetchFromGitHub { owner = "PyGithub"; repo = "PyGithub"; rev = "v${version}"; - sha256 = "067iyarllgdp40bzjxskzrixvmz350yj1qf8wvbddka504bcbh9r"; + sha256 = "16ngnnm7xj9bd97pvyddag17dx28c5wi0gjx4ws8c8nrmf5w3iqk"; }; propagatedBuildInputs = [ python-jose pyjwt requests deprecated httpretty ]; diff --git a/pkgs/development/python-modules/pyaxmlparser/default.nix b/pkgs/development/python-modules/pyaxmlparser/default.nix index c6c1afdcc95..85140d3db49 100644 --- a/pkgs/development/python-modules/pyaxmlparser/default.nix +++ b/pkgs/development/python-modules/pyaxmlparser/default.nix @@ -1,7 +1,7 @@ { buildPythonPackage, stdenv, lxml, click, fetchFromGitHub, pytest, isPy3k }: buildPythonPackage rec { - version = "0.3.21"; + version = "0.3.24"; pname = "pyaxmlparser"; # the PyPI tarball doesn't ship tests. @@ -9,7 +9,7 @@ buildPythonPackage rec { owner = "appknox"; repo = pname; rev = "v${version}"; - sha256 = "1bphd2vl9akk78yqvvxcz36wmr47hp3nh6xyrdc8w1avy1aby1ij"; + sha256 = "0fys26p7xhbnbdzp80zm6n3mragp38p08nyrsnilfgnlpi6rjpg0"; }; disabled = !isPy3k; diff --git a/pkgs/development/python-modules/pybind11/default.nix b/pkgs/development/python-modules/pybind11/default.nix index 2df360dfaab..0f386a7c42f 100644 --- a/pkgs/development/python-modules/pybind11/default.nix +++ b/pkgs/development/python-modules/pybind11/default.nix @@ -5,9 +5,10 @@ , python , pytest , cmake -, numpy ? null -, eigen ? null -, scipy ? null +, catch +, numpy +, eigen +, scipy }: buildPythonPackage rec { @@ -21,23 +22,42 @@ buildPythonPackage rec { sha256 = "0k89w4bsfbpzw963ykg1cyszi3h3nk393qd31m6y46pcfxkqh4rd"; }; - dontUseCmakeConfigure = true; - nativeBuildInputs = [ cmake ]; - checkInputs = [ pytest ] - ++ (lib.optional (numpy != null) numpy) - ++ (lib.optional (eigen != null) eigen) - ++ (lib.optional (scipy != null) scipy); - checkPhase = '' - cmake ${if eigen != null then "-DEIGEN3_INCLUDE_DIR=${eigen}/include/eigen3" else ""} - make -j $NIX_BUILD_CORES pytest - ''; - # re-expose the headers to other packages - postInstall = '' - ln -s $out/include/python${python.pythonVersion}m/pybind11/ $out/include/pybind11 + buildInputs = [ catch ]; + + cmakeFlags = [ + "-DEIGEN3_INCLUDE_DIR=${eigen}/include/eigen3" + ] ++ lib.optionals (!python.isPy2) [ + # Enable some tests only on Python 3. The "test_string_view" test + # 'testTypeError: string_view16_chars(): incompatible function arguments' + # fails on Python 2. + "-DPYBIND11_CPP_STANDARD=-std=c++17" + ]; + + dontUseSetuptoolsBuild = true; + dontUsePipInstall = true; + dontUseSetuptoolsCheck = true; + + preFixup = '' + pushd .. + export PYBIND11_USE_CMAKE=1 + setuptoolsBuildPhase + pipInstallPhase + # Symlink the CMake-installed headers to the location expected by setuptools + mkdir -p $out/include/${python.libPrefix} + ln -sf $out/include/pybind11 $out/include/${python.libPrefix}/pybind11 + popd ''; + installCheckTarget = "pytest"; + doInstallCheck = true; + checkInputs = [ + pytest + numpy + scipy + ]; + meta = { homepage = https://github.com/pybind/pybind11; description = "Seamless operability between C++11 and Python"; diff --git a/pkgs/development/python-modules/pycollada/default.nix b/pkgs/development/python-modules/pycollada/default.nix index 23ed4917cc5..fd3eb1b4c18 100644 --- a/pkgs/development/python-modules/pycollada/default.nix +++ b/pkgs/development/python-modules/pycollada/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "pycollada"; - version = "0.6"; + version = "0.7"; src = fetchPypi { inherit pname version; - sha256 = "fcd6f38fd981e350f9ec754d9671834017accd600e967d6d299a6cfdae5ba4f4"; + sha256 = "0b2vz9fp9asw57m3p9zjlz9gddanrhpxbdfimg98ik654kp2vj7r"; }; propagatedBuildInputs = [ numpy dateutil ]; diff --git a/pkgs/development/python-modules/pyglet/default.nix b/pkgs/development/python-modules/pyglet/default.nix index b680df21dd7..e6be92c0efb 100644 --- a/pkgs/development/python-modules/pyglet/default.nix +++ b/pkgs/development/python-modules/pyglet/default.nix @@ -37,7 +37,7 @@ buildPythonPackage rec { if name == 'GL': path = '${libGL}/lib/libGL${ext}' elif name == 'GLU': - path = '${libGL}/lib/libGLU${ext}' + path = '${libGLU}/lib/libGLU${ext}' elif name == 'c': path = '${glibc}/lib/libc${ext}.6' elif name == 'X11': diff --git a/pkgs/development/python-modules/pympler/default.nix b/pkgs/development/python-modules/pympler/default.nix index a9350f20eb3..85be0b4309c 100644 --- a/pkgs/development/python-modules/pympler/default.nix +++ b/pkgs/development/python-modules/pympler/default.nix @@ -5,11 +5,11 @@ buildPythonPackage rec { pname = "Pympler"; - version = "0.7"; + version = "0.8"; src = fetchPypi { inherit pname version; - sha256 = "0ki7bqp1h9l1xc2k1h4vjyzsgs20i8ingvcdhszyi72s28wyf4bs"; + sha256 = "08mrpnb6cv2nvfncvr8a9a8bpwhnasa924anapnjvnaw5jcd4k7p"; }; postPatch = '' diff --git a/pkgs/development/python-modules/pynamodb/default.nix b/pkgs/development/python-modules/pynamodb/default.nix index 74840d72a94..5016cfb741c 100644 --- a/pkgs/development/python-modules/pynamodb/default.nix +++ b/pkgs/development/python-modules/pynamodb/default.nix @@ -11,11 +11,11 @@ buildPythonPackage rec { pname = "pynamodb"; - version = "4.1.0"; + version = "4.2.0"; src = fetchPypi { inherit pname version; - sha256 = "d05d5e2b0f663679ad11421c6fc2cf2f89a2a5843e6ebc372706bf5a78d93762"; + sha256 = "0njbh3h6696nq5palqa0b8s0fbsvhbawpzl923dnfsa9kgq5m294"; }; propagatedBuildInputs = [ python-dateutil botocore ]; diff --git a/pkgs/development/python-modules/pysaml2/default.nix b/pkgs/development/python-modules/pysaml2/default.nix index 1528623aa0e..8c0513b0b51 100644 --- a/pkgs/development/python-modules/pysaml2/default.nix +++ b/pkgs/development/python-modules/pysaml2/default.nix @@ -9,14 +9,14 @@ buildPythonPackage rec { pname = "pysaml2"; - version = "4.8.0"; + version = "4.9.0"; # No tests in PyPI tarball src = fetchFromGitHub { owner = "IdentityPython"; repo = pname; rev = "v${version}"; - sha256 = "1nnmk7apg169bawqi06jbx3p0x4sq12kszzl7k6j39273hqq5ii4"; + sha256 = "1ww1l34zn25vxifs8nr0bg7gkhbpy5g45mj0jj4d8hzimahb1brx"; }; patches = [ diff --git a/pkgs/development/python-modules/pytest-rerunfailures/default.nix b/pkgs/development/python-modules/pytest-rerunfailures/default.nix index 79ce9fa63a9..f5c35905cf6 100644 --- a/pkgs/development/python-modules/pytest-rerunfailures/default.nix +++ b/pkgs/development/python-modules/pytest-rerunfailures/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "pytest-rerunfailures"; - version = "7.0"; + version = "8.0"; src = fetchPypi { inherit pname version; - sha256 = "1zfm9v80bqfdapygy9wmi6j6y5c179ixpnh9ih27py4v6cqwzjgk"; + sha256 = "04p8rfvv7yi3gsdm1dw1mfhjwg6507rhgj7nbm5gfqw4kxmj7h8p"; }; checkInputs = [ mock pytest ]; diff --git a/pkgs/development/python-modules/python-daemon/default.nix b/pkgs/development/python-modules/python-daemon/default.nix index 41b7aa78bab..e33aee6c1c9 100644 --- a/pkgs/development/python-modules/python-daemon/default.nix +++ b/pkgs/development/python-modules/python-daemon/default.nix @@ -1,4 +1,11 @@ -{ lib, buildPythonPackage, fetchPypi, mock, testscenarios, docutils, lockfile }: +{ lib, buildPythonPackage, fetchPypi +, docutils +, lockfile +, mock +, pytest +, testscenarios +, twine +}: buildPythonPackage rec { pname = "python-daemon"; @@ -9,12 +16,22 @@ buildPythonPackage rec { sha256 = "57c84f50a04d7825515e4dbf3a31c70cc44414394a71608dee6cfde469e81766"; }; - # A test fail within chroot builds. - doCheck = false; - - buildInputs = [ mock testscenarios ]; + nativeBuildInputs = [ twine ]; propagatedBuildInputs = [ docutils lockfile ]; + checkInputs = [ pytest mock testscenarios ]; + checkPhase = '' + pytest -k 'not detaches_process_context \ + and not standard_stream_file_descriptors' + ''; + + pythonImportsCheck = [ + "daemon" + "daemon.daemon" + "daemon.pidfile" + "daemon.runner" + ]; + meta = with lib; { description = "Library to implement a well-behaved Unix daemon process"; homepage = "https://pagure.io/python-daemon/"; diff --git a/pkgs/development/python-modules/python-engineio/default.nix b/pkgs/development/python-modules/python-engineio/default.nix index bf6d4cd2381..e1c380b64c3 100644 --- a/pkgs/development/python-modules/python-engineio/default.nix +++ b/pkgs/development/python-modules/python-engineio/default.nix @@ -13,13 +13,13 @@ buildPythonPackage rec { pname = "python-engineio"; - version = "3.9.3"; + version = "3.10.0"; src = fetchFromGitHub { owner = "miguelgrinberg"; repo = "python-engineio"; rev = "v${version}"; - sha256 = "0rwlj12d37dpw6y3bdn6rxv68xnd9ykj4fr3ly0fa143xci35d9y"; + sha256 = "1495r55177c38wq88pb28l50dfd4213iyxwq1k5rmsgp66vww09s"; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/python-gitlab/default.nix b/pkgs/development/python-modules/python-gitlab/default.nix index def0a2c0adb..4858ef8f8a6 100644 --- a/pkgs/development/python-modules/python-gitlab/default.nix +++ b/pkgs/development/python-modules/python-gitlab/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "python-gitlab"; - version = "1.12.1"; + version = "1.13.0"; src = fetchPypi { inherit pname version; - sha256 = "984e110c1f76fd939652c30ce3101267a7064e34417cbfc4687e6106d4db54ec"; + sha256 = "125zimbdprfx2j90dp19hyh60lzj11264bm494awc585pr6v9d3k"; }; propagatedBuildInputs = [ requests six ]; diff --git a/pkgs/development/python-modules/python-periphery/default.nix b/pkgs/development/python-modules/python-periphery/default.nix index 38642f066d7..4d10c985092 100644 --- a/pkgs/development/python-modules/python-periphery/default.nix +++ b/pkgs/development/python-modules/python-periphery/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "python-periphery"; - version = "1.1.2"; + version = "2.0.0"; src = fetchPypi { inherit pname version; - sha256 = "1bhzkzjvz6zb6rc5zmvgqfszrcyh64v1hay7m1m5dn083gaznyk9"; + sha256 = "1arsibmc19iyzr70lqfrkq0fk6gd6imm3zxa7zxv93b6lwl5bw1d"; }; # Some tests require physical probing and additional physical setup diff --git a/pkgs/development/python-modules/python-stdnum/default.nix b/pkgs/development/python-modules/python-stdnum/default.nix index 06577249a02..556be12872b 100644 --- a/pkgs/development/python-modules/python-stdnum/default.nix +++ b/pkgs/development/python-modules/python-stdnum/default.nix @@ -1,11 +1,11 @@ { lib, fetchPypi, buildPythonPackage, nose }: buildPythonPackage rec { - version = "1.11"; + version = "1.12"; pname = "python-stdnum"; src = fetchPypi { inherit pname version; - sha256 = "d5f0af1bee9ddd9a20b398b46ce062dbd4d41fcc9646940f2667256a44df3854"; + sha256 = "19fb5asv0ngnbpiz1bqzq2jhgn845kv9hjcjajsgzgfp2k24f4sc"; }; checkInputs = [ nose ]; diff --git a/pkgs/development/python-modules/rasterio/default.nix b/pkgs/development/python-modules/rasterio/default.nix index 42b03849283..5da97c964c1 100644 --- a/pkgs/development/python-modules/rasterio/default.nix +++ b/pkgs/development/python-modules/rasterio/default.nix @@ -6,14 +6,14 @@ buildPythonPackage rec { pname = "rasterio"; - version = "1.1.0"; + version = "1.1.1"; # Pypi doesn't ship the tests, so we fetch directly from GitHub src = fetchFromGitHub { owner = "mapbox"; repo = "rasterio"; rev = version; - sha256 = "0xa9jazsgsf7is4dbf2bbnfga8q8nmqy0qq4i7jj3riiccwlm6xw"; + sha256 = "1d0y16c5da252nj3pbdjwbzmd5kmh533s8jwlvg3aappa7h7qc1s"; }; checkInputs = [ boto3 pytest pytestcov packaging hypothesis ] ++ lib.optional (!isPy3k) mock; diff --git a/pkgs/development/python-modules/send2trash/default.nix b/pkgs/development/python-modules/send2trash/default.nix index 35115a45716..3809c0418e4 100644 --- a/pkgs/development/python-modules/send2trash/default.nix +++ b/pkgs/development/python-modules/send2trash/default.nix @@ -1,15 +1,12 @@ { stdenv -, lib , buildPythonPackage , fetchFromGitHub , pytest -, configparser -, isPy3k }: buildPythonPackage rec { pname = "Send2Trash"; - version = "1.4.2"; + version = "1.5.0"; src = fetchFromGitHub { owner = "hsoft"; @@ -19,10 +16,10 @@ buildPythonPackage rec { }; doCheck = !stdenv.isDarwin; - checkPhase = "HOME=. py.test"; - checkInputs = [ pytest ] ++ lib.optional (!isPy3k) configparser; + checkPhase = "HOME=$TMPDIR pytest"; + checkInputs = [ pytest ]; - meta = with lib; { + meta = with stdenv.lib; { description = "Send file to trash natively under macOS, Windows and Linux"; homepage = https://github.com/hsoft/send2trash; license = licenses.bsd3; diff --git a/pkgs/development/python-modules/slicedimage/default.nix b/pkgs/development/python-modules/slicedimage/default.nix index e121013c150..edc21e3292d 100644 --- a/pkgs/development/python-modules/slicedimage/default.nix +++ b/pkgs/development/python-modules/slicedimage/default.nix @@ -12,6 +12,7 @@ , six , pytest , isPy27 +, tifffile }: buildPythonPackage rec { @@ -31,14 +32,16 @@ buildPythonPackage rec { requests scikitimage six + tifffile ] ++ lib.optionals isPy27 [ pathlib enum34 ]; checkInputs = [ pytest ]; + # ignore tests which require setup checkPhase = '' - pytest + pytest --ignore tests/io_ ''; meta = with lib; { diff --git a/pkgs/development/python-modules/smart_open/default.nix b/pkgs/development/python-modules/smart_open/default.nix index 325f59b1df2..48cfcb132f0 100644 --- a/pkgs/development/python-modules/smart_open/default.nix +++ b/pkgs/development/python-modules/smart_open/default.nix @@ -12,11 +12,11 @@ buildPythonPackage rec { pname = "smart_open"; - version = "1.8.4"; + version = "1.9.0"; src = fetchPypi { inherit pname version; - sha256 = "1y845mfsswyvczknwh359xprgc3hk8r17qy1wdibpz6y6pq0g3kq"; + sha256 = "0xmnp8ywakwg3y21gqdvjw8a4v42vaxfq6njqizzllm4c9g2nk76"; }; # nixpkgs version of moto is >=1.2.0, remove version pin to fix build diff --git a/pkgs/development/python-modules/sqlalchemy/default.nix b/pkgs/development/python-modules/sqlalchemy/default.nix index e9e14b7da4d..e77f2e0e7b2 100644 --- a/pkgs/development/python-modules/sqlalchemy/default.nix +++ b/pkgs/development/python-modules/sqlalchemy/default.nix @@ -1,4 +1,4 @@ -{ lib, fetchPypi, buildPythonPackage, isPy3k, isPy35 +{ stdenv, lib, fetchPypi, buildPythonPackage, isPy3k, isPy35 , mock , pysqlite , fetchpatch @@ -25,7 +25,9 @@ buildPythonPackage rec { dontUseSetuptoolsCheck = true; - disabledTests = lib.optionals isPy35 [ "exception_persistent_flush_py3k "]; + # disable mem-usage tests on mac, has trouble serializing pickle files + disabledTests = lib.optionals isPy35 [ "exception_persistent_flush_py3k "] + ++ lib.optionals stdenv.isDarwin [ "MemUsageWBackendTest" "MemUsageTest" ]; patches = [ # Two patches for sqlite 3.30 compatibility. diff --git a/pkgs/development/python-modules/sunpy/default.nix b/pkgs/development/python-modules/sunpy/default.nix index 252eafec465..09732252437 100644 --- a/pkgs/development/python-modules/sunpy/default.nix +++ b/pkgs/development/python-modules/sunpy/default.nix @@ -1,4 +1,5 @@ -{ lib +{ stdenv +, lib , buildPythonPackage , fetchFromGitHub , numpy @@ -26,14 +27,14 @@ buildPythonPackage rec { pname = "sunpy"; - version = "1.0.2"; + version = "1.0.6"; disabled = pythonOlder "3.6"; src = fetchFromGitHub { owner = "sunpy"; repo = pname; rev = "v${version}"; - sha256 = "0dmfzxxsjjax9wf2ljyl4z07pxbshrj828zi5qnsa9rgk4148q9x"; + sha256 = "0j2yfhfxgi95rig8cfp9lvszb7694gq90jvs0xrb472hwnzgh2sk"; }; propagatedBuildInputs = [ @@ -67,8 +68,11 @@ buildPythonPackage rec { export HOME=$(mktemp -d) ''; + # darwin has write permission issues + doCheck = stdenv.isLinux; + # ignore documentation tests checkPhase = '' - pytest sunpy -k "not test_rotation" + pytest sunpy -k 'not rst' ''; meta = with lib; { diff --git a/pkgs/development/python-modules/tasklib/default.nix b/pkgs/development/python-modules/tasklib/default.nix index 73b92ea6d4b..197c98def3a 100644 --- a/pkgs/development/python-modules/tasklib/default.nix +++ b/pkgs/development/python-modules/tasklib/default.nix @@ -8,11 +8,11 @@ wsl_stub = writeShellScriptBin "wsl" "true"; in buildPythonPackage rec { pname = "tasklib"; - version = "1.2.1"; + version = "1.3.0"; src = fetchPypi { inherit pname version; - sha256 = "3964fb7e87f86dc5e2708addb67e69d0932534991991b6bae2e37a0c2059273f"; + sha256 = "19yra86g3wz2xgk22dnrjjh3gla969vb8jrps5rf0cdmsm9qqisv"; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/tesserocr/default.nix b/pkgs/development/python-modules/tesserocr/default.nix new file mode 100644 index 00000000000..2d4f9d10a8c --- /dev/null +++ b/pkgs/development/python-modules/tesserocr/default.nix @@ -0,0 +1,34 @@ +{ + buildPythonPackage, + fetchPypi, + lib, + # build dependencies + cython, + leptonica, + pkg-config, + tesseract, + # extra python packages + pillow +}: + +buildPythonPackage rec { + pname = "tesserocr"; + version = "2.5.0"; + + src = fetchPypi { + inherit pname version; + sha256 = "0nj33mwvppacy6p5mqk9a4x26hx9ailshgad84ks60wyms6rgjiv"; + }; + + nativeBuildInputs = [ cython pkg-config ]; + buildInputs = [ leptonica tesseract ]; + propagatedBuildInputs = [ pillow ]; + + meta = with lib; { + description = "A simple, Pillow-friendly, wrapper around the tesseract-ocr API for Optical Character Recognition (OCR)"; + homepage = "https://github.com/sirfz/tesserocr"; + license = licenses.mit; + maintainers = with maintainers; [ mtrsk ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/development/python-modules/textwrap3/default.nix b/pkgs/development/python-modules/textwrap3/default.nix new file mode 100644 index 00000000000..5b8e10db83e --- /dev/null +++ b/pkgs/development/python-modules/textwrap3/default.nix @@ -0,0 +1,37 @@ +{ lib +, buildPythonPackage +, fetchPypi +, tox +, pytest +, coverage +, pytestcov +}: + +buildPythonPackage rec { + pname = "textwrap3"; + version = "0.9.2"; + + src = fetchPypi { + inherit pname version; + extension = "zip"; + sha256 = "5008eeebdb236f6303dcd68f18b856d355f6197511d952ba74bc75e40e0c3414"; + }; + + checkInputs = [ + tox + pytest + coverage + pytestcov + ]; + + checkPhase = '' + pytest + ''; + + meta = with lib; { + description = "Textwrap from Python 3.6 backport plus a few tweaks"; + homepage = https://github.com/jonathaneunice/textwrap3; + license = licenses.psfl; + maintainers = [ maintainers.costrouc ]; + }; +} diff --git a/pkgs/development/python-modules/traits/default.nix b/pkgs/development/python-modules/traits/default.nix index bcf205aa1d2..84aa1c5784e 100644 --- a/pkgs/development/python-modules/traits/default.nix +++ b/pkgs/development/python-modules/traits/default.nix @@ -9,11 +9,11 @@ buildPythonPackage rec { pname = "traits"; - version = "5.1.2"; + version = "5.2.0"; src = fetchPypi { inherit pname version; - sha256 = "0a17qmpw0z9h7ybh5yxrghvkcf2q90vgxzbnv1n4i0fxhi7mjy3s"; + sha256 = "1b71vp0l4523428aw098xw6rmkl8vlcy2aag40akijbyz1nnk541"; }; # Use pytest because its easier to discover tests diff --git a/pkgs/development/python-modules/twilio/default.nix b/pkgs/development/python-modules/twilio/default.nix index 95c58e20d91..9098d41bd69 100644 --- a/pkgs/development/python-modules/twilio/default.nix +++ b/pkgs/development/python-modules/twilio/default.nix @@ -3,13 +3,13 @@ buildPythonPackage rec { pname = "twilio"; - version = "6.32.0"; + version = "6.33.1"; # tests not included in PyPi, so fetch from github instead src = fetchFromGitHub { owner = "twilio"; repo = "twilio-python"; rev = version; - sha256 = "0by2qjzxv13k4lvy4mas0hf468xf98qbc2arc8fcy6aj7h8jaam8"; + sha256 = "1k8hf4azgjzb4fifclzi8gj6v22368jk3y9f7f9qhq9ina7ilycj"; }; buildInputs = [ nose mock ]; diff --git a/pkgs/development/python-modules/uproot/default.nix b/pkgs/development/python-modules/uproot/default.nix index 0564e390410..f98b3411242 100644 --- a/pkgs/development/python-modules/uproot/default.nix +++ b/pkgs/development/python-modules/uproot/default.nix @@ -3,6 +3,7 @@ , backports_lzma , cachetools , lz4 +, pandas , pytestrunner , pytest , pkgconfig @@ -27,6 +28,7 @@ buildPythonPackage rec { checkInputs = [ lz4 mock + pandas pkgconfig pytest requests diff --git a/pkgs/development/python-modules/xdis/default.nix b/pkgs/development/python-modules/xdis/default.nix index d120f17780b..533e8d8b577 100644 --- a/pkgs/development/python-modules/xdis/default.nix +++ b/pkgs/development/python-modules/xdis/default.nix @@ -6,14 +6,14 @@ buildPythonPackage rec { pname = "xdis"; - version = "4.1.2"; + version = "4.1.3"; disabled = isPy27; src = fetchFromGitHub { owner = "rocky"; repo = "python-xdis"; rev = version; - sha256 = "0icqhafsnmcs6628cg3jjgq0d3x835nqmhljcz93yi457hfqd2lp"; + sha256 = "0ixx9svyi0kw3z2i51cv1cyg4l5z8hy432kxgsvz20mr9a8z5c91"; }; checkInputs = [ pytest ]; diff --git a/pkgs/development/python-modules/xml2rfc/default.nix b/pkgs/development/python-modules/xml2rfc/default.nix index ccb4d879be9..1a54b8b4049 100644 --- a/pkgs/development/python-modules/xml2rfc/default.nix +++ b/pkgs/development/python-modules/xml2rfc/default.nix @@ -5,11 +5,11 @@ buildPythonPackage rec { pname = "xml2rfc"; - version = "2.34.0"; + version = "2.35.0"; src = fetchPypi { inherit pname version; - sha256 = "7b9543edacc2f4fa12cea8b64ae8144afb493d7b2a0135494642f29592b5d272"; + sha256 = "0jpg9rxxw28n66wzznlhzdgv7b7gd1crcffjhlw7lam93ils4ah5"; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/xmlschema/default.nix b/pkgs/development/python-modules/xmlschema/default.nix index bd5f9eb40b8..19e2ed95328 100644 --- a/pkgs/development/python-modules/xmlschema/default.nix +++ b/pkgs/development/python-modules/xmlschema/default.nix @@ -4,14 +4,14 @@ }: buildPythonPackage rec { - version = "1.0.15"; + version = "1.0.16"; pname = "xmlschema"; src = fetchFromGitHub { owner = "sissaschool"; repo = "xmlschema"; rev = "v${version}"; - sha256 = "1s8ggvy2s7513cxcal3r37rn1bhpkxhq3hs5m9pgvmrysxjdz8lb"; + sha256 = "0mxvpafkaxib3qiz3zl7fbsgjaq9hbx4kb0w646azwhg7n7nxghj"; }; propagatedBuildInputs = [ elementpath ]; diff --git a/pkgs/development/python-modules/yamllint/default.nix b/pkgs/development/python-modules/yamllint/default.nix index 0406f6fe5a0..1b83c8987a1 100644 --- a/pkgs/development/python-modules/yamllint/default.nix +++ b/pkgs/development/python-modules/yamllint/default.nix @@ -3,11 +3,11 @@ buildPythonPackage rec { pname = "yamllint"; - version = "1.18.0"; + version = "1.19.0"; src = fetchPypi { inherit pname version; - sha256 = "076hqf189ww95n9vcbkkn8an42nx79cy8pf2qnl251yjncsvnbfl"; + sha256 = "05fg2i27bq40z83avmz3h91i206dx5k6nyyvpa5vja54sqg14q02"; }; checkInputs = [ nose ]; diff --git a/pkgs/development/python-modules/zodbpickle/default.nix b/pkgs/development/python-modules/zodbpickle/default.nix index 1e577fc487c..b24b5853876 100644 --- a/pkgs/development/python-modules/zodbpickle/default.nix +++ b/pkgs/development/python-modules/zodbpickle/default.nix @@ -5,12 +5,12 @@ buildPythonPackage rec { pname = "zodbpickle"; - version = "1.0.4"; + version = "2.0.0"; disabled = isPyPy; # https://github.com/zopefoundation/zodbpickle/issues/10 src = fetchPypi { inherit pname version; - sha256 = "0n4hng2zil1j8sbz0b83pxx8ndlh34h2mnmli3bqjmnrbry5zlr5"; + sha256 = "0fb7c7pnz86pcs6qqwlyw72vnijc04ns2h1zfrm0h7yl8q7r7ng0"; }; # fails.. diff --git a/pkgs/development/ruby-modules/solargraph/Gemfile.lock b/pkgs/development/ruby-modules/solargraph/Gemfile.lock index edd946d9285..c2e4840eab0 100644 --- a/pkgs/development/ruby-modules/solargraph/Gemfile.lock +++ b/pkgs/development/ruby-modules/solargraph/Gemfile.lock @@ -3,18 +3,18 @@ GEM specs: ast (2.4.0) backport (1.1.2) - htmlentities (4.3.4) - jaro_winkler (1.5.3) + jaro_winkler (1.5.4) + maruku (0.7.3) mini_portile2 (2.4.0) - nokogiri (1.10.4) + nokogiri (1.10.5) mini_portile2 (~> 2.4.0) - parallel (1.18.0) + parallel (1.19.1) parser (2.6.5.0) ast (~> 2.4.0) rainbow (3.0.0) reverse_markdown (1.3.0) nokogiri - rubocop (0.75.1) + rubocop (0.77.0) jaro_winkler (~> 1.5.1) parallel (~> 1.10) parser (>= 2.6) @@ -22,11 +22,11 @@ GEM ruby-progressbar (~> 1.7) unicode-display_width (>= 1.4.0, < 1.7) ruby-progressbar (1.10.1) - solargraph (0.37.2) + solargraph (0.38.0) backport (~> 1.1) bundler (>= 1.17.2) - htmlentities (~> 4.3, >= 4.3.4) jaro_winkler (~> 1.5) + maruku (~> 0.7, >= 0.7.3) nokogiri (~> 1.9, >= 1.9.1) parser (~> 2.3) reverse_markdown (~> 1.0, >= 1.0.5) @@ -46,4 +46,4 @@ DEPENDENCIES solargraph! BUNDLED WITH - 1.17.2 + 1.17.3 diff --git a/pkgs/development/ruby-modules/solargraph/gemset.nix b/pkgs/development/ruby-modules/solargraph/gemset.nix index aa28f666e5a..e1ea15fb4e1 100644 --- a/pkgs/development/ruby-modules/solargraph/gemset.nix +++ b/pkgs/development/ruby-modules/solargraph/gemset.nix @@ -19,25 +19,25 @@ }; version = "1.1.2"; }; - htmlentities = { + jaro_winkler = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1nkklqsn8ir8wizzlakncfv42i32wc0w9hxp00hvdlgjr7376nhj"; + sha256 = "1y8l6k34svmdyqxya3iahpwbpvmn3fswhwsvrz0nk1wyb8yfihsh"; type = "gem"; }; - version = "4.3.4"; + version = "1.5.4"; }; - jaro_winkler = { + maruku = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1930v0chc1q4fr7hn0y1j34mw0v032a8kh0by4d4sbz8ksy056kf"; + sha256 = "1r7bxpgnx2hp3g12bjrmdrpv663dfqxsdp0af69kjhxmaxpia56x"; type = "gem"; }; - version = "1.5.3"; + version = "0.7.3"; }; mini_portile2 = { groups = ["default"]; @@ -55,20 +55,20 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0nmdrqqz1gs0fwkgzxjl4wr554gr8dc1fkrqjc2jpsvwgm41rygv"; + sha256 = "185g3dwba73jqxjr94bd2zk6fil6n9hmcfnfyzh3p1w47vm296r7"; type = "gem"; }; - version = "1.10.4"; + version = "1.10.5"; }; parallel = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "091p5zrzzyg3fg48jhdz9lzjf2r9r3akra2cd46yd4nza3xgxshz"; + sha256 = "12jijkap4akzdv11lm08dglsc8jmc87xcgq6947i1s3qb69f4zn2"; type = "gem"; }; - version = "1.18.0"; + version = "1.19.1"; }; parser = { dependencies = ["ast"]; @@ -108,10 +108,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0s5q1i7776yklkcwwx6ibm2mwnjky6wv7rpa3xhn8448854is31n"; + sha256 = "0m88b1bgbhmmbdnz2xv6n0il0j4q5qm9jbc0vf1zsaxmxqp06nx9"; type = "gem"; }; - version = "0.75.1"; + version = "0.77.0"; }; ruby-progressbar = { groups = ["default"]; @@ -124,15 +124,15 @@ version = "1.10.1"; }; solargraph = { - dependencies = ["backport" "htmlentities" "jaro_winkler" "nokogiri" "parser" "reverse_markdown" "rubocop" "thor" "tilt" "yard"]; + dependencies = ["backport" "jaro_winkler" "maruku" "nokogiri" "parser" "reverse_markdown" "rubocop" "thor" "tilt" "yard"]; groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0w20g68i6djc2vyx3awzvn15brdfpcwbna27r0903h5djcmnr8a0"; + sha256 = "1pdqpxvjj6r6gzrz9rmxfg85cmfjs4y2lyq8p5qfg3kfpqx4rhpw"; type = "gem"; }; - version = "0.37.2"; + version = "0.38.0"; }; thor = { groups = ["default"]; @@ -174,4 +174,4 @@ }; version = "0.9.20"; }; -} +} \ No newline at end of file diff --git a/pkgs/development/tools/aws-sam-cli/default.nix b/pkgs/development/tools/aws-sam-cli/default.nix index 67abd284952..12cce3e8d46 100644 --- a/pkgs/development/tools/aws-sam-cli/default.nix +++ b/pkgs/development/tools/aws-sam-cli/default.nix @@ -5,12 +5,11 @@ let py = python.override { packageOverrides = self: super: { - - aws-sam-translator = super.aws-sam-translator.overridePythonAttrs (oldAttrs: rec { - version = "1.14.0"; + flask = super.flask.overridePythonAttrs (oldAttrs: rec { + version = "1.0.2"; src = oldAttrs.src.override { inherit version; - sha256 = "1cghn1m7ana9s8kyg61dwp9mrism5l04vy5rj1wnmksz8vzmnq9w"; + sha256 = "0j6f4a9rpfh25k1gp7azqhnni4mb4fgy50jammgjgddw1l3w0w92"; }; }); @@ -34,11 +33,11 @@ with py.pkgs; buildPythonApplication rec { pname = "aws-sam-cli"; - version = "0.22.0"; + version = "0.34.0"; src = fetchPypi { inherit pname version; - sha256 = "1flbvqlj5llz7nrszmcf00v2a1pa36alv90r1l8lwn8zid5aabkn"; + sha256 = "1ndgcbd6zr23lvmqn4wikgvnlwl0gj0wgyawaspwm3b0jlvxadik"; }; # Tests are not included in the PyPI package @@ -58,6 +57,7 @@ buildPythonApplication rec { requests serverlessrepo six + tomlkit ]; # fix over-restrictive version bounds diff --git a/pkgs/development/tools/build-managers/bazel/default.nix b/pkgs/development/tools/build-managers/bazel/default.nix index 4a5a1d4d44c..74a4ff4a3da 100644 --- a/pkgs/development/tools/build-managers/bazel/default.nix +++ b/pkgs/development/tools/build-managers/bazel/default.nix @@ -22,11 +22,11 @@ }: let - version = "1.1.0"; + version = "1.2.1"; src = fetchurl { url = "https://github.com/bazelbuild/bazel/releases/download/${version}/bazel-${version}-dist.zip"; - sha256 = "1awm5wa4y4c37zy7d1ass83amwq5992wydkj5v9jx0zp7b4shrjb"; + sha256 = "1qfk14mgx1m454b4w4ldggljzqkqwpdwrlynq7rc8aq11yfs8p95"; }; # Update with `eval $(nix-build -A bazel.updater)`, @@ -50,7 +50,7 @@ let else srcs."java_tools_javac11_linux-v6.1.zip") srcs."coverage_output_generator-v2.0.zip" srcs.build_bazel_rules_nodejs - srcs."android_tools_pkg-0.11.tar.gz" + srcs."android_tools_pkg-0.12.tar.gz" srcs."0.28.3.tar.gz" srcs.rules_pkg srcs.rules_cc diff --git a/pkgs/development/tools/build-managers/bazel/src-deps.json b/pkgs/development/tools/build-managers/bazel/src-deps.json index 152cce5093e..e86e6a1c945 100644 --- a/pkgs/development/tools/build-managers/bazel/src-deps.json +++ b/pkgs/development/tools/build-managers/bazel/src-deps.json @@ -55,11 +55,11 @@ "https://github.com/bazelbuild/rules_proto/archive/97d8af4dc474595af3900dd85cb3a29ad28cc313.tar.gz" ] }, - "android_tools_pkg-0.11.tar.gz": { - "name": "android_tools_pkg-0.11.tar.gz", - "sha256": "6fc50151063bffdda700038ea7df99c89d54dc066e9377a5baff60d55d482ad2", + "android_tools_pkg-0.12.tar.gz": { + "name": "android_tools_pkg-0.12.tar.gz", + "sha256": "96c4eef4d195dd95e43a4259cf5b82a1e34f67333439e91955bbdc0e1c8e7a31", "urls": [ - "https://mirror.bazel.build/bazel_android_tools/android_tools_pkg-0.11.tar.gz" + "https://mirror.bazel.build/bazel_android_tools/android_tools_pkg-0.12.tar.gz" ] }, "bazel_j2objc": { @@ -108,11 +108,11 @@ }, "com_google_googletest": { "name": "com_google_googletest", - "sha256": "0fb00ff413f6b9b80ccee44a374ca7a18af7315aea72a43c62f2acd1ca74e9b5", - "strip_prefix": "googletest-f13bbe2992d188e834339abe6f715b2b2f840a77", + "sha256": "9dc9157a9a1551ec7a7e43daea9a694a0bb5fb8bec81235d8a1e6ef64c716dcb", + "strip_prefix": "googletest-release-1.10.0", "urls": [ - "https://mirror.bazel.build/github.com/google/googletest/archive/f13bbe2992d188e834339abe6f715b2b2f840a77.tar.gz", - "https://github.com/google/googletest/archive/f13bbe2992d188e834339abe6f715b2b2f840a77.tar.gz" + "https://mirror.bazel.build/github.com/google/googletest/archive/release-1.10.0.tar.gz", + "https://github.com/google/googletest/archive/release-1.10.0.tar.gz" ] }, "coverage_output_generator-v2.0.zip": { diff --git a/pkgs/development/tools/build-managers/kati/default.nix b/pkgs/development/tools/build-managers/kati/default.nix index 03cc0518ab5..05834565f93 100644 --- a/pkgs/development/tools/build-managers/kati/default.nix +++ b/pkgs/development/tools/build-managers/kati/default.nix @@ -1,14 +1,14 @@ -{ fetchgit, stdenv }: +{ stdenv, fetchFromGitHub }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "kati-unstable"; - version = "2017-05-23"; - rev = "2dde61e46ab789f18956ff3b7c257dd8eb97993f"; + version = "2019-09-23"; - src = fetchgit { - inherit rev; - url = "https://github.com/google/kati.git"; - sha256 = "1das1fvycra546lmh72cr5qpgblhbzqqy7gfywiijjgx160l75vq"; + src = fetchFromGitHub { + owner = "google"; + repo = "kati"; + rev = "9da3296746a0cd55b38ebebf91e7f57105a4c36f"; + sha256 = "0s5dfhgpcbx12b1fqmm8p0jpvrhgrnl9qywv1ksbwhw3pfp7j866"; }; patches = [ ./version.patch ]; @@ -17,10 +17,11 @@ stdenv.mkDerivation rec { install -D ckati $out/bin/ckati ''; - meta = { + meta = with stdenv.lib; { description = "An experimental GNU make clone"; homepage = https://github.com/google/kati; - platforms = stdenv.lib.platforms.all; - license = stdenv.lib.licenses.asl20; + platforms = platforms.all; + license = licenses.asl20; + maintainers = with maintainers; [ danielfullmer ]; }; } diff --git a/pkgs/development/tools/ccloud-cli/default.nix b/pkgs/development/tools/ccloud-cli/default.nix new file mode 100644 index 00000000000..7fa53029772 --- /dev/null +++ b/pkgs/development/tools/ccloud-cli/default.nix @@ -0,0 +1,33 @@ +{ stdenv, autoPatchelfHook, fetchurl, lib }: + +stdenv.mkDerivation rec { + pname = "ccloud-cli"; + version = "0.202.0"; + + # To get the latest version: + # curl -L 'https://s3-us-west-2.amazonaws.com/confluent.cloud?prefix=ccloud-cli/archives/&delimiter=/' | nix run nixpkgs.libxml2 -c xmllint --format - + src = fetchurl (if stdenv.hostPlatform.isDarwin then { + url = "https://s3-us-west-2.amazonaws.com/confluent.cloud/ccloud-cli/archives/${version}/ccloud_v${version}_darwin_amd64.tar.gz"; + sha256 = "1w7c7fwpjj6f26nmcgm6rkrl4v9zhdpygkh02la77n23lg8wxah5"; + } else { + url = "https://s3-us-west-2.amazonaws.com/confluent.cloud/ccloud-cli/archives/${version}/ccloud_v${version}_linux_amd64.tar.gz"; + sha256 = "1xbhv2viw8cbwv03rfq99jddnw5lwy812a8xby348290l323xi89"; + }); + + nativeBuildInputs = [ autoPatchelfHook ]; + + installPhase = '' + mkdir -p $out/{bin,share/doc/ccloud-cli} + cp ccloud $out/bin/ + cp LICENSE $out/share/doc/ccloud-cli/ + cp -r legal $out/share/doc/ccloud-cli/ + ''; + + meta = with lib; { + description = "Confluent Cloud CLI"; + homepage = https://docs.confluent.io/current/cloud/cli/index.html; + license = licenses.unfree; + maintainers = with maintainers; [ kalbasit ]; + platforms = platforms.linux ++ platforms.darwin; + }; +} diff --git a/pkgs/development/tools/chefdk/default.nix b/pkgs/development/tools/chefdk/default.nix index d5c74201418..d30c0aaeb49 100644 --- a/pkgs/development/tools/chefdk/default.nix +++ b/pkgs/development/tools/chefdk/default.nix @@ -1,7 +1,7 @@ { lib, bundlerEnv, bundlerUpdateScript, ruby_2_4, perl, autoconf }: bundlerEnv { - pname = "chef-dk"; + name = "chef-dk-2.4.17"; ruby = ruby_2_4; gemdir = ./.; diff --git a/pkgs/development/tools/continuous-integration/gocd-agent/default.nix b/pkgs/development/tools/continuous-integration/gocd-agent/default.nix index cdc4e6db2c2..adee52d967e 100644 --- a/pkgs/development/tools/continuous-integration/gocd-agent/default.nix +++ b/pkgs/development/tools/continuous-integration/gocd-agent/default.nix @@ -2,12 +2,12 @@ stdenv.mkDerivation rec { name = "gocd-agent-${version}-${rev}"; - version = "16.9.0"; - rev = "4001"; + version = "19.3.0"; + rev = "8959"; src = fetchurl { url = "https://download.go.cd/binaries/${version}-${rev}/generic/go-agent-${version}-${rev}.zip"; - sha256 = "1xcwwjf2khhng6v1y7dvi579y2j643al9n0x80m0c46qb9mzd04x"; + sha256 = "1nirdv82i8x4s1dyb0rmxldh8avappd4g3mbbl6xp7r7s0drcprp"; }; meta = with stdenv.lib; { description = "A continuous delivery server specializing in advanced workflow modeling and visualization"; diff --git a/pkgs/development/tools/continuous-integration/gocd-server/default.nix b/pkgs/development/tools/continuous-integration/gocd-server/default.nix index 8982ca5f77a..c0fabdeb5a1 100644 --- a/pkgs/development/tools/continuous-integration/gocd-server/default.nix +++ b/pkgs/development/tools/continuous-integration/gocd-server/default.nix @@ -2,12 +2,12 @@ stdenv.mkDerivation rec { name = "gocd-server-${version}-${rev}"; - version = "16.9.0"; - rev = "4001"; + version = "19.3.0"; + rev = "8959"; src = fetchurl { url = "https://download.go.cd/binaries/${version}-${rev}/generic/go-server-${version}-${rev}.zip"; - sha256 = "0x5pmjbhrka6p27drkrca7872vgsjxaa5j0cbxsa2ds02wrn57a7"; + sha256 = "0c30qzd6awlw0zx91rk6na0mmgykqkgrw9ychx18ivjwma0hr0sc"; }; meta = with stdenv.lib; { diff --git a/pkgs/development/tools/flyway/default.nix b/pkgs/development/tools/flyway/default.nix index b57c9841978..8ab0ad21170 100644 --- a/pkgs/development/tools/flyway/default.nix +++ b/pkgs/development/tools/flyway/default.nix @@ -1,13 +1,13 @@ { stdenv, fetchurl, jre_headless, makeWrapper }: let - version = "5.2.4"; + version = "6.1.0"; in stdenv.mkDerivation { pname = "flyway"; inherit version; src = fetchurl { url = "https://repo1.maven.org/maven2/org/flywaydb/flyway-commandline/${version}/flyway-commandline-${version}.tar.gz"; - sha256 = "16ia6nlvj4cgmdkn66bjg73h5vah82hpzk9mf0n5kmqnwcaa8hmc"; + sha256 = "14f8vviki89dqhd429zlj0frma52xhyxpdln5c81z1dgs7819rpg"; }; nativeBuildInputs = [ makeWrapper ]; dontBuild = true; @@ -15,7 +15,7 @@ installPhase = '' mkdir -p $out/bin $out/share/flyway cp -r sql jars drivers conf $out/share/flyway - cp -r lib/community $out/share/flyway/lib + install -Dt $out/share/flyway/lib lib/community/*.jar lib/*.jar makeWrapper "${jre_headless}/bin/java" $out/bin/flyway \ --add-flags "-Djava.security.egd=file:/dev/../dev/urandom" \ --add-flags "-classpath '$out/share/flyway/lib/*:$out/share/flyway/drivers/*'" \ @@ -23,6 +23,13 @@ ''; meta = with stdenv.lib; { description = "Evolve your Database Schema easily and reliably across all your instances"; + longDescription = '' + The Flyway command-line tool is a standalone Flyway distribution. + It is primarily meant for users who wish to migrate their database from the command-line + without having to integrate Flyway into their applications nor having to install a build tool. + + This package is only the Community Edition of the Flyway command-line tool. + ''; homepage = "https://flywaydb.org/"; license = licenses.asl20; platforms = platforms.unix; diff --git a/pkgs/development/tools/grabserial/default.nix b/pkgs/development/tools/grabserial/default.nix index ab32674f188..5e06e9f771d 100644 --- a/pkgs/development/tools/grabserial/default.nix +++ b/pkgs/development/tools/grabserial/default.nix @@ -2,13 +2,13 @@ pythonPackages.buildPythonApplication rec { pname = "grabserial"; - version = "1.9.8"; + version = "1.9.9"; src = fetchFromGitHub { owner = "tbird20d"; repo = "grabserial"; rev = "v${version}"; - sha256 = "1xmy3js4hzsxlkxc172hkjzxsc34mmg3vfz61h24c7svmfzyhbd5"; + sha256 = "0cwrajkh605gfhshrlpbc32gmx86a8kv3pq7cv713k60sgqrgpqx"; }; propagatedBuildInputs = [ pythonPackages.pyserial ]; diff --git a/pkgs/development/tools/irony-server/default.nix b/pkgs/development/tools/irony-server/default.nix index f2c926a6f39..228a82f6008 100644 --- a/pkgs/development/tools/irony-server/default.nix +++ b/pkgs/development/tools/irony-server/default.nix @@ -2,10 +2,10 @@ stdenv.mkDerivation { pname = "irony-server"; - inherit (irony) version; + inherit (irony) src version; nativeBuildInputs = [ cmake ]; - buildInputs = [ llvmPackages.libclang ]; + buildInputs = [ llvmPackages.libclang llvmPackages.llvm ]; dontUseCmakeBuildDir = true; @@ -15,13 +15,11 @@ stdenv.mkDerivation { "-DCMAKE_PREFIX_PATH=${llvmPackages.clang-unwrapped}" ]; - src = irony.src; - - meta = { + meta = with stdenv.lib; { description = "The server part of irony."; homepage = "https://melpa.org/#/irony"; - maintainers = [ stdenv.lib.maintainers.deepfire ]; - platforms = stdenv.lib.platforms.unix; - license = stdenv.lib.licenses.free; + maintainers = [ maintainers.deepfire ]; + platforms = platforms.unix; + license = licenses.free; }; } diff --git a/pkgs/development/tools/misc/elfkickers/default.nix b/pkgs/development/tools/misc/elfkickers/default.nix index c7eaafd9c7a..288e8bf9699 100644 --- a/pkgs/development/tools/misc/elfkickers/default.nix +++ b/pkgs/development/tools/misc/elfkickers/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "elfkickers"; - version = "3.1"; + version = "3.1a"; src = fetchurl { url = "http://www.muppetlabs.com/~breadbox/pub/software/ELFkickers-${version}.tar.gz"; - sha256 = "0n0sypjrdm3ramv0sby4sdh3i3j9d0ihadr951wa08ypdnq3yrkd"; + sha256 = "02354yn1lh1dxny35ky2d0b44iq302krsqpwk5grr4glma00hhq6"; }; makeFlags = [ "CC=cc prefix=$(out)" ]; diff --git a/pkgs/development/tools/misc/uncrustify/default.nix b/pkgs/development/tools/misc/uncrustify/default.nix index d85cd1a8216..01ed6603018 100644 --- a/pkgs/development/tools/misc/uncrustify/default.nix +++ b/pkgs/development/tools/misc/uncrustify/default.nix @@ -1,18 +1,18 @@ -{ stdenv, fetchFromGitHub, cmake }: +{ stdenv, fetchFromGitHub, cmake, python }: stdenv.mkDerivation rec { name = "${product}-${version}"; product = "uncrustify"; - version = "0.67"; + version = "0.70.1"; src = fetchFromGitHub { owner = product; repo = product; rev = name; - sha256 = "0hf8c93aj1hjg6cc77x6p7nf7ddp8mn4b6a9gpcrvmx8w81afpd3"; + sha256 = "0zr3vxhd947zdvwccw3cj0vsriaawcpfjq3x94v9887hsi8fk87b"; }; - nativeBuildInputs = [ cmake ]; + nativeBuildInputs = [ cmake python ]; enableParallelBuilding = true; diff --git a/pkgs/development/tools/ofono-phonesim/default.nix b/pkgs/development/tools/ofono-phonesim/default.nix index cc33b675954..e62827c67b4 100644 --- a/pkgs/development/tools/ofono-phonesim/default.nix +++ b/pkgs/development/tools/ofono-phonesim/default.nix @@ -1,27 +1,21 @@ { stdenv , mkDerivation -, fetchFromGitHub +, fetchgit , autoreconfHook , pkgconfig , qtbase -, qtscript }: mkDerivation { pname = "ofono-phonesim"; - version = "unstable-2014-04-22"; + version = "unstable-2019-11-18"; - src = fetchFromGitHub { - owner = "jpakkane"; - repo = "ofono-phonesim"; - rev = "baa41f04e6a86c5289d7185cad8a6f08a5c3ed0a"; - sha256 = "0ywalvvf3dfbn81ml21gji1n2hywh2nmakynakjzyyskcqjn2wiz"; + src = fetchgit { + url = "git://git.kernel.org/pub/scm/network/ofono/phonesim.git"; + rev = "adf231a84cd3708b825dc82c56e841dd7e3b4541"; + sha256 = "sha256:1840914sz46l8h2jwa0lymw6dvgj72wq9bhp3k4v4rk6masbf6hp"; }; - patches = [ - ./qt5-compat.patch - ]; - nativeBuildInputs = [ autoreconfHook pkgconfig @@ -29,7 +23,6 @@ mkDerivation { buildInputs = [ qtbase - qtscript ]; makeFlags = [ @@ -39,7 +32,7 @@ mkDerivation { meta = with stdenv.lib; { description = "Phone Simulator for modem testing"; - homepage = https://github.com/jpakkane/ofono-phonesim; + homepage = "https://01.org/ofono"; license = licenses.gpl2; maintainers = with maintainers; [ jtojnar ]; platforms = platforms.linux; diff --git a/pkgs/development/tools/ofono-phonesim/qt5-compat.patch b/pkgs/development/tools/ofono-phonesim/qt5-compat.patch deleted file mode 100644 index e2e9dcebd6b..00000000000 --- a/pkgs/development/tools/ofono-phonesim/qt5-compat.patch +++ /dev/null @@ -1,48 +0,0 @@ -diff --git a/configure.ac b/configure.ac -index 2436292..993df87 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -21,18 +21,18 @@ AC_ARG_ENABLE(optimization, AC_HELP_STRING([--disable-optimization], - fi - ]) - --PKG_CHECK_MODULES(QT, QtCore QtGui QtXml QtNetwork QtScript QtDBus, dummy=yes, -+PKG_CHECK_MODULES(QT, Qt5Core Qt5Gui Qt5Widgets Qt5Xml Qt5Network Qt5Script Qt5DBus, dummy=yes, - AC_MSG_ERROR(Qt is required)) - AC_SUBST(QT_CFLAGS) - AC_SUBST(QT_LIBS) - - AC_MSG_CHECKING(for moc) --MOC="`$PKG_CONFIG --variable=moc_location QtCore`" -+MOC="`$PKG_CONFIG --variable=moc_location Qt5Core`" - AC_SUBST(MOC) - AC_MSG_RESULT($MOC) - - AC_MSG_CHECKING(for uic) --UIC="`$PKG_CONFIG --variable=uic_location QtCore`" -+UIC="`$PKG_CONFIG --variable=uic_location Qt5Core`" - AC_SUBST(UIC) - AC_MSG_RESULT($UIC) - -diff --git a/src/control.cpp b/src/control.cpp -index e1838a6..880da68 100644 ---- a/src/control.cpp -+++ b/src/control.cpp -@@ -22,7 +22,7 @@ - #include <qslider.h> - #include <qcheckbox.h> - #include <qcombobox.h> --#include <QtGui/qmessagebox.h> -+#include <QMessageBox> - #include <qfiledialog.h> - #include <Qt> - #include <qbuffer.h> -@@ -31,7 +31,7 @@ - #include <QFileInfo> - #include <QFile> - #include <QDir> --#include <QtGui/QHeaderView> -+#include <QHeaderView> - - #define TWO_BYTE_MAX 65535 - #define FOUR_CHAR 4 diff --git a/pkgs/development/tools/overcommit/Gemfile b/pkgs/development/tools/overcommit/Gemfile new file mode 100644 index 00000000000..39325c7561b --- /dev/null +++ b/pkgs/development/tools/overcommit/Gemfile @@ -0,0 +1,2 @@ +source 'https://rubygems.org' +gem 'overcommit' diff --git a/pkgs/development/tools/overcommit/Gemfile.lock b/pkgs/development/tools/overcommit/Gemfile.lock new file mode 100644 index 00000000000..bf88c1bb148 --- /dev/null +++ b/pkgs/development/tools/overcommit/Gemfile.lock @@ -0,0 +1,17 @@ +GEM + remote: https://rubygems.org/ + specs: + childprocess (3.0.0) + iniparse (1.4.4) + overcommit (0.51.0) + childprocess (>= 0.6.3, < 4) + iniparse (~> 1.4) + +PLATFORMS + ruby + +DEPENDENCIES + overcommit + +BUNDLED WITH + 1.17.3 diff --git a/pkgs/development/tools/overcommit/default.nix b/pkgs/development/tools/overcommit/default.nix new file mode 100644 index 00000000000..84529ca4b6f --- /dev/null +++ b/pkgs/development/tools/overcommit/default.nix @@ -0,0 +1,15 @@ +{ lib, bundlerApp }: + +bundlerApp { + pname = "overcommit"; + gemdir = ./.; + exes = [ "overcommit" ]; + + meta = with lib; { + description = "Tool to manage and configure Git hooks"; + homepage = https://github.com/sds/overcommit; + license = licenses.mit; + maintainers = with maintainers; [ filalex77 ]; + platforms = platforms.unix; + }; +} diff --git a/pkgs/development/tools/overcommit/gemset.nix b/pkgs/development/tools/overcommit/gemset.nix new file mode 100644 index 00000000000..b7d58c0ea70 --- /dev/null +++ b/pkgs/development/tools/overcommit/gemset.nix @@ -0,0 +1,33 @@ +{ + childprocess = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1ic028k8xgm2dds9mqnvwwx3ibaz32j8455zxr9f4bcnviyahya5"; + type = "gem"; + }; + version = "3.0.0"; + }; + iniparse = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1xbik6838gfh5yq9ahh1m7dzszxlk0g7x5lvhb8amk60mafkrgws"; + type = "gem"; + }; + version = "1.4.4"; + }; + overcommit = { + dependencies = ["childprocess" "iniparse"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0fjrrm9dy9mry5ss96sizn6xcphia5l54ydz9c31phipm61nwmfk"; + type = "gem"; + }; + version = "0.51.0"; + }; +} \ No newline at end of file diff --git a/pkgs/development/tools/purescript/spago/default.nix b/pkgs/development/tools/purescript/spago/default.nix new file mode 100644 index 00000000000..6879d6875cc --- /dev/null +++ b/pkgs/development/tools/purescript/spago/default.nix @@ -0,0 +1,47 @@ +{ mkDerivation, aeson, aeson-pretty, ansi-terminal, async-pool +, base, bower-json, bytestring, Cabal, containers, dhall, directory +, either, exceptions, extra, fetchgit, file-embed, filepath, foldl +, fsnotify, github, Glob, hpack, hspec, hspec-discover +, hspec-megaparsec, http-client, http-conduit, lens-family-core +, megaparsec, mtl, network-uri, open-browser, optparse-applicative +, prettyprinter, process, QuickCheck, retry, rio, rio-orphans, safe +, semver-range, stdenv, stm, tar, template-haskell, temporary, text +, time, transformers, turtle, unliftio, unordered-containers +, vector, versions, zlib +}: +mkDerivation { + pname = "spago"; + version = "0.12.1.0"; + src = fetchgit { + url = "https://github.com/spacchetti/spago"; + sha256 = "17xgp75yxangmb65sv3raysad31kmc109c4q4aj9dgcdqz23fcn2"; + rev = "a4679880402ead320f8be2f091b25d30e27b62df"; + fetchSubmodules = true; + }; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + aeson aeson-pretty ansi-terminal async-pool base bower-json + bytestring Cabal containers dhall directory either exceptions + file-embed filepath foldl fsnotify github Glob http-client + http-conduit lens-family-core megaparsec mtl network-uri + open-browser prettyprinter process retry rio rio-orphans safe + semver-range stm tar template-haskell temporary text time + transformers turtle unliftio unordered-containers vector versions + zlib + ]; + libraryToolDepends = [ hpack ]; + executableHaskellDepends = [ + aeson-pretty async-pool base bytestring containers dhall filepath + github lens-family-core megaparsec optparse-applicative process + retry stm temporary text time turtle vector + ]; + testHaskellDepends = [ + base containers directory extra hspec hspec-megaparsec megaparsec + process QuickCheck temporary text turtle versions + ]; + testToolDepends = [ hspec-discover ]; + prePatch = "hpack"; + homepage = "https://github.com/spacchetti/spago#readme"; + license = stdenv.lib.licenses.bsd3; +} diff --git a/pkgs/development/tools/rust/cargo-expand/default.nix b/pkgs/development/tools/rust/cargo-expand/default.nix index 43b3a88f6ee..41fc993c62f 100644 --- a/pkgs/development/tools/rust/cargo-expand/default.nix +++ b/pkgs/development/tools/rust/cargo-expand/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "cargo-expand"; - version = "0.4.15"; + version = "0.4.16"; src = fetchFromGitHub { owner = "dtolnay"; repo = pname; rev = version; - sha256 = "155b4azkrr0qfg52mk7934zavwsbl28i28hi1inb23d509hrr5ky"; + sha256 = "0cf539y20hlwxbk0zfs1and99hkb0fqg7m3a6dfd80hwx0dm0xmx"; }; - cargoSha256 = "050q4rk1x3jghinxg6gszi993a6zbg41vg535dlvvsqi36l278qc"; + cargoSha256 = "1bspciy7sfx887hwxmckrnjy7b6kpy6g51yraw25yl302mzzng21"; buildInputs = [ llvmPackages.libclang ] ++ stdenv.lib.optional stdenv.isDarwin darwin.apple_sdk.frameworks.Security; diff --git a/pkgs/development/tools/wasm-bindgen-cli/0001-Add-cargo.lock-for-rustPlatform.buildRustPackage-in-.patch b/pkgs/development/tools/wasm-bindgen-cli/0001-Add-cargo.lock-for-0.2.55.patch index e564717a56f..3866483f9ed 100644 --- a/pkgs/development/tools/wasm-bindgen-cli/0001-Add-cargo.lock-for-rustPlatform.buildRustPackage-in-.patch +++ b/pkgs/development/tools/wasm-bindgen-cli/0001-Add-cargo.lock-for-0.2.55.patch @@ -1,26 +1,26 @@ -From 3d3c33a610856b861204ccb111777e9edd8799b8 Mon Sep 17 00:00:00 2001 +From 26c538a9da9047597f9fd437d8b83502aca3f932 Mon Sep 17 00:00:00 2001 From: Maximilian Bosch <maximilian@mbosch.me> -Date: Thu, 3 Oct 2019 22:26:12 +0200 -Subject: [PATCH] Add cargo.lock for `rustPlatform.buildRustPackage` in nixpkgs +Date: Tue, 26 Nov 2019 22:40:30 +0100 +Subject: [PATCH] Add cargo.lock for 0.2.55 --- - Cargo.lock | 2221 ++++++++++++++++++++++++++++++++++++++++++++++++++++ - 1 file changed, 2221 insertions(+) + Cargo.lock | 2237 ++++++++++++++++++++++++++++++++++++++++++++++++++++ + 1 file changed, 2237 insertions(+) create mode 100644 Cargo.lock diff --git a/Cargo.lock b/Cargo.lock new file mode 100644 -index 00000000..d7d32a06 +index 00000000..f256688d --- /dev/null +++ b/Cargo.lock -@@ -0,0 +1,2221 @@ +@@ -0,0 +1,2237 @@ +# This file is automatically @generated by Cargo. +# It is not intended for manual editing. +[[package]] +name = "add" +version = "0.1.0" +dependencies = [ -+ "wasm-bindgen 0.2.51", ++ "wasm-bindgen 0.2.55", +] + +[[package]] @@ -37,17 +37,19 @@ index 00000000..d7d32a06 +] + +[[package]] ++name = "anyhow" ++version = "1.0.23" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++ ++[[package]] +name = "arrayref" +version = "0.3.5" +source = "registry+https://github.com/rust-lang/crates.io-index" + +[[package]] +name = "arrayvec" -+version = "0.4.11" ++version = "0.5.1" +source = "registry+https://github.com/rust-lang/crates.io-index" -+dependencies = [ -+ "nodrop 0.1.13 (registry+https://github.com/rust-lang/crates.io-index)", -+] + +[[package]] +name = "ascii" @@ -80,9 +82,9 @@ index 00000000..d7d32a06 +version = "0.7.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +dependencies = [ -+ "num-traits 0.2.8 (registry+https://github.com/rust-lang/crates.io-index)", -+ "serde 1.0.101 (registry+https://github.com/rust-lang/crates.io-index)", -+ "serde_derive 1.0.101 (registry+https://github.com/rust-lang/crates.io-index)", ++ "num-traits 0.2.10 (registry+https://github.com/rust-lang/crates.io-index)", ++ "serde 1.0.103 (registry+https://github.com/rust-lang/crates.io-index)", ++ "serde_derive 1.0.103 (registry+https://github.com/rust-lang/crates.io-index)", + "toml 0.4.10 (registry+https://github.com/rust-lang/crates.io-index)", +] + @@ -92,7 +94,7 @@ index 00000000..d7d32a06 +source = "registry+https://github.com/rust-lang/crates.io-index" +dependencies = [ + "escargot 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)", -+ "predicates 1.0.1 (registry+https://github.com/rust-lang/crates.io-index)", ++ "predicates 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)", + "predicates-core 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)", + "predicates-tree 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)", +] @@ -102,33 +104,33 @@ index 00000000..d7d32a06 +version = "0.2.13" +source = "registry+https://github.com/rust-lang/crates.io-index" +dependencies = [ -+ "libc 0.2.62 (registry+https://github.com/rust-lang/crates.io-index)", ++ "libc 0.2.65 (registry+https://github.com/rust-lang/crates.io-index)", + "winapi 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)", +] + +[[package]] +name = "autocfg" -+version = "0.1.6" ++version = "0.1.7" +source = "registry+https://github.com/rust-lang/crates.io-index" + +[[package]] +name = "backtrace" -+version = "0.3.38" ++version = "0.3.40" +source = "registry+https://github.com/rust-lang/crates.io-index" +dependencies = [ -+ "backtrace-sys 0.1.31 (registry+https://github.com/rust-lang/crates.io-index)", ++ "backtrace-sys 0.1.32 (registry+https://github.com/rust-lang/crates.io-index)", + "cfg-if 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)", -+ "libc 0.2.62 (registry+https://github.com/rust-lang/crates.io-index)", ++ "libc 0.2.65 (registry+https://github.com/rust-lang/crates.io-index)", + "rustc-demangle 0.1.16 (registry+https://github.com/rust-lang/crates.io-index)", +] + +[[package]] +name = "backtrace-sys" -+version = "0.1.31" ++version = "0.1.32" +source = "registry+https://github.com/rust-lang/crates.io-index" +dependencies = [ -+ "cc 1.0.45 (registry+https://github.com/rust-lang/crates.io-index)", -+ "libc 0.2.62 (registry+https://github.com/rust-lang/crates.io-index)", ++ "cc 1.0.47 (registry+https://github.com/rust-lang/crates.io-index)", ++ "libc 0.2.65 (registry+https://github.com/rust-lang/crates.io-index)", +] + +[[package]] @@ -137,7 +139,7 @@ index 00000000..d7d32a06 +source = "registry+https://github.com/rust-lang/crates.io-index" +dependencies = [ + "byteorder 1.3.2 (registry+https://github.com/rust-lang/crates.io-index)", -+ "safemem 0.3.2 (registry+https://github.com/rust-lang/crates.io-index)", ++ "safemem 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)", +] + +[[package]] @@ -155,16 +157,16 @@ index 00000000..d7d32a06 + +[[package]] +name = "bitflags" -+version = "1.2.0" ++version = "1.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" + +[[package]] +name = "blake2b_simd" -+version = "0.5.8" ++version = "0.5.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +dependencies = [ + "arrayref 0.3.5 (registry+https://github.com/rust-lang/crates.io-index)", -+ "arrayvec 0.4.11 (registry+https://github.com/rust-lang/crates.io-index)", ++ "arrayvec 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)", + "constant_time_eq 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)", +] + @@ -174,7 +176,7 @@ index 00000000..d7d32a06 +source = "registry+https://github.com/rust-lang/crates.io-index" +dependencies = [ + "memchr 2.2.1 (registry+https://github.com/rust-lang/crates.io-index)", -+ "safemem 0.3.2 (registry+https://github.com/rust-lang/crates.io-index)", ++ "safemem 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)", +] + +[[package]] @@ -189,25 +191,24 @@ index 00000000..d7d32a06 + +[[package]] +name = "c2-chacha" -+version = "0.2.2" ++version = "0.2.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +dependencies = [ -+ "lazy_static 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)", -+ "ppv-lite86 0.2.5 (registry+https://github.com/rust-lang/crates.io-index)", ++ "ppv-lite86 0.2.6 (registry+https://github.com/rust-lang/crates.io-index)", +] + +[[package]] +name = "canvas" +version = "0.1.0" +dependencies = [ -+ "js-sys 0.3.28", -+ "wasm-bindgen 0.2.51", -+ "web-sys 0.3.28", ++ "js-sys 0.3.32", ++ "wasm-bindgen 0.2.55", ++ "web-sys 0.3.32", +] + +[[package]] +name = "cc" -+version = "1.0.45" ++version = "1.0.47" +source = "registry+https://github.com/rust-lang/crates.io-index" + +[[package]] @@ -219,17 +220,16 @@ index 00000000..d7d32a06 +name = "char" +version = "0.1.0" +dependencies = [ -+ "wasm-bindgen 0.2.51", ++ "wasm-bindgen 0.2.55", +] + +[[package]] +name = "chrono" -+version = "0.4.9" ++version = "0.4.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +dependencies = [ -+ "libc 0.2.62 (registry+https://github.com/rust-lang/crates.io-index)", + "num-integer 0.1.41 (registry+https://github.com/rust-lang/crates.io-index)", -+ "num-traits 0.2.8 (registry+https://github.com/rust-lang/crates.io-index)", ++ "num-traits 0.2.10 (registry+https://github.com/rust-lang/crates.io-index)", + "time 0.1.42 (registry+https://github.com/rust-lang/crates.io-index)", +] + @@ -242,9 +242,9 @@ index 00000000..d7d32a06 +name = "closures" +version = "0.1.0" +dependencies = [ -+ "js-sys 0.3.28", -+ "wasm-bindgen 0.2.51", -+ "web-sys 0.3.28", ++ "js-sys 0.3.32", ++ "wasm-bindgen 0.2.55", ++ "web-sys 0.3.32", +] + +[[package]] @@ -252,7 +252,7 @@ index 00000000..d7d32a06 +version = "0.0.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +dependencies = [ -+ "bitflags 1.2.0 (registry+https://github.com/rust-lang/crates.io-index)", ++ "bitflags 1.2.1 (registry+https://github.com/rust-lang/crates.io-index)", +] + +[[package]] @@ -266,15 +266,15 @@ index 00000000..d7d32a06 +source = "registry+https://github.com/rust-lang/crates.io-index" +dependencies = [ + "cfg-if 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)", -+ "wasm-bindgen 0.2.51", ++ "wasm-bindgen 0.2.55", +] + +[[package]] +name = "console_log" +version = "0.1.0" +dependencies = [ -+ "wasm-bindgen 0.2.51", -+ "web-sys 0.3.28", ++ "wasm-bindgen 0.2.55", ++ "web-sys 0.3.32", +] + +[[package]] @@ -284,32 +284,32 @@ index 00000000..d7d32a06 + +[[package]] +name = "crossbeam-deque" -+version = "0.7.1" ++version = "0.7.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +dependencies = [ -+ "crossbeam-epoch 0.7.2 (registry+https://github.com/rust-lang/crates.io-index)", -+ "crossbeam-utils 0.6.6 (registry+https://github.com/rust-lang/crates.io-index)", ++ "crossbeam-epoch 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)", ++ "crossbeam-utils 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)", +] + +[[package]] +name = "crossbeam-epoch" -+version = "0.7.2" ++version = "0.8.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +dependencies = [ -+ "arrayvec 0.4.11 (registry+https://github.com/rust-lang/crates.io-index)", ++ "autocfg 0.1.7 (registry+https://github.com/rust-lang/crates.io-index)", + "cfg-if 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)", -+ "crossbeam-utils 0.6.6 (registry+https://github.com/rust-lang/crates.io-index)", ++ "crossbeam-utils 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)", + "lazy_static 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)", -+ "memoffset 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)", ++ "memoffset 0.5.3 (registry+https://github.com/rust-lang/crates.io-index)", + "scopeguard 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)", +] + +[[package]] +name = "crossbeam-queue" -+version = "0.1.2" ++version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +dependencies = [ -+ "crossbeam-utils 0.6.6 (registry+https://github.com/rust-lang/crates.io-index)", ++ "crossbeam-utils 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)", +] + +[[package]] @@ -322,14 +322,24 @@ index 00000000..d7d32a06 +] + +[[package]] ++name = "crossbeam-utils" ++version = "0.7.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "autocfg 0.1.7 (registry+https://github.com/rust-lang/crates.io-index)", ++ "cfg-if 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)", ++ "lazy_static 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] +name = "curl" -+version = "0.4.24" ++version = "0.4.25" +source = "registry+https://github.com/rust-lang/crates.io-index" +dependencies = [ -+ "curl-sys 0.4.22 (registry+https://github.com/rust-lang/crates.io-index)", -+ "libc 0.2.62 (registry+https://github.com/rust-lang/crates.io-index)", ++ "curl-sys 0.4.24 (registry+https://github.com/rust-lang/crates.io-index)", ++ "libc 0.2.65 (registry+https://github.com/rust-lang/crates.io-index)", + "openssl-probe 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)", -+ "openssl-sys 0.9.50 (registry+https://github.com/rust-lang/crates.io-index)", ++ "openssl-sys 0.9.53 (registry+https://github.com/rust-lang/crates.io-index)", + "schannel 0.1.16 (registry+https://github.com/rust-lang/crates.io-index)", + "socket2 0.3.11 (registry+https://github.com/rust-lang/crates.io-index)", + "winapi 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)", @@ -337,14 +347,14 @@ index 00000000..d7d32a06 + +[[package]] +name = "curl-sys" -+version = "0.4.22" ++version = "0.4.24" +source = "registry+https://github.com/rust-lang/crates.io-index" +dependencies = [ -+ "cc 1.0.45 (registry+https://github.com/rust-lang/crates.io-index)", -+ "libc 0.2.62 (registry+https://github.com/rust-lang/crates.io-index)", ++ "cc 1.0.47 (registry+https://github.com/rust-lang/crates.io-index)", ++ "libc 0.2.65 (registry+https://github.com/rust-lang/crates.io-index)", + "libz-sys 1.0.25 (registry+https://github.com/rust-lang/crates.io-index)", -+ "openssl-sys 0.9.50 (registry+https://github.com/rust-lang/crates.io-index)", -+ "pkg-config 0.3.16 (registry+https://github.com/rust-lang/crates.io-index)", ++ "openssl-sys 0.9.53 (registry+https://github.com/rust-lang/crates.io-index)", ++ "pkg-config 0.3.17 (registry+https://github.com/rust-lang/crates.io-index)", + "vcpkg 0.2.7 (registry+https://github.com/rust-lang/crates.io-index)", + "winapi 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)", +] @@ -368,7 +378,7 @@ index 00000000..d7d32a06 +version = "1.0.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +dependencies = [ -+ "libc 0.2.62 (registry+https://github.com/rust-lang/crates.io-index)", ++ "libc 0.2.65 (registry+https://github.com/rust-lang/crates.io-index)", + "redox_users 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)", + "winapi 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)", +] @@ -380,7 +390,7 @@ index 00000000..d7d32a06 +dependencies = [ + "lazy_static 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)", + "regex 1.3.1 (registry+https://github.com/rust-lang/crates.io-index)", -+ "serde 1.0.101 (registry+https://github.com/rust-lang/crates.io-index)", ++ "serde 1.0.103 (registry+https://github.com/rust-lang/crates.io-index)", + "strsim 0.9.2 (registry+https://github.com/rust-lang/crates.io-index)", +] + @@ -388,8 +398,8 @@ index 00000000..d7d32a06 +name = "dom" +version = "0.1.0" +dependencies = [ -+ "wasm-bindgen 0.2.51", -+ "web-sys 0.3.28", ++ "wasm-bindgen 0.2.55", ++ "web-sys 0.3.32", +] + +[[package]] @@ -407,7 +417,7 @@ index 00000000..d7d32a06 + +[[package]] +name = "env_logger" -+version = "0.7.0" ++version = "0.7.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +dependencies = [ + "atty 0.2.13 (registry+https://github.com/rust-lang/crates.io-index)", @@ -424,59 +434,59 @@ index 00000000..d7d32a06 +dependencies = [ + "lazy_static 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)", + "log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)", -+ "serde 1.0.101 (registry+https://github.com/rust-lang/crates.io-index)", -+ "serde_json 1.0.40 (registry+https://github.com/rust-lang/crates.io-index)", ++ "serde 1.0.103 (registry+https://github.com/rust-lang/crates.io-index)", ++ "serde_json 1.0.42 (registry+https://github.com/rust-lang/crates.io-index)", +] + +[[package]] +name = "failure" -+version = "0.1.5" ++version = "0.1.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +dependencies = [ -+ "backtrace 0.3.38 (registry+https://github.com/rust-lang/crates.io-index)", -+ "failure_derive 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)", ++ "backtrace 0.3.40 (registry+https://github.com/rust-lang/crates.io-index)", ++ "failure_derive 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)", +] + +[[package]] +name = "failure_derive" -+version = "0.1.5" ++version = "0.1.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +dependencies = [ -+ "proc-macro2 0.4.30 (registry+https://github.com/rust-lang/crates.io-index)", -+ "quote 0.6.13 (registry+https://github.com/rust-lang/crates.io-index)", -+ "syn 0.15.44 (registry+https://github.com/rust-lang/crates.io-index)", -+ "synstructure 0.10.2 (registry+https://github.com/rust-lang/crates.io-index)", ++ "proc-macro2 1.0.6 (registry+https://github.com/rust-lang/crates.io-index)", ++ "quote 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)", ++ "syn 1.0.8 (registry+https://github.com/rust-lang/crates.io-index)", ++ "synstructure 0.12.3 (registry+https://github.com/rust-lang/crates.io-index)", +] + +[[package]] +name = "fetch" +version = "0.1.0" +dependencies = [ -+ "js-sys 0.3.28", -+ "serde 1.0.101 (registry+https://github.com/rust-lang/crates.io-index)", -+ "serde_derive 1.0.101 (registry+https://github.com/rust-lang/crates.io-index)", -+ "wasm-bindgen 0.2.51", -+ "wasm-bindgen-futures 0.4.1", -+ "web-sys 0.3.28", ++ "js-sys 0.3.32", ++ "serde 1.0.103 (registry+https://github.com/rust-lang/crates.io-index)", ++ "serde_derive 1.0.103 (registry+https://github.com/rust-lang/crates.io-index)", ++ "wasm-bindgen 0.2.55", ++ "wasm-bindgen-futures 0.4.5", ++ "web-sys 0.3.32", +] + +[[package]] +name = "filetime" -+version = "0.2.7" ++version = "0.2.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +dependencies = [ + "cfg-if 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)", -+ "libc 0.2.62 (registry+https://github.com/rust-lang/crates.io-index)", ++ "libc 0.2.65 (registry+https://github.com/rust-lang/crates.io-index)", + "redox_syscall 0.1.56 (registry+https://github.com/rust-lang/crates.io-index)", + "winapi 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)", +] + +[[package]] +name = "float-cmp" -+version = "0.4.0" ++version = "0.5.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +dependencies = [ -+ "num-traits 0.2.8 (registry+https://github.com/rust-lang/crates.io-index)", ++ "num-traits 0.2.10 (registry+https://github.com/rust-lang/crates.io-index)", +] + +[[package]] @@ -512,11 +522,11 @@ index 00000000..d7d32a06 + +[[package]] +name = "getrandom" -+version = "0.1.12" ++version = "0.1.13" +source = "registry+https://github.com/rust-lang/crates.io-index" +dependencies = [ + "cfg-if 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)", -+ "libc 0.2.62 (registry+https://github.com/rust-lang/crates.io-index)", ++ "libc 0.2.65 (registry+https://github.com/rust-lang/crates.io-index)", + "wasi 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)", +] + @@ -538,7 +548,7 @@ index 00000000..d7d32a06 +name = "guide-supported-types-examples" +version = "0.1.0" +dependencies = [ -+ "wasm-bindgen 0.2.51", ++ "wasm-bindgen 0.2.55", +] + +[[package]] @@ -546,14 +556,22 @@ index 00000000..d7d32a06 +version = "0.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +dependencies = [ -+ "unicode-segmentation 1.3.0 (registry+https://github.com/rust-lang/crates.io-index)", ++ "unicode-segmentation 1.6.0 (registry+https://github.com/rust-lang/crates.io-index)", +] + +[[package]] +name = "hello_world" +version = "0.1.0" +dependencies = [ -+ "wasm-bindgen 0.2.51", ++ "wasm-bindgen 0.2.55", ++] ++ ++[[package]] ++name = "hermit-abi" ++version = "0.1.3" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "libc 0.2.65 (registry+https://github.com/rust-lang/crates.io-index)", +] + +[[package]] @@ -574,7 +592,7 @@ index 00000000..d7d32a06 +version = "2.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +dependencies = [ -+ "rayon 1.2.0 (registry+https://github.com/rust-lang/crates.io-index)", ++ "rayon 1.2.1 (registry+https://github.com/rust-lang/crates.io-index)", +] + +[[package]] @@ -584,7 +602,7 @@ index 00000000..d7d32a06 +dependencies = [ + "matches 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)", + "unicode-bidi 0.3.4 (registry+https://github.com/rust-lang/crates.io-index)", -+ "unicode-normalization 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)", ++ "unicode-normalization 0.1.11 (registry+https://github.com/rust-lang/crates.io-index)", +] + +[[package]] @@ -607,7 +625,7 @@ index 00000000..d7d32a06 +name = "import_js" +version = "0.1.0" +dependencies = [ -+ "wasm-bindgen 0.2.51", ++ "wasm-bindgen 0.2.55", +] + +[[package]] @@ -626,24 +644,24 @@ index 00000000..d7d32a06 +source = "registry+https://github.com/rust-lang/crates.io-index" +dependencies = [ + "byteorder 1.3.2 (registry+https://github.com/rust-lang/crates.io-index)", -+ "rayon 1.2.0 (registry+https://github.com/rust-lang/crates.io-index)", ++ "rayon 1.2.1 (registry+https://github.com/rust-lang/crates.io-index)", +] + +[[package]] +name = "js-sys" -+version = "0.3.28" ++version = "0.3.32" +dependencies = [ -+ "wasm-bindgen 0.2.51", -+ "wasm-bindgen-futures 0.4.1", -+ "wasm-bindgen-test 0.3.1", ++ "wasm-bindgen 0.2.55", ++ "wasm-bindgen-futures 0.4.5", ++ "wasm-bindgen-test 0.3.5", +] + +[[package]] +name = "julia_set" +version = "0.1.0" +dependencies = [ -+ "wasm-bindgen 0.2.51", -+ "web-sys 0.3.28", ++ "wasm-bindgen 0.2.55", ++ "web-sys 0.3.32", +] + +[[package]] @@ -658,7 +676,7 @@ index 00000000..d7d32a06 + +[[package]] +name = "libc" -+version = "0.2.62" ++version = "0.2.65" +source = "registry+https://github.com/rust-lang/crates.io-index" + +[[package]] @@ -666,9 +684,9 @@ index 00000000..d7d32a06 +version = "1.0.25" +source = "registry+https://github.com/rust-lang/crates.io-index" +dependencies = [ -+ "cc 1.0.45 (registry+https://github.com/rust-lang/crates.io-index)", -+ "libc 0.2.62 (registry+https://github.com/rust-lang/crates.io-index)", -+ "pkg-config 0.3.16 (registry+https://github.com/rust-lang/crates.io-index)", ++ "cc 1.0.47 (registry+https://github.com/rust-lang/crates.io-index)", ++ "libc 0.2.65 (registry+https://github.com/rust-lang/crates.io-index)", ++ "pkg-config 0.3.17 (registry+https://github.com/rust-lang/crates.io-index)", + "vcpkg 0.2.7 (registry+https://github.com/rust-lang/crates.io-index)", +] + @@ -705,7 +723,7 @@ index 00000000..d7d32a06 + +[[package]] +name = "memoffset" -+version = "0.5.1" ++version = "0.5.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +dependencies = [ + "rustc_version 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)", @@ -742,7 +760,7 @@ index 00000000..d7d32a06 + "mime_guess 1.8.7 (registry+https://github.com/rust-lang/crates.io-index)", + "quick-error 1.2.2 (registry+https://github.com/rust-lang/crates.io-index)", + "rand 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)", -+ "safemem 0.3.2 (registry+https://github.com/rust-lang/crates.io-index)", ++ "safemem 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)", + "tempdir 0.3.7 (registry+https://github.com/rust-lang/crates.io-index)", + "twoway 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)", +] @@ -751,15 +769,10 @@ index 00000000..d7d32a06 +name = "no-std" +version = "0.1.0" +dependencies = [ -+ "wasm-bindgen 0.2.51", ++ "wasm-bindgen 0.2.55", +] + +[[package]] -+name = "nodrop" -+version = "0.1.13" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+ -+[[package]] +name = "nom" +version = "4.2.3" +source = "registry+https://github.com/rust-lang/crates.io-index" @@ -778,8 +791,8 @@ index 00000000..d7d32a06 +version = "0.1.41" +source = "registry+https://github.com/rust-lang/crates.io-index" +dependencies = [ -+ "autocfg 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)", -+ "num-traits 0.2.8 (registry+https://github.com/rust-lang/crates.io-index)", ++ "autocfg 0.1.7 (registry+https://github.com/rust-lang/crates.io-index)", ++ "num-traits 0.2.10 (registry+https://github.com/rust-lang/crates.io-index)", +] + +[[package]] @@ -787,9 +800,9 @@ index 00000000..d7d32a06 +version = "0.1.39" +source = "registry+https://github.com/rust-lang/crates.io-index" +dependencies = [ -+ "autocfg 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)", ++ "autocfg 0.1.7 (registry+https://github.com/rust-lang/crates.io-index)", + "num-integer 0.1.41 (registry+https://github.com/rust-lang/crates.io-index)", -+ "num-traits 0.2.8 (registry+https://github.com/rust-lang/crates.io-index)", ++ "num-traits 0.2.10 (registry+https://github.com/rust-lang/crates.io-index)", +] + +[[package]] @@ -798,7 +811,7 @@ index 00000000..d7d32a06 +source = "registry+https://github.com/rust-lang/crates.io-index" +dependencies = [ + "num-integer 0.1.41 (registry+https://github.com/rust-lang/crates.io-index)", -+ "num-traits 0.2.8 (registry+https://github.com/rust-lang/crates.io-index)", ++ "num-traits 0.2.10 (registry+https://github.com/rust-lang/crates.io-index)", +] + +[[package]] @@ -806,36 +819,37 @@ index 00000000..d7d32a06 +version = "0.1.43" +source = "registry+https://github.com/rust-lang/crates.io-index" +dependencies = [ -+ "num-traits 0.2.8 (registry+https://github.com/rust-lang/crates.io-index)", ++ "num-traits 0.2.10 (registry+https://github.com/rust-lang/crates.io-index)", +] + +[[package]] +name = "num-traits" -+version = "0.2.8" ++version = "0.2.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +dependencies = [ -+ "autocfg 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)", ++ "autocfg 0.1.7 (registry+https://github.com/rust-lang/crates.io-index)", +] + +[[package]] +name = "num_cpus" -+version = "1.10.1" ++version = "1.11.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +dependencies = [ -+ "libc 0.2.62 (registry+https://github.com/rust-lang/crates.io-index)", ++ "hermit-abi 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)", ++ "libc 0.2.65 (registry+https://github.com/rust-lang/crates.io-index)", +] + +[[package]] +name = "openssl" -+version = "0.10.25" ++version = "0.10.26" +source = "registry+https://github.com/rust-lang/crates.io-index" +dependencies = [ -+ "bitflags 1.2.0 (registry+https://github.com/rust-lang/crates.io-index)", ++ "bitflags 1.2.1 (registry+https://github.com/rust-lang/crates.io-index)", + "cfg-if 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)", + "foreign-types 0.3.2 (registry+https://github.com/rust-lang/crates.io-index)", + "lazy_static 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)", -+ "libc 0.2.62 (registry+https://github.com/rust-lang/crates.io-index)", -+ "openssl-sys 0.9.50 (registry+https://github.com/rust-lang/crates.io-index)", ++ "libc 0.2.65 (registry+https://github.com/rust-lang/crates.io-index)", ++ "openssl-sys 0.9.53 (registry+https://github.com/rust-lang/crates.io-index)", +] + +[[package]] @@ -848,19 +862,19 @@ index 00000000..d7d32a06 +version = "111.6.0+1.1.1d" +source = "registry+https://github.com/rust-lang/crates.io-index" +dependencies = [ -+ "cc 1.0.45 (registry+https://github.com/rust-lang/crates.io-index)", ++ "cc 1.0.47 (registry+https://github.com/rust-lang/crates.io-index)", +] + +[[package]] +name = "openssl-sys" -+version = "0.9.50" ++version = "0.9.53" +source = "registry+https://github.com/rust-lang/crates.io-index" +dependencies = [ -+ "autocfg 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)", -+ "cc 1.0.45 (registry+https://github.com/rust-lang/crates.io-index)", -+ "libc 0.2.62 (registry+https://github.com/rust-lang/crates.io-index)", ++ "autocfg 0.1.7 (registry+https://github.com/rust-lang/crates.io-index)", ++ "cc 1.0.47 (registry+https://github.com/rust-lang/crates.io-index)", ++ "libc 0.2.65 (registry+https://github.com/rust-lang/crates.io-index)", + "openssl-src 111.6.0+1.1.1d (registry+https://github.com/rust-lang/crates.io-index)", -+ "pkg-config 0.3.16 (registry+https://github.com/rust-lang/crates.io-index)", ++ "pkg-config 0.3.17 (registry+https://github.com/rust-lang/crates.io-index)", + "vcpkg 0.2.7 (registry+https://github.com/rust-lang/crates.io-index)", +] + @@ -874,8 +888,8 @@ index 00000000..d7d32a06 +version = "0.1.0" +dependencies = [ + "humantime 1.3.0 (registry+https://github.com/rust-lang/crates.io-index)", -+ "wasm-bindgen 0.2.51", -+ "web-sys 0.3.28", ++ "wasm-bindgen 0.2.55", ++ "web-sys 0.3.32", +] + +[[package]] @@ -915,7 +929,7 @@ index 00000000..d7d32a06 + +[[package]] +name = "pkg-config" -+version = "0.3.16" ++version = "0.3.17" +source = "registry+https://github.com/rust-lang/crates.io-index" + +[[package]] @@ -931,16 +945,16 @@ index 00000000..d7d32a06 + +[[package]] +name = "ppv-lite86" -+version = "0.2.5" ++version = "0.2.6" +source = "registry+https://github.com/rust-lang/crates.io-index" + +[[package]] +name = "predicates" -+version = "1.0.1" ++version = "1.0.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +dependencies = [ + "difference 2.0.0 (registry+https://github.com/rust-lang/crates.io-index)", -+ "float-cmp 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)", ++ "float-cmp 0.5.3 (registry+https://github.com/rust-lang/crates.io-index)", + "normalize-line-endings 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)", + "predicates-core 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)", + "regex 1.3.1 (registry+https://github.com/rust-lang/crates.io-index)", @@ -970,7 +984,7 @@ index 00000000..d7d32a06 + +[[package]] +name = "proc-macro2" -+version = "1.0.4" ++version = "1.0.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +dependencies = [ + "unicode-xid 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)", @@ -994,7 +1008,7 @@ index 00000000..d7d32a06 +version = "1.0.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +dependencies = [ -+ "proc-macro2 1.0.4 (registry+https://github.com/rust-lang/crates.io-index)", ++ "proc-macro2 1.0.6 (registry+https://github.com/rust-lang/crates.io-index)", +] + +[[package]] @@ -1003,7 +1017,7 @@ index 00000000..d7d32a06 +source = "registry+https://github.com/rust-lang/crates.io-index" +dependencies = [ + "fuchsia-cprng 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)", -+ "libc 0.2.62 (registry+https://github.com/rust-lang/crates.io-index)", ++ "libc 0.2.65 (registry+https://github.com/rust-lang/crates.io-index)", + "rand_core 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)", + "rdrand 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)", + "winapi 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)", @@ -1016,7 +1030,7 @@ index 00000000..d7d32a06 +dependencies = [ + "cloudabi 0.0.3 (registry+https://github.com/rust-lang/crates.io-index)", + "fuchsia-cprng 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)", -+ "libc 0.2.62 (registry+https://github.com/rust-lang/crates.io-index)", ++ "libc 0.2.65 (registry+https://github.com/rust-lang/crates.io-index)", + "rand_core 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)", + "winapi 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)", +] @@ -1026,8 +1040,8 @@ index 00000000..d7d32a06 +version = "0.6.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +dependencies = [ -+ "autocfg 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)", -+ "libc 0.2.62 (registry+https://github.com/rust-lang/crates.io-index)", ++ "autocfg 0.1.7 (registry+https://github.com/rust-lang/crates.io-index)", ++ "libc 0.2.65 (registry+https://github.com/rust-lang/crates.io-index)", + "rand_chacha 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)", + "rand_core 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)", + "rand_hc 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)", @@ -1044,8 +1058,8 @@ index 00000000..d7d32a06 +version = "0.7.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +dependencies = [ -+ "getrandom 0.1.12 (registry+https://github.com/rust-lang/crates.io-index)", -+ "libc 0.2.62 (registry+https://github.com/rust-lang/crates.io-index)", ++ "getrandom 0.1.13 (registry+https://github.com/rust-lang/crates.io-index)", ++ "libc 0.2.65 (registry+https://github.com/rust-lang/crates.io-index)", + "rand_chacha 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)", + "rand_core 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)", + "rand_hc 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)", @@ -1056,7 +1070,7 @@ index 00000000..d7d32a06 +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +dependencies = [ -+ "autocfg 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)", ++ "autocfg 0.1.7 (registry+https://github.com/rust-lang/crates.io-index)", + "rand_core 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)", +] + @@ -1065,7 +1079,7 @@ index 00000000..d7d32a06 +version = "0.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +dependencies = [ -+ "c2-chacha 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)", ++ "c2-chacha 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)", + "rand_core 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)", +] + @@ -1087,7 +1101,7 @@ index 00000000..d7d32a06 +version = "0.5.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +dependencies = [ -+ "getrandom 0.1.12 (registry+https://github.com/rust-lang/crates.io-index)", ++ "getrandom 0.1.13 (registry+https://github.com/rust-lang/crates.io-index)", +] + +[[package]] @@ -1119,7 +1133,7 @@ index 00000000..d7d32a06 +version = "0.1.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +dependencies = [ -+ "libc 0.2.62 (registry+https://github.com/rust-lang/crates.io-index)", ++ "libc 0.2.65 (registry+https://github.com/rust-lang/crates.io-index)", + "rand_core 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)", + "winapi 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)", +] @@ -1131,7 +1145,7 @@ index 00000000..d7d32a06 +dependencies = [ + "cloudabi 0.0.3 (registry+https://github.com/rust-lang/crates.io-index)", + "fuchsia-cprng 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)", -+ "libc 0.2.62 (registry+https://github.com/rust-lang/crates.io-index)", ++ "libc 0.2.65 (registry+https://github.com/rust-lang/crates.io-index)", + "rand_core 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)", + "rdrand 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)", + "winapi 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)", @@ -1142,7 +1156,7 @@ index 00000000..d7d32a06 +version = "0.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +dependencies = [ -+ "autocfg 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)", ++ "autocfg 0.1.7 (registry+https://github.com/rust-lang/crates.io-index)", + "rand_core 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)", +] + @@ -1156,24 +1170,24 @@ index 00000000..d7d32a06 + +[[package]] +name = "rayon" -+version = "1.2.0" ++version = "1.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +dependencies = [ -+ "crossbeam-deque 0.7.1 (registry+https://github.com/rust-lang/crates.io-index)", ++ "crossbeam-deque 0.7.2 (registry+https://github.com/rust-lang/crates.io-index)", + "either 1.5.3 (registry+https://github.com/rust-lang/crates.io-index)", -+ "rayon-core 1.6.0 (registry+https://github.com/rust-lang/crates.io-index)", ++ "rayon-core 1.6.1 (registry+https://github.com/rust-lang/crates.io-index)", +] + +[[package]] +name = "rayon-core" -+version = "1.6.0" ++version = "1.6.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +dependencies = [ -+ "crossbeam-deque 0.7.1 (registry+https://github.com/rust-lang/crates.io-index)", -+ "crossbeam-queue 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)", -+ "crossbeam-utils 0.6.6 (registry+https://github.com/rust-lang/crates.io-index)", ++ "crossbeam-deque 0.7.2 (registry+https://github.com/rust-lang/crates.io-index)", ++ "crossbeam-queue 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)", ++ "crossbeam-utils 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)", + "lazy_static 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)", -+ "num_cpus 1.10.1 (registry+https://github.com/rust-lang/crates.io-index)", ++ "num_cpus 1.11.1 (registry+https://github.com/rust-lang/crates.io-index)", +] + +[[package]] @@ -1182,13 +1196,13 @@ index 00000000..d7d32a06 +dependencies = [ + "console_error_panic_hook 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)", + "futures-channel-preview 0.3.0-alpha.19 (registry+https://github.com/rust-lang/crates.io-index)", -+ "js-sys 0.3.28", -+ "rayon 1.2.0 (registry+https://github.com/rust-lang/crates.io-index)", -+ "rayon-core 1.6.0 (registry+https://github.com/rust-lang/crates.io-index)", ++ "js-sys 0.3.32", ++ "rayon 1.2.1 (registry+https://github.com/rust-lang/crates.io-index)", ++ "rayon-core 1.6.1 (registry+https://github.com/rust-lang/crates.io-index)", + "raytracer 0.1.0 (git+https://github.com/alexcrichton/raytracer?branch=update-deps)", -+ "wasm-bindgen 0.2.51", -+ "wasm-bindgen-futures 0.4.1", -+ "web-sys 0.3.28", ++ "wasm-bindgen 0.2.55", ++ "wasm-bindgen-futures 0.4.5", ++ "web-sys 0.3.32", +] + +[[package]] @@ -1197,8 +1211,8 @@ index 00000000..d7d32a06 +source = "git+https://github.com/alexcrichton/raytracer?branch=update-deps#42faa13859f7d8d47fd18be785c108003a207786" +dependencies = [ + "image 0.12.4 (registry+https://github.com/rust-lang/crates.io-index)", -+ "serde 1.0.101 (registry+https://github.com/rust-lang/crates.io-index)", -+ "serde_derive 1.0.101 (registry+https://github.com/rust-lang/crates.io-index)", ++ "serde 1.0.103 (registry+https://github.com/rust-lang/crates.io-index)", ++ "serde_derive 1.0.103 (registry+https://github.com/rust-lang/crates.io-index)", +] + +[[package]] @@ -1219,7 +1233,7 @@ index 00000000..d7d32a06 +version = "0.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +dependencies = [ -+ "failure 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)", ++ "failure 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)", + "rand_os 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)", + "redox_syscall 0.1.56 (registry+https://github.com/rust-lang/crates.io-index)", + "rust-argon2 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)", @@ -1253,8 +1267,8 @@ index 00000000..d7d32a06 +name = "request-animation-frame" +version = "0.1.0" +dependencies = [ -+ "wasm-bindgen 0.2.51", -+ "web-sys 0.3.28", ++ "wasm-bindgen 0.2.55", ++ "web-sys 0.3.32", +] + +[[package]] @@ -1263,14 +1277,14 @@ index 00000000..d7d32a06 +source = "registry+https://github.com/rust-lang/crates.io-index" +dependencies = [ + "base64 0.9.3 (registry+https://github.com/rust-lang/crates.io-index)", -+ "chrono 0.4.9 (registry+https://github.com/rust-lang/crates.io-index)", -+ "filetime 0.2.7 (registry+https://github.com/rust-lang/crates.io-index)", ++ "chrono 0.4.10 (registry+https://github.com/rust-lang/crates.io-index)", ++ "filetime 0.2.8 (registry+https://github.com/rust-lang/crates.io-index)", + "multipart 0.15.4 (registry+https://github.com/rust-lang/crates.io-index)", -+ "num_cpus 1.10.1 (registry+https://github.com/rust-lang/crates.io-index)", ++ "num_cpus 1.11.1 (registry+https://github.com/rust-lang/crates.io-index)", + "rand 0.5.6 (registry+https://github.com/rust-lang/crates.io-index)", -+ "serde 1.0.101 (registry+https://github.com/rust-lang/crates.io-index)", -+ "serde_derive 1.0.101 (registry+https://github.com/rust-lang/crates.io-index)", -+ "serde_json 1.0.40 (registry+https://github.com/rust-lang/crates.io-index)", ++ "serde 1.0.103 (registry+https://github.com/rust-lang/crates.io-index)", ++ "serde_derive 1.0.103 (registry+https://github.com/rust-lang/crates.io-index)", ++ "serde_json 1.0.42 (registry+https://github.com/rust-lang/crates.io-index)", + "sha1 0.6.0 (registry+https://github.com/rust-lang/crates.io-index)", + "term 0.5.2 (registry+https://github.com/rust-lang/crates.io-index)", + "threadpool 1.7.1 (registry+https://github.com/rust-lang/crates.io-index)", @@ -1285,7 +1299,7 @@ index 00000000..d7d32a06 +source = "registry+https://github.com/rust-lang/crates.io-index" +dependencies = [ + "base64 0.10.1 (registry+https://github.com/rust-lang/crates.io-index)", -+ "blake2b_simd 0.5.8 (registry+https://github.com/rust-lang/crates.io-index)", ++ "blake2b_simd 0.5.9 (registry+https://github.com/rust-lang/crates.io-index)", + "crossbeam-utils 0.6.6 (registry+https://github.com/rust-lang/crates.io-index)", +] + @@ -1293,7 +1307,7 @@ index 00000000..d7d32a06 +name = "rust-duck-typed-interfaces" +version = "0.1.0" +dependencies = [ -+ "wasm-bindgen 0.2.51", ++ "wasm-bindgen 0.2.55", +] + +[[package]] @@ -1311,22 +1325,22 @@ index 00000000..d7d32a06 + +[[package]] +name = "ryu" -+version = "1.0.0" ++version = "1.0.2" +source = "registry+https://github.com/rust-lang/crates.io-index" + +[[package]] +name = "safemem" -+version = "0.3.2" ++version = "0.3.3" +source = "registry+https://github.com/rust-lang/crates.io-index" + +[[package]] +name = "sample" +version = "0.1.0" +dependencies = [ -+ "js-sys 0.3.28", -+ "wasm-bindgen 0.2.51", -+ "wasm-bindgen-futures 0.4.1", -+ "wasm-bindgen-test 0.3.1", ++ "js-sys 0.3.32", ++ "wasm-bindgen 0.2.55", ++ "wasm-bindgen-futures 0.4.5", ++ "wasm-bindgen-test 0.3.5", +] + +[[package]] @@ -1368,30 +1382,30 @@ index 00000000..d7d32a06 + +[[package]] +name = "serde" -+version = "1.0.101" ++version = "1.0.103" +source = "registry+https://github.com/rust-lang/crates.io-index" +dependencies = [ -+ "serde_derive 1.0.101 (registry+https://github.com/rust-lang/crates.io-index)", ++ "serde_derive 1.0.103 (registry+https://github.com/rust-lang/crates.io-index)", +] + +[[package]] +name = "serde_derive" -+version = "1.0.101" ++version = "1.0.103" +source = "registry+https://github.com/rust-lang/crates.io-index" +dependencies = [ -+ "proc-macro2 1.0.4 (registry+https://github.com/rust-lang/crates.io-index)", ++ "proc-macro2 1.0.6 (registry+https://github.com/rust-lang/crates.io-index)", + "quote 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)", -+ "syn 1.0.5 (registry+https://github.com/rust-lang/crates.io-index)", ++ "syn 1.0.8 (registry+https://github.com/rust-lang/crates.io-index)", +] + +[[package]] +name = "serde_json" -+version = "1.0.40" ++version = "1.0.42" +source = "registry+https://github.com/rust-lang/crates.io-index" +dependencies = [ + "itoa 0.4.4 (registry+https://github.com/rust-lang/crates.io-index)", -+ "ryu 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)", -+ "serde 1.0.101 (registry+https://github.com/rust-lang/crates.io-index)", ++ "ryu 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)", ++ "serde 1.0.103 (registry+https://github.com/rust-lang/crates.io-index)", +] + +[[package]] @@ -1406,7 +1420,7 @@ index 00000000..d7d32a06 + +[[package]] +name = "smallvec" -+version = "0.6.10" ++version = "1.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" + +[[package]] @@ -1415,7 +1429,7 @@ index 00000000..d7d32a06 +source = "registry+https://github.com/rust-lang/crates.io-index" +dependencies = [ + "cfg-if 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)", -+ "libc 0.2.62 (registry+https://github.com/rust-lang/crates.io-index)", ++ "libc 0.2.65 (registry+https://github.com/rust-lang/crates.io-index)", + "redox_syscall 0.1.56 (registry+https://github.com/rust-lang/crates.io-index)", + "winapi 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)", +] @@ -1442,23 +1456,23 @@ index 00000000..d7d32a06 + +[[package]] +name = "syn" -+version = "1.0.5" ++version = "1.0.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +dependencies = [ -+ "proc-macro2 1.0.4 (registry+https://github.com/rust-lang/crates.io-index)", ++ "proc-macro2 1.0.6 (registry+https://github.com/rust-lang/crates.io-index)", + "quote 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)", + "unicode-xid 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)", +] + +[[package]] +name = "synstructure" -+version = "0.10.2" ++version = "0.12.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +dependencies = [ -+ "proc-macro2 0.4.30 (registry+https://github.com/rust-lang/crates.io-index)", -+ "quote 0.6.13 (registry+https://github.com/rust-lang/crates.io-index)", -+ "syn 0.15.44 (registry+https://github.com/rust-lang/crates.io-index)", -+ "unicode-xid 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)", ++ "proc-macro2 1.0.6 (registry+https://github.com/rust-lang/crates.io-index)", ++ "quote 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)", ++ "syn 1.0.8 (registry+https://github.com/rust-lang/crates.io-index)", ++ "unicode-xid 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)", +] + +[[package]] @@ -1476,7 +1490,7 @@ index 00000000..d7d32a06 +source = "registry+https://github.com/rust-lang/crates.io-index" +dependencies = [ + "cfg-if 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)", -+ "libc 0.2.62 (registry+https://github.com/rust-lang/crates.io-index)", ++ "libc 0.2.65 (registry+https://github.com/rust-lang/crates.io-index)", + "rand 0.7.2 (registry+https://github.com/rust-lang/crates.io-index)", + "redox_syscall 0.1.56 (registry+https://github.com/rust-lang/crates.io-index)", + "remove_dir_all 0.5.2 (registry+https://github.com/rust-lang/crates.io-index)", @@ -1514,7 +1528,7 @@ index 00000000..d7d32a06 +version = "1.7.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +dependencies = [ -+ "num_cpus 1.10.1 (registry+https://github.com/rust-lang/crates.io-index)", ++ "num_cpus 1.11.1 (registry+https://github.com/rust-lang/crates.io-index)", +] + +[[package]] @@ -1522,7 +1536,7 @@ index 00000000..d7d32a06 +version = "0.1.42" +source = "registry+https://github.com/rust-lang/crates.io-index" +dependencies = [ -+ "libc 0.2.62 (registry+https://github.com/rust-lang/crates.io-index)", ++ "libc 0.2.65 (registry+https://github.com/rust-lang/crates.io-index)", + "redox_syscall 0.1.56 (registry+https://github.com/rust-lang/crates.io-index)", + "winapi 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)", +] @@ -1533,7 +1547,7 @@ index 00000000..d7d32a06 +source = "registry+https://github.com/rust-lang/crates.io-index" +dependencies = [ + "ascii 0.8.7 (registry+https://github.com/rust-lang/crates.io-index)", -+ "chrono 0.4.9 (registry+https://github.com/rust-lang/crates.io-index)", ++ "chrono 0.4.10 (registry+https://github.com/rust-lang/crates.io-index)", + "chunked_transfer 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)", + "log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)", + "url 1.7.2 (registry+https://github.com/rust-lang/crates.io-index)", @@ -1545,9 +1559,9 @@ index 00000000..d7d32a06 +dependencies = [ + "askama 0.7.2 (registry+https://github.com/rust-lang/crates.io-index)", + "console_error_panic_hook 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)", -+ "js-sys 0.3.28", -+ "wasm-bindgen 0.2.51", -+ "web-sys 0.3.28", ++ "js-sys 0.3.32", ++ "wasm-bindgen 0.2.55", ++ "web-sys 0.3.32", +] + +[[package]] @@ -1555,15 +1569,15 @@ index 00000000..d7d32a06 +version = "0.4.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +dependencies = [ -+ "serde 1.0.101 (registry+https://github.com/rust-lang/crates.io-index)", ++ "serde 1.0.103 (registry+https://github.com/rust-lang/crates.io-index)", +] + +[[package]] +name = "toml" -+version = "0.5.3" ++version = "0.5.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +dependencies = [ -+ "serde 1.0.101 (registry+https://github.com/rust-lang/crates.io-index)", ++ "serde 1.0.103 (registry+https://github.com/rust-lang/crates.io-index)", +] + +[[package]] @@ -1573,15 +1587,15 @@ index 00000000..d7d32a06 + +[[package]] +name = "trybuild" -+version = "1.0.16" ++version = "1.0.18" +source = "registry+https://github.com/rust-lang/crates.io-index" +dependencies = [ + "glob 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)", + "lazy_static 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)", -+ "serde 1.0.101 (registry+https://github.com/rust-lang/crates.io-index)", -+ "serde_json 1.0.40 (registry+https://github.com/rust-lang/crates.io-index)", ++ "serde 1.0.103 (registry+https://github.com/rust-lang/crates.io-index)", ++ "serde_json 1.0.42 (registry+https://github.com/rust-lang/crates.io-index)", + "termcolor 1.0.5 (registry+https://github.com/rust-lang/crates.io-index)", -+ "toml 0.5.3 (registry+https://github.com/rust-lang/crates.io-index)", ++ "toml 0.5.5 (registry+https://github.com/rust-lang/crates.io-index)", +] + +[[package]] @@ -1596,7 +1610,7 @@ index 00000000..d7d32a06 +name = "typescript-tests" +version = "0.1.0" +dependencies = [ -+ "wasm-bindgen 0.2.51", ++ "wasm-bindgen 0.2.55", +] + +[[package]] @@ -1617,15 +1631,15 @@ index 00000000..d7d32a06 + +[[package]] +name = "unicode-normalization" -+version = "0.1.8" ++version = "0.1.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +dependencies = [ -+ "smallvec 0.6.10 (registry+https://github.com/rust-lang/crates.io-index)", ++ "smallvec 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)", +] + +[[package]] +name = "unicode-segmentation" -+version = "1.3.0" ++version = "1.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" + +[[package]] @@ -1660,27 +1674,27 @@ index 00000000..d7d32a06 + +[[package]] +name = "walrus" -+version = "0.12.0" ++version = "0.13.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +dependencies = [ -+ "failure 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)", ++ "anyhow 1.0.23 (registry+https://github.com/rust-lang/crates.io-index)", + "id-arena 2.2.1 (registry+https://github.com/rust-lang/crates.io-index)", + "leb128 0.2.4 (registry+https://github.com/rust-lang/crates.io-index)", + "log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)", -+ "rayon 1.2.0 (registry+https://github.com/rust-lang/crates.io-index)", -+ "walrus-macro 0.12.0 (registry+https://github.com/rust-lang/crates.io-index)", -+ "wasmparser 0.37.2 (registry+https://github.com/rust-lang/crates.io-index)", ++ "rayon 1.2.1 (registry+https://github.com/rust-lang/crates.io-index)", ++ "walrus-macro 0.13.0 (registry+https://github.com/rust-lang/crates.io-index)", ++ "wasmparser 0.39.3 (registry+https://github.com/rust-lang/crates.io-index)", +] + +[[package]] +name = "walrus-macro" -+version = "0.12.0" ++version = "0.13.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +dependencies = [ + "heck 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)", -+ "proc-macro2 1.0.4 (registry+https://github.com/rust-lang/crates.io-index)", ++ "proc-macro2 1.0.6 (registry+https://github.com/rust-lang/crates.io-index)", + "quote 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)", -+ "syn 1.0.5 (registry+https://github.com/rust-lang/crates.io-index)", ++ "syn 1.0.8 (registry+https://github.com/rust-lang/crates.io-index)", +] + +[[package]] @@ -1690,217 +1704,217 @@ index 00000000..d7d32a06 + +[[package]] +name = "wasm-bindgen" -+version = "0.2.51" ++version = "0.2.55" +dependencies = [ + "cfg-if 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)", -+ "js-sys 0.3.28", -+ "serde 1.0.101 (registry+https://github.com/rust-lang/crates.io-index)", -+ "serde_derive 1.0.101 (registry+https://github.com/rust-lang/crates.io-index)", -+ "serde_json 1.0.40 (registry+https://github.com/rust-lang/crates.io-index)", -+ "wasm-bindgen-futures 0.4.1", -+ "wasm-bindgen-macro 0.2.51", -+ "wasm-bindgen-test 0.3.1", ++ "js-sys 0.3.32", ++ "serde 1.0.103 (registry+https://github.com/rust-lang/crates.io-index)", ++ "serde_derive 1.0.103 (registry+https://github.com/rust-lang/crates.io-index)", ++ "serde_json 1.0.42 (registry+https://github.com/rust-lang/crates.io-index)", ++ "wasm-bindgen-futures 0.4.5", ++ "wasm-bindgen-macro 0.2.55", ++ "wasm-bindgen-test 0.3.5", + "wasm-bindgen-test-crate-a 0.1.0", + "wasm-bindgen-test-crate-b 0.1.0", +] + +[[package]] +name = "wasm-bindgen-anyref-xform" -+version = "0.2.51" ++version = "0.2.55" +dependencies = [ -+ "failure 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)", -+ "walrus 0.12.0 (registry+https://github.com/rust-lang/crates.io-index)", ++ "anyhow 1.0.23 (registry+https://github.com/rust-lang/crates.io-index)", ++ "walrus 0.13.0 (registry+https://github.com/rust-lang/crates.io-index)", +] + +[[package]] +name = "wasm-bindgen-backend" -+version = "0.2.51" ++version = "0.2.55" +dependencies = [ + "bumpalo 2.6.0 (registry+https://github.com/rust-lang/crates.io-index)", + "lazy_static 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)", + "log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)", -+ "proc-macro2 1.0.4 (registry+https://github.com/rust-lang/crates.io-index)", ++ "proc-macro2 1.0.6 (registry+https://github.com/rust-lang/crates.io-index)", + "quote 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)", -+ "syn 1.0.5 (registry+https://github.com/rust-lang/crates.io-index)", -+ "wasm-bindgen-shared 0.2.51", ++ "syn 1.0.8 (registry+https://github.com/rust-lang/crates.io-index)", ++ "wasm-bindgen-shared 0.2.55", +] + +[[package]] +name = "wasm-bindgen-benchmark" +version = "0.1.0" +dependencies = [ -+ "wasm-bindgen 0.2.51", -+ "web-sys 0.3.28", ++ "wasm-bindgen 0.2.55", ++ "web-sys 0.3.32", +] + +[[package]] +name = "wasm-bindgen-cli" -+version = "0.2.51" ++version = "0.2.55" +dependencies = [ ++ "anyhow 1.0.23 (registry+https://github.com/rust-lang/crates.io-index)", + "assert_cmd 0.11.1 (registry+https://github.com/rust-lang/crates.io-index)", -+ "curl 0.4.24 (registry+https://github.com/rust-lang/crates.io-index)", ++ "curl 0.4.25 (registry+https://github.com/rust-lang/crates.io-index)", + "docopt 1.1.0 (registry+https://github.com/rust-lang/crates.io-index)", -+ "env_logger 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)", -+ "failure 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)", ++ "env_logger 0.7.1 (registry+https://github.com/rust-lang/crates.io-index)", + "log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)", -+ "openssl 0.10.25 (registry+https://github.com/rust-lang/crates.io-index)", -+ "predicates 1.0.1 (registry+https://github.com/rust-lang/crates.io-index)", ++ "openssl 0.10.26 (registry+https://github.com/rust-lang/crates.io-index)", ++ "predicates 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)", + "rouille 3.0.0 (registry+https://github.com/rust-lang/crates.io-index)", -+ "serde 1.0.101 (registry+https://github.com/rust-lang/crates.io-index)", -+ "serde_derive 1.0.101 (registry+https://github.com/rust-lang/crates.io-index)", -+ "serde_json 1.0.40 (registry+https://github.com/rust-lang/crates.io-index)", -+ "walrus 0.12.0 (registry+https://github.com/rust-lang/crates.io-index)", -+ "wasm-bindgen-cli-support 0.2.51", -+ "wasm-bindgen-shared 0.2.51", ++ "serde 1.0.103 (registry+https://github.com/rust-lang/crates.io-index)", ++ "serde_derive 1.0.103 (registry+https://github.com/rust-lang/crates.io-index)", ++ "serde_json 1.0.42 (registry+https://github.com/rust-lang/crates.io-index)", ++ "walrus 0.13.0 (registry+https://github.com/rust-lang/crates.io-index)", ++ "wasm-bindgen-cli-support 0.2.55", ++ "wasm-bindgen-shared 0.2.55", +] + +[[package]] +name = "wasm-bindgen-cli-support" -+version = "0.2.51" ++version = "0.2.55" +dependencies = [ ++ "anyhow 1.0.23 (registry+https://github.com/rust-lang/crates.io-index)", + "base64 0.9.3 (registry+https://github.com/rust-lang/crates.io-index)", -+ "failure 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)", + "log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)", + "rustc-demangle 0.1.16 (registry+https://github.com/rust-lang/crates.io-index)", -+ "serde_json 1.0.40 (registry+https://github.com/rust-lang/crates.io-index)", ++ "serde_json 1.0.42 (registry+https://github.com/rust-lang/crates.io-index)", + "tempfile 3.1.0 (registry+https://github.com/rust-lang/crates.io-index)", -+ "walrus 0.12.0 (registry+https://github.com/rust-lang/crates.io-index)", -+ "wasm-bindgen-anyref-xform 0.2.51", -+ "wasm-bindgen-multi-value-xform 0.2.51", -+ "wasm-bindgen-shared 0.2.51", -+ "wasm-bindgen-threads-xform 0.2.51", -+ "wasm-bindgen-wasm-conventions 0.2.51", -+ "wasm-bindgen-wasm-interpreter 0.2.51", -+ "wasm-webidl-bindings 0.5.0 (registry+https://github.com/rust-lang/crates.io-index)", ++ "walrus 0.13.0 (registry+https://github.com/rust-lang/crates.io-index)", ++ "wasm-bindgen-anyref-xform 0.2.55", ++ "wasm-bindgen-multi-value-xform 0.2.55", ++ "wasm-bindgen-shared 0.2.55", ++ "wasm-bindgen-threads-xform 0.2.55", ++ "wasm-bindgen-wasm-conventions 0.2.55", ++ "wasm-bindgen-wasm-interpreter 0.2.55", ++ "wasm-webidl-bindings 0.6.0 (registry+https://github.com/rust-lang/crates.io-index)", +] + +[[package]] +name = "wasm-bindgen-futures" -+version = "0.4.1" ++version = "0.4.5" +dependencies = [ + "cfg-if 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)", + "futures-channel-preview 0.3.0-alpha.19 (registry+https://github.com/rust-lang/crates.io-index)", -+ "js-sys 0.3.28", -+ "wasm-bindgen 0.2.51", -+ "wasm-bindgen-test 0.3.1", -+ "web-sys 0.3.28", ++ "js-sys 0.3.32", ++ "wasm-bindgen 0.2.55", ++ "wasm-bindgen-test 0.3.5", ++ "web-sys 0.3.32", +] + +[[package]] +name = "wasm-bindgen-macro" -+version = "0.2.51" ++version = "0.2.55" +dependencies = [ + "quote 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)", -+ "trybuild 1.0.16 (registry+https://github.com/rust-lang/crates.io-index)", -+ "wasm-bindgen 0.2.51", -+ "wasm-bindgen-futures 0.4.1", -+ "wasm-bindgen-macro-support 0.2.51", ++ "trybuild 1.0.18 (registry+https://github.com/rust-lang/crates.io-index)", ++ "wasm-bindgen 0.2.55", ++ "wasm-bindgen-futures 0.4.5", ++ "wasm-bindgen-macro-support 0.2.55", +] + +[[package]] +name = "wasm-bindgen-macro-support" -+version = "0.2.51" ++version = "0.2.55" +dependencies = [ -+ "proc-macro2 1.0.4 (registry+https://github.com/rust-lang/crates.io-index)", ++ "proc-macro2 1.0.6 (registry+https://github.com/rust-lang/crates.io-index)", + "quote 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)", -+ "syn 1.0.5 (registry+https://github.com/rust-lang/crates.io-index)", -+ "wasm-bindgen-backend 0.2.51", -+ "wasm-bindgen-shared 0.2.51", ++ "syn 1.0.8 (registry+https://github.com/rust-lang/crates.io-index)", ++ "wasm-bindgen-backend 0.2.55", ++ "wasm-bindgen-shared 0.2.55", +] + +[[package]] +name = "wasm-bindgen-multi-value-xform" -+version = "0.2.51" ++version = "0.2.55" +dependencies = [ -+ "failure 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)", -+ "walrus 0.12.0 (registry+https://github.com/rust-lang/crates.io-index)", ++ "anyhow 1.0.23 (registry+https://github.com/rust-lang/crates.io-index)", ++ "walrus 0.13.0 (registry+https://github.com/rust-lang/crates.io-index)", +] + +[[package]] +name = "wasm-bindgen-paint" +version = "0.1.0" +dependencies = [ -+ "js-sys 0.3.28", -+ "wasm-bindgen 0.2.51", -+ "web-sys 0.3.28", ++ "js-sys 0.3.32", ++ "wasm-bindgen 0.2.55", ++ "web-sys 0.3.32", +] + +[[package]] +name = "wasm-bindgen-shared" -+version = "0.2.51" ++version = "0.2.55" + +[[package]] +name = "wasm-bindgen-test" -+version = "0.3.1" ++version = "0.3.5" +dependencies = [ + "console_error_panic_hook 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)", -+ "js-sys 0.3.28", ++ "js-sys 0.3.32", + "scoped-tls 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)", -+ "wasm-bindgen 0.2.51", -+ "wasm-bindgen-futures 0.4.1", -+ "wasm-bindgen-test-macro 0.3.1", ++ "wasm-bindgen 0.2.55", ++ "wasm-bindgen-futures 0.4.5", ++ "wasm-bindgen-test-macro 0.3.5", +] + +[[package]] +name = "wasm-bindgen-test-crate-a" +version = "0.1.0" +dependencies = [ -+ "wasm-bindgen 0.2.51", ++ "wasm-bindgen 0.2.55", +] + +[[package]] +name = "wasm-bindgen-test-crate-b" +version = "0.1.0" +dependencies = [ -+ "wasm-bindgen 0.2.51", ++ "wasm-bindgen 0.2.55", +] + +[[package]] +name = "wasm-bindgen-test-macro" -+version = "0.3.1" ++version = "0.3.5" +dependencies = [ -+ "proc-macro2 1.0.4 (registry+https://github.com/rust-lang/crates.io-index)", ++ "proc-macro2 1.0.6 (registry+https://github.com/rust-lang/crates.io-index)", + "quote 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)", +] + +[[package]] +name = "wasm-bindgen-threads-xform" -+version = "0.2.51" ++version = "0.2.55" +dependencies = [ -+ "failure 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)", -+ "walrus 0.12.0 (registry+https://github.com/rust-lang/crates.io-index)", -+ "wasm-bindgen-wasm-conventions 0.2.51", ++ "anyhow 1.0.23 (registry+https://github.com/rust-lang/crates.io-index)", ++ "walrus 0.13.0 (registry+https://github.com/rust-lang/crates.io-index)", ++ "wasm-bindgen-wasm-conventions 0.2.55", +] + +[[package]] +name = "wasm-bindgen-wasm-conventions" -+version = "0.2.51" ++version = "0.2.55" +dependencies = [ -+ "failure 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)", -+ "walrus 0.12.0 (registry+https://github.com/rust-lang/crates.io-index)", ++ "anyhow 1.0.23 (registry+https://github.com/rust-lang/crates.io-index)", ++ "walrus 0.13.0 (registry+https://github.com/rust-lang/crates.io-index)", +] + +[[package]] +name = "wasm-bindgen-wasm-interpreter" -+version = "0.2.51" ++version = "0.2.55" +dependencies = [ -+ "failure 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)", ++ "anyhow 1.0.23 (registry+https://github.com/rust-lang/crates.io-index)", + "log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)", + "tempfile 3.1.0 (registry+https://github.com/rust-lang/crates.io-index)", -+ "walrus 0.12.0 (registry+https://github.com/rust-lang/crates.io-index)", ++ "walrus 0.13.0 (registry+https://github.com/rust-lang/crates.io-index)", +] + +[[package]] +name = "wasm-bindgen-webidl" -+version = "0.2.51" ++version = "0.2.55" +dependencies = [ -+ "failure 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)", ++ "anyhow 1.0.23 (registry+https://github.com/rust-lang/crates.io-index)", + "heck 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)", + "log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)", -+ "proc-macro2 1.0.4 (registry+https://github.com/rust-lang/crates.io-index)", ++ "proc-macro2 1.0.6 (registry+https://github.com/rust-lang/crates.io-index)", + "quote 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)", -+ "syn 1.0.5 (registry+https://github.com/rust-lang/crates.io-index)", -+ "wasm-bindgen-backend 0.2.51", ++ "syn 1.0.8 (registry+https://github.com/rust-lang/crates.io-index)", ++ "wasm-bindgen-backend 0.2.55", + "weedle 0.10.0 (registry+https://github.com/rust-lang/crates.io-index)", +] + @@ -1908,81 +1922,81 @@ index 00000000..d7d32a06 +name = "wasm-in-wasm" +version = "0.1.0" +dependencies = [ -+ "js-sys 0.3.28", -+ "wasm-bindgen 0.2.51", ++ "js-sys 0.3.32", ++ "wasm-bindgen 0.2.55", +] + +[[package]] +name = "wasm-webidl-bindings" -+version = "0.5.0" ++version = "0.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +dependencies = [ -+ "failure 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)", ++ "anyhow 1.0.23 (registry+https://github.com/rust-lang/crates.io-index)", + "id-arena 2.2.1 (registry+https://github.com/rust-lang/crates.io-index)", + "leb128 0.2.4 (registry+https://github.com/rust-lang/crates.io-index)", -+ "walrus 0.12.0 (registry+https://github.com/rust-lang/crates.io-index)", ++ "walrus 0.13.0 (registry+https://github.com/rust-lang/crates.io-index)", +] + +[[package]] +name = "wasm2js" +version = "0.1.0" +dependencies = [ -+ "wasm-bindgen 0.2.51", ++ "wasm-bindgen 0.2.55", +] + +[[package]] +name = "wasmparser" -+version = "0.37.2" ++version = "0.39.3" +source = "registry+https://github.com/rust-lang/crates.io-index" + +[[package]] +name = "web-sys" -+version = "0.3.28" ++version = "0.3.32" +dependencies = [ -+ "env_logger 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)", -+ "failure 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)", -+ "js-sys 0.3.28", ++ "anyhow 1.0.23 (registry+https://github.com/rust-lang/crates.io-index)", ++ "env_logger 0.7.1 (registry+https://github.com/rust-lang/crates.io-index)", ++ "js-sys 0.3.32", + "sourcefile 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)", -+ "wasm-bindgen 0.2.51", -+ "wasm-bindgen-futures 0.4.1", -+ "wasm-bindgen-test 0.3.1", -+ "wasm-bindgen-webidl 0.2.51", ++ "wasm-bindgen 0.2.55", ++ "wasm-bindgen-futures 0.4.5", ++ "wasm-bindgen-test 0.3.5", ++ "wasm-bindgen-webidl 0.2.55", +] + +[[package]] +name = "webaudio" +version = "0.1.0" +dependencies = [ -+ "wasm-bindgen 0.2.51", -+ "web-sys 0.3.28", ++ "wasm-bindgen 0.2.55", ++ "web-sys 0.3.32", +] + +[[package]] +name = "webgl" +version = "0.1.0" +dependencies = [ -+ "js-sys 0.3.28", -+ "wasm-bindgen 0.2.51", -+ "web-sys 0.3.28", ++ "js-sys 0.3.32", ++ "wasm-bindgen 0.2.55", ++ "web-sys 0.3.32", +] + +[[package]] +name = "webidl-tests" +version = "0.1.0" +dependencies = [ -+ "env_logger 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)", -+ "js-sys 0.3.28", -+ "wasm-bindgen 0.2.51", -+ "wasm-bindgen-test 0.3.1", -+ "wasm-bindgen-webidl 0.2.51", ++ "env_logger 0.7.1 (registry+https://github.com/rust-lang/crates.io-index)", ++ "js-sys 0.3.32", ++ "wasm-bindgen 0.2.55", ++ "wasm-bindgen-test 0.3.5", ++ "wasm-bindgen-webidl 0.2.55", +] + +[[package]] +name = "websockets" +version = "0.1.0" +dependencies = [ -+ "wasm-bindgen 0.2.51", -+ "web-sys 0.3.28", ++ "wasm-bindgen 0.2.55", ++ "web-sys 0.3.32", +] + +[[package]] @@ -2033,76 +2047,79 @@ index 00000000..d7d32a06 +name = "without-a-bundler" +version = "0.1.0" +dependencies = [ -+ "wasm-bindgen 0.2.51", -+ "web-sys 0.3.28", ++ "wasm-bindgen 0.2.55", ++ "web-sys 0.3.32", +] + +[[package]] +name = "without-a-bundler-no-modules" +version = "0.1.0" +dependencies = [ -+ "wasm-bindgen 0.2.51", -+ "web-sys 0.3.28", ++ "wasm-bindgen 0.2.55", ++ "web-sys 0.3.32", +] + +[metadata] +"checksum adler32 1.0.4 (registry+https://github.com/rust-lang/crates.io-index)" = "5d2e7343e7fc9de883d1b0341e0b13970f764c14101234857d2ddafa1cb1cac2" +"checksum aho-corasick 0.7.6 (registry+https://github.com/rust-lang/crates.io-index)" = "58fb5e95d83b38284460a5fda7d6470aa0b8844d283a0b614b8535e880800d2d" ++"checksum anyhow 1.0.23 (registry+https://github.com/rust-lang/crates.io-index)" = "6f1072d8f55592084072d2d3cb23a4b680a8543c00f10d446118e85ad3718142" +"checksum arrayref 0.3.5 (registry+https://github.com/rust-lang/crates.io-index)" = "0d382e583f07208808f6b1249e60848879ba3543f57c32277bf52d69c2f0f0ee" -+"checksum arrayvec 0.4.11 (registry+https://github.com/rust-lang/crates.io-index)" = "b8d73f9beda665eaa98ab9e4f7442bd4e7de6652587de55b2525e52e29c1b0ba" ++"checksum arrayvec 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)" = "cff77d8686867eceff3105329d4698d96c2391c176d5d03adc90c7389162b5b8" +"checksum ascii 0.8.7 (registry+https://github.com/rust-lang/crates.io-index)" = "97be891acc47ca214468e09425d02cef3af2c94d0d82081cd02061f996802f14" +"checksum askama 0.7.2 (registry+https://github.com/rust-lang/crates.io-index)" = "eed81479263c8753e06f4981f5a313b3fe6cbff30c3ff8d9ae15ef0c72d93fb5" +"checksum askama_derive 0.7.2 (registry+https://github.com/rust-lang/crates.io-index)" = "46580c08e5520afadc6e9064759e15fc743489a4db78f9c751113e3d32a1e083" +"checksum askama_shared 0.7.2 (registry+https://github.com/rust-lang/crates.io-index)" = "64509fd5c2fa767fa7ea973b732c61f0b8d30d1adf084e5164523e51a5e35d71" +"checksum assert_cmd 0.11.1 (registry+https://github.com/rust-lang/crates.io-index)" = "2dc477793bd82ec39799b6f6b3df64938532fdf2ab0d49ef817eac65856a5a1e" +"checksum atty 0.2.13 (registry+https://github.com/rust-lang/crates.io-index)" = "1803c647a3ec87095e7ae7acfca019e98de5ec9a7d01343f611cf3152ed71a90" -+"checksum autocfg 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)" = "b671c8fb71b457dd4ae18c4ba1e59aa81793daacc361d82fcd410cef0d491875" -+"checksum backtrace 0.3.38 (registry+https://github.com/rust-lang/crates.io-index)" = "690a62be8920ccf773ee00ef0968649b0e724cda8bd5b12286302b4ae955fdf5" -+"checksum backtrace-sys 0.1.31 (registry+https://github.com/rust-lang/crates.io-index)" = "82a830b4ef2d1124a711c71d263c5abdc710ef8e907bd508c88be475cebc422b" ++"checksum autocfg 0.1.7 (registry+https://github.com/rust-lang/crates.io-index)" = "1d49d90015b3c36167a20fe2810c5cd875ad504b39cff3d4eae7977e6b7c1cb2" ++"checksum backtrace 0.3.40 (registry+https://github.com/rust-lang/crates.io-index)" = "924c76597f0d9ca25d762c25a4d369d51267536465dc5064bdf0eb073ed477ea" ++"checksum backtrace-sys 0.1.32 (registry+https://github.com/rust-lang/crates.io-index)" = "5d6575f128516de27e3ce99689419835fce9643a9b215a14d2b5b685be018491" +"checksum base64 0.10.1 (registry+https://github.com/rust-lang/crates.io-index)" = "0b25d992356d2eb0ed82172f5248873db5560c4721f564b13cb5193bda5e668e" +"checksum base64 0.9.3 (registry+https://github.com/rust-lang/crates.io-index)" = "489d6c0ed21b11d038c31b6ceccca973e65d73ba3bd8ecb9a2babf5546164643" +"checksum bitflags 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)" = "aad18937a628ec6abcd26d1489012cc0e18c21798210f491af69ded9b881106d" -+"checksum bitflags 1.2.0 (registry+https://github.com/rust-lang/crates.io-index)" = "8a606a02debe2813760609f57a64a2ffd27d9fdf5b2f133eaca0b248dd92cdd2" -+"checksum blake2b_simd 0.5.8 (registry+https://github.com/rust-lang/crates.io-index)" = "5850aeee1552f495dd0250014cf64b82b7c8879a89d83b33bbdace2cc4f63182" ++"checksum bitflags 1.2.1 (registry+https://github.com/rust-lang/crates.io-index)" = "cf1de2fe8c75bc145a2f577add951f8134889b4795d47466a54a5c846d691693" ++"checksum blake2b_simd 0.5.9 (registry+https://github.com/rust-lang/crates.io-index)" = "b83b7baab1e671718d78204225800d6b170e648188ac7dc992e9d6bddf87d0c0" +"checksum buf_redux 0.8.4 (registry+https://github.com/rust-lang/crates.io-index)" = "b953a6887648bb07a535631f2bc00fbdb2a2216f135552cb3f534ed136b9c07f" +"checksum bumpalo 2.6.0 (registry+https://github.com/rust-lang/crates.io-index)" = "ad807f2fc2bf185eeb98ff3a901bd46dc5ad58163d0fa4577ba0d25674d71708" +"checksum byteorder 1.3.2 (registry+https://github.com/rust-lang/crates.io-index)" = "a7c3dd8985a7111efc5c80b44e23ecdd8c007de8ade3b96595387e812b957cf5" -+"checksum c2-chacha 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)" = "7d64d04786e0f528460fc884753cf8dddcc466be308f6026f8e355c41a0e4101" -+"checksum cc 1.0.45 (registry+https://github.com/rust-lang/crates.io-index)" = "4fc9a35e1f4290eb9e5fc54ba6cf40671ed2a2514c3eeb2b2a908dda2ea5a1be" ++"checksum c2-chacha 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)" = "214238caa1bf3a496ec3392968969cab8549f96ff30652c9e56885329315f6bb" ++"checksum cc 1.0.47 (registry+https://github.com/rust-lang/crates.io-index)" = "aa87058dce70a3ff5621797f1506cb837edd02ac4c0ae642b4542dce802908b8" +"checksum cfg-if 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)" = "4785bdd1c96b2a846b2bd7cc02e86b6b3dbf14e7e53446c4f54c92a361040822" -+"checksum chrono 0.4.9 (registry+https://github.com/rust-lang/crates.io-index)" = "e8493056968583b0193c1bb04d6f7684586f3726992d6c573261941a895dbd68" ++"checksum chrono 0.4.10 (registry+https://github.com/rust-lang/crates.io-index)" = "31850b4a4d6bae316f7a09e691c944c28299298837edc0a03f755618c23cbc01" +"checksum chunked_transfer 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)" = "498d20a7aaf62625b9bf26e637cf7736417cde1d0c99f1d04d1170229a85cf87" +"checksum cloudabi 0.0.3 (registry+https://github.com/rust-lang/crates.io-index)" = "ddfc5b9aa5d4507acaf872de71051dfd0e309860e88966e1051e462a077aac4f" +"checksum color_quant 1.0.1 (registry+https://github.com/rust-lang/crates.io-index)" = "0dbbb57365263e881e805dc77d94697c9118fd94d8da011240555aa7b23445bd" +"checksum console_error_panic_hook 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)" = "b8d976903543e0c48546a91908f21588a680a8c8f984df9a5d69feccb2b2a211" +"checksum constant_time_eq 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)" = "995a44c877f9212528ccc74b21a232f66ad69001e40ede5bcee2ac9ef2657120" -+"checksum crossbeam-deque 0.7.1 (registry+https://github.com/rust-lang/crates.io-index)" = "b18cd2e169ad86297e6bc0ad9aa679aee9daa4f19e8163860faf7c164e4f5a71" -+"checksum crossbeam-epoch 0.7.2 (registry+https://github.com/rust-lang/crates.io-index)" = "fedcd6772e37f3da2a9af9bf12ebe046c0dfe657992377b4df982a2b54cd37a9" -+"checksum crossbeam-queue 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)" = "7c979cd6cfe72335896575c6b5688da489e420d36a27a0b9eb0c73db574b4a4b" ++"checksum crossbeam-deque 0.7.2 (registry+https://github.com/rust-lang/crates.io-index)" = "c3aa945d63861bfe624b55d153a39684da1e8c0bc8fba932f7ee3a3c16cea3ca" ++"checksum crossbeam-epoch 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)" = "5064ebdbf05ce3cb95e45c8b086f72263f4166b29b97f6baff7ef7fe047b55ac" ++"checksum crossbeam-queue 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)" = "dfd6515864a82d2f877b42813d4553292c6659498c9a2aa31bab5a15243c2700" +"checksum crossbeam-utils 0.6.6 (registry+https://github.com/rust-lang/crates.io-index)" = "04973fa96e96579258a5091af6003abde64af786b860f18622b82e026cca60e6" -+"checksum curl 0.4.24 (registry+https://github.com/rust-lang/crates.io-index)" = "d08ad3cb89d076a36b0ce5749eec2c9964f70c0c58480ab6b75a91ec4fc206d8" -+"checksum curl-sys 0.4.22 (registry+https://github.com/rust-lang/crates.io-index)" = "2e9a9a4e417722876332136a00cacf92c2ceb331fab4b52b6a1ad16c6cd79255" ++"checksum crossbeam-utils 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)" = "ce446db02cdc3165b94ae73111e570793400d0794e46125cc4056c81cbb039f4" ++"checksum curl 0.4.25 (registry+https://github.com/rust-lang/crates.io-index)" = "06aa71e9208a54def20792d877bc663d6aae0732b9852e612c4a933177c31283" ++"checksum curl-sys 0.4.24 (registry+https://github.com/rust-lang/crates.io-index)" = "f659f3ffac9582d6177bb86d1d2aa649f4eb9d0d4de9d03ccc08b402832ea340" +"checksum deflate 0.7.20 (registry+https://github.com/rust-lang/crates.io-index)" = "707b6a7b384888a70c8d2e8650b3e60170dfc6a67bb4aa67b6dfca57af4bedb4" +"checksum difference 2.0.0 (registry+https://github.com/rust-lang/crates.io-index)" = "524cbf6897b527295dff137cec09ecf3a05f4fddffd7dfcd1585403449e74198" +"checksum dirs 1.0.5 (registry+https://github.com/rust-lang/crates.io-index)" = "3fd78930633bd1c6e35c4b42b1df7b0cbc6bc191146e512bb3bedf243fcc3901" +"checksum docopt 1.1.0 (registry+https://github.com/rust-lang/crates.io-index)" = "7f525a586d310c87df72ebcd98009e57f1cc030c8c268305287a476beb653969" +"checksum either 1.5.3 (registry+https://github.com/rust-lang/crates.io-index)" = "bb1f6b1ce1c140482ea30ddd3335fc0024ac7ee112895426e0a629a6c20adfe3" +"checksum enum_primitive 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "be4551092f4d519593039259a9ed8daedf0da12e5109c5280338073eaeb81180" -+"checksum env_logger 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)" = "39ecdb7dd54465526f0a56d666e3b2dd5f3a218665a030b6e4ad9e70fa95d8fa" ++"checksum env_logger 0.7.1 (registry+https://github.com/rust-lang/crates.io-index)" = "44533bbbb3bb3c1fa17d9f2e4e38bbbaf8396ba82193c4cb1b6445d711445d36" +"checksum escargot 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)" = "ceb9adbf9874d5d028b5e4c5739d22b71988252b25c9c98fe7cf9738bee84597" -+"checksum failure 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)" = "795bd83d3abeb9220f257e597aa0080a508b27533824adf336529648f6abf7e2" -+"checksum failure_derive 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)" = "ea1063915fd7ef4309e222a5a07cf9c319fb9c7836b1f89b85458672dbb127e1" -+"checksum filetime 0.2.7 (registry+https://github.com/rust-lang/crates.io-index)" = "6bd7380b54ced79dda72ecc35cc4fbbd1da6bba54afaa37e96fd1c2a308cd469" -+"checksum float-cmp 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)" = "134a8fa843d80a51a5b77d36d42bc2def9edcb0262c914861d08129fd1926600" ++"checksum failure 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)" = "f8273f13c977665c5db7eb2b99ae520952fe5ac831ae4cd09d80c4c7042b5ed9" ++"checksum failure_derive 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)" = "0bc225b78e0391e4b8683440bf2e63c2deeeb2ce5189eab46e2b68c6d3725d08" ++"checksum filetime 0.2.8 (registry+https://github.com/rust-lang/crates.io-index)" = "1ff6d4dab0aa0c8e6346d46052e93b13a16cf847b54ed357087c35011048cc7d" ++"checksum float-cmp 0.5.3 (registry+https://github.com/rust-lang/crates.io-index)" = "75224bec9bfe1a65e2d34132933f2de7fe79900c96a0174307554244ece8150e" +"checksum foreign-types 0.3.2 (registry+https://github.com/rust-lang/crates.io-index)" = "f6f339eb8adc052cd2ca78910fda869aefa38d22d5cb648e6485e4d3fc06f3b1" +"checksum foreign-types-shared 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "00b0228411908ca8685dba7fc2cdd70ec9990a6e753e89b6ac91a84c40fbaf4b" +"checksum fuchsia-cprng 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "a06f77d526c1a601b7c4cdd98f54b5eaabffc14d5f2f0296febdc7f357c6d3ba" +"checksum futures-channel-preview 0.3.0-alpha.19 (registry+https://github.com/rust-lang/crates.io-index)" = "d5e5f4df964fa9c1c2f8bddeb5c3611631cacd93baf810fc8bb2fb4b495c263a" +"checksum futures-core-preview 0.3.0-alpha.19 (registry+https://github.com/rust-lang/crates.io-index)" = "b35b6263fb1ef523c3056565fa67b1d16f0a8604ff12b11b08c25f28a734c60a" -+"checksum getrandom 0.1.12 (registry+https://github.com/rust-lang/crates.io-index)" = "473a1265acc8ff1e808cd0a1af8cee3c2ee5200916058a2ca113c29f2d903571" ++"checksum getrandom 0.1.13 (registry+https://github.com/rust-lang/crates.io-index)" = "e7db7ca94ed4cd01190ceee0d8a8052f08a247aa1b469a7f68c6a3b71afcf407" +"checksum gif 0.9.2 (registry+https://github.com/rust-lang/crates.io-index)" = "e2e41945ba23db3bf51b24756d73d81acb4f28d85c3dccc32c6fae904438c25f" +"checksum glob 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)" = "9b919933a397b79c37e33b77bb2aa3dc8eb6e165ad809e58ff75bc7db2e34574" +"checksum heck 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)" = "20564e78d53d2bb135c343b3f47714a56af2061f1c928fdb541dc7b9fdd94205" ++"checksum hermit-abi 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)" = "307c3c9f937f38e3534b1d6447ecf090cafcc9744e4a6360e8b037b2cf5af120" +"checksum httparse 1.3.4 (registry+https://github.com/rust-lang/crates.io-index)" = "cd179ae861f0c2e53da70d892f5f3029f9594be0c41dc5269cd371691b1dc2f9" +"checksum humantime 1.3.0 (registry+https://github.com/rust-lang/crates.io-index)" = "df004cfca50ef23c36850aaaa59ad52cc70d0e90243c3c7737a4dd32dc7a3c4f" +"checksum id-arena 2.2.1 (registry+https://github.com/rust-lang/crates.io-index)" = "25a2bc672d1148e28034f176e01fffebb08b35768468cc954630da77a1449005" @@ -2113,43 +2130,42 @@ index 00000000..d7d32a06 +"checksum jpeg-decoder 0.1.16 (registry+https://github.com/rust-lang/crates.io-index)" = "c1aae18ffeeae409c6622c3b6a7ee49792a7e5a062eea1b135fbb74e301792ba" +"checksum lazy_static 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)" = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646" +"checksum leb128 0.2.4 (registry+https://github.com/rust-lang/crates.io-index)" = "3576a87f2ba00f6f106fdfcd16db1d698d648a26ad8e0573cad8537c3c362d2a" -+"checksum libc 0.2.62 (registry+https://github.com/rust-lang/crates.io-index)" = "34fcd2c08d2f832f376f4173a231990fa5aef4e99fb569867318a227ef4c06ba" ++"checksum libc 0.2.65 (registry+https://github.com/rust-lang/crates.io-index)" = "1a31a0627fdf1f6a39ec0dd577e101440b7db22672c0901fe00a9a6fbb5c24e8" +"checksum libz-sys 1.0.25 (registry+https://github.com/rust-lang/crates.io-index)" = "2eb5e43362e38e2bca2fd5f5134c4d4564a23a5c28e9b95411652021a8675ebe" +"checksum log 0.3.9 (registry+https://github.com/rust-lang/crates.io-index)" = "e19e8d5c34a3e0e2223db8e060f9e8264aeeb5c5fc64a4ee9965c062211c024b" +"checksum log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)" = "14b6052be84e6b71ab17edffc2eeabf5c2c3ae1fdb464aae35ac50c67a44e1f7" +"checksum lzw 0.10.0 (registry+https://github.com/rust-lang/crates.io-index)" = "7d947cbb889ed21c2a84be6ffbaebf5b4e0f4340638cba0444907e38b56be084" +"checksum matches 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)" = "7ffc5c5338469d4d3ea17d269fa8ea3512ad247247c30bd2df69e68309ed0a08" +"checksum memchr 2.2.1 (registry+https://github.com/rust-lang/crates.io-index)" = "88579771288728879b57485cc7d6b07d648c9f0141eb955f8ab7f9d45394468e" -+"checksum memoffset 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)" = "ce6075db033bbbb7ee5a0bbd3a3186bbae616f57fb001c485c7ff77955f8177f" ++"checksum memoffset 0.5.3 (registry+https://github.com/rust-lang/crates.io-index)" = "75189eb85871ea5c2e2c15abbdd541185f63b408415e5051f5cac122d8c774b9" +"checksum mime 0.2.6 (registry+https://github.com/rust-lang/crates.io-index)" = "ba626b8a6de5da682e1caa06bdb42a335aee5a84db8e5046a3e8ab17ba0a3ae0" +"checksum mime_guess 1.8.7 (registry+https://github.com/rust-lang/crates.io-index)" = "0d977de9ee851a0b16e932979515c0f3da82403183879811bc97d50bd9cc50f7" +"checksum multipart 0.15.4 (registry+https://github.com/rust-lang/crates.io-index)" = "adba94490a79baf2d6a23eac897157047008272fa3eecb3373ae6377b91eca28" -+"checksum nodrop 0.1.13 (registry+https://github.com/rust-lang/crates.io-index)" = "2f9667ddcc6cc8a43afc9b7917599d7216aa09c463919ea32c59ed6cac8bc945" +"checksum nom 4.2.3 (registry+https://github.com/rust-lang/crates.io-index)" = "2ad2a91a8e869eeb30b9cb3119ae87773a8f4ae617f41b1eb9c154b2905f7bd6" +"checksum normalize-line-endings 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)" = "2e0a1a39eab95caf4f5556da9289b9e68f0aafac901b2ce80daaf020d3b733a8" +"checksum num-integer 0.1.41 (registry+https://github.com/rust-lang/crates.io-index)" = "b85e541ef8255f6cf42bbfe4ef361305c6c135d10919ecc26126c4e5ae94bc09" +"checksum num-iter 0.1.39 (registry+https://github.com/rust-lang/crates.io-index)" = "76bd5272412d173d6bf9afdf98db8612bbabc9a7a830b7bfc9c188911716132e" +"checksum num-rational 0.1.42 (registry+https://github.com/rust-lang/crates.io-index)" = "ee314c74bd753fc86b4780aa9475da469155f3848473a261d2d18e35245a784e" +"checksum num-traits 0.1.43 (registry+https://github.com/rust-lang/crates.io-index)" = "92e5113e9fd4cc14ded8e499429f396a20f98c772a47cc8622a736e1ec843c31" -+"checksum num-traits 0.2.8 (registry+https://github.com/rust-lang/crates.io-index)" = "6ba9a427cfca2be13aa6f6403b0b7e7368fe982bfa16fccc450ce74c46cd9b32" -+"checksum num_cpus 1.10.1 (registry+https://github.com/rust-lang/crates.io-index)" = "bcef43580c035376c0705c42792c294b66974abbfd2789b511784023f71f3273" -+"checksum openssl 0.10.25 (registry+https://github.com/rust-lang/crates.io-index)" = "2f372b2b53ce10fb823a337aaa674e3a7d072b957c6264d0f4ff0bd86e657449" ++"checksum num-traits 0.2.10 (registry+https://github.com/rust-lang/crates.io-index)" = "d4c81ffc11c212fa327657cb19dd85eb7419e163b5b076bede2bdb5c974c07e4" ++"checksum num_cpus 1.11.1 (registry+https://github.com/rust-lang/crates.io-index)" = "76dac5ed2a876980778b8b85f75a71b6cbf0db0b1232ee12f826bccb00d09d72" ++"checksum openssl 0.10.26 (registry+https://github.com/rust-lang/crates.io-index)" = "3a3cc5799d98e1088141b8e01ff760112bbd9f19d850c124500566ca6901a585" +"checksum openssl-probe 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)" = "77af24da69f9d9341038eba93a073b1fdaaa1b788221b00a69bce9e762cb32de" +"checksum openssl-src 111.6.0+1.1.1d (registry+https://github.com/rust-lang/crates.io-index)" = "b9c2da1de8a7a3f860919c01540b03a6db16de042405a8a07a5e9d0b4b825d9c" -+"checksum openssl-sys 0.9.50 (registry+https://github.com/rust-lang/crates.io-index)" = "2c42dcccb832556b5926bc9ae61e8775f2a61e725ab07ab3d1e7fcf8ae62c3b6" ++"checksum openssl-sys 0.9.53 (registry+https://github.com/rust-lang/crates.io-index)" = "465d16ae7fc0e313318f7de5cecf57b2fbe7511fd213978b457e1c96ff46736f" +"checksum percent-encoding 1.0.1 (registry+https://github.com/rust-lang/crates.io-index)" = "31010dd2e1ac33d5b46a5b413495239882813e0369f8ed8a5e266f173602f831" +"checksum phf 0.7.24 (registry+https://github.com/rust-lang/crates.io-index)" = "b3da44b85f8e8dfaec21adae67f95d93244b2ecf6ad2a692320598dcc8e6dd18" +"checksum phf_codegen 0.7.24 (registry+https://github.com/rust-lang/crates.io-index)" = "b03e85129e324ad4166b06b2c7491ae27fe3ec353af72e72cd1654c7225d517e" +"checksum phf_generator 0.7.24 (registry+https://github.com/rust-lang/crates.io-index)" = "09364cc93c159b8b06b1f4dd8a4398984503483891b0c26b867cf431fb132662" +"checksum phf_shared 0.7.24 (registry+https://github.com/rust-lang/crates.io-index)" = "234f71a15de2288bcb7e3b6515828d22af7ec8598ee6d24c3b526fa0a80b67a0" -+"checksum pkg-config 0.3.16 (registry+https://github.com/rust-lang/crates.io-index)" = "72d5370d90f49f70bd033c3d75e87fc529fbfff9d6f7cccef07d6170079d91ea" ++"checksum pkg-config 0.3.17 (registry+https://github.com/rust-lang/crates.io-index)" = "05da548ad6865900e60eaba7f589cc0783590a92e940c26953ff81ddbab2d677" +"checksum png 0.6.2 (registry+https://github.com/rust-lang/crates.io-index)" = "3cb773e9a557edb568ce9935cf783e3cdcabe06a9449d41b3e5506d88e582c82" -+"checksum ppv-lite86 0.2.5 (registry+https://github.com/rust-lang/crates.io-index)" = "e3cbf9f658cdb5000fcf6f362b8ea2ba154b9f146a61c7a20d647034c6b6561b" -+"checksum predicates 1.0.1 (registry+https://github.com/rust-lang/crates.io-index)" = "53e09015b0d3f5a0ec2d4428f7559bb7b3fff341b4e159fedd1d57fac8b939ff" ++"checksum ppv-lite86 0.2.6 (registry+https://github.com/rust-lang/crates.io-index)" = "74490b50b9fbe561ac330df47c08f3f33073d2d00c150f719147d7c54522fa1b" ++"checksum predicates 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)" = "a9bfe52247e5cc9b2f943682a85a5549fb9662245caf094504e69a2f03fe64d4" +"checksum predicates-core 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)" = "06075c3a3e92559ff8929e7a280684489ea27fe44805174c3ebd9328dcb37178" +"checksum predicates-tree 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)" = "8e63c4859013b38a76eca2414c64911fba30def9e3202ac461a2d22831220124" +"checksum proc-macro2 0.4.30 (registry+https://github.com/rust-lang/crates.io-index)" = "cf3d2011ab5c909338f7887f4fc896d35932e29146c12c8d01da6b22a80ba759" -+"checksum proc-macro2 1.0.4 (registry+https://github.com/rust-lang/crates.io-index)" = "afdc77cc74ec70ed262262942ebb7dac3d479e9e5cfa2da1841c0806f6cdabcc" ++"checksum proc-macro2 1.0.6 (registry+https://github.com/rust-lang/crates.io-index)" = "9c9e470a8dc4aeae2dee2f335e8f533e2d4b347e1434e5671afc49b054592f27" +"checksum quick-error 1.2.2 (registry+https://github.com/rust-lang/crates.io-index)" = "9274b940887ce9addde99c4eee6b5c44cc494b182b97e73dc8ffdcb3397fd3f0" +"checksum quote 0.6.13 (registry+https://github.com/rust-lang/crates.io-index)" = "6ce23b6b870e8f94f81fb0a363d65d86675884b34a09043c81e5562f11c1f8e1" +"checksum quote 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)" = "053a8c8bcc71fcce321828dc897a98ab9760bef03a4fc36693c231e5b3216cfe" @@ -2169,8 +2185,8 @@ index 00000000..d7d32a06 +"checksum rand_os 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)" = "7b75f676a1e053fc562eafbb47838d67c84801e38fc1ba459e8f180deabd5071" +"checksum rand_pcg 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)" = "abf9b09b01790cfe0364f52bf32995ea3c39f4d2dd011eac241d2914146d0b44" +"checksum rand_xorshift 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "cbf7e9e623549b0e21f6e97cf8ecf247c1a8fd2e8a992ae265314300b2455d5c" -+"checksum rayon 1.2.0 (registry+https://github.com/rust-lang/crates.io-index)" = "83a27732a533a1be0a0035a111fe76db89ad312f6f0347004c220c57f209a123" -+"checksum rayon-core 1.6.0 (registry+https://github.com/rust-lang/crates.io-index)" = "98dcf634205083b17d0861252431eb2acbfb698ab7478a2d20de07954f47ec7b" ++"checksum rayon 1.2.1 (registry+https://github.com/rust-lang/crates.io-index)" = "43739f8831493b276363637423d3622d4bd6394ab6f0a9c4a552e208aeb7fddd" ++"checksum rayon-core 1.6.1 (registry+https://github.com/rust-lang/crates.io-index)" = "f8bf17de6f23b05473c437eb958b9c850bfc8af0961fe17b4cc92d5a627b4791" +"checksum raytracer 0.1.0 (git+https://github.com/alexcrichton/raytracer?branch=update-deps)" = "<none>" +"checksum rdrand 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)" = "678054eb77286b51581ba43620cc911abf02758c91f93f479767aed0f90458b2" +"checksum redox_syscall 0.1.56 (registry+https://github.com/rust-lang/crates.io-index)" = "2439c63f3f6139d1b57529d16bc3b8bb855230c8efcc5d3a896c8bea7c3b1e84" @@ -2182,26 +2198,26 @@ index 00000000..d7d32a06 +"checksum rust-argon2 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)" = "4ca4eaef519b494d1f2848fc602d18816fed808a981aedf4f1f00ceb7c9d32cf" +"checksum rustc-demangle 0.1.16 (registry+https://github.com/rust-lang/crates.io-index)" = "4c691c0e608126e00913e33f0ccf3727d5fc84573623b8d65b2df340b5201783" +"checksum rustc_version 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)" = "138e3e0acb6c9fb258b19b67cb8abd63c00679d2851805ea151465464fe9030a" -+"checksum ryu 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)" = "c92464b447c0ee8c4fb3824ecc8383b81717b9f1e74ba2e72540aef7b9f82997" -+"checksum safemem 0.3.2 (registry+https://github.com/rust-lang/crates.io-index)" = "d2b08423011dae9a5ca23f07cf57dac3857f5c885d352b76f6d95f4aea9434d0" ++"checksum ryu 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)" = "bfa8506c1de11c9c4e4c38863ccbe02a305c8188e85a05a784c9e11e1c3910c8" ++"checksum safemem 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)" = "ef703b7cb59335eae2eb93ceb664c0eb7ea6bf567079d843e09420219668e072" +"checksum schannel 0.1.16 (registry+https://github.com/rust-lang/crates.io-index)" = "87f550b06b6cba9c8b8be3ee73f391990116bf527450d2556e9b9ce263b9a021" +"checksum scoped-tls 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)" = "ea6a9290e3c9cf0f18145ef7ffa62d68ee0bf5fcd651017e586dc7fd5da448c2" +"checksum scoped_threadpool 0.1.9 (registry+https://github.com/rust-lang/crates.io-index)" = "1d51f5df5af43ab3f1360b429fa5e0152ac5ce8c0bd6485cae490332e96846a8" +"checksum scopeguard 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)" = "b42e15e59b18a828bbf5c58ea01debb36b9b096346de35d941dcb89009f24a0d" +"checksum semver 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)" = "1d7eb9ef2c18661902cc47e535f9bc51b78acd254da71d375c2f6720d9a40403" +"checksum semver-parser 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)" = "388a1df253eca08550bef6c72392cfe7c30914bf41df5269b68cbd6ff8f570a3" -+"checksum serde 1.0.101 (registry+https://github.com/rust-lang/crates.io-index)" = "9796c9b7ba2ffe7a9ce53c2287dfc48080f4b2b362fcc245a259b3a7201119dd" -+"checksum serde_derive 1.0.101 (registry+https://github.com/rust-lang/crates.io-index)" = "4b133a43a1ecd55d4086bd5b4dc6c1751c68b1bfbeba7a5040442022c7e7c02e" -+"checksum serde_json 1.0.40 (registry+https://github.com/rust-lang/crates.io-index)" = "051c49229f282f7c6f3813f8286cc1e3323e8051823fce42c7ea80fe13521704" ++"checksum serde 1.0.103 (registry+https://github.com/rust-lang/crates.io-index)" = "1217f97ab8e8904b57dd22eb61cde455fa7446a9c1cf43966066da047c1f3702" ++"checksum serde_derive 1.0.103 (registry+https://github.com/rust-lang/crates.io-index)" = "a8c6faef9a2e64b0064f48570289b4bf8823b7581f1d6157c1b52152306651d0" ++"checksum serde_json 1.0.42 (registry+https://github.com/rust-lang/crates.io-index)" = "1a3351dcbc1f067e2c92ab7c3c1f288ad1a4cffc470b5aaddb4c2e0a3ae80043" +"checksum sha1 0.6.0 (registry+https://github.com/rust-lang/crates.io-index)" = "2579985fda508104f7587689507983eadd6a6e84dd35d6d115361f530916fa0d" +"checksum siphasher 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)" = "0b8de496cf83d4ed58b6be86c3a275b8602f6ffe98d3024a869e124147a9a3ac" -+"checksum smallvec 0.6.10 (registry+https://github.com/rust-lang/crates.io-index)" = "ab606a9c5e214920bb66c458cd7be8ef094f813f20fe77a54cc7dbfff220d4b7" ++"checksum smallvec 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)" = "4ecf3b85f68e8abaa7555aa5abdb1153079387e60b718283d732f03897fcfc86" +"checksum socket2 0.3.11 (registry+https://github.com/rust-lang/crates.io-index)" = "e8b74de517221a2cb01a53349cf54182acdc31a074727d3079068448c0676d85" +"checksum sourcefile 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)" = "4bf77cb82ba8453b42b6ae1d692e4cdc92f9a47beaf89a847c8be83f4e328ad3" +"checksum strsim 0.9.2 (registry+https://github.com/rust-lang/crates.io-index)" = "032c03039aae92b350aad2e3779c352e104d919cb192ba2fabbd7b831ce4f0f6" +"checksum syn 0.15.44 (registry+https://github.com/rust-lang/crates.io-index)" = "9ca4b3b69a77cbe1ffc9e198781b7acb0c7365a883670e8f1c1bc66fba79a5c5" -+"checksum syn 1.0.5 (registry+https://github.com/rust-lang/crates.io-index)" = "66850e97125af79138385e9b88339cbcd037e3f28ceab8c5ad98e64f0f1f80bf" -+"checksum synstructure 0.10.2 (registry+https://github.com/rust-lang/crates.io-index)" = "02353edf96d6e4dc81aea2d8490a7e9db177bf8acb0e951c24940bf866cb313f" ++"checksum syn 1.0.8 (registry+https://github.com/rust-lang/crates.io-index)" = "661641ea2aa15845cddeb97dad000d22070bb5c1fb456b96c1cba883ec691e92" ++"checksum synstructure 0.12.3 (registry+https://github.com/rust-lang/crates.io-index)" = "67656ea1dc1b41b1451851562ea232ec2e5a80242139f7e679ceccfb5d61f545" +"checksum tempdir 0.3.7 (registry+https://github.com/rust-lang/crates.io-index)" = "15f2b5fb00ccdf689e0149d1b1b3c03fead81c2b37735d812fa8bddbbf41b6d8" +"checksum tempfile 3.1.0 (registry+https://github.com/rust-lang/crates.io-index)" = "7a6e24d9338a0a5be79593e2fa15a648add6138caa803e2d5bc782c371732ca9" +"checksum term 0.5.2 (registry+https://github.com/rust-lang/crates.io-index)" = "edd106a334b7657c10b7c540a0106114feadeb4dc314513e97df481d5d966f42" @@ -2211,24 +2227,24 @@ index 00000000..d7d32a06 +"checksum time 0.1.42 (registry+https://github.com/rust-lang/crates.io-index)" = "db8dcfca086c1143c9270ac42a2bbd8a7ee477b78ac8e45b19abfb0cbede4b6f" +"checksum tiny_http 0.6.2 (registry+https://github.com/rust-lang/crates.io-index)" = "1661fa0a44c95d01604bd05c66732a446c657efb62b5164a7a083a3b552b4951" +"checksum toml 0.4.10 (registry+https://github.com/rust-lang/crates.io-index)" = "758664fc71a3a69038656bee8b6be6477d2a6c315a6b81f7081f591bffa4111f" -+"checksum toml 0.5.3 (registry+https://github.com/rust-lang/crates.io-index)" = "c7aabe75941d914b72bf3e5d3932ed92ce0664d49d8432305a8b547c37227724" ++"checksum toml 0.5.5 (registry+https://github.com/rust-lang/crates.io-index)" = "01d1404644c8b12b16bfcffa4322403a91a451584daaaa7c28d3152e6cbc98cf" +"checksum treeline 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)" = "a7f741b240f1a48843f9b8e0444fb55fb2a4ff67293b50a9179dfd5ea67f8d41" -+"checksum trybuild 1.0.16 (registry+https://github.com/rust-lang/crates.io-index)" = "10d8f366221c5a5ff8a62faa005e186fdce758949d34a9140b64a062951bae68" ++"checksum trybuild 1.0.18 (registry+https://github.com/rust-lang/crates.io-index)" = "b75e31d624df08744532e935f1d4bfedd319a277d5a162c5b15f6ced59307575" +"checksum twoway 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)" = "59b11b2b5241ba34be09c3cc85a36e56e48f9888862e19cedf23336d35316ed1" +"checksum unicase 1.4.2 (registry+https://github.com/rust-lang/crates.io-index)" = "7f4765f83163b74f957c797ad9253caf97f103fb064d3999aea9568d09fc8a33" +"checksum unicode-bidi 0.3.4 (registry+https://github.com/rust-lang/crates.io-index)" = "49f2bd0c6468a8230e1db229cff8029217cf623c767ea5d60bfbd42729ea54d5" -+"checksum unicode-normalization 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)" = "141339a08b982d942be2ca06ff8b076563cbe223d1befd5450716790d44e2426" -+"checksum unicode-segmentation 1.3.0 (registry+https://github.com/rust-lang/crates.io-index)" = "1967f4cdfc355b37fd76d2a954fb2ed3871034eb4f26d60537d88795cfc332a9" ++"checksum unicode-normalization 0.1.11 (registry+https://github.com/rust-lang/crates.io-index)" = "b561e267b2326bb4cebfc0ef9e68355c7abe6c6f522aeac2f5bf95d56c59bdcf" ++"checksum unicode-segmentation 1.6.0 (registry+https://github.com/rust-lang/crates.io-index)" = "e83e153d1053cbb5a118eeff7fd5be06ed99153f00dbcd8ae310c5fb2b22edc0" +"checksum unicode-xid 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)" = "fc72304796d0818e357ead4e000d19c9c174ab23dc11093ac919054d20a6a7fc" +"checksum unicode-xid 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)" = "826e7639553986605ec5979c7dd957c7895e93eabed50ab2ffa7f6128a75097c" +"checksum url 1.7.2 (registry+https://github.com/rust-lang/crates.io-index)" = "dd4e7c0d531266369519a4aa4f399d748bd37043b00bde1e4ff1f60a120b355a" +"checksum vcpkg 0.2.7 (registry+https://github.com/rust-lang/crates.io-index)" = "33dd455d0f96e90a75803cfeb7f948768c08d70a6de9a8d2362461935698bf95" +"checksum version_check 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)" = "914b1a6776c4c929a602fafd8bc742e06365d4bcbe48c30f9cca5824f70dc9dd" -+"checksum walrus 0.12.0 (registry+https://github.com/rust-lang/crates.io-index)" = "e6f3bd9559eb5b59d55cc60986e26dc9b3f64377d0b9495e41abd9ede9a6443f" -+"checksum walrus-macro 0.12.0 (registry+https://github.com/rust-lang/crates.io-index)" = "0464a6e0d86be4c95c8c838bcb1910df831e1216a9586feeb02478cd52c4e554" ++"checksum walrus 0.13.0 (registry+https://github.com/rust-lang/crates.io-index)" = "85ce93ab0c27412ba41d509f2410fa575ecbfdb4a6aba0e02e79e12c09745485" ++"checksum walrus-macro 0.13.0 (registry+https://github.com/rust-lang/crates.io-index)" = "8757b0da38353d55a9687f4dee68a8f441f980dd36e16ab07d6e6c673f505f76" +"checksum wasi 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)" = "b89c3ce4ce14bdc6fb6beaf9ec7928ca331de5df7e5ea278375642a2f478570d" -+"checksum wasm-webidl-bindings 0.5.0 (registry+https://github.com/rust-lang/crates.io-index)" = "e407ee3155cb0742acacd0b21060daafe2ad78ea718f2d6b10e7d9d1032aa961" -+"checksum wasmparser 0.37.2 (registry+https://github.com/rust-lang/crates.io-index)" = "f7387ba67c13dd9cd01d7d961e733375aee889f828564e190da85b5602eb5eeb" ++"checksum wasm-webidl-bindings 0.6.0 (registry+https://github.com/rust-lang/crates.io-index)" = "b5cae185868c6038a48f487b9af3766ee0c68d4a85fa3610c3a0522092b3cec1" ++"checksum wasmparser 0.39.3 (registry+https://github.com/rust-lang/crates.io-index)" = "c702914acda5feeeffbc29e4d953e5b9ce79d8b98da4dbf18a77086e116c5470" +"checksum weedle 0.10.0 (registry+https://github.com/rust-lang/crates.io-index)" = "3bb43f70885151e629e2a19ce9e50bd730fd436cfd4b666894c9ce4de9141164" +"checksum winapi 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)" = "8093091eeb260906a183e6ae1abdba2ef5ef2257a21801128899c3fc699229c6" +"checksum winapi-i686-pc-windows-gnu 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)" = "ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6" diff --git a/pkgs/development/tools/wasm-bindgen-cli/default.nix b/pkgs/development/tools/wasm-bindgen-cli/default.nix index 2fd30ecc6b1..26f37c5dc74 100644 --- a/pkgs/development/tools/wasm-bindgen-cli/default.nix +++ b/pkgs/development/tools/wasm-bindgen-cli/default.nix @@ -2,20 +2,20 @@ rustPlatform.buildRustPackage rec { pname = "wasm-bindgen-cli"; - version = "0.2.51"; + version = "0.2.55"; src = fetchFromGitHub { owner = "rustwasm"; repo = "wasm-bindgen"; rev = version; - sha256 = "1pfkwak11k3ghvv985c20vhg4cyvf131a1f7k3sv5snw2klww7vm"; + sha256 = "13pcfrdf3nk4mrc7lqpz9qjdh7gfpqf849iywcyjk3f9y8sm46ii"; }; buildInputs = [ openssl ] ++ lib.optionals stdenv.isDarwin [ Security curl ]; nativeBuildInputs = [ pkgconfig ]; - cargoSha256 = "06zk2yzwpl569q5mgn56gprsfxxvyz4a2i949lls13daq1kal5pa"; - cargoPatches = [ ./0001-Add-cargo.lock-for-rustPlatform.buildRustPackage-in-.patch ]; + cargoSha256 = "0mpq40llddqj7syi07pfhr48kndx35f1hyf5pvx5zdnfz29a924v"; + cargoPatches = [ ./0001-Add-cargo.lock-for-0.2.55.patch ]; cargoBuildFlags = [ "-p" pname ]; meta = with lib; { diff --git a/pkgs/development/tools/yarn/default.nix b/pkgs/development/tools/yarn/default.nix index 43d3e20d3df..3384dac5410 100644 --- a/pkgs/development/tools/yarn/default.nix +++ b/pkgs/development/tools/yarn/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "yarn"; - version = "1.19.1"; + version = "1.19.2"; src = fetchzip { url = "https://github.com/yarnpkg/yarn/releases/download/v${version}/yarn-v${version}.tar.gz"; - sha256 = "0qlrwmvpv0ifvywqqzg28ywmhk4prkk1dflnnpk6grpgkq3bfv77"; + sha256 = "05sjf7pgdj3hh92j2xxl683frrkiw1rqxs72z3an4gb83nllvi0n"; }; buildInputs = [ nodejs ]; diff --git a/pkgs/development/web/cypress/default.nix b/pkgs/development/web/cypress/default.nix index f88a6ceaeb3..796060de0b0 100644 --- a/pkgs/development/web/cypress/default.nix +++ b/pkgs/development/web/cypress/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec{ pname = "cypress"; - version = "3.5.0"; + version = "3.6.1"; src = fetchzip { url = "https://cdn.cypress.io/desktop/${version}/linux-x64/cypress.zip"; - sha256 = "1w1nqa0j3bzjr000d4jlr34d1asdc1fv81pq831s3wl55hyqbij6"; + sha256 = "0vlfmhsz7zkp3bjsgqmp9n716d5znicl42hm0m9hl7ndvgm9z9z0"; }; # don't remove runtime deps diff --git a/pkgs/development/web/postman/default.nix b/pkgs/development/web/postman/default.nix index 440012461b9..7c56cd827ca 100644 --- a/pkgs/development/web/postman/default.nix +++ b/pkgs/development/web/postman/default.nix @@ -7,11 +7,11 @@ stdenv.mkDerivation rec { pname = "postman"; - version = "7.10.0"; + version = "7.12.0"; src = fetchurl { url = "https://dl.pstmn.io/download/version/${version}/linux64"; - sha256 = "0k8np71p414407hvcw149gspvdgyadnmpvfdxwwkr3pydj70vn6f"; + sha256 = "0sz7cidajrsj43vq5g8jrkxlrp97r7n8dfr9gp8l0wxnidiqm401"; name = "${pname}.tar.gz"; }; diff --git a/pkgs/games/alienarena/default.nix b/pkgs/games/alienarena/default.nix index 77a8cf9a2ef..5c27e3426fd 100644 --- a/pkgs/games/alienarena/default.nix +++ b/pkgs/games/alienarena/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, pkgconfig, libjpeg, libX11, libXxf86vm, curl, libogg -, libvorbis, freetype, openal, libGLU, libGL }: +, libvorbis, freetype, openal, libGL }: stdenv.mkDerivation { name = "alienarena-7.65"; @@ -11,12 +11,12 @@ stdenv.mkDerivation { nativeBuildInputs = [ pkgconfig ]; buildInputs = [ libjpeg libX11 curl libogg libvorbis - freetype openal libGLU libGL libXxf86vm ]; + freetype openal libGL libXxf86vm ]; patchPhase = '' substituteInPlace ./configure \ --replace libopenal.so.1 ${openal}/lib/libopenal.so.1 \ - --replace libGL.so.1 ${libGLU libGL}/lib/libGL.so.1 + --replace libGL.so.1 ${libGL}/lib/libGL.so.1 ''; meta = with stdenv.lib; { diff --git a/pkgs/games/tome4/default.nix b/pkgs/games/tome4/default.nix index af13ae2e7e1..9971aa0d166 100644 --- a/pkgs/games/tome4/default.nix +++ b/pkgs/games/tome4/default.nix @@ -18,11 +18,11 @@ let in stdenv.mkDerivation rec { name = "${pname}-${version}"; - version = "1.6.0"; + version = "1.6.1"; src = fetchurl { url = "https://te4.org/dl/t-engine/t-engine4-src-${version}.tar.bz2"; - sha256 = "1z1w4ycgl5wbm0sv7577vcdfwwf4k7vaf2njzyb21rvqjizpbkwr"; + sha256 = "0c5a2bdyfccwkqnb6yqvzggyi2nk032v01kfc00zlgpdfzljcb9i"; }; prePatch = '' diff --git a/pkgs/misc/cups/filters.nix b/pkgs/misc/cups/filters.nix index 7e3b4b952f1..76f68e50750 100644 --- a/pkgs/misc/cups/filters.nix +++ b/pkgs/misc/cups/filters.nix @@ -9,11 +9,11 @@ let in stdenv.mkDerivation rec { pname = "cups-filters"; - version = "1.25.11"; + version = "1.25.12"; src = fetchurl { url = "https://openprinting.org/download/cups-filters/${pname}-${version}.tar.xz"; - sha256 = "0ni8krr4rf5833livn9401cd41gspjvxj0iiqnc1rfg3x90i0fxh"; + sha256 = "1kv25011iyzvd33n5zmmn1z2p6pzk26hmmw6qvjjnx8p3sp7raqn"; }; nativeBuildInputs = [ pkgconfig makeWrapper ]; diff --git a/pkgs/misc/emulators/fs-uae/default.nix b/pkgs/misc/emulators/fs-uae/default.nix index 6c037eb9f22..9f092f91e2e 100644 --- a/pkgs/misc/emulators/fs-uae/default.nix +++ b/pkgs/misc/emulators/fs-uae/default.nix @@ -5,11 +5,11 @@ with stdenv.lib; stdenv.mkDerivation rec { pname = "fs-uae"; - version = "3.0.0"; + version = "3.0.2"; src = fetchurl { url = "https://fs-uae.net/stable/${version}/${pname}-${version}.tar.gz"; - sha256 = "0r69i6rh472lj4qwqfcfh17xmlw4x6mhqzr9hhpkbb4byyw6h592"; + sha256 = "1awakxs3rlbm0bxpi37cbavi5fpb89wszksyw62as4nz3qsdrpjf"; }; nativeBuildInputs = [ pkgconfig ]; diff --git a/pkgs/misc/uboot/default.nix b/pkgs/misc/uboot/default.nix index f7663c8e447..0c30e76b3fa 100644 --- a/pkgs/misc/uboot/default.nix +++ b/pkgs/misc/uboot/default.nix @@ -4,24 +4,27 @@ }: let - buildUBoot = { version ? "2019.10" - , filesToInstall - , installDir ? "$out" - , defconfig - , extraConfig ? "" - , extraPatches ? [] - , extraMakeFlags ? [] - , extraMeta ? {} - , ... } @ args: - stdenv.mkDerivation ({ - + defaultVersion = "2019.10"; + defaultSrc = fetchurl { + url = "ftp://ftp.denx.de/pub/u-boot/u-boot-${defaultVersion}.tar.bz2"; + sha256 = "053hcrwwlacqh2niisn0zas95zkbffw5aw5sdhixs8lmfdq60vcd"; + }; + buildUBoot = { + version ? null + , src ? null + , filesToInstall + , installDir ? "$out" + , defconfig + , extraConfig ? "" + , extraPatches ? [] + , extraMakeFlags ? [] + , extraMeta ? {} + , ... } @ args: stdenv.mkDerivation ({ pname = "uboot-${defconfig}"; - inherit version; - src = fetchurl { - url = "ftp://ftp.denx.de/pub/u-boot/u-boot-${version}.tar.bz2"; - sha256 = "053hcrwwlacqh2niisn0zas95zkbffw5aw5sdhixs8lmfdq60vcd"; - }; + version = if src == null then defaultVersion else version; + + src = if src == null then defaultSrc else src; patches = [ (fetchpatch { diff --git a/pkgs/misc/vim-plugins/generated.nix b/pkgs/misc/vim-plugins/generated.nix index 12bdf40d326..77ad13c2c00 100644 --- a/pkgs/misc/vim-plugins/generated.nix +++ b/pkgs/misc/vim-plugins/generated.nix @@ -50,23 +50,23 @@ let alchemist-vim = buildVimPluginFrom2Nix { pname = "alchemist-vim"; - version = "2019-11-06"; + version = "2019-11-27"; src = fetchFromGitHub { owner = "slashmili"; repo = "alchemist.vim"; - rev = "8b6ea7b1314bb3b47b115c04484b7af3c483f5b8"; - sha256 = "0jfwcd426hd9pb2dyq1949g8k8g1hhkc55k1kbp30r42m116p1qh"; + rev = "911eda990ef259d1f035061c5dfb2f44adb2697e"; + sha256 = "04lm3k6svq4y2a7kqq5phzyny93ynnjdmsv2s98pw6c4z5fq5y1m"; }; }; ale = buildVimPluginFrom2Nix { pname = "ale"; - version = "2019-11-15"; + version = "2019-11-27"; src = fetchFromGitHub { owner = "w0rp"; repo = "ale"; - rev = "b91d82bfaa395bb86b3ea51f63cc8cef05e90f98"; - sha256 = "0hgzi91213x0r5mvp1hw8dk1fcjmqjf706cnjcilgv7ljnd6sa5z"; + rev = "d8195e9276c27caabf173a268450a3420b53181a"; + sha256 = "0fdy4kvd7bg3xcls5g2xxml8hlwb80qvs9225dh2hqif0isbf4l2"; }; }; @@ -149,12 +149,12 @@ let awesome-vim-colorschemes = buildVimPluginFrom2Nix { pname = "awesome-vim-colorschemes"; - version = "2019-11-05"; + version = "2019-11-23"; src = fetchFromGitHub { owner = "rafi"; repo = "awesome-vim-colorschemes"; - rev = "c6962f051a0dff9c8d1390efea807a7440c9c0d4"; - sha256 = "1f5qq4l6mx7na008d5w6hji93w57vk26w78l4mp66wl790jcw4ky"; + rev = "b5037cbf87ee4b0beed91adb33c339122e58326f"; + sha256 = "1yxjdb2cmha6vqhmsv8vy80whs201wwwx0xmyp76mz9zkcsyljak"; }; }; @@ -204,12 +204,12 @@ let calendar-vim = buildVimPluginFrom2Nix { pname = "calendar-vim"; - version = "2019-11-04"; + version = "2019-11-29"; src = fetchFromGitHub { owner = "itchyny"; repo = "calendar.vim"; - rev = "644f88b9ddb17ef04c4558e945d1995aab400a96"; - sha256 = "0wbj61q3qyk432wzci8q8pjw2qrl7kv4cxjlxrdcv15w45b8wskk"; + rev = "ff2149d6f022ffdd51c1fa5dbf9b653800f2298b"; + sha256 = "1396p6hvv9dyi91n9y7h5ik4l44xfr9xqhah0mbcg4v7dghrdsdx"; }; }; @@ -336,12 +336,12 @@ let coc-go = buildVimPluginFrom2Nix { pname = "coc-go"; - version = "2019-10-29"; + version = "2019-11-27"; src = fetchFromGitHub { owner = "josa42"; repo = "coc-go"; - rev = "0f395b22aee6f99ba3cfc07d3faaf13edcb1ca96"; - sha256 = "118nqx3k7frxvx0cz8w6k6sx905200aym2lqh0qajkg5m288vl75"; + rev = "82b66de274b0405fad8affcc21fcfec62655c266"; + sha256 = "0mfh1xscs1jn2fmzsq4cz57slicyvri83h1f7i3fwlmm1jw6l2nd"; }; }; @@ -413,12 +413,12 @@ let coc-lists = buildVimPluginFrom2Nix { pname = "coc-lists"; - version = "2019-11-07"; + version = "2019-11-25"; src = fetchFromGitHub { owner = "neoclide"; repo = "coc-lists"; - rev = "f1cb662a5d23f792c6920f122d200731a77150b9"; - sha256 = "1j5n859fyi7wvyqhqvcd81y2h7qiddwqfz3kqx3ri0br0j4hvwc4"; + rev = "c3d8bca71ba4cbf6eefdd24e77e62b595dcff856"; + sha256 = "0djmzw782m8vy3sfff3gnnib4iz3wilvjv4hagv7mhzcf2lzswsb"; }; }; @@ -446,23 +446,23 @@ let coc-prettier = buildVimPluginFrom2Nix { pname = "coc-prettier"; - version = "2019-10-06"; + version = "2019-11-28"; src = fetchFromGitHub { owner = "neoclide"; repo = "coc-prettier"; - rev = "198fff4227cbc2742ed6167c1f097826e867d66d"; - sha256 = "1ylwcr8l3bhgxb2zkqskkq97757di6vq7acxw6dd1hb5hk5a17kc"; + rev = "5304a1087e454bb9da7d58e383837f4c3e356e6a"; + sha256 = "1vbyr1cxckdgxns86aknckhgqzp8x0kkk77y0c8my1qinhrmj8cl"; }; }; coc-python = buildVimPluginFrom2Nix { pname = "coc-python"; - version = "2019-11-21"; + version = "2019-11-26"; src = fetchFromGitHub { owner = "neoclide"; repo = "coc-python"; - rev = "756c9f623f6a82ad902e2bdfe3f0c77fba96c18e"; - sha256 = "1fab8bzj386zkgn7551l58q4ykqakjbx92afx30i1861y8m1a4p1"; + rev = "714ae8de45ab756d5b65f0be0b616153220b9257"; + sha256 = "17gb0xbvczkqxzs2abknr460v0rcvgsi0m7pc4v0waggr690z53l"; }; }; @@ -479,12 +479,12 @@ let coc-rls = buildVimPluginFrom2Nix { pname = "coc-rls"; - version = "2019-10-28"; + version = "2019-11-23"; src = fetchFromGitHub { owner = "neoclide"; repo = "coc-rls"; - rev = "1e8610b2642232185b7e020651423d11001b7546"; - sha256 = "18d2pxmifyacg7gki99bja7gjs7ycprsm3p6p7snf3dx3g5r4pqq"; + rev = "1c7df237f76a50f25e8bbe3d8bec897991ca86b2"; + sha256 = "0q9i1lz4id9c3d4lch3fxkh8qg9v59vh3kin9h2qdnp3xwgfcvjr"; }; }; @@ -567,12 +567,12 @@ let coc-tsserver = buildVimPluginFrom2Nix { pname = "coc-tsserver"; - version = "2019-11-20"; + version = "2019-11-23"; src = fetchFromGitHub { owner = "neoclide"; repo = "coc-tsserver"; - rev = "d48cc4a31217af3e0d2fa91159972ea7a9575b21"; - sha256 = "0zmzyqp8nw99ajzxr8469yfm9zgi53zggxsp6k6b9m6x8c9rqly9"; + rev = "4f493d6c35bfef71ec21e8db648bcabda5f9ad21"; + sha256 = "1n1b9ss5cjmn5vazfmy97x88s4nqw6f2mwvnqbnvx3cjrpwvyjy6"; }; }; @@ -622,12 +622,12 @@ let coc-yank = buildVimPluginFrom2Nix { pname = "coc-yank"; - version = "2019-10-28"; + version = "2019-11-23"; src = fetchFromGitHub { owner = "neoclide"; repo = "coc-yank"; - rev = "636c8a3ff0fb4a950b72c626bf2075c20f7c0086"; - sha256 = "1wz8vp558v3l1c4d3igz55iv673ypapjapyy9q3fcxya8b3qs09y"; + rev = "1d145660c81cf4f160965feb12ea69129d1cce3e"; + sha256 = "1sdpkr1rkvqaiixiddd5a0095di071nxr2gvnikb4pnzrknacngk"; }; }; @@ -788,23 +788,23 @@ let dart-vim-plugin = buildVimPluginFrom2Nix { pname = "dart-vim-plugin"; - version = "2019-09-24"; + version = "2019-11-28"; src = fetchFromGitHub { owner = "dart-lang"; repo = "dart-vim-plugin"; - rev = "f8486e58fb02351689ae247cebf28b5fee326c33"; - sha256 = "038zx5zn4da73ps5klixcwh64z6rivfp78l2lvaj5d1vjqh1ac83"; + rev = "1dca4e12299e26bf4277992fd9b8b22bcc2f4e56"; + sha256 = "11zjcp48c7n13pqmwg1s6fk8i0z2iyv5nmyl642xxdyg0h43v5hf"; }; }; defx-nvim = buildVimPluginFrom2Nix { pname = "defx-nvim"; - version = "2019-11-18"; + version = "2019-11-28"; src = fetchFromGitHub { owner = "Shougo"; repo = "defx.nvim"; - rev = "1c59c0bbeea3d9162b1f8405c0cdcf23f29860f6"; - sha256 = "0pn3szp6kpk6za1q7f5wimwxsfrz5csgx8sxkzsch133q0f24p7f"; + rev = "4dc152ac826a825b69741cc79681a257e24497dc"; + sha256 = "1j9hgz76x554wzdz9ss14c94pwp2fk7yplznhyxamndn9wcy8yiv"; }; }; @@ -843,23 +843,23 @@ let denite-nvim = buildVimPluginFrom2Nix { pname = "denite-nvim"; - version = "2019-11-19"; + version = "2019-11-27"; src = fetchFromGitHub { owner = "Shougo"; repo = "denite.nvim"; - rev = "7712a251e172b2dc6a41d36504c0392797484ab1"; - sha256 = "0n696hjri23s9janar3k9la85apzl5kn51jgrjjf3p9xbx8h3ljk"; + rev = "41aa8302dc5ae8b27370bfcbf1124559c2f953de"; + sha256 = "1bbnz9d8qayrr40kxikcgjv28y109b0ksys9pnb27l9az8sx64bz"; }; }; deol-nvim = buildVimPluginFrom2Nix { pname = "deol-nvim"; - version = "2019-11-22"; + version = "2019-11-27"; src = fetchFromGitHub { owner = "Shougo"; repo = "deol.nvim"; - rev = "6457c49bb90ea955755c6a47a561f04312a28ed8"; - sha256 = "0bmw6xw0qa25dix4lp82447w3ffl49vf431wz90j6xa0swaxifkj"; + rev = "856041638e98fc3bf4d4de5d90dee525f3dfa9a5"; + sha256 = "1y6kp56n26kabmp60nnyaw46yxv9nqv5bp15hzvfpwvzq7gvpm10"; }; }; @@ -934,12 +934,12 @@ let deoplete-lsp = buildVimPluginFrom2Nix { pname = "deoplete-lsp"; - version = "2019-11-21"; + version = "2019-11-25"; src = fetchFromGitHub { owner = "Shougo"; repo = "deoplete-lsp"; - rev = "44185b8c477b1ba5a299f157569f842a5f2ed1ec"; - sha256 = "0y7ibagw5hj10qjrkqa8vq1a0h50xdnrirz2lnpyy8wyk9l5l2lc"; + rev = "37a307b1b4e922df0ff2695658602f1c34973db6"; + sha256 = "10rdk35bljzi705b2760n7f4hlsikaz366a62wsh09npbw63sdzb"; }; }; @@ -978,12 +978,12 @@ let deoplete-nvim = buildVimPluginFrom2Nix { pname = "deoplete-nvim"; - version = "2019-11-20"; + version = "2019-11-26"; src = fetchFromGitHub { owner = "Shougo"; repo = "deoplete.nvim"; - rev = "57cf7710a8dd51797bbbe5a45e67aef44caa126f"; - sha256 = "1wmlx2nx3bciv9mhws04ryix0sp33j945mn09cm8vvipbq0bk2q2"; + rev = "41ab306416a951be661622d7b0d174fe74f84f7e"; + sha256 = "0sa6bzywlnpw4hrgnls0cs90ilykrbf9jblbq811di9d7rvn52zn"; }; }; @@ -1033,12 +1033,12 @@ let editorconfig-vim = buildVimPluginFrom2Nix { pname = "editorconfig-vim"; - version = "2019-11-03"; + version = "2019-11-28"; src = fetchFromGitHub { owner = "editorconfig"; repo = "editorconfig-vim"; - rev = "5df91ecb9008666912c7ee15f95ebe5ff4265c23"; - sha256 = "020ll1517z8hmmqcnif4kd579hwvxjf8m0m2x1lg2b9kzaid09d1"; + rev = "2ad3d7882d2e9622a7fdc1a5ba1c5d0064d89472"; + sha256 = "00cyvjzn2sr49fvjfsxv0rj7kmdr2m2xlcpqvnfamh6l19nagb35"; fetchSubmodules = true; }; }; @@ -1090,12 +1090,12 @@ let falcon = buildVimPluginFrom2Nix { pname = "falcon"; - version = "2019-11-04"; + version = "2019-11-29"; src = fetchFromGitHub { owner = "fenetikm"; repo = "falcon"; - rev = "4f7c122c55aa8a4cfaedc6b12d3d2f26ce579250"; - sha256 = "0qvdp5y4bhb5nim0va1a25xahc7698lxj63q7cx2w2papbia69pi"; + rev = "4d34d3a44f7ee234460fcd8d543e5ba55b6b36e6"; + sha256 = "0llck06cpjjlfi4ga420z64fq064n0ykb9hh6dygklnnvkhdgb92"; }; }; @@ -1201,34 +1201,34 @@ let fzf-vim = buildVimPluginFrom2Nix { pname = "fzf-vim"; - version = "2019-11-17"; + version = "2019-11-24"; src = fetchFromGitHub { owner = "junegunn"; repo = "fzf.vim"; - rev = "98cf39949b617b9f3a47d2e092af573060022301"; - sha256 = "1h3nz1rqkggf2gs9hywl3x67hprpspm3qc0lmjc3msc5p221f2n4"; + rev = "65edb6ad99b51514aaf29afc25e35ce5f05281ba"; + sha256 = "1d40whzc21c4zbzssjwvhzddyb0a106ib8r4zzzdd61s1935z4xr"; }; }; gentoo-syntax = buildVimPluginFrom2Nix { pname = "gentoo-syntax"; - version = "2019-09-30"; + version = "2019-11-27"; src = fetchFromGitHub { owner = "gentoo"; repo = "gentoo-syntax"; - rev = "d09e3a3cf3b9c37b1cf0cd7e4952e24c46bfb9fe"; - sha256 = "0d0brqssq4qrx0l0yr668jvq5zk5pxqfkr8d8acbds8a48afz6zf"; + rev = "c7ab3c0f6efbe68e864273ad460ab06905930bd0"; + sha256 = "1h46s31miyd3j8shmrs61phkljj7qp9bkclcx1l0yd4cppm3vi06"; }; }; ghcid = buildVimPluginFrom2Nix { pname = "ghcid"; - version = "2019-11-14"; + version = "2019-11-25"; src = fetchFromGitHub { owner = "ndmitchell"; repo = "ghcid"; - rev = "25faf559b6f5e8fdef8e1ca2aaf557644a57a165"; - sha256 = "08653iwhz29xskrj36sih0z2bb247p137g8ls8ydvjgfy60jzrkm"; + rev = "bd77010189fa5f14f9e06a0f71bb2831b9d5b4a6"; + sha256 = "0m1hxwri2imgjywrc9l1s8bnr38dbsfz8zxw228yknq392jpvlyk"; }; }; @@ -1311,12 +1311,12 @@ let gv-vim = buildVimPluginFrom2Nix { pname = "gv-vim"; - version = "2019-10-13"; + version = "2019-11-29"; src = fetchFromGitHub { owner = "junegunn"; repo = "gv.vim"; - rev = "7a84f6342cc79444e3fa873bf1d08fb6c53b097e"; - sha256 = "0q5xz8iw3jg42kbaspmgd8mlcgl3xglcqh3fyd2jmmwhnfzp3f7r"; + rev = "f12b8b80897c1214327e6075abc007ec6e55a691"; + sha256 = "0fb0zsmpx1vbdfh3d04dpgy2gkd4wkdn05jflcpr5cyf50zr1z9y"; }; }; @@ -1598,23 +1598,23 @@ let lh-brackets = buildVimPluginFrom2Nix { pname = "lh-brackets"; - version = "2019-11-22"; + version = "2019-11-26"; src = fetchFromGitHub { owner = "LucHermitte"; repo = "lh-brackets"; - rev = "88548effe90b6b980e1320656231eaff57952d83"; - sha256 = "1xmsmvkbxqh0ib30qzkk5km5mjdr4f64mxll79x2x0wn8ldwjz9g"; + rev = "441b2d3827158c1c1781e797dd5953fa2b7ba63f"; + sha256 = "134lb5nnbkwlcgryd39n9dbqyqzadnfibk76m67pjk60sy4s64wk"; }; }; lh-vim-lib = buildVimPluginFrom2Nix { pname = "lh-vim-lib"; - version = "2019-11-22"; + version = "2019-11-25"; src = fetchFromGitHub { owner = "LucHermitte"; repo = "lh-vim-lib"; - rev = "ae9d7cf976143a43af11d350ca3406733549b883"; - sha256 = "1jziwz9mp6jsfd0jkvj4s6n4fw1kg0zgbd5j5rjz2jgp1akqnz2l"; + rev = "a150fd6af763f9ec1d0785f8a3ba350d8f27d908"; + sha256 = "0l70gkzv279sv756yng7nq3m1pkw2bvjybl6xvjifm19rx8vmlsg"; }; }; @@ -1675,12 +1675,12 @@ let mattn-calendar-vim = buildVimPluginFrom2Nix { pname = "mattn-calendar-vim"; - version = "2019-11-13"; + version = "2019-11-24"; src = fetchFromGitHub { owner = "mattn"; repo = "calendar-vim"; - rev = "17a0395f19739964b85672fb5538ea3f2e28ca7a"; - sha256 = "01g9ig5h7cqvlv2xakr8cml7l4rlgnypglqzag8zyr2lb2c1dmm3"; + rev = "de499b9525490b10edbd28fb8f0c4e81c6a6f20c"; + sha256 = "0xvvkq9zckmv9pnzvxg71fblly8lksfi736brbcwcvnszqif4b69"; }; }; @@ -1862,12 +1862,12 @@ let neomake = buildVimPluginFrom2Nix { pname = "neomake"; - version = "2019-11-08"; + version = "2019-11-29"; src = fetchFromGitHub { owner = "neomake"; repo = "neomake"; - rev = "4e5ee03c61fbabf3eb90b6b30d9acd4f3d4b3fdb"; - sha256 = "13z45hsk99lcdfbinvbbwr1036fsakhp4dhlqd6dmq6fn3fw5y9w"; + rev = "fb9765ec9d8e14e01ed3f55364b56c608271fb45"; + sha256 = "02pqn7fjm4749qfbc13kz0bhf8azr7vhkzca8cq9imiwdpssvmjs"; }; }; @@ -1884,12 +1884,12 @@ let neosnippet-snippets = buildVimPluginFrom2Nix { pname = "neosnippet-snippets"; - version = "2019-08-11"; + version = "2019-11-25"; src = fetchFromGitHub { owner = "Shougo"; repo = "neosnippet-snippets"; - rev = "f38f1732e4bb0643b3019b5b733a87f5f03ea348"; - sha256 = "1brzryd2sc44xpkz4w4s78a8vmwddvzkqgiyiaygp45k87q2yp24"; + rev = "7e300f1b986f46b217c26906ca4ee88629f18610"; + sha256 = "121zqdmpz2dmgsc6zzvrbjhbc3ik5hbj069wh33laxvj74gsar6k"; }; }; @@ -1961,12 +1961,12 @@ let nerdcommenter = buildVimPluginFrom2Nix { pname = "nerdcommenter"; - version = "2019-10-05"; + version = "2019-11-26"; src = fetchFromGitHub { owner = "scrooloose"; repo = "nerdcommenter"; - rev = "92082862364cf5ec3eec79a025bbc7bc5165e05f"; - sha256 = "0aqjc26l1m62jgj34difkkbbd0kam1sa6ldfwf2fbkxs3f5y63q8"; + rev = "023cc20324c41059b5ce79edaef0ffeef8bf5923"; + sha256 = "02459d88v2g8slrhajmaywwwanqifyrbrxg90vp7rrzx42f6p56r"; }; }; @@ -2060,12 +2060,12 @@ let nvim-yarp = buildVimPluginFrom2Nix { pname = "nvim-yarp"; - version = "2019-10-13"; + version = "2019-11-25"; src = fetchFromGitHub { owner = "roxma"; repo = "nvim-yarp"; - rev = "81caad80107abb9c2f5159e02e2cd95876370bec"; - sha256 = "01x1jx7wxpjkv09l9wx1ygsjqrdvfy47pxqgjzmnx4x126ji9gw2"; + rev = "83c6f4e61aa73e2a53796ea6690fb7e5e64db50a"; + sha256 = "0yswx77gwxsac4aw2hkx0krjz4jh7pj5bgpvshynj5dlp34ip0m0"; }; }; @@ -2379,12 +2379,12 @@ let rust-vim = buildVimPluginFrom2Nix { pname = "rust-vim"; - version = "2019-10-20"; + version = "2019-11-28"; src = fetchFromGitHub { owner = "rust-lang"; repo = "rust.vim"; - rev = "97fdc4e4975515d8e8a5a82380dd85628d59a005"; - sha256 = "1ggnl9h0jqb3zf8n8vpvlizxb3fikmghwpj8d3xq3ny54wfjgx78"; + rev = "b7176e7a1607bb17f2f57cb8b365042f5676b21b"; + sha256 = "12i213ci5db4xiyqzwkd4i6mmxgq2j1ipjsn42mif3yp0cr1rvvv"; }; }; @@ -2401,12 +2401,12 @@ let semshi = buildVimPluginFrom2Nix { pname = "semshi"; - version = "2019-10-01"; + version = "2019-11-27"; src = fetchFromGitHub { owner = "numirias"; repo = "semshi"; - rev = "b50f1bcc48bb944704c586b462a5e9d5cdf0d532"; - sha256 = "1f2wqqhnfyicx8dgna6lcsa3pl5bxbjqf261rz9phxw649rsa9a4"; + rev = "816b8d22adf59260f4355aab31c1cdc99db8f438"; + sha256 = "01s46f0gclbz3v73z75zmcy7xh9xvzjn067xiyhbf7m6jlzic0aq"; }; }; @@ -3084,23 +3084,23 @@ let vim-airline = buildVimPluginFrom2Nix { pname = "vim-airline"; - version = "2019-11-21"; + version = "2019-11-29"; src = fetchFromGitHub { owner = "vim-airline"; repo = "vim-airline"; - rev = "b9eb94120133a3be4cee77e9bedf68c4200f4b04"; - sha256 = "0x9z67i8g4p6iik110nfcnsdpny74gi6arx2yvwssa6vzdv2rh9f"; + rev = "ce932f3825f59258f814d4b66174283875348a95"; + sha256 = "0mwvmxy5x03crp7nkbnjl9h6gmjwlhwiw8i62x95nl8yf5zi8gdl"; }; }; vim-airline-themes = buildVimPluginFrom2Nix { pname = "vim-airline-themes"; - version = "2019-11-21"; + version = "2019-11-27"; src = fetchFromGitHub { owner = "vim-airline"; repo = "vim-airline-themes"; - rev = "935dffc6ff96f7282db93e40e024c942056aedaa"; - sha256 = "0mx3w41sxvrvk4n4sv1zswlnxmkk93wy9wmc1gmc70yrd9q9jfbx"; + rev = "f4ba787e9c5455a6a88c6d04e61b189826375763"; + sha256 = "1w15r4c7qwlbjjc5mbdcmg4qv4skw9n5qcn543zmiws8hxfqhf6m"; }; }; @@ -3689,12 +3689,12 @@ let vim-fugitive = buildVimPluginFrom2Nix { pname = "vim-fugitive"; - version = "2019-11-18"; + version = "2019-11-27"; src = fetchFromGitHub { owner = "tpope"; repo = "vim-fugitive"; - rev = "13fdeb5fa7f464266163f405f42322e6fb0d3067"; - sha256 = "1605vznbf66z7f2g2lzx4yzxm0dnzddwzfa9mgbxa4wv1836ng0x"; + rev = "67efbf66e0fcfd25e617d22892a7e9768bfd0f92"; + sha256 = "0ga8qi26yfc3k5ynw75ai4a9605s8x2pk9i9vb79hddciwh02ia1"; }; }; @@ -3733,12 +3733,12 @@ let vim-gitgutter = buildVimPluginFrom2Nix { pname = "vim-gitgutter"; - version = "2019-11-22"; + version = "2019-11-25"; src = fetchFromGitHub { owner = "airblade"; repo = "vim-gitgutter"; - rev = "fa8d0feb4103f15b97e2abb4e76cbaaf03495d1d"; - sha256 = "0ki46g0xl6gn75hh9p13any17x5v703bc86ya2nfqwyp2w0gapyg"; + rev = "c31581c25b4896ccb6418137c70a3a3c37326c89"; + sha256 = "1drjj5d50s3hsd8sh4cvh8ah785chi5fyzq5cy01vpxf8cfghljg"; }; }; @@ -4603,11 +4603,11 @@ let vim-polyglot = buildVimPluginFrom2Nix { pname = "vim-polyglot"; - version = "2019-11-15"; + version = "2019-11-28"; src = fetchFromGitHub { owner = "sheerun"; repo = "vim-polyglot"; - rev = "d15651463ab5c3dd6609e548527a8ea18ab80c98"; + rev = "15aeea662e0b08088ac7b6e3ee661c834e69106a"; sha256 = "1x7xx12hdydn37hb2k0awzv4s00sb7zk09jixr9mjfrh2x7ywf1c"; }; }; @@ -4669,12 +4669,12 @@ let vim-qml = buildVimPluginFrom2Nix { pname = "vim-qml"; - version = "2018-07-22"; + version = "2019-11-28"; src = fetchFromGitHub { owner = "peterhoeg"; repo = "vim-qml"; - rev = "8af43da6950ce5483704bb97f5b24471d8ffda1a"; - sha256 = "1y1xvbfr1ffxyyk3zzf50xn87a85i1zszj4fqlq5ka8zhgdrnhvc"; + rev = "1af106ef8fcbd096fdadf6f4f3a2b422594836f5"; + sha256 = "1703zqpaadjji34mmyfzmnwr9jvms63w12lwsrdnqv9h9ag03n7y"; }; }; @@ -4812,12 +4812,12 @@ let vim-sensible = buildVimPluginFrom2Nix { pname = "vim-sensible"; - version = "2019-11-13"; + version = "2019-11-24"; src = fetchFromGitHub { owner = "tpope"; repo = "vim-sensible"; - rev = "bb75c2ec73f6b43346e0b159d46de3e304ac7dd6"; - sha256 = "0zxqm00c0aj5a55m35f42px4d19xbijfiqp6qs2xlqwzjw5na12m"; + rev = "2d9f34c09f548ed4df213389caa2882bfe56db58"; + sha256 = "153i3kh44ri046va3qdrbvvsv7gy25fsd9pc2yhrg23lvj169zfp"; }; }; @@ -4922,12 +4922,12 @@ let vim-snippets = buildVimPluginFrom2Nix { pname = "vim-snippets"; - version = "2019-11-07"; + version = "2019-11-24"; src = fetchFromGitHub { owner = "honza"; repo = "vim-snippets"; - rev = "5d259617f5198e511a759ccf4fb3000921abae21"; - sha256 = "1hxk0ab1r25m1mc09lvw6rsg9wrjrl0bgxql8slqpa7mqrkp47rn"; + rev = "c1d1cdce4f34d861cedebc948ef9cdecf633ae0a"; + sha256 = "1lnpv54mnn99yz4z4jr3al0bf1jxiz45rpqk8jvv5xz70zmfbrrg"; }; }; @@ -4988,12 +4988,12 @@ let vim-stylish-haskell = buildVimPluginFrom2Nix { pname = "vim-stylish-haskell"; - version = "2018-08-31"; + version = "2019-11-28"; src = fetchFromGitHub { owner = "nbouscal"; repo = "vim-stylish-haskell"; - rev = "0df8a2dd397f232a9ee0e56bc57071ccf29e21bf"; - sha256 = "05f2ms2c914ycxjjd7csga89mpsk3wzyhi56vikg3nd7a8z54gzw"; + rev = "ef12ab024cb3928ae57ce7c4fa519c4751afef99"; + sha256 = "0ysz68v4c2i4kxchsvxgkpj5kb0jbm5x06ri1ns9cmk5gj01pmd6"; }; }; @@ -5010,12 +5010,12 @@ let vim-surround = buildVimPluginFrom2Nix { pname = "vim-surround"; - version = "2019-11-12"; + version = "2019-11-28"; src = fetchFromGitHub { owner = "tpope"; repo = "vim-surround"; - rev = "e4c4cc0f816515fbb7e87076a988604b2d163daa"; - sha256 = "080wwicibkzll8v6a9mkr6wkibp5cv9wqfwpgy8i8djgbafcvnbz"; + rev = "f51a26d3710629d031806305b6c8727189cd1935"; + sha256 = "0aqrqn35xdiy80y7skxfsh3m33n6cdxw6lzz6aspfgzwllx2f0kr"; }; }; @@ -5087,12 +5087,12 @@ let vim-test = buildVimPluginFrom2Nix { pname = "vim-test"; - version = "2019-11-06"; + version = "2019-11-25"; src = fetchFromGitHub { owner = "janko-m"; repo = "vim-test"; - rev = "dcd7995802c7b90555ef6d920289c5d7f063bcb6"; - sha256 = "1a7k7i75n3qb14fvngkdpwvcyjl7cri2f2v1vi89waf7blmn22ib"; + rev = "3592eff62d38531acb2a948f0445463f27c5d801"; + sha256 = "1q41vp404n2pn65pg4br282wyimnfsrrhfkciwp0mhfp4ksn20mz"; }; }; @@ -5296,12 +5296,12 @@ let vim-visual-multi = buildVimPluginFrom2Nix { pname = "vim-visual-multi"; - version = "2019-11-16"; + version = "2019-11-27"; src = fetchFromGitHub { owner = "mg979"; repo = "vim-visual-multi"; - rev = "99d367c4974a9e398943a0f457a8f3994732b050"; - sha256 = "1cgphcm2fkhvks6bx8f0i54i91pcprisb079sddildnq4lsj895r"; + rev = "fb6895c5c39862e495644e2cc0d300ad00bdeed2"; + sha256 = "14mcrwfkwjlqh7r6h2qmcxm8a4c6lldrk549c9bwnrpzmvjw5daw"; }; }; @@ -5329,12 +5329,12 @@ let vim-wakatime = buildVimPluginFrom2Nix { pname = "vim-wakatime"; - version = "2019-07-27"; + version = "2019-11-28"; src = fetchFromGitHub { owner = "wakatime"; repo = "vim-wakatime"; - rev = "29d14cca6593a4809a31cfc3565a366d87426daf"; - sha256 = "1b47fv3jm37yhbg2mwc7kmlsl54dapb4sw9isf1h3mbmgxnvi5p9"; + rev = "fd18019b94d97c2ded56f8cce6087d692e6a055c"; + sha256 = "0m3dp5m8fbb28b68kykcickgd79bwv7gg30w483ndh2bgjjahqn0"; }; }; @@ -5483,12 +5483,12 @@ let vimproc-vim = buildVimPluginFrom2Nix { pname = "vimproc-vim"; - version = "2019-11-10"; + version = "2019-11-28"; src = fetchFromGitHub { owner = "Shougo"; repo = "vimproc.vim"; - rev = "47b54dd23eeb0a7fa81529d3768b27b979821b30"; - sha256 = "14nhnbds463iys8ndvyajbskwsi6hjljmmlvic3rbvym2h9mn442"; + rev = "89065f62883edb10a99aa1b1640d6d411907316b"; + sha256 = "0699kf269rsyabl49m4n7vsi5bbxk129wq6ml3ykhy9g9m2b8a3k"; }; }; @@ -5505,12 +5505,12 @@ let vimtex = buildVimPluginFrom2Nix { pname = "vimtex"; - version = "2019-11-19"; + version = "2019-11-23"; src = fetchFromGitHub { owner = "lervag"; repo = "vimtex"; - rev = "ed45b8b8ff5a61f05dea081d3eae98dcaee28857"; - sha256 = "1sd1315lg6sxydvwhk58kyp5hhdbrzqvkfgy0hvpy7c5h1rlfcjm"; + rev = "0647bb8991a490f92de173ca67e9b49a3f1fddcd"; + sha256 = "142wh5b2zl3s8jjlc6hnd1z8ysfiz4xllax84f6ddyny72z3di42"; }; }; @@ -5660,12 +5660,12 @@ let youcompleteme = buildVimPluginFrom2Nix { pname = "youcompleteme"; - version = "2019-11-19"; + version = "2019-11-23"; src = fetchFromGitHub { owner = "valloric"; repo = "youcompleteme"; - rev = "a7fd70cf7213c75088a47967c3e28aa4f6c47872"; - sha256 = "0knn6j85k6rpis3riv6j9nvxw7114ddz1fr1p6ayv4mhnyj669rc"; + rev = "8099995959e7e533306a2cadd38a2f83d2ea9ed9"; + sha256 = "1824jphq8mrswc594p032h459gn51mynfa5k8nnxkjws9c9myc4b"; fetchSubmodules = true; }; }; diff --git a/pkgs/misc/vim-plugins/overrides.nix b/pkgs/misc/vim-plugins/overrides.nix index b9c599da66c..f3f9b8825e6 100644 --- a/pkgs/misc/vim-plugins/overrides.nix +++ b/pkgs/misc/vim-plugins/overrides.nix @@ -115,12 +115,12 @@ self: super: { # NB: Make sure you pick a rev from the release branch! coc-nvim = buildVimPluginFrom2Nix rec { pname = "coc-nvim"; - version = "2019-11-18"; + version = "2019-11-29"; src = fetchFromGitHub { owner = "neoclide"; repo = "coc.nvim"; - rev = "a12d6833b4611f996528615186af86c3e041ffb6"; - sha256 = "0rkfhzyf42rbsv8p2337pvkbs3crz1z3vv6ar26sadjg3802118z"; + rev = "d566fa03807d8d86ce9302680d135198a36c7d4d"; + sha256 = "0m355w837f61jfpjrhi3h47z7vq16g8yai8kd82v1h71ns5fw9gz"; }; }; diff --git a/pkgs/misc/vim-plugins/update.py b/pkgs/misc/vim-plugins/update.py index 92a47bc5d13..0ef93ac569a 100755 --- a/pkgs/misc/vim-plugins/update.py +++ b/pkgs/misc/vim-plugins/update.py @@ -21,18 +21,54 @@ import xml.etree.ElementTree as ET from datetime import datetime from multiprocessing.dummy import Pool from pathlib import Path -from typing import Dict, List, Optional, Tuple, Union, Any +from typing import Dict, List, Optional, Tuple, Union, Any, Callable from urllib.parse import urljoin, urlparse from tempfile import NamedTemporaryFile -ATOM_ENTRY = "{http://www.w3.org/2005/Atom}entry" -ATOM_LINK = "{http://www.w3.org/2005/Atom}link" -ATOM_UPDATED = "{http://www.w3.org/2005/Atom}updated" +ATOM_ENTRY = "{http://www.w3.org/2005/Atom}entry" # " vim gets confused here +ATOM_LINK = "{http://www.w3.org/2005/Atom}link" # " +ATOM_UPDATED = "{http://www.w3.org/2005/Atom}updated" # " ROOT = Path(__file__).parent DEFAULT_IN = ROOT.joinpath("vim-plugin-names") DEFAULT_OUT = ROOT.joinpath("generated.nix") +import time +from functools import wraps + + +def retry(ExceptionToCheck: Any, tries: int = 4, delay: float = 3, backoff: float = 2): + """Retry calling the decorated function using an exponential backoff. + + http://www.saltycrane.com/blog/2009/11/trying-out-retry-decorator-python/ + original from: http://wiki.python.org/moin/PythonDecoratorLibrary#Retry + (BSD licensed) + + :param ExceptionToCheck: the exception on which to retry + :param tries: number of times to try (not retry) before giving up + :param delay: initial delay between retries in seconds + :param backoff: backoff multiplier e.g. value of 2 will double the delay + each retry + """ + + def deco_retry(f: Callable) -> Callable: + @wraps(f) + def f_retry(*args: Any, **kwargs: Any) -> Any: + mtries, mdelay = tries, delay + while mtries > 1: + try: + return f(*args, **kwargs) + except ExceptionToCheck as e: + print(f"{str(e)}, Retrying in {mdelay} seconds...") + time.sleep(mdelay) + mtries -= 1 + mdelay *= backoff + return f(*args, **kwargs) + + return f_retry # true decorator + + return deco_retry + class Repo: def __init__(self, owner: str, name: str) -> None: @@ -45,9 +81,12 @@ class Repo: def __repr__(self) -> str: return f"Repo({self.owner}, {self.name})" + @retry(urllib.error.URLError, tries=4, delay=3, backoff=2) def has_submodules(self) -> bool: try: - urllib.request.urlopen(self.url("blob/master/.gitmodules")).close() + urllib.request.urlopen( + self.url("blob/master/.gitmodules"), timeout=10 + ).close() except urllib.error.HTTPError as e: if e.code == 404: return False @@ -55,8 +94,9 @@ class Repo: raise return True + @retry(urllib.error.URLError, tries=4, delay=3, backoff=2) def latest_commit(self) -> Tuple[str, datetime]: - with urllib.request.urlopen(self.url("commits/master.atom")) as req: + with urllib.request.urlopen(self.url("commits/master.atom"), timeout=10) as req: xml = req.read() root = ET.fromstring(xml) latest_entry = root.find(ATOM_ENTRY) @@ -69,7 +109,7 @@ class Repo: updated_tag is not None and updated_tag.text is not None ), f"No updated tag found feed entry {xml}" updated = datetime.strptime(updated_tag.text, "%Y-%m-%dT%H:%M:%SZ") - return Path(url.path).name, updated + return Path(str(url.path)).name, updated def prefetch_git(self, ref: str) -> str: data = subprocess.check_output( @@ -210,20 +250,17 @@ def check_results( sys.exit(1) -def parse_plugin_line(line: str) -> Tuple[str, str, str]: +def parse_plugin_line(line: str) -> Tuple[str, str, Optional[str]]: + name, repo = line.split("/") try: - name, repo = line.split("/") - try: - repo, alias = repo.split(" as ") - return (name, repo, alias.strip()) - except ValueError: - # no alias defined - return (name, repo.strip(), None) + repo, alias = repo.split(" as ") + return (name, repo, alias.strip()) except ValueError: - return (None, None, None) + # no alias defined + return (name, repo.strip(), None) -def load_plugin_spec(plugin_file: str) -> List[Tuple[str, str]]: +def load_plugin_spec(plugin_file: str) -> List[Tuple[str, str, Optional[str]]]: plugins = [] with open(plugin_file) as f: for line in f: @@ -385,7 +422,7 @@ def main() -> None: try: # synchronous variant for debugging - # results = map(prefetch_with_cache, plugins) + # results = list(map(prefetch_with_cache, plugin_names)) pool = Pool(processes=30) results = pool.map(prefetch_with_cache, plugin_names) finally: diff --git a/pkgs/os-specific/linux/alsa-firmware/default.nix b/pkgs/os-specific/linux/alsa-firmware/default.nix index 53fcf7d6843..7f0ba5498df 100644 --- a/pkgs/os-specific/linux/alsa-firmware/default.nix +++ b/pkgs/os-specific/linux/alsa-firmware/default.nix @@ -1,11 +1,11 @@ {stdenv, fetchurl}: stdenv.mkDerivation rec { - name = "alsa-firmware-1.0.29"; + name = "alsa-firmware-1.2.1"; src = fetchurl { url = "mirror://alsa/firmware/${name}.tar.bz2"; - sha256 = "0gfcyj5anckjn030wcxx5v2xk2s219nyf99s9m833275b5wz2piw"; + sha256 = "1aq8z8ajpjvcx7bwhwp36bh5idzximyn77ygk3ifs0my3mbpr8mf"; }; configureFlags = [ diff --git a/pkgs/os-specific/linux/alsa-plugins/default.nix b/pkgs/os-specific/linux/alsa-plugins/default.nix index 2956b107aa7..a5262d6ae9e 100644 --- a/pkgs/os-specific/linux/alsa-plugins/default.nix +++ b/pkgs/os-specific/linux/alsa-plugins/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "alsa-plugins"; - version = "1.1.9"; + version = "1.2.1"; src = fetchurl { url = "mirror://alsa/plugins/${pname}-${version}.tar.bz2"; - sha256 = "01zrg0h2jw9dlj9233vjsn916yf4f2s667yry6xsn8d57lq745qn"; + sha256 = "1nj8cpbi05rb62yzs01c1k7lymdn1ch229b599hbhd0psixdx52d"; }; # ToDo: a52, etc.? diff --git a/pkgs/os-specific/linux/alsa-utils/default.nix b/pkgs/os-specific/linux/alsa-utils/default.nix index 6f23d190318..8b1faf788e5 100644 --- a/pkgs/os-specific/linux/alsa-utils/default.nix +++ b/pkgs/os-specific/linux/alsa-utils/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "alsa-utils"; - version = "1.1.9"; + version = "1.2.1"; src = fetchurl { url = "mirror://alsa/utils/${pname}-${version}.tar.bz2"; - sha256 = "0fi11b7r8hg1bdjw74s8sqx8rc4qb310jaj9lsia9labvfyjrpsx"; + sha256 = "039c19b7091is0czl9jlrfczp7pp1jpdri0vvc4k07gl3skhn48b"; }; patchPhase = '' diff --git a/pkgs/os-specific/linux/ati-drivers/builder.sh b/pkgs/os-specific/linux/ati-drivers/builder.sh index c848365f599..09d218e8745 100644 --- a/pkgs/os-specific/linux/ati-drivers/builder.sh +++ b/pkgs/os-specific/linux/ati-drivers/builder.sh @@ -246,9 +246,9 @@ if test -z "$libsOnly"; then ( # build and install fgl_glxgears cd fgl_glxgears; gcc -DGL_ARB_texture_multisample=1 -g \ - -I$libGLU libGL/include \ + -I$libGL/include -I$libGLU/include \ -I$out/include \ - -L$libGLU libGL/lib -lGL -lGLU -lX11 -lm \ + -L$libGL/lib -L$libGLU/lib -lGL -lGLU -lX11 -lm \ -o $out/bin/fgl_glxgears -Wall fgl_glxgears.c ) diff --git a/pkgs/os-specific/linux/kernel/common-config.nix b/pkgs/os-specific/linux/kernel/common-config.nix index 736e872f1ba..ff3e4fb2562 100644 --- a/pkgs/os-specific/linux/kernel/common-config.nix +++ b/pkgs/os-specific/linux/kernel/common-config.nix @@ -739,6 +739,9 @@ let } // optionalAttrs (stdenv.hostPlatform.system == "aarch64-linux") { # Enables support for the Allwinner Display Engine 2.0 SUN8I_DE2_CCU = whenAtLeast "4.13" yes; + + # See comments on https://github.com/NixOS/nixpkgs/commit/9b67ea9106102d882f53d62890468071900b9647 + CRYPTO_AEGIS128_SIMD = no; }; }; in diff --git a/pkgs/os-specific/linux/kernel/linux-4.4.nix b/pkgs/os-specific/linux/kernel/linux-4.4.nix index 35bd141ae46..19a393cbc7c 100644 --- a/pkgs/os-specific/linux/kernel/linux-4.4.nix +++ b/pkgs/os-specific/linux/kernel/linux-4.4.nix @@ -1,11 +1,11 @@ { stdenv, buildPackages, fetchurl, perl, buildLinux, ... } @ args: buildLinux (args // rec { - version = "4.4.202"; + version = "4.4.203"; extraMeta.branch = "4.4"; src = fetchurl { url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz"; - sha256 = "0adrmps7izfqy0yn4440isxvigslwzk1a375r9kh86idwbmcxb7x"; + sha256 = "02krniihix9mb9bc0ffs03q4i9grjhwymnfp10h1r6gmxa554qlj"; }; } // (args.argsOverride or {})) diff --git a/pkgs/os-specific/linux/microcode/intel.nix b/pkgs/os-specific/linux/microcode/intel.nix index 4ada201263f..70b2580b664 100644 --- a/pkgs/os-specific/linux/microcode/intel.nix +++ b/pkgs/os-specific/linux/microcode/intel.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "microcode-intel"; - version = "20191113"; + version = "20191115"; src = fetchFromGitHub { owner = "intel"; repo = "Intel-Linux-Processor-Microcode-Data-Files"; rev = "microcode-${version}"; - sha256 = "04138j9n14197ybkh2vxfjy21wcgvbd183ya4b6k262y9nzjmvsa"; + sha256 = "0pzi5qmrcrdf6nsds4bvyq1hnvv9d1dlrvqrbzcrpxk84rcjwq1x"; }; nativeBuildInputs = [ iucode-tool libarchive ]; @@ -28,5 +28,6 @@ stdenv.mkDerivation rec { description = "Microcode for Intel processors"; license = licenses.unfreeRedistributableFirmware; platforms = platforms.linux; + maintainers = with maintainers; [ andir ]; }; } diff --git a/pkgs/os-specific/linux/open-iscsi/default.nix b/pkgs/os-specific/linux/open-iscsi/default.nix index 090b9d7183d..34e2591d44a 100644 --- a/pkgs/os-specific/linux/open-iscsi/default.nix +++ b/pkgs/os-specific/linux/open-iscsi/default.nix @@ -4,7 +4,7 @@ stdenv.mkDerivation rec { pname = "open-iscsi"; - version = "2.0.878"; + version = "2.1.0"; nativeBuildInputs = [ autoconf automake gettext libtool perl pkgconf ]; buildInputs = [ kmod openisns.lib openssl systemd utillinux ]; @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { owner = "open-iscsi"; repo = "open-iscsi"; rev = version; - sha256 = "0hkprlni0z1zdkrmhd897knyfws0l95bz67fgp0vvf63ag08b5ly"; + sha256 = "0z7rnbfa48j3r4ij7335xgjfb835gnnp10v7q6lvwg7bq6v5xvih"; }; DESTDIR = "$(out)"; @@ -30,6 +30,10 @@ stdenv.mkDerivation rec { $out/sbin/iscsistart -v ''; + postFixup = '' + sed -i "s|/sbin/iscsiadm|$out/bin/iscsiadm|" $out/bin/iscsi_fw_login + ''; + meta = with stdenv.lib; { description = "A high performance, transport independent, multi-platform implementation of RFC3720"; license = licenses.gpl2; diff --git a/pkgs/os-specific/linux/openrazer/driver.nix b/pkgs/os-specific/linux/openrazer/driver.nix index 355108f56e4..a6bf67db098 100644 --- a/pkgs/os-specific/linux/openrazer/driver.nix +++ b/pkgs/os-specific/linux/openrazer/driver.nix @@ -14,7 +14,7 @@ stdenv.mkDerivation (common // { nativeBuildInputs = kernel.moduleBuildDependencies; buildFlags = [ - "KERNELDIR=${kernel.dev}/lib/modules/${kernel.version}/build" + "KERNELDIR=${kernel.dev}/lib/modules/${kernel.modDirVersion}/build" ]; installPhase = '' diff --git a/pkgs/servers/atlassian/confluence.nix b/pkgs/servers/atlassian/confluence.nix index d7fb5b55468..4d403e7d938 100644 --- a/pkgs/servers/atlassian/confluence.nix +++ b/pkgs/servers/atlassian/confluence.nix @@ -5,11 +5,11 @@ stdenv.mkDerivation rec { pname = "atlassian-confluence"; - version = "7.0.2"; + version = "7.0.3"; src = fetchurl { url = "https://product-downloads.atlassian.com/software/confluence/downloads/${pname}-${version}.tar.gz"; - sha256 = "00ma2l6gknlpaf2k26md9fskgzcllky3vv89sb1izsrxl8la1dhq"; + sha256 = "1anmhfdy4q74wchzha8fd2bd5hx0a2v3bgp9p5yvb8cal31zqcpd"; }; buildPhase = '' diff --git a/pkgs/servers/dns/bind/default.nix b/pkgs/servers/dns/bind/default.nix index 40a116f5665..e13967d7af1 100644 --- a/pkgs/servers/dns/bind/default.nix +++ b/pkgs/servers/dns/bind/default.nix @@ -10,11 +10,11 @@ assert enablePython -> python3 != null; stdenv.mkDerivation rec { pname = "bind"; - version = "9.14.7"; + version = "9.14.8"; src = fetchurl { url = "https://ftp.isc.org/isc/bind9/${version}/${pname}-${version}.tar.gz"; - sha256 = "07998nx0yv3xy8c62b1ira9qygsgvpljwcgb47ypzxq8b57gb86f"; + sha256 = "0xm0xrpgxq6gk6r6aa2w0lygnq02y1p614dmyjdmlsfnrrsslig5"; }; outputs = [ "out" "lib" "dev" "man" "dnsutils" "host" ]; diff --git a/pkgs/servers/freeradius/default.nix b/pkgs/servers/freeradius/default.nix index eeea3298ecd..cbd71085340 100644 --- a/pkgs/servers/freeradius/default.nix +++ b/pkgs/servers/freeradius/default.nix @@ -43,11 +43,11 @@ assert withRest -> curl != null && withJson; with stdenv.lib; stdenv.mkDerivation rec { pname = "freeradius"; - version = "3.0.19"; + version = "3.0.20"; src = fetchurl { url = "ftp://ftp.freeradius.org/pub/freeradius/freeradius-server-${version}.tar.gz"; - sha256 = "0v5b46rq878093ff549ijccy98md1l7l4rvshjxs672il0zvq5i4"; + sha256 = "0zrnlpril8lcnyd6zz0wy45wj5i2k2krcf42dwa0rldjsjh6nazp"; }; nativeBuildInputs = [ autoreconfHook ]; diff --git a/pkgs/servers/gotify/default.nix b/pkgs/servers/gotify/default.nix index 06663a87bcd..cce37fd8e6b 100644 --- a/pkgs/servers/gotify/default.nix +++ b/pkgs/servers/gotify/default.nix @@ -10,13 +10,15 @@ buildGoModule rec { pname = "gotify-server"; - version = "2.0.10"; + # Note that when this is updated, along with the hash, the `ui.nix` file + # should include the same changes to the version and the sha256. + version = "2.0.11"; src = fetchFromGitHub { owner = "gotify"; repo = "server"; rev = "v${version}"; - sha256 = "0f7y6gkxikdfjhdxplkv494ss2b0fqmibd2kl9nifabggfz5gjal"; + sha256 = "0zrylyaxy1cks1wlzyf0di8in2braj4pfriyqa24vipwrlnhvgs6"; }; modSha256 = "19mghbs1jasb7vxdw13mmwsbk5sfg3y2vvddr73c82lq0f8g2iha"; diff --git a/pkgs/servers/gotify/ui.nix b/pkgs/servers/gotify/ui.nix index e1277a2db21..a47e5279585 100644 --- a/pkgs/servers/gotify/ui.nix +++ b/pkgs/servers/gotify/ui.nix @@ -8,13 +8,13 @@ yarn2nix-moretea.mkYarnPackage rec { packageJSON = ./package.json; yarnNix = ./yarndeps.nix; - version = "2.0.8"; + version = "2.0.11"; src_all = fetchFromGitHub { owner = "gotify"; repo = "server"; rev = "v${version}"; - sha256 = "17bxs3wcazrxippf3i9w7d2mq8lf0v5m4bn3nl2zb8v8dl3lsc9a"; + sha256 = "0zrylyaxy1cks1wlzyf0di8in2braj4pfriyqa24vipwrlnhvgs6"; }; src = "${src_all}/ui"; diff --git a/pkgs/servers/gotify/yarndeps.nix b/pkgs/servers/gotify/yarndeps.nix index 02886c27f04..0e81e890a9f 100644 --- a/pkgs/servers/gotify/yarndeps.nix +++ b/pkgs/servers/gotify/yarndeps.nix @@ -706,6 +706,14 @@ }; } { + name = "_babel_runtime___runtime_7.6.3.tgz"; + path = fetchurl { + name = "_babel_runtime___runtime_7.6.3.tgz"; + url = "https://registry.yarnpkg.com/@babel/runtime/-/runtime-7.6.3.tgz"; + sha1 = "935122c74c73d2240cafd32ddb5fc2a6cd35cf1f"; + }; + } + { name = "_babel_template___template_7.4.4.tgz"; path = fetchurl { name = "_babel_template___template_7.4.4.tgz"; @@ -890,11 +898,11 @@ }; } { - name = "_material_ui_icons___icons_4.4.3.tgz"; + name = "_material_ui_icons___icons_4.5.1.tgz"; path = fetchurl { - name = "_material_ui_icons___icons_4.4.3.tgz"; - url = "https://registry.yarnpkg.com/@material-ui/icons/-/icons-4.4.3.tgz"; - sha1 = "5d4346ddbb2673a1b57ebc78fd6d50bcd88711db"; + name = "_material_ui_icons___icons_4.5.1.tgz"; + url = "https://registry.yarnpkg.com/@material-ui/icons/-/icons-4.5.1.tgz"; + sha1 = "6963bad139e938702ece85ca43067688018f04f8"; }; } { diff --git a/pkgs/servers/http/nginx/generic.nix b/pkgs/servers/http/nginx/generic.nix index 3edbed22b6b..2c0dbc7d665 100644 --- a/pkgs/servers/http/nginx/generic.nix +++ b/pkgs/servers/http/nginx/generic.nix @@ -1,5 +1,6 @@ { stdenv, fetchurl, fetchpatch, openssl, zlib, pcre, libxml2, libxslt -, substituteAll, gd, geoip +, nixosTests +, substituteAll, gd, geoip, perl , withDebug ? false , withStream ? true , withMail ? false @@ -29,7 +30,7 @@ stdenv.mkDerivation { inherit sha256; }; - buildInputs = [ openssl zlib pcre libxml2 libxslt gd geoip ] + buildInputs = [ openssl zlib pcre libxml2 libxslt gd geoip perl ] ++ mapModules "inputs"; configureFlags = [ @@ -52,8 +53,6 @@ stdenv.mkDerivation { "--with-http_stub_status_module" "--with-threads" "--with-pcre-jit" - # Install destination problems - # "--with-http_perl_module" ] ++ optional withDebug [ "--with-debug" ] ++ optional withStream [ @@ -65,6 +64,10 @@ stdenv.mkDerivation { ] ++ optional withMail [ "--with-mail" "--with-mail_ssl_module" + ] ++ optional (perl != null) [ + "--with-http_perl_module" + "--with-perl=${perl}/bin/perl" + "--with-perl_modules_path=lib/perl5" ] ++ optional (gd != null) "--with-http_image_filter_module" ++ optional (with stdenv.hostPlatform; isLinux || isFreeBSD) "--with-file-aio" @@ -107,7 +110,10 @@ stdenv.mkDerivation { mv $out/sbin $out/bin ''; - passthru.modules = modules; + passthru = { + modules = modules; + tests.nginx = nixosTests.nginx; + }; meta = { description = "A reverse proxy and lightweight webserver"; diff --git a/pkgs/servers/jellyfin/default.nix b/pkgs/servers/jellyfin/default.nix index 1f91e318c7f..3ceeb73e4ef 100644 --- a/pkgs/servers/jellyfin/default.nix +++ b/pkgs/servers/jellyfin/default.nix @@ -18,12 +18,12 @@ let in stdenv.mkDerivation rec { pname = "jellyfin"; - version = "10.4.1"; + version = "10.4.2"; # Impossible to build anything offline with dotnet src = fetchurl { url = "https://github.com/jellyfin/jellyfin/releases/download/v${version}/jellyfin_${version}_portable.tar.gz"; - sha256 = "0lv1xd3bfbf9khiqlahry2im1mvgl3cj5m3zfd7mf61il5rz70f9"; + sha256 = "08y3bxyqwpa28hgvvpiksbvss9wahmxprbi2dsm4gks9ba412f2f"; }; buildInputs = [ diff --git a/pkgs/servers/memcached/default.nix b/pkgs/servers/memcached/default.nix index 9e7550a7171..dfb3ac2cfa2 100644 --- a/pkgs/servers/memcached/default.nix +++ b/pkgs/servers/memcached/default.nix @@ -1,12 +1,12 @@ {stdenv, fetchurl, cyrus_sasl, libevent}: stdenv.mkDerivation rec { - version = "1.5.19"; + version = "1.5.20"; pname = "memcached"; src = fetchurl { url = "https://memcached.org/files/${pname}-${version}.tar.gz"; - sha256 = "1q2bb858iwc1jncav5vfl8c7dic9r1wqni5724qmy8ads6idmp1x"; + sha256 = "1r511qr95q0ywdaql3pdjiwzkfqxhhfzb13ilvl7mznfm4iv1myg"; }; configureFlags = [ diff --git a/pkgs/servers/metabase/default.nix b/pkgs/servers/metabase/default.nix index 5babc638e26..5c0fa2886dc 100644 --- a/pkgs/servers/metabase/default.nix +++ b/pkgs/servers/metabase/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "metabase"; - version = "0.33.2"; + version = "0.33.6"; src = fetchurl { url = "http://downloads.metabase.com/v${version}/metabase.jar"; - sha256 = "0sbh3xc4scp3qflnd0v7bd224w43rby20nzxb7xn2c80jwninnnl"; + sha256 = "1q5d323fzfvlc12v1g0mahlcz2sjii3k7cc6qg8q4q8yl0vg5c9k"; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/pkgs/servers/monitoring/grafana/default.nix b/pkgs/servers/monitoring/grafana/default.nix index 2a708a6d8c7..7e2aaa66257 100644 --- a/pkgs/servers/monitoring/grafana/default.nix +++ b/pkgs/servers/monitoring/grafana/default.nix @@ -2,7 +2,7 @@ buildGoPackage rec { pname = "grafana"; - version = "6.4.5"; + version = "6.5.1"; goPackagePath = "github.com/grafana/grafana"; @@ -12,12 +12,12 @@ buildGoPackage rec { rev = "v${version}"; owner = "grafana"; repo = "grafana"; - sha256 = "0chfskz3j0jc25fj7zpbs46lp6a426gz6nigiana04sqylmxm851"; + sha256 = "1hcfn9dgx8vabadagm69dgk5sdyc1kxkbma2ryfdb0v6vpm01784"; }; srcStatic = fetchurl { url = "https://dl.grafana.com/oss/release/grafana-${version}.linux-amd64.tar.gz"; - sha256 = "0sfs8kv4sxacly39ddy05i3gv14i7d14fc1fb952kdx0zzm8zray"; + sha256 = "1m2rxxgs8sf8qrg0bk3i2gy17q6n4nk4cwlp9bbffwmwcmf78gnw"; }; postPatch = '' diff --git a/pkgs/servers/monitoring/prometheus/postgres-exporter.nix b/pkgs/servers/monitoring/prometheus/postgres-exporter.nix index 410687d0335..e8af00b277b 100644 --- a/pkgs/servers/monitoring/prometheus/postgres-exporter.nix +++ b/pkgs/servers/monitoring/prometheus/postgres-exporter.nix @@ -2,7 +2,7 @@ buildGoPackage rec { pname = "postgres_exporter"; - version = "0.7.0"; + version = "0.8.0"; goPackagePath = "github.com/wrouesnel/postgres_exporter"; @@ -10,7 +10,7 @@ buildGoPackage rec { owner = "wrouesnel"; repo = "postgres_exporter"; rev = "v${version}"; - sha256 = "0xi61090kmkp1cid3hx00csfa4w8nvaw8ky0w004czwqlyids6jg"; + sha256 = "0mid2kvskab3a32jscygg5jh0741nr7dvxzj4v029yiiqcx55nrc"; }; doCheck = true; diff --git a/pkgs/servers/monitoring/prometheus/varnish-exporter.nix b/pkgs/servers/monitoring/prometheus/varnish-exporter.nix index a629a2a27e2..d7767567195 100644 --- a/pkgs/servers/monitoring/prometheus/varnish-exporter.nix +++ b/pkgs/servers/monitoring/prometheus/varnish-exporter.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "prometheus_varnish_exporter"; - version = "1.5.1"; + version = "1.5.2"; src = fetchFromGitHub { owner = "jonnenauha"; repo = "prometheus_varnish_exporter"; rev = version; - sha256 = "1lvs44936n3s9z6c5169jbvx390n5g0qk4pcrmnkndg796ixjshd"; + sha256 = "0rpabw6a6paavv62f0gzhax9brzcgkly27rhkf0ihw8736gkw8ar"; }; modSha256 = "0w1zg9jc2466srx9pdckw7rzn7ma4pbd0617b1h98v364wjzgj72"; diff --git a/pkgs/servers/mtprotoproxy/default.nix b/pkgs/servers/mtprotoproxy/default.nix index 523713e9d4d..550ee4c160f 100644 --- a/pkgs/servers/mtprotoproxy/default.nix +++ b/pkgs/servers/mtprotoproxy/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "mtprotoproxy"; - version = "1.0.7"; + version = "1.0.8"; src = fetchFromGitHub { owner = "alexbers"; repo = "mtprotoproxy"; rev = "v${version}"; - sha256 = "1j8bxwcq968h5sd58g03yc4zjqkhkjdn0f04vr826hhsdxy853r4"; + sha256 = "1bpgbqbgy7c637bzm6g5msm2i10dfl4qb7psy3k3cbaysw696kjc"; }; nativeBuildInputs = [ wrapPython ]; diff --git a/pkgs/servers/nosql/eventstore/default.nix b/pkgs/servers/nosql/eventstore/default.nix index bc1aee8a687..21658a273b4 100644 --- a/pkgs/servers/nosql/eventstore/default.nix +++ b/pkgs/servers/nosql/eventstore/default.nix @@ -16,13 +16,13 @@ in stdenv.mkDerivation rec { pname = "EventStore"; - version = "5.0.2"; + version = "5.0.5"; src = fetchFromGitHub { owner = "EventStore"; repo = "EventStore"; rev = "oss-v${version}"; - sha256 = "0hjc64lmi9x1sq8zk24iag14k424l72g1n4z7wf7gaygd07kx9k8"; + sha256 = "0cnpw24fvnj0q644p9jlijcqz6bxi61g0b59g52d3qxfydr0lgs0"; }; buildInputs = [ diff --git a/pkgs/servers/nosql/redis/default.nix b/pkgs/servers/nosql/redis/default.nix index f7a67ce398d..4b1003db284 100644 --- a/pkgs/servers/nosql/redis/default.nix +++ b/pkgs/servers/nosql/redis/default.nix @@ -1,12 +1,12 @@ -{ stdenv, fetchurl, lua, jemalloc }: +{ stdenv, fetchurl, lua, jemalloc, nixosTests }: stdenv.mkDerivation rec { - version = "5.0.6"; + version = "5.0.7"; pname = "redis"; src = fetchurl { url = "http://download.redis.io/releases/${pname}-${version}.tar.gz"; - sha256 = "1cr2dn9ilhj52snmlz38fw30gdlgbxq2sadyspawahp1cw988936"; + sha256 = "0ax8sf3vw0yadr41kzc04917scrg5wir1d94zmbz00b8pzm79nv1"; }; # Cross-compiling fixes @@ -29,6 +29,8 @@ stdenv.mkDerivation rec { doCheck = false; # needs tcl + passthru.tests.redis = nixosTests.redis; + meta = with stdenv.lib; { homepage = https://redis.io; description = "An open source, advanced key-value store"; diff --git a/pkgs/servers/routinator/default.nix b/pkgs/servers/routinator/default.nix index 360cc4d27d8..7d91dc91a93 100644 --- a/pkgs/servers/routinator/default.nix +++ b/pkgs/servers/routinator/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "routinator"; - version = "0.6.2"; + version = "0.6.4"; src = fetchFromGitHub { owner = "NLnetLabs"; repo = pname; rev = "v${version}"; - sha256 = "0v0j8lv1l7mxxwv7ycissya0rrvjqidb37dylqqy4zvirmk1b2av"; + sha256 = "1hbqvjv9h1aghpyrl03w5f4j8gjy6n9lx83rmpsh5p7yd9ahwmf9"; }; - cargoSha256 = "19333br2r27s0rsv7imsv2y1j9gmljy4v8bqybvblrw1vc5961kq"; + cargoSha256 = "08lizhag7aqz3a59gaapsymn7sf9c6im1aw64n0r9a5advhwdh18"; meta = with stdenv.lib; { description = "An RPKI Validator written in Rust"; diff --git a/pkgs/servers/samba/3.x.nix b/pkgs/servers/samba/3.x.nix deleted file mode 100644 index 1f432c18988..00000000000 --- a/pkgs/servers/samba/3.x.nix +++ /dev/null @@ -1,99 +0,0 @@ -{ stdenv, fetchurl, readline, pam ? null, openldap ? null -, popt, iniparser, libunwind -, fam ? null , acl ? null, cups ? null -, useKerberos ? false, kerberos ? null, winbind ? true - -# Eg. smbclient and smbspool require a smb.conf file. -# If you set configDir to "" an empty configuration file -# $out/lib/smb.conf is is created for you. -# -# configDir defaults to "/etc/samba" so that smbpassword picks up -# the location of its passwd db files from the system configuration file -# /etc/samba/smb.conf. That's why nixos touches /etc/samba/smb.conf even if you -# don't enable the samba upstart service. -, configDir ? "/etc/samba" - -}: - -assert useKerberos -> kerberos != null; - -stdenv.mkDerivation rec { - name = "samba-3.6.25"; - - src = fetchurl { - url = "mirror://samba/pub/samba/stable/${name}.tar.gz"; - sha256 = "0l9pz2m67vf398q3c2dwn8jwdxsjb20igncf4byhv6yq5dzqlb4g"; - }; - - patches = [(fetchurl { - url = "https://download.samba.org/pub/samba/patches/security/" - + "samba-3.6.25-security-2015-12-16.patch"; - sha256 = "00dcjcn577825mfdwdp76jfy5kcrqw3s4d5c41gqdq5gfcdbmqdb"; - })]; - - buildInputs = [ readline pam openldap popt iniparser libunwind fam acl cups ] - ++ stdenv.lib.optional useKerberos kerberos; - - enableParallelBuilding = true; - - postPatch = - # XXX: Awful hack to allow cross-compilation. - '' sed -i source3/configure \ - -e 's/^as_fn_error .. \("cannot run test program while cross compiling\)/$as_echo \1/g' - ''; # " - - preConfigure = - '' cd source3 - export samba_cv_CC_NEGATIVE_ENUM_VALUES=yes - export libreplace_cv_HAVE_GETADDRINFO=yes - export ac_cv_file__proc_sys_kernel_core_pattern=no # XXX: true on Linux, false elsewhere - ''; - - configureFlags = - stdenv.lib.optionals (pam != null) [ "--with-pam" "--with-pam_smbpass" ] - ++ [ "--with-aio-support" - "--disable-swat" - "--with-configdir=${configDir}" - "--with-fhs" - "--localstatedir=/var" - ] - ++ (stdenv.lib.optional winbind "--with-winbind") - ++ (stdenv.lib.optional (stdenv.cc.libc != null) "--with-libiconv=${stdenv.cc.libc}"); - - # Need to use a DESTDIR because `make install' tries to write in /var and /etc. - installFlags = "DESTDIR=$(TMPDIR)/inst"; - - stripAllList = [ "bin" "sbin" ]; - - postInstall = - '' - mkdir -p $out - mv $TMPDIR/inst/$out/* $out/ - - mkdir -p "$out/lib/pkgconfig" - cp pkgconfig/*.pc "$out/lib/pkgconfig" - - mkdir -pv $out/lib/cups/backend - ln -sv ../../../bin/smbspool $out/lib/cups/backend/smb - mkdir -pv $out/etc/openldap/schema - cp ../examples/LDAP/samba.schema $out/etc/openldap/schema - - # For nsswitch. Glibc >= 2.1 looks for libnss_<name>.so.2 (see man - # nsswitch.conf), so provide that too. - cp -v ../nsswitch/libnss_wins.so "$out/lib" - cp -v ../nsswitch/libnss_winbind.so "$out/lib" - (cd "$out/lib" && ln -s libnss_winbind.so libnss_winbind.so.2) - (cd "$out/lib" && ln -s libnss_wins.so libnss_wins.so.2) - '' # */ - + stdenv.lib.optionalString (configDir == "") "touch $out/lib/smb.conf"; - - meta = with stdenv.lib; { - homepage = https://www.samba.org/; - description = "The standard Windows interoperability suite of programs for Linux and Unix"; - platforms = platforms.linux; - license = licenses.gpl3; - knownVulnerabilities = [ - "Numerous CVEs and no patches from upstream for 3.x since 2014." - ]; - }; -} diff --git a/pkgs/servers/sql/mysql/8.0.x.nix b/pkgs/servers/sql/mysql/8.0.x.nix index 8785e052224..fcb64550d6f 100644 --- a/pkgs/servers/sql/mysql/8.0.x.nix +++ b/pkgs/servers/sql/mysql/8.0.x.nix @@ -5,10 +5,11 @@ let self = stdenv.mkDerivation rec { - name = "mysql-8.0.17"; + pname = "mysql"; + version = "8.0.17"; src = fetchurl { - url = "https://dev.mysql.com/get/Downloads/MySQL-${self.mysqlVersion}/${name}.tar.gz"; + url = "https://dev.mysql.com/get/Downloads/MySQL-${self.mysqlVersion}/${pname}-${version}.tar.gz"; sha256 = "1mjrlxn8vigi69r0r674j2dibdnkaar01ji5965gsyx7k60z7qy6"; }; diff --git a/pkgs/servers/sql/postgresql/ext/pgtap.nix b/pkgs/servers/sql/postgresql/ext/pgtap.nix index 804356e9f6b..54e92b977bc 100644 --- a/pkgs/servers/sql/postgresql/ext/pgtap.nix +++ b/pkgs/servers/sql/postgresql/ext/pgtap.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "pgtap"; - version = "1.0.0"; + version = "1.1.0"; src = fetchFromGitHub { owner = "theory"; repo = "pgtap"; rev = "v${version}"; - sha256 = "0ks53lsrpa8yxav8jh0jlvs25y6p7mkcdch8il1kvib9k5zq2wnb"; + sha256 = "09fvzsl8m18yzpvrz6cqvs1ffzs451iwmb2mw39yq69jgqby5kqy"; }; nativeBuildInputs = [ postgresql perl perlPackages.TAPParserSourceHandlerpgTAP which ]; diff --git a/pkgs/servers/web-apps/matomo/default.nix b/pkgs/servers/web-apps/matomo/default.nix index e990a16c038..98c532d5ddc 100644 --- a/pkgs/servers/web-apps/matomo/default.nix +++ b/pkgs/servers/web-apps/matomo/default.nix @@ -52,7 +52,7 @@ stdenv.mkDerivation rec { installPhase = '' runHook preInstall - # copy evertything to share/, used as webroot folder, and then remove what's known to be not needed + # copy everything to share/, used as webroot folder, and then remove what's known to be not needed mkdir -p $out/share cp -ra * $out/share/ # tmp/ is created by matomo in PIWIK_USER_PATH @@ -66,6 +66,27 @@ stdenv.mkDerivation rec { runHook postInstall ''; + filesToFix = [ + "misc/composer/build-xhprof.sh" + "misc/composer/clean-xhprof.sh" + "misc/cron/archive.sh" + "plugins/Installation/FormDatabaseSetup.php" + "vendor/leafo/lessphp/package.sh" + "vendor/pear/archive_tar/sync-php4" + "vendor/szymach/c-pchart/coverage.sh" + ]; + + # This fixes the consistency check in the admin interface + postFixup = '' + pushd $out/share > /dev/null + for f in $filesToFix; do + length="$(wc -c "$f" | cut -d' ' -f1)" + hash="$(md5sum "$f" | cut -d' ' -f1)" + sed -i "s:\\(\"$f\"[^(]*(\\).*:\\1\"$length\", \"$hash\"),:g" config/manifest.inc.php + done + popd > /dev/null + ''; + meta = with stdenv.lib; { description = "A real-time web analytics application"; license = licenses.gpl3Plus; diff --git a/pkgs/servers/x11/xorg/default.nix b/pkgs/servers/x11/xorg/default.nix index ec7246c4eb0..f83d76a3c2b 100644 --- a/pkgs/servers/x11/xorg/default.nix +++ b/pkgs/servers/x11/xorg/default.nix @@ -2691,12 +2691,12 @@ lib.makeScope newScope (self: with self; { meta.platforms = stdenv.lib.platforms.unix; }) {}; - xorgserver = callPackage ({ stdenv, fetchpatch, pkgconfig, fetchurl, xorgproto, openssl, libX11, libXau, libXaw, libxcb, xcbutil, xcbutilwm, xcbutilimage, xcbutilkeysyms, xcbutilrenderutil, libXdmcp, libXfixes, libxkbfile, libXmu, libXpm, libXrender, libXres, libXt }: stdenv.mkDerivation { - name = "xorg-server-1.20.5"; + xorgserver = callPackage ({ stdenv, pkgconfig, fetchurl, xorgproto, openssl, libX11, libXau, libXaw, libxcb, xcbutil, xcbutilwm, xcbutilimage, xcbutilkeysyms, xcbutilrenderutil, libXdmcp, libXfixes, libxkbfile, libXmu, libXpm, libXrender, libXres, libXt }: stdenv.mkDerivation { + name = "xorg-server-1.20.6"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/individual/xserver/xorg-server-1.20.5.tar.bz2; - sha256 = "17dc3g8cc55nbkx3np64dsz04n621dnzjmcc9wys0xbyyd1q47d8"; + url = mirror://xorg/individual/xserver/xorg-server-1.20.6.tar.bz2; + sha256 = "1laib9z17jksgzb67z69blcmnpbvj7i7m604b5ns7s760iii85k3"; }; hardeningDisable = [ "bindnow" "relro" ]; nativeBuildInputs = [ pkgconfig ]; diff --git a/pkgs/servers/x11/xorg/overrides.nix b/pkgs/servers/x11/xorg/overrides.nix index 60bda89835f..c334365d8b5 100644 --- a/pkgs/servers/x11/xorg/overrides.nix +++ b/pkgs/servers/x11/xorg/overrides.nix @@ -592,16 +592,6 @@ self: super: propagatedBuildInputs = [ libpciaccess epoxy ] ++ commonPropagatedBuildInputs ++ lib.optionals stdenv.isLinux [ udev ]; - # patchPhase is not working, this is a hack but we can remove it in the next xorg-server release - preConfigure = let - headerFix = fetchpatch { - url = "https://gitlab.freedesktop.org/xorg/xserver/commit/741bd73429e337071f49509ddcc5fb392e20b0f6.patch"; - sha256 = "0qjiin9pkggl3c33lfkpn9a9z8ldjpb3y47cflsjkfn868gsk8ri"; - excludes = [ "hw/xwayland/xwayland-glx.c" ]; # File not in release yet - }; - in '' - patch -p1 < ${headerFix} - ''; prePatch = stdenv.lib.optionalString stdenv.hostPlatform.isMusl '' export CFLAGS+=" -D__uid_t=uid_t -D__gid_t=gid_t" ''; diff --git a/pkgs/servers/x11/xorg/tarballs.list b/pkgs/servers/x11/xorg/tarballs.list index 9f4621316fc..2fcf09cd9fb 100644 --- a/pkgs/servers/x11/xorg/tarballs.list +++ b/pkgs/servers/x11/xorg/tarballs.list @@ -218,4 +218,4 @@ mirror://xorg/individual/util/lndir-1.0.3.tar.bz2 mirror://xorg/individual/util/makedepend-1.0.6.tar.bz2 mirror://xorg/individual/util/util-macros-1.19.2.tar.bz2 mirror://xorg/individual/util/xorg-cf-files-1.0.6.tar.bz2 -mirror://xorg/individual/xserver/xorg-server-1.20.5.tar.bz2 +mirror://xorg/individual/xserver/xorg-server-1.20.6.tar.bz2 diff --git a/pkgs/servers/x11/xorg/xwayland.nix b/pkgs/servers/x11/xorg/xwayland.nix index 06f54fd5207..d033f211c3a 100644 --- a/pkgs/servers/x11/xorg/xwayland.nix +++ b/pkgs/servers/x11/xorg/xwayland.nix @@ -1,16 +1,18 @@ -{ stdenv, wayland, wayland-protocols, xorgserver, xkbcomp, xkeyboard_config, epoxy, libxslt, libunwind, makeWrapper }: +{ stdenv, wayland, wayland-protocols, xorgserver, xkbcomp, xkeyboard_config, epoxy, libxslt, libunwind, makeWrapper, egl-wayland }: with stdenv.lib; xorgserver.overrideAttrs (oldAttrs: { name = "xwayland-${xorgserver.version}"; + buildInputs = oldAttrs.buildInputs ++ [ egl-wayland ]; propagatedBuildInputs = oldAttrs.propagatedBuildInputs ++ [wayland wayland-protocols epoxy libxslt makeWrapper libunwind]; configureFlags = [ "--disable-docs" "--disable-devel-docs" "--enable-xwayland" + "--enable-xwayland-eglstream" "--disable-xorg" "--disable-xvfb" "--disable-xnest" diff --git a/pkgs/shells/nushell/default.nix b/pkgs/shells/nushell/default.nix index 91684504774..3b37610eced 100644 --- a/pkgs/shells/nushell/default.nix +++ b/pkgs/shells/nushell/default.nix @@ -13,16 +13,16 @@ rustPlatform.buildRustPackage rec { pname = "nushell"; - version = "0.5.0"; + version = "0.6.0"; src = fetchFromGitHub { owner = pname; repo = pname; - rev = "0_5_0"; - sha256 = "1s60w29c8sv0a4nmpggls9pkqyfrwwxjzd65p68d1xxxsdb36rzj"; + rev = version; + sha256 = "012fhy7ni4kyxypn25ssj6py1zxwk41bj4xb1ni4zaw47fqsj1nw"; }; - cargoSha256 = "0b8alc3si6y4xmn812izknbkfkz64kz7kcnq4xaqws6iqn7pqidp"; + cargoSha256 = "17r6g80qcy1mb195fl5iwcr83d35q2hs71camhwjbdh8yrs9l1la"; nativeBuildInputs = [ pkg-config ] ++ stdenv.lib.optionals (withAllFeatures && stdenv.isLinux) [ python3 ]; @@ -32,7 +32,7 @@ rustPlatform.buildRustPackage rec { ++ stdenv.lib.optionals (withAllFeatures && stdenv.isLinux) [ xorg.libX11 ] ++ stdenv.lib.optionals (withAllFeatures && stdenv.isDarwin) [ AppKit ]; - cargoBuildFlags = stdenv.lib.optionals withAllFeatures [ "--features" "all" ]; + cargoBuildFlags = stdenv.lib.optional withAllFeatures "--all-features"; preCheck = '' export HOME=$TMPDIR @@ -42,7 +42,7 @@ rustPlatform.buildRustPackage rec { description = "A modern shell written in Rust"; homepage = "https://www.nushell.sh/"; license = licenses.mit; - maintainers = [ maintainers.marsam ]; + maintainers = with maintainers; [ filalex77 marsam ]; }; passthru = { diff --git a/pkgs/shells/powershell/default.nix b/pkgs/shells/powershell/default.nix index b999070a49e..6ec2319a49d 100644 --- a/pkgs/shells/powershell/default.nix +++ b/pkgs/shells/powershell/default.nix @@ -31,7 +31,7 @@ stdenv.mkDerivation rec { mkdir -p $out/share/powershell cp -r * $out/share/powershell makeWrapper $out/share/powershell/pwsh $out/bin/pwsh --prefix ${platformLdLibraryPath} : "${stdenv.lib.makeLibraryPath libraries}" \ - --set TERM xterm --set POWERSHELL_TELEMETRY_OPTOUT 1 + --set TERM xterm --set POWERSHELL_TELEMETRY_OPTOUT 1 --set DOTNET_CLI_TELEMETRY_OPTOUT 1 ''; dontStrip = true; diff --git a/pkgs/tools/X11/ckbcomp/default.nix b/pkgs/tools/X11/ckbcomp/default.nix index 5327e0f8c8f..1948dd2b9c5 100644 --- a/pkgs/tools/X11/ckbcomp/default.nix +++ b/pkgs/tools/X11/ckbcomp/default.nix @@ -2,14 +2,14 @@ stdenv.mkDerivation rec { pname = "ckbcomp"; - version = "1.193"; + version = "1.194"; src = fetchFromGitLab { domain = "salsa.debian.org"; owner = "installer-team"; repo = "console-setup"; rev = version; - sha256 = "107nl6vpy4036km3gr9z5f3mq1i6x169v0z0a0ywavj3zjqy23rp"; + sha256 = "0fkabv05j5dj10mfrpjyvv7lnxl9qaqkbjhwj72r18i9i4019vgh"; }; buildInputs = [ perl ]; diff --git a/pkgs/tools/admin/azure-cli/python-packages.nix b/pkgs/tools/admin/azure-cli/python-packages.nix index e925a239afb..06886ba4c79 100644 --- a/pkgs/tools/admin/azure-cli/python-packages.nix +++ b/pkgs/tools/admin/azure-cli/python-packages.nix @@ -117,6 +117,9 @@ let azure-mgmt-containerservice = overrideAzureMgmtPackage super.azure-mgmt-containerservice "7.0.0" "zip" "104w7rxv7hy84yzddbbpkjqha04ghr0zz9qy788n3wl69cj4cv1a"; + azure-mgmt-cosmosdb = overrideAzureMgmtPackage super.azure-mgmt-cosmosdb "0.8.0" "zip" + "0iakxb2rr1w9171802m9syjzqas02vjah711mpagbgcj549mjysb"; + azure-mgmt-iothub = overrideAzureMgmtPackage super.azure-mgmt-iothub "0.8.2" "zip" "0w3w1d156rnkwjdarv3qvycklxr3z2j7lry7a3jfgj3ykzny12rq"; diff --git a/pkgs/tools/archivers/unrar/default.nix b/pkgs/tools/archivers/unrar/default.nix index b1d440e51ce..4b3a2f60c4f 100644 --- a/pkgs/tools/archivers/unrar/default.nix +++ b/pkgs/tools/archivers/unrar/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "unrar"; - version = "5.8.3"; + version = "5.8.4"; src = fetchurl { url = "https://www.rarlab.com/rar/unrarsrc-${version}.tar.gz"; - sha256 = "19lizlsbblkcdyc81jycp5k8kf5d8h2hlgfy16zb1g2vixf6i49m"; + sha256 = "15igz4xkzxlf81kl9p1n447rp2zrzpi6qdwn2iimzrppgqqb4z0b"; }; postPatch = '' diff --git a/pkgs/tools/audio/abcm2ps/default.nix b/pkgs/tools/audio/abcm2ps/default.nix index 39ad4626f3e..575517829ff 100644 --- a/pkgs/tools/audio/abcm2ps/default.nix +++ b/pkgs/tools/audio/abcm2ps/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "abcm2ps"; - version = "8.14.5"; + version = "8.14.6"; src = fetchFromGitHub { owner = "leesavide"; repo = "abcm2ps"; rev = "v${version}"; - sha256 = "1i6db49khqy8bqg21cn90b1fvyw8mh1asdswzssr6dr2g8bhdwmq"; + sha256 = "1gqjqbd8wj0655vi8gcg2r5jqzafdlnfjzwa9z331ywhrskpm53w"; }; configureFlags = [ diff --git a/pkgs/tools/filesystems/cryfs/default.nix b/pkgs/tools/filesystems/cryfs/default.nix index 7eee02e220a..93a70f1f088 100644 --- a/pkgs/tools/filesystems/cryfs/default.nix +++ b/pkgs/tools/filesystems/cryfs/default.nix @@ -1,78 +1,78 @@ -{ stdenv, fetchFromGitHub -, cmake, pkgconfig, coreutils -, boost, cryptopp, curl, fuse, openssl, python, spdlog +{ stdenv, fetchFromGitHub, fetchpatch +, cmake, pkgconfig, python, gtest +, boost, cryptopp, curl, fuse, openssl }: stdenv.mkDerivation rec { pname = "cryfs"; - version = "0.9.10"; + version = "0.10.2"; src = fetchFromGitHub { owner = "cryfs"; repo = "cryfs"; rev = version; - sha256 = "04yqpad8x0hiiwpykcn3swi0py6sg9xid6g15ny2qs4j3llin5ry"; + sha256 = "1m6rcc82hbaiwcwcvf5xmxma8n0jal9zhcykv9xgwiax4ny0l8kz"; }; - prePatch = '' + patches = [ + (fetchpatch { + name = "cryfs-0.10.2-install-targets.patch"; + url = "https://gitweb.gentoo.org/repo/gentoo.git/plain/sys-fs/cryfs/files/cryfs-0.10.2-install-targets.patch?id=192ac7421ddd4093125f4997898fb62e8a140a44"; + sha256 = "1jz6gpi1i7dnfm88a6n3mccwfmsmvg0d0bmp3fmqqrkbcg7in00l"; + }) + (fetchpatch { + name = "cryfs-0.10.2-unbundle-libs.patch"; + url = "https://gitweb.gentoo.org/repo/gentoo.git/plain/sys-fs/cryfs/files/cryfs-0.10.2-unbundle-libs.patch?id=192ac7421ddd4093125f4997898fb62e8a140a44"; + sha256 = "0hzss5rawcjrh8iqzc40w5yjhxdqya4gbg6dzap70180s50mahzs"; + }) + ]; + + postPatch = '' patchShebangs src - substituteInPlace vendor/scrypt/CMakeLists.txt \ - --replace /usr/bin/ "" + # remove tests that require network access: + substituteInPlace test/cpp-utils/CMakeLists.txt \ + --replace "network/CurlHttpClientTest.cpp" "" \ + --replace "network/FakeHttpClientTest.cpp" "" - # scrypt in nixpkgs only produces a binary so we lift the patching from that so allow - # building the vendored version. This is very much NOT DRY. - # The proper solution is to have scrypt generate a dev output with the required files and just symlink - # into vendor/scrypt - for f in Makefile.in autocrap/Makefile.am libcperciva/cpusupport/Build/cpusupport.sh ; do - substituteInPlace vendor/scrypt/scrypt-*/scrypt/$f --replace "command -p " "" - done + # remove CLI test trying to access /dev/fuse + substituteInPlace test/cryfs-cli/CMakeLists.txt \ + --replace "CliTest_IntegrityCheck.cpp" "" - # cryfs is vendoring an old version of spdlog - rm -rf vendor/spdlog/spdlog - ln -s ${spdlog} vendor/spdlog/spdlog + # downsize large file test as 4.5G is too big for Hydra: + substituteInPlace test/cpp-utils/data/DataTest.cpp \ + --replace "(4.5L*1024*1024*1024)" "(0.5L*1024*1024*1024)" ''; - buildInputs = [ boost cryptopp curl fuse openssl python spdlog ]; + nativeBuildInputs = [ cmake gtest pkgconfig python ]; - patches = [ - ./test-no-network.patch # Disable tests using external networking - ./skip-failing-test-large-malloc.patch - ]; - - # coreutils is needed for the vendored scrypt - nativeBuildInputs = [ cmake coreutils pkgconfig ]; + buildInputs = [ boost cryptopp curl fuse openssl ]; enableParallelBuilding = true; cmakeFlags = [ - "-DCRYFS_UPDATE_CHECKS=OFF" - "-DBoost_USE_STATIC_LIBS=OFF" # this option is case sensitive + "-DCRYFS_UPDATE_CHECKS:BOOL=FALSE" + "-DBoost_USE_STATIC_LIBS:BOOL=FALSE" # this option is case sensitive + "-DUSE_SYSTEM_LIBS:BOOL=TRUE" + "-DBUILD_TESTING:BOOL=TRUE" ]; - doCheck = true; + doCheck = (!stdenv.isDarwin); # Cryfs tests are broken on darwin - # Cryfs tests are broken on darwin - checkPhase = stdenv.lib.optionalString (!stdenv.isDarwin) '' + checkPhase = '' # Skip CMakeFiles directory and tests depending on fuse (does not work well with sandboxing) - SKIP_IMPURE_TESTS="CMakeFiles|fspp|cryfs-cli" + SKIP_IMPURE_TESTS="CMakeFiles|fspp|my-gtest-main" - for test in `ls -d test/*/ | egrep -v "$SKIP_IMPURE_TESTS"`; do - "./$test`basename $test`-test" + for t in $(ls -d test/*/ | egrep -v "$SKIP_IMPURE_TESTS"); do + "./$t$(basename $t)-test" done ''; - installPhase = '' - # Building with BUILD_TESTING=ON is missing the install target - mkdir -p $out/bin - install -m 755 ./src/cryfs-cli/cryfs $out/bin/cryfs - ''; - meta = with stdenv.lib; { description = "Cryptographic filesystem for the cloud"; homepage = https://www.cryfs.org; license = licenses.lgpl3; - maintainers = with maintainers; [ peterhoeg ]; + maintainers = with maintainers; [ peterhoeg c0bw3b ]; platforms = with platforms; linux; }; } diff --git a/pkgs/tools/filesystems/cryfs/skip-failing-test-large-malloc.patch b/pkgs/tools/filesystems/cryfs/skip-failing-test-large-malloc.patch deleted file mode 100644 index feb0ed9cfbb..00000000000 --- a/pkgs/tools/filesystems/cryfs/skip-failing-test-large-malloc.patch +++ /dev/null @@ -1,34 +0,0 @@ -From ad3f7e9fa2dececfaab43963887a2f03de52d659 Mon Sep 17 00:00:00 2001 -From: adisbladis <adis@blad.is> -Date: Thu, 12 Oct 2017 21:45:26 +0800 -Subject: [PATCH] Skip failing test: large malloc - ---- - test/cpp-utils/data/DataTest.cpp | 11 ----------- - 1 file changed, 11 deletions(-) - -diff --git a/test/cpp-utils/data/DataTest.cpp b/test/cpp-utils/data/DataTest.cpp -index 6f9df070..bd426e62 100644 ---- a/test/cpp-utils/data/DataTest.cpp -+++ b/test/cpp-utils/data/DataTest.cpp -@@ -191,17 +191,6 @@ TEST_F(DataTest, Inequality_DifferentLastByte) { - EXPECT_TRUE(data1 != data2); - } - --#ifdef __x86_64__ --TEST_F(DataTest, LargesizeSize) { -- //Needs 64bit for representation. This value isn't in the size param list, because the list is also used for read/write checks. -- uint64_t size = 4.5L*1024*1024*1024; -- Data data(size); -- EXPECT_EQ(size, data.size()); --} --#else --#warning This is not a 64bit architecture. Large size data tests are disabled. --#endif -- - TEST_F(DataTest, LoadingNonexistingFile) { - TempFile file(false); // Pass false to constructor, so the tempfile is not created - EXPECT_FALSE(Data::LoadFromFile(file.path())); --- -2.14.2 - diff --git a/pkgs/tools/filesystems/cryfs/test-no-network.patch b/pkgs/tools/filesystems/cryfs/test-no-network.patch deleted file mode 100644 index 3392d3f855e..00000000000 --- a/pkgs/tools/filesystems/cryfs/test-no-network.patch +++ /dev/null @@ -1,24 +0,0 @@ -From 8b1808e1278d2cb0dc56a4e98781eceeadfb9718 Mon Sep 17 00:00:00 2001 -From: adisbladis <adis@blad.is> -Date: Thu, 12 Oct 2017 18:13:28 +0800 -Subject: [PATCH] Disable tests using external networking - ---- - test/cpp-utils/CMakeLists.txt | 1 - - 1 file changed, 1 deletion(-) - -diff --git a/test/cpp-utils/CMakeLists.txt b/test/cpp-utils/CMakeLists.txt -index 5a2bc9f8..d838edba 100644 ---- a/test/cpp-utils/CMakeLists.txt -+++ b/test/cpp-utils/CMakeLists.txt -@@ -20,7 +20,6 @@ set(SOURCES - tempfile/TempFileIncludeTest.cpp - tempfile/TempDirIncludeTest.cpp - tempfile/TempDirTest.cpp -- network/CurlHttpClientTest.cpp - network/FakeHttpClientTest.cpp - io/ConsoleIncludeTest.cpp - io/ConsoleTest_AskYesNo.cpp --- -2.14.2 - diff --git a/pkgs/tools/filesystems/fuse-overlayfs/default.nix b/pkgs/tools/filesystems/fuse-overlayfs/default.nix index 2c9336802ea..c65b2a63f2d 100644 --- a/pkgs/tools/filesystems/fuse-overlayfs/default.nix +++ b/pkgs/tools/filesystems/fuse-overlayfs/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "fuse-overlayfs"; - version = "0.6.2"; + version = "0.7"; src = fetchFromGitHub { owner = "containers"; repo = pname; rev = "v${version}"; - sha256 = "03gad89jg0dif5wqdl1kh0rpmfc80pnkx8hk0v4hrlirr130dgl2"; + sha256 = "1nhqy1fdzhkjhqs54nq66zj5bf85n3gr4k6zl0hswdvhg6flkg75"; }; nativeBuildInputs = [ autoreconfHook pkgconfig ]; diff --git a/pkgs/tools/filesystems/fusesmb/default.nix b/pkgs/tools/filesystems/fusesmb/default.nix deleted file mode 100644 index ada9445218b..00000000000 --- a/pkgs/tools/filesystems/fusesmb/default.nix +++ /dev/null @@ -1,28 +0,0 @@ -{ stdenv, fetchurl, samba, fuse }: - -stdenv.mkDerivation rec { - name = "fusesmb-0.8.7"; - - src = fetchurl { - url = "http://www.ricardis.tudelft.nl/~vincent/fusesmb/download/${name}.tar.gz"; - sha256 = "12gz2gn9iqjg27a233dn2wij7snm7q56h97k6gks0yijf6xcnpz1"; - }; - - buildInputs = [ samba fuse ]; - - postInstall = - '' - mkdir -p $out/lib - ln -fs ${samba}/lib/libsmbclient.so $out/lib/libsmbclient.so.0 - ''; - - hardeningDisable = [ "format" ]; - - meta = with stdenv.lib; { - description = "Samba mounted via FUSE"; - license = licenses.gpl2; - platforms = platforms.linux; - broken = true; # Needs vulnerable Samba, missing source link - # 2018-08-21 - }; -} diff --git a/pkgs/tools/filesystems/gitfs/default.nix b/pkgs/tools/filesystems/gitfs/default.nix index cd1e3110a13..5b379414666 100644 --- a/pkgs/tools/filesystems/gitfs/default.nix +++ b/pkgs/tools/filesystems/gitfs/default.nix @@ -2,13 +2,13 @@ python2Packages.buildPythonApplication rec { pname = "gitfs"; - version = "0.5.1"; + version = "0.5.2"; src = fetchFromGitHub { owner = "PressLabs"; repo = "gitfs"; rev = version; - sha256 = "04plfdaai7bvnz39lw0yyda6ahbwx0wkws9fjnxxx43dzm3sjl98"; + sha256 = "1jzwdwan8ndvp2lw6j7zbvg5k9rgf2d8dcxjrwc6bwyk59xdxn4p"; }; patchPhase = '' diff --git a/pkgs/tools/graphics/facedetect/default.nix b/pkgs/tools/graphics/facedetect/default.nix index aab2e111e85..cb697148d04 100644 --- a/pkgs/tools/graphics/facedetect/default.nix +++ b/pkgs/tools/graphics/facedetect/default.nix @@ -12,13 +12,13 @@ stdenv.mkDerivation rec { }; buildInputs = [ python2Packages.python python2Packages.wrapPython ]; - pythonPath = [ python2Packages.numpy python2Packages.opencv ]; + pythonPath = [ python2Packages.numpy python2Packages.opencv4 ]; phases = [ "unpackPhase" "patchPhase" "installPhase" ]; patchPhase = '' substituteInPlace facedetect \ - --replace /usr/share/opencv "${python2Packages.opencv}/share/OpenCV" + --replace /usr/share/opencv "${python2Packages.opencv4}/share/opencv4" ''; installPhase = '' diff --git a/pkgs/tools/inputmethods/fcitx-engines/fcitx-cloudpinyin/default.nix b/pkgs/tools/inputmethods/fcitx-engines/fcitx-cloudpinyin/default.nix index 4c0a7f0b410..230b2926561 100644 --- a/pkgs/tools/inputmethods/fcitx-engines/fcitx-cloudpinyin/default.nix +++ b/pkgs/tools/inputmethods/fcitx-engines/fcitx-cloudpinyin/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "fcitx-cloudpinyin"; - version = "0.3.6"; + version = "0.3.7"; src = fetchurl { url = "http://download.fcitx-im.org/fcitx-cloudpinyin/${pname}-${version}.tar.xz"; - sha256 = "1f3ryx817bxb8g942l50ng4xg0gp50rb7pv2p6zf98r2z804dcvf"; + sha256 = "0ai347wv3qdjzcbh0j9hdjpzwvh2kk57324xbxq37nzagrdgg5x0"; }; nativeBuildInputs = [ pkgconfig ]; diff --git a/pkgs/tools/misc/bdf2psf/default.nix b/pkgs/tools/misc/bdf2psf/default.nix index 6309587fd52..defdd9494e5 100644 --- a/pkgs/tools/misc/bdf2psf/default.nix +++ b/pkgs/tools/misc/bdf2psf/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "bdf2psf"; - version = "1.193"; + version = "1.194"; src = fetchurl { url = "mirror://debian/pool/main/c/console-setup/bdf2psf_${version}_all.deb"; - sha256 = "1mykng02fyxshm02kywrk16f27b1jhgn9zcaxcvxd255sn58w68k"; + sha256 = "10c0rbhqscizfa063m6mms31i0knh25bxr35s008b6mp5pxr33mc"; }; buildInputs = [ dpkg ]; diff --git a/pkgs/tools/misc/geekbench/default.nix b/pkgs/tools/misc/geekbench/default.nix index 567a4eaf230..32fe5cc5868 100644 --- a/pkgs/tools/misc/geekbench/default.nix +++ b/pkgs/tools/misc/geekbench/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "geekbench"; - version = "5.0.3"; + version = "5.0.4"; src = fetchurl { url = "https://cdn.geekbench.com/Geekbench-${version}-Linux.tar.gz"; - sha256 = "0bdkq36b8rr8xzbhjhxia7ss24bm5i4gz4g63dxckis5qi0pfsii"; + sha256 = "04d7ixfmzj22w9svjdj0kxsp7ycnzdzx9kd2z1vswnyybdkgyjy7"; }; dontConfigure = true; diff --git a/pkgs/tools/misc/memtest86-efi/default.nix b/pkgs/tools/misc/memtest86-efi/default.nix index 8d28dbcf40e..71409b1c3a8 100644 --- a/pkgs/tools/misc/memtest86-efi/default.nix +++ b/pkgs/tools/misc/memtest86-efi/default.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation rec { pname = "memtest86-efi"; - version = "8.1"; + version = "8.2"; src = fetchzip { # TODO: The latest version of memtest86 is actually 8.2, but the @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { # binaries that we make sure to version, then we could probably keep up # with the latest versions released by the company. url = "https://www.memtest86.com/downloads/memtest86-${version}-usb.zip"; - sha256 = "0qiyd8ymn307shmvwmqd80q3svxf49133d2pf84qpdlcmjjfnhgg"; + sha256 = "1x1wjssr4nnbnfan0pi7ni2dfwnm3288kq584hkfqcyza8xdx03i"; stripRoot = false; }; diff --git a/pkgs/tools/misc/onefetch/default.nix b/pkgs/tools/misc/onefetch/default.nix new file mode 100644 index 00000000000..be8c4fb9c06 --- /dev/null +++ b/pkgs/tools/misc/onefetch/default.nix @@ -0,0 +1,26 @@ +{ fetchFromGitHub, rustPlatform, stdenv +, CoreFoundation, libiconv, libresolv, Security }: + +rustPlatform.buildRustPackage rec { + pname = "onefetch"; + version = "2.1.0"; + + src = fetchFromGitHub { + owner = "o2sh"; + repo = pname; + rev = "v${version}"; + sha256 = "02mdzpzfcxp9na86b4jcqqjd3id5jslgmnq1jc0vykg58xha51jg"; + }; + + cargoSha256 = "1phv06zf47bv5cmhypivljfiynrblha0kj13c5al9l0hd1xx749h"; + + buildInputs = with stdenv; + lib.optionals isDarwin [ CoreFoundation libiconv libresolv Security ]; + + meta = with stdenv.lib; { + description = "Git repository summary on your terminal"; + homepage = "https://github.com/o2sh/onefetch"; + license = licenses.mit; + maintainers = with maintainers; [ filalex77 ]; + }; +} diff --git a/pkgs/tools/misc/parallel/default.nix b/pkgs/tools/misc/parallel/default.nix index 27fd51ed447..e606b38775e 100644 --- a/pkgs/tools/misc/parallel/default.nix +++ b/pkgs/tools/misc/parallel/default.nix @@ -1,11 +1,11 @@ { fetchurl, stdenv, perl, makeWrapper, procps }: stdenv.mkDerivation rec { - name = "parallel-20191022"; + name = "parallel-20191122"; src = fetchurl { url = "mirror://gnu/parallel/${name}.tar.bz2"; - sha256 = "1a89x5ix9kls1abj8zkgxdf3g3s5phzb83xcd4cwpz4szfjfw6v4"; + sha256 = "01wmk3sf34d2lmhl37j4ga7aims2hcnzv1bydg1xs4pablar6ahq"; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/pkgs/tools/misc/plantuml/default.nix b/pkgs/tools/misc/plantuml/default.nix index 2ff042d8cbb..c4868dd6183 100644 --- a/pkgs/tools/misc/plantuml/default.nix +++ b/pkgs/tools/misc/plantuml/default.nix @@ -1,12 +1,12 @@ { stdenv, fetchurl, makeWrapper, jre, graphviz }: stdenv.mkDerivation rec { - version = "1.2019.11"; + version = "1.2019.12"; pname = "plantuml"; src = fetchurl { url = "mirror://sourceforge/project/plantuml/${version}/plantuml.${version}.jar"; - sha256 = "0k9l4d3rf5g5vwx6kd170ija872j3fafkn50fkd3ddzjqdd0v9lm"; + sha256 = "1682lcfk63grzhzzxv34jxw3jacznvz1pd5cb266p9akk560a3z0"; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/pkgs/tools/misc/screenfetch/default.nix b/pkgs/tools/misc/screenfetch/default.nix index 71b6dd90530..d01a3a877f2 100644 --- a/pkgs/tools/misc/screenfetch/default.nix +++ b/pkgs/tools/misc/screenfetch/default.nix @@ -20,13 +20,13 @@ let in stdenv.mkDerivation rec { pname = "screenFetch"; - version = "3.9.0"; + version = "3.9.1"; src = fetchFromGitHub { owner = "KittyKatt"; repo = "screenFetch"; rev = "v${version}"; - sha256 = "11mqld9pppbappqbaj49mw2v5kysx06sy1xbs81i0hhgh35hlziv"; + sha256 = "04l8aqr474pb115nagn9f6y48jw92n1qfszgw7dbhgl4mpn95lcr"; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/pkgs/tools/misc/starship/default.nix b/pkgs/tools/misc/starship/default.nix index 93275093086..552327c3303 100644 --- a/pkgs/tools/misc/starship/default.nix +++ b/pkgs/tools/misc/starship/default.nix @@ -2,18 +2,18 @@ rustPlatform.buildRustPackage rec { pname = "starship"; - version = "0.26.4"; + version = "0.26.5"; src = fetchFromGitHub { owner = "starship"; repo = "starship"; rev = "v${version}"; - sha256 = "0r3ggy28zx94cjgf486s9qm9c8c0514k5a8fki466yghkxyjamj8"; + sha256 = "0a2jx82cwnxr0751qz2zp3chl0ndxf4wmjnar1y7s63syy9i6s52"; }; buildInputs = stdenv.lib.optionals stdenv.isDarwin [ libiconv darwin.apple_sdk.frameworks.Security ]; - cargoSha256 = "16pdvzvn4na0yksham0kwfkk7jlk4iwrzb4qych3libbswgkaklj"; + cargoSha256 = "110ajwgdshakcqxfnqi30yy0miikp2qx86flwfkd78jawfll2krp"; checkPhase = "cargo test -- --skip directory::home_directory --skip directory::directory_in_root"; meta = with stdenv.lib; { diff --git a/pkgs/tools/misc/tmuxp/default.nix b/pkgs/tools/misc/tmuxp/default.nix index b794e46b258..9ffa89f5919 100644 --- a/pkgs/tools/misc/tmuxp/default.nix +++ b/pkgs/tools/misc/tmuxp/default.nix @@ -4,11 +4,11 @@ with python.pkgs; buildPythonApplication rec { pname = "tmuxp"; - version = "1.5.3"; + version = "1.5.4"; src = fetchPypi { inherit pname version; - sha256 = "0vxnq5r3h32dvznh4lal29q5ny70rd861r7435gn7sa6v5ajs2f1"; + sha256 = "13qnacqlcih731wfrsalbff1g81inkh6sypvabg5gi7gd7mha49p"; }; postPatch = '' diff --git a/pkgs/tools/misc/wakatime/default.nix b/pkgs/tools/misc/wakatime/default.nix index 9016dfdf712..a685dc7cbde 100644 --- a/pkgs/tools/misc/wakatime/default.nix +++ b/pkgs/tools/misc/wakatime/default.nix @@ -3,13 +3,13 @@ with python3Packages; buildPythonApplication rec { pname = "wakatime"; - version = "13.0.1"; + version = "13.0.2"; src = fetchFromGitHub { owner = "wakatime"; repo = "wakatime"; rev = version; - sha256 = "1a188n763hg39s8wa20mb1bj6f3vs8h7knvm4ys7q8bhsib0pyrd"; + sha256 = "0ng7hb83gj6vb569qh58vqp4ana162r20dif086kgc3sch2z63j9"; }; # needs more dependencies from https://github.com/wakatime/wakatime/blob/191b302bfb5f272ae928c6d3867d06f3dfcba4a8/dev-requirements.txt diff --git a/pkgs/tools/networking/dhcpcd/default.nix b/pkgs/tools/networking/dhcpcd/default.nix index 0827f2eac7b..d63c63ab1d2 100644 --- a/pkgs/tools/networking/dhcpcd/default.nix +++ b/pkgs/tools/networking/dhcpcd/default.nix @@ -4,11 +4,11 @@ stdenv.mkDerivation rec { # when updating this to >=7, check, see previous reverts: # nix-build -A nixos.tests.networking.scripted.macvlan.x86_64-linux nixos/release-combined.nix pname = "dhcpcd"; - version = "8.0.6"; + version = "8.1.2"; src = fetchurl { url = "mirror://roy/${pname}/${pname}-${version}.tar.xz"; - sha256 = "0kxxpb79j564m6bjvjb9gsn0yzs13c0arfgsycm51gw3xnch3db6"; + sha256 = "1b9mihp1mf2vng92fgks764a6pwf2gx7ccw6knja79c42nmyglyb"; }; nativeBuildInputs = [ pkgconfig ]; diff --git a/pkgs/tools/networking/ferm/default.nix b/pkgs/tools/networking/ferm/default.nix index 2cf111e8ccf..6f1660484e7 100644 --- a/pkgs/tools/networking/ferm/default.nix +++ b/pkgs/tools/networking/ferm/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, makeWrapper, perl, ebtables, ipset, iptables }: +{ stdenv, fetchurl, makeWrapper, perl, ebtables, ipset, iptables, nixosTests }: stdenv.mkDerivation rec { version = "2.4.1"; @@ -21,6 +21,8 @@ stdenv.mkDerivation rec { done ''; + passthru.tests.ferm = nixosTests.ferm; + meta = { homepage = http://ferm.foo-projects.org/; description = "Tool to maintain complex firewalls"; diff --git a/pkgs/tools/networking/mmsd/default.nix b/pkgs/tools/networking/mmsd/default.nix new file mode 100644 index 00000000000..fee347dd201 --- /dev/null +++ b/pkgs/tools/networking/mmsd/default.nix @@ -0,0 +1,38 @@ +{ stdenv +, fetchgit +, autoreconfHook +, pkgconfig +, glib +, dbus +}: + +stdenv.mkDerivation rec { + pname = "mmsd"; + version = "unstable-2019-07-15"; + + src = fetchgit { + url = "git://git.kernel.org/pub/scm/network/ofono/mmsd.git"; + rev = "f4b8b32477a411180be1823fdc460b4f7e1e3c9c"; + sha256 = "0hcnpyhsi7b5m825dhnwbp65yi0961wi8mipzdvaw5nc693xv15b"; + }; + + nativeBuildInputs = [ + autoreconfHook + pkgconfig + ]; + + buildInputs = [ + glib + dbus + ]; + + doCheck = true; + + meta = with stdenv.lib; { + description = "Multimedia Messaging Service Daemon"; + homepage = "https://01.org/ofono"; + license = licenses.gpl2; + maintainers = with maintainers; [ jtojnar ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/tools/networking/ofono/default.nix b/pkgs/tools/networking/ofono/default.nix index 27f4b9562b3..5cae8a61203 100644 --- a/pkgs/tools/networking/ofono/default.nix +++ b/pkgs/tools/networking/ofono/default.nix @@ -12,14 +12,14 @@ stdenv.mkDerivation rec { pname = "ofono"; - version = "1.30"; + version = "1.31"; outputs = [ "out" "dev" ]; src = fetchgit { url = "git://git.kernel.org/pub/scm/network/ofono/ofono.git"; rev = version; - sha256 = "1qzysmzpgbh6zc3x9xh931wxcazka9wwx727c2k66z9gal2n6n66"; + sha256 = "033y3vggjxn1c7mw75j452idp7arrdv51axs727f7l3c5lnxqdjy"; }; patches = [ diff --git a/pkgs/tools/networking/tridactyl-native/default.nix b/pkgs/tools/networking/tridactyl-native/default.nix index 665d988f48e..44daa23cd92 100644 --- a/pkgs/tools/networking/tridactyl-native/default.nix +++ b/pkgs/tools/networking/tridactyl-native/default.nix @@ -7,13 +7,13 @@ stdenv.mkDerivation rec { pname = "tridactyl-native"; # this is actually the version of tridactyl itself; the native messenger will # probably not change with every tridactyl version - version = "1.17.0"; + version = "1.17.1"; src = fetchFromGitHub { owner = "tridactyl"; repo = "tridactyl"; rev = version; - sha256 = "0dpd4jdym644rqm9h83lb8cwfccnwrnqm1g91nl913pj4k5x4hqr"; + sha256 = "197vh3k9nh58djl6ph0lznkdb2schqlksxxr93xjkk4xsc7k6j1g"; }; sourceRoot = "source/native"; diff --git a/pkgs/tools/networking/wireguard-tools/default.nix b/pkgs/tools/networking/wireguard-tools/default.nix index ad449429f99..d5edb128cd5 100644 --- a/pkgs/tools/networking/wireguard-tools/default.nix +++ b/pkgs/tools/networking/wireguard-tools/default.nix @@ -1,6 +1,7 @@ { stdenv, fetchzip, + iptables ? null, iproute ? null, libmnl ? null, makeWrapper ? null, @@ -13,11 +14,11 @@ with stdenv.lib; stdenv.mkDerivation rec { pname = "wireguard-tools"; - version = "0.0.20191012"; + version = "0.0.20191127"; src = fetchzip { url = "https://git.zx2c4.com/WireGuard/snapshot/WireGuard-${version}.tar.xz"; - sha256 = "0nwcx7m5cpp4h1bclswiqq1jzj08xzpxmq5s4rcfqmrp59cmwgrs"; + sha256 = "1n1x5858c32p0a13rrhn9a491174k5z4wd0gsy8qn546k1a8qj99"; }; sourceRoot = "source/src/tools"; @@ -38,7 +39,7 @@ stdenv.mkDerivation rec { --replace /usr/bin $out/bin '' + optionalString stdenv.isLinux '' for f in $out/bin/*; do - wrapProgram $f --prefix PATH : ${makeBinPath [procps iproute openresolv]} + wrapProgram $f --prefix PATH : ${makeBinPath [procps iproute iptables openresolv]} done '' + optionalString stdenv.isDarwin '' for f in $out/bin/*; do diff --git a/pkgs/tools/networking/yggdrasil/default.nix b/pkgs/tools/networking/yggdrasil/default.nix index f6fff42efdf..ca10adae0e4 100644 --- a/pkgs/tools/networking/yggdrasil/default.nix +++ b/pkgs/tools/networking/yggdrasil/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "yggdrasil"; - version = "0.3.11"; + version = "0.3.12"; src = fetchFromGitHub { owner = "yggdrasil-network"; repo = "yggdrasil-go"; rev = "v${version}"; - sha256 = "0cz9axphqvpqwy591ws9by7khpdw96iwf9vmhif3i52ghp8hpfd1"; + sha256 = "03ywxamjcnhcr20vm9pn3rq3hqq49i6rfdvx44czzr30h8xp8dhw"; }; modSha256 = "1vqk0jyqc1qcryi247r5pbvfjw3m48l028fb2mrq1xqqfkjqrr85"; diff --git a/pkgs/tools/networking/ytcc/default.nix b/pkgs/tools/networking/ytcc/default.nix index d489d84d1cc..4675dac5f47 100644 --- a/pkgs/tools/networking/ytcc/default.nix +++ b/pkgs/tools/networking/ytcc/default.nix @@ -2,13 +2,13 @@ python3Packages.buildPythonApplication rec { pname = "ytcc"; - version = "1.8.1"; + version = "1.8.2"; src = fetchFromGitHub { owner = "woefe"; repo = "ytcc"; rev = "v${version}"; - sha256 = "080p145j5pg8db88kb0y3x1pfc3v4aj3w68pdihlmi68dhjdr7i7"; + sha256 = "0a4gxdan3aivbpkxw9cv1bgl7rfrwdii12d096dx06zlymb27gqs"; }; nativeBuildInputs = [ gettext ]; diff --git a/pkgs/tools/package-management/protontricks/default.nix b/pkgs/tools/package-management/protontricks/default.nix index f5cecaa8e04..c8413c56854 100644 --- a/pkgs/tools/package-management/protontricks/default.nix +++ b/pkgs/tools/package-management/protontricks/default.nix @@ -4,13 +4,13 @@ buildPythonApplication rec { pname = "protontricks"; - version = "1.3"; + version = "1.3.1"; src = fetchFromGitHub { owner = "Matoking"; repo = pname; rev = version; - sha256 = "1x3ln9sxczkh9rpznw8q5jqfk17kzsjiz125xd15rqj5zqkrwkkd"; + sha256 = "0snhm9r5igik030iqxm3zd9zvhlnsxi20zac71bbc29qflsi2dhk"; }; propagatedBuildInputs = [ vdf ]; diff --git a/pkgs/tools/package-management/reuse/default.nix b/pkgs/tools/package-management/reuse/default.nix index 0f8a6f19127..4aadc4b7af0 100644 --- a/pkgs/tools/package-management/reuse/default.nix +++ b/pkgs/tools/package-management/reuse/default.nix @@ -4,13 +4,13 @@ with python3Packages; buildPythonApplication rec { pname = "reuse"; - version = "0.5.2"; + version = "0.6.0"; src = fetchFromGitHub { owner = "fsfe"; repo = "reuse-tool"; rev = "v${version}"; - sha256 = "17qvsa2qnm767yv7x0v626np0kiyqpb0al7sjqmccarq2wnw8w90"; + sha256 = "17bslyvjndhqryrisba9y7y0ijyzi3gmyl9rddkcvdqi3lg9668y"; }; propagatedBuildInputs = [ diff --git a/pkgs/tools/security/clamav/default.nix b/pkgs/tools/security/clamav/default.nix index de275b6c09a..43f56352ceb 100644 --- a/pkgs/tools/security/clamav/default.nix +++ b/pkgs/tools/security/clamav/default.nix @@ -5,11 +5,11 @@ stdenv.mkDerivation rec { pname = "clamav"; - version = "0.102.0"; + version = "0.102.1"; src = fetchurl { url = "https://www.clamav.net/downloads/production/${pname}-${version}.tar.gz"; - sha256 = "1qdyj4r39266bmbsd2nwyspm20k9wh3c30awrg8c54y78s61izj8"; + sha256 = "1mpdgn3isz26hd1j6p8lcb76v8hjs54k1wb655rnil4hv78aig8d"; }; # don't install sample config files into the absolute sysconfdir folder diff --git a/pkgs/tools/security/gnome-keysign/default.nix b/pkgs/tools/security/gnome-keysign/default.nix index 2c216c0a404..a559039d95a 100644 --- a/pkgs/tools/security/gnome-keysign/default.nix +++ b/pkgs/tools/security/gnome-keysign/default.nix @@ -28,6 +28,14 @@ python3.pkgs.buildPythonApplication rec { url = "https://gitlab.gnome.org/GNOME/gnome-keysign/commit/216c3677e68960afc517edc00529323e85909323.patch"; sha256 = "1w410gvcridbq26sry7fxn49v59ss2lc0w5ab7csva8rzs1nc990"; }) + + # stop requiring lxml (no longer used) + # https://gitlab.gnome.org/GNOME/gnome-keysign/merge_requests/23 + (fetchpatch { + url = "https://gitlab.gnome.org/GNOME/gnome-keysign/commit/ffc6f40584d7564951e1c8b6d18d4f8a6a3fa09d.patch"; + sha256 = "1hs6mmhi2f21kvy26llzvp37yf0i0dr69d18r641139nr6qg6kwy"; + includes = [ "setup.py" ]; + }) ]; nativeBuildInputs = [ diff --git a/pkgs/tools/security/ipscan/default.nix b/pkgs/tools/security/ipscan/default.nix new file mode 100644 index 00000000000..40546b6f1c3 --- /dev/null +++ b/pkgs/tools/security/ipscan/default.nix @@ -0,0 +1,40 @@ +{ stdenv, fetchurl, jdk, jre, swt, makeWrapper, xorg, dpkg }: + +stdenv.mkDerivation rec { + pname = "ipscan"; + version = "3.6.2"; + + src = fetchurl { + url = "https://github.com/angryip/ipscan/releases/download/${version}/ipscan_${version}_amd64.deb"; + sha256 = "0wnnnabpj0dsxdijvss5sl9kd4i6rmcq55zbas33xs3c5g305ssk"; + }; + + sourceRoot = "."; + unpackCmd = "${dpkg}/bin/dpkg-deb -x $src ."; + + buildInputs = [ makeWrapper jdk ]; + + installPhase = '' + mkdir -p $out/share + cp usr/lib/ipscan/ipscan-linux64-${version}.jar $out/share/${pname}-${version}.jar + + makeWrapper ${jre}/bin/java $out/bin/ipscan \ + --prefix LD_LIBRARY_PATH : "$out/lib/:${stdenv.lib.makeLibraryPath [ swt xorg.libXtst ]}" \ + --add-flags "-Xmx256m -cp $out/share/${pname}-${version}.jar:${swt}/jars/swt.jar net.azib.ipscan.Main" + + mkdir -p $out/share/applications + cp usr/share/applications/ipscan.desktop $out/share/applications/ipscan.desktop + substituteInPlace $out/share/applications/ipscan.desktop --replace "/usr/bin" "$out/bin" + + mkdir -p $out/share/pixmaps + cp usr/share/pixmaps/ipscan.png $out/share/pixmaps/ipscan.png + ''; + + meta = with stdenv.lib; { + description = "Fast and friendly network scanner"; + homepage = https://angryip.org; + license = licenses.gpl2; + platforms = [ "x86_64-linux" ]; + maintainers = with maintainers; [ kylesferrazza ]; + }; +} diff --git a/pkgs/tools/security/keybase/default.nix b/pkgs/tools/security/keybase/default.nix index 97c8ffb8948..1edf86675c3 100644 --- a/pkgs/tools/security/keybase/default.nix +++ b/pkgs/tools/security/keybase/default.nix @@ -9,7 +9,7 @@ buildGoPackage rec { version = "5.0.0"; goPackagePath = "github.com/keybase/client"; - subPackages = [ "go/keybase" ]; + subPackages = [ "go/kbnm" "go/keybase" ]; dontRenameImports = true; diff --git a/pkgs/tools/security/pbis/default.nix b/pkgs/tools/security/pbis/default.nix new file mode 100644 index 00000000000..ee1282e9a13 --- /dev/null +++ b/pkgs/tools/security/pbis/default.nix @@ -0,0 +1,70 @@ +{ stdenv, fetchFromGitHub, autoconf, automake, libtool, perl, flex, bison, curl, + pam, popt, libiconv, libuuid, openssl_1_0_2, cyrus_sasl, sqlite, tdb, libxml2 }: + +stdenv.mkDerivation rec { + pname = "pbis-open"; + version = "9.1.0"; + + src = fetchFromGitHub { + owner = "BeyondTrust"; + repo = pname; + rev = version; + sha256 = "081jm34sf488nwz5wzs55d6rxx3sv566x6p4h1yqcjaw36174m8v"; + }; + + nativeBuildInputs = [ + autoconf automake libtool perl flex bison + ]; + + # curl must be placed after openssl_1_0_2, because it pulls openssl 1.1 dependency. + buildInputs = [ + pam popt libiconv libuuid openssl_1_0_2 cyrus_sasl + curl sqlite popt tdb libxml2 /*libglade2 for gtk*/ + ]; + + postPatch = '' + patchShebangs . + sed -i -e 's/legacy//g' lwupgrade/MakeKitBuild # disable /opt/ symlinks + sed -i -e 's/tdb.h//g' samba-interop/MakeKitBuild #include <tdb.h> fails but it won't affect the build + ''; + preConfigure = '' + mkdir release + cd release + if [ $CC = gcc ]; then + NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -Wno-error=format-overflow" + fi + NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -isystem ${stdenv.lib.getDev libxml2}/include/libxml2 -Wno-error=array-bounds -Wno-error=pointer-sign -Wno-error=deprecated-declarations -Wno-error=unused-variable" + ''; + configureScript = ''../configure''; + configureFlags = [ + "CFLAGS=-O" + "--docdir=${placeholder "prefix"}/share/doc" + "--mandir=${placeholder "prefix"}/share/doc/man" + "--datadir=${placeholder "prefix"}/share" + "--lw-initdir=${placeholder "prefix"}/etc/init.d" + "--selinux=no" # NixOS does not support SELinux + "--build-isas=x86_64" # [lwbase] endianness (host/x86_32): [lwbase] ERROR: could not determine endianness + "--fail-on-warn=no" + # "--debug=yes" + ]; # ^ See https://github.com/BeyondTrust/pbis-open/issues/124 + configureFlagsArray = [ "--lw-bundled-libs=linenoise-mob tomlc99 opensoap krb5 cyrus-sasl curl openldap ${ if libuuid == null then "libuuid" else "" }" ]; + # ^ it depends on old krb5 version 1.9 (issue #228) + # linenoise-mod, tomlc99, opensoap is not in nixpkgs. + # krb5 must be old one, and cyrus-sasl and openldap have dependency to newer libkrb5 that cause runtime error + enableParallelBuilding = true; + makeFlags = "SHELL="; + hardeningDisable = [ "format" ]; # -Werror=format-security + installPhase = '' + mkdir $sys + mv stage/{lib,var} $sys + mv stage$out $out + ''; + outputs = [ "out" "sys" ]; + + meta = with stdenv.lib; { + description = "BeyondTrust AD Bridge Open simplifies the process of joining non-Microsoft hosts to Active Directory domains"; + homepage = "https://github.com/BeyondTrust/pbis-open"; + license = with licenses; [ gpl2 lgpl21 ]; + platforms = [ "x86_64-linux" ]; + }; +} diff --git a/pkgs/tools/security/vault/vault-bin.nix b/pkgs/tools/security/vault/vault-bin.nix index 87f2e922ff7..6e2ab221c42 100644 --- a/pkgs/tools/security/vault/vault-bin.nix +++ b/pkgs/tools/security/vault/vault-bin.nix @@ -1,30 +1,30 @@ { stdenv, fetchurl, unzip }: let - version = "1.1.3"; + version = "1.3.0"; sources = let base = "https://releases.hashicorp.com/vault/${version}"; in { x86_64-linux = fetchurl { url = "${base}/vault_${version}_linux_amd64.zip"; - sha256 = "293b88f4d31f6bcdcc8b508eccb7b856a0423270adebfa0f52f04144c5a22ae0"; + sha256 = "1crfj4gd1qwwa2xidd0pjffv0n6hf5hbhv6568m6zc1ig0qqm6yq"; }; i686-linux = fetchurl { url = "${base}/vault_${version}_linux_386.zip"; - sha256 = "9f2fb99e08fa3d25af1497516d08b5d2d8a73bcacd5354ddec024e9628795867"; + sha256 = "0pyf0kyvxpmx3fwfvin1r0x30r9byx9lyi81894q06xrhiwbqc0l"; }; x86_64-darwin = fetchurl { url = "${base}/vault_${version}_darwin_amd64.zip"; - sha256 = "a0a7a242f8299ac4a00af8aa10ccedaf63013c8a068f56eadfb9d730b87155ea"; + sha256 = "113vnpz9n6y7z2k9jqpfpxqxqbrmd9bhny79yaxqzkfdqw8vyv3g"; }; i686-darwin = fetchurl { url = "${base}/vault_${version}_darwin_386.zip"; - sha256 = "50542cfb37abb06e8bb6b8ba41f5ca7d72a4d6a4396d4e3f4a8391bed14f63be"; + sha256 = "0d191qai0bpl7cyivca26wqgycsj2dz08809z147d1vnrz321v6w"; }; aarch64-linux = fetchurl { url = "${base}/vault_${version}_linux_arm64.zip"; - sha256 = "c243dce14b2e48e3667c2aa5b7fb37009dd7043b56032d6ebe50dd456715fd3f"; + sha256 = "1bk5y3knc42mh07gnnn6p109qz908014620h1s0348wp4qfdy49w"; }; }; @@ -49,6 +49,6 @@ in stdenv.mkDerivation { description = "A tool for managing secrets, this binary includes the UI"; platforms = [ "x86_64-linux" "i686-linux" "x86_64-darwin" "aarch64-linux" "i686-darwin" ]; license = licenses.mpl20; - maintainers = with maintainers; [ offline psyanticy ]; + maintainers = with maintainers; [ offline psyanticy mkaito ]; }; } diff --git a/pkgs/tools/system/facter/default.nix b/pkgs/tools/system/facter/default.nix index ad90a52a5bd..cc9b95d06c6 100644 --- a/pkgs/tools/system/facter/default.nix +++ b/pkgs/tools/system/facter/default.nix @@ -2,10 +2,10 @@ stdenv.mkDerivation rec { pname = "facter"; - version = "3.14.5"; + version = "3.14.6"; src = fetchFromGitHub { - sha256 = "0xzzhlsfw8yd3ac4kvr3za0rlkgfw28dzxzi5i1qbhzljivvipm5"; + sha256 = "1zfff1mpdwnlnm8dmmlvysw2zdsnglgk5nvhhzx8zyk0zyz0nj54"; rev = version; repo = pname; owner = "puppetlabs"; diff --git a/pkgs/tools/system/inxi/default.nix b/pkgs/tools/system/inxi/default.nix index a896a57b080..7866bece066 100644 --- a/pkgs/tools/system/inxi/default.nix +++ b/pkgs/tools/system/inxi/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "inxi"; - version = "3.0.36-1"; + version = "3.0.37-1"; src = fetchFromGitHub { owner = "smxi"; repo = "inxi"; rev = version; - sha256 = "04134l323vwd0g2bffj11rnpw2jgs9la6aqrmv8vh7w9mq5nd57y"; + sha256 = "15wvj9w601ci3bavd1hk5qlm8dfm7a7cjglczk29yir5yw2jww3f"; }; buildInputs = [ perl makeWrapper ]; diff --git a/pkgs/tools/system/rsyslog/default.nix b/pkgs/tools/system/rsyslog/default.nix index 5617ed9dc93..96f0a754f61 100644 --- a/pkgs/tools/system/rsyslog/default.nix +++ b/pkgs/tools/system/rsyslog/default.nix @@ -12,11 +12,11 @@ let in stdenv.mkDerivation rec { pname = "rsyslog"; - version = "8.1910.0"; + version = "8.1911.0"; src = fetchurl { url = "https://www.rsyslog.com/files/download/rsyslog/${pname}-${version}.tar.gz"; - sha256 = "14qczsj12spx0m3dz1pkxnacwi5njr0syamnmi1rg8ri5xlyw682"; + sha256 = "01713vwz3w5fx9b97286h1rx9hxhjsdah96nyhh75bb23impgx71"; }; #patches = [ ./fix-gnutls-detection.patch ]; diff --git a/pkgs/tools/system/stress-ng/default.nix b/pkgs/tools/system/stress-ng/default.nix index b15c8623fa5..c98634e1199 100644 --- a/pkgs/tools/system/stress-ng/default.nix +++ b/pkgs/tools/system/stress-ng/default.nix @@ -4,11 +4,11 @@ stdenv.mkDerivation rec { pname = "stress-ng"; - version = "0.10.08"; + version = "0.10.11"; src = fetchurl { url = "https://kernel.ubuntu.com/~cking/tarballs/${pname}/${pname}-${version}.tar.xz"; - sha256 = "1kkmznn0y5wxi7x9nlhzyfy933bv66113in4rf0raw6brymympaa"; + sha256 = "16z45fmvncpa0bv91dpwarqfm9p7aiqkmlcpmv2y23rh6sikhkdq"; }; postPatch = '' diff --git a/pkgs/tools/text/ansifilter/default.nix b/pkgs/tools/text/ansifilter/default.nix index b9a4f678207..7437d2765a9 100644 --- a/pkgs/tools/text/ansifilter/default.nix +++ b/pkgs/tools/text/ansifilter/default.nix @@ -2,18 +2,20 @@ stdenv.mkDerivation rec { pname = "ansifilter"; - version = "2.14"; + version = "2.15"; src = fetchurl { url = "http://www.andre-simon.de/zip/ansifilter-${version}.tar.bz2"; - sha256 = "1bwp8zmxykfxr3mz1fgvnwqbyix4qpjlha3y479jdchq4y8y7vp2"; - + sha256 = "07x1lha6xkfn5sr2f45ynk1fxmzc3qr4axxm0hip4adqygx2zsky"; }; nativeBuildInputs = [ pkgconfig ]; buildInputs = [ boost lua ]; - makeFlags = "PREFIX=$(out) conf_dir=/etc/ansifilter"; + makeFlags = [ + "PREFIX=${placeholder "out"}" + "conf_dir=/etc/ansifilter" + ]; meta = with stdenv.lib; { description = "Tool to convert ANSI to other formats"; @@ -21,10 +23,9 @@ stdenv.mkDerivation rec { Tool to remove ANSI or convert them to another format (HTML, TeX, LaTeX, RTF, Pango or BBCode) ''; - - license = licenses.gpl1; + homepage = "http://www.andre-simon.de/doku/ansifilter/en/ansifilter.php"; + license = licenses.gpl3; maintainers = [ maintainers.Adjective-Object ]; platforms = platforms.linux; }; } - diff --git a/pkgs/tools/text/fanficfare/default.nix b/pkgs/tools/text/fanficfare/default.nix index b0d66dfd93e..b01317a532f 100644 --- a/pkgs/tools/text/fanficfare/default.nix +++ b/pkgs/tools/text/fanficfare/default.nix @@ -2,11 +2,11 @@ python3Packages.buildPythonApplication rec { pname = "FanFicFare"; - version = "3.12.0"; + version = "3.13.0"; src = python3Packages.fetchPypi { inherit pname version; - sha256 = "1hzb668fga9y422670iw22ggfn8a9jp2jdxs2xhzbqxnfrw08wq0"; + sha256 = "01mrqqz2rv6abdsk80nxizsm5h68m12bqkdsjyqfzyxl0kn7zs0v"; }; propagatedBuildInputs = with python3Packages; [ diff --git a/pkgs/tools/text/highlight/default.nix b/pkgs/tools/text/highlight/default.nix index eb86bc79d5c..13e8e48a921 100644 --- a/pkgs/tools/text/highlight/default.nix +++ b/pkgs/tools/text/highlight/default.nix @@ -4,13 +4,13 @@ with stdenv.lib; stdenv.mkDerivation rec { pname = "highlight"; - version = "3.53"; + version = "3.54"; src = fetchFromGitLab { owner = "saalen"; repo = "highlight"; rev = "v${version}"; - sha256 = "11szws4q6qyffq2fsvh1vksh1d0kcwg6smyyba9yr61hzx6zmzgr"; + sha256 = "1144qv3c02hd3qrnms9cxfprdmkvz06vy4zjq500wg4iz7r8654m"; }; enableParallelBuilding = true; diff --git a/pkgs/tools/text/par/default.nix b/pkgs/tools/text/par/default.nix index 5f9ca5212d3..88325c38731 100644 --- a/pkgs/tools/text/par/default.nix +++ b/pkgs/tools/text/par/default.nix @@ -1,7 +1,8 @@ {stdenv, fetchurl, fetchpatch}: stdenv.mkDerivation { - name = "par-1.52"; + pname = "par"; + version = "1.52"; src = fetchurl { url = http://www.nicemice.net/par/Par152.tar.gz; diff --git a/pkgs/tools/typesetting/tex/auctex/default.nix b/pkgs/tools/typesetting/tex/auctex/default.nix index 2513d48796e..787f19d91f4 100644 --- a/pkgs/tools/typesetting/tex/auctex/default.nix +++ b/pkgs/tools/typesetting/tex/auctex/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl, emacs, texlive, ghostscript }: let auctex = stdenv.mkDerivation ( rec { - version = "12.1"; + version = "12.2"; # Make this a valid tex(live-new) package; # the pkgs attribute is provided with a hack below. @@ -13,7 +13,7 @@ let auctex = stdenv.mkDerivation ( rec { src = fetchurl { url = "mirror://gnu/${pname}/${pname}-${version}.tar.gz"; - sha256 = "1d2x59jw42hr81fma195bniqyhvp5ig5q0xmywbkcy59f16wlp69"; + sha256 = "14vqs08mkfzc91jg7kabs9sdn74vywj8a29gyrfa3ivnm9c7jrsr"; }; buildInputs = [ emacs texlive.combined.scheme-basic ghostscript ]; diff --git a/pkgs/tools/virtualization/amazon-ecs-cli/default.nix b/pkgs/tools/virtualization/amazon-ecs-cli/default.nix index 07fcf0eca8b..7745a3e7cb5 100644 --- a/pkgs/tools/virtualization/amazon-ecs-cli/default.nix +++ b/pkgs/tools/virtualization/amazon-ecs-cli/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "amazon-ecs-cli"; - version = "1.17.0"; + version = "1.18.0"; src = fetchurl { url = "https://s3.amazonaws.com/amazon-ecs-cli/ecs-cli-linux-amd64-v${version}"; - sha256 = "0dqnxzfdic3v10rr8k83zfbv7qc3yanajd81a0amzs778sqp7x9f"; + sha256 = "1w4n7rkcxpdzg7450s22a80a27g845n61k2bdfhq4c1md7604nyz"; }; dontUnpack = true; diff --git a/pkgs/tools/virtualization/ec2-utils/default.nix b/pkgs/tools/virtualization/ec2-utils/default.nix index ea088b486fc..1605bcfa43b 100644 --- a/pkgs/tools/virtualization/ec2-utils/default.nix +++ b/pkgs/tools/virtualization/ec2-utils/default.nix @@ -40,8 +40,8 @@ stdenv.mkDerivation { meta = { description = "A set of tools for running in EC2"; - homepage = https://aws.amazon.com/amazon-linux-ami/; - license = lib.licenses.apsl20; + homepage = "https://aws.amazon.com/amazon-linux-ami/"; + license = lib.licenses.asl20; maintainers = with lib.maintainers; [ thefloweringash ]; }; } diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index e8a02b18b0f..61645c41986 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -117,6 +117,7 @@ mapAliases ({ foomatic_filters = foomatic-filters; # 2016-08 fuse_exfat = exfat; # 2015-09-11 fuseki = apache-jena-fuseki; # added 2018-04-25 + fusesmb = throw "fusesmb is abandoned by upstream"; # added 2019-10-15 gccApple = throw "gccApple is no longer supported"; # added 2018-04-25 gdb-multitarget = gdb; # added 2017-11-13 gdk_pixbuf = gdk-pixbuf; # added 2019-05-22 @@ -339,6 +340,8 @@ mapAliases ({ s6PortableUtils = s6-portable-utils; # added 2018-07-23 sagemath = sage; # added 2018-10-27 sam = deadpixi-sam; # added 2018-04-25 + samba3 = throw "Samba 3 is discontinued, please switch to samba4"; # added 2019-10-15 + samba3_light = throw "Samba 3 is discontinued, please switch to samba4"; # added 2019-10-15 sambaMaster = throw "removed 2019-09-13: outdated and no longer needed"; samsungUnifiedLinuxDriver = samsung-unified-linux-driver; # added 2016-01-25 saneBackends = sane-backends; # added 2016-01-02 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index a76ec225752..a3307e2810c 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -2563,7 +2563,8 @@ in cron = callPackage ../tools/system/cron { }; - inherit (callPackages ../development/compilers/cudatoolkit { }) + cudaPackages = callPackages ../development/compilers/cudatoolkit { }; + inherit (cudaPackages) cudatoolkit_6 cudatoolkit_6_5 cudatoolkit_7 @@ -2579,7 +2580,8 @@ in cudatoolkit = cudatoolkit_10; - inherit (callPackages ../development/libraries/science/math/cudnn { }) + cudnnPackages = callPackages ../development/libraries/science/math/cudnn { }; + inherit (cudnnPackages) cudnn_cudatoolkit_7 cudnn_cudatoolkit_7_5 cudnn6_cudatoolkit_8 @@ -3020,9 +3022,7 @@ in endlessh = callPackage ../servers/endlessh { }; - cryfs = callPackage ../tools/filesystems/cryfs { - spdlog = spdlog_0; - }; + cryfs = callPackage ../tools/filesystems/cryfs { }; encfs = callPackage ../tools/filesystems/encfs { tinyxml2 = tinyxml-2; @@ -4148,6 +4148,8 @@ in netmask = callPackage ../tools/networking/netmask {}; + ipscan = callPackage ../tools/security/ipscan { }; + ipv6calc = callPackage ../tools/networking/ipv6calc {}; ipxe = callPackage ../tools/misc/ipxe { }; @@ -4559,8 +4561,6 @@ in next = callPackage ../applications/networking/browsers/next { }; - next-gtk-webkit = callPackage ../applications/networking/browsers/next-gtk-webkit { }; - nfpm = callPackage ../tools/package-management/nfpm { }; nginx-config-formatter = callPackage ../tools/misc/nginx-config-formatter { }; @@ -5240,6 +5240,9 @@ in nnn = callPackage ../applications/misc/nnn { }; + + noise-repellent = callPackage ../applications/audio/noise-repellent { }; + notary = callPackage ../tools/security/notary { }; notify-osd = callPackage ../applications/misc/notify-osd { }; @@ -5329,6 +5332,11 @@ in omping = callPackage ../applications/networking/omping { }; + onefetch = callPackage ../tools/misc/onefetch { + inherit (darwin) libresolv; + inherit (darwin.apple_sdk.frameworks) CoreFoundation Security; + }; + onioncircuits = callPackage ../tools/security/onioncircuits { }; openapi-generator-cli = callPackage ../tools/networking/openapi-generator-cli { }; @@ -5452,6 +5460,8 @@ in otpw = callPackage ../os-specific/linux/otpw { }; + overcommit = callPackage ../development/tools/overcommit { }; + overmind = callPackage ../applications/misc/overmind { }; owncloud-client = libsForQt5.callPackage ../applications/networking/owncloud-client { }; @@ -6394,8 +6404,6 @@ in syntex = callPackage ../tools/graphics/syntex {}; - fusesmb = callPackage ../tools/filesystems/fusesmb { samba = samba3; }; - sl = callPackage ../tools/misc/sl { stdenv = gccStdenv; }; socat = callPackage ../tools/networking/socat { }; @@ -6638,7 +6646,7 @@ in thin-provisioning-tools = callPackage ../tools/misc/thin-provisioning-tools { }; tiled = libsForQt5.callPackage ../applications/editors/tiled { }; - + tiledb = callPackage ../development/libraries/tiledb { }; timemachine = callPackage ../applications/audio/timemachine { }; @@ -8099,6 +8107,8 @@ in psc-package = haskell.lib.justStaticExecutables (haskellPackages.callPackage ../development/compilers/purescript/psc-package { }); + spago = haskell.lib.justStaticExecutables haskellPackages.spago; + tacacsplus = callPackage ../servers/tacacsplus { }; tamarin-prover = @@ -9513,7 +9523,7 @@ in inherit (darwin.apple_sdk.frameworks) CoreFoundation CoreServices Foundation; buildJdk = jdk8; buildJdkName = "jdk8"; - runJdk = jdk11; + runJdk = jdk11_headless; stdenv = if stdenv.cc.isClang then llvmPackages_6.stdenv else stdenv; }; @@ -9994,6 +10004,8 @@ in nodejs = nodejs-10_x; }; + ccloud-cli = callPackage ../development/tools/ccloud-cli { }; + htmlunit-driver = callPackage ../development/tools/selenium/htmlunit-driver { }; hyenae = callPackage ../tools/networking/hyenae { }; @@ -11025,6 +11037,8 @@ in inherit (darwin.apple_sdk.frameworks) Accelerate CoreGraphics CoreVideo; }; + egl-wayland = callPackage ../development/libraries/egl-wayland {}; + elastix = callPackage ../development/libraries/science/biology/elastix { }; enchant1 = callPackage ../development/libraries/enchant/1.x.nix { }; @@ -13481,6 +13495,7 @@ in protobuf = protobuf3_7; + protobuf3_11 = callPackage ../development/libraries/protobuf/3.11.nix { }; protobuf3_10 = callPackage ../development/libraries/protobuf/3.10.nix { }; protobuf3_9 = callPackage ../development/libraries/protobuf/3.9.nix { }; protobuf3_8 = callPackage ../development/libraries/protobuf/3.8.nix { }; @@ -13506,7 +13521,7 @@ in pugixml = callPackage ../development/libraries/pugixml { }; - pybind11 = callPackage ../development/libraries/pybind11 { }; + pybind11 = pythonPackages.pybind11; python-qt = callPackage ../development/libraries/python-qt { python = python27; @@ -15032,7 +15047,7 @@ in gofish = callPackage ../servers/gopher/gofish { }; grafana = callPackage ../servers/monitoring/grafana { - buildGoPackage = buildGo112Package; + buildGoPackage = buildGo113Package; }; grafana-loki = callPackage ../servers/monitoring/loki { }; @@ -15154,12 +15169,14 @@ in nginx = nginxStable; nginxStable = callPackage ../servers/http/nginx/stable.nix { + perl = null; # We don't use `with` statement here on purpose! # See https://github.com/NixOS/nixpkgs/pull/10474/files#r42369334 modules = [ nginxModules.rtmp nginxModules.dav nginxModules.moreheaders ]; }; nginxMainline = callPackage ../servers/http/nginx/mainline.nix { + perl = null; # We don't use `with` statement here on purpose! # See https://github.com/NixOS/nixpkgs/pull/10474/files#r42369334 modules = [ nginxModules.dav nginxModules.moreheaders ]; @@ -15517,8 +15534,6 @@ in deadpixi-sam-unstable = callPackage ../applications/editors/deadpixi-sam { }; - samba3 = callPackage ../servers/samba/3.x.nix { }; - samba4 = callPackage ../servers/samba/4.x.nix { rpcgen = netbsd.rpcgen; python = python3; @@ -15526,17 +15541,6 @@ in samba = samba4; - # A lightweight Samba 3, useful for non-Linux-based OSes. - samba3_light = lowPrio (samba3.override { - pam = null; - fam = null; - cups = null; - acl = null; - openldap = null; - # libunwind 1.0.1 is not ported to GNU/Hurd. - libunwind = null; - }); - samba4Full = lowPrio (samba4.override { enableLDAP = true; enablePrinting = true; @@ -17223,6 +17227,8 @@ in fira-mono = callPackage ../data/fonts/fira-mono { }; + flat-remix-icon-theme = callPackage ../data/icons/flat-remix-icon-theme { }; + font-awesome_4 = (callPackage ../data/fonts/font-awesome-5 { }).v4; font-awesome_5 = (callPackage ../data/fonts/font-awesome-5 { }).v5; font-awesome = font-awesome_5; @@ -17595,6 +17601,8 @@ in recursive = callPackage ../data/fonts/recursive { }; + rhodium-libre = callPackage ../data/fonts/rhodium-libre { }; + rictydiminished-with-firacode = callPackage ../data/fonts/rictydiminished-with-firacode { }; roboto = callPackage ../data/fonts/roboto { }; @@ -19874,6 +19882,14 @@ in }; matchbox = callPackage ../applications/window-managers/matchbox { }; + + matrixcli = callPackage ../applications/networking/instant-messengers/matrixcli { + inherit (python3Packages) buildPythonApplication buildPythonPackage + pygobject3 pytestrunner requests responses pytest python-olm + canonicaljson; + }; + + matrix-recorder = callPackage ../applications/networking/instant-messengers/matrix-recorder {}; mblaze = callPackage ../applications/networking/mailreaders/mblaze { }; @@ -19962,6 +19978,8 @@ in wxGTK30 = wxGTK30.override { withWebKit = true ; }; }; + mmsd = callPackage ../tools/networking/mmsd { }; + moc = callPackage ../applications/audio/moc { }; mod-distortion = callPackage ../applications/audio/mod-distortion { }; @@ -20169,6 +20187,8 @@ in partio = callPackage ../development/libraries/partio {}; + pbis-open = callPackage ../tools/security/pbis { }; + pcmanfm = callPackage ../applications/misc/pcmanfm { }; pcmanfm-qt = lxqt.pcmanfm-qt; @@ -20609,7 +20629,7 @@ in gtksharp = gtk-sharp-2_0; }; - plex-media-player = libsForQt5.callPackage ../applications/video/plex-media-player { }; + plex-media-player = libsForQt512.callPackage ../applications/video/plex-media-player { }; plover = recurseIntoAttrs (libsForQt5.callPackage ../applications/misc/plover { }); @@ -22396,9 +22416,7 @@ in wownero = callPackage ../applications/blockchains/wownero.nix {}; - zcash = callPackage ../applications/blockchains/zcash { - withGui = false; - }; + zcash = callPackage ../applications/blockchains/zcash { }; parity = callPackage ../applications/blockchains/parity { }; parity-beta = callPackage ../applications/blockchains/parity/beta.nix { }; diff --git a/pkgs/top-level/ocaml-packages.nix b/pkgs/top-level/ocaml-packages.nix index 20cd2965549..7e5aa6598c1 100644 --- a/pkgs/top-level/ocaml-packages.nix +++ b/pkgs/top-level/ocaml-packages.nix @@ -235,6 +235,8 @@ let easy-format = callPackage ../development/ocaml-modules/easy-format { }; + eigen = callPackage ../development/ocaml-modules/eigen { }; + elina = callPackage ../development/ocaml-modules/elina { }; eliom = callPackage ../development/ocaml-modules/eliom { }; @@ -374,6 +376,8 @@ let jsonm = callPackage ../development/ocaml-modules/jsonm { }; + kafka = callPackage ../development/ocaml-modules/kafka { }; + ke = callPackage ../development/ocaml-modules/ke { }; lablgl = callPackage ../development/ocaml-modules/lablgl { }; @@ -601,6 +605,10 @@ let owee = callPackage ../development/ocaml-modules/owee { }; + owl-base = callPackage ../development/ocaml-modules/owl-base { }; + + owl = callPackage ../development/ocaml-modules/owl { }; + ounit = callPackage ../development/ocaml-modules/ounit { }; pgsolver = callPackage ../development/ocaml-modules/pgsolver { }; diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index a3a6dbef322..666df8ee53d 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -167,6 +167,8 @@ in { ansicolor = callPackage ../development/python-modules/ansicolor { }; + ansiwrap = callPackage ../development/python-modules/ansiwrap { }; + ansi2html = callPackage ../development/python-modules/ansi2html { }; anytree = callPackage ../development/python-modules/anytree { @@ -251,10 +253,6 @@ in { azure-nspkg = callPackage ../development/python-modules/azure-nspkg { }; - azure-cli-core = callPackage ../development/python-modules/azure-cli-core { }; - - azure-cli-telemetry = callPackage ../development/python-modules/azure-cli-telemetry { }; - azure-common = callPackage ../development/python-modules/azure-common { }; azure-cosmos = callPackage ../development/python-modules/azure-cosmos { }; @@ -491,7 +489,7 @@ in { bt_proximity = callPackage ../development/python-modules/bt-proximity { }; - bugseverywhere = callPackage ../applications/version-management/bugseverywhere {}; + bugseverywhere = throw "bugseverywhere has been removed: Abandoned by upstream."; # Added 2019-11-27 cachecontrol = callPackage ../development/python-modules/cachecontrol { }; @@ -878,6 +876,8 @@ in { palettable = callPackage ../development/python-modules/palettable { }; + papermill = callPackage ../development/python-modules/papermill { }; + parsley = callPackage ../development/python-modules/parsley { }; pastel = callPackage ../development/python-modules/pastel { }; @@ -1325,6 +1325,8 @@ in { tableaudocumentapi = callPackage ../development/python-modules/tableaudocumentapi { }; + tesserocr = callPackage ../development/python-modules/tesserocr { }; + trueskill = callPackage ../development/python-modules/trueskill { }; trustme = callPackage ../development/python-modules/trustme {}; @@ -4489,7 +4491,7 @@ in { praw = if isPy3k then callPackage ../development/python-modules/praw { } else callPackage ../development/python-modules/praw/6.3.nix { }; - + prance = callPackage ../development/python-modules/prance { }; prawcore = callPackage ../development/python-modules/prawcore { }; @@ -5254,7 +5256,9 @@ in { texttable = callPackage ../development/python-modules/texttable { }; - tiledb = callPackage ../development/python-modules/tiledb { + textwrap3 = callPackage ../development/python-modules/textwrap3 { }; + + tiledb = callPackage ../development/python-modules/tiledb { inherit (pkgs) tiledb; }; @@ -6572,6 +6576,8 @@ in { managesieve = callPackage ../development/python-modules/managesieve { }; + pony = callPackage ../development/python-modules/pony { }; + }); in fix' (extends overrides packages) |