diff options
176 files changed, 5129 insertions, 4315 deletions
diff --git a/.github/CONTRIBUTING.md b/.github/CONTRIBUTING.md index 576beb18de6a..2b88f15d276e 100644 --- a/.github/CONTRIBUTING.md +++ b/.github/CONTRIBUTING.md @@ -20,6 +20,8 @@ under the terms of [COPYING](../COPYING), which is an MIT-like license. (Motivation for change. Additional information.) ``` + For consistency, there should not be a period at the end of the commit message. + Examples: * nginx: init at 2.0.1 diff --git a/default.nix b/default.nix index f4b2640ac5a0..a74a01719c73 100644 --- a/default.nix +++ b/default.nix @@ -18,7 +18,7 @@ if ! builtins ? nixVersion || builtins.compareVersions requiredVersion builtins. For more information, please see the NixOS release notes at https://nixos.org/nixos/manual or locally at - ${toString ./doc/manual/release-notes}. + ${toString ./nixos/doc/manual/release-notes}. If you need further help, see https://nixos.org/nixos/support.html '' diff --git a/lib/systems/examples.nix b/lib/systems/examples.nix index c2ee829529dc..8ba03a63fd8d 100644 --- a/lib/systems/examples.nix +++ b/lib/systems/examples.nix @@ -28,7 +28,7 @@ rec { }; armv7l-hf-multiplatform = rec { - config = "armv7a-unknown-linux-gnueabihf"; + config = "armv7l-unknown-linux-gnueabihf"; platform = platforms.armv7l-hf-multiplatform; }; diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 737431effaca..fd79376b14d3 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -3057,7 +3057,7 @@ name = "Oliver Dunkl"; }; offline = { - email = "jakahudoklin@gmail.com"; + email = "jaka@x-truder.net"; github = "offlinehacker"; name = "Jaka Hudoklin"; }; @@ -3120,6 +3120,11 @@ github = "oyren"; name = "Moritz Scheuren"; }; + pacien = { + email = "b4gx3q.nixpkgs@pacien.net"; + github = "pacien"; + name = "Pacien Tran-Girard"; + }; paholg = { email = "paho@paholg.com"; github = "paholg"; @@ -4673,6 +4678,11 @@ github = "maggesi"; name = "Marco Maggesi"; }; + zachcoyle = { + email = "zach.coyle@gmail.com"; + github = "zachcoyle"; + name = "Zach Coyle"; + }; zagy = { email = "cz@flyingcircus.io"; github = "zagy"; diff --git a/nixos/doc/manual/administration/container-networking.xml b/nixos/doc/manual/administration/container-networking.xml index 4b977d1d82eb..8aca329c8f1f 100644 --- a/nixos/doc/manual/administration/container-networking.xml +++ b/nixos/doc/manual/administration/container-networking.xml @@ -52,4 +52,7 @@ $ ping -c1 10.233.4.2 networking.networkmanager.unmanaged = [ "interface-name:ve-*" ]; </programlisting> </para> + <para> + You may need to restart your system for the changes to take effect. + </para> </section> diff --git a/nixos/doc/manual/administration/imperative-containers.xml b/nixos/doc/manual/administration/imperative-containers.xml index fa380477f6cb..9bb62bc2ece9 100644 --- a/nixos/doc/manual/administration/imperative-containers.xml +++ b/nixos/doc/manual/administration/imperative-containers.xml @@ -73,7 +73,8 @@ Linux foo 3.4.82 #1-NixOS SMP Thu Mar 20 14:44:05 UTC 2014 x86_64 GNU/Linux </para> <para> - To change the configuration of the container, you can edit + There are several ways to change the configuration of the container. First, + on the host, you can edit <literal>/var/lib/container/<replaceable>name</replaceable>/etc/nixos/configuration.nix</literal>, and run <screen> @@ -86,7 +87,8 @@ Linux foo 3.4.82 #1-NixOS SMP Thu Mar 20 14:44:05 UTC 2014 x86_64 GNU/Linux <xref linkend="opt-services.httpd.enable"/> = true; <xref linkend="opt-services.httpd.adminAddr"/> = "foo@example.org"; <xref linkend="opt-networking.firewall.allowedTCPPorts"/> = [ 80 ]; - ' +' + # curl http://$(nixos-container show-ip foo)/ <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 3.2 Final//EN">… </screen> @@ -95,13 +97,11 @@ Linux foo 3.4.82 #1-NixOS SMP Thu Mar 20 14:44:05 UTC 2014 x86_64 GNU/Linux </para> <para> - Note that in previous versions of NixOS (17.09 and earlier) one could also - use all nix-related commands (like <command>nixos-rebuild switch</command>) - from inside the container. However, since the release of Nix 2.0 this is not - supported anymore. Supporting Nix commands inside the container might be - possible again in future versions. See - <link xlink:href="https://github.com/NixOS/nixpkgs/issues/40355">the github - issue</link> for tracking progress on this issue. + Alternatively, you can change the configuration from within the container + itself by running <command>nixos-rebuild switch</command> inside the + container. Note that the container by default does not have a copy of the + NixOS channel, so you should run <command>nix-channel --update</command> + first. </para> <para> diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix index af630178a919..b6849a4df574 100644 --- a/nixos/modules/module-list.nix +++ b/nixos/modules/module-list.nix @@ -284,6 +284,7 @@ ./services/hardware/tlp.nix ./services/hardware/thinkfan.nix ./services/hardware/trezord.nix + ./services/hardware/triggerhappy.nix ./services/hardware/u2f.nix ./services/hardware/udev.nix ./services/hardware/udisks2.nix diff --git a/nixos/modules/services/hardware/triggerhappy.nix b/nixos/modules/services/hardware/triggerhappy.nix new file mode 100644 index 000000000000..81d4a1ae65bf --- /dev/null +++ b/nixos/modules/services/hardware/triggerhappy.nix @@ -0,0 +1,114 @@ +{ config, lib, pkgs, ... }: + +with lib; + +let + + cfg = config.services.triggerhappy; + + socket = "/run/thd.socket"; + + configFile = pkgs.writeText "triggerhappy.conf" '' + ${concatMapStringsSep "\n" + ({ keys, event, cmd, ... }: + ''${concatMapStringsSep "+" (x: "KEY_" + x) keys} ${toString { press = 1; hold = 2; release = 0; }.${event}} ${cmd}'' + ) + cfg.bindings} + ${cfg.extraConfig} + ''; + + bindingCfg = { config, ... }: { + options = { + + keys = mkOption { + type = types.listOf types.str; + description = "List of keys to match. Key names as defined in linux/input-event-codes.h"; + }; + + event = mkOption { + type = types.enum ["press" "hold" "release"]; + default = "press"; + description = "Event to match."; + }; + + cmd = mkOption { + type = types.str; + description = "What to run."; + }; + + }; + }; + +in + +{ + + ###### interface + + options = { + + services.triggerhappy = { + + enable = mkOption { + type = types.bool; + default = false; + description = '' + Whether to enable the <command>triggerhappy</command> hotkey daemon. + ''; + }; + + bindings = mkOption { + type = types.listOf (types.submodule bindingCfg); + default = []; + example = lib.literalExample '' + [ { keys = ["PLAYPAUSE"]; cmd = "''${pkgs.mpc_cli}/bin/mpc -q toggle"; } ] + ''; + description = '' + Key bindings for <command>triggerhappy</command>. + ''; + }; + + extraConfig = mkOption { + type = types.lines; + default = ""; + description = '' + Literal contents to append to the end of <command>triggerhappy</command> configuration file. + ''; + }; + + }; + + }; + + + ###### implementation + + config = mkIf cfg.enable { + + systemd.sockets.triggerhappy = { + description = "Triggerhappy Socket"; + wantedBy = [ "sockets.target" ]; + socketConfig.ListenDatagram = socket; + }; + + systemd.services.triggerhappy = { + wantedBy = [ "multi-user.target" ]; + after = [ "local-fs.target" ]; + description = "Global hotkey daemon"; + serviceConfig = { + ExecStart = "${pkgs.triggerhappy}/bin/thd --user nobody --socket ${socket} --triggers ${configFile} --deviceglob /dev/input/event*"; + }; + }; + + services.udev.packages = lib.singleton (pkgs.writeTextFile { + name = "triggerhappy-udev-rules"; + destination = "/etc/udev/rules.d/61-triggerhappy.rules"; + text = '' + ACTION=="add", SUBSYSTEM=="input", KERNEL=="event[0-9]*", ATTRS{name}!="triggerhappy", \ + RUN+="${pkgs.triggerhappy}/bin/th-cmd --socket ${socket} --passfd --udev" + ''; + }); + + }; + +} diff --git a/nixos/modules/services/logging/journaldriver.nix b/nixos/modules/services/logging/journaldriver.nix index 74ac3d4c2365..9bd581e9ec0e 100644 --- a/nixos/modules/services/logging/journaldriver.nix +++ b/nixos/modules/services/logging/journaldriver.nix @@ -7,7 +7,7 @@ # to be set. # # For further information please consult the documentation in the -# upstream repository at: https://github.com/aprilabank/journaldriver/ +# upstream repository at: https://github.com/tazjin/journaldriver/ { config, lib, pkgs, ...}: diff --git a/nixos/modules/services/misc/emby.nix b/nixos/modules/services/misc/emby.nix index 151edd0e761a..0ad4a3f7376f 100644 --- a/nixos/modules/services/misc/emby.nix +++ b/nixos/modules/services/misc/emby.nix @@ -55,7 +55,7 @@ in User = cfg.user; Group = cfg.group; PermissionsStartOnly = "true"; - ExecStart = "${pkgs.emby}/bin/emby"; + ExecStart = "${pkgs.emby}/bin/emby -programdata ${cfg.dataDir}"; Restart = "on-failure"; }; }; diff --git a/nixos/modules/services/networking/murmur.nix b/nixos/modules/services/networking/murmur.nix index fcc813e6898f..a6e90feff7ea 100644 --- a/nixos/modules/services/networking/murmur.nix +++ b/nixos/modules/services/networking/murmur.nix @@ -50,7 +50,7 @@ in enable = mkOption { type = types.bool; default = false; - description = "If enabled, start the Murmur Service."; + description = "If enabled, start the Murmur Mumble server."; }; autobanAttempts = mkOption { diff --git a/nixos/modules/services/x11/desktop-managers/gnome3.nix b/nixos/modules/services/x11/desktop-managers/gnome3.nix index eb86f7b53bb6..0d5b860d4617 100644 --- a/nixos/modules/services/x11/desktop-managers/gnome3.nix +++ b/nixos/modules/services/x11/desktop-managers/gnome3.nix @@ -133,7 +133,6 @@ in { fonts.fonts = [ pkgs.dejavu_fonts pkgs.cantarell-fonts ]; - services.xserver.displayManager.gdm.enable = mkDefault true; services.xserver.displayManager.extraSessionFilePackages = [ pkgs.gnome3.gnome-session ]; services.xserver.displayManager.sessionCommands = '' diff --git a/nixos/modules/services/x11/display-managers/lightdm-greeters/enso-os.nix b/nixos/modules/services/x11/display-managers/lightdm-greeters/enso-os.nix new file mode 100644 index 000000000000..7c794b1ba175 --- /dev/null +++ b/nixos/modules/services/x11/display-managers/lightdm-greeters/enso-os.nix @@ -0,0 +1,159 @@ +{ config, lib, pkgs, ... }: + +with lib; +let + dmcfg = config.services.xserver.displayManager; + ldmcfg = dmcfg.lightdm; + cfg = ldmcfg.greeters.enso; + + theme = cfg.theme.package; + icons = cfg.iconTheme.package; + cursors = cfg.cursorTheme.package; + + # We need a few things in the environment for the greeter to run with + # fonts/icons. + wrappedEnsoGreeter = pkgs.runCommand "lightdm-enso-os-greeter" + { buildInputs = [ pkgs.makeWrapper ]; } + '' + # This wrapper ensures that we actually get themes + makeWrapper ${pkgs.lightdm-enso-os-greeter}/bin/pantheon-greeter \ + $out/greeter \ + --prefix PATH : "${pkgs.glibc.bin}/bin" \ + --set GDK_PIXBUF_MODULE_FILE "${pkgs.librsvg.out}/lib/gdk-pixbuf-2.0/2.10.0/loaders.cache" \ + --set GTK_PATH "${theme}:${pkgs.gtk3.out}" \ + --set GTK_EXE_PREFIX "${theme}" \ + --set GTK_DATA_PREFIX "${theme}" \ + --set XDG_DATA_DIRS "${theme}/share:${icons}/share:${cursors}/share" \ + --set XDG_CONFIG_HOME "${theme}/share" + + cat - > $out/lightdm-enso-os-greeter.desktop << EOF + [Desktop Entry] + Name=LightDM Greeter + Comment=This runs the LightDM Greeter + Exec=$out/greeter + Type=Application + EOF + ''; + + ensoGreeterConf = pkgs.writeText "lightdm-enso-os-greeter.conf" '' + [greeter] + default-wallpaper=${ldmcfg.background} + gtk-theme=${cfg.theme.name} + icon-theme=${cfg.iconTheme.name} + cursor-theme=${cfg.cursorTheme.name} + blur=${toString cfg.blur} + brightness=${toString cfg.brightness} + ${cfg.extraConfig} + ''; +in { + options = { + services.xserver.displayManager.lightdm.greeters.enso = { + enable = mkOption { + type = types.bool; + default = false; + description = '' + Whether to enable enso-os-greeter as the lightdm greeter + ''; + }; + + theme = { + package = mkOption { + type = types.package; + default = pkgs.gnome3.gnome-themes-extra; + defaultText = "pkgs.gnome3.gnome-themes-extra"; + description = '' + The package path that contains the theme given in the name option. + ''; + }; + + name = mkOption { + type = types.str; + default = "Adwaita"; + description = '' + Name of the theme to use for the lightdm-enso-os-greeter + ''; + }; + }; + + iconTheme = { + package = mkOption { + type = types.package; + default = pkgs.papirus-icon-theme; + defaultText = "pkgs.papirus-icon-theme"; + description = '' + The package path that contains the icon theme given in the name option. + ''; + }; + + name = mkOption { + type = types.str; + default = "ePapirus"; + description = '' + Name of the icon theme to use for the lightdm-enso-os-greeter + ''; + }; + }; + + cursorTheme = { + package = mkOption { + type = types.package; + default = pkgs.capitaine-cursors; + defaultText = "pkgs.capitaine-cursors"; + description = '' + The package path that contains the cursor theme given in the name option. + ''; + }; + + name = mkOption { + type = types.str; + default = "capitane-cursors"; + description = '' + Name of the cursor theme to use for the lightdm-enso-os-greeter + ''; + }; + }; + + blur = mkOption { + type = types.bool; + default = false; + description = '' + Whether or not to enable blur + ''; + }; + + brightness = mkOption { + type = types.int; + default = 7; + description = '' + Brightness + ''; + }; + + extraConfig = mkOption { + type = types.lines; + default = ""; + description = '' + Extra configuration that should be put in the greeter.conf + configuration file + ''; + }; + }; + }; + + config = mkIf (ldmcfg.enable && cfg.enable) { + environment.etc."lightdm/greeter.conf".source = ensoGreeterConf; + + services.xserver.displayManager.lightdm = { + greeter = mkDefault { + package = wrappedEnsoGreeter; + name = "lightdm-enso-os-greeter"; + }; + + greeters = { + gtk = { + enable = mkDefault false; + }; + }; + }; + }; +} diff --git a/nixos/modules/services/x11/display-managers/lightdm.nix b/nixos/modules/services/x11/display-managers/lightdm.nix index 16f1ddea1a75..a685dbfff2a0 100644 --- a/nixos/modules/services/x11/display-managers/lightdm.nix +++ b/nixos/modules/services/x11/display-managers/lightdm.nix @@ -80,6 +80,7 @@ in imports = [ ./lightdm-greeters/gtk.nix ./lightdm-greeters/mini.nix + ./lightdm-greeters/enso-os.nix ]; options = { diff --git a/nixos/modules/virtualisation/container-config.nix b/nixos/modules/virtualisation/container-config.nix index 5e368acd6d8b..561db7cabcfb 100644 --- a/nixos/modules/virtualisation/container-config.nix +++ b/nixos/modules/virtualisation/container-config.nix @@ -22,6 +22,13 @@ with lib; # Not supported in systemd-nspawn containers. security.audit.enable = false; + # Make sure that root user in container will talk to host nix-daemon + environment.etc."profile".text = '' + export NIX_REMOTE=daemon + ''; + + + }; } diff --git a/nixos/tests/containers-imperative.nix b/nixos/tests/containers-imperative.nix index 6f86819f4e88..782095a09dad 100644 --- a/nixos/tests/containers-imperative.nix +++ b/nixos/tests/containers-imperative.nix @@ -86,6 +86,9 @@ import ./make-test.nix ({ pkgs, ...} : { # 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"); diff --git a/pkgs/applications/altcoins/litecoin.nix b/pkgs/applications/altcoins/litecoin.nix index cf84be6d7aa6..b23f3ad42434 100644 --- a/pkgs/applications/altcoins/litecoin.nix +++ b/pkgs/applications/altcoins/litecoin.nix @@ -11,13 +11,13 @@ with stdenv.lib; stdenv.mkDerivation rec { name = "litecoin" + (toString (optional (!withGui) "d")) + "-" + version; - version = "0.16.0"; + version = "0.16.2"; src = fetchFromGitHub { owner = "litecoin-project"; repo = "litecoin"; rev = "v${version}"; - sha256 = "1g79sbplkn2bnb17i2kyh1d64bjl3ihbx83n0xssvjaajn56hbzw"; + sha256 = "0xfwh7cxxz6w8kgr4kl48w3zm81n1hv8fxb5l9zx3460im1ffgy6"; }; nativeBuildInputs = [ pkgconfig autoreconfHook ]; diff --git a/pkgs/applications/audio/FIL-plugins/default.nix b/pkgs/applications/audio/FIL-plugins/default.nix new file mode 100644 index 000000000000..b9322c37df00 --- /dev/null +++ b/pkgs/applications/audio/FIL-plugins/default.nix @@ -0,0 +1,37 @@ +{ stdenv, fetchurl, ladspaH +}: + +stdenv.mkDerivation rec { + name = "FIL-plugins-${version}"; + version = "0.3.0"; + src = fetchurl { + url = "http://kokkinizita.linuxaudio.org/linuxaudio/downloads/${name}.tar.bz2"; + sha256 = "1scfv9j7jrp50r565haa4rvxn1vk2ss86xssl5qgcr8r45qz42qw"; + }; + + buildInputs = [ ladspaH ]; + + patchPhase = '' + sed -i 's@/usr/bin/install@install@g' Makefile + sed -i 's@/bin/rm@rm@g' Makefile + sed -i 's@/usr/lib/ladspa@$(out)/lib/ladspa@g' Makefile + ''; + + preInstall="mkdir -p $out/lib/ladspa"; + + meta = { + description = ''a four-band parametric equaliser, which has the nice property of being stable even while parameters are being changed''; + longDescription = '' + Each section has an active/bypass switch, frequency, bandwidth and gain controls. + There is also a global bypass switch and gain control. + The 2nd order resonant filters are implemented using a Mitra-Regalia style lattice filter. + All switches and controls are internally smoothed, so they can be used 'live' whithout any clicks or zipper noises. + This should make this plugin a good candidate for use in systems that allow automation of plugin control ports, such as Ardour, or for stage use. + ''; + version = "${version}"; + homepage = http://kokkinizita.linuxaudio.org/linuxaudio/ladspa/index.html; + license = stdenv.lib.licenses.gpl2Plus; + maintainers = [ stdenv.lib.maintainers.magnetophon ]; + platforms = stdenv.lib.platforms.linux; + }; +} diff --git a/pkgs/applications/audio/eteroj.lv2/default.nix b/pkgs/applications/audio/eteroj.lv2/default.nix new file mode 100644 index 000000000000..28e4879efdc0 --- /dev/null +++ b/pkgs/applications/audio/eteroj.lv2/default.nix @@ -0,0 +1,24 @@ +{ stdenv, fetchFromGitHub, cmake, pkgconfig, libuv, lv2 }: + +stdenv.mkDerivation rec { + pname = "eteroj.lv2"; + version = "0.4.0"; + name = "${pname}-${version}"; + + src = fetchFromGitHub { + owner = "OpenMusicKontrollers"; + repo = pname; + rev = version; + sha256 = "0lzdk7hlz3vqgshrfpj0izjad1fmsnzk2vxqrry70xgz8xglvnmn"; + }; + + buildInputs = [ libuv lv2 ]; + nativeBuildInputs = [ cmake pkgconfig ]; + + meta = with stdenv.lib; { + description = "OSC injection/ejection from/to UDP/TCP/Serial for LV2"; + homepage = https://open-music-kontrollers.ch/lv2/eteroj; + license = licenses.artistic2; + maintainers = with maintainers; [ magnetophon ]; + }; +} diff --git a/pkgs/applications/audio/midisheetmusic/default.nix b/pkgs/applications/audio/midisheetmusic/default.nix new file mode 100644 index 000000000000..448977e5705b --- /dev/null +++ b/pkgs/applications/audio/midisheetmusic/default.nix @@ -0,0 +1,60 @@ +{ stdenv, fetchurl +, mono, dotnetPackages, makeWrapper +, gtk2, cups, timidity }: + +let + version = "2.6"; +in stdenv.mkDerivation { + name = "midisheetmusic-${version}"; + + src = fetchurl { + url = "mirror://sourceforge/midisheetmusic/MidiSheetMusic-${version}-linux-src.tar.gz"; + sha256 = "05c6zskj50g29f51lx8fvgzsi3f31z01zj6ssjjrgr7jfs7ak70p"; + }; + + checkInputs = (with dotnetPackages; [ NUnitConsole ]); + nativeBuildInputs = [ mono makeWrapper ]; + + buildPhase = '' + for i in Classes/MidiPlayer.cs Classes/MidiSheetMusic.cs + do + substituteInPlace $i --replace "/usr/bin/timidity" "${timidity}/bin/timidity" + done + + ./build.sh + ''; + + # include missing file with unit tests for building + # switch from mono nunit dll to standalone dll otherwise mono compiler barks + # run via nunit3 console, because mono nunit console wants access $HOME + checkPhase = '' + substituteInPlace UnitTestDLL.csproj \ + --replace "</Compile>" '</Compile><Compile Include="Classes\UnitTest.cs"/>' \ + --replace nunit.framework.dll "${dotnetPackages.NUnit}/lib/dotnet/NUnit/nunit.framework.dll" + ./build_unit_test.sh + nunit3-console bin/Debug/UnitTest.dll + ''; + + # 2 tests of 47 are still failing + doCheck = false; + + installPhase = '' + mkdir -p $out/share/applications $out/share/pixmaps $out/bin + + cp deb/midisheetmusic.desktop $out/share/applications + cp NotePair.png $out/share/pixmaps/midisheetmusic.png + cp bin/Debug/MidiSheetMusic.exe $out/bin/.MidiSheetMusic.exe + + makeWrapper ${mono}/bin/mono $out/bin/midisheetmusic.mono.exe \ + --prefix LD_LIBRARY_PATH : ${stdenv.lib.makeLibraryPath [ gtk2 cups ]} \ + --add-flags $out/bin/.MidiSheetMusic.exe + ''; + + meta = with stdenv.lib; { + description = "Convert MIDI Files to Piano Sheet Music for two hands"; + homepage = http://midisheetmusic.com; + license = licenses.gpl2; + maintainers = [ maintainers.gnidorah ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/applications/audio/tambura/default.nix b/pkgs/applications/audio/tambura/default.nix new file mode 100644 index 000000000000..a739d72898e2 --- /dev/null +++ b/pkgs/applications/audio/tambura/default.nix @@ -0,0 +1,34 @@ +{ stdenv, fetchFromGitHub, faust2jaqt, faust2lv2 }: +stdenv.mkDerivation rec { + pname = "Tambura"; + name = "${pname}-${version}"; + version = "1.0"; + + src = fetchFromGitHub { + owner = "olilarkin"; + repo = "${pname}"; + rev = "v${version}"; + sha256 = "1w80cmiyzca1wirf5gypg3hcix1ky777id8wnd3k92mn1jf4a24y"; + }; + + buildInputs = [ faust2jaqt faust2lv2 ]; + + buildPhase = '' + faust2jaqt -vec -time -t 99999 ${pname}.dsp + faust2lv2 -vec -time -gui -t 99999 ${pname}.dsp + ''; + + installPhase = '' + mkdir -p $out/bin + cp ${pname} $out/bin/ + mkdir -p $out/lib/lv2 + cp -r ${pname}.lv2/ $out/lib/lv2 + ''; + + meta = with stdenv.lib; { + description = "A FAUST patch inspired by the Indian Tambura/Tanpura - a four string drone instrument, known for its unique rich harmonic timbre"; + homepage = https://github.com/olilarkin/Tambura; + license = licenses.gpl2; + maintainers = [ maintainers.magnetophon ]; + }; +} diff --git a/pkgs/applications/audio/yoshimi/default.nix b/pkgs/applications/audio/yoshimi/default.nix index 65a3bbfdc011..d35c7b05a893 100644 --- a/pkgs/applications/audio/yoshimi/default.nix +++ b/pkgs/applications/audio/yoshimi/default.nix @@ -6,11 +6,11 @@ assert stdenv ? glibc; stdenv.mkDerivation rec { name = "yoshimi-${version}"; - version = "1.5.8.2"; + version = "1.5.9"; src = fetchurl { url = "mirror://sourceforge/yoshimi/${name}.tar.bz2"; - sha256 = "1kg7d6mnzdwzsqhrf7pmrf1hzgfpbpm5lv8xkaz32wiv391qrnxc"; + sha256 = "1nqwxwq6814m860zrh33r85vdyi2bgkvjg5372h3ngcdmxnb7wr0"; }; buildInputs = [ diff --git a/pkgs/applications/display-managers/lightdm-enso-os-greeter/default.nix b/pkgs/applications/display-managers/lightdm-enso-os-greeter/default.nix new file mode 100644 index 000000000000..38270a25c9c9 --- /dev/null +++ b/pkgs/applications/display-managers/lightdm-enso-os-greeter/default.nix @@ -0,0 +1,71 @@ +{ stdenv, fetchgit, pkgconfig +, dbus, pcre, epoxy, libXdmcp, at-spi2-core, libxklavier, libxkbcommon, libpthreadstubs +, gtk3, vala, cmake, libgee, libX11, lightdm, gdk_pixbuf, clutter-gtk }: + +stdenv.mkDerivation rec { + version = "0.2.1"; + name = "lightdm-enso-os-greeter-${version}"; + + src = fetchgit { + url = https://github.com/nick92/Enso-OS; + rev = "ed48330bfd986072bd82ac542ed8f8a7365c6427"; + sha256 = "11jm181jq1vbn83h235avpdxz7pqq6prqyzki5yryy53mkj4kgxz"; + }; + + buildInputs = [ + dbus + gtk3 + pcre + vala + cmake + epoxy + libgee + libX11 + lightdm + libXdmcp + gdk_pixbuf + clutter-gtk + libxklavier + at-spi2-core + libxkbcommon + libpthreadstubs + ]; + + nativeBuildInputs = [ + pkgconfig + ]; + + postPatch = '' + sed -i "s@\''${CMAKE_INSTALL_PREFIX}/@@" greeter/CMakeLists.txt + ''; + + preConfigure = '' + cd greeter + ''; + + installFlags = [ + "DESTDIR=$(out)" + ]; + + preFixup = '' + mv $out/usr/* $out + rm -r $out/usr + ''; + + postFixup = '' + rm -r $out/sbin + ''; + + meta = with stdenv.lib; { + description = '' + A fork of pantheon greeter that positions elements in a central and + vertigal manner and adds a blur effect to the background + ''; + homepage = https://github.com/nick92/Enso-OS; + platforms = platforms.linux; + license = licenses.gpl3; + maintainers = with maintainers; [ + eadwu + ]; + }; +} diff --git a/pkgs/applications/editors/atom/default.nix b/pkgs/applications/editors/atom/default.nix index 25b5cad34dd2..6cfba39ed4b3 100644 --- a/pkgs/applications/editors/atom/default.nix +++ b/pkgs/applications/editors/atom/default.nix @@ -73,8 +73,8 @@ let }; in stdenv.lib.mapAttrs common { atom = { - version = "1.31.0"; - sha256 = "184vsj7qcpzwiq2v5kh8i21wfzhinhybxmr71y41sjqp78s2gy57"; + version = "1.31.2"; + sha256 = "1szx9p2nz1qzjpig0l8h4hj5mqwpjvkcynn8crh21drply4bpfr0"; }; atom-beta = { diff --git a/pkgs/applications/editors/howl/default.nix b/pkgs/applications/editors/howl/default.nix new file mode 100644 index 000000000000..8f75eda7ef70 --- /dev/null +++ b/pkgs/applications/editors/howl/default.nix @@ -0,0 +1,40 @@ +{ stdenv, fetchurl, makeWrapper, pkgconfig, gtk3, librsvg }: + +with stdenv.lib; + +stdenv.mkDerivation rec { + name = "howl-${version}"; + version = "0.5.3"; + + # Use the release tarball containing pre-downloaded dependencies sources + src = fetchurl { + url = "https://github.com/howl-editor/howl/releases/download/0.5.3/howl-0.5.3.tgz"; + sha256 = "0gnc8vr5h8mwapbcqc1zr9la62rb633awyqgy8q7pwjpiy85a03v"; + }; + + sourceRoot = "./howl-${version}/src"; + + # The Makefile uses "/usr/local" if not explicitly overridden + installFlags = [ "PREFIX=$(out)" ]; + + nativeBuildInputs = [ makeWrapper pkgconfig ]; + buildInputs = [ gtk3 librsvg ]; + enableParallelBuilding = true; + + # Required for the program to properly load its SVG assets + postInstall = '' + wrapProgram $out/bin/howl \ + --set GDK_PIXBUF_MODULE_FILE "$GDK_PIXBUF_MODULE_FILE" + ''; + + meta = { + homepage = https://howl.io/; + description = "A general purpose, fast and lightweight editor with a keyboard-centric minimalistic user interface"; + license = licenses.mit; + maintainers = with maintainers; [ pacien ]; + + # LuaJIT and Howl builds fail for x86_64-darwin and aarch64-linux respectively + platforms = [ "i686-linux" "x86_64-linux" ]; + }; +} + diff --git a/pkgs/applications/graphics/digikam/default.nix b/pkgs/applications/graphics/digikam/default.nix index a31bbe8caeb6..fb99d3e38322 100644 --- a/pkgs/applications/graphics/digikam/default.nix +++ b/pkgs/applications/graphics/digikam/default.nix @@ -34,7 +34,8 @@ , libqtav , libusb1 , marble -, libGLU_combined +, libGL +, libGLU , opencv3 , pcre , threadweaver @@ -75,7 +76,8 @@ mkDerivation rec { liblqr1 libqtav libusb1 - libGLU_combined + libGL + libGLU opencv3 pcre diff --git a/pkgs/applications/kde/marble.nix b/pkgs/applications/kde/marble.nix index e0e80b05ebce..ea140cad5ee5 100644 --- a/pkgs/applications/kde/marble.nix +++ b/pkgs/applications/kde/marble.nix @@ -8,6 +8,7 @@ mkDerivation { name = "marble"; meta.license = with lib.licenses; [ lgpl21 gpl3 ]; + outputs = [ "out" "dev" ]; nativeBuildInputs = [ extra-cmake-modules kdoctools perl ]; propagatedBuildInputs = [ qtscript qtsvg qtquickcontrols qtwebkit shared-mime-info krunner kparts diff --git a/pkgs/applications/misc/gramps/default.nix b/pkgs/applications/misc/gramps/default.nix index b12b84d106dc..413679afd219 100644 --- a/pkgs/applications/misc/gramps/default.nix +++ b/pkgs/applications/misc/gramps/default.nix @@ -1,7 +1,9 @@ { stdenv, fetchFromGitHub, gtk3, pythonPackages, intltool, gnome3, pango, gobjectIntrospection, wrapGAppsHook, # Optional packages: - enableOSM ? true, osm-gps-map + enableOSM ? true, osm-gps-map, + enableGraphviz ? true, graphviz, + enableGhostscript ? true, ghostscript }: let @@ -14,6 +16,11 @@ in buildPythonApplication rec { buildInputs = [ intltool gtk3 gobjectIntrospection pango gnome3.gexiv2 ] # Map support ++ stdenv.lib.optional enableOSM osm-gps-map + # Graphviz support + ++ stdenv.lib.optional enableGraphviz graphviz + # Ghostscript support + ++ stdenv.lib.optional enableGhostscript ghostscript + ; src = fetchFromGitHub { @@ -53,5 +60,6 @@ in buildPythonApplication rec { description = "Genealogy software"; homepage = https://gramps-project.org; license = licenses.gpl2; + maintainers = with maintainers; [ joncojonathan ]; }; } diff --git a/pkgs/applications/misc/gutenberg/default.nix b/pkgs/applications/misc/gutenberg/default.nix index c5982f68201d..c71dcf2e0182 100644 --- a/pkgs/applications/misc/gutenberg/default.nix +++ b/pkgs/applications/misc/gutenberg/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { name = "gutenberg-${version}"; - version = "0.4.1"; + version = "0.4.2"; src = fetchFromGitHub { owner = "Keats"; repo = "gutenberg"; rev = "v${version}"; - sha256 = "0is7156aim2ad8xg2f5068crc4gfvm89x8gxa25vc25p0yr1bpla"; + sha256 = "0kzxz26khk5rwb9mz0wi9r8y7r93w4n2dbq6v2qr07cy5h14pa6w"; }; - cargoSha256 = "146vlr85n9d06am5ki76fh1vb5r8a4lzx5b7dmgi292kc3dsn41z"; + cargoSha256 = "0n4ji06chybmcvg5yz6cnhzqh162zhh5xpbz374a796dwp1132m8"; nativeBuildInputs = [ cmake pkgconfig openssl ]; buildInputs = stdenv.lib.optionals stdenv.isDarwin [ CoreServices cf-private ]; diff --git a/pkgs/applications/misc/limesuite/default.nix b/pkgs/applications/misc/limesuite/default.nix index 070073ea3e2c..e1cdc4a0f863 100644 --- a/pkgs/applications/misc/limesuite/default.nix +++ b/pkgs/applications/misc/limesuite/default.nix @@ -4,7 +4,7 @@ } : let - version = "18.06.0"; + version = "18.10.0"; in stdenv.mkDerivation { name = "limesuite-${version}"; @@ -13,9 +13,11 @@ in stdenv.mkDerivation { owner = "myriadrf"; repo = "LimeSuite"; rev = "v${version}"; - sha256 = "0j6mxlvij2k6ib1d9jwzvilmqgm1h0q7wy9sf8a6bvidwlphvy25"; + sha256 = "0nbyvcdwvfvln1wic9qwb7y221v3jv454gp5v6ms9112a41zj46h"; }; + enableParallelBuilding = true; + nativeBuildInputs = [ cmake ]; buildInputs = [ @@ -36,10 +38,6 @@ in stdenv.mkDerivation { mkdir -p $out/share/limesuite cp bin/Release/lms7suite_mcu/* $out/share/limesuite - - cp bin/dualRXTX $out/bin - cp bin/basicRX $out/bin - cp bin/singleRX $out/bin ''; meta = with stdenv.lib; { diff --git a/pkgs/applications/misc/slic3r/prusa3d.nix b/pkgs/applications/misc/slic3r/prusa3d.nix index 9f4036c3f967..7df4007cf403 100644 --- a/pkgs/applications/misc/slic3r/prusa3d.nix +++ b/pkgs/applications/misc/slic3r/prusa3d.nix @@ -1,6 +1,6 @@ { stdenv, fetchFromGitHub, makeWrapper, which, cmake, perl, perlPackages, boost, tbb, wxGTK30, pkgconfig, gtk3, fetchurl, gtk2, libGLU, - glew, eigen, curl }: + glew, eigen, curl, gtest, nlopt, pcre, xorg }: let AlienWxWidgets = perlPackages.buildPerlPackage rec { name = "Alien-wxWidgets-0.69"; @@ -33,22 +33,28 @@ let in stdenv.mkDerivation rec { name = "slic3r-prusa-edition-${version}"; - version = "1.40.1"; + version = "1.41.0"; enableParallelBuilding = true; - buildInputs = [ + nativeBuildInputs = [ cmake - curl - perl makeWrapper + ]; + + buildInputs = [ + curl eigen glew + pcre + perl tbb which Wx WxGLCanvas - ] ++ (with perlPackages; [ + xorg.libXdmcp + xorg.libpthreadstubs + ] ++ checkInputs ++ (with perlPackages; [ boost ClassXSAccessor EncodeLocale @@ -72,8 +78,24 @@ stdenv.mkDerivation rec { XMLSAX ]); + checkInputs = [ gtest ]; + + # The build system uses custom logic - defined in + # xs/src/libnest2d/cmake_modules/FindNLopt.cmake in the package source - + # for finding the nlopt library, which doesn't pick up the package in the nix store. + # We need to set the path via the NLOPT environment variable instead. + NLOPT = "${nlopt}"; + prePatch = '' + # In nix ioctls.h isn't available from the standard kernel-headers package + # on other distributions. As the copy in glibc seems to be identical to the + # one in the kernel, we use that one instead. sed -i 's|"/usr/include/asm-generic/ioctls.h"|<asm-generic/ioctls.h>|g' xs/src/libslic3r/GCodeSender.cpp + + # PERL_VENDORARCH and PERL_VENDORLIB aren't set correctly by the build + # system, so we have to override them. Setting them as environment variables + # doesn't work though, so substituting the paths directly in CMakeLists.txt + # seems to be the easiest way. sed -i "s|\''${PERL_VENDORARCH}|$out/lib/slic3r-prusa3d|g" xs/CMakeLists.txt sed -i "s|\''${PERL_VENDORLIB}|$out/lib/slic3r-prusa3d|g" xs/CMakeLists.txt ''; @@ -92,7 +114,7 @@ stdenv.mkDerivation rec { src = fetchFromGitHub { owner = "prusa3d"; repo = "Slic3r"; - sha256 = "022mdz8824wg68qwgd49gnplw7wn84hqw113xh8l25v3j1jb9zmc"; + sha256 = "1al60hrqbhl05dnsr99hzbmxmn26fyx19sc5zxv816x3q6px9n2d"; rev = "version_${version}"; }; @@ -100,7 +122,7 @@ stdenv.mkDerivation rec { description = "G-code generator for 3D printer"; homepage = https://github.com/prusa3d/Slic3r; license = licenses.agpl3; - platforms = platforms.linux; maintainers = with maintainers; [ tweber ]; + broken = stdenv.hostPlatform.isAarch64; }; } diff --git a/pkgs/applications/networking/browsers/firefox-bin/beta_sources.nix b/pkgs/applications/networking/browsers/firefox-bin/beta_sources.nix index fa382a2bf246..a2b01c888419 100644 --- a/pkgs/applications/networking/browsers/firefox-bin/beta_sources.nix +++ b/pkgs/applications/networking/browsers/firefox-bin/beta_sources.nix @@ -1,995 +1,995 @@ { - version = "63.0b9"; + version = "63.0b13"; sources = [ - { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b9/linux-x86_64/ach/firefox-63.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b13/linux-x86_64/ach/firefox-63.0b13.tar.bz2"; locale = "ach"; arch = "linux-x86_64"; - sha512 = "34bbbd919c8b756392fb085afa6dc23b4a2101f2b089f1a4ea558eeefdbe5fa01334e8a2c45abb3ea2d5409f38693699921938b913da8195efe25353f4af9b5c"; + sha512 = "f07014570689a2f4f55771d199340193a3059ae121e7d5825e818fc6e5245bce15cde80de1f7c35bb13a595e898b79481b20f7b80abe63181cb46b6f47da4076"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b9/linux-x86_64/af/firefox-63.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b13/linux-x86_64/af/firefox-63.0b13.tar.bz2"; locale = "af"; arch = "linux-x86_64"; - sha512 = "62e754f4e1a1972cd737feb5d2960d2a9271695ab38fc58a53c62ebf66a889d724fead843b72ee7f48d416a1af66eb2387d49f8cb665fcae1be1ecf40f939f70"; + sha512 = "76606553f77a5a0deb6e50908b39824242175b044ab1562b1276ba97c8bf0d24154edd46e67c13afdba06df6e65725e291d4d25f1cd9177265f747bf729ed7db"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b9/linux-x86_64/an/firefox-63.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b13/linux-x86_64/an/firefox-63.0b13.tar.bz2"; locale = "an"; arch = "linux-x86_64"; - sha512 = "8068aad55ca3d6fe47c19ff43b814fa84d93dc051e4f22197ab4b512ba525b30bfcb0a39d490effaea383d4841482c1415f5e0737957cdc83ad8188b3136aac8"; + sha512 = "fa29b6af86d37befb227359254d680d2ce7eed7cbd4ff511be222ef112fca6b477fe3dd5c78696bcd71402aa4e99051ef3a0b6326ac959dc3262c9b8193e69b6"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b9/linux-x86_64/ar/firefox-63.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b13/linux-x86_64/ar/firefox-63.0b13.tar.bz2"; locale = "ar"; arch = "linux-x86_64"; - sha512 = "58dce7a3530872be9e1961c4a14a84e77d43d874f4ae0ec0bc1a9bf05e4f8264f832add17c4b05f6586ed7b456667ef85764786dff386feabd23269da7abd725"; + sha512 = "1921963fd0a8b515c351d30d9b7683f7984e619e77df0f9bdbcae85b0a0c1e4a9475be238cac6049d61135677af26868fc91ae76ec2ba81535116c95665afc4a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b9/linux-x86_64/as/firefox-63.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b13/linux-x86_64/as/firefox-63.0b13.tar.bz2"; locale = "as"; arch = "linux-x86_64"; - sha512 = "7599160ec4dfbdf774ea12231fa1a06e6448304898c031d973448a04aafc2966ab6421a1952a39ab0faf6bbc41151c8f4da97af3400afc0ca8c2f2da74aadc93"; + sha512 = "083b1f189b5b25f788d5bb8aa4367743a701e760e3ffa9c3d7bef8d221dccab9ebbb5c4486349f156bcf3cc44b90aae215fb76ea22c18b0401f69988915ee8ac"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b9/linux-x86_64/ast/firefox-63.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b13/linux-x86_64/ast/firefox-63.0b13.tar.bz2"; locale = "ast"; arch = "linux-x86_64"; - sha512 = "93aa64c23a9d52c67b3da7df22de140ca82e285cbfd55f2803cb55c3c369ce61c32c43383cf140b8ef884d137f072e258f13c3e657b10ceedd7853a84896b690"; + sha512 = "c1a7dfcf12d8b4fd4a7c6b657436073c41a10cd4ffc1e131482b83242d8a023cc89920bae085a3d7e334e5f8a87be8e2c01967d3d5e76f687c6528af09dd2adb"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b9/linux-x86_64/az/firefox-63.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b13/linux-x86_64/az/firefox-63.0b13.tar.bz2"; locale = "az"; arch = "linux-x86_64"; - sha512 = "7ddd48532987004cd48faee65ab93d6d6155df674d37ce744e06a32086e3e739355066b0411e673636d192a7d2610012ead4d417a1801fd11bef58d7b9a64dff"; + sha512 = "febe74dfeece3c7fddf3d24e682f4c991eecd511702217c3e18941edb9ec6a5120b95da72bd7b7f5f146f74174a0f4624ff112c56e3d6d9cb1ff5e8e349a294d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b9/linux-x86_64/be/firefox-63.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b13/linux-x86_64/be/firefox-63.0b13.tar.bz2"; locale = "be"; arch = "linux-x86_64"; - sha512 = "9b94f1741354bd018b539fabc167b842d42ede08a7f91ecca731d90c8677478b239150c06b1fc29888334358b724424fe011630f2b8ebe8ab80557ef6e6a2965"; + sha512 = "0ef2883de7eeb54eacd376cf00bdcfaf399f1a7761f2a26ce8756d70673f9074d0f919ca0253795db7643161aaf780461f238ae1065506376ce6511f0134444e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b9/linux-x86_64/bg/firefox-63.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b13/linux-x86_64/bg/firefox-63.0b13.tar.bz2"; locale = "bg"; arch = "linux-x86_64"; - sha512 = "8f5f3c7ee95a7b2542de91262d2e67b5ad86a6f1b95eadd5852c04814bfe19600f6a4dba1cc872a09afc124c60e7a9e5ffe630d197f4bc41e15f9e5d4bbf3766"; + sha512 = "df39cacd1c8b40c863fa4d64bf1eba8016f5789b1a09f5d3dc0947795e11b51dd67fa61dc666ab22d00c2d21c3eb3891cbef5e6ccfd6f419ba5ca47d8b98d588"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b9/linux-x86_64/bn-BD/firefox-63.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b13/linux-x86_64/bn-BD/firefox-63.0b13.tar.bz2"; locale = "bn-BD"; arch = "linux-x86_64"; - sha512 = "54c6be22eeeadc70c390a0cc0da72097468349bdd710698f7e1111c3f1157162f37cdcfa42532a80f2631d26ecd023bab8c247b2e1e4a73632e0f203aebb60ed"; + sha512 = "8398e8048bf7f15a234e6bc311561aae170d97715f73f9d8fd1dd5441562158970eae4628cd16a67992edd14f7a38bb5c7c32e6e9b554b0d234d2b012c80f76a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b9/linux-x86_64/bn-IN/firefox-63.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b13/linux-x86_64/bn-IN/firefox-63.0b13.tar.bz2"; locale = "bn-IN"; arch = "linux-x86_64"; - sha512 = "bae82b157d08ccb6f7e070d0a187c65dcf2e0d04ca2017658b523298aeb27e87ec1429bb5f8351baf5936599d70a20dc9da673bb7d46217babf2f5d0cc9f16bc"; + sha512 = "56cb6e80aaa4e9d98c8baad5bd8082e580d9d43e86e461939c41eda37fb19b95b55c693ef2b3e2d1cca486b307b0a9cf50367f66844bf8ab04c36e69b8d97ecd"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b9/linux-x86_64/br/firefox-63.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b13/linux-x86_64/br/firefox-63.0b13.tar.bz2"; locale = "br"; arch = "linux-x86_64"; - sha512 = "b3324be13c515feb2a91399fc490a736947856ebdacb0ce672b854841296e4a8912e0f26ec3d4b8dcec57a59eb178f01284098a3ab575c5f22984eceb1107b63"; + sha512 = "408693dd3d83be1c61bdb0618eb690477c6249e1ab3b7a2ab5dea03e29fa3574894d3ea1bfa3c5d9f3c853b5385f456aadf0a95a2972f39cf559a5a599cdf2c9"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b9/linux-x86_64/bs/firefox-63.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b13/linux-x86_64/bs/firefox-63.0b13.tar.bz2"; locale = "bs"; arch = "linux-x86_64"; - sha512 = "90df8d7791f187e27d698552be49d29467113628a743034eb972ed79c6e054b64aa76a199bfb71f2396284250da8a599e57c85595a0dfd8e184a983cc2e00853"; + sha512 = "afb9bc011ba0a95b2a87372de281024a1327d28b586e1465c7533b615357668ab5f89d1b6497e63b682dbc891da78f70fda4a70935380747ad8013a8492467c2"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b9/linux-x86_64/ca/firefox-63.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b13/linux-x86_64/ca/firefox-63.0b13.tar.bz2"; locale = "ca"; arch = "linux-x86_64"; - sha512 = "ae4326cf2eebfe722f12ffa6d75f1406115401edfe5503b49b116bacda0da94476d7a2e6efca9a3986f530d8ffa386c889ae3a2f559afc5fe7cc76681cfa8928"; + sha512 = "3faa14062e22dcbde97a66541e5d070d1a02b3471cabd3105a5ca546df6e34e7bfeba5af1c106b3f0db11d33343ff7df2d3fb39e8b55ea3cba22a172e93eec6a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b9/linux-x86_64/cak/firefox-63.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b13/linux-x86_64/cak/firefox-63.0b13.tar.bz2"; locale = "cak"; arch = "linux-x86_64"; - sha512 = "a9218854b8795e0558ad35f210d29b57ddd285822ac7177f9393fedb9572b99567c580fea7c107caf3453323576e048ce1527343432303e3c4c0881d03732c45"; + sha512 = "d1ea0e03595edf8c8a55b8bf60596aa866f6d228a28ca68f28b33bbee09016800b7ddde07ede3b1131f5502f57fceb4c088d977f2da0669b9b8771668aa77fb6"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b9/linux-x86_64/cs/firefox-63.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b13/linux-x86_64/cs/firefox-63.0b13.tar.bz2"; locale = "cs"; arch = "linux-x86_64"; - sha512 = "543a3cb1688f7f917e06a23d10e5f5c21355fa1ffc01bb26db41b8867bbf42c185f86ac9d6ba5411ee5278bfcb7b32d2659d7a808da680e0dc264e492da2b983"; + sha512 = "f3e8a43371919735279f934d207ccb78d568dbc17fe678a36c50d04371f55dae97c3a7ebb1f6afe16f884cab65d02bdad4e7cd59d1b34d59295bd90965159673"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b9/linux-x86_64/cy/firefox-63.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b13/linux-x86_64/cy/firefox-63.0b13.tar.bz2"; locale = "cy"; arch = "linux-x86_64"; - sha512 = "e06850664dabc4c90f9a9ecb6a11bcc5b8b7410a3402cc13c1ca75a92d5d69213f01cd5a94adcb45214d9fe334d537c7cf85fd2df0222977d1bd1a2c7f312a41"; + sha512 = "9e053f5b2dd82cdc81577fc17b115c0e1630612b70e16d2286f4fcf7eb56298d88a927f42b387f298997f33bcc56e2b85b08761220193b486bab0a8d76a85de1"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b9/linux-x86_64/da/firefox-63.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b13/linux-x86_64/da/firefox-63.0b13.tar.bz2"; locale = "da"; arch = "linux-x86_64"; - sha512 = "185617b4af7374b7cead277667dea7d9ea13c6edf0e5fecad156e1fcc940c26c8022dc9c4443b06859a65cd979c82529032a6ffbaaaaf710f2b56c3efc3658f3"; + sha512 = "8bda7cd63969acb27aba21113d8d44f833a7b8bbf5fea9af43b905edbd4e4db6a33830d4954af2635e684f04f9bdc35d4f4eb08f2433443c65704d8d482b7a38"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b9/linux-x86_64/de/firefox-63.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b13/linux-x86_64/de/firefox-63.0b13.tar.bz2"; locale = "de"; arch = "linux-x86_64"; - sha512 = "17ee2eac1b1f978c8b2a30cedb19361a37c6eb77974a037d13983b774639fa82807ecbb9226d3916a9177a21d3e3d322db0ed2cb06ca3c48d32e9d264c6b933b"; + sha512 = "640bc5d6195c7cc8291d890b707ac68dc2bdd7d5c1af1476482a3ebe8af738ffec60d8d01eedb11120393e3dc636d7c84403a28df579d1af4235e0d2831f3411"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b9/linux-x86_64/dsb/firefox-63.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b13/linux-x86_64/dsb/firefox-63.0b13.tar.bz2"; locale = "dsb"; arch = "linux-x86_64"; - sha512 = "af6ef7176e9b93e04302675b5b13cf8087821e1e708721141dede14db494e997783f279a8b5cceee8283581efd5d04ff18a5602703ad87f1ac86a1338be77638"; + sha512 = "55734d9efd54b0b67a7d8e3fb5b51cbe426e32b801037042d83e72ab7c2f039a42f9be4f15facf29b30e2b7e94ec568ba05e21f90714c5d42f9f96c6594185f9"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b9/linux-x86_64/el/firefox-63.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b13/linux-x86_64/el/firefox-63.0b13.tar.bz2"; locale = "el"; arch = "linux-x86_64"; - sha512 = "1d225254cef8025eee2811d3ee8dae017c1a91e56e1bf749b2f88d0cfb784a384f773b64d394e56097182de5e74c9807fd44efa35fb1d27dc68b3afe511d5745"; + sha512 = "c8f088dd546dd551c0400269a3cff29a79e9f125fb6a7f8faa558efa6331b5f34a389282e2a69a35f16dbea37826a411b9091eb0dbb5a2b2885bc84f493ec5d0"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b9/linux-x86_64/en-CA/firefox-63.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b13/linux-x86_64/en-CA/firefox-63.0b13.tar.bz2"; locale = "en-CA"; arch = "linux-x86_64"; - sha512 = "6dfb80b4f9b2b70651959bf5675b615eb096de271fd63bf1542e5d6b04a6c6bb850c520bd20240d757a5a9d84a524269495e933875fd5cd389da30cecab44620"; + sha512 = "2d093cacb7be796934b1f83f96bfe0c8c453fff180e5e10cb467123d6dc12620751e0074679220e874163fea1ae49447ea0ab4a4abaae710a891860b9731c42d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b9/linux-x86_64/en-GB/firefox-63.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b13/linux-x86_64/en-GB/firefox-63.0b13.tar.bz2"; locale = "en-GB"; arch = "linux-x86_64"; - sha512 = "ea6a81fd71445400b500bcd3a41d3af15b6125d0607b54742120119430c3993f65e534ec9183e9290b674df271706b0b9c20b9c3fd482e79e99dda67f222e03b"; + sha512 = "a791aec86b3ed14efb08d70159950bc5019f34b052dc773ea829ba37352fbf692c6e37df4b47fe256af5b6977390f0b47d82473778f489af3f43031eb83a3636"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b9/linux-x86_64/en-US/firefox-63.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b13/linux-x86_64/en-US/firefox-63.0b13.tar.bz2"; locale = "en-US"; arch = "linux-x86_64"; - sha512 = "c438b8c0a0c14575eeab5e41ffa5760378567ffae890a2cb5b8bb61b17013f815341425c489158c3bc6fa62e23a7316b79aed20fa971f476a873c163ca79bde8"; + sha512 = "b815f79b53694e370d4a7cae85a2222b9ba245f9d84db424bf8c25b5b4b3bb95e3895cb3d5ba10a1d33b9e0459ac57c158d75fa757c8b923df5d3ae253289e4b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b9/linux-x86_64/en-ZA/firefox-63.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b13/linux-x86_64/en-ZA/firefox-63.0b13.tar.bz2"; locale = "en-ZA"; arch = "linux-x86_64"; - sha512 = "44a5b04d64cb7f6528838165197d8be83ea45c0b84a0b4e444caf7f3b33d4ac8ca0e95fc8f1abf9e54b1b4102dda7d57709549649f9b7af35b4fdf112a266e85"; + sha512 = "7769ddef410d868ef5eb8c9c2b205bc1083a3224eb260734363653867bb1efbc2b524444401dc6ed2e65e2dcd8849e6ae05b3ff8143a2eb06b266bad7e43552f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b9/linux-x86_64/eo/firefox-63.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b13/linux-x86_64/eo/firefox-63.0b13.tar.bz2"; locale = "eo"; arch = "linux-x86_64"; - sha512 = "d5586193387bcb9edefdcc2d66e0e718b10f0790c29a7b45b0a7ef2382537a18d151eefb2a5e28af05078fcb798e6a6ca2b6dc2348dabfbe9b77b79fdcf6d9f6"; + sha512 = "78845601a316d7d0902031a0909ccaa53e1c36afe1607150b28ab6e0067dbf4c84c6b08aec6b334ecf04d714514b02a9b62852dcba22b54652d0fbde99223210"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b9/linux-x86_64/es-AR/firefox-63.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b13/linux-x86_64/es-AR/firefox-63.0b13.tar.bz2"; locale = "es-AR"; arch = "linux-x86_64"; - sha512 = "b2dbeaef33d58cb69ab4ae3474af984211eb180f31b9207a0a8de9801899b25aca63fa0164d8f631650a8a117b29078b780e90891e22fade85d1910d352dddd5"; + sha512 = "54e0a9200b55e10a5a480d0df47884b2c5c6f3f8f11c61bb645a1196d00dd6c121ee9710e6b2ccc5050c659c90cf36c9489a9045800cd566d64628f7e2affb97"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b9/linux-x86_64/es-CL/firefox-63.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b13/linux-x86_64/es-CL/firefox-63.0b13.tar.bz2"; locale = "es-CL"; arch = "linux-x86_64"; - sha512 = "e28890ea9fdf6ff771198f5dcdbdd0dd0bb2bc85fc3c1d2e0085536c9651fe0c853be528edeef1b37f96c9623ea0f71defb51839239f04b4c79f9fc9f462def9"; + sha512 = "b9f22d8318097134f70a22cdb21ce47300ee17cfc319dbb7872bc4ca5e3e7537fe255fb2db67ba347fc2ebf3ab2cbc8a6ff5b797385a0603f5a651a8cb820154"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b9/linux-x86_64/es-ES/firefox-63.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b13/linux-x86_64/es-ES/firefox-63.0b13.tar.bz2"; locale = "es-ES"; arch = "linux-x86_64"; - sha512 = "fcb9cd80dc5d55394b47239431614093f40963a208fe0269631906b19628514a93e0777e6e05b703adf3c474e92613d6239ad889d1602dbb36dcaa196af74af6"; + sha512 = "14cd21583ed2c74da7d75eca039bcec68689e369c4851062c5fa205488b577e29222fd6a025e5264d0423061d1c11d617339359a2cbcec927c453181df6b0c59"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b9/linux-x86_64/es-MX/firefox-63.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b13/linux-x86_64/es-MX/firefox-63.0b13.tar.bz2"; locale = "es-MX"; arch = "linux-x86_64"; - sha512 = "2cf4f172fbac8ab6c91f33e177c7919560556733f5cb18f6ddea8f8bada941d44161b6d0485e04538d334854f629e54f159e66b061d65aa9d7ad27f30c58907a"; + sha512 = "770cf8416d344ca603acde18841fb21ab1c8946e7a5a150876c47783de79bb43b85e8b366e55a4ce105b3ddf43f46272ee165deed6bb497471b74d849b858e55"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b9/linux-x86_64/et/firefox-63.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b13/linux-x86_64/et/firefox-63.0b13.tar.bz2"; locale = "et"; arch = "linux-x86_64"; - sha512 = "e70b40ac7a951da75f03e04640d8497c8628aa1b3633df180c6239025538c9dc66008aa717022bd2ddabeb01b924b05e1c076775ea5188bd70f60c921477e169"; + sha512 = "7402a094d60729cb28b71cb6d3774201fb6331fdc77321cf4705fbfa330a418c92bca2b5a7a3a2901b843d8bdb55045e339b0d87753148ecab699588bb1923c8"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b9/linux-x86_64/eu/firefox-63.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b13/linux-x86_64/eu/firefox-63.0b13.tar.bz2"; locale = "eu"; arch = "linux-x86_64"; - sha512 = "b4301494e41c0078fd34779a7da0d49efc7cdca25f83a9afc609b1deb1ab217cc5ede37e9c13d447e10cf2dd34b0b1b55a696b36beee96d40fc53f32e5d6f0a2"; + sha512 = "485ab61f0e85bd8a391560f4f2cac43ab35b81c7fdf957c36ac21f7b25f9538f1d118041f44742b978fd0619a977d8ec69553890d8bdef73c88944228f63022d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b9/linux-x86_64/fa/firefox-63.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b13/linux-x86_64/fa/firefox-63.0b13.tar.bz2"; locale = "fa"; arch = "linux-x86_64"; - sha512 = "9412d03c831ceed000d277de746efbe85347617fd15fda1e0649f546c3cf9a8f845230342af4fa629bc0cfbb6dea1fd8994d3dc392b0ea893e4aa9da0f076222"; + sha512 = "3f82d765e55611f1204068f2a62cb8a51f8db0940dee4d184fd2de69dc2336a1b6ad6132ad6e0188fb82028daafd244a2c478799e648c74d8efc8c46b6309e62"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b9/linux-x86_64/ff/firefox-63.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b13/linux-x86_64/ff/firefox-63.0b13.tar.bz2"; locale = "ff"; arch = "linux-x86_64"; - sha512 = "867ffaf66c28e111da286b3bd00605f8b5a373e73dfc660e0d5c3762cd08486491f25662867b964f24f5485bc41ce6783c391d7619781ce03d1576f9edea2001"; + sha512 = "33a5c4fa3436bd719fa2e02fdb23f9aaa33303f57db7ab27e86fe86d44065ea5218ccbfa13b410b9de0525c0c882e67ed6c6bc7b6546501edaed635460e26f12"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b9/linux-x86_64/fi/firefox-63.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b13/linux-x86_64/fi/firefox-63.0b13.tar.bz2"; locale = "fi"; arch = "linux-x86_64"; - sha512 = "b9005b63b6216f24a8d6be5acf2b086b682557dafbeaca593fa4aa9d9bcb13150443e97309a9bd585abb9245af37d041982088c0541b95391654eceb8c0e54e8"; + sha512 = "43d44d212bbb8d1f964abaa553b26fe5ac1c14c5cc2bd535697a03a28671984559925eeb66e0301db4b5f4cca615e77edfba5d443655205a5648de8dde6552ae"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b9/linux-x86_64/fr/firefox-63.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b13/linux-x86_64/fr/firefox-63.0b13.tar.bz2"; locale = "fr"; arch = "linux-x86_64"; - sha512 = "a8bdb7f2a27eff5973ff6c15fb68842c0470337c5fb765d7a0874501f9bfbcbf1864a3a258c9cb56df5e29ad8c69d77bc8b8c5572b51a02ac077e572893c9788"; + sha512 = "8d68e0667444cb5451382adf002dbd52f2cc755f0da0e91d5476c1cb88e62b0c1d14d8f796bd45940cbce01c2a180cde1ca087558a3e0985137f9f2db8ff4ef0"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b9/linux-x86_64/fy-NL/firefox-63.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b13/linux-x86_64/fy-NL/firefox-63.0b13.tar.bz2"; locale = "fy-NL"; arch = "linux-x86_64"; - sha512 = "e5d9bb130212db0c1e729c03a7a16ba584a00ceb26cbfbc254b8bd2851b9d57b8d81b746359452d66a0dd6617e62734a68e88db6cc74fa8ed5baae063bfd6acc"; + sha512 = "332a3219011cf0662ef0c560f86a7480fb270bf0ab9c6643ecd53f28b95cd7a8118a08638fd9b9197b2f6353bf3acf05656501ae67106cbde008edee87a8ba3d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b9/linux-x86_64/ga-IE/firefox-63.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b13/linux-x86_64/ga-IE/firefox-63.0b13.tar.bz2"; locale = "ga-IE"; arch = "linux-x86_64"; - sha512 = "b582d7bf274c6a43cca7a441a36704a22e5dab8903c323525ce6b29949104a057d692b9d1e3190bcf254c4cf76006e8e312d3e835e160413e7b659f0328a34f0"; + sha512 = "55eca096ca6a8bdf779d6ded920bbddee406a0f925b293b9c5c346e5542b1349811248014d908edfbf757c6510ca2ad561e97fa5b4557804f15a62da45afa97c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b9/linux-x86_64/gd/firefox-63.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b13/linux-x86_64/gd/firefox-63.0b13.tar.bz2"; locale = "gd"; arch = "linux-x86_64"; - sha512 = "028454bc9220da6ae7c45a08c897401fca9bb44b6fd5b358373c7c6d19673301ec1643578b386bc3d1b6faaa51e9df40ef31f27a829ddbde302b34a7473c0a0e"; + sha512 = "f70cc87ecccb1357a33fc0e8e5a94a5fce1c4150d9f80946faaee7e6280bfb821a403b522dc6c1579f36fe91697e02dbaf79c1c83b3e1858007fcf7570e8c6bb"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b9/linux-x86_64/gl/firefox-63.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b13/linux-x86_64/gl/firefox-63.0b13.tar.bz2"; locale = "gl"; arch = "linux-x86_64"; - sha512 = "f9957dd96b0b67d6f842c0908caacc747203cd143814c50c04d51387d869fdd6e958b1f0d262fdcf331f02b6672db738f4b55075de9d9036d3890f99e63f872e"; + sha512 = "bc5fa19ee0f1b907bec355f2fd0dff4f5ff8797c8ee77ba4c9085119ba25b270c664b488c66600c85ae30c12acfdd9e8cf1d84d785743a62b85030f3739cff36"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b9/linux-x86_64/gn/firefox-63.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b13/linux-x86_64/gn/firefox-63.0b13.tar.bz2"; locale = "gn"; arch = "linux-x86_64"; - sha512 = "c2346118765b436ea32eb56b3c8cdf3d4eb89729f5bebf708e7c7cd4778e5068d39d8295e045b1503c65c2a3388c98ab45532597e802ba0740e3081779204511"; + sha512 = "6009359591c9d0656eaa2c371c73d9a7141ef99d1533db04003ae3d7fcc31e33694cb0e2d29fbedaa63689a3556c40b281a6723fd7a28764ff77fd2ff624d9a1"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b9/linux-x86_64/gu-IN/firefox-63.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b13/linux-x86_64/gu-IN/firefox-63.0b13.tar.bz2"; locale = "gu-IN"; arch = "linux-x86_64"; - sha512 = "8cf5a1b00f038c0d06048ff88f1e49ef6db82d86b58341bd7b4758430ed2a990c49deb274ad9faba87f2531acd6bf4506886a518d02648cb0d8b33299ab8fb2d"; + sha512 = "2f3d315c8424fdb5823343885a115faaf57732977fe535526220125d38b0daa3faaec89c196cf5e153190575dd0162988a26a7d483e96f367c1dc7d1753ca676"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b9/linux-x86_64/he/firefox-63.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b13/linux-x86_64/he/firefox-63.0b13.tar.bz2"; locale = "he"; arch = "linux-x86_64"; - sha512 = "a7423bb84d6e299ae39d6fbfe0c7fc0650e46e6509c1bfa9fee7cadc50ebbd161a8fdc44289a910b4199d2fe97028b7f62a821b321ae1884e9359a7b3283ed2d"; + sha512 = "34577bb7b26c0c8fd8d12a278e55d89bc291e5c3aec101325a664125dffb4a33fbaa7decb9f75751ea3e83d06cff755db7012776ef1948789b2005edc4838505"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b9/linux-x86_64/hi-IN/firefox-63.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b13/linux-x86_64/hi-IN/firefox-63.0b13.tar.bz2"; locale = "hi-IN"; arch = "linux-x86_64"; - sha512 = "ae7404c79f130fd75943e9f1687b15baa7d29ae6dec176a5faba0d55c5d2795367b1fc8d665ef2c8f3767d70a34e4ca0efeef449f39f44ee0250100d6f3deb7c"; + sha512 = "a4319f07f092d10afbefdb316d3ccb550dbfe81f886458797a23a8ef9633e04269d2c8839f6e440e91cba48554eb604d491fff685bc3773114c5c413ca760149"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b9/linux-x86_64/hr/firefox-63.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b13/linux-x86_64/hr/firefox-63.0b13.tar.bz2"; locale = "hr"; arch = "linux-x86_64"; - sha512 = "c3f77366765494c689707ba0159c496c2bcd55b8a76e9abb49e3f849a99d34d7ff2a57f37b6468df91f91abfda87d142dd72a5ccdb4e5f4aeac6f6360b30767d"; + sha512 = "69503b9c45edbe65c8e21477583bfcde353b588bfb0ba2686fa4e73f279f050a62a0ef5c93cea60e05e777175993302740b3e1907013c648bebfc318c05b72d5"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b9/linux-x86_64/hsb/firefox-63.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b13/linux-x86_64/hsb/firefox-63.0b13.tar.bz2"; locale = "hsb"; arch = "linux-x86_64"; - sha512 = "591da976361db115ccca4d859ac1e105e8fad61f4e0b945643e1fccb77989604517421900889c2007248c672261c5e7bdd37c195610f9b47db7013fe5518c6bc"; + sha512 = "8a45b429b0f338f13b59fde3b98455a9c57312030bde04d1ed1478c0fa393d0523b6aae94a8127de429d47c52ad997aee1e49bfb3fda051386365c2f772a0d5e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b9/linux-x86_64/hu/firefox-63.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b13/linux-x86_64/hu/firefox-63.0b13.tar.bz2"; locale = "hu"; arch = "linux-x86_64"; - sha512 = "9310a55c992c545cb296319329e275363e944dbdf9109fe75fddf6d4b87e33d5bfa5ce582235933218777ccc76ad51743e50bb2045563d8d00f20fb8d3359159"; + sha512 = "7001c9ee64a1052d117e5bb649dfcf287982f55e5262baccfb7c9492c7535e975d831a92321fdc65775dc31b5abcc1bd2bf7240d7eea701bd2548f95ef646660"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b9/linux-x86_64/hy-AM/firefox-63.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b13/linux-x86_64/hy-AM/firefox-63.0b13.tar.bz2"; locale = "hy-AM"; arch = "linux-x86_64"; - sha512 = "b89921e45b08b9c8d93498b76a265cecdc5d15a6ff12948f7ae0f4de414403e096ab238e115923cc51541a4d220f4efd7a2840199adb852527ed0f53b97076b3"; + sha512 = "1fdf9cd98aec5cde88511fc3a79ff43c85185ac2c6008da6b432aa870eb3a9643814cea6bf402a17dacc7f2ad2c84a95e19a2f85180eb87e8a365e64a0e6a532"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b9/linux-x86_64/ia/firefox-63.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b13/linux-x86_64/ia/firefox-63.0b13.tar.bz2"; locale = "ia"; arch = "linux-x86_64"; - sha512 = "5c857e348ca910dcc200ebfb3d3d3afc9ee30f00cca22f8201587c8f9464317690e330c89c244877a9a5ad12d090a47ef0ca8de725e4ef9676f55c9a9a612108"; + sha512 = "6ffb602151ac4c9d9caa8b529caceca673521379fae298a9d1daf9049e0d4005a52adf079036b340d9a4099444404e9fed522011a953bedd2000fc7d42c0e03f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b9/linux-x86_64/id/firefox-63.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b13/linux-x86_64/id/firefox-63.0b13.tar.bz2"; locale = "id"; arch = "linux-x86_64"; - sha512 = "ea5cb9b840cc20d7f1298097b2aaa35966021186c5b59d39b47e58c7a6701a4c7029e1e891273ec73f937b237068073e91cc416dea58864c907cdb0979c7b9d8"; + sha512 = "bc95099398a49a8417a8cbd7745fd3d07788d6f1f4ccbfb70cad2e705ce45386e7ead17a1864755497576c3055a0ce05007c5a33e82db2e1b8e41995e68b9c87"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b9/linux-x86_64/is/firefox-63.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b13/linux-x86_64/is/firefox-63.0b13.tar.bz2"; locale = "is"; arch = "linux-x86_64"; - sha512 = "ceccb4d0d3388866488adf59a12de217cbae5d26d679db63b132cd4ecebb8dd1fee754f9fe4e3419718a33cd8582bce983b5166639fe375a1a3c7493749b2b73"; + sha512 = "09d898308d707dfa60ffb05ff816ad10f9d5acec5956f634b344f345c19ef47621512da73b27ec59db822f6c66ebf478ea83e43d6c1c40f5dca32f824542607b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b9/linux-x86_64/it/firefox-63.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b13/linux-x86_64/it/firefox-63.0b13.tar.bz2"; locale = "it"; arch = "linux-x86_64"; - sha512 = "e1834195e237972c48d5b7f237281cc6e1622091efb8aeda4be6f4ecabe04b8f51d3cc86be4a1aebb50cfeeae039deeaa758a23bf4c36ea57d927c5a57c01fb6"; + sha512 = "7373941b6f58e72a99bceaa18ac36922ac07f6af3b7b0bb669c223644f52b0253912c4ba199094d7d1faacb410f445f0e13a9793b0ad4810acc387692e9d5262"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b9/linux-x86_64/ja/firefox-63.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b13/linux-x86_64/ja/firefox-63.0b13.tar.bz2"; locale = "ja"; arch = "linux-x86_64"; - sha512 = "65f07c789cb22d0993065e592be705ba80b03a9453770f0681bc355ac6aa32d7aee6afd2a4d106e39cc763dda9b9578213647dfeeb2db0108f354d64c5c9121f"; + sha512 = "07680a13fba7016b030aa70430094250fd75332675402a051501c1c7588869dcf0adb52c1c74366ad12291bee5f43c0748637afa465cec5ba9a9675779e4b0f5"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b9/linux-x86_64/ka/firefox-63.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b13/linux-x86_64/ka/firefox-63.0b13.tar.bz2"; locale = "ka"; arch = "linux-x86_64"; - sha512 = "7da0dcb993d25e4642d86fd1ed40d88328cd380dc1d9e037c7d771785c128e085516ff302e168d6ba08ef27de47c0cff14c5a2f6cfb0d7430d9b2d37caffb5c2"; + sha512 = "0a2a7903ce148d8643a51f0dcc30121245a05fe36928a318a12fdea3708cae991978782565384ff4131f0551c1deefd83b3c636eb461b69eba468e4781f2f03c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b9/linux-x86_64/kab/firefox-63.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b13/linux-x86_64/kab/firefox-63.0b13.tar.bz2"; locale = "kab"; arch = "linux-x86_64"; - sha512 = "2c79187951b8225dc88130e1e37baa40d3b9aa8a954b8b4d51bd23c713e96f80e9205f902346ecee1229623be64c59b34ade01a1aaaff10f7786cb80f3af4a7d"; + sha512 = "3d6151e50dc676d694bbd88cf3947ac6bacae371ff534fc8d5cd20a0a670056f7b3bbbb490bb44904668058660c6d3937b713a5818d5d69bcdf68706780ac9da"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b9/linux-x86_64/kk/firefox-63.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b13/linux-x86_64/kk/firefox-63.0b13.tar.bz2"; locale = "kk"; arch = "linux-x86_64"; - sha512 = "28ce4f55d95f8db27fd246ba812fb9d1ab2eefb955e544601429caeb5e1767820abf8f5cdba693033b91813371ff1cc0bb106ed88de869866960aaf92aa57d31"; + sha512 = "7984af247c9e825dd25c37d50443f310ad5b2575a98bf06abbb734511b1b9705196260f82e40f8fdb7c9298cbdfc314f4a4d3516f6bfc99c5f0ada945160ae11"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b9/linux-x86_64/km/firefox-63.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b13/linux-x86_64/km/firefox-63.0b13.tar.bz2"; locale = "km"; arch = "linux-x86_64"; - sha512 = "e61a3a5cbb9c5c094d2441511db8b6883e2a5a15180d60f03d05bc597eb260955341a0247c4191acade5fe26806e11e660e5d9360d9da4f2e6a88ca8b205fca8"; + sha512 = "e0e565783f069f2484c70e74f1fc6c0a4625d8d6b2fc80bf87f757a04ef9f3b86581354b84b64bafb356f01f5daf602bda845f376153b753f2144230cd17ddc1"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b9/linux-x86_64/kn/firefox-63.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b13/linux-x86_64/kn/firefox-63.0b13.tar.bz2"; locale = "kn"; arch = "linux-x86_64"; - sha512 = "e6fa91115190efe19e210ff1f77c03dc3b5529903664ed6ab8e205843df49523b9b4b8d24ecce8c46670d2a9512872e1f406c28ff7127c574cf7402d869888b6"; + sha512 = "28e9d308d29a8400506a497a2b2bbb3a8462646c7c0039015d74e2405971bd17c53357e994ec24bf61593e64443c90308034637e25b52b61c05c1870b8cd35ca"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b9/linux-x86_64/ko/firefox-63.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b13/linux-x86_64/ko/firefox-63.0b13.tar.bz2"; locale = "ko"; arch = "linux-x86_64"; - sha512 = "373738364d15ecd81112a64e8f32822ad00994a1e4014c33631f05c4ad3656e7398d8ecf2ee9988bb3a885282190599c2b19941457ac405438f6f5304a92e6c0"; + sha512 = "de5cb0e68eedc4dc3893ddd92ae1380ed13a3c629af353a84210bf606fec6afc6a14c34408e84a9671a489a73bc1e041055dedff66d903a832878b918ac22814"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b9/linux-x86_64/lij/firefox-63.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b13/linux-x86_64/lij/firefox-63.0b13.tar.bz2"; locale = "lij"; arch = "linux-x86_64"; - sha512 = "11530c0504400332469a654363825e08b5c338c6b8e27be5721a23ab49ed69d8a69e97286ba5e930ecd9a67cf17e453dc130ae8f8c100450f6fdc8507972d8f4"; + sha512 = "bdf96509b64cd3d6fcc6fe573409ba95252d9ce8b903279ec866a796b2f84da09d1a8361fbded06f5ba7a632b4e5b9dab5d278fd5307f09274a2a6f1921db524"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b9/linux-x86_64/lt/firefox-63.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b13/linux-x86_64/lt/firefox-63.0b13.tar.bz2"; locale = "lt"; arch = "linux-x86_64"; - sha512 = "63970fb0d3005a4da865789623d302f45e4dfe5e140e6a7158ccabdcafd53a48eaca43a5d016c7bff3b522888c8def078eaf95bd8b7cd8710df492d89a7c8ca5"; + sha512 = "7533b8894aebce270fe279d38ada97f2daf1e21f412386e59f4fbc8da1b833d8c0999102870ad3ef77274240ba4428ff44a3e19ce66e7d8502cd09fd9b09c38f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b9/linux-x86_64/lv/firefox-63.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b13/linux-x86_64/lv/firefox-63.0b13.tar.bz2"; locale = "lv"; arch = "linux-x86_64"; - sha512 = "3b5d286ea467cbf1e3435ab13a1a7ca90694af534a11b34e2efa1b3eb1dd4d9bb18402959c247628b97b698f0a62447b23027995125387e1be84dc39e42584a6"; + sha512 = "207e76a7168535e019e302996fe90e187652e78d114119a01b85247bdc2c35c8f99a1ec7ce4aea50206ef3515f24b21823271d5ac708ce48d66dd98ef65995e4"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b9/linux-x86_64/mai/firefox-63.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b13/linux-x86_64/mai/firefox-63.0b13.tar.bz2"; locale = "mai"; arch = "linux-x86_64"; - sha512 = "da8d85e7160207670043fc03f2a7bb1053fe6480e0a0e5f5ba583dbaf922ebd5a77b5faa6c3ade512c4ba53378df083b8c9a59485e5330a63fb9c876f6b7f4a7"; + sha512 = "eb53a363dc68e5ff0913a264eac23fd55966d779a421fd73adb8ca48343b31a72fe4281a25875c4bf75df1e600cdf8cb15ac2444933cfbb4239ea097fd337c8c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b9/linux-x86_64/mk/firefox-63.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b13/linux-x86_64/mk/firefox-63.0b13.tar.bz2"; locale = "mk"; arch = "linux-x86_64"; - sha512 = "fc375837230aa468dcf1e5a89a162f46c386f95d07e007698470e5bfb48900750709dc57a723bd54aa89dcb466fed768cdc4ac5edb2acc51b3cf56fec2c22e79"; + sha512 = "cae33d4b6712fd95891da966e3382c6bd3d9cb643a1a8e38a56de719f066f01b0219a158faeddf8a001021b489cef85369243ff51279261bd456f70c6da759a5"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b9/linux-x86_64/ml/firefox-63.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b13/linux-x86_64/ml/firefox-63.0b13.tar.bz2"; locale = "ml"; arch = "linux-x86_64"; - sha512 = "f4d8615fb76480b4af8ba497632c45b06c0e464109ece1bc425dadf376581b01d7a34540178334081b485ec280de46d83616b0570f50eeced483cc4eb6bf344e"; + sha512 = "d6752487843849640e2104c285ec6c0981cde2905b25c2cf93a9b4602322fd3f232043832e933cdfaad8552a137398b2bb70fed7846a57c67703372bb6e710c9"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b9/linux-x86_64/mr/firefox-63.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b13/linux-x86_64/mr/firefox-63.0b13.tar.bz2"; locale = "mr"; arch = "linux-x86_64"; - sha512 = "30b7e1c97aab33077d1c322f3e25391fb3a47378e8365d7437e0cdb814a45ccbd5e7f03129aedfb83f51ec06785427dcf180f41ac247f562cda7f32d9d6ec060"; + sha512 = "120f02bf41cee52f8a0d0244622c02df18e3870a389428aa2fd2d3f3b3ca4763c3a1e2c93b68f2eb2efc57abc308838128410abcdd6edcba7089458771eb4386"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b9/linux-x86_64/ms/firefox-63.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b13/linux-x86_64/ms/firefox-63.0b13.tar.bz2"; locale = "ms"; arch = "linux-x86_64"; - sha512 = "8aa1546bddd95c28cd155e614532090d01a6343c46f67eb55ad9b82c48f6f0b83aa27852b67756e58869496b4c3ba3b27cf130a69c24ace248c092cb877b87c0"; + sha512 = "813c1912d70069c36de7c54a6797a635c7838d2befa50e9cce21b718ab4f00443ba53f714b8a6447aeb1b1b72e02f4c66f31436f17be7b1f6e9eb4bcdbbcdd13"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b9/linux-x86_64/my/firefox-63.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b13/linux-x86_64/my/firefox-63.0b13.tar.bz2"; locale = "my"; arch = "linux-x86_64"; - sha512 = "1e38cf10b3ae242610d81a964e0816cbd947e7cc0ca5445aa3cc4af14e27b4e4ee2f7325d9011e01f3b45a3ef1ef8c8880c80bbefd9c88f1e4fddefdf871c74f"; + sha512 = "bb112178b58424654e0f384733d52a2f99a3769f4314b62a911db7bc67d4c08b0a75c9281fe853d774535cd74a14816e78bffd4df00ea50534b95c113d79e212"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b9/linux-x86_64/nb-NO/firefox-63.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b13/linux-x86_64/nb-NO/firefox-63.0b13.tar.bz2"; locale = "nb-NO"; arch = "linux-x86_64"; - sha512 = "d5ecc468ee26cd61f65984ebb02e21898a4eabbe3f81f3dd98b127e4b98b14237b6c72b94bd96e890e44a3a92f70d9a4c3734d80bf52b58e2160f3d3febc831f"; + sha512 = "e9116f7ed4a375c35ffe574194b846c336c1603946115eff03fc0a79556a7ff4ccee5bd2853f925aa08e4f7c40b596644bce09b3930a0c541a00c134f2f68da5"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b9/linux-x86_64/ne-NP/firefox-63.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b13/linux-x86_64/ne-NP/firefox-63.0b13.tar.bz2"; locale = "ne-NP"; arch = "linux-x86_64"; - sha512 = "f0ed61857efb6527ae2d1be0e141e61c3b43d7e1a4b6415b2d7717924332603910d2df02f9124c77f67736b776eb99f035498f104fe863b7dc071a7f5431caa0"; + sha512 = "688515bfebcc238c16861eb2044dd6f715e08f61eadc28eed5bc639138e32b94db74e4e9f06833bbc81cd681473dd3e8c3c3a3c5cea58a476eccef7eb40ecb81"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b9/linux-x86_64/nl/firefox-63.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b13/linux-x86_64/nl/firefox-63.0b13.tar.bz2"; locale = "nl"; arch = "linux-x86_64"; - sha512 = "0b4aad92078da9071a17c0abdcdcaaf800b2028c4154d35974daebe6253427cc22cbf322f974acc84b4f6ac6b669088813fd3bb6f6cde35155f281db0656f7b4"; + sha512 = "23fde17dd874441f13c73439f9ddccbc08485d21325fd92ff4201ef61b969e5db30b1228bbfd0f6f32ac8a596c19e44e8edb8fbd28e910b41b2b272afee8e19e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b9/linux-x86_64/nn-NO/firefox-63.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b13/linux-x86_64/nn-NO/firefox-63.0b13.tar.bz2"; locale = "nn-NO"; arch = "linux-x86_64"; - sha512 = "cbb3cb267763dbce0ab77aee54b2211eff26f7307ff6a7dfdebd8f6f1321ea3ffd396bdffec17ebbbf7a274a4d37503dc9f0b70cae0854c740df158de5360e36"; + sha512 = "f90ba4addda86e2b8fead3e1d2ea3105204e5173b85ac0ede40a2d69b5b9a3a2c29f0b75015eb93210909c61df8f73ca8bf9c428767019355ed98f402be5d7ed"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b9/linux-x86_64/oc/firefox-63.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b13/linux-x86_64/oc/firefox-63.0b13.tar.bz2"; locale = "oc"; arch = "linux-x86_64"; - sha512 = "26656804968ec7287441bc28a0e5d6a43d8c47c922e33784e2186fe3552c68c054602483b99cf97f093fa7457bfe07f94d0f6838253354283d3a705b29cf5313"; + sha512 = "af7672a5cdea2e0d834e510711db4d1a2de541c44e97ee501af113d5dc102b2c5bffac86bdd363d2b541107ff1d121a182b14e90e9a68a8792977a3e73361023"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b9/linux-x86_64/or/firefox-63.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b13/linux-x86_64/or/firefox-63.0b13.tar.bz2"; locale = "or"; arch = "linux-x86_64"; - sha512 = "fa55e0b1c927d698bc0c640dedf0b134996b56e12a73ea493f30c3321ad4df3587dba0829f1cd116f95d6e9bc5a35732dd32a4b4a1b9de611a70e93977780f47"; + sha512 = "49cedc91af113cfad9a15d6933bef8c1bc9c6d0174cb1d6f57aded210296db6a248561c4ecedcc44dbd605922761e220404c335b0e7206402a4ff6d039b5b9c4"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b9/linux-x86_64/pa-IN/firefox-63.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b13/linux-x86_64/pa-IN/firefox-63.0b13.tar.bz2"; locale = "pa-IN"; arch = "linux-x86_64"; - sha512 = "2a394a2d29ff2c63f8db24c09b85c4d7a488a4e0a4b17121ca54b95a0c7a3f40a12c59105c959eb4baded027de8301ea7161475d3f4130d353e7bd95e2d36cef"; + sha512 = "48fffe7aac458bf9879c6471733d7d0d4fd43b3609aa3ba04647721e7dc60be609009136d42e58d760a4ff298ee83c2e624529cd1b08daacfe60d7bfec7f1f43"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b9/linux-x86_64/pl/firefox-63.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b13/linux-x86_64/pl/firefox-63.0b13.tar.bz2"; locale = "pl"; arch = "linux-x86_64"; - sha512 = "1f4fadb6767b7c58cf242c9714925aabfabd9a080a3b29d39f1002b9f01e73b6f19f39427d57c7604eb3f3518922ca4f2127322565080817e674bce64aa6f3d6"; + sha512 = "a7c613e88606be20d514be2e2dbd2a09f94fc500541ded40ba73b5e4c66dcd01ea5f7a96a55059f0714d321f712655c67ca86a0a328783a2a9aa9ca9d2802b57"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b9/linux-x86_64/pt-BR/firefox-63.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b13/linux-x86_64/pt-BR/firefox-63.0b13.tar.bz2"; locale = "pt-BR"; arch = "linux-x86_64"; - sha512 = "e15090e6a2b79ba0829b3727e6ef7349443b51263e596a39fef83951142b6ed0ab2a10bdad9afc1b78941f1c38c996b4556548bbb92553b48335e183c210f92d"; + sha512 = "6ab1c44c2a04f14a89385a2708916dfaa4f8d095a56c1bb1dc06c4e59a23f5faa356b1e86d26a905523855aa11d332a9f290291953e6fb9517cc73318935e0ee"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b9/linux-x86_64/pt-PT/firefox-63.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b13/linux-x86_64/pt-PT/firefox-63.0b13.tar.bz2"; locale = "pt-PT"; arch = "linux-x86_64"; - sha512 = "eee661bca9d04cd7c479e1f371b0d426061ed691c85067ac3c36e9fa7c11aa03e1bb137459fc3f638aecc17e94254d4f4290caeffcdde9225075bdbc3b68f5eb"; + sha512 = "965e5973a197f1122adf63b39e9dbdf1e2cf88653c7eb3eeb77ec498a1bff5abe54ecb3b76d2e39e267fb78ad13417e376e0ef5aba2ebee7ab21f0f4735a006e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b9/linux-x86_64/rm/firefox-63.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b13/linux-x86_64/rm/firefox-63.0b13.tar.bz2"; locale = "rm"; arch = "linux-x86_64"; - sha512 = "8152b4f2811eb156c45850851a801e4d9c3f235357a0a42b25f4257ddbf1e4494df612f5a94c99e7c3f3927f94f697f34dc233d4c88c042c17648b538ea63968"; + sha512 = "e2eadf2a965e62b9fad998d3897eec6f888c95fd52e149ee85a2557ec5c7fb85f77dbe77817e919f868cd4f50d374a4557815cbdc6dd7219ba9260ee25c804bf"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b9/linux-x86_64/ro/firefox-63.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b13/linux-x86_64/ro/firefox-63.0b13.tar.bz2"; locale = "ro"; arch = "linux-x86_64"; - sha512 = "0930ebfd13a5ac96322458fbe4ff98f0ad2faa69de467275e345f55ccf836d4393d5a78f3d47f363b73602374a331496461f68c1a76eeeb7586ae6dc1171ef7e"; + sha512 = "d5f848de1c19d1bfd9a10e14c356002524e07692be8383ea7d31f3f30b623b2503b986ea33f7c1cfcb03886652b551d58b1fbc50e37f02975548e03f490def07"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b9/linux-x86_64/ru/firefox-63.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b13/linux-x86_64/ru/firefox-63.0b13.tar.bz2"; locale = "ru"; arch = "linux-x86_64"; - sha512 = "618814427d173a0219a223bf3052bba7c8c7d22e244d66ed1fbddb061bcdb786d78176842e34ee0cfa7c739f958043a52a6f55904512e766a9315fbcbdaef351"; + sha512 = "d85f76ef591e0349083681bbd24d2f7fb4dc2a7483a21665c1f9b71396a29573e7aeafc431422bba271c63eaa4dc11b9cc87036338cb62084cc5e13b4b187c2c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b9/linux-x86_64/si/firefox-63.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b13/linux-x86_64/si/firefox-63.0b13.tar.bz2"; locale = "si"; arch = "linux-x86_64"; - sha512 = "e5407e2469f78e73a78eeed46d0e5cb310313c5bfadd0dcdc12670bb63f8e399b7bcbaada3ecd17e77596be4fb15f28d1706a193743cb7d519f8cc0350b8ed30"; + sha512 = "e44299e24ab160ae39acbc1b3b6ccac1e8eeb30d99a2a60fa39ab7bb1dd1c7296383040542cd81da8fe8fc5a778eadc10d90ade11346bc8886b714762f8d2ae0"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b9/linux-x86_64/sk/firefox-63.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b13/linux-x86_64/sk/firefox-63.0b13.tar.bz2"; locale = "sk"; arch = "linux-x86_64"; - sha512 = "7eb1c68eea484df32aae65dc87961f58c59c97b31a12c5e9de7d7805cfd4ed9fddbd1da7fb8e7b9857a835979b2a6635111e211f72bc1bfc78aa0534b40e03fc"; + sha512 = "20c1a9437398ab3f0509850e23fbc8dec319fabdb139d0e953f3e0782df3f355fbc48701a08f13ead7689b094fa1f7df2308e8e47b2095d55ab5dcfa93f701fe"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b9/linux-x86_64/sl/firefox-63.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b13/linux-x86_64/sl/firefox-63.0b13.tar.bz2"; locale = "sl"; arch = "linux-x86_64"; - sha512 = "3574599de52fe2c887cf81992f9cd7302524082a00b26324d3ca701f2eb2c59eae870c70abe7dd424bf9c0a2ee869a34107265c0d8ea6bb7a7df149f12345af1"; + sha512 = "ca4433207bf6321b822e273977c3c432a322c66b9132cbd91fa0993eb142997f304aedf5c96e4e62b2fb7b2530942d9f48bd40a329d10266efe9af8c062de89d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b9/linux-x86_64/son/firefox-63.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b13/linux-x86_64/son/firefox-63.0b13.tar.bz2"; locale = "son"; arch = "linux-x86_64"; - sha512 = "6487b05d6b6657b2565d506ce7bdba7cb7281fe6d0acd5a20052012e22488acadce65f238c0195e089c2da4b9bb13781e5b31b2bb85208da9622853c12a8f648"; + sha512 = "4534137bbc75738b4246d899ca5e16489a025b37315fa81e6bf0bc71edf4736749e90c953fa7dc7c829f1494f18d7c94ee84b6bfaf70ee3ccfd11b8d7636323b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b9/linux-x86_64/sq/firefox-63.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b13/linux-x86_64/sq/firefox-63.0b13.tar.bz2"; locale = "sq"; arch = "linux-x86_64"; - sha512 = "e69a3757a5c752f3e417787c4cb02c2330a467ff76c4930eb4c32faf64e63943162ec0681af1899b8e96782de6f50c5c31ab25e7ac1f777b52e4da223df5ee49"; + sha512 = "b2bf90fac89b89f3d61aebc26978120531d757c8500d2ade97e9c48f2168c64cb8da1be6d6c3c8ddffd23fbc463d54123e322b04febecfccb7bd4327620aac99"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b9/linux-x86_64/sr/firefox-63.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b13/linux-x86_64/sr/firefox-63.0b13.tar.bz2"; locale = "sr"; arch = "linux-x86_64"; - sha512 = "38c57fb51a76c912d07a9a56f81f4428aa2fe47be395009af1e2b6221e0baaa4f3ed8d31693a737d615b5e97d8fcec33ef22a3151210877e625c20759b355034"; + sha512 = "4c28ba897cdfa60f548f52ee4cd98444010204a59efb7fcd8bdc5b6318a9f001500cdef11c7b7ea7637168adf6491ba269c30996ddcf526b5e1a2dde1388d6d0"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b9/linux-x86_64/sv-SE/firefox-63.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b13/linux-x86_64/sv-SE/firefox-63.0b13.tar.bz2"; locale = "sv-SE"; arch = "linux-x86_64"; - sha512 = "6b2319ce5e131e05419b946435c901f654d9d3b35374396220b89290600ac05a6df41cb344f0b3d6366cde1693b925870221f2d8f98d69e0f6bb41f0ab6e4dbc"; + sha512 = "04db58a9c1f80d4fd77a32f663ca95aea107b61c90fff8307b077c666af1369536e668c60c89ab8ae92b7b6a585a41c35f487c92e96484f0ce0c138525614e87"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b9/linux-x86_64/ta/firefox-63.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b13/linux-x86_64/ta/firefox-63.0b13.tar.bz2"; locale = "ta"; arch = "linux-x86_64"; - sha512 = "39641d56d492786df53a39dc9a12c26aaea0035895b225a4b0c82484e32ef1a907a07d158e20962d3243cfa7bbd4205c7e3bf7b5ed5fbc5ac92e0e28d1cd6f35"; + sha512 = "5a2efde48546042d640de3cc76f6e7918ccc8b34df3c53935505b321d23611d86999b1c3ef00c08af003cf7991b7b00909ee5825251c9a13521e1477bd9242fb"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b9/linux-x86_64/te/firefox-63.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b13/linux-x86_64/te/firefox-63.0b13.tar.bz2"; locale = "te"; arch = "linux-x86_64"; - sha512 = "3beea5023cabd7c5c30e9d95eb162987cf44dbf34885d5b72e931adb0ffa8385be8a72190109558a6af7050cd479757dd5426553c22a321b4c21073956e5d1ca"; + sha512 = "cefe7a27d4a246549dd19f6c95d99cfc21ccd8b7b48b57425b51ff081cbfee4e35ee06350d7b90f40ed60029883ec7ad3d0a9ad64bfd851996bb301279a688b6"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b9/linux-x86_64/th/firefox-63.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b13/linux-x86_64/th/firefox-63.0b13.tar.bz2"; locale = "th"; arch = "linux-x86_64"; - sha512 = "40eb8a38fd4a66d5a1b81563b05dfc5d8e22767ac7e7a69f47c02ee34d132868e9b2b2be3591c6183e5e9c659e8e27c99c7e002c8846b069233b91bb65c1552a"; + sha512 = "68a997083d7c8fde45746ac55c8994f54d87b5ffe48c3aa1fb83460ac5bb61bd13d5b9f1d33e2ec6e6c2b9c965ed7ea8f1642b3145edd8a4977206c38da42044"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b9/linux-x86_64/tr/firefox-63.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b13/linux-x86_64/tr/firefox-63.0b13.tar.bz2"; locale = "tr"; arch = "linux-x86_64"; - sha512 = "69214b1e322743ae364f86efe15a4589b283ef2bb19cca99dfaede9b9672f79ccfcab5b2929f910ffa203a74de9fb6ac2945bf79af55a701394ee499a0f7278c"; + sha512 = "02718cabffcf3585faad05e07697ba1b832d2af7fe9c99adefd4d68b2ff19773884467fe3f9c6fe6cc0e8ca47056f500f4b76b184f7fa8fd899e9e26c024f013"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b9/linux-x86_64/uk/firefox-63.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b13/linux-x86_64/uk/firefox-63.0b13.tar.bz2"; locale = "uk"; arch = "linux-x86_64"; - sha512 = "3f8e68f2e665909bd531a24d6d66d1f8e23bbe3c6bb40def5c28e71a8cd8418ab604adb19750d1ac509e583264bae41804a228b854a0df479a2a32aaaf452145"; + sha512 = "202043343fe98673ad33d032267a5696d0554348c709cb2e356136a6becd5a0e2c1147d07fd752afb80384cf13a56296b859c4b771ab993d5a3feebe5415fecf"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b9/linux-x86_64/ur/firefox-63.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b13/linux-x86_64/ur/firefox-63.0b13.tar.bz2"; locale = "ur"; arch = "linux-x86_64"; - sha512 = "3020c7e26afbe079c87c4a64631ccf57003135fa2e06516503bb40cd0e499e935a95a94bd729890090a4037bd2bd400a68d68e26bf8b6af91465dd5235310abe"; + sha512 = "834849bea96f7176bd4b897a1877b56447674bd32ed0bb5b15715fb5d37fa1bbcb8d10af459bf08d7def3f973489aa33e6fb359be81f69a5492c5aecc20c57da"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b9/linux-x86_64/uz/firefox-63.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b13/linux-x86_64/uz/firefox-63.0b13.tar.bz2"; locale = "uz"; arch = "linux-x86_64"; - sha512 = "6b7895cb2425071f77705fce09b7de49e01eae4c00af1d35fe31783bfb83d62e310988c73612689aec9f05b3825f1fef663ee7d42b52ecc84a04a3c1aaa45bbc"; + sha512 = "b360d917901e693c29f49bbb349d10bc4129bffbd8f105b2b9e9e6169dc13edd0d453368a831bf1be21b5d856766bccc4536f50727b5f7b7a6f6d2fa287bc803"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b9/linux-x86_64/vi/firefox-63.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b13/linux-x86_64/vi/firefox-63.0b13.tar.bz2"; locale = "vi"; arch = "linux-x86_64"; - sha512 = "e34f384f75faac4bc45c9cbc0d92fadf238b8d9d0d877312b3bec2bd9e47ae0bbfd7097dc647e5b4fe68a28fe351a659600bc860f2caf6fb6a9cd9d22ad7273f"; + sha512 = "279807df6ac7d0a19d8010311973b5e623ec91909d952120f565656fcf78f3a549b3eeaac3fd27ed1e30554a7b57c4a129757f37bb8971fed7785867277d14c0"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b9/linux-x86_64/xh/firefox-63.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b13/linux-x86_64/xh/firefox-63.0b13.tar.bz2"; locale = "xh"; arch = "linux-x86_64"; - sha512 = "e11dec71ea6c8cc54cc785f264f280c4983fcb0e3f5a6c21e73f660d455a1f96e3266fa5d714072fd868b09ce381cdef0f6497948fb4dea44adb3a89da901db2"; + sha512 = "313dfce1b88243761718b313b0753e09def7cfef69c1f65088872543ce31c6957739dec51113b301c5c788d1b89aa173d750c3b214dba6413fc5522378ac333c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b9/linux-x86_64/zh-CN/firefox-63.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b13/linux-x86_64/zh-CN/firefox-63.0b13.tar.bz2"; locale = "zh-CN"; arch = "linux-x86_64"; - sha512 = "2a1af884c86303c07162b3750394d3ab9faad5f5dd8d1867ae88385b70b66b757c53afdb51ae12f1c8ab7f57c347259f561d176dd9104068d5f3f1271fab2d4e"; + sha512 = "1351106b16c20d80eacea77e26ab6235b00d16f33a94577184f61ce926675bdc9bd662dbcc39cadaca18c9ade0ba786690b12aea752520c671157f5525f581fc"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b9/linux-x86_64/zh-TW/firefox-63.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b13/linux-x86_64/zh-TW/firefox-63.0b13.tar.bz2"; locale = "zh-TW"; arch = "linux-x86_64"; - sha512 = "b9568016dadd0fee3c01e37206b515762edd21a558b523723f6764f469af99054f5e17712327ecb883f1a84ed799bd263e11fd867073ea2f68a238b78e0b189f"; + sha512 = "da9808a83c45d5a233aa1649a7bcb7d88fc3fafe59d93d9a872de2902b8b0c7f80be073f905bc2dee587b53bb5d010e66f2926d2c35d50a9237884d3d03fb6b9"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b9/linux-i686/ach/firefox-63.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b13/linux-i686/ach/firefox-63.0b13.tar.bz2"; locale = "ach"; arch = "linux-i686"; - sha512 = "099ee11bce1f4cae44427463b45713821f2e0363119446c3ea04425504cb2b812f9f9c28102b38fd65bb4115d38ffdc0249079cfdc3f850c3a59755f6429eec6"; + sha512 = "98f43a0ec582e6753f12a079f07a4e55f8e699b9a8624a632e141b09afc8484901ab3cbea5609d7cf2107fd90da3d10308245a28ef3d93e07d35cbad68200bd6"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b9/linux-i686/af/firefox-63.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b13/linux-i686/af/firefox-63.0b13.tar.bz2"; locale = "af"; arch = "linux-i686"; - sha512 = "77930408b3feb29e49582ebabed8859fdfd488feecc250aa6c8315975d6cbff09a551ab5e3c4330eb3d4ed8ef43a3c4776fdda2bd2baa876591f634a4ce0bfbf"; + sha512 = "b8ab0b90538b7b8ced483b2771c8340228d23d39f28413f82468626553aeb81169c629fb9f1a1b4e17ac312b8bcc984ecfe711e4a85af8afb02ec485ae589a64"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b9/linux-i686/an/firefox-63.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b13/linux-i686/an/firefox-63.0b13.tar.bz2"; locale = "an"; arch = "linux-i686"; - sha512 = "0c3b334a51ed74cde2296745177df5ce57eedb43644af43ee16cd4fb0d070dc1bd117012bf5759975a708098791b6d0ff637a0501b064874c9d8decc2778111e"; + sha512 = "43b923b7b99c4aa1a3efda001c60b9570f15ccb648d70dba5f7ae57c282a1923d310ec48b3424a641d8508d05a18a1da76fd7203d947c9383695d91d2b7e2da2"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b9/linux-i686/ar/firefox-63.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b13/linux-i686/ar/firefox-63.0b13.tar.bz2"; locale = "ar"; arch = "linux-i686"; - sha512 = "9591eb30ce5bd4779629faa60316651c90e6c97754c8580dbbafe7ac85d345488b4af613068ed5778390dbdf9e1e06cdd28f9b758bc5940dd87ee39b77bc31d9"; + sha512 = "562a1a314a598f442acbc92a0d752e48136dfb10303e0dd51bb3ab0a2c2774e5f5eb3f932d9a880fe37674be3288f5406ab4a0251aca2ef1bb3d23f5e0ab303f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b9/linux-i686/as/firefox-63.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b13/linux-i686/as/firefox-63.0b13.tar.bz2"; locale = "as"; arch = "linux-i686"; - sha512 = "cc3eb28017b91a77cc72984669cf5f62e7ac4d9fc0b415597cb4216bbbc62028e3864ea897d3b3ae616da7c603fa3109456b1bb331e712fcdd10e48151fa87dc"; + sha512 = "acb3076508c51621d11ad6c0a8031e6aa9f26fb376fbdc0b1eaedbdeed5e84e61682e5f1d45511567e1159125bede12be12f0e0f7c716a1addca8affe12cdb00"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b9/linux-i686/ast/firefox-63.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b13/linux-i686/ast/firefox-63.0b13.tar.bz2"; locale = "ast"; arch = "linux-i686"; - sha512 = "23c04d3674afffdea2f9abcbd0fcffd45f9e6e1c7288fc22cb457f80c664ba25f89b154fa1ef80a12594b93417da943eb12e803a74c3467ff523e27feb3eff6f"; + sha512 = "c262869d7a4aea66cfea24911cae4e43de2a17a371167f4d78f3353f598187a1e6102708346afde86166f360e9d42842016f65a272d9106ef54938e21048a83b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b9/linux-i686/az/firefox-63.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b13/linux-i686/az/firefox-63.0b13.tar.bz2"; locale = "az"; arch = "linux-i686"; - sha512 = "2c99eed922b254e6b1f64ae62f958a6156de1fef5a26185b1d70f5569f4452f52ed3b58dfeb3dd0ccd121fdcb365c68a613d25c2d0b55b4ad15b5a91145e1a46"; + sha512 = "a9da5d539e4ebe59b1d21b21bd018413e935cd7eadeb60c437f3a5e972851b1087a2269d31b414a17fc712c1f9cf180287b8a69d7b3d4faf34a61b555d1d109d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b9/linux-i686/be/firefox-63.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b13/linux-i686/be/firefox-63.0b13.tar.bz2"; locale = "be"; arch = "linux-i686"; - sha512 = "1d0299bdb7f4bdf8967888e1e749c0f84a96bc2f9b7ac6cf857e0f368ffd66df08dd65da20d6a8c93ce5831f9328870c5d50078e29a3698e521a5dabc19f49b3"; + sha512 = "661f58b200c1d18c4b837aec8b2ec334270a06d68ceb48b4d6cf6762ee8fc94c6c871cc9bb956ca67c2759da3450c08fd2870bf32f88798396ccf3c24ecd7fe9"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b9/linux-i686/bg/firefox-63.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b13/linux-i686/bg/firefox-63.0b13.tar.bz2"; locale = "bg"; arch = "linux-i686"; - sha512 = "4659e8ff47719639f6fa0c16c974e02ac73d4bb51635352647bf006238c916280217c9ee2691723ca40ef10451ec5940b2317730a322c00c609f01ff68634d06"; + sha512 = "f8517bcfebede31aaab3c20c10be22b2dd4e9ee56ab37fd8c0c362933f375189ad41df04a2452b83759555211a9699998143aae224f688473fd4da8d258e8566"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b9/linux-i686/bn-BD/firefox-63.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b13/linux-i686/bn-BD/firefox-63.0b13.tar.bz2"; locale = "bn-BD"; arch = "linux-i686"; - sha512 = "54b366a1b07867d6d24d051eb367183489a0bc87b5ad72607aa1c6f7393f0420d7cd38d1ce7c2ed5cbfd910fd1c9d0ab65fee4aaa1a18792e09798ef85d44098"; + sha512 = "98eba90fd685eb3e5a22f68027464735e6eae764ab5063fc3b49cb2a0888839eb7fed41978ef9edbf2729a66278368313a61363c7b0a9abddb68d7a93a22fff5"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b9/linux-i686/bn-IN/firefox-63.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b13/linux-i686/bn-IN/firefox-63.0b13.tar.bz2"; locale = "bn-IN"; arch = "linux-i686"; - sha512 = "6224053e229ba628ca78e54bee868113709bf4e6e559681e74d8c6a656958842f1d9f0e157dff7fe003215f3880c237e060ff5b5c6b5ac9882237edd8bbb90a6"; + sha512 = "e916abc4c8e0f547f0f510a2919637029d9531dc275e8330164d0092864d5912697c89ea23100c1c411632a6f4238554e83162aaaa50f23d85534838e05d9b87"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b9/linux-i686/br/firefox-63.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b13/linux-i686/br/firefox-63.0b13.tar.bz2"; locale = "br"; arch = "linux-i686"; - sha512 = "0e96eb748c5cbf4d21ddb9ae6d98d4c87c54db7c6f59205b77365522137598a29f97dcce47f6d91ff479fbd5830b316e29a9a36f69045d5fb078e340309208bf"; + sha512 = "db5c9c663c0b12654602ceb5b73033cc97c0d45e3ec6b5d755b94ce3daf7743417777fdcadd8263b1272f7503ea6ace25358285fa22a8fcb7d4bf50038bb2727"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b9/linux-i686/bs/firefox-63.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b13/linux-i686/bs/firefox-63.0b13.tar.bz2"; locale = "bs"; arch = "linux-i686"; - sha512 = "5eef8480eb7166c78ae9552e783ada29b1a2ed0774414c1807089263ad3b6b4726ace0f68af4454f03fbd379cd9e69d7963ed4a9b23ea383d71f33f2e77af5d4"; + sha512 = "4216655dc3ffeb28fba06405b5854114e0ed5cdf014e3bdbc3873083a27b336e5348b326b85f09d690bc6345589889738f5ec92b0c1776cf93bda76310d3e117"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b9/linux-i686/ca/firefox-63.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b13/linux-i686/ca/firefox-63.0b13.tar.bz2"; locale = "ca"; arch = "linux-i686"; - sha512 = "3480209479c215604c4f7b34d41b5d766d4c5a0c3d6e5d71f249a5c27d22c2049fdcbedf49b766f4aad950d1601af061e98c1be22c8d919ef3e78d125a8a6ada"; + sha512 = "164b57623737c0ad20f5f470b39293872aaca3018db55f181fce19a40c11650111ebce4b54b5fcbeea7292455f9d5ac7f5d3c1460c50c1b577b935a7c8738d9a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b9/linux-i686/cak/firefox-63.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b13/linux-i686/cak/firefox-63.0b13.tar.bz2"; locale = "cak"; arch = "linux-i686"; - sha512 = "6a8e24323139654e8e484699df06cd6109f343a9a7e524f50a8f5366c2de2869b92bb56b742f9ad3191830f0dd62a4bf11b0b60c40214ea1b32dc56235ce04d8"; + sha512 = "e7e03b8a6f70978528d9d0671ae0dc73f78f6af998bb1ca6c84dad5186559087bda0aeb1c870c377eb009e7ad6f14490dd959cd28beb564731c43b9f699ebc6d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b9/linux-i686/cs/firefox-63.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b13/linux-i686/cs/firefox-63.0b13.tar.bz2"; locale = "cs"; arch = "linux-i686"; - sha512 = "3cd2d6c739348e939bf84ab793d3ea105e37f16aec9cb353c31f772219be2cb1ed4fdc3fc99b71754e0450545086694a94e86c53354c7dfbec7436c655c0aa04"; + sha512 = "b0c17ae3f61f6829b7d578968eb1166ce4043d33b81935e1c5ca51353a0bfe64ae2c326ba555008a30c59f34af72ab8ef8460e204caea203a6b174f2e3b92993"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b9/linux-i686/cy/firefox-63.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b13/linux-i686/cy/firefox-63.0b13.tar.bz2"; locale = "cy"; arch = "linux-i686"; - sha512 = "db650f6c6201c8d6885a364e3477c8f0341c526aaa0e708039c545814bf95c66b516275ef464a1c1ab2f1bc4d5e7c58d03b4d6deae8cb6a4de477f64108f128b"; + sha512 = "88e93d54fadfa6149c8de03e82b898ab4c319cf66c0aa1f6a16b24f73815031a943d0c91d9b382e97c29ac0bcb83f09cc391e01b7bd3120e8f2c9328e85da4ab"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b9/linux-i686/da/firefox-63.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b13/linux-i686/da/firefox-63.0b13.tar.bz2"; locale = "da"; arch = "linux-i686"; - sha512 = "ed189013ee62440e2f6a326e2ca1ff3a0764ff589e514a2eda489e519695144cd9378bc78d10fd18bfef65e39a27500fbe4f09c64ec9904693db153d83b884b9"; + sha512 = "1ff1029bf7486c6ec3516ed7e57d22d0dab95bcd8b21aa5e60d32c630ff88c15eaa484892e35a473d962b89f49b281bd25b6d16db3a6446fc9959fd64d75aab9"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b9/linux-i686/de/firefox-63.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b13/linux-i686/de/firefox-63.0b13.tar.bz2"; locale = "de"; arch = "linux-i686"; - sha512 = "f77538811ea28c701db8a4d38d9286aeb6782f4b56153c98d2133caff823aaffb23a3b3c014adb09d2a5c295a68a8e0e1a071f41d86ecec21c6f284c52a9338e"; + sha512 = "6523e7ed4aa0ef502f2a64653c7d06909b67c6a8f173295783c97e97b39f9c00b36b1f06038352bb2a247a156e4a1310ff0fed5b688a5f2b84efbad1d1406362"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b9/linux-i686/dsb/firefox-63.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b13/linux-i686/dsb/firefox-63.0b13.tar.bz2"; locale = "dsb"; arch = "linux-i686"; - sha512 = "366fff164bc3dbdbbc143ba37aa3a66befd5c2bd89bace5c9bb669fa5d812e7505140405c08919994cd65e937e91035b9c62bfbb2a5668f4273f295fc6dad485"; + sha512 = "34aae423aa61bbe02f31b07513cdd4734d94dca42cfd64dd3db7f3e55529316815a266d578af1771135a264e69b8869373df061370e4046a2046ca1e0f75b74a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b9/linux-i686/el/firefox-63.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b13/linux-i686/el/firefox-63.0b13.tar.bz2"; locale = "el"; arch = "linux-i686"; - sha512 = "8898b25d271037fe02772270f358ab2e44d286bf1d5be45b67d57907ead81be2990aec0104e724d8d105793e45454d571e7eb45ba67dc75dbd25ab0a467f698e"; + sha512 = "542ec3370d58e4ee767013c3511e7e04e76d84926f12986d9e9611dd337c1a649de3e8bb95365bb92f339a95058f8cbc9194d3f22f54f96504cda24860c1fcc9"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b9/linux-i686/en-CA/firefox-63.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b13/linux-i686/en-CA/firefox-63.0b13.tar.bz2"; locale = "en-CA"; arch = "linux-i686"; - sha512 = "5ee77fd93d9b557fb729031f96880b9ba72990d47ddfdfb3e4eba38a6eabcbf63587b0892551b1d9c023472fc8681deb529c6d4f8b283d11b4832f9e2992cb4f"; + sha512 = "bc11f690284b11100608002f3e1402f758d9d1cb981390f14d16c841ef605451b7cd043928ffad60c3505423bd89f7d3dbb268abeb8f1835aeb1d2ce185286de"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b9/linux-i686/en-GB/firefox-63.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b13/linux-i686/en-GB/firefox-63.0b13.tar.bz2"; locale = "en-GB"; arch = "linux-i686"; - sha512 = "74e415c2545b0fb760be6c459c7262e309c72b3e41a580e36250f381a74dd1d48a2b62db4ca93274dcb71b0951cbc42f897275a8664242d0424281f227699a37"; + sha512 = "9fbf9ca0c1da0a80b77c975a980acf7afb2ac7f99c3f69a1d8cce88c8651957e1e203ac97fff9a67965a36d85f09c7a80e970d043e0affa2f273615d8fb9aedb"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b9/linux-i686/en-US/firefox-63.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b13/linux-i686/en-US/firefox-63.0b13.tar.bz2"; locale = "en-US"; arch = "linux-i686"; - sha512 = "c37ae4711dc74c4beb8bdac272e0e6353c4c88b170c84de86003c11d0d7a6d615f28d567d2e3a36b7dd9a06eaa68f21a5e2e64d12ecfa8c4e6f8cd2eb8eb9925"; + sha512 = "25d9a0510fea951dfaa432117adf90591bba6dfb021fb18bdcd8849e71f59e8ba3ce9067e8291dd0d7769f1d2c8e5ac803c1d76d52e98e8ea7233ad5daadc45c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b9/linux-i686/en-ZA/firefox-63.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b13/linux-i686/en-ZA/firefox-63.0b13.tar.bz2"; locale = "en-ZA"; arch = "linux-i686"; - sha512 = "bbfc1d6bd97fdf2302c399ac1c0e76f949b73cb3af99af04ec0e502f2b9b0e353cc3ada738dad6699cd658170098b6f87f87aa231e563d62527f75106e1d101f"; + sha512 = "c8a6ea2aab2bfec44dd0d13d3f8f8f3e17377f54889f9b13ad1e6529bfc8b27a4f08fd287964edb5f63e8bba00ab961e413fa23b37cc05e46e050d11622a324b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b9/linux-i686/eo/firefox-63.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b13/linux-i686/eo/firefox-63.0b13.tar.bz2"; locale = "eo"; arch = "linux-i686"; - sha512 = "2c7cc1b01a4348ea18b6fc39e773c79a0dfe60a72b9637cda0ac4cc05de65eeaaaf6bbc05b5b15f92c1cebbde0b385d58b173f347af4538f2545709800877070"; + sha512 = "1335b46db5961afa02401f4f318c52aae40c00611688f2eb32506f10faf24046d2d495f4c3e8579d7271e0728e5608aa7af461ee3c3e3940a2c5532ae52bc270"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b9/linux-i686/es-AR/firefox-63.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b13/linux-i686/es-AR/firefox-63.0b13.tar.bz2"; locale = "es-AR"; arch = "linux-i686"; - sha512 = "4e9a3fb356d0e88c8b620a0ff00eb56bd25e341e951f3e4139d631ee276dabf78575ee9b2b30e159708388a25ebf088b7c5c88dc7004ad4e0fa8b1bd8daa5667"; + sha512 = "db631bc0fa67e2440ff068f009f1cd59f8f0004341911af9372a09c89f8882ddd82fb7cc350bf609b81ffb7ed23fa0a0aaafc91ac3aa0a7e03c9a52b10eafaca"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b9/linux-i686/es-CL/firefox-63.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b13/linux-i686/es-CL/firefox-63.0b13.tar.bz2"; locale = "es-CL"; arch = "linux-i686"; - sha512 = "5b85539c1d8c30e817c4b82996f9a5cc8d078224b97c32c910931965db45a09a186472722de84e7de7349e8f9f086b9d76d2fc87c8775f67ac829e9137305e32"; + sha512 = "e65a58b49ae8c24466f9762276fd3f006dbae2ec4c200ec298d787bc4aaeb742cd17e5dcda24226327377082cb4aa5f4b37966e94d30bbd920bc1f8b7210fd6b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b9/linux-i686/es-ES/firefox-63.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b13/linux-i686/es-ES/firefox-63.0b13.tar.bz2"; locale = "es-ES"; arch = "linux-i686"; - sha512 = "5a39cf930255d271e8e318bc285446a5346cff9443db8dc5270ae0232d2b4b61345dce191136da2531bc3213f4e0abf6902231abdaaf5bdf6baff2b7b689e84c"; + sha512 = "0d4dc421d87aa50bfb43be4d80405741901d6ee69ce0537dff064077f5713afd692cdd1405c1504e8ed3bca1affd672985f8dafce63a398d8ed8758a259c6c1d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b9/linux-i686/es-MX/firefox-63.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b13/linux-i686/es-MX/firefox-63.0b13.tar.bz2"; locale = "es-MX"; arch = "linux-i686"; - sha512 = "2a57741f8a2f2325ab6ebfa46d3e26f92b07daef81dc01997d8ea981e9713240a08830741f37542ddf948f022a2ff56378915b5bdffa4215f64a84136850c648"; + sha512 = "798b502fe83e7ea9d0e32786e618009d7631018b303f31489754e2b04b5c89ddd8dca48a0472f8b4785da5aaf2a2a4454428d5794c6e1f8e2ee8d08c655d2137"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b9/linux-i686/et/firefox-63.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b13/linux-i686/et/firefox-63.0b13.tar.bz2"; locale = "et"; arch = "linux-i686"; - sha512 = "1b8bcf9dc03af2ee215a24eaf82ad75efe8c8ce6dc9c2fbd4b7d8f751f7854604b0fcf3ae941f7b19ed2b36daa03fd603b1ec2f8bfca87b16fc8741b939ba8e1"; + sha512 = "4e32583343514637080a7d41366949d415a8caf6abb2d220f55fb0623fa2df08eb51f8e1205e38fcb0635052eda52c1175728a63dc06ab555e1d26ef22035b1e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b9/linux-i686/eu/firefox-63.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b13/linux-i686/eu/firefox-63.0b13.tar.bz2"; locale = "eu"; arch = "linux-i686"; - sha512 = "04ed8f610132573951d32e2532543e8a056a89f6f2ae252c72c3dfe1450bfa1d969ceb6ead5c707ec0a5b9e44d16b25238db1d4e52035d2555339bcef20c1947"; + sha512 = "4619ff888774f2da4c0a745d08462c6b584e49f6bed7cf4a9f38f1e69c0553eb40f461491858bbba9d26835bf86493459c273ced320f5292306863d7e1b4900c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b9/linux-i686/fa/firefox-63.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b13/linux-i686/fa/firefox-63.0b13.tar.bz2"; locale = "fa"; arch = "linux-i686"; - sha512 = "71204442585640cec6f2ca6f554b403f4a44a5aad4d899d264b1c224280a03fe5053e21d030d2c21be41571f26f6d97468d26add6fd4c8b3e82a97ab1be528a1"; + sha512 = "d47c39364157f96bca30c84795ab216a3d12677f39a43fa3a411b2d6c1a58ff60204242266b4ffd0b48474417d791ae6cb01ff657d3b66a01932a632a23e4a68"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b9/linux-i686/ff/firefox-63.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b13/linux-i686/ff/firefox-63.0b13.tar.bz2"; locale = "ff"; arch = "linux-i686"; - sha512 = "cc9d2d4de8a29cab8ced52ee92e810f43ab15052baddec3275f5a5245246be4f5fa1c19d9eae8d6dce4337421a88cc81ccd3e87538e85740531ae1140512a396"; + sha512 = "b816e4d844112785a33a8519833dbc1ac5b4832b6186946b0e0866e53c47936bffb385f464ff04659f03db8938c25f330de75e3940c644e8e19fb5d9cc30f1cd"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b9/linux-i686/fi/firefox-63.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b13/linux-i686/fi/firefox-63.0b13.tar.bz2"; locale = "fi"; arch = "linux-i686"; - sha512 = "28b1be8512bea62cd40c83d52a1e5a0d3e1ef1e12cb7e40df2205f0a973558ab70a88a7df5d9bf0c3aaad2d73c55b0dd6cd0130f89e844d555369e844552f092"; + sha512 = "e6420db4cd448e62ce975f4090365749bccdaaff39b881e7c40eb75686799851f264ee3e9c9b2d69ce833b59ce5d1cba2a2fba4017e03495b23b7501a87e046b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b9/linux-i686/fr/firefox-63.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b13/linux-i686/fr/firefox-63.0b13.tar.bz2"; locale = "fr"; arch = "linux-i686"; - sha512 = "f946653b1ca82eb83fffdc2ccf4df81dbd3952acdf77f6f7c3f2bdeca4b4b09af9f7ed282743494fb790a14bab9863c99e18ec3077c6d03e979621ca2ead6387"; + sha512 = "1ad0a3de8e08007ea64a0476bed1c202e35f938f31152a18a4bf043f78c0e3e9a172c9be73a578a69c1d873ba702116a484b921f9e0de48c0e00d551e973417f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b9/linux-i686/fy-NL/firefox-63.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b13/linux-i686/fy-NL/firefox-63.0b13.tar.bz2"; locale = "fy-NL"; arch = "linux-i686"; - sha512 = "5d4bc41b40f8bb680f3e4d81c011994d73f84f8040d05b5427f0932013789935e064272621c25b19bd51c2cf3c8316f62aaac60b75c2f950de77d2e306dfd52d"; + sha512 = "3b082ee567267ebe7e846cc928607c832c96c9a4d996e098c0fcc887bc4cf52d696fe1dffcae9a06a927b45d2f29d4137c55cc99f2ddb95b79dc2c61ba561912"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b9/linux-i686/ga-IE/firefox-63.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b13/linux-i686/ga-IE/firefox-63.0b13.tar.bz2"; locale = "ga-IE"; arch = "linux-i686"; - sha512 = "09a34eb4a3866998b7a26aedbc6d4e7ae5bc5b091c5edaf0675c473730f42fc8446727e7fb3936f5768269de43786ac823911038272ba615d745df43e23e6928"; + sha512 = "1bddad6efd191825751252c6c543286614e5c52c2fe514c3cb5835953f28b11eb642abe72460d55fbbcd937fa93a57cbe6dc8cfdc3fe179961922402f81e90d6"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b9/linux-i686/gd/firefox-63.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b13/linux-i686/gd/firefox-63.0b13.tar.bz2"; locale = "gd"; arch = "linux-i686"; - sha512 = "77c8f4d6a3fdd2a8525d173fffd36254419f87f46b42d91b050faf5779c0fae4944df3bc646f1d893477f3aca943e09438b467b5ba6d8862a9f3ffb2848e69de"; + sha512 = "55d1dffb686b0f0c9072171b1dbb6059ae31a88f77252d922ca0f52e8210e724a1e951a1049ff5f5395eb247ddc3d93ef6e865b50b94fa8226394a1c32768e66"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b9/linux-i686/gl/firefox-63.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b13/linux-i686/gl/firefox-63.0b13.tar.bz2"; locale = "gl"; arch = "linux-i686"; - sha512 = "9634ff8df8c375013d020415d6b4fa944b539511291a6c0e2e4994ff618b4cdb36420bcd78285427f9aa146fe774207f39ad2c0ccb6e23040e15e3cb0ce39cc2"; + sha512 = "11ebfffae756c46685091c63245e8bde2068c192f335d37585629a646a78478e76eea84d01b4dca85b6fbc0d53c09477ce59a29a3ce4219593c24cddbdf3cbbb"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b9/linux-i686/gn/firefox-63.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b13/linux-i686/gn/firefox-63.0b13.tar.bz2"; locale = "gn"; arch = "linux-i686"; - sha512 = "226e115d8e26e9c06dc07a3611db551632fc383f3347ca421df3fd82d21001c51ab2e16c937be2c98bf07d00529d19de090bf9427d548a2f6c2280d03ad81006"; + sha512 = "9f2ce62956775b7b75014d62a6af3caa6e55cad0bce6b69a5bf41f83c89db0a7d6446c8b13d84b0bcb59e14f11a92c998e489339fd15c1c92c7ae2273ae4219c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b9/linux-i686/gu-IN/firefox-63.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b13/linux-i686/gu-IN/firefox-63.0b13.tar.bz2"; locale = "gu-IN"; arch = "linux-i686"; - sha512 = "6522b70c7122a18e9d975ef2dbc51c6fe3d23cf8e5fa287210bc29a7e63821ca3fe3d24b6a6fddb0fb800116ae55010eea95f7d555c94468beb90bc9f3e5ec1f"; + sha512 = "185c6a2daf7ea7c221c2de73aa113d81ab0b28b085e2098943e1d315be52ddb43deb90ce1fc53a94bfac20562923e7aa90ebbe959c0d66bd9035674eb2e146f6"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b9/linux-i686/he/firefox-63.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b13/linux-i686/he/firefox-63.0b13.tar.bz2"; locale = "he"; arch = "linux-i686"; - sha512 = "3a2481485d2c641f9d2205bf2679a733be224fc463476bb7f3ca8ea275d27a1490410fd9fd54f09b3d91bf165d46d26f4fbf8d173f01740280b50119ad25d80b"; + sha512 = "8b40e3c315ae5b6f90c396a68bcb08781c4161715f9b4ba1fa7d1c6b584b8093942e9da3dde7232a0e97847eb3749ae9225e0a136c5ac6c3e95eea0710ad0ede"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b9/linux-i686/hi-IN/firefox-63.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b13/linux-i686/hi-IN/firefox-63.0b13.tar.bz2"; locale = "hi-IN"; arch = "linux-i686"; - sha512 = "b5a6241c748654d858337b81febe8a2219ba2d3ed3e03725ca1432fcb5dccb1d715920b2a009a00ba330ff51d202b4da27ac6bddc329011e830a4e715a089db7"; + sha512 = "bcdd3223262d192e07e68e51cc610654387f4c3c05b21652740c11fea1010aa6e5dc564974daac1801bd50d0b0f78f0e8173b3cd2b0ef8a0719251bcc83e66b8"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b9/linux-i686/hr/firefox-63.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b13/linux-i686/hr/firefox-63.0b13.tar.bz2"; locale = "hr"; arch = "linux-i686"; - sha512 = "f704b353e92532c8ab0598263a5ad92323f46289a9a4369f05487f22dfbbefc59893938916689b0bdf1c07a079ecd8f6d8754b16c9cfb99333673f94ab1699c3"; + sha512 = "4075cd52c92433515fd97ad2b04878d21711d52fcf388ae19477ddad63a7a1d88fe62983f47fcad844ee8be1881e1fa353e18865b8c0c02c57d43b2be6250c48"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b9/linux-i686/hsb/firefox-63.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b13/linux-i686/hsb/firefox-63.0b13.tar.bz2"; locale = "hsb"; arch = "linux-i686"; - sha512 = "44517eb11cd22ee1bb201b14c7cd18dbb1663f0e2a52c8cd1d0e215985f2f9e67d80ba4e10ee599f693e9b12436a9757eed94e3dd4b82a8ae37d1892296b1428"; + sha512 = "2534c74303a9e40de6e32ed3552c575a38a2be612237e9daeca2334c4f3354698d640c62f7bb170b38bc8267735e75ff2c7dc61bbe1b9e0a7b4adfeda891a1a9"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b9/linux-i686/hu/firefox-63.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b13/linux-i686/hu/firefox-63.0b13.tar.bz2"; locale = "hu"; arch = "linux-i686"; - sha512 = "24d7a30076378d584f8f524353dee730d9ebd5be16a5e6ba0a44af1e7f0b51fc96670f8fb1f6a661b662d649bfdc1b6be6ff19410a913031a108f610f0f63e2b"; + sha512 = "002b67ca863b1da0e68c39cb05b11b956f4f8a47968b88541b73b45bf795235d1b851bfb3c06200a71c7205806d637c8da315303f8050e56f5560d1066d2eb97"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b9/linux-i686/hy-AM/firefox-63.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b13/linux-i686/hy-AM/firefox-63.0b13.tar.bz2"; locale = "hy-AM"; arch = "linux-i686"; - sha512 = "4bd50fcb8405a59b4624277ccfb2a528667dc386b87f815551ef264655d6c9cef4cf0d2452b1c7babde138aa81fbdc6a6484cdc6890e0f6a4e926786ac0fbeb5"; + sha512 = "2ee7f78a9a8eae99792be88885b9d10f596473e9fc03d935d4d16b927cfb5e6305a037edfd5d4cef1e253a46a9d7b2c2c3bca3f86e557302e326f1002ba12ba7"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b9/linux-i686/ia/firefox-63.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b13/linux-i686/ia/firefox-63.0b13.tar.bz2"; locale = "ia"; arch = "linux-i686"; - sha512 = "d62d825507c92878bc022d85947d59d93c9913cfb02a8dce0e2937a4527a80444e59bb324f175d18322726f1ba9686faf349236ebb12fb268a3e13eab32fe317"; + sha512 = "c901603efeb9b40a0eae5c6c52973dacd218cd4a31f94a597f3cd20338dae8dc2a10c0b991e4367a72e8ee473d000e972ca6aabf2dbc4ea16f0d4dac4b2edad7"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b9/linux-i686/id/firefox-63.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b13/linux-i686/id/firefox-63.0b13.tar.bz2"; locale = "id"; arch = "linux-i686"; - sha512 = "955ac0a9b30e9209a0fbcec5e88b94d75bec3b8455a78e08770e5ce54b10f73b8642a8a2a1b534ab9b3671611fc6a9278c597c3a3e84b073008c42745fdb6892"; + sha512 = "8c215c9bdd711f9165a99dd5276b73036590234be62f42c93587598d0d6423ee26d312fb015f176de4afe799ffdacdf860f0d00b3006f0229c1dec84d2af9f7f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b9/linux-i686/is/firefox-63.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b13/linux-i686/is/firefox-63.0b13.tar.bz2"; locale = "is"; arch = "linux-i686"; - sha512 = "984a706f8ae3bfd09ef720e5586c69da7bee182281b8231132431080b6504a265e891114bd7937381c64dbd9dd09904b9e531849998409c29c235783ad8c22cb"; + sha512 = "39af62503e8de0c74630e4c877c920553902661deff8a2271252a0b15ab3f544d4c843f53e6ef3a6f386dfbf047d2ecf47d29b3b91a683dae181f1bd5c175791"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b9/linux-i686/it/firefox-63.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b13/linux-i686/it/firefox-63.0b13.tar.bz2"; locale = "it"; arch = "linux-i686"; - sha512 = "5d917c06052408d11c22945aaf0f26b1c312c8aadb631c935fb341893d3d2c762feaf1fac8aedd944fea13518a73fddc5fd4850863036e05964e4ae72cca6542"; + sha512 = "50e8f50ae82f3cd13799884367968bc3e1d1b01f029bad18a2ee1f658c1c45a98782b831172d9bc65c2c97da29478767429a299851a7f498b534c121ab493d13"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b9/linux-i686/ja/firefox-63.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b13/linux-i686/ja/firefox-63.0b13.tar.bz2"; locale = "ja"; arch = "linux-i686"; - sha512 = "3fa9888377d958d879cc04f2763593a7e88871d09e304e597f27997b4c4291d5db7d9345cc3c19d09de8cde34d5c4c1e9488eb205d075cc9b6f368db6c77cf29"; + sha512 = "01d52a8d525bae042f78f865284412bac2861f8804e214725671a25d2d4128671bdda564e73b9342520939426f7c1c68349637cc5a85030f1a559a5af940507a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b9/linux-i686/ka/firefox-63.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b13/linux-i686/ka/firefox-63.0b13.tar.bz2"; locale = "ka"; arch = "linux-i686"; - sha512 = "b0e49faf822c1145e185069e001d63480132619b39b76ec2baa36456f2402f88e6d500cfb86b3edd7387e11f145283e1256218e0fae8d95bf716f00c5d682a44"; + sha512 = "dbad627cfb3eb60b4c7ff47f54faf75df232fae7919073641a394e6c882035af32e8bef25084115b25959fbbbfbf30753f32a2868838e87c7905fee109ad5037"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b9/linux-i686/kab/firefox-63.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b13/linux-i686/kab/firefox-63.0b13.tar.bz2"; locale = "kab"; arch = "linux-i686"; - sha512 = "1b4f60da621fd4d7e2690b84541edb16f58a4065f87bb6062efa8efc650b1e12de51ad583c5f11941dfb9849572edd27e5bea83d766a9b629337a3f13b3d0502"; + sha512 = "ae48811af05c1ac602270e8e6acc230dbf2e497567fafe9c7b402897f4e5cfb34c3645f14e63f463cb784e56bd49aba1b8ab692b9500a5241b5f91bb3a89e239"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b9/linux-i686/kk/firefox-63.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b13/linux-i686/kk/firefox-63.0b13.tar.bz2"; locale = "kk"; arch = "linux-i686"; - sha512 = "97aebb3ff8b39d2bd5fc7bac22db0169eb30fd16523b8e92fa25d840b289331cfd3aabe8686f85e76396fe8d57e5c4c7b32d5f28bb949166b48eb88858285f65"; + sha512 = "70077e5aa220d6e67c819e98f230894277d8ee9446885397bd2bdfc886f1075907639ead92007dac2c74cc0ff7baac75c921b7c6ddf56120d87f66714e1e9388"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b9/linux-i686/km/firefox-63.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b13/linux-i686/km/firefox-63.0b13.tar.bz2"; locale = "km"; arch = "linux-i686"; - sha512 = "2dea52a11615a8fdac422cc495a5a344ada2540778c0300eea3e85ef5cd906bb6fd009631fd62565bbeb01a65470f9833cb66345fab63493fbc0e8fd8c4d85d1"; + sha512 = "25e487b8dea02fa31211cf9b8e143911293f14485ec167e5524be0ff61db8cd9cdc86d2e4ccba58e63f14a82439dd11f6e25b9c9b591d0915c8119cabab81551"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b9/linux-i686/kn/firefox-63.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b13/linux-i686/kn/firefox-63.0b13.tar.bz2"; locale = "kn"; arch = "linux-i686"; - sha512 = "72ccf22a789a7aae6132c9522138e5482024e61550fd81122969a641227448d4e781fa40e0472e95b36e66abd0c74be3a96f4479781894be1323cde248c00e8f"; + sha512 = "9a947d844a81c3f6e2f62ee5a9dc0129afac82d9c6e77e59232ff3e140b3552b146a702a4be49fec64edeb3f506f4ee86c4c85345315f76171cfbf72c3f269da"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b9/linux-i686/ko/firefox-63.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b13/linux-i686/ko/firefox-63.0b13.tar.bz2"; locale = "ko"; arch = "linux-i686"; - sha512 = "b9d627ecd91bc9510b777d355cc821f6eb4830748eec14ef44ff1022fc3daf42caf9212e9bb4ad541584cef9eb41f5ff56b216c2c6e68dd067e91e75202f4eeb"; + sha512 = "c56662d013ac5ebe4cd6bb64785ea165321aee492dd37fb5c7368c4932c4f871d2bd33128d3201dd9c3e73fbabe4319190eb1701332891f62bbb48fd5c5776a8"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b9/linux-i686/lij/firefox-63.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b13/linux-i686/lij/firefox-63.0b13.tar.bz2"; locale = "lij"; arch = "linux-i686"; - sha512 = "fab085b0db9c01852def72428421440731a17656f9d77da2e5f5743703aa7ae3e51e1a2172efe47610a4f02b5655520776ce2b48a7e6ecf9cefced78cf533ec6"; + sha512 = "c1f6944f4f52e4e6b6f84a69050b5692a2982a30a9ae7ddb747ecc2f183d9be225428675ac1ed1553efd573f71bd3350efd9d247d16ae0c3d80044000b0cbbf2"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b9/linux-i686/lt/firefox-63.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b13/linux-i686/lt/firefox-63.0b13.tar.bz2"; locale = "lt"; arch = "linux-i686"; - sha512 = "28ec2617cf310b2a007112b308bb47f668f89511515375b2e822947a7ca9218c3209975845fdb91989a70285601c2b5f7b04e1ea98055d1c0804f73956e3b5df"; + sha512 = "5be16d895d58829791afed1c9fec00a2c84c849729cdf5b0a0e51ab06fc55deeee24bf98107f4e75ca8616f936676630455cfefc9034d6f53167247438e956a9"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b9/linux-i686/lv/firefox-63.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b13/linux-i686/lv/firefox-63.0b13.tar.bz2"; locale = "lv"; arch = "linux-i686"; - sha512 = "08dc0583e0c7642aab90c9d4536b567026cb245fb44cbaeea8e91bfde9ba1bbfe90667ddffe8c1224ac59867d4626c4e3641b044d7b25fc85d4832c2fe0e3522"; + sha512 = "f75d0186d228a03137aa9174122109c42e9aee19a1ffb0e810f53b8f0af9f72d1a81ad86468db3bdcf0401ade5407764253ae1176457f1823afa8d1f2e44db11"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b9/linux-i686/mai/firefox-63.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b13/linux-i686/mai/firefox-63.0b13.tar.bz2"; locale = "mai"; arch = "linux-i686"; - sha512 = "dcc85c2b60851cafd12bad1c018cde11150b946147fcc2e213eaeffa5e89f4eae9b346ce90552b0ccff6efea64fe126eaf51d5a442173e0954bcc4d33e616b8a"; + sha512 = "e010c961c9e6dc4d7c8b29a2acda5aaaa7c0e4f2ef2bcbcc9b3a29e8b1a80f375c877b8f925cfe0a35e018fea2acd3acb67394547943f2dd1818a2138db7b83a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b9/linux-i686/mk/firefox-63.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b13/linux-i686/mk/firefox-63.0b13.tar.bz2"; locale = "mk"; arch = "linux-i686"; - sha512 = "56a8dd0b99aaaf975e932d18a89dd5364c0277e11ffb6077bfd38b63e38a9960b16f638e304e836599add79db4d35c05db13110a5a0081c24855caaf0ad25f88"; + sha512 = "91d984cab9a39cbdb9bb5a6971ed107b0de33ebec913db1c8c48c459abefaecada9267d1b7211626c4617edaf85c1f827e92e0f8fb2af42dd67a09792e4cdfff"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b9/linux-i686/ml/firefox-63.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b13/linux-i686/ml/firefox-63.0b13.tar.bz2"; locale = "ml"; arch = "linux-i686"; - sha512 = "d89b9385905130130373612a6f0e79da26e0ab2bd7b0a28101b429b3d226d833ad2b415f6ce02746bc6b9c5fe5eec80e7ffa733a547835c636408559281766ad"; + sha512 = "868cf98a5cb99e9a5879d13a7de79f62178ec8dccbe7b36ef7392f5313fc93b4252e08fa9e2926b51a1f885c86e2198712523e9d144da36d4c0e84ecb2b7a563"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b9/linux-i686/mr/firefox-63.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b13/linux-i686/mr/firefox-63.0b13.tar.bz2"; locale = "mr"; arch = "linux-i686"; - sha512 = "a1c76c260d4347e7e3feea2eb5070dab80301a305195befc2d988f2cd982e8a7d6dddd16dd4b0016fa71709426ef3e9bc533aaaa3d3e07fcb8c1817994baf3d5"; + sha512 = "07e3df41fb1f8e4ae97ae02b3d559fc5e1ac133478913b0bb3767bf5f528aae34d241a1aa8b1de876d20d244afe5ce5ec88d9663bc6b4d81a6c89a72b5435a92"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b9/linux-i686/ms/firefox-63.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b13/linux-i686/ms/firefox-63.0b13.tar.bz2"; locale = "ms"; arch = "linux-i686"; - sha512 = "a68f7794f28ad0f083d6200b5bce8849b370afb6e5cc0b5013659f7818afd3dae38fd2216c80a2b555a0dad897365e6cef2c2152d969cdc5d4e4e59ef73d23b4"; + sha512 = "c07bb19e1cd42a6b7125140ebba6b76801ce6120075e5dd1c93dcafa78cede7e2f905c1cafa2d16272278468019808334d6428039b94816fbefe358e5c20a54d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b9/linux-i686/my/firefox-63.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b13/linux-i686/my/firefox-63.0b13.tar.bz2"; locale = "my"; arch = "linux-i686"; - sha512 = "936b3fcd3bb4b3119768bb49f382cda0e5d6601a83432939801248b0fd3e1f734438a0f5d69bee96469be25333a77dc12d57f2ab65462feb13d6f50f8671d85d"; + sha512 = "3153f92490938d546c7f7b8497c08a5a71c78a847948f1853fe2faeb5c077311b8e42175f639bc27d0ea4bb72343e0a35fc2ccbd1cf04e5e556619eb11282ce3"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b9/linux-i686/nb-NO/firefox-63.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b13/linux-i686/nb-NO/firefox-63.0b13.tar.bz2"; locale = "nb-NO"; arch = "linux-i686"; - sha512 = "4bd3ee6c762423d3e10b96f583b0b785778ca7a72074122941e3cbacb8e8680fc6d6fb4daf2a8d13615947297a27dde03cb415579762c015a6fdd3dbd23bfd31"; + sha512 = "e4a63f4a19d28e248f97b4f6791873f6bdefd61f80cf8476a555864ed5ba6ff2001e69c02a2a271c8b78c28e1c78adc7c766b8e1bc2791111127eceef777c30e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b9/linux-i686/ne-NP/firefox-63.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b13/linux-i686/ne-NP/firefox-63.0b13.tar.bz2"; locale = "ne-NP"; arch = "linux-i686"; - sha512 = "de6f295ea831a91249857e896d888d3866db4aa39fa9a2bc57d46d4f8e0c0db2858733fd6db7326803dd75d6d5a9eb9f34d85b285851ac2066a6dbf7242e1a5f"; + sha512 = "abadef6736bd802c81e1a741e77291600dd7f90cd12d623a3c39392515c23191c1a3d5f1f9771b62c6d8a7add46dadf5722dc9d0dc47d8a4e15227879875c6d1"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b9/linux-i686/nl/firefox-63.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b13/linux-i686/nl/firefox-63.0b13.tar.bz2"; locale = "nl"; arch = "linux-i686"; - sha512 = "603e7b90798d500dd9c6dc10b29735f8a0e1dbdf8ae8c776f1433ea92291550b67581a0a58b60314fe32a1e3b9856d3c2cc22b42d23f5c339201240e91047d8c"; + sha512 = "a3654dfaf19fe2a30445e9f0e8007739e446a78c3f630ec42d28d802698fb41fcfe7c8977b9d05dbbb9bf5eab264ab73b70993825f285473c941c10293df1863"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b9/linux-i686/nn-NO/firefox-63.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b13/linux-i686/nn-NO/firefox-63.0b13.tar.bz2"; locale = "nn-NO"; arch = "linux-i686"; - sha512 = "e4a4513296533a965f470464b1530a14225f71cda1edf17605d49a565b91ccad25ec226878c315d1ed1cb80d491c9e3b2577e41ce252f0b8b5c7fd99b136b6c6"; + sha512 = "06817e98fa2f89f7fc513f8b439ea12d2d7cce4b24384cc5c442d61b6d974261d6cca5f3ac06db267be22988a87a9e672ef948a78bfd3cf92e83a3f11620543a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b9/linux-i686/oc/firefox-63.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b13/linux-i686/oc/firefox-63.0b13.tar.bz2"; locale = "oc"; arch = "linux-i686"; - sha512 = "d95abb474023bed4471f366c1109f28f7be2a938d333cf30d3e0b76429a6625078f78cfa7deea42a541bdb815611e46ba6c4c77f3e890143cb001aa26a1b6ef8"; + sha512 = "67b3baeaf105149491bb98f7a7e1d38a056116ad331ce56e39263172240f89a76c6a0b7e322069c9f23f11cd0486cf51d7847b70bb28801fd8abf0d669326c07"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b9/linux-i686/or/firefox-63.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b13/linux-i686/or/firefox-63.0b13.tar.bz2"; locale = "or"; arch = "linux-i686"; - sha512 = "16eaab71e1896ba201a44cabb84083d3aecd75a8f1e4736d9046976e2ddd983de63b287512c41ec2fb0b942af7d2f36b2b7f8923d77ecbfdfb751f64416d0b19"; + sha512 = "447a66d8938c9fee0ff2c8c0b2e7c5539e55ee7151e46ddba3e6ba09499138e0fc1f6ae8cd954463c65a58ecdf69bc65996bad02580b16e5a5e963c6ff268f88"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b9/linux-i686/pa-IN/firefox-63.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b13/linux-i686/pa-IN/firefox-63.0b13.tar.bz2"; locale = "pa-IN"; arch = "linux-i686"; - sha512 = "0b274e05f65cb11be8c0b6b70cbdefe5c910b8a9e8c7200b6778e40e755e656c4849bb1bfb128b36150a7fcfe1cf5b641c7a1872cf14549c9d039aebed7ccc07"; + sha512 = "5f3cbd069ce774d5055b39e9a6a97fc421e47f4e49e05d0505a2386d017a76dc25d14b7bbb19a53ac4d5a5baa858257633a4d2f8c4f5f4965587da4dcc7a7c67"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b9/linux-i686/pl/firefox-63.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b13/linux-i686/pl/firefox-63.0b13.tar.bz2"; locale = "pl"; arch = "linux-i686"; - sha512 = "2b03845b3795bdabe1b38ec890164cd4d83e2ecc2ac36fb2a96aa37c9db97f79ce3e8b7d8d113c2a88decda342b445b2caf0f137aed25def4177197fe4ea9d2b"; + sha512 = "b07d5d238eccae9447cb2fba17b4dfbf8c11e983bd57e75460d4219be2cf9883fe26efae3319491baec68539840c3bd0a707e5c7b74c3449b950b2e1e1aa7c48"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b9/linux-i686/pt-BR/firefox-63.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b13/linux-i686/pt-BR/firefox-63.0b13.tar.bz2"; locale = "pt-BR"; arch = "linux-i686"; - sha512 = "80f1105afefbff17774f5389a95453d9f2c89684329506ac9c6bd9ad8c7c40b29a65c0f6773bd9ad6988ecb89a29e21dcb1eaf1d53b91f6186632f4cc1de8858"; + sha512 = "0ae1543d6e0b49353963a2e7ccc271ada1ab79018975895c838c83da3bccc01c9f5c420b186086eb2204dedf2cdc9a8321bc164963e6e45bf1f919b32bbc798e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b9/linux-i686/pt-PT/firefox-63.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b13/linux-i686/pt-PT/firefox-63.0b13.tar.bz2"; locale = "pt-PT"; arch = "linux-i686"; - sha512 = "ee0b41a61efce3b9c439b08de1e518e8c886655d0952b1c7c575c413c042dad19da3f4da6505615706046c522ffe918c7bfb26c5ad97525d60ccf36a0e17adb2"; + sha512 = "5100ffba1866e21c83254e8bb49ad7f18167500d03f034d2b9db298130ee8804317692a1fbf177c39f997b4c9d1fbec0112836fd1930137f740c779069050dea"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b9/linux-i686/rm/firefox-63.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b13/linux-i686/rm/firefox-63.0b13.tar.bz2"; locale = "rm"; arch = "linux-i686"; - sha512 = "6c761c8b83da4361398efdc196e2390677d485c12fa5a696ed5a9b9bd8974d693cf199048369d1804df739a6f1cc45de406afb08cce2354bcae35c66230f66ce"; + sha512 = "2c4efea31a1c091a417b35d3007db737baec62f9b19174b7f8254ac0277909f3c5751613effee4b344b3ea2da2bb04408eb337870efbcc339e44e7327a023eb2"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b9/linux-i686/ro/firefox-63.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b13/linux-i686/ro/firefox-63.0b13.tar.bz2"; locale = "ro"; arch = "linux-i686"; - sha512 = "59f679d4113a12d14f99bc3faf765c7ef0a811ee1b638ea1b6e04f67cf3a97da81f9388833e94a38bb47bd88eb8c16b0134508289128771ec7135001b79b199b"; + sha512 = "a2db9d68c20467cae286929d168bdcf2992d95cbe8c7cd8cce792110c8fd66e0bb8d1e1f5a0d671d6de4b220afd88d326f2ca842f6ae89ba4117d8b3e30750ea"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b9/linux-i686/ru/firefox-63.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b13/linux-i686/ru/firefox-63.0b13.tar.bz2"; locale = "ru"; arch = "linux-i686"; - sha512 = "2296a95fd6417eaccf832f33811c6a65cbce5e6520ad4cc79ce3adbc1b773ff51169654ac348c6ae3040abada2b3d1b1d3981fb3ade7998df033e5fa52fce391"; + sha512 = "01caeb7ea42435fa560866f8acbbbf1a3ef34e2a97a5616dfc0e017469b86e730076591121eb1ae4e8542a5d9dc297f1b8081e9815ca2f191245362c7bab409f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b9/linux-i686/si/firefox-63.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b13/linux-i686/si/firefox-63.0b13.tar.bz2"; locale = "si"; arch = "linux-i686"; - sha512 = "4b67e4731bc9d5e0570a5d03864d1857cb4864768006740c8f5880aef4bddb499976d4f69223def08a7db104eb459bbe06c2e9023e2e2c84af85166b17457451"; + sha512 = "879a4adf470d5dba2e3b99a8415aa34bd491cd7392bc138d5a98cac9cbfbc53ad23aacc947f14775cbd438f5af7a28abf2c9072847a42e53a9ad6d43a5e01082"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b9/linux-i686/sk/firefox-63.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b13/linux-i686/sk/firefox-63.0b13.tar.bz2"; locale = "sk"; arch = "linux-i686"; - sha512 = "0fbe91caef978c857f765d3bfa4d6c116f0a4d80d1fdd4d9d1f65baa8358a53ab0f18d8527e301e36229230d28a68e1b840ed5bc4fdd5751be39b1e9c3095609"; + sha512 = "52abceea5248ea7fdf70e9d7f6ffcbfe903ef09fa91458930d1fd9a39717621491b65b198fc72bb6e39d5dc189fd4a7aea59482cbfc851df76a3e53904ec784b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b9/linux-i686/sl/firefox-63.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b13/linux-i686/sl/firefox-63.0b13.tar.bz2"; locale = "sl"; arch = "linux-i686"; - sha512 = "75345e5b882142b16ffd1a978fe91f3185cf7dc906494ec1a886130d9a51189bb2cd3a2d3b340b63b8c7ccaddfc60d46e2e7c9314a9337dd1db21e0a1dda03d0"; + sha512 = "b6e55f76896463fb6b9e964dbac60be2dae5aa60bb59be2a22f4742249539ce35791c408e7b5258f35e9d24c1732d0a8900e8855e7866d401e636ab7c603fe77"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b9/linux-i686/son/firefox-63.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b13/linux-i686/son/firefox-63.0b13.tar.bz2"; locale = "son"; arch = "linux-i686"; - sha512 = "25f9791dd9fa9ec38d52291de240130c998fc6186ced18a41128b6c68d3375702794260a77b7ab8c28dbfac2afe0bce0f80bbb8ebfa3f3529346e264690c934d"; + sha512 = "2a27edaf71212ce13e2b841db8892fbe6bab969767833475abbb1e63b075d3811e00d95f39008a1a0a198f98059d8148b78939657f7ed0837d438dcc7e9f460c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b9/linux-i686/sq/firefox-63.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b13/linux-i686/sq/firefox-63.0b13.tar.bz2"; locale = "sq"; arch = "linux-i686"; - sha512 = "6e199b772d1e89ee6b74add0ebe53a1ad590abc7c436851445ef5eb060011d27d371d06f8dfb08316e84f4971637450c76272bc77e57b76d3f8945a4f1e36169"; + sha512 = "e347bdc355e4dcfe7e2fc85d0ac6e2bdc72d51d697820b00cf5e6f30ee4a4117765430fa1f0a40ad647a87e4c9ca0721be1fa345c6c31dd9da403ac576091779"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b9/linux-i686/sr/firefox-63.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b13/linux-i686/sr/firefox-63.0b13.tar.bz2"; locale = "sr"; arch = "linux-i686"; - sha512 = "331fcf1f0ffe68d3925518a044c40562d37480392534e161df9546c4da2e648b0c1a765714bc2fc3457ddf80bb7ff4b65c0092d3e2a6f2a11af1b66a099086c3"; + sha512 = "b32eb6ba5290674d81893419f38279d0761d0a45a68204f3fec0625db09ae53e959c02276a852d7cbc59dc8bccef149ed024246c343836e57750ab73ed739a43"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b9/linux-i686/sv-SE/firefox-63.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b13/linux-i686/sv-SE/firefox-63.0b13.tar.bz2"; locale = "sv-SE"; arch = "linux-i686"; - sha512 = "ce9b87e63e9fbc975d48432996d12c31e13548f328befc9c52a5da9b2998f3bf286e7d4cbd1fe36b77e0f99dee32cf186ab81e90ab4760771bbe7fd98e70adf6"; + sha512 = "b5244288fcc8dbcbfe705e20b754214f26bc0c28b929ebfc946a5ee93230094486cb06313eb130d5782a874369b4690edb9f40ef960cdf367363db3bdac2467d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b9/linux-i686/ta/firefox-63.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b13/linux-i686/ta/firefox-63.0b13.tar.bz2"; locale = "ta"; arch = "linux-i686"; - sha512 = "d40ec15bd52e4a71c73366a3a5fa58458401300375723eb76fdf68d5bcfd101cbc18d15f773d58005cc80f78b3f8d52e6d2c7e969a351e8ceb9e0226bf2cabc2"; + sha512 = "ac680424cf44999fd33473f96a82f9ab5b05fa2ec415370694449aa5513423f4d7a416026047d04660d2273c3953c60a72e8f31120a88bcf77f9c9ddfcbfa209"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b9/linux-i686/te/firefox-63.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b13/linux-i686/te/firefox-63.0b13.tar.bz2"; locale = "te"; arch = "linux-i686"; - sha512 = "3a1f6a31f6f6ae2c50a9a082314489e23a294ae8df8bff191b18606621e1eafafbb4b1d8172a61cf62e2572864d3973b8edd82cdd352e2227883cd020ff05285"; + sha512 = "ef821bac5631cddfa1cd5c6ecd5bc10b3e6085d94c2d2a1f86c4a557ceec8d0081c41fdd46b83bd3f03412bc9dd4ff66988ccc2a4447b134e3a7115d02714558"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b9/linux-i686/th/firefox-63.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b13/linux-i686/th/firefox-63.0b13.tar.bz2"; locale = "th"; arch = "linux-i686"; - sha512 = "9f8b425f1acb31e1cb147daf0139d6d74235b0c73cb7fc9b371eaabcb543e75409f9fac5027d0475acba7d811e3fd69e406788a7eec5f958329b1b159511aea0"; + sha512 = "ee5733a21ff7ef0d58ff1b5dd056ff2b97de2f6a90c733b3244235e9d51aa3d14cf16f2b6738d53e33ae9bf641197ef129571ee297401663286d93303e6fd6c8"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b9/linux-i686/tr/firefox-63.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b13/linux-i686/tr/firefox-63.0b13.tar.bz2"; locale = "tr"; arch = "linux-i686"; - sha512 = "6b9e1de61d667f47d6f77d92872a24c360e8cc0833c14338d16db9af6eac511c2b92a371b5afb64af08c50e5367ae8c7567a3473080227cefc8ed9e04e1dba86"; + sha512 = "49ffe5b0ac9b2987d330b8c34dafa352a5c2d327cd7af652ccaadc85c45d63d5bd4222cb4fbccc513f13f2797a7525a0456f30de0603f65581001ed629e0bc8a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b9/linux-i686/uk/firefox-63.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b13/linux-i686/uk/firefox-63.0b13.tar.bz2"; locale = "uk"; arch = "linux-i686"; - sha512 = "e9dd5bb21770ca8fac633c22cdce120d2e1eefd10eab66345afa76c0c7e4533dc325ef954878e13c223f545eebcfb15875a4735f990c5ee121eddf976ece1cff"; + sha512 = "bf6eacd5877f6d157d35f532878f6806eb2bbc6946fb3dcd79c7ca608e649da3f86428182d596242c7c57d3daeaaafdba62a4cb62bd6eb3df57f7788dbfaf0c7"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b9/linux-i686/ur/firefox-63.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b13/linux-i686/ur/firefox-63.0b13.tar.bz2"; locale = "ur"; arch = "linux-i686"; - sha512 = "54ab27f01b7885f9c99c2df40bc660d642a5671c348ecc587f7989816d6ee0ad8003c7c6ca92c6ff644edf04fb72444d87bc041d75d13ab70c713e0f52ae17ef"; + sha512 = "07d175fa078d9be7effc148380b737e2611c301c2af833c9b475388d2b3715a2207ed20f2d4f583a921196199e10816674428c68e7410e7e237f74243fc0641a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b9/linux-i686/uz/firefox-63.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b13/linux-i686/uz/firefox-63.0b13.tar.bz2"; locale = "uz"; arch = "linux-i686"; - sha512 = "da7c03cad4b58447d41d74f6ba36544290cd1a68b9b822473685c8d467cd3570d0ec172f5d510f9fe9b0554c138e4484e64c5fc7858ebe68912d4cf7cbe4f7d7"; + sha512 = "b9a52df09d30406fc21f82e683ce8704df9ce69816f52288ce8d04f72a18842d2cec8fc560bf9fb4e18d513150a14c3b93d3fd15b3dcacfa304f4026666f2a4e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b9/linux-i686/vi/firefox-63.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b13/linux-i686/vi/firefox-63.0b13.tar.bz2"; locale = "vi"; arch = "linux-i686"; - sha512 = "246880d50325895b6cdf549b48f3abda0ce0983284623907f8a08cdfc32f9e748e0918e07c606b398fe48d1e23e713b53cdaeca218c54282c68221420cd94b8d"; + sha512 = "2f255254ce614dd77c8a5f250a83020b5649dc7f8a6b2f4007c857bf7528ee7b959425ca54b1878261cdc26ed5c51fb0539aa05551f2591909ca0728d0415bf2"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b9/linux-i686/xh/firefox-63.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b13/linux-i686/xh/firefox-63.0b13.tar.bz2"; locale = "xh"; arch = "linux-i686"; - sha512 = "dc59e7c637964ffee861ec41a7012ce96980301548882d4c115b8963217487e82eca939f73fab76fdb67d1c676a580eeebdee1b332d22f45435c5d58dadf9499"; + sha512 = "79ae1a6c8ed23b37764be436a0d6cce60c14d91bebd44c8644adf8800f894b475383132f37620893f994aa6620146f08f48d8c2721ba54ff2ddd9ce063918f63"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b9/linux-i686/zh-CN/firefox-63.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b13/linux-i686/zh-CN/firefox-63.0b13.tar.bz2"; locale = "zh-CN"; arch = "linux-i686"; - sha512 = "fc6518d0dd4c24b2c4c3bb72fec23690e8647210f97e2154817bf0793049943becd6d25061c3a57e36f693082af93084faf2357a35d9e19ca1eb8722a7587ba1"; + sha512 = "6f99f8239f5ed00003ce61d82e82c9df5ea6f30b68b6c5b51f26e153e3b2f5ec26c38b09e9b05bd12e9ebf9e1156d59ac102a9258017a1359cd66763945c38d8"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b9/linux-i686/zh-TW/firefox-63.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b13/linux-i686/zh-TW/firefox-63.0b13.tar.bz2"; locale = "zh-TW"; arch = "linux-i686"; - sha512 = "c85ca42f38731e27ebff681af104330d486744215f8db829dbf0f4abd9460a655a5b6d93bbfc4ee83aa6b1bccdd90d3b8743d340a818d84f6fe4a715f775f7f4"; + sha512 = "9a61516afb0fe59775794dabfe0a9a7bae2a71472453bac321468391541d3d052817d5f7650d1b2d1a554af57434c11845d5591bc9e7e79336b8a57706aa133b"; } ]; } diff --git a/pkgs/applications/networking/browsers/firefox-bin/devedition_sources.nix b/pkgs/applications/networking/browsers/firefox-bin/devedition_sources.nix index d175c02ff800..582da6bd8c94 100644 --- a/pkgs/applications/networking/browsers/firefox-bin/devedition_sources.nix +++ b/pkgs/applications/networking/browsers/firefox-bin/devedition_sources.nix @@ -1,995 +1,995 @@ { - version = "63.0b9"; + version = "63.0b13"; sources = [ - { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b9/linux-x86_64/ach/firefox-63.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b13/linux-x86_64/ach/firefox-63.0b13.tar.bz2"; locale = "ach"; arch = "linux-x86_64"; - sha512 = "8b5a6d1e9abea221f134804ddc9bea5e8500e51338487cd004bd1d39b67102491e5d5b18c9737847461dfb8f711e5fc7345c013c057eee478ec1d7f1be71fd4d"; + sha512 = "34615c8bf9be4bc1f544c32df32d986b44d66f91e5f9a834fa7d7321b951700889e7ba1cf41348df457ffc71dd40e8f52177266299ca3044fc2af4514956a8b2"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b9/linux-x86_64/af/firefox-63.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b13/linux-x86_64/af/firefox-63.0b13.tar.bz2"; locale = "af"; arch = "linux-x86_64"; - sha512 = "64d5927caf64b39bfc9bef4b5d9cccff4a19abbee6447580eff5d66c0af331bd6076f9cd4d6c8cb8aa6e25dea7623e2ed0ef18501b044240dab5c1c9ffc71b6e"; + sha512 = "501cd71d70809bd81f233b5205f06f289046eeab8258b1fc87e652ec2235ec73dd7f783f5d4eb8206f8981ba06f4ef312ea4a28e3a23dbb34a099cbe74bfbc7a"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b9/linux-x86_64/an/firefox-63.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b13/linux-x86_64/an/firefox-63.0b13.tar.bz2"; locale = "an"; arch = "linux-x86_64"; - sha512 = "fe4042a34cc3704dabf4de8cc373949cbda705a9aeee28a908fb406972d3746cdf8b10f92b8a8f61bf491f7d662afc64aab207a826d672dc06d57f04592a8e08"; + sha512 = "e3cb48e42d423843e9e563f94bf28086c6b68306191b1893aa5ddf9e482ab947bc3bb123e36d64b3f10eb9a6750c845799ecaea721858c3de93cb120561f34e4"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b9/linux-x86_64/ar/firefox-63.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b13/linux-x86_64/ar/firefox-63.0b13.tar.bz2"; locale = "ar"; arch = "linux-x86_64"; - sha512 = "585224e0ca25a21ea0a6f20936594da9c914d1d5c6993cfdcaec3a43792fb32f16c6dc6ffc86b02c02101ca39da3d81be0e6abd1c9188d76cfa0f05419573de3"; + sha512 = "ccea5e826c4701f33b72165a6aa5087e9cd030c763fb291d94deac2a4650d1666b187909a6122f80df2d5182053cc31c63354fbba468709d8bbf9d3581604469"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b9/linux-x86_64/as/firefox-63.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b13/linux-x86_64/as/firefox-63.0b13.tar.bz2"; locale = "as"; arch = "linux-x86_64"; - sha512 = "cc794031e63fc76438b6e995fe1b093ce0e010683bba68ac0f73c0eaea7d61e67cfc400621b57389e10330d750e244e6ab4b9b88006821b2fd513d1baaf72304"; + sha512 = "5562bdcfe2922203a51e28ed2b03d98b24e401d447acd91b32de25db4553f779bf98530912e1063757d2340e73b7c93092d7b56a208f4b0e899b78c1f1a02f07"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b9/linux-x86_64/ast/firefox-63.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b13/linux-x86_64/ast/firefox-63.0b13.tar.bz2"; locale = "ast"; arch = "linux-x86_64"; - sha512 = "189a5f4fa12838d33adf29fbfe7d96e87de7a54fe3ea7078b2af124158d99457d2c83c1b490adb9608a0e3d42f2f721a1597c80dedf3d342c4f3ce176c93865e"; + sha512 = "4dae80bb715f931f2b7b85a4031335edecab8eeda9bbf8d5afa850d4c4db6cff1c41827a35d95d0bd3bd06351d835edf12f23f37a2fcd8735778cd898b969746"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b9/linux-x86_64/az/firefox-63.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b13/linux-x86_64/az/firefox-63.0b13.tar.bz2"; locale = "az"; arch = "linux-x86_64"; - sha512 = "a7dfa9984917ea02eb61cd800033e8c090d630bf49eae1c1ce9419e2c424717f4203bf9bdae59f88144fb098d20673178528a5fa7f9d343ab4b95f9fc6490d19"; + sha512 = "dbea03117bbd76daf7dbe2b0fd5364255c998b9de8f1d5b1731613f676d442abb0a4e2de43eddcc0162f96898aa1bc7b08b72264d87d7625a56d177eb49d6d08"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b9/linux-x86_64/be/firefox-63.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b13/linux-x86_64/be/firefox-63.0b13.tar.bz2"; locale = "be"; arch = "linux-x86_64"; - sha512 = "79af6add5a203cc4815fd615ede035ba5b15c1cef22d69b5dc81d7874c6ebee5560e6b442a3e626aa72dcee5ce2b5bee90e31a3b2c0223b1d4cf43848d35d822"; + sha512 = "b194bed02d6fdaa0389856e9b838cfb48d2d3a39cec8a6e4a6b80fc5fff9fd6ffaad431c34d546475e8cc126fc3a686619f72a557ad9f2395f5e2db4932443ad"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b9/linux-x86_64/bg/firefox-63.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b13/linux-x86_64/bg/firefox-63.0b13.tar.bz2"; locale = "bg"; arch = "linux-x86_64"; - sha512 = "7f2b152d342a3d864f18088a6ff6e09f54887c50251c47acea2a98e019cf7cc6308085ce3a2f9fe3f6533ed1593ec8a13d8d07e0e94ef870c60ea726bd0a411c"; + sha512 = "5b6c8ed858b5e412bdf75643f988226a762e8c649f33064e488e1790b1266c8fad5a75eb79110aa1d03f9699a05b0d87494d7a1171894696399c1b74f8ac929d"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b9/linux-x86_64/bn-BD/firefox-63.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b13/linux-x86_64/bn-BD/firefox-63.0b13.tar.bz2"; locale = "bn-BD"; arch = "linux-x86_64"; - sha512 = "a5b2f54c57122f81ab5477f6e74140fbf4eecd58837cb14550a6dd48c586f37ae584bdc3ebd3c508986bf966f5a0c1b3e5510040f24a9a6caa43f28b1357f649"; + sha512 = "a44fbd3c3d0607c5c5193125002bcbe890e7fddb6306e45ea7dafe491b43085d55bcc912e8e94ef9c6bb7c3672e6456806f17a5291b0588742319a69ef93474c"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b9/linux-x86_64/bn-IN/firefox-63.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b13/linux-x86_64/bn-IN/firefox-63.0b13.tar.bz2"; locale = "bn-IN"; arch = "linux-x86_64"; - sha512 = "361fd5ff3e5c8572537cf5bfb875e80c12f2ce6de46ff5fd20863d00f550341f58532e1f7e918958ea6754cc1bf8f174e61d1a0bb819603cebefa44185e010cd"; + sha512 = "dda156f8acf3e0790c4ef2195eeac9ccc5895e1d92999f4b8254531c55e1074c313d8acd98182781b35c5d96592227ff29435d1f4c55ba8c39de60de4ea0ae92"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b9/linux-x86_64/br/firefox-63.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b13/linux-x86_64/br/firefox-63.0b13.tar.bz2"; locale = "br"; arch = "linux-x86_64"; - sha512 = "a70cd83ac27d2bb1cb01f5fe2a897f7f626954725d04974adad6fed90ca9aab70484a0920af465293c859b48fa6ed1fcc8723c166fee9e2faede4b8b6b5ce006"; + sha512 = "8812bd2e2871ead8b507ea1b9625c997cfd21547a0acd1bd2a181c5a88180708b5a9b29d8c162c977fe6dcaec48e0704ea17e49623f0b15b194ff553d5cdad99"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b9/linux-x86_64/bs/firefox-63.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b13/linux-x86_64/bs/firefox-63.0b13.tar.bz2"; locale = "bs"; arch = "linux-x86_64"; - sha512 = "c394fd9da07c12e060bcc91ac79f2cb5fd43fab74ffed738f9c5afc3d2c22069d54c38331ea97c944c0d20d884295560016cd094b413e8f3156c6cc548b18d19"; + sha512 = "e016283425dca5e6622bdd3826ad6f720f7ffbfeab4eb3e3f862da2ba2129f3ceb17a2d0b39af514d197519a2e09294f0a4284b8f4d0362598b776e3791a54fc"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b9/linux-x86_64/ca/firefox-63.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b13/linux-x86_64/ca/firefox-63.0b13.tar.bz2"; locale = "ca"; arch = "linux-x86_64"; - sha512 = "5c93688a59b84c324d2ce846d9d235bbf4ae56a2dcdcf6437207bded60311e7b7d0ba6a207cd6089a7f6afb6bf1dadc58ac72454e6831b50bcc0a1fc0f9713b6"; + sha512 = "cab866b668a3e010e22fd92e29bec5b65404f1690f593e49b9aa03cc2ad22d3707f04451e8f6d86e796f46270c671c370e103296952bb63a59708b627ea6788e"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b9/linux-x86_64/cak/firefox-63.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b13/linux-x86_64/cak/firefox-63.0b13.tar.bz2"; locale = "cak"; arch = "linux-x86_64"; - sha512 = "67ce43c2a19448d08eccad1c0788c73a7de6cbd81fe41a171177d8110886e4cc3e43418b1f4a07cc4c9073fc04c24c9215fa6216ebe91d620e313d23aa9f67b3"; + sha512 = "2bc6de3f1e4bb5a99734a04aedc9e4e73b71a588bb92dfbe520ab5df3e4128b683b83d67648f7b39261aa25d20f1b12af875ae92ff4fd628faaa202a268eacb2"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b9/linux-x86_64/cs/firefox-63.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b13/linux-x86_64/cs/firefox-63.0b13.tar.bz2"; locale = "cs"; arch = "linux-x86_64"; - sha512 = "50c02eb32459c8cd394a12c23f81295c75d5ffa2e62ce501bcb75b06b60b3d23c16a392d3c965222ff9eb7e50d41ce03cc32cf3d54c42086b092e25cc4a11648"; + sha512 = "de405fffb62de62c06cb6ae9360adcbf97496addff647a1a738f35a6d04b58eeecf0f2869f1daf5147da1cbc91661a04e6607d7ef2759ed4933dc061ad769cdc"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b9/linux-x86_64/cy/firefox-63.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b13/linux-x86_64/cy/firefox-63.0b13.tar.bz2"; locale = "cy"; arch = "linux-x86_64"; - sha512 = "c2e65a560da8011a50f7694adef788dddeaa68a5d7262c1da0456b22e2fa7229991c1f06ae737f7b9d85e0dfb954c7330796398bf0103f162beedec9b2383f04"; + sha512 = "107bef8675386b084a74a318aa1526aab541a281cfe38a782a42800cb8d20f009d90d11c08386274d20e0f91f2aa32b09814d64ac759b56c247cc23c4921547c"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b9/linux-x86_64/da/firefox-63.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b13/linux-x86_64/da/firefox-63.0b13.tar.bz2"; locale = "da"; arch = "linux-x86_64"; - sha512 = "262a796bdb63a4fdad4bbc79395781d660dec3f24606f8ea715a1d97d8e62d01536538529c79e6a70316319e967c4537b81a1b4b597e5981ecdf7895cfe06b1a"; + sha512 = "88ff633e4e332e32d1f494f7032d1218ec122046c0d134365e1b7195232c77a06c9c2267f27f5ff2ba115832557159f9bbab4c6d9405c2a051a3b3f31662ae2a"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b9/linux-x86_64/de/firefox-63.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b13/linux-x86_64/de/firefox-63.0b13.tar.bz2"; locale = "de"; arch = "linux-x86_64"; - sha512 = "d26a474d464338b472899726fe41ba53c1e00dd3879ea8afca9814b4ee8268a518be3820c54ad8c358c8e2ff62b164f7665087bc9776237858f1edd5c22a4d16"; + sha512 = "427f9b2bb38d94ec872b3fee46a234e3d778f468330be582edaf3205fa9721a7608d5611df9c3c0586f325f116c044a1c64f1920e3939ebf40990878b00d24d7"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b9/linux-x86_64/dsb/firefox-63.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b13/linux-x86_64/dsb/firefox-63.0b13.tar.bz2"; locale = "dsb"; arch = "linux-x86_64"; - sha512 = "3d228820f0bc1e61f4de3d99cae0b0b52174e88effbf8ea36250c30e9baec63cc716478ce775f5e4ce3adc35913dbb2942c0a67da2d1082adcaaf514815ab49b"; + sha512 = "b51741ac82877a212b7ce3f6f58c60b9cd2cc10b4cfd3bee584ad14acd6381f04268c9670e3457048c1bc804fd534e6d271124684e3d5eb19d204b9068b9ca2c"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b9/linux-x86_64/el/firefox-63.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b13/linux-x86_64/el/firefox-63.0b13.tar.bz2"; locale = "el"; arch = "linux-x86_64"; - sha512 = "77eac6e37f285250efe9e5ea53b0666eb52886b4a877c4fc40be0aeba6492a5b54e8311ebf305237c57dc5c838ba5181de5cb593c338eff8132e73dcd4459927"; + sha512 = "a2e9960b35789d53e74ee55081790962ff5aa0c928b68a04c99c06ed32bd35cf776e3f39f1d8933403f97a3d1c5471f3e9915100c1b20ee7e3613801adee1dcd"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b9/linux-x86_64/en-CA/firefox-63.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b13/linux-x86_64/en-CA/firefox-63.0b13.tar.bz2"; locale = "en-CA"; arch = "linux-x86_64"; - sha512 = "7a0bc375c742ac0c45f95f3f25d7fc84b3ee9fe6895fb5b3d4462fbbcf421191f50e096637e73e71d25718cf5772e9c1966ce15639c3b2bc1adc9227506723ec"; + sha512 = "7aca0601a1e298f745267efada3d9999f57643bde087d182ba053b32f995b19a9ee166297d805b440cd5716b28ebca1b6a1ab234da26fc83ee71148e279338de"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b9/linux-x86_64/en-GB/firefox-63.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b13/linux-x86_64/en-GB/firefox-63.0b13.tar.bz2"; locale = "en-GB"; arch = "linux-x86_64"; - sha512 = "7d37c2a3b66c5bae98ee09b81f262bc8aedbde5d6d700abf6dbae232785774daae661fa7c1933e2c6408d0ea95c09153e0cc45efa02468794f03e81079b504b5"; + sha512 = "0eafc24598a7f5e7c15e2d49db5326551c215eb0e8a89215df30c3a26b09c44fd2ed632698223ef78e24024196860625aeadfd290c5bb35adea04e84d003614f"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b9/linux-x86_64/en-US/firefox-63.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b13/linux-x86_64/en-US/firefox-63.0b13.tar.bz2"; locale = "en-US"; arch = "linux-x86_64"; - sha512 = "88a144836494b18ee1f46024771e15cbe778b5630ab884aeafbaf7e59d5df6ff915c71f13f449faa3e56aab46a61bf5d56b354d36f5d378ee51bf34f4565c04c"; + sha512 = "bfdd31f584b739ad09498b0b540150348c68ccd669383e7afefdb303573b553c4fef74e0d3e587486178f7fc00c9096781172cfcb81b0dfa4d135a4c1a597e80"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b9/linux-x86_64/en-ZA/firefox-63.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b13/linux-x86_64/en-ZA/firefox-63.0b13.tar.bz2"; locale = "en-ZA"; arch = "linux-x86_64"; - sha512 = "4f7f4d020559323e9ac1db113418c418a35c5fa8739b75cbb510d55122bc96b0c7492a79ea2862149f34019d95839733883d5516bb399a3d3e623b96d606db69"; + sha512 = "e3989ac6cbdd96e4bcd66c80865249ac501bc833708969d68f2ba07411ef8feebe74cbffe04676dba7979908b794d33af8aff82e79b8e17bbc7a09b344233cb6"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b9/linux-x86_64/eo/firefox-63.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b13/linux-x86_64/eo/firefox-63.0b13.tar.bz2"; locale = "eo"; arch = "linux-x86_64"; - sha512 = "ded60b65f9ee8d21ac8d88723a6114c9ffae6b5e632c27f6d03c50deb054b178a576dde5379b5406366a938fa8285c7e34a71d48e3357e2439a22cc8476bb6f0"; + sha512 = "d2ce6fc32f5fabde2d7748b3b2930d3fce260eb08e49e290539e6f8ccf2c7434324ad99395879e3fbc6f34b97abb6e7b450359045f9344a68dc55c4a8d49dd9a"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b9/linux-x86_64/es-AR/firefox-63.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b13/linux-x86_64/es-AR/firefox-63.0b13.tar.bz2"; locale = "es-AR"; arch = "linux-x86_64"; - sha512 = "c0963472026a9467c057f772835727d8f8b7aba52c09a73d4017943332455a98642c1732bb0f762ccb771fed9d956525fe761f85861d007950921ba8df73f2ea"; + sha512 = "a23f44b93e87781fd4b7f2dbb9084f67410d4713c622be52c4d66f3dd4caf41f135592fe852a21b29ba2364fc3bc8c910d2447dfa102340c0a9260ca53da07e4"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b9/linux-x86_64/es-CL/firefox-63.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b13/linux-x86_64/es-CL/firefox-63.0b13.tar.bz2"; locale = "es-CL"; arch = "linux-x86_64"; - sha512 = "4a5acfa9427e86835b1a1faac10dbdb19f1e80dc797dad3235513addd58a6a0a348a20310fddf20791a2a2758543c4aed18fa1802423b506f5cffc72d65d534d"; + sha512 = "628910a5012f060f98308415965050184c17b4d8cf5cec9ee90c97a59da6f4384f8a571fe9b1107d2596c10e8a9c9ea2102e8b393ef04c6f0125269f8e207b57"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b9/linux-x86_64/es-ES/firefox-63.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b13/linux-x86_64/es-ES/firefox-63.0b13.tar.bz2"; locale = "es-ES"; arch = "linux-x86_64"; - sha512 = "484c2e083135215b2266f5731f308c5f3adf57d1b065654eef2f36a83e37367c8190ce906cd0fb96f3e34a0f712953d4c0d3531056cd5f213aa92b20fcc8182a"; + sha512 = "a9bfba0b13e057fc05b4fbda7a5da6ea3dbdb014ba7d46dbaf76d193d677bbcaea7cb2c65aa6b174c8c0a967e88411e03d11039bc4942f4f8214770b636c2ea2"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b9/linux-x86_64/es-MX/firefox-63.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b13/linux-x86_64/es-MX/firefox-63.0b13.tar.bz2"; locale = "es-MX"; arch = "linux-x86_64"; - sha512 = "300d9d5419fcd2aadf7122180408d85130e1289456a81e623bea3160a1c98205d750c7dec639ca8c731a548042852c9411b9c1e344477dd7297678c34f6f7981"; + sha512 = "b600afd00e3b8d3ad597aadaaff99c0ebdb121829a637b197acb993368a792c88a6219b37e2d10c9ee57e941794cd279837f63ad7c772acbce9cd8a9067a95f4"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b9/linux-x86_64/et/firefox-63.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b13/linux-x86_64/et/firefox-63.0b13.tar.bz2"; locale = "et"; arch = "linux-x86_64"; - sha512 = "9b9e58975178d0a8770d29ab9e205cfc6200a70e423afc4ed6b3c5bf93e25ae39a1ffcec62f468a2ca99e6ffe75434963c0ec39f52c385f746bcaa4e7fe5f98c"; + sha512 = "5938b8535f581ee8801ff78a31425f147a6d21c708c11c0a5c65253ebe811f684380249077e7df4f502dfce35edbccd9f9c5418139f1cc2b327d601c91d222ed"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b9/linux-x86_64/eu/firefox-63.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b13/linux-x86_64/eu/firefox-63.0b13.tar.bz2"; locale = "eu"; arch = "linux-x86_64"; - sha512 = "5114575659341ee38dc5ee5685338d8b1f1f09d97b3fe7ef9cf79574ea61078b399756d289e444eb03d00f1df6e053fc9f927d3eb249f24985facf863bc8901c"; + sha512 = "235c1bb90687d250a7abe644149aa0000ede3b90f070593801beaf77133ab90b52697a3a799b9da9abc5d61a5f489e991c5989281fb13a1558d4bbe1fb2a5547"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b9/linux-x86_64/fa/firefox-63.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b13/linux-x86_64/fa/firefox-63.0b13.tar.bz2"; locale = "fa"; arch = "linux-x86_64"; - sha512 = "30c901a0a9b4093af3f143641a15ddfdb79bfe41c1c85a2c797426a6c0de4af359aabf7ec1a5a9498dd6228b60dd0dafb18f8237e87623b978e724fb60c1976a"; + sha512 = "9d29949da55984f261a3b5b74f3cd29222b8c7743da838674ed44f21df3548f940e295cd34f4c9cedb5f26165a1f65e9d9f5263b931ef414c446600f6246cc0c"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b9/linux-x86_64/ff/firefox-63.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b13/linux-x86_64/ff/firefox-63.0b13.tar.bz2"; locale = "ff"; arch = "linux-x86_64"; - sha512 = "c29ae3741e16f88e23c113167b6e32ced9256b3ff219e9125a251d810d1355049931b94e28e12ff7377837899720443cf1f26eb887d17d12418b755c850d7ffb"; + sha512 = "994ac583be5d6428b7fe575c9a33d0396f0e2cb6fe3cfd256fd069b5c4590787f7606d7c0ff89004cc3adfbcd40a3466a1af72a93cba1f1d072f2dd0e9c25763"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b9/linux-x86_64/fi/firefox-63.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b13/linux-x86_64/fi/firefox-63.0b13.tar.bz2"; locale = "fi"; arch = "linux-x86_64"; - sha512 = "37231275a2ff967da020f2f2549437be552e9d12f3919bb7999c97641d723daba4744a5ecd6240f246028fa4e9d708169152e96578bd76882656f9d8d3aa133b"; + sha512 = "710ec15475c002f14dec5b63cff6878be3ce9bd36626641d7a9927bbf7f393338541945b77fa309f10f22a67a89b8960e19b5edf6390ccbcd37bcf17a166eb20"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b9/linux-x86_64/fr/firefox-63.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b13/linux-x86_64/fr/firefox-63.0b13.tar.bz2"; locale = "fr"; arch = "linux-x86_64"; - sha512 = "16c41300ef3c70b872c7fbce71c8dda35e6b7a0783be96fe77fa33514f8678cb9cd08e57075513e39ec0ededf64c4502fa3391c55b55f3187ff451fc970ee8dd"; + sha512 = "2e7e2d0c3d7db2a2b8967cfff4341d63a17513d4953f8ab1d7822ef71ea3735f0b2c092a56ea7acb1253de1dcbccedf68680d68b25d0e01f923375ee7d92dc6f"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b9/linux-x86_64/fy-NL/firefox-63.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b13/linux-x86_64/fy-NL/firefox-63.0b13.tar.bz2"; locale = "fy-NL"; arch = "linux-x86_64"; - sha512 = "a3e1453b0f6e4d3a9ea5989489c963bb45c7ae3f476353f77ef572cc98643cb517fcbde08d2b3051fd1bf9265ee34c52aac262d179ec28ee7819b71e3c8b0fa4"; + sha512 = "feac9d6a241186e8a5d995fc4fc959be09b7d8561b1d36fb885801fd061941d1a882de2d5aa81135f7bb63f9fc332b748486518d690c375162e3e987353c4e71"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b9/linux-x86_64/ga-IE/firefox-63.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b13/linux-x86_64/ga-IE/firefox-63.0b13.tar.bz2"; locale = "ga-IE"; arch = "linux-x86_64"; - sha512 = "313547aa3d90a90acde80c8a9c093b0c0cf5e12141562075c006432a5fb65839a7a1facf4b150ef9c91d6de787e5b1958db9e3239d392da5bbe467acfc5913a4"; + sha512 = "25a9d4d87eb083d48dee3ddca9ca70b8d1fa30262c002a41eaecf885343164345204d4a3588bff03fe0729b1b3de5352e3223f091fb37f8f490c987ceefd788e"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b9/linux-x86_64/gd/firefox-63.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b13/linux-x86_64/gd/firefox-63.0b13.tar.bz2"; locale = "gd"; arch = "linux-x86_64"; - sha512 = "c058b18deeec9949667e15e715fe0f71fe37db598f187fb6c5f9e112e06aa1fdc8cd1a16635d719ec107fd399848f5ff90dd2b39dcba15ca98daf3ebc4cc28ce"; + sha512 = "83cc9f13165bf0220c943ce0557ca58224ea9dc66cf054c7d68ef0879340989ff1ad90dbefa34cd1c4b82944c17403465b99c9c0fef3b7e4c944e4681560b71f"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b9/linux-x86_64/gl/firefox-63.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b13/linux-x86_64/gl/firefox-63.0b13.tar.bz2"; locale = "gl"; arch = "linux-x86_64"; - sha512 = "ba4780796f50b0ebfebb2249d372801837348a59d805ba1f918cdbb941eb0754ebf2f1ee6b04dc95e0fbb765fc70b1c06c65fe5e4f0f03c7c252b0b706d15794"; + sha512 = "b23daf5212d56b386c2fd080e9a56d1b19235b794a27b529c9bcb23984abe1464955bae5ab40f7d358b3ab7fa8ed2d68cb086c323b0d42ab672a8a646ebae8f6"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b9/linux-x86_64/gn/firefox-63.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b13/linux-x86_64/gn/firefox-63.0b13.tar.bz2"; locale = "gn"; arch = "linux-x86_64"; - sha512 = "56a7ef1f12e2dd65d6b474323ecea3e7e1a2828ea31cdfe91ab2e4457db84d55d207217d9aae927c3d0cc28791511c35bc6f9881825fce6bbae16a91f203559c"; + sha512 = "31e47a2402f48031b502dc40ea12350846c9915bde6ee7f11eccd4de1f427258f2a187c9b1469ed9d47689ec9953826362f4c7e6161651d175723a238db569ac"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b9/linux-x86_64/gu-IN/firefox-63.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b13/linux-x86_64/gu-IN/firefox-63.0b13.tar.bz2"; locale = "gu-IN"; arch = "linux-x86_64"; - sha512 = "e0e671642e03dd877763bd27e1a9f4e88df922676558bfb079d992d84752ac017edb6d641c7952120338625510923d684e8eb43e45ca80619ee77d08d974f655"; + sha512 = "8bc66f49f4ab7584128d3574760e16eca026701caab8aa3c28d4a3e9543dde25e6d8f4bb4216549cda80b89e5c39547205e94f11813af1920bb4488b465e8422"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b9/linux-x86_64/he/firefox-63.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b13/linux-x86_64/he/firefox-63.0b13.tar.bz2"; locale = "he"; arch = "linux-x86_64"; - sha512 = "4915c3f2848bb4967a23f8d6fcf4c21527187785c0e4e419770a4949f37901372635503c97a23a8876c76491977ba83cd4d090da09f6cd994b841073f571a84d"; + sha512 = "50e316c0acbfca298fc8d02ecc5561797d4557fdd0f2347ee9cb6547d9b4b78076ccc52b114df81479f96c0b122959da088703388f29597c1e802c27b080e09e"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b9/linux-x86_64/hi-IN/firefox-63.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b13/linux-x86_64/hi-IN/firefox-63.0b13.tar.bz2"; locale = "hi-IN"; arch = "linux-x86_64"; - sha512 = "269d92393fa1d11f55664439f320834dc61134a55be5470130726bb4a58e00c17ed187ec9ae1bb27001c9a5ffd9b17ec7fbedbc4383d9e03b6d9aac77babcfc2"; + sha512 = "193ae2c739c39d3933170a1a53aa9e987fed221be59d862a49f8ed916470a4009c46b222b5e92b02a362b07f3abfe85263cd0a7eebd6c45a8915dab2398bd702"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b9/linux-x86_64/hr/firefox-63.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b13/linux-x86_64/hr/firefox-63.0b13.tar.bz2"; locale = "hr"; arch = "linux-x86_64"; - sha512 = "f2b5082db9b8dae90a186bc6fc4f998e047e8b2925bafbc3fc4832f267116e482bdf25f022271d5a849989fdc37915d84d25b71af85427d29d5400c4fed0306f"; + sha512 = "da7ee45b5b8beba3476aea9949bed3bf22a71f03642855c3c67a32028f94c6ef709b8ab3fbc0b8a4dae7bc95fc977615e6aadf00f2f1002061ea69e327ac1e71"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b9/linux-x86_64/hsb/firefox-63.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b13/linux-x86_64/hsb/firefox-63.0b13.tar.bz2"; locale = "hsb"; arch = "linux-x86_64"; - sha512 = "dc43c58836f25f3df85c0afe6ed4040a18364081d933615823704b0ba2dfff87626cdcdea412eba8d1f09a3897306a52a3b76afc8414c16f66ec1ad3e01c268b"; + sha512 = "e8bc21952b7bf8a41598b7294546136089b21c4515b7a5101b1d2191f6b1d3bae082590b9c921d13c46a459fa2f67cfd3c37ba0b636f027f3e7a67685bfb5c75"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b9/linux-x86_64/hu/firefox-63.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b13/linux-x86_64/hu/firefox-63.0b13.tar.bz2"; locale = "hu"; arch = "linux-x86_64"; - sha512 = "5911ee66aa79fe78d01dca3da65dccffef2eeeeee8c52e1853cd29b097d65c0e552e0b90f6f1691d50ed5a9863857c70ead858f5695c0c76f19262d84e9a2668"; + sha512 = "3e73a62b810dcb521c7f5e477ba4a26c70c003c53f59c4ab9984a983df785a871eaaabef57a9873edc22c64ceb572a658c5d4ed4f53e4f02d2bf5a62d0032c5d"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b9/linux-x86_64/hy-AM/firefox-63.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b13/linux-x86_64/hy-AM/firefox-63.0b13.tar.bz2"; locale = "hy-AM"; arch = "linux-x86_64"; - sha512 = "b39d418a1fdaaab483d75cfca73a8224a769c266366d48d14e306fc2dda8de1a582cb8a51deb6427dc2c4acf5d411f22247f6bd128b87bc23fa1a43d24eda3a0"; + sha512 = "a10ccb8f7d38572ab16dd7ce4495633edbe66dfd668b05008cef4dc0a5dd01df7317d2795daec8f41f06ccca344673072ac1dbc7e56d77e5233577d9a73ce300"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b9/linux-x86_64/ia/firefox-63.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b13/linux-x86_64/ia/firefox-63.0b13.tar.bz2"; locale = "ia"; arch = "linux-x86_64"; - sha512 = "b1d186c332841942c33265e93c185ba51ceafdb5b22314f06d9ccdf21fc47efdd8d26124f53caa70b4c3f35035259150d39ea426eb5ba38bc2cc51f386ca15f8"; + sha512 = "9240f49fd6d3bc0531acb01f31c4777e911da1ac5bf86ff620d197037d8b814ef9df217e3e4c53152eac32f8504511257818433dc0da86fa2b83963501c37f4b"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b9/linux-x86_64/id/firefox-63.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b13/linux-x86_64/id/firefox-63.0b13.tar.bz2"; locale = "id"; arch = "linux-x86_64"; - sha512 = "a23bec75f62edd71c9a7c5d329d00763c4f2ef12008e724f7e2b59b0c02a1c913bd0c079c0868190a920619e7b715ce6b91499ccdb02c0f45fd5bbc9d845c10c"; + sha512 = "43556f5c0fda64eb3164ee62d4deb21e5cb6b32fce5820dace98c745b89a5edcb8881cdbbf7dac26f840145a3450f363ec0fdcde0cefa607f090e35fe4dd5c6f"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b9/linux-x86_64/is/firefox-63.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b13/linux-x86_64/is/firefox-63.0b13.tar.bz2"; locale = "is"; arch = "linux-x86_64"; - sha512 = "c16c9148f78f9e99c78a82500acea75cfe9ebba0a7e916f4840c9f734fef18184b03805e55556f20201f75d25ce59e8f78b780ccdf922936a26b46f556af5ec6"; + sha512 = "a1e3cc5ad9efd33e9053ce1c7495bdb6420dd71aa966cbc4a8ef74fb92993943f5afc6563f8863f6e2efb9f9fc13e56b92771ff209966d7f3b3b28b107686b55"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b9/linux-x86_64/it/firefox-63.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b13/linux-x86_64/it/firefox-63.0b13.tar.bz2"; locale = "it"; arch = "linux-x86_64"; - sha512 = "731112a159a8fab05733ba9945f06c2d278164ab73a83c09986146993e68caa591ed00e59dfbc6479f284f0aaa6171dfc4c4fde8656b11842483a7501062799a"; + sha512 = "74ad88540de11314be567d277bb4b8c015eefc6ca676d58ffd844aa7ac84fdc9e01c88c1eea16731bcf7e21b69a4d0a3c52a283c0b8a9c19746f9deb971f3502"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b9/linux-x86_64/ja/firefox-63.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b13/linux-x86_64/ja/firefox-63.0b13.tar.bz2"; locale = "ja"; arch = "linux-x86_64"; - sha512 = "3a1fa485a9fa134bb8892b410555a4dafe230fa818a14d9befe29c792ce43c1a92e4e1e4ecf33e7acd7861ede11469f5b4b74e465fbfc97943eaed904bf64396"; + sha512 = "d4be7496a7c051007e2c0766cc4efed5def3fca6ddb54db1aa17e4644323b7029cfc57deeb33f80ce0266fa129e303cfbd1eef7cb57565d7e2740c0f98dc23fd"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b9/linux-x86_64/ka/firefox-63.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b13/linux-x86_64/ka/firefox-63.0b13.tar.bz2"; locale = "ka"; arch = "linux-x86_64"; - sha512 = "ae6ddd192ea353b6b1b961976e8591db920b3355ab3c09988fa72d99415855254ba3e687261782d5eb35407a951f625efece356e1648a785963414f38460bf4e"; + sha512 = "8b5128e43d6bd626bc0ef52b7f6dc1625bff751fba00ba04dfb3e378274b578be4384dca22b37a2c01b70358b098ba8062f2228219cc3194d84bd7f3a5f8e39d"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b9/linux-x86_64/kab/firefox-63.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b13/linux-x86_64/kab/firefox-63.0b13.tar.bz2"; locale = "kab"; arch = "linux-x86_64"; - sha512 = "51d989032b7c5fa3f4103f6835dc13560b0bac0b3cc7085edb655f2fff45c45154816ef126fe16599e7ccc20bef1bb198a3f3466fe9b2ac05c178bc3867ef729"; + sha512 = "a6bbfa967cb96f167a595453ccd699f55ff2175366063fb69a28026498334901286e3a1527b36a0cfcdccdb5c7b22d6ab61e39979e261c206b51565b408625b6"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b9/linux-x86_64/kk/firefox-63.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b13/linux-x86_64/kk/firefox-63.0b13.tar.bz2"; locale = "kk"; arch = "linux-x86_64"; - sha512 = "38d5bfe52516213f4fd9952e9c458a27223d7d07456e451cee353fd22f5a6cd2f83b48a1911417dc62ed73b9e686d686bc292c3b78a365702498aa81fb6b65d8"; + sha512 = "bc1e4b1c2b4a9d098cac8ad7f227f1be756dde3c172d2867297862f1d86ac268d77a3d4ee1b4d685cb8f7fcf0f4ac5eeef6bdb41e802da1b5cbaacfd121c8285"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b9/linux-x86_64/km/firefox-63.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b13/linux-x86_64/km/firefox-63.0b13.tar.bz2"; locale = "km"; arch = "linux-x86_64"; - sha512 = "7abeca23f35464e9fcb88902bbda0eee9ab2b05e3a6e887b92a3383f21f82a45681e0fc5df365096eb340a43f79dcfdab91e2dec3c567cad7d5ee8cf1ab9f82a"; + sha512 = "6600bf27398ac41d447d3c73f03f61b3f631303ecbcd31106c9db824d805e24c0754e8da34a6befd30c72fbf6c4eb059b468924f26fa145bdb1444813b7fd895"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b9/linux-x86_64/kn/firefox-63.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b13/linux-x86_64/kn/firefox-63.0b13.tar.bz2"; locale = "kn"; arch = "linux-x86_64"; - sha512 = "10ea3bd4aba05b67916c43c6d28972b31b947843d23c37885869f8df2153ff426b3ecd9df652ba78b8e29f087ab9ecdd65e41e9d21088492e0ca193986508af9"; + sha512 = "7d10dfb714e62820f02ea51f453c6ef8671fc6feddae63354d73ab053e584151c32f6490421853f56f048d2540a4537f99e50ceaedefb8330e6d85f6d3a62c6b"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b9/linux-x86_64/ko/firefox-63.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b13/linux-x86_64/ko/firefox-63.0b13.tar.bz2"; locale = "ko"; arch = "linux-x86_64"; - sha512 = "7b43a7760e4cd6c8c40af2783dd9428cfaa1e10f05b1db03e843a06dff05043ef36ba4214b758477ea2a2834457ef73538ded0025749e4fec895afd1417437a2"; + sha512 = "6ddb53a1a2f7df7b7578e9c241f0c838ae5b29650fead195d8d2182f7ded0ad7827c938a59320553539b3b0fea4c6694e37b578e8c9733d38622123a46a17bbf"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b9/linux-x86_64/lij/firefox-63.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b13/linux-x86_64/lij/firefox-63.0b13.tar.bz2"; locale = "lij"; arch = "linux-x86_64"; - sha512 = "0718601664e8f656fe052e76b84d69e79d7939adf27dfad98b748b1d9ada0f8de75f8303da756812cf8bd66435f3ec6fe459581fc76b70719ba5ab40538e3454"; + sha512 = "dbea98459bc6a0aca38f47c48b72d22a102c7d544aa085d3ef12a8e290b56ea2ef11a95f4cffd9280c20601d85eae129ae31c48a607fad778bcc096165b3c585"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b9/linux-x86_64/lt/firefox-63.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b13/linux-x86_64/lt/firefox-63.0b13.tar.bz2"; locale = "lt"; arch = "linux-x86_64"; - sha512 = "ed823d71d94bfd796c0641a9c1f304e306f40ab3ae8748bd3953565f0017378dad18c27ae5390075aa20227fc69bbc6fdb25853381a97c1552fd8c2097fe561e"; + sha512 = "b1813a9cbb879019241e5cfc5439ad79f6bfbc141a8702b5c6ae58d0eddc34e7b9f5ed4428bed3b04d616d6a3b369b9ee56d1fb2458154edd27a4844c5a57fbe"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b9/linux-x86_64/lv/firefox-63.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b13/linux-x86_64/lv/firefox-63.0b13.tar.bz2"; locale = "lv"; arch = "linux-x86_64"; - sha512 = "6fd6e4abdc7d3af659907f427e3c1e05f5e0108a6bfebc64e1ba56fab83dd280a9a94a5f719d96129b72ab569d217ee3e5983822512264a11ea99e409e0b07ea"; + sha512 = "9a2d526c26eae72699bad13d7441589688bca84541e83f1fae4539934c973d86631eb055e48807c19f3f65cc34f3144605ed8ba0dffc1f951f7ad2da551b4cd9"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b9/linux-x86_64/mai/firefox-63.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b13/linux-x86_64/mai/firefox-63.0b13.tar.bz2"; locale = "mai"; arch = "linux-x86_64"; - sha512 = "8fbe293fc29acc1633f47667e2ec2aa4c9d17cbbdac8d7a5fe727c586a65818f7a9fe091c8ebe17515aa008a2848b82152ca49abdc5de6a5ecff2d0415e9b74c"; + sha512 = "24f5466284251416f1d54261f074a3e35cc44241b52774a2c0dbe56289cf4ec5bcedc530ae8db33df628265c41031d47ca84de9877d60236c33fd9b8e71c1d97"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b9/linux-x86_64/mk/firefox-63.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b13/linux-x86_64/mk/firefox-63.0b13.tar.bz2"; locale = "mk"; arch = "linux-x86_64"; - sha512 = "b0bd1aa305c38c493bf41daa6f385f87d2b8bea73fbdc2f20a6c84c5f1a90bc7cab464bad659a06eca87806acbae9fc702ae91c61e91519c8b7dd0b584ab792d"; + sha512 = "e1458a97cd0383e93804b7bf069285e18e797050891fac46e7e98dbfae9956e6a22dba38ba4514554a4134018317c2bd59d1fe7875419c3c5120410035db4888"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b9/linux-x86_64/ml/firefox-63.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b13/linux-x86_64/ml/firefox-63.0b13.tar.bz2"; locale = "ml"; arch = "linux-x86_64"; - sha512 = "cc43c32c3af0e6db3d4dfb2919b6de8bb1aecbab1566ad8cd9b5bf5df1b31e3307fd8cc2994f2496cea56f2c6f1089615ce963d1c81436d4a8b1392a9fed5026"; + sha512 = "07a71306ff1ebda998beedaf275f393c4aed96b12b1ed5f6c6d55d6c7f1fe8c65343be3d6924c61cc88c21e376c386ba2b837f1765261842a86a748dc672bb0a"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b9/linux-x86_64/mr/firefox-63.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b13/linux-x86_64/mr/firefox-63.0b13.tar.bz2"; locale = "mr"; arch = "linux-x86_64"; - sha512 = "dac2e8593b629b9821b3003e5005df1a4b1dfd5b5b806fbeec9b1293b8371d2adb4df0c87c1d895f084d679d7492f64d11e80f44cc22e436a10ffbc2cc4cac22"; + sha512 = "b9f9aa5acc722642ed4a27274d60ac054f06d43bd0bbb80c790c9d88afd25675dc8a2fd4d22f04b5085135916c383d5e4b6c612a821274d2bb7941b128d9c331"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b9/linux-x86_64/ms/firefox-63.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b13/linux-x86_64/ms/firefox-63.0b13.tar.bz2"; locale = "ms"; arch = "linux-x86_64"; - sha512 = "ef3005c1c7cfd935899d9051e57e1808b2f3af7902994979862c74e9ae1d2e84d97babb33d924a58507c7574756c76db8ed78b57fad9814a796d081a2c38981a"; + sha512 = "ad341798073be55ca24190ce3774ffc5e355c4db34fd17bdb5488449893826968ebc47591318f2a0fae9cd6319c6b529ca203cde4ca250790b451f3232740795"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b9/linux-x86_64/my/firefox-63.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b13/linux-x86_64/my/firefox-63.0b13.tar.bz2"; locale = "my"; arch = "linux-x86_64"; - sha512 = "ac397b34649079e06ca6180722943d9fda3ea4a34ecf051e94bc9264b919b9b535957a87fc0030f53d7c23b571473b232f62ff6bdb507612dc2206ce0445f0e1"; + sha512 = "d6b631660961d6027ec227a8352c2fb9ea97fd8345908fbc8b8273d29ebb3391af49e89efb8c060013c7ffdfa733e6b0319e6a37cd84907ddcbc441e8b689b63"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b9/linux-x86_64/nb-NO/firefox-63.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b13/linux-x86_64/nb-NO/firefox-63.0b13.tar.bz2"; locale = "nb-NO"; arch = "linux-x86_64"; - sha512 = "614b537e3d80b0f73f3e64f28be6b7d05f4733da559c051ee953de51ef6f00e86714ec5285c1ea0cab2c40abb438f60ebcd007bc37d3ad0b60c7b3a255cbea7b"; + sha512 = "f809901e3018d02236bb6d6fbfee3aaa98d3332887e83e0e9b94104e11eeb1066a7dd313d3924adec68afa962e89f71f56e164391a4d4b0502469f4146a040be"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b9/linux-x86_64/ne-NP/firefox-63.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b13/linux-x86_64/ne-NP/firefox-63.0b13.tar.bz2"; locale = "ne-NP"; arch = "linux-x86_64"; - sha512 = "c0d97e45e54d468cd8ee4deef0465886efbd9fb43a6995b3fc09e2fadc06587a425dc4b0a625997429ac154077d27ad27f91fb77669f8413ce2247d6df4579fa"; + sha512 = "860786fb3bb15792e5c6180fb1d2ad3a44f71ed71aae8d6e4c7799cb3daabd37378656672a3124759ab9c6b5d32793966992fc3de54c7a17de0066d09a3287bd"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b9/linux-x86_64/nl/firefox-63.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b13/linux-x86_64/nl/firefox-63.0b13.tar.bz2"; locale = "nl"; arch = "linux-x86_64"; - sha512 = "c21a9d73378ca0c5994780505a7bfa3221a714db25bb3a44fe981892457231382823cc032e3ce0f1f63819ddfd301ee3d0ac35c7bf8bc44af90ed6e73024491e"; + sha512 = "dca1ea920a191735011a44522166a2e46e023a7d61dc3e779954dccb9aae5a6c0af9e94221d150ce55351ba14c3de3de5c0beac65117e90ef5cce8107c39da45"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b9/linux-x86_64/nn-NO/firefox-63.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b13/linux-x86_64/nn-NO/firefox-63.0b13.tar.bz2"; locale = "nn-NO"; arch = "linux-x86_64"; - sha512 = "1c6765886b7f9808cc342bda04f624a676ac097b175be297238a70610404171b485472be3bb974b6d9fce8ff1113aaa9c9c631b338e98e1292e6573c4d8dece1"; + sha512 = "033ef00d2c1ea1e5459c0ce6c3f1cc5e0d136a88a7dac28a2dd9d90ad2e8d036769fbce1993463800bbc96236913cf37ffd0b5f2139ab65547288feabfecdbfc"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b9/linux-x86_64/oc/firefox-63.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b13/linux-x86_64/oc/firefox-63.0b13.tar.bz2"; locale = "oc"; arch = "linux-x86_64"; - sha512 = "0b212f54478321be6185724d9c72b8fdc15d46f52e80051e8fd9f6e853934ce425ab7ed07aef4d74bb73ad9165562a0204c79ffa2db277b9bac927fd1894007a"; + sha512 = "912da545e8fd176b269ab8d28407f00a4790136656b94c74fac4236636879c3fa4019490ddb2600bb897d58fc8171cbf7a2612dd9f8c98ab71c2b145d1a1ace0"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b9/linux-x86_64/or/firefox-63.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b13/linux-x86_64/or/firefox-63.0b13.tar.bz2"; locale = "or"; arch = "linux-x86_64"; - sha512 = "ddd916e8b5073263670c4474860f447c0eeea15ccf43474a2dbdcdbacac1d30db56e2ee8f95f0907bfd41fca3d3db55dd230e53b17f531138444b9e91d711afe"; + sha512 = "49a2a5403deaf9895f18eca6a1248ad6defaea47d95831f555d05c995c70c519b2bafec8db9273f25068924bc3c80cdcc0dc7eda592449af574fcdb93ec87e73"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b9/linux-x86_64/pa-IN/firefox-63.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b13/linux-x86_64/pa-IN/firefox-63.0b13.tar.bz2"; locale = "pa-IN"; arch = "linux-x86_64"; - sha512 = "d0db3905c6d3db720e108c36de4f442bdbb195ca35d9876c1658282630c1256359677183c22027fb2484435e232cc362c986a2b46edfb128c265f98f6cc899f8"; + sha512 = "2b91579e572e7d52e843c6303c5df04d34af0ab371b6cbba98c02c6fc41bb9e5d1a6e116cbbf2c91ed730fb5a19c308e825ac916785b1c447bde3d1d82c81f8f"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b9/linux-x86_64/pl/firefox-63.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b13/linux-x86_64/pl/firefox-63.0b13.tar.bz2"; locale = "pl"; arch = "linux-x86_64"; - sha512 = "fb20a5d61a31b8f119479912751b17e741258b651b682b7e47db131316d3ef8bb823d4d8b8df0ff24885093e28609bfb055d051f96caa4fea11934ac996907de"; + sha512 = "d5c5250644ff2815b532c129a55e1d7ffb10302f156c78d6d06be07959504c613deac8e12640ededf66f6e70e2a1e7f81a8513504753386fa83d8fa805a12ee9"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b9/linux-x86_64/pt-BR/firefox-63.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b13/linux-x86_64/pt-BR/firefox-63.0b13.tar.bz2"; locale = "pt-BR"; arch = "linux-x86_64"; - sha512 = "570153b3f9ef1213ef5f38d56da9e62e43607d5385eb63d35bce6884186b2e48d48cc0c4c1a1a66cf8270e4c4aac78e3d4caf88b338791f7ef7295465ad180fb"; + sha512 = "ee1304064ff6503433e4d6523727827f43b5ef8ce14a3a41f936d3c8f8f744594aa2749103c4f2d55687520d5e539795b77d5063e59b11f424729cadf49732df"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b9/linux-x86_64/pt-PT/firefox-63.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b13/linux-x86_64/pt-PT/firefox-63.0b13.tar.bz2"; locale = "pt-PT"; arch = "linux-x86_64"; - sha512 = "68ef51079373eb05f743ddcf5c1a574de69dca1d2f927b5479d72ba232f5c44544e7aa7a3b945dd592c60cca0768387080053bf121ca3c873f802e8b466960f2"; + sha512 = "a26f9aa7713589c072d92129533eaa50fe162ed60e862541915da40af2f79337bd0c49ea1589fa38c5742c7f684850ab986d4510557d203e25512437a81fb3b4"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b9/linux-x86_64/rm/firefox-63.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b13/linux-x86_64/rm/firefox-63.0b13.tar.bz2"; locale = "rm"; arch = "linux-x86_64"; - sha512 = "73251e69ad99ecac500f57b9b7edee0c892e633f01d2594cc972e95b525a9516551de124fcb906d72998c10b49861219830bed3bd5bc6b479a28672e0bbe4406"; + sha512 = "38dc7cef6558f4bd4625f628fa2d048064d94ee0b03d157ec0bcf5577bc1d481c15ce29a0b430a3c7126ff60a374e07bab45c2fb05610d4aa5e1a03aedf0d5b3"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b9/linux-x86_64/ro/firefox-63.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b13/linux-x86_64/ro/firefox-63.0b13.tar.bz2"; locale = "ro"; arch = "linux-x86_64"; - sha512 = "e68797f62737578f9a01ad51cbb462b89c056d1ea3fa426f96ce7bb248ecb15592fe3641b502f12ccf95c21b6ef38473bbbe0406e36990cd5af234b3c3879041"; + sha512 = "7dab5b2679ff891eeb8fb28b5828069b338d1e9c5d679168551556784f5962b71a7c848fc13edf92f736f3349c403fa0a86a485643b1e29a52070fcc9e575d9d"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b9/linux-x86_64/ru/firefox-63.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b13/linux-x86_64/ru/firefox-63.0b13.tar.bz2"; locale = "ru"; arch = "linux-x86_64"; - sha512 = "9261a4bf36400b1a4d4dc20abfe984e79ff10ade602cdf529d9995959a9dedf1ec78a00562b310b3e1cbd91869d89aee382f5760d07e1f32a4b3d9cd7328ef4a"; + sha512 = "853c0ad182add84b9eb2033b21b3f7421252dfcfde0bedc16380b159173b293f1d478a821480af7ccf7717532fc2566b2ce9426dd52fda9c8ad588685c2ff8d1"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b9/linux-x86_64/si/firefox-63.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b13/linux-x86_64/si/firefox-63.0b13.tar.bz2"; locale = "si"; arch = "linux-x86_64"; - sha512 = "d72b75c96695e8df4bad4dde1e91c3d3fa666ef0c40ed69b39c8b95c093f6127399203ed29bd36c02c99180a786a117af496201738c3a489b4bf2ba5f5fdde7c"; + sha512 = "dc0cd90a3a540be1abf132cdcd0491a1a58c17f0a32ec398699e2a9fe1e73751e16203310405c0c8f60477662778fc1fdc4e139073eb213232115f9cd0189d5d"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b9/linux-x86_64/sk/firefox-63.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b13/linux-x86_64/sk/firefox-63.0b13.tar.bz2"; locale = "sk"; arch = "linux-x86_64"; - sha512 = "3361539812c51898fa7890c90215a2b23544f27b13da5ce160f8a4ba28e4e1be097a7e4e94cb4c1311d9c4d307cea3007694f913f227d5669f1a5070d2962513"; + sha512 = "ab9521a26c9cf2794318095829150a49cc3b01e2c88e6e7c604c0a2f45aa0087b997560b1111486743a89d78f8df3d76048afd503f09a41fcd03ae715c6f5254"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b9/linux-x86_64/sl/firefox-63.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b13/linux-x86_64/sl/firefox-63.0b13.tar.bz2"; locale = "sl"; arch = "linux-x86_64"; - sha512 = "e2b2032653d45af1b201bb51c053b1eaad089316f4ac31da1df3b1effe925cb22c015e0928502377fb24e5c5d97fbd1db0f0cdba52dcf332e26f7ad7b4a4f79b"; + sha512 = "f1f5473848cdf05e1fc401254879e8591d2cc660ec5aa94ba64820d0423bbb85385f5be5db957cd4df5e2690557c9c85ab5795ca909fff2c3fd109be0f9e2f75"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b9/linux-x86_64/son/firefox-63.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b13/linux-x86_64/son/firefox-63.0b13.tar.bz2"; locale = "son"; arch = "linux-x86_64"; - sha512 = "fbe4f5d07d74179d018edd877fe4811bf78a25bb9a0b8e374f8bd0166557502aabad43586de363729f923ae6deb3f66b6b4e1de4547e137a059a8f2a08f390c6"; + sha512 = "f074e38aae351973fb4ce4fb3e97b0c07cb7f9766961f88d8c992c87670ea79437517ffc7562d6d36e40f30c717a3b36dc1da2d6e5ed59cdec5c20c5e84ac527"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b9/linux-x86_64/sq/firefox-63.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b13/linux-x86_64/sq/firefox-63.0b13.tar.bz2"; locale = "sq"; arch = "linux-x86_64"; - sha512 = "b7a30f7f943ace41ab1c099de12b2098f07d4bd88cb871bbe4550e2f7e4479e2e0c484b286f939a839af75054f10426515ec2686fec5830bc318c0d35083ea4d"; + sha512 = "7e27f79d7ae1d6861a5cc41c2a5c08bc9aa011017af214c443719e292c1e42bdd41f38fdba356ef2954822e47135c5ebf7af35efebdd4b0b6b6f89d1bd7195c1"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b9/linux-x86_64/sr/firefox-63.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b13/linux-x86_64/sr/firefox-63.0b13.tar.bz2"; locale = "sr"; arch = "linux-x86_64"; - sha512 = "562b516c767116da4f01cbdc1e463b9bc63838f7a3a03bdaf57f6c188805b5a1b0f1b82495fae43cd3989ec9b80bad4c0621e0fc78da0853449e99cb2e11e23b"; + sha512 = "84cbe8a1320a99048c0600f7b3078fb96b5fc7b350298d05647d36a9523ead178ee79b1a29c00dc814c9d225b70cf33f708ca6ca845c9316802a4ddeb6310d73"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b9/linux-x86_64/sv-SE/firefox-63.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b13/linux-x86_64/sv-SE/firefox-63.0b13.tar.bz2"; locale = "sv-SE"; arch = "linux-x86_64"; - sha512 = "10be9908b228df38c7ae420cf9c0c6b46371cf942f59a00cc77c1198c8870a85c28857dd09757015f8efb13df492b3d600bad720200e79b9c28e677d300f8bd8"; + sha512 = "8a28af04b02558556814dac039ea7bb16f06e4824d9f5536258286d0ad9abd6cd415ce3043aea3eb2be49a2deba54ef215093843ec78b5d145eebc70495a0df2"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b9/linux-x86_64/ta/firefox-63.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b13/linux-x86_64/ta/firefox-63.0b13.tar.bz2"; locale = "ta"; arch = "linux-x86_64"; - sha512 = "1a1cc424588cfc3556dbadd136ce28bd5e6b8879d623b6d7f6825bc154b3dce9b40267cf0536d35144c152a6726692a00240e9639dcce67981b65b2bc8c648e3"; + sha512 = "c1e46473b31c8f45eaa72f329e28654e214fcdafa7a4bdfa27aa7e4777901c5adf6249ca5dced05f4f027b68ec26a2427b3a577d43ee6d7683ddce304b357f48"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b9/linux-x86_64/te/firefox-63.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b13/linux-x86_64/te/firefox-63.0b13.tar.bz2"; locale = "te"; arch = "linux-x86_64"; - sha512 = "c53fd59378b8da7fa6256e1af62cefb214402d9c9ac022015ae8c628dce2e384a965a80d206ceb6f9e4ac113a2e491c9ff66c02e68a866b4606ebf1afd301e38"; + sha512 = "df5c5c2bb42027ec729b5eecb1efd82fe6c2703dc39b7cf412109e316b389aac77b0b302809b0f6e9a82ca718d4018745999a96bf6810c58922518a01081a088"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b9/linux-x86_64/th/firefox-63.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b13/linux-x86_64/th/firefox-63.0b13.tar.bz2"; locale = "th"; arch = "linux-x86_64"; - sha512 = "848c544742993d0b075489f324d2e8ac11d51fcf3001253e7a242098f02c0721c4ba7fc9d622d38495ae46fc7bcf98119d3dfc7d2ca0b7589a6f956f2e69c295"; + sha512 = "0f735b5e4b4e7081826bac7b9d85aa5cb2bffe805ceb5d396d48137869ca414f332677549aec4cb160390c1aa8d2103c7bd614b87fd065d8d80689e90b58f458"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b9/linux-x86_64/tr/firefox-63.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b13/linux-x86_64/tr/firefox-63.0b13.tar.bz2"; locale = "tr"; arch = "linux-x86_64"; - sha512 = "336ea26ef61234d1adaca4c4d4d0ac8c37b891bf8770072bc16828ba05de572b6e5b72e901360f24fceae1e1f933a13fae80e5957eac0b0145ac347227062de0"; + sha512 = "3646e8277d2adcfcadff557ac1537f30859e1bb8413e45deafa46d171341e0b0f8c250d500355104def1023d7f46886244acb5a90e3abc08aaba36530df3b12e"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b9/linux-x86_64/uk/firefox-63.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b13/linux-x86_64/uk/firefox-63.0b13.tar.bz2"; locale = "uk"; arch = "linux-x86_64"; - sha512 = "cfa0ed64bf0d6054fe8e6eb2d9edc7c6b6eb84ecac36f7e166c8fac6d26a78d70b21174f24df61c942d8bfca6a838db9206f00026eee5f6c8cfc6a4f36c8ce63"; + sha512 = "2f2e5a128e0032a966b520515f3954106d095510915add883d5b4996e99d80ecfd442379bd1070bc45f5424f7be757dcd3ad869274a638807457a4edf9794834"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b9/linux-x86_64/ur/firefox-63.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b13/linux-x86_64/ur/firefox-63.0b13.tar.bz2"; locale = "ur"; arch = "linux-x86_64"; - sha512 = "0b2520ea0a3feb87efd3b387ea22fc8bba9a62dc3d212d897d263b25954accb1869858f4d655ab82dba00d58deee38d984d547f7bb1d2715f723c8998626733d"; + sha512 = "cfd25e52b91a38769b440b0452ad99089c98f0c99c8d371ba54ab5930eeec5cee9a701c4df216e67b6d8dfafaa269286a70b9ad77b6f8ad45e687b1f5d44d6ba"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b9/linux-x86_64/uz/firefox-63.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b13/linux-x86_64/uz/firefox-63.0b13.tar.bz2"; locale = "uz"; arch = "linux-x86_64"; - sha512 = "ac628adb5a2362cf721a25af62e94ee98995d2d74b66d75463eab92e229d2614af5652dd5af8bf04f966d787bc91ce34d1d9654a2609da073ee69e0202694eae"; + sha512 = "9ea58c5fa76134916076bed9727afcb6f87935d9bef0631da0060c519c45fdb741c1f1d8df08b572c7848de378c23fc038dcfce446c10d9115c16d272aca89f9"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b9/linux-x86_64/vi/firefox-63.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b13/linux-x86_64/vi/firefox-63.0b13.tar.bz2"; locale = "vi"; arch = "linux-x86_64"; - sha512 = "fc0e815629c30b3d03e4700980d2c1894e8be6d6fe98e1d8d38d36c61c39e3030dd4f3ef7baef14ee68d8625da025f89367eb201be2f6feee2c6b7a09cb2caae"; + sha512 = "87db8282cce46499ec31ca67ec52ec6216f883dbcc725192d97209e59f59dfa29c2fc106c3dfbbaf04ba738feaa902ced14a23cd95ae0f09e58701cc276b7f2f"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b9/linux-x86_64/xh/firefox-63.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b13/linux-x86_64/xh/firefox-63.0b13.tar.bz2"; locale = "xh"; arch = "linux-x86_64"; - sha512 = "1652c92d67ef49d4b5e14e348647c21b9a7485d1f23d6e4b3251edd2505af95c60e7b9bc7d3d37f87a99f12bbb332a70ccc250f43ea7af8b03c76abfaea8a46d"; + sha512 = "fb42f2801b529f49c0deec9f8fe5705621fa63bac84ea302c8a0fb83ce76bcb288969a9dfa7e43d90193055fca006595d31689cd3404784dcefee76f1e5439c1"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b9/linux-x86_64/zh-CN/firefox-63.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b13/linux-x86_64/zh-CN/firefox-63.0b13.tar.bz2"; locale = "zh-CN"; arch = "linux-x86_64"; - sha512 = "3dc448c450274255f327cf7130273b9c220699c98c4af5cccd85f7e153674e9db6dfdcea4bc3ab2bdc3c1e5fe3eb848ffbf16ecc1673584b992380a0bf18f4a4"; + sha512 = "f3799097631b4f4515ab672abed8edd0aa5ea3168a55b40ed70d5d981bdd4a04810d07a2355c46c54c5eb80500fcf0a071bd22c5f1f7584b96c1e7c3917df0d1"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b9/linux-x86_64/zh-TW/firefox-63.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b13/linux-x86_64/zh-TW/firefox-63.0b13.tar.bz2"; locale = "zh-TW"; arch = "linux-x86_64"; - sha512 = "683b8dc78a420c11ad657bedb86959900be81ddc21e3fc45c22a2b0a17af62d7615761ed545d58ce0843d97191ac2ab0f5f080107a07f7c3ed765ff38a3f1d50"; + sha512 = "aca754e9f2517db05e9418687e039bcf3b990c3d484b138d7cfc103a57713193eadd50a361909467d2dc6d2c9cc93f11557ec48935fd5fb31e867436f2b4f171"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b9/linux-i686/ach/firefox-63.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b13/linux-i686/ach/firefox-63.0b13.tar.bz2"; locale = "ach"; arch = "linux-i686"; - sha512 = "1978ab44856b91b1d9691e492c86d0f3e6c676312c156c852e0c69764e4500da7c8ec6f77fc417df850e73e5577fbd260c4023712d6b5cf17df885a02460a7c3"; + sha512 = "689a076a45197afd8371b286422970446a2ab53be9440bb18fbf5787f177aac6eca4d2038247042da8377baf1694a576d0121deb5763db0f3a23ae72febd959d"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b9/linux-i686/af/firefox-63.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b13/linux-i686/af/firefox-63.0b13.tar.bz2"; locale = "af"; arch = "linux-i686"; - sha512 = "284183486d1715bfb89a41a92f195b73ab36a34ff01373c4559ff97473e9813aa8adccfeb1629142f947a817f750bf63222f19d77318fcd56a599cc2292ac7f4"; + sha512 = "2f1ec4e19ab51001c79b17b582f1d348eb8e40ba63c2ea4201df1d3cfca72dfaee7b141884674165c33596b295e16c91c26eba9d9808d6285adaeb767a4cb617"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b9/linux-i686/an/firefox-63.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b13/linux-i686/an/firefox-63.0b13.tar.bz2"; locale = "an"; arch = "linux-i686"; - sha512 = "e61a418db6e78d260a28b4baefdb6ad58f7c8ec8ba85d0f9da0ca1630ad7cb3d9e8dd6676b05f4791d029c57aef6fca9cddfa28fd55a1b762740591ceab187f4"; + sha512 = "0b0aa3f8edc3f49c93896e5485cc2223fdff4edb45a437cb0e8197a5779163ea3e660303fecda2a1f8306e7e385410ec5f8891cd7e41b21b0a619d8af9c1d9c2"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b9/linux-i686/ar/firefox-63.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b13/linux-i686/ar/firefox-63.0b13.tar.bz2"; locale = "ar"; arch = "linux-i686"; - sha512 = "7a61d7f58e4a776b1b63dd576af91ed71887cc0ca191f2799eeb160de55a7c2439bcf44335f4e343a7b7d66336c35ef07c27c49548cf7b18bc2643018c1d576f"; + sha512 = "d19ecb3f9f12a572f8a1bd125efa09f4947823b4ddcee12e8467176274cdb5677733935c2967e66d40012fe29c87123ba501c45d1594d0e1afd14460a824e56e"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b9/linux-i686/as/firefox-63.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b13/linux-i686/as/firefox-63.0b13.tar.bz2"; locale = "as"; arch = "linux-i686"; - sha512 = "0248abd063856e71cf1318b183f3cf9d34d4d59843411ce3119583d80dcc63628def6893a9610858b055a6ab93633f2c2b813a3f824c7bf5ac82e0d833ec83be"; + sha512 = "b481962d3d88fc7ea015a7514ab3a0ad4593eb587debbd3afd51485437bef7f5dd3a447ed0d3a57f1c500533bde9026b2185d2137127f159743d8adab8794b19"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b9/linux-i686/ast/firefox-63.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b13/linux-i686/ast/firefox-63.0b13.tar.bz2"; locale = "ast"; arch = "linux-i686"; - sha512 = "cc0bf69fdabc6f72c72b11b04f6bc1e72eb17e0b54f4e8890f343dd0de59d730132d53087b89f707803d5fcd6dc70f83c1f01a0462595068851ea5bdcf96f572"; + sha512 = "b08a438a6298aa4144e8798893f9df8ed25846c0fe5831018f6ecbacae7c84b23448f03a7fa16bc05866d92ee2606d7b43b1fc0ead6745c2491da286d99fb112"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b9/linux-i686/az/firefox-63.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b13/linux-i686/az/firefox-63.0b13.tar.bz2"; locale = "az"; arch = "linux-i686"; - sha512 = "6836c22daf3b0e3140cdaf595fcfffb364002c42c2b3b2374aec6a1f50a469bd20a0e27293402571f48dcf3703c944d8d0704f4b4229c7dbaea0c40a8b89ab6e"; + sha512 = "69ee1200a4fac5059e4d91e48e7921952e304fbcc4c560f6ab53f0c13fd57b5c5ec775a07926c01087878a80e7e15369e97062a7c5cfd8db2f47c15ef9da3e98"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b9/linux-i686/be/firefox-63.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b13/linux-i686/be/firefox-63.0b13.tar.bz2"; locale = "be"; arch = "linux-i686"; - sha512 = "dafd1bc57b1ea6f817a4705373d0dae4fdb5669887e96eba735e43c1aba1b6277ed08eedfb01372aba0dd0cd2b1bf10d5f75984e4dabc5dd8c1c26f07932b6f6"; + sha512 = "a0e909524a56e80f8cb75021390f7ad7ac035afeec5295b14d3cced450a0bddc223d677fe567d406aa7836ffd5768712b105c5e0db2ab14558a159d6aa359ca0"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b9/linux-i686/bg/firefox-63.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b13/linux-i686/bg/firefox-63.0b13.tar.bz2"; locale = "bg"; arch = "linux-i686"; - sha512 = "b6f23b0c4e2baf837881f9fc183f19ecd83daba1190cb828ba1442ac5db3bbb2d1555a52bcc8fa48564614943ab7e6f0b81e9a5d6784874b45b08727fc4be04e"; + sha512 = "070cd6775ec08a6c77b92ff9f8c4b2a0439a4326121e47d1afa15db3445aa15e992be465179ddaf0e907455cf3891bd236c0a9e65b13696cf158166a5d6e5ef3"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b9/linux-i686/bn-BD/firefox-63.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b13/linux-i686/bn-BD/firefox-63.0b13.tar.bz2"; locale = "bn-BD"; arch = "linux-i686"; - sha512 = "5f1cbe0e96422c73e5dd9552886324a256a9fc33e8f8bf8111a4533bd45ac799e4b25d63ab9d8a0e93a302aa39fcc1300fbc33453e7efde8e24798ab1ed92853"; + sha512 = "fc27567c007d42d038ae699ab4175e32068f144645eb7f087807aabe5305b5f33c8991f9a4fb43f3489bf3c5245eef29b363a744d595e6517d2f8a72a0074927"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b9/linux-i686/bn-IN/firefox-63.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b13/linux-i686/bn-IN/firefox-63.0b13.tar.bz2"; locale = "bn-IN"; arch = "linux-i686"; - sha512 = "1e01547c8454e376d78bf9ed3c5ded5d85e38bf6e7bf05bdcb984a0c978a4790d61dc6357156ab5d3999cc3d8ebf8d418fe18c03de1b2bb1772b914a37bb55fc"; + sha512 = "115651b2c72497b05d92b745edc27851a00054865b930c87448267c1427db6c65178a337387daa2fbbb826c687d8940a08d9cabeb4faecb902f08898b6239934"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b9/linux-i686/br/firefox-63.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b13/linux-i686/br/firefox-63.0b13.tar.bz2"; locale = "br"; arch = "linux-i686"; - sha512 = "49f78074d8078b81adf03a371841777f72842727365cb05b0e6f04fe478778972592540071599f14c2e760342831bd9fa0b1d1d6e18f1a5fcb766fd83e20a871"; + sha512 = "2072f3b12787d799c378cd727f168807ee6a20b79f42988d08bda2b990c19b227caa57e5c996337489d000e682a53a0d6e7cb33a8f3c6270e32741c414d7ed49"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b9/linux-i686/bs/firefox-63.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b13/linux-i686/bs/firefox-63.0b13.tar.bz2"; locale = "bs"; arch = "linux-i686"; - sha512 = "03540ca42b87073455d7a16645d4af9843d25de86a00ede526531de920c7112191aef16097551b497c6f086baa7d92000acf6e396a544f5933f879a87e23fd57"; + sha512 = "ddf09c431e74d6bfab7a49a10fde28b20a24f732315a7bda9295d035bcf4cf2c3d049f2a66dba7f9abe9f66fc64bf99549bed2abb7e5a0ac1ba1a9c77457b707"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b9/linux-i686/ca/firefox-63.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b13/linux-i686/ca/firefox-63.0b13.tar.bz2"; locale = "ca"; arch = "linux-i686"; - sha512 = "db81d8ef8d676271e1a9c756bd9e55957aa65759649c211a69b7ffb5648cf641da30cf5068cd0b16ea197f7454738bd17ae7d73a419503b4e0f6f7dccbbfc71b"; + sha512 = "cfd3f91f39b499f3a0125da9c952d68a8e815492b6597535017f824722f25eddd3a8b92817f546ffb4236d2984128d9b179366361f917c5d3e46b8da25da91ab"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b9/linux-i686/cak/firefox-63.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b13/linux-i686/cak/firefox-63.0b13.tar.bz2"; locale = "cak"; arch = "linux-i686"; - sha512 = "974f9894e248c89d4f772a090250f0d5697224746860990d692eb2b75d86b6c98bf64f1fadb7208ce6a1f57f5cdd8e2ff91c9301fb77bf2a21ca3bc9bf24776f"; + sha512 = "d077b44d7dd813a7d17ede21273d7e56bef8378b76ccf73f36f3fa7611186f7d63d266736f59f59301d0fdf26b6063b366ba7e6f1caea16407d3b1d20fc323b0"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b9/linux-i686/cs/firefox-63.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b13/linux-i686/cs/firefox-63.0b13.tar.bz2"; locale = "cs"; arch = "linux-i686"; - sha512 = "ae5d3e44196348cf1690dc0723565214f9f72ef7e045185ef0fa65f9a58bff9340dbe989306287b1462291e01d5dfc64e71296d7340517a455d7081619739368"; + sha512 = "66454a7c5055e1550eed48d2ec70c4d921db524d449392a9edbe6e42ea111ab1152b225de3095e9ccb3922e3327eaa3180d01105cd4e9fd7634471472fc18fb1"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b9/linux-i686/cy/firefox-63.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b13/linux-i686/cy/firefox-63.0b13.tar.bz2"; locale = "cy"; arch = "linux-i686"; - sha512 = "2ed50ea85102a7e201ec7618289af29b079a4dd568178310aab3c41738183c22b90d34cac4763d28bbfdbdc92078078a99a18893b3edf7a513d7ffdde5dfdd28"; + sha512 = "9c1d3ed7acc8ecdcb9f10d5a3af3ee2cde1331a7fd6c9a4f6f97c26289722c96a8cafc2580b0608a8c7226d5b211d4eee137deb45f1cab9df5c1fe9462ff5062"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b9/linux-i686/da/firefox-63.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b13/linux-i686/da/firefox-63.0b13.tar.bz2"; locale = "da"; arch = "linux-i686"; - sha512 = "cd9ea4ec76ca7b8e391d8565536b3da9ac5c9406788f60307a6c4179da6947f01bffb593b9cb2ff988128c0926fdf92f0a4a6a747e593a436b8afdb984a85421"; + sha512 = "5bf78b9b0dff6f4ddce433703549602fb73d98d2dd9b9720acd4fd9c023cda6bb52a92bac16d57ea339e0ffa56b4ce3eb831ffa0974940a12ca72dc250c5de6f"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b9/linux-i686/de/firefox-63.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b13/linux-i686/de/firefox-63.0b13.tar.bz2"; locale = "de"; arch = "linux-i686"; - sha512 = "4ab7b30c9c74c111fc229ea109b892335c1c453ba5d119c3e1a481a1168990702c277acc9ffd22350b2f4a657a2786dcc77275a86e2c6372b0931dfe92d6c06a"; + sha512 = "78ca04e9dae5d05ce20db93f33b312469e6e3da1b936e43daf60d0e7eadd76eefb64a1f171fab674f688accc347d464284c410d81e9a5a407d9fcbb407031bf7"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b9/linux-i686/dsb/firefox-63.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b13/linux-i686/dsb/firefox-63.0b13.tar.bz2"; locale = "dsb"; arch = "linux-i686"; - sha512 = "34a8104bf029558dccdbee73b40f357afec438768a45aad870e455305a07b6eaf25aa57a67b3e8cef72362e1c17239097c9cedd0093f3ad58e120860c9cbf6fa"; + sha512 = "b3569c4d4be9fe8dee22b1a3667807b89f2526a0477ac6f99886c2b8e687598eb799328589d951f6ebc1de6b05a3c2493037575d324f322bf39acff24b645c26"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b9/linux-i686/el/firefox-63.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b13/linux-i686/el/firefox-63.0b13.tar.bz2"; locale = "el"; arch = "linux-i686"; - sha512 = "f13cb383aa609cf5c8b997c52324f4c8f345697f12c489e6a8eae076a3c56327e00315c30942c2454623804b6889ab529ce988d83dcb940905d98dd38f0d056e"; + sha512 = "024f90c38265badd689fba3950b18da9834f03bc0a754910115f34e3bfc232d9728073c058891c592c4292e4148e8459f3515caa1a05acaa1ed2c9dc709e1b48"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b9/linux-i686/en-CA/firefox-63.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b13/linux-i686/en-CA/firefox-63.0b13.tar.bz2"; locale = "en-CA"; arch = "linux-i686"; - sha512 = "72c97423432457f299428f43657d257008585fd31eb4006bb8ed20077563d0e708f16c3331f88224f5780bd039cbef2a7c894bb1fa965cce98047698bf2abc90"; + sha512 = "0317e9d27964f9c9c1b7fd5df85bafdf553703bc493f6f67a52bdf9f893d560b6b5c0479624599d3756ddbbb66a86fe9b88577353b1f01c3cb1c0be4425847ea"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b9/linux-i686/en-GB/firefox-63.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b13/linux-i686/en-GB/firefox-63.0b13.tar.bz2"; locale = "en-GB"; arch = "linux-i686"; - sha512 = "199ce1699b93774f7e206167f694415cbce6e7321607cd7f680798c391ac4eb58159962b36cdbf4e6e5928b6b9d1dfe926880651c764742aa2b10c7ad6981d8b"; + sha512 = "a700f4708e585afcef5c84a6c2a2e4d13c87c82d897f1403e9ffd7da62ba6938d8260d6ca65a3d97a4be927085a85e07fdde2cfe0fbeae7d0775fe5e875a69f9"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b9/linux-i686/en-US/firefox-63.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b13/linux-i686/en-US/firefox-63.0b13.tar.bz2"; locale = "en-US"; arch = "linux-i686"; - sha512 = "01ee82125f77c4a3dc25dc86dec4cb2e37a07a4d24afe811b5a8efa8c6ade58eb9e7a75ea34e58673b11f367dcf15838af775c39f4aad6bc39d8c86385bb7c1d"; + sha512 = "46e4b65651202497bc01e49eda6a3e39196023c83d7c7407dd2a3cabb11cd954f7d2e1056ea0ed032f8eab52dfe9aeb3398f77f6aecc6be377053d4cd7ebe852"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b9/linux-i686/en-ZA/firefox-63.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b13/linux-i686/en-ZA/firefox-63.0b13.tar.bz2"; locale = "en-ZA"; arch = "linux-i686"; - sha512 = "5023173aa1c6ef8bb3c8872fba37edac66330543a688c17b43e4bfd45f08379b6309994a5dc9be98dc1766905d91865f026f9027644c906d170130b3a920f07f"; + sha512 = "535e2d45789b7486060d00d03fa5dd6d33fb650bfd00344306e1c237d4a4c68cf30176f39b6ecc1cb1f211186dc53d749421a8b72f8b9a0e68261f447bfbc09d"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b9/linux-i686/eo/firefox-63.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b13/linux-i686/eo/firefox-63.0b13.tar.bz2"; locale = "eo"; arch = "linux-i686"; - sha512 = "c570a2b74dc4185d2175db8047ddc7e979593b094893fe92254861ac9f714c76a872e18926d6c73a5be26b6f6593e56e647c7561e432349c0ab7175fff41d7a2"; + sha512 = "24c179f95f5475ca9923792808139693c8cfbbcd46e8ce94b7fe5a17e51b7ff26fd4e5acee41e65b2a73c06801768246d21ddf65d0324d56a77df78ad21cbf90"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b9/linux-i686/es-AR/firefox-63.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b13/linux-i686/es-AR/firefox-63.0b13.tar.bz2"; locale = "es-AR"; arch = "linux-i686"; - sha512 = "bc6adc9c6ab971d3af9eaad370792feb18c162a43e9361de437fe90a55ef304b1c7ac0275267e722d6d7f9a4ede37a2539bab60a551ce7bf2ebc0040e9a5ec8c"; + sha512 = "dd950166b500e45181dc09b76e01651c360b9bc350768125ab963e328d249d6769a8237628bbd4d0ece0a9e1b7c782a59e9a5e0b515a26eef7b2ff906a59e98e"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b9/linux-i686/es-CL/firefox-63.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b13/linux-i686/es-CL/firefox-63.0b13.tar.bz2"; locale = "es-CL"; arch = "linux-i686"; - sha512 = "99044eb8bb8d799ae6045c37cb6a12016e885ee5c9d2a893d4d653d34579fb1403078d484389623b22f1532ea33ae1b29e3532366f9fdc6ec1228b68cbb9dd12"; + sha512 = "9f68c9746c951259ab156c6e326c62de4bd8db3b0497a5128e3024f2e640f54f1d11495d6a8ff5940e7dd9acdd6f3f0125b85326149f994dce08c96a19deb69c"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b9/linux-i686/es-ES/firefox-63.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b13/linux-i686/es-ES/firefox-63.0b13.tar.bz2"; locale = "es-ES"; arch = "linux-i686"; - sha512 = "c5638fac25f3715a4f7389f32b2d9e8f22e5a356e02e2ee94116080951c451c85245834c8b55fa9df95f0848a0b54eb8f68f57936e69bcf5210932c782fd621f"; + sha512 = "f63b6011aca761312eb5e5c468844b0bde291b0e1ad67a8ad7a0c020ea2e7f2ad43565998ed49f4c618656e9ad5d04d6324f9d22c1ee45bc6af6a560dc863e4a"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b9/linux-i686/es-MX/firefox-63.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b13/linux-i686/es-MX/firefox-63.0b13.tar.bz2"; locale = "es-MX"; arch = "linux-i686"; - sha512 = "9a329cc370a2e7dbf1b76bf185f1b118e33b20b349bda8e8419797aef87db8881b4161d790f03c51b06020929a8b85bd6539fed4f8aa9838e98f4f6710321aaf"; + sha512 = "6640a1c96477906749457aa9670559c44327b25cb6526534cdd7be70c84b6687819b0ff433aaa37ce13a7f9895c2899797a3f4e4982969a1869ac1788a1b4bb4"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b9/linux-i686/et/firefox-63.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b13/linux-i686/et/firefox-63.0b13.tar.bz2"; locale = "et"; arch = "linux-i686"; - sha512 = "f09f4e49dac39d91ea7b146122f3d99b034de486ae6339b8fadaabf1bf87eedf297503475cdf559d69a14c205841ddc2f75c0f961b9a8913f16bc14dd7593274"; + sha512 = "622842075565b7708bd4c1e06b49a8e15a5a52c768cd8dad0fa6744b1295269c38f5547cb061d4c9096a0309251c29f388b0670d7a773276c232f7124a455b38"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b9/linux-i686/eu/firefox-63.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b13/linux-i686/eu/firefox-63.0b13.tar.bz2"; locale = "eu"; arch = "linux-i686"; - sha512 = "871e683e51d619e19189b8f0341ffe6e14d14c058e0b4ab973f804ddecad9c1e3c8dd7730a3da884392aaaeae99022196af27641facc1a8fd25052f516c56c22"; + sha512 = "328840563121cdaa39918ab443b1946e3b6e39a7a1866ce95daaef9f12fe46f8aa18ba4394515ad72eb7ef332cdbcf0b893fd4095368c0ca949039b31f335f80"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b9/linux-i686/fa/firefox-63.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b13/linux-i686/fa/firefox-63.0b13.tar.bz2"; locale = "fa"; arch = "linux-i686"; - sha512 = "7e0d7651ebcf03f40cd9cf5faec8a404fd028a213575c644f2b2640cb00fee06a029ada21aa17ca9f24f22b7aa73767390e635f169fbdfca8d162dd914bb19cf"; + sha512 = "8d9081a75b7543c2e1c25c67d41cbebedd914f7f21eb1fc970241031120345adc7851305f57ae341b8ae7f7119712dd6a1cd9f6bc9d44d6f7cac5fc6a9591b3c"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b9/linux-i686/ff/firefox-63.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b13/linux-i686/ff/firefox-63.0b13.tar.bz2"; locale = "ff"; arch = "linux-i686"; - sha512 = "fbb8c2fc1d6e589fbc42a1efe33af0aa129b2a435e33c8cc7dcabf2dfae917403c2f0d9cf62e2045ed2350ba72d07ccb92ef46842a6d34a5def928386222560f"; + sha512 = "c53f07a1bb521ea5f3a3084fa6899c5fc81693bb51ba51d848c9581dabd108c769d0793e72aad7c03b7d017cc75ac084910f2d114f9e2c23e967f731eff85118"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b9/linux-i686/fi/firefox-63.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b13/linux-i686/fi/firefox-63.0b13.tar.bz2"; locale = "fi"; arch = "linux-i686"; - sha512 = "e2639d8060552ff688bc0961b19da279ea8563143f8dade844f906218a3816427562b895d30e4732c96c39fec81cecee6d39f572823e3f4890a680f0b8acc61f"; + sha512 = "4c08f8034ee0319f2e0eb75c4bf72620b793601c08fe7bc196bdd99e2d054bb1bda7cf65633546af0d91fdb857ec451f003040d38b6de999293cbfd35d76ecb7"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b9/linux-i686/fr/firefox-63.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b13/linux-i686/fr/firefox-63.0b13.tar.bz2"; locale = "fr"; arch = "linux-i686"; - sha512 = "1da0564312f8a180d5d793e1a782519331ad78bdd7a44dd361b15c8230520127c69b52667f0bf670038d9b5b25426522e7fbab20bc2fabf0fb9fccfcefeea442"; + sha512 = "b4d96844c39cf9ab5ea348adcbea6777446791c39d2832373881e22625a60c72f5261f04e36c44955c7069a9b94cfa46caa719c6495035708328d41cf07c5d10"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b9/linux-i686/fy-NL/firefox-63.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b13/linux-i686/fy-NL/firefox-63.0b13.tar.bz2"; locale = "fy-NL"; arch = "linux-i686"; - sha512 = "cd9e14f1469f2c0530d36b5d29e26efb93b38fdf45b29775fea481a305c3a4a12c8cd6b016ec5796e2fcf3a9901348214ede9aecb62cd101022287c415c7d370"; + sha512 = "08995d67415319ce82a49b80099669714bfcd1e54a8e2590d38c1ecdd1707eca03a4b885ee608d28881609ba3ac1e1ae8f0a3460588ee713c0c9faf60d01ce50"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b9/linux-i686/ga-IE/firefox-63.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b13/linux-i686/ga-IE/firefox-63.0b13.tar.bz2"; locale = "ga-IE"; arch = "linux-i686"; - sha512 = "dfcdaad90a50cd80337e3015b060e554de815b31b4075bb0738bdcd88a373a88ec9a308497c4f7b6ac031101abd700f9a796f52e10b071c7bf4cd2832f2b0d2b"; + sha512 = "a53f8909fb0e778d821404fc6566a8a5e0e13c46190777900abcbeb86648275272f37a94afbe4c83e4438f4f4f3949b945824e3d8c16734fb444bbcd2354e4f9"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b9/linux-i686/gd/firefox-63.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b13/linux-i686/gd/firefox-63.0b13.tar.bz2"; locale = "gd"; arch = "linux-i686"; - sha512 = "8fcf87ad0c1d85d5be1fd81ef4d3f17c93060d29c6ce889a2c96a53f3ca78a55777ff2c709c4500c643dde6b7c468fa27a5e0b71e677b5ccfc90291eca6d6744"; + sha512 = "a6e9ba4cd2a0c2f032b1f88e0e5966bfc04520ba63606f640386216719ad1c900dc3978e0cc858659912dd89140d26641157b32d5daf7fa0c35dfe2d826dd9ab"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b9/linux-i686/gl/firefox-63.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b13/linux-i686/gl/firefox-63.0b13.tar.bz2"; locale = "gl"; arch = "linux-i686"; - sha512 = "76aa9c700f00b86575cc81e3a7c0bf485e819c3cff7765ad7ae28b3089afa7adf2ea7c4afdbdfa36e29c57257c74a467d9225cbe524217c525c91e4f43c28892"; + sha512 = "0f902f3bf54dd76fb6fa5c0622e2ad51b85adc5cdfe4a1baede2cbba66b71856dc1c306d5ef85b49fc3222b52a210a0ac7f54796fe60329e9859d618bc4a200b"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b9/linux-i686/gn/firefox-63.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b13/linux-i686/gn/firefox-63.0b13.tar.bz2"; locale = "gn"; arch = "linux-i686"; - sha512 = "01775737dafdbf6d0da9da6c20aae3ea631e59db156aed56bf2423cfd344e7cf7dd4c4ab409e0d98c2f2e3188b6b27f2228d18bac02d4a3570fb0095aff460dd"; + sha512 = "63f9c95a8b8eab315cb2a531a6573cfac53eabacabebec97d2869fd8ce07b753ab633f4ef7ced7d92784d5682dc87dc40492df78ff37a0f45326668422fe62f4"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b9/linux-i686/gu-IN/firefox-63.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b13/linux-i686/gu-IN/firefox-63.0b13.tar.bz2"; locale = "gu-IN"; arch = "linux-i686"; - sha512 = "4d57c9cf63031533db0f731c6087802ebc33aaff64f6520244b82c6b2e5b26c84c5721483405fb36e85c87b00780f5c849ca9b8627f44e57e2e0de82890928ae"; + sha512 = "28b79ef84f412f747cc03f8b5622fe8eba7bb5834da6a95ef376348a95cb5d146bbcc1597425f61f898f40fba70a79fa8e0c3e03716addf0e9fb33b523f014c2"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b9/linux-i686/he/firefox-63.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b13/linux-i686/he/firefox-63.0b13.tar.bz2"; locale = "he"; arch = "linux-i686"; - sha512 = "f99e1e067fab39e8c7a63a55535fa1a8157b501ccdfd8a45274d5c5e34e9c2817c6ef6a77692619bf7d744af99c484a62dcdcee066103711fd430f41a9b0c1d8"; + sha512 = "65a49ad024813a51692466b4cfa62ac13a53615d4b16e423d6eec0424bfd7c151c07b66c177c348bf2127eb1c623c979658a524085af8938e18e9f353462cf47"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b9/linux-i686/hi-IN/firefox-63.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b13/linux-i686/hi-IN/firefox-63.0b13.tar.bz2"; locale = "hi-IN"; arch = "linux-i686"; - sha512 = "b9e6f5d952178667662225f6ea47e392eeb2fad54d3acd96f7d51074cf30565e8cf9fa549a77c83ef6812bd540ae41a1c4bd51ac9bf70abc40c310b6f7e6348b"; + sha512 = "495fb3e61076679cc5d57da9d542ef80c039d91be15e09a5dc37a26ed48cac1b05b36ff5c91dfb6d912debadec67a0a9914f81796bbf63b07153c47d27536475"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b9/linux-i686/hr/firefox-63.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b13/linux-i686/hr/firefox-63.0b13.tar.bz2"; locale = "hr"; arch = "linux-i686"; - sha512 = "c7b4ffcdbab0ee56d77f9ce59c8525cc91f99aef6aa0fd5015468ff69cf3817ee9ef98c79b8fc868275ed1dfb24e0cb8f6594eeb0e7231d0594c5169b39d60ce"; + sha512 = "826e7c4b0b56a0d1d766e0f2eaff0a5b4329ad4d0e01d715d3a50b61cc26aa07042b7ad1d1ea3098a439ebde266fb919e6acdfaaa521ce9a7f3a09640f3419f2"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b9/linux-i686/hsb/firefox-63.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b13/linux-i686/hsb/firefox-63.0b13.tar.bz2"; locale = "hsb"; arch = "linux-i686"; - sha512 = "002bad3e119386e3c62850e8b6e145e8242538da2367ee83d383a7c47ddc002101c2f4a1d3a775819059f83fb0f94ec041348d0440849ff6677672b01be5fff3"; + sha512 = "816bd4044bc536dde81789303aea5b26d494535e82e330bf189fa42a7a41f6a89a82525680db5551f6906457772a4b3616a349b1a730bd1fc63b9f16869aa59d"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b9/linux-i686/hu/firefox-63.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b13/linux-i686/hu/firefox-63.0b13.tar.bz2"; locale = "hu"; arch = "linux-i686"; - sha512 = "4ee79e8f4eefbbe29762537f117e7aae5d67a7ae2052eeb73ac19fa4119d2e4a344777aa6a4f2c449e9cc9bf247041b4085d39b76c568d7aa87bcfea6654e26c"; + sha512 = "1570c8cf2792b39f4e56e7bcc48bcee3e383a7918b908e56dae302a086d3866527de61d75e3e277b3a52de0200d68d4e8cf43303f2837562be23de79f64baae0"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b9/linux-i686/hy-AM/firefox-63.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b13/linux-i686/hy-AM/firefox-63.0b13.tar.bz2"; locale = "hy-AM"; arch = "linux-i686"; - sha512 = "4818076c75e28bfee746cdfc9ade97c3dbf05b987f7c1053e7c1e5f40d9b90345cce4e5cd3497520d7c87a827de6e61bd32f2b3cbad61da040e98e7433aa5044"; + sha512 = "0343efa60301b2fb79f2c34cc04c7aced7b96fc9eb3c2bbd1cd843704c97188b016fb276ad4b1c80623271ae6b610c1177c971c30189d5e6f42b3cc941697eff"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b9/linux-i686/ia/firefox-63.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b13/linux-i686/ia/firefox-63.0b13.tar.bz2"; locale = "ia"; arch = "linux-i686"; - sha512 = "96f7768946a349d3ece7dbc71ef1abe53bab26ed34bc63b5371e9dfd667ef168d778edb6fae873e0a378c96677455d547267ed38bd186daa0ca9d6008f7abb19"; + sha512 = "963e565dd8e2e96f60b83031532260cf464960528655bb69ff7c554f503b6e635162692c7ad91d9fade88e69fa88c3c7d758db15160b805f9b68356dd7b9f3ba"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b9/linux-i686/id/firefox-63.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b13/linux-i686/id/firefox-63.0b13.tar.bz2"; locale = "id"; arch = "linux-i686"; - sha512 = "eeeccee3c1a8c8a21d320d23c6fcdcb95d0cfea3ae6c6501e33caacd18a161725e72f848fffbb7c192600e0e4f3ad047dcdefebee22574f34c59386df87971a6"; + sha512 = "63ce005570a8917dc75025249962c68919d3335bd4d9568148be138c51be477383a23a2ee790774cb1426e6a4b8fe4b7057219a11d8dff27e1a88d6106e61ba4"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b9/linux-i686/is/firefox-63.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b13/linux-i686/is/firefox-63.0b13.tar.bz2"; locale = "is"; arch = "linux-i686"; - sha512 = "ed625feb72929469734be42ad6eff565e2f4fba5a73d0e7c0b6616ee642630d090ed48bc622367b6ad9bd2c13a8e1ae940e87bd546ac63d266863123d8363dba"; + sha512 = "49a219ca5427b8a7553d0b2a490afb6e4e82012cd6f6917735eeac9ae43a38b150ae568300dcae864a228a80f8c8184c76aaba9092b7dd51a617859a700b4be3"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b9/linux-i686/it/firefox-63.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b13/linux-i686/it/firefox-63.0b13.tar.bz2"; locale = "it"; arch = "linux-i686"; - sha512 = "7af81f8bfa22f021e6e820d51b007da961de995dca36faada43414578ed205a274b2120b7821aebc4e70533a3af53b74322b4183df86e447b317aaf53c08a7ee"; + sha512 = "dace66b729e7800834271b5dab8a7bf0e12f1d1ed52a4ab4fff5a74f3ee16318d60ed199902f67bed92c541da0e3c92cb1407d5520aeff7b3bcd2f4d0f71e840"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b9/linux-i686/ja/firefox-63.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b13/linux-i686/ja/firefox-63.0b13.tar.bz2"; locale = "ja"; arch = "linux-i686"; - sha512 = "a25ec6be34de7f80bedb83b0311c3df564fb46d8521e367ca85135ff66dc8f67fe38f8a0a2dc50fdb74db3c0c93fcf5355e80cb8fef83be1ec88d4bbe3a63155"; + sha512 = "5ac65b01efd765eded53d94f1e97614045cdb350efab9dd576d5aef88e9acd0625437fecda35516726cbf4c47dab96061ce50e04d260a848ca31cb18ec8176c5"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b9/linux-i686/ka/firefox-63.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b13/linux-i686/ka/firefox-63.0b13.tar.bz2"; locale = "ka"; arch = "linux-i686"; - sha512 = "94dea7384f702ee9f4991bbd1732f93d610e83d451124bb598891f1f1a36c72e2a3da5681584e3b27e71e7c4fda4980a09be23bcfdfa0fb83389300bb231bc16"; + sha512 = "00da1a788dd8887b2ae2e512a56b3ff05ef7b564f2abc6661fa9b5ba2928a49645aeef4a53978120207dd6d361a3133765c414f6868d2543511f173e96f615d5"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b9/linux-i686/kab/firefox-63.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b13/linux-i686/kab/firefox-63.0b13.tar.bz2"; locale = "kab"; arch = "linux-i686"; - sha512 = "3b20e653a7f70939402486ab7daefbacb91fc074acd28b718e914dfd1596e33431119f28c1caa318f911a4006dc6f7c51259fb962ef9113cf8df83fc4cbe6377"; + sha512 = "ccdc2f88de9fbdd87fa639993a5f241bfd3afa68e36923d8f04ed7b70e30c44aa4a7969b402e839f535c3cbf202b89d287364dc5124b08db01fe3a03f4fa21ca"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b9/linux-i686/kk/firefox-63.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b13/linux-i686/kk/firefox-63.0b13.tar.bz2"; locale = "kk"; arch = "linux-i686"; - sha512 = "6db1a0d8dd25f6199e50035830314e3a9bea1168b441ea2708b62c6b8fe673b146926d92e55a9c7d4d0c07da74d1c8aaf3a4216a117d18d4b217f67bc082da4b"; + sha512 = "105e96a68895ed65a7e32155f248daf03c7389a3eeab42ffc2ac9bdd82122f0f8257ac2bdba4d0a60c6591db18564850c0615cccd6a7cedfe42f51938b9c5b64"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b9/linux-i686/km/firefox-63.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b13/linux-i686/km/firefox-63.0b13.tar.bz2"; locale = "km"; arch = "linux-i686"; - sha512 = "3595148a4b24d85ccb4e8e7ea4d0591a278d4e0b43fdd91504757e01fe51cc163e7866760ccf00be621dcb07321290de22a85710ff8cc5afeb11a21b67704ac3"; + sha512 = "234b65b2c053be05846845219bb3c7e2fbe74b5e0062f361a7d5d0d27a9f14d9235b88e0af734587035597baadb1933c2e762c75436325c362de0e0377d1d0de"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b9/linux-i686/kn/firefox-63.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b13/linux-i686/kn/firefox-63.0b13.tar.bz2"; locale = "kn"; arch = "linux-i686"; - sha512 = "5bf194dfc1ad7d7a48d1a29735f88c2aa86fc79aace1159bc6fb2c6b11d088402dc9477d80075b8913699f9e02e651882a1d24d2996770ca9ec1835fb0bb73a7"; + sha512 = "763a405e942190c5314b44ace507e6d019a875e8252bc25af1ec0294265e9729fcf1d3732b22e74c3327b6fb4599f58d97599a1d46eb8762a49136fac23a57a6"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b9/linux-i686/ko/firefox-63.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b13/linux-i686/ko/firefox-63.0b13.tar.bz2"; locale = "ko"; arch = "linux-i686"; - sha512 = "3b9bf762ed356fbca85a9e9742258484ab6edae9cae6667c64cf8572b07ed3cf83e090b30932d3beb542ffdd9906e609ed51c79906115ce7be0fd2e8cd7dbcda"; + sha512 = "076c5b2fe53b32a63238ef2c61026e9fae925725da7fc75e117edb48b4df91f2cc7b7730b82695ca7689f460518218e9a7ff32484dad63931f9d45eb6990a9cb"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b9/linux-i686/lij/firefox-63.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b13/linux-i686/lij/firefox-63.0b13.tar.bz2"; locale = "lij"; arch = "linux-i686"; - sha512 = "7a3552c80157ca05eec6cb018af0ced148b2cca2f8f713ef71c37ebf64c778eb881eb7dee7daa86a788ea542fe62f45080dac05259aec30070dfa79994422974"; + sha512 = "a1d756abb22516279e5473642abb1922feae9ee5604127a47f298850f620ff610ad4e0e3785ec386e28d3bc94e2dd7f09a070f40d7e3de910471b7bc694ecc75"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b9/linux-i686/lt/firefox-63.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b13/linux-i686/lt/firefox-63.0b13.tar.bz2"; locale = "lt"; arch = "linux-i686"; - sha512 = "030f0d0756b3f259079539cb4ef0f1268526970e636f27540bd72647a5acb25d73d0a35f9efb4d3ef8120990ad2fa5ea1a0c5faabfab4b8a50eb670ab1f04d1a"; + sha512 = "9566c7bda61b662d371c11d899daa67a6110bb0202aee4fa7c32398a7238d0a3453f5c0b9c5f20b5b7c6d225c16883220b0739e06ab42ac5c7dae53a581e29c0"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b9/linux-i686/lv/firefox-63.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b13/linux-i686/lv/firefox-63.0b13.tar.bz2"; locale = "lv"; arch = "linux-i686"; - sha512 = "508b40d3251cdf63f36f46e632a798ebe796c8288ba91549ff94dad8a8105946df1379881c4d4a66f82d54e027356889a9b7e684fe924ee956a777d00ca8124f"; + sha512 = "e31862b260634f32fbc61a75bbdc550ee4310d7d53a1f3e810cc5c9a8c8b64b00b6dcf53c229219988b88e44e832d5d197ae544685b79eccd34c3f5fbb40036b"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b9/linux-i686/mai/firefox-63.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b13/linux-i686/mai/firefox-63.0b13.tar.bz2"; locale = "mai"; arch = "linux-i686"; - sha512 = "1d1747277d8e8bd4643abdd261c77bf799997470ef0d6af8c55733e59f3ae7324a05bb8bb831846a6d7da3644c6cce39d83fe39935f459b1b01c3ddb8aa3af91"; + sha512 = "c347401f25574a5fc7dac814e61c2699b53ead432eaa48001df4c83184e1f609a34e7c6843a1d03c60756bed7176fc05bce0fd56c3b4586d2543c31f7e0fb809"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b9/linux-i686/mk/firefox-63.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b13/linux-i686/mk/firefox-63.0b13.tar.bz2"; locale = "mk"; arch = "linux-i686"; - sha512 = "0270f0b638fd7371b6dd302ab02bb8bbbe55a445c50ad6c62676d6ad61564b40e72ca1ee2e4b84427b8b50fa5874eba657da7bc8c316aee997164a86eb36e65e"; + sha512 = "c50615219573dbf30b60349e85138dc788fab5e162524b0fa5b78f0fd69060dc910e7c7960061f016d13e3c8880ce801c7fcb69a5da5f634567d5460f2bb2ce9"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b9/linux-i686/ml/firefox-63.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b13/linux-i686/ml/firefox-63.0b13.tar.bz2"; locale = "ml"; arch = "linux-i686"; - sha512 = "99f7eba79ccb6fa69113fc30689c599a1d2b66795eed8fdc7c3b49733b42948eda051b5d178d3d07bcb8d7d37f065ca5115a2c0807c39209adcf294890f64c13"; + sha512 = "a879ffa00eeac859a2bd265aeb44971afd0119c43ef81552d1dfc477465e0d0b947b9acad7bbe6bc4cfac3c7405c5635cc181fa3bd393d3d4d7891fbd78cc29c"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b9/linux-i686/mr/firefox-63.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b13/linux-i686/mr/firefox-63.0b13.tar.bz2"; locale = "mr"; arch = "linux-i686"; - sha512 = "c377e0c9f1390a31ee7390bc0272b669115a796c5fcce2effb34e0e5b2cd342b59e20465b56da30de2e35265930684dcdc122bbe16a0b28f54d23665f3ca463c"; + sha512 = "0ab05a8aba2ba9b3faf6cdf764db59d7e85593ac13cf4be1981d18a6bfdd0817bb411210ea3810d6c59c1046a76c8e4147f67647da4f047175b71aa5cb1b7ab1"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b9/linux-i686/ms/firefox-63.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b13/linux-i686/ms/firefox-63.0b13.tar.bz2"; locale = "ms"; arch = "linux-i686"; - sha512 = "d1102ecfb52eb0dcc1036774c7f2d3cbdce75fc893521ac2283772a956ccbf97bf84e5a70de5ec2610dd97ead87af76a217d27b3bc01ab111be989b377c22143"; + sha512 = "6669fdb2e0a73f295220327248e954ab0c80c762766535ab63cd1d1625de55439865632b7b9243fcc2663abd7acb83833dcc0cd8afed5aee0393fca7142a68e3"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b9/linux-i686/my/firefox-63.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b13/linux-i686/my/firefox-63.0b13.tar.bz2"; locale = "my"; arch = "linux-i686"; - sha512 = "60c35a0475fc8ea7f377fb9ed958f85ad0d844b8b68234b52bb75ecf4165ee8fec6adc715bdb3862012307e8497c15a594a83cb9812f11f00b81dfe1f5f1e67a"; + sha512 = "d2a48eebdec336da92588a7bbc318844058b8735e229a0059dcabbed16b47b2887dc042bea37ad1ea6be95ee55356a1093ea5b077289de8b0c9e5c14c199dd65"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b9/linux-i686/nb-NO/firefox-63.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b13/linux-i686/nb-NO/firefox-63.0b13.tar.bz2"; locale = "nb-NO"; arch = "linux-i686"; - sha512 = "c177111dbe0696f772801fbc0cb015ba6ad4cf3e2fea1e060d14e69ea08a68714e8dabbfd67ceb7a2d228aadd6dbebdfaa97db0aff3816fd60672be909e7e1cf"; + sha512 = "28febae6395caae9156f5e4168ed030767a6daf259bb96d3779a35da58d0a72e96b5530c57cd8d0570c4eec3d142772839f14d52a542418f2ca52db2b1641895"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b9/linux-i686/ne-NP/firefox-63.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b13/linux-i686/ne-NP/firefox-63.0b13.tar.bz2"; locale = "ne-NP"; arch = "linux-i686"; - sha512 = "9fd64628bca69b9571a66d0dff0d86111be76a9b1f33221883081864f44f4f8d33d470012cba7dde3c215384e4b6813ea23d7389360ff14843d28d884ab23389"; + sha512 = "519617b868bca07510faaa8e21bd705718d3ac23aeebaf4a4513e0346597662dd2cc5f6480a71ae1c93d9399b61f908d2090ea7c5ed5e0a30beb3efa2e4d143b"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b9/linux-i686/nl/firefox-63.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b13/linux-i686/nl/firefox-63.0b13.tar.bz2"; locale = "nl"; arch = "linux-i686"; - sha512 = "302e61504fbe381ab40fdd5a8ffdc62a8051dc331106109392bd1872ea46ab736f19ac075f9f6f3eac93fe09b512f5fb84ca18a2013d54a672f1caf43ad8e095"; + sha512 = "20a19189579d2e45be4659a77bee320a62fd6df2b48a8ecfc273f507674c3ce495b56cc4a1d22b0c923e2759475f7e25eaf363f361c729abcca0906d5faaf87f"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b9/linux-i686/nn-NO/firefox-63.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b13/linux-i686/nn-NO/firefox-63.0b13.tar.bz2"; locale = "nn-NO"; arch = "linux-i686"; - sha512 = "b0bb001ca13024cad21cd97502a48381fa92dcd6f5a83dbdce1efbc28b23abeb3e84812b650187d22f775d8729c492b7a8a17987c1905e8ee827643e06a3d0d0"; + sha512 = "7efa4e6a168e6cfd2de234d3868d02083d88dd4928d721481dc57605bedc7d947b3aa097935291d6c18ba0898baeea8f325830ed6588c0b90408588fc2956d98"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b9/linux-i686/oc/firefox-63.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b13/linux-i686/oc/firefox-63.0b13.tar.bz2"; locale = "oc"; arch = "linux-i686"; - sha512 = "e5f1eabce231b3ebba8102e6f13665ea34b38e1aeb8ac02e249d4c62a1ef65a8182bea28d51ea606ceb2493b9a8e8ae3e510dc92cecfd37713cb5dee8dc52c90"; + sha512 = "216c24840bdac20d43c992d2347b4301d13f72d4425292ac30c9f8414d5cfd991830c5dca09db829c16882dc3ee62a7e389eb0c0d202cf4a01b6ad1cfcdbf7b2"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b9/linux-i686/or/firefox-63.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b13/linux-i686/or/firefox-63.0b13.tar.bz2"; locale = "or"; arch = "linux-i686"; - sha512 = "f55315d533e28e998cdda05bc91a9d26895f7d69be151732a50715928e63d14017e191628b564ddf005708c459354ea999aaca34771ea27598cbe5a9b238f21e"; + sha512 = "17c770c27d32ef8cf4f5255240b8d307f8c483d299b0d9d97a40f18accfa11788efee1e210055711e7c892ac7c03c14fa5ee0e6f4cff399f89ca37f8a56bdbb1"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b9/linux-i686/pa-IN/firefox-63.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b13/linux-i686/pa-IN/firefox-63.0b13.tar.bz2"; locale = "pa-IN"; arch = "linux-i686"; - sha512 = "fa07e94f5b7550bf25e2cb21059d1b0a6ede77dead1fb6403fce47b23da91722ee1a022ba564c7e11dbe2ea2ff30c782c77b461b3bb4e5ad348a55582e7d4349"; + sha512 = "665b931bf1bf79e356fc29c5bfcec44ceceb6fb9a462148fcce3f6edb711a21043e9b5e9043321188238dfe9aa0d92955aadd1a28e080917f571e5ec02dd1c49"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b9/linux-i686/pl/firefox-63.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b13/linux-i686/pl/firefox-63.0b13.tar.bz2"; locale = "pl"; arch = "linux-i686"; - sha512 = "55834f3b4f5ec07b91fdddd7397a9214f96a85a24172fdcfb18e01eea3e3c5108505af8bd172a53eccd9f00ec218e8b46fd0e178d3ece960ed7448e9a5eb79c7"; + sha512 = "2331674e5dbadcaab35991f7863493957ff054c008917200d33f8c1770f3db33ce9373965d48ef230ef45f1ba43c8de798d3a60f1c77ba2da2281fc16c352ba1"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b9/linux-i686/pt-BR/firefox-63.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b13/linux-i686/pt-BR/firefox-63.0b13.tar.bz2"; locale = "pt-BR"; arch = "linux-i686"; - sha512 = "d4d3278f06d991fd63e400e3cbea799e721edf62de6241cc712ecdd61997e23b15dfd23197c8ea3602149af6a9ef6aa9245511ea0d4bb00591797f7d68e568e9"; + sha512 = "e0f487145013ed40f0708a44d90ad78e859472e48f2f77153065d04fe7b06ad2b862624092ce822fc8f20bab9c55dab4d70a0070d8a64c130104d41d821edf88"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b9/linux-i686/pt-PT/firefox-63.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b13/linux-i686/pt-PT/firefox-63.0b13.tar.bz2"; locale = "pt-PT"; arch = "linux-i686"; - sha512 = "317f290c2eb4a7c0aed978f927cbd1292843c38a9bf4a9ea16cfbc3a4bc1f452079a6439d4578712ce2d04ee5cb46e8e17a50ae5950b2d036bc91d746bf47a7a"; + sha512 = "2426bb2da07fc96e7083c1d52f1cf593503b9f07372484075170f1b9591caaa5dad8a7b74b573cf09eee4e76bccedb367f427fac98470cb31b12fff7efcc95a8"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b9/linux-i686/rm/firefox-63.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b13/linux-i686/rm/firefox-63.0b13.tar.bz2"; locale = "rm"; arch = "linux-i686"; - sha512 = "b0826babdc742bf6365c33aa7f7be7b15c15ead4fe5aa2acecabe35e53edaabd1d31d02b57a3be83104a4fb14cab6f344c7b67a12c5ea234e75d2075358036e4"; + sha512 = "587d112fd2da7c05a482804aeabcac701414eb1d48092b9d3020a3658a5bfa5de3e8314879eaf7fc59321a54b79b820f34c54d342395469d8324e6f677ada9b0"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b9/linux-i686/ro/firefox-63.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b13/linux-i686/ro/firefox-63.0b13.tar.bz2"; locale = "ro"; arch = "linux-i686"; - sha512 = "36915aba5be63ee3f5b6a46bf835cef732bfb41c105b3b0e7bc2c72c7abc359c014398948365be75a133d3dcb1fc69288dc44da01426395bab0b8616c51078b4"; + sha512 = "9e08891a07b5a3d2e1043f0713383124ddac0e7266e1dd6f3218f5d3c90bab787d00b1e1bc2dde01cf5f777734931708d601133392f87452156444c25dbe7d5e"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b9/linux-i686/ru/firefox-63.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b13/linux-i686/ru/firefox-63.0b13.tar.bz2"; locale = "ru"; arch = "linux-i686"; - sha512 = "c43c79f415ae5ec5ffac83db60e0c7f4f4b9f39dff51d78e79a4ef3df60ccee8328aff22a8543aa58067e6418124ccc39152de6a024c58df45e01e3cd75c7ac6"; + sha512 = "d1dea1d65f29301048e185b5cf5845b8ce32bfe8c6bcb2a1be571a505e9755b5bcbce507c30054ddf021700f460e1f5e3cbef65c463727866b3962cc4e6e5dac"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b9/linux-i686/si/firefox-63.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b13/linux-i686/si/firefox-63.0b13.tar.bz2"; locale = "si"; arch = "linux-i686"; - sha512 = "55dc14dcbbb9ac2369d1cefdac04e0433c371ddc660978793ba44f2bf8b982c13644da7c6ddc0d2bffc6068f51233caae8b28afaa0d979eaf318be81d80d4e9f"; + sha512 = "d0f30cc64b7300c437d581c367006f5ddd9a3fba453f9e1d86928d77da6fc104467c090c6dd4d5c897f3d9324812efdd09f8e8c9fd8561f6e066c8218ae486f6"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b9/linux-i686/sk/firefox-63.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b13/linux-i686/sk/firefox-63.0b13.tar.bz2"; locale = "sk"; arch = "linux-i686"; - sha512 = "884fe79157630df26eddf10193d09bc929c14af774599beff9fb34a965c713da961cc45e0acd6f9a66df5b2763a6a4db7e7e361fcec8d486fd18b607e3e5c145"; + sha512 = "a001ab086a7ff80a429c133871c3257ac29e0ddfe0ad480f1f7e06c095aaae5c7637b0a40b6712ffc5d51eff12aa77a8cb7e734ab2ebc35c7ac8f3e3e07275ca"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b9/linux-i686/sl/firefox-63.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b13/linux-i686/sl/firefox-63.0b13.tar.bz2"; locale = "sl"; arch = "linux-i686"; - sha512 = "606145426e3ca2c361de129290d8968c77fc099d8afecf6e22ea771533912d8f60fb0da9ac60302f19bac7979f840be6365c8a7459d067ec6f68a9dd29ae611b"; + sha512 = "a3bdf74b5d7e9e5b0f3934a6c9b11c336ed99b34727e32c9263e31106dfc77bbf9cd0e11b2289f6a94261d6f6ec641e5f8b1e22dee0b2aad1e220d7dd1f0860d"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b9/linux-i686/son/firefox-63.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b13/linux-i686/son/firefox-63.0b13.tar.bz2"; locale = "son"; arch = "linux-i686"; - sha512 = "13c2b730ba38adb35d69bea2315179517892663e9aa7d31d41812496e691f37b3fb52dbd0a99cbe56af705fac0b9b51c6a9d96c1769f4aa6d6f6cbc174b223ca"; + sha512 = "3eb55a9e6f0bde7d236357ed19db896a7999409d07995997e7b464083c730ab3fd21c80f92f61babeff03520b209aec06a55c6f5764ec858de9402e4f436c848"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b9/linux-i686/sq/firefox-63.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b13/linux-i686/sq/firefox-63.0b13.tar.bz2"; locale = "sq"; arch = "linux-i686"; - sha512 = "9ffb352754822966685dbe85a42e5f083ead0f3d38b8bc6181f624b561a60390ac968064987a593e96f5a74c01f9b7815cd58c5759f295b85d99dfd54312821d"; + sha512 = "24b5dde86cfba7463556572772fd142d1610a66776d6e021307484ae8087285c1a578c4e6849668fa345292acc889efad22bb1243418406c6b28d7768f94e4d4"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b9/linux-i686/sr/firefox-63.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b13/linux-i686/sr/firefox-63.0b13.tar.bz2"; locale = "sr"; arch = "linux-i686"; - sha512 = "333d38a1a0fca834e7c68dffbe78173a1751461f30f0eeb642aba6936cd09bcf0f5b6fefa5eff23e34126fcdd40b7acf28d68eb3da3400a70c245332c8175f23"; + sha512 = "863f5ca12705d5ce5c75ee4da9951bc4f8d232596857ed6354ad29c5e28e15b7e610a6c282b8607145c37be6f365cfc8e0ebe2f8ce9a8410b39f44a4b6f30985"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b9/linux-i686/sv-SE/firefox-63.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b13/linux-i686/sv-SE/firefox-63.0b13.tar.bz2"; locale = "sv-SE"; arch = "linux-i686"; - sha512 = "888eb9dd0d673815f7cf87be600341d0fb42b92f92b4c39cccefd8bf48b666b542b679bf9d7c87957e39c9c235b8bd80b510fe56e0b449e2bfec301e9f10ae8e"; + sha512 = "a1179cf0010cb1d8f84e06292c932ea1b6d91b7278ced351e920b752e6105e6bce8d2792640c382ccd4a495fd4f58cadbb5dd5d35e8bd90a791050b05b8e975a"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b9/linux-i686/ta/firefox-63.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b13/linux-i686/ta/firefox-63.0b13.tar.bz2"; locale = "ta"; arch = "linux-i686"; - sha512 = "7d237b92a23ba67d016f94aa1f2a5b65425adb9d9a7ecdbb8090fad4edf200cf8ccbd512998914c4d36ca53edb144b138f838685f0c6f757fb8f3b3abdcde969"; + sha512 = "f46dee416a015612f973577a77ccd151bec500ebd52d05467a8e8ced85dd698edab13d2d38ee2bfcd16ebda7c2970c7f2eb22726bb06c355965216da32acfbda"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b9/linux-i686/te/firefox-63.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b13/linux-i686/te/firefox-63.0b13.tar.bz2"; locale = "te"; arch = "linux-i686"; - sha512 = "4aea0a2f2d0563f054fa59ad024efb4fb01f23bcfae74a3984222a584125aa7fe8d88729049f9c748e679fa9dab9cea10e3f6072e7bb8d65d3d9313234206985"; + sha512 = "303b4a892479f8ae8d0628e58522929fc184d7179733b38fe45f154cdff14ff1e9675bfd6a16e1d1975ce8787b930f6ac1794390d2c4ef1a9009927735d37ab5"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b9/linux-i686/th/firefox-63.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b13/linux-i686/th/firefox-63.0b13.tar.bz2"; locale = "th"; arch = "linux-i686"; - sha512 = "172b2d4d91d145d05fb45a9ef4415d5c31335f464a35adf7a29325e8eb97e6720908ec6cf962935945bc8f01dc18b052ede28c779f276bffe4fe497e73026ab6"; + sha512 = "e9ceb65512d95c6d3e8d5fc77f428e7047fed84664be1ce77376d4e8e73ac31c23c8b2008bd73d87f3dc463708bce6631be885e23385790ee35b9d32cab69164"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b9/linux-i686/tr/firefox-63.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b13/linux-i686/tr/firefox-63.0b13.tar.bz2"; locale = "tr"; arch = "linux-i686"; - sha512 = "d69bb024bad2d27498fda94cd878014e8dbfcfa436c89b1a8fcbed5968ddc33f2680887547abfb5867c8e47acd926a907e4b7fd3a4fbe91d583de3cae200a90c"; + sha512 = "2996a1f32dac40cb2e327cdbf89b8b28b13e210c5d7a4fc4d8e9ab13f8d6e6a29992f240e9791d7fc7d1bafa8fe86a905ea216fc1c14eacf4649ba9f95f8601a"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b9/linux-i686/uk/firefox-63.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b13/linux-i686/uk/firefox-63.0b13.tar.bz2"; locale = "uk"; arch = "linux-i686"; - sha512 = "db35d4c9fdf59644b39b16604dbe61def9142b4799ea22e0ce9ad1855a8c4fdfaf06d0db83aca92de8b57e368b6f4933da61d5b9a1b992fadbc1db3a59eeed08"; + sha512 = "30514c8de52e33a021c94261fce16a9e7606cd511a1fb492cb817d4f57d2230fa6ff94317112fce230b8e4a4b3fb7db17961c4080c55269c398bcfdca036357f"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b9/linux-i686/ur/firefox-63.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b13/linux-i686/ur/firefox-63.0b13.tar.bz2"; locale = "ur"; arch = "linux-i686"; - sha512 = "adc59c274967e05de777b591e6e85a65bb8c8fc62d03abb0a5f0f59be33d128bc45ffc731f4ef68cdec743e1def5bb1a49932ff68095716c866c1a039f9c6c8c"; + sha512 = "60460b758f82d306494c601a6fa708ae203ff712bd4a14128114ffb90bed91fcfd482dd43556841871c0a352e92abaaf8c75cc24d3b79022f5847d17c2341083"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b9/linux-i686/uz/firefox-63.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b13/linux-i686/uz/firefox-63.0b13.tar.bz2"; locale = "uz"; arch = "linux-i686"; - sha512 = "9bcfe72ded0b8ac3e153a41c3440306c6696035af5a288e912b8a946c13431881f53e8a59a242df4f73bf83b5fa6cc9de75fbd0f1ea469eb51b959c54be22a8f"; + sha512 = "cd5e6c09f778dafa923ddbf01f24e1143f1c8719b2af5d2a4a697ce9dc6998a2893d7019762f1c87c80a190ffb42469e27eade981bf3d35f0e3428421fda2645"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b9/linux-i686/vi/firefox-63.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b13/linux-i686/vi/firefox-63.0b13.tar.bz2"; locale = "vi"; arch = "linux-i686"; - sha512 = "eb580260af95438e0d6e3eec37846f684ce61c12c09a0c563e66ae43d30a9f9cbc4c2c36b9830691d94f2d86ddce0a70b2996b82a9a9b14bbe00f87cac145b00"; + sha512 = "ff892cc4b533aabb1821ded5d2157a594c7e0581ce59cab600c4d083d563aacc7c67ba58ac2133bccf31997a81e649eab87417485d7c9de1f93b3846df4df8f4"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b9/linux-i686/xh/firefox-63.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b13/linux-i686/xh/firefox-63.0b13.tar.bz2"; locale = "xh"; arch = "linux-i686"; - sha512 = "8f794848b9d1da7b4dc90fe91b53d16b572153a6f8cecbbb92fc0ebce468982cdac339938a4c74d629e85f65edc6c2697ab9a671b6fe9f3396c81a6503aaf967"; + sha512 = "db3786087ea3aed24f04b4fdc94717260fae98c288f0df17cc753df572b092b25bcbbe08de765f76b84ac9e7f1d39bcbcc2cbb1372b3c76775cf2a55f45cc32f"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b9/linux-i686/zh-CN/firefox-63.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b13/linux-i686/zh-CN/firefox-63.0b13.tar.bz2"; locale = "zh-CN"; arch = "linux-i686"; - sha512 = "7cc3f84221270f495f1eab5a6bdb6e3d968edde0586bf6260b7a474ad2e6b9c0de737a0cebaa6c7a312fb5a26490336194915b4715d1e9939381e39e1f73476c"; + sha512 = "f803c7b7b593b66baf6995ca9e2ac51613b668b878c26bfb1280ec4263e4ca1e4300bf4abf41b327b90736d78be0a823431a7e3c0c121347cd13d88ecf12da97"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b9/linux-i686/zh-TW/firefox-63.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b13/linux-i686/zh-TW/firefox-63.0b13.tar.bz2"; locale = "zh-TW"; arch = "linux-i686"; - sha512 = "93961413dcd0cb6343e5b65793a7528e4001af511d04cf28d5f869b1fa838113a2904ad27d3e7bda0589d87ae0cf69eaea69e4d126df8c103a3a981f36a9d9eb"; + sha512 = "27836c549263ec7ed275a9a65a3707e8b04f2cd6ce87fe29c796ecd6639a4dd95749157004e370876df058da3d452804633bbe34517dab186a54b964ab655181"; } ]; } diff --git a/pkgs/applications/networking/google-drive-ocamlfuse/default.nix b/pkgs/applications/networking/google-drive-ocamlfuse/default.nix index ff099a909c75..abf67a3b0ac0 100644 --- a/pkgs/applications/networking/google-drive-ocamlfuse/default.nix +++ b/pkgs/applications/networking/google-drive-ocamlfuse/default.nix @@ -3,13 +3,13 @@ stdenv.mkDerivation rec { name = "google-drive-ocamlfuse-${version}"; - version = "0.6.25"; + version = "0.7.0"; src = fetchFromGitHub { owner = "astrada"; repo = "google-drive-ocamlfuse"; rev = "v${version}"; - sha256 = "1rjm2jcc93sz7l25zbgqal81534vvvbmwy7847s0k8fkr5nq97gp"; + sha256 = "14r2y5blvid0640ixd0b4agpcfgkan5j9qdv3g0cn2q6ik39lfyl"; }; nativeBuildInputs = [ dune ]; diff --git a/pkgs/applications/networking/instant-messengers/bitlbee-discord/default.nix b/pkgs/applications/networking/instant-messengers/bitlbee-discord/default.nix index 00636c7c1e9a..4dd26103cbe6 100644 --- a/pkgs/applications/networking/instant-messengers/bitlbee-discord/default.nix +++ b/pkgs/applications/networking/instant-messengers/bitlbee-discord/default.nix @@ -2,13 +2,14 @@ with stdenv.lib; stdenv.mkDerivation rec { - name = "bitlbee-discord-2017-12-27"; + name = "bitlbee-discord-${version}"; + version = "0.4.1"; src = fetchFromGitHub { - rev = "6a03db169ad44fee55609ecd16e19f3c0f99a182"; + rev = version; owner = "sm00th"; repo = "bitlbee-discord"; - sha256 = "1ci9a12c6zg8d6i9f95pq6dal79cp4klmmsyj8ag2gin90kl3x95"; + sha256 = "1n3xw5mcmg7224r09gbm39bd6h2158dwl6jx21290636b4345f4c"; }; nativeBuildInputs = [ autoreconfHook pkgconfig ]; diff --git a/pkgs/applications/networking/instant-messengers/nheko/default.nix b/pkgs/applications/networking/instant-messengers/nheko/default.nix index 810720baa7ca..0d34a0a43628 100644 --- a/pkgs/applications/networking/instant-messengers/nheko/default.nix +++ b/pkgs/applications/networking/instant-messengers/nheko/default.nix @@ -20,13 +20,13 @@ let in stdenv.mkDerivation rec { name = "nheko-${version}"; - version = "0.6.1"; + version = "0.6.2"; src = fetchFromGitHub { owner = "mujx"; repo = "nheko"; rev = "v${version}"; - sha256 = "00jigca7kcqwm57qalz7ifz9p6v7p3pnamjvpkxjjix2rm9wmg2q"; + sha256 = "014k68mmw3ys7ldgj96kkr1i1lyv2nk89wndkqznsizcr3097fn5"; }; # If, on Darwin, you encounter the error diff --git a/pkgs/applications/networking/instant-messengers/vk-messenger/default.nix b/pkgs/applications/networking/instant-messengers/vk-messenger/default.nix new file mode 100644 index 000000000000..5642d254295e --- /dev/null +++ b/pkgs/applications/networking/instant-messengers/vk-messenger/default.nix @@ -0,0 +1,53 @@ +{ stdenv, fetchurl, rpmextract, autoPatchelfHook +, xorg, gtk2, gnome2, nss, alsaLib, udev, libnotify }: + +let + version = "3.9.0"; +in stdenv.mkDerivation { + name = "vk-messenger-${version}"; + src = { + i686-linux = fetchurl { + url = "https://desktop.userapi.com/rpm/master/vk-${version}.i686.rpm"; + sha256 = "150qjj6ccbdp3gxs99jbzp27in1y8qkngn7jgb9za61pm4j70va3"; + }; + x86_64-linux = fetchurl { + url = "https://desktop.userapi.com/rpm/master/vk-${version}.x86_64.rpm"; + sha256 = "04lavv614qhj17zccpdih4k6ghj21nd0s8qxbkxkqb1jb0z8dfz9"; + }; + }.${stdenv.system} or (throw "Unsupported system: ${stdenv.system}"); + + nativeBuildInputs = [ rpmextract autoPatchelfHook ]; + buildInputs = (with xorg; [ + libXdamage libXtst libXScrnSaver libxkbfile + ]) ++ [ + gtk2 gnome2.GConf nss alsaLib + ]; + runtimeDependencies = [ udev.lib libnotify ]; + + unpackPhase = '' + rpmextract $src + ''; + + buildPhase = '' + substituteInPlace usr/share/applications/vk.desktop \ + --replace /usr/share/pixmaps/vk.png vk + ''; + + installPhase = '' + mkdir $out + cd usr + cp -r --parents bin $out + cp -r --parents share/vk $out + cp -r --parents share/applications $out + cp -r --parents share/pixmaps $out + ''; + + meta = with stdenv.lib; { + description = "Simple and Convenient Messaging App for VK"; + homepage = https://vk.com/messenger; + license = licenses.unfree; + maintainers = [ maintainers.gnidorah ]; + platforms = ["i686-linux" "x86_64-linux"]; + hydraPlatforms = []; + }; +} diff --git a/pkgs/applications/networking/mailreaders/astroid/default.nix b/pkgs/applications/networking/mailreaders/astroid/default.nix index 0cb07b8ce755..8dd23df7749c 100644 --- a/pkgs/applications/networking/mailreaders/astroid/default.nix +++ b/pkgs/applications/networking/mailreaders/astroid/default.nix @@ -1,36 +1,31 @@ -{ stdenv, fetchFromGitHub, cmake, pkgconfig, gnome3, gmime3, webkitgtk +{ stdenv, fetchFromGitHub, cmake, pkgconfig, gnome3, gmime3, webkitgtk222x , libsass, notmuch, boost, wrapGAppsHook, glib-networking, protobuf, vim_configurable , makeWrapper, python3, python3Packages , vim ? vim_configurable.override { features = "normal"; gui = "auto"; } +, ronn }: stdenv.mkDerivation rec { name = "astroid-${version}"; - version = "0.13"; + version = "0.14"; src = fetchFromGitHub { owner = "astroidmail"; repo = "astroid"; rev = "v${version}"; - sha256 = "105x5g44hng3fi03h67j3an53088148jbq8726nmcp0zs0cy9gac"; + sha256 = "1wkv1icsx3g3gq485dnvcdhr9srrjgz4ws1i1krcw9n61bj7gxh8"; }; - nativeBuildInputs = [ cmake pkgconfig wrapGAppsHook ]; + nativeBuildInputs = [ cmake ronn pkgconfig wrapGAppsHook ]; - buildInputs = [ gnome3.gtkmm gmime3 webkitgtk libsass gnome3.libpeas + buildInputs = [ gnome3.gtkmm gmime3 webkitgtk222x libsass gnome3.libpeas python3 python3Packages.pygobject3 notmuch boost gnome3.gsettings-desktop-schemas gnome3.defaultIconTheme glib-networking protobuf ] ++ (if vim == null then [] else [ vim ]); - patches = [ - # TODO: remove when https://github.com/astroidmail/astroid/pull/531 - # is released - ./run_tests.diff - ]; - postPatch = '' sed -i "s~gvim ~${vim}/bin/vim -g ~g" src/config.cc sed -i "s~ -geom 10x10~~g" src/config.cc diff --git a/pkgs/applications/networking/mailreaders/astroid/run_tests.diff b/pkgs/applications/networking/mailreaders/astroid/run_tests.diff deleted file mode 100644 index 21b466741ce1..000000000000 --- a/pkgs/applications/networking/mailreaders/astroid/run_tests.diff +++ /dev/null @@ -1,10 +0,0 @@ -diff --git a/tests/run_test.sh b/tests/run_test.sh -index f2ea7d7..927c61d 100755 ---- a/tests/run_test.sh -+++ b/tests/run_test.sh -@@ -1,4 +1,4 @@ --#! /bin/bash -+#! /usr/bin/env bash - # - # Set up environment and run test specified on command line - diff --git a/pkgs/applications/networking/mailreaders/thunderbird/default.nix b/pkgs/applications/networking/mailreaders/thunderbird/default.nix index e0bedeb2f045..419cc2fd2d84 100644 --- a/pkgs/applications/networking/mailreaders/thunderbird/default.nix +++ b/pkgs/applications/networking/mailreaders/thunderbird/default.nix @@ -47,14 +47,17 @@ in stdenv.mkDerivation rec { # from firefox + m4 + wrapperTool nativeBuildInputs = [ m4 autoconf213 which gnused pkgconfig perl python wrapperTool cargo rustc ]; - # https://bugzilla.mozilla.org/show_bug.cgi?format=default&id=1479540 - # https://hg.mozilla.org/releases/mozilla-release/rev/bc651d3d910c patches = [ + # https://bugzilla.mozilla.org/show_bug.cgi?format=default&id=1479540 + # https://hg.mozilla.org/releases/mozilla-release/rev/bc651d3d910c (fetchpatch { name = "bc651d3d910c.patch"; url = "https://hg.mozilla.org/releases/mozilla-release/raw-rev/bc651d3d910c"; sha256 = "0iybkadsgsf6a3pq3jh8z1p110vmpkih8i35jfj8micdkhxzi89g"; }) + + # Remove buildconfig.html to prevent a dependency on clang etc. + ../../browsers/firefox/no-buildconfig.patch ]; configureFlags = @@ -191,6 +194,8 @@ in stdenv.mkDerivation rec { "$out/bin/thunderbird" --version ''; + disallowedRequisites = [ stdenv.cc ]; + meta = with stdenv.lib; { description = "A full-featured e-mail client"; homepage = http://www.mozilla.org/thunderbird/; diff --git a/pkgs/applications/networking/p2p/soulseekqt/default.nix b/pkgs/applications/networking/p2p/soulseekqt/default.nix index 12ed680482f6..1b7901e3c463 100644 --- a/pkgs/applications/networking/p2p/soulseekqt/default.nix +++ b/pkgs/applications/networking/p2p/soulseekqt/default.nix @@ -5,7 +5,7 @@ , qtbase, qtmultimedia , libjson, libgpgerror , libX11, libxcb, libXau, libXdmcp, freetype, libbsd -, pythonPackages, squashfsTools, makeDesktopItem +, pythonPackages, squashfsTools, desktop_file_utils }: with stdenv.lib; @@ -23,16 +23,6 @@ let }; }; - desktopItem = makeDesktopItem { - name = "SoulseekQt"; - exec = "soulseekqt"; - icon = "$out/share/soulseekqt/"; - comment = "Official Qt SoulSeek client"; - desktopName = "SoulseekQt"; - genericName = "SoulseekQt"; - categories = "Network;"; - }; - in stdenv.mkDerivation rec { name = "soulseekqt-${version}"; @@ -41,26 +31,36 @@ in stdenv.mkDerivation rec { dontBuild = true; - buildInputs = [ pythonPackages.binwalk squashfsTools ]; + buildInputs = [ pythonPackages.binwalk squashfsTools desktop_file_utils ]; - # avoid usage of appimagetool + # avoid usage of appimage's runner option --appimage-extract unpackCmd = '' export HOME=$(pwd) # workaround for binwalk - tar xvf $curSrc && binwalk --quiet \ - ${mainbin}.AppImage -D 'squashfs:.squashfs:unsquashfs %e' + appimage=$(tar xvf $curSrc) && binwalk --quiet \ + $appimage -D 'squashfs:squashfs:unsquashfs %e' ''; + + patchPhase = '' + cd squashfs-root/ + binary="$(readlink AppRun)" + + # fixup desktop file + desktop-file-edit --set-key Exec --set-value $binary default.desktop + desktop-file-edit --set-key Comment --set-value "${meta.description}" default.desktop + desktop-file-edit --set-key Categories --set-value Network default.desktop + ''; installPhase = '' - mkdir -p $out/{bin,share/soulseekqt} - cd squashfs-root/ - cp -R soulseek.png translations $out/share/soulseekqt - cp SoulseekQt $out/bin/soulseekqt + mkdir -p $out/{bin,share/applications,share/icons/} + cp default.desktop $out/share/applications/$binary.desktop + cp soulseek.png $out/share/icons/ + cp $binary $out/bin/ ''; fixupPhase = '' patchelf --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \ --set-rpath ${libPath} \ - $out/bin/soulseekqt + $out/bin/$binary ''; meta = with stdenv.lib; { diff --git a/pkgs/applications/office/gnucash/default.nix b/pkgs/applications/office/gnucash/default.nix index 63fda1e0e8be..683db389fedf 100644 --- a/pkgs/applications/office/gnucash/default.nix +++ b/pkgs/applications/office/gnucash/default.nix @@ -25,11 +25,11 @@ in stdenv.mkDerivation rec { name = "gnucash-${version}"; - version = "3.2"; + version = "3.3"; src = fetchurl { url = "mirror://sourceforge/gnucash/${name}.tar.bz2"; - sha256 = "0li4b6pvlahgh5n9v91yxfgm972a1kky80xw3q1ggl4f2h6b1rb3"; + sha256 = "0grr5qi5rn1xvr7qx5d7mcxa2mcgycy2b325ry73bb485a6yv5l3"; }; nativeBuildInputs = [ pkgconfig makeWrapper cmake gtest ]; diff --git a/pkgs/applications/office/scribus/default.nix b/pkgs/applications/office/scribus/default.nix index ac1bf18e9999..76bf7ac6893e 100644 --- a/pkgs/applications/office/scribus/default.nix +++ b/pkgs/applications/office/scribus/default.nix @@ -5,11 +5,11 @@ let pythonEnv = python2.withPackages(ps: [ps.tkinter]); in stdenv.mkDerivation rec { - name = "scribus-1.4.6"; + name = "scribus-1.4.7"; src = fetchurl { url = "mirror://sourceforge/scribus/scribus/${name}.tar.xz"; - sha256 = "16m1g38dig37ag0zxjx3wk1rxx9xxzjqfc7prj89rp4y1m83dqr1"; + sha256 = "1v2ziq3k0yjz35nk5plcbc1jpi53p9v1cq1z3spch9lwlns3bls2"; }; enableParallelBuilding = true; diff --git a/pkgs/applications/science/logic/coq/8.3.nix b/pkgs/applications/science/logic/coq/8.3.nix deleted file mode 100644 index 341267b2cebe..000000000000 --- a/pkgs/applications/science/logic/coq/8.3.nix +++ /dev/null @@ -1,82 +0,0 @@ -# - coqide compilation can be disabled by setting lablgtk to null; -# - The csdp program used for the Micromega tactic is statically referenced. -# However, coq can build without csdp by setting it to null. -# In this case some Micromega tactics will search the user's path for the csdp program and will fail if it is not found. - -{ stdenv, lib, make, fetchurl -, ocaml, findlib, camlp5, ncurses, lablgtk ? null, csdp ? null }: - -assert lib.versionOlder ocaml.version "4"; - -let - version = "8.3pl4"; - buildIde = lablgtk != null; - ideFlags = if buildIde then "-lablgtkdir ${lablgtk}/lib/ocaml/*/site-lib/lablgtk2 -coqide opt" else ""; - idePatch = if buildIde then '' - substituteInPlace scripts/coqmktop.ml --replace \ - "\"-I\"; \"+lablgtk2\"" \ - "\"-I\"; \"$(echo "${lablgtk}"/lib/ocaml/*/site-lib/lablgtk2)\"; \"-I\"; \"$(echo "${lablgtk}"/lib/ocaml/*/site-lib/stublibs)\"" - '' else ""; - csdpPatch = if csdp != null then '' - substituteInPlace plugins/micromega/sos.ml --replace "; csdp" "; ${csdp}/bin/csdp" - substituteInPlace plugins/micromega/coq_micromega.ml --replace "System.search_exe_in_path \"csdp\"" "Some \"${csdp}/bin/csdp\"" - '' else ""; -in - -stdenv.mkDerivation { - name = "coq-${version}"; - - src = fetchurl { - url = "https://coq.inria.fr/V${version}/files/coq-${version}.tar.gz"; - sha256 = "17d3lmchmqir1rawnr52g78srg4wkd7clzpzfsivxc4y1zp6rwkr"; - }; - - buildInputs = [ make ocaml findlib camlp5 ncurses lablgtk ]; - - prefixKey = "-prefix "; - - preConfigure = '' - configureFlagsArray=( - -opt - -camldir ${ocaml}/bin - -camlp5dir $(ocamlfind query camlp5) - ${ideFlags} - ) - ''; - - buildFlags = "world"; # Debug with "world VERBOSE=1"; - - patches = [ ./configure.8.3.patch ]; - - postPatch = '' - UNAME=$(type -tp uname) - RM=$(type -tp rm) - substituteInPlace configure --replace "/bin/uname" "$UNAME" - substituteInPlace tools/beautify-archive --replace "/bin/rm" "$RM" - ${idePatch} - ${csdpPatch} - ''; - - # This post install step is needed to build ssrcoqide from the ssreflect package - # It could be made optional, but I see little harm in including it in the default - # distribution -- roconnor - # This will likely no longer be necessary for coq >= 8.4. -- roconnor - postInstall = if buildIde then '' - cp ide/*.cmi ide/ide.*a $out/lib/coq/ide/ - '' else ""; - - meta = with stdenv.lib; { - description = "Coq proof assistant"; - longDescription = '' - Coq is a formal proof management system. It provides a formal language - to write mathematical definitions, executable algorithms and theorems - together with an environment for semi-interactive development of - machine-checked proofs. - ''; - homepage = http://coq.inria.fr; - license = licenses.lgpl21; - branch = "8.3"; - maintainers = with maintainers; [ roconnor vbgl ]; - platforms = with platforms; linux; - }; -} diff --git a/pkgs/applications/science/logic/coq/configure.8.3.patch b/pkgs/applications/science/logic/coq/configure.8.3.patch deleted file mode 100644 index 431cccac4b0b..000000000000 --- a/pkgs/applications/science/logic/coq/configure.8.3.patch +++ /dev/null @@ -1,1112 +0,0 @@ -diff -Nuar coq-8.3pl3-orig/configure coq-8.3pl3/configure ---- coq-8.3pl3-orig/configure 2011-12-19 22:57:30.000000000 +0100 -+++ coq-8.3pl3/configure 2012-03-17 16:38:16.000000000 +0100 -@@ -395,7 +395,6 @@ - ocamlyaccexec=$CAMLBIN/ocamlyacc - ocamlmktopexec=$CAMLBIN/ocamlmktop - ocamlmklibexec=$CAMLBIN/ocamlmklib -- camlp4oexec=$CAMLBIN/camlp4o - esac - - if test ! -f "$CAMLC" ; then -@@ -628,7 +627,7 @@ - no) LABLGTKLIB=+lablgtk2 # Pour le message - LABLGTKINCLUDES="-I $LABLGTKLIB";; # Pour le makefile - yes) LABLGTKLIB="$lablgtkdir" # Pour le message -- LABLGTKINCLUDES="-I \"$LABLGTKLIB\"";; # Pour le makefile -+ LABLGTKINCLUDES="-I $LABLGTKLIB";; # Pour le makefile - esac;; - no) LABLGTKINCLUDES="";; - esac -diff -Nuar coq-8.3pl3-orig/configure~ coq-8.3pl3/configure~ ---- coq-8.3pl3-orig/configure~ 1970-01-01 01:00:00.000000000 +0100 -+++ coq-8.3pl3/configure~ 2011-12-19 22:57:30.000000000 +0100 -@@ -0,0 +1,1088 @@ -+#!/bin/sh -+ -+################################## -+# -+# Configuration script for Coq -+# -+################################## -+ -+VERSION=8.3pl3 -+VOMAGIC=08300 -+STATEMAGIC=58300 -+DATE=`LANG=C date +"%B %Y"` -+ -+# Create the bin/ directory if non-existent -+test -d bin || mkdir bin -+ -+# a local which command for sh -+which () { -+IFS=":" # set words separator in PATH to be ':' (it allows spaces in dirnames) -+for i in $PATH; do -+ if test -z "$i"; then i=.; fi -+ if [ -f "$i/$1" ] ; then -+ IFS=" " -+ echo "$i/$1" -+ break -+ fi -+done -+} -+ -+usage () { -+ printf "Available options for configure are:\n" -+ echo "-help" -+ printf "\tDisplays this help page\n" -+ echo "-prefix <dir>" -+ printf "\tSet installation directory to <dir>\n" -+ echo "-local" -+ printf "\tSet installation directory to the current source tree\n" -+ echo "-coqrunbyteflags" -+ printf "\tSet link flags for VM-dependent bytecode (coqtop)\n" -+ echo "-coqtoolsbyteflags" -+ printf "\tSet link flags for VM-independant bytecode (coqdep, coqdoc, ...)\n" -+ echo "-custom" -+ printf "\tGenerate all bytecode executables with -custom (not recommended)\n" -+ echo "-src" -+ printf "\tSpecifies the source directory\n" -+ echo "-bindir" -+ echo "-libdir" -+ echo "-mandir" -+ echo "-docdir" -+ printf "\tSpecifies where to install bin/lib/man/doc files resp.\n" -+ echo "-emacslib" -+ echo "-emacs" -+ printf "\tSpecifies where emacs files are to be installed\n" -+ echo "-coqdocdir" -+ printf "\tSpecifies where Coqdoc style files are to be installed\n" -+ echo "-camldir" -+ printf "\tSpecifies the path to the OCaml library\n" -+ echo "-lablgtkdir" -+ printf "\tSpecifies the path to the Lablgtk library\n" -+ echo "-camlp5dir" -+ printf "\tSpecifies where to look for the Camlp5 library and tells to use it\n" -+ echo "-arch" -+ printf "\tSpecifies the architecture\n" -+ echo "-opt" -+ printf "\tSpecifies whether or not to use OCaml *.opt optimized compilers\n" -+ echo "-natdynlink (yes|no)" -+ printf "\tSpecifies whether or not to use dynamic loading of native code\n" -+ echo "-coqide (opt|byte|no)" -+ printf "\tSpecifies whether or not to compile Coqide\n" -+ echo "-browser <command>" -+ printf "\tUse <command> to open URL %%s\n" -+ echo "-with-doc (yes|no)" -+ printf "\tSpecifies whether or not to compile the documentation\n" -+ echo "-with-geoproof (yes|no)" -+ printf "\tSpecifies whether or not to use Geoproof binding\n" -+ echo "-with-cc <file>" -+ echo "-with-ar <file>" -+ echo "-with-ranlib <file>" -+ printf "\tTells configure where to find gcc/ar/ranlib executables\n" -+ echo "-byte-only" -+ printf "\tCompiles only bytecode version of Coq\n" -+ echo "-debug" -+ printf "\tAdd debugging information in the Coq executables\n" -+ echo "-profile" -+ printf "\tAdd profiling information in the Coq executables\n" -+ echo "-annotate" -+ printf "\tCompiles Coq with -dtypes option\n" -+} -+ -+ -+# Default OCaml binaries -+bytecamlc=ocamlc -+nativecamlc=ocamlopt -+ocamlmklibexec=ocamlmklib -+ocamlexec=ocaml -+ocamldepexec=ocamldep -+ocamldocexec=ocamldoc -+ocamllexexec=ocamllex -+ocamlyaccexec=ocamlyacc -+ocamlmktopexec=ocamlmktop -+camlp4oexec=camlp4o -+ -+ -+coq_debug_flag= -+coq_debug_flag_opt= -+coq_profile_flag= -+coq_annotate_flag= -+best_compiler=opt -+cflags="-fno-defer-pop -Wall -Wno-unused" -+natdynlink=yes -+ -+gcc_exec=gcc -+ar_exec=ar -+ranlib_exec=ranlib -+ -+local=false -+coqrunbyteflags_spec=no -+coqtoolsbyteflags_spec=no -+custom_spec=no -+src_spec=no -+prefix_spec=no -+bindir_spec=no -+libdir_spec=no -+mandir_spec=no -+docdir_spec=no -+emacslib_spec=no -+emacs_spec=no -+camldir_spec=no -+lablgtkdir_spec=no -+coqdocdir_spec=no -+arch_spec=no -+coqide_spec=no -+browser_spec=no -+wwwcoq_spec=no -+with_geoproof=false -+with_doc=all -+with_doc_spec=no -+force_caml_version=no -+force_caml_version_spec=no -+ -+COQSRC=`pwd` -+ -+# Parse command-line arguments -+ -+while : ; do -+ case "$1" in -+ "") break;; -+ -help|--help) usage -+ exit;; -+ -prefix|--prefix) prefix_spec=yes -+ prefix="$2" -+ shift;; -+ -local|--local) local=true;; -+ -coqrunbyteflags|--coqrunbyteflags) coqrunbyteflags_spec=yes -+ coqrunbyteflags="$2" -+ shift;; -+ -coqtoolsbyteflags|--coqtoolsbyteflags) coqtoolsbyteflags_spec=yes -+ coqtoolsbyteflags="$2" -+ shift;; -+ -custom|--custom) custom_spec=yes -+ shift;; -+ -src|--src) src_spec=yes -+ COQSRC="$2" -+ shift;; -+ -bindir|--bindir) bindir_spec=yes -+ bindir="$2" -+ shift;; -+ -libdir|--libdir) libdir_spec=yes -+ libdir="$2" -+ shift;; -+ -mandir|--mandir) mandir_spec=yes -+ mandir="$2" -+ shift;; -+ -docdir|--docdir) docdir_spec=yes -+ docdir="$2" -+ shift;; -+ -emacslib|--emacslib) emacslib_spec=yes -+ emacslib="$2" -+ shift;; -+ -emacs |--emacs) emacs_spec=yes -+ emacs="$2" -+ shift;; -+ -coqdocdir|--coqdocdir) coqdocdir_spec=yes -+ coqdocdir="$2" -+ shift;; -+ -camldir|--camldir) camldir_spec=yes -+ camldir="$2" -+ shift;; -+ -lablgtkdir|--lablgtkdir) lablgtkdir_spec=yes -+ lablgtkdir="$2" -+ shift;; -+ -camlp5dir|--camlp5dir) -+ camlp5dir="$2" -+ shift;; -+ -arch|--arch) arch_spec=yes -+ arch=$2 -+ shift;; -+ -opt|--opt) bytecamlc=ocamlc.opt -+ camlp4oexec=camlp4o # can't add .opt since dyn load'll be required -+ nativecamlc=ocamlopt.opt;; -+ -natdynlink|--natdynlink) case "$2" in -+ yes) natdynlink=yes;; -+ *) natdynlink=no -+ esac -+ shift;; -+ -coqide|--coqide) coqide_spec=yes -+ case "$2" in -+ byte|opt) COQIDE=$2;; -+ *) COQIDE=no -+ esac -+ shift;; -+ -browser|--browser) browser_spec=yes -+ BROWSER=$2 -+ shift;; -+ -coqwebsite|--coqwebsite) wwwcoq_spec=yes -+ WWWCOQ=$2 -+ shift;; -+ -with-doc|--with-doc) with_doc_spec=yes -+ case "$2" in -+ yes|all) with_doc=all;; -+ *) with_doc=no -+ esac -+ shift;; -+ -with-geoproof|--with-geoproof) -+ case "$2" in -+ yes) with_geoproof=true;; -+ no) with_geoproof=false;; -+ esac -+ shift;; -+ -with-cc|-with-gcc|--with-cc|--with-gcc) -+ gcc_spec=yes -+ gcc_exec=$2 -+ shift;; -+ -with-ar|--with-ar) -+ ar_spec=yes -+ ar_exec=$2 -+ shift;; -+ -with-ranlib|--with-ranlib) -+ ranlib_spec=yes -+ ranlib_exec=$2 -+ shift;; -+ -byte-only|-byteonly|--byteonly|--byte-only) best_compiler=byte;; -+ -debug|--debug) coq_debug_flag=-g;; -+ -profile|--profile) coq_profile_flag=-p;; -+ -annotate|--annotate) coq_annotate_flag=-dtypes;; -+ -force-caml-version|--force-caml-version|-force-ocaml-version|--force-ocaml-version) -+ force_caml_version_spec=yes -+ force_caml_version=yes;; -+ *) echo "Unknown option \"$1\"." 1>&2; usage; exit 2;; -+ esac -+ shift -+done -+ -+if [ $prefix_spec = yes -a $local = true ] ; then -+ echo "Options -prefix and -local are incompatible." -+ echo "Configure script failed!" -+ exit 1 -+fi -+ -+# compile date -+DATEPGM=`which date` -+case $DATEPGM in -+ "") echo "I can't find the program \"date\" in your path." -+ echo "Please give me the current date" -+ read COMPILEDATE;; -+ *) COMPILEDATE=`date +"%h %d %Y %H:%M:%S"`;; -+esac -+ -+# Architecture -+ -+case $arch_spec in -+ no) -+ # First we test if we are running a Cygwin system -+ if [ `uname -s | cut -c -6` = "CYGWIN" ] ; then -+ ARCH="win32" -+ else -+ # If not, we determine the architecture -+ if test -x /bin/arch ; then -+ ARCH=`/bin/arch` -+ elif test -x /usr/bin/arch ; then -+ ARCH=`/usr/bin/arch` -+ elif test -x /usr/ucb/arch ; then -+ ARCH=`/usr/ucb/arch` -+ elif test -x /bin/uname ; then -+ ARCH=`/bin/uname -s` -+ elif test -x /usr/bin/uname ; then -+ ARCH=`/usr/bin/uname -s` -+ else -+ echo "I can not automatically find the name of your architecture." -+ printf "%s"\ -+ "Give me a name, please [win32 for Win95, Win98 or WinNT]: " -+ read ARCH -+ fi -+ fi;; -+ yes) ARCH=$arch -+esac -+ -+# executable extension -+ -+case $ARCH in -+ win32) -+ EXE=".exe" -+ DLLEXT=".dll";; -+ *) EXE="" -+ DLLEXT=".so" -+esac -+ -+# Is the source tree checked out from a recognised -+# version control system ? -+if test -e .svn/entries ; then -+ checkedout=svn -+elif [ -d '{arch}' ]; then -+ checkedout=gnuarch -+elif [ -z "${GIT_DIR}" ] && [ -d .git ] || [ -d "${GIT_DIR}" ]; then -+ checkedout=git -+else -+ checkedout=0 -+fi -+ -+# make command -+ -+MAKE=`which make` -+if [ "$MAKE" != "" ]; then -+ MAKEVERSION=`$MAKE -v | head -1 | cut -d" " -f3` -+ MAKEVERSIONMAJOR=`echo $MAKEVERSION | cut -d. -f1` -+ MAKEVERSIONMINOR=`echo $MAKEVERSION | cut -d. -f2` -+ if [ "$MAKEVERSIONMAJOR" -eq 3 -a "$MAKEVERSIONMINOR" -ge 81 ]; then -+ echo "You have GNU Make $MAKEVERSION. Good!" -+ else -+ OK="no" -+ if [ -x ./make ]; then -+ MAKEVERSION=`./make -v | head -1` -+ if [ "$MAKEVERSION" = "GNU Make 3.81" ]; then OK="yes"; fi -+ fi -+ if [ $OK = "no" ]; then -+ echo "GNU Make >= 3.81 is needed." -+ echo "Make 3.81 can be downloaded from ftp://ftp.gnu.org/gnu/make/make-3.81.tar.gz" -+ echo "then locally installed on a Unix-style system by issuing:" -+ echo " tar xzvf make-3.81.tar.gz" -+ echo " cd make-3.81" -+ echo " ./configure" -+ echo " make" -+ echo " mv make .." -+ echo " cd .." -+ echo "Restart then the configure script and later use ./make instead of make." -+ exit 1 -+ else -+ echo "You have locally installed GNU Make 3.81. Good!" -+ fi -+ fi -+else -+ echo "Cannot find GNU Make >= 3.81." -+fi -+ -+# Browser command -+ -+if [ "$browser_spec" = "no" ]; then -+ case $ARCH in -+ win32) BROWSER='C:\PROGRA~1\INTERN~1\IEXPLORE %s' ;; -+ *) BROWSER='firefox -remote "OpenURL(%s,new-tab)" || firefox %s &' ;; -+ esac -+fi -+ -+if [ "$wwwcoq_spec" = "no" ]; then -+ WWWCOQ="http://coq.inria.fr/" -+fi -+ -+######################################### -+# Objective Caml programs -+ -+case $camldir_spec in -+ no) CAMLC=`which $bytecamlc` -+ case "$CAMLC" in -+ "") echo "$bytecamlc is not present in your path!" -+ echo "Give me manually the path to the $bytecamlc executable [/usr/local/bin by default]: " -+ read CAMLC -+ -+ case "$CAMLC" in -+ "") CAMLC=/usr/local/bin/$bytecamlc;; -+ */ocamlc|*/ocamlc.opt) true;; -+ */) CAMLC="${CAMLC}"$bytecamlc;; -+ *) CAMLC="${CAMLC}"/$bytecamlc;; -+ esac -+ esac -+ CAMLBIN=`dirname "$CAMLC"`;; -+ yes) CAMLC=$camldir/$bytecamlc -+ -+ CAMLBIN=`dirname "$CAMLC"` -+ bytecamlc="$CAMLC" -+ nativecamlc=$CAMLBIN/$nativecamlc -+ ocamlexec=$CAMLBIN/ocaml -+ ocamldepexec=$CAMLBIN/ocamldep -+ ocamldocexec=$CAMLBIN/ocamldoc -+ ocamllexexec=$CAMLBIN/ocamllex -+ ocamlyaccexec=$CAMLBIN/ocamlyacc -+ ocamlmktopexec=$CAMLBIN/ocamlmktop -+ ocamlmklibexec=$CAMLBIN/ocamlmklib -+ camlp4oexec=$CAMLBIN/camlp4o -+esac -+ -+if test ! -f "$CAMLC" ; then -+ echo "I can not find the executable '$CAMLC'. Have you installed it?" -+ echo "Configuration script failed!" -+ exit 1 -+fi -+ -+# Under Windows, OCaml only understands Windows filenames (C:\...) -+case $ARCH in -+ win32) CAMLBIN=`cygpath -m ${CAMLBIN}`;; -+esac -+ -+CAMLVERSION=`"$bytecamlc" -version` -+ -+case $CAMLVERSION in -+ 1.*|2.*|3.00|3.01|3.02|3.03|3.03alpha|3.04|3.05beta|3.05|3.06|3.07*|3.08*|3.09*) -+ echo "Your version of Objective-Caml is $CAMLVERSION." -+ if [ "$force_caml_version" = "yes" ]; then -+ echo "*Warning* You are compiling Coq with an outdated version of Objective-Caml." -+ else -+ echo " You need Objective-Caml 3.10.2 or later." -+ echo " Configuration script failed!" -+ exit 1 -+ fi;; -+ ?*) -+ CAMLP4COMPAT="-loc loc" -+ echo "You have Objective-Caml $CAMLVERSION. Good!";; -+ *) -+ echo "I found the Objective-Caml compiler but cannot find its version number!" -+ echo "Is it installed properly?" -+ echo "Configuration script failed!" -+ exit 1;; -+esac -+ -+CAMLTAG=OCAML`echo $CAMLVERSION | sed -e "s/\([1-9]\)\.\([0-9]*\).*/\1\2/g"` -+ -+# For coqmktop & bytecode compiler -+ -+case $ARCH in -+ win32) # Awfull trick to get around a ^M problem at the end of CAMLLIB -+ CAMLLIB=`"$CAMLC" -where | sed -e 's/^\(.*\)$/\1/'` ;; -+ *) -+ CAMLLIB=`"$CAMLC" -where` -+esac -+ -+if [ "$coq_debug_flag" = "-g" ]; then -+ case $CAMLTAG in -+ OCAML31*) -+ # Compilation debug flag -+ coq_debug_flag_opt="-g" -+ ;; -+ esac -+fi -+ -+# Native dynlink -+if [ "$natdynlink" = "yes" -a -f `"$CAMLC" -where`/dynlink.cmxa ]; then -+ HASNATDYNLINK=true -+else -+ HASNATDYNLINK=false -+fi -+ -+case $HASNATDYNLINK,`uname -s`,`uname -r`,$CAMLVERSION in -+ true,Darwin,9.*,3.11.*) # ocaml 3.11.0 dynlink on MacOS 10.5 is buggy -+ NATDYNLINKFLAG=os5fixme;; -+ #Possibly a problem on 10.6.0/10.6.1/10.6.2 -+ #May just be a 32 vs 64 problem for all 10.6.* -+ true,Darwin,10.0.*,3.11.*) # Possibly a problem on 10.6.0 -+ NATDYNLINKFLAG=os5fixme;; -+ true,Darwin,10.1.*,3.11.*) # Possibly a problem on 10.6.1 -+ NATDYNLINKFLAG=os5fixme;; -+ true,Darwin,10.2.*,3.11.*) # Possibly a problem on 10.6.2 -+ NATDYNLINKFLAG=os5fixme;; -+ true,Darwin,10.*,3.11.*) -+ if [ `getconf LONG_BIT` = "32" ]; then -+ # Still a problem for x86_32 -+ NATDYNLINKFLAG=os5fixme -+ else -+ # Not a problem for x86_64 -+ NATDYNLINKFLAG=$HASNATDYNLINK -+ fi;; -+ *) -+ NATDYNLINKFLAG=$HASNATDYNLINK;; -+esac -+ -+# Camlp4 / Camlp5 configuration -+ -+if [ "$camlp5dir" != "" ]; then -+ CAMLP4=camlp5 -+ CAMLP4LIB=$camlp5dir -+ if [ ! -f $camlp5dir/camlp5.cma ]; then -+ echo "Cannot find camlp5 libraries in $camlp5dir (camlp5.cma not found)." -+ echo "Configuration script failed!" -+ exit 1 -+ fi -+ camlp4oexec=`echo $camlp4oexec | sed -e 's/4/5/'` -+else -+ case $CAMLTAG in -+ OCAML31*) -+ if [ -x "${CAMLLIB}/camlp5" ]; then -+ CAMLP4LIB=+camlp5 -+ elif [ -x "${CAMLLIB}/site-lib/camlp5" ]; then -+ CAMLP4LIB=+site-lib/camlp5 -+ else -+ echo "Objective Caml $CAMLVERSION found but no Camlp5 installed." -+ echo "Configuration script failed!" -+ exit 1 -+ fi -+ CAMLP4=camlp5 -+ camlp4oexec=`echo $camlp4oexec | sed -e 's/4/5/'` -+ ;; -+ *) -+ CAMLP4=camlp4 -+ CAMLP4LIB=+camlp4 -+ ;; -+ esac -+fi -+ -+if [ "$CAMLP4" = "camlp5" ] && `$camlp4oexec -v 2>&1 | grep -q 5.00`; then -+ echo "Camlp5 version 5.00 not supported: versions 4.0x or >= 5.01 are OK" -+ echo "(depending also on your ocaml version)." -+ echo "Configuration script failed!" -+ exit 1 -+fi -+ -+ -+case $CAMLP4LIB in -+ +*) FULLCAMLP4LIB=$CAMLLIB/`echo $CAMLP4LIB | cut -b 2-`;; -+ *) FULLCAMLP4LIB=$CAMLP4LIB;; -+esac -+ -+# Assume that camlp(4|5) binaries are at the same place as ocaml ones -+# (this should become configurable some day) -+CAMLP4BIN=${CAMLBIN} -+ -+# do we have a native compiler: test of ocamlopt and its version -+ -+if [ "$best_compiler" = "opt" ] ; then -+ if test -e "$nativecamlc" || test -e "`which $nativecamlc`"; then -+ CAMLOPTVERSION=`"$nativecamlc" -v | sed -n -e 's|.*version* *\(.*\)$|\1|p' ` -+ if [ "`uname -s`" = "Darwin" -a "$ARCH" = "i386" ]; then -+ case $CAMLOPTVERSION in -+ 3.09.3|3.1?*) ;; -+ *) echo "Native compilation on MacOS X Pentium requires Objective-Caml >= 3.09.3," -+ best_compiler=byte -+ echo "only the bytecode version of Coq will be available." -+ esac -+ elif [ ! -f $FULLCAMLP4LIB/gramlib.cmxa ]; then -+ best_compiler=byte -+ echo "Cannot find native-code $CAMLP4," -+ echo "only the bytecode version of Coq will be available." -+ else -+ if [ "$CAMLOPTVERSION" != "$CAMLVERSION" ] ; then -+ echo "Native and bytecode compilers do not have the same version!" -+ fi -+ echo "You have native-code compilation. Good!" -+ fi -+ else -+ best_compiler=byte -+ echo "You have only bytecode compilation." -+ fi -+fi -+ -+# OS dependent libraries -+ -+case $ARCH in -+ sun4*) OS=`uname -r` -+ case $OS in -+ 5*) OS="Sun Solaris $OS" -+ OSDEPLIBS="-cclib -lunix -cclib -lnsl -cclib -lsocket";; -+ *) OS="Sun OS $OS" -+ OSDEPLIBS="-cclib -lunix" -+ esac;; -+ alpha) OSDEPLIBS="-cclib -lunix";; -+ win32) OS="Win32" -+ OSDEPLIBS="-cclib -lunix" -+ cflags="-mno-cygwin $cflags";; -+ *) OSDEPLIBS="-cclib -lunix" -+esac -+ -+# lablgtk2 and CoqIDE -+ -+# -byte-only should imply -coqide byte, unless the user decides otherwise -+ -+if [ "$best_compiler" = "byte" -a "$coqide_spec" = "no" ]; then -+ coqide_spec=yes -+ COQIDE=byte -+fi -+ -+# Which coqide is asked ? which one is possible ? -+ -+if [ "$coqide_spec" = "yes" -a "$COQIDE" = "no" ]; then -+ echo "CoqIde disabled as requested." -+else -+ case $lablgtkdir_spec in -+ no) -+ if [ -f "${CAMLLIB}/lablgtk2/glib.mli" ]; then -+ lablgtkdir=${CAMLLIB}/lablgtk2 -+ elif [ -f "${CAMLLIB}/site-lib/lablgtk2/glib.mli" ]; then -+ lablgtkdir=${CAMLLIB}/site-lib/lablgtk2 -+ fi;; -+ yes) -+ if [ ! -f "$lablgtkdir/glib.mli" ]; then -+ echo "Incorrect LablGtk2 library (glib.mli not found)." -+ echo "Configuration script failed!" -+ exit 1 -+ fi;; -+ esac -+ if [ "$lablgtkdir" = "" ]; then -+ echo "LablGtk2 not found: CoqIde will not be available." -+ COQIDE=no -+ elif [ -z "`grep -w convert_with_fallback "$lablgtkdir/glib.mli"`" ]; then -+ echo "LablGtk2 found but too old: CoqIde will not be available." -+ COQIDE=no; -+ elif [ "$coqide_spec" = "yes" -a "$COQIDE" = "byte" ]; then -+ echo "LablGtk2 found, bytecode CoqIde will be used as requested." -+ COQIDE=byte -+ elif [ ! -f "${CAMLLIB}/threads/threads.cmxa" ]; then -+ echo "LablGtk2 found, no native threads: bytecode CoqIde will be available." -+ COQIDE=byte -+ else -+ echo "LablGtk2 found, native threads: native CoqIde will be available." -+ COQIDE=opt -+ fi -+fi -+ -+case $COQIDE in -+ byte|opt) -+ case $lablgtkdir_spec in -+ no) LABLGTKLIB=+lablgtk2 # Pour le message -+ LABLGTKINCLUDES="-I $LABLGTKLIB";; # Pour le makefile -+ yes) LABLGTKLIB="$lablgtkdir" # Pour le message -+ LABLGTKINCLUDES="-I \"$LABLGTKLIB\"";; # Pour le makefile -+ esac;; -+ no) LABLGTKINCLUDES="";; -+esac -+ -+# strip command -+ -+case $ARCH in -+ win32) -+ # true -> strip : it exists under cygwin ! -+ STRIPCOMMAND="strip";; -+ *) -+ if [ "$coq_profile_flag" = "-p" ] || [ "$coq_debug_flag" = "-g" ] || -+ [ "`uname -s`" = "Darwin" -a "$HASNATDYNLINK" = "true" ] -+ then -+ STRIPCOMMAND="true" -+ else -+ STRIPCOMMAND="strip" -+ fi -+esac -+ -+# mktexlsr -+#MKTEXLSR=`which mktexlsr` -+#case $MKTEXLSR in -+# "") MKTEXLSR=true;; -+#esac -+ -+# " -+### Test if documentation can be compiled (latex, hevea) -+ -+if test "$with_doc" = "all" -+then -+ for cmd in "latex" "hevea" ; do -+ if test ! -x "`which $cmd`" -+ then -+ echo "$cmd was not found; documentation will not be available" -+ with_doc=no -+ break -+ fi -+ done -+fi -+ -+########################################### -+# bindir, libdir, mandir, docdir, etc. -+ -+case $src_spec in -+ no) COQTOP=${COQSRC} -+esac -+ -+# OCaml only understand Windows filenames (C:\...) -+case $ARCH in -+ win32) COQTOP=`cygpath -m ${COQTOP}` -+esac -+ -+case $ARCH in -+ win32) -+ bindir_def='C:\coq\bin' -+ libdir_def='C:\coq\lib' -+ mandir_def='C:\coq\man' -+ docdir_def='C:\coq\doc' -+ emacslib_def='C:\coq\emacs' -+ coqdocdir_def='C:\coq\latex';; -+ *) -+ bindir_def=/usr/local/bin -+ libdir_def=/usr/local/lib/coq -+ mandir_def=/usr/local/man -+ docdir_def=/usr/local/share/doc/coq -+ emacslib_def=/usr/local/share/emacs/site-lisp -+ coqdocdir_def=/usr/local/share/texmf/tex/latex/misc;; -+esac -+ -+emacs_def=emacs -+ -+case $bindir_spec/$prefix_spec/$local in -+ yes/*/*) BINDIR=$bindir ;; -+ */yes/*) BINDIR=$prefix/bin ;; -+ */*/true) BINDIR=$COQTOP/bin ;; -+ *) printf "Where should I install the Coq binaries [$bindir_def]? " -+ read BINDIR -+ case $BINDIR in -+ "") BINDIR=$bindir_def;; -+ *) true;; -+ esac;; -+esac -+ -+case $libdir_spec/$prefix_spec/$local in -+ yes/*/*) LIBDIR=$libdir;; -+ */yes/*) -+ case $ARCH in -+ win32) LIBDIR=$prefix ;; -+ *) LIBDIR=$prefix/lib/coq ;; -+ esac ;; -+ */*/true) LIBDIR=$COQTOP ;; -+ *) printf "Where should I install the Coq library [$libdir_def]? " -+ read LIBDIR -+ case $LIBDIR in -+ "") LIBDIR=$libdir_def;; -+ *) true;; -+ esac;; -+esac -+ -+case $mandir_spec/$prefix_spec/$local in -+ yes/*/*) MANDIR=$mandir;; -+ */yes/*) MANDIR=$prefix/man ;; -+ */*/true) MANDIR=$COQTOP/man ;; -+ *) printf "Where should I install the Coq man pages [$mandir_def]? " -+ read MANDIR -+ case $MANDIR in -+ "") MANDIR=$mandir_def;; -+ *) true;; -+ esac;; -+esac -+ -+case $docdir_spec/$prefix_spec/$local in -+ yes/*/*) DOCDIR=$docdir; HTMLREFMANDIR=$DOCDIR/html/refman;; -+ */yes/*) DOCDIR=$prefix/share/doc/coq; HTMLREFMANDIR=$DOCDIR/html/refman;; -+ */*/true) DOCDIR=$COQTOP/doc; HTMLREFMANDIR=$DOCDIR/refman/html;; -+ *) printf "Where should I install the Coq documentation [$docdir_def]? " -+ read DOCDIR -+ case $DOCDIR in -+ "") DOCDIR=$docdir_def; HTMLREFMANDIR=$DOCDIR/html/refman;; -+ *) true;; -+ esac;; -+esac -+ -+case $emacslib_spec/$prefix_spec/$local in -+ yes/*/*) EMACSLIB=$emacslib;; -+ */yes/*) -+ case $ARCH in -+ win32) EMACSLIB=$prefix/emacs ;; -+ *) EMACSLIB=$prefix/share/emacs/site-lisp ;; -+ esac ;; -+ */*/true) EMACSLIB=$COQTOP/tools/emacs ;; -+ *) printf "Where should I install the Coq Emacs mode [$emacslib_def]? " -+ read EMACSLIB -+ case $EMACSLIB in -+ "") EMACSLIB=$emacslib_def;; -+ *) true;; -+ esac;; -+esac -+ -+case $coqdocdir_spec/$prefix_spec/$local in -+ yes/*/*) COQDOCDIR=$coqdocdir;; -+ */yes/*) -+ case $ARCH in -+ win32) COQDOCDIR=$prefix/latex ;; -+ *) COQDOCDIR=$prefix/share/emacs/site-lisp ;; -+ esac ;; -+ */*/true) COQDOCDIR=$COQTOP/tools/coqdoc ;; -+ *) printf "Where should I install Coqdoc TeX/LaTeX files [$coqdocdir_def]? " -+ read COQDOCDIR -+ case $COQDOCDIR in -+ "") COQDOCDIR=$coqdocdir_def;; -+ *) true;; -+ esac;; -+esac -+ -+# Determine if we enable -custom by default (Windows and MacOS) -+CUSTOM_OS=no -+if [ "$ARCH" = "win32" ] || [ "`uname -s`" = "Darwin" ]; then -+ CUSTOM_OS=yes -+fi -+ -+BUILDLDPATH="# you might want to set CAML_LD_LIBRARY_PATH by hand!" -+case $coqrunbyteflags_spec/$local/$custom_spec/$CUSTOM_OS in -+ yes/*/*/*) COQRUNBYTEFLAGS="$coqrunbyteflags";; -+ */*/yes/*|*/*/*/yes) COQRUNBYTEFLAGS="-custom";; -+ */true/*/*) COQRUNBYTEFLAGS="-dllib -lcoqrun -dllpath '$COQTOP'/kernel/byterun";; -+ *) -+ COQRUNBYTEFLAGS="-dllib -lcoqrun -dllpath '$LIBDIR'" -+ BUILDLDPATH="export CAML_LD_LIBRARY_PATH='$COQTOP'/kernel/byterun";; -+esac -+case $coqtoolsbyteflags_spec/$custom_spec/$CUSTOM_OS in -+ yes/*/*) COQTOOLSBYTEFLAGS="$coqtoolsbyteflags";; -+ */yes/*|*/*/yes) COQTOOLSBYTEFLAGS="-custom";; -+ *) COQTOOLSBYTEFLAGS="";; -+esac -+ -+# case $emacs_spec in -+# no) printf "Which Emacs command should I use to compile coq.el [$emacs_def]? " -+# read EMACS -+ -+# case $EMACS in -+# "") EMACS=$emacs_def;; -+# *) true;; -+# esac;; -+# yes) EMACS=$emacs;; -+# esac -+ -+ -+ -+########################################### -+# Summary of the configuration -+ -+echo "" -+echo " Coq top directory : $COQTOP" -+echo " Architecture : $ARCH" -+if test ! -z "$OS" ; then -+ echo " Operating system : $OS" -+fi -+echo " Coq VM bytecode link flags : $COQRUNBYTEFLAGS" -+echo " Coq tools bytecode link flags : $COQTOOLSBYTEFLAGS" -+echo " OS dependent libraries : $OSDEPLIBS" -+echo " Objective-Caml/Camlp4 version : $CAMLVERSION" -+echo " Objective-Caml/Camlp4 binaries in : $CAMLBIN" -+echo " Objective-Caml library in : $CAMLLIB" -+echo " Camlp4 library in : $CAMLP4LIB" -+if test "$best_compiler" = opt ; then -+echo " Native dynamic link support : $HASNATDYNLINK" -+fi -+if test "$COQIDE" != "no"; then -+echo " Lablgtk2 library in : $LABLGTKLIB" -+fi -+if test "$with_doc" = "all"; then -+echo " Documentation : All" -+else -+echo " Documentation : None" -+fi -+echo " CoqIde : $COQIDE" -+echo " Web browser : $BROWSER" -+echo " Coq web site : $WWWCOQ" -+echo "" -+ -+echo " Paths for true installation:" -+echo " binaries will be copied in $BINDIR" -+echo " library will be copied in $LIBDIR" -+echo " man pages will be copied in $MANDIR" -+echo " documentation will be copied in $DOCDIR" -+echo " emacs mode will be copied in $EMACSLIB" -+echo "" -+ -+################################################## -+# Building the $COQTOP/dev/ocamldebug-coq file -+################################################## -+ -+OCAMLDEBUGCOQ=$COQSRC/dev/ocamldebug-coq -+ -+if test "$coq_debug_flag" = "-g" ; then -+ rm -f $OCAMLDEBUGCOQ -+ sed -e "s|COQTOPDIRECTORY|$COQTOP|" \ -+ -e "s|COQLIBDIRECTORY|$LIBDIR|" \ -+ -e "s|CAMLBINDIRECTORY|$CAMLBIN|" \ -+ -e "s|CAMLP4LIBDIRECTORY|$FULLCAMLP4LIB|"\ -+ $OCAMLDEBUGCOQ.template > $OCAMLDEBUGCOQ -+ chmod a-w,a+x $OCAMLDEBUGCOQ -+fi -+ -+#################################################### -+# Fixing lablgtk types (before/after 2.6.0) -+#################################################### -+ -+if [ ! "$COQIDE" = "no" ]; then -+ if grep "class view " "$lablgtkdir/gText.mli" | grep -q "\[>" ; then -+ if grep -q "?accepts_tab:bool" "$lablgtkdir/gText.mli" ; then -+ cp -f ide/undo_lablgtk_ge212.mli ide/undo.mli -+ else -+ cp -f ide/undo_lablgtk_ge26.mli ide/undo.mli -+ fi -+ else -+ cp -f ide/undo_lablgtk_lt26.mli ide/undo.mli -+ fi -+fi -+ -+############################################## -+# Creation of configuration files -+############################################## -+ -+mlconfig_file="$COQSRC/config/coq_config.ml" -+config_file="$COQSRC/config/Makefile" -+config_template="$COQSRC/config/Makefile.template" -+ -+ -+### Warning !! -+### After this line, be careful when using variables, -+### since some of them (e.g. $COQSRC) will be escaped -+ -+ -+# An escaped version of a variable -+escape_var () { -+"$ocamlexec" 2>&1 1>/dev/null <<EOF -+ prerr_endline(String.escaped(Sys.getenv"$VAR"));; -+EOF -+} -+ -+# Escaped version of browser command -+export BROWSER -+BROWSER=`VAR=BROWSER escape_var` -+ -+# damned backslashes under M$Windows -+case $ARCH in -+ win32) -+ COQTOP=`echo $COQTOP |sed -e 's|\\\|\\\\\\\|g'` -+ BINDIR=`echo $BINDIR |sed -e 's|\\\|\\\\\\\|g'` -+ COQSRC=`cygpath -m $COQSRC |sed -e 's|\\\|\\\\\\\|g'` -+ LIBDIR=`echo $LIBDIR |sed -e 's|\\\|\\\\\\\|g'` -+ CAMLBIN=`echo $CAMLBIN |sed -e 's|\\\|\\\\\\\|g'` -+ CAMLLIB=`echo $CAMLLIB |sed -e 's|\\\|\\\\\\\|g'` -+ MANDIR=`echo $MANDIR |sed -e 's|\\\|\\\\\\\|g'` -+ DOCDIR=`echo $DOCDIR |sed -e 's|\\\|\\\\\\\|g'` -+ EMACSLIB=`echo $EMACSLIB |sed -e 's|\\\|\\\\\\\|g'` -+ COQDOCDIR=`echo $COQDOCDIR |sed -e 's|\\\|\\\\\\\|g'` -+ CAMLP4BIN=`echo $CAMLP4BIN |sed -e 's|\\\|\\\\\\\|g'` -+ CAMLP4LIB=`echo $CAMLP4LIB |sed -e 's|\\\|\\\\\\\|g'` -+ LABLGTKINCLUDES=`echo $LABLGTKINCLUDES |sed -e 's|\\\|\\\\\\\|g'` -+ COQRUNBYTEFLAGS=`echo $COQRUNBYTEFLAGS |sed -e 's|\\\|\\\\\\\|g'` -+ COQTOOLSBYTEFLAGS=`echo $COQTOOLSBYTEFLAGS |sed -e 's|\\\|\\\\\\\|g'` -+ BUILDLDPATH=`echo $BUILDLDPATH |sed -e 's|\\\|\\\\\\\|g'` -+ ocamlexec=`echo $ocamlexec |sed -e 's|\\\|\\\\\\\|g'` -+ bytecamlc=`echo $bytecamlc |sed -e 's|\\\|\\\\\\\|g'` -+ nativecamlc=`echo $nativecamlc |sed -e 's|\\\|\\\\\\\|g'` -+ ocamlmklibexec=`echo $ocamlmklibexec |sed -e 's|\\\|\\\\\\\|g'` -+ ocamldepexec=`echo $ocamldepexec |sed -e 's|\\\|\\\\\\\|g'` -+ ocamldocexec=`echo $ocamldocexec |sed -e 's|\\\|\\\\\\\|g'` -+ ocamllexexec=`echo $ocamllexexec |sed -e 's|\\\|\\\\\\\|g'` -+ ocamlyaccexec=`echo $ocamlyaccexec |sed -e 's|\\\|\\\\\\\|g'` -+ camlp4oexec=`echo $camlp4oexec |sed -e 's|\\\|\\\\\\\|g'` -+ ;; -+esac -+ -+##################################################### -+# Building the $COQTOP/config/coq_config.ml file -+##################################################### -+ -+rm -f "$mlconfig_file" -+cat << END_OF_COQ_CONFIG > $mlconfig_file -+(* DO NOT EDIT THIS FILE: automatically generated by ../configure *) -+ -+let local = $local -+let coqrunbyteflags = "$COQRUNBYTEFLAGS" -+let coqlib = "$LIBDIR" -+let coqsrc = "$COQSRC" -+let ocaml = "$ocamlexec" -+let ocamlc = "$bytecamlc" -+let ocamlopt = "$nativecamlc" -+let ocamlmklib = "$ocamlmklibexec" -+let ocamldep = "$ocamldepexec" -+let ocamldoc = "$ocamldocexec" -+let ocamlyacc = "$ocamlyaccexec" -+let ocamllex = "$ocamllexexec" -+let camlbin = "$CAMLBIN" -+let camllib = "$CAMLLIB" -+let camlp4 = "$CAMLP4" -+let camlp4o = "$camlp4oexec" -+let camlp4bin = "$CAMLP4BIN" -+let camlp4lib = "$CAMLP4LIB" -+let camlp4compat = "$CAMLP4COMPAT" -+let coqideincl = "$LABLGTKINCLUDES" -+let cflags = "$cflags" -+let best = "$best_compiler" -+let arch = "$ARCH" -+let has_coqide = "$COQIDE" -+let has_natdynlink = $HASNATDYNLINK -+let natdynlinkflag = "$NATDYNLINKFLAG" -+let osdeplibs = "$OSDEPLIBS" -+let version = "$VERSION" -+let caml_version = "$CAMLVERSION" -+let date = "$DATE" -+let compile_date = "$COMPILEDATE" -+let vo_magic_number = $VOMAGIC -+let state_magic_number = $STATEMAGIC -+let exec_extension = "$EXE" -+let with_geoproof = ref $with_geoproof -+let browser = "$BROWSER" -+let wwwcoq = "$WWWCOQ" -+let wwwrefman = wwwcoq ^ "distrib/" ^ version ^ "/refman/" -+let wwwstdlib = wwwcoq ^ "distrib/" ^ version ^ "/stdlib/" -+let localwwwrefman = "file://$HTMLREFMANDIR/" -+ -+END_OF_COQ_CONFIG -+ -+# to be sure printf is found on windows when spaces occur in PATH variable -+PRINTF=`which printf` -+ -+# Subdirectories of theories/ added in coq_config.ml -+subdirs () { -+ (cd $1; find * \( -name .svn -prune \) -o \( -type d -exec $PRINTF "\"%s\";\n" {} \; \) >> "$mlconfig_file") -+} -+ -+echo "let theories_dirs = [" >> "$mlconfig_file" -+subdirs theories -+echo "]" >> "$mlconfig_file" -+ -+echo "let plugins_dirs = [" >> "$mlconfig_file" -+subdirs plugins -+echo "]" >> "$mlconfig_file" -+ -+chmod a-w "$mlconfig_file" -+ -+ -+############################################### -+# Building the $COQTOP/config/Makefile file -+############################################### -+ -+rm -f "$config_file" -+ -+sed -e "s|LOCALINSTALLATION|$local|" \ -+ -e "s|XCOQRUNBYTEFLAGS|$COQRUNBYTEFLAGS|" \ -+ -e "s|XCOQTOOLSBYTEFLAGS|$COQTOOLSBYTEFLAGS|" \ -+ -e "s|COQSRCDIRECTORY|$COQSRC|" \ -+ -e "s|COQVERSION|$VERSION|" \ -+ -e "s|BINDIRDIRECTORY|$BINDIR|" \ -+ -e "s|COQLIBDIRECTORY|$LIBDIR|" \ -+ -e "s|BUILDLDPATH=|$BUILDLDPATH|" \ -+ -e "s|MANDIRDIRECTORY|$MANDIR|" \ -+ -e "s|DOCDIRDIRECTORY|$DOCDIR|" \ -+ -e "s|EMACSLIBDIRECTORY|$EMACSLIB|" \ -+ -e "s|EMACSCOMMAND|$EMACS|" \ -+ -e "s|COQDOCDIRECTORY|$COQDOCDIR|" \ -+ -e "s|MKTEXLSRCOMMAND|$MKTEXLSR|" \ -+ -e "s|ARCHITECTURE|$ARCH|" \ -+ -e "s|OSDEPENDENTLIBS|$OSDEPLIBS|" \ -+ -e "s|OSDEPENDENTP4OPTFLAGS|$OSDEPP4OPTFLAGS|" \ -+ -e "s|CAMLLIBDIRECTORY|$CAMLLIB|" \ -+ -e "s|CAMLTAG|$CAMLTAG|" \ -+ -e "s|CAMLP4BINDIRECTORY|$CAMLP4BIN|" \ -+ -e "s|CAMLP4LIBDIRECTORY|$CAMLP4LIB|" \ -+ -e "s|CAMLP4TOOL|$camlp4oexec|" \ -+ -e "s|CAMLP4COMPATFLAGS|$CAMLP4COMPAT|" \ -+ -e "s|LABLGTKINCLUDES|$LABLGTKINCLUDES|" \ -+ -e "s|COQDEBUGFLAGOPT|$coq_debug_flag_opt|" \ -+ -e "s|COQDEBUGFLAG|$coq_debug_flag|" \ -+ -e "s|COQPROFILEFLAG|$coq_profile_flag|" \ -+ -e "s|CAMLANNOTATEFLAG|$coq_annotate_flag|" \ -+ -e "s|CCOMPILEFLAGS|$cflags|" \ -+ -e "s|BESTCOMPILER|$best_compiler|" \ -+ -e "s|DLLEXTENSION|$DLLEXT|" \ -+ -e "s|EXECUTEEXTENSION|$EXE|" \ -+ -e "s|BYTECAMLC|$bytecamlc|" \ -+ -e "s|OCAMLMKLIBEXEC|$ocamlmklibexec|" \ -+ -e "s|NATIVECAMLC|$nativecamlc|" \ -+ -e "s|OCAMLEXEC|$ocamlexec|" \ -+ -e "s|OCAMLDEPEXEC|$ocamldepexec|" \ -+ -e "s|OCAMLDOCEXEC|$ocamldocexec|" \ -+ -e "s|OCAMLLEXEXEC|$ocamllexexec|" \ -+ -e "s|OCAMLYACCEXEC|$ocamlyaccexec|" \ -+ -e "s|CAMLMKTOPEXEC|$ocamlmktopexec|" \ -+ -e "s|CCEXEC|$gcc_exec|" \ -+ -e "s|AREXEC|$ar_exec|" \ -+ -e "s|RANLIBEXEC|$ranlib_exec|" \ -+ -e "s|STRIPCOMMAND|$STRIPCOMMAND|" \ -+ -e "s|COQIDEOPT|$COQIDE|" \ -+ -e "s|CHECKEDOUTSOURCETREE|$checkedout|" \ -+ -e "s|WITHDOCOPT|$with_doc|" \ -+ -e "s|HASNATIVEDYNLINK|$NATDYNLINKFLAG|" \ -+ "$config_template" > "$config_file" -+ -+chmod a-w "$config_file" -+ -+################################################## -+# The end -+#################################################### -+ -+echo "If anything in the above is wrong, please restart './configure'." -+echo -+echo "*Warning* To compile the system for a new architecture" -+echo " don't forget to do a 'make archclean' before './configure'." -+ -+# $Id: configure 14833 2011-12-19 21:57:30Z notin $ diff --git a/pkgs/applications/science/logic/coq/no-codesign.patch b/pkgs/applications/science/logic/coq/no-codesign.patch deleted file mode 100644 index 0f917fbf56d4..000000000000 --- a/pkgs/applications/science/logic/coq/no-codesign.patch +++ /dev/null @@ -1,19 +0,0 @@ -diff --git a/Makefile.build b/Makefile.build -index 2963a3d..876479c 100644 ---- a/Makefile.build -+++ b/Makefile.build -@@ -101,13 +101,8 @@ BYTEFLAGS=$(CAMLDEBUG) $(USERFLAGS) - OPTFLAGS=$(CAMLDEBUGOPT) $(CAMLTIMEPROF) $(USERFLAGS) - DEPFLAGS= $(LOCALINCLUDES) -I ide -I ide/utils - --ifeq ($(ARCH),Darwin) --LINKMETADATA=-ccopt "-sectcreate __TEXT __info_plist config/Info-$(notdir $@).plist" --CODESIGN=codesign -s - --else - LINKMETADATA= - CODESIGN=true --endif - - define bestocaml - $(if $(OPT),\ - diff --git a/pkgs/applications/science/logic/matita/130312.nix b/pkgs/applications/science/logic/matita/130312.nix deleted file mode 100644 index 573b0ad7e4b5..000000000000 --- a/pkgs/applications/science/logic/matita/130312.nix +++ /dev/null @@ -1,65 +0,0 @@ -{stdenv, fetchurl, ocaml, findlib, gdome2, ocaml_expat, gmetadom, ocaml_http, lablgtk, ocaml_mysql, ocamlnet, ulex08, camlzip, ocaml_pcre, automake, autoconf }: - -let - version = "0.99.1pre130312"; - pname = "matita"; -in - -stdenv.mkDerivation { - name = "${pname}-${version}"; - - src = fetchurl { - url = "http://matita.cs.unibo.it/sources/${pname}_130312.tar.gz"; - sha256 = "13mjvvldv53dcdid6wmc6g8yn98xca26xq2rgq2jg700lqsni59s"; - }; - - sourceRoot="${pname}-${version}"; - - unpackPhase = '' - mkdir $sourceRoot - tar -xvzf $src -C $sourceRoot - echo "source root is $sourceRoot" - ''; - - prePatch = '' - autoreconf -fvi - ''; - - buildInputs = [ocaml findlib gdome2 ocaml_expat gmetadom ocaml_http lablgtk ocaml_mysql ocamlnet ulex08 camlzip ocaml_pcre automake autoconf]; - - postPatch = '' - BASH=$(type -tp bash) - substituteInPlace components/Makefile --replace "SHELL=/bin/bash" "SHELL=$BASH" - substituteInPlace matita/Makefile --replace "SHELL=/bin/bash" "SHELL=$BASH" - substituteInPlace configure --replace "ulex08" "ulex" - substituteInPlace components/METAS/meta.helm-content_pres.src --replace "ulex08" "ulex" - substituteInPlace components/content_pres/Makefile --replace "ulex08" "ulex" - substituteInPlace components/METAS/meta.helm-grafite_parser.src --replace "ulex08" "ulex" - substituteInPlace components/grafite_parser/Makefile --replace "ulex08" "ulex" - substituteInPlace configure --replace "zip" "camlzip" - substituteInPlace components/METAS/meta.helm-getter.src --replace "zip" "camlzip" - substituteInPlace components/METAS/meta.helm-xml.src --replace "zip" "camlzip" - ''; - - patches = [ ./configure_130312.patch ]; - - preConfigure = '' - # Setup for findlib. - OCAMLPATH=$(pwd)/components/METAS:$OCAMLPATH - RTDIR=$out/share/matita - export configureFlags="--with-runtime-dir=$RTDIR" - ''; - - postInstall = '' - mkdir -p $out/bin - ln -vs $RTDIR/matita $RTDIR/matitac $RTDIR/matitaclean $RTDIR/matitadep $RTDIR/matitawiki $out/bin - ''; - - meta = { - homepage = http://matita.cs.unibo.it/; - description = "Matita is an experimental, interactive theorem prover"; - license = stdenv.lib.licenses.gpl2Plus; - maintainers = [ stdenv.lib.maintainers.roconnor ]; - broken = true; - }; -} diff --git a/pkgs/applications/science/logic/matita/Makefile.patch b/pkgs/applications/science/logic/matita/Makefile.patch deleted file mode 100644 index 64c9a13f2d07..000000000000 --- a/pkgs/applications/science/logic/matita/Makefile.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- matita-0.5.8/Makefile 2009-12-01 18:21:00.000000000 -0500 -+++ matita-0.5.8/Makefile 2010-09-16 10:33:59.665461260 -0400 -@@ -38,7 +38,7 @@ - uninstall: $(foreach d,$(SUBDIRS),rec@uninstall@$(d)) - - rec@%: -- $(MAKE) -C $(word 2, $(subst @, ,$*)) $(word 1, $(subst @, ,$*)) DESTDIR=$(shell pwd)/$(DESTDIR) -+ $(MAKE) -C $(word 2, $(subst @, ,$*)) $(word 1, $(subst @, ,$*)) - - # {{{ Distribution stuff - diff --git a/pkgs/applications/science/logic/matita/configure.patch b/pkgs/applications/science/logic/matita/configure.patch deleted file mode 100644 index 9a3bbbb13f52..000000000000 --- a/pkgs/applications/science/logic/matita/configure.patch +++ /dev/null @@ -1,36 +0,0 @@ ---- zzz/matita-0.5.8/configure 2009-12-01 18:21:00.000000000 -0500 -+++ matita-0.5.8/configure 2010-09-07 19:57:29.732139550 -0400 -@@ -1895,6 +1895,7 @@ - # look for METAS dir - - LIBSPATH="`pwd`/components" -+OLDCAMLPATH="$OCAMLPATH" - OCAMLPATH="$LIBSPATH/METAS" - - # creating META.* -@@ -1917,7 +1918,7 @@ - gdome2 \ - http \ - lablgtk2 \ --lablgtksourceview2.gtksourceview2 \ -+lablgtk2.gtksourceview \ - lablgtkmathview \ - mysql \ - netstring \ -@@ -1951,14 +1952,14 @@ - $FINDLIB_CREQUIRES \ - lablgtk2.glade \ - lablgtkmathview \ --lablgtksourceview2.gtksourceview2 \ -+lablgtk2.gtksourceview \ - helm-xmldiff \ - " - for r in $FINDLIB_LIBSREQUIRES $FINDLIB_REQUIRES - do - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $r ocaml library" >&5 - $as_echo_n "checking for $r ocaml library... " >&6; } -- if OCAMLPATH=$OCAMLPATH $OCAMLFIND query $r &> /dev/null; then -+ if OCAMLPATH=$OCAMLPATH:$OLDCAMLPATH $OCAMLFIND query $r &> /dev/null; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 - $as_echo "yes" >&6; } - else diff --git a/pkgs/applications/science/logic/matita/configure_130312.patch b/pkgs/applications/science/logic/matita/configure_130312.patch deleted file mode 100644 index 255feec566bf..000000000000 --- a/pkgs/applications/science/logic/matita/configure_130312.patch +++ /dev/null @@ -1,35 +0,0 @@ ---- matita/configure 2011-11-22 06:04:17.000000000 -0500 -+++ matita/configure 2011-11-24 11:43:11.584847938 -0500 -@@ -1905,6 +1905,7 @@ - # look for METAS dir - - LIBSPATH="`pwd`/components" -+OLDCAMLPATH="$OCAMLPATH" - OCAMLPATH="$LIBSPATH/METAS" - - # creating META.* -@@ -1927,7 +1928,7 @@ - gdome2 \ - http \ - lablgtk2 \ --lablgtksourceview2.gtksourceview2 \ -+lablgtk2.gtksourceview \ - mysql \ - netstring \ - ulex08 \ -@@ -1953,13 +1954,13 @@ - FINDLIB_REQUIRES="\ - $FINDLIB_CREQUIRES \ - lablgtk2.glade \ --lablgtksourceview2.gtksourceview2 \ -+lablgtk2.gtksourceview \ - " - for r in $FINDLIB_LIBSREQUIRES $FINDLIB_REQUIRES - do - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $r ocaml library" >&5 - $as_echo_n "checking for $r ocaml library... " >&6; } -- if OCAMLPATH=$OCAMLPATH $OCAMLFIND query $r &> /dev/null; then -+ if OCAMLPATH=$OCAMLPATH:$OLDCAMLPATH $OCAMLFIND query $r &> /dev/null; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 - $as_echo "yes" >&6; } - else diff --git a/pkgs/applications/science/logic/matita/default.nix b/pkgs/applications/science/logic/matita/default.nix deleted file mode 100644 index 5495f61bfd88..000000000000 --- a/pkgs/applications/science/logic/matita/default.nix +++ /dev/null @@ -1,52 +0,0 @@ -{stdenv, fetchurl, ocaml, findlib, gdome2, ocaml_expat, gmetadom, ocaml_http, lablgtk, lablgtkmathview, ocaml_mysql, ocaml_sqlite3, ocamlnet, ulex08, camlzip, ocaml_pcre }: - -let - version = "0.5.8"; - pname = "matita"; -in - -stdenv.mkDerivation { - name = "${pname}-${version}"; - - src = fetchurl { - url = "http://matita.cs.unibo.it/FILES/${pname}-${version}.orig.tar.gz"; - sha256 = "04sxklfak71khy1f07ks5c6163jbpxv6fmaw03fx8gwwlvpmzglh"; - }; - - buildInputs = [ocaml findlib gdome2 ocaml_expat gmetadom ocaml_http lablgtk lablgtkmathview ocaml_mysql ocaml_sqlite3 ocamlnet ulex08 camlzip ocaml_pcre ]; - - postPatch = '' - BASH=$(type -tp bash) - substituteInPlace components/Makefile --replace "SHELL=/bin/bash" "SHELL=$BASH" - substituteInPlace matita/Makefile --replace "SHELL=/bin/bash" "SHELL=$BASH" - substituteInPlace configure --replace "ulex08" "ulex" - substituteInPlace components/METAS/meta.helm-content_pres.src --replace "ulex08" "ulex" - substituteInPlace components/content_pres/Makefile --replace "ulex08" "ulex" - substituteInPlace components/METAS/meta.helm-grafite_parser.src --replace "ulex08" "ulex" - substituteInPlace components/grafite_parser/Makefile --replace "ulex08" "ulex" - substituteInPlace configure --replace "zip" "camlzip" - substituteInPlace components/METAS/meta.helm-getter.src --replace "zip" "camlzip" - substituteInPlace components/METAS/meta.helm-xml.src --replace "zip" "camlzip" - ''; - - patches = [ ./configure.patch ./Makefile.patch ]; - - preConfigure = '' - # Setup for findlib. - OCAMLPATH=$(pwd)/components/METAS:$OCAMLPATH - RTDIR=$out/share/matita - export configureFlags="--with-runtime-dir=$RTDIR" - ''; - - postInstall = '' - mkdir -p $out/bin - ln -vs $RTDIR/matita $RTDIR/matitac $RTDIR/matitaclean $RTDIR/matitadep $RTDIR/matitawiki $out/bin - ''; - - meta = { - homepage = http://matita.cs.unibo.it/; - description = "Experimental, interactive theorem prover"; - license = stdenv.lib.licenses.gpl2Plus; - maintainers = [ stdenv.lib.maintainers.roconnor ]; - }; -} diff --git a/pkgs/applications/version-management/git-and-tools/git/default.nix b/pkgs/applications/version-management/git-and-tools/git/default.nix index 368e2b68d0d1..b946d0b7daaf 100644 --- a/pkgs/applications/version-management/git-and-tools/git/default.nix +++ b/pkgs/applications/version-management/git-and-tools/git/default.nix @@ -303,6 +303,8 @@ EOF disable_test t0028-working-tree-encoding ''; + stripDebugList = [ "lib" "libexec" "bin" "share/git/contrib/credential/libsecret" ]; + meta = { homepage = https://git-scm.com/; diff --git a/pkgs/applications/virtualization/tinyemu/default.nix b/pkgs/applications/virtualization/tinyemu/default.nix new file mode 100644 index 000000000000..a8f113307251 --- /dev/null +++ b/pkgs/applications/virtualization/tinyemu/default.nix @@ -0,0 +1,23 @@ +{ stdenv, fetchurl, openssl, curl, SDL }: + +stdenv.mkDerivation rec { + name = "tinyemu-${version}"; + version = "2018-09-23"; + src = fetchurl { + url = "https://bellard.org/tinyemu/${name}.tar.gz"; + sha256 = "0d6payyqf4lpvmmzvlpq1i8wpbg4sf3h6llsw0xnqdgq3m9dan4v"; + }; + buildInputs = [ openssl curl SDL ]; + makeFlags = [ "DESTDIR=$(out)" "bindir=/bin" ]; + preInstall = '' + mkdir -p "$out/bin" + ''; + meta = { + homepage = https://bellard.org/tinyemu/; + description = "A system emulator for the RISC-V and x86 architectures"; + longDescription = "TinyEMU is a system emulator for the RISC-V and x86 architectures. Its purpose is to be small and simple while being complete."; + license = with stdenv.lib.licenses; [ mit bsd2 ]; + platforms = stdenv.lib.platforms.linux; + maintainers = with stdenv.lib.maintainers; [ jhhuh ]; + }; +} diff --git a/pkgs/build-support/vm/default.nix b/pkgs/build-support/vm/default.nix index 03b3fb1f9f27..7880d98e6b6a 100644 --- a/pkgs/build-support/vm/default.nix +++ b/pkgs/build-support/vm/default.nix @@ -990,7 +990,7 @@ rec { name = "debian-9.4-stretch-i386"; fullName = "Debian 9.4 Stretch (i386)"; packagesList = fetchurl { - url = https://web.archive.org/web/20180912163509/http://ftp.debian.org/debian/dists/stretch/main/binary-i386/Packages.xz; + url = http://snapshot.debian.org/archive/debian/20180912T154744Z/dists/stretch/main/binary-i386/Packages.xz; sha256 = "0flvn8zn7vk04p10ndf3aq0mdr8k2ic01g51aq4lsllkv8lmwzyh"; }; urlPrefix = mirror://debian; @@ -1001,7 +1001,7 @@ rec { name = "debian-9.4-stretch-amd64"; fullName = "Debian 9.4 Stretch (amd64)"; packagesList = fetchurl { - url = https://web.archive.org/web/20180912163152/http://ftp.debian.org/debian/dists/stretch/main/binary-amd64/Packages.xz; + url = http://snapshot.debian.org/archive/debian/20180912T154744Z/dists/stretch/main/binary-amd64/Packages.xz; sha256 = "11vnn9bba2jabixvabfbw9zparl326c88xn99di7pbr5xsnl15jm"; }; urlPrefix = mirror://debian; diff --git a/pkgs/data/icons/papirus-icon-theme/default.nix b/pkgs/data/icons/papirus-icon-theme/default.nix index 1efd4145ce03..83cae45426f7 100644 --- a/pkgs/data/icons/papirus-icon-theme/default.nix +++ b/pkgs/data/icons/papirus-icon-theme/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { name = "papirus-icon-theme-${version}"; - version = "20180816"; + version = "20181007"; src = fetchFromGitHub { owner = "PapirusDevelopmentTeam"; repo = "papirus-icon-theme"; rev = version; - sha256 = "0rmf5hvp6711pyqdq5sdxkrjr21nbk6113r4a7d8735ynvm8znkk"; + sha256 = "1hv526k0ykq2yj9f6bcl711sgdxwx5y0yqjf5acpvcmx9pm58vz5"; }; nativeBuildInputs = [ gtk3 ]; diff --git a/pkgs/data/misc/hackage/default.nix b/pkgs/data/misc/hackage/default.nix index 3126269a6e7a..079fccadfcb1 100644 --- a/pkgs/data/misc/hackage/default.nix +++ b/pkgs/data/misc/hackage/default.nix @@ -1,6 +1,6 @@ { fetchurl }: fetchurl { - url = "https://github.com/commercialhaskell/all-cabal-hashes/archive/3715ae81be1a8e0c6a1cb5902c054b6cedfb7f41.tar.gz"; - sha256 = "05bsk99d4k2nq8dfiagpby0cllx19crzn2rh29v26p0irzagrqfb"; + url = "https://github.com/commercialhaskell/all-cabal-hashes/archive/70f02ad82349a18e1eff41eea4949be532486f7b.tar.gz"; + sha256 = "1ajqybsl8hfzbhziww57zp9a8kgypj96ngxrargk916v3xpf3x15"; } diff --git a/pkgs/development/compilers/jsonnet/default.nix b/pkgs/development/compilers/jsonnet/default.nix index f363c6fdb5ee..15eec4134acf 100644 --- a/pkgs/development/compilers/jsonnet/default.nix +++ b/pkgs/development/compilers/jsonnet/default.nix @@ -1,12 +1,8 @@ -{ stdenv, lib, fetchFromGitHub, emscripten -, enableJsonnetJs ? !stdenv.isDarwin -}: +{ stdenv, lib, fetchFromGitHub }: -let version = "0.11.2"; in - -stdenv.mkDerivation { +stdenv.mkDerivation rec { name = "jsonnet-${version}"; - version = version; + version = "0.11.2"; src = fetchFromGitHub { rev = "v${version}"; @@ -15,19 +11,18 @@ stdenv.mkDerivation { sha256 = "05rl5i4g36k2ikxv4sw726mha1qf5bb66wiqpi0s09wj9azm7vym"; }; - buildInputs = if enableJsonnetJs then [ emscripten ] else [ ]; - enableParallelBuilding = true; - makeFlags = [''EM_CACHE=$(TMPDIR)/.em_cache''] ++ - (if enableJsonnetJs then ["all"] else ["jsonnet" "libjsonnet.so" "libjsonnet++.so"]); + makeFlags = [ + "jsonnet" + "libjsonnet.so" + ]; installPhase = '' - mkdir -p $out/bin $out/lib $out/share/ + mkdir -p $out/bin $out/lib $out/include cp jsonnet $out/bin/ cp libjsonnet*.so $out/lib/ - cp -a doc $out/share/doc - cp -a include $out/include + cp -a include/*.h $out/include/ ''; meta = { diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index 409f159387fd..8ff6aed506f2 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -1074,6 +1074,10 @@ self: super: { hpack = self.hpack_0_31_0; yaml = self.yaml_0_10_2_0; }); + stack2nix = super.stack2nix.overrideScope (self: super: { + hpack = self.hpack_0_31_0; + yaml = self.yaml_0_10_2_0; + }); # Break out of "aeson <1.3, temporary <1.3". stack = doJailbreak super.stack; diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml index aee9b8df8fa3..f68270ba772e 100644 --- a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml +++ b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml @@ -45,7 +45,7 @@ default-package-overrides: - base-compat-batteries ==0.10.1 # Newer versions don't work in LTS-12.x - cassava-megaparsec < 2 - # LTS Haskell 12.11 + # LTS Haskell 12.12 - abstract-deque ==0.3 - abstract-deque-tests ==0.3 - abstract-par ==0.3.3 @@ -80,6 +80,7 @@ default-package-overrides: - alex ==3.2.4 - alg ==0.2.7.0 - algebra ==4.3.1 + - algebraic-graphs ==0.2 - Allure ==0.8.3.0 - almost-fix ==0.0.2 - alsa-core ==0.5.0.1 @@ -187,7 +188,7 @@ default-package-overrides: - apply-refact ==0.5.0.0 - apportionment ==0.0.0.3 - approximate ==0.3.1 - - app-settings ==0.2.0.11 + - app-settings ==0.2.0.12 - arithmoi ==0.7.0.0 - array-memoize ==0.6.0 - arrow-extras ==0.1.0.1 @@ -219,12 +220,12 @@ default-package-overrides: - authenticate ==1.3.4 - authenticate-oauth ==1.6 - auto ==0.4.3.1 - - autoexporter ==1.1.11 + - autoexporter ==1.1.13 - auto-update ==0.1.4 - avro ==0.3.5.1 - avwx ==0.3.0.2 - backprop ==0.2.5.0 - - bank-holidays-england ==0.1.0.7 + - bank-holidays-england ==0.1.0.8 - barrier ==0.1.1 - base16-bytestring ==0.1.1.6 - base32string ==0.9.1 @@ -314,7 +315,7 @@ default-package-overrides: - btrfs ==0.1.2.3 - buffer-builder ==0.2.4.6 - buffer-pipe ==0.0 - - butcher ==1.3.1.1 + - butcher ==1.3.2.0 - butter ==0.1.0.6 - bv ==0.5 - bv-little ==0.1.2 @@ -399,7 +400,7 @@ default-package-overrides: - clock ==0.7.2 - clock-extras ==0.1.0.2 - closed ==0.2.0 - - clr-host ==0.2.0.1 + - clr-host ==0.2.1.0 - clr-marshal ==0.2.0.0 - clumpiness ==0.17.0.0 - ClustalParser ==1.2.3 @@ -460,7 +461,7 @@ default-package-overrides: - contravariant ==1.4.1 - contravariant-extras ==0.3.4 - control-bool ==0.2.1 - - control-monad-free ==0.6.1 + - control-monad-free ==0.6.2 - control-monad-omega ==0.3.1 - convertible ==1.1.1.0 - cookie ==0.4.4 @@ -568,7 +569,7 @@ default-package-overrides: - dependent-sum-template ==0.0.0.6 - deque ==0.2.1 - deriving-compat ==0.5.2 - - derulo ==1.0.3 + - derulo ==1.0.5 - detour-via-sci ==1.0.0 - df1 ==0.1.1 - dhall ==1.15.1 @@ -616,7 +617,7 @@ default-package-overrides: - doctemplates ==0.2.2.1 - doctest ==0.16.0.1 - doctest-discover ==0.1.0.9 - - doctest-driver-gen ==0.2.0.3 + - doctest-driver-gen ==0.2.0.4 - do-list ==1.0.1 - dom-parser ==3.1.0 - dotenv ==0.5.2.5 @@ -729,8 +730,8 @@ default-package-overrides: - fileplow ==0.1.0.0 - filter-logger ==0.6.0.0 - filtrable ==0.1.1.0 - - fin ==0.0.1 - Fin ==0.2.6.0 + - fin ==0.0.1 - FindBin ==0.0.5 - find-clumpiness ==0.2.3.1 - fingertree ==0.1.4.1 @@ -746,16 +747,16 @@ default-package-overrides: - flay ==0.4 - flexible-defaults ==0.0.2 - floatshow ==0.2.4 - - flow ==1.0.15 + - flow ==1.0.17 - fmlist ==0.9.2 - fn ==0.3.0.2 - focus ==0.1.5.2 - foldable1 ==0.1.0.0 - fold-debounce ==0.2.0.8 - - fold-debounce-conduit ==0.2.0.2 - - foldl ==1.4.4 + - fold-debounce-conduit ==0.2.0.3 + - foldl ==1.4.5 - folds ==0.7.4 - - FontyFruity ==0.5.3.3 + - FontyFruity ==0.5.3.4 - force-layout ==0.4.0.6 - foreign-store ==0.2 - ForestStructures ==0.0.0.2 @@ -802,15 +803,15 @@ default-package-overrides: - genvalidity ==0.5.1.0 - genvalidity-aeson ==0.2.0.2 - genvalidity-bytestring ==0.2.0.2 - - genvalidity-containers ==0.5.0.0 - - genvalidity-hspec ==0.6.1.1 + - genvalidity-containers ==0.5.1.0 + - genvalidity-hspec ==0.6.2.0 - genvalidity-hspec-aeson ==0.3.0.0 - genvalidity-hspec-binary ==0.2.0.2 - genvalidity-hspec-cereal ==0.2.0.2 - genvalidity-hspec-hashable ==0.2.0.2 - genvalidity-path ==0.3.0.2 - - genvalidity-property ==0.2.1.0 - - genvalidity-scientific ==0.2.0.1 + - genvalidity-property ==0.2.1.1 + - genvalidity-scientific ==0.2.1.0 - genvalidity-text ==0.5.1.0 - genvalidity-time ==0.2.1.0 - genvalidity-unordered-containers ==0.2.0.3 @@ -874,9 +875,9 @@ default-package-overrides: - graph-wrapper ==0.2.5.1 - gravatar ==0.8.0 - graylog ==0.1.0.1 - - greskell ==0.2.1.0 - - greskell-core ==0.1.2.3 - - greskell-websocket ==0.1.1.1 + - greskell ==0.2.1.1 + - greskell-core ==0.1.2.4 + - greskell-websocket ==0.1.1.2 - groom ==0.1.2.1 - groups ==0.4.1.0 - gtk ==0.14.10 @@ -962,11 +963,11 @@ default-package-overrides: - hidden-char ==0.1.0.2 - hierarchical-clustering ==0.4.6 - hierarchy ==1.0.2 - - higher-leveldb ==0.5.0.1 + - higher-leveldb ==0.5.0.2 - highlighting-kate ==0.6.4 - hinotify ==0.3.10 - hint ==0.8.0 - - histogram-fill ==0.9.0.0 + - histogram-fill ==0.9.1.0 - hjsmin ==0.2.0.2 - hlibgit2 ==0.18.0.16 - hlibsass ==0.1.7.0 @@ -980,7 +981,7 @@ default-package-overrides: - hmpfr ==0.4.4 - Hoed ==0.5.1 - hoopl ==3.10.2.2 - - hOpenPGP ==2.7.2 + - hOpenPGP ==2.7.3 - hopenpgp-tools ==0.21.2 - hopfli ==0.2.2.1 - hostname ==1.0 @@ -1004,7 +1005,7 @@ default-package-overrides: - hsemail ==2 - HSet ==0.0.1 - hset ==2.2.0 - - hsexif ==0.6.1.5 + - hsexif ==0.6.1.6 - hs-functors ==0.1.3.0 - hs-GeoIP ==0.3 - hsini ==0.5.1.2 @@ -1058,7 +1059,7 @@ default-package-overrides: - http-date ==0.0.8 - httpd-shed ==0.4.0.3 - http-link-header ==1.0.3.1 - - http-media ==0.7.1.2 + - http-media ==0.7.1.3 - http-reverse-proxy ==0.6.0 - http-streams ==0.8.6.1 - http-types ==0.12.2 @@ -1070,7 +1071,7 @@ default-package-overrides: - hvega ==0.1.0.3 - hw-balancedparens ==0.2.0.2 - hw-bits ==0.7.0.3 - - hw-conduit ==0.2.0.3 + - hw-conduit ==0.2.0.5 - hw-diagnostics ==0.0.0.5 - hweblib ==0.6.3 - hw-excess ==0.2.0.2 @@ -1117,10 +1118,10 @@ default-package-overrides: - immortal ==0.3 - include-file ==0.1.0.3 - incremental-parser ==0.3.1.1 - - indentation-core ==0.0.0.1 - - indentation-parsec ==0.0.0.1 + - indentation-core ==0.0.0.2 + - indentation-parsec ==0.0.0.2 - indents ==0.5.0.0 - - indexed-list-literals ==0.2.1.1 + - indexed-list-literals ==0.2.1.2 - inflections ==0.4.0.3 - influxdb ==1.6.0.9 - ini ==0.3.6 @@ -1153,7 +1154,7 @@ default-package-overrides: - ip ==1.3.0 - ip6addr ==1.0.0 - iproute ==1.7.5 - - IPv6Addr ==1.1.0 + - IPv6Addr ==1.1.1 - IPv6DB ==0.3.1 - ipython-kernel ==0.9.1.0 - irc ==0.6.1.0 @@ -1166,7 +1167,7 @@ default-package-overrides: - iso639 ==0.1.0.3 - iso8601-time ==0.1.5 - iterable ==3.0 - - ixset-typed ==0.4 + - ixset-typed ==0.4.0.1 - ix-shapable ==0.1.0 - jack ==0.7.1.4 - jmacro ==0.6.15 @@ -1273,7 +1274,7 @@ default-package-overrides: - log-domain ==0.12 - logfloat ==0.13.3.3 - logger-thread ==0.1.0.2 - - logging-effect ==1.3.2 + - logging-effect ==1.3.3 - logging-facade ==0.3.0 - logging-facade-syslog ==1 - logict ==0.6.0.2 @@ -1318,7 +1319,7 @@ default-package-overrides: - med-module ==0.1.1 - megaparsec ==6.5.0 - mega-sdist ==0.3.3.1 - - memory ==0.14.16 + - memory ==0.14.18 - MemoTrie ==0.6.9 - mercury-api ==0.1.0.1 - mersenne-random-pure64 ==0.2.2.0 @@ -1329,7 +1330,7 @@ default-package-overrides: - microformats2-parser ==1.0.1.9 - microlens ==0.4.9.1 - microlens-aeson ==2.3.0 - - microlens-contra ==0.1.0.1 + - microlens-contra ==0.1.0.2 - microlens-ghc ==0.4.9.1 - microlens-mtl ==0.1.11.1 - microlens-platform ==0.3.10 @@ -1392,7 +1393,7 @@ default-package-overrides: - mongoDB ==2.4.0.0 - monoidal-containers ==0.3.1.0 - monoid-extras ==0.5 - - monoid-subclasses ==0.4.6 + - monoid-subclasses ==0.4.6.1 - monoid-transformer ==0.0.4 - mono-traversable ==1.0.9.0 - mono-traversable-instances ==0.1.0.0 @@ -1405,9 +1406,9 @@ default-package-overrides: - multiarg ==0.30.0.10 - multimap ==1.2.1 - multipart ==0.1.3 - - multistate ==0.8.0.0 + - multistate ==0.8.0.1 - murmur-hash ==0.1.0.9 - - MusicBrainz ==0.4 + - MusicBrainz ==0.4.1 - mustache ==2.3.0 - mutable-containers ==0.3.4 - mwc-probability ==2.0.4 @@ -1476,12 +1477,12 @@ default-package-overrides: - numhask-test ==0.1.0.0 - NumInstances ==1.4 - numtype-dk ==0.5.0.2 - - nvim-hs ==1.0.0.2 + - nvim-hs ==1.0.0.3 - nvim-hs-contrib ==1.0.0.0 - oauthenticated ==0.2.1.0 - objective ==1.1.2 - ObjectName ==1.1.0.1 - - o-clock ==1.0.0 + - o-clock ==1.0.0.1 - odbc ==0.2.2 - oeis ==0.3.9 - ofx ==0.4.2.0 @@ -1509,7 +1510,7 @@ default-package-overrides: - opml-conduit ==0.6.0.4 - optional-args ==1.0.2 - options ==1.2.1.1 - - optparse-applicative ==0.14.2.0 + - optparse-applicative ==0.14.3.0 - optparse-generic ==1.3.0 - optparse-simple ==0.1.0 - optparse-text ==0.1.1.0 @@ -1737,12 +1738,13 @@ default-package-overrides: - relational-schemas ==0.1.6.2 - relude ==0.1.1 - renderable ==0.2.0.1 - - repa ==3.4.1.3 + - repa ==3.4.1.4 - repline ==0.1.7.0 - req ==1.1.0 - req-conduit ==1.0.0 - require ==0.2.1 - req-url-extra ==0.1.0.0 + - reroute ==0.5.0.0 - resolv ==0.1.1.1 - resource-pool ==0.2.3.2 - resourcet ==1.2.1 @@ -1774,7 +1776,7 @@ default-package-overrides: - safe-money ==0.6 - SafeSemaphore ==0.10.1 - saltine ==0.1.0.1 - - salve ==1.0.4 + - salve ==1.0.6 - sample-frame ==0.0.3 - sample-frame-np ==0.0.4.1 - sampling ==0.3.3 @@ -1913,6 +1915,8 @@ default-package-overrides: - splice ==0.6.1.1 - split ==0.2.3.3 - splitmix ==0.0.1 + - Spock ==0.13.0.0 + - Spock-core ==0.13.0.0 - spoon ==0.3.1 - spreadsheet ==0.1.3.8 - sqlite-simple ==0.4.16.0 @@ -1950,7 +1954,7 @@ default-package-overrides: - store-core ==0.4.4 - Strafunski-StrategyLib ==5.0.1.0 - stratosphere ==0.24.4 - - streaming ==0.2.1.0 + - streaming ==0.2.2.0 - streaming-attoparsec ==1.0.0 - streaming-bytestring ==0.1.6 - streaming-commons ==0.2.1.0 @@ -1972,7 +1976,6 @@ default-package-overrides: - strive ==5.0.6 - structs ==0.1.1 - stylish-haskell ==0.9.2.0 - - summoner ==1.0.6 - sum-type-boilerplate ==0.1.1 - sundown ==0.6 - superbuffer ==0.3.1.1 @@ -2119,7 +2122,7 @@ default-package-overrides: - tuples-homogenous-h98 ==0.1.1.0 - tuple-sop ==0.3.1.0 - tuple-th ==0.2.5 - - turtle ==1.5.11 + - turtle ==1.5.12 - TypeCompose ==0.9.13 - typed-process ==0.2.3.0 - type-fun ==0.1.1 @@ -2127,7 +2130,7 @@ default-package-overrides: - type-level-integers ==0.0.1 - type-level-kv-list ==1.1.0 - type-level-numbers ==0.1.1.1 - - typelits-witnesses ==0.3.0.2 + - typelits-witnesses ==0.3.0.3 - typenums ==0.1.2 - type-of-html ==1.4.0.1 - type-of-html-static ==0.1.0.2 @@ -2201,7 +2204,7 @@ default-package-overrides: - vec ==0.1 - vector ==0.12.0.1 - vector-algorithms ==0.7.0.4 - - vector-binary-instances ==0.2.4 + - vector-binary-instances ==0.2.5 - vector-buffer ==0.4.1 - vector-builder ==0.3.6 - vector-bytes-instances ==0.1.1 @@ -2264,8 +2267,8 @@ default-package-overrides: - weigh ==0.0.12 - wide-word ==0.1.0.6 - wikicfp-scraper ==0.1.0.9 - - wild-bind ==0.1.2.2 - - wild-bind-x11 ==0.2.0.5 + - wild-bind ==0.1.2.3 + - wild-bind-x11 ==0.2.0.6 - Win32-notify ==0.3.0.3 - wire-streams ==0.1.1.0 - withdependencies ==0.2.4.2 @@ -2333,7 +2336,7 @@ default-package-overrides: - yesod ==1.6.0 - yesod-alerts ==0.1.2.0 - yesod-auth ==1.6.4.1 - - yesod-auth-fb ==1.9.0 + - yesod-auth-fb ==1.9.1 - yesod-auth-hashdb ==1.7 - yesod-bin ==1.6.0.3 - yesod-core ==1.6.6 diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix index b160174cf5eb..352d97d497ab 100644 --- a/pkgs/development/haskell-modules/hackage-packages.nix +++ b/pkgs/development/haskell-modules/hackage-packages.nix @@ -5580,22 +5580,6 @@ self: { }: mkDerivation { pname = "FontyFruity"; - version = "0.5.3.3"; - sha256 = "0p02w0v93y11f7rzsc1im2rvld6h0pgrhmd827ypzamibry6xl5h"; - libraryHaskellDepends = [ - base binary bytestring containers deepseq directory filepath text - vector xml - ]; - description = "A true type file format loader"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "FontyFruity_0_5_3_4" = callPackage - ({ mkDerivation, base, binary, bytestring, containers, deepseq - , directory, filepath, text, vector, xml - }: - mkDerivation { - pname = "FontyFruity"; version = "0.5.3.4"; sha256 = "0gavpjv83vg5q2x254d3zi3kw5aprl6z8ifcn0vs6hymaj0qgls3"; libraryHaskellDepends = [ @@ -5604,7 +5588,6 @@ self: { ]; description = "A true type file format loader"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "ForSyDe" = callPackage @@ -5820,8 +5803,8 @@ self: { }: mkDerivation { pname = "Frames"; - version = "0.5.0"; - sha256 = "0dd2gqgxjhy23a9xhz62gzashjqmcv34gkcys4wz9l6y2fk1a5xl"; + version = "0.6.0"; + sha256 = "0ri1x80za9gjcv44xk9kgx5w5jczr2p26jlpwhmn1sgmjdyc2m02"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -5865,6 +5848,23 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "Frames-dsv" = callPackage + ({ mkDerivation, base, bytestring, Frames, hspec, hw-dsv, pipes + , template-haskell, text, vector, vinyl + }: + mkDerivation { + pname = "Frames-dsv"; + version = "0.1.1"; + sha256 = "0932k8aqn9c08ijbs29g04gcka441gg424g90cqd4ky9b3yxzm7w"; + libraryHaskellDepends = [ + base bytestring Frames hw-dsv pipes template-haskell text vector + vinyl + ]; + testHaskellDepends = [ base Frames hspec pipes ]; + description = "Alternative CSV parser for the Frames package"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "Frank" = callPackage ({ mkDerivation, base, mtl, newtype, she, void }: mkDerivation { @@ -10205,8 +10205,8 @@ self: { }: mkDerivation { pname = "IPv6Addr"; - version = "1.1.0"; - sha256 = "0f7dckgiv5yq87gb7fd31k0h4adqi6xmdc010rdb6yfgpbk10k29"; + version = "1.1.1"; + sha256 = "0l2yfn46xyv0ib30k0kmhw3vl4vfmziqinhbynpi4yrmy6lmj29v"; libraryHaskellDepends = [ aeson attoparsec base iproute network network-info random text ]; @@ -10754,8 +10754,8 @@ self: { pname = "JuicyPixels-scale-dct"; version = "0.1.2"; sha256 = "04rhrmjnh12hh2nz04k245avgdcwqfyjnsbpcrz8j9328j41nf7p"; - revision = "1"; - editedCabalFile = "1snx05qpllybd9yvy03p0lpnmimj0m24x1bxa4svxcsiv56yv9w8"; + revision = "2"; + editedCabalFile = "0pp67ygrd3m6q8ry5229m1b2rhy401gb74368h09bqc6wa3g7ygv"; libraryHaskellDepends = [ base base-compat carray fft JuicyPixels ]; @@ -12723,8 +12723,8 @@ self: { }: mkDerivation { pname = "MusicBrainz"; - version = "0.4"; - sha256 = "0aanc1c43di5wq9c2w0b5lw3p24cwpaksgxy79lqm8qxj8qd3jxr"; + version = "0.4.1"; + sha256 = "0mydq3bjf15ksfrh4lf947ka43i3978q58y2aij3aqd763v2jb16"; libraryHaskellDepends = [ aeson base bytestring conduit conduit-extra HTTP http-conduit http-types monad-control resourcet text time time-locale-compat @@ -19976,8 +19976,8 @@ self: { }: mkDerivation { pname = "accelerate"; - version = "1.2.0.0"; - sha256 = "0y8wx09smrcxkyyklrf4lrilqasbmaw1w1ga9y110bqgywkw4pmj"; + version = "1.2.0.1"; + sha256 = "0vglmasqgq0h8fvm9z8l2b3sygqvix8vr6c3n357gkr2mpz6gq8h"; setupHaskellDepends = [ base Cabal cabal-doctest ]; libraryHaskellDepends = [ ansi-terminal ansi-wl-pprint base base-orphans bytestring @@ -20272,6 +20272,8 @@ self: { pname = "accelerate-io"; version = "1.2.0.0"; sha256 = "13pqqsd5pbxmgsxnp9w141mnwscnlmbhxaz6f5jx4ssipnma2pwf"; + revision = "1"; + editedCabalFile = "0n1bch7rb2pvfqajjzaxrlw06f7vr583ckvn2ldr6lv59w1jrk3l"; libraryHaskellDepends = [ accelerate array base bmp bytestring primitive repa vector ]; @@ -21031,6 +21033,8 @@ self: { pname = "acme-stringly-typed"; version = "1.0.0.0"; sha256 = "18wvsvdmbwh9dcawiy4f9pn4vg98kdq9zxc37sz7dpmaigimw16f"; + revision = "1"; + editedCabalFile = "0i5hark97zl45iyiijxj07d2pg112kh3jcmjmscpbss5l5n02h23"; libraryHaskellDepends = [ base ]; description = "Stringly Typed Programming"; license = stdenv.lib.licenses.bsd3; @@ -26999,8 +27003,8 @@ self: { }: mkDerivation { pname = "antiope-athena"; - version = "6.0.3"; - sha256 = "0w50dw9fig4fhk40fjgj1hggs1jbw0yhdrzinmwr2a8lg3nxx5z6"; + version = "6.1.1"; + sha256 = "1scshv7whw3ylp9nq8zgz12rbkvwq6hmcwn04s8h7ygnb9k3zy21"; libraryHaskellDepends = [ amazonka amazonka-athena amazonka-core base lens resourcet text unliftio-core @@ -27016,8 +27020,8 @@ self: { ({ mkDerivation, aeson, antiope-s3, avro, base, bytestring, text }: mkDerivation { pname = "antiope-contract"; - version = "6.0.3"; - sha256 = "001qywhyk013148g4cjw5xkr6b006zvn9f18m98mj5wg6wm1yxzc"; + version = "6.1.1"; + sha256 = "14nvb786w4cqam3nd3wjfr7m0ysbr07vjm0ivwsxyvda3mwkn7pz"; libraryHaskellDepends = [ aeson antiope-s3 avro base bytestring text ]; @@ -27032,8 +27036,8 @@ self: { }: mkDerivation { pname = "antiope-core"; - version = "6.0.3"; - sha256 = "1zrp7dp86vgcj215ykwagjwpqnz137qbi1czhasxq3bby6rmkvca"; + version = "6.1.1"; + sha256 = "0vmqyhxwfs45x3cqrlm1nij0cfnw2bk6sq3ldq6vrfpzm892g6py"; libraryHaskellDepends = [ amazonka amazonka-core base bytestring generic-lens http-client lens monad-logger mtl resourcet transformers unliftio-core @@ -27053,8 +27057,8 @@ self: { }: mkDerivation { pname = "antiope-dynamodb"; - version = "6.0.3"; - sha256 = "1s4x1y88zzac8i5p2yg28q91lknh4cxm72fsxqbpdwq43p1iynb0"; + version = "6.1.1"; + sha256 = "1kjsqka70bnkjzgdi427jqihlnm997ii147nzj8w04w5d6ynm2ly"; libraryHaskellDepends = [ amazonka amazonka-core amazonka-dynamodb antiope-core base generic-lens lens text unliftio-core unordered-containers @@ -27074,8 +27078,8 @@ self: { }: mkDerivation { pname = "antiope-messages"; - version = "6.0.3"; - sha256 = "1mvg36wbj5knqrzmrvh9pn7aw1a22pcv1j8dafvg9qzm6wkr2liw"; + version = "6.1.1"; + sha256 = "0nklh0wi1y6drpm7i4ssjc8xx4b20knpnghn2yv839ph6w0f0r13"; libraryHaskellDepends = [ aeson amazonka amazonka-core amazonka-s3 amazonka-sqs antiope-s3 base generic-lens lens lens-aeson monad-loops network-uri text @@ -27091,24 +27095,26 @@ self: { }) {}; "antiope-s3" = callPackage - ({ mkDerivation, amazonka, amazonka-core, amazonka-s3, base - , bytestring, conduit, conduit-extra, exceptions, generic-lens - , http-types, lens, monad-logger, network-uri, resourcet, text + ({ mkDerivation, amazonka, amazonka-core, amazonka-s3, antiope-core + , base, bytestring, conduit, conduit-extra, exceptions + , generic-lens, hedgehog, hspec, http-types, hw-hspec-hedgehog + , lens, monad-logger, mtl, network-uri, resourcet, text , unliftio-core }: mkDerivation { pname = "antiope-s3"; - version = "6.0.3"; - sha256 = "17ffjl3myk0575cds8z49rv9nkc72yvx37ka5l4r43p8faj82q2m"; + version = "6.1.1"; + sha256 = "0aq0qk377wvxm3kgy63zk382rnvjxx8csxj63vnmc5gikz5i2ya7"; libraryHaskellDepends = [ - amazonka amazonka-core amazonka-s3 base bytestring conduit - conduit-extra exceptions generic-lens http-types lens monad-logger - network-uri resourcet text unliftio-core + amazonka amazonka-core amazonka-s3 antiope-core base bytestring + conduit conduit-extra exceptions generic-lens http-types lens + monad-logger mtl network-uri resourcet text unliftio-core ]; testHaskellDepends = [ - amazonka amazonka-core amazonka-s3 base bytestring conduit - conduit-extra exceptions generic-lens http-types lens monad-logger - network-uri resourcet text unliftio-core + amazonka amazonka-core amazonka-s3 antiope-core base bytestring + conduit conduit-extra exceptions generic-lens hedgehog hspec + http-types hw-hspec-hedgehog lens monad-logger mtl network-uri + resourcet text unliftio-core ]; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; @@ -27120,8 +27126,8 @@ self: { }: mkDerivation { pname = "antiope-sns"; - version = "6.0.3"; - sha256 = "1zxwhlaypk0pykrg39zi1zlz7zs0dha4ri3b6cb0qdbprcwbfvvx"; + version = "6.1.1"; + sha256 = "0jdlm3sl7w5cq2hpikm73763np56g16z48b34wavg9yblrdfvvn7"; libraryHaskellDepends = [ aeson amazonka amazonka-core amazonka-sns base generic-lens lens text unliftio-core @@ -27141,8 +27147,8 @@ self: { }: mkDerivation { pname = "antiope-sqs"; - version = "6.0.3"; - sha256 = "0clljlvbz6irxpfjrzhc541991r9spsw8aj5mblb666llc34nbax"; + version = "6.1.1"; + sha256 = "189wgl3qpmf4amgc571zv88zpdblaqcbcnw93a6lk6i7rzc6h40r"; libraryHaskellDepends = [ aeson amazonka amazonka-core amazonka-s3 amazonka-sqs antiope-messages antiope-s3 base generic-lens lens lens-aeson @@ -27848,24 +27854,6 @@ self: { }: mkDerivation { pname = "app-settings"; - version = "0.2.0.11"; - sha256 = "1cahrpf42g5ids4k6hlzys1kmbgy1ypgax9ljckwymafradcc53a"; - libraryHaskellDepends = [ - base containers directory mtl parsec text - ]; - testHaskellDepends = [ - base containers directory hspec HUnit mtl parsec text - ]; - description = "A library to manage application settings (INI file-like)"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "app-settings_0_2_0_12" = callPackage - ({ mkDerivation, base, containers, directory, hspec, HUnit, mtl - , parsec, text - }: - mkDerivation { - pname = "app-settings"; version = "0.2.0.12"; sha256 = "1nncn8vmq55m4b6zh77mdmx19d1s7z0af4pmz1v082bpf2wril9b"; libraryHaskellDepends = [ @@ -27876,7 +27864,6 @@ self: { ]; description = "A library to manage application settings (INI file-like)"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "appar" = callPackage @@ -31031,8 +31018,8 @@ self: { ({ mkDerivation, base, Cabal, directory, filepath }: mkDerivation { pname = "autoexporter"; - version = "1.1.11"; - sha256 = "17d1a2fns4b3gw8cggg9yq1fxvkyr859s3y22i9lviz6x7hd8dvn"; + version = "1.1.13"; + sha256 = "05mgvif7wiq0vplk92kp8qn4a5wfma1gwdihqlz5lspmczszpdkv"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base Cabal directory filepath ]; @@ -31207,8 +31194,8 @@ self: { pname = "avers"; version = "0.0.17.1"; sha256 = "1x96fvx0z7z75c39qcggw70qvqnw7kzjf0qqxb3jwg3b0fmdhi8v"; - revision = "25"; - editedCabalFile = "11igp1sw7snsjcrw865rrcp1k14828yj5z9q9kdmn09f0hdl57rb"; + revision = "28"; + editedCabalFile = "1x653r0x4frpp78jncvr91kc7g41i9c3s561cizyh518318lvsnr"; libraryHaskellDepends = [ aeson attoparsec base bytestring clock containers cryptonite filepath inflections memory MonadRandom mtl network network-uri @@ -32685,25 +32672,12 @@ self: { ({ mkDerivation, base, containers, hspec, QuickCheck, time }: mkDerivation { pname = "bank-holidays-england"; - version = "0.1.0.7"; - sha256 = "196ldac7aljysw8m4nzdyf5mygswbckkvd6axm8a9yw4vchzcjks"; - libraryHaskellDepends = [ base containers time ]; - testHaskellDepends = [ base containers hspec QuickCheck time ]; - description = "Calculation of bank holidays in England and Wales"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "bank-holidays-england_0_1_0_8" = callPackage - ({ mkDerivation, base, containers, hspec, QuickCheck, time }: - mkDerivation { - pname = "bank-holidays-england"; version = "0.1.0.8"; sha256 = "0ak7m4xaymbh3cyhddj45p0pcazf79lnp63wvh4kh2f4fwh4f69j"; libraryHaskellDepends = [ base containers time ]; testHaskellDepends = [ base containers hspec QuickCheck time ]; description = "Calculation of bank holidays in England and Wales"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "banwords" = callPackage @@ -39635,6 +39609,8 @@ self: { pname = "btrfs"; version = "0.1.2.3"; sha256 = "13dq5xdzny1c0yih67r3yhnsr9vxxim8kbqbj5hcygb2cmf0pz3y"; + revision = "1"; + editedCabalFile = "1py88k9sjmx9x41l0wmp19a52ng9fdf66rmd0n9404gxxbqd5jxv"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base bytestring time unix ]; @@ -40149,10 +40125,31 @@ self: { }: mkDerivation { pname = "butcher"; - version = "1.3.1.1"; - sha256 = "1llhsqg8m4f7am14kvw4psm5fb8kcph27mk059vg2mq65xns470z"; - revision = "2"; - editedCabalFile = "0r600p7pd4l4p75igklwfqqxp2jyl2ghqc3y6jhn473rrw31g36m"; + version = "1.3.2.0"; + sha256 = "06pas8iq0qvvraidjid9m85z7wx8cy017xhyqralxz67alirmchc"; + revision = "1"; + editedCabalFile = "1r4v2biwd0hp6v1jgx7zngh0hqlsk8ia3bvggbxxn5sp5x7ika1m"; + libraryHaskellDepends = [ + base bifunctors containers deque extra free microlens microlens-th + mtl multistate pretty transformers unsafe void + ]; + testHaskellDepends = [ + base containers deque extra free hspec microlens microlens-th mtl + multistate pretty transformers unsafe + ]; + description = "Chops a command or program invocation into digestable pieces"; + license = stdenv.lib.licenses.bsd3; + }) {}; + + "butcher_1_3_2_1" = callPackage + ({ mkDerivation, base, bifunctors, containers, deque, extra, free + , hspec, microlens, microlens-th, mtl, multistate, pretty + , transformers, unsafe, void + }: + mkDerivation { + pname = "butcher"; + version = "1.3.2.1"; + sha256 = "16jwhj3lrghn11igc5ci484r4xc1ii6hz6ysj39njds547dmznda"; libraryHaskellDepends = [ base bifunctors containers deque extra free microlens microlens-th mtl multistate pretty transformers unsafe void @@ -40163,6 +40160,7 @@ self: { ]; description = "Chops a command or program invocation into digestable pieces"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "butter" = callPackage @@ -46847,6 +46845,8 @@ self: { pname = "classy-prelude"; version = "1.4.0"; sha256 = "1q7r4lnrxjsh7rj5nr0cs22ddp9m6maa7bzbkarxw3xbfrb2afrb"; + revision = "1"; + editedCabalFile = "1gf615lz0bfsn09vrjgj63d8zcpsmz1cgvdv8px3h0b4jrwdij6v"; libraryHaskellDepends = [ async base basic-prelude bifunctors bytestring chunked-data containers deepseq dlist ghc-prim hashable mono-traversable @@ -47785,26 +47785,6 @@ self: { }: mkDerivation { pname = "clr-host"; - version = "0.2.0.1"; - sha256 = "15hfdwddqij5dhl8qbq89rsbjvxpymvph8wz2naxa8mrd09yl1jk"; - setupHaskellDepends = [ - base Cabal directory filepath transformers - ]; - libraryHaskellDepends = [ - base bytestring clr-marshal file-embed text - ]; - librarySystemDepends = [ glib mono ]; - testHaskellDepends = [ base ]; - description = "Hosting the Common Language Runtime"; - license = stdenv.lib.licenses.bsd3; - }) {inherit (pkgs) glib; inherit (pkgs) mono;}; - - "clr-host_0_2_1_0" = callPackage - ({ mkDerivation, base, bytestring, Cabal, clr-marshal, directory - , file-embed, filepath, glib, mono, text, transformers - }: - mkDerivation { - pname = "clr-host"; version = "0.2.1.0"; sha256 = "192yzi7xx2hrk2q0i4qzq0plam2b0xgg9r5s3kjzcvf9hq1vyapy"; setupHaskellDepends = [ @@ -47817,7 +47797,6 @@ self: { testHaskellDepends = [ base ]; description = "Hosting the Common Language Runtime"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {inherit (pkgs) glib; inherit (pkgs) mono;}; "clr-inline" = callPackage @@ -49159,6 +49138,8 @@ self: { pname = "colour-accelerate"; version = "0.3.0.0"; sha256 = "0zvzra2w0sajw0hzg2k25khv8c5j1i17g8dnga70w73f3mmh3gbz"; + revision = "1"; + editedCabalFile = "1mbz9wdx396q8gdy6yqsc5vsxrkky9zkxczjblvc9zy542v252cn"; libraryHaskellDepends = [ accelerate base ]; description = "Working with colours in Accelerate"; license = stdenv.lib.licenses.bsd3; @@ -50530,8 +50511,8 @@ self: { }: mkDerivation { pname = "concraft"; - version = "0.12.1"; - sha256 = "1zjrv58fl4lkknmmih0dwi9ds241mxi42q3fxlpd8z5hlgq9pxpj"; + version = "0.13.0"; + sha256 = "1b03h65ww3cb0vxjrvj8y7bn30ci0fdbjcf8gxnmyy34npgz1ihw"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -52566,6 +52547,19 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "contiguous-fft" = callPackage + ({ mkDerivation, base, contiguous, prim-instances, primitive }: + mkDerivation { + pname = "contiguous-fft"; + version = "0.1.0.1"; + sha256 = "07nv27gj4shh22azf1nl1yr7xvzy4hzmp66yjsgxywj50850i6dq"; + libraryHaskellDepends = [ + base contiguous prim-instances primitive + ]; + description = "dft of contiguous memory structures"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "continue" = callPackage ({ mkDerivation, base, bifunctors, monad-control, mtl , semigroupoids, transformers, transformers-base @@ -52721,6 +52715,24 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "control-dsl" = callPackage + ({ mkDerivation, base, containers, doctest, doctest-discover + , temporary + }: + mkDerivation { + pname = "control-dsl"; + version = "0.2.1.1"; + sha256 = "0nfbipf26kkkjbxb9mqbjxqg99z3dfmpada28ajqjvz6n3mg4grg"; + revision = "1"; + editedCabalFile = "11rjly75f57a1818hjzy18pms51jicnzn99kx2mqzf7c7lygnsgg"; + libraryHaskellDepends = [ base ]; + testHaskellDepends = [ + base containers doctest doctest-discover temporary + ]; + description = "An alternative to monads for control flow DSLs"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "control-event" = callPackage ({ mkDerivation, base, containers, stm, time }: mkDerivation { @@ -52859,14 +52871,12 @@ self: { }) {}; "control-monad-free" = callPackage - ({ mkDerivation, base, prelude-extras, transformers }: + ({ mkDerivation, base, transformers }: mkDerivation { pname = "control-monad-free"; - version = "0.6.1"; - sha256 = "11i297ngwb5ck23vsr84fh5qx4hn7fzm9ml90y79lwi97hyigagy"; - revision = "1"; - editedCabalFile = "1901lm2md7flri4ms745lgla18x2k7v0xh51jbjbx6202ppcx3fh"; - libraryHaskellDepends = [ base prelude-extras transformers ]; + version = "0.6.2"; + sha256 = "1habgf7byffqf1rqjkzpihvdhclaafgqsqpfpwp3fgpj5ayk1j33"; + libraryHaskellDepends = [ base transformers ]; description = "Free monads and monad transformers"; license = stdenv.lib.licenses.publicDomain; }) {}; @@ -54626,32 +54636,31 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "criterion_1_5_1_0" = callPackage + "criterion_1_5_2_0" = callPackage ({ mkDerivation, aeson, ansi-wl-pprint, base, base-compat , base-compat-batteries, binary, bytestring, cassava, code-page , containers, criterion-measurement, deepseq, directory, exceptions - , fail, filepath, Glob, HUnit, js-flot, js-jquery, microstache, mtl - , mwc-random, optparse-applicative, parsec, QuickCheck, semigroups - , statistics, tasty, tasty-hunit, tasty-quickcheck, text, time - , transformers, transformers-compat, vector, vector-algorithms + , filepath, Glob, HUnit, js-flot, js-jquery, microstache, mtl + , mwc-random, optparse-applicative, parsec, QuickCheck, statistics + , tasty, tasty-hunit, tasty-quickcheck, text, time, transformers + , transformers-compat, vector, vector-algorithms }: mkDerivation { pname = "criterion"; - version = "1.5.1.0"; - sha256 = "1ixmr1mjid3yds5lzhcrjmvvlpgsn579wns96x5n1rkba14srxcq"; + version = "1.5.2.0"; + sha256 = "03y4lqkrr08nbsjk6qkrhyai7zzv0rrknn6rgni184f18c091wsd"; isLibrary = true; isExecutable = true; enableSeparateDataOutput = true; libraryHaskellDepends = [ aeson ansi-wl-pprint base base-compat-batteries binary bytestring cassava code-page containers criterion-measurement deepseq - directory exceptions fail filepath Glob js-flot js-jquery - microstache mtl mwc-random optparse-applicative parsec semigroups - statistics text time transformers transformers-compat vector - vector-algorithms + directory exceptions filepath Glob js-flot js-jquery microstache + mtl mwc-random optparse-applicative parsec statistics text time + transformers transformers-compat vector vector-algorithms ]; executableHaskellDepends = [ - base base-compat-batteries optparse-applicative semigroups + base base-compat-batteries optparse-applicative ]; testHaskellDepends = [ aeson base base-compat base-compat-batteries bytestring deepseq @@ -55860,6 +55869,8 @@ self: { pname = "css-syntax"; version = "0.1.0.0"; sha256 = "02f000nzc0dhjhlp1z82q4far8ablvzalpk918lg54f63lbqdwsh"; + revision = "1"; + editedCabalFile = "14241m9nm3wbbhajw95gdj9mvfzf4hmrzvk2wgjvkm71mg4yhwnr"; libraryHaskellDepends = [ base scientific text ]; testHaskellDepends = [ base directory hspec QuickCheck scientific text @@ -56486,6 +56497,44 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "cursor" = callPackage + ({ mkDerivation, base, containers, microlens, text, validity + , validity-containers, validity-text + }: + mkDerivation { + pname = "cursor"; + version = "0.0.0.1"; + sha256 = "0iq83v3yp7rj1fn82qkwakxi180nri50irzf8p8bzi558c6b3bmr"; + libraryHaskellDepends = [ + base containers microlens text validity validity-containers + validity-text + ]; + description = "Purely Functional Cursors"; + license = stdenv.lib.licenses.mit; + }) {}; + + "cursor-gen" = callPackage + ({ mkDerivation, base, containers, cursor, genvalidity + , genvalidity-containers, genvalidity-hspec + , genvalidity-hspec-optics, genvalidity-text, hspec, microlens + , pretty-show, QuickCheck, text + }: + mkDerivation { + pname = "cursor-gen"; + version = "0.0.0.0"; + sha256 = "10jxxy3dx2gsddmq4l95ddim4cj85l7l76lamhgqlhx6zw4j7d52"; + libraryHaskellDepends = [ + base containers cursor genvalidity genvalidity-containers + genvalidity-text QuickCheck text + ]; + testHaskellDepends = [ + base containers cursor genvalidity-hspec genvalidity-hspec-optics + hspec microlens pretty-show QuickCheck text + ]; + description = "Generators for Purely Functional Cursors"; + license = stdenv.lib.licenses.mit; + }) {}; + "curve25519" = callPackage ({ mkDerivation, base, bytestring, crypto-api, DRBG, HUnit , QuickCheck, tagged, test-framework, test-framework-hunit @@ -56665,6 +56714,19 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "czipwith_1_0_1_1" = callPackage + ({ mkDerivation, base, template-haskell, transformers }: + mkDerivation { + pname = "czipwith"; + version = "1.0.1.1"; + sha256 = "0hs296mwx62alp9fkpkhw9jsjqlygagvb911nx22b0pgyiwqa52a"; + libraryHaskellDepends = [ base template-haskell ]; + testHaskellDepends = [ base transformers ]; + description = "CZipWith class and deriving via TH"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "d-bus" = callPackage ({ mkDerivation, async, attoparsec, base, binary, blaze-builder , bytestring, conduit, conduit-extra, containers @@ -56696,6 +56758,18 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "d10" = callPackage + ({ mkDerivation, base, doctest, template-haskell }: + mkDerivation { + pname = "d10"; + version = "0.1.0.0"; + sha256 = "0ymhfarhsryqw0h6nksz9ki640b3xa1613k40hp85mk4rqir0zjq"; + libraryHaskellDepends = [ base template-haskell ]; + testHaskellDepends = [ base doctest ]; + description = "Digits 0-9"; + license = stdenv.lib.licenses.mit; + }) {}; + "d3d11binding" = callPackage ({ mkDerivation, base, c-storable-deriving, d3d11, D3DCompiler , d3dx11, d3dxof, dxgi, dxguid, vect, Win32 @@ -60469,18 +60543,22 @@ self: { "deferred-folds" = callPackage ({ mkDerivation, base, bytestring, containers, foldl, hashable - , primitive, transformers, unordered-containers, vector + , primitive, QuickCheck, quickcheck-instances, rerebase, tasty + , tasty-hunit, tasty-quickcheck, transformers, unordered-containers + , vector }: mkDerivation { pname = "deferred-folds"; - version = "0.9.8"; - sha256 = "0lrp0dzg6ihm1if2qq6i1dmrwfpnwvyr45yrc8ans0ar9jnrgrn3"; - revision = "1"; - editedCabalFile = "08pnfyy4vfwmvyma0h0jwil7p27y5bz9wzihy3kcc6283v9hkh52"; + version = "0.9.9"; + sha256 = "1hsfz93h6d4bzrllgmqr22ankl5pas3vlwg2yhbbcfpf35pdk9vd"; libraryHaskellDepends = [ base bytestring containers foldl hashable primitive transformers unordered-containers vector ]; + testHaskellDepends = [ + QuickCheck quickcheck-instances rerebase tasty tasty-hunit + tasty-quickcheck + ]; description = "Abstractions over deferred folds"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; @@ -60857,16 +60935,21 @@ self: { "dense-int-set" = callPackage ({ mkDerivation, base, cereal, cereal-vector, deferred-folds - , hashable, vector, vector-algorithms + , hashable, QuickCheck, quickcheck-instances, rerebase, tasty + , tasty-hunit, tasty-quickcheck, vector, vector-algorithms }: mkDerivation { pname = "dense-int-set"; - version = "0.2"; - sha256 = "02gfghbpgfcr8vnbahz9y025cb5cvh4ns5xwz9gavpbi8vbcbyv9"; + version = "0.3"; + sha256 = "04aww0ffsw1mfj7v3qhvfrbllqiwihyipis3zah0m4y47197x8gh"; libraryHaskellDepends = [ base cereal cereal-vector deferred-folds hashable vector vector-algorithms ]; + testHaskellDepends = [ + QuickCheck quickcheck-instances rerebase tasty tasty-hunit + tasty-quickcheck + ]; description = "Dense int-set"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; @@ -61064,6 +61147,18 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "deque_0_2_4" = callPackage + ({ mkDerivation, base, semigroups }: + mkDerivation { + pname = "deque"; + version = "0.2.4"; + sha256 = "19bz1i8la16an158wwqqg6zjd93d1n6jx6kqb2zd7lm1sk1055l9"; + libraryHaskellDepends = [ base semigroups ]; + description = "Double-ended queue"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "dequeue" = callPackage ({ mkDerivation, base, Cabal, cabal-test-quickcheck, QuickCheck , safe @@ -61318,8 +61413,8 @@ self: { ({ mkDerivation, base, doctest }: mkDerivation { pname = "derulo"; - version = "1.0.3"; - sha256 = "1z2yv4476a42xndws1zqw0kmiy4wqw1ydqgp7hf7rk3s067wz33m"; + version = "1.0.5"; + sha256 = "1pyal6rhnyhqx8gwyh42vf66i18y9nplmqka546ikzps439rvmly"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base ]; @@ -62229,8 +62324,8 @@ self: { pname = "diagrams-core"; version = "1.4.1.1"; sha256 = "10mnicfyvawy3jlpgf656fx2y4836x04p3z1lpgyyr1nkvwyk0m1"; - revision = "1"; - editedCabalFile = "0qf0b27lx8w16x85rr4zf3sf4qzkywyi04incv3667054v7y8m25"; + revision = "2"; + editedCabalFile = "1lf7xcq42l4hjksgp1nhj7600shvw9q5a27bh729fyfphmvv3xkf"; libraryHaskellDepends = [ adjunctions base containers distributive dual-tree lens linear monoid-extras mtl profunctors semigroups unordered-containers @@ -65416,8 +65511,8 @@ self: { ({ mkDerivation, base, doctest }: mkDerivation { pname = "doctest-driver-gen"; - version = "0.2.0.3"; - sha256 = "1vm9rwym2fdl76kwgkh21z2ixfcvza1df4gba2hm7hkk0n4ndcq6"; + version = "0.2.0.4"; + sha256 = "0wbsql0pph74nghnnwwm2p8w4wnqs0iiwqfn3p3i26g6cg8yv1nr"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base doctest ]; @@ -66568,8 +66663,8 @@ self: { pname = "dual-tree"; version = "0.2.2"; sha256 = "1sx9p9yr06z7bi7pshjpswizs6bkmfzcpw8xlasriniry86df4kl"; - revision = "1"; - editedCabalFile = "1hkjhij3s2a82b0sd898511lr6iphk3myk1l0hpl42ai32sf606q"; + revision = "2"; + editedCabalFile = "0r8idr1haqixa9nlp8db5iw9vr9sdk6rcargkr7w7s6i99lm6jmh"; libraryHaskellDepends = [ base monoid-extras newtype-generics semigroups ]; @@ -71990,34 +72085,87 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "exinst_0_7" = callPackage + ({ mkDerivation, base, binary, bytestring, constraints, deepseq + , hashable, profunctors, QuickCheck, singletons, tasty, tasty-hunit + , tasty-quickcheck + }: + mkDerivation { + pname = "exinst"; + version = "0.7"; + sha256 = "01m50pixmrw6mrd04nxw6qwx0z5k857pn3nqfiybpmp4zbc3bwac"; + libraryHaskellDepends = [ + base binary constraints deepseq hashable profunctors QuickCheck + singletons + ]; + testHaskellDepends = [ + base binary bytestring constraints deepseq hashable profunctors + QuickCheck singletons tasty tasty-hunit tasty-quickcheck + ]; + description = "Dependent pairs and their instances"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "exinst-aeson" = callPackage - ({ mkDerivation, aeson, base, constraints, exinst, singletons }: + ({ mkDerivation, aeson, base, bytestring, constraints, exinst + , QuickCheck, singletons, tasty, tasty-quickcheck + }: mkDerivation { pname = "exinst-aeson"; - version = "0.2"; - sha256 = "12qnc7kfr51gxnmyj71m82rh76phj207bd6fl8iwhwvzb5xhnnsr"; + version = "0.7"; + sha256 = "1dn08xqcfp3bsgvrhcv491kdfmky6925wa33zry8aijwxkchva67"; libraryHaskellDepends = [ aeson base constraints exinst singletons ]; - description = "Derive instances for the `aeson` library for your existential types"; + testHaskellDepends = [ + aeson base bytestring exinst QuickCheck tasty tasty-quickcheck + ]; + description = "Dependent pairs and their instances"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; }) {}; "exinst-bytes" = callPackage - ({ mkDerivation, base, bytes, constraints, exinst, singletons }: + ({ mkDerivation, base, binary, bytes, bytestring, cereal + , constraints, exinst, exinst-cereal, QuickCheck, singletons, tasty + , tasty-quickcheck + }: mkDerivation { pname = "exinst-bytes"; - version = "0.2"; - sha256 = "0rxjfy3ljkmjnvsvif0wvcwhcgvz1yr5amj10ii08lr3vn6papnj"; + version = "0.7"; + sha256 = "05k2jzlz6aj5wwy3bnysszr6kw85n0j73wkda5vwcrsha4prmf9r"; libraryHaskellDepends = [ base bytes constraints exinst singletons ]; - description = "Derive instances for the `bytes` library for your existential types"; + testHaskellDepends = [ + base binary bytes bytestring cereal exinst exinst-cereal QuickCheck + tasty tasty-quickcheck + ]; + description = "Dependent pairs and their instances"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "exinst-cereal" = callPackage + ({ mkDerivation, base, binary, bytestring, cereal, constraints + , exinst, QuickCheck, singletons, tasty, tasty-quickcheck + }: + mkDerivation { + pname = "exinst-cereal"; + version = "0.7"; + sha256 = "1qdz4a4qzi3fbkigvng36hz5j322zbbwya2vrs0shja8ry6rvi74"; + libraryHaskellDepends = [ + base cereal constraints exinst singletons + ]; + testHaskellDepends = [ + base binary bytestring cereal exinst QuickCheck tasty + tasty-quickcheck + ]; + description = "Dependent pairs and their instances"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "exinst-deepseq" = callPackage ({ mkDerivation, base, constraints, deepseq, exinst }: mkDerivation { @@ -72044,6 +72192,24 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "exinst-serialise" = callPackage + ({ mkDerivation, base, binary, constraints, exinst, QuickCheck + , serialise, singletons, tasty, tasty-quickcheck + }: + mkDerivation { + pname = "exinst-serialise"; + version = "0.7"; + sha256 = "0a51534sifdhq764qa9hrhwnv48f1y08a7f11mhhx3r23pxh4588"; + libraryHaskellDepends = [ + base constraints exinst serialise singletons + ]; + testHaskellDepends = [ + base binary exinst QuickCheck serialise tasty tasty-quickcheck + ]; + description = "Dependent pairs and their instances"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "existential" = callPackage ({ mkDerivation, base, cereal, constraints, control-invariants , lens, portable-template-haskell-lens, QuickCheck @@ -72442,8 +72608,8 @@ self: { }: mkDerivation { pname = "expressions"; - version = "0.2"; - sha256 = "1mqkz354w29fyc1sihr8bv10j6igcjhdn807ga9608r1lccgqf2d"; + version = "0.4.2"; + sha256 = "0lps0grvknsp0sfsqnd6kxfh6xf518x9ii11s7fy03qcl0v51da5"; libraryHaskellDepends = [ attoparsec base containers free lattices singletons text transformers @@ -72459,8 +72625,8 @@ self: { }: mkDerivation { pname = "expressions-z3"; - version = "0.2"; - sha256 = "17q4mjlh8dxs1al3mw6xm9maxhbmmqprckqnyq9mwqc5j6c26b84"; + version = "0.4"; + sha256 = "1m3s9rm4767z68wpl92vryhg1sb0pllrv18x5x53amfa7kf6vrvv"; libraryHaskellDepends = [ base containers expressions list-t singletons transformers z3 ]; @@ -73162,8 +73328,8 @@ self: { }: mkDerivation { pname = "fast-arithmetic"; - version = "0.6.1.1"; - sha256 = "0adnngx0bqbrcsxkgpdfb60p4jhvx0b8ls37g94q6cx9s0n3cmb8"; + version = "0.6.2.2"; + sha256 = "0rdlsl1k6kp766nm85afilwcvkdbi40kvqi5iy9a1ldkdk277vlk"; libraryHaskellDepends = [ base composition-prelude gmpint ]; testHaskellDepends = [ arithmoi base combinat-compat hspec QuickCheck @@ -75711,8 +75877,8 @@ self: { }: mkDerivation { pname = "fixed-vector-binary"; - version = "1.0.0.0"; - sha256 = "1q3rjjgn16fa5d8cqrlaac2b29v3045am1aanyn77vi843xzah98"; + version = "1.0.0.1"; + sha256 = "10s0mc6xdx7n6dmdgpjysbqmk79ssfw9zmaz5j0spjy7dy55zq3m"; libraryHaskellDepends = [ base binary fixed-vector ]; testHaskellDepends = [ base binary fixed-vector tasty tasty-quickcheck @@ -75727,8 +75893,8 @@ self: { }: mkDerivation { pname = "fixed-vector-cborg"; - version = "1.0.0.0"; - sha256 = "0fmdl4vfg65709iw8s18hjayqhdx4zgn36l17z2x9xlh0prspkki"; + version = "1.0.0.1"; + sha256 = "0m5xcy99hydcs99yph6n63517h2asg611rgg0h28blqd1f7bfch8"; libraryHaskellDepends = [ base cborg fixed-vector serialise ]; testHaskellDepends = [ base fixed-vector serialise tasty tasty-quickcheck @@ -75743,8 +75909,8 @@ self: { }: mkDerivation { pname = "fixed-vector-cereal"; - version = "1.0.0.0"; - sha256 = "1vg44xjwf4ffq4jxiqzk5rphbkgys81lzm1nzjsrfr8s7hhn0clp"; + version = "1.0.0.1"; + sha256 = "15vg3kr7fkd6i0swm4lm76gkfdnh0ydl4nci5abj1zss8qcn9gam"; libraryHaskellDepends = [ base cereal fixed-vector ]; testHaskellDepends = [ base cereal fixed-vector tasty tasty-quickcheck @@ -76417,8 +76583,8 @@ self: { ({ mkDerivation, base, doctest, QuickCheck, template-haskell }: mkDerivation { pname = "flow"; - version = "1.0.15"; - sha256 = "1i3rhjjl8w9xmvckz0qrlbg7jfdz6v5w5cgmhs8xqjys5ssmla2y"; + version = "1.0.17"; + sha256 = "06adx3drx4b283v0aawhzyigvjizbhig8lqxw9cgqfn1pvc1kv46"; libraryHaskellDepends = [ base ]; testHaskellDepends = [ base doctest QuickCheck template-haskell ]; description = "Write more understandable Haskell"; @@ -76963,25 +77129,6 @@ self: { }: mkDerivation { pname = "fold-debounce-conduit"; - version = "0.2.0.2"; - sha256 = "18hxlcm0fixx4iiac26cdbkkqivg71qk3z50k71l9n3yashijjdc"; - libraryHaskellDepends = [ - base conduit fold-debounce resourcet stm transformers - transformers-base - ]; - testHaskellDepends = [ - base conduit hspec resourcet stm transformers - ]; - description = "Regulate input traffic from conduit Source with Control.FoldDebounce"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "fold-debounce-conduit_0_2_0_3" = callPackage - ({ mkDerivation, base, conduit, fold-debounce, hspec, resourcet - , stm, transformers, transformers-base - }: - mkDerivation { - pname = "fold-debounce-conduit"; version = "0.2.0.3"; sha256 = "0rzgaxqv3q0s848bk3hm0mq14sxa1szpxvi9k19n0hpqlx60rj4p"; libraryHaskellDepends = [ @@ -76993,7 +77140,6 @@ self: { ]; description = "Regulate input traffic from conduit Source with Control.FoldDebounce"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "foldable1" = callPackage @@ -77015,10 +77161,8 @@ self: { }: mkDerivation { pname = "foldl"; - version = "1.4.4"; - sha256 = "0dy8dhpys2bq6pn0m6klsykk4mfxi6q8hr8gqbfcvqk6g4i5wyn7"; - revision = "1"; - editedCabalFile = "1qdllf16djf7w5h8jq1f8sb5a0k5ihr9psai8wgkvnhd9addsk0f"; + version = "1.4.5"; + sha256 = "19qjmzc7gaxfwgqbgy0kq4vhbxvh3qjnwsxnc7pzwws2if5bv80b"; libraryHaskellDepends = [ base bytestring comonad containers contravariant hashable mwc-random primitive profunctors semigroupoids semigroups text @@ -78198,20 +78342,20 @@ self: { }) {}; "free-algebras" = callPackage - ({ mkDerivation, base, constraints, containers, data-fix, free - , groups, hedgehog, kan-extensions, mtl, natural-numbers + ({ mkDerivation, base, constraints, containers, data-fix, dlist + , free, groups, hedgehog, kan-extensions, mtl, natural-numbers , transformers }: mkDerivation { pname = "free-algebras"; - version = "0.0.4.0"; - sha256 = "1rfrdnwsb1kpdc0ha3a7yrykff6fi3ji6ljdxmijv2n4halmxnly"; + version = "0.0.5.0"; + sha256 = "1aqzah0c95mi9aqlvhl9r56im59jgjl38r199d7zb4lligfzvacr"; libraryHaskellDepends = [ - base constraints containers data-fix free groups kan-extensions mtl - natural-numbers transformers + base constraints containers data-fix dlist free groups + kan-extensions mtl natural-numbers transformers ]; testHaskellDepends = [ - base constraints containers data-fix free groups hedgehog + base constraints containers data-fix dlist free groups hedgehog kan-extensions mtl natural-numbers transformers ]; description = "Free algebras in Haskell"; @@ -81533,6 +81677,19 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "genvalidity_0_6_1_0" = callPackage + ({ mkDerivation, base, hspec, hspec-core, QuickCheck, validity }: + mkDerivation { + pname = "genvalidity"; + version = "0.6.1.0"; + sha256 = "0wjqwn040yn7wpmcmhfp5slvyspal104p5wgkwwi40ykaj2zhayg"; + libraryHaskellDepends = [ base QuickCheck validity ]; + testHaskellDepends = [ base hspec hspec-core QuickCheck ]; + description = "Testing utilities for the validity library"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "genvalidity-aeson" = callPackage ({ mkDerivation, aeson, base, genvalidity, genvalidity-hspec , genvalidity-scientific, genvalidity-text @@ -81600,8 +81757,8 @@ self: { }: mkDerivation { pname = "genvalidity-containers"; - version = "0.5.0.0"; - sha256 = "1qjqwsmdcwww4fwd3m40cckwq3xgmm37kc6s25z75w768grr51br"; + version = "0.5.1.0"; + sha256 = "098360pcf522xcwa3lk091pyjl6a08cl12z18ybrlai38saskd83"; libraryHaskellDepends = [ base containers genvalidity QuickCheck validity validity-containers ]; @@ -81618,8 +81775,8 @@ self: { }: mkDerivation { pname = "genvalidity-hspec"; - version = "0.6.1.1"; - sha256 = "0jqdsslag6zz499z5ilra3dklsdvil92kzdx6gb591xvc30a74vs"; + version = "0.6.2.0"; + sha256 = "05dgfivvsfcnrbdkvx7mssi14xsnxck8h2xasbqnn6xng3pc351v"; libraryHaskellDepends = [ base genvalidity genvalidity-property hspec hspec-core QuickCheck transformers validity @@ -81711,8 +81868,8 @@ self: { }: mkDerivation { pname = "genvalidity-hspec-optics"; - version = "0.1.0.0"; - sha256 = "08p7hv1wr6df8sng906rvys0998nk8j331r2q5v2abw2rg2609m5"; + version = "0.1.1.0"; + sha256 = "13nspyfd8apvqf30dr8zz027d60qh2f25rc6gk8fliiq626ajz17"; libraryHaskellDepends = [ base genvalidity genvalidity-hspec hspec microlens QuickCheck ]; @@ -81772,8 +81929,8 @@ self: { }: mkDerivation { pname = "genvalidity-property"; - version = "0.2.1.0"; - sha256 = "0xwq2wnrxlxcllina9faxxs8svslpxr73z9cw8asgc4b3hf41drm"; + version = "0.2.1.1"; + sha256 = "0cjw5i2pydidda9bnp6x37ylhxdk9g874x5sadr6sscg5kq85a1b"; libraryHaskellDepends = [ base genvalidity hspec QuickCheck validity ]; @@ -81788,8 +81945,8 @@ self: { }: mkDerivation { pname = "genvalidity-scientific"; - version = "0.2.0.1"; - sha256 = "1wxrcpmhcbiklzqf5zjn0q7hpgkds5jjmdhl9kq68vbm96lm8zgn"; + version = "0.2.1.0"; + sha256 = "0gchsn5pvmbk57y7jn33zcbdr78mx3vb8v4cwr8b4pj5af6d84dg"; libraryHaskellDepends = [ base genvalidity QuickCheck scientific validity validity-scientific ]; @@ -81834,6 +81991,23 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "genvalidity-time_0_2_1_1" = callPackage + ({ mkDerivation, base, genvalidity, genvalidity-hspec, hspec + , QuickCheck, time, validity-time + }: + mkDerivation { + pname = "genvalidity-time"; + version = "0.2.1.1"; + sha256 = "0x3qddniy2a0qfyaxi1mfw9kqijky2gwyp19bcsp1gfxxl3c4mf5"; + libraryHaskellDepends = [ + base genvalidity QuickCheck time validity-time + ]; + testHaskellDepends = [ base genvalidity-hspec hspec time ]; + description = "GenValidity support for time"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "genvalidity-unordered-containers" = callPackage ({ mkDerivation, base, genvalidity, genvalidity-hspec, hashable , hspec, QuickCheck, unordered-containers, validity @@ -82036,8 +82210,8 @@ self: { }: mkDerivation { pname = "geojson"; - version = "3.0.3"; - sha256 = "05kifzlw077ggxish1hmpqlk180w46qpj4b2c8pjqngk5j0jd5vv"; + version = "3.0.4"; + sha256 = "0dnk9cb7y8wgnx8wzzln635r9pijljd9h5rinl0s9g4bjhw0rcw5"; libraryHaskellDepends = [ aeson base containers deepseq lens scientific semigroups text transformers validation @@ -82260,26 +82434,27 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "ghc_8_4_3" = callPackage + "ghc_8_6_1" = callPackage ({ mkDerivation, alex, array, base, binary, bytestring, containers - , deepseq, directory, filepath, ghc-boot, ghc-boot-th, ghci, happy - , hpc, process, template-haskell, terminfo, time, transformers - , unix + , deepseq, directory, filepath, ghc-boot, ghc-boot-th, ghc-heap + , ghci, happy, hpc, process, template-haskell, terminfo, time + , transformers, unix }: mkDerivation { pname = "ghc"; - version = "8.4.3"; - sha256 = "1yryz21fnx5g1khpa7y2ps58kws3s1wjmz1ipnbv3hdcf6gyq46d"; + version = "8.6.1"; + sha256 = "1s4iggkyki6fd1wv9l5qgpnkyf1wgyf2mcncj6jwl4whrii3r7br"; libraryHaskellDepends = [ array base binary bytestring containers deepseq directory filepath - ghc-boot ghc-boot-th ghci hpc process template-haskell terminfo - time transformers unix + ghc-boot ghc-boot-th ghc-heap ghci hpc process template-haskell + terminfo time transformers unix ]; libraryToolDepends = [ alex happy ]; description = "The GHC API"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; - }) {}; + broken = true; + }) {ghc-heap = null;}; "ghc-boot_8_6_1" = callPackage ({ mkDerivation, base, binary, bytestring, directory, filepath @@ -82907,12 +83082,12 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "ghc-prim_0_5_2_0" = callPackage + "ghc-prim_0_5_3" = callPackage ({ mkDerivation, rts }: mkDerivation { pname = "ghc-prim"; - version = "0.5.2.0"; - sha256 = "1ccvzkw3v4xlj7g126wwlc5rvd480hbv1pcq2rfb85k77rzi6bjr"; + version = "0.5.3"; + sha256 = "07s75s4yj33p87zzpvp68hgf72xsxg6rm47g4aaymmlf52aywmv9"; libraryHaskellDepends = [ rts ]; description = "GHC primitives"; license = stdenv.lib.licenses.bsd3; @@ -83353,6 +83528,18 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "ghci-hexcalc" = callPackage + ({ mkDerivation, base, doctest, QuickCheck }: + mkDerivation { + pname = "ghci-hexcalc"; + version = "0.1.0.1"; + sha256 = "1mwh4wz3ccmh0fi0k0y19bk33vn8p6ylmkklidpw5vg7k3v9d7s2"; + libraryHaskellDepends = [ base ]; + testHaskellDepends = [ base doctest QuickCheck ]; + description = "GHCi as a Hex Calculator interactive"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "ghci-history-parser" = callPackage ({ mkDerivation, base, doctest, hspec, parsec }: mkDerivation { @@ -86361,6 +86548,8 @@ self: { pname = "gloss"; version = "1.13.0.1"; sha256 = "1f19vlx32nkgply25p83n7498lwdpshiibqg7nzkhb2kv7n0y71q"; + revision = "1"; + editedCabalFile = "1nyg324icnlky647zq4c21sqxv2bgnwnzgh2hz5d5ys6ba69j59h"; libraryHaskellDepends = [ base bmp bytestring containers ghc-prim gloss-rendering GLUT OpenGL ]; @@ -86386,6 +86575,8 @@ self: { pname = "gloss-algorithms"; version = "1.13.0.1"; sha256 = "0vbqcsvyicb409a60fab0c0shixny4l5z2l15n8hrrr1dsvisf95"; + revision = "1"; + editedCabalFile = "140zmk3br0nn98mjc6ri36nk8yl93n4v69zybzv2vc41yxgvnac5"; libraryHaskellDepends = [ base containers ghc-prim gloss ]; description = "Data structures and algorithms for working with 2D graphics"; license = stdenv.lib.licenses.mit; @@ -86425,8 +86616,8 @@ self: { }: mkDerivation { pname = "gloss-examples"; - version = "1.13.0.1"; - sha256 = "071b75qlppjff9q7b8312wb382gry4dnz1b8p84sb8lxmxr2848w"; + version = "1.13.0.2"; + sha256 = "1g2l3jjj2mmmw9w45bmasqn9nbbsxxny6zhdvda931r6ryanq8db"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -86506,14 +86697,14 @@ self: { license = stdenv.lib.licenses.mit; }) {}; - "gloss-raster_1_13_0_1" = callPackage + "gloss-raster_1_13_0_2" = callPackage ({ mkDerivation, base, containers, ghc-prim, gloss, gloss-rendering , repa }: mkDerivation { pname = "gloss-raster"; - version = "1.13.0.1"; - sha256 = "1dyj8r0b3gal54dgyq9jb4s5sqjhp152q63r8nkpzjh1c9d3cp9x"; + version = "1.13.0.2"; + sha256 = "1k4l19c1fn1s14phq2qml5ibsli3jmkk6748k9y96lbrgj5nfp49"; libraryHaskellDepends = [ base containers ghc-prim gloss gloss-rendering repa ]; @@ -86559,6 +86750,8 @@ self: { pname = "gloss-rendering"; version = "1.13.0.2"; sha256 = "0ivzijqkxn0r4iqk0rmq0bzdzzgv9a8fgwy3gwnfibmvhhm9jfq0"; + revision = "1"; + editedCabalFile = "0r57zc8ryxgjb4ydcdlmq19hl3nj6gjm3z85wrmdkn0wrx16mqih"; libraryHaskellDepends = [ base bmp bytestring containers GLUT OpenGL ]; @@ -90144,8 +90337,8 @@ self: { }: mkDerivation { pname = "greskell"; - version = "0.2.1.0"; - sha256 = "03a3rgrzmhc3rh8hwz2pmq3w2q6yf8ypcfzbmqm8cwkix5xx1h8z"; + version = "0.2.1.1"; + sha256 = "0nplscs0gv9isb1z2i8qh50yssvd7kkd669j53491hjw53rwy1cs"; libraryHaskellDepends = [ aeson base greskell-core semigroups text transformers unordered-containers vector @@ -90165,8 +90358,8 @@ self: { }: mkDerivation { pname = "greskell-core"; - version = "0.1.2.3"; - sha256 = "026lipvhc4kjcmf1d604f6m71b3hrrkaafdvymmn1fsxa360dw0s"; + version = "0.1.2.4"; + sha256 = "11agvhvpv94rnylc5ch5cg90w5z1i0ywdw47yca83503lmv3y790"; libraryHaskellDepends = [ aeson base containers hashable scientific semigroups text unordered-containers uuid vector @@ -90186,8 +90379,8 @@ self: { }: mkDerivation { pname = "greskell-websocket"; - version = "0.1.1.1"; - sha256 = "133jwmqm5swm214sav8kigg8lqvk64g1nly5zk1xcij6rajxryci"; + version = "0.1.1.2"; + sha256 = "1rydw93dscnq41a1j4l7fchbpxgbqgf2kx8c58kb0m8qxi7v6qlh"; libraryHaskellDepends = [ aeson async base base64-bytestring bytestring greskell-core hashtables safe-exceptions stm text unordered-containers uuid @@ -91813,8 +92006,8 @@ self: { }: mkDerivation { pname = "hOpenPGP"; - version = "2.7.2"; - sha256 = "1fcpzc1ph0nykjs4k5hm6b67698h1n9452wlpm55acdf53mrk1lg"; + version = "2.7.3"; + sha256 = "0qxqq46p4l61chkxk7c6lhnscik3gzsgcvszp6ywspk8zp1yhbi8"; libraryHaskellDepends = [ aeson asn1-encoding attoparsec base base16-bytestring base64-bytestring bifunctors binary binary-conduit bytestring bzlib @@ -102778,8 +102971,8 @@ self: { }: mkDerivation { pname = "hevm"; - version = "0.16"; - sha256 = "0i55jw3xcnh48r81jfs6k5ffckar2p85l67n3x6lkz12q8iq8vkn"; + version = "0.17"; + sha256 = "0xp28mm3wxyj3win37nvrjdywkrfzm4l0j441q88bd35vr25yi2k"; isLibrary = true; isExecutable = true; enableSeparateDataOutput = true; @@ -103169,6 +103362,27 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "heyting-algebras" = callPackage + ({ mkDerivation, base, containers, free-algebras, hashable + , lattices, QuickCheck, tagged, tasty, tasty-quickcheck + , universe-base, unordered-containers + }: + mkDerivation { + pname = "heyting-algebras"; + version = "0.0.1.2"; + sha256 = "132r0k0m8b7f8rkyay57k42kjl7nyzqv7942njkz6nwnhjg8i6ag"; + libraryHaskellDepends = [ + base containers free-algebras hashable lattices QuickCheck tagged + universe-base unordered-containers + ]; + testHaskellDepends = [ + base containers lattices QuickCheck tasty tasty-quickcheck + universe-base + ]; + description = "Heyting and Boolean algebras"; + license = stdenv.lib.licenses.mpl20; + }) {}; + "hfann" = callPackage ({ mkDerivation, base, doublefann, fann }: mkDerivation { @@ -104005,8 +104219,8 @@ self: { }: mkDerivation { pname = "higher-leveldb"; - version = "0.5.0.1"; - sha256 = "0p7rsawd4d5cbsxlj8ddgx5blg2yw853zjfqcy78gdqn6kk8vz24"; + version = "0.5.0.2"; + sha256 = "1wmgz2aqz0vg0fnnigpg27gnzs9i6slyn6lb41myv6m20j0j5z1a"; libraryHaskellDepends = [ base bytestring cereal data-default exceptions leveldb-haskell mtl resourcet transformers transformers-base unliftio-core @@ -104546,6 +104760,27 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "hint_0_9_0" = callPackage + ({ mkDerivation, base, directory, exceptions, extensible-exceptions + , filepath, ghc, ghc-boot, ghc-paths, HUnit, mtl, random, temporary + , unix + }: + mkDerivation { + pname = "hint"; + version = "0.9.0"; + sha256 = "1g7q4clzc2pdnbvmm265dindjpynabsykd088qjjzlk6590sy9bl"; + libraryHaskellDepends = [ + base directory exceptions filepath ghc ghc-boot ghc-paths mtl + random temporary unix + ]; + testHaskellDepends = [ + base directory exceptions extensible-exceptions filepath HUnit unix + ]; + description = "Runtime Haskell interpreter (GHC API wrapper)"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "hint-server" = callPackage ({ mkDerivation, base, eprocess, exceptions, hint, monad-loops, mtl }: @@ -104902,8 +105137,8 @@ self: { }: mkDerivation { pname = "histogram-fill"; - version = "0.9.0.0"; - sha256 = "00j4ncqy0s5wil158wx1f8x0n2mj4ki2hgs4hmkrx0vbkc2pil56"; + version = "0.9.1.0"; + sha256 = "0qcil8lgkzklgbzb9a81kdzsyzrsgzwdgz424mlvp8sbrfmbnz3m"; libraryHaskellDepends = [ base deepseq ghc-prim primitive vector ]; benchmarkHaskellDepends = [ base criterion mwc-random vector ]; description = "Library for histograms creation"; @@ -105278,8 +105513,8 @@ self: { }: mkDerivation { pname = "hledger"; - version = "1.11"; - sha256 = "1kkgvyf4vrj5dy41v4z7xbyxhnw79y1j18d46pldim7iq43643ji"; + version = "1.11.1"; + sha256 = "0cy60ysmydg0ahx6gjmjm97skvjp5a3vgqxsn2l1dp7hk34ac5p9"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -105329,8 +105564,8 @@ self: { }: mkDerivation { pname = "hledger-api"; - version = "1.11"; - sha256 = "1a59i6gn70mk124mmzfk4wz464a9r6hni0cd8c04fgp1v9zsa3m1"; + version = "1.11.1"; + sha256 = "1wsbjsdibdwf4bmhbwcql7yiprhz83zj8g7a1labykmdw8lldlqc"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -105414,8 +105649,8 @@ self: { }: mkDerivation { pname = "hledger-interest"; - version = "1.5.2"; - sha256 = "10ck23d69wxylxbp8cj7ic8slklm9l88xbb4p29nvm5lgjiqidbq"; + version = "1.5.3"; + sha256 = "1ff113z2ir07ihdvfa5fca4x326zwm2jd7sjy6hjpr4qgi1mszvs"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -105454,8 +105689,8 @@ self: { }: mkDerivation { pname = "hledger-lib"; - version = "1.11"; - sha256 = "0zh0y41cxz6skazfbqb1hw5sqy0kvdciib8d4xa0ny9rx4sjjq6a"; + version = "1.11.1"; + sha256 = "0diz7ygl8zl4bjxq2c627fjvvjcdpkiqp42f5wjmz9pd1nd2da4f"; libraryHaskellDepends = [ ansi-terminal array base base-compat-batteries blaze-markup bytestring call-stack cassava cassava-megaparsec cmdargs containers @@ -105485,8 +105720,8 @@ self: { }: mkDerivation { pname = "hledger-ui"; - version = "1.11"; - sha256 = "1szn9gx1s331axhg1m51s6v695skblx52fk0i0z03v2xkajn3y2r"; + version = "1.11.1"; + sha256 = "03k62vsjyk2d7nq3lzas4qac2ck09xhk2x752xncls5rfzj8hjcj"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -105529,8 +105764,8 @@ self: { }: mkDerivation { pname = "hledger-web"; - version = "1.11"; - sha256 = "0di7imrlpgldbk4hjv5l3b80v5n9qfyjajz9qgfpr0f1d54l0rdn"; + version = "1.11.1"; + sha256 = "1bvhiikz8hlgjvc7s2hk363gjva9izga167bpx074m560q7y77fs"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -105994,8 +106229,8 @@ self: { ({ mkDerivation, base, doctest, hmatrix, nlopt-haskell, vector }: mkDerivation { pname = "hmatrix-nlopt"; - version = "0.1.2.0"; - sha256 = "1w04gi7shpck8z80a3lx77054i39ig7n3rig66hbpq1wp11snivs"; + version = "0.1.3.0"; + sha256 = "17c6s4q5sldr3mqqbyg4yknqxfgd45a0aw6sac33xcv9dvgyjyfc"; libraryHaskellDepends = [ base hmatrix nlopt-haskell vector ]; testHaskellDepends = [ base doctest ]; description = "Interface HMatrix with the NLOPT minimizer"; @@ -110552,14 +110787,16 @@ self: { }) {}; "hscrtmpl" = callPackage - ({ mkDerivation, base, directory, process, time }: + ({ mkDerivation, base, directory, filepath, process, time }: mkDerivation { pname = "hscrtmpl"; - version = "1.5"; - sha256 = "12b5409gaiasgap0lvykvapjbls1p2p9jz62sqpl70181y4812l0"; + version = "1.6"; + sha256 = "166xp46bxi079h9bpr8xfnlzzivwkhnykv7g7kg7rnp35cmwxshm"; isLibrary = false; isExecutable = true; - executableHaskellDepends = [ base directory process time ]; + executableHaskellDepends = [ + base directory filepath process time + ]; description = "Haskell shell script template"; license = stdenv.lib.licenses.isc; }) {}; @@ -110821,26 +111058,6 @@ self: { }: mkDerivation { pname = "hsexif"; - version = "0.6.1.5"; - sha256 = "0vmhd6l9vkzm4pqizqh3hjb86f4vk212plvlzfd6rd5dc08fl4ig"; - revision = "1"; - editedCabalFile = "1q5ppjq8b08ljccg5680h1kklr288wfz52vnmgpcf9hqjm3icgvb"; - libraryHaskellDepends = [ - base binary bytestring containers iconv text time - ]; - testHaskellDepends = [ - base binary bytestring containers hspec HUnit iconv text time - ]; - description = "EXIF handling library in pure Haskell"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "hsexif_0_6_1_6" = callPackage - ({ mkDerivation, base, binary, bytestring, containers, hspec, HUnit - , iconv, text, time - }: - mkDerivation { - pname = "hsexif"; version = "0.6.1.6"; sha256 = "0pdm0v3xz308yzdhc646bbkwj156llf9g17c2y74x339xk6i8zhg"; revision = "1"; @@ -110853,7 +111070,6 @@ self: { ]; description = "EXIF handling library in pure Haskell"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "hsfacter" = callPackage @@ -111854,8 +112070,8 @@ self: { }: mkDerivation { pname = "hspec-dirstream"; - version = "1.0.0.1"; - sha256 = "17ac54ac21a5r954zvwxvn1j049q49m4ia7ghmdrcp94q3aczf4n"; + version = "1.0.0.2"; + sha256 = "1df6rjgwj6rw78dh1ihswk7sgh72c8aqnaaj4r9k0gjq30hkdlfr"; enableSeparateDataOutput = true; libraryHaskellDepends = [ base dirstream filepath hspec hspec-core pipes pipes-safe @@ -112947,6 +113163,8 @@ self: { pname = "hstatistics"; version = "0.3"; sha256 = "1v7f2844p6bjzcwc2pnjyb8zl42kw1x021gcn688dvdxs6cgdwvs"; + revision = "1"; + editedCabalFile = "0qcp1kgpwnqphqq1fd92lfp8d0vcf3l6ighsdiqin51qg499xz9w"; libraryHaskellDepends = [ array base hmatrix hmatrix-gsl-stats random vector ]; @@ -113808,8 +114026,8 @@ self: { }: mkDerivation { pname = "htoml-megaparsec"; - version = "2.1.0.2"; - sha256 = "0m5v4f6djwr6sr9sndfal4gwxl0ryq2cg661ka8br7v1ww2d70yl"; + version = "2.1.0.3"; + sha256 = "1fpvfrib4igcmwhfms1spxr2b78srhrh4hrflrlgdgdn9x1m5w1x"; libraryHaskellDepends = [ base composition-prelude containers deepseq megaparsec mtl text time unordered-containers vector @@ -113955,7 +114173,7 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "http-api-data_0_3_9" = callPackage + "http-api-data_0_3_10" = callPackage ({ mkDerivation, attoparsec, attoparsec-iso8601, base, bytestring , Cabal, cabal-doctest, containers, cookie, directory, doctest , filepath, hashable, hspec, hspec-discover, http-types, HUnit @@ -113964,8 +114182,8 @@ self: { }: mkDerivation { pname = "http-api-data"; - version = "0.3.9"; - sha256 = "013m662vn02vw37gpffnvffwjirhg8lprknav5rinxffq7ra4cr8"; + version = "0.3.10"; + sha256 = "061v98l5j8791jzp6fzhdc0gpmzzf4qxavrjzm7ir8x5h7il3qm8"; setupHaskellDepends = [ base Cabal cabal-doctest ]; libraryHaskellDepends = [ attoparsec attoparsec-iso8601 base bytestring containers cookie @@ -113973,8 +114191,9 @@ self: { unordered-containers uuid-types ]; testHaskellDepends = [ - base bytestring directory doctest filepath hspec HUnit QuickCheck - quickcheck-instances text time unordered-containers uuid-types + base bytestring cookie directory doctest filepath hspec HUnit + QuickCheck quickcheck-instances text time unordered-containers + uuid-types ]; testToolDepends = [ hspec-discover ]; description = "Converting to/from HTTP API data like URL pieces, headers and query parameters"; @@ -114525,10 +114744,8 @@ self: { }: mkDerivation { pname = "http-media"; - version = "0.7.1.2"; - sha256 = "01vvrd6yb2aykha7y1c13ylnkyws2wy68vqbdb7kmbzwbdxdb4zy"; - revision = "2"; - editedCabalFile = "0in3xw1hqdz0s8pqvkfqw5qr186cd1yr4zxc5rnr0q95asi8s0rh"; + version = "0.7.1.3"; + sha256 = "0kqjzvh5y8r6x5rw2kgd816w2963c6cbyw2qjvaj2mv59zxzqkrr"; libraryHaskellDepends = [ base bytestring case-insensitive containers utf8-string ]; @@ -115706,16 +115923,16 @@ self: { "hw-conduit" = callPackage ({ mkDerivation, array, base, bytestring, conduit - , conduit-combinators, criterion, hspec, mmap, time, vector, word8 + , conduit-combinators, criterion, hspec, mmap, time, transformers + , unliftio-core, vector, word8 }: mkDerivation { pname = "hw-conduit"; - version = "0.2.0.3"; - sha256 = "19fwlgnpc17h305nmaygd5w9p5yv9jm25jgc440r9frqzw7if83a"; - revision = "1"; - editedCabalFile = "0zr1r7px2qgpf5fgq18l6ziy2xaz773qbxc87cp84x0vpwas0yg7"; + version = "0.2.0.5"; + sha256 = "00fpinpafvrdkmk6gksqd9v6f3lzrqcg79yja0h55gw7qjz5lz84"; libraryHaskellDepends = [ - array base bytestring conduit conduit-combinators time word8 + array base bytestring conduit conduit-combinators time transformers + unliftio-core word8 ]; testHaskellDepends = [ base bytestring conduit hspec ]; benchmarkHaskellDepends = [ @@ -115980,16 +116197,17 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "hw-json_0_8_1_0" = callPackage + "hw-json_0_9_0_0" = callPackage ({ mkDerivation, ansi-wl-pprint, array, attoparsec, base - , bytestring, containers, criterion, directory, dlist, hspec - , hw-balancedparens, hw-bits, hw-mquery, hw-parser, hw-prim - , hw-rankselect, hw-rankselect-base, mmap, text, vector, word8 + , bytestring, containers, criterion, directory, dlist, generic-lens + , hspec, hw-balancedparens, hw-bits, hw-mquery, hw-parser, hw-prim + , hw-rankselect, hw-rankselect-base, lens, mmap + , optparse-applicative, resourcet, text, vector, word8 }: mkDerivation { pname = "hw-json"; - version = "0.8.1.0"; - sha256 = "1dllysbajkjsyb0rr9rhp2pmyrl99l7n086w8ifkm3491vgph179"; + version = "0.9.0.0"; + sha256 = "0465pc8k4wvvih4z5klq3ign2cznrb837ivqxg9nrzbx8szsnsc7"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -115998,8 +116216,9 @@ self: { hw-rankselect-base mmap text vector word8 ]; executableHaskellDepends = [ - base bytestring criterion dlist hw-balancedparens hw-bits hw-mquery - hw-prim hw-rankselect hw-rankselect-base mmap vector + base bytestring criterion dlist generic-lens hw-balancedparens + hw-bits hw-mquery hw-prim hw-rankselect hw-rankselect-base lens + mmap optparse-applicative resourcet vector ]; testHaskellDepends = [ attoparsec base bytestring containers hspec hw-balancedparens @@ -119420,6 +119639,8 @@ self: { pname = "incremental-parser"; version = "0.3.1.1"; sha256 = "1p7m897bavh45h755ra97jk06jprls7vrnpzv1kjklgj19vbz1vz"; + revision = "1"; + editedCabalFile = "0g6haprqb1w06bazjj107frraxc6bbj8i98im16k66wlx7c9f99i"; libraryHaskellDepends = [ base monoid-subclasses ]; testHaskellDepends = [ base checkers monoid-subclasses QuickCheck tasty tasty-quickcheck @@ -119469,8 +119690,8 @@ self: { }: mkDerivation { pname = "indentation"; - version = "0.3.2"; - sha256 = "1knazqvr6bk07j7q7835z2d2vs3zyd7i4hzir6aqcdxwhrqm5q7k"; + version = "0.3.3"; + sha256 = "0iwnz4j4zkr9xpw5f8p42blgifdj6mqbxpqsci76pic6safp3avq"; libraryHaskellDepends = [ base indentation-core indentation-parsec indentation-trifecta mtl parsec parsers trifecta @@ -119484,8 +119705,8 @@ self: { ({ mkDerivation, base, mtl }: mkDerivation { pname = "indentation-core"; - version = "0.0.0.1"; - sha256 = "136skn3parvsyfii0ywm8cqfmsysi562944fbb0xsgckx0sq1dr1"; + version = "0.0.0.2"; + sha256 = "1l1zk5wz9x0m4ird1qk8shi1fkcm3sq2nwkjj6wz2sicp0xkx6h9"; libraryHaskellDepends = [ base mtl ]; description = "Indentation sensitive parsing combinators core library"; license = stdenv.lib.licenses.bsd3; @@ -119497,8 +119718,8 @@ self: { }: mkDerivation { pname = "indentation-parsec"; - version = "0.0.0.1"; - sha256 = "12s7ic8i7l2g7knzzab0c6k1s59cjlcdsrwygzh8l6l9azvya5lp"; + version = "0.0.0.2"; + sha256 = "1m7jr1s7h4vrx0lbl88gjrpd6zgzalmqzqsv6rn5s17ay5p88dqf"; libraryHaskellDepends = [ base indentation-core mtl parsec ]; testHaskellDepends = [ base parsec tasty tasty-hunit ]; description = "Indentation sensitive parsing combinators for Parsec"; @@ -119511,8 +119732,8 @@ self: { }: mkDerivation { pname = "indentation-trifecta"; - version = "0.0.2"; - sha256 = "0d2mxd1cdcr0zfz618dh4grin4z2bjfv4659i2zsddxm9li0dqis"; + version = "0.1.0"; + sha256 = "1za8x4w26ifxvfv5xra5xpykr67ari91c4p0vca89y28q54l9qpj"; libraryHaskellDepends = [ base indentation-core mtl parsers trifecta ]; @@ -119633,8 +119854,8 @@ self: { ({ mkDerivation, base, hspec, Only }: mkDerivation { pname = "indexed-list-literals"; - version = "0.2.1.1"; - sha256 = "1b4g2196pi7v347gzl1x68qriwwfgr2iddjqfs49h5swh7qqqpfg"; + version = "0.2.1.2"; + sha256 = "043xl356q9n1nw2bw8a8msymy18d6f7nwcyrrpzak9qr75dsx5nq"; libraryHaskellDepends = [ base Only ]; testHaskellDepends = [ base hspec ]; description = "Type safe indexed list literals"; @@ -122016,24 +122237,24 @@ self: { }) {}; "iridium" = callPackage - ({ mkDerivation, ansi-terminal, base, bytestring, Cabal, containers - , extra, foldl, http-conduit, lifted-base, monad-control - , multistate, process, split, system-filepath, tagged, text - , transformers, transformers-base, turtle, unordered-containers - , vector, xmlhtml, yaml + ({ mkDerivation, aeson, ansi-terminal, base, bytestring, Cabal + , containers, extra, foldl, HTTP, lifted-base, monad-control + , multistate, network-uri, process, split, system-filepath, tagged + , text, transformers, transformers-base, turtle + , unordered-containers, vector, yaml }: mkDerivation { pname = "iridium"; - version = "0.1.5.7"; - sha256 = "0jfsz8j9dq0nfr536wp78k02ffg8xgjm3zqgjgfdm1i0zwi5dcbp"; + version = "0.1.5.8"; + sha256 = "02l18z38n3cbrav7lyi3d27393invc216j78xgg7qfpbvhm3pfgw"; isLibrary = true; isExecutable = true; enableSeparateDataOutput = true; libraryHaskellDepends = [ - ansi-terminal base bytestring Cabal containers extra foldl - http-conduit lifted-base monad-control multistate process split + aeson ansi-terminal base bytestring Cabal containers extra foldl + HTTP lifted-base monad-control multistate network-uri process split system-filepath tagged text transformers transformers-base turtle - unordered-containers vector xmlhtml yaml + unordered-containers vector yaml ]; executableHaskellDepends = [ base extra multistate text transformers unordered-containers yaml @@ -122868,27 +123089,6 @@ self: { }: mkDerivation { pname = "ixset-typed"; - version = "0.4"; - sha256 = "0xjj7vjyp4p6cid5xcin36xd8lwqah0vix4rj2d4mnmbb9ch19aa"; - revision = "1"; - editedCabalFile = "1ldf6bkm085idwp8a8ppxvyawii4gbhyw1pwrcyi3n8jpjh8hqcq"; - libraryHaskellDepends = [ - base containers deepseq safecopy syb template-haskell - ]; - testHaskellDepends = [ - base containers HUnit QuickCheck tasty tasty-hunit tasty-quickcheck - ]; - description = "Efficient relational queries on Haskell sets"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "ixset-typed_0_4_0_1" = callPackage - ({ mkDerivation, base, containers, deepseq, HUnit, QuickCheck - , safecopy, syb, tasty, tasty-hunit, tasty-quickcheck - , template-haskell - }: - mkDerivation { - pname = "ixset-typed"; version = "0.4.0.1"; sha256 = "135cfc8d39qv02sga03gsym1yfajf0l5ci1s6q9n1xpb9ignblx8"; libraryHaskellDepends = [ @@ -122899,7 +123099,6 @@ self: { ]; description = "Efficient relational queries on Haskell sets"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "ixshader" = callPackage @@ -123549,6 +123748,8 @@ self: { pname = "jmacro"; version = "0.6.15"; sha256 = "1b3crf16szj11pcgrg3912xq072vnv0myq6mzg0ypaabdzn3zr7s"; + revision = "1"; + editedCabalFile = "07jghfxn4m26q8rksxn4v6pcc8mwcjdlz1ypy7dqsvhzc3hs2s4i"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -123933,6 +124134,8 @@ self: { pname = "jsaddle"; version = "0.9.5.0"; sha256 = "1b1d8dvj5lqpn0k6ay90jdgm0a05vbchxy4l3r9s4fn4mx56jp9z"; + revision = "1"; + editedCabalFile = "1f77rxrmd0rqdz81dqaw5rxxcrsjw7ibw5qp93lkgw6yj531ki99"; libraryHaskellDepends = [ aeson attoparsec base base64-bytestring bytestring containers deepseq exceptions filepath ghc-prim http-types lens primitive @@ -124613,6 +124816,8 @@ self: { pname = "json-schema"; version = "0.7.4.2"; sha256 = "09bgcc00q1v24rdglw9b24dgi690mlax6abarhcgvgmn22406wp8"; + revision = "1"; + editedCabalFile = "0pwmh48z54n0mrwzmgff95mwy1jbmy1rwsk5kmddby86f0j5873g"; libraryHaskellDepends = [ aeson base base-compat-batteries containers generic-aeson generic-deriving mtl scientific text time unordered-containers @@ -125697,13 +125902,17 @@ self: { }) {}; "kansas-lava-shake" = callPackage - ({ mkDerivation, base, hastache, kansas-lava, shake, text }: + ({ mkDerivation, base, containers, kansas-lava, mustache, shake + , text, vector + }: mkDerivation { pname = "kansas-lava-shake"; - version = "0.2.0"; - sha256 = "197nyj21r2z9a648ljmqkhzdbhy3syzw1rw4xfggn1rhk94px0rl"; + version = "0.3.0"; + sha256 = "00mmk0fsv1vdm3xidmv9wa5dwbnka564bhjp2j3jx5i4l7kw4xrb"; enableSeparateDataOutput = true; - libraryHaskellDepends = [ base hastache kansas-lava shake text ]; + libraryHaskellDepends = [ + base containers kansas-lava mustache shake text vector + ]; description = "Shake rules for building Kansas Lava projects"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; @@ -126966,18 +127175,18 @@ self: { }) {}; "knead" = callPackage - ({ mkDerivation, base, llvm-extra, llvm-tf, storable-record + ({ mkDerivation, base, bool8, llvm-extra, llvm-tf, storable-record , storable-tuple, tfp, transformers, utility-ht }: mkDerivation { pname = "knead"; - version = "0.2.3"; - sha256 = "14wi37i3y8hvfiwfs82mg7nanin84if4wlxi3rdg4w3fkdqm9ycl"; + version = "0.3"; + sha256 = "0pghy04z5ps1m3v6qmq7pilnflrcswm83c68k2f8d4g56v9lcp40"; libraryHaskellDepends = [ - base llvm-extra llvm-tf storable-record storable-tuple tfp + base bool8 llvm-extra llvm-tf storable-record storable-tuple tfp transformers utility-ht ]; - description = "Repa array processing using LLVM JIT"; + description = "Repa-like array processing using LLVM JIT"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; }) {}; @@ -127139,8 +127348,8 @@ self: { pname = "kraken"; version = "0.1.0"; sha256 = "12l24z6alscbdicp11nfc8fwmlhk5mjdjyh6xdqyvlzphp5yfp1k"; - revision = "1"; - editedCabalFile = "0ycdikk0mwy1ys9v29ybiws4fr59arwkpibdx62p9vpdv9f0p9k6"; + revision = "2"; + editedCabalFile = "141qx2fb3dimv20qsl2q1bagwcn9i0r72z2ha1w7191m557in319"; libraryHaskellDepends = [ aeson base bytestring http-client http-client-tls mtl ]; @@ -130027,6 +130236,8 @@ self: { pname = "lazysplines"; version = "0.2"; sha256 = "0r6z3b6yaxsnz8cbfr815q97jlzsjrqszb2vvzwjyqbh6qqw006y"; + revision = "1"; + editedCabalFile = "0781158jza2q6zdd7z0szsnsw1kvsbhiijivbi61rridjgv1yq23"; libraryHaskellDepends = [ base ]; description = "Differential solving with lazy splines"; license = stdenv.lib.licenses.bsd3; @@ -130609,6 +130820,8 @@ self: { pname = "lens-accelerate"; version = "0.2.0.0"; sha256 = "099vvakv7gq9sr9mh3hxj5byxxb4dw8lw7y1g3c4j1kz4gf2vxfk"; + revision = "1"; + editedCabalFile = "0ggm157i4bmgh7k0dv9zncgn4agwk7zn5wvsknxsnfqzy45qabi9"; libraryHaskellDepends = [ accelerate base lens ]; description = "Instances to mix lens with accelerate"; license = stdenv.lib.licenses.bsd3; @@ -133914,20 +134127,18 @@ self: { }) {}; "llvm-extra" = callPackage - ({ mkDerivation, base, bifunctors, containers, cpuid, llvm-tf - , non-empty, tfp, transformers, unsafe, utility-ht + ({ mkDerivation, base, bifunctors, bool8, containers, cpuid + , llvm-tf, non-empty, tfp, transformers, unsafe, utility-ht }: mkDerivation { pname = "llvm-extra"; - version = "0.7.3"; - sha256 = "12h3c86i8hps26rgy1s8m7rpmp7v6sms7m3bnq7l22qca7dny58a"; - revision = "1"; - editedCabalFile = "1zsmfzhlcxcn24z3k21lkk3wmb6rw1mnsky2q85kj6xam92lyn73"; + version = "0.8"; + sha256 = "0gy7zl3ln64aypkci5gc1bxy1j98zfj9wj7z07lk9n07s6ddm9k2"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ - base bifunctors containers cpuid llvm-tf non-empty tfp transformers - unsafe utility-ht + base bifunctors bool8 containers cpuid llvm-tf non-empty tfp + transformers unsafe utility-ht ]; description = "Utility functions for the llvm interface"; license = stdenv.lib.licenses.bsd3; @@ -134972,29 +135183,6 @@ self: { }: mkDerivation { pname = "logging-effect"; - version = "1.3.2"; - sha256 = "1q8mhshz95xckqn4d8wxj0nsg4qrxmc6a826fjzxm1ii0krwpgbd"; - 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_3" = 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.3"; sha256 = "10pighhav1zmg54gvfnvxcvz83698ziaq9ccs3zqc7jxahmyaslr"; libraryHaskellDepends = [ @@ -135008,7 +135196,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 @@ -140109,24 +140296,6 @@ self: { }: mkDerivation { pname = "memory"; - version = "0.14.16"; - sha256 = "03rbszi5d4z9rlbfv8ydrl1xf84xsh8z57g07f7j9qccn9587c3v"; - revision = "1"; - editedCabalFile = "10j8737fm287ii0nm4hqnhf87apls3xjczkzdw9qqkb4a2dybsbx"; - libraryHaskellDepends = [ - base basement bytestring deepseq foundation ghc-prim - ]; - testHaskellDepends = [ base basement bytestring foundation ]; - description = "memory and related abstraction stuff"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "memory_0_14_18" = callPackage - ({ mkDerivation, base, basement, bytestring, deepseq, foundation - , ghc-prim - }: - mkDerivation { - pname = "memory"; version = "0.14.18"; sha256 = "01rmq3vagxzjmm96qnfxk4f0516cn12bp5m8inn8h5r918bqsigm"; revision = "1"; @@ -140137,7 +140306,6 @@ self: { testHaskellDepends = [ base basement bytestring foundation ]; description = "memory and related abstraction stuff"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "memorypool" = callPackage @@ -140798,23 +140966,11 @@ self: { ({ mkDerivation, base, contravariant, microlens }: mkDerivation { pname = "microlens-contra"; - version = "0.1.0.1"; - sha256 = "15gmqxi24jy8w83852y5qf4xymiilkl24sppcaw7r2hn6yfz30s9"; - libraryHaskellDepends = [ base contravariant microlens ]; - description = "True folds and getters for microlens"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "microlens-contra_0_1_0_2" = callPackage - ({ mkDerivation, base, contravariant, microlens }: - mkDerivation { - pname = "microlens-contra"; version = "0.1.0.2"; sha256 = "1ny9qhvd7rfzdkq4jdcgh4mfia856rsgpdhg8lprfprh6p7lhy5m"; libraryHaskellDepends = [ base contravariant microlens ]; description = "True folds and getters for microlens"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "microlens-each" = callPackage @@ -141762,18 +141918,23 @@ self: { }) {}; "mios" = callPackage - ({ mkDerivation, base, bytestring, ghc-prim, primitive, vector }: + ({ mkDerivation, base, bytestring, ghc-prim, gitrev, hspec + , primitive, vector + }: mkDerivation { pname = "mios"; - version = "1.6.0"; - sha256 = "1pwcv24csffb734q4z4amjlgv8kkzncz8bjhn4s3wji021ndj1b7"; + version = "1.6.2"; + sha256 = "1q2lz5sir6pcxiqxb3vr1xp6zsld0nfwjymg0zbhszd5w0iprxdh"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base bytestring ghc-prim primitive vector ]; executableHaskellDepends = [ - base bytestring ghc-prim primitive vector + base bytestring ghc-prim gitrev primitive vector + ]; + testHaskellDepends = [ + base bytestring ghc-prim hspec primitive vector ]; description = "A Minisat-based CDCL SAT solver in Haskell"; license = stdenv.lib.licenses.gpl3; @@ -142595,6 +142756,8 @@ self: { pname = "mole"; version = "0.0.6"; sha256 = "0shsx1sc6rc5jxijvrc4bzqpjw4xdjq5ghlj8jnmm7gp8b6h6y5b"; + revision = "2"; + editedCabalFile = "1qykba99djdhwm0mmkrfbjdyjcx47gi5clxm8kz87ccx9qs72kfy"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -143707,8 +143870,8 @@ self: { ({ mkDerivation, base, mtl, stm }: mkDerivation { pname = "monadIO"; - version = "0.11.0.0"; - sha256 = "11pbg83fw5vdlny5w9afmzdhn3ryg1av429gbsk8w6wl8zqhd4n9"; + version = "0.11.1.0"; + sha256 = "1a3gb70fkh28ck13zdkphdip2kzdcivzdrsg9fdn3nci9scbdp2w"; libraryHaskellDepends = [ base mtl stm ]; description = "Overloading of concurrency variables"; license = stdenv.lib.licenses.bsd3; @@ -144241,8 +144404,8 @@ self: { pname = "monoid-extras"; version = "0.5"; sha256 = "172d1mfns7agd619rlbb1i9kw2y26kjvivkva06k1r14bar1lmy6"; - revision = "1"; - editedCabalFile = "12dq0flvkw8lqbga3wsygcmkzwc9f16kmq31wh79alybzynz36qw"; + revision = "2"; + editedCabalFile = "1q73ghd12fd451zm4m045h8v3y61jmfhj6k890gnv6z7lyb7xwg2"; libraryHaskellDepends = [ base groups semigroupoids semigroups ]; benchmarkHaskellDepends = [ base criterion semigroups ]; description = "Various extra monoid-related definitions and utilities"; @@ -144298,8 +144461,8 @@ self: { }: mkDerivation { pname = "monoid-subclasses"; - version = "0.4.6"; - sha256 = "1rsipvaab5wpzi4qxzzb3gihg1gnsdiv0iz00gdskgjifggamh8m"; + version = "0.4.6.1"; + sha256 = "19mfklkdhyv94pfg5i92h0z90sc99rbgpi8z0w55bz3qhxnqg5yh"; libraryHaskellDepends = [ base bytestring containers primes text vector ]; @@ -144339,6 +144502,23 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "monoidal-containers_0_4_0_0" = callPackage + ({ mkDerivation, aeson, base, containers, deepseq, hashable, lens + , newtype, semigroups, unordered-containers + }: + mkDerivation { + pname = "monoidal-containers"; + version = "0.4.0.0"; + sha256 = "15mh2hx7a31gr5zb2g30h2fcnb3a2wvv2y8hvzzk5l9cr2nvhcm1"; + libraryHaskellDepends = [ + aeson base containers deepseq hashable lens newtype semigroups + unordered-containers + ]; + description = "Containers with monoidal accumulation"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "monoidplus" = callPackage ({ mkDerivation, base, contravariant, semigroups, transformers }: mkDerivation { @@ -144381,12 +144561,12 @@ self: { }) {}; "monopati" = callPackage - ({ mkDerivation, base, free, split }: + ({ mkDerivation, base, directory, free, split }: mkDerivation { pname = "monopati"; - version = "0.1.1"; - sha256 = "0zpqhxq9vq7svkdrn8aph5i1f8kd9l8jgdg8lpj15c311qrz8cl5"; - libraryHaskellDepends = [ base free split ]; + version = "0.1.2"; + sha256 = "1bimppfh14754a8dra6cjd2ricdyry5fmm0shryf974h9l6wbrp8"; + libraryHaskellDepends = [ base directory free split ]; description = "Well-typed paths"; license = stdenv.lib.licenses.bsd3; }) {}; @@ -146026,10 +146206,8 @@ self: { }: mkDerivation { pname = "multistate"; - version = "0.8.0.0"; - sha256 = "0sax983yjzcbailza3fpjjszg4vn0wb11wjr11jskk22lccbagq1"; - revision = "3"; - editedCabalFile = "0gi4l3765jgsvhr6jj2q1l7v6188kg2xw4zwcaarq3hcg1ncaakw"; + version = "0.8.0.1"; + sha256 = "1s9fs29ki3l1df0ddi04ckbich1xid413sm2zx59aqp92dfpimvm"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -146769,8 +146947,8 @@ self: { pname = "mwc-random-accelerate"; version = "0.1.0.0"; sha256 = "1qrji6b39zp5wrgz5c59xv06l3khhp4fv2ybdmx4ac5i28yx7yih"; - revision = "2"; - editedCabalFile = "16llz1jvpq841a20wvv2j8kkb357y970i54w340hwk4c187hypic"; + revision = "3"; + editedCabalFile = "1a7xx3mcli9fx5lqg1zxwqbrgzvgbssn3vprh4wp8zg58pqic6ic"; libraryHaskellDepends = [ accelerate base mwc-random ]; description = "Generate Accelerate arrays filled with high quality pseudorandom numbers"; license = stdenv.lib.licenses.bsd3; @@ -147520,12 +147698,18 @@ self: { }) {}; "nano-cryptr" = callPackage - ({ mkDerivation, base, bytestring }: + ({ mkDerivation, base, bytestring, HUnit, test-framework + , test-framework-hunit, test-framework-quickcheck2 + }: mkDerivation { pname = "nano-cryptr"; - version = "0.1.1.3"; - sha256 = "1pqwzl8l48c4q83jhjj11jd3kwwa0ail2c6kv3k38kig9yvj7ff8"; + version = "0.2.1"; + sha256 = "00c0niyjhkcv942vhm775jml3frhj0i3svgj9xxy0hnfb3nawvjb"; libraryHaskellDepends = [ base bytestring ]; + testHaskellDepends = [ + base bytestring HUnit test-framework test-framework-hunit + test-framework-quickcheck2 + ]; description = "A threadsafe binding to glibc's crypt_r function"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; @@ -150577,8 +150761,8 @@ self: { ({ mkDerivation, base, nlopt, vector }: mkDerivation { pname = "nlopt-haskell"; - version = "0.1.2.0"; - sha256 = "0hzg2y11lacgn9793zsk0vib3wb9kyqkcp65vfcfwvd90lny3mmn"; + version = "0.1.3.0"; + sha256 = "1lsh2wbl1l291xqwjxdqjpvxss9zzl2ivvwigza7zkbmaz9a0zvx"; libraryHaskellDepends = [ base vector ]; librarySystemDepends = [ nlopt ]; testHaskellDepends = [ base vector ]; @@ -152006,46 +152190,6 @@ self: { }: mkDerivation { pname = "nvim-hs"; - version = "1.0.0.2"; - sha256 = "00s8anzazzax8kjsa0ciyvx9c5smwb8a81qh625nf2v9pkp7lr20"; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ - base bytestring cereal cereal-conduit conduit containers - data-default deepseq directory dyre filepath foreign-store hslogger - megaparsec messagepack mtl network optparse-applicative - prettyprinter prettyprinter-ansi-terminal process resourcet setenv - stm streaming-commons template-haskell text time time-locale-compat - transformers transformers-base unliftio unliftio-core utf8-string - void - ]; - executableHaskellDepends = [ base data-default ]; - testHaskellDepends = [ - base bytestring cereal cereal-conduit conduit containers - data-default directory dyre filepath foreign-store hslogger hspec - hspec-discover HUnit megaparsec messagepack mtl network - optparse-applicative prettyprinter prettyprinter-ansi-terminal - process QuickCheck resourcet setenv stm streaming-commons - template-haskell text time time-locale-compat transformers - transformers-base unliftio unliftio-core utf8-string - ]; - testToolDepends = [ hspec-discover ]; - description = "Haskell plugin backend for neovim"; - license = stdenv.lib.licenses.asl20; - }) {}; - - "nvim-hs_1_0_0_3" = callPackage - ({ mkDerivation, base, bytestring, cereal, cereal-conduit, conduit - , containers, data-default, deepseq, directory, dyre, filepath - , foreign-store, hslogger, hspec, hspec-discover, HUnit, megaparsec - , messagepack, mtl, network, optparse-applicative, prettyprinter - , prettyprinter-ansi-terminal, process, QuickCheck, resourcet - , setenv, stm, streaming-commons, template-haskell, text, time - , time-locale-compat, transformers, transformers-base, unliftio - , unliftio-core, utf8-string, void - }: - mkDerivation { - pname = "nvim-hs"; version = "1.0.0.3"; sha256 = "07pnabrb9hs2l8ajrzcs3wz1m9vfq88wqjirf84ygmmnnd8dva71"; isLibrary = true; @@ -152072,7 +152216,6 @@ self: { testToolDepends = [ hspec-discover ]; description = "Haskell plugin backend for neovim"; license = stdenv.lib.licenses.asl20; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "nvim-hs-contrib" = callPackage @@ -152190,32 +152333,6 @@ self: { }: mkDerivation { pname = "o-clock"; - version = "1.0.0"; - sha256 = "18wmy90fn514dmjsyk8n6q4p1nvks6lbi0077s00p6hv247p353j"; - revision = "1"; - editedCabalFile = "0df6b78y05q8pmlxyfpln01vkm0r38cay1ffsbz1biyfs6s115j5"; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ base ghc-prim ]; - executableHaskellDepends = [ base ]; - testHaskellDepends = [ - base doctest Glob hedgehog markdown-unlit tasty tasty-hedgehog - tasty-hspec type-spec - ]; - testToolDepends = [ doctest markdown-unlit ]; - benchmarkHaskellDepends = [ base deepseq gauge tiempo time-units ]; - description = "Type-safe time library"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - - "o-clock_1_0_0_1" = callPackage - ({ mkDerivation, base, deepseq, doctest, gauge, ghc-prim, Glob - , hedgehog, markdown-unlit, tasty, tasty-hedgehog, tasty-hspec - , tiempo, time-units, type-spec - }: - mkDerivation { - pname = "o-clock"; version = "1.0.0.1"; sha256 = "0nmv0zvhd2wd327q268xd8x9swb5v6pm5fn9p5zyn0khja38s6fr"; isLibrary = true; @@ -154401,8 +154518,8 @@ self: { }: mkDerivation { pname = "optparse-applicative"; - version = "0.14.2.0"; - sha256 = "0c3z1mvynlyv1garjbdmdd3npm40dabgm75js4r07cf766c1wd71"; + version = "0.14.3.0"; + sha256 = "0qvn1s7jwrabbpmqmh6d6iafln3v3h9ddmxj2y4m0njmzq166ivj"; libraryHaskellDepends = [ ansi-wl-pprint base process transformers transformers-compat ]; @@ -155971,8 +156088,8 @@ self: { }: mkDerivation { pname = "pandoc-pyplot"; - version = "1.0.0.0"; - sha256 = "0dcrvzsg6h8pmrk1k3w12hsnh169n0ahlybpg8zhm4xbac5iafc7"; + version = "1.0.0.1"; + sha256 = "1sxksn2b7x1mrgla0c3dn5x9js0yhfg125259kh1iqzlkanj81px"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -156115,8 +156232,8 @@ self: { }: mkDerivation { pname = "pangraph"; - version = "0.2.0"; - sha256 = "1zm19gbidi6a27vi7x66dlw3q0syy5vwdykck716kdfka88vr9k5"; + version = "0.2.1"; + sha256 = "09jyhaxl89y8arkm4xmbx3bp859viq00bdnqk3bnvdiwv3klry8l"; libraryHaskellDepends = [ algebraic-graphs attoparsec base bytestring containers fgl hexml html-entities text @@ -157713,26 +157830,28 @@ self: { }) {}; "patch-image" = callPackage - ({ mkDerivation, accelerate, accelerate-arithmetic, accelerate-cuda + ({ mkDerivation, accelerate, accelerate-arithmetic , accelerate-cufft, accelerate-fourier, accelerate-io - , accelerate-utility, array, base, bytestring, Cabal, carray - , cassava, containers, enumset, explicit-exception, fft, filepath - , gnuplot, hmatrix, JuicyPixels, knead, llvm-extra, llvm-tf - , non-empty, pqueue, storable-tuple, tfp, unordered-containers - , utility-ht, vector + , accelerate-llvm-ptx, accelerate-utility, array, base, bool8 + , bytestring, Cabal, carray, cassava, containers, dsp, enumset + , explicit-exception, fft, filepath, gnuplot, JuicyPixels, knead + , llvm-extra, llvm-tf, non-empty, pqueue, prelude-compat + , semigroups, storable-complex, storable-tuple, tfp + , unordered-containers, utility-ht, vector }: mkDerivation { pname = "patch-image"; - version = "0.3.1"; - sha256 = "1l7iv83r145wmfhr8mygc7ln78jv669n2klhm1n9p50dinv1gj17"; + version = "0.3.2"; + sha256 = "00zjpbhw5886zc4cmflqw4721kvndyc7r3i7p5493visqr0d1hvk"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ - accelerate accelerate-arithmetic accelerate-cuda accelerate-cufft - accelerate-fourier accelerate-io accelerate-utility array base - bytestring Cabal carray cassava containers enumset - explicit-exception fft filepath gnuplot hmatrix JuicyPixels knead - llvm-extra llvm-tf non-empty pqueue storable-tuple tfp + accelerate accelerate-arithmetic accelerate-cufft + accelerate-fourier accelerate-io accelerate-llvm-ptx + accelerate-utility array base bool8 bytestring Cabal carray cassava + containers dsp enumset explicit-exception fft filepath gnuplot + JuicyPixels knead llvm-extra llvm-tf non-empty pqueue + prelude-compat semigroups storable-complex storable-tuple tfp unordered-containers utility-ht vector ]; description = "Compose a big image from overlapping parts"; @@ -161849,14 +161968,14 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "pipes-safe_2_3_0" = callPackage + "pipes-safe_2_3_1" = callPackage ({ mkDerivation, base, containers, exceptions, monad-control, mtl , pipes, primitive, transformers, transformers-base }: mkDerivation { pname = "pipes-safe"; - version = "2.3.0"; - sha256 = "1b8cx8drwnviq2fic2ppldf774awih4wd0m1an0iv2x3l7ndy9jp"; + version = "2.3.1"; + sha256 = "0dfdd3fccfd7wfn5228hbfj3h10xq01sddpy1v2ds63wlg84kwly"; libraryHaskellDepends = [ base containers exceptions monad-control mtl pipes primitive transformers transformers-base @@ -165865,6 +165984,8 @@ self: { pname = "pretty-sop"; version = "0.2.0.2"; sha256 = "0x1j5ngxwk176kr1qb0vr7zzjph1jxjc3bpzqcnph3rn2j6z4kyn"; + revision = "1"; + editedCabalFile = "16j80587sfq4hm2p24awcv388sm2snrwj3fhg9l3x256fbl4bm4s"; libraryHaskellDepends = [ base generics-sop pretty-show ]; description = "A generic pretty-printer using generics-sop"; license = stdenv.lib.licenses.bsd3; @@ -167182,16 +167303,16 @@ self: { , hashable, hashable-time, haskeline, http-api-data, http-types , HUnit, list-t, megaparsec, monad-parallel, MonadRandom, mtl , network, network-transport, network-transport-tcp, old-locale - , optparse-applicative, parallel, path-pieces, QuickCheck, random - , random-shuffle, resourcet, rset, scotty, semigroups, stm - , stm-containers, template-haskell, temporary, text, time - , transformers, unix, unordered-containers, uuid, vector - , vector-binary-instances, websockets, zlib + , optparse-applicative, parallel, path-pieces, QuickCheck + , quickcheck-instances, random, random-shuffle, resourcet, rset + , scotty, semigroups, stm, stm-containers, template-haskell + , temporary, text, time, transformers, unix, unordered-containers + , uuid, vector, vector-binary-instances, websockets, zlib }: mkDerivation { pname = "project-m36"; - version = "0.5"; - sha256 = "0k9px4f4yn6fgzc7zaig33w4nqnjgrmizbmmq11yg76gk08f7mv1"; + version = "0.5.1"; + sha256 = "1i3g6x3447hy1df6kzh8afpp366lzi9jspqzwi7gjkhkqhxxc94q"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -167203,10 +167324,10 @@ self: { filepath foldl ghc ghc-boot ghc-paths ghci Glob gnuplot hashable hashable-time haskeline http-api-data list-t monad-parallel MonadRandom mtl network-transport network-transport-tcp old-locale - optparse-applicative parallel path-pieces QuickCheck random-shuffle - resourcet rset semigroups stm stm-containers temporary text time - transformers unix unordered-containers uuid vector - vector-binary-instances zlib + optparse-applicative parallel path-pieces QuickCheck + quickcheck-instances random-shuffle resourcet rset semigroups stm + stm-containers temporary text time transformers unix + unordered-containers uuid vector vector-binary-instances zlib ]; executableHaskellDepends = [ aeson attoparsec base base64-bytestring binary blaze-html @@ -173469,6 +173590,30 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "rebase_1_3" = callPackage + ({ mkDerivation, base, base-prelude, bifunctors, bytestring + , containers, contravariant, contravariant-extras, deepseq, dlist + , either, fail, hashable, mtl, profunctors, scientific + , semigroupoids, semigroups, stm, text, time, transformers + , unordered-containers, uuid, vector, void + }: + mkDerivation { + pname = "rebase"; + version = "1.3"; + sha256 = "02g14vv4qbzq9vakkr55960r386jmkivgm5ld782b1bqyvpfsfh7"; + revision = "1"; + editedCabalFile = "1yz51pghns6xanzdnlkagghpzwnkl7wjqnqcp5gs0zs1iywrbl45"; + libraryHaskellDepends = [ + base base-prelude bifunctors bytestring containers contravariant + contravariant-extras deepseq dlist either fail hashable mtl + profunctors scientific semigroupoids semigroups stm text time + transformers unordered-containers uuid vector void + ]; + description = "A more progressive alternative to the \"base\" package"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "rebindable" = callPackage ({ mkDerivation, base, data-default-class, indexed }: mkDerivation { @@ -175111,8 +175256,8 @@ self: { }: mkDerivation { pname = "regexdot"; - version = "0.12.1.0"; - sha256 = "11hv0mc48y42dz0bjfcvjxjxcbag33kvdc2gxbx0lsgyb4lm0q8j"; + version = "0.12.2.0"; + sha256 = "12vbdljm38nnl76byik6fzar51v0nyjm1dp4ky8fh16f5ghnm5b8"; libraryHaskellDepends = [ base data-default deepseq extra parallel parsec toolshed ]; @@ -175990,10 +176135,8 @@ self: { }: mkDerivation { pname = "repa"; - version = "3.4.1.3"; - sha256 = "0w3swrv5rdzkngcv1b6lndsg93y0y0wcxg7asgnxd529jsrdfciy"; - revision = "2"; - editedCabalFile = "0kmypfnpzjszdzhpd1lskp0plja8zyr8r2y9xyscx4g5md9hh0zp"; + version = "3.4.1.4"; + sha256 = "17m3wl4hvf04fxwm4fflhnv41yl9bm263hnbpxc8x6xqwifplq23"; libraryHaskellDepends = [ base bytestring ghc-prim QuickCheck template-haskell vector ]; @@ -176005,10 +176148,8 @@ self: { ({ mkDerivation, base, repa, vector }: mkDerivation { pname = "repa-algorithms"; - version = "3.4.1.2"; - sha256 = "11lqq5j4g7p1dd47y65mfhzfsj8r27h7qj6qpc43g7kmf7h9gd87"; - revision = "1"; - editedCabalFile = "1dj9gq4v9y8818d5vx2zlsdl4fspwi4aywfbminr7dvlljhf415k"; + version = "3.4.1.3"; + sha256 = "1bhg1vr85j9mqm9lg1577dvlgzdbkh9f48h0ll6h03jfw7knyn6y"; libraryHaskellDepends = [ base repa vector ]; description = "Algorithms using the Repa array library"; license = stdenv.lib.licenses.bsd3; @@ -176092,10 +176233,8 @@ self: { }: mkDerivation { pname = "repa-examples"; - version = "3.4.1.1"; - sha256 = "16jg56021r7974z66rhfyp246cj0r7h6wabnpl590q3fljwh5039"; - revision = "3"; - editedCabalFile = "0vdzcx1fixvgqzmjxra8gfwhzs56qdrzixscq074sddv7jh5iz2f"; + version = "3.4.1.2"; + sha256 = "1lqqnk3prvw1pr2wi4rhymb8ij6mjp9mcsvjcllnxv567mz9gr4d"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -176153,8 +176292,8 @@ self: { pname = "repa-io"; version = "3.4.1.1"; sha256 = "1nm9kfin6fv016r02l74c9hf8pr1rz7s33i833cqpyw8m6bcmnxm"; - revision = "2"; - editedCabalFile = "0zslqm87abzrsbrw2dlnsmm8jnpvg7ldi2d83d7p5sih78ksfmmm"; + revision = "3"; + editedCabalFile = "027vn7an0hm3ysnzk19y0dbjpah0wpg96dgb55149x1310vwybxl"; libraryHaskellDepends = [ base binary bmp bytestring old-time repa vector ]; @@ -176703,8 +176842,8 @@ self: { ({ mkDerivation, rebase }: mkDerivation { pname = "rerebase"; - version = "1.2.2"; - sha256 = "11v6rmz7ql2rdx6mhb3lsal952lwihclfhh0m7fcnii5br0906ks"; + version = "1.3"; + sha256 = "16c5r69shz9zg01awjpwh7jpw3hqy81p4hh22rwdm0scdc45n5fa"; libraryHaskellDepends = [ rebase ]; description = "Reexports from \"base\" with a bunch of other standard libraries"; license = stdenv.lib.licenses.mit; @@ -177238,8 +177377,8 @@ self: { }: mkDerivation { pname = "restless-git"; - version = "0.6"; - sha256 = "1apg2vd6yw1m02i6fd2m2i6kw08dhds93ky7ncm4psj95wwkw2al"; + version = "0.7"; + sha256 = "0r344f4q9bvqfrh1ls1g90xq7r1p30anwhnwjckz5v26idiynxy3"; libraryHaskellDepends = [ base bytestring clock containers HSH text time ]; @@ -179409,16 +179548,12 @@ self: { }) {}; "rss" = callPackage - ({ mkDerivation, base, HaXml, network, network-uri, old-locale - , time - }: + ({ mkDerivation, base, HaXml, network, network-uri, time }: mkDerivation { pname = "rss"; - version = "3000.2.0.6"; - sha256 = "03crzmi9903w6xsdc00wd9jhsr41b8pglz9n502h68w3jkm6zr4d"; - libraryHaskellDepends = [ - base HaXml network network-uri old-locale time - ]; + version = "3000.2.0.7"; + sha256 = "0z48xb610k1h29rg03q19y08fp78agxp2gr48innw5y3rz00s6ym"; + libraryHaskellDepends = [ base HaXml network network-uri time ]; description = "A library for generating RSS 2.0 feeds."; license = stdenv.lib.licenses.publicDomain; hydraPlatforms = stdenv.lib.platforms.none; @@ -180605,8 +180740,8 @@ self: { ({ mkDerivation, base, doctest }: mkDerivation { pname = "salve"; - version = "1.0.4"; - sha256 = "0q9z7smss3lf33lq982ghrq8dhv71cppc73zi61b22f0b076njvd"; + version = "1.0.6"; + sha256 = "1vgpj0yg27n6hw1gb763hgxv99hpq7511n2ihys0qdi0ri8bpj1j"; libraryHaskellDepends = [ base ]; testHaskellDepends = [ base doctest ]; description = "Semantic version numbers and constraints"; @@ -184402,6 +184537,37 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "servant-auth-server_0_4_1_0" = callPackage + ({ mkDerivation, aeson, base, base64-bytestring, blaze-builder + , bytestring, bytestring-conversion, case-insensitive, cookie + , crypto-api, data-default-class, entropy, hspec, hspec-discover + , http-api-data, http-client, http-types, jose, lens, lens-aeson + , markdown-unlit, monad-time, mtl, QuickCheck, servant + , servant-auth, servant-server, tagged, text, time, transformers + , unordered-containers, wai, warp, wreq + }: + mkDerivation { + pname = "servant-auth-server"; + version = "0.4.1.0"; + sha256 = "1fxh50fjrdi5j88qs2vsrflqdwq3pc8s5h424nhjrpc24w277bqi"; + libraryHaskellDepends = [ + aeson base base64-bytestring blaze-builder bytestring + bytestring-conversion case-insensitive cookie crypto-api + data-default-class entropy http-api-data http-types jose lens + monad-time mtl servant servant-auth servant-server tagged text time + unordered-containers wai + ]; + testHaskellDepends = [ + aeson base bytestring case-insensitive hspec http-client http-types + jose lens lens-aeson markdown-unlit mtl QuickCheck servant-auth + servant-server time transformers wai warp wreq + ]; + testToolDepends = [ hspec-discover markdown-unlit ]; + description = "servant-server/servant-auth compatibility"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "servant-auth-swagger" = callPackage ({ mkDerivation, base, hspec, hspec-discover, lens, QuickCheck , servant, servant-auth, servant-swagger, swagger2, text @@ -187688,6 +187854,8 @@ self: { pname = "shell-monad"; version = "0.6.4"; sha256 = "1wmihv2x4pbz9bkrjyyh4hqwsdmlldmyi5jlgxx6ry6z3jyx9i13"; + revision = "1"; + editedCabalFile = "0hm3nlr9a3n18f7y0pnw4q4x3s8y1jxz9mify7hplpj2fq23wpdm"; libraryHaskellDepends = [ base containers text unix ]; description = "shell monad"; license = stdenv.lib.licenses.bsd3; @@ -188981,6 +189149,8 @@ self: { pname = "simple-pipe"; version = "0.0.0.29"; sha256 = "0ilc781520h1x65x3cqdzp2067g7rf7vdlnss8wsg2x1f5cxs6yh"; + revision = "1"; + editedCabalFile = "1bp8dwhympy43g43496vgp6dclbfjibdwgqsild681bn83yprsdz"; libraryHaskellDepends = [ base bytestring lifted-base monad-control monads-tf stm transformers-base @@ -195894,8 +196064,8 @@ self: { }: mkDerivation { pname = "stacked-dag"; - version = "0.1.0.4"; - sha256 = "067dbhap8aras9ixrmsaw961mlnq9fd3qyksfi8gj1zld0kxbp7k"; + version = "0.1.1.0"; + sha256 = "0bvifa45dlqnyybydi5lbwhhnkqv1bvjdp6fvsmjnsf7mi5m0fq3"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base containers graphviz text ]; @@ -197014,6 +197184,8 @@ self: { pname = "stm-lifted"; version = "0.1.1.0"; sha256 = "1xp3cfpkhkhpva170vwwrwqm0spwm2g778s98gwbil24icx0p32c"; + revision = "1"; + editedCabalFile = "0mh0gdfwky4qxyhxrysqj1sr913pffvf420mf8cl9i53fsx4f255"; libraryHaskellDepends = [ base stm transformers ]; description = "Software Transactional Memory lifted to MonadIO"; license = stdenv.lib.licenses.bsd3; @@ -197715,10 +197887,8 @@ self: { }: mkDerivation { pname = "streaming"; - version = "0.2.1.0"; - sha256 = "0xah2cn12dxqc54wa5yxx0g0b9n0xy0czc0c32awql63qhw5w7g1"; - revision = "2"; - editedCabalFile = "124nccw28cwzjzl82anbwk7phcyfzlz8yx6wyl4baymzdikvbpgq"; + version = "0.2.2.0"; + sha256 = "04fdw4f51yb16bv3b7z97vqxbns8rv2ag2aphglm29jsd527fsss"; libraryHaskellDepends = [ base containers ghc-prim mmorph mtl semigroups transformers transformers-base @@ -197956,6 +198126,21 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "streaming-fft" = callPackage + ({ mkDerivation, base, contiguous-fft, ghc-prim, prim-instances + , primitive, streaming + }: + mkDerivation { + pname = "streaming-fft"; + version = "0.1.0.0"; + sha256 = "1qphhbap1va897ghcr8v4d3nnpcb4w0b422d24isz8rg138m99wi"; + libraryHaskellDepends = [ + base contiguous-fft ghc-prim prim-instances primitive streaming + ]; + description = "online streaming fft"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "streaming-histogram" = callPackage ({ mkDerivation, base, containers, criterion, tasty, tasty-hunit , tasty-quickcheck @@ -198413,8 +198598,8 @@ self: { }: mkDerivation { pname = "strict-types"; - version = "0.1.2"; - sha256 = "0yapmsia9lmgjgvmcpk9m1z6gc63qic6vvnmnxvmh2k9887n41li"; + version = "0.1.3"; + sha256 = "0rkycz6fxwqnx5lz3ycmd29402iw8p4896lrmwksphqyl957c0ks"; libraryHaskellDepends = [ array base bytestring containers deepseq hashable text unordered-containers vector @@ -199529,32 +199714,6 @@ self: { }) {}; "summoner" = callPackage - ({ mkDerivation, aeson, ansi-terminal, base, bytestring, directory - , filepath, generic-deriving, hedgehog, neat-interpolation - , optparse-applicative, process, relude, tasty, tasty-discover - , tasty-hedgehog, text, time, tomland - }: - mkDerivation { - pname = "summoner"; - version = "1.0.6"; - sha256 = "0sb877846l34qp2cjl7gayb517fi5igf9vcmksryasnjxlbhs7vx"; - revision = "1"; - editedCabalFile = "08rzxxxfzf5dip9va8wjqgmar5rlmm0fx3wj3vlx0i6rwqq24maz"; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ - aeson ansi-terminal base bytestring directory filepath - generic-deriving neat-interpolation optparse-applicative process - relude text time tomland - ]; - executableHaskellDepends = [ base relude ]; - testHaskellDepends = [ base hedgehog relude tasty tasty-hedgehog ]; - testToolDepends = [ tasty-discover ]; - description = "Tool for creating completely configured production Haskell projects"; - license = stdenv.lib.licenses.mpl20; - }) {}; - - "summoner_1_1_0_1" = callPackage ({ mkDerivation, aeson, ansi-terminal, base-noprelude, bytestring , directory, filepath, generic-deriving, gitrev, hedgehog , neat-interpolation, optparse-applicative, process, relude, tasty @@ -199580,7 +199739,6 @@ self: { testToolDepends = [ tasty-discover ]; description = "Tool for creating completely configured production Haskell projects"; license = stdenv.lib.licenses.mpl20; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "sump" = callPackage @@ -201800,6 +201958,8 @@ self: { pname = "tabl"; version = "1.0.3"; sha256 = "1pxh6g1xjbp37fsab3hl2ldrpnbxdnp4s7pcr3mqxv62qi9b3m2f"; + revision = "1"; + editedCabalFile = "15zmgsylfmm8pf355i0ph1dcczy0z6jw0d9dh4xfmfba8ailvcdg"; libraryHaskellDepends = [ base safe text ]; description = "Table layout"; license = "unknown"; @@ -205551,7 +205711,7 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "text-builder_0_6_3" = callPackage + "text-builder_0_6_4" = callPackage ({ mkDerivation, base, base-prelude, bytestring, criterion , deferred-folds, QuickCheck, quickcheck-instances, rerebase , semigroups, tasty, tasty-hunit, tasty-quickcheck, text @@ -205559,8 +205719,8 @@ self: { }: mkDerivation { pname = "text-builder"; - version = "0.6.3"; - sha256 = "00i0p155sfii0pl3300xa4af57nhhcz690qr0drwby34xqjy2c1z"; + version = "0.6.4"; + sha256 = "0s3rphrp9d3pbagmlzz3xdm4fym38j8vg55wlqw1j1pkbdvm2cgg"; libraryHaskellDepends = [ base base-prelude bytestring deferred-folds semigroups text transformers @@ -206062,8 +206222,8 @@ self: { }: mkDerivation { pname = "text-replace"; - version = "0.0.0.3"; - sha256 = "0dj024y7qmkmv31n5h6li6wna3gpayr5gmyl6jiiiprdvild2i1n"; + version = "0.0.0.4"; + sha256 = "18hiy0d18wxh8v4zd6vg69fwd8vp9b2yd3ngf04yh9y1bl8wwwhb"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base containers ]; @@ -206109,8 +206269,8 @@ self: { pname = "text-show"; version = "3.7.4"; sha256 = "068yp74k4ybhvycivnr7x238dl1qdnkjdzf25pcz127294rn9yry"; - revision = "1"; - editedCabalFile = "0002han9bgcc8m64a3k5wgfmzlma4j3qxqd7m2illyza19hijsj9"; + revision = "2"; + editedCabalFile = "10hmmrm5qjc1lhrqgbh7yyyij9v0rpsv9fakynm5myfcc2ayif82"; libraryHaskellDepends = [ array base base-compat-batteries bifunctors bytestring bytestring-builder containers contravariant generic-deriving @@ -206130,6 +206290,39 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "text-show_3_7_5" = callPackage + ({ mkDerivation, array, base, base-compat-batteries, base-orphans + , bifunctors, bytestring, bytestring-builder, containers + , contravariant, criterion, deepseq, deriving-compat + , generic-deriving, ghc-boot-th, ghc-prim, hspec, hspec-discover + , integer-gmp, nats, QuickCheck, quickcheck-instances, semigroups + , tagged, template-haskell, text, th-abstraction, th-lift + , transformers, transformers-compat, void + }: + mkDerivation { + pname = "text-show"; + version = "3.7.5"; + sha256 = "1by89i3c6qyjh7jjld06wb2sphb236rbvwb1mmvq8f6mxliiyf1r"; + libraryHaskellDepends = [ + array base base-compat-batteries bifunctors bytestring + bytestring-builder containers contravariant generic-deriving + ghc-boot-th ghc-prim integer-gmp nats semigroups tagged + template-haskell text th-abstraction th-lift transformers + transformers-compat void + ]; + testHaskellDepends = [ + array base base-compat-batteries base-orphans bytestring + bytestring-builder deriving-compat generic-deriving ghc-prim hspec + nats QuickCheck quickcheck-instances semigroups tagged + template-haskell text transformers transformers-compat + ]; + testToolDepends = [ hspec-discover ]; + benchmarkHaskellDepends = [ base criterion deepseq ghc-prim text ]; + description = "Efficient conversion of values into Text"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "text-show-instances" = callPackage ({ mkDerivation, base, base-compat-batteries, bifunctors, binary , containers, directory, generic-deriving, ghc-boot-th, ghc-prim @@ -206166,6 +206359,40 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "text-show-instances_3_7" = callPackage + ({ mkDerivation, base, base-compat-batteries, bifunctors, binary + , containers, directory, generic-deriving, ghc-boot-th, ghc-prim + , haskeline, hpc, hspec, hspec-discover, old-locale, old-time + , pretty, QuickCheck, quickcheck-instances, random, semigroups + , tagged, template-haskell, terminfo, text, text-show, th-orphans + , time, transformers, transformers-compat, unix + , unordered-containers, vector, xhtml + }: + mkDerivation { + pname = "text-show-instances"; + version = "3.7"; + sha256 = "1bwpj8fdrfhmhlgdql59f75bkcfng7fx9m409m8k0dq9ymawmj5c"; + libraryHaskellDepends = [ + base base-compat-batteries bifunctors binary containers directory + ghc-boot-th haskeline hpc old-locale old-time pretty random + semigroups tagged template-haskell terminfo text text-show time + transformers transformers-compat unix unordered-containers vector + xhtml + ]; + testHaskellDepends = [ + base base-compat-batteries bifunctors binary containers directory + generic-deriving ghc-boot-th ghc-prim haskeline hpc hspec + old-locale old-time pretty QuickCheck quickcheck-instances random + tagged template-haskell terminfo text-show th-orphans time + transformers transformers-compat unix unordered-containers vector + xhtml + ]; + testToolDepends = [ hspec-discover ]; + description = "Additional instances for text-show"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "text-stream-decode" = callPackage ({ mkDerivation, base, bytestring, criterion, deepseq, hspec, text }: @@ -207421,17 +207648,17 @@ self: { "threepenny-editors" = callPackage ({ mkDerivation, base, bifunctors, casing, containers, generics-sop - , profunctors, text, threepenny-gui + , profunctors, semigroups, text, threepenny-gui }: mkDerivation { pname = "threepenny-editors"; - version = "0.5.6"; - sha256 = "0gnbzf3a3xykkf8xc5bnn1wznszyrnllf5s6cb4gqz6cbqnf2mnw"; + version = "0.5.6.1"; + sha256 = "0x6x4cfs52lwdcxjyqirrb8ka5pm40l89xsxaz9vvz44hmixqjrj"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ - base bifunctors casing containers generics-sop profunctors text - threepenny-gui + base bifunctors casing containers generics-sop profunctors + semigroups text threepenny-gui ]; description = "Composable algebraic editors"; license = stdenv.lib.licenses.bsd3; @@ -207954,6 +208181,8 @@ self: { pname = "tighttp"; version = "0.0.0.10"; sha256 = "0q0177nm71c6sl7qdw0za740m52bhqavkn4b7f6dxwvfw15icxdz"; + revision = "1"; + editedCabalFile = "077s20c7cl29h65v5sgh4df5r41574srll20r6cmbdbb339jr4nr"; libraryHaskellDepends = [ base bytestring handle-like monads-tf old-locale papillon simple-pipe time @@ -209656,6 +209885,27 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "toodles" = callPackage + ({ mkDerivation, aeson, base, blaze-html, bytestring, cmdargs + , directory, filepath, http-types, megaparsec, MissingH + , regex-posix, servant, servant-blaze, servant-server, strict, text + , transformers, wai, warp, yaml + }: + mkDerivation { + pname = "toodles"; + version = "0.1.0.0"; + sha256 = "0hbmnyym6hrwvacc783hl7s26yqbw8vcify4vna0mmp8y67rwjfx"; + isLibrary = false; + isExecutable = true; + executableHaskellDepends = [ + aeson base blaze-html bytestring cmdargs directory filepath + http-types megaparsec MissingH regex-posix servant servant-blaze + servant-server strict text transformers wai warp yaml + ]; + description = "Manage the TODO entries in your code"; + license = stdenv.lib.licenses.mit; + }) {}; + "toolshed" = callPackage ({ mkDerivation, array, base, containers, data-default, deepseq , directory, extra, filepath, HUnit, QuickCheck, random @@ -211898,8 +212148,8 @@ self: { }: mkDerivation { pname = "turtle"; - version = "1.5.11"; - sha256 = "19jn9k70qwhdlzkm8kq1jq37i8ck3q4fnkzn1x75prwhs60rgr0f"; + version = "1.5.12"; + sha256 = "0hacgsgs64fgp8k562gyly8i19zz18fj0v1v2m5g26vaj356ys5k"; libraryHaskellDepends = [ ansi-wl-pprint async base bytestring clock containers directory exceptions foldl hostname managed optional-args @@ -213449,21 +213699,6 @@ self: { }) {}; "typelits-witnesses" = callPackage - ({ mkDerivation, base, base-compat, constraints, reflection - , transformers - }: - mkDerivation { - pname = "typelits-witnesses"; - version = "0.3.0.2"; - sha256 = "0k76ir1c6ga44cj3qmjcsnikzz2nnb2kyzkcirb3ila7yfgwc9kf"; - libraryHaskellDepends = [ - base base-compat constraints reflection transformers - ]; - description = "Existential witnesses, singletons, and classes for operations on GHC TypeLits"; - license = stdenv.lib.licenses.mit; - }) {}; - - "typelits-witnesses_0_3_0_3" = callPackage ({ mkDerivation, base, constraints, reflection }: mkDerivation { pname = "typelits-witnesses"; @@ -213472,7 +213707,6 @@ self: { libraryHaskellDepends = [ base constraints reflection ]; description = "Existential witnesses, singletons, and classes for operations on GHC TypeLits"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "typenums" = callPackage @@ -216034,8 +216268,8 @@ self: { ({ mkDerivation, base, parsec, safe, utf8-string }: mkDerivation { pname = "uri"; - version = "0.1.6.4"; - sha256 = "02g49smrq4j3wnk4f9w73a80fxva4rrlgw9jqw6p8cqxrb9x6359"; + version = "0.1.6.5"; + sha256 = "0gfv54ys1h4ac3dhaypnpnm4w781857n2k8680jflnjbkqlandrr"; libraryHaskellDepends = [ base parsec safe utf8-string ]; description = "Library for working with URIs"; license = stdenv.lib.licenses.bsd3; @@ -217417,6 +217651,19 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "validity_0_8_0_0" = callPackage + ({ mkDerivation, base, hspec }: + mkDerivation { + pname = "validity"; + version = "0.8.0.0"; + sha256 = "0yr342gd8ylji7nqa8w3ssik8qcgb4v3h3j30qf5nbzg900k5rsn"; + libraryHaskellDepends = [ base ]; + testHaskellDepends = [ base hspec ]; + description = "Validity typeclass"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "validity-aeson" = callPackage ({ mkDerivation, aeson, base, validity, validity-scientific , validity-text, validity-unordered-containers, validity-vector @@ -217701,16 +217948,16 @@ self: { }) {}; "varying" = callPackage - ({ mkDerivation, base, criterion, hspec, QuickCheck, time - , transformers + ({ mkDerivation, base, contravariant, criterion, hspec, QuickCheck + , time, transformers }: mkDerivation { pname = "varying"; - version = "0.7.0.3"; - sha256 = "0283cjsl7siyjyvppwpss5nc5jwy0lfx47d0sndqy3dksvx1gm3c"; + version = "0.7.1.0"; + sha256 = "0lb76yqhb6jyfi046cy0axadi10n2h155dhi9c8sqrlwyc0n7hlx"; isLibrary = true; isExecutable = true; - libraryHaskellDepends = [ base transformers ]; + libraryHaskellDepends = [ base contravariant transformers ]; executableHaskellDepends = [ base time transformers ]; testHaskellDepends = [ base hspec QuickCheck time transformers ]; benchmarkHaskellDepends = [ base criterion time transformers ]; @@ -218125,16 +218372,14 @@ self: { }: mkDerivation { pname = "vector-binary-instances"; - version = "0.2.4"; - sha256 = "1y236jb72iab9ska1mc48z6yb0xgwmj45laaqdyjxksd84z7hbrb"; - revision = "1"; - editedCabalFile = "196frl4akhfk7xf1nxzn8lmq99dxhzhsimanswn9yy7ym8zhki4i"; + version = "0.2.5"; + sha256 = "0l9zj58a4sbpic1dc9if7iwv4rihya2bj4zb4qfna5fb3pf6plwc"; libraryHaskellDepends = [ base binary vector ]; testHaskellDepends = [ base binary tasty tasty-quickcheck vector ]; benchmarkHaskellDepends = [ base binary bytestring criterion deepseq vector ]; - description = "Instances of Data.Binary and Data.Serialize for vector"; + description = "Instances of Data.Binary for vector"; license = stdenv.lib.licenses.bsd3; }) {}; @@ -218403,14 +218648,12 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "vector-space_0_14" = callPackage + "vector-space_0_15" = callPackage ({ mkDerivation, base, Boolean, MemoTrie, NumInstances }: mkDerivation { pname = "vector-space"; - version = "0.14"; - sha256 = "1kfziqdnsjr540y8iajpfmdkarhmjnc5xm897bswjhrpgyh2k6h3"; - revision = "2"; - editedCabalFile = "0rz23fkpx6fgn3pjmmnz0mj5iyq70wv4j9z0c4c9ar7g72dalch7"; + version = "0.15"; + sha256 = "03swlbn0x8gfb7bilxmh3zckprjc6v64bildmhwzlimjvd1v8jb8"; libraryHaskellDepends = [ base Boolean MemoTrie NumInstances ]; description = "Vector & affine spaces, linear maps, and derivatives"; license = stdenv.lib.licenses.bsd3; @@ -221807,6 +222050,17 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "weak-bag" = callPackage + ({ mkDerivation, base, containers }: + mkDerivation { + pname = "weak-bag"; + version = "0.1.0.0"; + sha256 = "0jh5xv02wlifjqdvm2cr9mi3wjj4f14s1ap5pphin2rdzklhl3rc"; + libraryHaskellDepends = [ base containers ]; + description = "Mutable bag backed by weak pointers to each item"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "weather-api" = callPackage ({ mkDerivation, aeson, attoparsec, base, bytestring, HTTP, network , network-uri, utf8-string, vector @@ -223213,24 +223467,6 @@ self: { }: mkDerivation { pname = "wild-bind"; - version = "0.1.2.2"; - sha256 = "0s1hwgc1fzr2mgls6na6xsc51iw8xp11ydwgwcaqq527gcij101p"; - libraryHaskellDepends = [ - base containers semigroups text transformers - ]; - testHaskellDepends = [ - base hspec microlens QuickCheck stm transformers - ]; - description = "Dynamic key binding framework"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "wild-bind_0_1_2_3" = callPackage - ({ mkDerivation, base, containers, hspec, microlens, QuickCheck - , semigroups, stm, text, transformers - }: - mkDerivation { - pname = "wild-bind"; version = "0.1.2.3"; sha256 = "1dl3vh4xn6mml2mydapyqwlg872pczgz7lv912skzwnzv55hxg12"; libraryHaskellDepends = [ @@ -223241,7 +223477,6 @@ self: { ]; description = "Dynamic key binding framework"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "wild-bind-indicator" = callPackage @@ -223282,25 +223517,6 @@ self: { }: mkDerivation { pname = "wild-bind-x11"; - version = "0.2.0.5"; - sha256 = "0r9nlv96f1aavigd70r33q11a125kn3zah17z5vvsjlw55br0wxy"; - libraryHaskellDepends = [ - base containers fold-debounce mtl semigroups stm text transformers - wild-bind X11 - ]; - testHaskellDepends = [ - async base hspec text time transformers wild-bind X11 - ]; - description = "X11-specific implementation for WildBind"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "wild-bind-x11_0_2_0_6" = callPackage - ({ mkDerivation, async, base, containers, fold-debounce, hspec, mtl - , semigroups, stm, text, time, transformers, wild-bind, X11 - }: - mkDerivation { - pname = "wild-bind-x11"; version = "0.2.0.6"; sha256 = "0dqxcmdx3dinqkpwdnkb5nlc0cvn1gnwril5qmzixzshh03c8va9"; libraryHaskellDepends = [ @@ -223312,7 +223528,6 @@ self: { ]; description = "X11-specific implementation for WildBind"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "wilton-ffi" = callPackage @@ -226606,8 +226821,8 @@ self: { }: mkDerivation { pname = "xmobar"; - version = "0.28"; - sha256 = "1xh87asg8y35srvp7d3gyyy4bkxsw122liihxgzgm8pqv2z3h4zd"; + version = "0.28.1"; + sha256 = "1zrpvr1nr6a55sxmjbacacflrxvnw6aibsdal19wx404r74qjgz5"; configureFlags = [ "-fwith_alsa" "-fwith_conduit" "-fwith_datezone" "-fwith_dbus" "-fwith_inotify" "-fwith_iwlib" "-fwith_mpd" "-fwith_mpris" @@ -227357,6 +227572,22 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "yak" = callPackage + ({ mkDerivation, attoparsec, base, bytestring, hspec, lens + , template-haskell, text, time + }: + mkDerivation { + pname = "yak"; + version = "0.1.0.0"; + sha256 = "1zw522pijmad87986m663myzfkvm40y7w3g04z0f67yfzby4s19a"; + libraryHaskellDepends = [ + attoparsec base bytestring lens template-haskell text time + ]; + testHaskellDepends = [ base bytestring hspec ]; + description = "A strongly typed IRC library"; + license = stdenv.lib.licenses.mit; + }) {}; + "yall" = callPackage ({ mkDerivation, base, categories, transformers }: mkDerivation { @@ -228477,23 +228708,6 @@ self: { }: mkDerivation { pname = "yesod-auth-fb"; - version = "1.9.0"; - sha256 = "1hj6xb7rv28dz8jzygckqg5m5igy78zx0gpc6zmp7g5j0dvinxg8"; - libraryHaskellDepends = [ - aeson base bytestring conduit fb http-conduit resourcet shakespeare - text time transformers unliftio wai yesod-auth yesod-core yesod-fb - ]; - description = "Authentication backend for Yesod using Facebook"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "yesod-auth-fb_1_9_1" = callPackage - ({ mkDerivation, aeson, base, bytestring, conduit, fb, http-conduit - , resourcet, shakespeare, text, time, transformers, unliftio, wai - , yesod-auth, yesod-core, yesod-fb - }: - mkDerivation { - pname = "yesod-auth-fb"; version = "1.9.1"; sha256 = "1368hxic51vnilwp6dygc98yfclqi0vn1vwkxpvdd9vzy73kdj0i"; libraryHaskellDepends = [ @@ -228502,7 +228716,6 @@ self: { ]; description = "Authentication backend for Yesod using Facebook"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "yesod-auth-hashdb" = callPackage @@ -228932,6 +229145,43 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "yesod-core_1_6_7" = callPackage + ({ mkDerivation, aeson, async, auto-update, base, blaze-html + , blaze-markup, byteable, bytestring, case-insensitive, cereal + , clientsession, conduit, conduit-extra, containers, cookie + , deepseq, fast-logger, gauge, hspec, hspec-expectations + , http-types, HUnit, monad-logger, mtl, network, parsec + , path-pieces, primitive, random, resourcet, rio, shakespeare + , streaming-commons, template-haskell, text, time, transformers + , unix-compat, unliftio, unordered-containers, vector, wai + , wai-extra, wai-logger, warp, word8 + }: + mkDerivation { + pname = "yesod-core"; + version = "1.6.7"; + sha256 = "0smjkfidavm1iggdi4wd47ykbx7jw1qknj6glyjq8cc3p75zc3w7"; + libraryHaskellDepends = [ + aeson auto-update base blaze-html blaze-markup byteable bytestring + case-insensitive cereal clientsession conduit conduit-extra + containers cookie deepseq fast-logger http-types monad-logger mtl + parsec path-pieces primitive random resourcet rio shakespeare + template-haskell text time transformers unix-compat unliftio + unordered-containers vector wai wai-extra wai-logger warp word8 + ]; + testHaskellDepends = [ + async base bytestring clientsession conduit conduit-extra + containers cookie hspec hspec-expectations http-types HUnit network + path-pieces random resourcet shakespeare streaming-commons + template-haskell text transformers unliftio wai wai-extra warp + ]; + benchmarkHaskellDepends = [ + base blaze-html bytestring gauge shakespeare text + ]; + description = "Creation of type-safe, RESTful web applications"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "yesod-crud" = callPackage ({ mkDerivation, base, classy-prelude, containers, MissingH , monad-control, persistent, random, safe, stm, uuid, yesod-core @@ -230309,8 +230559,8 @@ self: { }: mkDerivation { pname = "yet-another-logger"; - version = "0.3.0"; - sha256 = "0j58lamn7rxvkl0nha9mqpykwiklfg2hj9rm1cxfjlxciz1wg0ri"; + version = "0.3.1"; + sha256 = "1dbwrkya2c7wf5ccsvhnk7isc90pp7vwi8ff6yq15vsn4jbirpsq"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ diff --git a/pkgs/development/idris-modules/bi.nix b/pkgs/development/idris-modules/bi.nix index d16d9b2245d6..844ce98cd4c3 100644 --- a/pkgs/development/idris-modules/bi.nix +++ b/pkgs/development/idris-modules/bi.nix @@ -8,6 +8,7 @@ build-idris-package { name = "bi"; version = "2018-06-25"; + ipkgName = "Bi"; idrisDeps = [ contrib pruviloj ]; src = fetchFromGitHub { diff --git a/pkgs/development/idris-modules/bifunctors.nix b/pkgs/development/idris-modules/bifunctors.nix index 53b4fb0a004f..3a915cd67f41 100644 --- a/pkgs/development/idris-modules/bifunctors.nix +++ b/pkgs/development/idris-modules/bifunctors.nix @@ -13,10 +13,6 @@ build-idris-package { sha256 = "0cfp58lhm2g0g1vrpb0mh71qb44n2yvg5sil9ndyf2sqd5ria6yq"; }; - postUnpack = '' - rm source/test.ipkg - ''; - meta = { description = "A small bifunctor library for idris"; homepage = https://github.com/japesinator/Idris-Bifunctors; diff --git a/pkgs/development/idris-modules/build-idris-package.nix b/pkgs/development/idris-modules/build-idris-package.nix index 3ed1404fef7c..5e1288685a7e 100644 --- a/pkgs/development/idris-modules/build-idris-package.nix +++ b/pkgs/development/idris-modules/build-idris-package.nix @@ -5,6 +5,7 @@ , noBase ? false , name , version + , ipkgName ? name , extraBuildInputs ? [] , ... }@attrs: @@ -13,7 +14,10 @@ let ++ lib.optional (!noPrelude) idrisPackages.prelude ++ lib.optional (!noBase) idrisPackages.base; idris-with-packages = idrisPackages.with-packages allIdrisDeps; - newAttrs = builtins.removeAttrs attrs [ "idrisDeps" "extraBuildInputs" "name" "version" ] // { + newAttrs = builtins.removeAttrs attrs [ + "idrisDeps" "noPrelude" "noBase" + "name" "version" "ipkgName" "extraBuildInputs" + ] // { meta = attrs.meta // { platforms = attrs.meta.platforms or idrisPackages.idris.meta.platforms; }; @@ -29,22 +33,29 @@ stdenv.mkDerivation ({ # opts = -i ../../path/to/package # rather than the declarative pkgs attribute so we have to rewrite the path. postPatch = '' - sed -i *.ipkg -e "/^opts/ s|-i \\.\\./|-i ${idris-with-packages}/libs/|g" + runHook prePatch + sed -i ${ipkgName}.ipkg -e "/^opts/ s|-i \\.\\./|-i ${idris-with-packages}/libs/|g" ''; buildPhase = '' - idris --build *.ipkg + runHook preBuild + idris --build ${ipkgName}.ipkg + runHook postBuild ''; checkPhase = '' - if grep -q test *.ipkg; then - idris --testpkg *.ipkg + runHook preCheck + if grep -q tests ${ipkgName}.ipkg; then + idris --testpkg ${ipkgName}.ipkg fi + runHook postCheck ''; installPhase = '' - idris --install *.ipkg --ibcsubdir $out/libs - IDRIS_DOC_PATH=$out/doc idris --installdoc *.ipkg || true + runHook preInstall + idris --install ${ipkgName}.ipkg --ibcsubdir $out/libs + IDRIS_DOC_PATH=$out/doc idris --installdoc ${ipkgName}.ipkg || true + runHook postInstall ''; } // newAttrs) diff --git a/pkgs/development/idris-modules/canvas.nix b/pkgs/development/idris-modules/canvas.nix index 72e5e3f5be7e..0f6e258ee202 100644 --- a/pkgs/development/idris-modules/canvas.nix +++ b/pkgs/development/idris-modules/canvas.nix @@ -6,6 +6,8 @@ build-idris-package { name = "canvas"; version = "2017-11-09"; + ipkgName = "idriscanvas"; + src = fetchFromGitHub { owner = "JinWuZhao"; repo = "idriscanvas"; diff --git a/pkgs/development/idris-modules/coda.nix b/pkgs/development/idris-modules/coda.nix index 7dbd12110888..c5e33f4594f2 100644 --- a/pkgs/development/idris-modules/coda.nix +++ b/pkgs/development/idris-modules/coda.nix @@ -6,6 +6,8 @@ build-idris-package { name = "coda"; version = "2018-01-25"; + ipkgName = "Coda"; + src = fetchFromGitHub { owner = "ostera"; repo = "idris-coda"; diff --git a/pkgs/development/idris-modules/containers.nix b/pkgs/development/idris-modules/containers.nix index c12ea54f5f9f..2fe783da4486 100644 --- a/pkgs/development/idris-modules/containers.nix +++ b/pkgs/development/idris-modules/containers.nix @@ -17,10 +17,6 @@ build-idris-package { sha256 = "0vyjadd9sb8qcbzvzhnqwc8wa7ma770c10xhn96jsqsnzr81k52d"; }; - postUnpack = '' - rm source/containers-travis.ipkg - ''; - meta = { description = "Various data structures for use in the Idris Language."; homepage = https://github.com/jfdm/idris-containers; diff --git a/pkgs/development/idris-modules/electron.nix b/pkgs/development/idris-modules/electron.nix index 3989b8f41135..8b968c9732ab 100644 --- a/pkgs/development/idris-modules/electron.nix +++ b/pkgs/development/idris-modules/electron.nix @@ -18,11 +18,6 @@ build-idris-package { sha256 = "1rpa7yjvfpzl06h0qbk54jd2n52nmgpf7nq5aamcinqh7h5gbiwn"; }; - postUnpack = '' - rm source/example_main.ipkg - rm source/example_view.ipkg - ''; - meta = { description = "Electron bindings for Idris"; homepage = https://github.com/jheiling/idris-electron; diff --git a/pkgs/development/idris-modules/free.nix b/pkgs/development/idris-modules/free.nix index 8e979ea796ec..06b8ec5e82d2 100644 --- a/pkgs/development/idris-modules/free.nix +++ b/pkgs/development/idris-modules/free.nix @@ -6,6 +6,8 @@ build-idris-package { name = "free"; version = "2017-07-03"; + ipkgName = "idris-free"; + src = fetchFromGitHub { owner = "idris-hackers"; repo = "idris-free"; diff --git a/pkgs/development/idris-modules/hamt.nix b/pkgs/development/idris-modules/hamt.nix index 17706d1b0969..79df925323ed 100644 --- a/pkgs/development/idris-modules/hamt.nix +++ b/pkgs/development/idris-modules/hamt.nix @@ -5,7 +5,7 @@ , lib }: build-idris-package { - name = "idris-hamt"; + name = "hamt"; version = "2016-11-15"; idrisDeps = [ contrib effects ]; diff --git a/pkgs/development/idris-modules/hrtime.nix b/pkgs/development/idris-modules/hrtime.nix index 09fabb6715db..9e9736d25661 100644 --- a/pkgs/development/idris-modules/hrtime.nix +++ b/pkgs/development/idris-modules/hrtime.nix @@ -7,6 +7,7 @@ build-idris-package { name = "hrtime"; version = "2017-04-16"; + ipkgName = "hrTime"; idrisDeps = [ idrisscript ]; src = fetchFromGitHub { diff --git a/pkgs/development/idris-modules/idrishighlighter.nix b/pkgs/development/idris-modules/idrishighlighter.nix index d8b469ca7689..5629221d601b 100644 --- a/pkgs/development/idris-modules/idrishighlighter.nix +++ b/pkgs/development/idris-modules/idrishighlighter.nix @@ -8,6 +8,7 @@ build-idris-package { name = "idrishighlighter"; version = "2018-02-22"; + ipkgName = "idris-code-highlighter"; idrisDeps = [ effects lightyear ]; src = fetchFromGitHub { diff --git a/pkgs/development/idris-modules/jheiling-js.nix b/pkgs/development/idris-modules/jheiling-js.nix index 2281e4821f7a..dae310cda053 100644 --- a/pkgs/development/idris-modules/jheiling-js.nix +++ b/pkgs/development/idris-modules/jheiling-js.nix @@ -8,6 +8,7 @@ build-idris-package { name = "jheiling-js"; version = "2016-03-09"; + ipkgName = "js"; idrisDeps = [ contrib jheiling-extras ]; src = fetchFromGitHub { diff --git a/pkgs/development/idris-modules/mhd.nix b/pkgs/development/idris-modules/mhd.nix index 9f4af7cc3b85..197cb1552cbd 100644 --- a/pkgs/development/idris-modules/mhd.nix +++ b/pkgs/development/idris-modules/mhd.nix @@ -9,6 +9,7 @@ build-idris-package { name = "mhd"; version = "2016-04-22"; + ipkgName = "MHD"; idrisDeps = [ contrib effects ]; extraBuildInputs = [ libmicrohttpd ]; diff --git a/pkgs/development/idris-modules/patricia.nix b/pkgs/development/idris-modules/patricia.nix index 9ba8c6bb2d4d..5ce9ad7e915d 100644 --- a/pkgs/development/idris-modules/patricia.nix +++ b/pkgs/development/idris-modules/patricia.nix @@ -16,10 +16,6 @@ build-idris-package { sha256 = "093q3qjmr93wv8pqwk0zfm3hzf14c235k9c9ip53rhg6yzcm0yqz"; }; - postUnpack = '' - rm source/patricia-nix.ipkg - ''; - meta = { description = "Immutable map from integer keys to values based on patricia tree. Basically persistent array."; homepage = https://github.com/ChShersh/idris-patricia; diff --git a/pkgs/development/idris-modules/permutations.nix b/pkgs/development/idris-modules/permutations.nix index 8bcb67fa759a..21b81f4a95c5 100644 --- a/pkgs/development/idris-modules/permutations.nix +++ b/pkgs/development/idris-modules/permutations.nix @@ -13,10 +13,6 @@ build-idris-package { sha256 = "1dirzqy40fczbw7gp2jr51lzqsnq5vcx9z5l6194lcrq2vxgzv1s"; }; - postUnpack = '' - rm source/test.ipkg - ''; - meta = { description = "Type-safe way of working with permutations in Idris"; homepage = https://github.com/vmchale/permutations; diff --git a/pkgs/development/idris-modules/recursion_schemes.nix b/pkgs/development/idris-modules/recursion_schemes.nix index 78f3674aeabd..dab6913ee8bc 100644 --- a/pkgs/development/idris-modules/recursion_schemes.nix +++ b/pkgs/development/idris-modules/recursion_schemes.nix @@ -20,10 +20,6 @@ build-idris-package { sha256 = "0rbx0yqa0fb7h7qfsvqvirc5q85z51rcwbivn6351jgn3a0inmhf"; }; - postUnpack = '' - rm source/test.ipkg - ''; - meta = { description = "Recursion schemes for Idris"; homepage = https://github.com/vmchale/recursion_schemes; diff --git a/pkgs/development/idris-modules/refined.nix b/pkgs/development/idris-modules/refined.nix index 00252b6a7cd6..433fdf647697 100644 --- a/pkgs/development/idris-modules/refined.nix +++ b/pkgs/development/idris-modules/refined.nix @@ -6,6 +6,8 @@ build-idris-package { name = "refined"; version = "2017-12-28"; + ipkgName = "idris-refined"; + src = fetchFromGitHub { owner = "janschultecom"; repo = "idris-refined"; @@ -13,10 +15,6 @@ build-idris-package { sha256 = "1am7kfc51p2zlml954v8cl9xvx0g0f1caq7ni3z36xvsd7fh47yh"; }; - postUnpack = '' - rm source/idris-refined-test.ipkg - ''; - meta = { description = "Port of Scala/Haskell Refined library to Idris"; homepage = https://github.com/janschultecom/idris-refined; diff --git a/pkgs/development/idris-modules/snippets.nix b/pkgs/development/idris-modules/snippets.nix index c8d993ccb8a2..6d752fed0f98 100644 --- a/pkgs/development/idris-modules/snippets.nix +++ b/pkgs/development/idris-modules/snippets.nix @@ -7,6 +7,7 @@ build-idris-package { name = "snippets"; version = "2018-03-17"; + ipkgName = "idris-snippets"; idrisDeps = [ contrib ]; src = fetchFromGitHub { diff --git a/pkgs/development/idris-modules/tap.nix b/pkgs/development/idris-modules/tap.nix index 7f80a1ce3c50..98f4b4ea4d63 100644 --- a/pkgs/development/idris-modules/tap.nix +++ b/pkgs/development/idris-modules/tap.nix @@ -7,6 +7,7 @@ build-idris-package { name = "tap"; version = "2017-04-08"; + ipkgName = "TAP"; idrisDeps = [ contrib ]; src = fetchFromGitHub { @@ -16,10 +17,6 @@ build-idris-package { sha256 = "0fhlmmivq9xv89r7plrnhmvay1j7bapz3wh7y8lygwvcrllh9zxs"; }; - postUnpack = '' - rm source/Draft.ipkg - ''; - meta = { description = "A simple TAP producer and consumer/reporter for Idris"; homepage = https://github.com/ostera/tap-idris; diff --git a/pkgs/development/idris-modules/tparsec.nix b/pkgs/development/idris-modules/tparsec.nix index bd895a33bae3..00d4adba5dc8 100644 --- a/pkgs/development/idris-modules/tparsec.nix +++ b/pkgs/development/idris-modules/tparsec.nix @@ -6,6 +6,8 @@ build-idris-package { name = "tparsec"; version = "2018-06-26"; + ipkgName = "TParsec"; + src = fetchFromGitHub { owner = "gallais"; repo = "idris-tparsec"; diff --git a/pkgs/development/idris-modules/vdom.nix b/pkgs/development/idris-modules/vdom.nix index 7f1ecb61c8ec..f6fdaf7a75e2 100644 --- a/pkgs/development/idris-modules/vdom.nix +++ b/pkgs/development/idris-modules/vdom.nix @@ -6,6 +6,8 @@ build-idris-package { name = "vdom"; version = "0.6.0"; + ipkgName = "idris-vdom"; + src = fetchFromGitHub { owner = "brandondyck"; repo = "idris-vdom"; diff --git a/pkgs/development/idris-modules/yaml.nix b/pkgs/development/idris-modules/yaml.nix index ec689ce4805a..61efb8cd575e 100644 --- a/pkgs/development/idris-modules/yaml.nix +++ b/pkgs/development/idris-modules/yaml.nix @@ -8,6 +8,7 @@ build-idris-package { name = "yaml"; version = "2018-01-25"; + ipkgName = "Yaml"; idrisDeps = [ contrib lightyear ]; src = fetchFromGitHub { diff --git a/pkgs/development/idris-modules/yampa.nix b/pkgs/development/idris-modules/yampa.nix index 0231555b4ad6..ebe92f468982 100644 --- a/pkgs/development/idris-modules/yampa.nix +++ b/pkgs/development/idris-modules/yampa.nix @@ -7,6 +7,7 @@ build-idris-package { name = "yampa"; version = "2016-07-05"; + ipkgName = "idris-yampa"; idrisDeps = [ bifunctors ]; src = fetchFromGitHub { diff --git a/pkgs/development/libraries/accountsservice/default.nix b/pkgs/development/libraries/accountsservice/default.nix index 36d7912d0f8a..66d540f8d66b 100644 --- a/pkgs/development/libraries/accountsservice/default.nix +++ b/pkgs/development/libraries/accountsservice/default.nix @@ -1,22 +1,26 @@ { stdenv, fetchurl, pkgconfig, glib, intltool, makeWrapper, shadow -, libtool, gobjectIntrospection, polkit, systemd, coreutils }: +, gobjectIntrospection, polkit, systemd, coreutils, meson, dbus +, ninja, python3 }: stdenv.mkDerivation rec { name = "accountsservice-${version}"; - version = "0.6.50"; + version = "0.6.54"; src = fetchurl { url = "https://www.freedesktop.org/software/accountsservice/accountsservice-${version}.tar.xz"; - sha256 = "0jn7vg1z4vxnna0hl33hbcb4bb3zpilxc2vyclh24vx4vvsjhn83"; + sha256 = "1b115n0a4yfa06kgxc69qfc1rc0w4frgs3id3029czkrhhn0ds96"; }; - nativeBuildInputs = [ pkgconfig makeWrapper ]; + nativeBuildInputs = [ pkgconfig makeWrapper meson ninja python3 ]; - buildInputs = [ glib intltool libtool gobjectIntrospection polkit systemd ]; + buildInputs = [ glib intltool gobjectIntrospection polkit systemd dbus ]; - configureFlags = [ "--with-systemdsystemunitdir=$(out)/etc/systemd/system" - "--localstatedir=/var" ]; + mesonFlags = [ "-Dsystemdsystemunitdir=etc/systemd/system" + "-Dlocalstatedir=/var" ]; prePatch = '' + chmod +x meson_post_install.py + patchShebangs meson_post_install.py + substituteInPlace src/daemon.c --replace '"/usr/sbin/useradd"' '"${shadow}/bin/useradd"' \ --replace '"/usr/sbin/userdel"' '"${shadow}/bin/userdel"' substituteInPlace src/user.c --replace '"/usr/sbin/usermod"' '"${shadow}/bin/usermod"' \ diff --git a/pkgs/development/libraries/accountsservice/no-create-dirs.patch b/pkgs/development/libraries/accountsservice/no-create-dirs.patch index f26f5c738227..ef1a59b0249f 100644 --- a/pkgs/development/libraries/accountsservice/no-create-dirs.patch +++ b/pkgs/development/libraries/accountsservice/no-create-dirs.patch @@ -1,13 +1,15 @@ ---- a/src/Makefile.in 2014-04-23 22:30:00.276005326 +0200 -+++ b/src/Makefile.in 2014-04-23 22:30:16.809409113 +0200 -@@ -881,8 +881,8 @@ - gdbus-codegen --generate-c-code accounts-user-generated --c-namespace Accounts --interface-prefix=org.freedesktop.Accounts. $(top_srcdir)/data/org.freedesktop.Accounts.User.xml +diff --git a/meson_post_install.py b/meson_post_install.py +index ba95055..17f7926 100644 +--- a/meson_post_install.py ++++ b/meson_post_install.py +@@ -9,8 +9,8 @@ localstatedir = os.path.normpath(destdir + os.sep + sys.argv[1]) + # FIXME: meson will not track the creation of these directories + # https://github.com/mesonbuild/meson/blob/master/mesonbuild/scripts/uninstall.py#L39 + dst_dirs = [ +- os.path.join(localstatedir, 'lib', 'AccountsService', 'icons'), +- os.path.join(localstatedir, 'lib', 'AccountsService', 'users'), ++ #os.path.join(localstatedir, 'lib', 'AccountsService', 'icons'), ++ #os.path.join(localstatedir, 'lib', 'AccountsService', 'users'), + ] - install-data-hook: -- $(MKDIR_P) "$(DESTDIR)$(localstatedir)/lib/AccountsService/users" -- $(MKDIR_P) "$(DESTDIR)$(localstatedir)/lib/AccountsService/icons" -+# $(MKDIR_P) "$(DESTDIR)$(localstatedir)/lib/AccountsService/users" -+# $(MKDIR_P) "$(DESTDIR)$(localstatedir)/lib/AccountsService/icons" - - # Tell versions [3.59,3.63) of GNU make to not export all variables. - # Otherwise a system limit (for SysV at least) may be exceeded. + for dst_dir in dst_dirs: diff --git a/pkgs/development/libraries/aubio/default.nix b/pkgs/development/libraries/aubio/default.nix index adcb86cedf84..8c8fe25f5000 100644 --- a/pkgs/development/libraries/aubio/default.nix +++ b/pkgs/development/libraries/aubio/default.nix @@ -3,11 +3,11 @@ }: stdenv.mkDerivation rec { - name = "aubio-0.4.6"; + name = "aubio-0.4.7"; src = fetchurl { url = "https://aubio.org/pub/${name}.tar.bz2"; - sha256 = "1yvwskahx1bf3x2fvi6cwah1ay11iarh79fjlqz8s887y3hkpixx"; + sha256 = "0hd0kzfmr46am00ygxar8alrldv92c5azqy701iilfmbqpz4mvfb"; }; nativeBuildInputs = [ pkgconfig python ]; diff --git a/pkgs/development/libraries/boehm-gc/7.6.6.nix b/pkgs/development/libraries/boehm-gc/7.6.6.nix new file mode 100644 index 000000000000..da71e40187f4 --- /dev/null +++ b/pkgs/development/libraries/boehm-gc/7.6.6.nix @@ -0,0 +1,74 @@ +{ lib, stdenv, fetchurl, fetchpatch, pkgconfig, libatomic_ops +, enableLargeConfig ? false # doc: https://github.com/ivmai/bdwgc/blob/v7.6.6/doc/README.macros#L179 +}: + +stdenv.mkDerivation rec { + name = "boehm-gc-${version}"; + version = "7.6.6"; + + src = fetchurl { + urls = [ + "http://www.hboehm.info/gc/gc_source/gc-${version}.tar.gz" + "https://github.com/ivmai/bdwgc/releases/download/v${version}/gc-${version}.tar.gz" + ]; + sha256 = "1p1r015a7jbpvkkbgzv1y8nxrbbp6dg0mq3ksi6ji0qdz3wfss79"; + }; + + buildInputs = [ libatomic_ops ]; + nativeBuildInputs = [ pkgconfig ]; + + outputs = [ "out" "dev" "doc" ]; + separateDebugInfo = stdenv.isLinux; + + preConfigure = stdenv.lib.optionalString (stdenv.hostPlatform.libc == "musl") '' + export NIX_CFLAGS_COMPILE+="-D_GNU_SOURCE -DUSE_MMAP -DHAVE_DL_ITERATE_PHDR" + ''; + + patches = [ (fetchpatch { + url = "https://gitweb.gentoo.org/proj/musl.git/plain/dev-libs/boehm-gc/files/boehm-gc-7.6.0-sys_select.patch"; + sha256 = "1gydwlklvci30f5dpp5ccw2p2qpph5y41r55wx9idamjlq66fbb3"; + }) ] ++ + # https://github.com/ivmai/bdwgc/pull/208 + lib.optional stdenv.hostPlatform.isRiscV ./riscv.patch; + + configureFlags = + [ "--enable-cplusplus" ] + ++ lib.optional enableLargeConfig "--enable-large-config" + ++ lib.optional (stdenv.hostPlatform.libc == "musl") "--disable-static"; + + doCheck = true; # not cross; + + # Don't run the native `strip' when cross-compiling. + dontStrip = stdenv.hostPlatform != stdenv.buildPlatform; + + enableParallelBuilding = true; + + meta = { + description = "The Boehm-Demers-Weiser conservative garbage collector for C and C++"; + + longDescription = '' + The Boehm-Demers-Weiser conservative garbage collector can be used as a + garbage collecting replacement for C malloc or C++ new. It allows you + to allocate memory basically as you normally would, without explicitly + deallocating memory that is no longer useful. The collector + automatically recycles memory when it determines that it can no longer + be otherwise accessed. + + The collector is also used by a number of programming language + implementations that either use C as intermediate code, want to + facilitate easier interoperation with C libraries, or just prefer the + simple collector interface. + + Alternatively, the garbage collector may be used as a leak detector for + C or C++ programs, though that is not its primary goal. + ''; + + homepage = http://hboehm.info/gc/; + + # non-copyleft, X11-style license + license = http://hboehm.info/gc/license.txt; + + maintainers = [ ]; + platforms = stdenv.lib.platforms.all; + }; +} diff --git a/pkgs/development/libraries/cl/default.nix b/pkgs/development/libraries/cl/default.nix index 7cb75d8de0f3..1890d2b25a0d 100644 --- a/pkgs/development/libraries/cl/default.nix +++ b/pkgs/development/libraries/cl/default.nix @@ -1,14 +1,14 @@ {stdenv, fetchFromGitHub, rebar, erlang, opencl-headers, ocl-icd }: stdenv.mkDerivation rec { - version = "1.2.3"; + version = "1.2.4"; name = "cl-${version}"; src = fetchFromGitHub { owner = "tonyrog"; repo = "cl"; rev = "cl-${version}"; - sha256 = "1dk0k03z0ipxvrnn0kihph135hriw96jpnd31lbq44k6ckh6bm03"; + sha256 = "1gwkjl305a0231hz3k0w448dsgbgdriaq764sizs5qfn59nzvinz"; }; buildInputs = [ erlang rebar opencl-headers ocl-icd ]; diff --git a/pkgs/development/libraries/clutter-gtk/default.nix b/pkgs/development/libraries/clutter-gtk/default.nix index afeb7064ffea..6c8951165313 100644 --- a/pkgs/development/libraries/clutter-gtk/default.nix +++ b/pkgs/development/libraries/clutter-gtk/default.nix @@ -14,6 +14,8 @@ stdenv.mkDerivation rec { sha256 = "01ibniy4ich0fgpam53q252idm7f4fn5xg5qvizcfww90gn9652j"; }; + outputs = [ "out" "dev" ]; + propagatedBuildInputs = [ clutter gtk3 ]; nativeBuildInputs = [ meson ninja pkgconfig gobjectIntrospection ]; diff --git a/pkgs/development/libraries/clutter/default.nix b/pkgs/development/libraries/clutter/default.nix index 97db6880c5f0..090f85554b66 100644 --- a/pkgs/development/libraries/clutter/default.nix +++ b/pkgs/development/libraries/clutter/default.nix @@ -15,6 +15,8 @@ stdenv.mkDerivation rec { sha256 = "0mif1qnrpkgxi43h7pimim6w6zwywa16ixcliw0yjm9hk0a368z7"; }; + outputs = [ "out" "dev" ]; + buildInputs = [ gtk3 ]; nativeBuildInputs = [ pkgconfig ]; propagatedBuildInputs = diff --git a/pkgs/development/libraries/cogl/default.nix b/pkgs/development/libraries/cogl/default.nix index 3f81c39a9b22..f35335e4be7b 100644 --- a/pkgs/development/libraries/cogl/default.nix +++ b/pkgs/development/libraries/cogl/default.nix @@ -31,6 +31,8 @@ in stdenv.mkDerivation rec { }) ]; + outputs = [ "out" "dev" ]; + nativeBuildInputs = [ pkgconfig libintl ]; configureFlags = [ diff --git a/pkgs/development/libraries/cpp-hocon/default.nix b/pkgs/development/libraries/cpp-hocon/default.nix index 1f4b43db16c3..f08077a9a3cf 100644 --- a/pkgs/development/libraries/cpp-hocon/default.nix +++ b/pkgs/development/libraries/cpp-hocon/default.nix @@ -2,10 +2,10 @@ stdenv.mkDerivation rec { name = "cpp-hocon-${version}"; - version = "0.1.7"; + version = "0.2.0"; src = fetchFromGitHub { - sha256 = "0mfpz349c3arihvngw1a1gfhwlcw6wiwyc44bghjx1q109w7wm1m"; + sha256 = "084vsn080z8mp5s54jaq0qdwlx0p62nbw1i0rffkag477h8vq68i"; rev = version; repo = "cpp-hocon"; owner = "puppetlabs"; diff --git a/pkgs/development/libraries/geos/default.nix b/pkgs/development/libraries/geos/default.nix index c1b4c88aa479..2417af3dbfd8 100644 --- a/pkgs/development/libraries/geos/default.nix +++ b/pkgs/development/libraries/geos/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, python }: stdenv.mkDerivation rec { - name = "geos-3.6.3"; + name = "geos-3.7.0"; src = fetchurl { url = "https://download.osgeo.org/geos/${name}.tar.bz2"; - sha256 = "0jrypv61rbyp7vi9qpnnaiigjj8cgdqvyk8ymik8h1ppcw5am7mb"; + sha256 = "1mrz778m6bd1x9k6sha5kld43kalhq79h2lynlx2jx7xjakl3gsg"; }; enableParallelBuilding = true; diff --git a/pkgs/development/libraries/hiredis/default.nix b/pkgs/development/libraries/hiredis/default.nix index 7ff8ed61cab3..0f68d7df2981 100644 --- a/pkgs/development/libraries/hiredis/default.nix +++ b/pkgs/development/libraries/hiredis/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { name = "hiredis-${version}"; - version = "0.13.3"; + version = "0.14.0"; src = fetchFromGitHub { owner = "redis"; repo = "hiredis"; rev = "v${version}"; - sha256 = "1qxiv61bsp6s847hhkxqj7vnbdlac089r2qdp3zgxhhckaflhb7r"; + sha256 = "0ik38lwpmm780jqrry95ckf6flmvd172444p3q8d1k9n99jwij9c"; }; PREFIX = "\${out}"; diff --git a/pkgs/development/libraries/libchamplain/default.nix b/pkgs/development/libraries/libchamplain/default.nix index 677910328458..95b1ad074b05 100644 --- a/pkgs/development/libraries/libchamplain/default.nix +++ b/pkgs/development/libraries/libchamplain/default.nix @@ -13,6 +13,8 @@ stdenv.mkDerivation rec { sha256 = "13chvc2n074i0jw5jlb8i7cysda4yqx58ca6y3mrlrl9g37k2zja"; }; + outputs = [ "out" "dev" ]; + nativeBuildInputs = [ pkgconfig gobjectIntrospection ]; propagatedBuildInputs = [ glib gtk3 cairo clutter-gtk sqlite libsoup ]; diff --git a/pkgs/development/libraries/libguestfs/default.nix b/pkgs/development/libraries/libguestfs/default.nix index 6001946cb970..aad6365e4c2d 100644 --- a/pkgs/development/libraries/libguestfs/default.nix +++ b/pkgs/development/libraries/libguestfs/default.nix @@ -11,11 +11,11 @@ assert javaSupport -> jdk != null; stdenv.mkDerivation rec { name = "libguestfs-${version}"; - version = "1.38.4"; + version = "1.38.6"; src = fetchurl { url = "http://libguestfs.org/download/1.38-stable/libguestfs-${version}.tar.gz"; - sha256 = "1xsazw6yrbgmc647j8l896fzv534157sqmdzac09rxkxwiy0wm16"; + sha256 = "1v2mggx2jlaq4m3p5shc46gzf7vmaayha6r0nwdnyzd7x6q0is7p"; }; nativeBuildInputs = [ pkgconfig ]; diff --git a/pkgs/development/libraries/libisoburn/default.nix b/pkgs/development/libraries/libisoburn/default.nix index 6e7764176091..ce2028e805dc 100644 --- a/pkgs/development/libraries/libisoburn/default.nix +++ b/pkgs/development/libraries/libisoburn/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "libisoburn-${version}"; - version = "1.4.8"; + version = "1.5.0"; src = fetchurl { url = "http://files.libburnia-project.org/releases/${name}.tar.gz"; - sha256 = "19d53j17pn18vfxxqqlqwam5lm21ljyp8nai5434068g7x3m1kwi"; + sha256 = "1r8xbhw21bmcp3jhfmvadivh0fa7f4k6larv8lvg4ka0kiigbhfs"; }; buildInputs = [ attr zlib libburn libisofs ]; diff --git a/pkgs/development/libraries/libqtav/default.nix b/pkgs/development/libraries/libqtav/default.nix index b291ec2fdf0b..048ba48bb674 100644 --- a/pkgs/development/libraries/libqtav/default.nix +++ b/pkgs/development/libraries/libqtav/default.nix @@ -1,6 +1,6 @@ { mkDerivation, lib, fetchFromGitHub, extra-cmake-modules , qtbase, qtmultimedia, qtquick1, qttools -, libGLU_combined, libX11 +, libGL, libX11 , libass, openal, ffmpeg, libuchardet , alsaLib, libpulseaudio, libva }: @@ -14,7 +14,7 @@ mkDerivation rec { nativeBuildInputs = [ extra-cmake-modules qttools ]; buildInputs = [ qtbase qtmultimedia qtquick1 - libGLU_combined libX11 + libGL libX11 libass openal ffmpeg libuchardet alsaLib libpulseaudio libva ]; @@ -27,18 +27,20 @@ mkDerivation rec { fetchSubmodules = true; }; - # Make sure libqtav finds its libGL dependancy at both link and run time - # by adding libGLU_combined to rpath. Not sure why it wasn't done automatically like - # the other libraries as `libGLU_combined` is part of our `buildInputs`. - NIX_CFLAGS_LINK = [ "-Wl,-rpath,${libGLU_combined}/lib"]; + # Make sure libqtav finds its libGL dependency at both link and run time + # by adding libGL to rpath. Not sure why it wasn't done automatically like + # the other libraries as `libGL` is part of our `buildInputs`. + NIX_CFLAGS_LINK = [ "-Wl,-rpath,${libGL}/lib"]; preFixup = '' mkdir -p "$out/bin" cp -a "./bin/"* "$out/bin" ''; + stripDebugList = [ "lib" "libexec" "bin" "qml" ]; + meta = { - description = "A multimedia playback framework based on Qt + FFmpeg."; + description = "A multimedia playback framework based on Qt + FFmpeg"; #license = licenses.lgpl21; # For the libraries / headers only. license = licenses.gpl3; # With the examples (under bin) and most likely some of the optional dependencies used. homepage = http://www.qtav.org/; diff --git a/pkgs/development/libraries/opencv/3.x.nix b/pkgs/development/libraries/opencv/3.x.nix index dd87fa932604..64aa11e17634 100644 --- a/pkgs/development/libraries/opencv/3.x.nix +++ b/pkgs/development/libraries/opencv/3.x.nix @@ -165,6 +165,11 @@ stdenv.mkDerivation rec { ${installExtraFiles face} ''); + postConfigure = '' + [ -e modules/core/version_string.inc ] + echo '"(build info elided)"' > modules/core/version_string.inc + ''; + buildInputs = [ zlib pcre hdf5 glog boost google-gflags protobuf ] ++ lib.optional enablePython pythonPackages.python diff --git a/pkgs/development/libraries/qt-5/modules/qtgraphicaleffects.nix b/pkgs/development/libraries/qt-5/modules/qtgraphicaleffects.nix index 888f627baab8..d0be6ae77694 100644 --- a/pkgs/development/libraries/qt-5/modules/qtgraphicaleffects.nix +++ b/pkgs/development/libraries/qt-5/modules/qtgraphicaleffects.nix @@ -3,5 +3,5 @@ qtModule { name = "qtgraphicaleffects"; qtInputs = [ qtdeclarative ]; - outputs = [ "out" ]; + outputs = [ "out" "dev" ]; } diff --git a/pkgs/development/libraries/rapidcheck/default.nix b/pkgs/development/libraries/rapidcheck/default.nix new file mode 100644 index 000000000000..9d8ce8cef202 --- /dev/null +++ b/pkgs/development/libraries/rapidcheck/default.nix @@ -0,0 +1,27 @@ +{ stdenv, cmake, fetchFromGitHub }: + +stdenv.mkDerivation rec{ + name = "rapidcheck-${version}"; + version = "unstable-2018-09-27"; + + src = fetchFromGitHub { + owner = "emil-e"; + repo = "rapidcheck"; + rev = "de54478fa35c0d9cea14ec0c5c9dfae906da524c"; + sha256 = "0n8l0mlq9xqmpkgcj5xicicd1my2cfwxg25zdy8347dqkl1ppgbs"; + }; + + nativeBuildInputs = [ cmake ]; + + postInstall = '' + cp ../extras/boost_test/include/rapidcheck/boost_test.h $out/include/rapidcheck + ''; + + meta = with stdenv.lib; { + description = "A C++ framework for property based testing inspired by QuickCheck"; + inherit (src.meta) homepage; + maintainers = with maintainers; [ jb55 ]; + license = licenses.bsd2; + platforms = platforms.all; + }; +} diff --git a/pkgs/development/libraries/v8/6_x.nix b/pkgs/development/libraries/v8/6_x.nix index adebedbf2ac1..85d0c0d91bb5 100644 --- a/pkgs/development/libraries/v8/6_x.nix +++ b/pkgs/development/libraries/v8/6_x.nix @@ -13,82 +13,102 @@ let else "ia32"; git_url = "https://chromium.googlesource.com"; + # This data is from the DEPS file in the root of a V8 checkout deps = { "base/trace_event/common" = fetchgit { - url = "${git_url}/chromium/src/base/trace_event/common.git"; - rev = "65d1d42a5df6c0a563a6fdfa58a135679185e5d9"; - sha256 = "0ikk0dj12adzr0138jrmwzhx8n9sl5qzs86a3mc3gva08a8wc84p"; + url = "${git_url}/chromium/src/base/trace_event/common.git"; + rev = "211b3ed9d0481b4caddbee1322321b86a483ca1f"; + sha256 = "080sya1dg32hi5gj7zr3r5l18r6w8g0imajyf3xfvnz67a2i8dd7"; }; "build" = fetchgit { - url = "${git_url}/chromium/src/build.git"; - rev = "48a2b7b39debc7c77c868c9ddb0a360af1ebc367"; - sha256 = "0aj554dfdbwnikwaapznfq55wkwbvg4114h7qamixy8ryjkaiy0k"; + url = "${git_url}/chromium/src/build.git"; + rev = "7315579e388589b62236ad933f09afd1e838d234"; + sha256 = "14gsigyjfm03kfzmz0v6429b6qnycvzx0yj3vwaks8may26aiv71"; }; "buildtools" = fetchgit { - url = "${git_url}/chromium/buildtools.git"; - rev = "5af0a3a8b89827a8634132080a39ab4b63dee489"; - sha256 = "1841803m40w1hmnmm7qzdpk4b6q1m8cb7q4hsflqfpddpf4lp3v1"; + url = "${git_url}/chromium/buildtools.git"; + rev = "0dd5c6f980d22be96b728155249df2da355989d9"; + sha256 = "0m1fh0qjcx9c69khnqcsqvrnqs7ji6wfxns9vv9mknj20sph5ydr"; }; "test/benchmarks/data" = fetchgit { - url = "${git_url}/v8/deps/third_party/benchmarks.git"; - rev = "05d7188267b4560491ff9155c5ee13e207ecd65f"; + url = "${git_url}/v8/deps/third_party/benchmarks.git"; + rev = "05d7188267b4560491ff9155c5ee13e207ecd65f"; sha256 = "0ad2ay14bn67d61ks4dmzadfnhkj9bw28r4yjdjjyzck7qbnzchl"; }; "test/mozilla/data" = fetchgit { - url = "${git_url}/v8/deps/third_party/mozilla-tests.git"; - rev = "f6c578a10ea707b1a8ab0b88943fe5115ce2b9be"; + url = "${git_url}/v8/deps/third_party/mozilla-tests.git"; + rev = "f6c578a10ea707b1a8ab0b88943fe5115ce2b9be"; sha256 = "0rfdan76yfawqxbwwb35aa57b723j3z9fx5a2w16nls02yk2kqyn"; }; "test/test262/data" = fetchgit { - url = "${git_url}/external/github.com/tc39/test262.git"; - rev = "1b911a8f8abf4cb63882cfbe72dcd4c82bb8ad91"; - sha256 = "1hbp7vv41k7jka8azc78hhw4qng7gckr6dz1van7cyd067znwvr4"; + url = "${git_url}/external/github.com/tc39/test262.git"; + rev = "a6c1d05ac4fed084fa047e4c52ab2a8c9c2a8aef"; + sha256 = "1cy3val2ih6r4sbaxd1v9fir87mrlw1kr54s64g68gnch53ck9s3"; }; "test/test262/harness" = fetchgit { - url = "${git_url}/external/github.com/test262-utils/test262-harness-py.git"; - rev = "0f2acdd882c84cff43b9d60df7574a1901e2cdcd"; + url = "${git_url}/external/github.com/test262-utils/test262-harness-py.git"; + rev = "0f2acdd882c84cff43b9d60df7574a1901e2cdcd"; sha256 = "00brj5avp43yamc92kinba2mg3a2x1rcd7wnm7z093l73idprvkp"; }; "test/wasm-js" = fetchgit { - url = "${git_url}/external/github.com/WebAssembly/spec.git"; - rev = "17b4a4d98c80b1ec736649d5a73496a0e6d12d4c"; - sha256 = "03nyrrqffzj6xrmqi1v7f9m9395bdk53x301fy5mcq4hhpq6rsjr"; + url = "${git_url}/external/github.com/WebAssembly/spec.git"; + rev = "2113ea7e106f8a964e0445ba38f289d2aa845edd"; + sha256 = "07aw7x2xzmzk905mqf8gbbb1bi1a5kv99g8iv6x2p07d3zns7xzx"; }; - "testing/gmock" = fetchgit { - url = "${git_url}/external/googlemock.git"; - rev = "0421b6f358139f02e102c9c332ce19a33faf75be"; - sha256 = "1xiky4v98maxs8fg1avcd56y0alv3hw8qyrlpd899zgzbq2k10pp"; + "third_party/depot_tools" = fetchgit { + url = "${git_url}/chromium/tools/depot_tools.git"; + rev = "fb734036f4b5ae6d5afc63cbfc41d3a5d1c29a82"; + sha256 = "1738y7xgfnn0hfdr8g5jw7555841ycxbn580mdffwv4jnbn7120s"; }; - "testing/gtest" = fetchgit { - url = "${git_url}/external/github.com/google/googletest.git"; - rev = "6f8a66431cb592dad629028a50b3dd418a408c87"; - sha256 = "0bdba2lr6pg15bla9600zg0r0vm4lnrx0wqz84p376wfdxra24vw"; + "third_party/googletest/src" = fetchgit { + url = "${git_url}/external/github.com/google/googletest.git"; + rev = "ce468a17c434e4e79724396ee1b51d86bfc8a88b"; + sha256 = "0nik8wb1b0zk2sslawgp5h211r5bc4x7m962dgnmbk11ccvsmr23"; }; "third_party/icu" = fetchgit { - url = "${git_url}/chromium/deps/icu.git"; - rev = "08cb956852a5ccdba7f9c941728bb833529ba3c6"; - sha256 = "0vn2iv068kmcjqqx5cgyha80x9iraz11hpx3q4n3rkvrlvbb3d7b"; + url = "${git_url}/chromium/deps/icu.git"; + rev = "a9a2bd3ee4f1d313651c5272252aaf2a3e7ed529"; + sha256 = "1bfyxakgv9z0rxbqsy5csi85kg8dqy7i6zybmng5wyzag9cns4f9"; }; "third_party/instrumented_libraries" = fetchgit { - url = "${git_url}/chromium/src/third_party/instrumented_libraries.git"; - rev = "644afd349826cb68204226a16c38bde13abe9c3c"; - sha256 = "0d1vkwilgv1a4ghazn623gwmm7h51padpfi94qrmig1y748xfwfa"; + url = "${git_url}/chromium/src/third_party/instrumented_libraries.git"; + rev = "323cf32193caecbf074d1a0cb5b02b905f163e0f"; + sha256 = "0q3n3ivqva28qpn67ds635521pwzpc9apcyagz65i9j17bb1k231"; }; - # templates of code generator require jinja2 2.8 (while nixpkgs has 2.9.5, which breaks the template) "third_party/jinja2" = fetchgit { - url = "${git_url}/chromium/src/third_party/jinja2.git"; - rev = "d34383206fa42d52faa10bb9931d6d538f3a57e0"; - sha256 = "0d9hyw0bvp3p0dbwy833cm9vdqxcam0qbm9jc561ynphddxlkmgd"; + url = "${git_url}/chromium/src/third_party/jinja2.git"; + rev = "b41863e42637544c2941b574c7877d3e1f663e25"; + sha256 = "1qgilclkav67m6cl2xq2kmzkswrkrb2axc2z8mw58fnch4j1jf1r"; }; "third_party/markupsafe" = fetchgit { - url = "${git_url}/chromium/src/third_party/markupsafe.git"; - rev = "8f45f5cfa0009d2a70589bcda0349b8cb2b72783"; + url = "${git_url}/chromium/src/third_party/markupsafe.git"; + rev = "8f45f5cfa0009d2a70589bcda0349b8cb2b72783"; sha256 = "168ppjmicfdh4i1l0l25s86mdbrz9fgxmiq1rx33x79mph41scfz"; }; + "third_party/proguard" = fetchgit { + url = "${git_url}/chromium/src/third_party/proguard.git"; + rev = "eba7a98d98735b2cc65c54d36baa5c9b46fe4f8e"; + sha256 = "1yx86z2p243b0ykixgqz6nlqfp8swa6n0yl5fgb29fa4jvsjz3d1"; + }; "tools/clang" = fetchgit { - url = "${git_url}/chromium/src/tools/clang.git"; - rev = "40f69660bf3cd407e72b8ae240fdd6c513dddbfe"; - sha256 = "1plkb9dcn34yd6lad7w59s9vqwmcc592dasgdk232spkafpg8qcf"; + url = "${git_url}/chromium/src/tools/clang.git"; + rev = "c0b1d892b2bc1291eb287d716ca239c1b03fb215"; + sha256 = "1mz1pqzr2b37mymbkqkmpmj48j7a8ig0ibaw3dfilbx5nbl4wd2z"; + }; + "tools/gyp" = fetchgit { + url = "${git_url}/external/gyp.git"; + rev = "d61a9397e668fa9843c4aa7da9e79460fe590bfb"; + sha256 = "1z081h72mjy285jb1kj5xd0pb4p12n9blvsimsavyn3ldmswv0r0"; + }; + "tools/luci-go" = fetchgit { + url = "${git_url}/chromium/src/tools/luci-go.git"; + rev = "abcd908f74fdb155cc8870f5cae48dff1ece7c3c"; + sha256 = "07c8vanc31wal6aw8v0s499l7ifrgvdvi2sx4ln3nyha5ngxinld"; + }; + "tools/swarming_client" = fetchgit { + url = "${git_url}/infra/luci/client-py.git"; + rev = "9a518d097dca20b7b00ce3bdfc5d418ccc79893a"; + sha256 = "1d8nly7rp24gx7q0m01jvsc15nw5fahayfczwd40gzzzkmvhjazi"; }; }; @@ -96,7 +116,7 @@ in stdenv.mkDerivation rec { name = "v8-${version}"; - version = "6.2.414.27"; + version = "6.9.427.14"; inherit doCheck; @@ -104,7 +124,7 @@ stdenv.mkDerivation rec { owner = "v8"; repo = "v8"; rev = version; - sha256 = "15zrb9bcpnhljhrilqnjaak3a4xnhj8li6ra12g3gkrw3fzir9a2"; + sha256 = "13d50iz87qh7v8l8kjky8wqs9rvz02pgw74q8crqi5ywnvvill1x"; }; postUnpack = '' @@ -133,11 +153,13 @@ stdenv.mkDerivation rec { configurePhase = '' tools/dev/v8gen.py -vv ${arch}.release -- \ - is_component_build=true \ - ${if snapshot then "v8_use_external_startup_data=false" else "v8_use_snapshot=false" } \ - is_clang=false \ - linux_use_bundled_binutils=false \ - treat_warnings_as_errors=false + is_component_build=true \ + ${if snapshot then "v8_use_external_startup_data=false" else "v8_use_snapshot=false"} \ + is_clang=false \ + linux_use_bundled_binutils=false \ + treat_warnings_as_errors=false \ + use_custom_libcxx=false \ + use_custom_libcxx_for_host=false ''; nativeBuildInputs = [ gn ninja pkgconfig ]; diff --git a/pkgs/development/libraries/webkitgtk/2.22.nix b/pkgs/development/libraries/webkitgtk/2.22.nix new file mode 100644 index 000000000000..7eae5819daf1 --- /dev/null +++ b/pkgs/development/libraries/webkitgtk/2.22.nix @@ -0,0 +1,83 @@ +{ stdenv, fetchurl, perl, python2, ruby, bison, gperf, cmake, ninja +, pkgconfig, gettext, gobjectIntrospection, libnotify, gnutls, libgcrypt +, gtk3, wayland, libwebp, enchant2, xorg, libxkbcommon, epoxy, at-spi2-core +, libxml2, libsoup, libsecret, libxslt, harfbuzz, libpthreadstubs, pcre, nettle, libtasn1, p11-kit +, libidn, libedit, readline, libGLU_combined, libintl +, enableGeoLocation ? true, geoclue2, sqlite +, enableGtk2Plugins ? false, gtk2 ? null +, gst-plugins-base, gst-plugins-bad, woff2 +}: + +assert enableGeoLocation -> geoclue2 != null; +assert enableGtk2Plugins -> gtk2 != null; +assert stdenv.isDarwin -> !enableGtk2Plugins; + +with stdenv.lib; +stdenv.mkDerivation rec { + name = "webkitgtk-${version}"; + version = "2.22.2"; + + meta = { + description = "Web content rendering engine, GTK+ port"; + homepage = https://webkitgtk.org/; + license = licenses.bsd2; + platforms = platforms.linux; + hydraPlatforms = []; + maintainers = with maintainers; [ ]; + }; + + src = fetchurl { + url = "https://webkitgtk.org/releases/${name}.tar.xz"; + sha256 = "1flrbr8pzbrlwv09b4pmgh6vklw7jghd2lgrhcb72vl9s7a8fm1l"; + }; + + patches = optionals stdenv.isDarwin [ + ## TODO add necessary patches for Darwin + ]; + + postPatch = '' + patchShebangs . + ''; + + cmakeFlags = [ + "-DPORT=GTK" + "-DUSE_LIBHYPHEN=0" + "-DENABLE_INTROSPECTION=ON" + ] + ++ optional (!enableGtk2Plugins) "-DENABLE_PLUGIN_PROCESS_GTK2=OFF" + ++ optional stdenv.isLinux "-DENABLE_GLES2=ON" + ++ optionals stdenv.isDarwin [ + "-DUSE_SYSTEM_MALLOC=ON" + "-DUSE_ACCELERATE=0" + "-DENABLE_MINIBROWSER=OFF" + "-DENABLE_VIDEO=ON" + "-DENABLE_QUARTZ_TARGET=ON" + "-DENABLE_X11_TARGET=OFF" + "-DENABLE_OPENGL=OFF" + "-DENABLE_WEB_AUDIO=OFF" + "-DENABLE_WEBGL=OFF" + "-DENABLE_GRAPHICS_CONTEXT_3D=OFF" + "-DENABLE_GTKDOC=OFF" + ]; + + nativeBuildInputs = [ + cmake ninja perl python2 ruby bison gperf + pkgconfig gettext gobjectIntrospection + ]; + + buildInputs = [ + libintl libwebp enchant2 libnotify gnutls pcre nettle libidn libgcrypt woff2 + libxml2 libsecret libxslt harfbuzz libpthreadstubs libtasn1 p11-kit + sqlite gst-plugins-base gst-plugins-bad libxkbcommon epoxy at-spi2-core + ] ++ optional enableGeoLocation geoclue2 + ++ optional enableGtk2Plugins gtk2 + ++ (with xorg; [ libXdmcp libXt libXtst libXdamage ]) + ++ optionals stdenv.isDarwin [ libedit readline libGLU_combined ] + ++ optional stdenv.isLinux wayland; + + propagatedBuildInputs = [ + libsoup gtk3 + ]; + + outputs = [ "out" "dev" ]; +} diff --git a/pkgs/development/node-packages/node-packages-v8.json b/pkgs/development/node-packages/node-packages-v8.json index 40d70f198abf..779e6389bd39 100644 --- a/pkgs/development/node-packages/node-packages-v8.json +++ b/pkgs/development/node-packages/node-packages-v8.json @@ -36,6 +36,7 @@ , "grunt-cli" , { "guifi-earth": "https://github.com/jmendeth/guifi-earth/tarball/f3ee96835fd4fb0e3e12fadbd2cb782770d64854 " } , "gulp" +, "gulp-cli" , "hipache" , "htmlhint" , "html-minifier" diff --git a/pkgs/development/node-packages/node-packages-v8.nix b/pkgs/development/node-packages/node-packages-v8.nix index c419a0db44e1..de90e1d188c5 100644 --- a/pkgs/development/node-packages/node-packages-v8.nix +++ b/pkgs/development/node-packages/node-packages-v8.nix @@ -103,13 +103,13 @@ let sha512 = "O/IyiB5pfztCdmxQZg0/xeq5w+YiP3gtJz8d4We2EpLPKzbDVjOrtfLKYgVfm6Ya6mbvDge1uLkSRwaoVCWKnA=="; }; }; - "@commitlint/cli-7.1.2" = { + "@commitlint/cli-7.2.0" = { name = "_at_commitlint_slash_cli"; packageName = "@commitlint/cli"; - version = "7.1.2"; + version = "7.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/@commitlint/cli/-/cli-7.1.2.tgz"; - sha512 = "Dck7MqJCzrATYm4UqIKPdJvLVUuVZcpFw9KicrLw+a9YNIjsaXG9XojgPomTxFBNJZabAYBqKWkqNoFLrFA77w=="; + url = "https://registry.npmjs.org/@commitlint/cli/-/cli-7.2.0.tgz"; + sha512 = "qFTXZoyi+XFkUXRj1pgcfRw5ao31kPkP/V3c7O8SU52GUVxFo2LM8sFiTF9WEqlgSd7WJA0SGl5tOX/VtCMYEA=="; }; }; "@commitlint/config-conventional-7.1.2" = { @@ -121,13 +121,13 @@ let sha512 = "DmA4ixkpv03qA1TVs1Bl25QsVym2bPL6pKapesALWIVggG3OpwqGZ55vN75Tx8xZoG7LFKrVyrt7kwhA7X8njQ=="; }; }; - "@commitlint/ensure-7.1.2" = { + "@commitlint/ensure-7.2.0" = { name = "_at_commitlint_slash_ensure"; packageName = "@commitlint/ensure"; - version = "7.1.2"; + version = "7.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/@commitlint/ensure/-/ensure-7.1.2.tgz"; - sha512 = "F0U4UEMgB5lnscgiZtuUolFkQ/dRD4RzXs8KgCik2D0wL3fUXSB5hmfbrbMF9ERseVQCHsxCHWm7bKzxKmXgIA=="; + url = "https://registry.npmjs.org/@commitlint/ensure/-/ensure-7.2.0.tgz"; + sha512 = "j2AJE4eDeLP6O/Z1CdPwEXAzcrRRoeeHLuvW8bldQ4J2nHiX9hzmSe87H87Ob8Avm+zIegsqVPGaBAtRmbODYw=="; }; }; "@commitlint/execute-rule-7.1.2" = { @@ -139,40 +139,40 @@ let sha512 = "EP/SqX2U2L4AQHglZ2vGM1pvHJOh3sbYtHn1QhtllqEpsdmhuNpVPSGHP/r9OD2h4i90vtnWgZQoskt2MkbknA=="; }; }; - "@commitlint/format-7.1.2" = { + "@commitlint/format-7.2.0" = { name = "_at_commitlint_slash_format"; packageName = "@commitlint/format"; - version = "7.1.2"; + version = "7.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/@commitlint/format/-/format-7.1.2.tgz"; - sha512 = "l+eQChtIeNOddi4t5p+T9ViFXQMMFWIbzKh708YCI8BoByhqedhLsEhEn1nzGq1cVYT2AdGRhY8ed6/Nc5z85w=="; + url = "https://registry.npmjs.org/@commitlint/format/-/format-7.2.0.tgz"; + sha512 = "Vx10wFyP3yfE4tq1x0HWb/vqkZc5+79uWak91sARSu5wG5JVzBvQXxfqOhefOKbVqXGKXlP2yXrSq8fM6YUQ3w=="; }; }; - "@commitlint/is-ignored-7.1.2" = { + "@commitlint/is-ignored-7.2.0" = { name = "_at_commitlint_slash_is-ignored"; packageName = "@commitlint/is-ignored"; - version = "7.1.2"; + version = "7.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/@commitlint/is-ignored/-/is-ignored-7.1.2.tgz"; - sha512 = "29SHreGSAKxOTtIdG1swo9E14E8KZbyE0Y1u0wz9iKjb6i0m7ahZW0l4Ty+j3pACiYDOOXDW1BWSOFaBwwKlxQ=="; + url = "https://registry.npmjs.org/@commitlint/is-ignored/-/is-ignored-7.2.0.tgz"; + sha512 = "6HCkLSuh4hms72x0EJp9mt9UXq27MRpZtmf7exhBnYqNyd76vMMA7/nGjdULxldr2xyzlzKNjMbh2lpQRD4aog=="; }; }; - "@commitlint/lint-7.1.2" = { + "@commitlint/lint-7.2.0" = { name = "_at_commitlint_slash_lint"; packageName = "@commitlint/lint"; - version = "7.1.2"; + version = "7.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/@commitlint/lint/-/lint-7.1.2.tgz"; - sha512 = "HCkMlnUZD4yVnGDHcJQN/PkJRQpKgsiLojUaUHE8b1YjWW+qviolizbZjcqs/nimzCWlAkaU5KPs+3pzGBfVug=="; + url = "https://registry.npmjs.org/@commitlint/lint/-/lint-7.2.0.tgz"; + sha512 = "aZAiQggpF638/XmY7EJe5yTEhg4C4GrxWktcdEDMQrRG1phFUPp+AKXBqljDYzrpmptiL9glY3fLO1m5XzA+BA=="; }; }; - "@commitlint/load-7.1.2" = { + "@commitlint/load-7.2.0" = { name = "_at_commitlint_slash_load"; packageName = "@commitlint/load"; - version = "7.1.2"; + version = "7.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/@commitlint/load/-/load-7.1.2.tgz"; - sha512 = "BEQ9k3iZjB1NDAblmB88WU+256p8xHCWYuqZmJOerx6Upbam7XrpDTurMOKFUxk8tZU9OBqHQtBapX8UxJWi9A=="; + url = "https://registry.npmjs.org/@commitlint/load/-/load-7.2.0.tgz"; + sha512 = "+7rh1jeYhSMj6+zzZVbo5bMnuWx1nL4c5JJdEq3rMQT6ILI169xlL94sPdkz0to6dDmi4yLgC4/kipyLyynriA=="; }; }; "@commitlint/message-7.1.2" = { @@ -211,13 +211,13 @@ let sha512 = "zwbifMB9DeHP4sYQdrkx+XJh5Q1lyP/OdlErUCC34NV4Lkxw/XxXF4St3e+y1X28/SgrEc2XSOS6n/vQQfUlLA=="; }; }; - "@commitlint/rules-7.1.2" = { + "@commitlint/rules-7.2.0" = { name = "_at_commitlint_slash_rules"; packageName = "@commitlint/rules"; - version = "7.1.2"; + version = "7.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/@commitlint/rules/-/rules-7.1.2.tgz"; - sha512 = "O9fONZXiJ6NN2mfy+enHmeTzBHcfDVVYjxTdBJFp99yUSvVyHaD+jc2r795gcMv3oP5594BDXSKcD/3yb8sLzA=="; + url = "https://registry.npmjs.org/@commitlint/rules/-/rules-7.2.0.tgz"; + sha512 = "c15Q9H5iYE9fnncLnFnMuvPLYA/i0pve5moV0uxJJGr4GgJoBKyldd4CCDhoE80C1k8ABuqr2o2qsopzVEp3Ww=="; }; }; "@commitlint/to-lines-7.1.2" = { @@ -310,49 +310,40 @@ let sha1 = "890ae7c5d8c877f6d384860215ace9d7ec945bda"; }; }; - "@ionic/cli-framework-1.0.7" = { + "@ionic/cli-framework-1.1.1" = { name = "_at_ionic_slash_cli-framework"; packageName = "@ionic/cli-framework"; - version = "1.0.7"; - src = fetchurl { - url = "https://registry.npmjs.org/@ionic/cli-framework/-/cli-framework-1.0.7.tgz"; - sha512 = "e6yaPkqom2KVNgUpJJMJbClkc8n4r4pOieiVEgfVmjC0ZC1wRZ3hYHzUMbsY/QOnB3UceCBGuYZMScaF/QNY8g=="; - }; - }; - "@ionic/cli-utils-2.2.1" = { - name = "_at_ionic_slash_cli-utils"; - packageName = "@ionic/cli-utils"; - version = "2.2.1"; + version = "1.1.1"; src = fetchurl { - url = "https://registry.npmjs.org/@ionic/cli-utils/-/cli-utils-2.2.1.tgz"; - sha512 = "/fAsYbgNOVcQhihW3EBy//FtBD/uhZyLA/fCd42UbHloR1uNo0KsGW7dh2i5NBYsaYsOequV5ZxGk2p0Wr5HWw=="; + url = "https://registry.npmjs.org/@ionic/cli-framework/-/cli-framework-1.1.1.tgz"; + sha512 = "atY7TZO7Lh00iz9TIkEuzAg+h+onaf9tR5Xdq365grIDlOD6iRm1xAYKkLOzlObzNQ3WqDW5vqKmtiVrvg3Kfg=="; }; }; - "@ionic/discover-1.0.4" = { + "@ionic/discover-1.0.6" = { name = "_at_ionic_slash_discover"; packageName = "@ionic/discover"; - version = "1.0.4"; + version = "1.0.6"; src = fetchurl { - url = "https://registry.npmjs.org/@ionic/discover/-/discover-1.0.4.tgz"; - sha512 = "/9WbB31cv0nr2M8Vi4O2coDiX27IJ5EXwGKrgnV0X0/dfavObNVqV9ksNcHnZTuNArqBXywOsWPIES0+tHXIhA=="; + url = "https://registry.npmjs.org/@ionic/discover/-/discover-1.0.6.tgz"; + sha512 = "7OsJ4Kr6G9PWVOFdlfXuM7Cz39qFff60dOOzPpIwDXInive+jk42pZ9aKPz/3NMrwWULUOY8pSZ4leiZJNPFpg=="; }; }; - "@ionic/utils-fs-0.0.1" = { + "@ionic/utils-fs-0.0.3" = { name = "_at_ionic_slash_utils-fs"; packageName = "@ionic/utils-fs"; - version = "0.0.1"; + version = "0.0.3"; src = fetchurl { - url = "https://registry.npmjs.org/@ionic/utils-fs/-/utils-fs-0.0.1.tgz"; - sha512 = "l5+RM7lEIKSsxAUyNiarHuNJBioJhFM4CAezZ7YRyFoX6J7Y4paZIfZzoFa6UdNsyucE51lZ1X/6ZOf/gVj73Q=="; + url = "https://registry.npmjs.org/@ionic/utils-fs/-/utils-fs-0.0.3.tgz"; + sha512 = "nj976Lms/0ocagWkfizM/zSWwfYRMOnT+wgNO3B9LMW8OjOH/llxTulBvTih0epqgLl9jjU7moW310BeECVC4g=="; }; }; - "@ionic/utils-network-0.0.1" = { + "@ionic/utils-network-0.0.3" = { name = "_at_ionic_slash_utils-network"; packageName = "@ionic/utils-network"; - version = "0.0.1"; + version = "0.0.3"; src = fetchurl { - url = "https://registry.npmjs.org/@ionic/utils-network/-/utils-network-0.0.1.tgz"; - sha512 = "qpzZ+k94PCWbWmub2XHP0XJKcoBflGeOAW64RlIbthoIzj0SRwoYjn4DrFVbYhScQ/xmLe1hSD2Hq8NZ4HEM5g=="; + url = "https://registry.npmjs.org/@ionic/utils-network/-/utils-network-0.0.3.tgz"; + sha512 = "jc71iYRTg+st9K39rHtT2FWcgtVP9QIWTaDt4o+WFDD1lUicscosFncx5DEzHsb3Shn24SgbiqhcfQ2F//nfyw=="; }; }; "@kbrandwijk/swagger-to-graphql-2.4.3" = { @@ -364,13 +355,13 @@ let sha512 = "CNVsCrMge/jq6DCT5buNZ8PACY9RTvPJbCNoIcndfkJOCsNxOx9dnc5qw4pHZdHi8GS6l3qlgkuFKp33iD8J2Q=="; }; }; - "@lerna/add-3.3.2" = { + "@lerna/add-3.4.1" = { name = "_at_lerna_slash_add"; packageName = "@lerna/add"; - version = "3.3.2"; + version = "3.4.1"; src = fetchurl { - url = "https://registry.npmjs.org/@lerna/add/-/add-3.3.2.tgz"; - sha512 = "nKRRRKb4wt/GAywi8P++NY1TUiyhMs2g2KHSb41I4/qiCFQnTj2zkeshPyNmtBGjKzFXnOqrmc/8Wa2vmHHZVg=="; + url = "https://registry.npmjs.org/@lerna/add/-/add-3.4.1.tgz"; + sha512 = "Vf54B42jlD6G52qnv/cAGH70cVQIa+LX//lfsbkxHvzkhIqBl5J4KsnTOPkA9uq3R+zP58ayicCHB9ReiEWGJg=="; }; }; "@lerna/batch-packages-3.1.2" = { @@ -382,22 +373,22 @@ let sha512 = "HAkpptrYeUVlBYbLScXgeCgk6BsNVXxDd53HVWgzzTWpXV4MHpbpeKrByyt7viXlNhW0w73jJbipb/QlFsHIhQ=="; }; }; - "@lerna/bootstrap-3.3.2" = { + "@lerna/bootstrap-3.4.1" = { name = "_at_lerna_slash_bootstrap"; packageName = "@lerna/bootstrap"; - version = "3.3.2"; + version = "3.4.1"; src = fetchurl { - url = "https://registry.npmjs.org/@lerna/bootstrap/-/bootstrap-3.3.2.tgz"; - sha512 = "f0/FZ6iCXHNpHoUiM3wfmiJebHetrquP9mdNT7t//2iTGm1nz8iuKSLhfu9APazDXtqo3aDFx7JvuYKMg+GiXQ=="; + url = "https://registry.npmjs.org/@lerna/bootstrap/-/bootstrap-3.4.1.tgz"; + sha512 = "yZDJgNm/KDoRH2klzmQGmpWMg/XMzWgeWvauXkrfW/mj1wwmufOuh5pN4fBFxVmUUa/RFZdfMeaaJt3+W3PPBw=="; }; }; - "@lerna/changed-3.3.2" = { + "@lerna/changed-3.4.1" = { name = "_at_lerna_slash_changed"; packageName = "@lerna/changed"; - version = "3.3.2"; + version = "3.4.1"; src = fetchurl { - url = "https://registry.npmjs.org/@lerna/changed/-/changed-3.3.2.tgz"; - sha512 = "wLH6RzYPQAryrsJakc9I3k0aFWE/cJyWoUD8dQy186jxwtLgeQdVc0+NegNyab7MIPi7Hsv9A3hx6lM1rPH94A=="; + url = "https://registry.npmjs.org/@lerna/changed/-/changed-3.4.1.tgz"; + sha512 = "gT7fhl4zQWyGETDO4Yy5wsFnqNlBSsezncS1nkMW1uO6jwnolwYqcr1KbrMR8HdmsZBn/00Y0mRnbtbpPPey8w=="; }; }; "@lerna/check-working-tree-3.3.0" = { @@ -454,22 +445,22 @@ let sha512 = "NTOkLEKlWcBLHSvUr9tzVpV7RJ4GROLeOuZ6RfztGOW/31JPSwVVBD2kPifEXNZunldOx5GVWukR+7+NpAWhsg=="; }; }; - "@lerna/conventional-commits-3.3.0" = { + "@lerna/conventional-commits-3.4.1" = { name = "_at_lerna_slash_conventional-commits"; packageName = "@lerna/conventional-commits"; - version = "3.3.0"; + version = "3.4.1"; src = fetchurl { - url = "https://registry.npmjs.org/@lerna/conventional-commits/-/conventional-commits-3.3.0.tgz"; - sha512 = "nUFardc5G4jG5LI/Jlw0kblzlRLJ08ut6uJjHXTnUE/QJuKYaqBZm6goGG8OSxp/WltklndkQUOtThyZpefviA=="; + url = "https://registry.npmjs.org/@lerna/conventional-commits/-/conventional-commits-3.4.1.tgz"; + sha512 = "3NETrA58aUkaEW3RdwdJ766Bg9NVpLzb26mtdlsJQcvB5sQBWH5dJSHIVQH1QsGloBeH2pE/mDUEVY8ZJXuR4w=="; }; }; - "@lerna/create-3.3.1" = { + "@lerna/create-3.4.1" = { name = "_at_lerna_slash_create"; packageName = "@lerna/create"; - version = "3.3.1"; + version = "3.4.1"; src = fetchurl { - url = "https://registry.npmjs.org/@lerna/create/-/create-3.3.1.tgz"; - sha512 = "4VASkTLvN66euTcWMPN2vIzEoP07hgutx7V70CXSOc+DiWV8S22z0PjXATi2yli83TC/Qj4gHYtU2futQrdY1A=="; + url = "https://registry.npmjs.org/@lerna/create/-/create-3.4.1.tgz"; + sha512 = "l+4t2SRO5nvW0MNYY+EWxbaMHsAN8bkWH3nyt7EzhBjs4+TlRAJRIEqd8o9NWznheE3pzwczFz1Qfl3BWbyM5A=="; }; }; "@lerna/create-symlink-3.3.0" = { @@ -607,13 +598,13 @@ let sha512 = "vVQHgMagE2wnbxhNY9nFkdu+Cx2TsyWalkJfkxbNzmo6gOCrDsxCBDj9vTEV8Q+4aWx0C0Bsc0sB2Eb8y/+ofA=="; }; }; - "@lerna/npm-conf-3.0.0" = { + "@lerna/npm-conf-3.4.1" = { name = "_at_lerna_slash_npm-conf"; packageName = "@lerna/npm-conf"; - version = "3.0.0"; + version = "3.4.1"; src = fetchurl { - url = "https://registry.npmjs.org/@lerna/npm-conf/-/npm-conf-3.0.0.tgz"; - sha512 = "xXG7qt349t+xzaHTQELmIDjbq8Q49HOMR8Nx/gTDBkMl02Fno91LXFnA4A7ErPiyUSGqNSfLw+zgij0hgpeN7w=="; + url = "https://registry.npmjs.org/@lerna/npm-conf/-/npm-conf-3.4.1.tgz"; + sha512 = "i9G6DnbCqiAqxKx2rSXej/n14qxlV/XOebL6QZonxJKzNTB+Q2wglnhTXmfZXTPJfoqimLaY4NfAEtbOXRWOXQ=="; }; }; "@lerna/npm-dist-tag-3.3.0" = { @@ -697,13 +688,13 @@ let sha512 = "eJhofrUCUaItMIH6et8kI7YqHfhjWqGZoTsE+40NRCfAraOMWx+pDzfRfeoAl3qeRAH2HhNj1bkYn70FbUOxuQ=="; }; }; - "@lerna/publish-3.4.0" = { + "@lerna/publish-3.4.1" = { name = "_at_lerna_slash_publish"; packageName = "@lerna/publish"; - version = "3.4.0"; + version = "3.4.1"; src = fetchurl { - url = "https://registry.npmjs.org/@lerna/publish/-/publish-3.4.0.tgz"; - sha512 = "wcqWDKbkDjyj6F9Mw4/LL2CtpCN61RazNKxYm+fyJ20P2zfcAwLEwxttA6ZWIO8xUiLXkCTFIhwOulHyAPAq3w=="; + url = "https://registry.npmjs.org/@lerna/publish/-/publish-3.4.1.tgz"; + sha512 = "Nd5PT2Ksngo1GHqT6ccmGVfMvoA9MplBvqyzPFIjFIJOgODrJ9IGJAMobxgBQ6xXXShflQ/1dHWk8faTOYKLoQ=="; }; }; "@lerna/resolve-symlink-3.3.0" = { @@ -733,13 +724,13 @@ let sha512 = "cruwRGZZWnQ5I0M+AqcoT3Xpq2wj3135iVw4n59/Op6dZu50sMFXZNLiTTTZ15k8rTKjydcccJMdPSpTHbH7/A=="; }; }; - "@lerna/run-lifecycle-3.3.1" = { + "@lerna/run-lifecycle-3.4.1" = { name = "_at_lerna_slash_run-lifecycle"; packageName = "@lerna/run-lifecycle"; - version = "3.3.1"; + version = "3.4.1"; src = fetchurl { - url = "https://registry.npmjs.org/@lerna/run-lifecycle/-/run-lifecycle-3.3.1.tgz"; - sha512 = "xy4K3amlXk0LjSa5d3VqmrW9SsxMyvI7lw2dHDMb5PqjjcjMQgb6+nFbycwyJMhCP8u7MwQIZ4hFYF9XYbWSzQ=="; + url = "https://registry.npmjs.org/@lerna/run-lifecycle/-/run-lifecycle-3.4.1.tgz"; + sha512 = "N/hi2srM9A4BWEkXccP7vCEbf4MmIuALF00DTBMvc0A/ccItwUpl3XNuM7+ADDRK0mkwE3hDw89lJ3A7f8oUQw=="; }; }; "@lerna/run-parallel-batches-3.0.0" = { @@ -778,13 +769,13 @@ let sha512 = "5wjkd2PszV0kWvH+EOKZJWlHEqCTTKrWsvfHnHhcUaKBe/NagPZFWs+0xlsDPZ3DJt5FNfbAPAnEBQ05zLirFA=="; }; }; - "@lerna/version-3.3.2" = { + "@lerna/version-3.4.1" = { name = "_at_lerna_slash_version"; packageName = "@lerna/version"; - version = "3.3.2"; + version = "3.4.1"; src = fetchurl { - url = "https://registry.npmjs.org/@lerna/version/-/version-3.3.2.tgz"; - sha512 = "2MHP6mA1f0t3UdzqPpfgAhsT1L64HOedlJxrQUoHrkou/G25Od4wjmKr9OZ0Oc4CLDbXD/sYEmE/9fZi1GGgKg=="; + url = "https://registry.npmjs.org/@lerna/version/-/version-3.4.1.tgz"; + sha512 = "oefNaQLBJSI2WLZXw5XxDXk4NyF5/ct0V9ys/J308NpgZthPgwRPjk9ZR0o1IOxW1ABi6z3E317W/dxHDjvAkg=="; }; }; "@lerna/write-log-file-3.0.0" = { @@ -1048,22 +1039,22 @@ let sha512 = "A2TAGbTFdBw9azHbpVd+/FkdW2T6msN1uct1O9bH3vTerEHKZhTXJUQXy+hNq1B0RagfU8U+KBdqiZpxjhOUQA=="; }; }; - "@types/node-10.11.3" = { + "@types/node-10.11.4" = { name = "_at_types_slash_node"; packageName = "@types/node"; - version = "10.11.3"; + version = "10.11.4"; src = fetchurl { - url = "https://registry.npmjs.org/@types/node/-/node-10.11.3.tgz"; - sha512 = "3AvcEJAh9EMatxs+OxAlvAEs7OTy6AG94mcH1iqyVDwVVndekLxzwkWQ/Z4SDbY6GO2oyUXyWW8tQ4rENSSQVQ=="; + url = "https://registry.npmjs.org/@types/node/-/node-10.11.4.tgz"; + sha512 = "ojnbBiKkZFYRfQpmtnnWTMw+rzGp/JiystjluW9jgN3VzRwilXddJ6aGQ9V/7iuDG06SBgn7ozW9k3zcAnYjYQ=="; }; }; - "@types/node-8.10.30" = { + "@types/node-8.10.34" = { name = "_at_types_slash_node"; packageName = "@types/node"; - version = "8.10.30"; + version = "8.10.34"; src = fetchurl { - url = "https://registry.npmjs.org/@types/node/-/node-8.10.30.tgz"; - sha512 = "Le8HGMI5gjFSBqcCuKP/wfHC19oURzkU2D+ERIescUoJd+CmNEMYBib9LQ4zj1HHEZOJQWhw2ZTnbD8weASh/Q=="; + url = "https://registry.npmjs.org/@types/node/-/node-8.10.34.tgz"; + sha512 = "alypNiaAEd0RBGXoWehJ2gchPYCITmw4CYBoB5nDlji8l8on7FsklfdfIs4DDmgpKLSX3OF3ha6SV+0W7cTzUA=="; }; }; "@types/range-parser-1.2.2" = { @@ -2074,6 +2065,15 @@ let sha1 = "ed0317c322064f79466c02966bddb605ab37d998"; }; }; + "ansi-regex-4.0.0" = { + name = "ansi-regex"; + packageName = "ansi-regex"; + version = "4.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/ansi-regex/-/ansi-regex-4.0.0.tgz"; + sha512 = "iB5Dda8t/UqpPI/IjsejXu5jOGDrzn41wJyljwPH65VCIbk6+1BzFIMJGFwTNrYXT1CrD+B4l19U7awiQ8rk7w=="; + }; + }; "ansi-split-1.0.1" = { name = "ansi-split"; packageName = "ansi-split"; @@ -2218,13 +2218,13 @@ let sha512 = "xEDrUvo3U2mQKSzA8NzQmgeqK4ytwFnTGl2YKGKPfG0+r8fZdswKp6CDBue29KLO8KkSuqW/hntveWrAdK51FQ=="; }; }; - "apollo-cache-inmemory-1.3.0" = { + "apollo-cache-inmemory-1.3.5" = { name = "apollo-cache-inmemory"; packageName = "apollo-cache-inmemory"; - version = "1.3.0"; + version = "1.3.5"; src = fetchurl { - url = "https://registry.npmjs.org/apollo-cache-inmemory/-/apollo-cache-inmemory-1.3.0.tgz"; - sha512 = "7NXKkICo/JswTfTf7E3XAt5qcmt8xydUk86LbFrNiM9w3mHNIJnCJZdycuy34bx4DWsA+Bex4oYDB4H70v4maQ=="; + url = "https://registry.npmjs.org/apollo-cache-inmemory/-/apollo-cache-inmemory-1.3.5.tgz"; + sha512 = "CD4Dl9vcCp7N05KUqR3rNDj2WJ1DQNNfeyBUIo5T6XTiUhfBQp5x+CL7S+ezy5mPp+xo4TnwFzLFh/vy2LdDog=="; }; }; "apollo-client-2.4.2" = { @@ -2812,6 +2812,15 @@ let sha512 = "B1qMD3RBP7O8o0H2KbrXDyB0IccejMF15+87Lvlor12ONPRHP6gTjXMNkt/d3ZuOGbAe66hFmaCfECI24Ufp6w=="; }; }; + "array-sort-1.0.0" = { + name = "array-sort"; + packageName = "array-sort"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/array-sort/-/array-sort-1.0.0.tgz"; + sha512 = "ihLeJkonmdiAsD7vpgN3CRcx2J2S0TiYW+IS/5zHBI7mKUq3ySvBdzzBfD236ubDBQFiiyG3SWCPc+msQ9KoYg=="; + }; + }; "array-union-1.0.2" = { name = "array-union"; packageName = "array-union"; @@ -3253,13 +3262,13 @@ let sha1 = "00f35b2d27ac91b1f0d3ef2084c98cf1d1f0adc3"; }; }; - "aws-sdk-2.325.0" = { + "aws-sdk-2.330.0" = { name = "aws-sdk"; packageName = "aws-sdk"; - version = "2.325.0"; + version = "2.330.0"; src = fetchurl { - url = "https://registry.npmjs.org/aws-sdk/-/aws-sdk-2.325.0.tgz"; - sha512 = "26V/4vzInQ5EO/+HCoZaXO5YB6XWo4sRXbNtc3bFEcUfMZ5Psin2M8McY/zasJyYbZuNisK608kjio+AXm8vig=="; + url = "https://registry.npmjs.org/aws-sdk/-/aws-sdk-2.330.0.tgz"; + sha512 = "biW3J8S9/b9uqeED2jbBHEbscwIclc0PBiylUkd3lJ5s226Yuv7mwSOfoI2Eogpyg/i97phK3uiUb/Q89/pCpQ=="; }; }; "aws-sign-0.2.1" = { @@ -4392,7 +4401,7 @@ let packageName = "bl"; version = "0.8.2"; src = fetchurl { - url = "https://registry.npmjs.org/bl/-/bl-0.8.2.tgz"; + url = "http://registry.npmjs.org/bl/-/bl-0.8.2.tgz"; sha1 = "c9b6bca08d1bc2ea00fc8afb4f1a5fd1e1c66e4e"; }; }; @@ -4401,7 +4410,7 @@ let packageName = "bl"; version = "1.0.3"; src = fetchurl { - url = "https://registry.npmjs.org/bl/-/bl-1.0.3.tgz"; + url = "http://registry.npmjs.org/bl/-/bl-1.0.3.tgz"; sha1 = "fc5421a28fd4226036c3b3891a66a25bc64d226e"; }; }; @@ -4410,7 +4419,7 @@ let packageName = "bl"; version = "1.1.2"; src = fetchurl { - url = "https://registry.npmjs.org/bl/-/bl-1.1.2.tgz"; + url = "http://registry.npmjs.org/bl/-/bl-1.1.2.tgz"; sha1 = "fdca871a99713aa00d19e3bbba41c44787a65398"; }; }; @@ -4419,7 +4428,7 @@ let packageName = "bl"; version = "1.2.2"; src = fetchurl { - url = "https://registry.npmjs.org/bl/-/bl-1.2.2.tgz"; + url = "http://registry.npmjs.org/bl/-/bl-1.2.2.tgz"; sha512 = "e8tQYnZodmebYDWGH7KMRvtzKXaJHx3BbilrgZCfvyLUYdKpK1t5PSPmpkny/SgiTSCnjfLW7v5rlONXVFkQEA=="; }; }; @@ -4720,6 +4729,15 @@ let sha1 = "fef069bee85975b2ddcc2264aaa7c50dc17a3c7e"; }; }; + "bplist-creator-0.0.7" = { + name = "bplist-creator"; + packageName = "bplist-creator"; + version = "0.0.7"; + src = fetchurl { + url = "https://registry.npmjs.org/bplist-creator/-/bplist-creator-0.0.7.tgz"; + sha1 = "37df1536092824b87c42f957b01344117372ae45"; + }; + }; "bplist-parser-0.1.1" = { name = "bplist-parser"; packageName = "bplist-parser"; @@ -6889,6 +6907,15 @@ let sha512 = "6CYPa+JP2ftfRU2qkDK+UTVeQYosOg/2GbcjIcKPHfinyOLPVGXu/ovN86RP49Re5ndJK1N0kuiidFFuepc4ZQ=="; }; }; + "commander-2.19.0" = { + name = "commander"; + packageName = "commander"; + version = "2.19.0"; + src = fetchurl { + url = "https://registry.npmjs.org/commander/-/commander-2.19.0.tgz"; + sha512 = "6tvAOO+D6OENvRAh524Dh9jcfKTYDQAqvqezbCW82xj5X0pSrcpxtvRKHLG0yBY6SD7PSDrJaj+0AiOcKVd1Xg=="; + }; + }; "commander-2.3.0" = { name = "commander"; packageName = "commander"; @@ -7475,40 +7502,49 @@ let sha512 = "suQnFSqCxRwyBxY68pYTsFkG0taIdinHLNEAX5ivtw8bCRnIgnpvcHmlR/yjUyZIrNPYAoXlY1WiEKWgSE4BNg=="; }; }; - "conventional-changelog-core-2.0.11" = { + "conventional-changelog-angular-5.0.1" = { + name = "conventional-changelog-angular"; + packageName = "conventional-changelog-angular"; + version = "5.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/conventional-changelog-angular/-/conventional-changelog-angular-5.0.1.tgz"; + sha512 = "q4ylJ68fWZDdrFC9z4zKcf97HW6hp7Mo2YlqD4owfXhecFKy/PJCU/1oVFF4TqochchChqmZ0Vb0e0g8/MKNlA=="; + }; + }; + "conventional-changelog-core-3.1.0" = { name = "conventional-changelog-core"; packageName = "conventional-changelog-core"; - version = "2.0.11"; + version = "3.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/conventional-changelog-core/-/conventional-changelog-core-2.0.11.tgz"; - sha512 = "HvTE6RlqeEZ/NFPtQeFLsIDOLrGP3bXYr7lFLMhCVsbduF1MXIe8OODkwMFyo1i9ku9NWBwVnVn0jDmIFXjDRg=="; + url = "https://registry.npmjs.org/conventional-changelog-core/-/conventional-changelog-core-3.1.0.tgz"; + sha512 = "bcZkcFXkqVgG2W8m/1wjlp2wn/BKDcrPgw3/mvSEQtzs8Pax8JbAPFpEQReHY92+EKNNXC67wLA8y2xcNx0rDA=="; }; }; - "conventional-changelog-preset-loader-1.1.8" = { + "conventional-changelog-preset-loader-2.0.1" = { name = "conventional-changelog-preset-loader"; packageName = "conventional-changelog-preset-loader"; - version = "1.1.8"; + version = "2.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/conventional-changelog-preset-loader/-/conventional-changelog-preset-loader-1.1.8.tgz"; - sha512 = "MkksM4G4YdrMlT2MbTsV2F6LXu/hZR0Tc/yenRrDIKRwBl/SP7ER4ZDlglqJsCzLJi4UonBc52Bkm5hzrOVCcw=="; + url = "https://registry.npmjs.org/conventional-changelog-preset-loader/-/conventional-changelog-preset-loader-2.0.1.tgz"; + sha512 = "HiSfhXNzAzG9klIqJaA97MMiNBR4js+53g4Px0k7tgKeCNVXmrDrm+CY+nIqcmG5NVngEPf8rAr7iji1TWW7zg=="; }; }; - "conventional-changelog-writer-3.0.9" = { + "conventional-changelog-writer-4.0.0" = { name = "conventional-changelog-writer"; packageName = "conventional-changelog-writer"; - version = "3.0.9"; + version = "4.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/conventional-changelog-writer/-/conventional-changelog-writer-3.0.9.tgz"; - sha512 = "n9KbsxlJxRQsUnK6wIBRnARacvNnN4C/nxnxCkH+B/R1JS2Fa+DiP1dU4I59mEDEjgnFaN2+9wr1P1s7GYB5/Q=="; + url = "https://registry.npmjs.org/conventional-changelog-writer/-/conventional-changelog-writer-4.0.0.tgz"; + sha512 = "hMZPe0AQ6Bi05epeK/7hz80xxk59nPA5z/b63TOHq2wigM0/akreOc8N4Jam5b9nFgKWX1e9PdPv2ewgW6bcfg=="; }; }; - "conventional-commits-filter-1.1.6" = { + "conventional-commits-filter-2.0.0" = { name = "conventional-commits-filter"; packageName = "conventional-commits-filter"; - version = "1.1.6"; + version = "2.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/conventional-commits-filter/-/conventional-commits-filter-1.1.6.tgz"; - sha512 = "KcDgtCRKJCQhyk6VLT7zR+ZOyCnerfemE/CsR3iQpzRRFbLEs0Y6rwk3mpDvtOh04X223z+1xyJ582Stfct/0Q=="; + url = "https://registry.npmjs.org/conventional-commits-filter/-/conventional-commits-filter-2.0.0.tgz"; + sha512 = "Cfl0j1/NquB/TMVx7Wrmyq7uRM+/rPQbtVVGwzfkhZ6/yH6fcMmP0Q/9044TBZPTNdGzm46vXFXL14wbET0/Mg=="; }; }; "conventional-commits-parser-2.1.7" = { @@ -7520,13 +7556,22 @@ let sha512 = "BoMaddIEJ6B4QVMSDu9IkVImlGOSGA1I2BQyOZHeLQ6qVOJLcLKn97+fL6dGbzWEiqDzfH4OkcveULmeq2MHFQ=="; }; }; - "conventional-recommended-bump-2.0.9" = { + "conventional-commits-parser-3.0.0" = { + name = "conventional-commits-parser"; + packageName = "conventional-commits-parser"; + version = "3.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/conventional-commits-parser/-/conventional-commits-parser-3.0.0.tgz"; + sha512 = "GWh71U26BLWgMykCp+VghZ4s64wVbtseECcKQ/PvcPZR2cUnz+FUc2J9KjxNl7/ZbCxST8R03c9fc+Vi0umS9Q=="; + }; + }; + "conventional-recommended-bump-4.0.1" = { name = "conventional-recommended-bump"; packageName = "conventional-recommended-bump"; - version = "2.0.9"; + version = "4.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/conventional-recommended-bump/-/conventional-recommended-bump-2.0.9.tgz"; - sha512 = "YE6/o+648qkX3fTNvfBsvPW3tSnbZ6ec3gF0aBahCPgyoVHU2Mw0nUAZ1h1UN65GazpORngrgRC8QCltNYHPpQ=="; + url = "https://registry.npmjs.org/conventional-recommended-bump/-/conventional-recommended-bump-4.0.1.tgz"; + sha512 = "9waJvW01TUs4HQJ3khwGSSlTlKsY+5u7OrxHL+oWEoGNvaNO/0qL6qqnhS3J0Fq9fNKA9bmlf5cOXjCQoW+I4Q=="; }; }; "convert-source-map-1.1.3" = { @@ -7718,6 +7763,15 @@ let sha1 = "676f6eb3c39997c2ee1ac3a924fd6124748f578d"; }; }; + "copy-props-2.0.4" = { + name = "copy-props"; + packageName = "copy-props"; + version = "2.0.4"; + src = fetchurl { + url = "https://registry.npmjs.org/copy-props/-/copy-props-2.0.4.tgz"; + sha512 = "7cjuUME+p+S3HZlbllgsn2CDwS+5eCCX16qBgNC4jgSTf49qR1VKy/Zhl400m0IQXl/bPGEVqncgUUMjrr4s8A=="; + }; + }; "cordova-app-hello-world-3.12.0" = { name = "cordova-app-hello-world"; packageName = "cordova-app-hello-world"; @@ -7763,13 +7817,13 @@ let sha512 = "Qy0O3w/gwbIqIJzlyCy60nPwJlF1c74ELpsfDIGXB92/uST5nQSSUDVDP4UOfb/c6OU7yPqxhCWOGROyTYKPDw=="; }; }; - "cordova-lib-8.1.0" = { + "cordova-lib-8.1.1" = { name = "cordova-lib"; packageName = "cordova-lib"; - version = "8.1.0"; + version = "8.1.1"; src = fetchurl { - url = "https://registry.npmjs.org/cordova-lib/-/cordova-lib-8.1.0.tgz"; - sha512 = "VLLRhEaqi5bD1AxAndlPGiRD5ZX2EwUnxGxIvEUUbgZxwOceGWHM2wdI4V2nJOieJ0N8CbDRsLsOwFJQsRLOyQ=="; + url = "https://registry.npmjs.org/cordova-lib/-/cordova-lib-8.1.1.tgz"; + sha512 = "PcrlEGRGubV2c9ThcSwoVtN/1hKQ0qtwRopl4188rD10gjtt8K+NSKrnRqh6Ia5PouVUUOZBrlhBxDd5BRbfeg=="; }; }; "cordova-registry-mapper-1.1.15" = { @@ -8798,13 +8852,13 @@ let sha512 = "D61LaDQPQkxJ5AUM2mbSJRbPkNs/TmdmOeLAi1hgDkpDfIfetSrjmWhccwtuResSwMbACjx/xXQofvM9CE/aeg=="; }; }; - "debug-4.0.1" = { + "debug-4.1.0" = { name = "debug"; packageName = "debug"; - version = "4.0.1"; + version = "4.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/debug/-/debug-4.0.1.tgz"; - sha512 = "K23FHJ/Mt404FSlp6gSZCevIbTMLX0j3fmHhUEhQ3Wq0FMODW3+cUSoLdy1Gx4polAf4t/lphhmHH35BB8cLYw=="; + url = "https://registry.npmjs.org/debug/-/debug-4.1.0.tgz"; + sha512 = "heNPJUJIqC+xB6ayLAMHaIrmN9HKa7aQO8MGqKpvCA+uJYVcvR6l5kgdrhRuwPFHU7P5/A1w0BjByPHwpfTDKg=="; }; }; "debug-fabulous-1.1.0" = { @@ -9028,7 +9082,7 @@ let packageName = "deepmerge"; version = "2.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/deepmerge/-/deepmerge-2.1.0.tgz"; + url = "http://registry.npmjs.org/deepmerge/-/deepmerge-2.1.0.tgz"; sha512 = "Q89Z26KAfA3lpPGhbF6XMfYAm3jIV3avViy6KOJ2JLzFbeWHOvPQUu5aSJIWXap3gDZC2y1eF5HXEPI2wGqgvw=="; }; }; @@ -9041,6 +9095,15 @@ let sha512 = "urQxA1smbLZ2cBbXbaYObM1dJ82aJ2H57A1C/Kklfh/ZN1bgH4G/n5KWhdNfOK11W98gqZfyYj7W4frJJRwA2w=="; }; }; + "deepmerge-2.2.1" = { + name = "deepmerge"; + packageName = "deepmerge"; + version = "2.2.1"; + src = fetchurl { + url = "https://registry.npmjs.org/deepmerge/-/deepmerge-2.2.1.tgz"; + sha512 = "R9hc1Xa/NOBi9WRVUWg19rl1UB7Tt4kuPd+thNJgFZoxXsTz7ncaPaeIm+40oSGuP33DfMb4sZt1QIGiJzC4EA=="; + }; + }; "default-browser-id-1.0.4" = { name = "default-browser-id"; packageName = "default-browser-id"; @@ -9050,6 +9113,15 @@ let sha1 = "e59d09a5d157b828b876c26816e61c3d2a2c203a"; }; }; + "default-compare-1.0.0" = { + name = "default-compare"; + packageName = "default-compare"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/default-compare/-/default-compare-1.0.0.tgz"; + sha512 = "QWfXlM0EkAbqOCbD/6HjdwT19j7WCkMyiRhWilc4H9/5h/RzTF9gv5LYh1+CmDV5d1rki6KAWLtQale0xt20eQ=="; + }; + }; "default-uid-1.0.0" = { name = "default-uid"; packageName = "default-uid"; @@ -9968,6 +10040,15 @@ let sha1 = "dee5229bdf0ab6ba2012a395e1b869abf8813473"; }; }; + "each-props-1.3.2" = { + name = "each-props"; + packageName = "each-props"; + version = "1.3.2"; + src = fetchurl { + url = "https://registry.npmjs.org/each-props/-/each-props-1.3.2.tgz"; + sha512 = "vV0Hem3zAGkJAyU7JSjixeU66rwdynTAa1vofCrSA5fEln+m67Az9CcnkVD776/fsN/UjIWmBDoNRS6t6G9RfA=="; + }; + }; "eachr-3.2.0" = { name = "eachr"; packageName = "eachr"; @@ -10446,13 +10527,13 @@ let sha1 = "85675afba237c43f98de2d46adc0e532a4dcf48b"; }; }; - "envinfo-3.4.2" = { + "envinfo-5.10.0" = { name = "envinfo"; packageName = "envinfo"; - version = "3.4.2"; + version = "5.10.0"; src = fetchurl { - url = "https://registry.npmjs.org/envinfo/-/envinfo-3.4.2.tgz"; - sha512 = "yqKl+qfQ849zLua/aRGIs4TzNah6ypvdX6KPmK9LPP54Ea+Hqx2gFzSBmGhka8HvWcmCmffGIshG4INSh0ku6g=="; + url = "https://registry.npmjs.org/envinfo/-/envinfo-5.10.0.tgz"; + sha512 = "rXbzXWvnQxy+TcqZlARbWVQwgGVVouVJgFZhLVN5htjLxl1thstrP2ZGi0pXC309AbK7gVOPU+ulz/tmpCI7iw=="; }; }; "epidemic-broadcast-trees-6.3.4" = { @@ -11733,13 +11814,13 @@ let sha1 = "7b05218ddf9667bf7f370bf7fdb2cb15fdd0aa49"; }; }; - "fast-diff-1.1.2" = { + "fast-diff-1.2.0" = { name = "fast-diff"; packageName = "fast-diff"; - version = "1.1.2"; + version = "1.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/fast-diff/-/fast-diff-1.1.2.tgz"; - sha512 = "KaJUt+M9t1qaIteSvjc6P3RbMdXsNhK61GRftR6SNxqmhthcd9MGIi4T+o0jD8LUSpSnSKXE20nLtJ3fOHxQig=="; + url = "https://registry.npmjs.org/fast-diff/-/fast-diff-1.2.0.tgz"; + sha512 = "xJuoT5+L99XlZ8twedaRf6Ax2TgQVxvgZOYoPKqZufmJib0tL2tegPBOZb1pVNgIhlqDlA0eO0c3wBvQcmzx4w=="; }; }; "fast-future-1.0.2" = { @@ -11751,13 +11832,13 @@ let sha1 = "8435a9aaa02d79248d17d704e76259301d99280a"; }; }; - "fast-glob-2.2.2" = { + "fast-glob-2.2.3" = { name = "fast-glob"; packageName = "fast-glob"; - version = "2.2.2"; + version = "2.2.3"; src = fetchurl { - url = "https://registry.npmjs.org/fast-glob/-/fast-glob-2.2.2.tgz"; - sha512 = "TR6zxCKftDQnUAPvkrCWdBgDq/gbqx8A3ApnBrR5rMvpp6+KMJI0Igw7fkWPgeVK0uhRXTXdvO3O+YP0CaUX2g=="; + url = "https://registry.npmjs.org/fast-glob/-/fast-glob-2.2.3.tgz"; + sha512 = "NiX+JXjnx43RzvVFwRWfPKo4U+1BrK5pJPsHQdKMlLoFHrrGktXglQhHliSihWAq+m1z6fHk3uwGHrtRbS9vLA=="; }; }; "fast-json-parse-1.0.3" = { @@ -11805,13 +11886,13 @@ let sha1 = "3d8a5c66883a16a30ca8643e851f19baa7797917"; }; }; - "fast-redact-1.2.0" = { + "fast-redact-1.3.0" = { name = "fast-redact"; packageName = "fast-redact"; - version = "1.2.0"; + version = "1.3.0"; src = fetchurl { - url = "https://registry.npmjs.org/fast-redact/-/fast-redact-1.2.0.tgz"; - sha512 = "k/uSk9PtFmvYx0m7bRk5B2gZChQk4euWhrn7Mf3vYSmwZBLh7cGNuMuc/vhH1MKMPyVJMMtl9oMwPnwlKqs7CQ=="; + url = "https://registry.npmjs.org/fast-redact/-/fast-redact-1.3.0.tgz"; + sha512 = "ci4qKDR8nDzQCQTPw4hviyDFaSwTgSYiqddRh/EslkUQa0otpzM8IGnuG+LwiUE54t4OjU2T7bYKmjtd7632Wg=="; }; }; "fast-safe-stringify-1.2.3" = { @@ -11963,7 +12044,7 @@ let packageName = "file-type"; version = "3.9.0"; src = fetchurl { - url = "https://registry.npmjs.org/file-type/-/file-type-3.9.0.tgz"; + url = "http://registry.npmjs.org/file-type/-/file-type-3.9.0.tgz"; sha1 = "257a078384d1db8087bc449d107d52a52672b9e9"; }; }; @@ -12318,13 +12399,13 @@ let sha1 = "248cf79a3da7d7dc379e2a11c92a2719cbb540f6"; }; }; - "flatmap-stream-0.1.0" = { + "flatmap-stream-0.1.1" = { name = "flatmap-stream"; packageName = "flatmap-stream"; - version = "0.1.0"; + version = "0.1.1"; src = fetchurl { - url = "https://registry.npmjs.org/flatmap-stream/-/flatmap-stream-0.1.0.tgz"; - sha512 = "Nlic4ZRYxikqnK5rj3YoxDVKGGtUjcNDUtvQ7XsdGLZmMwdUYnXf10o1zcXtzEZTBgc6GxeRpQxV/Wu3WPIIHA=="; + url = "https://registry.npmjs.org/flatmap-stream/-/flatmap-stream-0.1.1.tgz"; + sha512 = "lAq4tLbm3sidmdCN8G3ExaxH7cUCtP5mgDvrYowsx84dcYkJJ4I28N7gkxA6+YlSXzaGLJYIDEi9WGfXzMiXdw=="; }; }; "flatstr-1.0.8" = { @@ -12444,13 +12525,13 @@ let sha512 = "lk3Gs5wf6BwZKDafjE95/r0wv4nkMRsZULmulDCybFu1mPFeqUMR4H+ENcg+fgOpQBGaiNRTyHPQyg0OLur2wA=="; }; }; - "flumeview-reduce-1.3.13" = { + "flumeview-reduce-1.3.14" = { name = "flumeview-reduce"; packageName = "flumeview-reduce"; - version = "1.3.13"; + version = "1.3.14"; src = fetchurl { - url = "https://registry.npmjs.org/flumeview-reduce/-/flumeview-reduce-1.3.13.tgz"; - sha512 = "QN/07+ia3uXpfy8/xWjLI2XGIG67Aiwp9VaOTIqYt6NHP6OfdGfl8nGRPkJRHlkfFbzEouRvJcQBFohWEXMdNQ=="; + url = "https://registry.npmjs.org/flumeview-reduce/-/flumeview-reduce-1.3.14.tgz"; + sha512 = "hMk9g42JrD92PCmNDiET6JGjur09wQrlAUQRPjmsk8LNqDz/tC5upvCfiynIgWUphe8dZMhUHIzOTh75xa1WKA=="; }; }; "flush-write-stream-1.0.3" = { @@ -13241,7 +13322,7 @@ let packageName = "get-stream"; version = "2.3.1"; src = fetchurl { - url = "https://registry.npmjs.org/get-stream/-/get-stream-2.3.1.tgz"; + url = "http://registry.npmjs.org/get-stream/-/get-stream-2.3.1.tgz"; sha1 = "5f38f93f346009666ee0150a054167f91bdd95de"; }; }; @@ -13250,17 +13331,17 @@ let packageName = "get-stream"; version = "3.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/get-stream/-/get-stream-3.0.0.tgz"; + url = "http://registry.npmjs.org/get-stream/-/get-stream-3.0.0.tgz"; sha1 = "8e943d1358dc37555054ecbe2edb05aa174ede14"; }; }; - "get-stream-4.0.0" = { + "get-stream-4.1.0" = { name = "get-stream"; packageName = "get-stream"; - version = "4.0.0"; + version = "4.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/get-stream/-/get-stream-4.0.0.tgz"; - sha512 = "FneLKMENeOR7wOK0/ZXCh+lwqtnPwkeunJjRN28LPqzGvNAhYvrTAhXv6xDm4vsJ0M7lcRbIYHQudKsSy2RtSQ=="; + url = "https://registry.npmjs.org/get-stream/-/get-stream-4.1.0.tgz"; + sha512 = "GMat4EJ5161kIy2HevLlr4luNjBgvmj413KaQA7jt4V8B4RDsfpHk7WQ9GVqfYyyx8OS/L66Kox+rJRNklLK7w=="; }; }; "get-uri-2.0.2" = { @@ -13353,6 +13434,15 @@ let sha512 = "svsK26tQ8vEKnMshTDatSIQSMDdz8CxIIqKsvPqbtV23Etmw6VNaFAitu8zwZ0VrOne7FztwPyRLxK7/DIUTQg=="; }; }; + "git-raw-commits-2.0.0" = { + name = "git-raw-commits"; + packageName = "git-raw-commits"; + version = "2.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/git-raw-commits/-/git-raw-commits-2.0.0.tgz"; + sha512 = "w4jFEJFgKXMQJ0H0ikBk2S+4KP2VEjhCvLCNqbNRQC8BgGWgLKNCO7a9K9LI+TVT7Gfoloje502sEnctibffgg=="; + }; + }; "git-remote-origin-url-2.0.0" = { name = "git-remote-origin-url"; packageName = "git-remote-origin-url"; @@ -13380,13 +13470,13 @@ let sha1 = "a0c2e3dd392abcf6b76962e27fc75fb3223449ce"; }; }; - "git-semver-tags-1.3.6" = { + "git-semver-tags-2.0.0" = { name = "git-semver-tags"; packageName = "git-semver-tags"; - version = "1.3.6"; + version = "2.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/git-semver-tags/-/git-semver-tags-1.3.6.tgz"; - sha512 = "2jHlJnln4D/ECk9FxGEBh3k44wgYdWjWDtMmJPaecjoRmxKo3Y1Lh8GMYuOPu04CHw86NTAODchYjC5pnpMQig=="; + url = "https://registry.npmjs.org/git-semver-tags/-/git-semver-tags-2.0.0.tgz"; + sha512 = "lSgFc3zQTul31nFje2Q8XdNcTOI6B4I3mJRPCgFzHQQLfxfqdWTYzdtCaynkK5Xmb2wQlSJoKolhXJ1VhKROnQ=="; }; }; "git-ssb-web-2.8.0" = { @@ -13669,13 +13759,13 @@ let sha512 = "glWGTgPzsOQs0mPRxHnWIwqYrEuQcxYpUFWF7BJxJL+c2F4fW304vdn53pqgod4PzOqZKDr1cex+a/pXCwrncA=="; }; }; - "globals-11.7.0" = { + "globals-11.8.0" = { name = "globals"; packageName = "globals"; - version = "11.7.0"; + version = "11.8.0"; src = fetchurl { - url = "https://registry.npmjs.org/globals/-/globals-11.7.0.tgz"; - sha512 = "K8BNSPySfeShBQXsahYB/AbbWruVOTyVpgoIDnl8odPpeSfP2J5QO2oLFFdl2j7GfDCtZj2bMKar2T49itTPCg=="; + url = "https://registry.npmjs.org/globals/-/globals-11.8.0.tgz"; + sha512 = "io6LkyPVuzCHBSQV9fmOwxZkUk6nIaGmxheLDgmuFv89j0fm2aqDbIXKAGfzCMHqz3HLF2Zf8WSG6VqMh2qFmA=="; }; }; "globals-9.18.0" = { @@ -14020,13 +14110,13 @@ let sha512 = "+ytmryoHF1LVf58NKEaNPRUzYyXplm120ntxfPcgOBC7TnK7Tv/4VRHeh4FAR9iL+O1bqhZs4nkibxQ+OA5cDQ=="; }; }; - "graphql-tag-2.9.2" = { + "graphql-tag-2.10.0" = { name = "graphql-tag"; packageName = "graphql-tag"; - version = "2.9.2"; + version = "2.10.0"; src = fetchurl { - url = "https://registry.npmjs.org/graphql-tag/-/graphql-tag-2.9.2.tgz"; - sha512 = "qnNmof9pAqj/LUzs3lStP0Gw1qhdVCUS7Ab7+SUB6KD5aX1uqxWQRwMnOGTkhKuLvLNIs1TvNz+iS9kUGl1MhA=="; + url = "https://registry.npmjs.org/graphql-tag/-/graphql-tag-2.10.0.tgz"; + sha512 = "9FD6cw976TLLf9WYIUPCaaTpniawIjHWZSwIRZSjrfufJamcXbVVYfN2TWvJYbw0Xf2JjYbl1/f2+wDnBVw3/w=="; }; }; "graphql-tools-3.1.1" = { @@ -14115,7 +14205,7 @@ let packageName = "gulp"; version = "3.9.1"; src = fetchurl { - url = "https://registry.npmjs.org/gulp/-/gulp-3.9.1.tgz"; + url = "http://registry.npmjs.org/gulp/-/gulp-3.9.1.tgz"; sha1 = "571ce45928dd40af6514fc4011866016c13845b4"; }; }; @@ -15091,13 +15181,13 @@ let sha512 = "PH5GBkXqFxw5+4eKaKRIkD23y6vRd/IXSl7IldyJxEXpDH9SEIXRORkBtkGni/ae2P7RVOw6Wxypd2tGXhha1w=="; }; }; - "hypercore-6.19.1" = { + "hypercore-6.19.2" = { name = "hypercore"; packageName = "hypercore"; - version = "6.19.1"; + version = "6.19.2"; src = fetchurl { - url = "https://registry.npmjs.org/hypercore/-/hypercore-6.19.1.tgz"; - sha512 = "CnpaH6+qlt0w1ynt3y+q9alZh23lK0nD7bbuG0vNtQzFefmTYoLexq/Vpss8CYjoQfh6qeG90g2F8GjCl8/Eag=="; + url = "https://registry.npmjs.org/hypercore/-/hypercore-6.19.2.tgz"; + sha512 = "AQS6mtwI7RDKRT3u68EEcehtI1VpaavWXxfnGDyOrR/AVBDUMdIUw8wcYCZdiZZVHarh5xKS4+VRCdJjS67LuA=="; }; }; "hypercore-crypto-1.0.0" = { @@ -19601,13 +19691,13 @@ let sha1 = "88328fd7d1ce7938b29283746f0b1bc126b24708"; }; }; - "log4js-3.0.5" = { + "log4js-3.0.6" = { name = "log4js"; packageName = "log4js"; - version = "3.0.5"; + version = "3.0.6"; src = fetchurl { - url = "https://registry.npmjs.org/log4js/-/log4js-3.0.5.tgz"; - sha512 = "IX5c3G/7fuTtdr0JjOT2OIR12aTESVhsH6cEsijloYwKgcPRlO6DgOU72v0UFhWcoV1HN6+M3dwT89qVPLXm0w=="; + url = "https://registry.npmjs.org/log4js/-/log4js-3.0.6.tgz"; + sha512 = "ezXZk6oPJCWL483zj64pNkMuY/NcRX5MPiB0zE6tjZM137aeusrOnW1ecxgF9cmwMWkBMhjteQxBPoZBh9FDxQ=="; }; }; "lokijs-1.5.3" = { @@ -20186,6 +20276,15 @@ let sha512 = "ea2eGWOqNxPcXv8dyERdSr/6FmzvWwzjMxpfGB/sbMccXoct+xY+YukPD+QTUZwyvK7BZwcr4m21WBOW41pAkg=="; }; }; + "matchdep-2.0.0" = { + name = "matchdep"; + packageName = "matchdep"; + version = "2.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/matchdep/-/matchdep-2.0.0.tgz"; + sha1 = "c6f34834a0d8dbc3b37c27ee8bbcb27c7775582e"; + }; + }; "matcher-collection-1.0.5" = { name = "matcher-collection"; packageName = "matcher-collection"; @@ -20218,10 +20317,19 @@ let packageName = "md5.js"; version = "1.3.4"; src = fetchurl { - url = "https://registry.npmjs.org/md5.js/-/md5.js-1.3.4.tgz"; + url = "http://registry.npmjs.org/md5.js/-/md5.js-1.3.4.tgz"; sha1 = "e9bdbde94a20a5ac18b04340fc5764d5b09d901d"; }; }; + "md5.js-1.3.5" = { + name = "md5.js"; + packageName = "md5.js"; + version = "1.3.5"; + src = fetchurl { + url = "https://registry.npmjs.org/md5.js/-/md5.js-1.3.5.tgz"; + sha512 = "xitP+WxNPcTTOgnTJcrhM0xvdPepipPSf3I8EIpGKeFLjt3PlJLIDG3u8EX53ZIubkb+5U2+3rELYpEhHhzdkg=="; + }; + }; "mdmanifest-1.0.8" = { name = "mdmanifest"; packageName = "mdmanifest"; @@ -21244,7 +21352,7 @@ let packageName = "ms"; version = "0.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/ms/-/ms-0.1.0.tgz"; + url = "http://registry.npmjs.org/ms/-/ms-0.1.0.tgz"; sha1 = "f21fac490daf1d7667fd180fe9077389cc9442b2"; }; }; @@ -21253,7 +21361,7 @@ let packageName = "ms"; version = "0.7.0"; src = fetchurl { - url = "https://registry.npmjs.org/ms/-/ms-0.7.0.tgz"; + url = "http://registry.npmjs.org/ms/-/ms-0.7.0.tgz"; sha1 = "865be94c2e7397ad8a57da6a633a6e2f30798b83"; }; }; @@ -21262,7 +21370,7 @@ let packageName = "ms"; version = "0.7.1"; src = fetchurl { - url = "https://registry.npmjs.org/ms/-/ms-0.7.1.tgz"; + url = "http://registry.npmjs.org/ms/-/ms-0.7.1.tgz"; sha1 = "9cd13c03adbff25b65effde7ce864ee952017098"; }; }; @@ -21271,7 +21379,7 @@ let packageName = "ms"; version = "0.7.2"; src = fetchurl { - url = "https://registry.npmjs.org/ms/-/ms-0.7.2.tgz"; + url = "http://registry.npmjs.org/ms/-/ms-0.7.2.tgz"; sha1 = "ae25cf2512b3885a1d95d7f037868d8431124765"; }; }; @@ -21554,6 +21662,15 @@ let sha1 = "2e5cb1ac64c937dae28296e8f42af5eafd9bc7ef"; }; }; + "mute-stdout-1.0.1" = { + name = "mute-stdout"; + packageName = "mute-stdout"; + version = "1.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/mute-stdout/-/mute-stdout-1.0.1.tgz"; + sha512 = "kDcwXR4PS7caBpuRYYBUz9iVixUk3anO3f5OYFiIPwK/20vCzKCHyKoulbiDY1S53zD2bxUpxN/IJ+TnXjfvxg=="; + }; + }; "mute-stream-0.0.4" = { name = "mute-stream"; packageName = "mute-stream"; @@ -21725,13 +21842,13 @@ let sha512 = "N1IBreECNaxmsaOLMqqm01K7XIp+sMvoVX8mvmT/p1VjM2FLcBU0lj0FalKooi2/2i+ph9WsEoEogOJevqQ6LQ=="; }; }; - "nanoid-1.2.5" = { + "nanoid-1.2.6" = { name = "nanoid"; packageName = "nanoid"; - version = "1.2.5"; + version = "1.2.6"; src = fetchurl { - url = "https://registry.npmjs.org/nanoid/-/nanoid-1.2.5.tgz"; - sha512 = "mOYdCQS3xdgu81Hg3EQEhORykMk53Pkzg15Y6I+O9T3db9qHPf9z6nXzQBCUaHXlQs57eRKotDTzYlYACL+5uA=="; + url = "https://registry.npmjs.org/nanoid/-/nanoid-1.2.6.tgz"; + sha512 = "um9vXiM407BaRbBNa0aKPzFBSD2fDbVmmA9TzCWWlxZvEBzTbixM7ss6GDS4G/cNMYeZSNFx5SzAgWoG1uHU9g=="; }; }; "nanolru-1.0.0" = { @@ -22144,13 +22261,13 @@ let sha512 = "rmTZ9kz+f3rCvK2TD1Ue/oZlns7OGoIWP4fc3llxxRXlOkHKoWPPWJOfFYpITabSow43QJbRIoHQXtt10VldyQ=="; }; }; - "node-abi-2.4.4" = { + "node-abi-2.4.5" = { name = "node-abi"; packageName = "node-abi"; - version = "2.4.4"; + version = "2.4.5"; src = fetchurl { - url = "https://registry.npmjs.org/node-abi/-/node-abi-2.4.4.tgz"; - sha512 = "DQ9Mo2mf/XectC+s6+grPPRQ1Z9gI3ZbrGv6nyXRkjwT3HrE0xvtvrfnH7YHYBLgC/KLadg+h3XHnhZw1sv88A=="; + url = "https://registry.npmjs.org/node-abi/-/node-abi-2.4.5.tgz"; + sha512 = "aa/UC6Nr3+tqhHGRsAuw/edz7/q9nnetBrKWxj6rpTtm+0X9T1qU7lIEHMS3yN9JwAbRiKUbRRFy1PLz/y3aaA=="; }; }; "node-alias-1.0.4" = { @@ -22351,13 +22468,13 @@ let sha512 = "5+MtH9t8tX6Aw6M+SeoyGR23XplNTOln3aTQ7El9tj/606bxea4GxYyvV4ymTmuoODz3GXQlLLQVdGkFLyIdDQ=="; }; }; - "node-red-node-twitter-1.1.2" = { + "node-red-node-twitter-1.1.3" = { name = "node-red-node-twitter"; packageName = "node-red-node-twitter"; - version = "1.1.2"; + version = "1.1.3"; src = fetchurl { - url = "https://registry.npmjs.org/node-red-node-twitter/-/node-red-node-twitter-1.1.2.tgz"; - sha512 = "6qyeZluZCn3SBkmDFGNm3Zf5Y21FosRQ0AMHv9UM9KOf1v9gFS82Ybyah2Z85NHaXqTvyIM5R7zJbvsK2GMq9g=="; + url = "https://registry.npmjs.org/node-red-node-twitter/-/node-red-node-twitter-1.1.3.tgz"; + sha512 = "H4q6wfIeDkDp7ykFh4nK7vrnJa9NI3FmC2rASabup/9LEJ5XD5KXH07eqo+B3Cf3jAzJDmL7RFEFucA8C1oqCw=="; }; }; "node-request-by-swagger-1.1.3" = { @@ -22720,13 +22837,13 @@ let sha512 = "zYbhP2k9DbJhA0Z3HKUePUgdB1x7MfIfKssC+WLPFMKTBZKpZh5m13PgexJjCq6KW7j17r0jHWcCpxEqnnncSA=="; }; }; - "npm-packlist-1.1.11" = { + "npm-packlist-1.1.12" = { name = "npm-packlist"; packageName = "npm-packlist"; - version = "1.1.11"; + version = "1.1.12"; src = fetchurl { - url = "https://registry.npmjs.org/npm-packlist/-/npm-packlist-1.1.11.tgz"; - sha512 = "CxKlZ24urLkJk+9kCm48RTQ7L4hsmgSVzEk0TLGPzzyuFxD7VNgy5Sl24tOLMzQv773a/NeJ1ce1DKeacqffEA=="; + url = "https://registry.npmjs.org/npm-packlist/-/npm-packlist-1.1.12.tgz"; + sha512 = "WJKFOVMeAlsU/pjXuqVdzU0WfgtIBCupkEVwn+1Y0ERAbUfWw8R4GjgVbaKnUjRoD2FoQbHOCbOyT5Mbs9Lw4g=="; }; }; "npm-path-2.0.4" = { @@ -23342,13 +23459,13 @@ let sha1 = "067428230fd67443b2794b22bba528b6867962d4"; }; }; - "ono-4.0.9" = { + "ono-4.0.10" = { name = "ono"; packageName = "ono"; - version = "4.0.9"; + version = "4.0.10"; src = fetchurl { - url = "https://registry.npmjs.org/ono/-/ono-4.0.9.tgz"; - sha512 = "HuSv0Z//JsX3246ykva50NDq2dw2UOaUKRK/CrD3UN96FQ3kr9msI5wR0lMezAIKgfN9+utK+iDfWzj1df3TZg=="; + url = "https://registry.npmjs.org/ono/-/ono-4.0.10.tgz"; + sha512 = "4Xz4hlbq7MzV0I3vKfZwRvyj8tCbXODqBNzFqtkjP+KTV93zzDRju8kw1qnf6P5kcZ2+xlIq6wSCqA+euSKxhA=="; }; }; "open-0.0.2" = { @@ -23891,6 +24008,15 @@ let sha512 = "cDNAN1Ehjbf5EHkNY5qnRhGPUCp6SnpyVof5fRzN800QV1Y2OkzbH9rmjZkbBRa8igof903yOnjIl6z0SlAhxA=="; }; }; + "pac-proxy-agent-3.0.0" = { + name = "pac-proxy-agent"; + packageName = "pac-proxy-agent"; + version = "3.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/pac-proxy-agent/-/pac-proxy-agent-3.0.0.tgz"; + sha512 = "AOUX9jES/EkQX2zRz0AW7lSx9jD//hQS8wFXBvcnd/J2Py9KaMJMqV/LPqJssj1tgGufotb2mmopGPR15ODv1Q=="; + }; + }; "pac-resolver-3.0.0" = { name = "pac-resolver"; packageName = "pac-resolver"; @@ -25530,6 +25656,15 @@ let sha512 = "CNKuhC1jVtm8KJYFTS2ZRO71VCBx3QSA92So/e6NrY6GoJonkx3Irnk4047EsCcswczwqAekRj3s8qLRGahSKg=="; }; }; + "proxy-agent-3.0.3" = { + name = "proxy-agent"; + packageName = "proxy-agent"; + version = "3.0.3"; + src = fetchurl { + url = "https://registry.npmjs.org/proxy-agent/-/proxy-agent-3.0.3.tgz"; + sha512 = "PXVVVuH9tiQuxQltFJVSnXWuDtNr+8aNBP6XVDDCDiUuDN8eRCm+ii4/mFWmXWEA0w8jjJSlePa4LXlM4jIzNA=="; + }; + }; "proxy-from-env-1.0.0" = { name = "proxy-from-env"; packageName = "proxy-from-env"; @@ -25611,13 +25746,13 @@ let sha512 = "q5I5vLRMVtdWa8n/3UEzZX7Lfghzrg9eG2IKk2ENLSofKRCXVqMvMUHxCKgXNaqH/8ebhBxrqftHWnyTFweJ5Q=="; }; }; - "public-encrypt-4.0.2" = { + "public-encrypt-4.0.3" = { name = "public-encrypt"; packageName = "public-encrypt"; - version = "4.0.2"; + version = "4.0.3"; src = fetchurl { - url = "http://registry.npmjs.org/public-encrypt/-/public-encrypt-4.0.2.tgz"; - sha512 = "4kJ5Esocg8X3h8YgJsKAuoesBgB7mqH3eowiDzMUPKiRDDE7E/BqqZD1hnTByIaAFiwAw246YEltSq7tdrOH0Q=="; + url = "https://registry.npmjs.org/public-encrypt/-/public-encrypt-4.0.3.tgz"; + sha512 = "zVpa8oKZSz5bTMTFClc1fQOnyyEzpl5ozpi1B5YcvBrdohMjH2rfsBtyXcuNuwjsDIXmBYlF2N5FlJYhR29t8Q=="; }; }; "pug-2.0.3" = { @@ -26552,7 +26687,7 @@ let packageName = "query-string"; version = "1.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/query-string/-/query-string-1.0.1.tgz"; + url = "http://registry.npmjs.org/query-string/-/query-string-1.0.1.tgz"; sha1 = "63ac953352499ad670a9681a75680f6bf3dd1faf"; }; }; @@ -26561,7 +26696,7 @@ let packageName = "query-string"; version = "5.1.1"; src = fetchurl { - url = "https://registry.npmjs.org/query-string/-/query-string-5.1.1.tgz"; + url = "http://registry.npmjs.org/query-string/-/query-string-5.1.1.tgz"; sha512 = "gjWOsm2SoGlgLEdAGt7a6slVOk9mGiXmPFMqrEhLQ68rhQuBnpfs3+EmlvqKyxnCo9/PPlF+9MtY02S1aFg+Jw=="; }; }; @@ -26799,13 +26934,13 @@ let sha512 = "9esiElv1BrZoI3rCDuOuKCBRbuApGGaDPQfjSflGxdy4oyzqghxu6klEkkVIvBje+FF0BX9coEv8KqW6X/7njw=="; }; }; - "raw-socket-1.6.2" = { + "raw-socket-1.6.3" = { name = "raw-socket"; packageName = "raw-socket"; - version = "1.6.2"; + version = "1.6.3"; src = fetchurl { - url = "https://registry.npmjs.org/raw-socket/-/raw-socket-1.6.2.tgz"; - sha512 = "JbmNAXPFNI+yJv3Kx0Lsl+ao2doZ/kdz9J4Ba9+ggC1U4e50BK0GfHHYuLFj8acnYzqXgKiLzhi2ixOPk6/kcw=="; + url = "https://registry.npmjs.org/raw-socket/-/raw-socket-1.6.3.tgz"; + sha512 = "OcplcSbIIyEZxW6YFsqbvyrUrqvwFNmA4jhA9ZmMhquLrd9VBzIrFRRZ2qaD98UpyVk/VYJLemO8haECHMmEgQ=="; }; }; "rc-0.4.0" = { @@ -27024,13 +27159,13 @@ let sha512 = "tQtKA9WIAhBF3+VLAseyMqZeBjW0AHJoxOtYqSUZNJxauErmLbVm2FW1y+J/YA9dUrAC39ITejlZWhVIwawkKw=="; }; }; - "readable-stream-3.0.3" = { + "readable-stream-3.0.6" = { name = "readable-stream"; packageName = "readable-stream"; - version = "3.0.3"; + version = "3.0.6"; src = fetchurl { - url = "https://registry.npmjs.org/readable-stream/-/readable-stream-3.0.3.tgz"; - sha512 = "CzN1eAu5Pmh4EaDlJp1g5E37LIHR24b82XlMWRQlPFjhvOYKa4HhClRsQO21zhdDWUpdWfiKt9/L/ZL2+vwxCw=="; + url = "https://registry.npmjs.org/readable-stream/-/readable-stream-3.0.6.tgz"; + sha512 = "9E1oLoOWfhSXHGv6QlwXJim7uNzd9EVlWK+21tCU9Ju/kR0/p2AZYPz4qSchgO8PlLIH4FpZYfzwS+rEksZjIg=="; }; }; "readdir-scoped-modules-1.0.2" = { @@ -27245,17 +27380,17 @@ let packageName = "regexpp"; version = "1.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/regexpp/-/regexpp-1.1.0.tgz"; + url = "http://registry.npmjs.org/regexpp/-/regexpp-1.1.0.tgz"; sha512 = "LOPw8FpgdQF9etWMaAfG/WRthIdXJGYp4mJ2Jgn/2lpkbod9jPn0t9UqN7AxBOKNfzRbYyVfgc7Vk4t/MpnXgw=="; }; }; - "regexpp-2.0.0" = { + "regexpp-2.0.1" = { name = "regexpp"; packageName = "regexpp"; - version = "2.0.0"; + version = "2.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/regexpp/-/regexpp-2.0.0.tgz"; - sha512 = "g2FAVtR8Uh8GO1Nv5wpxW7VFVwHcCEr4wyA8/MHiRkO8uHoR5ntAA8Uq3P1vvMTX/BeQiRVSpDGLd+Wn5HNOTA=="; + url = "https://registry.npmjs.org/regexpp/-/regexpp-2.0.1.tgz"; + sha512 = "lv0M6+TkDVniA3aD1Eg0DVpfU/booSu7Eev3TDO/mZKHBfVjgCGTV4t4buppESEYDtkArYFOxTJWv6S5C+iaNw=="; }; }; "registry-auth-token-3.3.2" = { @@ -27456,6 +27591,15 @@ let sha1 = "de63128373fcbf7c3ccfa4de5a480c45a67958eb"; }; }; + "replace-homedir-1.0.0" = { + name = "replace-homedir"; + packageName = "replace-homedir"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/replace-homedir/-/replace-homedir-1.0.0.tgz"; + sha1 = "e87f6d513b928dde808260c12be7fec6ff6e798c"; + }; + }; "replaceall-0.1.6" = { name = "replaceall"; packageName = "replaceall"; @@ -27582,6 +27726,15 @@ let sha1 = "5281770f68e0c9719e5163fd3fab482215f4fda5"; }; }; + "requestretry-3.0.1" = { + name = "requestretry"; + packageName = "requestretry"; + version = "3.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/requestretry/-/requestretry-3.0.1.tgz"; + sha512 = "vJUdB4xucpx+Hc5N1hV44/fHmT4ovhrwGWfG9MtZR6AeO1G350IqPUXJL4gfZND6RtqoSqB+Zs9EeCsMizYf9A=="; + }; + }; "require-directory-2.1.1" = { name = "require-directory"; packageName = "require-directory"; @@ -28347,13 +28500,13 @@ let sha1 = "f0c82d98a3b139a8776a8808050b824431087fca"; }; }; - "secure-scuttlebutt-18.3.3" = { + "secure-scuttlebutt-18.4.0" = { name = "secure-scuttlebutt"; packageName = "secure-scuttlebutt"; - version = "18.3.3"; + version = "18.4.0"; src = fetchurl { - url = "https://registry.npmjs.org/secure-scuttlebutt/-/secure-scuttlebutt-18.3.3.tgz"; - sha512 = "f1APqe25N1Te++xtP1ZFnZ9hff/9lbj1o2fMnvFcGD+BezvwkKuR2RURRdu1NApDp0Xmglki45UeVqMfvs73iw=="; + url = "https://registry.npmjs.org/secure-scuttlebutt/-/secure-scuttlebutt-18.4.0.tgz"; + sha512 = "v74wJIcscPYRG+OF7cQPUi3wCBIy0lRT0e7w+bleFpAPvPL3LTlKtPqt9Stbjrtj5LKV7yWALjoLrkWT0eg+xg=="; }; }; "seek-bzip-1.0.5" = { @@ -28491,6 +28644,15 @@ let sha1 = "4bbb8437c8d37e4b0cf1a68fd726ec6d645d6d36"; }; }; + "semver-greatest-satisfied-range-1.1.0" = { + name = "semver-greatest-satisfied-range"; + packageName = "semver-greatest-satisfied-range"; + version = "1.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/semver-greatest-satisfied-range/-/semver-greatest-satisfied-range-1.1.0.tgz"; + sha1 = "13e8c2658ab9691cb0cd71093240280d36f77a5b"; + }; + }; "semver-regex-1.0.0" = { name = "semver-regex"; packageName = "semver-regex"; @@ -29049,13 +29211,13 @@ let sha512 = "Wvre/Jq5vgoz31Z9stYWPLn0PqRqmBDpFSdypAnHu5AvRVCYPRYGnvryNLiXu8GOBNDH82J2FRHUGMjjHUpXFw=="; }; }; - "simple-git-1.103.0" = { + "simple-git-1.104.0" = { name = "simple-git"; packageName = "simple-git"; - version = "1.103.0"; + version = "1.104.0"; src = fetchurl { - url = "https://registry.npmjs.org/simple-git/-/simple-git-1.103.0.tgz"; - sha512 = "5QKrOtoXLTA3CdFG//8ZIGIVIVRRMBfSyMXDn1t3y+TOf+Kg39mfzfU4t0CRJBcxBGynjNWVwsx6W04+biIUmg=="; + url = "https://registry.npmjs.org/simple-git/-/simple-git-1.104.0.tgz"; + sha512 = "KTELLFyhLhN1qZGQkglx1e0YezYKNabCY4oKrTVb9y0BllkWwruK2qFCQDm2zpT7rE4IPd4/hzZt/6+0ykQIdA=="; }; }; "simple-lru-cache-0.0.2" = { @@ -29085,6 +29247,15 @@ let sha512 = "MUWWno5o5cvISKOH4pYQ18PQJLpDaNWoKUbrPPKuspCLCkkh+zhtuQyTE8h2U2Ags+/OUN5wnUe92+9B8/Sm2Q=="; }; }; + "simple-plist-0.2.1" = { + name = "simple-plist"; + packageName = "simple-plist"; + version = "0.2.1"; + src = fetchurl { + url = "https://registry.npmjs.org/simple-plist/-/simple-plist-0.2.1.tgz"; + sha1 = "71766db352326928cf3a807242ba762322636723"; + }; + }; "simple-sha1-2.1.1" = { name = "simple-sha1"; packageName = "simple-sha1"; @@ -29409,13 +29580,13 @@ let sha512 = "FL1b58BDrqS3A11lJ0zEdnJ3UOKqVxawAkF3k7F0CVN7VQ34aZrV+G8BZ1WC9ZL7NyrwsW0oviwsWDgRuVYtJg=="; }; }; - "snyk-1.99.1" = { + "snyk-1.102.0" = { name = "snyk"; packageName = "snyk"; - version = "1.99.1"; + version = "1.102.0"; src = fetchurl { - url = "https://registry.npmjs.org/snyk/-/snyk-1.99.1.tgz"; - sha512 = "vN2jUGwHPHAbqqOeZQsBrnWgTvuCnbxsP8i9BIaqZxINeKbuBOS1t5Kg9KMMCRJyqqCB/y76PQSdoqavh4yxkg=="; + url = "https://registry.npmjs.org/snyk/-/snyk-1.102.0.tgz"; + sha512 = "OZfjEJeMdrYj7KVXaNhLwVi1vv5omRyrLv469BD6Bc6mvOK4/JVEcJGoNgn3MyWazgpOy8/4Xi9mMQvrdwfRfQ=="; }; }; "snyk-config-2.2.0" = { @@ -29445,13 +29616,13 @@ let sha512 = "XWajcSh6Ld+I+WdcyU3DGDuE2ydThQd8ORkESy0nQ2LwekygLYVYN66OBy0uxpqYfd4qoqeg+J8lb4oGzCmyGA=="; }; }; - "snyk-gradle-plugin-2.0.1" = { + "snyk-gradle-plugin-2.1.0" = { name = "snyk-gradle-plugin"; packageName = "snyk-gradle-plugin"; - version = "2.0.1"; + version = "2.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/snyk-gradle-plugin/-/snyk-gradle-plugin-2.0.1.tgz"; - sha512 = "dL9MRlwmDP4OmOk4b61pMqvbu8gG+HVCBTryBEU+vkvjloX0lslKvA5NTUPAM2M8SShnOic54cSegGQChBhYHw=="; + url = "https://registry.npmjs.org/snyk-gradle-plugin/-/snyk-gradle-plugin-2.1.0.tgz"; + sha512 = "9gYJluomFZ5kaww5FoBvp4zUIsr27pEJ12jQJaVf0FJ0BmyYHmbCoxvHdqjCSYS2fVtF+fmPnvw0XKQOIwA1SA=="; }; }; "snyk-module-1.8.2" = { @@ -29508,13 +29679,13 @@ let sha512 = "CEioNnDzccHyid7UIVl3bJ1dnG4co4ofI+KxuC1mo0IUXy64gxnBTeVoZF5gVLWbAyxGxSeW8f0+8GmWMHVb7w=="; }; }; - "snyk-python-plugin-1.8.1" = { + "snyk-python-plugin-1.8.2" = { name = "snyk-python-plugin"; packageName = "snyk-python-plugin"; - version = "1.8.1"; + version = "1.8.2"; src = fetchurl { - url = "https://registry.npmjs.org/snyk-python-plugin/-/snyk-python-plugin-1.8.1.tgz"; - sha512 = "DsUBkQZiPlXGkwzhxxEo2Tvfq6XhygWQThWM0yRBythi9M5n8UimZEwdkBHPj7xKC1clsB8boM3+sT/E1x6XGA=="; + url = "https://registry.npmjs.org/snyk-python-plugin/-/snyk-python-plugin-1.8.2.tgz"; + sha512 = "LBvjztnXarSHKyhivzM567icOOLOB98I7S9EEnjepuG+EZ0jiZzqOEMVRmzuYi+hRq3Cwh0hhjkwgJAQpKDz+g=="; }; }; "snyk-resolve-1.0.1" = { @@ -29526,13 +29697,13 @@ let sha512 = "7+i+LLhtBo1Pkth01xv+RYJU8a67zmJ8WFFPvSxyCjdlKIcsps4hPQFebhz+0gC5rMemlaeIV6cqwqUf9PEDpw=="; }; }; - "snyk-resolve-deps-3.1.0" = { + "snyk-resolve-deps-4.0.1" = { name = "snyk-resolve-deps"; packageName = "snyk-resolve-deps"; - version = "3.1.0"; + version = "4.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/snyk-resolve-deps/-/snyk-resolve-deps-3.1.0.tgz"; - sha512 = "YVAelR+dTpqLgfk6lf6WgOlw+MGmGI0r3/Dny8tUbJJ9uVTHTRAOdZCbUyTFqJG7oEmEZxUwmfjqgAuniYwx8Q=="; + url = "https://registry.npmjs.org/snyk-resolve-deps/-/snyk-resolve-deps-4.0.1.tgz"; + sha512 = "gieaYoOuJLXzUmDDKfQJAqfwaxa43KmSqN2d9abRfgMXnLlX9IqyoZ1wqZMbd3WN7tsHSkpWvVwc4FHdQEkUKA=="; }; }; "snyk-sbt-plugin-2.0.0" = { @@ -30066,22 +30237,22 @@ let sha1 = "b00799557eb7fb0c8376c29d44e8a1ea67e57476"; }; }; - "spdx-correct-3.0.1" = { + "spdx-correct-3.0.2" = { name = "spdx-correct"; packageName = "spdx-correct"; - version = "3.0.1"; + version = "3.0.2"; src = fetchurl { - url = "https://registry.npmjs.org/spdx-correct/-/spdx-correct-3.0.1.tgz"; - sha512 = "hxSPZbRZvSDuOvADntOElzJpenIR7wXJkuoUcUtS0erbgt2fgeaoPIYretfKpslMhfFDY4k0MZ2F5CUzhBsSvQ=="; + url = "https://registry.npmjs.org/spdx-correct/-/spdx-correct-3.0.2.tgz"; + sha512 = "q9hedtzyXHr5S0A1vEPoK/7l8NpfkFYTq6iCY+Pno2ZbdZR6WexZFtqeVGkGxW3TEJMN914Z55EnAGMmenlIQQ=="; }; }; - "spdx-exceptions-2.1.0" = { + "spdx-exceptions-2.2.0" = { name = "spdx-exceptions"; packageName = "spdx-exceptions"; - version = "2.1.0"; + version = "2.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/spdx-exceptions/-/spdx-exceptions-2.1.0.tgz"; - sha512 = "4K1NsmrlCU1JJgUrtgEeTVyfx8VaYea9J9LvARxhbHtVtohPs/gFGG5yy49beySjlIMhhXZ4QqujIZEfS4l6Cg=="; + url = "https://registry.npmjs.org/spdx-exceptions/-/spdx-exceptions-2.2.0.tgz"; + sha512 = "2XQACfElKi9SlVb1CYadKDXvoajPgBVPn/gOQLrTvHdElaVhr7ZEbqJaRnJLVNeaI4cMEAgVCeBMKF6MWRDCRA=="; }; }; "spdx-expression-parse-3.0.0" = { @@ -30264,13 +30435,13 @@ let sha512 = "LyH5Y/U7xvafmAuG1puyhNv4G3Ew9xC67dYgRX0wwbUf5iT422WB1Cvat9qGFAu3/BQbdctXtdEQPxaAn0+hYA=="; }; }; - "ssb-config-2.3.3" = { + "ssb-config-2.3.4" = { name = "ssb-config"; packageName = "ssb-config"; - version = "2.3.3"; + version = "2.3.4"; src = fetchurl { - url = "https://registry.npmjs.org/ssb-config/-/ssb-config-2.3.3.tgz"; - sha512 = "w4tdXE7xEpYe9M071G60Wr/6lf59OTwrsTykUGFySh9Y7Prcu4pORmOIBgQUttZ86QvGMxJO1qdl7toIK53RMA=="; + url = "https://registry.npmjs.org/ssb-config/-/ssb-config-2.3.4.tgz"; + sha512 = "Yp0DKsc9eSaU+9+5xMO4/NVdOFyBtHD+QgraZ+1Id2K4f0eUiKpJ2ogLNmGanTvkLVhm/vq27TLI27Fq83njWQ=="; }; }; "ssb-ebt-5.2.3" = { @@ -31101,6 +31272,15 @@ let sha1 = "a8479022eb1ac368a871389b635262c505ee368f"; }; }; + "strip-ansi-5.0.0" = { + name = "strip-ansi"; + packageName = "strip-ansi"; + version = "5.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/strip-ansi/-/strip-ansi-5.0.0.tgz"; + sha512 = "Uu7gQyZI7J7gn5qLn1Np3G9vcYGTVqB+lFTytnDJv83dd8T22aGH451P3jueT2/QemInJDfxHB5Tde5OzgG1Ow=="; + }; + }; "strip-bom-1.0.0" = { name = "strip-bom"; packageName = "strip-bom"; @@ -31326,13 +31506,13 @@ let sha512 = "GLQtLMCoEIK4eDv6OGtkOoSMt3D+oq0y3dsxMuYuDvaNUvuT8eFBuLmfR0iYYzHC1e8hpzC6ZsxbuP6DIalMFA=="; }; }; - "superagent-proxy-1.0.3" = { + "superagent-proxy-2.0.0" = { name = "superagent-proxy"; packageName = "superagent-proxy"; - version = "1.0.3"; + version = "2.0.0"; src = fetchurl { - url = "http://registry.npmjs.org/superagent-proxy/-/superagent-proxy-1.0.3.tgz"; - sha512 = "79Ujg1lRL2ICfuHUdX+H2MjIw73kB7bXsIkxLwHURz3j0XUmEEEoJ+u/wq+mKwna21Uejsm2cGR3OESA00TIjA=="; + url = "https://registry.npmjs.org/superagent-proxy/-/superagent-proxy-2.0.0.tgz"; + sha512 = "TktJma5jPdiH1BNN+reF/RMW3b8aBTCV7KlLFV0uYcREgNf3pvo7Rdt564OcFHwkGb3mYEhHuWPBhSbOwiNaYw=="; }; }; "supports-color-0.2.0" = { @@ -31416,6 +31596,15 @@ let sha512 = "QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow=="; }; }; + "sver-compat-1.5.0" = { + name = "sver-compat"; + packageName = "sver-compat"; + version = "1.5.0"; + src = fetchurl { + url = "https://registry.npmjs.org/sver-compat/-/sver-compat-1.5.0.tgz"; + sha1 = "3cf87dfeb4d07b4a3f14827bc186b3fd0c645cd8"; + }; + }; "swagger-converter-0.1.7" = { name = "swagger-converter"; packageName = "swagger-converter"; @@ -31547,7 +31736,7 @@ let packageName = "tabtab"; version = "1.3.2"; src = fetchurl { - url = "https://registry.npmjs.org/tabtab/-/tabtab-1.3.2.tgz"; + url = "http://registry.npmjs.org/tabtab/-/tabtab-1.3.2.tgz"; sha1 = "bb9c2ca6324f659fde7634c2caf3c096e1187ca7"; }; }; @@ -31822,13 +32011,13 @@ let sha1 = "4ca2fffc02a51290d2744b9e3f557693ca6b627a"; }; }; - "thriftrw-3.11.2" = { + "thriftrw-3.11.3" = { name = "thriftrw"; packageName = "thriftrw"; - version = "3.11.2"; + version = "3.11.3"; src = fetchurl { - url = "https://registry.npmjs.org/thriftrw/-/thriftrw-3.11.2.tgz"; - sha512 = "3iCowlHgCEXjabCkurHTaECb2+U0V+NzqBmwfKHn8fzJJwXd/oDo7Wh6Vs0kaESN7YNJMRPC8ObL3AfQ1gxKmQ=="; + url = "https://registry.npmjs.org/thriftrw/-/thriftrw-3.11.3.tgz"; + sha512 = "mnte80Go5MCfYyOQ9nk6SljaEicCXlwLchupHR+/zlx0MKzXwAiyt38CHjLZVvKtoyEzirasXuNYtkEjgghqCw=="; }; }; "throat-3.2.0" = { @@ -32002,13 +32191,13 @@ let sha512 = "YvC1SV1XdOUaL6gx5CoGroT3Gu49pK9+TZ38ErPldOWW4j49GI1HKs9DV+KGq/w6y+LZ72W1c8cKz2vzY+qpzg=="; }; }; - "timers-ext-0.1.5" = { + "timers-ext-0.1.7" = { name = "timers-ext"; packageName = "timers-ext"; - version = "0.1.5"; + version = "0.1.7"; src = fetchurl { - url = "https://registry.npmjs.org/timers-ext/-/timers-ext-0.1.5.tgz"; - sha512 = "tsEStd7kmACHENhsUPaxb8Jf8/+GZZxyNFQbZD07HQOyooOa6At1rQqjffgvg7n+dxscQa9cjjMdWhJtsP2sxg=="; + url = "https://registry.npmjs.org/timers-ext/-/timers-ext-0.1.7.tgz"; + sha512 = "b85NUNzTSdodShTIbky6ZF02e8STtVVfD+fu4aXXShEELpozH+bCpJLYMPZbsABN2wDH7fJpqIoXxJpzbf0NqQ=="; }; }; "timespan-2.3.0" = { @@ -33105,7 +33294,7 @@ let packageName = "underscore.string"; version = "2.3.3"; src = fetchurl { - url = "https://registry.npmjs.org/underscore.string/-/underscore.string-2.3.3.tgz"; + url = "http://registry.npmjs.org/underscore.string/-/underscore.string-2.3.3.tgz"; sha1 = "71c08bf6b428b1133f37e78fa3a21c82f7329b0d"; }; }; @@ -33114,7 +33303,7 @@ let packageName = "underscore.string"; version = "2.4.0"; src = fetchurl { - url = "https://registry.npmjs.org/underscore.string/-/underscore.string-2.4.0.tgz"; + url = "http://registry.npmjs.org/underscore.string/-/underscore.string-2.4.0.tgz"; sha1 = "8cdd8fbac4e2d2ea1e7e2e8097c42f442280f85b"; }; }; @@ -33793,6 +33982,15 @@ let sha1 = "67e2e863797215530dff318e5bf9dcebfd47b21a"; }; }; + "uuid-3.0.1" = { + name = "uuid"; + packageName = "uuid"; + version = "3.0.1"; + src = fetchurl { + url = "http://registry.npmjs.org/uuid/-/uuid-3.0.1.tgz"; + sha1 = "6544bba2dfda8c1cf17e629a3a305e2bb1fee6c1"; + }; + }; "uuid-3.1.0" = { name = "uuid"; packageName = "uuid"; @@ -33847,6 +34045,15 @@ let sha512 = "6sgSKoFw1UpUPd3cFdF7QGnrH6tDeBgW1F3v9gy8gLY0mlbiBXq8soy8aQpY6xeeCjH5K+JvC62Acp7gtl7wWA=="; }; }; + "v8flags-3.1.1" = { + name = "v8flags"; + packageName = "v8flags"; + version = "3.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/v8flags/-/v8flags-3.1.1.tgz"; + sha512 = "iw/1ViSEaff8NJ3HLyEjawk/8hjJib3E7pvG4pddVXfUg1983s3VGsiClDjhK64MQVDGqc1Q8r18S4VKQZS9EQ=="; + }; + }; "valid-identifier-0.0.1" = { name = "valid-identifier"; packageName = "valid-identifier"; @@ -34932,7 +35139,7 @@ let packageName = "ws"; version = "0.4.31"; src = fetchurl { - url = "https://registry.npmjs.org/ws/-/ws-0.4.31.tgz"; + url = "http://registry.npmjs.org/ws/-/ws-0.4.31.tgz"; sha1 = "5a4849e7a9ccd1ed5a81aeb4847c9fedf3122927"; }; }; @@ -34941,7 +35148,7 @@ let packageName = "ws"; version = "0.4.32"; src = fetchurl { - url = "https://registry.npmjs.org/ws/-/ws-0.4.32.tgz"; + url = "http://registry.npmjs.org/ws/-/ws-0.4.32.tgz"; sha1 = "787a6154414f3c99ed83c5772153b20feb0cec32"; }; }; @@ -34981,13 +35188,13 @@ let sha512 = "jaHFD6PFv6UgoIVda6qZllptQsMlDEJkTQcybzzXDYM1XO9Y8em691FGMPmM46WGyLU4z9KMgQN+qrux/nhlHA=="; }; }; - "ws-6.0.0" = { + "ws-6.1.0" = { name = "ws"; packageName = "ws"; - version = "6.0.0"; + version = "6.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/ws/-/ws-6.0.0.tgz"; - sha512 = "c2UlYcAZp1VS8AORtpq6y4RJIkJ9dQz18W32SpR/qXGfLDZ2jU4y4wKvvZwqbi7U6gxFQTeE+urMbXU/tsDy4w=="; + url = "https://registry.npmjs.org/ws/-/ws-6.1.0.tgz"; + sha512 = "H3dGVdGvW2H8bnYpIDc3u3LH8Wue3Qh+Zto6aXXFzvESkTVT6rAfKR6tR/+coaUvxs8yHtmNV0uioBF62ZGSTg=="; }; }; "wtf-8-1.0.0" = { @@ -35008,6 +35215,15 @@ let sha1 = "7f6194154fd1786cf261e68b5488c47127a04977"; }; }; + "xcode-1.0.0" = { + name = "xcode"; + packageName = "xcode"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/xcode/-/xcode-1.0.0.tgz"; + sha1 = "e1f5b1443245ded38c180796df1a10fdeda084ec"; + }; + }; "xdg-basedir-2.0.0" = { name = "xdg-basedir"; packageName = "xdg-basedir"; @@ -35491,7 +35707,7 @@ let packageName = "yargs-parser"; version = "4.2.1"; src = fetchurl { - url = "https://registry.npmjs.org/yargs-parser/-/yargs-parser-4.2.1.tgz"; + url = "http://registry.npmjs.org/yargs-parser/-/yargs-parser-4.2.1.tgz"; sha1 = "29cceac0dc4f03c6c87b4a9f217dd18c9f74871c"; }; }; @@ -35842,10 +36058,10 @@ in asar = nodeEnv.buildNodePackage { name = "asar"; packageName = "asar"; - version = "0.14.4"; + version = "0.14.5"; src = fetchurl { - url = "https://registry.npmjs.org/asar/-/asar-0.14.4.tgz"; - sha512 = "U+Bd2VY5LkLM3DUpLtlQgS+goiXBmSU4P41xUdck/vyHqhMfxBVAXTMLksDGoWvhx7LPgboSUVF0ujHCVsturw=="; + url = "https://registry.npmjs.org/asar/-/asar-0.14.5.tgz"; + sha512 = "2Di/TnY1sridHFKMFgxBh0Wk0gVxSZN4qQhRhjJn3UywZAvP5MHI0RNVSkpzmJ+n6t0BC8w/+1257wtSgQ3Kdg=="; }; dependencies = [ sources."abbrev-1.1.1" @@ -35963,7 +36179,7 @@ in sha512 = "9OBihy+L53g9ALssKTY/vTWEiz8mGEJ1asWiCdfPdQ1Uf++tewiNrN7Fq2Eb6ZYtvK0BYvPZlh3bHguKmKO3yA=="; }; dependencies = [ - sources."@types/node-8.10.30" + sources."@types/node-8.10.34" sources."JSV-4.0.2" sources."adal-node-0.1.28" sources."ajv-5.5.2" @@ -36507,8 +36723,8 @@ in sources."signal-exit-3.0.2" sources."sort-keys-1.1.2" sources."sort-keys-length-1.0.1" - sources."spdx-correct-3.0.1" - sources."spdx-exceptions-2.1.0" + sources."spdx-correct-3.0.2" + sources."spdx-exceptions-2.2.0" sources."spdx-expression-parse-3.0.0" sources."spdx-license-ids-3.0.1" sources."sprintf-js-1.0.3" @@ -36626,7 +36842,7 @@ in sources."jsonparse-1.3.1" sources."labeled-stream-splicer-2.0.1" sources."lodash.memoize-3.0.4" - sources."md5.js-1.3.4" + sources."md5.js-1.3.5" sources."miller-rabin-4.0.1" sources."minimalistic-assert-1.0.1" sources."minimalistic-crypto-utils-1.0.1" @@ -36646,7 +36862,7 @@ in sources."pbkdf2-3.0.17" sources."process-0.11.10" sources."process-nextick-args-2.0.0" - sources."public-encrypt-4.0.2" + sources."public-encrypt-4.0.3" sources."punycode-1.4.1" sources."querystring-0.2.0" sources."querystring-es3-0.2.1" @@ -37013,8 +37229,8 @@ in }) sources."single-line-log-0.4.1" sources."sntp-0.1.4" - sources."spdx-correct-3.0.1" - sources."spdx-exceptions-2.1.0" + sources."spdx-correct-3.0.2" + sources."spdx-exceptions-2.2.0" sources."spdx-expression-parse-3.0.0" sources."spdx-license-ids-3.0.1" sources."speedometer-0.1.4" @@ -37202,10 +37418,10 @@ in cordova = nodeEnv.buildNodePackage { name = "cordova"; packageName = "cordova"; - version = "8.1.1"; + version = "8.1.2"; src = fetchurl { - url = "https://registry.npmjs.org/cordova/-/cordova-8.1.1.tgz"; - sha512 = "YmsGlgz8yiPFcRphTW3LO+6YaCZU5FmoVMOxIti5tbd4Td3JiXiJblpklijryc7jCY6B6seifu9xCVCpfc0AMA=="; + url = "https://registry.npmjs.org/cordova/-/cordova-8.1.2.tgz"; + sha512 = "IfslM3MP42CA/ebVJVlit6FhQ2P6Fercwx9NNQjkVs0wahEwqamL4bcqh1gKiTti7+/ZsDtBRSVmRv+y7LcTbg=="; }; dependencies = [ sources."JSONStream-1.3.4" @@ -37247,6 +37463,7 @@ in sources."base64-js-1.2.0" sources."bcrypt-pbkdf-1.0.2" sources."big-integer-1.6.36" + sources."block-stream-0.0.9" sources."bn.js-4.11.8" sources."body-parser-1.18.2" (sources."boxen-1.3.0" // { @@ -37256,6 +37473,7 @@ in sources."supports-color-5.5.0" ]; }) + sources."bplist-creator-0.0.7" sources."bplist-parser-0.1.1" sources."brace-expansion-1.1.11" sources."brorand-1.1.0" @@ -37289,7 +37507,6 @@ in sources."capture-stack-trace-1.0.1" sources."caseless-0.12.0" sources."chalk-1.1.3" - sources."chownr-1.1.1" sources."ci-info-1.6.0" sources."cipher-base-1.0.4" sources."cli-boxes-1.0.0" @@ -37334,7 +37551,7 @@ in ]; }) sources."cordova-js-4.2.4" - (sources."cordova-lib-8.1.0" // { + (sources."cordova-lib-8.1.1" // { dependencies = [ sources."base64-js-1.1.2" sources."elementtree-0.1.7" @@ -37416,8 +37633,8 @@ in }) sources."forwarded-0.1.2" sources."fresh-0.5.2" - sources."fs-minipass-1.2.5" sources."fs.realpath-1.0.0" + sources."fstream-1.0.11" sources."function-bind-1.1.1" sources."get-assigned-identifiers-1.2.0" sources."get-stream-3.0.0" @@ -37511,13 +37728,9 @@ in sources."lodash.memoize-3.0.4" sources."loud-rejection-1.6.0" sources."lowercase-keys-1.0.1" - (sources."lru-cache-4.1.3" // { - dependencies = [ - sources."yallist-2.1.2" - ]; - }) + sources."lru-cache-4.1.3" sources."make-dir-1.3.0" - sources."md5.js-1.3.4" + sources."md5.js-1.3.5" sources."media-typer-0.3.0" sources."merge-descriptors-1.0.1" sources."methods-1.1.2" @@ -37529,8 +37742,6 @@ in sources."minimalistic-crypto-utils-1.0.1" sources."minimatch-3.0.4" sources."minimist-1.2.0" - sources."minipass-2.3.4" - sources."minizlib-1.1.0" (sources."mkdirp-0.5.1" // { dependencies = [ sources."minimist-0.0.8" @@ -37574,6 +37785,7 @@ in sources."path-platform-0.11.15" sources."path-to-regexp-0.1.7" sources."pbkdf2-3.0.17" + sources."pegjs-0.10.0" sources."performance-now-2.1.0" sources."pify-3.0.0" sources."plist-2.1.0" @@ -37585,7 +37797,7 @@ in sources."proxy-addr-2.0.4" sources."pseudomap-1.0.2" sources."psl-1.1.29" - sources."public-encrypt-4.0.2" + sources."public-encrypt-4.0.3" sources."punycode-1.4.1" sources."q-1.5.1" sources."qs-6.5.1" @@ -37632,6 +37844,11 @@ in }) sources."resolve-1.8.1" sources."restore-cursor-1.0.1" + (sources."rimraf-2.6.2" // { + dependencies = [ + sources."glob-7.1.3" + ]; + }) sources."ripemd160-2.0.2" sources."run-async-0.1.0" sources."rx-lite-3.1.2" @@ -37651,16 +37868,23 @@ in sources."shelljs-0.5.3" sources."signal-exit-3.0.2" sources."simple-concat-1.0.0" + (sources."simple-plist-0.2.1" // { + dependencies = [ + sources."base64-js-1.1.2" + sources."plist-2.0.1" + ]; + }) sources."slash-1.0.0" sources."slide-1.1.6" sources."source-map-0.5.7" - sources."spdx-correct-3.0.1" - sources."spdx-exceptions-2.1.0" + sources."spdx-correct-3.0.2" + sources."spdx-exceptions-2.2.0" sources."spdx-expression-parse-3.0.0" sources."spdx-license-ids-3.0.1" sources."sshpk-1.14.2" sources."statuses-1.4.0" sources."stream-browserify-2.0.1" + sources."stream-buffers-2.2.0" sources."stream-combiner2-1.1.1" sources."stream-http-2.8.3" sources."stream-splicer-2.0.0" @@ -37679,7 +37903,7 @@ in sources."subarg-1.0.0" sources."supports-color-2.0.0" sources."syntax-error-1.4.0" - sources."tar-4.4.6" + sources."tar-2.2.1" sources."term-size-1.2.0" sources."through-2.3.8" sources."through2-2.0.3" @@ -37727,11 +37951,16 @@ in sources."win-release-1.1.1" sources."wrappy-1.0.2" sources."write-file-atomic-2.3.0" + (sources."xcode-1.0.0" // { + dependencies = [ + sources."uuid-3.0.1" + ]; + }) sources."xdg-basedir-3.0.0" sources."xmlbuilder-8.2.2" sources."xmldom-0.1.27" sources."xtend-4.0.1" - sources."yallist-3.0.2" + sources."yallist-2.1.2" ]; buildInputs = globalBuildInputs; meta = { @@ -37745,10 +37974,10 @@ in create-cycle-app = nodeEnv.buildNodePackage { name = "create-cycle-app"; packageName = "create-cycle-app"; - version = "4.0.0"; + version = "5.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/create-cycle-app/-/create-cycle-app-4.0.0.tgz"; - sha512 = "ofgR7gXf+7lgnXQvj0KeveHAyrtoK8zveCDD3sTHPFQY1FKJGkJ7M404ak+G8w6VbTuHwzaBrYbEh8M/SBuykQ=="; + url = "https://registry.npmjs.org/create-cycle-app/-/create-cycle-app-5.0.0.tgz"; + sha512 = "Ic10lxNqRXWtO9CUbvsWcOWEigWuGApKEiRo0DNybhrsCuUQBeGhxfdVRYb3TD+keK+2LVCBFCdVbWb4UqqcdA=="; }; dependencies = [ sources."@cycle/dom-18.3.0" @@ -37761,7 +37990,7 @@ in sources."@cycle/run-3.4.0" sources."@cycle/time-0.10.1" sources."@types/cookiejar-2.1.0" - sources."@types/node-10.11.3" + sources."@types/node-10.11.4" sources."@types/superagent-3.8.2" sources."ansi-escapes-3.1.0" sources."ansi-regex-2.1.1" @@ -37892,10 +38121,10 @@ in create-react-app = nodeEnv.buildNodePackage { name = "create-react-app"; packageName = "create-react-app"; - version = "1.5.2"; + version = "2.0.3"; src = fetchurl { - url = "http://registry.npmjs.org/create-react-app/-/create-react-app-1.5.2.tgz"; - sha512 = "vnYIzsfTaqai2l07P9qtxhsZgHbzirC2omxKmf16wqvpXao9CNCDmpk+BCZRElih7HTn/mpO3soe8DTZV4DsgQ=="; + url = "https://registry.npmjs.org/create-react-app/-/create-react-app-2.0.3.tgz"; + sha512 = "HpApfnkI/kc8mfqN9JkPUZ0MmaqsKkvhJzUWjXg/PqeeGNrO4NKXmWzc2QUncszl/o+jfaqxy8ajgO0BQuRcow=="; }; dependencies = [ sources."ansi-regex-2.1.1" @@ -37912,9 +38141,9 @@ in sources."cross-spawn-4.0.2" sources."debug-2.6.9" sources."duplexer2-0.0.2" - sources."envinfo-3.4.2" + sources."envinfo-5.10.0" sources."escape-string-regexp-1.0.5" - sources."fs-extra-1.0.0" + sources."fs-extra-5.0.0" sources."fs.realpath-1.0.0" sources."fstream-1.0.11" sources."fstream-ignore-1.0.5" @@ -37926,20 +38155,13 @@ in sources."inherits-2.0.3" sources."isarray-0.0.1" sources."isexe-2.0.0" - sources."jsonfile-2.4.0" - sources."klaw-1.3.1" + sources."jsonfile-4.0.0" sources."lru-cache-4.1.3" - sources."macos-release-1.1.0" sources."minimatch-3.0.4" - sources."minimist-1.2.0" - (sources."mkdirp-0.5.1" // { - dependencies = [ - sources."minimist-0.0.8" - ]; - }) + sources."minimist-0.0.8" + sources."mkdirp-0.5.1" sources."ms-2.0.0" sources."once-1.4.0" - sources."os-name-2.0.1" sources."os-tmpdir-1.0.2" sources."path-is-absolute-1.0.1" sources."process-nextick-args-2.0.0" @@ -37964,12 +38186,12 @@ in sources."readable-stream-1.0.34" ]; }) - sources."tmp-0.0.31" + sources."tmp-0.0.33" sources."uid-number-0.0.6" + sources."universalify-0.1.2" sources."util-deprecate-1.0.2" sources."validate-npm-package-name-3.0.0" sources."which-1.3.1" - sources."win-release-1.1.1" sources."wrappy-1.0.2" sources."xtend-4.0.1" sources."yallist-2.1.2" @@ -37977,7 +38199,7 @@ in buildInputs = globalBuildInputs; meta = { description = "Create React apps with no build configuration."; - homepage = "https://github.com/facebookincubator/create-react-app#readme"; + homepage = "https://github.com/facebook/create-react-app#readme"; license = "MIT"; }; production = true; @@ -38233,7 +38455,7 @@ in sources."has-flag-3.0.0" sources."http-methods-0.1.0" sources."http-signature-1.2.0" - (sources."hypercore-6.19.1" // { + (sources."hypercore-6.19.2" // { dependencies = [ sources."process-nextick-args-1.0.7" sources."unordered-set-2.0.1" @@ -38840,10 +39062,10 @@ in elasticdump = nodeEnv.buildNodePackage { name = "elasticdump"; packageName = "elasticdump"; - version = "3.4.0"; + version = "4.0.3"; src = fetchurl { - url = "https://registry.npmjs.org/elasticdump/-/elasticdump-3.4.0.tgz"; - sha512 = "DHK6WpqZf5VTW9PK2UjkRADDacT6c2fsHFCy0pQ8c1VYUWz/zI5OGzBBPg5HTZbvTgY+AXJ3JHUB3E7Esktlog=="; + url = "https://registry.npmjs.org/elasticdump/-/elasticdump-4.0.3.tgz"; + sha512 = "Rxbsh4LWdIlMUO+NxET9g1xHZ9Q93i7jtPESYcCyEOnRiSsZXi/AF6UmCdvmM38IgHrklI2e4DwuG1OwRIGQAA=="; }; dependencies = [ sources."JSONStream-1.3.4" @@ -38852,12 +39074,13 @@ in sources."assert-plus-1.0.0" sources."async-2.6.1" sources."asynckit-0.4.0" - sources."aws-sdk-2.325.0" + sources."aws-sdk-2.330.0" sources."aws-sign2-0.7.0" sources."aws4-1.8.0" sources."base64-js-1.3.0" sources."bcrypt-pbkdf-1.0.2" sources."buffer-4.9.1" + sources."bytes-3.0.0" sources."caseless-0.12.0" sources."co-4.6.0" sources."combined-stream-1.0.7" @@ -38910,6 +39133,7 @@ in sources."uuid-3.3.2" ]; }) + sources."requestretry-3.0.1" sources."safe-buffer-5.1.2" sources."safer-buffer-2.1.2" sources."sax-1.2.1" @@ -38925,6 +39149,7 @@ in sources."url-0.10.3" sources."uuid-3.1.0" sources."verror-1.10.0" + sources."when-3.7.8" sources."wordwrap-0.0.3" sources."xml2js-0.4.19" sources."xmlbuilder-9.0.7" @@ -39624,8 +39849,8 @@ in sources."slash-1.0.0" sources."source-map-0.5.7" sources."source-map-support-0.4.18" - sources."spdx-correct-3.0.1" - sources."spdx-exceptions-2.1.0" + sources."spdx-correct-3.0.2" + sources."spdx-exceptions-2.2.0" sources."spdx-expression-parse-3.0.0" sources."spdx-license-ids-3.0.1" (sources."string-width-2.1.1" // { @@ -39703,7 +39928,7 @@ in sources."color-name-1.1.3" sources."concat-map-0.0.1" sources."cross-spawn-6.0.5" - sources."debug-4.0.1" + sources."debug-4.1.0" sources."deep-is-0.1.3" sources."del-2.2.2" sources."doctrine-2.1.0" @@ -39727,7 +39952,7 @@ in sources."fs.realpath-1.0.0" sources."functional-red-black-tree-1.0.1" sources."glob-7.1.3" - sources."globals-11.7.0" + sources."globals-11.8.0" sources."globby-5.0.0" sources."graceful-fs-4.1.11" sources."has-flag-3.0.0" @@ -39773,7 +39998,7 @@ in sources."prelude-ls-1.1.2" sources."progress-2.0.0" sources."punycode-2.1.1" - sources."regexpp-2.0.0" + sources."regexpp-2.0.1" sources."require-uncached-1.0.3" sources."resolve-from-1.0.1" sources."restore-cursor-2.0.0" @@ -39847,7 +40072,7 @@ in sources."color-name-1.1.3" sources."concat-map-0.0.1" sources."cross-spawn-6.0.5" - sources."debug-4.0.1" + sources."debug-4.1.0" sources."deep-is-0.1.3" sources."del-2.2.2" sources."doctrine-2.1.0" @@ -39872,7 +40097,7 @@ in sources."fs.realpath-1.0.0" sources."functional-red-black-tree-1.0.1" sources."glob-7.1.3" - sources."globals-11.7.0" + sources."globals-11.8.0" sources."globby-5.0.0" sources."graceful-fs-4.1.11" sources."has-flag-3.0.0" @@ -39920,7 +40145,7 @@ in sources."prelude-ls-1.1.2" sources."progress-2.0.0" sources."punycode-2.1.1" - sources."regexpp-2.0.0" + sources."regexpp-2.0.1" sources."require-uncached-1.0.3" sources."resolve-1.8.1" sources."resolve-from-1.0.1" @@ -40130,8 +40355,8 @@ in sources."safer-buffer-2.1.2" sources."semver-5.5.1" sources."signal-exit-3.0.2" - sources."spdx-correct-3.0.1" - sources."spdx-exceptions-2.1.0" + sources."spdx-correct-3.0.2" + sources."spdx-exceptions-2.2.0" sources."spdx-expression-parse-3.0.0" sources."spdx-license-ids-3.0.1" sources."sshpk-1.14.2" @@ -40617,13 +40842,13 @@ in }; dependencies = [ sources."async-2.6.1" - sources."debug-4.0.1" + sources."debug-4.1.0" sources."lodash-4.17.11" sources."lodash.groupby-4.6.0" sources."microee-0.0.6" sources."minilog-3.1.0" sources."ms-2.1.1" - sources."simple-git-1.103.0" + sources."simple-git-1.104.0" sources."tabtab-git+https://github.com/mixu/node-tabtab.git" ]; buildInputs = globalBuildInputs; @@ -40765,7 +40990,7 @@ in sources."split-buffer-1.0.0" sources."ssb-avatar-0.2.0" sources."ssb-client-4.6.0" - sources."ssb-config-2.3.3" + sources."ssb-config-2.3.4" sources."ssb-git-0.5.0" sources."ssb-git-repo-2.8.3" sources."ssb-issues-1.0.0" @@ -40809,10 +41034,10 @@ in git-standup = nodeEnv.buildNodePackage { name = "git-standup"; packageName = "git-standup"; - version = "2.1.9"; + version = "2.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/git-standup/-/git-standup-2.1.9.tgz"; - sha512 = "+XT110zb/S1XzG+amg5gKGWcD6dW58mnstS4GkuiO63aA8qGvpgNB9Cq89qxhFSIQ2smeB/00QGsVLn4CL1V+A=="; + url = "https://registry.npmjs.org/git-standup/-/git-standup-2.2.0.tgz"; + sha512 = "GlQib2CmkcPfPlZhelfZmFKP2AbkeAOZ9SK3Z2M+CwdsrAA62bhI6CTDYWk/bm0C3bxizlX+U86/RNSk4O9efQ=="; }; buildInputs = globalBuildInputs; meta = { @@ -41200,7 +41425,7 @@ in sources."on-finished-2.3.0" sources."once-1.4.0" sources."onetime-2.0.1" - sources."ono-4.0.9" + sources."ono-4.0.10" sources."open-0.0.5" sources."opn-5.4.0" sources."ora-1.4.0" @@ -41306,8 +41531,8 @@ in sources."source-map-0.6.1" ]; }) - sources."spdx-correct-3.0.1" - sources."spdx-exceptions-2.1.0" + sources."spdx-correct-3.0.2" + sources."spdx-exceptions-2.2.0" sources."spdx-expression-parse-3.0.0" sources."spdx-license-ids-3.0.1" sources."sprintf-js-1.0.3" @@ -41763,7 +41988,7 @@ in packageName = "gulp"; version = "3.9.1"; src = fetchurl { - url = "https://registry.npmjs.org/gulp/-/gulp-3.9.1.tgz"; + url = "http://registry.npmjs.org/gulp/-/gulp-3.9.1.tgz"; sha1 = "571ce45928dd40af6514fc4011866016c13845b4"; }; dependencies = [ @@ -42144,6 +42369,345 @@ in production = true; bypassCache = true; }; + gulp-cli = nodeEnv.buildNodePackage { + name = "gulp-cli"; + packageName = "gulp-cli"; + version = "2.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/gulp-cli/-/gulp-cli-2.0.1.tgz"; + sha512 = "RxujJJdN8/O6IW2nPugl7YazhmrIEjmiVfPKrWt68r71UCaLKS71Hp0gpKT+F6qOUFtr7KqtifDKaAJPRVvMYQ=="; + }; + dependencies = [ + sources."ansi-colors-1.1.0" + sources."ansi-gray-0.1.1" + sources."ansi-regex-2.1.1" + sources."ansi-wrap-0.1.0" + sources."archy-1.0.0" + sources."arr-diff-4.0.0" + sources."arr-flatten-1.1.0" + sources."arr-union-3.1.0" + sources."array-each-1.0.1" + sources."array-slice-1.1.0" + sources."array-sort-1.0.0" + sources."array-unique-0.3.2" + sources."assign-symbols-1.0.0" + sources."atob-2.1.2" + (sources."base-0.11.2" // { + dependencies = [ + sources."define-property-1.0.0" + ]; + }) + (sources."braces-2.3.2" // { + dependencies = [ + sources."extend-shallow-2.0.1" + ]; + }) + sources."buffer-from-1.1.1" + sources."builtin-modules-1.1.1" + sources."cache-base-1.0.1" + sources."camelcase-3.0.0" + (sources."class-utils-0.3.6" // { + dependencies = [ + sources."define-property-0.2.5" + sources."is-accessor-descriptor-0.1.6" + sources."is-data-descriptor-0.1.4" + sources."is-descriptor-0.1.6" + sources."kind-of-3.2.2" + ]; + }) + sources."cliui-3.2.0" + sources."code-point-at-1.1.0" + sources."collection-visit-1.0.0" + sources."color-support-1.1.3" + sources."component-emitter-1.2.1" + sources."concat-stream-1.6.2" + sources."copy-descriptor-0.1.1" + sources."copy-props-2.0.4" + sources."core-util-is-1.0.2" + sources."d-1.0.0" + sources."debug-2.6.9" + sources."decamelize-1.2.0" + sources."decode-uri-component-0.2.0" + sources."default-compare-1.0.0" + sources."define-property-2.0.2" + sources."detect-file-1.0.0" + sources."each-props-1.3.2" + sources."error-ex-1.3.2" + sources."es5-ext-0.10.46" + sources."es6-iterator-2.0.3" + sources."es6-symbol-3.1.1" + (sources."expand-brackets-2.1.4" // { + dependencies = [ + sources."define-property-0.2.5" + sources."extend-shallow-2.0.1" + sources."is-accessor-descriptor-0.1.6" + sources."is-data-descriptor-0.1.4" + sources."is-descriptor-0.1.6" + sources."kind-of-3.2.2" + ]; + }) + sources."expand-tilde-2.0.2" + sources."extend-3.0.2" + (sources."extend-shallow-3.0.2" // { + dependencies = [ + sources."is-extendable-1.0.1" + ]; + }) + (sources."extglob-2.0.4" // { + dependencies = [ + sources."define-property-1.0.0" + sources."extend-shallow-2.0.1" + ]; + }) + sources."fancy-log-1.3.2" + (sources."fill-range-4.0.0" // { + dependencies = [ + sources."extend-shallow-2.0.1" + ]; + }) + sources."find-up-1.1.2" + sources."findup-sync-2.0.0" + sources."fined-1.1.0" + sources."flagged-respawn-1.0.0" + sources."for-in-1.0.2" + sources."for-own-1.0.0" + sources."fragment-cache-0.2.1" + sources."get-caller-file-1.0.3" + sources."get-value-2.0.6" + sources."global-modules-1.0.0" + sources."global-prefix-1.0.2" + sources."glogg-1.0.1" + sources."graceful-fs-4.1.11" + sources."gulplog-1.0.0" + sources."has-value-1.0.0" + (sources."has-values-1.0.0" // { + dependencies = [ + sources."kind-of-4.0.0" + ]; + }) + sources."homedir-polyfill-1.0.1" + sources."hosted-git-info-2.7.1" + sources."inherits-2.0.3" + sources."ini-1.3.5" + sources."interpret-1.1.0" + sources."invert-kv-1.0.0" + sources."is-absolute-1.0.0" + (sources."is-accessor-descriptor-1.0.0" // { + dependencies = [ + sources."kind-of-6.0.2" + ]; + }) + sources."is-arrayish-0.2.1" + sources."is-buffer-1.1.6" + sources."is-builtin-module-1.0.0" + (sources."is-data-descriptor-1.0.0" // { + dependencies = [ + sources."kind-of-6.0.2" + ]; + }) + (sources."is-descriptor-1.0.2" // { + dependencies = [ + sources."kind-of-6.0.2" + ]; + }) + sources."is-extendable-0.1.1" + sources."is-extglob-2.1.1" + sources."is-fullwidth-code-point-1.0.0" + sources."is-glob-3.1.0" + (sources."is-number-3.0.0" // { + dependencies = [ + sources."kind-of-3.2.2" + ]; + }) + sources."is-plain-object-2.0.4" + sources."is-relative-1.0.0" + sources."is-unc-path-1.0.0" + sources."is-utf8-0.2.1" + sources."is-windows-1.0.2" + sources."isarray-1.0.0" + sources."isexe-2.0.0" + sources."isobject-3.0.1" + sources."kind-of-5.1.0" + sources."lcid-1.0.0" + sources."liftoff-2.5.0" + sources."load-json-file-1.1.0" + (sources."make-iterator-1.0.1" // { + dependencies = [ + sources."kind-of-6.0.2" + ]; + }) + sources."map-cache-0.2.2" + sources."map-visit-1.0.0" + sources."matchdep-2.0.0" + (sources."micromatch-3.1.10" // { + dependencies = [ + sources."kind-of-6.0.2" + ]; + }) + (sources."mixin-deep-1.3.1" // { + dependencies = [ + sources."is-extendable-1.0.1" + ]; + }) + sources."ms-2.0.0" + sources."mute-stdout-1.0.1" + (sources."nanomatch-1.2.13" // { + dependencies = [ + sources."kind-of-6.0.2" + ]; + }) + sources."next-tick-1.0.0" + sources."normalize-package-data-2.4.0" + sources."number-is-nan-1.0.1" + (sources."object-copy-0.1.0" // { + dependencies = [ + sources."define-property-0.2.5" + sources."is-accessor-descriptor-0.1.6" + sources."is-data-descriptor-0.1.4" + (sources."is-descriptor-0.1.6" // { + dependencies = [ + sources."kind-of-5.1.0" + ]; + }) + sources."kind-of-3.2.2" + ]; + }) + sources."object-visit-1.0.1" + sources."object.defaults-1.1.0" + sources."object.map-1.0.1" + sources."object.pick-1.3.0" + sources."os-locale-1.4.0" + sources."parse-filepath-1.0.2" + sources."parse-json-2.2.0" + sources."parse-passwd-1.0.0" + sources."pascalcase-0.1.1" + sources."path-exists-2.1.0" + sources."path-parse-1.0.6" + sources."path-root-0.1.1" + sources."path-root-regex-0.1.2" + sources."path-type-1.1.0" + sources."pify-2.3.0" + sources."pinkie-2.0.4" + sources."pinkie-promise-2.0.1" + sources."posix-character-classes-0.1.1" + sources."pretty-hrtime-1.0.3" + sources."process-nextick-args-2.0.0" + sources."read-pkg-1.1.0" + sources."read-pkg-up-1.0.1" + sources."readable-stream-2.3.6" + sources."rechoir-0.6.2" + sources."regex-not-1.0.2" + sources."remove-trailing-separator-1.1.0" + sources."repeat-element-1.1.3" + sources."repeat-string-1.6.1" + sources."replace-homedir-1.0.0" + sources."require-directory-2.1.1" + sources."require-main-filename-1.0.1" + sources."resolve-1.8.1" + sources."resolve-dir-1.0.1" + sources."resolve-url-0.2.1" + sources."ret-0.1.15" + sources."safe-buffer-5.1.2" + sources."safe-regex-1.1.0" + sources."semver-5.5.1" + sources."semver-greatest-satisfied-range-1.1.0" + sources."set-blocking-2.0.0" + (sources."set-value-2.0.0" // { + dependencies = [ + sources."extend-shallow-2.0.1" + ]; + }) + (sources."snapdragon-0.8.2" // { + dependencies = [ + sources."define-property-0.2.5" + sources."extend-shallow-2.0.1" + sources."is-accessor-descriptor-0.1.6" + sources."is-data-descriptor-0.1.4" + sources."is-descriptor-0.1.6" + sources."kind-of-3.2.2" + ]; + }) + (sources."snapdragon-node-2.1.1" // { + dependencies = [ + sources."define-property-1.0.0" + ]; + }) + (sources."snapdragon-util-3.0.1" // { + dependencies = [ + sources."kind-of-3.2.2" + ]; + }) + sources."source-map-0.5.7" + sources."source-map-resolve-0.5.2" + sources."source-map-url-0.4.0" + sources."sparkles-1.0.1" + sources."spdx-correct-3.0.2" + sources."spdx-exceptions-2.2.0" + sources."spdx-expression-parse-3.0.0" + sources."spdx-license-ids-3.0.1" + sources."split-string-3.1.0" + sources."stack-trace-0.0.10" + (sources."static-extend-0.1.2" // { + dependencies = [ + sources."define-property-0.2.5" + sources."is-accessor-descriptor-0.1.6" + sources."is-data-descriptor-0.1.4" + sources."is-descriptor-0.1.6" + sources."kind-of-3.2.2" + ]; + }) + sources."string-width-1.0.2" + sources."string_decoder-1.1.1" + sources."strip-ansi-3.0.1" + sources."strip-bom-2.0.0" + sources."sver-compat-1.5.0" + sources."time-stamp-1.1.0" + (sources."to-object-path-0.3.0" // { + dependencies = [ + sources."kind-of-3.2.2" + ]; + }) + sources."to-regex-3.0.2" + sources."to-regex-range-2.1.1" + sources."typedarray-0.0.6" + sources."unc-path-regex-0.1.2" + (sources."union-value-1.0.0" // { + dependencies = [ + sources."extend-shallow-2.0.1" + sources."set-value-0.4.3" + ]; + }) + (sources."unset-value-1.0.0" // { + dependencies = [ + (sources."has-value-0.3.1" // { + dependencies = [ + sources."isobject-2.1.0" + ]; + }) + sources."has-values-0.1.4" + ]; + }) + sources."urix-0.1.0" + sources."use-3.1.1" + sources."util-deprecate-1.0.2" + sources."v8flags-3.1.1" + sources."validate-npm-package-license-3.0.4" + sources."which-1.3.1" + sources."which-module-1.0.0" + sources."wrap-ansi-2.1.0" + sources."y18n-3.2.1" + sources."yargs-7.1.0" + sources."yargs-parser-5.0.0" + ]; + buildInputs = globalBuildInputs; + meta = { + description = "Command line interface for gulp"; + homepage = http://gulpjs.com/; + license = "MIT"; + }; + production = true; + bypassCache = true; + }; hipache = nodeEnv.buildNodePackage { name = "hipache"; packageName = "hipache"; @@ -42389,6 +42953,7 @@ in sources."lodash-4.17.11" sources."lodash.assign-4.2.0" sources."lodash.assignin-4.2.0" + sources."lodash.clone-4.5.0" sources."lodash.clonedeep-4.5.0" sources."lodash.flatten-4.4.0" sources."lodash.get-4.4.2" @@ -42488,11 +43053,11 @@ in sources."shelljs-0.3.0" sources."signal-exit-3.0.2" sources."smart-buffer-1.1.15" - sources."snyk-1.99.1" + sources."snyk-1.102.0" sources."snyk-config-2.2.0" sources."snyk-docker-plugin-1.11.0" sources."snyk-go-plugin-1.5.2" - sources."snyk-gradle-plugin-2.0.1" + sources."snyk-gradle-plugin-2.1.0" sources."snyk-module-1.8.2" sources."snyk-mvn-plugin-2.0.0" (sources."snyk-nodejs-lockfile-parser-1.5.1" // { @@ -42503,9 +43068,9 @@ in sources."snyk-nuget-plugin-1.6.5" sources."snyk-php-plugin-1.5.1" sources."snyk-policy-1.12.0" - sources."snyk-python-plugin-1.8.1" + sources."snyk-python-plugin-1.8.2" sources."snyk-resolve-1.0.1" - sources."snyk-resolve-deps-3.1.0" + sources."snyk-resolve-deps-4.0.1" sources."snyk-sbt-plugin-2.0.0" sources."snyk-tree-1.0.0" sources."snyk-try-require-1.3.1" @@ -42681,17 +43246,16 @@ in ionic = nodeEnv.buildNodePackage { name = "ionic"; packageName = "ionic"; - version = "4.1.2"; + version = "4.2.1"; src = fetchurl { - url = "https://registry.npmjs.org/ionic/-/ionic-4.1.2.tgz"; - sha512 = "iZOKZI7MRcIi2zgmPJ20Gj4SWPBp7FG87yw3akHhFdGR+OnPqsm/6Zy7/b0jRdMjFk6srlhtVmKgHvXYX3EZhw=="; + url = "https://registry.npmjs.org/ionic/-/ionic-4.2.1.tgz"; + sha512 = "4QwbtBxHYTaa/wxlYx+iXdSALs8aoEAw8poR24tTUtJRd0aKoAJM4K815DuNKLUFdgn3v0pTixdTTPLH8CADxw=="; }; dependencies = [ - sources."@ionic/cli-framework-1.0.7" - sources."@ionic/cli-utils-2.2.1" - sources."@ionic/discover-1.0.4" - sources."@ionic/utils-fs-0.0.1" - sources."@ionic/utils-network-0.0.1" + sources."@ionic/cli-framework-1.1.1" + sources."@ionic/discover-1.0.6" + sources."@ionic/utils-fs-0.0.3" + sources."@ionic/utils-network-0.0.3" sources."agent-base-4.2.1" sources."ansi-align-2.0.0" sources."ansi-escapes-3.1.0" @@ -42726,11 +43290,7 @@ in sources."cross-spawn-5.1.0" sources."crypto-random-string-1.0.0" sources."data-uri-to-buffer-1.2.0" - (sources."debug-3.2.5" // { - dependencies = [ - sources."ms-2.1.1" - ]; - }) + sources."debug-4.1.0" sources."deep-extend-0.6.0" sources."deep-is-0.1.3" sources."degenerator-1.0.4" @@ -42769,6 +43329,7 @@ in (sources."get-uri-2.0.2" // { dependencies = [ sources."debug-2.6.9" + sources."ms-2.0.0" ]; }) sources."glob-7.1.3" @@ -42780,16 +43341,25 @@ in (sources."http-proxy-agent-2.1.0" // { dependencies = [ sources."debug-3.1.0" + sources."ms-2.0.0" + ]; + }) + (sources."https-proxy-agent-2.2.1" // { + dependencies = [ + sources."debug-3.2.5" ]; }) - sources."https-proxy-agent-2.2.1" sources."iconv-lite-0.4.24" sources."import-lazy-2.1.0" sources."imurmurhash-0.1.4" sources."inflight-1.0.6" sources."inherits-2.0.3" sources."ini-1.3.5" - sources."inquirer-6.2.0" + (sources."inquirer-6.2.0" // { + dependencies = [ + sources."strip-ansi-4.0.0" + ]; + }) sources."ip-1.1.5" sources."is-ci-1.2.1" sources."is-fullwidth-code-point-2.0.0" @@ -42808,6 +43378,7 @@ in (sources."leek-0.0.24" // { dependencies = [ sources."debug-2.6.9" + sources."ms-2.0.0" ]; }) sources."levn-0.3.0" @@ -42845,7 +43416,7 @@ in sources."minimist-0.0.8" ]; }) - sources."ms-2.0.0" + sources."ms-2.1.1" sources."mute-stream-0.0.7" sources."ncp-2.0.0" sources."netmask-1.0.6" @@ -42857,7 +43428,11 @@ in sources."os-name-2.0.1" sources."os-tmpdir-1.0.2" sources."p-finally-1.0.0" - sources."pac-proxy-agent-2.0.2" + (sources."pac-proxy-agent-3.0.0" // { + dependencies = [ + sources."debug-3.2.5" + ]; + }) sources."pac-resolver-3.0.0" sources."package-json-4.0.1" sources."path-is-absolute-1.0.1" @@ -42867,7 +43442,11 @@ in sources."prelude-ls-1.1.2" sources."prepend-http-1.0.4" sources."process-nextick-args-2.0.0" - sources."proxy-agent-2.3.1" + (sources."proxy-agent-3.0.3" // { + dependencies = [ + sources."debug-3.2.5" + ]; + }) sources."proxy-from-env-1.0.0" sources."pseudomap-1.0.2" sources."qs-6.5.2" @@ -42895,21 +43474,37 @@ in sources."shebang-regex-1.0.0" sources."signal-exit-3.0.2" sources."slice-ansi-1.0.0" - sources."smart-buffer-1.1.15" - sources."socks-1.1.10" - sources."socks-proxy-agent-3.0.1" + sources."smart-buffer-4.0.1" + sources."socks-2.2.1" + sources."socks-proxy-agent-4.0.1" sources."source-map-0.6.1" sources."split2-2.2.0" sources."ssh-config-1.1.3" sources."statuses-1.5.0" sources."stream-combiner2-1.1.1" - sources."string-width-2.1.1" + (sources."string-width-2.1.1" // { + dependencies = [ + sources."strip-ansi-4.0.0" + ]; + }) sources."string_decoder-1.1.1" - sources."strip-ansi-4.0.0" + (sources."strip-ansi-5.0.0" // { + dependencies = [ + sources."ansi-regex-4.0.0" + ]; + }) sources."strip-eof-1.0.0" sources."strip-json-comments-2.0.1" - sources."superagent-3.8.3" - sources."superagent-proxy-1.0.3" + (sources."superagent-3.8.3" // { + dependencies = [ + sources."debug-3.2.5" + ]; + }) + (sources."superagent-proxy-2.0.0" // { + dependencies = [ + sources."debug-3.2.5" + ]; + }) sources."supports-color-5.5.0" (sources."tar-4.4.6" // { dependencies = [ @@ -42937,10 +43532,14 @@ in sources."widest-line-2.0.0" sources."win-release-1.1.1" sources."wordwrap-1.0.0" - sources."wrap-ansi-4.0.0" + (sources."wrap-ansi-4.0.0" // { + dependencies = [ + sources."strip-ansi-4.0.0" + ]; + }) sources."wrappy-1.0.2" sources."write-file-atomic-2.3.0" - sources."ws-6.0.0" + sources."ws-6.1.0" sources."xdg-basedir-3.0.0" sources."xregexp-2.0.0" sources."xtend-4.0.1" @@ -43158,23 +43757,23 @@ in sha512 = "Kkal2i0jcXsgwgn61gnhVJuh0R0J+HqyzREVaeBvZHgMCAQVW02kYwVbY8xzpBfcZmDBYcT5LrPBBQa27C9tRA=="; }; dependencies = [ - (sources."@commitlint/cli-7.1.2" // { + (sources."@commitlint/cli-7.2.0" // { dependencies = [ sources."chalk-2.3.1" ]; }) sources."@commitlint/config-conventional-7.1.2" - sources."@commitlint/ensure-7.1.2" + sources."@commitlint/ensure-7.2.0" sources."@commitlint/execute-rule-7.1.2" - sources."@commitlint/format-7.1.2" - sources."@commitlint/is-ignored-7.1.2" - sources."@commitlint/lint-7.1.2" - sources."@commitlint/load-7.1.2" + sources."@commitlint/format-7.2.0" + sources."@commitlint/is-ignored-7.2.0" + sources."@commitlint/lint-7.2.0" + sources."@commitlint/load-7.2.0" sources."@commitlint/message-7.1.2" sources."@commitlint/parse-7.1.2" sources."@commitlint/read-7.1.2" sources."@commitlint/resolve-extends-7.1.2" - sources."@commitlint/rules-7.1.2" + sources."@commitlint/rules-7.2.0" sources."@commitlint/to-lines-7.1.2" sources."@commitlint/top-level-7.1.2" sources."@marionebl/sander-0.6.1" @@ -43341,8 +43940,8 @@ in sources."semaphore-async-await-1.5.1" sources."semver-5.5.0" sources."signal-exit-3.0.2" - sources."spdx-correct-3.0.1" - sources."spdx-exceptions-2.1.0" + sources."spdx-correct-3.0.2" + sources."spdx-exceptions-2.2.0" sources."spdx-expression-parse-3.0.0" sources."spdx-license-ids-3.0.1" sources."split2-2.2.0" @@ -43357,7 +43956,7 @@ in sources."text-extensions-1.8.0" sources."thenify-3.3.0" sources."thenify-all-1.6.0" - sources."thriftrw-3.11.2" + sources."thriftrw-3.11.3" sources."through-2.3.8" sources."through2-2.0.3" sources."trim-newlines-2.0.0" @@ -43722,10 +44321,10 @@ in json-refs = nodeEnv.buildNodePackage { name = "json-refs"; packageName = "json-refs"; - version = "3.0.10"; + version = "3.0.12"; src = fetchurl { - url = "https://registry.npmjs.org/json-refs/-/json-refs-3.0.10.tgz"; - sha512 = "hTBuXx9RKpyhNhCEh7AUm0Emngxf9f1caw4BzH9CQSPlTqxSJG/X5W0di8AHSeePu+ZqSYjlXLU6u2+Q/6wFmw=="; + url = "https://registry.npmjs.org/json-refs/-/json-refs-3.0.12.tgz"; + sha512 = "6RbO1Y3e0Hty/tEpXtQG6jUx7g1G8e39GIOuPugobPC8BX1gZ0OGZQpBn1FLWGkuWF35GRGADvhwdEIFpwIjyA=="; }; dependencies = [ sources."argparse-1.0.10" @@ -43940,7 +44539,7 @@ in sources."minimist-1.2.0" sources."morgan-1.9.1" sources."ms-2.0.0" - sources."nanoid-1.2.5" + sources."nanoid-1.2.6" sources."negotiator-0.6.1" sources."npm-run-path-2.0.2" sources."number-is-nan-1.0.1" @@ -44278,7 +44877,7 @@ in sources."kind-of-6.0.2" sources."lodash-4.17.11" sources."lodash.debounce-4.0.8" - (sources."log4js-3.0.5" // { + (sources."log4js-3.0.6" // { dependencies = [ sources."debug-3.2.5" sources."ms-2.1.1" @@ -44999,24 +45598,24 @@ in lerna = nodeEnv.buildNodePackage { name = "lerna"; packageName = "lerna"; - version = "3.4.0"; + version = "3.4.1"; src = fetchurl { - url = "https://registry.npmjs.org/lerna/-/lerna-3.4.0.tgz"; - sha512 = "RCLm0gMi8PESEF8PzMxo35foA2NGGC/NKnKiUmJyRrhLybOIUfVPdPStSAWCjW1c+DYCgLZCbxu57/KWt4ZWZA=="; + url = "https://registry.npmjs.org/lerna/-/lerna-3.4.1.tgz"; + sha512 = "00X2mYuwJk/bvxdjJceUxTjUgUg7MIMWllo2zGfDVGPijLadrg8QCtJASZqVE7HDQbBLDxLGPjswk29HF5JS2Q=="; }; dependencies = [ - sources."@lerna/add-3.3.2" + sources."@lerna/add-3.4.1" sources."@lerna/batch-packages-3.1.2" - sources."@lerna/bootstrap-3.3.2" - sources."@lerna/changed-3.3.2" + sources."@lerna/bootstrap-3.4.1" + sources."@lerna/changed-3.4.1" sources."@lerna/check-working-tree-3.3.0" sources."@lerna/child-process-3.3.0" sources."@lerna/clean-3.3.2" sources."@lerna/cli-3.2.0" sources."@lerna/collect-updates-3.3.2" sources."@lerna/command-3.3.0" - sources."@lerna/conventional-commits-3.3.0" - sources."@lerna/create-3.3.1" + sources."@lerna/conventional-commits-3.4.1" + sources."@lerna/create-3.4.1" sources."@lerna/create-symlink-3.3.0" sources."@lerna/describe-ref-3.3.0" sources."@lerna/diff-3.3.0" @@ -45032,7 +45631,7 @@ in sources."@lerna/list-3.3.2" sources."@lerna/listable-3.0.0" sources."@lerna/log-packed-3.0.4" - sources."@lerna/npm-conf-3.0.0" + sources."@lerna/npm-conf-3.4.1" sources."@lerna/npm-dist-tag-3.3.0" sources."@lerna/npm-install-3.3.0" sources."@lerna/npm-publish-3.3.1" @@ -45042,16 +45641,16 @@ in sources."@lerna/package-graph-3.1.2" sources."@lerna/project-3.0.0" sources."@lerna/prompt-3.3.1" - sources."@lerna/publish-3.4.0" + sources."@lerna/publish-3.4.1" sources."@lerna/resolve-symlink-3.3.0" sources."@lerna/rimraf-dir-3.3.0" sources."@lerna/run-3.3.2" - sources."@lerna/run-lifecycle-3.3.1" + sources."@lerna/run-lifecycle-3.4.1" sources."@lerna/run-parallel-batches-3.0.0" sources."@lerna/symlink-binary-3.3.0" sources."@lerna/symlink-dependencies-3.3.0" sources."@lerna/validation-error-3.0.0" - sources."@lerna/version-3.3.2" + sources."@lerna/version-3.4.1" sources."@lerna/write-log-file-3.0.0" sources."@mrmlnc/readdir-enhanced-2.2.1" sources."@nodelib/fs.stat-1.1.2" @@ -45160,8 +45759,8 @@ in sources."concat-stream-1.6.2" sources."config-chain-1.1.12" sources."console-control-strings-1.1.0" - sources."conventional-changelog-angular-1.6.6" - (sources."conventional-changelog-core-2.0.11" // { + sources."conventional-changelog-angular-5.0.1" + (sources."conventional-changelog-core-3.1.0" // { dependencies = [ sources."load-json-file-1.1.0" sources."parse-json-2.2.0" @@ -45171,11 +45770,11 @@ in sources."strip-bom-2.0.0" ]; }) - sources."conventional-changelog-preset-loader-1.1.8" - sources."conventional-changelog-writer-3.0.9" - sources."conventional-commits-filter-1.1.6" - sources."conventional-commits-parser-2.1.7" - sources."conventional-recommended-bump-2.0.9" + sources."conventional-changelog-preset-loader-2.0.1" + sources."conventional-changelog-writer-4.0.0" + sources."conventional-commits-filter-2.0.0" + sources."conventional-commits-parser-3.0.0" + sources."conventional-recommended-bump-4.0.1" sources."copy-concurrently-1.0.5" sources."copy-descriptor-0.1.1" sources."core-util-is-1.0.2" @@ -45250,7 +45849,7 @@ in }) sources."extsprintf-1.3.0" sources."fast-deep-equal-1.1.0" - (sources."fast-glob-2.2.2" // { + (sources."fast-glob-2.2.3" // { dependencies = [ sources."is-glob-4.0.0" ]; @@ -45302,16 +45901,16 @@ in }) sources."get-port-3.2.0" sources."get-stdin-4.0.1" - sources."get-stream-4.0.0" + sources."get-stream-4.1.0" sources."get-value-2.0.6" sources."getpass-0.1.7" - sources."git-raw-commits-1.3.6" + sources."git-raw-commits-2.0.0" (sources."git-remote-origin-url-2.0.0" // { dependencies = [ sources."pify-2.3.0" ]; }) - sources."git-semver-tags-1.3.6" + sources."git-semver-tags-2.0.0" sources."gitconfiglocal-1.0.0" sources."glob-7.1.3" sources."glob-parent-3.1.0" @@ -45485,7 +46084,7 @@ in sources."npm-bundled-1.0.5" sources."npm-lifecycle-2.1.0" sources."npm-package-arg-6.1.0" - sources."npm-packlist-1.1.11" + sources."npm-packlist-1.1.12" sources."npm-pick-manifest-2.1.0" sources."npm-registry-fetch-3.8.0" sources."npm-run-path-2.0.2" @@ -45672,8 +46271,8 @@ in sources."source-map-0.5.7" sources."source-map-resolve-0.5.2" sources."source-map-url-0.4.0" - sources."spdx-correct-3.0.1" - sources."spdx-exceptions-2.1.0" + sources."spdx-correct-3.0.2" + sources."spdx-exceptions-2.2.0" sources."spdx-expression-parse-3.0.0" sources."spdx-license-ids-3.0.1" sources."split-1.0.1" @@ -47524,7 +48123,7 @@ in }) sources."tildify-1.2.0" sources."time-stamp-1.1.0" - sources."timers-ext-0.1.5" + sources."timers-ext-0.1.7" sources."to-absolute-glob-2.0.2" (sources."to-object-path-0.3.0" // { dependencies = [ @@ -47849,8 +48448,8 @@ in sources."signal-exit-3.0.2" sources."slasp-0.0.4" sources."slide-1.1.6" - sources."spdx-correct-3.0.1" - sources."spdx-exceptions-2.1.0" + sources."spdx-correct-3.0.2" + sources."spdx-exceptions-2.2.0" sources."spdx-expression-parse-3.0.0" sources."spdx-license-ids-3.0.1" sources."sshpk-1.14.2" @@ -48239,8 +48838,8 @@ in sources."setprototypeof-1.1.0" sources."signal-exit-3.0.2" sources."sntp-1.0.9" - sources."spdx-correct-3.0.1" - sources."spdx-exceptions-2.1.0" + sources."spdx-correct-3.0.2" + sources."spdx-exceptions-2.2.0" sources."spdx-expression-parse-3.0.0" sources."spdx-license-ids-3.0.1" (sources."sshpk-1.14.2" // { @@ -48362,7 +48961,7 @@ in sources."needle-2.2.4" sources."nopt-4.0.1" sources."npm-bundled-1.0.5" - sources."npm-packlist-1.1.11" + sources."npm-packlist-1.1.12" sources."npmlog-4.1.2" sources."number-is-nan-1.0.1" sources."object-assign-4.1.1" @@ -48523,7 +49122,7 @@ in sources."is-extendable-0.1.1" ]; }) - sources."flatmap-stream-0.1.0" + sources."flatmap-stream-0.1.1" sources."for-in-1.0.2" sources."fragment-cache-0.2.1" sources."from-0.1.7" @@ -49038,7 +49637,7 @@ in sources."node-red-node-email-0.1.29" sources."node-red-node-feedparser-0.1.14" sources."node-red-node-rbe-0.2.3" - sources."node-red-node-twitter-1.1.2" + sources."node-red-node-twitter-1.1.3" sources."nodemailer-1.11.0" sources."nodemailer-direct-transport-1.1.0" (sources."nodemailer-smtp-transport-1.1.0" // { @@ -49219,7 +49818,7 @@ in sources."connect-flash-0.1.0" sources."cookie-0.0.5" sources."cookie-signature-1.0.1" - (sources."debug-4.0.1" // { + (sources."debug-4.1.0" // { dependencies = [ sources."ms-2.1.1" ]; @@ -49275,7 +49874,7 @@ in sources."qs-0.5.1" sources."rai-0.1.12" sources."range-parser-0.0.4" - (sources."raw-socket-1.6.2" // { + (sources."raw-socket-1.6.3" // { dependencies = [ sources."nan-2.10.0" ]; @@ -49527,7 +50126,7 @@ in sources."color-convert-1.9.3" sources."color-name-1.1.3" sources."colors-1.0.3" - sources."commander-2.18.0" + sources."commander-2.19.0" sources."configstore-3.1.2" sources."create-error-class-3.0.2" sources."cross-spawn-5.1.0" @@ -49539,7 +50138,7 @@ in sources."escape-string-regexp-1.0.5" sources."esprima-4.0.1" sources."execa-0.7.0" - sources."fast-diff-1.1.2" + sources."fast-diff-1.2.0" sources."find-up-1.1.2" sources."get-stdin-5.0.1" sources."get-stream-3.0.0" @@ -49749,8 +50348,8 @@ in sources."shebang-command-1.2.0" sources."shebang-regex-1.0.0" sources."signal-exit-3.0.2" - sources."spdx-correct-3.0.1" - sources."spdx-exceptions-2.1.0" + sources."spdx-correct-3.0.2" + sources."spdx-exceptions-2.2.0" sources."spdx-expression-parse-3.0.0" sources."spdx-license-ids-3.0.1" sources."string-width-1.0.2" @@ -50105,8 +50704,8 @@ in sources."setprototypeof-1.1.0" sources."simplediff-0.1.1" sources."source-map-0.6.1" - sources."spdx-correct-3.0.1" - sources."spdx-exceptions-2.1.0" + sources."spdx-correct-3.0.2" + sources."spdx-exceptions-2.2.0" sources."spdx-expression-parse-3.0.0" sources."spdx-license-ids-3.0.1" sources."sprintf-js-1.0.3" @@ -50387,8 +50986,8 @@ in ]; }) sources."single-line-log-1.1.2" - sources."spdx-correct-3.0.1" - sources."spdx-exceptions-2.1.0" + sources."spdx-correct-3.0.2" + sources."spdx-exceptions-2.2.0" sources."spdx-expression-parse-3.0.0" sources."spdx-license-ids-3.0.1" sources."speedometer-0.1.4" @@ -50900,7 +51499,7 @@ in sources."caseless-0.11.0" sources."chalk-1.1.3" sources."combined-stream-1.0.7" - sources."commander-2.18.0" + sources."commander-2.19.0" sources."concat-map-0.0.1" sources."concat-stream-1.5.0" sources."core-util-is-1.0.2" @@ -51282,7 +51881,7 @@ in sources."lodash.memoize-3.0.4" sources."map-cache-0.2.2" sources."map-visit-1.0.0" - sources."md5.js-1.3.4" + sources."md5.js-1.3.5" sources."micromatch-3.1.10" sources."miller-rabin-4.0.1" sources."mime-1.6.0" @@ -51354,7 +51953,7 @@ in sources."posix-character-classes-0.1.1" sources."process-0.11.10" sources."process-nextick-args-1.0.7" - sources."public-encrypt-4.0.2" + sources."public-encrypt-4.0.3" sources."punycode-1.4.1" sources."querystring-0.2.0" sources."querystring-es3-0.2.1" @@ -51577,7 +52176,7 @@ in sources."co-4.6.0" sources."code-point-at-1.1.0" sources."combined-stream-1.0.7" - sources."commander-2.18.0" + sources."commander-2.19.0" sources."console-control-strings-1.1.0" sources."constantinople-3.1.2" sources."content-disposition-0.5.2" @@ -51707,7 +52306,7 @@ in sources."nan-2.5.1" sources."negotiator-0.6.1" sources."net-browserify-alt-1.1.0" - sources."node-abi-2.4.4" + sources."node-abi-2.4.5" sources."node.extend-2.0.0" sources."noop-logger-0.1.1" sources."npmlog-4.1.2" @@ -51859,7 +52458,7 @@ in sources."balanced-match-1.0.0" sources."base62-0.1.1" sources."brace-expansion-1.1.11" - sources."commander-2.18.0" + sources."commander-2.19.0" sources."commoner-0.10.8" sources."concat-map-0.0.1" sources."defined-1.0.0" @@ -51997,7 +52596,7 @@ in sources."crc-0.2.0" sources."crypto-0.0.3" sources."dashdash-1.14.1" - sources."debug-4.0.1" + sources."debug-4.1.0" sources."delayed-stream-1.0.0" sources."ecc-jsbn-0.1.2" sources."events.node-0.4.9" @@ -52100,10 +52699,10 @@ in scuttlebot = nodeEnv.buildNodePackage { name = "scuttlebot"; packageName = "scuttlebot"; - version = "12.2.0"; + version = "12.2.3"; src = fetchurl { - url = "https://registry.npmjs.org/scuttlebot/-/scuttlebot-12.2.0.tgz"; - sha512 = "zSB0mcodvOOXumXDqITpB6mjmqPnW32pN3SreOF/cr4mpBpWSvSmvlmHQqAVH0RnorNVu0djjDXUO8SMjc+cWQ=="; + url = "https://registry.npmjs.org/scuttlebot/-/scuttlebot-12.2.3.tgz"; + sha512 = "Y40HTj8B8DHdGUCbup//Ge/BiVcmp6fVPCGHnn5Jmq0QyQitlnFUaeMlv2fdqealM4xB3xuCTS2KChbiRJOWtw=="; }; dependencies = [ sources."abstract-leveldown-4.0.3" @@ -52197,7 +52796,7 @@ in sources."code-point-at-1.1.0" sources."collapse-white-space-1.0.4" sources."collection-visit-1.0.0" - sources."commander-2.18.0" + sources."commander-2.19.0" sources."compare-at-paths-1.0.0" sources."component-emitter-1.2.1" sources."concat-map-0.0.1" @@ -52290,7 +52889,7 @@ in sources."map-filter-reduce-3.2.1" ]; }) - (sources."flumeview-reduce-1.3.13" // { + (sources."flumeview-reduce-1.3.14" // { dependencies = [ sources."atomic-file-1.1.5" sources."flumecodec-0.0.0" @@ -52498,7 +53097,7 @@ in ]; }) sources."ncp-2.0.0" - sources."node-abi-2.4.4" + sources."node-abi-2.4.5" sources."node-gyp-build-3.4.0" (sources."non-private-ip-1.4.4" // { dependencies = [ @@ -52726,7 +53325,7 @@ in sources."ip-1.1.5" ]; }) - (sources."secure-scuttlebutt-18.3.3" // { + (sources."secure-scuttlebutt-18.4.0" // { dependencies = [ sources."deep-equal-0.2.2" ]; @@ -52792,7 +53391,7 @@ in sources."split-string-3.1.0" sources."ssb-blobs-1.1.5" sources."ssb-client-4.6.0" - sources."ssb-config-2.3.3" + sources."ssb-config-2.3.4" sources."ssb-ebt-5.2.3" (sources."ssb-friends-3.1.3" // { dependencies = [ @@ -53073,7 +53672,7 @@ in sources."cheerio-0.17.0" sources."co-4.6.0" sources."combined-stream-1.0.7" - sources."commander-2.18.0" + sources."commander-2.19.0" sources."component-bind-1.0.0" sources."component-emitter-1.1.2" sources."component-inherit-0.0.3" @@ -53121,7 +53720,7 @@ in sources."fast-deep-equal-1.1.0" sources."fast-json-stable-stringify-2.0.0" sources."finalhandler-1.1.1" - sources."flatmap-stream-0.1.0" + sources."flatmap-stream-0.1.1" sources."forever-agent-0.6.1" (sources."form-data-2.3.2" // { dependencies = [ @@ -53318,7 +53917,7 @@ in sources."color-convert-1.9.3" sources."color-name-1.1.3" sources."combined-stream-1.0.7" - sources."commander-2.18.0" + sources."commander-2.19.0" sources."compressible-2.0.15" (sources."compression-1.7.3" // { dependencies = [ @@ -53926,10 +54525,10 @@ in snyk = nodeEnv.buildNodePackage { name = "snyk"; packageName = "snyk"; - version = "1.99.1"; + version = "1.102.0"; src = fetchurl { - url = "https://registry.npmjs.org/snyk/-/snyk-1.99.1.tgz"; - sha512 = "vN2jUGwHPHAbqqOeZQsBrnWgTvuCnbxsP8i9BIaqZxINeKbuBOS1t5Kg9KMMCRJyqqCB/y76PQSdoqavh4yxkg=="; + url = "https://registry.npmjs.org/snyk/-/snyk-1.102.0.tgz"; + sha512 = "OZfjEJeMdrYj7KVXaNhLwVi1vv5omRyrLv469BD6Bc6mvOK4/JVEcJGoNgn3MyWazgpOy8/4Xi9mMQvrdwfRfQ=="; }; dependencies = [ sources."@yarnpkg/lockfile-1.1.0" @@ -54055,6 +54654,7 @@ in sources."lodash-4.17.11" sources."lodash.assign-4.2.0" sources."lodash.assignin-4.2.0" + sources."lodash.clone-4.5.0" sources."lodash.clonedeep-4.5.0" sources."lodash.flatten-4.4.0" sources."lodash.get-4.4.2" @@ -54130,7 +54730,7 @@ in sources."snyk-config-2.2.0" sources."snyk-docker-plugin-1.11.0" sources."snyk-go-plugin-1.5.2" - sources."snyk-gradle-plugin-2.0.1" + sources."snyk-gradle-plugin-2.1.0" sources."snyk-module-1.8.2" sources."snyk-mvn-plugin-2.0.0" (sources."snyk-nodejs-lockfile-parser-1.5.1" // { @@ -54141,9 +54741,9 @@ in sources."snyk-nuget-plugin-1.6.5" sources."snyk-php-plugin-1.5.1" sources."snyk-policy-1.12.0" - sources."snyk-python-plugin-1.8.1" + sources."snyk-python-plugin-1.8.2" sources."snyk-resolve-1.0.1" - sources."snyk-resolve-deps-3.1.0" + sources."snyk-resolve-deps-4.0.1" sources."snyk-sbt-plugin-2.0.0" sources."snyk-tree-1.0.0" sources."snyk-try-require-1.3.1" @@ -54367,7 +54967,7 @@ in sources."brace-expansion-1.1.11" sources."concat-map-0.0.1" sources."css-parse-1.7.0" - sources."debug-4.0.1" + sources."debug-4.1.0" sources."fs.realpath-1.0.0" sources."glob-7.0.6" sources."inflight-1.0.6" @@ -54558,7 +55158,7 @@ in sources."color-convert-1.9.3" sources."color-name-1.1.3" sources."combined-stream-1.0.6" - sources."commander-2.18.0" + sources."commander-2.19.0" sources."component-emitter-1.2.1" sources."concat-map-0.0.1" sources."concat-stream-1.6.2" @@ -54641,7 +55241,7 @@ in ]; }) sources."finalhandler-1.1.0" - sources."flatmap-stream-0.1.0" + sources."flatmap-stream-0.1.1" sources."for-in-1.0.2" sources."form-data-2.3.2" sources."formidable-1.2.1" @@ -55294,10 +55894,10 @@ in triton = nodeEnv.buildNodePackage { name = "triton"; packageName = "triton"; - version = "6.1.2"; + version = "6.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/triton/-/triton-6.1.2.tgz"; - sha1 = "1f4376383ea07de8bffbfd00b445719d57a5f474"; + url = "https://registry.npmjs.org/triton/-/triton-6.2.0.tgz"; + sha512 = "wERRcxLL1DnjCl5N/t68zu1/cPpqLs70clFI2ke1fLfwjuGF+PdZhO8dZwZZROJqOwlOozCqf3qMWiMAfztWzQ=="; }; dependencies = [ sources."asn1-0.2.4" @@ -56097,8 +56697,8 @@ in sources."isarray-2.0.1" ]; }) - sources."spdx-correct-3.0.1" - sources."spdx-exceptions-2.1.0" + sources."spdx-correct-3.0.2" + sources."spdx-exceptions-2.2.0" sources."spdx-expression-parse-3.0.0" sources."spdx-license-ids-3.0.1" sources."sshpk-1.14.2" @@ -56245,7 +56845,7 @@ in sources."color-convert-1.9.3" sources."color-name-1.1.3" sources."combined-stream-1.0.7" - sources."commander-2.18.0" + sources."commander-2.19.0" sources."concat-map-0.0.1" sources."config-chain-1.1.12" sources."consolidate-0.14.5" @@ -56506,7 +57106,7 @@ in sources."@types/express-serve-static-core-4.16.0" sources."@types/long-4.0.0" sources."@types/mime-2.0.0" - sources."@types/node-10.11.3" + sources."@types/node-10.11.4" sources."@types/range-parser-1.2.2" sources."@types/serve-static-1.13.2" sources."@types/ws-5.1.2" @@ -56528,7 +57128,7 @@ in sources."anymatch-2.0.0" sources."apollo-cache-1.1.17" sources."apollo-cache-control-0.2.5" - sources."apollo-cache-inmemory-1.3.0" + sources."apollo-cache-inmemory-1.3.5" sources."apollo-client-2.4.2" sources."apollo-datasource-0.1.3" sources."apollo-engine-reporting-0.0.6" @@ -56657,7 +57257,7 @@ in sources."color-convert-1.9.3" sources."color-name-1.1.3" sources."combined-stream-1.0.7" - sources."commander-2.18.0" + sources."commander-2.19.0" sources."component-emitter-1.2.1" sources."concat-map-0.0.1" sources."config-chain-1.1.12" @@ -56700,7 +57300,7 @@ in ]; }) sources."deep-extend-0.6.0" - sources."deepmerge-2.1.1" + sources."deepmerge-2.2.1" sources."defaults-1.0.3" sources."define-properties-1.1.3" sources."define-property-2.0.2" @@ -56794,7 +57394,7 @@ in sources."extract-files-3.1.0" sources."extsprintf-1.3.0" sources."fast-deep-equal-1.1.0" - sources."fast-glob-2.2.2" + sources."fast-glob-2.2.3" sources."fast-json-stable-stringify-2.0.0" sources."fclone-1.0.11" sources."fd-slicer-1.1.0" @@ -56809,7 +57409,7 @@ in sources."statuses-1.4.0" ]; }) - sources."flatmap-stream-0.1.0" + sources."flatmap-stream-0.1.1" sources."for-in-1.0.2" sources."forever-agent-0.6.1" (sources."form-data-2.3.2" // { @@ -56855,7 +57455,7 @@ in sources."graphql-anywhere-4.1.19" sources."graphql-extensions-0.2.1" sources."graphql-subscriptions-1.0.0" - sources."graphql-tag-2.9.2" + sources."graphql-tag-2.10.0" sources."graphql-tools-3.1.1" sources."graphql-type-json-0.2.1" sources."growly-1.3.0" @@ -56992,7 +57592,7 @@ in sources."ms-2.0.0" sources."mute-stream-0.0.7" sources."nan-2.11.1" - sources."nanoid-1.2.5" + sources."nanoid-1.2.6" (sources."nanomatch-1.2.13" // { dependencies = [ sources."extend-shallow-3.0.2" @@ -57359,7 +57959,7 @@ in sources."caseless-0.11.0" sources."chalk-1.1.3" sources."combined-stream-1.0.7" - sources."commander-2.18.0" + sources."commander-2.19.0" sources."concat-map-0.0.1" sources."concat-stream-1.5.0" (sources."config-chain-1.1.12" // { @@ -57730,7 +58330,7 @@ in sources."make-dir-1.3.0" sources."map-cache-0.2.2" sources."map-visit-1.0.0" - sources."md5.js-1.3.4" + sources."md5.js-1.3.5" sources."memory-fs-0.4.1" sources."micromatch-3.1.10" sources."miller-rabin-4.0.1" @@ -57793,7 +58393,7 @@ in sources."promise-inflight-1.0.1" sources."prr-1.0.1" sources."pseudomap-1.0.2" - sources."public-encrypt-4.0.2" + sources."public-encrypt-4.0.3" sources."pump-2.0.1" sources."pumpify-1.5.1" sources."punycode-2.1.1" @@ -58165,7 +58765,7 @@ in sources."randombytes-2.0.6" sources."range-parser-1.2.0" sources."range-slice-stream-2.0.0" - sources."readable-stream-3.0.3" + sources."readable-stream-3.0.6" sources."record-cache-1.1.0" (sources."render-media-3.1.3" // { dependencies = [ @@ -58244,7 +58844,7 @@ in }) sources."winreg-1.2.4" sources."wrappy-1.0.2" - sources."ws-6.0.0" + sources."ws-6.1.0" sources."xml2js-0.4.19" sources."xmlbuilder-9.0.7" sources."xmldom-0.1.27" @@ -58270,7 +58870,7 @@ in dependencies = [ sources."@cliqz-oss/firefox-client-0.3.1" sources."@cliqz-oss/node-firefox-connect-1.2.1" - sources."@types/node-10.11.3" + sources."@types/node-10.11.4" sources."@yarnpkg/lockfile-1.1.0" sources."JSONSelect-0.2.1" sources."abbrev-1.1.1" @@ -58447,7 +59047,7 @@ in sources."colors-0.5.1" sources."columnify-1.5.4" sources."combined-stream-1.0.7" - sources."commander-2.18.0" + sources."commander-2.19.0" sources."common-tags-1.8.0" sources."component-emitter-1.2.1" sources."compress-commons-1.2.2" @@ -58543,7 +59143,7 @@ in dependencies = [ sources."ansi-regex-3.0.0" sources."debug-3.2.5" - sources."globals-11.7.0" + sources."globals-11.8.0" sources."ms-2.1.1" sources."strip-ansi-4.0.0" ]; @@ -58630,7 +59230,7 @@ in sources."fast-json-patch-2.0.7" sources."fast-json-stable-stringify-2.0.0" sources."fast-levenshtein-2.0.6" - sources."fast-redact-1.2.0" + sources."fast-redact-1.3.0" sources."fast-safe-stringify-2.0.6" sources."fd-slicer-1.1.0" sources."figures-2.0.0" @@ -58878,6 +59478,7 @@ in sources."lodash-4.17.11" sources."lodash.assign-4.2.0" sources."lodash.assignin-4.2.0" + sources."lodash.clone-4.5.0" sources."lodash.clonedeep-4.5.0" sources."lodash.debounce-4.0.8" sources."lodash.flatten-4.4.0" @@ -59197,7 +59798,7 @@ in ]; }) sources."snapdragon-util-3.0.1" - (sources."snyk-1.99.1" // { + (sources."snyk-1.102.0" // { dependencies = [ sources."ansi-regex-3.0.0" sources."ansi-styles-3.2.1" @@ -59225,7 +59826,7 @@ in ]; }) sources."snyk-go-plugin-1.5.2" - sources."snyk-gradle-plugin-2.0.1" + sources."snyk-gradle-plugin-2.1.0" (sources."snyk-module-1.8.2" // { dependencies = [ sources."debug-3.2.5" @@ -59258,17 +59859,18 @@ in sources."ms-2.1.1" ]; }) - sources."snyk-python-plugin-1.8.1" + sources."snyk-python-plugin-1.8.2" (sources."snyk-resolve-1.0.1" // { dependencies = [ sources."debug-3.2.5" sources."ms-2.1.1" ]; }) - (sources."snyk-resolve-deps-3.1.0" // { + (sources."snyk-resolve-deps-4.0.1" // { dependencies = [ sources."debug-3.2.5" sources."ms-2.1.1" + sources."semver-5.5.1" ]; }) sources."snyk-sbt-plugin-2.0.0" @@ -59291,8 +59893,8 @@ in }) sources."source-map-url-0.4.0" sources."spawn-sync-1.0.15" - sources."spdx-correct-3.0.1" - sources."spdx-exceptions-2.1.0" + sources."spdx-correct-3.0.2" + sources."spdx-exceptions-2.2.0" sources."spdx-expression-parse-3.0.0" sources."spdx-license-ids-3.0.1" sources."split-0.3.3" @@ -59700,7 +60302,7 @@ in }) sources."extsprintf-1.3.0" sources."fast-deep-equal-1.1.0" - sources."fast-glob-2.2.2" + sources."fast-glob-2.2.3" sources."fast-json-stable-stringify-2.0.0" sources."figures-2.0.0" (sources."fill-range-4.0.0" // { @@ -60068,8 +60670,8 @@ in sources."source-map-resolve-0.5.2" sources."source-map-url-0.4.0" sources."spawn-sync-1.0.15" - sources."spdx-correct-3.0.1" - sources."spdx-exceptions-2.1.0" + sources."spdx-correct-3.0.2" + sources."spdx-exceptions-2.2.0" sources."spdx-expression-parse-3.0.0" sources."spdx-license-ids-3.0.1" sources."split-string-3.1.0" diff --git a/pkgs/development/ocaml-modules/cohttp/lwt.nix b/pkgs/development/ocaml-modules/cohttp/lwt.nix index 1630bfd131e4..741df5b06145 100644 --- a/pkgs/development/ocaml-modules/cohttp/lwt.nix +++ b/pkgs/development/ocaml-modules/cohttp/lwt.nix @@ -1,4 +1,4 @@ -{ stdenv, ocaml, findlib, dune, cohttp, lwt3, uri, ppx_sexp_conv }: +{ stdenv, ocaml, findlib, dune, cohttp, ocaml_lwt, uri, ppx_sexp_conv }: if !stdenv.lib.versionAtLeast cohttp.version "0.99" then cohttp @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { buildInputs = [ ocaml findlib dune uri ppx_sexp_conv ]; - propagatedBuildInputs = [ cohttp lwt3 ]; + propagatedBuildInputs = [ cohttp ocaml_lwt ]; buildPhase = "dune build -p cohttp-lwt"; } diff --git a/pkgs/development/ocaml-modules/conduit/lwt.nix b/pkgs/development/ocaml-modules/conduit/lwt.nix index 5b085239cfd0..69d7132a83a4 100644 --- a/pkgs/development/ocaml-modules/conduit/lwt.nix +++ b/pkgs/development/ocaml-modules/conduit/lwt.nix @@ -1,4 +1,4 @@ -{ stdenv, ocaml, findlib, dune, ppx_sexp_conv, conduit, lwt3 }: +{ stdenv, ocaml, findlib, dune, ppx_sexp_conv, conduit, ocaml_lwt }: if !stdenv.lib.versionAtLeast conduit.version "1.0" then conduit @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { buildInputs = [ ocaml findlib dune ppx_sexp_conv ]; - propagatedBuildInputs = [ conduit lwt3 ]; + propagatedBuildInputs = [ conduit ocaml_lwt ]; buildPhase = "dune build -p conduit-lwt"; } diff --git a/pkgs/development/ocaml-modules/lwt/default.nix b/pkgs/development/ocaml-modules/lwt/3.x.nix index c8371feb9052..c8371feb9052 100644 --- a/pkgs/development/ocaml-modules/lwt/default.nix +++ b/pkgs/development/ocaml-modules/lwt/3.x.nix diff --git a/pkgs/development/ocaml-modules/lwt/4.x.nix b/pkgs/development/ocaml-modules/lwt/4.x.nix new file mode 100644 index 000000000000..f43a65065b92 --- /dev/null +++ b/pkgs/development/ocaml-modules/lwt/4.x.nix @@ -0,0 +1,35 @@ +{ stdenv, fetchzip, pkgconfig, ncurses, libev, dune +, ocaml, findlib, cppo +, ocaml-migrate-parsetree, ppx_tools_versioned, result +}: + +let inherit (stdenv.lib) optional versionAtLeast; in + +stdenv.mkDerivation rec { + version = "4.1.0"; + name = "ocaml${ocaml.version}-lwt-${version}"; + + src = fetchzip { + url = "https://github.com/ocsigen/lwt/archive/${version}.tar.gz"; + sha256 = "16wnc61kfj54z4q8sn9f5iik37pswz328hcz3z6rkza3kh3s6wmm"; + }; + + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ ocaml findlib dune cppo + ocaml-migrate-parsetree ppx_tools_versioned + ] ++ optional (!versionAtLeast ocaml.version "4.07") ncurses; + propagatedBuildInputs = [ libev result ]; + + configurePhase = "ocaml src/util/configure.ml -use-libev true"; + buildPhase = "jbuilder build -p lwt"; + inherit (dune) installPhase; + + meta = { + homepage = "https://ocsigen.org/lwt/"; + description = "A cooperative threads library for OCaml"; + maintainers = [ stdenv.lib.maintainers.vbgl ]; + license = stdenv.lib.licenses.lgpl21; + inherit (ocaml.meta) platforms; + }; +} + diff --git a/pkgs/development/ocaml-modules/lwt_log/default.nix b/pkgs/development/ocaml-modules/lwt_log/default.nix index 42ff2f26b7d3..a3d34b190b86 100644 --- a/pkgs/development/ocaml-modules/lwt_log/default.nix +++ b/pkgs/development/ocaml-modules/lwt_log/default.nix @@ -1,10 +1,19 @@ -{ stdenv, ocaml, findlib, dune, lwt }: +{ stdenv, fetchFromGitHub, ocaml, findlib, dune, lwt }: + +if !stdenv.lib.versionAtLeast ocaml.version "4.02" +then throw "lwt_log is not available for OCaml ${ocaml.version}" +else stdenv.mkDerivation rec { - version = "1.0.0"; + version = "1.1.0"; name = "ocaml${ocaml.version}-lwt_log-${version}"; - inherit (lwt) src; + src = fetchFromGitHub { + owner = "aantron"; + repo = "lwt_log"; + rev = version; + sha256 = "1c58gkqfvyf2j11jwj2nh4iq999wj9xpnmr80hz9d0nk9fv333pi"; + }; buildInputs = [ ocaml findlib dune ]; diff --git a/pkgs/development/ocaml-modules/lwt_ssl/default.nix b/pkgs/development/ocaml-modules/lwt_ssl/default.nix index 8fbec7cd4dff..a06e72529864 100644 --- a/pkgs/development/ocaml-modules/lwt_ssl/default.nix +++ b/pkgs/development/ocaml-modules/lwt_ssl/default.nix @@ -1,5 +1,9 @@ { stdenv, fetchzip, ocaml, findlib, dune, ssl, lwt }: +if !stdenv.lib.versionAtLeast ocaml.version "4.02" +then throw "lwt_ssl is not available for OCaml ${ocaml.version}" +else + stdenv.mkDerivation rec { version = "1.1.2"; name = "ocaml${ocaml.version}-lwt_ssl-${version}"; diff --git a/pkgs/development/ocaml-modules/ojquery/default.nix b/pkgs/development/ocaml-modules/ojquery/default.nix index 8cf5819c9002..6b0eefe195f1 100644 --- a/pkgs/development/ocaml-modules/ojquery/default.nix +++ b/pkgs/development/ocaml-modules/ojquery/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchgit, ocaml, findlib, ocamlbuild, js_of_ocaml, js_of_ocaml-camlp4, camlp4, lwt3, react }: +{ stdenv, fetchgit, ocaml, findlib, ocamlbuild, js_of_ocaml, js_of_ocaml-camlp4, camlp4, ocaml_lwt, react }: if stdenv.lib.versionAtLeast ocaml.version "4.06" then throw "ojquery is not available for OCaml ${ocaml.version}" @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { }; buildInputs = [ ocaml findlib ocamlbuild js_of_ocaml-camlp4 camlp4 ]; - propagatedBuildInputs = [ js_of_ocaml lwt3 react ]; + propagatedBuildInputs = [ js_of_ocaml ocaml_lwt react ]; createFindlibDestdir = true; diff --git a/pkgs/development/python-modules/osmnx/default.nix b/pkgs/development/python-modules/osmnx/default.nix new file mode 100755 index 000000000000..c34b75bd0415 --- /dev/null +++ b/pkgs/development/python-modules/osmnx/default.nix @@ -0,0 +1,33 @@ +{ stdenv, buildPythonPackage, fetchFromGitHub, geopandas, descartes, matplotlib, networkx, numpy +, pandas, requests, Rtree, shapely, pytest, coverage, coveralls, folium, scikitlearn, scipy}: + +buildPythonPackage rec { + pname = "osmnx"; + version = "0.8.1"; + + src = fetchFromGitHub { + owner = "gboeing"; + repo = pname; + rev = "v${version}"; + sha256 = "1pn2v3dhbmb0yhqif9padg7x3sdx27pgfr95i3kxj4v0yrviaf9k"; + }; + + propagatedBuildInputs = [ geopandas descartes matplotlib networkx numpy pandas requests Rtree shapely folium scikitlearn scipy ]; + + checkInputs = [ coverage pytest coveralls ]; + #Fails when using sandboxing as it requires internet connection, works fine without it + doCheck = false; + + #Check phase for the record + #checkPhase = '' + # coverage run --source osmnx -m pytest --verbose + #''; + + meta = with stdenv.lib; { + description = "A package to easily download, construct, project, visualize, and analyze complex street networks from OpenStreetMap with NetworkX."; + homepage = https://github.com/gboeing/osmnx; + license = licenses.mit; + maintainers = with maintainers; [ psyanticy ]; + }; +} + diff --git a/pkgs/development/r-modules/default.nix b/pkgs/development/r-modules/default.nix index 0fbd2ae6fa70..c9766a985f6f 100644 --- a/pkgs/development/r-modules/default.nix +++ b/pkgs/development/r-modules/default.nix @@ -367,6 +367,7 @@ let tkrplot = [ pkgs.xorg.libX11 pkgs.tk.dev ]; topicmodels = [ pkgs.gsl_1 ]; udunits2 = [ pkgs.udunits pkgs.expat ]; + units = [ pkgs.udunits ]; V8 = [ pkgs.v8_3_14 ]; VBLPCM = [ pkgs.gsl_1 ]; WhopGenome = [ pkgs.zlib.dev ]; diff --git a/pkgs/development/tools/ansible-lint/default.nix b/pkgs/development/tools/ansible-lint/default.nix index 16d2782b7340..c460662f4f88 100644 --- a/pkgs/development/tools/ansible-lint/default.nix +++ b/pkgs/development/tools/ansible-lint/default.nix @@ -2,13 +2,13 @@ pythonPackages.buildPythonPackage rec { pname = "ansible-lint"; - version = "3.4.20"; + version = "3.4.23"; src = fetchFromGitHub { owner = "willthames"; repo = "ansible-lint"; rev = "v${version}"; - sha256 = "0wgczijrg5azn2f63hjbkas1w0f5hbvxnk3ia53w69mybk0gy044"; + sha256 = "0cnfgxh5m7alzm811hc95jigbca5vc1pf8fjazmsakmhdjyfbpb7"; }; propagatedBuildInputs = with pythonPackages; [ pyyaml six ] ++ [ ansible ]; diff --git a/pkgs/development/tools/build-managers/buildbot/worker.nix b/pkgs/development/tools/build-managers/buildbot/worker.nix index cffcb594a0d2..4fabad9d3701 100644 --- a/pkgs/development/tools/build-managers/buildbot/worker.nix +++ b/pkgs/development/tools/build-managers/buildbot/worker.nix @@ -3,11 +3,11 @@ pythonPackages.buildPythonApplication (rec { name = "${pname}-${version}"; pname = "buildbot-worker"; - version = "1.3.0"; + version = "1.4.0"; src = pythonPackages.fetchPypi { inherit pname version; - sha256 = "1l9iqyqn9yln6ln6dhfkngzx92a61v1cf5ahqj4ax663i02yq7fh"; + sha256 = "12zvf4c39b6s4g1f2w407q8kkw602m88rc1ggi4w9pkw3bwbxrgy"; }; buildInputs = with pythonPackages; [ setuptoolsTrial mock ]; diff --git a/pkgs/development/tools/build-managers/sbt/default.nix b/pkgs/development/tools/build-managers/sbt/default.nix index bbbbbf462ec8..60f342db12aa 100644 --- a/pkgs/development/tools/build-managers/sbt/default.nix +++ b/pkgs/development/tools/build-managers/sbt/default.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation rec { name = "sbt-${version}"; - version = "1.2.3"; + version = "1.2.4"; src = fetchurl { urls = [ @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { "https://github.com/sbt/sbt/releases/download/v${version}/sbt-${version}.tgz" "https://cocl.us/sbt-${version}.tgz" ]; - sha256 = "1szyp9hgrvr3r5rhr98cn5mkhca1mr0qfs6cd8fiihm6hzjzn0nm"; + sha256 = "06zv1mm4rhl0h6qa7m4w5lbwjcyqp43r183q36q9zlyip965mnrn"; }; patchPhase = '' diff --git a/pkgs/development/tools/database/dbmate/default.nix b/pkgs/development/tools/database/dbmate/default.nix new file mode 100644 index 000000000000..14fcc3f8607c --- /dev/null +++ b/pkgs/development/tools/database/dbmate/default.nix @@ -0,0 +1,25 @@ +{ stdenv, lib, buildGoPackage, fetchFromGitHub }: + +buildGoPackage rec { + name = "dbmate-${version}"; + version = "1.4.1"; + + goPackagePath = "github.com/amacneil/dbmate"; + + src = fetchFromGitHub { + owner = "amacneil"; + repo = "dbmate"; + rev = "v${version}"; + sha256 = "0s3l51kmpsaikixq1yxryrgglzk4kfrjagcpf1i2bkq4wc5gyv5d"; + }; + + goDeps = ./deps.nix; + + meta = with stdenv.lib; { + description = "Database migration tool"; + homepage = https://dbmate.readthedocs.io; + license = licenses.mit; + maintainers = [ maintainers.manveru ]; + platforms = platforms.unix; + }; +} diff --git a/pkgs/development/tools/database/dbmate/deps.nix b/pkgs/development/tools/database/dbmate/deps.nix new file mode 100644 index 000000000000..97bfc10b20af --- /dev/null +++ b/pkgs/development/tools/database/dbmate/deps.nix @@ -0,0 +1,84 @@ +# file generated from Gopkg.lock using dep2nix (https://github.com/nixcloud/dep2nix) +[ + { + goPackagePath = "github.com/davecgh/go-spew"; + fetch = { + type = "git"; + url = "https://github.com/davecgh/go-spew"; + rev = "346938d642f2ec3594ed81d874461961cd0faa76"; + sha256 = "0d4jfmak5p6lb7n2r6yvf5p1zcw0l8j74kn55ghvr7zr7b7axm6c"; + }; + } + { + goPackagePath = "github.com/go-sql-driver/mysql"; + fetch = { + type = "git"; + url = "https://github.com/go-sql-driver/mysql"; + rev = "2cc627ac8defc45d65066ae98f898166f580f9a4"; + sha256 = "0n589y9ak2m6glaqmqlggrfv2hghy5i2906r123svf92ci4r9sww"; + }; + } + { + goPackagePath = "github.com/joho/godotenv"; + fetch = { + type = "git"; + url = "https://github.com/joho/godotenv"; + rev = "a79fa1e548e2c689c241d10173efd51e5d689d5b"; + sha256 = "09610yqswxa02905mp9cqgsm50r76saagzddc55sqav4ad04j6qm"; + }; + } + { + goPackagePath = "github.com/lib/pq"; + fetch = { + type = "git"; + url = "https://github.com/lib/pq"; + rev = "19c8e9ad00952ce0c64489b60e8df88bb16dd514"; + sha256 = "0lm79ja5id7phf1jwf1vs987azaxis0q7qr69px0r6gqiva0q0vz"; + }; + } + { + goPackagePath = "github.com/mattn/go-sqlite3"; + fetch = { + type = "git"; + url = "https://github.com/mattn/go-sqlite3"; + rev = "6c771bb9887719704b210e87e934f08be014bdb1"; + sha256 = "0x6s7hy3ab3qw6dfl81y7ighjva5j4rrzvqhppf1qwz5alpfmpdm"; + }; + } + { + goPackagePath = "github.com/pmezard/go-difflib"; + fetch = { + type = "git"; + url = "https://github.com/pmezard/go-difflib"; + rev = "792786c7400a136282c1664665ae0a8db921c6c2"; + sha256 = "0c1cn55m4rypmscgf0rrb88pn58j3ysvc2d0432dp3c6fqg6cnzw"; + }; + } + { + goPackagePath = "github.com/stretchr/testify"; + fetch = { + type = "git"; + url = "https://github.com/stretchr/testify"; + rev = "b91bfb9ebec76498946beb6af7c0230c7cc7ba6c"; + sha256 = "178xyfgsbs40jq406aqj0r67ik1b81gdc28z45nbcw6hfhz82rvl"; + }; + } + { + goPackagePath = "github.com/urfave/cli"; + fetch = { + type = "git"; + url = "https://github.com/urfave/cli"; + rev = "cfb38830724cc34fedffe9a2a29fb54fa9169cd1"; + sha256 = "0y6f4sbzkiiwrxbl15biivj8c7qwxnvm3zl2dd3mw4wzg4x10ygj"; + }; + } + { + goPackagePath = "google.golang.org/appengine"; + fetch = { + type = "git"; + url = "https://github.com/golang/appengine"; + rev = "150dc57a1b433e64154302bdc40b6bb8aefa313a"; + sha256 = "0w3knznv39k8bm85ri62f83czcrxknql7dv6p9hk1a5jx3xljgxq"; + }; + } +] diff --git a/pkgs/development/tools/misc/lsof/default.nix b/pkgs/development/tools/misc/lsof/default.nix index 0a5a3c487810..63003f338eb9 100644 --- a/pkgs/development/tools/misc/lsof/default.nix +++ b/pkgs/development/tools/misc/lsof/default.nix @@ -28,7 +28,7 @@ stdenv.mkDerivation rec { unpackPhase = "tar xvjf $src; cd lsof_*; tar xvf lsof_*.tar; sourceRoot=$( echo lsof_*/); "; - patches = stdenv.lib.optional stdenv.isDarwin ./darwin-dfile.patch; + patches = [ ./no-build-info.patch ] ++ stdenv.lib.optional stdenv.isDarwin ./darwin-dfile.patch; postPatch = stdenv.lib.optionalString stdenv.hostPlatform.isMusl '' substituteInPlace dialects/linux/dlsof.h --replace "defined(__UCLIBC__)" 1 diff --git a/pkgs/development/tools/misc/lsof/no-build-info.patch b/pkgs/development/tools/misc/lsof/no-build-info.patch new file mode 100644 index 000000000000..cf785e248f2a --- /dev/null +++ b/pkgs/development/tools/misc/lsof/no-build-info.patch @@ -0,0 +1,43 @@ +diff -ru -x '*~' lsof_4.91_src-orig/usage.c lsof_4.91_src/usage.c +--- lsof_4.91_src-orig/usage.c 2018-02-14 15:20:32.000000000 +0100 ++++ lsof_4.91_src/usage.c 2018-10-08 21:57:45.718560869 +0200 +@@ -930,26 +930,6 @@ + (void) fprintf(stderr, " configuration info: %s\n", cp); + #endif /* defined(LSOF_CINFO) */ + +- if ((cp = isnullstr(LSOF_CCDATE))) +- (void) fprintf(stderr, " constructed: %s\n", cp); +- cp = isnullstr(LSOF_HOST); +- if (!(cp1 = isnullstr(LSOF_LOGNAME))) +- cp1 = isnullstr(LSOF_USER); +- if (cp || cp1) { +- if (cp && cp1) +- cp2 = "by and on"; +- else if (cp) +- cp2 = "on"; +- else +- cp2 = "by"; +- (void) fprintf(stderr, " constructed %s: %s%s%s\n", +- cp2, +- cp1 ? cp1 : "", +- (cp && cp1) ? "@" : "", +- cp ? cp : "" +- ); +- } +- + #if defined(LSOF_BLDCMT) + if ((cp = isnullstr(LSOF_BLDCMT))) + (void) fprintf(stderr, " builder's comment: %s\n", cp); +@@ -959,12 +939,8 @@ + (void) fprintf(stderr, " compiler: %s\n", cp); + if ((cp = isnullstr(LSOF_CCV))) + (void) fprintf(stderr, " compiler version: %s\n", cp); +- if ((cp = isnullstr(LSOF_CCFLAGS))) +- (void) fprintf(stderr, " compiler flags: %s\n", cp); + if ((cp = isnullstr(LSOF_LDFLAGS))) + (void) fprintf(stderr, " loader flags: %s\n", cp); +- if ((cp = isnullstr(LSOF_SYSINFO))) +- (void) fprintf(stderr, " system info: %s\n", cp); + (void) report_SECURITY(" ", ".\n"); + (void) report_WARNDEVACCESS(" ", "are", ".\n"); + (void) report_HASKERNIDCK(" K", "is"); diff --git a/pkgs/development/tools/misc/xxdiff/tip.nix b/pkgs/development/tools/misc/xxdiff/tip.nix index 844758c0f065..1424b8fe1974 100644 --- a/pkgs/development/tools/misc/xxdiff/tip.nix +++ b/pkgs/development/tools/misc/xxdiff/tip.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromBitbucket, qtbase, flex, bison, docutils }: stdenv.mkDerivation rec { - name = "xxdiff-4.0.1.20170623"; + name = "xxdiff-5.0b1"; src = fetchFromBitbucket { owner = "blais"; diff --git a/pkgs/development/tools/ocaml/camlp5/5.15.nix b/pkgs/development/tools/ocaml/camlp5/5.15.nix deleted file mode 100644 index 2e03bb8025ef..000000000000 --- a/pkgs/development/tools/ocaml/camlp5/5.15.nix +++ /dev/null @@ -1,46 +0,0 @@ -{stdenv, fetchurl, ocaml, transitional ? false}: - -let - pname = "camlp5"; - webpage = http://pauillac.inria.fr/~ddr/camlp5/; - metafile = ./META; -in - -assert !stdenv.lib.versionOlder "4.00" ocaml.version; - -stdenv.mkDerivation rec { - - name = "${pname}${if transitional then "_transitional" else ""}-${version}"; - version = "5.15"; - - src = fetchurl { - url = "${webpage}/distrib/src/${pname}-${version}.tgz"; - sha256 = "1sx5wlfpydqskm97gp7887p3avbl3vanlmrwj35wx5mbzj6kn9nq"; - }; - - buildInputs = [ ocaml ]; - - prefixKey = "-prefix "; - - preConfigure = "configureFlagsArray=(" + (if transitional then "--transitional" else "--strict") + - " --libdir $out/lib/ocaml/${ocaml.version}/site-lib)"; - - buildFlags = "world.opt"; - - postInstall = "cp ${metafile} $out/lib/ocaml/${ocaml.version}/site-lib/camlp5/META"; - - meta = { - description = "Preprocessor-pretty-printer for OCaml"; - longDescription = '' - Camlp5 is a preprocessor and pretty-printer for OCaml programs. - It also provides parsing and printing tools. - ''; - homepage = "${webpage}"; - license = stdenv.lib.licenses.bsd3; - branch = "5"; - platforms = ocaml.meta.platforms or []; - maintainers = [ - stdenv.lib.maintainers.z77z - ]; - }; -} diff --git a/pkgs/development/tools/packer/default.nix b/pkgs/development/tools/packer/default.nix index 851c6f01b20f..25ec443be42b 100644 --- a/pkgs/development/tools/packer/default.nix +++ b/pkgs/development/tools/packer/default.nix @@ -1,7 +1,7 @@ { stdenv, buildGoPackage, fetchFromGitHub }: buildGoPackage rec { name = "packer-${version}"; - version = "1.2.5"; + version = "1.3.1"; goPackagePath = "github.com/hashicorp/packer"; @@ -11,7 +11,7 @@ buildGoPackage rec { owner = "hashicorp"; repo = "packer"; rev = "v${version}"; - sha256 = "0wbf0iqfqphwy2snspf34j16ar4ghk0f1zsw8n8vj8gviiivlr7p"; + sha256 = "0aif4ilzfv8qyqk4mn525r38xw2w34ryknzd2vrg6mcjcarm8myq"; }; meta = with stdenv.lib; { diff --git a/pkgs/games/boohu/default.nix b/pkgs/games/boohu/default.nix new file mode 100644 index 000000000000..6d4129edbd00 --- /dev/null +++ b/pkgs/games/boohu/default.nix @@ -0,0 +1,38 @@ +{stdenv, lib, fetchurl, buildGoPackage, ansiTag ? false}: + +buildGoPackage rec { + + name = if ansiTag then "boohu-ansi-${version}" else "boohu-${version}"; + version = "0.10.0"; + + goPackagePath = "git.tuxfamily.org/boohu/boohu.git"; + + src = fetchurl { + url = "https://download.tuxfamily.org/boohu/downloads/boohu-${version}.tar.gz"; + sha256 = "a4d1fc488cfeecbe0a5e9be1836d680951941014f926351692a8dbed9042eba6"; + }; + + goDeps = ./deps.nix; + + # If ansiTag is true, the "--tags ansi" will be passed + buildFlags = if ansiTag then "--tags ansi" else ""; + + # If ansiTag is true, binary output file name will be "boohu-ansi". + # Otherwise it will be "boohu". + postInstall = if ansiTag then "mv $bin/bin/boohu.git $bin/bin/boohu-ansi" + else "mv $bin/bin/boohu.git $bin/bin/boohu"; + + meta = with stdenv.lib; { + description = "A new roguelike game"; + longDescription = '' + Break Out Of Hareka's Underground (Boohu) is a roguelike game mainly + inspired from DCSS and its tavern, with some ideas from Brogue, but + aiming for very short games, almost no character building, and a + simplified inventory. + ''; + homepage = https://download.tuxfamily.org/boohu/index.html; + license = licenses.isc; + platforms = platforms.unix; + maintainers = with maintainers; [freepotion]; + }; +} diff --git a/pkgs/games/boohu/deps.nix b/pkgs/games/boohu/deps.nix new file mode 100644 index 000000000000..8b6b32811938 --- /dev/null +++ b/pkgs/games/boohu/deps.nix @@ -0,0 +1,20 @@ +[ + { + goPackagePath = "github.com/nsf/termbox-go"; + fetch = { + type = "git"; + url = "https://github.com/nsf/termbox-go"; + rev = "b66b20ab708e289ff1eb3e218478302e6aec28ce"; + sha256 = "0wrgnwfdxrspni5q15vzr5q1bxnzb7m6q4xjhllcyddgn2zqprsa"; + }; + } + { + goPackagePath = "github.com/mattn/go-runewidth"; + fetch = { + type = "git"; + url = "https://github.com/mattn/go-runewidth"; + rev = "ce7b0b5c7b45a81508558cd1dba6bb1e4ddb51bb"; + sha256 = "0lc39b6xrxv7h3v3y1kgz49cgi5qxwlygs715aam6ba35m48yi7g"; + }; + } +] diff --git a/pkgs/games/urbanterror/default.nix b/pkgs/games/urbanterror/default.nix index 8ceff15b93d0..1cd87541b8c3 100644 --- a/pkgs/games/urbanterror/default.nix +++ b/pkgs/games/urbanterror/default.nix @@ -2,16 +2,16 @@ stdenv.mkDerivation rec { name = "urbanterror-${version}"; - version = "4.3.3"; + version = "4.3.4"; srcs = [ (fetchurl { - url = "http://cdn.fs1.urbanterror.info/urt/43/releases/zips/UrbanTerror433_full.zip"; - sha256 = "0rrh08ypnw805gd2wrs6af34nvp02x7vggfp0ymcmbr44wcjfn63"; + url = "http://cdn.urbanterror.info/urt/43/releases/zips/UrbanTerror434_full.zip"; + sha256 = "1rx4nnndsk88nvd7k4p35cw6znclkkzm2bl5j6vn6mjjdk66jrki"; }) (fetchurl { - url = "https://github.com/Barbatos/ioq3-for-UrbanTerror-4/archive/release-${version}.zip"; - sha256 = "1624zsnr02nhdksmwnwmvw129lw3afd8h0hvv2j8qmcyxa7jw68b"; + url = "https://github.com/FrozenSand/ioq3-for-UrbanTerror-4/archive/release-${version}.zip"; + sha256 = "1s9pmw7rbnzwzl1llcs0kr2krf4daf8hhnz1j89qk4bq9a9qfp71"; }) ]; diff --git a/pkgs/misc/emulators/wine/sources.nix b/pkgs/misc/emulators/wine/sources.nix index c2665353a390..b1af27807316 100644 --- a/pkgs/misc/emulators/wine/sources.nix +++ b/pkgs/misc/emulators/wine/sources.nix @@ -56,8 +56,8 @@ in rec { winetricks = fetchFromGitHub rec { # https://github.com/Winetricks/winetricks/releases - version = "20180603"; - sha256 = "02valprlb64cc40ivd8sxgxy2hsgqn22s49a47inl6pknj5nmvar"; + version = "20180815"; + sha256 = "0ksz2jkpqq8vnsc511zag9zcx8486hs8mwlmkkygljc8ylb1ibn5"; owner = "Winetricks"; repo = "winetricks"; rev = version; diff --git a/pkgs/os-specific/bsd/netbsd/default.nix b/pkgs/os-specific/bsd/netbsd/default.nix index 2d1909547b61..c53b7e50b9f3 100644 --- a/pkgs/os-specific/bsd/netbsd/default.nix +++ b/pkgs/os-specific/bsd/netbsd/default.nix @@ -2,6 +2,9 @@ , yacc, flex, libressl, bash, less, writeText }: let + inherit (lib) optionalString replaceStrings; + inherit (stdenv) hostPlatform; + fetchNetBSD = path: version: sha256: fetchcvs { cvsRoot = ":pserver:anoncvs@anoncvs.NetBSD.org:/cvsroot"; module = "src/${path}"; @@ -9,20 +12,52 @@ let tag = "netbsd-${builtins.replaceStrings ["."] ["-"] version}-RELEASE"; }; + # Needed to support cross correctly. Splicing only happens when we + # do callPackage, but sense everything is here, it needs to be done + # by hand. All native build inputs should come from here. + nbBuildPackages = buildPackages.netbsd; + + MACHINE_ARCH = { + "i686" = "i386"; + }.${hostPlatform.parsed.cpu.name} or hostPlatform.parsed.cpu.name; + + MACHINE = { + "x86_64" = "amd64"; + "aarch64" = "evbarm64"; + "i686" = "i386"; + }.${hostPlatform.parsed.cpu.name} or hostPlatform.parsed.cpu.name; + netBSDDerivation = attrs: stdenv.mkDerivation ((rec { - name = "bsd-${attrs.pname or (baseNameOf attrs.path)}-netbsd-${attrs.version}"; + name = "netbsd-${attrs.pname or (baseNameOf attrs.path)}-${attrs.version}"; src = attrs.src or fetchNetBSD attrs.path attrs.version attrs.sha256; extraPaths = [ ]; setOutputFlags = false; - nativeBuildInputs = [ makeMinimal mandoc groff install stat - yacc flex tsort lorder ]; - buildInputs = [ compat ]; + nativeBuildInputs = [ yacc flex mandoc groff + nbBuildPackages.makeMinimal + nbBuildPackages.stat + nbBuildPackages.install + nbBuildPackages.tsort + nbBuildPackages.lorder ]; + buildInputs = [ nbPackages.compat ]; installFlags = [ "includes" ]; + # TODO: eventually move this to a make.conf + makeFlags = [ + "MACHINE=${MACHINE}" + "MACHINE_ARCH=${MACHINE_ARCH}" + + "AR=${stdenv.cc.targetPrefix}ar" + "CC=${stdenv.cc.targetPrefix}cc" + "CPP=${stdenv.cc.targetPrefix}cpp" + "CXX=${stdenv.cc.targetPrefix}c++" + "LD=${stdenv.cc.targetPrefix}ld" + "STRIP=${stdenv.cc.targetPrefix}strip" + ] ++ (attrs.makeFlags or []); # Definitions passed to share/mk/*.mk. Should be pretty simple - # eventually maybe move it to a configure script. + # TODO: don’t rely on DESTDIR, instead use prefix DESTDIR = "$(out)"; TOOLDIR = "$(out)"; USETOOLS = "never"; @@ -30,16 +65,21 @@ let NOGCCERROR = "yes"; LEX = "flex"; MKUNPRIVED = "yes"; - HOST_SH = "${bash}/bin/sh"; + HOST_SH = "${buildPackages.bash}/bin/sh"; OBJCOPY = if stdenv.isDarwin then "true" else "objcopy"; - MACHINE_ARCH = stdenv.hostPlatform.parsed.cpu.name; - MACHINE_CPU = stdenv.hostPlatform.parsed.cpu.name; + RPCGEN_CPP = "${stdenv.cc.targetPrefix}cpp"; + + MKPIC = if stdenv.isDarwin then "no" else "yes"; + MKRELRO = if stdenv.isDarwin then "no" else "yes"; INSTALL_FILE = "install -U -c"; INSTALL_DIR = "xinstall -U -d"; INSTALL_LINK = "install -U -l h"; INSTALL_SYMLINK = "install -U -l s"; + HOST_CC = "${buildPackages.stdenv.cc}/bin/${buildPackages.stdenv.cc.targetPrefix}cc"; + HOST_CXX = "${buildPackages.stdenv.cc}/bin/${buildPackages.stdenv.cc.targetPrefix}c++"; + # libs will be provided by cc-wrapper LIBCRT0 = ""; LIBCRTI = ""; @@ -82,7 +122,7 @@ let # NetBSD makefiles should be able to detect this # but without they end up using gcc on Darwin stdenv preConfigure = '' - export HAVE_${if stdenv.cc.isGNU then "GCC" else "LLVM"}=${lib.head (lib.splitString "." (lib.getVersion stdenv.cc.cc))} + export HAVE_${if stdenv.cc.isClang then "LLVM" else "GCC"}=${lib.head (lib.splitString "." (lib.getVersion stdenv.cc.cc))} # Parallel building. Needs the space. export makeFlags+=" -j $NIX_BUILD_CORES" @@ -125,15 +165,111 @@ let platforms = platforms.unix; license = licenses.bsd2; }; - }) // attrs); + }) // (removeAttrs attrs ["makeFlags"])); + + libutil = netBSDDerivation { + path = "lib/libutil"; + version = "8.0"; + sha256 = "077syyxd303m4x7avs5nxzk4c9n13d5lyk5aicsacqjvx79qrk3i"; + extraPaths = [ + (fetchNetBSD "common/lib/libutil" "8.0" "0q3ixrf36lip1dx0gafs0a03qfs5cs7n0myqq7af4jpjd6kh1831") + ]; + }; + + libc = netBSDDerivation { + path = "lib/libc"; + version = "8.0"; + sha256 = "0lgbc58qgn8kwm3l011x1ml1kgcf7jsgq7hbf0hxhlbvxq5bljl3"; + extraPaths = [ + (fetchNetBSD "common/lib/libc" "8.0" "1kbhj0vxixvdy9fvsr5y70ri4mlkmim1v9m98sqjlzc1vdiqfqc8") + ]; + }; + + make = netBSDDerivation { + path = "usr.bin/make"; + sha256 = "103643qs3w5kiahir6cca2rkm5ink81qbg071qyzk63qvspfq10c"; + version = "8.0"; + postPatch = '' + # make needs this to pick up our sys make files + export NIX_CFLAGS_COMPILE+=" -D_PATH_DEFSYSPATH=\"$out/share/mk\"" + + substituteInPlace $NETBSDSRCDIR/share/mk/bsd.prog.mk \ + --replace '-Wl,-dynamic-linker=''${_SHLINKER}' "" \ + --replace '-Wl,-rpath,''${SHLIBDIR}' "" + substituteInPlace $NETBSDSRCDIR/share/mk/bsd.lib.mk \ + --replace '_INSTRANLIB=''${empty(PRESERVE):?-a "''${RANLIB} -t":}' '_INSTRANLIB=' + substituteInPlace $NETBSDSRCDIR/share/mk/bsd.kinc.mk \ + --replace /bin/rm rm + '' + lib.optionalString stdenv.isDarwin '' + substituteInPlace $NETBSDSRCDIR/share/mk/bsd.sys.mk \ + --replace '-Wl,--fatal-warnings' "" \ + --replace '-Wl,--warn-shared-textrel' "" + substituteInPlace $NETBSDSRCDIR/share/mk/bsd.lib.mk \ + --replace '-Wl,-soname,''${_LIB}.so.''${SHLIB_SOVERSION}' "" \ + --replace '-Wl,--whole-archive' "" \ + --replace '-Wl,--no-whole-archive' "" \ + --replace '-Wl,--warn-shared-textrel' "" \ + --replace '-Wl,-Map=''${_LIB}.so.''${SHLIB_SOVERSION}.map' "" \ + --replace '-Wl,-rpath,''${SHLIBDIR}' "" + ''; + postInstall = '' + make -C $NETBSDSRCDIR/share/mk FILESDIR=/share/mk install + ''; + extraPaths = [ + (fetchNetBSD "share/mk" "8.0" "033q4w3rmvwznz6m7fn9xcf13chyhwwl8ijj3a9mrn80fkwm55qs") + ]; + }; + + libcurses = netBSDDerivation { + path = "lib/libcurses"; + version = "8.0"; + sha256 = "0azhzh1910v24dqx45zmh4z4dl63fgsykajrbikx5xfvvmkcq7xs"; + buildInputs = [ nbPackages.libterminfo ]; + makeFlags = [ "INCSDIR=/include" ]; + NIX_CFLAGS_COMPILE = [ + "-D__scanflike(a,b)=" + "-D__va_list=va_list" + "-D__warn_references(a,b)=" + ] ++ lib.optional stdenv.isDarwin "-D__strong_alias(a,b)="; + propagatedBuildInputs = [ nbPackages.compat ]; + MKDOC = "no"; # missing vfontedpr + postPatch = '' + substituteInPlace printw.c \ + --replace "funopen2(win, NULL, winwrite, NULL, NULL, NULL)" NULL \ + --replace "__strong_alias(vwprintw, vw_printw)" 'extern int vwprintw(WINDOW*, const char*, va_list) __attribute__ ((alias ("vw_printw")));' + substituteInPlace scanw.c \ + --replace "__strong_alias(vwscanw, vw_scanw)" 'extern int vwscanw(WINDOW*, const char*, va_list) __attribute__ ((alias ("vw_scanw")));' + ''; + }; + + libedit = netBSDDerivation { + path = "lib/libedit"; + buildInputs = [ nbPackages.libterminfo libcurses ]; + propagatedBuildInputs = [ nbPackages.compat ]; + makeFlags = [ "INCSDIR=/include" ]; + postPatch = '' + sed -i '1i #undef bool_t' el.h + substituteInPlace config.h \ + --replace "#define HAVE_STRUCT_DIRENT_D_NAMLEN 1" "" + ''; + NIX_CFLAGS_COMPILE = [ + "-D__noinline=" + "-D__scanflike(a,b)=" + "-D__va_list=va_list" + ]; + version = "8.0"; + sha256 = "0pmqh2mkfp70bwchiwyrkdyq9jcihx12g1awd6alqi9bpr3f9xmd"; + }; + + nbPackages = rec { ## ## BOOTSTRAPPING ## makeMinimal = netBSDDerivation rec { path = "tools/make"; - sha256 = "0l4794zwj2haark3azf9xwcwqlkbrifhb2glaa9iba4dkg2mklsb"; - version = "7.1.2"; + sha256 = "1xbzfd4i7allrkk1if74a8ymgpizyj0gkvdigzzj37qar7la7nc1"; + version = "8.0"; buildInputs = []; nativeBuildInputs = []; @@ -162,10 +298,10 @@ let extraPaths = [ make.src ] ++ make.extraPaths; }; - compat = netBSDDerivation rec { + compat = if hostPlatform.isNetBSD then null else netBSDDerivation rec { path = "tools/compat"; - sha256 = "17phkfafybxwhzng44k5bhmag6i55br53ky1nwcmw583kg2fa86z"; - version = "7.1.2"; + sha256 = "050449lq5gpxqsripdqip5ks49g5ypjga188nd3ss8dg1zf7ydz3"; + version = "8.0"; setupHooks = [ ../../../build-support/setup-hooks/role.bash @@ -173,7 +309,7 @@ let ]; # override defaults to prevent infinite recursion - nativeBuildInputs = [ makeMinimal ]; + nativeBuildInputs = [ nbBuildPackages.makeMinimal ]; buildInputs = [ zlib ]; # temporarily use gnuinstall for bootstrapping @@ -206,7 +342,12 @@ let install -D $NETBSDSRCDIR/include/utmpx.h $out/include/utmpx.h install -D $NETBSDSRCDIR/include/tzfile.h $out/include/tzfile.h install -D $NETBSDSRCDIR/sys/sys/tree.h $out/include/sys/tree.h - + install -D $NETBSDSRCDIR/include/nl_types.h $out/include/nl_types.h + install -D $NETBSDSRCDIR/include/stringlist.h $out/include/stringlist.h + '' + lib.optionalString stdenv.isDarwin '' + mkdir -p $out/include/ssp + touch $out/include/ssp/ssp.h + '' + '' mkdir -p $out/lib/pkgconfig substitute ${./libbsd-overlay.pc} $out/lib/pkgconfig/libbsd-overlay.pc \ --subst-var-by out $out \ @@ -222,25 +363,25 @@ let find $out -type d -empty -delete ''; extraPaths = [ libc.src libutil.src - (fetchNetBSD "include" "7.1.2" "1vc58xrhrp202biiv1chhlh0jwnjr7k3qq91pm46k6v5j95j0qwp") - (fetchNetBSD "external/bsd/flex" "7.1.2" "0m0m72r3zzc9gi432h3xkqdzspr4n0hj4m8h7j74pwbvpfg9d9qq") - (fetchNetBSD "sys/sys" "7.1.2" "1vwnv5nk7rlgn5w9nkdqj9652hmwmfwqxj3ymcz0zk10abbaib93") + (fetchNetBSD "include" "8.0" "128m77k16i7frvk8kifhmxzk7a37m7z1s0bbmja3ywga6sx6v6sq") + (fetchNetBSD "external/bsd/flex" "8.0" "0yxcjshz9nj827qhmjwwjmzvmmqgaf0d25b42k7lj84vliwrgyr6") + (fetchNetBSD "sys/sys" "8.0" "0b0yjjy0c0cvk5nyffppqwxlwh2s1qr2xzl97a9ldck00dibar94") ] ++ libutil.extraPaths ++ libc.extraPaths; }; # HACK to ensure parent directories exist. This emulates GNU # install’s -D option. No alternative seems to exist in BSD install. install = let binstall = writeText "binstall" '' - #!/usr/bin/env sh + #!${stdenv.shell} for last in $@; do true; done mkdir -p $(dirname $last) xinstall "$@" ''; in netBSDDerivation { path = "usr.bin/xinstall"; - version = "7.1.2"; - sha256 = "0nzhyh714m19h61m45gzc5dszkbafp5iaphbp5mza6w020fzf2y8"; + version = "8.0"; + sha256 = "1f6pbz3qv1qcrchdxif8p5lbmnwl8b9nq615hsd3cyl4avd5bfqj"; extraPaths = [ mtree.src make.src ]; - nativeBuildInputs = [ makeMinimal mandoc groff ]; + nativeBuildInputs = [ nbBuildPackages.makeMinimal mandoc groff ]; buildInputs = [ compat fts ]; installPhase = '' runHook preInstall @@ -258,13 +399,13 @@ let pname = "fts"; path = "include/fts.h"; sha256 = "01d4fpxvz1pgzfk5xznz5dcm0x0gdzwcsfm1h3d0xc9kc6hj2q77"; - version = "7.1.2"; + version = "8.0"; nativeBuildInputs = [ ]; propagatedBuildInputs = [ compat ]; extraPaths = [ - (fetchNetBSD "lib/libc/gen/fts.c" "7.1.2" "1yfd2liypj6xky2h0mgxi5lgpflmkkg4zf3ii3apz5cf8jq9gmn9") - (fetchNetBSD "lib/libc/include/namespace.h" "7.1.2" "0kwd4v8y0mfjhmwplsk52pvzbcpvpp2qy2g8c0jmfraam63q6q1y") - (fetchNetBSD "lib/libc/gen/fts.3" "7.1.2" "1asxw0n3fhjdadwkkq3xplfgqgl3q32w1lyrvbakfa3gs0wz5zc1") + (fetchNetBSD "lib/libc/gen/fts.c" "8.0" "1a8hmf26242nmv05ipn3ircxb0jqmmi66rh78kkyi9vjwkfl3qn7") + (fetchNetBSD "lib/libc/include/namespace.h" "8.0" "1sjvh9nw3prnk4rmdwrfsxh6gdb9lmilkn46jcfh3q5c8glqzrd7") + (fetchNetBSD "lib/libc/gen/fts.3" "8.0" "1asxw0n3fhjdadwkkq3xplfgqgl3q32w1lyrvbakfa3gs0wz5zc1") ]; buildPhase = '' cc -c -Iinclude -Ilib/libc/include lib/libc/gen/fts.c \ @@ -289,322 +430,124 @@ let stat = netBSDDerivation { path = "usr.bin/stat"; - version = "7.1.2"; + version = "8.0"; sha256 = "0z4r96id2r4cfy443rw2s1n52n186xm0lqvs8s3qjf4314z7r7yh"; - nativeBuildInputs = [ makeMinimal mandoc groff install ]; + nativeBuildInputs = [ nbBuildPackages.makeMinimal nbBuildPackages.install + mandoc groff ]; }; tsort = netBSDDerivation { path = "usr.bin/tsort"; - version = "7.1.2"; + version = "8.0"; sha256 = "1dqvf9gin29nnq3c4byxc7lfd062pg7m84843zdy6n0z63hnnwiq"; - nativeBuildInputs = [ makeMinimal mandoc groff install ]; + nativeBuildInputs = [ nbBuildPackages.makeMinimal nbBuildPackages.install + mandoc groff ]; }; lorder = netBSDDerivation { path = "usr.bin/lorder"; - version = "7.1.2"; + version = "8.0"; sha256 = "0rjf9blihhm0n699vr2bg88m4yjhkbxh6fxliaay3wxkgnydjwn2"; - nativeBuildInputs = [ makeMinimal mandoc groff install ]; + nativeBuildInputs = [ nbBuildPackages.makeMinimal nbBuildPackages.install + mandoc groff ]; }; ## ## END BOOTSTRAPPING ## - libutil = netBSDDerivation { - path = "lib/libutil"; - version = "7.1.2"; - sha256 = "12848ynizz13mvn2kndrkq482xhkw323b7c8fg0zli1nhfsmwsm8"; - extraPaths = [ - (fetchNetBSD "common/lib/libutil" "7.1.2" "0q3ixrf36lip1dx0gafs0a03qfs5cs7n0myqq7af4jpjd6kh1831") - ]; - }; - - libc = netBSDDerivation { - path = "lib/libc"; - version = "7.1.2"; - sha256 = "13rcx3mbx2644z01zgk9gggdfr0hqdbsvd7zrsm2l13yf9aix6pg"; - extraPaths = [ - (fetchNetBSD "common/lib/libc" "7.1.2" "1va8zd4lqyrc1d0c9q04r8y88cfxpkhwcxasggxxvhksd3khkpha") - ]; - }; - - make = netBSDDerivation { - path = "usr.bin/make"; - sha256 = "0srkkg6qdzqlccfi4xh19gl766ks6hpss76bnfvwmd0zg4q4zdar"; - version = "7.1.2"; - postPatch = '' - # make needs this to pick up our sys make files - export NIX_CFLAGS_COMPILE+=" -D_PATH_DEFSYSPATH=\"$out/share/mk\"" - - substituteInPlace $NETBSDSRCDIR/share/mk/bsd.prog.mk \ - --replace '-Wl,-dynamic-linker=''${_SHLINKER}' "" \ - --replace '-Wl,-rpath,''${SHLIBDIR}' "" - substituteInPlace $NETBSDSRCDIR/share/mk/bsd.lib.mk \ - --replace '_INSTRANLIB=''${empty(PRESERVE):?-a "''${RANLIB} -t":}' '_INSTRANLIB=' - '' + lib.optionalString stdenv.isDarwin '' - substituteInPlace $NETBSDSRCDIR/share/mk/bsd.sys.mk \ - --replace '-Wl,--fatal-warnings' "" \ - --replace '-Wl,--warn-shared-textrel' "" - substituteInPlace $NETBSDSRCDIR/share/mk/bsd.lib.mk \ - --replace '-Wl,-soname,''${_LIB}.so.''${SHLIB_SOVERSION}' "" \ - --replace '-Wl,--whole-archive' "" \ - --replace '-Wl,--no-whole-archive' "" \ - --replace '-Wl,--warn-shared-textrel' "" \ - --replace '-Wl,-Map=''${_LIB}.so.''${SHLIB_SOVERSION}.map' "" \ - --replace '-Wl,-rpath,''${SHLIBDIR}' "" - ''; - postInstall = '' - (cd $NETBSDSRCDIR/share/mk && make FILESDIR=/share/mk install) - ''; - extraPaths = [ - (fetchNetBSD "share/mk" "7.1.2" "0570v0siv0wygn8ygs1yy9pgk9xjw9x1axr5qg4xrddv3lskf9xa") - ]; - }; - mtree = netBSDDerivation { path = "usr.sbin/mtree"; - version = "7.1.2"; - sha256 = "1dhsyfvcm67kf5zdbg5dmx5y8fimnbll6qxwp3gjfmbxqigmc52m"; + version = "8.0"; + sha256 = "0hanmzm8bgwz2bhsinmsgfmgy6nbdhprwmgwbyjm6bl17vgn7vid"; + extraPaths = [ mknod.src ]; }; - who = netBSDDerivation { - path = "usr.bin/who"; - version = "7.1.2"; - sha256 = "17ffwww957m3qw0b6fkgjpp12pd5ydg2hs9dxkkw0qpv11j00d88"; - postPatch = lib.optionalString stdenv.isLinux '' - substituteInPlace $NETBSDSRCDIR/usr.bin/who/utmpentry.c \ - --replace "utmptime = st.st_mtimespec" "utmptime = st.st_mtim" \ - --replace "timespeccmp(&st.st_mtimespec, &utmptime, >)" "st.st_mtim.tv_sec == utmptime.tv_sec ? st.st_mtim.tv_nsec > utmptime.tv_nsec : st.st_mtim.tv_sec > utmptime.tv_sec" - '' + lib.optionalString stdenv.isDarwin '' - substituteInPlace $NETBSDSRCDIR/usr.bin/who/utmpentry.c \ - --replace "timespeccmp(&st.st_mtimespec, &utmpxtime, >)" "st.st_mtimespec.tv_sec == utmpxtime.tv_sec ? st.st_mtimespec.tv_nsec > utmpxtime.tv_nsec : st.st_mtimespec.tv_sec > utmpxtime.tv_sec" - '' + '' - substituteInPlace $NETBSDSRCDIR/usr.bin/who/utmpentry.c \ - --replace "strncpy(e->name, up->ut_name, sizeof(up->ut_name))" "strncpy(e->name, up->ut_user, sizeof(up->ut_user))" \ - --replace "timespecclear(&utmptime)" "utmptime.tv_sec = utmptime.tv_nsec = 0" \ - --replace "timespecclear(&utmpxtime)" "utmpxtime.tv_sec = utmpxtime.tv_nsec = 0" - ''; + mknod = netBSDDerivation { + path = "sbin/mknod"; + version = "8.0"; + sha256 = "0vq66v0hj0r4z2r2z2d3l3c5vh48pvcdmddc8bhm8hzq2civ5df2"; }; -in rec { - inherit compat install netBSDDerivation fts; - getent = netBSDDerivation { path = "usr.bin/getent"; sha256 = "1ylhw4dnpyrmcy8n5kjcxywm8qc9p124dqnm17x4magiqx1kh9iz"; - version = "7.1.2"; + version = "8.0"; patches = [ ./getent.patch ]; }; getconf = netBSDDerivation { path = "usr.bin/getconf"; sha256 = "122vslz4j3h2mfs921nr2s6m078zcj697yrb75rwp2hnw3qz4s8q"; - version = "7.1.2"; + version = "8.0"; }; dict = netBSDDerivation { path = "share/dict"; - version = "7.1.2"; - sha256 = "0nickhsjwgnr2h9nvwflvgfz93kqms5hzdnpyq02crpj35w98bh4"; + version = "8.0"; + sha256 = "1pk0y3xc5ihc2k89wjkh33qqx3w9q34k03k2qcffvbqh1l6wm36l"; makeFlags = [ "BINDIR=/share" ]; }; - games = netBSDDerivation { - path = "games"; - sha256 = "04wjsang8f8kxsifiayklbxaaxmm3vx9rfr91hfbxj4hk8gkqzy1"; - version = "7.1.2"; - makeFlags = [ "BINDIR=/bin" - "SCRIPTSDIR=/bin" ]; - postPatch = '' - sed -i '1i #include <time.h>' adventure/save.c - - for f in $(find . -name pathnames.h); do - substituteInPlace $f \ - --replace /usr/share/games $out/share/games \ - --replace /usr/games $out/bin \ - --replace /usr/libexec $out/libexec \ - --replace /usr/bin/more ${less}/bin/less \ - --replace /usr/share/dict ${dict}/share/dict - done - substituteInPlace boggle/boggle/bog.h \ - --replace /usr/share/games $out/share/games - substituteInPlace ching/ching/ching.sh \ - --replace /usr/share $out/share \ - --replace /usr/libexec $out/libexec - substituteInPlace hunt/huntd/driver.c \ - --replace "(void) setpgrp(getpid(), getpid());" "" - - # Disable some games that don't build. They should be possible - # to build but need to look at how to implement stuff in - # Linux. macOS is missing gettime. TODO try to get these - # working. - disableGame() { - substituteInPlace Makefile --replace $1 "" - } - - disableGame atc - disableGame dm - disableGame dab - disableGame sail - disableGame trek - ${lib.optionalString stdenv.isLinux "disableGame boggle"} - ${lib.optionalString stdenv.isLinux "disableGame hunt"} - ${lib.optionalString stdenv.isLinux "disableGame larn"} - ${lib.optionalString stdenv.isLinux "disableGame phantasia"} - ${lib.optionalString stdenv.isLinux "disableGame rogue"} - ${lib.optionalString stdenv.isDarwin "disableGame adventure"} - ${lib.optionalString stdenv.isDarwin "disableGame factor"} - ${lib.optionalString stdenv.isDarwin "disableGame gomoku"} - ${lib.optionalString stdenv.isDarwin "disableGame mille"} - ''; - - # HACK strfile needs to be installed first & in the path. The - # Makefile should do this for us but haven't gotten it to work - preBuild = '' - (cd fortune/strfile && make && make BINDIR=/bin install) - export PATH=$out/bin:$PATH - ''; - - postInstall = '' - substituteInPlace $out/usr/share/games/quiz.db/index \ - --replace /usr $out - ''; - - NIX_CFLAGS_COMPILE = [ - "-D__noinline=" - "-D__scanflike(a,b)=" - "-D__va_list=va_list" - "-DOXTABS=XTABS" - "-DRANDOM_MAX=RAND_MAX" - "-DINFTIM=-1" - (lib.optionalString stdenv.hostPlatform.isMusl "-include sys/ttydefaults.h -include sys/file.h") - "-DBE32TOH(x)=((void)0)" - "-DBE64TOH(x)=((void)0)" - "-D__c99inline=__inline" - ]; - - buildInputs = [ compat libcurses libterminfo libressl ]; - extraPaths = [ dict.src who.src ]; - }; - - finger = netBSDDerivation { - path = "usr.bin/finger"; - sha256 = "0jl672z50f2yf7ikp682b3xrarm6bnrrx9vi94xnp2fav8m8zfyi"; - version = "7.1.2"; - NIX_CFLAGS_COMPILE = [ - (if stdenv.isLinux then "-DSUPPORT_UTMP" else "-USUPPORT_UTMP") - (if stdenv.isDarwin then "-DSUPPORT_UTMPX" else "-USUPPORT_UTMPX") - ]; - postPatch = '' - NIX_CFLAGS_COMPILE+=" -I$NETBSDSRCDIR/include" - - substituteInPlace extern.h \ - --replace psort _psort - - ${who.postPatch} - ''; - extraPaths = [ who.src ] - ++ lib.optional stdenv.isDarwin (fetchNetBSD "include/utmp.h" "7.1.2" "05690fzz0825p2bq0sfyb00mxwd0wa06qryqgqkwpqk9y2xzc7px"); - }; - fingerd = netBSDDerivation { path = "libexec/fingerd"; - sha256 = "1hhdq70hrxxkjnjfmjm3w8w9g9xq2ngxaxk0chy4vm7chg9nfpmp"; - version = "7.1.2"; - }; - - libedit = netBSDDerivation { - path = "lib/libedit"; - buildInputs = [ libterminfo libcurses ]; - propagatedBuildInputs = [ compat ]; - makeFlags = [ "INCSDIR=/include" ]; - postPatch = '' - sed -i '1i #undef bool_t' el.h - substituteInPlace config.h \ - --replace "#define HAVE_STRUCT_DIRENT_D_NAMLEN 1" "" - ''; - NIX_CFLAGS_COMPILE = [ - "-D__noinline=" - "-D__scanflike(a,b)=" - "-D__va_list=va_list" - ]; - version = "7.1.2"; - sha256 = "0qvr52j4qih10m7fa8nddn1psyjy9l0pa4ix02acyssjvgbz2kca"; + sha256 = "0blcahhgyj1lm0mimrbvgmq3wkjvqk5wy85sdvbs99zxg7da1190"; + version = "8.0"; }; libterminfo = netBSDDerivation { path = "lib/libterminfo"; - version = "7.1.2"; - sha256 = "06plg0bjqgbb0aghpb9qlk8wkp1l2izdlr64vbr5laqyw8jg84zq"; + version = "8.0"; + sha256 = "14gp0d6fh6zjnbac2yjhyq5m6rca7gm6q1s9gilhzpdgl9m7vb9r"; buildInputs = [ compat tic nbperf ]; - MKPIC = if stdenv.isDarwin then "no" else "yes"; makeFlags = [ "INCSDIR=/include" ]; postPatch = '' substituteInPlace term.c --replace /usr/share $out/share + substituteInPlace setupterm.c --replace '#include <curses.h>' 'void use_env(bool);' + ''; postInstall = '' - (cd $NETBSDSRCDIR/share/terminfo && make && make BINDIR=/share install) + make -C $NETBSDSRCDIR/share/terminfo BINDIR=/share + make -C $NETBSDSRCDIR/share/terminfo BINDIR=/share install ''; extraPaths = [ - (fetchNetBSD "share/terminfo" "7.1.2" "1z5vzq8cw24j05r6df4vd6r57cvdbv7vbm4h962kplp14xrbg2h3") + (fetchNetBSD "share/terminfo" "8.0" "18db0fk1dw691vk6lsm6dksm4cf08g8kdm0gc4052ysdagg2m6sm") ]; }; - libcurses = netBSDDerivation { - path = "lib/libcurses"; - version = "7.1.2"; - sha256 = "04djah9dadzw74nswn0xydkxn900kav8xdvxlxdl50nbrynxg9yf"; - buildInputs = [ libterminfo ]; - makeFlags = [ "INCSDIR=/include" ]; - NIX_CFLAGS_COMPILE = [ - "-D__scanflike(a,b)=" - "-D__va_list=va_list" - "-D__warn_references(a,b)=" - ] ++ lib.optional stdenv.isDarwin "-D__strong_alias(a,b)="; - propagatedBuildInputs = [ compat ]; - MKDOC = "no"; # missing vfontedpr - MKPIC = if stdenv.isDarwin then "no" else "yes"; - postPatch = lib.optionalString (!stdenv.isDarwin) '' - substituteInPlace printw.c \ - --replace "funopen(win, NULL, __winwrite, NULL, NULL)" NULL \ - --replace "__strong_alias(vwprintw, vw_printw)" 'extern int vwprintw(WINDOW*, const char*, va_list) __attribute__ ((alias ("vw_printw")));' - substituteInPlace scanw.c \ - --replace "__strong_alias(vwscanw, vw_scanw)" 'extern int vwscanw(WINDOW*, const char*, va_list) __attribute__ ((alias ("vw_scanw")));' - ''; - }; - nbperf = netBSDDerivation { path = "usr.bin/nbperf"; - version = "7.1.2"; + version = "8.0"; sha256 = "0gzm0zv2400lasnsswnjw9bwzyizhxzdbrcjwcl1k65aj86aqyqb"; }; tic = netBSDDerivation { path = "tools/tic"; - version = "7.1.2"; + version = "8.0"; sha256 = "092y7db7k4kh2jq8qc55126r5qqvlb8lq8mhmy5ipbi36hwb4zrz"; HOSTPROG = "tic"; buildInputs = [ compat nbperf ]; extraPaths = [ libterminfo.src - (fetchNetBSD "usr.bin/tic" "7.1.2" "1ghwsaag4gbwvgp3lfxscnh8hn27n8cscwmgjwp3bkx5vl85nfsa") - (fetchNetBSD "tools/Makefile.host" "7.1.2" "076r3amivb6xranpvqjmg7x5ibj4cbxaa3z2w1fh47h7d55dw9w8") + (fetchNetBSD "usr.bin/tic" "8.0" "0diirnzmdnpc5bixyb34c9rid9paw2a4zfczqrpqrfvjsf1nnljf") + (fetchNetBSD "tools/Makefile.host" "8.0" "1p23dsc4qrv93vc6gzid9w2479jwswry9qfn88505s0pdd7h6nvp") ]; }; misc = netBSDDerivation { path = "share/misc"; - version = "7.1.2"; - sha256 = "1vyn30js14nnadlls55mg7g1gz8h14l75rbrrh8lgn49qg289665"; + version = "8.0"; + sha256 = "0d34b3irjbqsqfk8v8aaj36fjyvwyx410igl26jcx2ryh3ispch8"; makeFlags = [ "BINDIR=/share" ]; }; locale = netBSDDerivation { path = "usr.bin/locale"; - version = "7.1.2"; + version = "8.0"; sha256 = "0kk6v9k2bygq0wf9gbinliqzqpzs9bgxn0ndyl2wcv3hh2bmsr9p"; patches = [ ./locale.patch ]; + NIX_CFLAGS_COMPILE = "-DYESSTR=__YESSTR -DNOSTR=__NOSTR"; + }; + }; -} +in nbPackages diff --git a/pkgs/os-specific/linux/batman-adv/alfred.nix b/pkgs/os-specific/linux/batman-adv/alfred.nix index cc632db160f2..605334e12a10 100644 --- a/pkgs/os-specific/linux/batman-adv/alfred.nix +++ b/pkgs/os-specific/linux/batman-adv/alfred.nix @@ -1,14 +1,14 @@ { stdenv, fetchurl, pkgconfig, gpsd, libcap, libnl }: let - ver = "2018.2"; + ver = "2018.3"; in stdenv.mkDerivation rec { name = "alfred-${ver}"; src = fetchurl { url = "https://downloads.open-mesh.org/batman/releases/batman-adv-${ver}/${name}.tar.gz"; - sha256 = "0640p9zy1511pl30i5yybqa0s1yqz83291vw1z22jrcsq57rrgib"; + sha256 = "06lbyac0w48jkxpji9pgkxnwcrwbzs2dwzfgw2vfr1lix6ivhrb2"; }; nativeBuildInputs = [ pkgconfig ]; diff --git a/pkgs/os-specific/linux/kernel/linux-testing.nix b/pkgs/os-specific/linux/kernel/linux-testing.nix index cabaa59966c1..3d28bd68121d 100644 --- a/pkgs/os-specific/linux/kernel/linux-testing.nix +++ b/pkgs/os-specific/linux/kernel/linux-testing.nix @@ -1,13 +1,13 @@ { stdenv, buildPackages, fetchurl, perl, buildLinux, libelf, utillinux, ... } @ args: buildLinux (args // rec { - version = "4.19-rc6"; - modDirVersion = "4.19.0-rc6"; + version = "4.19-rc7"; + modDirVersion = "4.19.0-rc7"; extraMeta.branch = "4.19"; src = fetchurl { url = "https://git.kernel.org/torvalds/t/linux-${version}.tar.gz"; - sha256 = "0cq0xr4lwvngyiyall62hddbk27gy72zjiigb8xdsry96a8ccvgl"; + sha256 = "0wjh62vfhvi2prz9sx9c0s0f9sa9z1775qn4jf8zz5y5isixzdml"; }; # Should the testing kernels ever be built on Hydra? diff --git a/pkgs/os-specific/linux/mwprocapture/default.nix b/pkgs/os-specific/linux/mwprocapture/default.nix index 72095bc8cdab..f6f6c10112a7 100644 --- a/pkgs/os-specific/linux/mwprocapture/default.nix +++ b/pkgs/os-specific/linux/mwprocapture/default.nix @@ -15,17 +15,15 @@ let in stdenv.mkDerivation rec { name = "mwprocapture-1.2.${version}-${kernel.version}"; - version = "3773"; + version = "3950"; src = fetchurl { url = "http://www.magewell.com/files/drivers/ProCaptureForLinux_${version}.tar.gz"; - sha256 = "1ri7c4l4xgkhpz0f15jra1p7mpzi8ir6lpwjm7q7hc9m4cvxcs1g"; + sha256 = "1im3k533r6c0dx08h9wjfbhadzk7zawrxxaz7v94c92m3q133ys6"; }; nativeBuildInputs = [ kernel.moduleBuildDependencies ]; - patches = [ ./linux_4_14_fix.patch ]; - preConfigure = '' cd ./src diff --git a/pkgs/os-specific/linux/mwprocapture/linux_4_14_fix.patch b/pkgs/os-specific/linux/mwprocapture/linux_4_14_fix.patch deleted file mode 100644 index 94da5a00a2e2..000000000000 --- a/pkgs/os-specific/linux/mwprocapture/linux_4_14_fix.patch +++ /dev/null @@ -1,71 +0,0 @@ -diff -Naur ProCaptureForLinux_3773/src/sources/ospi/linux-file.c ProCaptureForLinux_3773_new/src/sources/ospi/linux-file.c ---- ProCaptureForLinux_3773/src/sources/ospi/linux-file.c 2017-12-15 01:59:57.000000000 -0800 -+++ ProCaptureForLinux_3773_new/src/sources/ospi/linux-file.c 2017-12-23 22:47:33.666823299 -0800 -@@ -7,8 +7,9 @@ - - #include "linux-file.h" - --#include <asm/uaccess.h> - #include <linux/sched.h> -+#include <asm/uaccess.h> -+#include <linux/version.h> - - struct file *linux_file_open(const char *path, int flags, int mode) - { -@@ -28,29 +29,36 @@ - filp_close(file, NULL); - } - --ssize_t linux_file_read(struct file *file, loff_t offset, unsigned char *data, size_t size) -+ssize_t linux_file_read(struct file *file, loff_t offset, void *data, size_t size) - { -+#if LINUX_VERSION_CODE >= KERNEL_VERSION(4,14,0) -+ return(kernel_read(file, data, size, &offset)); -+#else - mm_segment_t oldfs; - ssize_t ret; - - oldfs = get_fs(); - set_fs(get_ds()); -- ret = vfs_read(file, data, size, &offset); -+ ret = vfs_read(file, (unsigned char *)data, size, &offset); - set_fs(oldfs); - - return ret; -+#endif - } - --ssize_t linux_file_write(struct file *file, loff_t offset, unsigned char *data, size_t size) -+ssize_t linux_file_write(struct file *file, loff_t offset, const void *data, size_t size) - { -+#if LINUX_VERSION_CODE >= KERNEL_VERSION(4,14,0) -+ return(kernel_write(file, data, size, &offset)); -+#else - mm_segment_t oldfs; - ssize_t ret; - - oldfs = get_fs(); - set_fs(get_ds()); -- ret = vfs_write(file, data, size, &offset); -+ ret = vfs_write(file, (const unsigned char *)data, size, &offset); - set_fs(oldfs); - - return ret; -+#endif - } -- -diff -Naur ProCaptureForLinux_3773/src/sources/ospi/linux-file.h ProCaptureForLinux_3773_new/src/sources/ospi/linux-file.h ---- ProCaptureForLinux_3773/src/sources/ospi/linux-file.h 2017-12-15 01:59:57.000000000 -0800 -+++ ProCaptureForLinux_3773_new/src/sources/ospi/linux-file.h 2017-12-23 22:46:22.028545189 -0800 -@@ -13,9 +13,9 @@ - - void linux_file_close(struct file *file); - --ssize_t linux_file_read(struct file *file, loff_t offset, unsigned char *data, size_t size); -+ssize_t linux_file_read(struct file *file, loff_t offset, void *data, size_t size); - --ssize_t linux_file_write(struct file *file, loff_t offset, unsigned char *data, size_t size); -+ssize_t linux_file_write(struct file *file, loff_t offset, const void *data, size_t size); - - #endif /* __LINUX_FILE_H__ */ - diff --git a/pkgs/os-specific/linux/v4l2loopback/default.nix b/pkgs/os-specific/linux/v4l2loopback/default.nix index 3db2814a0878..2e22b99a95f3 100644 --- a/pkgs/os-specific/linux/v4l2loopback/default.nix +++ b/pkgs/os-specific/linux/v4l2loopback/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { name = "v4l2loopback-${version}-${kernel.version}"; - version = "0.11.0"; + version = "0.12.0"; src = fetchFromGitHub { owner = "umlaeute"; repo = "v4l2loopback"; rev = "v${version}"; - sha256 = "1wb5qmy13w8rl4279bwp69s4sb1x5hk5d2n563p1yk8yi567p2az"; + sha256 = "1rf8dvabksxb2sj14j32h7n7pw7byqfnpqs4m4afj3398y9y23c4"; }; hardeningDisable = [ "format" "pic" ]; diff --git a/pkgs/servers/computing/slurm/default.nix b/pkgs/servers/computing/slurm/default.nix index ba0e57bb2be8..e016c5860f74 100644 --- a/pkgs/servers/computing/slurm/default.nix +++ b/pkgs/servers/computing/slurm/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub, pkgconfig, libtool, curl -, python, munge, perl, pam, openssl +, python, munge, perl, pam, openssl, zlib , ncurses, mysql, gtk2, lua, hwloc, numactl -, readline, freeipmi, libssh2, xorg +, readline, freeipmi, libssh2, xorg, lz4 # enable internal X11 support via libssh2 , enableX11 ? true }: @@ -34,16 +34,18 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkgconfig libtool ]; buildInputs = [ - curl python munge perl pam openssl - mysql.connector-c ncurses gtk2 + curl python munge perl pam openssl zlib + mysql.connector-c ncurses gtk2 lz4 lua hwloc numactl readline freeipmi ] ++ stdenv.lib.optionals enableX11 [ libssh2 xorg.xauth ]; configureFlags = with stdenv.lib; - [ "--with-munge=${munge}" - "--with-ssl=${openssl.dev}" + [ "--with-freeipmi=${freeipmi}" "--with-hwloc=${hwloc.dev}" - "--with-freeipmi=${freeipmi}" + "--with-lz4=${lz4.dev}" + "--with-munge=${munge}" + "--with-ssl=${openssl.dev}" + "--with-zlib=${zlib}" "--sysconfdir=/etc/slurm" ] ++ (optional (gtk2 == null) "--disable-gtktest") ++ (optional enableX11 "--with-libssh2=${libssh2.dev}"); diff --git a/pkgs/servers/dico/default.nix b/pkgs/servers/dico/default.nix index 76a3f51caa2e..0e4c392c7a3e 100644 --- a/pkgs/servers/dico/default.nix +++ b/pkgs/servers/dico/default.nix @@ -2,11 +2,11 @@ , guile, python, pcre, libffi, groff }: stdenv.mkDerivation rec { - name = "dico-2.6"; + name = "dico-2.7"; src = fetchurl { url = "mirror://gnu/dico/${name}.tar.xz"; - sha256 = "0zmi041gv5nd5fmyzgdrgrsy2pvjaq9p8dvvhxwi842hiyng5b7i"; + sha256 = "0dg4aacnmlf3ljssd7dwh8z5644xzq8k1501mbsx8nz8p8a9mbsq"; }; hardeningDisable = [ "format" ]; diff --git a/pkgs/servers/dns/nsd/default.nix b/pkgs/servers/dns/nsd/default.nix index ee09024dc0eb..5f330c4f06e2 100644 --- a/pkgs/servers/dns/nsd/default.nix +++ b/pkgs/servers/dns/nsd/default.nix @@ -15,11 +15,11 @@ }: stdenv.mkDerivation rec { - name = "nsd-4.1.24"; + name = "nsd-4.1.25"; src = fetchurl { url = "https://www.nlnetlabs.nl/downloads/nsd/${name}.tar.gz"; - sha256 = "04ck8ia6xq1xqdk2g922262xywzd070pl4iad7c0lqclwk48gdjg"; + sha256 = "0zyzjd3wmq258jiry62ci1z23qfd0rc5ggnpmybc60xvpddgynwg"; }; prePatch = '' diff --git a/pkgs/servers/emby/default.nix b/pkgs/servers/emby/default.nix index 932d070577e6..12b0dde0c9b4 100644 --- a/pkgs/servers/emby/default.nix +++ b/pkgs/servers/emby/default.nix @@ -39,7 +39,7 @@ stdenv.mkDerivation rec { --prefix LD_LIBRARY_PATH : "${stdenv.lib.makeLibraryPath [ sqlite ]}" \ - --add-flags "$out/opt/emby-server/EmbyServer.dll -programdata /var/lib/emby/ProgramData-Server -ffmpeg ${ffmpeg}/bin/ffmpeg -ffprobe ${ffmpeg}/bin/ffprobe" + --add-flags "$out/opt/emby-server/EmbyServer.dll -ffmpeg ${ffmpeg}/bin/ffmpeg -ffprobe ${ffmpeg}/bin/ffprobe" ''; meta = with stdenv.lib; { diff --git a/pkgs/servers/http/nginx/mainline.nix b/pkgs/servers/http/nginx/mainline.nix index 49f212a8fe57..f830f0acee35 100644 --- a/pkgs/servers/http/nginx/mainline.nix +++ b/pkgs/servers/http/nginx/mainline.nix @@ -1,6 +1,6 @@ { callPackage, ... }@args: callPackage ./generic.nix (args // { - version = "1.15.3"; - sha256 = "11dysslkz76cdzhshc6w5qivdplk10pjpb73li0d1sz2qf8zp4ck"; + version = "1.15.5"; + sha256 = "0vxfbnc1794al60d9mhjw1w72x5jslfwq51vvs38568liyd8hfhs"; }) diff --git a/pkgs/servers/monitoring/prometheus/alertmanager.nix b/pkgs/servers/monitoring/prometheus/alertmanager.nix index 38b789261773..516a537bb247 100644 --- a/pkgs/servers/monitoring/prometheus/alertmanager.nix +++ b/pkgs/servers/monitoring/prometheus/alertmanager.nix @@ -2,7 +2,7 @@ buildGoPackage rec { name = "alertmanager-${version}"; - version = "0.15.1"; + version = "0.15.2"; rev = "v${version}"; goPackagePath = "github.com/prometheus/alertmanager"; @@ -11,7 +11,7 @@ buildGoPackage rec { inherit rev; owner = "prometheus"; repo = "alertmanager"; - sha256 = "110l8xy3bkgq137hvvz2v5cr464j02fy43lvgd3l8n5v8qmv81vy"; + sha256 = "1r4j22jnxayicz9hn0pwm77cgzzywr5haq0hwz6sx5j2xwjmnwm7"; }; # Tests exist, but seem to clash with the firewall. diff --git a/pkgs/servers/search/groonga/default.nix b/pkgs/servers/search/groonga/default.nix index c346d6bd37b7..861bd7fe5ed5 100644 --- a/pkgs/servers/search/groonga/default.nix +++ b/pkgs/servers/search/groonga/default.nix @@ -7,11 +7,11 @@ stdenv.mkDerivation rec { name = "groonga-${version}"; - version = "8.0.6"; + version = "8.0.7"; src = fetchurl { url = "https://packages.groonga.org/source/groonga/${name}.tar.gz"; - sha256 = "1q00p02jprbsx2c6l3dnv2m04pzxlfag4j1pan0jlb4g3fvb20wf"; + sha256 = "040q525qdlxlypgs7jzklndshdvd5shzss67lcs6xhkbs0f977cc"; }; buildInputs = with stdenv.lib; diff --git a/pkgs/shells/any-nix-shell/default.nix b/pkgs/shells/any-nix-shell/default.nix new file mode 100644 index 000000000000..21f40858ea28 --- /dev/null +++ b/pkgs/shells/any-nix-shell/default.nix @@ -0,0 +1,27 @@ +{ stdenv, fetchFromGitHub, makeWrapper }: + +stdenv.mkDerivation rec { + name = "any-nix-shell-${version}"; + version = "1.1.0"; + + src = fetchFromGitHub { + owner = "haslersn"; + repo = "any-nix-shell"; + rev = "v${version}"; + sha256 = "02cv86csk1m8nlh2idvh7bjw43lpssmdawya2jhr4bam2606yzdv"; + }; + + nativeBuildInputs = [ makeWrapper ]; + installPhase = '' + mkdir -p $out/bin + cp -r bin $out + wrapProgram $out/bin/any-nix-shell --prefix PATH ":" $out/bin + ''; + + meta = with stdenv.lib; { + description = "fish and zsh support for nix-shell"; + license = licenses.mit; + homepage = https://github.com/haslersn/any-nix-shell; + maintainers = with maintainers; [ haslersn ]; + }; +} \ No newline at end of file diff --git a/pkgs/tools/X11/dex/default.nix b/pkgs/tools/X11/dex/default.nix index fd0c0503de9f..9387c62c2a51 100644 --- a/pkgs/tools/X11/dex/default.nix +++ b/pkgs/tools/X11/dex/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, python3 }: +{ stdenv, fetchFromGitHub, python3, fetchpatch }: stdenv.mkDerivation rec { program = "dex"; @@ -16,6 +16,13 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ python3.pkgs.sphinx ]; makeFlags = [ "PREFIX=$(out)" "VERSION=$(version)" ]; + patches = [ + (fetchpatch { + url = https://github.com/jceb/dex/commit/107358ddf5e1ca4fa56ef1a7ab161dc3b6adc45a.patch; + sha256 = "06dfkfzxp8199by0jc5wim8g8qw38j09dq9p6n9w4zaasla60pjq"; + }) + ]; + meta = with stdenv.lib; { description = "A program to generate and execute DesktopEntry files of the Application type"; homepage = https://github.com/jceb/dex; diff --git a/pkgs/tools/admin/aws-env/default.nix b/pkgs/tools/admin/aws-env/default.nix new file mode 100644 index 000000000000..19f149b02274 --- /dev/null +++ b/pkgs/tools/admin/aws-env/default.nix @@ -0,0 +1,26 @@ +{ stdenv, buildGoPackage, fetchFromGitHub, lib }: + +buildGoPackage rec { + pname = "aws-env"; + version = "0.4"; + name = "${pname}-${version}"; + rev = "v${version}"; + + goPackagePath = "github.com/Droplr/aws-env"; + + src = fetchFromGitHub { + owner = "Droplr"; + repo = pname; + inherit rev; + sha256 = "0pw1qz1nn0ig90p8d8c1qcwsdz0m9w63ib07carhh86gw55425j7"; + }; + + goDeps = ./deps.nix; + + meta = with lib; { + description = "Secure way to handle environment variables in Docker and envfile with AWS Parameter Store"; + homepage = "https://github.com/Droplr/aws-env"; + license = licenses.mit; + maintainers = with maintainers; [ srhb ]; + }; +} diff --git a/pkgs/tools/admin/aws-env/deps.nix b/pkgs/tools/admin/aws-env/deps.nix new file mode 100644 index 000000000000..891a6ecb5962 --- /dev/null +++ b/pkgs/tools/admin/aws-env/deps.nix @@ -0,0 +1,12 @@ +# This file was generated by https://github.com/kamilchm/go2nix v1.2.1 +[ + { + goPackagePath = "github.com/aws/aws-sdk-go"; + fetch = { + type = "git"; + url = "https://github.com/aws/aws-sdk-go"; + rev = "5f03c87445c9dcd6aa831a76a77170919265aa97"; + sha256 = "146rwinw2x4r0f2pixv62b7mmhvnnfvvjmfaj6dqjxrhp0imcxdi"; + }; + } +] diff --git a/pkgs/tools/filesystems/f2fs-tools/default.nix b/pkgs/tools/filesystems/f2fs-tools/default.nix index 20e1853a3af6..a1428a257742 100644 --- a/pkgs/tools/filesystems/f2fs-tools/default.nix +++ b/pkgs/tools/filesystems/f2fs-tools/default.nix @@ -5,7 +5,7 @@ stdenv.mkDerivation rec { version = "1.11.0"; src = fetchgit { - url = "git://git.kernel.org/pub/scm/linux/kernel/git/jaegeuk/f2fs-tools.git"; + url = "https://git.kernel.org/pub/scm/linux/kernel/git/jaegeuk/f2fs-tools.git"; rev = "refs/tags/v${version}"; sha256 = "188yv77ga466wpzbirsx6vspym8idaschgi7cx92z4jwqpnkk5gv"; }; diff --git a/pkgs/tools/graphics/asymptote/default.nix b/pkgs/tools/graphics/asymptote/default.nix index a0bf0a434471..102ffae5f9d0 100644 --- a/pkgs/tools/graphics/asymptote/default.nix +++ b/pkgs/tools/graphics/asymptote/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl +{stdenv, fetchurl, fetchpatch , freeglut, ghostscriptX, imagemagick, fftw , boehmgc, libGLU, libGL, mesa_noglu, ncurses, readline, gsl, libsigsegv , python, zlib, perl, texLive, texinfo, xz @@ -33,6 +33,15 @@ stdenv.mkDerivation { inherit (s) url sha256; }; + patches = [ + # Remove when updating from 2.47 to 2.48 + # Compatibility with BoehmGC 7.6.8 + (fetchpatch { + url = "https://github.com/vectorgraphics/asymptote/commit/38a59370dc5ac720c29e1424614a10f7384b943f.patch"; + sha256 = "0c3d11hzxxaqh24kfw9y8zvlid54kk40rx2zajx7jwl12gga05s1"; + }) + ]; + preConfigure = '' export HOME="$PWD" patchShebangs . diff --git a/pkgs/tools/graphics/fbv/default.nix b/pkgs/tools/graphics/fbv/default.nix new file mode 100644 index 000000000000..c7fab1710672 --- /dev/null +++ b/pkgs/tools/graphics/fbv/default.nix @@ -0,0 +1,25 @@ +{ stdenv, fetchurl, getopt, libjpeg, libpng12, libungif }: + +stdenv.mkDerivation rec { + name = "fbv-1.0b"; + + src = fetchurl { + url = "http://s-tech.elsat.net.pl/fbv/${name}.tar.gz"; + sha256 = "0g5b550vk11l639y8p5sx1v1i6ihgqk0x1hd0ri1bc2yzpdbjmcv"; + }; + + buildInputs = [ getopt libjpeg libpng12 libungif ]; + + enableParallelBuilding = true; + + preInstall = '' + mkdir -p $out/{bin,man/man1} + ''; + + meta = with stdenv.lib; { + description = "View pictures on a linux framebuffer device"; + homepage = http://s-tech.elsat.net.pl/fbv/; + license = licenses.gpl2; + maintainers = with maintainers; [ peterhoeg ]; + }; +} diff --git a/pkgs/tools/graphics/gnuplot/default.nix b/pkgs/tools/graphics/gnuplot/default.nix index f2be9fafc605..8de7ca3262cf 100644 --- a/pkgs/tools/graphics/gnuplot/default.nix +++ b/pkgs/tools/graphics/gnuplot/default.nix @@ -19,11 +19,11 @@ let withX = libX11 != null && !aquaterm && !stdenv.isDarwin; in stdenv.mkDerivation rec { - name = "gnuplot-5.2.4"; + name = "gnuplot-5.2.5"; src = fetchurl { url = "mirror://sourceforge/gnuplot/${name}.tar.gz"; - sha256 = "1jvh8xmd2cvrhlsg88kxwh55wkwx31sg50v1n59slfippl0g058m"; + sha256 = "1ajw8xcb1kg2vy8n3rhrz71knjr2yivfavv9lqqzvp1dwv6b5783"; }; nativeBuildInputs = [ makeWrapper pkgconfig texinfo ] ++ lib.optional withQt qttools; diff --git a/pkgs/tools/graphics/vips/default.nix b/pkgs/tools/graphics/vips/default.nix index e2688e930cf6..489442e4c2a4 100644 --- a/pkgs/tools/graphics/vips/default.nix +++ b/pkgs/tools/graphics/vips/default.nix @@ -1,24 +1,34 @@ -{ stdenv, fetchurl, pkgconfig, glib, libxml2, expat, +{ stdenv, pkgconfig, glib, libxml2, expat, fftw, orc, lcms, imagemagick, openexr, libtiff, libjpeg, libgsf, libexif, ApplicationServices, - python27, libpng ? null + python27, libpng ? null, + fetchFromGitHub, + autoreconfHook, + gtk-doc, + gobjectIntrospection, }: stdenv.mkDerivation rec { name = "vips-${version}"; - version = "8.6.5"; + version = "8.7.0"; - src = fetchurl { - url = "https://github.com/jcupitt/libvips/releases/download/v${version}/${name}.tar.gz"; - sha256 = "1nymm4vzscb68aifin9q742ff64b4k4ddppq1060w8hf6h7ay0l7"; + src = fetchFromGitHub { + owner = "libvips"; + repo = "libvips"; + rev = "v${version}"; + sha256 = "1dwcpmpqbgb9lkajnqv50mrsn97mxbxpq6b5aya7fgfkgdnrs9sw"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkgconfig autoreconfHook gtk-doc gobjectIntrospection ]; buildInputs = [ glib libxml2 fftw orc lcms imagemagick openexr libtiff libjpeg libgsf libexif python27 libpng expat ] ++ stdenv.lib.optional stdenv.isDarwin ApplicationServices; + autoreconfPhase = '' + ./autogen.sh + ''; + meta = with stdenv.lib; { homepage = http://www.vips.ecs.soton.ac.uk; description = "Image processing system for large images"; diff --git a/pkgs/tools/inputmethods/triggerhappy/default.nix b/pkgs/tools/inputmethods/triggerhappy/default.nix index 719d86b3a389..ec8ac8845597 100644 --- a/pkgs/tools/inputmethods/triggerhappy/default.nix +++ b/pkgs/tools/inputmethods/triggerhappy/default.nix @@ -1,26 +1,23 @@ -{ stdenv, fetchurl, perl }: +{ stdenv, fetchFromGitHub, pkgconfig, perl, systemd }: stdenv.mkDerivation rec { name = "triggerhappy-${version}"; version = "0.5.0"; - src = fetchurl { - url = "https://github.com/wertarbyte/triggerhappy/archive/release/${version}.tar.gz"; - sha256 = "af0fc196202f2d35153be401769a9ad9107b5b6387146cfa8895ae9cafad631c"; + src = fetchFromGitHub { + owner = "wertarbyte"; + repo = "triggerhappy"; + rev = "release/${version}"; + sha256 = "0gb1qhrxwq7i5abd408d01a2dpf28nr1fph1fg7w7n0i5i1nnk90"; }; - buildInputs = [ perl ]; - installFlags = [ "DESTDIR=$(out)" ]; + nativeBuildInputs = [ pkgconfig perl ]; + buildInputs = [ systemd ]; - postPatch = '' - substituteInPlace Makefile --replace "/usr/" "/" - substituteInPlace Makefile --replace "/sbin/" "/bin/" - ''; + makeFlags = [ "PREFIX=$(out)" "BINDIR=$(out)/bin" ]; postInstall = '' install -D -m 644 -t "$out/etc/triggerhappy/triggers.d" "triggerhappy.conf.examples" - install -D -m 644 -t "$out/usr/lib/systemd/system" "systemd/triggerhappy.service" "systemd/triggerhappy.socket" - install -D -m 644 -t "$out/usr/lib/udev/rules.d" "udev/triggerhappy-udev.rules" ''; meta = with stdenv.lib; { @@ -34,6 +31,6 @@ stdenv.mkDerivation rec { homepage = https://github.com/wertarbyte/triggerhappy/; license = licenses.gpl3Plus; platforms = platforms.linux; - maintainers = [ maintainers.taha ]; + maintainers = with maintainers; [ jfrankenau taha ]; }; } diff --git a/pkgs/tools/misc/journaldriver/default.nix b/pkgs/tools/misc/journaldriver/default.nix index 58c9ee770b7f..e97f4048f0ff 100644 --- a/pkgs/tools/misc/journaldriver/default.nix +++ b/pkgs/tools/misc/journaldriver/default.nix @@ -2,14 +2,14 @@ rustPlatform.buildRustPackage rec { name = "journaldriver-${version}"; - version = "1.0.0"; - cargoSha256 = "04llhriwsrjqnkbjgd22nhci6zmhadclnd8r2bw5092gwdamf49k"; + version = "1.1.0"; + cargoSha256 = "03rq96hzv97wh2gbzi8sz796bqgh6pbpvdn0zy6zgq2f2sgkavsl"; src = fetchFromGitHub { - owner = "aprilabank"; + owner = "tazjin"; repo = "journaldriver"; rev = "v${version}"; - sha256 = "1163ghf7dxxchyawdaa7zdi8ly2pxmc005c2k549larbirjjbmgc"; + sha256 = "0672iq6s9klb1p37hciyl7snbjgjw98kwrbfkypv07lplc5qcnrf"; }; buildInputs = [ openssl systemd ]; @@ -17,7 +17,7 @@ rustPlatform.buildRustPackage rec { meta = with lib; { description = "Log forwarder from journald to Stackdriver Logging"; - homepage = "https://github.com/aprilabank/journaldriver"; + homepage = "https://github.com/tazjin/journaldriver"; license = licenses.gpl3; maintainers = [ maintainers.tazjin ]; platforms = platforms.linux; diff --git a/pkgs/tools/misc/systrayhelper/default.nix b/pkgs/tools/misc/systrayhelper/default.nix new file mode 100644 index 000000000000..e812d6799fea --- /dev/null +++ b/pkgs/tools/misc/systrayhelper/default.nix @@ -0,0 +1,41 @@ +{ stdenv, pkgconfig, libappindicator-gtk3, buildGoPackage, fetchFromGitHub }: + +buildGoPackage rec { + name = "systrayhelper-${version}"; + version = "0.0.3"; + rev = "0953942245566bf358ba937af840947100380e15"; + + goPackagePath = "github.com/ssbc/systrayhelper"; + + src = fetchFromGitHub { + inherit rev; + owner = "ssbc"; + repo = "systrayhelper"; + sha256 = "12xmzcw94in4m1hl4hbfdsbvkkaqrljgb67b95m1qwkkjak3q9g6"; + }; + + goDeps = ./deps.nix; + + # re date: https://github.com/NixOS/nixpkgs/pull/45997#issuecomment-418186178 + # > .. keep the derivation deterministic. Otherwise, we would have to rebuild it every time. + buildFlagsArray = [ ''-ldflags= + -X main.version=v${version} + -X main.commit=${rev} + -X main.date="nix-byrev" + -s + -w + '' ]; + + nativeBuildInputs = [ pkgconfig libappindicator-gtk3 ]; + buildInputs = [ libappindicator-gtk3 ]; + + meta = with stdenv.lib; { + description = "A systray utility written in go, using json over stdio for control and events"; + homepage = "https://github.com/ssbc/systrayhelper"; + maintainers = with maintainers; [ cryptix ]; + license = licenses.mit; + # It depends on the inputs, i guess? not sure about solaris, for instance. go supports it though + # I hope nix can figure this out?! ¯\\_(ツ)_/¯ + platforms = platforms.all; + }; +} diff --git a/pkgs/tools/misc/systrayhelper/deps.nix b/pkgs/tools/misc/systrayhelper/deps.nix new file mode 100644 index 000000000000..67ec6662d984 --- /dev/null +++ b/pkgs/tools/misc/systrayhelper/deps.nix @@ -0,0 +1,102 @@ +# file generated from Gopkg.lock using dep2nix (https://github.com/nixcloud/dep2nix) +[ + { + goPackagePath = "github.com/getlantern/context"; + fetch = { + type = "git"; + url = "https://github.com/getlantern/context"; + rev = "624d99b1798d7c5375ea1d3ca4c5b04d58f7c775"; + sha256 = "09yf9x6478a5z01hybr98zwa8ax3fx7l6wwsvdkxp3fdg9dqm13b"; + }; + } + { + goPackagePath = "github.com/getlantern/errors"; + fetch = { + type = "git"; + url = "https://github.com/getlantern/errors"; + rev = "e24b7f4ff7c70be59bbefca6b7695d68cda8b399"; + sha256 = "1wshagslgl3r07gniq0g55cqgi1j1gk0yrri5ywjz7wm8da42qcr"; + }; + } + { + goPackagePath = "github.com/getlantern/golog"; + fetch = { + type = "git"; + url = "https://github.com/getlantern/golog"; + rev = "cca714f7feb5df8e455f409b549d384441ac4578"; + sha256 = "0gnf30n38zkx356cqc6jdv1kbzy59ddqhqndwrxsm2n2zc3b5p7q"; + }; + } + { + goPackagePath = "github.com/getlantern/hex"; + fetch = { + type = "git"; + url = "https://github.com/getlantern/hex"; + rev = "083fba3033ad473db3dd31c9bb368473d37581a7"; + sha256 = "18q6rypmcqmcwlfzrrdcz08nff0a289saplvd9y3ifnfcqdw3j77"; + }; + } + { + goPackagePath = "github.com/getlantern/hidden"; + fetch = { + type = "git"; + url = "https://github.com/getlantern/hidden"; + rev = "d52a649ab33af200943bb599898dbdcfdbc94cb7"; + sha256 = "0133qmp4sjq8da5di3459vc5g5nqbpqra0f558zd95js3fdmkmsi"; + }; + } + { + goPackagePath = "github.com/getlantern/ops"; + fetch = { + type = "git"; + url = "https://github.com/getlantern/ops"; + rev = "37353306c90844c8e0591956f56611f46299d202"; + sha256 = "0q8j2963jqf3p7fcnsfinkvz71mfylrkk2xjar775zjx5a23sa5i"; + }; + } + { + goPackagePath = "github.com/getlantern/systray"; + fetch = { + type = "git"; + url = "https://github.com/getlantern/systray"; + rev = "3fd1443dac5c8297999189fe28d5836b2b075b66"; + sha256 = "1sb11n27zy8xmq0lvrpqikb53425jvwl5617cp201va6iwk1hgnh"; + }; + } + { + goPackagePath = "github.com/go-stack/stack"; + fetch = { + type = "git"; + url = "https://github.com/go-stack/stack"; + rev = "2fee6af1a9795aafbe0253a0cfbdf668e1fb8a9a"; + sha256 = "0wk25751ryyvxclyp8jdk5c3ar0cmfr8lrjb66qbg4808x66b96v"; + }; + } + { + goPackagePath = "github.com/oxtoacart/bpool"; + fetch = { + type = "git"; + url = "https://github.com/oxtoacart/bpool"; + rev = "4e1c5567d7c2dd59fa4c7c83d34c2f3528b025d6"; + sha256 = "01kk6dhkz96yhp3p5v2rjwq8mbrwrdsn6glqw7jp4h7g5za7yi95"; + }; + } + { + goPackagePath = "github.com/pkg/errors"; + fetch = { + type = "git"; + url = "https://github.com/pkg/errors"; + rev = "c059e472caf75dbe73903f6521a20abac245b17f"; + sha256 = "07xg8ym776j2w0k8445ii82lx8yz358cp1z96r739y13i1anqdzi"; + }; + } + { + goPackagePath = "golang.org/x/sys"; + fetch = { + type = "git"; + url = "https://go.googlesource.com/sys"; + rev = "d0be0721c37eeb5299f245a996a483160fc36940"; + sha256 = "081wyvfnlf842dqg03raxfz6lldlxpmyh1prix9lmrrm65arxb12"; + }; + } +] diff --git a/pkgs/tools/misc/teamocil/Gemfile b/pkgs/tools/misc/teamocil/Gemfile new file mode 100644 index 000000000000..046ba3d536e0 --- /dev/null +++ b/pkgs/tools/misc/teamocil/Gemfile @@ -0,0 +1,2 @@ +source 'https://rubygems.org' +gem 'teamocil' diff --git a/pkgs/tools/misc/teamocil/Gemfile.lock b/pkgs/tools/misc/teamocil/Gemfile.lock new file mode 100644 index 000000000000..419c2ae49d31 --- /dev/null +++ b/pkgs/tools/misc/teamocil/Gemfile.lock @@ -0,0 +1,13 @@ +GEM + remote: https://rubygems.org/ + specs: + teamocil (1.4.2) + +PLATFORMS + ruby + +DEPENDENCIES + teamocil + +BUNDLED WITH + 1.16.3 diff --git a/pkgs/tools/misc/teamocil/default.nix b/pkgs/tools/misc/teamocil/default.nix new file mode 100644 index 000000000000..2215e4d4fee7 --- /dev/null +++ b/pkgs/tools/misc/teamocil/default.nix @@ -0,0 +1,17 @@ +{ lib, bundlerEnv, ruby }: + +bundlerEnv rec { + inherit ruby; + pname = "teamocil"; + gemdir = ./.; + + meta = with lib; { + description = "A simple tool used to automatically create windows and panes in tmux with YAML files"; + homepage = https://github.com/remiprev/teamocil; + license = licenses.mit; + platforms = platforms.all; + maintainers = with maintainers; [ + zachcoyle + ]; + }; +} diff --git a/pkgs/tools/misc/teamocil/gemset.nix b/pkgs/tools/misc/teamocil/gemset.nix new file mode 100644 index 000000000000..f363d62b6d68 --- /dev/null +++ b/pkgs/tools/misc/teamocil/gemset.nix @@ -0,0 +1,10 @@ +{ + teamocil = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1l5f33faipb45xx7ds67s7dqgvjlljlcxgpgig4pg8p002vg06r2"; + type = "gem"; + }; + version = "1.4.2"; + }; +} \ No newline at end of file diff --git a/pkgs/tools/misc/teamocil/update b/pkgs/tools/misc/teamocil/update new file mode 100755 index 000000000000..58a7bd4a4539 --- /dev/null +++ b/pkgs/tools/misc/teamocil/update @@ -0,0 +1,10 @@ +#!/usr/bin/env nix-shell +#! nix-shell -i bash -p bash ruby bundler bundix + +rm Gemfile.lock +bundler install +bundix + +if [ "clean" == "$1" ]; then + rm -rf ~/.gem +fi diff --git a/pkgs/tools/networking/inadyn/default.nix b/pkgs/tools/networking/inadyn/default.nix index 8029415a98cf..47352d21c4a2 100644 --- a/pkgs/tools/networking/inadyn/default.nix +++ b/pkgs/tools/networking/inadyn/default.nix @@ -3,13 +3,13 @@ stdenv.mkDerivation rec { name = "inadyn-${version}"; - version = "2.4"; + version = "2.5"; src = fetchFromGitHub { owner = "troglobit"; repo = "inadyn"; rev = "v${version}"; - sha256 = "1h24yavp1246zn5isypvxrilp6xj2266qr52w2r24qxicr8b320y"; + sha256 = "0izhynqfj4xafsrc653wym8arwps0qim203w8l0g5z9vzfxfnvqw"; }; nativeBuildInputs = [ autoreconfHook pkgconfig ]; diff --git a/pkgs/tools/networking/netsniff-ng/default.nix b/pkgs/tools/networking/netsniff-ng/default.nix index 60f7b647eea5..8bebe973522b 100644 --- a/pkgs/tools/networking/netsniff-ng/default.nix +++ b/pkgs/tools/networking/netsniff-ng/default.nix @@ -4,14 +4,14 @@ stdenv.mkDerivation rec { name = "netsniff-ng-${version}"; - version = "0.6.4"; + version = "0.6.5"; # Upstream recommends and supports git src = fetchFromGitHub rec { repo = "netsniff-ng"; owner = repo; rev = "v${version}"; - sha256 = "0nip1gmzxq5kak41n0y0qzbhk2876fypk83q14ssy32fk49lxjly"; + sha256 = "0bcbdiik69g6jnravkkid8gxw2akg01i372msc5x1w9fh9wh2phw"; }; patches = [ ./glibc-2.26.patch ]; diff --git a/pkgs/tools/networking/pcapfix/default.nix b/pkgs/tools/networking/pcapfix/default.nix index 970844ea6d6d..5e3bf176b2c9 100644 --- a/pkgs/tools/networking/pcapfix/default.nix +++ b/pkgs/tools/networking/pcapfix/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl }: stdenv.mkDerivation rec { - name = "pcapfix-1.1.2"; + name = "pcapfix-1.1.3"; src = fetchurl { url = "https://f00l.de/pcapfix/${name}.tar.gz"; - sha256 = "0dl6pgqw6d8i5rhn6xwdx7sny16lpf771sn45c3p0l8z4mfzg6ay"; + sha256 = "0f9g6yh1dc7x1n28xs4lcwlk6sa3mpz0rbw0ddhajqidag2k07sr"; }; postPatch = ''sed -i "s|/usr|$out|" Makefile''; diff --git a/pkgs/tools/networking/quickserve/default.nix b/pkgs/tools/networking/quickserve/default.nix new file mode 100644 index 000000000000..06e5918dccd8 --- /dev/null +++ b/pkgs/tools/networking/quickserve/default.nix @@ -0,0 +1,35 @@ +{ stdenv, makeWrapper, fetchzip, python3, python3Packages, writeScript }: +let + threaded_servers = python3Packages.buildPythonPackage { + name = "threaded_servers"; + src = fetchzip { + url = https://xyne.archlinux.ca/projects/python3-threaded_servers/src/python3-threaded_servers-2018.6.tar.xz; + sha256 = "1irliz90a1dk4lyl7mrfq8qnnrfad9czvbcw1spc13zyai66iyhf"; + }; + + # stuff we don't care about pacserve + doCheck = false; + }; + wrappedPython = python3.withPackages (_: [ threaded_servers ]); +in stdenv.mkDerivation { + name = "quickserve"; + version = "2018"; + + unpackPhase = ":"; + nativeBuildInputs = [ makeWrapper ]; + + installPhase = '' + runHook preInstall + mkdir -p $out/bin + makeWrapper ${wrappedPython}/bin/python $out/bin/quickserve \ + --add-flags -mThreadedServers.PeeredQuickserve + runHook postInstall + ''; + + meta = with stdenv.lib; { + description = "A simple HTTP server for quickly sharing files."; + homepage = https://xyne.archlinux.ca/projects/quickserve/; + license = licenses.gpl2; + maintainers = with maintainers; [ lassulus ]; + }; +} diff --git a/pkgs/tools/networking/tinc/default.nix b/pkgs/tools/networking/tinc/default.nix index bf039b653cc6..a17f382557ac 100644 --- a/pkgs/tools/networking/tinc/default.nix +++ b/pkgs/tools/networking/tinc/default.nix @@ -1,12 +1,12 @@ {stdenv, fetchurl, lzo, openssl, zlib}: stdenv.mkDerivation rec { - version = "1.0.34"; + version = "1.0.35"; name = "tinc-${version}"; src = fetchurl { url = "https://www.tinc-vpn.org/packages/tinc-${version}.tar.gz"; - sha256 = "1nngdp2x5kykrgh13q5wjry8m82vahqv53csvlb22ifxvrhrnfn0"; + sha256 = "0pl92sdwrkiwgll78x0ww06hfljd07mkwm62g8x17qn3gha3pj0q"; }; buildInputs = [ lzo openssl zlib ]; diff --git a/pkgs/tools/networking/tinc/pre.nix b/pkgs/tools/networking/tinc/pre.nix index 09c737c048ae..0cc1fb99455a 100644 --- a/pkgs/tools/networking/tinc/pre.nix +++ b/pkgs/tools/networking/tinc/pre.nix @@ -2,12 +2,12 @@ stdenv.mkDerivation rec { name = "tinc-${version}"; - version = "1.1pre16"; + version = "1.1pre17"; src = fetchgit { rev = "refs/tags/release-${version}"; url = "git://tinc-vpn.org/tinc"; - sha256 = "03dsm1kxagq8srskzg649xyhbdqbbqxc84pdwrz7yakpa9m6225c"; + sha256 = "12abmx9qglchgn94a1qwgzldf2kaz77p8705ylpggzyncxv6bw2q"; }; outputs = [ "out" "man" "info" ]; diff --git a/pkgs/tools/package-management/packagekit/default.nix b/pkgs/tools/package-management/packagekit/default.nix index 2acb39c0b732..5ba387a12f82 100644 --- a/pkgs/tools/package-management/packagekit/default.nix +++ b/pkgs/tools/package-management/packagekit/default.nix @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { name = "packagekit-${version}"; - version = "1.1.10"; + version = "1.1.11"; outputs = [ "out" "dev" ]; @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { owner = "hughsie"; repo = "PackageKit"; rev = "PACKAGEKIT_${lib.replaceStrings ["."] ["_"] version}"; - sha256 = "11drd6ixx75q3w12am3z1npwllq1kxnhbxv0npng92c69kn291zs"; + sha256 = "0zr4b3ax8lcd3wkgj1cybs2cqf38br2nvl91qkw9g2jmzlq6bvic"; }; buildInputs = [ glib polkit python gobjectIntrospection vala_0_38 ] diff --git a/pkgs/tools/security/vault/default.nix b/pkgs/tools/security/vault/default.nix index a0f7d0f6287f..597047a679bb 100644 --- a/pkgs/tools/security/vault/default.nix +++ b/pkgs/tools/security/vault/default.nix @@ -11,13 +11,13 @@ let }; in stdenv.mkDerivation rec { name = "vault-${version}"; - version = "0.11.1"; + version = "0.11.2"; src = fetchFromGitHub { owner = "hashicorp"; repo = "vault"; rev = "v${version}"; - sha256 = "1ydnb9z6rd5ck6wza5ir6927xq375i1a9zh5p2xanp29ly6ijiiz"; + sha256 = "0lckpfp1yw6rfq2cardsp2qjiajg706qjk98cycrlsa5nr2csafa"; }; nativeBuildInputs = [ go gox removeReferencesTo ]; diff --git a/pkgs/tools/system/plan9port/builder.sh b/pkgs/tools/system/plan9port/builder.sh index 6085e6f841ac..7729bae897c0 100644 --- a/pkgs/tools/system/plan9port/builder.sh +++ b/pkgs/tools/system/plan9port/builder.sh @@ -5,7 +5,8 @@ export PLAN9_TARGET=$PLAN9 configurePhase() { - echo CFLAGS=\"-I${fontconfig_dev}/include -I${libXt_dev}/include -I${freetype_dev}/include\" > LOCAL.config + echo CFLAGS=\"-I${fontconfig_dev}/include -I${xproto_exp}/include -I${xextproto_exp}/include -I${libX11_dev}/include -I${libXt_dev}/include -I${libXext_dev}/include -I${freetype_dev}/include -I${zlib_dev}/include\" > LOCAL.config + echo LDFLAGS=\"-L${fontconfig_lib}/lib -L${xproto_exp}/lib -L${xextproto_exp}/lib -L${libX11_exp}/lib -L${libXt_exp}/lib -L${libXext_exp}/lib -L${freetype_exp}/lib -L${zlib_exp}/lib\" >> LOCAL.config echo X11=\"${libXt_dev}/include\" >> LOCAL.config for f in `grep -l -r /usr/local/plan9`; do diff --git a/pkgs/tools/system/plan9port/default.nix b/pkgs/tools/system/plan9port/default.nix index dc588e54aea8..c71c70b57a7a 100644 --- a/pkgs/tools/system/plan9port/default.nix +++ b/pkgs/tools/system/plan9port/default.nix @@ -2,24 +2,23 @@ , xproto ? null , xextproto ? null , libXext ? null +, zlib ? null # For building web manuals , perl ? null , samChordingSupport ? true #from 9front }: stdenv.mkDerivation rec { - name = "plan9port-2016-04-18"; + name = "plan9port-2018-09-20"; src = fetchgit { # Latest, same as on github, google code is old - url = "https://plan9port.googlesource.com/plan9"; - rev = "35d43924484b88b9816e40d2f6bff4547f3eec47"; - sha256 = "1dvg580rkav09fra2gnrzh271b4fw6bgqfv4ib7ds5k3j55ahcdc"; + url = "https://github.com/9fans/plan9port.git"; + rev = "a82a8b6368274d77d42f526e379b74e79c137e26"; + sha256 = "1icywcnqv0dz1mkm7giakii536nycp0ajxnmzkx4944dxsmhcwq1"; }; - patches = [ - ./fontsrv.patch - ] ++ stdenv.lib.optionals samChordingSupport [ ./sam_chord_9front.patch ]; + patches = stdenv.lib.optionals samChordingSupport [ ./sam_chord_9front.patch ]; postPatch = '' #hardcoded path @@ -59,11 +58,24 @@ stdenv.mkDerivation rec { homepage = http://swtch.com/plan9port/; description = "Plan 9 from User Space"; license = licenses.lpl-102; - maintainers = with maintainers; [ ftrvxmtrx kovirobi ]; + maintainers = with maintainers; [ bbarker ftrvxmtrx kovirobi ]; platforms = platforms.unix; }; - + + libX11_dev = libX11.dev; libXt_dev = libXt.dev; + libXext_dev = libXext.dev; fontconfig_dev = fontconfig.dev; freetype_dev = freetype.dev; + zlib_dev = zlib.dev; + + xproto_exp = xproto; + xextproto_exp = xextproto; + libX11_exp = libX11; + libXt_exp = libXt; + libXext_exp = libXext; + freetype_exp = freetype; + zlib_exp = zlib; + + fontconfig_lib = fontconfig.lib; } diff --git a/pkgs/tools/system/plan9port/fontsrv.patch b/pkgs/tools/system/plan9port/fontsrv.patch deleted file mode 100644 index 49fd9c04231b..000000000000 --- a/pkgs/tools/system/plan9port/fontsrv.patch +++ /dev/null @@ -1,14 +0,0 @@ -diff -r dc0640f14d07 src/cmd/mkfile ---- a/src/cmd/mkfile Tue Mar 25 23:23:10 2014 -0400 -+++ b/src/cmd/mkfile Mon Apr 14 22:36:05 2014 +0530 -@@ -4,8 +4,8 @@ - - <$PLAN9/src/mkmany - --BUGGERED='CVS|faces|factotum|fontsrv|lp|ip|mailfs|upas|vncv|mnihongo|mpm|index|u9fs|secstore|smugfs|snarfer' --DIRS=lex `ls -l |sed -n 's/^d.* //p' |egrep -v "^($BUGGERED)$"|egrep -v '^lex$'` $FONTSRV -+BUGGERED='CVS|faces|factotum|lp|ip|mailfs|upas|vncv|mnihongo|mpm|index|u9fs|secstore|smugfs|snarfer' -+DIRS=lex `ls -l |sed -n 's/^d.* //p' |egrep -v "^($BUGGERED)$"|egrep -v '^lex$'` - - <$PLAN9/src/mkdirs - diff --git a/pkgs/tools/typesetting/scdoc/default.nix b/pkgs/tools/typesetting/scdoc/default.nix index bdf074b558e7..270fd7da1717 100644 --- a/pkgs/tools/typesetting/scdoc/default.nix +++ b/pkgs/tools/typesetting/scdoc/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "scdoc-${version}"; - version = "1.4.2"; + version = "1.5.1"; src = fetchurl { - url = "https://git.sr.ht/~sircmpwn/scdoc/snapshot/scdoc-${version}.tar.xz"; - sha256 = "1hhvg9cifx1v8b5i91lgq5cjdcskzl3rz7vwmwdq7ad0nqnykz82"; + url = "https://git.sr.ht/~sircmpwn/scdoc/archive/${version}.tar.gz"; + sha256 = "0hcwpyy97afwq40qn8jq75f1b2p0172lil1v0hs9a0rislpqk5nm"; }; postPatch = '' @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { scdoc is a simple man page generator written for POSIX systems written in C99. ''; - homepage = https://git.sr.ht/~sircmpwn/scdoc/; + homepage = https://git.sr.ht/~sircmpwn/scdoc; license = licenses.mit; platforms = platforms.unix; maintainers = with maintainers; [ primeos ]; diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index 92a0f2b45709..fe0d3816413e 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -329,7 +329,6 @@ mapAliases ({ callPackage_i686 = pkgsi686Linux.callPackage; inherit (ocaml-ng) # added 2016-09-14 - ocamlPackages_3_10_0 ocamlPackages_3_11_2 ocamlPackages_3_12_1 ocamlPackages_4_00_1 ocamlPackages_4_01_0 ocamlPackages_4_02 ocamlPackages_4_03 ocamlPackages_latest; @@ -348,10 +347,6 @@ mapAliases ({ gst-ffmpeg = pkgs.gst-ffmpeg; }; } // (with ocaml-ng; { # added 2016-09-14 - ocaml_3_08_0 = ocamlPackages_3_08_0.ocaml; - ocaml_3_10_0 = ocamlPackages_3_10_0.ocaml; - ocaml_3_11_2 = ocamlPackages_3_11_2.ocaml; - ocaml_3_12_1 = ocamlPackages_3_12_1.ocaml; ocaml_4_00_1 = ocamlPackages_4_00_1.ocaml; ocaml_4_01_0 = ocamlPackages_4_01_0.ocaml; ocaml_4_02 = ocamlPackages_4_02.ocaml; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 15c4a5944a16..becd4148f1f6 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -585,6 +585,8 @@ with pkgs; awslogs = callPackage ../tools/admin/awslogs { }; + aws-env = callPackage ../tools/admin/aws-env { }; + aws-okta = callPackage ../tools/security/aws-okta { }; aws-rotate-key = callPackage ../tools/admin/aws-rotate-key { }; @@ -2334,6 +2336,8 @@ with pkgs; tealdeer = callPackage ../tools/misc/tealdeer { }; + teamocil = callPackage ../tools/misc/teamocil { }; + uudeview = callPackage ../tools/misc/uudeview { }; uutils-coreutils = callPackage ../tools/misc/uutils-coreutils { @@ -2594,6 +2598,8 @@ with pkgs; feedgnuplot = callPackage ../tools/graphics/feedgnuplot { }; + fbv = callPackage ../tools/graphics/fbv { }; + fim = callPackage ../tools/graphics/fim { }; flac123 = callPackage ../applications/audio/flac123 { }; @@ -4052,6 +4058,8 @@ with pkgs; mgba = libsForQt5.callPackage ../misc/emulators/mgba { }; + midisheetmusic = callPackage ../applications/audio/midisheetmusic { }; + mikutter = callPackage ../applications/networking/instant-messengers/mikutter { }; mimeo = callPackage ../tools/misc/mimeo { }; @@ -4917,6 +4925,8 @@ with pkgs; qtikz = libsForQt5.callPackage ../applications/graphics/ktikz { }; + quickserve = callPackage ../tools/networking/quickserve { }; + quicktun = callPackage ../tools/networking/quicktun { }; quilt = callPackage ../development/tools/quilt { }; @@ -5497,6 +5507,8 @@ with pkgs; staruml = callPackage ../tools/misc/staruml { inherit (gnome2) GConf; libgcrypt = libgcrypt_1_5; }; + systrayhelper = callPackage ../tools/misc/systrayhelper {}; + otter-browser = qt5.callPackage ../applications/networking/browsers/otter {}; privoxy = callPackage ../tools/networking/privoxy { @@ -5599,6 +5611,8 @@ with pkgs; tiny8086 = callPackage ../applications/virtualization/8086tiny { }; + tinyemu = callPackage ../applications/virtualization/tinyemu { }; + tinyproxy = callPackage ../tools/networking/tinyproxy {}; tio = callPackage ../tools/misc/tio { }; @@ -5793,6 +5807,8 @@ with pkgs; vampire = callPackage ../applications/science/logic/vampire {}; + vk-messenger = callPackage ../applications/networking/instant-messengers/vk-messenger {}; + volatility = callPackage ../tools/security/volatility { }; vbetool = callPackage ../tools/system/vbetool { }; @@ -6301,6 +6317,8 @@ with pkgs; runtimeShell = "${runtimeShellPackage}${runtimeShellPackage.shellPath}"; runtimeShellPackage = bash; + any-nix-shell = callPackage ../shells/any-nix-shell { }; + bash = lowPrio (callPackage ../shells/bash/4.4.nix { }); # WARNING: this attribute is used by nix-shell so it shouldn't be removed/renamed @@ -6470,6 +6488,8 @@ with pkgs; scry = callPackage ../development/tools/scry {}; + dbmate = callPackage ../development/tools/database/dbmate { }; + devpi-client = callPackage ../development/tools/devpi-client {}; devpi-server = callPackage ../development/tools/devpi-server {}; @@ -9074,6 +9094,7 @@ with pkgs; bobcat = callPackage ../development/libraries/bobcat { }; boehmgc = callPackage ../development/libraries/boehm-gc { }; + boehmgc_766 = callPackage ../development/libraries/boehm-gc/7.6.6.nix { }; boolstuff = callPackage ../development/libraries/boolstuff { }; @@ -10110,9 +10131,7 @@ with pkgs; jsoncpp = callPackage ../development/libraries/jsoncpp { }; - jsonnet = callPackage ../development/compilers/jsonnet { - emscripten = emscripten.override {python=python2;}; - }; + jsonnet = callPackage ../development/compilers/jsonnet { }; jsonrpc-glib = callPackage ../development/libraries/jsonrpc-glib { }; @@ -11954,6 +11973,8 @@ with pkgs; rabbitmq-java-client = callPackage ../development/libraries/rabbitmq-java-client {}; + rapidcheck = callPackage ../development/libraries/rapidcheck {}; + rapidjson = callPackage ../development/libraries/rapidjson {}; raul = callPackage ../development/libraries/audio/raul { }; @@ -12549,6 +12570,13 @@ with pkgs; stdenv = overrideCC stdenv gcc6; }; + webkitgtk222x = callPackage ../development/libraries/webkitgtk/2.22.nix { + harfbuzz = harfbuzzFull; + inherit (gst_all_1) gst-plugins-base gst-plugins-bad; + stdenv = overrideCC stdenv gcc6; + }; + + webkitgtk24x-gtk2 = webkitgtk24x-gtk3.override { withGtk2 = true; enableIntrospection = false; @@ -14784,7 +14812,7 @@ with pkgs; ''; })); - systemd-wait = callPackages ../os-specific/linux/systemd-wait { }; + systemd-wait = callPackage ../os-specific/linux/systemd-wait { }; sysvinit = callPackage ../os-specific/linux/sysvinit { }; @@ -16389,6 +16417,8 @@ with pkgs; eterm = callPackage ../applications/misc/eterm { }; + eteroj.lv2 = libsForQt5.callPackage ../applications/audio/eteroj.lv2 { }; + etherape = callPackage ../applications/networking/sniffers/etherape { }; evilvte = callPackage ../applications/misc/evilvte { @@ -16438,6 +16468,8 @@ with pkgs; fig2dev = callPackage ../applications/graphics/fig2dev { }; + FIL-plugins = callPackage ../applications/audio/FIL-plugins { }; + flacon = callPackage ../applications/audio/flacon { }; flexget = callPackage ../applications/networking/flexget { }; @@ -17026,6 +17058,8 @@ with pkgs; gtk = gtk3; }; + howl = callPackage ../applications/editors/howl { }; + ht = callPackage ../applications/editors/ht { }; hubstaff = callPackage ../applications/misc/hubstaff { }; @@ -18756,6 +18790,11 @@ with pkgs; lightdm_qt = lightdm.override { withQt5 = true; }; + lightdm-enso-os-greeter = callPackage ../applications/display-managers/lightdm-enso-os-greeter { + inherit (gnome3) libgee; + inherit (xorg) libX11 libXdmcp libpthreadstubs; + }; + lightdm_gtk_greeter = callPackage ../applications/display-managers/lightdm/gtk-greeter.nix { inherit (xfce) exo; }; @@ -18947,6 +18986,8 @@ with pkgs; gconf = gnome2.GConf; }; + tambura = callPackage ../applications/audio/tambura { }; + teamspeak_client = libsForQt5.callPackage ../applications/networking/instant-messengers/teamspeak/client.nix { }; teamspeak_server = callPackage ../applications/networking/instant-messengers/teamspeak/server.nix { }; @@ -19890,6 +19931,10 @@ with pkgs; blobby = callPackage ../games/blobby { }; + boohu = callPackage ../games/boohu { }; + + boohu-ansi = callPackage ../games/boohu { ansiTag = true; }; + braincurses = callPackage ../games/braincurses { }; brogue = callPackage ../games/brogue { }; @@ -21132,12 +21177,11 @@ with pkgs; boogie = dotnetPackages.Boogie; inherit (callPackage ./coq-packages.nix { - inherit (ocaml-ng) ocamlPackages_3_12_1 - ocamlPackages_4_02 + inherit (ocaml-ng) ocamlPackages_4_02 ocamlPackages_4_05 ; }) mkCoqPackages - coq_8_3 coq_8_4 coq_8_5 coq_8_6 coq_8_7 coq_8_8 + coq_8_4 coq_8_5 coq_8_6 coq_8_7 coq_8_8 coqPackages_8_5 coqPackages_8_6 coqPackages_8_7 coqPackages_8_8 coqPackages coq ; @@ -21216,10 +21260,6 @@ with pkgs; ltl2ba = callPackage ../applications/science/logic/ltl2ba {}; - inherit (ocaml-ng.ocamlPackages_3_11_2) matita; - - matita_130312 = lowPrio ocamlPackages.matita_130312; - metis-prover = callPackage ../applications/science/logic/metis-prover { }; mcrl2 = callPackage ../applications/science/logic/mcrl2 { }; diff --git a/pkgs/top-level/coq-packages.nix b/pkgs/top-level/coq-packages.nix index bc21137903af..305d9ba351ba 100644 --- a/pkgs/top-level/coq-packages.nix +++ b/pkgs/top-level/coq-packages.nix @@ -1,6 +1,5 @@ { lib, callPackage, newScope, recurseIntoAttrs , gnumake3 -, ocamlPackages_3_12_1 , ocamlPackages_4_02 , ocamlPackages_4_05 }: @@ -56,12 +55,6 @@ in rec { let self = mkCoqPackages' self coq; in filterCoqPackages coq self; - coq_8_3 = callPackage ../applications/science/logic/coq/8.3.nix { - make = gnumake3; - inherit (ocamlPackages_3_12_1) ocaml findlib; - camlp5 = ocamlPackages_3_12_1.camlp5_transitional; - lablgtk = ocamlPackages_3_12_1.lablgtk_2_14; - }; coq_8_4 = callPackage ../applications/science/logic/coq/8.4.nix { inherit (ocamlPackages_4_02) ocaml findlib lablgtk; camlp5 = ocamlPackages_4_02.camlp5_transitional; diff --git a/pkgs/top-level/ocaml-packages.nix b/pkgs/top-level/ocaml-packages.nix index a6214abbc367..5f6d6fc9bc1d 100644 --- a/pkgs/top-level/ocaml-packages.nix +++ b/pkgs/top-level/ocaml-packages.nix @@ -88,18 +88,6 @@ let then callPackage ../development/tools/ocaml/camlp4 { } else null; - camlp5_old_strict = - if lib.versionOlder "4.00" ocaml.version - then camlp5_6_strict - else callPackage ../development/tools/ocaml/camlp5/5.15.nix { }; - - camlp5_old_transitional = - if lib.versionOlder "4.00" ocaml.version - then camlp5_6_transitional - else callPackage ../development/tools/ocaml/camlp5/5.15.nix { - transitional = true; - }; - camlp5_6_strict = callPackage ../development/tools/ocaml/camlp5 { }; camlp5_6_transitional = callPackage ../development/tools/ocaml/camlp5 { @@ -238,7 +226,16 @@ let easy-format = callPackage ../development/ocaml-modules/easy-format { }; - eliom = callPackage ../development/ocaml-modules/eliom { }; + eliom = callPackage ../development/ocaml-modules/eliom { + js_of_ocaml-lwt = js_of_ocaml-lwt.override { + ocaml_lwt = lwt3; + lwt_log = lib.overrideDerivation + (lwt_log.override { lwt = lwt3; }) + (_: { inherit (lwt3) src; }); + }; + lwt_react = lwt_react.override { lwt = lwt3; }; + lwt_ssl = lwt_ssl.override { lwt = lwt3; }; + }; elpi = callPackage ../development/ocaml-modules/elpi { }; @@ -401,25 +398,27 @@ let lwt2 = callPackage ../development/ocaml-modules/lwt/legacy.nix { }; lwt3 = if lib.versionOlder "4.02" ocaml.version - then callPackage ../development/ocaml-modules/lwt { } + then callPackage ../development/ocaml-modules/lwt/3.x.nix { } else throw "lwt3 is not available for OCaml ${ocaml.version}"; - ocaml_lwt = if lib.versionOlder "4.02" ocaml.version then lwt3 else lwt2; + lwt4 = callPackage ../development/ocaml-modules/lwt/4.x.nix { }; + + ocaml_lwt = if lib.versionOlder "4.02" ocaml.version then lwt4 else lwt2; lwt_log = callPackage ../development/ocaml-modules/lwt_log { - lwt = lwt3; + lwt = lwt4; }; lwt_ppx = callPackage ../development/ocaml-modules/lwt/ppx.nix { - lwt = lwt3; + lwt = ocaml_lwt; }; lwt_react = callPackage ../development/ocaml-modules/lwt_react { - lwt = lwt3; + lwt = ocaml_lwt; }; lwt_ssl = callPackage ../development/ocaml-modules/lwt_ssl { - lwt = lwt3; + lwt = ocaml_lwt; }; macaque = callPackage ../development/ocaml-modules/macaque { }; @@ -535,7 +534,10 @@ let ocplib-simplex = callPackage ../development/ocaml-modules/ocplib-simplex { }; - ocsigen_server = callPackage ../development/ocaml-modules/ocsigen-server { }; + ocsigen_server = callPackage ../development/ocaml-modules/ocsigen-server { + lwt_react = lwt_react.override { lwt = lwt3; }; + lwt_ssl = lwt_ssl.override { lwt = lwt3; }; + }; ocsigen-start = callPackage ../development/ocaml-modules/ocsigen-start { }; @@ -545,7 +547,9 @@ let odoc = callPackage ../development/ocaml-modules/odoc { }; - ojquery = callPackage ../development/ocaml-modules/ojquery { }; + ojquery = callPackage ../development/ocaml-modules/ojquery { + ocaml_lwt = lwt3; + }; omd = callPackage ../development/ocaml-modules/omd { }; @@ -1047,12 +1051,6 @@ let camlp5 = camlp5_strict; }; - matita = callPackage ../applications/science/logic/matita { - ulex08 = ulex08.override { camlp5 = camlp5_old_transitional; }; - }; - - matita_130312 = callPackage ../applications/science/logic/matita/130312.nix { }; - }; in (ocamlPackages.janeStreet // ocamlPackages); in lib.fix' (lib.extends overrides packageSet); @@ -1061,14 +1059,6 @@ in rec inherit mkOcamlPackages; - ocamlPackages_3_08_0 = mkOcamlPackages (callPackage ../development/compilers/ocaml/3.08.0.nix { }) (self: super: { lablgtk = self.lablgtk_2_14; }); - - ocamlPackages_3_10_0 = mkOcamlPackages (callPackage ../development/compilers/ocaml/3.10.0.nix { }) (self: super: { lablgtk = self.lablgtk_2_14; }); - - ocamlPackages_3_11_2 = mkOcamlPackages (callPackage ../development/compilers/ocaml/3.11.2.nix { }) (self: super: { lablgtk = self.lablgtk_2_14; }); - - ocamlPackages_3_12_1 = mkOcamlPackages (callPackage ../development/compilers/ocaml/3.12.1.nix { }) (self: super: { camlimages = self.camlimages_4_0; }); - ocamlPackages_4_00_1 = mkOcamlPackages (callPackage ../development/compilers/ocaml/4.00.1.nix { }) (self: super: { }); ocamlPackages_4_01_0 = mkOcamlPackages (callPackage ../development/compilers/ocaml/4.01.0.nix { }) (self: super: { }); diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 8f04a0e710d5..6f7445c6d8bb 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -376,6 +376,8 @@ in { ordered-set = callPackage ../development/python-modules/ordered-set { }; + osmnx = callPackage ../development/python-modules/osmnx { }; + outcome = callPackage ../development/python-modules/outcome {}; palettable = callPackage ../development/python-modules/palettable { }; |